From f3d2504117cff8cb0adafcf7f1960481d1f11714 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 30 Jul 2025 11:34:15 -0400 Subject: [PATCH 001/253] Changeset version bump (#6438) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens --- .changeset/v3.25.3.md | 14 -------------- CHANGELOG.md | 13 +++++++++++++ src/package.json | 2 +- 3 files changed, 14 insertions(+), 15 deletions(-) delete mode 100644 .changeset/v3.25.3.md diff --git a/.changeset/v3.25.3.md b/.changeset/v3.25.3.md deleted file mode 100644 index d0d891b694..0000000000 --- a/.changeset/v3.25.3.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -"roo-cline": patch ---- - -- Fix: Prevent input clearing when clicking chat buttons (thanks @hassoncs!) -- Increase Claude Code default max output tokens to 16k (#6125 by @bpeterson1991, PR by @app/roomote) -- Update PR reviewer rules and mode configuration (thanks @daniel-lxs!) -- Add translation check action to pull_request.opened event (thanks @app/roomote!) -- Add docs link for slash commands -- Allow queueing images -- Hide Gemini checkboxes on the welcome view -- Remove "(prev Roo Cline)" from extension title in all languages (thanks @app/roomote!) -- Remove event types mention from PR reviewer rules (thanks @daniel-lxs!) -- Clarify apply_diff tool descriptions to emphasize surgical edits diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b7d1e984c..80dd3921c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Roo Code Changelog +## [3.25.3] - 2025-07-30 + +- Allow queueing messages with images +- Increase Claude Code default max output tokens to 16k (#6125 by @bpeterson1991, PR by @app/roomote) +- Add docs link for slash commands +- Hide Gemini checkboxes on the welcome view +- Clarify apply_diff tool descriptions to emphasize surgical edits +- Fix: Prevent input clearing when clicking chat buttons (thanks @hassoncs!) +- Update PR reviewer rules and mode configuration (thanks @daniel-lxs!) +- Add translation check action to pull_request.opened event (thanks @app/roomote!) +- Remove "(prev Roo Cline)" from extension title in all languages (thanks @app/roomote!) +- Remove event types mention from PR reviewer rules (thanks @daniel-lxs!) + ## [3.25.2] - 2025-07-29 - Fix: Show diff view before approval when background edits are disabled (thanks @daniel-lxs!) diff --git a/src/package.json b/src/package.json index e1dc8ae72e..8b350ac838 100644 --- a/src/package.json +++ b/src/package.json @@ -3,7 +3,7 @@ "displayName": "%extension.displayName%", "description": "%extension.description%", "publisher": "RooVeterinaryInc", - "version": "3.25.2", + "version": "3.25.3", "icon": "assets/icons/icon.png", "galleryBanner": { "color": "#617A91", From 75f93c41cff8fb5aabcc0dc02add8c21881cc014 Mon Sep 17 00:00:00 2001 From: Jorge Piedrahita Ortiz <166410071+snova-jorgep@users.noreply.github.com> Date: Wed, 30 Jul 2025 11:47:12 -0500 Subject: [PATCH 002/253] feat: add SambaNova provider integration (#6188) --- .github/ISSUE_TEMPLATE/bug_report.yml | 1 + packages/types/src/global-settings.ts | 1 + packages/types/src/provider-settings.ts | 7 + packages/types/src/providers/index.ts | 1 + packages/types/src/providers/sambanova.ts | 90 ++++++++++ src/api/index.ts | 3 + src/api/providers/__tests__/sambanova.spec.ts | 154 ++++++++++++++++++ src/api/providers/index.ts | 1 + src/api/providers/sambanova.ts | 19 +++ src/shared/ProfileValidator.ts | 1 + src/shared/__tests__/ProfileValidator.spec.ts | 1 + .../src/components/settings/ApiOptions.tsx | 7 + .../src/components/settings/constants.ts | 3 + .../settings/providers/SambaNova.tsx | 52 ++++++ .../components/settings/providers/index.ts | 1 + .../components/ui/hooks/useSelectedModel.ts | 7 + webview-ui/src/i18n/locales/ca/settings.json | 2 + webview-ui/src/i18n/locales/de/settings.json | 2 + webview-ui/src/i18n/locales/en/settings.json | 2 + webview-ui/src/i18n/locales/es/settings.json | 2 + webview-ui/src/i18n/locales/fr/settings.json | 2 + webview-ui/src/i18n/locales/hi/settings.json | 2 + webview-ui/src/i18n/locales/id/settings.json | 2 + webview-ui/src/i18n/locales/it/settings.json | 2 + webview-ui/src/i18n/locales/ja/settings.json | 2 + webview-ui/src/i18n/locales/ko/settings.json | 2 + webview-ui/src/i18n/locales/nl/settings.json | 2 + webview-ui/src/i18n/locales/pl/settings.json | 2 + .../src/i18n/locales/pt-BR/settings.json | 2 + webview-ui/src/i18n/locales/ru/settings.json | 2 + webview-ui/src/i18n/locales/tr/settings.json | 2 + webview-ui/src/i18n/locales/vi/settings.json | 2 + .../src/i18n/locales/zh-CN/settings.json | 2 + .../src/i18n/locales/zh-TW/settings.json | 2 + 34 files changed, 385 insertions(+) create mode 100644 packages/types/src/providers/sambanova.ts create mode 100644 src/api/providers/__tests__/sambanova.spec.ts create mode 100644 src/api/providers/sambanova.ts create mode 100644 webview-ui/src/components/settings/providers/SambaNova.tsx diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 44626273b5..03bbe9640a 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -38,6 +38,7 @@ body: - OpenAI Compatible - OpenRouter - Requesty + - SambaNova - Unbound - VS Code Language Model API - xAI (Grok) diff --git a/packages/types/src/global-settings.ts b/packages/types/src/global-settings.ts index dc5a9e6744..62cd02df54 100644 --- a/packages/types/src/global-settings.ts +++ b/packages/types/src/global-settings.ts @@ -187,6 +187,7 @@ export const SECRET_STATE_KEYS = [ "codebaseIndexGeminiApiKey", "codebaseIndexMistralApiKey", "huggingFaceApiKey", + "sambaNovaApiKey", ] as const satisfies readonly (keyof ProviderSettings)[] export type SecretState = Pick diff --git a/packages/types/src/provider-settings.ts b/packages/types/src/provider-settings.ts index 8cdb5296b2..23cbd711d2 100644 --- a/packages/types/src/provider-settings.ts +++ b/packages/types/src/provider-settings.ts @@ -33,6 +33,7 @@ export const providerNames = [ "chutes", "litellm", "huggingface", + "sambanova", ] as const export const providerNamesSchema = z.enum(providerNames) @@ -241,6 +242,10 @@ const litellmSchema = baseProviderSettingsSchema.extend({ litellmUsePromptCache: z.boolean().optional(), }) +const sambaNovaSchema = apiModelIdProviderModelSchema.extend({ + sambaNovaApiKey: z.string().optional(), +}) + const defaultSchema = z.object({ apiProvider: z.undefined(), }) @@ -271,6 +276,7 @@ export const providerSettingsSchemaDiscriminated = z.discriminatedUnion("apiProv huggingFaceSchema.merge(z.object({ apiProvider: z.literal("huggingface") })), chutesSchema.merge(z.object({ apiProvider: z.literal("chutes") })), litellmSchema.merge(z.object({ apiProvider: z.literal("litellm") })), + sambaNovaSchema.merge(z.object({ apiProvider: z.literal("sambanova") })), defaultSchema, ]) @@ -301,6 +307,7 @@ export const providerSettingsSchema = z.object({ ...huggingFaceSchema.shape, ...chutesSchema.shape, ...litellmSchema.shape, + ...sambaNovaSchema.shape, ...codebaseIndexProviderSchema.shape, }) diff --git a/packages/types/src/providers/index.ts b/packages/types/src/providers/index.ts index f5061f152c..2e9a2a74a2 100644 --- a/packages/types/src/providers/index.ts +++ b/packages/types/src/providers/index.ts @@ -15,6 +15,7 @@ export * from "./ollama.js" export * from "./openai.js" export * from "./openrouter.js" export * from "./requesty.js" +export * from "./sambanova.js" export * from "./unbound.js" export * from "./vertex.js" export * from "./vscode-llm.js" diff --git a/packages/types/src/providers/sambanova.ts b/packages/types/src/providers/sambanova.ts new file mode 100644 index 0000000000..bed143f6e5 --- /dev/null +++ b/packages/types/src/providers/sambanova.ts @@ -0,0 +1,90 @@ +import type { ModelInfo } from "../model.js" + +// https://docs.sambanova.ai/cloud/docs/get-started/supported-models +export type SambaNovaModelId = + | "Meta-Llama-3.1-8B-Instruct" + | "Meta-Llama-3.3-70B-Instruct" + | "DeepSeek-R1" + | "DeepSeek-V3-0324" + | "DeepSeek-R1-Distill-Llama-70B" + | "Llama-4-Maverick-17B-128E-Instruct" + | "Llama-3.3-Swallow-70B-Instruct-v0.4" + | "Qwen3-32B" + +export const sambaNovaDefaultModelId: SambaNovaModelId = "Meta-Llama-3.3-70B-Instruct" + +export const sambaNovaModels = { + "Meta-Llama-3.1-8B-Instruct": { + maxTokens: 8192, + contextWindow: 16384, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.1, + outputPrice: 0.2, + description: "Meta Llama 3.1 8B Instruct model with 16K context window.", + }, + "Meta-Llama-3.3-70B-Instruct": { + maxTokens: 8192, + contextWindow: 131072, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.6, + outputPrice: 1.2, + description: "Meta Llama 3.3 70B Instruct model with 128K context window.", + }, + "DeepSeek-R1": { + maxTokens: 8192, + contextWindow: 32768, + supportsImages: false, + supportsPromptCache: false, + supportsReasoningBudget: true, + inputPrice: 5.0, + outputPrice: 7.0, + description: "DeepSeek R1 reasoning model with 32K context window.", + }, + "DeepSeek-V3-0324": { + maxTokens: 8192, + contextWindow: 32768, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 3.0, + outputPrice: 4.5, + description: "DeepSeek V3 model with 32K context window.", + }, + "DeepSeek-R1-Distill-Llama-70B": { + maxTokens: 8192, + contextWindow: 131072, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.7, + outputPrice: 1.4, + description: "DeepSeek R1 distilled Llama 70B model with 128K context window.", + }, + "Llama-4-Maverick-17B-128E-Instruct": { + maxTokens: 8192, + contextWindow: 131072, + supportsImages: true, + supportsPromptCache: false, + inputPrice: 0.63, + outputPrice: 1.8, + description: "Meta Llama 4 Maverick 17B 128E Instruct model with 128K context window.", + }, + "Llama-3.3-Swallow-70B-Instruct-v0.4": { + maxTokens: 8192, + contextWindow: 16384, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.6, + outputPrice: 1.2, + description: "Tokyotech Llama 3.3 Swallow 70B Instruct v0.4 model with 16K context window.", + }, + "Qwen3-32B": { + maxTokens: 8192, + contextWindow: 8192, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.4, + outputPrice: 0.8, + description: "Alibaba Qwen 3 32B model with 8K context window.", + }, +} as const satisfies Record diff --git a/src/api/index.ts b/src/api/index.ts index bda390848c..1e9d2f6e59 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -30,6 +30,7 @@ import { ChutesHandler, LiteLLMHandler, ClaudeCodeHandler, + SambaNovaHandler, } from "./providers" export interface SingleCompletionHandler { @@ -115,6 +116,8 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler { return new ChutesHandler(options) case "litellm": return new LiteLLMHandler(options) + case "sambanova": + return new SambaNovaHandler(options) default: apiProvider satisfies "gemini-cli" | undefined return new AnthropicHandler(options) diff --git a/src/api/providers/__tests__/sambanova.spec.ts b/src/api/providers/__tests__/sambanova.spec.ts new file mode 100644 index 0000000000..cd0e4a1989 --- /dev/null +++ b/src/api/providers/__tests__/sambanova.spec.ts @@ -0,0 +1,154 @@ +// npx vitest run src/api/providers/__tests__/sambanova.spec.ts + +// Mock vscode first to avoid import errors +vitest.mock("vscode", () => ({})) + +import OpenAI from "openai" +import { Anthropic } from "@anthropic-ai/sdk" + +import { type SambaNovaModelId, sambaNovaDefaultModelId, sambaNovaModels } from "@roo-code/types" + +import { SambaNovaHandler } from "../sambanova" + +vitest.mock("openai", () => { + const createMock = vitest.fn() + return { + default: vitest.fn(() => ({ chat: { completions: { create: createMock } } })), + } +}) + +describe("SambaNovaHandler", () => { + let handler: SambaNovaHandler + let mockCreate: any + + beforeEach(() => { + vitest.clearAllMocks() + mockCreate = (OpenAI as unknown as any)().chat.completions.create + handler = new SambaNovaHandler({ sambaNovaApiKey: "test-sambanova-api-key" }) + }) + + it("should use the correct SambaNova base URL", () => { + new SambaNovaHandler({ sambaNovaApiKey: "test-sambanova-api-key" }) + expect(OpenAI).toHaveBeenCalledWith(expect.objectContaining({ baseURL: "https://api.sambanova.ai/v1" })) + }) + + it("should use the provided API key", () => { + const sambaNovaApiKey = "test-sambanova-api-key" + new SambaNovaHandler({ sambaNovaApiKey }) + expect(OpenAI).toHaveBeenCalledWith(expect.objectContaining({ apiKey: sambaNovaApiKey })) + }) + + it("should return default model when no model is specified", () => { + const model = handler.getModel() + expect(model.id).toBe(sambaNovaDefaultModelId) + expect(model.info).toEqual(sambaNovaModels[sambaNovaDefaultModelId]) + }) + + it("should return specified model when valid model is provided", () => { + const testModelId: SambaNovaModelId = "Meta-Llama-3.3-70B-Instruct" + const handlerWithModel = new SambaNovaHandler({ + apiModelId: testModelId, + sambaNovaApiKey: "test-sambanova-api-key", + }) + const model = handlerWithModel.getModel() + expect(model.id).toBe(testModelId) + expect(model.info).toEqual(sambaNovaModels[testModelId]) + }) + + it("completePrompt method should return text from SambaNova API", async () => { + const expectedResponse = "This is a test response from SambaNova" + mockCreate.mockResolvedValueOnce({ choices: [{ message: { content: expectedResponse } }] }) + const result = await handler.completePrompt("test prompt") + expect(result).toBe(expectedResponse) + }) + + it("should handle errors in completePrompt", async () => { + const errorMessage = "SambaNova API error" + mockCreate.mockRejectedValueOnce(new Error(errorMessage)) + await expect(handler.completePrompt("test prompt")).rejects.toThrow( + `SambaNova completion error: ${errorMessage}`, + ) + }) + + it("createMessage should yield text content from stream", async () => { + const testContent = "This is test content from SambaNova stream" + + mockCreate.mockImplementationOnce(() => { + return { + [Symbol.asyncIterator]: () => ({ + next: vitest + .fn() + .mockResolvedValueOnce({ + done: false, + value: { choices: [{ delta: { content: testContent } }] }, + }) + .mockResolvedValueOnce({ done: true }), + }), + } + }) + + const stream = handler.createMessage("system prompt", []) + const firstChunk = await stream.next() + + expect(firstChunk.done).toBe(false) + expect(firstChunk.value).toEqual({ type: "text", text: testContent }) + }) + + it("createMessage should yield usage data from stream", async () => { + mockCreate.mockImplementationOnce(() => { + return { + [Symbol.asyncIterator]: () => ({ + next: vitest + .fn() + .mockResolvedValueOnce({ + done: false, + value: { choices: [{ delta: {} }], usage: { prompt_tokens: 10, completion_tokens: 20 } }, + }) + .mockResolvedValueOnce({ done: true }), + }), + } + }) + + const stream = handler.createMessage("system prompt", []) + const firstChunk = await stream.next() + + expect(firstChunk.done).toBe(false) + expect(firstChunk.value).toEqual({ type: "usage", inputTokens: 10, outputTokens: 20 }) + }) + + it("createMessage should pass correct parameters to SambaNova client", async () => { + const modelId: SambaNovaModelId = "Meta-Llama-3.3-70B-Instruct" + const modelInfo = sambaNovaModels[modelId] + const handlerWithModel = new SambaNovaHandler({ + apiModelId: modelId, + sambaNovaApiKey: "test-sambanova-api-key", + }) + + mockCreate.mockImplementationOnce(() => { + return { + [Symbol.asyncIterator]: () => ({ + async next() { + return { done: true } + }, + }), + } + }) + + const systemPrompt = "Test system prompt for SambaNova" + const messages: Anthropic.Messages.MessageParam[] = [{ role: "user", content: "Test message for SambaNova" }] + + const messageGenerator = handlerWithModel.createMessage(systemPrompt, messages) + await messageGenerator.next() + + expect(mockCreate).toHaveBeenCalledWith( + expect.objectContaining({ + model: modelId, + max_tokens: modelInfo.maxTokens, + temperature: 0.7, + messages: expect.arrayContaining([{ role: "system", content: systemPrompt }]), + stream: true, + stream_options: { include_usage: true }, + }), + ) + }) +}) diff --git a/src/api/providers/index.ts b/src/api/providers/index.ts index 1cefd0616b..e49dc55c76 100644 --- a/src/api/providers/index.ts +++ b/src/api/providers/index.ts @@ -19,6 +19,7 @@ export { OpenAiNativeHandler } from "./openai-native" export { OpenAiHandler } from "./openai" export { OpenRouterHandler } from "./openrouter" export { RequestyHandler } from "./requesty" +export { SambaNovaHandler } from "./sambanova" export { UnboundHandler } from "./unbound" export { VertexHandler } from "./vertex" export { VsCodeLmHandler } from "./vscode-lm" diff --git a/src/api/providers/sambanova.ts b/src/api/providers/sambanova.ts new file mode 100644 index 0000000000..a15bc12577 --- /dev/null +++ b/src/api/providers/sambanova.ts @@ -0,0 +1,19 @@ +import { type SambaNovaModelId, sambaNovaDefaultModelId, sambaNovaModels } from "@roo-code/types" + +import type { ApiHandlerOptions } from "../../shared/api" + +import { BaseOpenAiCompatibleProvider } from "./base-openai-compatible-provider" + +export class SambaNovaHandler extends BaseOpenAiCompatibleProvider { + constructor(options: ApiHandlerOptions) { + super({ + ...options, + providerName: "SambaNova", + baseURL: "https://api.sambanova.ai/v1", + apiKey: options.sambaNovaApiKey, + defaultProviderModelId: sambaNovaDefaultModelId, + providerModels: sambaNovaModels, + defaultTemperature: 0.7, + }) + } +} diff --git a/src/shared/ProfileValidator.ts b/src/shared/ProfileValidator.ts index 9fc527c15a..2ebf9bb3ab 100644 --- a/src/shared/ProfileValidator.ts +++ b/src/shared/ProfileValidator.ts @@ -65,6 +65,7 @@ export class ProfileValidator { case "deepseek": case "xai": case "groq": + case "sambanova": case "chutes": return profile.apiModelId case "litellm": diff --git a/src/shared/__tests__/ProfileValidator.spec.ts b/src/shared/__tests__/ProfileValidator.spec.ts index 896968ff7c..7ece0d8bf8 100644 --- a/src/shared/__tests__/ProfileValidator.spec.ts +++ b/src/shared/__tests__/ProfileValidator.spec.ts @@ -192,6 +192,7 @@ describe("ProfileValidator", () => { "xai", "groq", "chutes", + "sambanova", ] apiModelProviders.forEach((provider) => { diff --git a/webview-ui/src/components/settings/ApiOptions.tsx b/webview-ui/src/components/settings/ApiOptions.tsx index 977822cac3..486702a2f7 100644 --- a/webview-ui/src/components/settings/ApiOptions.tsx +++ b/webview-ui/src/components/settings/ApiOptions.tsx @@ -25,6 +25,7 @@ import { chutesDefaultModelId, bedrockDefaultModelId, vertexDefaultModelId, + sambaNovaDefaultModelId, } from "@roo-code/types" import { vscode } from "@src/utils/vscode" @@ -69,6 +70,7 @@ import { OpenAICompatible, OpenRouter, Requesty, + SambaNova, Unbound, Vertex, VSCodeLM, @@ -297,6 +299,7 @@ const ApiOptions = ({ chutes: { field: "apiModelId", default: chutesDefaultModelId }, bedrock: { field: "apiModelId", default: bedrockDefaultModelId }, vertex: { field: "apiModelId", default: vertexDefaultModelId }, + sambanova: { field: "apiModelId", default: sambaNovaDefaultModelId }, openai: { field: "openAiModelId" }, ollama: { field: "ollamaModelId" }, lmstudio: { field: "lmStudioModelId" }, @@ -509,6 +512,10 @@ const ApiOptions = ({ /> )} + {selectedProvider === "sambanova" && ( + + )} + {selectedProvider === "human-relay" && ( <>
diff --git a/webview-ui/src/components/settings/constants.ts b/webview-ui/src/components/settings/constants.ts index 995f591034..7d07e41f46 100644 --- a/webview-ui/src/components/settings/constants.ts +++ b/webview-ui/src/components/settings/constants.ts @@ -13,6 +13,7 @@ import { xaiModels, groqModels, chutesModels, + sambaNovaModels, } from "@roo-code/types" export const MODELS_BY_PROVIDER: Partial>> = { @@ -28,6 +29,7 @@ export const MODELS_BY_PROVIDER: Partial a.label.localeCompare(b.label)) diff --git a/webview-ui/src/components/settings/providers/SambaNova.tsx b/webview-ui/src/components/settings/providers/SambaNova.tsx new file mode 100644 index 0000000000..9202f8d06e --- /dev/null +++ b/webview-ui/src/components/settings/providers/SambaNova.tsx @@ -0,0 +1,52 @@ +import { useCallback } from "react" +import { VSCodeTextField } from "@vscode/webview-ui-toolkit/react" + +import type { ProviderSettings } from "@roo-code/types" + +import { useAppTranslation } from "@src/i18n/TranslationContext" +import { VSCodeButtonLink } from "@src/components/common/VSCodeButtonLink" + +import { inputEventTransform } from "../transforms" + +type SambaNovaProps = { + apiConfiguration: ProviderSettings + setApiConfigurationField: (field: keyof ProviderSettings, value: ProviderSettings[keyof ProviderSettings]) => void +} + +export const SambaNova = ({ apiConfiguration, setApiConfigurationField }: SambaNovaProps) => { + const { t } = useAppTranslation() + + const handleInputChange = useCallback( + ( + field: K, + transform: (event: E) => ProviderSettings[K] = inputEventTransform, + ) => + (event: E | Event) => { + setApiConfigurationField(field, transform(event as E)) + }, + [setApiConfigurationField], + ) + + return ( + <> + + + +
+ {t("settings:providers.apiKeyStorageNotice")} +
+ {!apiConfiguration?.sambaNovaApiKey && ( + + {t("settings:providers.getSambaNovaApiKey")} + + )} + + ) +} diff --git a/webview-ui/src/components/settings/providers/index.ts b/webview-ui/src/components/settings/providers/index.ts index 6c6fdddaee..957edb7992 100644 --- a/webview-ui/src/components/settings/providers/index.ts +++ b/webview-ui/src/components/settings/providers/index.ts @@ -15,6 +15,7 @@ export { OpenAI } from "./OpenAI" export { OpenAICompatible } from "./OpenAICompatible" export { OpenRouter } from "./OpenRouter" export { Requesty } from "./Requesty" +export { SambaNova } from "./SambaNova" export { Unbound } from "./Unbound" export { Vertex } from "./Vertex" export { VSCodeLM } from "./VSCodeLM" diff --git a/webview-ui/src/components/ui/hooks/useSelectedModel.ts b/webview-ui/src/components/ui/hooks/useSelectedModel.ts index 8dceb6e117..a6b76fbd7c 100644 --- a/webview-ui/src/components/ui/hooks/useSelectedModel.ts +++ b/webview-ui/src/components/ui/hooks/useSelectedModel.ts @@ -34,6 +34,8 @@ import { litellmDefaultModelId, claudeCodeDefaultModelId, claudeCodeModels, + sambaNovaModels, + sambaNovaDefaultModelId, } from "@roo-code/types" import type { RouterModels } from "@roo/api" @@ -224,6 +226,11 @@ function getSelectedModel({ const info = claudeCodeModels[id as keyof typeof claudeCodeModels] return { id, info: { ...openAiModelInfoSaneDefaults, ...info } } } + case "sambanova": { + const id = apiConfiguration.apiModelId ?? sambaNovaDefaultModelId + const info = sambaNovaModels[id as keyof typeof sambaNovaModels] + return { id, info } + } // case "anthropic": // case "human-relay": // case "fake-ai": diff --git a/webview-ui/src/i18n/locales/ca/settings.json b/webview-ui/src/i18n/locales/ca/settings.json index 9d09a04cd8..adde176b31 100644 --- a/webview-ui/src/i18n/locales/ca/settings.json +++ b/webview-ui/src/i18n/locales/ca/settings.json @@ -259,6 +259,8 @@ "geminiApiKey": "Clau API de Gemini", "getGroqApiKey": "Obtenir clau API de Groq", "groqApiKey": "Clau API de Groq", + "getSambaNovaApiKey": "Obtenir clau API de SambaNova", + "sambaNovaApiKey": "Clau API de SambaNova", "getHuggingFaceApiKey": "Obtenir clau API de Hugging Face", "huggingFaceApiKey": "Clau API de Hugging Face", "huggingFaceModelId": "ID del model", diff --git a/webview-ui/src/i18n/locales/de/settings.json b/webview-ui/src/i18n/locales/de/settings.json index 4132dc0ca9..429f1ccb5c 100644 --- a/webview-ui/src/i18n/locales/de/settings.json +++ b/webview-ui/src/i18n/locales/de/settings.json @@ -259,6 +259,8 @@ "geminiApiKey": "Gemini API-Schlüssel", "getGroqApiKey": "Groq API-Schlüssel erhalten", "groqApiKey": "Groq API-Schlüssel", + "getSambaNovaApiKey": "SambaNova API-Schlüssel erhalten", + "sambaNovaApiKey": "SambaNova API-Schlüssel", "getHuggingFaceApiKey": "Hugging Face API-Schlüssel erhalten", "huggingFaceApiKey": "Hugging Face API-Schlüssel", "huggingFaceModelId": "Modell-ID", diff --git a/webview-ui/src/i18n/locales/en/settings.json b/webview-ui/src/i18n/locales/en/settings.json index 7c58e679c6..93b184fc27 100644 --- a/webview-ui/src/i18n/locales/en/settings.json +++ b/webview-ui/src/i18n/locales/en/settings.json @@ -259,6 +259,8 @@ "geminiApiKey": "Gemini API Key", "getGroqApiKey": "Get Groq API Key", "groqApiKey": "Groq API Key", + "getSambaNovaApiKey": "Get SambaNova API Key", + "sambaNovaApiKey": "SambaNova API Key", "getHuggingFaceApiKey": "Get Hugging Face API Key", "huggingFaceApiKey": "Hugging Face API Key", "huggingFaceModelId": "Model ID", diff --git a/webview-ui/src/i18n/locales/es/settings.json b/webview-ui/src/i18n/locales/es/settings.json index 510d135170..c56058dff5 100644 --- a/webview-ui/src/i18n/locales/es/settings.json +++ b/webview-ui/src/i18n/locales/es/settings.json @@ -259,6 +259,8 @@ "geminiApiKey": "Clave API de Gemini", "getGroqApiKey": "Obtener clave API de Groq", "groqApiKey": "Clave API de Groq", + "getSambaNovaApiKey": "Obtener clave API de SambaNova", + "sambaNovaApiKey": "Clave API de SambaNova", "getHuggingFaceApiKey": "Obtener clave API de Hugging Face", "huggingFaceApiKey": "Clave API de Hugging Face", "huggingFaceModelId": "ID del modelo", diff --git a/webview-ui/src/i18n/locales/fr/settings.json b/webview-ui/src/i18n/locales/fr/settings.json index 1c258e42d2..5ea19d71f9 100644 --- a/webview-ui/src/i18n/locales/fr/settings.json +++ b/webview-ui/src/i18n/locales/fr/settings.json @@ -259,6 +259,8 @@ "geminiApiKey": "Clé API Gemini", "getGroqApiKey": "Obtenir la clé API Groq", "groqApiKey": "Clé API Groq", + "getSambaNovaApiKey": "Obtenir la clé API SambaNova", + "sambaNovaApiKey": "Clé API SambaNova", "getHuggingFaceApiKey": "Obtenir la clé API Hugging Face", "huggingFaceApiKey": "Clé API Hugging Face", "huggingFaceModelId": "ID du modèle", diff --git a/webview-ui/src/i18n/locales/hi/settings.json b/webview-ui/src/i18n/locales/hi/settings.json index 3c09fbbf13..088b523400 100644 --- a/webview-ui/src/i18n/locales/hi/settings.json +++ b/webview-ui/src/i18n/locales/hi/settings.json @@ -259,6 +259,8 @@ "geminiApiKey": "Gemini API कुंजी", "getGroqApiKey": "Groq API कुंजी प्राप्त करें", "groqApiKey": "Groq API कुंजी", + "getSambaNovaApiKey": "SambaNova API कुंजी प्राप्त करें", + "sambaNovaApiKey": "SambaNova API कुंजी", "getHuggingFaceApiKey": "Hugging Face API कुंजी प्राप्त करें", "huggingFaceApiKey": "Hugging Face API कुंजी", "huggingFaceModelId": "मॉडल ID", diff --git a/webview-ui/src/i18n/locales/id/settings.json b/webview-ui/src/i18n/locales/id/settings.json index 8d6fa19fd9..a8b8600c1b 100644 --- a/webview-ui/src/i18n/locales/id/settings.json +++ b/webview-ui/src/i18n/locales/id/settings.json @@ -263,6 +263,8 @@ "geminiApiKey": "Gemini API Key", "getGroqApiKey": "Dapatkan Groq API Key", "groqApiKey": "Groq API Key", + "getSambaNovaApiKey": "Dapatkan SambaNova API Key", + "sambaNovaApiKey": "SambaNova API Key", "getHuggingFaceApiKey": "Dapatkan Kunci API Hugging Face", "huggingFaceApiKey": "Kunci API Hugging Face", "huggingFaceModelId": "ID Model", diff --git a/webview-ui/src/i18n/locales/it/settings.json b/webview-ui/src/i18n/locales/it/settings.json index 181f089f88..b6eeeb65bf 100644 --- a/webview-ui/src/i18n/locales/it/settings.json +++ b/webview-ui/src/i18n/locales/it/settings.json @@ -259,6 +259,8 @@ "geminiApiKey": "Chiave API Gemini", "getGroqApiKey": "Ottieni chiave API Groq", "groqApiKey": "Chiave API Groq", + "getSambaNovaApiKey": "Ottieni chiave API SambaNova", + "sambaNovaApiKey": "Chiave API SambaNova", "getHuggingFaceApiKey": "Ottieni chiave API Hugging Face", "huggingFaceApiKey": "Chiave API Hugging Face", "huggingFaceModelId": "ID modello", diff --git a/webview-ui/src/i18n/locales/ja/settings.json b/webview-ui/src/i18n/locales/ja/settings.json index 07954e4b45..ee81d1cef6 100644 --- a/webview-ui/src/i18n/locales/ja/settings.json +++ b/webview-ui/src/i18n/locales/ja/settings.json @@ -259,6 +259,8 @@ "geminiApiKey": "Gemini APIキー", "getGroqApiKey": "Groq APIキーを取得", "groqApiKey": "Groq APIキー", + "getSambaNovaApiKey": "SambaNova APIキーを取得", + "sambaNovaApiKey": "SambaNova APIキー", "getHuggingFaceApiKey": "Hugging Face APIキーを取得", "huggingFaceApiKey": "Hugging Face APIキー", "huggingFaceModelId": "モデルID", diff --git a/webview-ui/src/i18n/locales/ko/settings.json b/webview-ui/src/i18n/locales/ko/settings.json index ad6304dd80..d1d4364232 100644 --- a/webview-ui/src/i18n/locales/ko/settings.json +++ b/webview-ui/src/i18n/locales/ko/settings.json @@ -259,6 +259,8 @@ "geminiApiKey": "Gemini API 키", "getGroqApiKey": "Groq API 키 받기", "groqApiKey": "Groq API 키", + "getSambaNovaApiKey": "SambaNova API 키 받기", + "sambaNovaApiKey": "SambaNova API 키", "getGeminiApiKey": "Gemini API 키 받기", "getHuggingFaceApiKey": "Hugging Face API 키 받기", "huggingFaceApiKey": "Hugging Face API 키", diff --git a/webview-ui/src/i18n/locales/nl/settings.json b/webview-ui/src/i18n/locales/nl/settings.json index 6548df5bca..435886c522 100644 --- a/webview-ui/src/i18n/locales/nl/settings.json +++ b/webview-ui/src/i18n/locales/nl/settings.json @@ -259,6 +259,8 @@ "geminiApiKey": "Gemini API-sleutel", "getGroqApiKey": "Groq API-sleutel ophalen", "groqApiKey": "Groq API-sleutel", + "getSambaNovaApiKey": "SambaNova API-sleutel ophalen", + "sambaNovaApiKey": "SambaNova API-sleutel", "getGeminiApiKey": "Gemini API-sleutel ophalen", "getHuggingFaceApiKey": "Hugging Face API-sleutel ophalen", "huggingFaceApiKey": "Hugging Face API-sleutel", diff --git a/webview-ui/src/i18n/locales/pl/settings.json b/webview-ui/src/i18n/locales/pl/settings.json index e1e4f3f66f..1683332934 100644 --- a/webview-ui/src/i18n/locales/pl/settings.json +++ b/webview-ui/src/i18n/locales/pl/settings.json @@ -259,6 +259,8 @@ "geminiApiKey": "Klucz API Gemini", "getGroqApiKey": "Uzyskaj klucz API Groq", "groqApiKey": "Klucz API Groq", + "getSambaNovaApiKey": "Uzyskaj klucz API SambaNova", + "sambaNovaApiKey": "Klucz API SambaNova", "getGeminiApiKey": "Uzyskaj klucz API Gemini", "getHuggingFaceApiKey": "Uzyskaj klucz API Hugging Face", "huggingFaceApiKey": "Klucz API Hugging Face", diff --git a/webview-ui/src/i18n/locales/pt-BR/settings.json b/webview-ui/src/i18n/locales/pt-BR/settings.json index dad1db42e8..3b3abd2dc2 100644 --- a/webview-ui/src/i18n/locales/pt-BR/settings.json +++ b/webview-ui/src/i18n/locales/pt-BR/settings.json @@ -259,6 +259,8 @@ "geminiApiKey": "Chave de API Gemini", "getGroqApiKey": "Obter chave de API Groq", "groqApiKey": "Chave de API Groq", + "getSambaNovaApiKey": "Obter chave de API SambaNova", + "sambaNovaApiKey": "Chave de API SambaNova", "getGeminiApiKey": "Obter chave de API Gemini", "getHuggingFaceApiKey": "Obter chave de API Hugging Face", "huggingFaceApiKey": "Chave de API Hugging Face", diff --git a/webview-ui/src/i18n/locales/ru/settings.json b/webview-ui/src/i18n/locales/ru/settings.json index cf425fd001..dc45d922d0 100644 --- a/webview-ui/src/i18n/locales/ru/settings.json +++ b/webview-ui/src/i18n/locales/ru/settings.json @@ -259,6 +259,8 @@ "geminiApiKey": "Gemini API-ключ", "getGroqApiKey": "Получить Groq API-ключ", "groqApiKey": "Groq API-ключ", + "getSambaNovaApiKey": "Получить SambaNova API-ключ", + "sambaNovaApiKey": "SambaNova API-ключ", "getGeminiApiKey": "Получить Gemini API-ключ", "getHuggingFaceApiKey": "Получить Hugging Face API-ключ", "huggingFaceApiKey": "Hugging Face API-ключ", diff --git a/webview-ui/src/i18n/locales/tr/settings.json b/webview-ui/src/i18n/locales/tr/settings.json index 451c6e1c85..52ab8b17c8 100644 --- a/webview-ui/src/i18n/locales/tr/settings.json +++ b/webview-ui/src/i18n/locales/tr/settings.json @@ -259,6 +259,8 @@ "geminiApiKey": "Gemini API Anahtarı", "getGroqApiKey": "Groq API Anahtarı Al", "groqApiKey": "Groq API Anahtarı", + "getSambaNovaApiKey": "SambaNova API Anahtarı Al", + "sambaNovaApiKey": "SambaNova API Anahtarı", "getHuggingFaceApiKey": "Hugging Face API Anahtarı Al", "huggingFaceApiKey": "Hugging Face API Anahtarı", "huggingFaceModelId": "Model ID", diff --git a/webview-ui/src/i18n/locales/vi/settings.json b/webview-ui/src/i18n/locales/vi/settings.json index 2fb890ac5e..65fd58d0ed 100644 --- a/webview-ui/src/i18n/locales/vi/settings.json +++ b/webview-ui/src/i18n/locales/vi/settings.json @@ -259,6 +259,8 @@ "geminiApiKey": "Khóa API Gemini", "getGroqApiKey": "Lấy khóa API Groq", "groqApiKey": "Khóa API Groq", + "getSambaNovaApiKey": "Lấy khóa API SambaNova", + "sambaNovaApiKey": "Khóa API SambaNova", "getHuggingFaceApiKey": "Lấy Khóa API Hugging Face", "huggingFaceApiKey": "Khóa API Hugging Face", "huggingFaceModelId": "ID Mô hình", diff --git a/webview-ui/src/i18n/locales/zh-CN/settings.json b/webview-ui/src/i18n/locales/zh-CN/settings.json index 261b77f7bc..9f1cbd34b1 100644 --- a/webview-ui/src/i18n/locales/zh-CN/settings.json +++ b/webview-ui/src/i18n/locales/zh-CN/settings.json @@ -259,6 +259,8 @@ "geminiApiKey": "Gemini API 密钥", "getGroqApiKey": "获取 Groq API 密钥", "groqApiKey": "Groq API 密钥", + "getSambaNovaApiKey": "获取 SambaNova API 密钥", + "sambaNovaApiKey": "SambaNova API 密钥", "getHuggingFaceApiKey": "获取 Hugging Face API 密钥", "huggingFaceApiKey": "Hugging Face API 密钥", "huggingFaceModelId": "模型 ID", diff --git a/webview-ui/src/i18n/locales/zh-TW/settings.json b/webview-ui/src/i18n/locales/zh-TW/settings.json index dbdae65d5a..6d96be360e 100644 --- a/webview-ui/src/i18n/locales/zh-TW/settings.json +++ b/webview-ui/src/i18n/locales/zh-TW/settings.json @@ -259,6 +259,8 @@ "geminiApiKey": "Gemini API 金鑰", "getGroqApiKey": "取得 Groq API 金鑰", "groqApiKey": "Groq API 金鑰", + "getSambaNovaApiKey": "取得 SambaNova API 金鑰", + "sambaNovaApiKey": "SambaNova API 金鑰", "getHuggingFaceApiKey": "取得 Hugging Face API 金鑰", "huggingFaceApiKey": "Hugging Face API 金鑰", "huggingFaceModelId": "模型 ID", From 2217a3d548bcc14db50b2f578f19dee20747cb3a Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Wed, 30 Jul 2025 13:52:28 -0700 Subject: [PATCH 003/253] feat: auto-refresh marketplace data when organization settings change (#6446) - Added organizationSettingsVersion to ExtensionState type - Modified ClineProvider to include version in state sent to webview - Updated CloudService callback to trigger marketplace refresh on settings change - Added logic to MarketplaceView to detect version changes and request data refresh - Added comprehensive tests for the new functionality This ensures marketplace items (MCPs and modes) stay in sync when organization settings are updated in the cloud. --------- Co-authored-by: Roo Code Co-authored-by: John Richmond <5629+jr@users.noreply.github.com> --- src/core/webview/ClineProvider.ts | 16 ++ src/shared/ExtensionMessage.ts | 1 + .../marketplace/MarketplaceView.tsx | 17 +- .../__tests__/MarketplaceView.spec.tsx | 187 ++++++++++++------ .../components/marketplace/useStateManager.ts | 3 + .../src/context/ExtensionStateContext.tsx | 3 + 6 files changed, 170 insertions(+), 57 deletions(-) diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index 280ab61a06..932442934c 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -1505,6 +1505,7 @@ export class ClineProvider cloudIsAuthenticated, sharingEnabled, organizationAllowList, + organizationSettingsVersion, maxConcurrentFileReads, condensingApiConfigId, customCondensingPrompt, @@ -1617,6 +1618,7 @@ export class ClineProvider cloudIsAuthenticated: cloudIsAuthenticated ?? false, sharingEnabled: sharingEnabled ?? false, organizationAllowList, + organizationSettingsVersion, condensingApiConfigId, customCondensingPrompt, codebaseIndexModels: codebaseIndexModels ?? EMBEDDING_MODEL_PROFILES, @@ -1703,6 +1705,19 @@ export class ClineProvider ) } + let organizationSettingsVersion: number = -1 + + try { + if (CloudService.hasInstance()) { + const settings = CloudService.instance.getOrganizationSettings() + organizationSettingsVersion = settings?.version ?? -1 + } + } catch (error) { + console.error( + `[getState] failed to get organization settings version: ${error instanceof Error ? error.message : String(error)}`, + ) + } + // Return the same structure as before return { apiConfiguration: providerSettings, @@ -1786,6 +1801,7 @@ export class ClineProvider cloudIsAuthenticated, sharingEnabled, organizationAllowList, + organizationSettingsVersion, // Explicitly add condensing settings condensingApiConfigId: stateValues.condensingApiConfigId, customCondensingPrompt: stateValues.customCondensingPrompt, diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts index 67f8782e19..1e562bb9ee 100644 --- a/src/shared/ExtensionMessage.ts +++ b/src/shared/ExtensionMessage.ts @@ -313,6 +313,7 @@ export type ExtensionState = Pick< cloudApiUrl?: string sharingEnabled: boolean organizationAllowList: OrganizationAllowList + organizationSettingsVersion?: number autoCondenseContext: boolean autoCondenseContextPercent: number diff --git a/webview-ui/src/components/marketplace/MarketplaceView.tsx b/webview-ui/src/components/marketplace/MarketplaceView.tsx index b47e1aa875..abfcf87cc5 100644 --- a/webview-ui/src/components/marketplace/MarketplaceView.tsx +++ b/webview-ui/src/components/marketplace/MarketplaceView.tsx @@ -1,4 +1,4 @@ -import { useState, useEffect, useMemo } from "react" +import { useState, useEffect, useMemo, useContext } from "react" import { Button } from "@/components/ui/button" import { Tab, TabContent, TabHeader } from "../common/Tab" import { MarketplaceViewStateManager } from "./MarketplaceViewStateManager" @@ -8,6 +8,7 @@ import { vscode } from "@/utils/vscode" import { MarketplaceListView } from "./MarketplaceListView" import { cn } from "@/lib/utils" import { TooltipProvider } from "@/components/ui/tooltip" +import { ExtensionStateContext } from "@/context/ExtensionStateContext" interface MarketplaceViewProps { onDone?: () => void @@ -18,6 +19,20 @@ export function MarketplaceView({ stateManager, onDone, targetTab }: Marketplace const { t } = useAppTranslation() const [state, manager] = useStateManager(stateManager) const [hasReceivedInitialState, setHasReceivedInitialState] = useState(false) + const extensionState = useContext(ExtensionStateContext) + const [lastOrganizationSettingsVersion, setLastOrganizationSettingsVersion] = useState( + extensionState?.organizationSettingsVersion ?? -1, + ) + + useEffect(() => { + const currentVersion = extensionState?.organizationSettingsVersion ?? -1 + if (currentVersion !== lastOrganizationSettingsVersion) { + vscode.postMessage({ + type: "fetchMarketplaceData", + }) + } + setLastOrganizationSettingsVersion(currentVersion) + }, [extensionState?.organizationSettingsVersion, lastOrganizationSettingsVersion]) // Track when we receive the initial state useEffect(() => { diff --git a/webview-ui/src/components/marketplace/__tests__/MarketplaceView.spec.tsx b/webview-ui/src/components/marketplace/__tests__/MarketplaceView.spec.tsx index 95b2dea54b..57f7e9eb9d 100644 --- a/webview-ui/src/components/marketplace/__tests__/MarketplaceView.spec.tsx +++ b/webview-ui/src/components/marketplace/__tests__/MarketplaceView.spec.tsx @@ -1,14 +1,13 @@ -import { render, screen } from "@/utils/test-utils" -import userEvent from "@testing-library/user-event" - +import { render, waitFor } from "@testing-library/react" +import { vi, describe, it, expect, beforeEach } from "vitest" import { MarketplaceView } from "../MarketplaceView" import { MarketplaceViewStateManager } from "../MarketplaceViewStateManager" +import { ExtensionStateContext } from "@/context/ExtensionStateContext" +import { vscode } from "@/utils/vscode" vi.mock("@/utils/vscode", () => ({ vscode: { postMessage: vi.fn(), - getState: vi.fn(() => ({})), - setState: vi.fn(), }, })) @@ -18,70 +17,146 @@ vi.mock("@/i18n/TranslationContext", () => ({ }), })) -vi.mock("../useStateManager", () => ({ - useStateManager: () => [ - { - allItems: [], - displayItems: [], - isFetching: false, - activeTab: "mcp", - filters: { type: "", search: "", tags: [] }, - }, - { - transition: vi.fn(), - onStateChange: vi.fn(() => vi.fn()), - }, - ], -})) - -vi.mock("../MarketplaceListView", () => ({ - MarketplaceListView: ({ filterByType }: { filterByType: string }) => ( -
MarketplaceListView - {filterByType}
- ), -})) - -// Mock Tab components to avoid ExtensionStateContext dependency -vi.mock("@/components/common/Tab", () => ({ - Tab: ({ children, ...props }: any) =>
{children}
, - TabHeader: ({ children, ...props }: any) =>
{children}
, - TabContent: ({ children, ...props }: any) =>
{children}
, - TabList: ({ children, ...props }: any) =>
{children}
, - TabTrigger: ({ children, ...props }: any) => , -})) - describe("MarketplaceView", () => { - const mockOnDone = vi.fn() - const mockStateManager = new MarketplaceViewStateManager() + let stateManager: MarketplaceViewStateManager + let mockExtensionState: any beforeEach(() => { vi.clearAllMocks() + stateManager = new MarketplaceViewStateManager() + + // Initialize state manager with some test data + stateManager.transition({ + type: "FETCH_COMPLETE", + payload: { + items: [ + { + id: "test-mcp", + name: "Test MCP", + type: "mcp" as const, + description: "Test MCP server", + tags: ["test"], + content: "Test content", + url: "https://test.com", + author: "Test Author", + }, + ], + }, + }) + + mockExtensionState = { + organizationSettingsVersion: 1, + // Add other required properties for the context + didHydrateState: true, + showWelcome: false, + theme: {}, + mcpServers: [], + filePaths: [], + openedTabs: [], + commands: [], + organizationAllowList: { allowAll: true, providers: {} }, + cloudIsAuthenticated: false, + sharingEnabled: false, + hasOpenedModeSelector: false, + setHasOpenedModeSelector: vi.fn(), + alwaysAllowFollowupQuestions: false, + setAlwaysAllowFollowupQuestions: vi.fn(), + followupAutoApproveTimeoutMs: 60000, + setFollowupAutoApproveTimeoutMs: vi.fn(), + profileThresholds: {}, + setProfileThresholds: vi.fn(), + // ... other required context properties + } }) - it("renders without crashing", () => { - render() + it("should trigger fetchMarketplaceData when organization settings version changes", async () => { + const { rerender } = render( + + + , + ) - expect(screen.getByText("marketplace:title")).toBeInTheDocument() - expect(screen.getByText("marketplace:done")).toBeInTheDocument() + // Initial render should not trigger fetch (version hasn't changed) + expect(vscode.postMessage).not.toHaveBeenCalledWith({ + type: "fetchMarketplaceData", + }) + + // Update the organization settings version + mockExtensionState = { + ...mockExtensionState, + organizationSettingsVersion: 2, + } + + // Re-render with updated context + rerender( + + + , + ) + + // Wait for the effect to run + await waitFor(() => { + expect(vscode.postMessage).toHaveBeenCalledWith({ + type: "fetchMarketplaceData", + }) + }) }) - it("calls onDone when Done button is clicked", async () => { - const user = userEvent.setup() - render() + it("should trigger fetchMarketplaceData when organization settings version changes from -1", async () => { + // Start with -1 version (default) + mockExtensionState = { + ...mockExtensionState, + organizationSettingsVersion: -1, + } - await user.click(screen.getByText("marketplace:done")) - expect(mockOnDone).toHaveBeenCalledTimes(1) + const { rerender } = render( + + + , + ) + + // Clear any initial calls + vi.clearAllMocks() + + // Update to a defined version + mockExtensionState = { + ...mockExtensionState, + organizationSettingsVersion: 1, + } + + rerender( + + + , + ) + + // Should trigger fetch when transitioning from -1 to 1 + await waitFor(() => { + expect(vscode.postMessage).toHaveBeenCalledWith({ + type: "fetchMarketplaceData", + }) + }) }) - it("renders tab buttons", () => { - render() + it("should not trigger fetchMarketplaceData when organization settings version remains the same", async () => { + const { rerender } = render( + + + , + ) - expect(screen.getByText("MCP")).toBeInTheDocument() - expect(screen.getByText("Modes")).toBeInTheDocument() - }) + // Re-render with same version + rerender( + + + , + ) - it("renders MarketplaceListView", () => { - render() - - expect(screen.getByTestId("marketplace-list-view")).toBeInTheDocument() + // Should not trigger fetch when version hasn't changed + await waitFor(() => { + expect(vscode.postMessage).not.toHaveBeenCalledWith({ + type: "fetchMarketplaceData", + }) + }) }) }) diff --git a/webview-ui/src/components/marketplace/useStateManager.ts b/webview-ui/src/components/marketplace/useStateManager.ts index 697c015cbd..a1e5a9533c 100644 --- a/webview-ui/src/components/marketplace/useStateManager.ts +++ b/webview-ui/src/components/marketplace/useStateManager.ts @@ -13,7 +13,10 @@ export function useStateManager(existingManager?: MarketplaceViewStateManager) { prevState.isFetching !== newState.isFetching || prevState.activeTab !== newState.activeTab || JSON.stringify(prevState.allItems) !== JSON.stringify(newState.allItems) || + JSON.stringify(prevState.organizationMcps) !== JSON.stringify(newState.organizationMcps) || JSON.stringify(prevState.displayItems) !== JSON.stringify(newState.displayItems) || + JSON.stringify(prevState.displayOrganizationMcps) !== + JSON.stringify(newState.displayOrganizationMcps) || JSON.stringify(prevState.filters) !== JSON.stringify(newState.filters) return hasChanged ? newState : prevState diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx index b156d0193b..41a7a93670 100644 --- a/webview-ui/src/context/ExtensionStateContext.tsx +++ b/webview-ui/src/context/ExtensionStateContext.tsx @@ -35,6 +35,7 @@ export interface ExtensionStateContextType extends ExtensionState { openedTabs: Array<{ label: string; isActive: boolean; path?: string }> commands: Command[] organizationAllowList: OrganizationAllowList + organizationSettingsVersion: number cloudIsAuthenticated: boolean sharingEnabled: boolean maxConcurrentFileReads?: number @@ -226,6 +227,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode cloudIsAuthenticated: false, sharingEnabled: false, organizationAllowList: ORGANIZATION_ALLOW_ALL, + organizationSettingsVersion: -1, autoCondenseContext: true, autoCondenseContextPercent: 100, profileThresholds: {}, @@ -392,6 +394,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode screenshotQuality: state.screenshotQuality, routerModels: extensionRouterModels, cloudIsAuthenticated: state.cloudIsAuthenticated ?? false, + organizationSettingsVersion: state.organizationSettingsVersion ?? -1, marketplaceItems, marketplaceInstalledMetadata, profileThresholds: state.profileThresholds ?? {}, From 4015a58951656eea178427f926e61cf167acb24e Mon Sep 17 00:00:00 2001 From: Hannes Rudolph Date: Wed, 30 Jul 2025 14:53:35 -0600 Subject: [PATCH 004/253] fix: Use separate changelog for nightly builds to prevent marketplace freezing (#6449) --- CHANGELOG-NIGHTLY.md | 1 + apps/vscode-nightly/esbuild.mjs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 CHANGELOG-NIGHTLY.md diff --git a/CHANGELOG-NIGHTLY.md b/CHANGELOG-NIGHTLY.md new file mode 100644 index 0000000000..72fd331162 --- /dev/null +++ b/CHANGELOG-NIGHTLY.md @@ -0,0 +1 @@ +changelog-test diff --git a/apps/vscode-nightly/esbuild.mjs b/apps/vscode-nightly/esbuild.mjs index 09fa948cd8..842f858090 100644 --- a/apps/vscode-nightly/esbuild.mjs +++ b/apps/vscode-nightly/esbuild.mjs @@ -64,7 +64,7 @@ async function main() { copyPaths( [ ["../README.vscode.md", "README.md"], - ["../CHANGELOG.md", "CHANGELOG.md"], + ["../CHANGELOG-NIGHTLY.md", "CHANGELOG.md"], ["../LICENSE", "LICENSE"], ["../.env", ".env", { optional: true }], [".vscodeignore", ".vscodeignore"], From 4b45a4e7f23d2d6d98c73c99d0e1f8e7a8b5bdb2 Mon Sep 17 00:00:00 2001 From: AntiMoron Date: Thu, 31 Jul 2025 04:54:16 +0800 Subject: [PATCH 005/253] Support new LLM provider: Doubao (#6345) Co-authored-by: Daniel Riccio --- packages/types/src/provider-settings.ts | 8 ++ packages/types/src/providers/doubao.ts | 44 ++++++++++ packages/types/src/providers/index.ts | 1 + src/api/index.ts | 3 + src/api/providers/doubao.ts | 81 +++++++++++++++++++ src/api/providers/index.ts | 1 + .../src/components/settings/ApiOptions.tsx | 7 ++ .../src/components/settings/constants.ts | 3 + .../components/settings/providers/Doubao.tsx | 52 ++++++++++++ .../components/settings/providers/index.ts | 1 + .../components/ui/hooks/useSelectedModel.ts | 7 ++ webview-ui/src/i18n/locales/ca/settings.json | 2 + webview-ui/src/i18n/locales/de/settings.json | 2 + webview-ui/src/i18n/locales/en/settings.json | 2 + webview-ui/src/i18n/locales/es/settings.json | 2 + webview-ui/src/i18n/locales/fr/settings.json | 2 + webview-ui/src/i18n/locales/hi/settings.json | 2 + webview-ui/src/i18n/locales/id/settings.json | 2 + webview-ui/src/i18n/locales/it/settings.json | 2 + webview-ui/src/i18n/locales/ja/settings.json | 2 + webview-ui/src/i18n/locales/ko/settings.json | 2 + webview-ui/src/i18n/locales/nl/settings.json | 2 + webview-ui/src/i18n/locales/pl/settings.json | 2 + .../src/i18n/locales/pt-BR/settings.json | 2 + webview-ui/src/i18n/locales/ru/settings.json | 2 + webview-ui/src/i18n/locales/tr/settings.json | 2 + webview-ui/src/i18n/locales/vi/settings.json | 2 + .../src/i18n/locales/zh-CN/settings.json | 2 + .../src/i18n/locales/zh-TW/settings.json | 2 + 29 files changed, 244 insertions(+) create mode 100644 packages/types/src/providers/doubao.ts create mode 100644 src/api/providers/doubao.ts create mode 100644 webview-ui/src/components/settings/providers/Doubao.tsx diff --git a/packages/types/src/provider-settings.ts b/packages/types/src/provider-settings.ts index 23cbd711d2..e13dc9d639 100644 --- a/packages/types/src/provider-settings.ts +++ b/packages/types/src/provider-settings.ts @@ -24,6 +24,7 @@ export const providerNames = [ "mistral", "moonshot", "deepseek", + "doubao", "unbound", "requesty", "human-relay", @@ -194,6 +195,11 @@ const deepSeekSchema = apiModelIdProviderModelSchema.extend({ deepSeekApiKey: z.string().optional(), }) +const doubaoSchema = apiModelIdProviderModelSchema.extend({ + doubaoBaseUrl: z.string().optional(), + doubaoApiKey: z.string().optional(), +}) + const moonshotSchema = apiModelIdProviderModelSchema.extend({ moonshotBaseUrl: z .union([z.literal("https://api.moonshot.ai/v1"), z.literal("https://api.moonshot.cn/v1")]) @@ -266,6 +272,7 @@ export const providerSettingsSchemaDiscriminated = z.discriminatedUnion("apiProv openAiNativeSchema.merge(z.object({ apiProvider: z.literal("openai-native") })), mistralSchema.merge(z.object({ apiProvider: z.literal("mistral") })), deepSeekSchema.merge(z.object({ apiProvider: z.literal("deepseek") })), + doubaoSchema.merge(z.object({ apiProvider: z.literal("doubao") })), moonshotSchema.merge(z.object({ apiProvider: z.literal("moonshot") })), unboundSchema.merge(z.object({ apiProvider: z.literal("unbound") })), requestySchema.merge(z.object({ apiProvider: z.literal("requesty") })), @@ -297,6 +304,7 @@ export const providerSettingsSchema = z.object({ ...openAiNativeSchema.shape, ...mistralSchema.shape, ...deepSeekSchema.shape, + ...doubaoSchema.shape, ...moonshotSchema.shape, ...unboundSchema.shape, ...requestySchema.shape, diff --git a/packages/types/src/providers/doubao.ts b/packages/types/src/providers/doubao.ts new file mode 100644 index 0000000000..f948450bc4 --- /dev/null +++ b/packages/types/src/providers/doubao.ts @@ -0,0 +1,44 @@ +import type { ModelInfo } from "../model.js" + +export const doubaoDefaultModelId = "doubao-seed-1-6-250615" + +export const doubaoModels = { + "doubao-seed-1-6-250615": { + maxTokens: 32_768, + contextWindow: 128_000, + supportsImages: true, + supportsPromptCache: true, + inputPrice: 0.0001, // $0.0001 per million tokens (cache miss) + outputPrice: 0.0004, // $0.0004 per million tokens + cacheWritesPrice: 0.0001, // $0.0001 per million tokens (cache miss) + cacheReadsPrice: 0.00002, // $0.00002 per million tokens (cache hit) + description: `Doubao Seed 1.6 is a powerful model designed for high-performance tasks with extensive context handling.`, + }, + "doubao-seed-1-6-thinking-250715": { + maxTokens: 32_768, + contextWindow: 128_000, + supportsImages: true, + supportsPromptCache: true, + inputPrice: 0.0002, // $0.0002 per million tokens + outputPrice: 0.0008, // $0.0008 per million tokens + cacheWritesPrice: 0.0002, // $0.0002 per million + cacheReadsPrice: 0.00004, // $0.00004 per million tokens (cache hit) + description: `Doubao Seed 1.6 Thinking is optimized for reasoning tasks, providing enhanced performance in complex problem-solving scenarios.`, + }, + "doubao-seed-1-6-flash-250715": { + maxTokens: 32_768, + contextWindow: 128_000, + supportsImages: true, + supportsPromptCache: true, + inputPrice: 0.00015, // $0.00015 per million tokens + outputPrice: 0.0006, // $0.0006 per million tokens + cacheWritesPrice: 0.00015, // $0.00015 per million + cacheReadsPrice: 0.00003, // $0.00003 per million tokens (cache hit) + description: `Doubao Seed 1.6 Flash is tailored for speed and efficiency, making it ideal for applications requiring rapid responses.`, + }, +} as const satisfies Record + +export const doubaoDefaultModelInfo: ModelInfo = doubaoModels[doubaoDefaultModelId] + +export const DOUBAO_API_BASE_URL = "https://ark.cn-beijing.volces.com/api/v3" +export const DOUBAO_API_CHAT_PATH = "/chat/completions" diff --git a/packages/types/src/providers/index.ts b/packages/types/src/providers/index.ts index 2e9a2a74a2..d6676b885a 100644 --- a/packages/types/src/providers/index.ts +++ b/packages/types/src/providers/index.ts @@ -20,3 +20,4 @@ export * from "./unbound.js" export * from "./vertex.js" export * from "./vscode-llm.js" export * from "./xai.js" +export * from "./doubao.js" diff --git a/src/api/index.ts b/src/api/index.ts index 1e9d2f6e59..f726063a82 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -31,6 +31,7 @@ import { LiteLLMHandler, ClaudeCodeHandler, SambaNovaHandler, + DoubaoHandler, } from "./providers" export interface SingleCompletionHandler { @@ -92,6 +93,8 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler { return new OpenAiNativeHandler(options) case "deepseek": return new DeepSeekHandler(options) + case "doubao": + return new DoubaoHandler(options) case "moonshot": return new MoonshotHandler(options) case "vscode-lm": diff --git a/src/api/providers/doubao.ts b/src/api/providers/doubao.ts new file mode 100644 index 0000000000..a1337ed558 --- /dev/null +++ b/src/api/providers/doubao.ts @@ -0,0 +1,81 @@ +import { OpenAiHandler } from "./openai" +import type { ApiHandlerOptions } from "../../shared/api" +import { DOUBAO_API_BASE_URL, doubaoDefaultModelId, doubaoModels } from "@roo-code/types" +import { getModelParams } from "../transform/model-params" +import { ApiStreamUsageChunk } from "../transform/stream" + +// Core types for Doubao API +interface ChatCompletionMessageParam { + role: "system" | "user" | "assistant" | "developer" + content: + | string + | Array<{ + type: "text" | "image_url" + text?: string + image_url?: { url: string } + }> +} + +interface ChatCompletionParams { + model: string + messages: ChatCompletionMessageParam[] + temperature?: number + stream?: boolean + stream_options?: { include_usage: boolean } + max_completion_tokens?: number +} + +interface ChatCompletion { + choices: Array<{ + message: { + content: string + } + }> + usage?: { + prompt_tokens: number + completion_tokens: number + } +} + +interface ChatCompletionChunk { + choices: Array<{ + delta: { + content?: string + } + }> + usage?: { + prompt_tokens: number + completion_tokens: number + } +} + +export class DoubaoHandler extends OpenAiHandler { + constructor(options: ApiHandlerOptions) { + super({ + ...options, + openAiApiKey: options.doubaoApiKey ?? "not-provided", + openAiModelId: options.apiModelId ?? doubaoDefaultModelId, + openAiBaseUrl: options.doubaoBaseUrl ?? DOUBAO_API_BASE_URL, + openAiStreamingEnabled: true, + includeMaxTokens: true, + }) + } + + override getModel() { + const id = this.options.apiModelId ?? doubaoDefaultModelId + const info = doubaoModels[id as keyof typeof doubaoModels] || doubaoModels[doubaoDefaultModelId] + const params = getModelParams({ format: "openai", modelId: id, model: info, settings: this.options }) + return { id, info, ...params } + } + + // Override to handle Doubao's usage metrics, including caching. + protected override processUsageMetrics(usage: any): ApiStreamUsageChunk { + return { + type: "usage", + inputTokens: usage?.prompt_tokens || 0, + outputTokens: usage?.completion_tokens || 0, + cacheWriteTokens: usage?.prompt_tokens_details?.cache_miss_tokens, + cacheReadTokens: usage?.prompt_tokens_details?.cached_tokens, + } + } +} diff --git a/src/api/providers/index.ts b/src/api/providers/index.ts index e49dc55c76..7b35e02f15 100644 --- a/src/api/providers/index.ts +++ b/src/api/providers/index.ts @@ -4,6 +4,7 @@ export { AwsBedrockHandler } from "./bedrock" export { ChutesHandler } from "./chutes" export { ClaudeCodeHandler } from "./claude-code" export { DeepSeekHandler } from "./deepseek" +export { DoubaoHandler } from "./doubao" export { MoonshotHandler } from "./moonshot" export { FakeAIHandler } from "./fake-ai" export { GeminiHandler } from "./gemini" diff --git a/webview-ui/src/components/settings/ApiOptions.tsx b/webview-ui/src/components/settings/ApiOptions.tsx index 486702a2f7..5b9d90b343 100644 --- a/webview-ui/src/components/settings/ApiOptions.tsx +++ b/webview-ui/src/components/settings/ApiOptions.tsx @@ -15,6 +15,7 @@ import { litellmDefaultModelId, openAiNativeDefaultModelId, anthropicDefaultModelId, + doubaoDefaultModelId, claudeCodeDefaultModelId, geminiDefaultModelId, deepSeekDefaultModelId, @@ -57,6 +58,7 @@ import { Chutes, ClaudeCode, DeepSeek, + Doubao, Gemini, Glama, Groq, @@ -292,6 +294,7 @@ const ApiOptions = ({ "openai-native": { field: "apiModelId", default: openAiNativeDefaultModelId }, gemini: { field: "apiModelId", default: geminiDefaultModelId }, deepseek: { field: "apiModelId", default: deepSeekDefaultModelId }, + doubao: { field: "apiModelId", default: doubaoDefaultModelId }, moonshot: { field: "apiModelId", default: moonshotDefaultModelId }, mistral: { field: "apiModelId", default: mistralDefaultModelId }, xai: { field: "apiModelId", default: xaiDefaultModelId }, @@ -475,6 +478,10 @@ const ApiOptions = ({ )} + {selectedProvider === "doubao" && ( + + )} + {selectedProvider === "moonshot" && ( )} diff --git a/webview-ui/src/components/settings/constants.ts b/webview-ui/src/components/settings/constants.ts index 7d07e41f46..b8aa84cb72 100644 --- a/webview-ui/src/components/settings/constants.ts +++ b/webview-ui/src/components/settings/constants.ts @@ -14,6 +14,7 @@ import { groqModels, chutesModels, sambaNovaModels, + doubaoModels, } from "@roo-code/types" export const MODELS_BY_PROVIDER: Partial>> = { @@ -21,6 +22,7 @@ export const MODELS_BY_PROVIDER: Partial void +} + +export const Doubao = ({ apiConfiguration, setApiConfigurationField }: DoubaoProps) => { + const { t } = useAppTranslation() + + const handleInputChange = useCallback( + ( + field: K, + transform: (event: E) => ProviderSettings[K] = inputEventTransform, + ) => + (event: E | Event) => { + setApiConfigurationField(field, transform(event as E)) + }, + [setApiConfigurationField], + ) + + return ( + <> + + + +
+ {t("settings:providers.apiKeyStorageNotice")} +
+ {!apiConfiguration?.doubaoApiKey && ( + + {t("settings:providers.getDoubaoApiKey")} + + )} + + ) +} diff --git a/webview-ui/src/components/settings/providers/index.ts b/webview-ui/src/components/settings/providers/index.ts index 957edb7992..13420b2679 100644 --- a/webview-ui/src/components/settings/providers/index.ts +++ b/webview-ui/src/components/settings/providers/index.ts @@ -3,6 +3,7 @@ export { Bedrock } from "./Bedrock" export { Chutes } from "./Chutes" export { ClaudeCode } from "./ClaudeCode" export { DeepSeek } from "./DeepSeek" +export { Doubao } from "./Doubao" export { Gemini } from "./Gemini" export { Glama } from "./Glama" export { Groq } from "./Groq" diff --git a/webview-ui/src/components/ui/hooks/useSelectedModel.ts b/webview-ui/src/components/ui/hooks/useSelectedModel.ts index a6b76fbd7c..6bda83ab94 100644 --- a/webview-ui/src/components/ui/hooks/useSelectedModel.ts +++ b/webview-ui/src/components/ui/hooks/useSelectedModel.ts @@ -36,6 +36,8 @@ import { claudeCodeModels, sambaNovaModels, sambaNovaDefaultModelId, + doubaoModels, + doubaoDefaultModelId, } from "@roo-code/types" import type { RouterModels } from "@roo/api" @@ -176,6 +178,11 @@ function getSelectedModel({ const info = deepSeekModels[id as keyof typeof deepSeekModels] return { id, info } } + case "doubao": { + const id = apiConfiguration.apiModelId ?? doubaoDefaultModelId + const info = doubaoModels[id as keyof typeof doubaoModels] + return { id, info } + } case "moonshot": { const id = apiConfiguration.apiModelId ?? moonshotDefaultModelId const info = moonshotModels[id as keyof typeof moonshotModels] diff --git a/webview-ui/src/i18n/locales/ca/settings.json b/webview-ui/src/i18n/locales/ca/settings.json index adde176b31..3da1f5e50e 100644 --- a/webview-ui/src/i18n/locales/ca/settings.json +++ b/webview-ui/src/i18n/locales/ca/settings.json @@ -253,6 +253,8 @@ "getChutesApiKey": "Obtenir clau API de Chutes", "deepSeekApiKey": "Clau API de DeepSeek", "getDeepSeekApiKey": "Obtenir clau API de DeepSeek", + "doubaoApiKey": "Clau API de Doubao", + "getDoubaoApiKey": "Obtenir clau API de Doubao", "moonshotApiKey": "Clau API de Moonshot", "getMoonshotApiKey": "Obtenir clau API de Moonshot", "moonshotBaseUrl": "Punt d'entrada de Moonshot", diff --git a/webview-ui/src/i18n/locales/de/settings.json b/webview-ui/src/i18n/locales/de/settings.json index 429f1ccb5c..a96b41f0c3 100644 --- a/webview-ui/src/i18n/locales/de/settings.json +++ b/webview-ui/src/i18n/locales/de/settings.json @@ -225,6 +225,8 @@ "awsCustomArnDesc": "Stellen Sie sicher, dass die Region in der ARN mit Ihrer oben ausgewählten AWS-Region übereinstimmt.", "openRouterApiKey": "OpenRouter API-Schlüssel", "getOpenRouterApiKey": "OpenRouter API-Schlüssel erhalten", + "doubaoApiKey": "Doubao API-Schlüssel", + "getDoubaoApiKey": "Doubao API-Schlüssel erhalten", "apiKeyStorageNotice": "API-Schlüssel werden sicher im VSCode Secret Storage gespeichert", "glamaApiKey": "Glama API-Schlüssel", "getGlamaApiKey": "Glama API-Schlüssel erhalten", diff --git a/webview-ui/src/i18n/locales/en/settings.json b/webview-ui/src/i18n/locales/en/settings.json index 93b184fc27..5f67268bd9 100644 --- a/webview-ui/src/i18n/locales/en/settings.json +++ b/webview-ui/src/i18n/locales/en/settings.json @@ -253,6 +253,8 @@ "getChutesApiKey": "Get Chutes API Key", "deepSeekApiKey": "DeepSeek API Key", "getDeepSeekApiKey": "Get DeepSeek API Key", + "doubaoApiKey": "Doubao API Key", + "getDoubaoApiKey": "Get Doubao API Key", "moonshotApiKey": "Moonshot API Key", "getMoonshotApiKey": "Get Moonshot API Key", "moonshotBaseUrl": "Moonshot Entrypoint", diff --git a/webview-ui/src/i18n/locales/es/settings.json b/webview-ui/src/i18n/locales/es/settings.json index c56058dff5..c4c7fb39c0 100644 --- a/webview-ui/src/i18n/locales/es/settings.json +++ b/webview-ui/src/i18n/locales/es/settings.json @@ -253,6 +253,8 @@ "getChutesApiKey": "Obtener clave API de Chutes", "deepSeekApiKey": "Clave API de DeepSeek", "getDeepSeekApiKey": "Obtener clave API de DeepSeek", + "doubaoApiKey": "Clave API de Doubao", + "getDoubaoApiKey": "Obtener clave API de Doubao", "moonshotApiKey": "Clave API de Moonshot", "getMoonshotApiKey": "Obtener clave API de Moonshot", "moonshotBaseUrl": "Punto de entrada de Moonshot", diff --git a/webview-ui/src/i18n/locales/fr/settings.json b/webview-ui/src/i18n/locales/fr/settings.json index 5ea19d71f9..e00b0c0559 100644 --- a/webview-ui/src/i18n/locales/fr/settings.json +++ b/webview-ui/src/i18n/locales/fr/settings.json @@ -253,6 +253,8 @@ "getChutesApiKey": "Obtenir la clé API Chutes", "deepSeekApiKey": "Clé API DeepSeek", "getDeepSeekApiKey": "Obtenir la clé API DeepSeek", + "doubaoApiKey": "Clé API Doubao", + "getDoubaoApiKey": "Obtenir la clé API Doubao", "moonshotApiKey": "Clé API Moonshot", "getMoonshotApiKey": "Obtenir la clé API Moonshot", "moonshotBaseUrl": "Point d'entrée Moonshot", diff --git a/webview-ui/src/i18n/locales/hi/settings.json b/webview-ui/src/i18n/locales/hi/settings.json index 088b523400..2497ffe6da 100644 --- a/webview-ui/src/i18n/locales/hi/settings.json +++ b/webview-ui/src/i18n/locales/hi/settings.json @@ -253,6 +253,8 @@ "getChutesApiKey": "Chutes API कुंजी प्राप्त करें", "deepSeekApiKey": "DeepSeek API कुंजी", "getDeepSeekApiKey": "DeepSeek API कुंजी प्राप्त करें", + "doubaoApiKey": "डौबाओ API कुंजी", + "getDoubaoApiKey": "डौबाओ API कुंजी प्राप्त करें", "moonshotApiKey": "Moonshot API कुंजी", "getMoonshotApiKey": "Moonshot API कुंजी प्राप्त करें", "moonshotBaseUrl": "Moonshot प्रवेश बिंदु", diff --git a/webview-ui/src/i18n/locales/id/settings.json b/webview-ui/src/i18n/locales/id/settings.json index a8b8600c1b..3665c99c1b 100644 --- a/webview-ui/src/i18n/locales/id/settings.json +++ b/webview-ui/src/i18n/locales/id/settings.json @@ -257,6 +257,8 @@ "getChutesApiKey": "Dapatkan Chutes API Key", "deepSeekApiKey": "DeepSeek API Key", "getDeepSeekApiKey": "Dapatkan DeepSeek API Key", + "doubaoApiKey": "Kunci API Doubao", + "getDoubaoApiKey": "Dapatkan Kunci API Doubao", "moonshotApiKey": "Kunci API Moonshot", "getMoonshotApiKey": "Dapatkan Kunci API Moonshot", "moonshotBaseUrl": "Titik Masuk Moonshot", diff --git a/webview-ui/src/i18n/locales/it/settings.json b/webview-ui/src/i18n/locales/it/settings.json index b6eeeb65bf..056b0f9124 100644 --- a/webview-ui/src/i18n/locales/it/settings.json +++ b/webview-ui/src/i18n/locales/it/settings.json @@ -253,6 +253,8 @@ "getChutesApiKey": "Ottieni chiave API Chutes", "deepSeekApiKey": "Chiave API DeepSeek", "getDeepSeekApiKey": "Ottieni chiave API DeepSeek", + "doubaoApiKey": "Chiave API Doubao", + "getDoubaoApiKey": "Ottieni chiave API Doubao", "moonshotApiKey": "Chiave API Moonshot", "getMoonshotApiKey": "Ottieni chiave API Moonshot", "moonshotBaseUrl": "Punto di ingresso Moonshot", diff --git a/webview-ui/src/i18n/locales/ja/settings.json b/webview-ui/src/i18n/locales/ja/settings.json index ee81d1cef6..3b38277b86 100644 --- a/webview-ui/src/i18n/locales/ja/settings.json +++ b/webview-ui/src/i18n/locales/ja/settings.json @@ -253,6 +253,8 @@ "getChutesApiKey": "Chutes APIキーを取得", "deepSeekApiKey": "DeepSeek APIキー", "getDeepSeekApiKey": "DeepSeek APIキーを取得", + "doubaoApiKey": "Doubao APIキー", + "getDoubaoApiKey": "Doubao APIキーを取得", "moonshotApiKey": "Moonshot APIキー", "getMoonshotApiKey": "Moonshot APIキーを取得", "moonshotBaseUrl": "Moonshot エントリーポイント", diff --git a/webview-ui/src/i18n/locales/ko/settings.json b/webview-ui/src/i18n/locales/ko/settings.json index d1d4364232..89739f4c4a 100644 --- a/webview-ui/src/i18n/locales/ko/settings.json +++ b/webview-ui/src/i18n/locales/ko/settings.json @@ -253,6 +253,8 @@ "getChutesApiKey": "Chutes API 키 받기", "deepSeekApiKey": "DeepSeek API 키", "getDeepSeekApiKey": "DeepSeek API 키 받기", + "doubaoApiKey": "Doubao API 키", + "getDoubaoApiKey": "Doubao API 키 받기", "moonshotApiKey": "Moonshot API 키", "getMoonshotApiKey": "Moonshot API 키 받기", "moonshotBaseUrl": "Moonshot 엔트리포인트", diff --git a/webview-ui/src/i18n/locales/nl/settings.json b/webview-ui/src/i18n/locales/nl/settings.json index 435886c522..7d8721ffd8 100644 --- a/webview-ui/src/i18n/locales/nl/settings.json +++ b/webview-ui/src/i18n/locales/nl/settings.json @@ -253,6 +253,8 @@ "getChutesApiKey": "Chutes API-sleutel ophalen", "deepSeekApiKey": "DeepSeek API-sleutel", "getDeepSeekApiKey": "DeepSeek API-sleutel ophalen", + "doubaoApiKey": "Doubao API-sleutel", + "getDoubaoApiKey": "Doubao API-sleutel ophalen", "moonshotApiKey": "Moonshot API-sleutel", "getMoonshotApiKey": "Moonshot API-sleutel ophalen", "moonshotBaseUrl": "Moonshot-ingangspunt", diff --git a/webview-ui/src/i18n/locales/pl/settings.json b/webview-ui/src/i18n/locales/pl/settings.json index 1683332934..5a23d2137d 100644 --- a/webview-ui/src/i18n/locales/pl/settings.json +++ b/webview-ui/src/i18n/locales/pl/settings.json @@ -253,6 +253,8 @@ "getChutesApiKey": "Uzyskaj klucz API Chutes", "deepSeekApiKey": "Klucz API DeepSeek", "getDeepSeekApiKey": "Uzyskaj klucz API DeepSeek", + "doubaoApiKey": "Klucz API Doubao", + "getDoubaoApiKey": "Uzyskaj klucz API Doubao", "moonshotApiKey": "Klucz API Moonshot", "getMoonshotApiKey": "Uzyskaj klucz API Moonshot", "moonshotBaseUrl": "Punkt wejścia Moonshot", diff --git a/webview-ui/src/i18n/locales/pt-BR/settings.json b/webview-ui/src/i18n/locales/pt-BR/settings.json index 3b3abd2dc2..2e39982d27 100644 --- a/webview-ui/src/i18n/locales/pt-BR/settings.json +++ b/webview-ui/src/i18n/locales/pt-BR/settings.json @@ -253,6 +253,8 @@ "getChutesApiKey": "Obter chave de API Chutes", "deepSeekApiKey": "Chave de API DeepSeek", "getDeepSeekApiKey": "Obter chave de API DeepSeek", + "doubaoApiKey": "Chave de API Doubao", + "getDoubaoApiKey": "Obter chave de API Doubao", "moonshotApiKey": "Chave de API Moonshot", "getMoonshotApiKey": "Obter chave de API Moonshot", "moonshotBaseUrl": "Ponto de entrada Moonshot", diff --git a/webview-ui/src/i18n/locales/ru/settings.json b/webview-ui/src/i18n/locales/ru/settings.json index dc45d922d0..76c3877e10 100644 --- a/webview-ui/src/i18n/locales/ru/settings.json +++ b/webview-ui/src/i18n/locales/ru/settings.json @@ -253,6 +253,8 @@ "getChutesApiKey": "Получить Chutes API-ключ", "deepSeekApiKey": "DeepSeek API-ключ", "getDeepSeekApiKey": "Получить DeepSeek API-ключ", + "doubaoApiKey": "Doubao API-ключ", + "getDoubaoApiKey": "Получить Doubao API-ключ", "moonshotApiKey": "Moonshot API-ключ", "getMoonshotApiKey": "Получить Moonshot API-ключ", "moonshotBaseUrl": "Точка входа Moonshot", diff --git a/webview-ui/src/i18n/locales/tr/settings.json b/webview-ui/src/i18n/locales/tr/settings.json index 52ab8b17c8..26a295ffae 100644 --- a/webview-ui/src/i18n/locales/tr/settings.json +++ b/webview-ui/src/i18n/locales/tr/settings.json @@ -253,6 +253,8 @@ "getChutesApiKey": "Chutes API Anahtarı Al", "deepSeekApiKey": "DeepSeek API Anahtarı", "getDeepSeekApiKey": "DeepSeek API Anahtarı Al", + "doubaoApiKey": "Doubao API Anahtarı", + "getDoubaoApiKey": "Doubao API Anahtarı Al", "moonshotApiKey": "Moonshot API Anahtarı", "getMoonshotApiKey": "Moonshot API Anahtarı Al", "moonshotBaseUrl": "Moonshot Giriş Noktası", diff --git a/webview-ui/src/i18n/locales/vi/settings.json b/webview-ui/src/i18n/locales/vi/settings.json index 65fd58d0ed..48f63bdf42 100644 --- a/webview-ui/src/i18n/locales/vi/settings.json +++ b/webview-ui/src/i18n/locales/vi/settings.json @@ -253,6 +253,8 @@ "getChutesApiKey": "Lấy khóa API Chutes", "deepSeekApiKey": "Khóa API DeepSeek", "getDeepSeekApiKey": "Lấy khóa API DeepSeek", + "doubaoApiKey": "Khóa API Doubao", + "getDoubaoApiKey": "Lấy khóa API Doubao", "moonshotApiKey": "Khóa API Moonshot", "getMoonshotApiKey": "Lấy khóa API Moonshot", "moonshotBaseUrl": "Điểm vào Moonshot", diff --git a/webview-ui/src/i18n/locales/zh-CN/settings.json b/webview-ui/src/i18n/locales/zh-CN/settings.json index 9f1cbd34b1..6d46e337c5 100644 --- a/webview-ui/src/i18n/locales/zh-CN/settings.json +++ b/webview-ui/src/i18n/locales/zh-CN/settings.json @@ -253,6 +253,8 @@ "getChutesApiKey": "获取 Chutes API 密钥", "deepSeekApiKey": "DeepSeek API 密钥", "getDeepSeekApiKey": "获取 DeepSeek API 密钥", + "doubaoApiKey": "豆包 API 密钥", + "getDoubaoApiKey": "获取豆包 API 密钥", "moonshotApiKey": "Moonshot API 密钥", "getMoonshotApiKey": "获取 Moonshot API 密钥", "moonshotBaseUrl": "Moonshot 服务站点", diff --git a/webview-ui/src/i18n/locales/zh-TW/settings.json b/webview-ui/src/i18n/locales/zh-TW/settings.json index 6d96be360e..ffd852397f 100644 --- a/webview-ui/src/i18n/locales/zh-TW/settings.json +++ b/webview-ui/src/i18n/locales/zh-TW/settings.json @@ -253,6 +253,8 @@ "getChutesApiKey": "取得 Chutes API 金鑰", "deepSeekApiKey": "DeepSeek API 金鑰", "getDeepSeekApiKey": "取得 DeepSeek API 金鑰", + "doubaoApiKey": "豆包 API 金鑰", + "getDoubaoApiKey": "取得豆包 API 金鑰", "moonshotApiKey": "Moonshot API 金鑰", "getMoonshotApiKey": "取得 Moonshot API 金鑰", "moonshotBaseUrl": "Moonshot 服務站點", From 83280a0d4086c1709869bea839345d9195bf05a7 Mon Sep 17 00:00:00 2001 From: Will Li Date: Wed, 30 Jul 2025 13:54:33 -0700 Subject: [PATCH 006/253] feat: Add Task History Context to Prompt Enhancement (#6343) --- packages/types/src/global-settings.ts | 1 + src/core/webview/ClineProvider.ts | 4 + .../webview/__tests__/messageEnhancer.test.ts | 365 ++++++++++++++++++ src/core/webview/messageEnhancer.ts | 143 +++++++ src/core/webview/webviewMessageHandler.ts | 54 +-- src/shared/WebviewMessage.ts | 1 + .../components/settings/PromptsSettings.tsx | 81 ++-- .../src/components/settings/SettingsView.tsx | 6 + .../src/context/ExtensionStateContext.tsx | 9 + webview-ui/src/i18n/locales/ca/prompts.json | 4 +- webview-ui/src/i18n/locales/de/prompts.json | 4 +- webview-ui/src/i18n/locales/en/prompts.json | 4 +- webview-ui/src/i18n/locales/es/prompts.json | 4 +- webview-ui/src/i18n/locales/fr/prompts.json | 4 +- webview-ui/src/i18n/locales/hi/prompts.json | 4 +- webview-ui/src/i18n/locales/id/prompts.json | 4 +- webview-ui/src/i18n/locales/it/prompts.json | 4 +- webview-ui/src/i18n/locales/ja/prompts.json | 4 +- webview-ui/src/i18n/locales/ko/prompts.json | 4 +- webview-ui/src/i18n/locales/nl/prompts.json | 4 +- webview-ui/src/i18n/locales/pl/prompts.json | 4 +- .../src/i18n/locales/pt-BR/prompts.json | 4 +- webview-ui/src/i18n/locales/ru/prompts.json | 4 +- webview-ui/src/i18n/locales/tr/prompts.json | 4 +- webview-ui/src/i18n/locales/vi/prompts.json | 4 +- .../src/i18n/locales/zh-CN/prompts.json | 4 +- .../src/i18n/locales/zh-TW/prompts.json | 4 +- 27 files changed, 671 insertions(+), 65 deletions(-) create mode 100644 src/core/webview/__tests__/messageEnhancer.test.ts create mode 100644 src/core/webview/messageEnhancer.ts diff --git a/packages/types/src/global-settings.ts b/packages/types/src/global-settings.ts index 62cd02df54..8916263d5d 100644 --- a/packages/types/src/global-settings.ts +++ b/packages/types/src/global-settings.ts @@ -139,6 +139,7 @@ export const globalSettingsSchema = z.object({ customModePrompts: customModePromptsSchema.optional(), customSupportPrompts: customSupportPromptsSchema.optional(), enhancementApiConfigId: z.string().optional(), + includeTaskHistoryInEnhance: z.boolean().optional(), historyPreviewCollapsed: z.boolean().optional(), profileThresholds: z.record(z.string(), z.number()).optional(), hasOpenedModeSelector: z.boolean().optional(), diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index 932442934c..31aac80932 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -1516,6 +1516,7 @@ export class ClineProvider followupAutoApproveTimeoutMs, includeDiagnosticMessages, maxDiagnosticMessages, + includeTaskHistoryInEnhance, } = await this.getState() const telemetryKey = process.env.POSTHOG_API_KEY @@ -1641,6 +1642,7 @@ export class ClineProvider followupAutoApproveTimeoutMs: followupAutoApproveTimeoutMs ?? 60000, includeDiagnosticMessages: includeDiagnosticMessages ?? true, maxDiagnosticMessages: maxDiagnosticMessages ?? 50, + includeTaskHistoryInEnhance: includeTaskHistoryInEnhance ?? false, } } @@ -1825,6 +1827,8 @@ export class ClineProvider // Add diagnostic message settings includeDiagnosticMessages: stateValues.includeDiagnosticMessages ?? true, maxDiagnosticMessages: stateValues.maxDiagnosticMessages ?? 50, + // Add includeTaskHistoryInEnhance setting + includeTaskHistoryInEnhance: stateValues.includeTaskHistoryInEnhance ?? false, } } diff --git a/src/core/webview/__tests__/messageEnhancer.test.ts b/src/core/webview/__tests__/messageEnhancer.test.ts new file mode 100644 index 0000000000..f6f6b44e1d --- /dev/null +++ b/src/core/webview/__tests__/messageEnhancer.test.ts @@ -0,0 +1,365 @@ +import { describe, it, expect, vi, beforeEach, afterEach } from "vitest" +import { MessageEnhancer } from "../messageEnhancer" +import { ProviderSettings, ClineMessage } from "@roo-code/types" +import { TelemetryService } from "@roo-code/telemetry" +import * as singleCompletionHandlerModule from "../../../utils/single-completion-handler" +import { ProviderSettingsManager } from "../../config/ProviderSettingsManager" + +// Mock dependencies +vi.mock("../../../utils/single-completion-handler") +vi.mock("@roo-code/telemetry") + +describe("MessageEnhancer", () => { + let mockProviderSettingsManager: ProviderSettingsManager + let mockSingleCompletionHandler: ReturnType + + const mockApiConfiguration: ProviderSettings = { + apiProvider: "openai", + apiKey: "test-key", + apiModelId: "gpt-4", + } + + const mockListApiConfigMeta = [ + { id: "config1", name: "Config 1" }, + { id: "config2", name: "Config 2" }, + ] + + beforeEach(() => { + // Reset all mocks + vi.clearAllMocks() + + // Mock provider settings manager + mockProviderSettingsManager = { + getProfile: vi.fn().mockResolvedValue({ + name: "Enhancement Config", + apiProvider: "anthropic", + apiKey: "enhancement-key", + apiModelId: "claude-3", + }), + } as any + + // Mock single completion handler + mockSingleCompletionHandler = vi.fn().mockResolvedValue("Enhanced prompt text") + vi.mocked(singleCompletionHandlerModule).singleCompletionHandler = mockSingleCompletionHandler + + // Mock TelemetryService + vi.mocked(TelemetryService).hasInstance = vi.fn().mockReturnValue(true) + // Mock the instance getter + Object.defineProperty(TelemetryService, "instance", { + get: vi.fn().mockReturnValue({ + capturePromptEnhanced: vi.fn(), + }), + configurable: true, + }) + }) + + afterEach(() => { + vi.restoreAllMocks() + }) + + describe("enhanceMessage", () => { + it("should enhance a simple message successfully", async () => { + const result = await MessageEnhancer.enhanceMessage({ + text: "Write a function to calculate fibonacci", + apiConfiguration: mockApiConfiguration, + listApiConfigMeta: mockListApiConfigMeta, + providerSettingsManager: mockProviderSettingsManager, + }) + + expect(result.success).toBe(true) + expect(result.enhancedText).toBe("Enhanced prompt text") + expect(result.error).toBeUndefined() + + // Verify single completion handler was called with correct prompt + expect(mockSingleCompletionHandler).toHaveBeenCalledWith( + mockApiConfiguration, + expect.stringContaining("Write a function to calculate fibonacci"), + ) + }) + + it("should use enhancement API config when provided", async () => { + const result = await MessageEnhancer.enhanceMessage({ + text: "Test prompt", + apiConfiguration: mockApiConfiguration, + customSupportPrompts: {}, + listApiConfigMeta: mockListApiConfigMeta, + enhancementApiConfigId: "config2", + providerSettingsManager: mockProviderSettingsManager, + }) + + expect(result.success).toBe(true) + expect(mockProviderSettingsManager.getProfile).toHaveBeenCalledWith({ id: "config2" }) + + // Verify the enhancement config was used instead of default + const expectedConfig = { + apiProvider: "anthropic", + apiKey: "enhancement-key", + apiModelId: "claude-3", + } + expect(mockSingleCompletionHandler).toHaveBeenCalledWith(expectedConfig, expect.any(String)) + }) + + it("should include task history when enabled", async () => { + const mockClineMessages: ClineMessage[] = [ + { type: "ask", text: "Create a React component", ts: 1000 }, + { type: "say", say: "text", text: "I'll create a React component for you", ts: 2000 }, + { type: "ask", text: "Add props to the component", ts: 3000 }, + { type: "say", say: "reasoning", text: "Using tool", ts: 4000 }, // Should be filtered out + ] + + const result = await MessageEnhancer.enhanceMessage({ + text: "Improve the component", + apiConfiguration: mockApiConfiguration, + listApiConfigMeta: mockListApiConfigMeta, + includeTaskHistoryInEnhance: true, + currentClineMessages: mockClineMessages, + providerSettingsManager: mockProviderSettingsManager, + }) + + expect(result.success).toBe(true) + + // Verify the prompt includes task history + const calledPrompt = mockSingleCompletionHandler.mock.calls[0][1] + expect(calledPrompt).toContain("Improve the component") + expect(calledPrompt).toContain("previous conversation context") + expect(calledPrompt).toContain("User: Create a React component") + expect(calledPrompt).toContain("Assistant: I'll create a React component for you") + expect(calledPrompt).toContain("User: Add props to the component") + expect(calledPrompt).not.toContain("Using tool") // reasoning messages should be filtered + }) + + it("should limit task history to last 10 messages", async () => { + // Create 15 messages + const mockClineMessages: ClineMessage[] = Array.from({ length: 15 }, (_, i) => ({ + type: i % 2 === 0 ? "ask" : "say", + say: i % 2 === 1 ? "text" : undefined, + text: `Message ${i + 1}`, + ts: i * 1000, + })) as ClineMessage[] + + await MessageEnhancer.enhanceMessage({ + text: "Test", + apiConfiguration: mockApiConfiguration, + listApiConfigMeta: mockListApiConfigMeta, + includeTaskHistoryInEnhance: true, + currentClineMessages: mockClineMessages, + providerSettingsManager: mockProviderSettingsManager, + }) + + const calledPrompt = mockSingleCompletionHandler.mock.calls[0][1] + + // Should include messages 6-15 (last 10) + expect(calledPrompt).toContain("Message 6") + expect(calledPrompt).toContain("Message 15") + expect(calledPrompt).not.toContain("Message 5") + }) + + it("should truncate long messages in task history", async () => { + const longText = "A".repeat(600) // 600 characters + const mockClineMessages: ClineMessage[] = [{ type: "ask", text: longText, ts: 1000 }] + + await MessageEnhancer.enhanceMessage({ + text: "Test", + apiConfiguration: mockApiConfiguration, + listApiConfigMeta: mockListApiConfigMeta, + includeTaskHistoryInEnhance: true, + currentClineMessages: mockClineMessages, + providerSettingsManager: mockProviderSettingsManager, + }) + + const calledPrompt = mockSingleCompletionHandler.mock.calls[0][1] + + // Should truncate to 500 chars + "..." + expect(calledPrompt).toContain("A".repeat(500) + "...") + expect(calledPrompt).not.toContain("A".repeat(501)) + }) + + it("should use custom support prompts when provided", async () => { + const customSupportPrompts = { + ENHANCE: "Custom enhancement template: ${userInput}", + } + + await MessageEnhancer.enhanceMessage({ + text: "Test prompt", + apiConfiguration: mockApiConfiguration, + customSupportPrompts, + listApiConfigMeta: mockListApiConfigMeta, + providerSettingsManager: mockProviderSettingsManager, + }) + + const calledPrompt = mockSingleCompletionHandler.mock.calls[0][1] + expect(calledPrompt).toBe("Custom enhancement template: Test prompt") + }) + + it("should handle errors gracefully", async () => { + mockSingleCompletionHandler.mockRejectedValue(new Error("API error")) + + const result = await MessageEnhancer.enhanceMessage({ + text: "Test", + apiConfiguration: mockApiConfiguration, + listApiConfigMeta: mockListApiConfigMeta, + providerSettingsManager: mockProviderSettingsManager, + }) + + expect(result.success).toBe(false) + expect(result.error).toBe("API error") + expect(result.enhancedText).toBeUndefined() + }) + + it("should handle non-Error exceptions", async () => { + mockSingleCompletionHandler.mockRejectedValue("String error") + + const result = await MessageEnhancer.enhanceMessage({ + text: "Test", + apiConfiguration: mockApiConfiguration, + listApiConfigMeta: mockListApiConfigMeta, + providerSettingsManager: mockProviderSettingsManager, + }) + + expect(result.success).toBe(false) + expect(result.error).toBe("String error") + }) + + it("should fall back to default config if enhancement config is invalid", async () => { + mockProviderSettingsManager.getProfile = vi.fn().mockResolvedValue({ + name: "Invalid Config", + // Missing apiProvider + }) + + await MessageEnhancer.enhanceMessage({ + text: "Test", + apiConfiguration: mockApiConfiguration, + listApiConfigMeta: mockListApiConfigMeta, + enhancementApiConfigId: "config2", + providerSettingsManager: mockProviderSettingsManager, + }) + + // Should use the default config + expect(mockSingleCompletionHandler).toHaveBeenCalledWith(mockApiConfiguration, expect.any(String)) + }) + + it("should handle empty task history gracefully", async () => { + const result = await MessageEnhancer.enhanceMessage({ + text: "Test", + apiConfiguration: mockApiConfiguration, + listApiConfigMeta: mockListApiConfigMeta, + includeTaskHistoryInEnhance: true, + currentClineMessages: [], + providerSettingsManager: mockProviderSettingsManager, + }) + + expect(result.success).toBe(true) + + const calledPrompt = mockSingleCompletionHandler.mock.calls[0][1] + // Should not include task history section + expect(calledPrompt).not.toContain("previous conversation context") + }) + }) + + describe("captureTelemetry", () => { + it("should capture telemetry when TelemetryService is available", () => { + const mockTaskId = "task-123" + const mockCaptureEvent = vi.fn() + vi.mocked(TelemetryService.instance).captureEvent = mockCaptureEvent + + MessageEnhancer.captureTelemetry(mockTaskId, true) + + expect(TelemetryService.hasInstance).toHaveBeenCalled() + expect(mockCaptureEvent).toHaveBeenCalledWith(expect.any(String), { + taskId: mockTaskId, + includeTaskHistory: true, + }) + }) + + it("should handle missing TelemetryService gracefully", () => { + vi.mocked(TelemetryService).hasInstance = vi.fn().mockReturnValue(false) + + // Should not throw + expect(() => MessageEnhancer.captureTelemetry("task-123", true)).not.toThrow() + }) + + it("should work without task ID", () => { + const mockCaptureEvent = vi.fn() + vi.mocked(TelemetryService.instance).captureEvent = mockCaptureEvent + + MessageEnhancer.captureTelemetry(undefined, false) + + expect(mockCaptureEvent).toHaveBeenCalledWith(expect.any(String), { + includeTaskHistory: false, + }) + }) + + it("should default includeTaskHistory to false when not provided", () => { + const mockCaptureEvent = vi.fn() + vi.mocked(TelemetryService.instance).captureEvent = mockCaptureEvent + + MessageEnhancer.captureTelemetry("task-123") + + expect(mockCaptureEvent).toHaveBeenCalledWith(expect.any(String), { + taskId: "task-123", + includeTaskHistory: false, + }) + }) + }) + + describe("extractTaskHistory", () => { + it("should filter and format messages correctly", () => { + const messages: ClineMessage[] = [ + { type: "ask", text: "User message 1", ts: 1000 }, + { type: "say", say: "text", text: "Assistant message 1", ts: 2000 }, + { type: "say", say: "reasoning", text: "Tool use", ts: 3000 }, + { type: "ask", text: "", ts: 4000 }, // Empty text + { type: "say", say: "text", text: undefined, ts: 5000 }, // No text + { type: "ask", text: "User message 2", ts: 6000 }, + ] + + // Access private method through any type assertion for testing + const history = (MessageEnhancer as any).extractTaskHistory(messages) + + expect(history).toContain("User: User message 1") + expect(history).toContain("Assistant: Assistant message 1") + expect(history).toContain("User: User message 2") + expect(history).not.toContain("Tool use") + expect(history.split("\n").length).toBe(3) // Only 3 valid messages + }) + + it("should handle malformed messages gracefully", () => { + const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {}) + + // Create messages that will cause errors when accessed + const malformedMessages = [ + null, + undefined, + { type: "ask" }, // Missing required properties + "not an object", + ] as any + + // Access private method through any type assertion for testing + const history = (MessageEnhancer as any).extractTaskHistory(malformedMessages) + + // Should return empty string and log error + expect(history).toBe("") + expect(consoleSpy).toHaveBeenCalledWith("Failed to extract task history:", expect.any(Error)) + + consoleSpy.mockRestore() + }) + + it("should handle messages with circular references", () => { + const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {}) + + // Create a message with circular reference + const circularMessage: any = { type: "ask", text: "Test" } + circularMessage.self = circularMessage + + const messages = [circularMessage] as ClineMessage[] + + // Access private method through any type assertion for testing + const history = (MessageEnhancer as any).extractTaskHistory(messages) + + // Should handle gracefully + expect(history).toBe("User: Test") + + consoleSpy.mockRestore() + }) + }) +}) diff --git a/src/core/webview/messageEnhancer.ts b/src/core/webview/messageEnhancer.ts new file mode 100644 index 0000000000..89df7b5b59 --- /dev/null +++ b/src/core/webview/messageEnhancer.ts @@ -0,0 +1,143 @@ +import { ProviderSettings, ClineMessage, GlobalState, TelemetryEventName } from "@roo-code/types" +import { TelemetryService } from "@roo-code/telemetry" +import { supportPrompt } from "../../shared/support-prompt" +import { singleCompletionHandler } from "../../utils/single-completion-handler" +import { ProviderSettingsManager } from "../config/ProviderSettingsManager" +import { ClineProvider } from "./ClineProvider" + +export interface MessageEnhancerOptions { + text: string + apiConfiguration: ProviderSettings + customSupportPrompts?: Record + listApiConfigMeta: Array<{ id: string; name?: string }> + enhancementApiConfigId?: string + includeTaskHistoryInEnhance?: boolean + currentClineMessages?: ClineMessage[] + providerSettingsManager: ProviderSettingsManager +} + +export interface MessageEnhancerResult { + success: boolean + enhancedText?: string + error?: string +} + +/** + * Enhances a message prompt using AI, optionally including task history for context + */ +export class MessageEnhancer { + /** + * Enhances a message prompt using the configured AI provider + * @param options Configuration options for message enhancement + * @returns Enhanced message result with success status + */ + static async enhanceMessage(options: MessageEnhancerOptions): Promise { + try { + const { + text, + apiConfiguration, + customSupportPrompts, + listApiConfigMeta, + enhancementApiConfigId, + includeTaskHistoryInEnhance, + currentClineMessages, + providerSettingsManager, + } = options + + // Determine which API configuration to use + let configToUse: ProviderSettings = apiConfiguration + + // Try to get enhancement config first, fall back to current config + if (enhancementApiConfigId && listApiConfigMeta.find(({ id }) => id === enhancementApiConfigId)) { + const { name: _, ...providerSettings } = await providerSettingsManager.getProfile({ + id: enhancementApiConfigId, + }) + + if (providerSettings.apiProvider) { + configToUse = providerSettings + } + } + + // Prepare the prompt to enhance + let promptToEnhance = text + + // Include task history if enabled and available + if (includeTaskHistoryInEnhance && currentClineMessages && currentClineMessages.length > 0) { + const taskHistory = this.extractTaskHistory(currentClineMessages) + if (taskHistory) { + promptToEnhance = `${text}\n\nUse the following previous conversation context as needed:\n${taskHistory}` + } + } + + // Create the enhancement prompt using the support prompt system + const enhancementPrompt = supportPrompt.create( + "ENHANCE", + { userInput: promptToEnhance }, + customSupportPrompts, + ) + + // Call the single completion handler to get the enhanced prompt + const enhancedText = await singleCompletionHandler(configToUse, enhancementPrompt) + + return { + success: true, + enhancedText, + } + } catch (error) { + return { + success: false, + error: error instanceof Error ? error.message : String(error), + } + } + } + + /** + * Extracts relevant task history from Cline messages for context + * @param messages Array of Cline messages + * @returns Formatted task history string + */ + private static extractTaskHistory(messages: ClineMessage[]): string { + try { + const relevantMessages = messages + .filter((msg) => { + // Include user messages (type: "ask" with text) and assistant messages (type: "say" with say: "text") + if (msg.type === "ask" && msg.text) { + return true + } + if (msg.type === "say" && msg.say === "text" && msg.text) { + return true + } + return false + }) + .slice(-10) // Limit to last 10 messages to avoid context explosion + + return relevantMessages + .map((msg) => { + const role = msg.type === "ask" ? "User" : "Assistant" + const content = msg.text || "" + // Truncate long messages + return `${role}: ${content.slice(0, 500)}${content.length > 500 ? "..." : ""}` + }) + .join("\n") + } catch (error) { + // Log error but don't fail the enhancement + console.error("Failed to extract task history:", error) + return "" + } + } + + /** + * Captures telemetry for prompt enhancement + * @param taskId Optional task ID for telemetry tracking + * @param includeTaskHistory Whether task history was included in the enhancement + */ + static captureTelemetry(taskId?: string, includeTaskHistory?: boolean): void { + if (TelemetryService.hasInstance()) { + // Use captureEvent directly to include the includeTaskHistory property + TelemetryService.instance.captureEvent(TelemetryEventName.PROMPT_ENHANCED, { + ...(taskId && { taskId }), + includeTaskHistory: includeTaskHistory ?? false, + }) + } + } +} diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts index 763e118125..b1b62229c9 100644 --- a/src/core/webview/webviewMessageHandler.ts +++ b/src/core/webview/webviewMessageHandler.ts @@ -22,6 +22,7 @@ import { changeLanguage, t } from "../../i18n" import { Package } from "../../shared/package" import { RouterName, toRouterName, ModelRecord } from "../../shared/api" import { supportPrompt } from "../../shared/support-prompt" +import { MessageEnhancer } from "./messageEnhancer" import { checkoutDiffPayloadSchema, checkoutRestorePayloadSchema, WebviewMessage } from "../../shared/WebviewMessage" import { checkExistKey } from "../../shared/checkExistApiConfig" @@ -35,7 +36,6 @@ import { discoverChromeHostUrl, tryChromeHostUrl } from "../../services/browser/ import { searchWorkspaceFiles } from "../../services/search/file-search" import { fileExistsAtPath } from "../../utils/fs" import { playTts, setTtsEnabled, setTtsSpeed, stopTts } from "../../utils/tts" -import { singleCompletionHandler } from "../../utils/single-completion-handler" import { searchCommits } from "../../utils/git" import { exportSettings, importSettingsWithFeedback } from "../config/importExport" import { getOpenAiModels } from "../../api/providers/openai" @@ -1311,6 +1311,10 @@ export const webviewMessageHandler = async ( await updateGlobalState("enhancementApiConfigId", message.text) await provider.postStateToWebview() break + case "includeTaskHistoryInEnhance": + await updateGlobalState("includeTaskHistoryInEnhance", message.bool ?? false) + await provider.postStateToWebview() + break case "condensingApiConfigId": await updateGlobalState("condensingApiConfigId", message.text) await provider.postStateToWebview() @@ -1335,32 +1339,34 @@ export const webviewMessageHandler = async ( case "enhancePrompt": if (message.text) { try { - const { apiConfiguration, customSupportPrompts, listApiConfigMeta, enhancementApiConfigId } = - await provider.getState() + const state = await provider.getState() + const { + apiConfiguration, + customSupportPrompts, + listApiConfigMeta, + enhancementApiConfigId, + includeTaskHistoryInEnhance, + } = state - // Try to get enhancement config first, fall back to current config. - let configToUse: ProviderSettings = apiConfiguration - - if (enhancementApiConfigId && !!listApiConfigMeta.find(({ id }) => id === enhancementApiConfigId)) { - const { name: _, ...providerSettings } = await provider.providerSettingsManager.getProfile({ - id: enhancementApiConfigId, - }) - - if (providerSettings.apiProvider) { - configToUse = providerSettings - } - } - - const enhancedPrompt = await singleCompletionHandler( - configToUse, - supportPrompt.create("ENHANCE", { userInput: message.text }, customSupportPrompts), - ) - - // Capture telemetry for prompt enhancement. const currentCline = provider.getCurrentCline() - TelemetryService.instance.capturePromptEnhanced(currentCline?.taskId) + const result = await MessageEnhancer.enhanceMessage({ + text: message.text, + apiConfiguration, + customSupportPrompts, + listApiConfigMeta, + enhancementApiConfigId, + includeTaskHistoryInEnhance, + currentClineMessages: currentCline?.clineMessages, + providerSettingsManager: provider.providerSettingsManager, + }) - await provider.postMessageToWebview({ type: "enhancedPrompt", text: enhancedPrompt }) + if (result.success && result.enhancedText) { + // Capture telemetry for prompt enhancement + MessageEnhancer.captureTelemetry(currentCline?.taskId, includeTaskHistoryInEnhance) + await provider.postMessageToWebview({ type: "enhancedPrompt", text: result.enhancedText }) + } else { + throw new Error(result.error || "Unknown error") + } } catch (error) { provider.log( `Error enhancing prompt: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`, diff --git a/src/shared/WebviewMessage.ts b/src/shared/WebviewMessage.ts index a91d1af7ba..0b0cc06880 100644 --- a/src/shared/WebviewMessage.ts +++ b/src/shared/WebviewMessage.ts @@ -140,6 +140,7 @@ export interface WebviewMessage { | "copySystemPrompt" | "systemPrompt" | "enhancementApiConfigId" + | "includeTaskHistoryInEnhance" | "updateExperimental" | "autoApprovalEnabled" | "updateCustomMode" diff --git a/webview-ui/src/components/settings/PromptsSettings.tsx b/webview-ui/src/components/settings/PromptsSettings.tsx index a71132d62b..ee112b54dd 100644 --- a/webview-ui/src/components/settings/PromptsSettings.tsx +++ b/webview-ui/src/components/settings/PromptsSettings.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from "react" -import { VSCodeTextArea } from "@vscode/webview-ui-toolkit/react" +import { VSCodeTextArea, VSCodeCheckbox } from "@vscode/webview-ui-toolkit/react" import { supportPrompt, SupportPromptType } from "@roo/support-prompt" @@ -22,9 +22,16 @@ import { MessageSquare } from "lucide-react" interface PromptsSettingsProps { customSupportPrompts: Record setCustomSupportPrompts: (prompts: Record) => void + includeTaskHistoryInEnhance?: boolean + setIncludeTaskHistoryInEnhance?: (value: boolean) => void } -const PromptsSettings = ({ customSupportPrompts, setCustomSupportPrompts }: PromptsSettingsProps) => { +const PromptsSettings = ({ + customSupportPrompts, + setCustomSupportPrompts, + includeTaskHistoryInEnhance: propsIncludeTaskHistoryInEnhance, + setIncludeTaskHistoryInEnhance: propsSetIncludeTaskHistoryInEnhance, +}: PromptsSettingsProps) => { const { t } = useAppTranslation() const { listApiConfigMeta, @@ -34,8 +41,14 @@ const PromptsSettings = ({ customSupportPrompts, setCustomSupportPrompts }: Prom setCondensingApiConfigId, customCondensingPrompt, setCustomCondensingPrompt, + includeTaskHistoryInEnhance: contextIncludeTaskHistoryInEnhance, + setIncludeTaskHistoryInEnhance: contextSetIncludeTaskHistoryInEnhance, } = useExtensionState() + // Use props if provided, otherwise fall back to context + const includeTaskHistoryInEnhance = propsIncludeTaskHistoryInEnhance ?? contextIncludeTaskHistoryInEnhance + const setIncludeTaskHistoryInEnhance = propsSetIncludeTaskHistoryInEnhance ?? contextSetIncludeTaskHistoryInEnhance + const [testPrompt, setTestPrompt] = useState("") const [isEnhancing, setIsEnhancing] = useState(false) const [activeSupportOption, setActiveSupportOption] = useState("ENHANCE") @@ -219,28 +232,50 @@ const PromptsSettings = ({ customSupportPrompts, setCustomSupportPrompts }: Prom
{activeSupportOption === "ENHANCE" && ( -
- - setTestPrompt((e.target as HTMLTextAreaElement).value)} - placeholder={t("prompts:supportPrompts.enhance.testPromptPlaceholder")} - rows={3} - className="w-full" - data-testid="test-prompt-textarea" - /> -
- + <> +
+ { + const value = e.target.checked + setIncludeTaskHistoryInEnhance(value) + vscode.postMessage({ + type: "includeTaskHistoryInEnhance", + bool: value, + }) + }}> + + {t("prompts:supportPrompts.enhance.includeTaskHistory")} + + +
+ {t("prompts:supportPrompts.enhance.includeTaskHistoryDescription")} +
-
+ +
+ + setTestPrompt((e.target as HTMLTextAreaElement).value)} + placeholder={t("prompts:supportPrompts.enhance.testPromptPlaceholder")} + rows={3} + className="w-full" + data-testid="test-prompt-textarea" + /> +
+ +
+
+ )}
)} diff --git a/webview-ui/src/components/settings/SettingsView.tsx b/webview-ui/src/components/settings/SettingsView.tsx index 1854585377..9cfd9b64e5 100644 --- a/webview-ui/src/components/settings/SettingsView.tsx +++ b/webview-ui/src/components/settings/SettingsView.tsx @@ -181,6 +181,7 @@ const SettingsView = forwardRef(({ onDone, t followupAutoApproveTimeoutMs, includeDiagnosticMessages, maxDiagnosticMessages, + includeTaskHistoryInEnhance, } = cachedState const apiConfiguration = useMemo(() => cachedState.apiConfiguration ?? {}, [cachedState.apiConfiguration]) @@ -338,6 +339,7 @@ const SettingsView = forwardRef(({ onDone, t vscode.postMessage({ type: "condensingApiConfigId", text: condensingApiConfigId || "" }) vscode.postMessage({ type: "updateCondensingPrompt", text: customCondensingPrompt || "" }) vscode.postMessage({ type: "updateSupportPrompt", values: customSupportPrompts || {} }) + vscode.postMessage({ type: "includeTaskHistoryInEnhance", bool: includeTaskHistoryInEnhance ?? false }) vscode.postMessage({ type: "upsertApiConfiguration", text: currentApiConfigName, apiConfiguration }) vscode.postMessage({ type: "telemetrySetting", text: telemetrySetting }) vscode.postMessage({ type: "profileThresholds", values: profileThresholds }) @@ -705,6 +707,10 @@ const SettingsView = forwardRef(({ onDone, t + setCachedStateField("includeTaskHistoryInEnhance", value) + } /> )} diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx index 41a7a93670..33537b58ac 100644 --- a/webview-ui/src/context/ExtensionStateContext.tsx +++ b/webview-ui/src/context/ExtensionStateContext.tsx @@ -144,6 +144,8 @@ export interface ExtensionStateContextType extends ExtensionState { setIncludeDiagnosticMessages: (value: boolean) => void maxDiagnosticMessages?: number setMaxDiagnosticMessages: (value: number) => void + includeTaskHistoryInEnhance?: boolean + setIncludeTaskHistoryInEnhance: (value: boolean) => void } export const ExtensionStateContext = createContext(undefined) @@ -262,6 +264,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode project: {}, global: {}, }) + const [includeTaskHistoryInEnhance, setIncludeTaskHistoryInEnhance] = useState(false) const setListApiConfigMeta = useCallback( (value: ProviderSettingsEntry[]) => setState((prevState) => ({ ...prevState, listApiConfigMeta: value })), @@ -295,6 +298,10 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode if ((newState as any).followupAutoApproveTimeoutMs !== undefined) { setFollowupAutoApproveTimeoutMs((newState as any).followupAutoApproveTimeoutMs) } + // Update includeTaskHistoryInEnhance if present in state message + if ((newState as any).includeTaskHistoryInEnhance !== undefined) { + setIncludeTaskHistoryInEnhance((newState as any).includeTaskHistoryInEnhance) + } // Handle marketplace data if present in state message if (newState.marketplaceItems !== undefined) { setMarketplaceItems(newState.marketplaceItems) @@ -506,6 +513,8 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode setMaxDiagnosticMessages: (value) => { setState((prevState) => ({ ...prevState, maxDiagnosticMessages: value })) }, + includeTaskHistoryInEnhance, + setIncludeTaskHistoryInEnhance, } return {children} diff --git a/webview-ui/src/i18n/locales/ca/prompts.json b/webview-ui/src/i18n/locales/ca/prompts.json index 1f67068df0..5730211daa 100644 --- a/webview-ui/src/i18n/locales/ca/prompts.json +++ b/webview-ui/src/i18n/locales/ca/prompts.json @@ -94,7 +94,9 @@ "useCurrentConfig": "Utilitzar la configuració d'API seleccionada actualment", "testPromptPlaceholder": "Introduïu un prompt per provar la millora", "previewButton": "Previsualització de la millora del prompt", - "testEnhancement": "Prova la millora" + "testEnhancement": "Prova la millora", + "includeTaskHistory": "Inclou l'historial de tasques com a context", + "includeTaskHistoryDescription": "Quan està activat, els últims 10 missatges de la conversa actual s'inclouran com a context en millorar els prompts, ajudant a generar suggeriments més rellevants i conscients del context." }, "condense": { "apiConfiguration": "Configuració de l'API per a la condensació de context", diff --git a/webview-ui/src/i18n/locales/de/prompts.json b/webview-ui/src/i18n/locales/de/prompts.json index 229178abb3..ce5fe66110 100644 --- a/webview-ui/src/i18n/locales/de/prompts.json +++ b/webview-ui/src/i18n/locales/de/prompts.json @@ -94,7 +94,9 @@ "useCurrentConfig": "Aktuell ausgewählte API-Konfiguration verwenden", "testPromptPlaceholder": "Gib einen Prompt ein, um die Verbesserung zu testen", "previewButton": "Vorschau der Prompt-Verbesserung", - "testEnhancement": "Verbesserung testen" + "testEnhancement": "Verbesserung testen", + "includeTaskHistory": "Aufgabenverlauf als Kontext einbeziehen", + "includeTaskHistoryDescription": "Wenn aktiviert, werden die letzten 10 Nachrichten aus der aktuellen Unterhaltung als Kontext beim Verbessern von Prompts einbezogen, um relevantere und kontextbewusste Vorschläge zu generieren." }, "condense": { "apiConfiguration": "API-Konfiguration für die Kontextverdichtung", diff --git a/webview-ui/src/i18n/locales/en/prompts.json b/webview-ui/src/i18n/locales/en/prompts.json index 5d0e6ff8db..0ea5e133b8 100644 --- a/webview-ui/src/i18n/locales/en/prompts.json +++ b/webview-ui/src/i18n/locales/en/prompts.json @@ -93,7 +93,9 @@ "useCurrentConfig": "Use currently selected API configuration", "testPromptPlaceholder": "Enter a prompt to test the enhancement", "previewButton": "Preview Prompt Enhancement", - "testEnhancement": "Test Enhancement" + "testEnhancement": "Test Enhancement", + "includeTaskHistory": "Include task history as context", + "includeTaskHistoryDescription": "When enabled, the last 10 messages from the current conversation will be included as context when enhancing prompts, helping to generate more relevant and context-aware suggestions." }, "condense": { "apiConfiguration": "API Configuration for Context Condensing", diff --git a/webview-ui/src/i18n/locales/es/prompts.json b/webview-ui/src/i18n/locales/es/prompts.json index 50ab1cdb76..26ee72b4b5 100644 --- a/webview-ui/src/i18n/locales/es/prompts.json +++ b/webview-ui/src/i18n/locales/es/prompts.json @@ -94,7 +94,9 @@ "useCurrentConfig": "Usar la configuración de API actualmente seleccionada", "testPromptPlaceholder": "Ingresa una solicitud para probar la mejora", "previewButton": "Vista previa de la mejora de solicitud", - "testEnhancement": "Probar mejora" + "testEnhancement": "Probar mejora", + "includeTaskHistory": "Incluir historial de tareas como contexto", + "includeTaskHistoryDescription": "Cuando está habilitado, los últimos 10 mensajes de la conversación actual se incluirán como contexto al mejorar solicitudes, ayudando a generar sugerencias más relevantes y conscientes del contexto." }, "condense": { "apiConfiguration": "Configuración de API para la condensación de contexto", diff --git a/webview-ui/src/i18n/locales/fr/prompts.json b/webview-ui/src/i18n/locales/fr/prompts.json index d48ef28fa4..3b43280c00 100644 --- a/webview-ui/src/i18n/locales/fr/prompts.json +++ b/webview-ui/src/i18n/locales/fr/prompts.json @@ -94,7 +94,9 @@ "useCurrentConfig": "Utiliser la configuration API actuellement sélectionnée", "testPromptPlaceholder": "Entrez un prompt pour tester l'amélioration", "previewButton": "Aperçu de l'amélioration du prompt", - "testEnhancement": "Tester l'amélioration" + "testEnhancement": "Tester l'amélioration", + "includeTaskHistory": "Inclure l'historique des tâches comme contexte", + "includeTaskHistoryDescription": "Lorsque activé, les 10 derniers messages de la conversation actuelle seront inclus comme contexte lors de l'amélioration des prompts, aidant à générer des suggestions plus pertinentes et conscientes du contexte." }, "condense": { "apiConfiguration": "Configuration de l'API pour la condensation du contexte", diff --git a/webview-ui/src/i18n/locales/hi/prompts.json b/webview-ui/src/i18n/locales/hi/prompts.json index ff409f41f5..bd403adde9 100644 --- a/webview-ui/src/i18n/locales/hi/prompts.json +++ b/webview-ui/src/i18n/locales/hi/prompts.json @@ -94,7 +94,9 @@ "useCurrentConfig": "वर्तमान में चयनित API कॉन्फ़िगरेशन का उपयोग करें", "testPromptPlaceholder": "वृद्धि का परीक्षण करने के लिए एक प्रॉम्प्ट दर्ज करें", "previewButton": "प्रॉम्प्ट वृद्धि का पूर्वावलोकन", - "testEnhancement": "वृद्धि का परीक्षण करें" + "testEnhancement": "वृद्धि का परीक्षण करें", + "includeTaskHistory": "कार्य इतिहास को संदर्भ के रूप में शामिल करें", + "includeTaskHistoryDescription": "जब सक्षम किया जाता है, तो वर्तमान बातचीत के अंतिम 10 संदेश प्रॉम्प्ट को बेहतर बनाते समय संदर्भ के रूप में शामिल किए जाएंगे, जो अधिक प्रासंगिक और संदर्भ-जागरूक सुझाव उत्पन्न करने में मदद करेगा।" }, "condense": { "apiConfiguration": "संदर्भ संघनन के लिए API कॉन्फ़िगरेशन", diff --git a/webview-ui/src/i18n/locales/id/prompts.json b/webview-ui/src/i18n/locales/id/prompts.json index 52736ad69b..b4d45459f0 100644 --- a/webview-ui/src/i18n/locales/id/prompts.json +++ b/webview-ui/src/i18n/locales/id/prompts.json @@ -94,7 +94,9 @@ "useCurrentConfig": "Gunakan konfigurasi API yang sedang dipilih", "testPromptPlaceholder": "Masukkan prompt untuk menguji peningkatan", "previewButton": "Pratinjau Peningkatan Prompt", - "testEnhancement": "Uji Peningkatan" + "testEnhancement": "Uji Peningkatan", + "includeTaskHistory": "Sertakan riwayat tugas sebagai konteks", + "includeTaskHistoryDescription": "Ketika diaktifkan, 10 pesan terakhir dari percakapan saat ini akan disertakan sebagai konteks saat meningkatkan prompt, membantu menghasilkan saran yang lebih relevan dan sadar konteks." }, "condense": { "apiConfiguration": "Konfigurasi API untuk Peringkasan Konteks", diff --git a/webview-ui/src/i18n/locales/it/prompts.json b/webview-ui/src/i18n/locales/it/prompts.json index e6356f828b..57c144a650 100644 --- a/webview-ui/src/i18n/locales/it/prompts.json +++ b/webview-ui/src/i18n/locales/it/prompts.json @@ -94,7 +94,9 @@ "useCurrentConfig": "Usa la configurazione API attualmente selezionata", "testPromptPlaceholder": "Inserisci un prompt per testare il miglioramento", "previewButton": "Anteprima miglioramento prompt", - "testEnhancement": "Testa miglioramento" + "testEnhancement": "Testa miglioramento", + "includeTaskHistory": "Includi cronologia attività come contesto", + "includeTaskHistoryDescription": "Quando abilitato, gli ultimi 10 messaggi della conversazione corrente verranno inclusi come contesto durante il miglioramento dei prompt, aiutando a generare suggerimenti più rilevanti e consapevoli del contesto." }, "condense": { "apiConfiguration": "Configurazione API per la condensazione del contesto", diff --git a/webview-ui/src/i18n/locales/ja/prompts.json b/webview-ui/src/i18n/locales/ja/prompts.json index e9f108f615..15cb64dcf2 100644 --- a/webview-ui/src/i18n/locales/ja/prompts.json +++ b/webview-ui/src/i18n/locales/ja/prompts.json @@ -94,7 +94,9 @@ "useCurrentConfig": "現在選択されているAPI設定を使用", "testPromptPlaceholder": "強化をテストするプロンプトを入力してください", "previewButton": "プロンプト強化のプレビュー", - "testEnhancement": "強化をテスト" + "testEnhancement": "強化をテスト", + "includeTaskHistory": "タスク履歴をコンテキストとして含める", + "includeTaskHistoryDescription": "有効にすると、現在の会話の最後の10メッセージがプロンプト強化時にコンテキストとして含まれ、より関連性が高くコンテキストを意識した提案の生成に役立ちます。" }, "condense": { "apiConfiguration": "コンテキスト圧縮のためのAPI構成", diff --git a/webview-ui/src/i18n/locales/ko/prompts.json b/webview-ui/src/i18n/locales/ko/prompts.json index 688ddd18a9..d21107be43 100644 --- a/webview-ui/src/i18n/locales/ko/prompts.json +++ b/webview-ui/src/i18n/locales/ko/prompts.json @@ -94,7 +94,9 @@ "useCurrentConfig": "현재 선택된 API 구성 사용", "testPromptPlaceholder": "향상을 테스트할 프롬프트 입력", "previewButton": "프롬프트 향상 미리보기", - "testEnhancement": "향상 테스트" + "testEnhancement": "향상 테스트", + "includeTaskHistory": "작업 기록을 컨텍스트로 포함", + "includeTaskHistoryDescription": "활성화하면 현재 대화의 마지막 10개 메시지가 프롬프트 향상 시 컨텍스트로 포함되어 더 관련성 높고 컨텍스트를 인식하는 제안을 생성하는 데 도움이 됩니다." }, "condense": { "apiConfiguration": "컨텍스트 압축을 위한 API 구성", diff --git a/webview-ui/src/i18n/locales/nl/prompts.json b/webview-ui/src/i18n/locales/nl/prompts.json index 7c8ba28605..43af1ada59 100644 --- a/webview-ui/src/i18n/locales/nl/prompts.json +++ b/webview-ui/src/i18n/locales/nl/prompts.json @@ -94,7 +94,9 @@ "useCurrentConfig": "Huidige API-configuratie gebruiken", "testPromptPlaceholder": "Voer een prompt in om de verbetering te testen", "previewButton": "Voorbeeld promptverbetering", - "testEnhancement": "Test verbetering" + "testEnhancement": "Test verbetering", + "includeTaskHistory": "Taakgeschiedenis als context opnemen", + "includeTaskHistoryDescription": "Wanneer ingeschakeld, worden de laatste 10 berichten van het huidige gesprek opgenomen als context bij het verbeteren van prompts, wat helpt bij het genereren van meer relevante en contextbewuste suggesties." }, "condense": { "apiConfiguration": "API-configuratie voor contextcondensatie", diff --git a/webview-ui/src/i18n/locales/pl/prompts.json b/webview-ui/src/i18n/locales/pl/prompts.json index c627f3a84d..7bd71f49b0 100644 --- a/webview-ui/src/i18n/locales/pl/prompts.json +++ b/webview-ui/src/i18n/locales/pl/prompts.json @@ -94,7 +94,9 @@ "useCurrentConfig": "Użyj aktualnie wybranej konfiguracji API", "testPromptPlaceholder": "Wprowadź podpowiedź, aby przetestować ulepszenie", "previewButton": "Podgląd ulepszenia podpowiedzi", - "testEnhancement": "Testuj ulepszenie" + "testEnhancement": "Testuj ulepszenie", + "includeTaskHistory": "Uwzględnij historię zadań jako kontekst", + "includeTaskHistoryDescription": "Gdy włączone, ostatnie 10 wiadomości z bieżącej rozmowy zostanie uwzględnione jako kontekst podczas ulepszania podpowiedzi, pomagając generować bardziej trafne i świadome kontekstu sugestie." }, "condense": { "apiConfiguration": "Konfiguracja API do kondensacji kontekstu", diff --git a/webview-ui/src/i18n/locales/pt-BR/prompts.json b/webview-ui/src/i18n/locales/pt-BR/prompts.json index e5989d2894..5bc3234c4d 100644 --- a/webview-ui/src/i18n/locales/pt-BR/prompts.json +++ b/webview-ui/src/i18n/locales/pt-BR/prompts.json @@ -94,7 +94,9 @@ "useCurrentConfig": "Usar configuração de API atualmente selecionada", "testPromptPlaceholder": "Digite um prompt para testar o aprimoramento", "previewButton": "Visualizar aprimoramento do prompt", - "testEnhancement": "Testar aprimoramento" + "testEnhancement": "Testar aprimoramento", + "includeTaskHistory": "Incluir histórico de tarefas como contexto", + "includeTaskHistoryDescription": "Quando habilitado, as últimas 10 mensagens da conversa atual serão incluídas como contexto ao aprimorar prompts, ajudando a gerar sugestões mais relevantes e conscientes do contexto." }, "condense": { "apiConfiguration": "Configuração da API para condensação de contexto", diff --git a/webview-ui/src/i18n/locales/ru/prompts.json b/webview-ui/src/i18n/locales/ru/prompts.json index c96d4b54a1..cc9210c678 100644 --- a/webview-ui/src/i18n/locales/ru/prompts.json +++ b/webview-ui/src/i18n/locales/ru/prompts.json @@ -91,7 +91,9 @@ "useCurrentConfig": "Использовать текущую конфигурацию API", "testPromptPlaceholder": "Введите промпт для тестирования улучшения", "previewButton": "Просмотреть улучшенный промпт", - "testEnhancement": "Тестировать улучшение" + "testEnhancement": "Тестировать улучшение", + "includeTaskHistory": "Включить историю задач как контекст", + "includeTaskHistoryDescription": "При включении последние 10 сообщений из текущего разговора будут включены как контекст при улучшении промптов, помогая генерировать более релевантные и контекстно-осведомленные предложения." }, "condense": { "apiConfiguration": "Конфигурация API для сжатия контекста", diff --git a/webview-ui/src/i18n/locales/tr/prompts.json b/webview-ui/src/i18n/locales/tr/prompts.json index 9b7e2c569f..eec283977c 100644 --- a/webview-ui/src/i18n/locales/tr/prompts.json +++ b/webview-ui/src/i18n/locales/tr/prompts.json @@ -91,7 +91,9 @@ "useCurrentConfig": "Şu anda seçili API yapılandırmasını kullan", "testPromptPlaceholder": "Geliştirmeyi test etmek için bir prompt girin", "previewButton": "Prompt geliştirmesini önizle", - "testEnhancement": "Geliştirmeyi test et" + "testEnhancement": "Geliştirmeyi test et", + "includeTaskHistory": "Görev geçmişini bağlam olarak dahil et", + "includeTaskHistoryDescription": "Etkinleştirildiğinde, mevcut konuşmanın son 10 mesajı promptları geliştirirken bağlam olarak dahil edilecek ve daha alakalı ve bağlam farkında öneriler üretmeye yardımcı olacaktır." }, "condense": { "apiConfiguration": "Bağlam Yoğunlaştırma için API Yapılandırması", diff --git a/webview-ui/src/i18n/locales/vi/prompts.json b/webview-ui/src/i18n/locales/vi/prompts.json index d3b7e75f3c..d7a38cda6f 100644 --- a/webview-ui/src/i18n/locales/vi/prompts.json +++ b/webview-ui/src/i18n/locales/vi/prompts.json @@ -91,7 +91,9 @@ "useCurrentConfig": "Sử dụng cấu hình API hiện tại đã chọn", "testPromptPlaceholder": "Nhập lời nhắc để kiểm tra việc nâng cao", "previewButton": "Xem trước nâng cao lời nhắc", - "testEnhancement": "Kiểm tra cải tiến" + "testEnhancement": "Kiểm tra cải tiến", + "includeTaskHistory": "Bao gồm lịch sử tác vụ làm ngữ cảnh", + "includeTaskHistoryDescription": "Khi được bật, 10 tin nhắn cuối cùng từ cuộc trò chuyện hiện tại sẽ được bao gồm làm ngữ cảnh khi nâng cao lời nhắc, giúp tạo ra các gợi ý phù hợp và nhận thức ngữ cảnh hơn." }, "condense": { "apiConfiguration": "Cấu hình API để cô đọng ngữ cảnh", diff --git a/webview-ui/src/i18n/locales/zh-CN/prompts.json b/webview-ui/src/i18n/locales/zh-CN/prompts.json index 157ba5d7ea..c21c22b7bd 100644 --- a/webview-ui/src/i18n/locales/zh-CN/prompts.json +++ b/webview-ui/src/i18n/locales/zh-CN/prompts.json @@ -91,7 +91,9 @@ "useCurrentConfig": "使用当前选择的API配置", "testPromptPlaceholder": "输入提示词以测试增强效果", "previewButton": "测试提示词增强", - "testEnhancement": "测试增强" + "testEnhancement": "测试增强", + "includeTaskHistory": "包含任务历史作为上下文", + "includeTaskHistoryDescription": "启用后，当前对话的最后 10 条消息将作为上下文包含在增强提示词时，有助于生成更相关和上下文感知的建议。" }, "condense": { "apiConfiguration": "用于上下文压缩的 API 配置", diff --git a/webview-ui/src/i18n/locales/zh-TW/prompts.json b/webview-ui/src/i18n/locales/zh-TW/prompts.json index 3a2bae4af5..47a32d7d83 100644 --- a/webview-ui/src/i18n/locales/zh-TW/prompts.json +++ b/webview-ui/src/i18n/locales/zh-TW/prompts.json @@ -91,7 +91,9 @@ "useCurrentConfig": "使用目前選擇的 API 設定", "testPromptPlaceholder": "輸入提示詞以測試增強效果", "previewButton": "預覽提示詞增強", - "testEnhancement": "測試增強" + "testEnhancement": "測試增強", + "includeTaskHistory": "包含工作歷史作為內容", + "includeTaskHistoryDescription": "啟用後，目前對話的最後 10 則訊息將作為內容包含在增強提示詞時，有助於產生更相關和內容感知的建議。" }, "condense": { "apiConfiguration": "用於上下文壓縮的 API 設定", From 181993f6395f2d6adce4def35de8848895f9864a Mon Sep 17 00:00:00 2001 From: NaccOll Date: Thu, 31 Jul 2025 04:56:01 +0800 Subject: [PATCH 007/253] feat: enhance token counting by extracting text from messages using VSCode LM API (#6424) --- src/api/providers/vscode-lm.ts | 16 +- .../__tests__/vscode-lm-format.spec.ts | 165 +++++++++++++++++- src/api/transform/vscode-lm-format.ts | 38 ++++ 3 files changed, 204 insertions(+), 15 deletions(-) diff --git a/src/api/providers/vscode-lm.ts b/src/api/providers/vscode-lm.ts index 6474371bee..d8a492f772 100644 --- a/src/api/providers/vscode-lm.ts +++ b/src/api/providers/vscode-lm.ts @@ -7,7 +7,7 @@ import type { ApiHandlerOptions } from "../../shared/api" import { SELECTOR_SEPARATOR, stringifyVsCodeLmModelSelector } from "../../shared/vsCodeSelectorUtils" import { ApiStream } from "../transform/stream" -import { convertToVsCodeLmMessages } from "../transform/vscode-lm-format" +import { convertToVsCodeLmMessages, extractTextCountFromMessage } from "../transform/vscode-lm-format" import { BaseProvider } from "./base-provider" import type { SingleCompletionHandler, ApiHandlerCreateMessageMetadata } from "../index" @@ -231,7 +231,8 @@ export class VsCodeLmHandler extends BaseProvider implements SingleCompletionHan console.debug("Roo Code : Empty chat message content") return 0 } - tokenCount = await this.client.countTokens(text, this.currentRequestCancellation.token) + const countMessage = extractTextCountFromMessage(text) + tokenCount = await this.client.countTokens(countMessage, this.currentRequestCancellation.token) } else { console.warn("Roo Code : Invalid input type for token counting") return 0 @@ -268,15 +269,10 @@ export class VsCodeLmHandler extends BaseProvider implements SingleCompletionHan } } - private async calculateTotalInputTokens( - systemPrompt: string, - vsCodeLmMessages: vscode.LanguageModelChatMessage[], - ): Promise { - const systemTokens: number = await this.internalCountTokens(systemPrompt) - + private async calculateTotalInputTokens(vsCodeLmMessages: vscode.LanguageModelChatMessage[]): Promise { const messageTokens: number[] = await Promise.all(vsCodeLmMessages.map((msg) => this.internalCountTokens(msg))) - return systemTokens + messageTokens.reduce((sum: number, tokens: number): number => sum + tokens, 0) + return messageTokens.reduce((sum: number, tokens: number): number => sum + tokens, 0) } private ensureCleanState(): void { @@ -359,7 +355,7 @@ export class VsCodeLmHandler extends BaseProvider implements SingleCompletionHan this.currentRequestCancellation = new vscode.CancellationTokenSource() // Calculate input tokens before starting the stream - const totalInputTokens: number = await this.calculateTotalInputTokens(systemPrompt, vsCodeLmMessages) + const totalInputTokens: number = await this.calculateTotalInputTokens(vsCodeLmMessages) // Accumulate the text and count at the end of the stream to reduce token counting overhead. let accumulatedText: string = "" diff --git a/src/api/transform/__tests__/vscode-lm-format.spec.ts b/src/api/transform/__tests__/vscode-lm-format.spec.ts index 73878033c2..1f53cc5751 100644 --- a/src/api/transform/__tests__/vscode-lm-format.spec.ts +++ b/src/api/transform/__tests__/vscode-lm-format.spec.ts @@ -1,8 +1,9 @@ // npx vitest run src/api/transform/__tests__/vscode-lm-format.spec.ts import { Anthropic } from "@anthropic-ai/sdk" +import * as vscode from "vscode" -import { convertToVsCodeLmMessages, convertToAnthropicRole } from "../vscode-lm-format" +import { convertToVsCodeLmMessages, convertToAnthropicRole, extractTextCountFromMessage } from "../vscode-lm-format" // Mock crypto using Vitest vitest.stubGlobal("crypto", { @@ -24,8 +25,8 @@ interface MockLanguageModelToolCallPart { interface MockLanguageModelToolResultPart { type: "tool_result" - toolUseId: string - parts: MockLanguageModelTextPart[] + callId: string + content: MockLanguageModelTextPart[] } // Mock vscode namespace @@ -52,8 +53,8 @@ vitest.mock("vscode", () => { class MockLanguageModelToolResultPart { type = "tool_result" constructor( - public toolUseId: string, - public parts: MockLanguageModelTextPart[], + public callId: string, + public content: MockLanguageModelTextPart[], ) {} } @@ -189,3 +190,157 @@ describe("convertToAnthropicRole", () => { expect(result).toBeNull() }) }) + +describe("extractTextCountFromMessage", () => { + it("should extract text from simple string content", () => { + const message = { + role: "user", + content: "Hello world", + } as any + + const result = extractTextCountFromMessage(message) + expect(result).toBe("Hello world") + }) + + it("should extract text from LanguageModelTextPart", () => { + const mockTextPart = new (vitest.mocked(vscode).LanguageModelTextPart)("Text content") + const message = { + role: "user", + content: [mockTextPart], + } as any + + const result = extractTextCountFromMessage(message) + expect(result).toBe("Text content") + }) + + it("should extract text from multiple LanguageModelTextParts", () => { + const mockTextPart1 = new (vitest.mocked(vscode).LanguageModelTextPart)("First part") + const mockTextPart2 = new (vitest.mocked(vscode).LanguageModelTextPart)("Second part") + const message = { + role: "user", + content: [mockTextPart1, mockTextPart2], + } as any + + const result = extractTextCountFromMessage(message) + expect(result).toBe("First partSecond part") + }) + + it("should extract text from LanguageModelToolResultPart", () => { + const mockTextPart = new (vitest.mocked(vscode).LanguageModelTextPart)("Tool result content") + const mockToolResultPart = new (vitest.mocked(vscode).LanguageModelToolResultPart)("tool-result-id", [ + mockTextPart, + ]) + const message = { + role: "user", + content: [mockToolResultPart], + } as any + + const result = extractTextCountFromMessage(message) + expect(result).toBe("tool-result-idTool result content") + }) + + it("should extract text from LanguageModelToolCallPart without input", () => { + const mockToolCallPart = new (vitest.mocked(vscode).LanguageModelToolCallPart)("call-id", "tool-name", {}) + const message = { + role: "assistant", + content: [mockToolCallPart], + } as any + + const result = extractTextCountFromMessage(message) + expect(result).toBe("tool-namecall-id") + }) + + it("should extract text from LanguageModelToolCallPart with input", () => { + const mockInput = { operation: "add", numbers: [1, 2, 3] } + const mockToolCallPart = new (vitest.mocked(vscode).LanguageModelToolCallPart)( + "call-id", + "calculator", + mockInput, + ) + const message = { + role: "assistant", + content: [mockToolCallPart], + } as any + + const result = extractTextCountFromMessage(message) + expect(result).toBe(`calculatorcall-id${JSON.stringify(mockInput)}`) + }) + + it("should extract text from LanguageModelToolCallPart with empty input", () => { + const mockToolCallPart = new (vitest.mocked(vscode).LanguageModelToolCallPart)("call-id", "tool-name", {}) + const message = { + role: "assistant", + content: [mockToolCallPart], + } as any + + const result = extractTextCountFromMessage(message) + expect(result).toBe("tool-namecall-id") + }) + + it("should extract text from mixed content types", () => { + const mockTextPart = new (vitest.mocked(vscode).LanguageModelTextPart)("Text content") + const mockToolResultTextPart = new (vitest.mocked(vscode).LanguageModelTextPart)("Tool result") + const mockToolResultPart = new (vitest.mocked(vscode).LanguageModelToolResultPart)("result-id", [ + mockToolResultTextPart, + ]) + const mockInput = { param: "value" } + const mockToolCallPart = new (vitest.mocked(vscode).LanguageModelToolCallPart)("call-id", "tool", mockInput) + + const message = { + role: "assistant", + content: [mockTextPart, mockToolResultPart, mockToolCallPart], + } as any + + const result = extractTextCountFromMessage(message) + expect(result).toBe(`Text contentresult-idTool resulttoolcall-id${JSON.stringify(mockInput)}`) + }) + + it("should handle empty array content", () => { + const message = { + role: "user", + content: [], + } as any + + const result = extractTextCountFromMessage(message) + expect(result).toBe("") + }) + + it("should handle undefined content", () => { + const message = { + role: "user", + content: undefined, + } as any + + const result = extractTextCountFromMessage(message) + expect(result).toBe("") + }) + + it("should handle ToolResultPart with multiple text parts", () => { + const mockTextPart1 = new (vitest.mocked(vscode).LanguageModelTextPart)("Part 1") + const mockTextPart2 = new (vitest.mocked(vscode).LanguageModelTextPart)("Part 2") + const mockToolResultPart = new (vitest.mocked(vscode).LanguageModelToolResultPart)("result-id", [ + mockTextPart1, + mockTextPart2, + ]) + + const message = { + role: "user", + content: [mockToolResultPart], + } as any + + const result = extractTextCountFromMessage(message) + expect(result).toBe("result-idPart 1Part 2") + }) + + it("should handle ToolResultPart with empty parts array", () => { + const mockToolResultPart = new (vitest.mocked(vscode).LanguageModelToolResultPart)("result-id", []) + + const message = { + role: "user", + content: [mockToolResultPart], + } as any + + const result = extractTextCountFromMessage(message) + expect(result).toBe("result-id") + }) +}) diff --git a/src/api/transform/vscode-lm-format.ts b/src/api/transform/vscode-lm-format.ts index 080267b221..58b85f19a9 100644 --- a/src/api/transform/vscode-lm-format.ts +++ b/src/api/transform/vscode-lm-format.ts @@ -155,3 +155,41 @@ export function convertToAnthropicRole(vsCodeLmMessageRole: vscode.LanguageModel return null } } + +/** + * Extracts the text content from a VS Code Language Model chat message. + * @param message A VS Code Language Model chat message. + * @returns The extracted text content. + */ +export function extractTextCountFromMessage(message: vscode.LanguageModelChatMessage): string { + let text = "" + if (Array.isArray(message.content)) { + for (const item of message.content) { + if (item instanceof vscode.LanguageModelTextPart) { + text += item.value + } + if (item instanceof vscode.LanguageModelToolResultPart) { + text += item.callId + for (const part of item.content) { + if (part instanceof vscode.LanguageModelTextPart) { + text += part.value + } + } + } + if (item instanceof vscode.LanguageModelToolCallPart) { + text += item.name + text += item.callId + if (item.input && Object.keys(item.input).length > 0) { + try { + text += JSON.stringify(item.input) + } catch (error) { + console.error("Roo Code : Failed to stringify tool call input:", error) + } + } + } + } + } else if (typeof message.content === "string") { + text += message.content + } + return text +} From 7a07088802dd41a54d330b9c6f61a062c532a208 Mon Sep 17 00:00:00 2001 From: Adam Brand <36556838+adambrand@users.noreply.github.com> Date: Wed, 30 Jul 2025 17:31:26 -0500 Subject: [PATCH 008/253] Add pattern to support Databricks /invocations endpoints (#6317) For using other models in Azure (e.g., Claude); you have to use Databricks, and the other patterns didn't match that. --- src/services/code-index/embedders/openai-compatible.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/services/code-index/embedders/openai-compatible.ts b/src/services/code-index/embedders/openai-compatible.ts index 035f50f386..06c4ba5282 100644 --- a/src/services/code-index/embedders/openai-compatible.ts +++ b/src/services/code-index/embedders/openai-compatible.ts @@ -171,6 +171,8 @@ export class OpenAICompatibleEmbedder implements IEmbedder { const patterns = [ // Azure OpenAI: /deployments/{deployment-name}/embeddings /\/deployments\/[^\/]+\/embeddings(\?|$)/, + // Azure Databricks: /serving-endpoints/{endpoint-name}/invocations + /\/serving-endpoints\/[^\/]+\/invocations(\?|$)/, // Direct endpoints: ends with /embeddings (before query params) /\/embeddings(\?|$)/, // Some providers use /embed instead of /embeddings From 5f4ccbcc341a94aad38bb9547fe4d6e3bdbb0909 Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Wed, 30 Jul 2025 18:32:31 -0400 Subject: [PATCH 009/253] fix: resolve navigator global error by updating mammoth and bluebird dependencies (#6363) - Update mammoth from ^1.8.0 to ^1.9.1 - Add pnpm override to force bluebird >=3.7.2 (was 3.4.7) - Fixes PendingMigrationError: navigator is now a global in nodejs - Resolves extension crashes in VS Code nightly builds Fixes #6356 Co-authored-by: Roo Code --- package.json | 3 ++- pnpm-lock.yaml | 21 +++++++++++---------- src/package.json | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index cc917ab7ca..5e73f0c479 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,8 @@ "esbuild": ">=0.25.0", "undici": ">=5.29.0", "brace-expansion": ">=2.0.2", - "form-data": ">=4.0.4" + "form-data": ">=4.0.4", + "bluebird": ">=3.7.2" } } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4134d3945a..311c51d0ba 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,6 +10,7 @@ overrides: undici: '>=5.29.0' brace-expansion: '>=2.0.2' form-data: '>=4.0.4' + bluebird: '>=3.7.2' importers: @@ -671,8 +672,8 @@ importers: specifier: ^4.0.8 version: 4.0.8 mammoth: - specifier: ^1.8.0 - version: 1.9.0 + specifier: ^1.9.1 + version: 1.9.1 monaco-vscode-textmate-theme-converter: specifier: ^0.1.7 version: 0.1.7(tslib@2.8.1) @@ -4393,8 +4394,8 @@ packages: bl@4.1.0: resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} - bluebird@3.4.7: - resolution: {integrity: sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==} + bluebird@3.7.2: + resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==} body-parser@2.2.0: resolution: {integrity: sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==} @@ -7060,8 +7061,8 @@ packages: resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==} engines: {node: '>=10'} - mammoth@1.9.0: - resolution: {integrity: sha512-F+0NxzankQV9XSUAuVKvkdQK0GbtGGuqVnND9aVf9VSeUA82LQa29GjLqYU6Eez8LHqSJG3eGiDW3224OKdpZg==} + mammoth@1.9.1: + resolution: {integrity: sha512-4S2v1eP4Yo4so0zGNicJKcP93su3wDPcUk+xvkjSG75nlNjSkDJu8BhWQ+e54BROM0HfA6nPzJn12S6bq2Ko6w==} engines: {node: '>=12.0.0'} hasBin: true @@ -13789,7 +13790,7 @@ snapshots: inherits: 2.0.4 readable-stream: 3.6.2 - bluebird@3.4.7: {} + bluebird@3.7.2: {} body-parser@2.2.0: dependencies: @@ -16685,12 +16686,12 @@ snapshots: dependencies: semver: 7.7.2 - mammoth@1.9.0: + mammoth@1.9.1: dependencies: '@xmldom/xmldom': 0.8.10 argparse: 1.0.10 base64-js: 1.5.1 - bluebird: 3.4.7 + bluebird: 3.7.2 dingbat-to-unicode: 1.0.1 jszip: 3.10.1 lop: 0.4.2 @@ -19475,7 +19476,7 @@ snapshots: dependencies: big-integer: 1.6.52 binary: 0.3.0 - bluebird: 3.4.7 + bluebird: 3.7.2 buffer-indexof-polyfill: 1.0.2 duplexer2: 0.1.4 fstream: 1.0.12 diff --git a/src/package.json b/src/package.json index 8b350ac838..551c9303a2 100644 --- a/src/package.json +++ b/src/package.json @@ -447,7 +447,7 @@ "ignore": "^7.0.3", "isbinaryfile": "^5.0.2", "lodash.debounce": "^4.0.8", - "mammoth": "^1.8.0", + "mammoth": "^1.9.1", "monaco-vscode-textmate-theme-converter": "^0.1.7", "node-cache": "^5.1.2", "node-ipc": "^12.0.0", From ded0180112143fc5a2bab3fbb52b6a0240afc134 Mon Sep 17 00:00:00 2001 From: Hannes Rudolph Date: Wed, 30 Jul 2025 16:41:56 -0600 Subject: [PATCH 010/253] feat: diagnose nightly freeze by disabling contributes (#6450) --- apps/vscode-nightly/package.nightly.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/vscode-nightly/package.nightly.json b/apps/vscode-nightly/package.nightly.json index 94bc2c8b67..971bc2ff7d 100644 --- a/apps/vscode-nightly/package.nightly.json +++ b/apps/vscode-nightly/package.nightly.json @@ -2,5 +2,6 @@ "name": "roo-code-nightly", "version": "0.0.1", "icon": "assets/icons/icon-nightly.png", - "scripts": {} + "scripts": {}, + "contributes": {} } From b8dc31581cb67c5c412bab76ce1f54d2fd521971 Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Wed, 30 Jul 2025 18:57:15 -0400 Subject: [PATCH 011/253] feat: add symlink support for AGENTS.md file loading (#6326) * feat: add symlink support for AGENTS.md file loading - Add safeReadFileFollowingSymlinks function to handle symlink resolution - Update loadAgentRulesFile to use the new symlink-aware function - Add comprehensive tests for both symlink and regular file scenarios - Ensures AGENTS.md can be a symlink pointing to actual rules file * refactor: use existing symlink resolution pattern for AGENTS.md - Extracted resolveSymlinkPath function to handle symlink resolution - Removed duplicate safeReadFileFollowingSymlinks function - Updated loadAgentRulesFile to use resolveSymlinkPath + safeReadFile - Updated tests to match new implementation - Maintains same functionality while reusing existing patterns * fix: simplify symlink resolution for AGENTS.md to fix Windows compatibility - Remove duplicate resolveSymlinkPath function as suggested by @mrubens - Use simpler inline symlink resolution in loadAgentRulesFile - Update tests to match simplified implementation - This should fix the failing Windows unit tests while maintaining functionality * refactor: use existing resolveSymLink function for AGENTS.md symlink support - Remove duplicate inline symlink resolution logic - Reuse existing resolveSymLink function with MAX_DEPTH protection - Adapt loadAgentRulesFile to work with resolveSymLink's fileInfo interface - Fix test to properly mock fs.stat for resolved symlink targets - All tests pass (36/36) --------- Co-authored-by: Roo Code Co-authored-by: Daniel Riccio --- .../__tests__/custom-instructions.spec.ts | 147 ++++++++++++++++++ .../prompts/sections/custom-instructions.ts | 25 ++- 2 files changed, 171 insertions(+), 1 deletion(-) diff --git a/src/core/prompts/sections/__tests__/custom-instructions.spec.ts b/src/core/prompts/sections/__tests__/custom-instructions.spec.ts index 01574406b2..d015748315 100644 --- a/src/core/prompts/sections/__tests__/custom-instructions.spec.ts +++ b/src/core/prompts/sections/__tests__/custom-instructions.spec.ts @@ -54,12 +54,14 @@ const readFileMock = vi.fn() const statMock = vi.fn() const readdirMock = vi.fn() const readlinkMock = vi.fn() +const lstatMock = vi.fn() // Replace fs functions with our mocks fs.readFile = readFileMock as any fs.stat = statMock as any fs.readdir = readdirMock as any fs.readlink = readlinkMock as any +fs.lstat = lstatMock as any // Mock process.cwd const originalCwd = process.cwd @@ -509,6 +511,17 @@ describe("addCustomInstructions", () => { // Simulate no .roo/rules-test-mode directory statMock.mockRejectedValueOnce({ code: "ENOENT" }) + // Mock lstat to indicate AGENTS.md is NOT a symlink + lstatMock.mockImplementation((filePath: PathLike) => { + const pathStr = filePath.toString() + if (pathStr.endsWith("AGENTS.md")) { + return Promise.resolve({ + isSymbolicLink: vi.fn().mockReturnValue(false), + }) + } + return Promise.reject({ code: "ENOENT" }) + }) + readFileMock.mockImplementation((filePath: PathLike) => { const pathStr = filePath.toString() if (pathStr.endsWith("AGENTS.md")) { @@ -558,6 +571,17 @@ describe("addCustomInstructions", () => { // Simulate no .roo/rules-test-mode directory statMock.mockRejectedValueOnce({ code: "ENOENT" }) + // Mock lstat to indicate AGENTS.md is NOT a symlink + lstatMock.mockImplementation((filePath: PathLike) => { + const pathStr = filePath.toString() + if (pathStr.endsWith("AGENTS.md")) { + return Promise.resolve({ + isSymbolicLink: vi.fn().mockReturnValue(false), + }) + } + return Promise.reject({ code: "ENOENT" }) + }) + readFileMock.mockImplementation((filePath: PathLike) => { const pathStr = filePath.toString() if (pathStr.endsWith("AGENTS.md")) { @@ -602,6 +626,17 @@ describe("addCustomInstructions", () => { // Simulate no .roo/rules-test-mode directory statMock.mockRejectedValueOnce({ code: "ENOENT" }) + // Mock lstat to indicate AGENTS.md is NOT a symlink + lstatMock.mockImplementation((filePath: PathLike) => { + const pathStr = filePath.toString() + if (pathStr.endsWith("AGENTS.md")) { + return Promise.resolve({ + isSymbolicLink: vi.fn().mockReturnValue(false), + }) + } + return Promise.reject({ code: "ENOENT" }) + }) + readFileMock.mockImplementation((filePath: PathLike) => { const pathStr = filePath.toString() if (pathStr.endsWith("AGENTS.md")) { @@ -628,6 +663,118 @@ describe("addCustomInstructions", () => { expect(result).toContain("Roo rules content") }) + it("should follow symlinks when loading AGENTS.md", async () => { + // Simulate no .roo/rules-test-mode directory + statMock.mockRejectedValueOnce({ code: "ENOENT" }) + + // Mock lstat to indicate AGENTS.md is a symlink + lstatMock.mockImplementation((filePath: PathLike) => { + const pathStr = filePath.toString() + if (pathStr.endsWith("AGENTS.md")) { + return Promise.resolve({ + isSymbolicLink: vi.fn().mockReturnValue(true), + }) + } + return Promise.reject({ code: "ENOENT" }) + }) + + // Mock readlink to return the symlink target + readlinkMock.mockImplementation((filePath: PathLike) => { + const pathStr = filePath.toString() + if (pathStr.endsWith("AGENTS.md")) { + return Promise.resolve("../actual-agents-file.md") + } + return Promise.reject({ code: "ENOENT" }) + }) + + // Mock stat to indicate the resolved target is a file + statMock.mockImplementation((filePath: PathLike) => { + const pathStr = filePath.toString() + const normalizedPath = pathStr.replace(/\\/g, "/") + if (normalizedPath.endsWith("actual-agents-file.md")) { + return Promise.resolve({ + isFile: vi.fn().mockReturnValue(true), + }) + } + return Promise.reject({ code: "ENOENT" }) + }) + + // Mock readFile to return content from the resolved path + readFileMock.mockImplementation((filePath: PathLike) => { + const pathStr = filePath.toString() + const normalizedPath = pathStr.replace(/\\/g, "/") + if (normalizedPath.endsWith("actual-agents-file.md")) { + return Promise.resolve("Agent rules from symlinked file") + } + return Promise.reject({ code: "ENOENT" }) + }) + + const result = await addCustomInstructions( + "mode instructions", + "global instructions", + "/fake/path", + "test-mode", + { settings: { maxConcurrentFileReads: 5, todoListEnabled: true, useAgentRules: true } }, + ) + + expect(result).toContain("# Agent Rules Standard (AGENTS.md):") + expect(result).toContain("Agent rules from symlinked file") + + // Verify lstat was called to check if it's a symlink + expect(lstatMock).toHaveBeenCalledWith(expect.stringContaining("AGENTS.md")) + + // Verify readlink was called to resolve the symlink + expect(readlinkMock).toHaveBeenCalledWith(expect.stringContaining("AGENTS.md")) + + // Verify the resolved path was read + expect(readFileMock).toHaveBeenCalledWith(expect.stringContaining("actual-agents-file.md"), "utf-8") + }) + + it("should handle AGENTS.md as a regular file when not a symlink", async () => { + // Simulate no .roo/rules-test-mode directory + statMock.mockRejectedValueOnce({ code: "ENOENT" }) + + // Mock lstat to indicate AGENTS.md is NOT a symlink + lstatMock.mockImplementation((filePath: PathLike) => { + const pathStr = filePath.toString() + if (pathStr.endsWith("AGENTS.md")) { + return Promise.resolve({ + isSymbolicLink: vi.fn().mockReturnValue(false), + }) + } + return Promise.reject({ code: "ENOENT" }) + }) + + // Mock readFile to return content directly from AGENTS.md + readFileMock.mockImplementation((filePath: PathLike) => { + const pathStr = filePath.toString() + if (pathStr.endsWith("AGENTS.md")) { + return Promise.resolve("Agent rules from regular file") + } + return Promise.reject({ code: "ENOENT" }) + }) + + const result = await addCustomInstructions( + "mode instructions", + "global instructions", + "/fake/path", + "test-mode", + { settings: { maxConcurrentFileReads: 5, todoListEnabled: true, useAgentRules: true } }, + ) + + expect(result).toContain("# Agent Rules Standard (AGENTS.md):") + expect(result).toContain("Agent rules from regular file") + + // Verify lstat was called + expect(lstatMock).toHaveBeenCalledWith(expect.stringContaining("AGENTS.md")) + + // Verify readlink was NOT called since it's not a symlink + expect(readlinkMock).not.toHaveBeenCalledWith(expect.stringContaining("AGENTS.md")) + + // Verify the file was read directly + expect(readFileMock).toHaveBeenCalledWith(expect.stringContaining("AGENTS.md"), "utf-8") + }) + it("should return empty string when no instructions provided", async () => { // Simulate no .roo/rules directory statMock.mockRejectedValueOnce({ code: "ENOENT" }) diff --git a/src/core/prompts/sections/custom-instructions.ts b/src/core/prompts/sections/custom-instructions.ts index ccd36b2662..22fb6122ec 100644 --- a/src/core/prompts/sections/custom-instructions.ts +++ b/src/core/prompts/sections/custom-instructions.ts @@ -222,7 +222,30 @@ export async function loadRuleFiles(cwd: string): Promise { async function loadAgentRulesFile(cwd: string): Promise { try { const agentsPath = path.join(cwd, "AGENTS.md") - const content = await safeReadFile(agentsPath) + let resolvedPath = agentsPath + + // Check if AGENTS.md exists and handle symlinks + try { + const stats = await fs.lstat(agentsPath) + if (stats.isSymbolicLink()) { + // Create a temporary fileInfo array to use with resolveSymLink + const fileInfo: Array<{ originalPath: string; resolvedPath: string }> = [] + + // Use the existing resolveSymLink function to handle symlink resolution + await resolveSymLink(agentsPath, fileInfo, 0) + + // Extract the resolved path from fileInfo + if (fileInfo.length > 0) { + resolvedPath = fileInfo[0].resolvedPath + } + } + } catch (err) { + // If lstat fails (file doesn't exist), return empty + return "" + } + + // Read the content from the resolved path + const content = await safeReadFile(resolvedPath) if (content) { return `# Agent Rules Standard (AGENTS.md):\n${content}` } From cb6dccab95933b08fad825c4d7d867adbc0d495f Mon Sep 17 00:00:00 2001 From: Chris Estreich Date: Wed, 30 Jul 2025 16:10:53 -0700 Subject: [PATCH 012/253] Miscellaneous cleanup (#6453) --- .roo/rules/rules.md | 3 +- README.vscode.md | 1 - apps/web-evals/package.json | 2 +- apps/web-roo-code/package.json | 3 +- packages/cloud/src/CloudService.ts | 6 ++- src/core/task/Task.ts | 45 +++++++++++------- src/core/webview/ClineProvider.ts | 46 ++++++++++--------- src/extension/api.ts | 2 +- src/package.json | 2 +- .../marketplace/MarketplaceManager.ts | 15 ++++-- src/shared/ProfileValidator.ts | 1 + 11 files changed, 74 insertions(+), 52 deletions(-) delete mode 100644 README.vscode.md diff --git a/.roo/rules/rules.md b/.roo/rules/rules.md index 2323f03354..5726770a28 100644 --- a/.roo/rules/rules.md +++ b/.roo/rules/rules.md @@ -4,7 +4,7 @@ - Before attempting completion, always make sure that any code changes have test coverage - Ensure all tests pass before submitting changes - - The vitest framework is used for testing; the `describe`, `test`, `it`, etc functions are defined by default in `tsconfig.json` and therefore don't need to be imported + - The vitest framework is used for testing; the `vi`, `describe`, `test`, `it`, etc functions are defined by default in `tsconfig.json` and therefore don't need to be imported from `vitest` - Tests must be run from the same directory as the `package.json` file that specifies `vitest` in `devDependencies` - Run tests with: `npx vitest run ` - Do NOT run tests from project root - this causes "vitest: command not found" error @@ -18,6 +18,7 @@ - Never disable any lint rules without explicit user approval 3. Styling Guidelines: + - Use Tailwind CSS classes instead of inline style objects for new markup - VSCode CSS variables must be added to webview-ui/src/index.css before using them in Tailwind classes - Example: `
` instead of style objects diff --git a/README.vscode.md b/README.vscode.md deleted file mode 100644 index 2afed2a9c6..0000000000 --- a/README.vscode.md +++ /dev/null @@ -1 +0,0 @@ -readme test diff --git a/apps/web-evals/package.json b/apps/web-evals/package.json index b210fa085e..df8efec115 100644 --- a/apps/web-evals/package.json +++ b/apps/web-evals/package.json @@ -9,7 +9,7 @@ "format": "prettier --write src", "build": "next build", "start": "next start", - "clean": "rimraf .next .turbo" + "clean": "rimraf tsconfig.tsbuildinfo .next .turbo" }, "dependencies": { "@hookform/resolvers": "^5.1.1", diff --git a/apps/web-roo-code/package.json b/apps/web-roo-code/package.json index 02812dc471..8495dd961a 100644 --- a/apps/web-roo-code/package.json +++ b/apps/web-roo-code/package.json @@ -7,7 +7,8 @@ "check-types": "tsc --noEmit", "dev": "next dev", "build": "next build", - "start": "next start" + "start": "next start", + "clean": "rimraf .next .turbo" }, "dependencies": { "@radix-ui/react-dialog": "^1.1.14", diff --git a/packages/cloud/src/CloudService.ts b/packages/cloud/src/CloudService.ts index 9a32a16fcb..30d1545b23 100644 --- a/packages/cloud/src/CloudService.ts +++ b/packages/cloud/src/CloudService.ts @@ -48,6 +48,7 @@ export class CloudService { try { const cloudToken = process.env.ROO_CODE_CLOUD_TOKEN + if (cloudToken && cloudToken.length > 0) { this.authService = new StaticTokenAuthService(this.context, cloudToken, this.log) } else { @@ -62,8 +63,9 @@ export class CloudService { this.authService.on("logged-out", this.authListener) this.authService.on("user-info", this.authListener) - // Check for static settings environment variable + // Check for static settings environment variable. const staticOrgSettings = process.env.ROO_CODE_CLOUD_ORG_SETTINGS + if (staticOrgSettings && staticOrgSettings.length > 0) { this.settingsService = new StaticSettingsService(staticOrgSettings, this.log) } else { @@ -73,12 +75,12 @@ export class CloudService { () => this.callbacks.stateChanged?.(), this.log, ) + cloudSettingsService.initialize() this.settingsService = cloudSettingsService } this.telemetryClient = new TelemetryClient(this.authService, this.settingsService) - this.shareService = new ShareService(this.authService, this.settingsService, this.log) try { diff --git a/src/core/task/Task.ts b/src/core/task/Task.ts index edbde32ea7..38c67b5021 100644 --- a/src/core/task/Task.ts +++ b/src/core/task/Task.ts @@ -93,10 +93,9 @@ import { getMessagesSinceLastSummary, summarizeConversation } from "../condense" import { maybeRemoveImageBlocks } from "../../api/transform/image-cleaning" import { restoreTodoListForTask } from "../tools/updateTodoListTool" -// Constants const MAX_EXPONENTIAL_BACKOFF_SECONDS = 600 // 10 minutes -export type ClineEvents = { +export type TaskEvents = { message: [{ action: "created" | "updated"; message: ClineMessage }] taskStarted: [] taskModeSwitched: [taskId: string, mode: string] @@ -110,6 +109,10 @@ export type ClineEvents = { taskToolFailed: [taskId: string, tool: ToolName, error: string] } +export type TaskEventHandlers = { + [K in keyof TaskEvents]: (...args: TaskEvents[K]) => void | Promise +} + export type TaskOptions = { provider: ClineProvider apiConfiguration: ProviderSettings @@ -125,10 +128,10 @@ export type TaskOptions = { rootTask?: Task parentTask?: Task taskNumber?: number - onCreated?: (cline: Task) => void + onCreated?: (task: Task) => void } -export class Task extends EventEmitter { +export class Task extends EventEmitter { todoList?: TodoItem[] readonly taskId: string readonly instanceId: string @@ -137,6 +140,7 @@ export class Task extends EventEmitter { readonly parentTask: Task | undefined = undefined readonly taskNumber: number readonly workspacePath: string + /** * The mode associated with this task. Persisted across sessions * to maintain user context when reopening tasks from history. @@ -279,10 +283,12 @@ export class Task extends EventEmitter { } this.taskId = historyItem ? historyItem.id : crypto.randomUUID() - // normal use-case is usually retry similar history task with new workspace + + // Normal use-case is usually retry similar history task with new workspace. this.workspacePath = parentTask ? parentTask.workspacePath : getWorkspacePath(path.join(os.homedir(), "Desktop")) + this.instanceId = crypto.randomUUID().slice(0, 8) this.taskNumber = -1 @@ -311,25 +317,26 @@ export class Task extends EventEmitter { this.parentTask = parentTask this.taskNumber = taskNumber - // Store the task's mode when it's created - // For history items, use the stored mode; for new tasks, we'll set it after getting state + // Store the task's mode when it's created. + // For history items, use the stored mode; for new tasks, we'll set it + // after getting state. if (historyItem) { this._taskMode = historyItem.mode || defaultModeSlug this.taskModeReady = Promise.resolve() TelemetryService.instance.captureTaskRestarted(this.taskId) } else { - // For new tasks, don't set the mode yet - wait for async initialization + // For new tasks, don't set the mode yet - wait for async initialization. this._taskMode = undefined this.taskModeReady = this.initializeTaskMode(provider) TelemetryService.instance.captureTaskCreated(this.taskId) } - // Only set up diff strategy if diff is enabled + // Only set up diff strategy if diff is enabled. if (this.diffEnabled) { - // Default to old strategy, will be updated if experiment is enabled + // Default to old strategy, will be updated if experiment is enabled. this.diffStrategy = new MultiSearchReplaceDiffStrategy(this.fuzzyMatchThreshold) - // Check experiment asynchronously and update strategy if needed + // Check experiment asynchronously and update strategy if needed. provider.getState().then((state) => { const isMultiFileApplyDiffEnabled = experiments.isEnabled( state.experiments ?? {}, @@ -1230,7 +1237,7 @@ export class Task extends EventEmitter { } } catch (error) { console.error("Error disposing RooIgnoreController:", error) - // This is the critical one for the leak fix + // This is the critical one for the leak fix. } try { @@ -1240,7 +1247,7 @@ export class Task extends EventEmitter { } try { - // If we're not streaming then `abortStream` won't be called + // If we're not streaming then `abortStream` won't be called. if (this.isStreaming && this.diffViewProvider.isEditing) { this.diffViewProvider.revertChanges().catch(console.error) } @@ -1847,6 +1854,7 @@ export class Task extends EventEmitter { public async *attemptApiRequest(retryAttempt: number = 0): ApiStream { const state = await this.providerRef.deref()?.getState() + const { apiConfiguration, autoApprovalEnabled, @@ -1858,21 +1866,24 @@ export class Task extends EventEmitter { profileThresholds = {}, } = state ?? {} - // Get condensing configuration for automatic triggers + // Get condensing configuration for automatic triggers. const customCondensingPrompt = state?.customCondensingPrompt const condensingApiConfigId = state?.condensingApiConfigId const listApiConfigMeta = state?.listApiConfigMeta - // Determine API handler to use for condensing + // Determine API handler to use for condensing. let condensingApiHandler: ApiHandler | undefined + if (condensingApiConfigId && listApiConfigMeta && Array.isArray(listApiConfigMeta)) { - // Using type assertion for the id property to avoid implicit any + // Using type assertion for the id property to avoid implicit any. const matchingConfig = listApiConfigMeta.find((config: any) => config.id === condensingApiConfigId) + if (matchingConfig) { const profile = await this.providerRef.deref()?.providerSettingsManager.getProfile({ id: condensingApiConfigId, }) - // Ensure profile and apiProvider exist before trying to build handler + + // Ensure profile and apiProvider exist before trying to build handler. if (profile && profile.apiProvider) { condensingApiHandler = buildApiHandler(profile) } diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index 31aac80932..e013525e06 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -23,12 +23,12 @@ import { type TerminalActionPromptType, type HistoryItem, type CloudUserInfo, - type MarketplaceItem, requestyDefaultModelId, openRouterDefaultModelId, glamaDefaultModelId, ORGANIZATION_ALLOW_ALL, DEFAULT_TERMINAL_OUTPUT_CHARACTER_LIMIT, + DEFAULT_WRITE_DELAY_MS, } from "@roo-code/types" import { TelemetryService } from "@roo-code/telemetry" import { CloudService, getRooCodeApiUrl } from "@roo-code/cloud" @@ -41,9 +41,8 @@ import { supportPrompt } from "../../shared/support-prompt" import { GlobalFileNames } from "../../shared/globalFileNames" import { ExtensionMessage, MarketplaceInstalledMetadata } from "../../shared/ExtensionMessage" import { Mode, defaultModeSlug, getModeBySlug } from "../../shared/modes" -import { experimentDefault, experiments, EXPERIMENT_IDS } from "../../shared/experiments" +import { experimentDefault } from "../../shared/experiments" import { formatLanguage } from "../../shared/language" -import { DEFAULT_WRITE_DELAY_MS } from "@roo-code/types" import { Terminal } from "../../integrations/terminal/Terminal" import { downloadTask } from "../../integrations/misc/export-markdown" import { getTheme } from "../../integrations/theme/getTheme" @@ -78,13 +77,7 @@ import { getWorkspaceGitInfo } from "../../utils/git" */ export type ClineProviderEvents = { - clineCreated: [cline: Task] -} - -class OrganizationAllowListViolationError extends Error { - constructor(message: string) { - super(message) - } + taskCreated: [task: Task] } export class ClineProvider @@ -380,6 +373,7 @@ export class ClineProvider // Errors from terminal commands seem to get swallowed / ignored. vscode.window.showErrorMessage(error.message) } + throw error } } @@ -526,7 +520,7 @@ export class ClineProvider // of tasks, each one being a sub task of the previous one until the main // task is finished. public async initClineWithTask( - task?: string, + text?: string, images?: string[], parentTask?: Task, options: Partial< @@ -549,30 +543,30 @@ export class ClineProvider throw new OrganizationAllowListViolationError(t("common:errors.violated_organization_allowlist")) } - const cline = new Task({ + const task = new Task({ provider: this, apiConfiguration, enableDiff, enableCheckpoints, fuzzyMatchThreshold, consecutiveMistakeLimit: apiConfiguration.consecutiveMistakeLimit, - task, + task: text, images, experiments, rootTask: this.clineStack.length > 0 ? this.clineStack[0] : undefined, parentTask, taskNumber: this.clineStack.length + 1, - onCreated: (cline) => this.emit("clineCreated", cline), + onCreated: (instance) => this.emit("taskCreated", instance), ...options, }) - await this.addClineToStack(cline) + await this.addClineToStack(task) this.log( - `[subtasks] ${cline.parentTask ? "child" : "parent"} task ${cline.taskId}.${cline.instanceId} instantiated`, + `[subtasks] ${task.parentTask ? "child" : "parent"} task ${task.taskId}.${task.instanceId} instantiated`, ) - return cline + return task } public async initClineWithHistoryItem(historyItem: HistoryItem & { rootTask?: Task; parentTask?: Task }) { @@ -629,7 +623,7 @@ export class ClineProvider experiments, } = await this.getState() - const cline = new Task({ + const task = new Task({ provider: this, apiConfiguration, enableDiff, @@ -641,14 +635,16 @@ export class ClineProvider rootTask: historyItem.rootTask, parentTask: historyItem.parentTask, taskNumber: historyItem.number, - onCreated: (cline) => this.emit("clineCreated", cline), + onCreated: (instance) => this.emit("taskCreated", instance), }) - await this.addClineToStack(cline) + await this.addClineToStack(task) + this.log( - `[subtasks] ${cline.parentTask ? "child" : "parent"} task ${cline.taskId}.${cline.instanceId} instantiated`, + `[subtasks] ${task.parentTask ? "child" : "parent"} task ${task.taskId}.${task.instanceId} instantiated`, ) - return cline + + return task } public async postMessageToWebview(message: ExtensionMessage) { @@ -1999,3 +1995,9 @@ export class ClineProvider } } } + +class OrganizationAllowListViolationError extends Error { + constructor(message: string) { + super(message) + } +} diff --git a/src/extension/api.ts b/src/extension/api.ts index 7027cb963a..fba10d041a 100644 --- a/src/extension/api.ts +++ b/src/extension/api.ts @@ -214,7 +214,7 @@ export class API extends EventEmitter implements RooCodeAPI { } private registerListeners(provider: ClineProvider) { - provider.on("clineCreated", (cline) => { + provider.on("taskCreated", (cline) => { cline.on("taskStarted", async () => { this.emit(RooCodeEventName.TaskStarted, cline.taskId) this.taskMap.set(cline.taskId, provider) diff --git a/src/package.json b/src/package.json index 551c9303a2..8503d2bdc6 100644 --- a/src/package.json +++ b/src/package.json @@ -407,7 +407,7 @@ "publish:marketplace": "vsce publish --no-dependencies && ovsx publish --no-dependencies", "watch:bundle": "pnpm bundle --watch", "watch:tsc": "cd .. && tsc --noEmit --watch --project src/tsconfig.json", - "clean": "rimraf README.md CHANGELOG.md LICENSE dist mock .turbo" + "clean": "rimraf README.md CHANGELOG.md LICENSE dist logs mock .turbo" }, "dependencies": { "@anthropic-ai/bedrock-sdk": "^0.10.2", diff --git a/src/services/marketplace/MarketplaceManager.ts b/src/services/marketplace/MarketplaceManager.ts index 6cd174a577..800eba62e0 100644 --- a/src/services/marketplace/MarketplaceManager.ts +++ b/src/services/marketplace/MarketplaceManager.ts @@ -1,16 +1,20 @@ -import * as vscode from "vscode" import * as fs from "fs/promises" import * as path from "path" + +import * as vscode from "vscode" import * as yaml from "yaml" -import { RemoteConfigLoader } from "./RemoteConfigLoader" -import { SimpleInstaller } from "./SimpleInstaller" + import type { MarketplaceItem, MarketplaceItemType, McpMarketplaceItem, OrganizationSettings } from "@roo-code/types" +import { TelemetryService } from "@roo-code/telemetry" +import { CloudService } from "@roo-code/cloud" + import { GlobalFileNames } from "../../shared/globalFileNames" import { ensureSettingsDirectoryExists } from "../../utils/globalContext" import { t } from "../../i18n" -import { TelemetryService } from "@roo-code/telemetry" import type { CustomModesManager } from "../../core/config/CustomModesManager" -import { CloudService } from "@roo-code/cloud" + +import { RemoteConfigLoader } from "./RemoteConfigLoader" +import { SimpleInstaller } from "./SimpleInstaller" export interface MarketplaceItemsResponse { organizationMcps: MarketplaceItem[] @@ -35,6 +39,7 @@ export class MarketplaceManager { const errors: string[] = [] let orgSettings: OrganizationSettings | undefined + try { if (CloudService.hasInstance() && CloudService.instance.isAuthenticated()) { orgSettings = CloudService.instance.getOrganizationSettings() diff --git a/src/shared/ProfileValidator.ts b/src/shared/ProfileValidator.ts index 2ebf9bb3ab..9cfba84aae 100644 --- a/src/shared/ProfileValidator.ts +++ b/src/shared/ProfileValidator.ts @@ -41,6 +41,7 @@ export class ProfileValidator { } const providerAllowList = allowList.providers[providerName] + if (!providerAllowList) { return false } From 796ee5c0e3015f3e97cc3bb856e9e17f48e03f83 Mon Sep 17 00:00:00 2001 From: Chris Estreich Date: Wed, 30 Jul 2025 17:12:21 -0700 Subject: [PATCH 013/253] Migrate evals database when deploying roo-code-website (#6146) Evals db migrate --- .github/workflows/website-deploy.yml | 17 +++++++++++------ packages/evals/package.json | 5 ++--- .../db/migrations/0001_add_timeout_to_runs.sql | 1 - 3 files changed, 13 insertions(+), 10 deletions(-) delete mode 100644 packages/evals/src/db/migrations/0001_add_timeout_to_runs.sql diff --git a/.github/workflows/website-deploy.yml b/.github/workflows/website-deploy.yml index 20eea4288a..cd18a3e766 100644 --- a/.github/workflows/website-deploy.yml +++ b/.github/workflows/website-deploy.yml @@ -5,7 +5,7 @@ on: branches: - main paths: - - 'apps/web-roo-code/**' + - "apps/web-roo-code/**" workflow_dispatch: env: @@ -21,11 +21,11 @@ jobs: - name: Check if VERCEL_TOKEN exists id: check run: | - if [ -n "${{ secrets.VERCEL_TOKEN }}" ]; then - echo "has-vercel-token=true" >> $GITHUB_OUTPUT - else - echo "has-vercel-token=false" >> $GITHUB_OUTPUT - fi + if [ -n "${{ secrets.VERCEL_TOKEN }}" ]; then + echo "has-vercel-token=true" >> $GITHUB_OUTPUT + else + echo "has-vercel-token=false" >> $GITHUB_OUTPUT + fi deploy: runs-on: ubuntu-latest @@ -36,6 +36,11 @@ jobs: uses: actions/checkout@v4 - name: Setup Node.js and pnpm uses: ./.github/actions/setup-node-pnpm + - name: Migrate evals database + run: pnpm db:migrate:production + working-directory: packages/evals + env: + DATABASE_URL: ${{ secrets.EVALS_DATABASE_URL }} - name: Install Vercel CLI run: npm install --global vercel@canary - name: Pull Vercel Environment Information diff --git a/packages/evals/package.json b/packages/evals/package.json index 83690a99c4..a918a2a586 100644 --- a/packages/evals/package.json +++ b/packages/evals/package.json @@ -15,9 +15,8 @@ "drizzle-kit:production": "dotenvx run -f .env.production -- tsx node_modules/drizzle-kit/bin.cjs", "db:generate": "pnpm drizzle-kit generate", "db:migrate": "pnpm drizzle-kit migrate", - "db:push": "pnpm drizzle-kit push", - "db:test:push": "pnpm drizzle-kit:test push", - "db:production:push": "pnpm drizzle-kit:production push", + "db:migrate:production": "pnpm drizzle-kit:production migrate", + "db:push:test": "pnpm drizzle-kit:test push", "db:up": "dotenvx run -f .env.development .env.local -- docker compose up -d db", "db:down": "dotenvx run -f .env.development .env.local -- docker compose down db", "redis:up": "dotenvx run -f .env.development .env.local -- docker compose up -d redis", diff --git a/packages/evals/src/db/migrations/0001_add_timeout_to_runs.sql b/packages/evals/src/db/migrations/0001_add_timeout_to_runs.sql deleted file mode 100644 index 16d3cc1bdd..0000000000 --- a/packages/evals/src/db/migrations/0001_add_timeout_to_runs.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE "runs" ADD COLUMN "timeout" integer DEFAULT 5 NOT NULL; \ No newline at end of file From c21ef368d7877caaa9eb58a024fcad03d41e4399 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 30 Jul 2025 20:18:38 -0400 Subject: [PATCH 014/253] chore(deps): update dependency @changesets/cli to v2.29.5 (#4936) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- pnpm-lock.yaml | 67 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 22 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 311c51d0ba..c70669d452 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,7 +18,7 @@ importers: devDependencies: '@changesets/cli': specifier: ^2.27.10 - version: 2.29.4 + version: 2.29.5 '@dotenvx/dotenvx': specifier: ^1.34.0 version: 1.44.2 @@ -1468,14 +1468,14 @@ packages: '@changesets/apply-release-plan@7.0.12': resolution: {integrity: sha512-EaET7As5CeuhTzvXTQCRZeBUcisoYPDDcXvgTE/2jmmypKp0RC7LxKj/yzqeh/1qFTZI7oDGFcL1PHRuQuketQ==} - '@changesets/assemble-release-plan@6.0.8': - resolution: {integrity: sha512-y8+8LvZCkKJdbUlpXFuqcavpzJR80PN0OIfn8HZdwK7Sh6MgLXm4hKY5vu6/NDoKp8lAlM4ERZCqRMLxP4m+MQ==} + '@changesets/assemble-release-plan@6.0.9': + resolution: {integrity: sha512-tPgeeqCHIwNo8sypKlS3gOPmsS3wP0zHt67JDuL20P4QcXiw/O4Hl7oXiuLnP9yg+rXLQ2sScdV1Kkzde61iSQ==} '@changesets/changelog-git@0.2.1': resolution: {integrity: sha512-x/xEleCFLH28c3bQeQIyeZf8lFXyDFVn1SgcBiR2Tw/r4IAWlk1fzxCEZ6NxQAjF2Nwtczoen3OA2qR+UawQ8Q==} - '@changesets/cli@2.29.4': - resolution: {integrity: sha512-VW30x9oiFp/un/80+5jLeWgEU6Btj8IqOgI+X/zAYu4usVOWXjPIK5jSSlt5jsCU7/6Z7AxEkarxBxGUqkAmNg==} + '@changesets/cli@2.29.5': + resolution: {integrity: sha512-0j0cPq3fgxt2dPdFsg4XvO+6L66RC0pZybT9F4dG5TBrLA3jA/1pNkdTXH9IBBVHkgsKrNKenI3n1mPyPlIydg==} hasBin: true '@changesets/config@3.1.1': @@ -1487,8 +1487,8 @@ packages: '@changesets/get-dependents-graph@2.1.3': resolution: {integrity: sha512-gphr+v0mv2I3Oxt19VdWRRUxq3sseyUpX9DaHpTUmLj92Y10AGy+XOtV+kbM6L/fDcpx7/ISDFK6T8A/P3lOdQ==} - '@changesets/get-release-plan@4.0.12': - resolution: {integrity: sha512-KukdEgaafnyGryUwpHG2kZ7xJquOmWWWk5mmoeQaSvZTWH1DC5D/Sw6ClgGFYtQnOMSQhgoEbDxAbpIIayKH1g==} + '@changesets/get-release-plan@4.0.13': + resolution: {integrity: sha512-DWG1pus72FcNeXkM12tx+xtExyH/c9I1z+2aXlObH3i9YA7+WZEVaiHzHl03thpvAgWTRaH64MpfHxozfF7Dvg==} '@changesets/get-version-range-type@0.4.0': resolution: {integrity: sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==} @@ -3886,6 +3886,9 @@ packages: '@types/node@20.19.1': resolution: {integrity: sha512-jJD50LtlD2dodAEO653i3YF04NWak6jN3ky+Ri3Em3mGR39/glWiboM/IePaRbgwSfqM1TpGXfAg8ohn/4dTgA==} + '@types/node@20.19.4': + resolution: {integrity: sha512-OP+We5WV8Xnbuvw0zC2m4qfB/BJvjyCwtNjhHdJxV1639SGSKrLmJkc3fMnp2Qy8nJyHp8RO6umxELN/dS1/EA==} + '@types/node@22.15.29': resolution: {integrity: sha512-LNdjOkUDlU1RZb8e1kOIUpN1qQUlzGkEtbVNo53vbrwDg5om6oduhm4SiUaPW5ASTXhAiP0jInWG8Qx9fVlOeQ==} @@ -9655,6 +9658,18 @@ packages: utf-8-validate: optional: true + ws@8.18.3: + resolution: {integrity: sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==} + engines: {node: '>=10.0.0'} + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: '>=5.0.2' + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + xml-name-validator@5.0.0: resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==} engines: {node: '>=18'} @@ -10563,7 +10578,7 @@ snapshots: resolve-from: 5.0.0 semver: 7.7.2 - '@changesets/assemble-release-plan@6.0.8': + '@changesets/assemble-release-plan@6.0.9': dependencies: '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.1.3 @@ -10576,15 +10591,15 @@ snapshots: dependencies: '@changesets/types': 6.1.0 - '@changesets/cli@2.29.4': + '@changesets/cli@2.29.5': dependencies: '@changesets/apply-release-plan': 7.0.12 - '@changesets/assemble-release-plan': 6.0.8 + '@changesets/assemble-release-plan': 6.0.9 '@changesets/changelog-git': 0.2.1 '@changesets/config': 3.1.1 '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.1.3 - '@changesets/get-release-plan': 4.0.12 + '@changesets/get-release-plan': 4.0.13 '@changesets/git': 3.0.4 '@changesets/logger': 0.1.1 '@changesets/pre': 2.0.2 @@ -10628,9 +10643,9 @@ snapshots: picocolors: 1.1.1 semver: 7.7.2 - '@changesets/get-release-plan@4.0.12': + '@changesets/get-release-plan@4.0.13': dependencies: - '@changesets/assemble-release-plan': 6.0.8 + '@changesets/assemble-release-plan': 6.0.9 '@changesets/config': 3.1.1 '@changesets/pre': 2.0.2 '@changesets/read': 0.6.5 @@ -11158,7 +11173,7 @@ snapshots: '@libsql/isomorphic-ws@0.1.5': dependencies: '@types/ws': 8.18.1 - ws: 8.18.2 + ws: 8.18.3 transitivePeerDependencies: - bufferutil - utf-8-validate @@ -11205,14 +11220,14 @@ snapshots: '@manypkg/find-root@1.1.0': dependencies: - '@babel/runtime': 7.27.4 + '@babel/runtime': 7.27.6 '@types/node': 12.20.55 find-up: 4.1.0 fs-extra: 8.1.0 '@manypkg/get-packages@1.1.3': dependencies: - '@babel/runtime': 7.27.1 + '@babel/runtime': 7.27.6 '@changesets/types': 4.1.0 '@manypkg/find-root': 1.1.0 fs-extra: 8.1.0 @@ -13149,6 +13164,11 @@ snapshots: dependencies: undici-types: 6.21.0 + '@types/node@20.19.4': + dependencies: + undici-types: 6.21.0 + optional: true + '@types/node@22.15.29': dependencies: undici-types: 6.21.0 @@ -13212,7 +13232,7 @@ snapshots: '@types/ws@8.18.1': dependencies: - '@types/node': 20.19.1 + '@types/node': 20.19.4 optional: true '@types/yargs-parser@21.0.3': {} @@ -13223,7 +13243,7 @@ snapshots: '@types/yauzl@2.10.3': dependencies: - '@types/node': 20.17.57 + '@types/node': 20.17.50 optional: true '@typescript-eslint/eslint-plugin@8.32.1(@typescript-eslint/parser@8.32.1(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3))(eslint@9.27.0(jiti@2.4.2))(typescript@5.8.3)': @@ -14584,7 +14604,7 @@ snapshots: dom-helpers@5.2.1: dependencies: - '@babel/runtime': 7.27.4 + '@babel/runtime': 7.27.6 csstype: 3.1.3 dom-serializer@2.0.0: @@ -16035,7 +16055,7 @@ snapshots: is-it-type@5.1.2: dependencies: - '@babel/runtime': 7.27.4 + '@babel/runtime': 7.27.6 globalthis: 1.0.4 is-map@2.0.3: {} @@ -18135,7 +18155,7 @@ snapshots: react-transition-group@4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: - '@babel/runtime': 7.27.4 + '@babel/runtime': 7.27.6 dom-helpers: 5.2.1 loose-envify: 1.4.0 prop-types: 15.8.1 @@ -18459,7 +18479,7 @@ snapshots: rtl-css-js@1.16.1: dependencies: - '@babel/runtime': 7.27.4 + '@babel/runtime': 7.27.6 run-applescript@7.0.0: {} @@ -20019,6 +20039,9 @@ snapshots: ws@8.18.2: {} + ws@8.18.3: + optional: true + xml-name-validator@5.0.0: {} xml2js@0.5.0: From b71cd44c1c6b253cd4d89bb2e14f9b655b40d09a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 30 Jul 2025 20:23:02 -0400 Subject: [PATCH 015/253] Update contributors list (#6360) docs: update contributors list [skip ci] Co-authored-by: mrubens <2600+mrubens@users.noreply.github.com> --- README.md | 78 ++++++++++++++++++++-------------------- locales/ca/README.md | 80 ++++++++++++++++++++--------------------- locales/de/README.md | 80 ++++++++++++++++++++--------------------- locales/es/README.md | 80 ++++++++++++++++++++--------------------- locales/fr/README.md | 80 ++++++++++++++++++++--------------------- locales/hi/README.md | 80 ++++++++++++++++++++--------------------- locales/id/README.md | 80 ++++++++++++++++++++--------------------- locales/it/README.md | 80 ++++++++++++++++++++--------------------- locales/ja/README.md | 80 ++++++++++++++++++++--------------------- locales/ko/README.md | 80 ++++++++++++++++++++--------------------- locales/nl/README.md | 80 ++++++++++++++++++++--------------------- locales/pl/README.md | 80 ++++++++++++++++++++--------------------- locales/pt-BR/README.md | 80 ++++++++++++++++++++--------------------- locales/ru/README.md | 80 ++++++++++++++++++++--------------------- locales/tr/README.md | 80 ++++++++++++++++++++--------------------- locales/vi/README.md | 80 ++++++++++++++++++++--------------------- locales/zh-CN/README.md | 80 ++++++++++++++++++++--------------------- locales/zh-TW/README.md | 80 ++++++++++++++++++++--------------------- 18 files changed, 702 insertions(+), 736 deletions(-) diff --git a/README.md b/README.md index f4441dc8a6..38e58264cf 100644 --- a/README.md +++ b/README.md @@ -208,45 +208,45 @@ Thanks to all our contributors who have helped make Roo Code better! -| mrubens
mrubens | saoudrizwan
saoudrizwan | cte
cte | daniel-lxs
daniel-lxs | samhvw8
samhvw8 | hannesrudolph
hannesrudolph | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
KJ7LNW | a8trejo
a8trejo | MuriloFP
MuriloFP | ColemanRoo
ColemanRoo | canrobins13
canrobins13 | stea9499
stea9499 | -| joemanley201
joemanley201 | System233
System233 | jr
jr | nissa-seru
nissa-seru | jquanton
jquanton | roomote-agent
roomote-agent | -| NyxJae
NyxJae | d-oit
d-oit | elianiva
elianiva | qdaxb
qdaxb | punkpeye
punkpeye | wkordalski
wkordalski | -| SannidhyaSah
SannidhyaSah | xyOz-dev
xyOz-dev | chrarnoldus
chrarnoldus | sachasayan
sachasayan | Smartsheet-JB-Brown
Smartsheet-JB-Brown | monotykamary
monotykamary | -| cannuri
cannuri | feifei325
feifei325 | zhangtony239
zhangtony239 | shariqriazz
shariqriazz | vigneshsubbiah16
vigneshsubbiah16 | pugazhendhi-m
pugazhendhi-m | -| lloydchang
lloydchang | dtrugman
dtrugman | Szpadel
Szpadel | lupuletic
lupuletic | kiwina
kiwina | liwilliam2021
liwilliam2021 | -| Premshay
Premshay | psv2522
psv2522 | olweraltuve
olweraltuve | diarmidmackenzie
diarmidmackenzie | hassoncs
hassoncs | ChuKhaLi
ChuKhaLi | -| PeterDaveHello
PeterDaveHello | aheizi
aheizi | nbihan-mediware
nbihan-mediware | noritaka1166
noritaka1166 | RaySinner
RaySinner | afshawnlotfi
afshawnlotfi | -| dleffel
dleffel | StevenTCramer
StevenTCramer | Ruakij
Ruakij | pdecat
pdecat | kyle-apex
kyle-apex | emshvac
emshvac | -| Lunchb0ne
Lunchb0ne | SmartManoj
SmartManoj | vagadiya
vagadiya | slytechnical
slytechnical | dlab-anton
dlab-anton | arthurauffray
arthurauffray | -| upamune
upamune | NamesMT
NamesMT | taylorwilsdon
taylorwilsdon | sammcj
sammcj | p12tic
p12tic | gtaylor
gtaylor | -| brunobergher
brunobergher | aitoroses
aitoroses | ross
ross | mr-ryan-james
mr-ryan-james | heyseth
heyseth | taisukeoe
taisukeoe | -| avtc
avtc | eonghk
eonghk | GOODBOY008
GOODBOY008 | kcwhite
kcwhite | ronyblum
ronyblum | teddyOOXX
teddyOOXX | -| vincentsong
vincentsong | yongjer
yongjer | zeozeozeo
zeozeozeo | ashktn
ashktn | franekp
franekp | yt3trees
yt3trees | -| seedlord
seedlord | bramburn
bramburn | anton-otee
anton-otee | benzntech
benzntech | axkirillov
axkirillov | olearycrew
olearycrew | -| catrielmuller
catrielmuller | devxpain
devxpain | snoyiatk
snoyiatk | GitlyHallows
GitlyHallows | jcbdev
jcbdev | Chenjiayuan195
Chenjiayuan195 | -| julionav
julionav | KanTakahiro
KanTakahiro | SplittyDev
SplittyDev | mdp
mdp | napter
napter | philfung
philfung | -| bbenshalom
bbenshalom | chris-garrett
chris-garrett | dairui1
dairui1 | dqroid
dqroid | janaki-sasidhar
janaki-sasidhar | forestyoo
forestyoo | -| hatsu38
hatsu38 | hongzio
hongzio | im47cn
im47cn | shoopapa
shoopapa | jwcraig
jwcraig | kinandan
kinandan | -| bannzai
bannzai | axmo
axmo | asychin
asychin | amittell
amittell | Yoshino-Yukitaro
Yoshino-Yukitaro | Yikai-Liao
Yikai-Liao | -| zxdvd
zxdvd | s97712
s97712 | vladstudio
vladstudio | vivekfyi
vivekfyi | HahaBill
HahaBill | tmsjngx0
tmsjngx0 | -| TGlide
TGlide | Githubguy132010
Githubguy132010 | nevermorec
nevermorec | PretzelVector
PretzelVector | zetaloop
zetaloop | cdlliuy
cdlliuy | -| user202729
user202729 | thill2323
thill2323 | takakoutso
takakoutso | student20880
student20880 | shubhamgupta731
shubhamgupta731 | shohei-ihaya
shohei-ihaya | -| shivamd1810
shivamd1810 | shaybc
shaybc | sensei-woo
sensei-woo | samir-nimbly
samir-nimbly | robertheadley
robertheadley | refactorthis
refactorthis | -| qingyuan1109
qingyuan1109 | pokutuna
pokutuna | philipnext
philipnext | village-way
village-way | oprstchn
oprstchn | nobu007
nobu007 | -| mosleyit
mosleyit | moqimoqidea
moqimoqidea | mlopezr
mlopezr | mecab
mecab | olup
olup | lightrabbit
lightrabbit | -| lhish
lhish | kohii
kohii | tgfjt
tgfjt | DeXtroTip
DeXtroTip | pfitz
pfitz | ExactDoug
ExactDoug | -| celestial-vault
celestial-vault | linegel
linegel | edwin-truthsearch-io
edwin-truthsearch-io | EamonNerbonne
EamonNerbonne | dbasclpy
dbasclpy | dflatline
dflatline | -| Deon588
Deon588 | dleen
dleen | CW-B-W
CW-B-W | chadgauth
chadgauth | thecolorblue
thecolorblue | bogdan0083
bogdan0083 | -| benashby
benashby | Atlogit
Atlogit | atlasgong
atlasgong | andrewshu2000
andrewshu2000 | andreastempsch
andreastempsch | alasano
alasano | -| QuinsZouls
QuinsZouls | HadesArchitect
HadesArchitect | alarno
alarno | nexon33
nexon33 | adilhafeez
adilhafeez | adamwlarson
adamwlarson | -| adamhill
adamhill | AMHesch
AMHesch | maekawataiki
maekawataiki | AlexandruSmirnov
AlexandruSmirnov | samsilveira
samsilveira | 01Rian
01Rian | -| RSO
RSO | RandalSchwartz
RandalSchwartz | SECKainersdorfer
SECKainersdorfer | R-omk
R-omk | Sarke
Sarke | PaperBoardOfficial
PaperBoardOfficial | -| OlegOAndreev
OlegOAndreev | Naam
Naam | kvokka
kvokka | ecmasx
ecmasx | mollux
mollux | marvijo-code
marvijo-code | -| markijbema
markijbema | mamertofabian
mamertofabian | monkeyDluffy6017
monkeyDluffy6017 | libertyteeth
libertyteeth | shtse8
shtse8 | Rexarrior
Rexarrior | -| kevinvandijk
kevinvandijk | KevinZhao
KevinZhao | ksze
ksze | Juice10
Juice10 | Fovty
Fovty | Jdo300
Jdo300 | -| hesara
hesara | | | | | | +| mrubens
mrubens | saoudrizwan
saoudrizwan | cte
cte | daniel-lxs
daniel-lxs | samhvw8
samhvw8 | hannesrudolph
hannesrudolph | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
KJ7LNW | a8trejo
a8trejo | MuriloFP
MuriloFP | ColemanRoo
ColemanRoo | canrobins13
canrobins13 | stea9499
stea9499 | +| joemanley201
joemanley201 | System233
System233 | jr
jr | nissa-seru
nissa-seru | jquanton
jquanton | roomote-agent
roomote-agent | +| NyxJae
NyxJae | d-oit
d-oit | elianiva
elianiva | qdaxb
qdaxb | punkpeye
punkpeye | wkordalski
wkordalski | +| SannidhyaSah
SannidhyaSah | xyOz-dev
xyOz-dev | chrarnoldus
chrarnoldus | sachasayan
sachasayan | Smartsheet-JB-Brown
Smartsheet-JB-Brown | monotykamary
monotykamary | +| cannuri
cannuri | feifei325
feifei325 | zhangtony239
zhangtony239 | shariqriazz
shariqriazz | vigneshsubbiah16
vigneshsubbiah16 | pugazhendhi-m
pugazhendhi-m | +| lloydchang
lloydchang | dtrugman
dtrugman | Szpadel
Szpadel | hassoncs
hassoncs | liwilliam2021
liwilliam2021 | lupuletic
lupuletic | +| kiwina
kiwina | Premshay
Premshay | psv2522
psv2522 | olweraltuve
olweraltuve | diarmidmackenzie
diarmidmackenzie | ChuKhaLi
ChuKhaLi | +| PeterDaveHello
PeterDaveHello | aheizi
aheizi | nbihan-mediware
nbihan-mediware | noritaka1166
noritaka1166 | RaySinner
RaySinner | afshawnlotfi
afshawnlotfi | +| dleffel
dleffel | StevenTCramer
StevenTCramer | Ruakij
Ruakij | pdecat
pdecat | kyle-apex
kyle-apex | emshvac
emshvac | +| Lunchb0ne
Lunchb0ne | SmartManoj
SmartManoj | vagadiya
vagadiya | slytechnical
slytechnical | dlab-anton
dlab-anton | arthurauffray
arthurauffray | +| upamune
upamune | NamesMT
NamesMT | taylorwilsdon
taylorwilsdon | sammcj
sammcj | p12tic
p12tic | gtaylor
gtaylor | +| brunobergher
brunobergher | aitoroses
aitoroses | ross
ross | mr-ryan-james
mr-ryan-james | heyseth
heyseth | taisukeoe
taisukeoe | +| avtc
avtc | eonghk
eonghk | GOODBOY008
GOODBOY008 | kcwhite
kcwhite | ronyblum
ronyblum | teddyOOXX
teddyOOXX | +| vincentsong
vincentsong | yongjer
yongjer | zeozeozeo
zeozeozeo | ashktn
ashktn | franekp
franekp | yt3trees
yt3trees | +| seedlord
seedlord | bramburn
bramburn | anton-otee
anton-otee | benzntech
benzntech | axkirillov
axkirillov | olearycrew
olearycrew | +| catrielmuller
catrielmuller | devxpain
devxpain | snoyiatk
snoyiatk | GitlyHallows
GitlyHallows | jcbdev
jcbdev | Chenjiayuan195
Chenjiayuan195 | +| julionav
julionav | KanTakahiro
KanTakahiro | SplittyDev
SplittyDev | mdp
mdp | napter
napter | philfung
philfung | +| bannzai
bannzai | bbenshalom
bbenshalom | chris-garrett
chris-garrett | dairui1
dairui1 | dqroid
dqroid | janaki-sasidhar
janaki-sasidhar | +| forestyoo
forestyoo | hatsu38
hatsu38 | hongzio
hongzio | im47cn
im47cn | shoopapa
shoopapa | jwcraig
jwcraig | +| axmo
axmo | asychin
asychin | amittell
amittell | Yoshino-Yukitaro
Yoshino-Yukitaro | Yikai-Liao
Yikai-Liao | zxdvd
zxdvd | +| s97712
s97712 | vladstudio
vladstudio | vivekfyi
vivekfyi | HahaBill
HahaBill | tmsjngx0
tmsjngx0 | TGlide
TGlide | +| Githubguy132010
Githubguy132010 | tgfjt
tgfjt | maekawataiki
maekawataiki | nevermorec
nevermorec | PretzelVector
PretzelVector | zetaloop
zetaloop | +| cdlliuy
cdlliuy | user202729
user202729 | thill2323
thill2323 | takakoutso
takakoutso | student20880
student20880 | shubhamgupta731
shubhamgupta731 | +| shohei-ihaya
shohei-ihaya | shivamd1810
shivamd1810 | shaybc
shaybc | sensei-woo
sensei-woo | samir-nimbly
samir-nimbly | robertheadley
robertheadley | +| refactorthis
refactorthis | qingyuan1109
qingyuan1109 | pokutuna
pokutuna | philipnext
philipnext | village-way
village-way | oprstchn
oprstchn | +| nobu007
nobu007 | mosleyit
mosleyit | moqimoqidea
moqimoqidea | mlopezr
mlopezr | mecab
mecab | olup
olup | +| lightrabbit
lightrabbit | lhish
lhish | kohii
kohii | kinandan
kinandan | AlexandruSmirnov
AlexandruSmirnov | pfitz
pfitz | +| ExactDoug
ExactDoug | celestial-vault
celestial-vault | linegel
linegel | edwin-truthsearch-io
edwin-truthsearch-io | EamonNerbonne
EamonNerbonne | dbasclpy
dbasclpy | +| dflatline
dflatline | Deon588
Deon588 | dleen
dleen | CW-B-W
CW-B-W | chadgauth
chadgauth | thecolorblue
thecolorblue | +| bogdan0083
bogdan0083 | benashby
benashby | Atlogit
Atlogit | atlasgong
atlasgong | AntiMoron
AntiMoron | andrewshu2000
andrewshu2000 | +| andreastempsch
andreastempsch | alasano
alasano | QuinsZouls
QuinsZouls | HadesArchitect
HadesArchitect | alarno
alarno | nexon33
nexon33 | +| adilhafeez
adilhafeez | adamwlarson
adamwlarson | adamhill
adamhill | AMHesch
AMHesch | adambrand
adambrand | samsilveira
samsilveira | +| 01Rian
01Rian | RSO
RSO | RandalSchwartz
RandalSchwartz | SECKainersdorfer
SECKainersdorfer | R-omk
R-omk | Sarke
Sarke | +| PaperBoardOfficial
PaperBoardOfficial | OlegOAndreev
OlegOAndreev | Naam
Naam | NaccOll
NaccOll | kvokka
kvokka | ecmasx
ecmasx | +| mollux
mollux | marvijo-code
marvijo-code | markijbema
markijbema | mamertofabian
mamertofabian | monkeyDluffy6017
monkeyDluffy6017 | libertyteeth
libertyteeth | +| shtse8
shtse8 | Rexarrior
Rexarrior | kevinvandijk
kevinvandijk | KevinZhao
KevinZhao | ksze
ksze | Juice10
Juice10 | +| snova-jorgep
snova-jorgep | Fovty
Fovty | Jdo300
Jdo300 | hesara
hesara | DeXtroTip
DeXtroTip | | diff --git a/locales/ca/README.md b/locales/ca/README.md index e0cefbc39b..0bc417753c 100644 --- a/locales/ca/README.md +++ b/locales/ca/README.md @@ -181,47 +181,45 @@ Ens encanten les contribucions de la comunitat! Comenceu llegint el nostre [CONT Gràcies a tots els nostres col·laboradors que han ajudat a millorar Roo Code! - -| mrubens
mrubens | saoudrizwan
saoudrizwan | cte
cte | daniel-lxs
daniel-lxs | samhvw8
samhvw8 | hannesrudolph
hannesrudolph | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
KJ7LNW | a8trejo
a8trejo | MuriloFP
MuriloFP | ColemanRoo
ColemanRoo | canrobins13
canrobins13 | stea9499
stea9499 | -| joemanley201
joemanley201 | System233
System233 | jr
jr | nissa-seru
nissa-seru | jquanton
jquanton | roomote-agent
roomote-agent | -| NyxJae
NyxJae | d-oit
d-oit | elianiva
elianiva | qdaxb
qdaxb | punkpeye
punkpeye | wkordalski
wkordalski | -| SannidhyaSah
SannidhyaSah | xyOz-dev
xyOz-dev | chrarnoldus
chrarnoldus | sachasayan
sachasayan | Smartsheet-JB-Brown
Smartsheet-JB-Brown | monotykamary
monotykamary | -| cannuri
cannuri | feifei325
feifei325 | zhangtony239
zhangtony239 | shariqriazz
shariqriazz | vigneshsubbiah16
vigneshsubbiah16 | pugazhendhi-m
pugazhendhi-m | -| lloydchang
lloydchang | dtrugman
dtrugman | Szpadel
Szpadel | lupuletic
lupuletic | kiwina
kiwina | liwilliam2021
liwilliam2021 | -| Premshay
Premshay | psv2522
psv2522 | olweraltuve
olweraltuve | diarmidmackenzie
diarmidmackenzie | hassoncs
hassoncs | ChuKhaLi
ChuKhaLi | -| PeterDaveHello
PeterDaveHello | aheizi
aheizi | nbihan-mediware
nbihan-mediware | noritaka1166
noritaka1166 | RaySinner
RaySinner | afshawnlotfi
afshawnlotfi | -| dleffel
dleffel | StevenTCramer
StevenTCramer | Ruakij
Ruakij | pdecat
pdecat | kyle-apex
kyle-apex | emshvac
emshvac | -| Lunchb0ne
Lunchb0ne | SmartManoj
SmartManoj | vagadiya
vagadiya | slytechnical
slytechnical | dlab-anton
dlab-anton | arthurauffray
arthurauffray | -| upamune
upamune | NamesMT
NamesMT | taylorwilsdon
taylorwilsdon | sammcj
sammcj | p12tic
p12tic | gtaylor
gtaylor | -| brunobergher
brunobergher | aitoroses
aitoroses | ross
ross | mr-ryan-james
mr-ryan-james | heyseth
heyseth | taisukeoe
taisukeoe | -| avtc
avtc | eonghk
eonghk | GOODBOY008
GOODBOY008 | kcwhite
kcwhite | ronyblum
ronyblum | teddyOOXX
teddyOOXX | -| vincentsong
vincentsong | yongjer
yongjer | zeozeozeo
zeozeozeo | ashktn
ashktn | franekp
franekp | yt3trees
yt3trees | -| seedlord
seedlord | bramburn
bramburn | anton-otee
anton-otee | benzntech
benzntech | axkirillov
axkirillov | olearycrew
olearycrew | -| catrielmuller
catrielmuller | devxpain
devxpain | snoyiatk
snoyiatk | GitlyHallows
GitlyHallows | jcbdev
jcbdev | Chenjiayuan195
Chenjiayuan195 | -| julionav
julionav | KanTakahiro
KanTakahiro | SplittyDev
SplittyDev | mdp
mdp | napter
napter | philfung
philfung | -| bbenshalom
bbenshalom | chris-garrett
chris-garrett | dairui1
dairui1 | dqroid
dqroid | janaki-sasidhar
janaki-sasidhar | forestyoo
forestyoo | -| hatsu38
hatsu38 | hongzio
hongzio | im47cn
im47cn | shoopapa
shoopapa | jwcraig
jwcraig | kinandan
kinandan | -| bannzai
bannzai | axmo
axmo | asychin
asychin | amittell
amittell | Yoshino-Yukitaro
Yoshino-Yukitaro | Yikai-Liao
Yikai-Liao | -| zxdvd
zxdvd | s97712
s97712 | vladstudio
vladstudio | vivekfyi
vivekfyi | HahaBill
HahaBill | tmsjngx0
tmsjngx0 | -| TGlide
TGlide | Githubguy132010
Githubguy132010 | nevermorec
nevermorec | PretzelVector
PretzelVector | zetaloop
zetaloop | cdlliuy
cdlliuy | -| user202729
user202729 | thill2323
thill2323 | takakoutso
takakoutso | student20880
student20880 | shubhamgupta731
shubhamgupta731 | shohei-ihaya
shohei-ihaya | -| shivamd1810
shivamd1810 | shaybc
shaybc | sensei-woo
sensei-woo | samir-nimbly
samir-nimbly | robertheadley
robertheadley | refactorthis
refactorthis | -| qingyuan1109
qingyuan1109 | pokutuna
pokutuna | philipnext
philipnext | village-way
village-way | oprstchn
oprstchn | nobu007
nobu007 | -| mosleyit
mosleyit | moqimoqidea
moqimoqidea | mlopezr
mlopezr | mecab
mecab | olup
olup | lightrabbit
lightrabbit | -| lhish
lhish | kohii
kohii | tgfjt
tgfjt | DeXtroTip
DeXtroTip | pfitz
pfitz | ExactDoug
ExactDoug | -| celestial-vault
celestial-vault | linegel
linegel | edwin-truthsearch-io
edwin-truthsearch-io | EamonNerbonne
EamonNerbonne | dbasclpy
dbasclpy | dflatline
dflatline | -| Deon588
Deon588 | dleen
dleen | CW-B-W
CW-B-W | chadgauth
chadgauth | thecolorblue
thecolorblue | bogdan0083
bogdan0083 | -| benashby
benashby | Atlogit
Atlogit | atlasgong
atlasgong | andrewshu2000
andrewshu2000 | andreastempsch
andreastempsch | alasano
alasano | -| QuinsZouls
QuinsZouls | HadesArchitect
HadesArchitect | alarno
alarno | nexon33
nexon33 | adilhafeez
adilhafeez | adamwlarson
adamwlarson | -| adamhill
adamhill | AMHesch
AMHesch | maekawataiki
maekawataiki | AlexandruSmirnov
AlexandruSmirnov | samsilveira
samsilveira | 01Rian
01Rian | -| RSO
RSO | RandalSchwartz
RandalSchwartz | SECKainersdorfer
SECKainersdorfer | R-omk
R-omk | Sarke
Sarke | PaperBoardOfficial
PaperBoardOfficial | -| OlegOAndreev
OlegOAndreev | Naam
Naam | kvokka
kvokka | ecmasx
ecmasx | mollux
mollux | marvijo-code
marvijo-code | -| markijbema
markijbema | mamertofabian
mamertofabian | monkeyDluffy6017
monkeyDluffy6017 | libertyteeth
libertyteeth | shtse8
shtse8 | Rexarrior
Rexarrior | -| kevinvandijk
kevinvandijk | KevinZhao
KevinZhao | ksze
ksze | Juice10
Juice10 | Fovty
Fovty | Jdo300
Jdo300 | -| hesara
hesara | | | | | | - +|mrubens
mrubens|saoudrizwan
saoudrizwan|cte
cte|daniel-lxs
daniel-lxs|samhvw8
samhvw8|hannesrudolph
hannesrudolph| +|:---:|:---:|:---:|:---:|:---:|:---:| +|KJ7LNW
KJ7LNW|a8trejo
a8trejo|MuriloFP
MuriloFP|ColemanRoo
ColemanRoo|canrobins13
canrobins13|stea9499
stea9499| +|joemanley201
joemanley201|System233
System233|jr
jr|nissa-seru
nissa-seru|jquanton
jquanton|roomote-agent
roomote-agent| +|NyxJae
NyxJae|d-oit
d-oit|elianiva
elianiva|qdaxb
qdaxb|punkpeye
punkpeye|wkordalski
wkordalski| +|SannidhyaSah
SannidhyaSah|xyOz-dev
xyOz-dev|chrarnoldus
chrarnoldus|sachasayan
sachasayan|Smartsheet-JB-Brown
Smartsheet-JB-Brown|monotykamary
monotykamary| +|cannuri
cannuri|feifei325
feifei325|zhangtony239
zhangtony239|shariqriazz
shariqriazz|vigneshsubbiah16
vigneshsubbiah16|pugazhendhi-m
pugazhendhi-m| +|lloydchang
lloydchang|dtrugman
dtrugman|Szpadel
Szpadel|hassoncs
hassoncs|liwilliam2021
liwilliam2021|lupuletic
lupuletic| +|kiwina
kiwina|Premshay
Premshay|psv2522
psv2522|olweraltuve
olweraltuve|diarmidmackenzie
diarmidmackenzie|ChuKhaLi
ChuKhaLi| +|PeterDaveHello
PeterDaveHello|aheizi
aheizi|nbihan-mediware
nbihan-mediware|noritaka1166
noritaka1166|RaySinner
RaySinner|afshawnlotfi
afshawnlotfi| +|dleffel
dleffel|StevenTCramer
StevenTCramer|Ruakij
Ruakij|pdecat
pdecat|kyle-apex
kyle-apex|emshvac
emshvac| +|Lunchb0ne
Lunchb0ne|SmartManoj
SmartManoj|vagadiya
vagadiya|slytechnical
slytechnical|dlab-anton
dlab-anton|arthurauffray
arthurauffray| +|upamune
upamune|NamesMT
NamesMT|taylorwilsdon
taylorwilsdon|sammcj
sammcj|p12tic
p12tic|gtaylor
gtaylor| +|brunobergher
brunobergher|aitoroses
aitoroses|ross
ross|mr-ryan-james
mr-ryan-james|heyseth
heyseth|taisukeoe
taisukeoe| +|avtc
avtc|eonghk
eonghk|GOODBOY008
GOODBOY008|kcwhite
kcwhite|ronyblum
ronyblum|teddyOOXX
teddyOOXX| +|vincentsong
vincentsong|yongjer
yongjer|zeozeozeo
zeozeozeo|ashktn
ashktn|franekp
franekp|yt3trees
yt3trees| +|seedlord
seedlord|bramburn
bramburn|anton-otee
anton-otee|benzntech
benzntech|axkirillov
axkirillov|olearycrew
olearycrew| +|catrielmuller
catrielmuller|devxpain
devxpain|snoyiatk
snoyiatk|GitlyHallows
GitlyHallows|jcbdev
jcbdev|Chenjiayuan195
Chenjiayuan195| +|julionav
julionav|KanTakahiro
KanTakahiro|SplittyDev
SplittyDev|mdp
mdp|napter
napter|philfung
philfung| +|bannzai
bannzai|bbenshalom
bbenshalom|chris-garrett
chris-garrett|dairui1
dairui1|dqroid
dqroid|janaki-sasidhar
janaki-sasidhar| +|forestyoo
forestyoo|hatsu38
hatsu38|hongzio
hongzio|im47cn
im47cn|shoopapa
shoopapa|jwcraig
jwcraig| +|axmo
axmo|asychin
asychin|amittell
amittell|Yoshino-Yukitaro
Yoshino-Yukitaro|Yikai-Liao
Yikai-Liao|zxdvd
zxdvd| +|s97712
s97712|vladstudio
vladstudio|vivekfyi
vivekfyi|HahaBill
HahaBill|tmsjngx0
tmsjngx0|TGlide
TGlide| +|Githubguy132010
Githubguy132010|tgfjt
tgfjt|maekawataiki
maekawataiki|nevermorec
nevermorec|PretzelVector
PretzelVector|zetaloop
zetaloop| +|cdlliuy
cdlliuy|user202729
user202729|thill2323
thill2323|takakoutso
takakoutso|student20880
student20880|shubhamgupta731
shubhamgupta731| +|shohei-ihaya
shohei-ihaya|shivamd1810
shivamd1810|shaybc
shaybc|sensei-woo
sensei-woo|samir-nimbly
samir-nimbly|robertheadley
robertheadley| +|refactorthis
refactorthis|qingyuan1109
qingyuan1109|pokutuna
pokutuna|philipnext
philipnext|village-way
village-way|oprstchn
oprstchn| +|nobu007
nobu007|mosleyit
mosleyit|moqimoqidea
moqimoqidea|mlopezr
mlopezr|mecab
mecab|olup
olup| +|lightrabbit
lightrabbit|lhish
lhish|kohii
kohii|kinandan
kinandan|AlexandruSmirnov
AlexandruSmirnov|pfitz
pfitz| +|ExactDoug
ExactDoug|celestial-vault
celestial-vault|linegel
linegel|edwin-truthsearch-io
edwin-truthsearch-io|EamonNerbonne
EamonNerbonne|dbasclpy
dbasclpy| +|dflatline
dflatline|Deon588
Deon588|dleen
dleen|CW-B-W
CW-B-W|chadgauth
chadgauth|thecolorblue
thecolorblue| +|bogdan0083
bogdan0083|benashby
benashby|Atlogit
Atlogit|atlasgong
atlasgong|AntiMoron
AntiMoron|andrewshu2000
andrewshu2000| +|andreastempsch
andreastempsch|alasano
alasano|QuinsZouls
QuinsZouls|HadesArchitect
HadesArchitect|alarno
alarno|nexon33
nexon33| +|adilhafeez
adilhafeez|adamwlarson
adamwlarson|adamhill
adamhill|AMHesch
AMHesch|adambrand
adambrand|samsilveira
samsilveira| +|01Rian
01Rian|RSO
RSO|RandalSchwartz
RandalSchwartz|SECKainersdorfer
SECKainersdorfer|R-omk
R-omk|Sarke
Sarke| +|PaperBoardOfficial
PaperBoardOfficial|OlegOAndreev
OlegOAndreev|Naam
Naam|NaccOll
NaccOll|kvokka
kvokka|ecmasx
ecmasx| +|mollux
mollux|marvijo-code
marvijo-code|markijbema
markijbema|mamertofabian
mamertofabian|monkeyDluffy6017
monkeyDluffy6017|libertyteeth
libertyteeth| +|shtse8
shtse8|Rexarrior
Rexarrior|kevinvandijk
kevinvandijk|KevinZhao
KevinZhao|ksze
ksze|Juice10
Juice10| +|snova-jorgep
snova-jorgep|Fovty
Fovty|Jdo300
Jdo300|hesara
hesara|DeXtroTip
DeXtroTip| | ## Llicència diff --git a/locales/de/README.md b/locales/de/README.md index 36056d88bb..46f724a160 100644 --- a/locales/de/README.md +++ b/locales/de/README.md @@ -181,47 +181,45 @@ Wir lieben Community-Beiträge! Beginnen Sie mit dem Lesen unserer [CONTRIBUTING Danke an alle unsere Mitwirkenden, die geholfen haben, Roo Code zu verbessern! - -| mrubens
mrubens | saoudrizwan
saoudrizwan | cte
cte | daniel-lxs
daniel-lxs | samhvw8
samhvw8 | hannesrudolph
hannesrudolph | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
KJ7LNW | a8trejo
a8trejo | MuriloFP
MuriloFP | ColemanRoo
ColemanRoo | canrobins13
canrobins13 | stea9499
stea9499 | -| joemanley201
joemanley201 | System233
System233 | jr
jr | nissa-seru
nissa-seru | jquanton
jquanton | roomote-agent
roomote-agent | -| NyxJae
NyxJae | d-oit
d-oit | elianiva
elianiva | qdaxb
qdaxb | punkpeye
punkpeye | wkordalski
wkordalski | -| SannidhyaSah
SannidhyaSah | xyOz-dev
xyOz-dev | chrarnoldus
chrarnoldus | sachasayan
sachasayan | Smartsheet-JB-Brown
Smartsheet-JB-Brown | monotykamary
monotykamary | -| cannuri
cannuri | feifei325
feifei325 | zhangtony239
zhangtony239 | shariqriazz
shariqriazz | vigneshsubbiah16
vigneshsubbiah16 | pugazhendhi-m
pugazhendhi-m | -| lloydchang
lloydchang | dtrugman
dtrugman | Szpadel
Szpadel | lupuletic
lupuletic | kiwina
kiwina | liwilliam2021
liwilliam2021 | -| Premshay
Premshay | psv2522
psv2522 | olweraltuve
olweraltuve | diarmidmackenzie
diarmidmackenzie | hassoncs
hassoncs | ChuKhaLi
ChuKhaLi | -| PeterDaveHello
PeterDaveHello | aheizi
aheizi | nbihan-mediware
nbihan-mediware | noritaka1166
noritaka1166 | RaySinner
RaySinner | afshawnlotfi
afshawnlotfi | -| dleffel
dleffel | StevenTCramer
StevenTCramer | Ruakij
Ruakij | pdecat
pdecat | kyle-apex
kyle-apex | emshvac
emshvac | -| Lunchb0ne
Lunchb0ne | SmartManoj
SmartManoj | vagadiya
vagadiya | slytechnical
slytechnical | dlab-anton
dlab-anton | arthurauffray
arthurauffray | -| upamune
upamune | NamesMT
NamesMT | taylorwilsdon
taylorwilsdon | sammcj
sammcj | p12tic
p12tic | gtaylor
gtaylor | -| brunobergher
brunobergher | aitoroses
aitoroses | ross
ross | mr-ryan-james
mr-ryan-james | heyseth
heyseth | taisukeoe
taisukeoe | -| avtc
avtc | eonghk
eonghk | GOODBOY008
GOODBOY008 | kcwhite
kcwhite | ronyblum
ronyblum | teddyOOXX
teddyOOXX | -| vincentsong
vincentsong | yongjer
yongjer | zeozeozeo
zeozeozeo | ashktn
ashktn | franekp
franekp | yt3trees
yt3trees | -| seedlord
seedlord | bramburn
bramburn | anton-otee
anton-otee | benzntech
benzntech | axkirillov
axkirillov | olearycrew
olearycrew | -| catrielmuller
catrielmuller | devxpain
devxpain | snoyiatk
snoyiatk | GitlyHallows
GitlyHallows | jcbdev
jcbdev | Chenjiayuan195
Chenjiayuan195 | -| julionav
julionav | KanTakahiro
KanTakahiro | SplittyDev
SplittyDev | mdp
mdp | napter
napter | philfung
philfung | -| bbenshalom
bbenshalom | chris-garrett
chris-garrett | dairui1
dairui1 | dqroid
dqroid | janaki-sasidhar
janaki-sasidhar | forestyoo
forestyoo | -| hatsu38
hatsu38 | hongzio
hongzio | im47cn
im47cn | shoopapa
shoopapa | jwcraig
jwcraig | kinandan
kinandan | -| bannzai
bannzai | axmo
axmo | asychin
asychin | amittell
amittell | Yoshino-Yukitaro
Yoshino-Yukitaro | Yikai-Liao
Yikai-Liao | -| zxdvd
zxdvd | s97712
s97712 | vladstudio
vladstudio | vivekfyi
vivekfyi | HahaBill
HahaBill | tmsjngx0
tmsjngx0 | -| TGlide
TGlide | Githubguy132010
Githubguy132010 | nevermorec
nevermorec | PretzelVector
PretzelVector | zetaloop
zetaloop | cdlliuy
cdlliuy | -| user202729
user202729 | thill2323
thill2323 | takakoutso
takakoutso | student20880
student20880 | shubhamgupta731
shubhamgupta731 | shohei-ihaya
shohei-ihaya | -| shivamd1810
shivamd1810 | shaybc
shaybc | sensei-woo
sensei-woo | samir-nimbly
samir-nimbly | robertheadley
robertheadley | refactorthis
refactorthis | -| qingyuan1109
qingyuan1109 | pokutuna
pokutuna | philipnext
philipnext | village-way
village-way | oprstchn
oprstchn | nobu007
nobu007 | -| mosleyit
mosleyit | moqimoqidea
moqimoqidea | mlopezr
mlopezr | mecab
mecab | olup
olup | lightrabbit
lightrabbit | -| lhish
lhish | kohii
kohii | tgfjt
tgfjt | DeXtroTip
DeXtroTip | pfitz
pfitz | ExactDoug
ExactDoug | -| celestial-vault
celestial-vault | linegel
linegel | edwin-truthsearch-io
edwin-truthsearch-io | EamonNerbonne
EamonNerbonne | dbasclpy
dbasclpy | dflatline
dflatline | -| Deon588
Deon588 | dleen
dleen | CW-B-W
CW-B-W | chadgauth
chadgauth | thecolorblue
thecolorblue | bogdan0083
bogdan0083 | -| benashby
benashby | Atlogit
Atlogit | atlasgong
atlasgong | andrewshu2000
andrewshu2000 | andreastempsch
andreastempsch | alasano
alasano | -| QuinsZouls
QuinsZouls | HadesArchitect
HadesArchitect | alarno
alarno | nexon33
nexon33 | adilhafeez
adilhafeez | adamwlarson
adamwlarson | -| adamhill
adamhill | AMHesch
AMHesch | maekawataiki
maekawataiki | AlexandruSmirnov
AlexandruSmirnov | samsilveira
samsilveira | 01Rian
01Rian | -| RSO
RSO | RandalSchwartz
RandalSchwartz | SECKainersdorfer
SECKainersdorfer | R-omk
R-omk | Sarke
Sarke | PaperBoardOfficial
PaperBoardOfficial | -| OlegOAndreev
OlegOAndreev | Naam
Naam | kvokka
kvokka | ecmasx
ecmasx | mollux
mollux | marvijo-code
marvijo-code | -| markijbema
markijbema | mamertofabian
mamertofabian | monkeyDluffy6017
monkeyDluffy6017 | libertyteeth
libertyteeth | shtse8
shtse8 | Rexarrior
Rexarrior | -| kevinvandijk
kevinvandijk | KevinZhao
KevinZhao | ksze
ksze | Juice10
Juice10 | Fovty
Fovty | Jdo300
Jdo300 | -| hesara
hesara | | | | | | - +|mrubens
mrubens|saoudrizwan
saoudrizwan|cte
cte|daniel-lxs
daniel-lxs|samhvw8
samhvw8|hannesrudolph
hannesrudolph| +|:---:|:---:|:---:|:---:|:---:|:---:| +|KJ7LNW
KJ7LNW|a8trejo
a8trejo|MuriloFP
MuriloFP|ColemanRoo
ColemanRoo|canrobins13
canrobins13|stea9499
stea9499| +|joemanley201
joemanley201|System233
System233|jr
jr|nissa-seru
nissa-seru|jquanton
jquanton|roomote-agent
roomote-agent| +|NyxJae
NyxJae|d-oit
d-oit|elianiva
elianiva|qdaxb
qdaxb|punkpeye
punkpeye|wkordalski
wkordalski| +|SannidhyaSah
SannidhyaSah|xyOz-dev
xyOz-dev|chrarnoldus
chrarnoldus|sachasayan
sachasayan|Smartsheet-JB-Brown
Smartsheet-JB-Brown|monotykamary
monotykamary| +|cannuri
cannuri|feifei325
feifei325|zhangtony239
zhangtony239|shariqriazz
shariqriazz|vigneshsubbiah16
vigneshsubbiah16|pugazhendhi-m
pugazhendhi-m| +|lloydchang
lloydchang|dtrugman
dtrugman|Szpadel
Szpadel|hassoncs
hassoncs|liwilliam2021
liwilliam2021|lupuletic
lupuletic| +|kiwina
kiwina|Premshay
Premshay|psv2522
psv2522|olweraltuve
olweraltuve|diarmidmackenzie
diarmidmackenzie|ChuKhaLi
ChuKhaLi| +|PeterDaveHello
PeterDaveHello|aheizi
aheizi|nbihan-mediware
nbihan-mediware|noritaka1166
noritaka1166|RaySinner
RaySinner|afshawnlotfi
afshawnlotfi| +|dleffel
dleffel|StevenTCramer
StevenTCramer|Ruakij
Ruakij|pdecat
pdecat|kyle-apex
kyle-apex|emshvac
emshvac| +|Lunchb0ne
Lunchb0ne|SmartManoj
SmartManoj|vagadiya
vagadiya|slytechnical
slytechnical|dlab-anton
dlab-anton|arthurauffray
arthurauffray| +|upamune
upamune|NamesMT
NamesMT|taylorwilsdon
taylorwilsdon|sammcj
sammcj|p12tic
p12tic|gtaylor
gtaylor| +|brunobergher
brunobergher|aitoroses
aitoroses|ross
ross|mr-ryan-james
mr-ryan-james|heyseth
heyseth|taisukeoe
taisukeoe| +|avtc
avtc|eonghk
eonghk|GOODBOY008
GOODBOY008|kcwhite
kcwhite|ronyblum
ronyblum|teddyOOXX
teddyOOXX| +|vincentsong
vincentsong|yongjer
yongjer|zeozeozeo
zeozeozeo|ashktn
ashktn|franekp
franekp|yt3trees
yt3trees| +|seedlord
seedlord|bramburn
bramburn|anton-otee
anton-otee|benzntech
benzntech|axkirillov
axkirillov|olearycrew
olearycrew| +|catrielmuller
catrielmuller|devxpain
devxpain|snoyiatk
snoyiatk|GitlyHallows
GitlyHallows|jcbdev
jcbdev|Chenjiayuan195
Chenjiayuan195| +|julionav
julionav|KanTakahiro
KanTakahiro|SplittyDev
SplittyDev|mdp
mdp|napter
napter|philfung
philfung| +|bannzai
bannzai|bbenshalom
bbenshalom|chris-garrett
chris-garrett|dairui1
dairui1|dqroid
dqroid|janaki-sasidhar
janaki-sasidhar| +|forestyoo
forestyoo|hatsu38
hatsu38|hongzio
hongzio|im47cn
im47cn|shoopapa
shoopapa|jwcraig
jwcraig| +|axmo
axmo|asychin
asychin|amittell
amittell|Yoshino-Yukitaro
Yoshino-Yukitaro|Yikai-Liao
Yikai-Liao|zxdvd
zxdvd| +|s97712
s97712|vladstudio
vladstudio|vivekfyi
vivekfyi|HahaBill
HahaBill|tmsjngx0
tmsjngx0|TGlide
TGlide| +|Githubguy132010
Githubguy132010|tgfjt
tgfjt|maekawataiki
maekawataiki|nevermorec
nevermorec|PretzelVector
PretzelVector|zetaloop
zetaloop| +|cdlliuy
cdlliuy|user202729
user202729|thill2323
thill2323|takakoutso
takakoutso|student20880
student20880|shubhamgupta731
shubhamgupta731| +|shohei-ihaya
shohei-ihaya|shivamd1810
shivamd1810|shaybc
shaybc|sensei-woo
sensei-woo|samir-nimbly
samir-nimbly|robertheadley
robertheadley| +|refactorthis
refactorthis|qingyuan1109
qingyuan1109|pokutuna
pokutuna|philipnext
philipnext|village-way
village-way|oprstchn
oprstchn| +|nobu007
nobu007|mosleyit
mosleyit|moqimoqidea
moqimoqidea|mlopezr
mlopezr|mecab
mecab|olup
olup| +|lightrabbit
lightrabbit|lhish
lhish|kohii
kohii|kinandan
kinandan|AlexandruSmirnov
AlexandruSmirnov|pfitz
pfitz| +|ExactDoug
ExactDoug|celestial-vault
celestial-vault|linegel
linegel|edwin-truthsearch-io
edwin-truthsearch-io|EamonNerbonne
EamonNerbonne|dbasclpy
dbasclpy| +|dflatline
dflatline|Deon588
Deon588|dleen
dleen|CW-B-W
CW-B-W|chadgauth
chadgauth|thecolorblue
thecolorblue| +|bogdan0083
bogdan0083|benashby
benashby|Atlogit
Atlogit|atlasgong
atlasgong|AntiMoron
AntiMoron|andrewshu2000
andrewshu2000| +|andreastempsch
andreastempsch|alasano
alasano|QuinsZouls
QuinsZouls|HadesArchitect
HadesArchitect|alarno
alarno|nexon33
nexon33| +|adilhafeez
adilhafeez|adamwlarson
adamwlarson|adamhill
adamhill|AMHesch
AMHesch|adambrand
adambrand|samsilveira
samsilveira| +|01Rian
01Rian|RSO
RSO|RandalSchwartz
RandalSchwartz|SECKainersdorfer
SECKainersdorfer|R-omk
R-omk|Sarke
Sarke| +|PaperBoardOfficial
PaperBoardOfficial|OlegOAndreev
OlegOAndreev|Naam
Naam|NaccOll
NaccOll|kvokka
kvokka|ecmasx
ecmasx| +|mollux
mollux|marvijo-code
marvijo-code|markijbema
markijbema|mamertofabian
mamertofabian|monkeyDluffy6017
monkeyDluffy6017|libertyteeth
libertyteeth| +|shtse8
shtse8|Rexarrior
Rexarrior|kevinvandijk
kevinvandijk|KevinZhao
KevinZhao|ksze
ksze|Juice10
Juice10| +|snova-jorgep
snova-jorgep|Fovty
Fovty|Jdo300
Jdo300|hesara
hesara|DeXtroTip
DeXtroTip| | ## Lizenz diff --git a/locales/es/README.md b/locales/es/README.md index 8101c1d7b5..299df96be2 100644 --- a/locales/es/README.md +++ b/locales/es/README.md @@ -181,47 +181,45 @@ Usamos [changesets](https://github.com/changesets/changesets) para versionar y p ¡Gracias a todos nuestros colaboradores que han ayudado a mejorar Roo Code! - -| mrubens
mrubens | saoudrizwan
saoudrizwan | cte
cte | daniel-lxs
daniel-lxs | samhvw8
samhvw8 | hannesrudolph
hannesrudolph | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
KJ7LNW | a8trejo
a8trejo | MuriloFP
MuriloFP | ColemanRoo
ColemanRoo | canrobins13
canrobins13 | stea9499
stea9499 | -| joemanley201
joemanley201 | System233
System233 | jr
jr | nissa-seru
nissa-seru | jquanton
jquanton | roomote-agent
roomote-agent | -| NyxJae
NyxJae | d-oit
d-oit | elianiva
elianiva | qdaxb
qdaxb | punkpeye
punkpeye | wkordalski
wkordalski | -| SannidhyaSah
SannidhyaSah | xyOz-dev
xyOz-dev | chrarnoldus
chrarnoldus | sachasayan
sachasayan | Smartsheet-JB-Brown
Smartsheet-JB-Brown | monotykamary
monotykamary | -| cannuri
cannuri | feifei325
feifei325 | zhangtony239
zhangtony239 | shariqriazz
shariqriazz | vigneshsubbiah16
vigneshsubbiah16 | pugazhendhi-m
pugazhendhi-m | -| lloydchang
lloydchang | dtrugman
dtrugman | Szpadel
Szpadel | lupuletic
lupuletic | kiwina
kiwina | liwilliam2021
liwilliam2021 | -| Premshay
Premshay | psv2522
psv2522 | olweraltuve
olweraltuve | diarmidmackenzie
diarmidmackenzie | hassoncs
hassoncs | ChuKhaLi
ChuKhaLi | -| PeterDaveHello
PeterDaveHello | aheizi
aheizi | nbihan-mediware
nbihan-mediware | noritaka1166
noritaka1166 | RaySinner
RaySinner | afshawnlotfi
afshawnlotfi | -| dleffel
dleffel | StevenTCramer
StevenTCramer | Ruakij
Ruakij | pdecat
pdecat | kyle-apex
kyle-apex | emshvac
emshvac | -| Lunchb0ne
Lunchb0ne | SmartManoj
SmartManoj | vagadiya
vagadiya | slytechnical
slytechnical | dlab-anton
dlab-anton | arthurauffray
arthurauffray | -| upamune
upamune | NamesMT
NamesMT | taylorwilsdon
taylorwilsdon | sammcj
sammcj | p12tic
p12tic | gtaylor
gtaylor | -| brunobergher
brunobergher | aitoroses
aitoroses | ross
ross | mr-ryan-james
mr-ryan-james | heyseth
heyseth | taisukeoe
taisukeoe | -| avtc
avtc | eonghk
eonghk | GOODBOY008
GOODBOY008 | kcwhite
kcwhite | ronyblum
ronyblum | teddyOOXX
teddyOOXX | -| vincentsong
vincentsong | yongjer
yongjer | zeozeozeo
zeozeozeo | ashktn
ashktn | franekp
franekp | yt3trees
yt3trees | -| seedlord
seedlord | bramburn
bramburn | anton-otee
anton-otee | benzntech
benzntech | axkirillov
axkirillov | olearycrew
olearycrew | -| catrielmuller
catrielmuller | devxpain
devxpain | snoyiatk
snoyiatk | GitlyHallows
GitlyHallows | jcbdev
jcbdev | Chenjiayuan195
Chenjiayuan195 | -| julionav
julionav | KanTakahiro
KanTakahiro | SplittyDev
SplittyDev | mdp
mdp | napter
napter | philfung
philfung | -| bbenshalom
bbenshalom | chris-garrett
chris-garrett | dairui1
dairui1 | dqroid
dqroid | janaki-sasidhar
janaki-sasidhar | forestyoo
forestyoo | -| hatsu38
hatsu38 | hongzio
hongzio | im47cn
im47cn | shoopapa
shoopapa | jwcraig
jwcraig | kinandan
kinandan | -| bannzai
bannzai | axmo
axmo | asychin
asychin | amittell
amittell | Yoshino-Yukitaro
Yoshino-Yukitaro | Yikai-Liao
Yikai-Liao | -| zxdvd
zxdvd | s97712
s97712 | vladstudio
vladstudio | vivekfyi
vivekfyi | HahaBill
HahaBill | tmsjngx0
tmsjngx0 | -| TGlide
TGlide | Githubguy132010
Githubguy132010 | nevermorec
nevermorec | PretzelVector
PretzelVector | zetaloop
zetaloop | cdlliuy
cdlliuy | -| user202729
user202729 | thill2323
thill2323 | takakoutso
takakoutso | student20880
student20880 | shubhamgupta731
shubhamgupta731 | shohei-ihaya
shohei-ihaya | -| shivamd1810
shivamd1810 | shaybc
shaybc | sensei-woo
sensei-woo | samir-nimbly
samir-nimbly | robertheadley
robertheadley | refactorthis
refactorthis | -| qingyuan1109
qingyuan1109 | pokutuna
pokutuna | philipnext
philipnext | village-way
village-way | oprstchn
oprstchn | nobu007
nobu007 | -| mosleyit
mosleyit | moqimoqidea
moqimoqidea | mlopezr
mlopezr | mecab
mecab | olup
olup | lightrabbit
lightrabbit | -| lhish
lhish | kohii
kohii | tgfjt
tgfjt | DeXtroTip
DeXtroTip | pfitz
pfitz | ExactDoug
ExactDoug | -| celestial-vault
celestial-vault | linegel
linegel | edwin-truthsearch-io
edwin-truthsearch-io | EamonNerbonne
EamonNerbonne | dbasclpy
dbasclpy | dflatline
dflatline | -| Deon588
Deon588 | dleen
dleen | CW-B-W
CW-B-W | chadgauth
chadgauth | thecolorblue
thecolorblue | bogdan0083
bogdan0083 | -| benashby
benashby | Atlogit
Atlogit | atlasgong
atlasgong | andrewshu2000
andrewshu2000 | andreastempsch
andreastempsch | alasano
alasano | -| QuinsZouls
QuinsZouls | HadesArchitect
HadesArchitect | alarno
alarno | nexon33
nexon33 | adilhafeez
adilhafeez | adamwlarson
adamwlarson | -| adamhill
adamhill | AMHesch
AMHesch | maekawataiki
maekawataiki | AlexandruSmirnov
AlexandruSmirnov | samsilveira
samsilveira | 01Rian
01Rian | -| RSO
RSO | RandalSchwartz
RandalSchwartz | SECKainersdorfer
SECKainersdorfer | R-omk
R-omk | Sarke
Sarke | PaperBoardOfficial
PaperBoardOfficial | -| OlegOAndreev
OlegOAndreev | Naam
Naam | kvokka
kvokka | ecmasx
ecmasx | mollux
mollux | marvijo-code
marvijo-code | -| markijbema
markijbema | mamertofabian
mamertofabian | monkeyDluffy6017
monkeyDluffy6017 | libertyteeth
libertyteeth | shtse8
shtse8 | Rexarrior
Rexarrior | -| kevinvandijk
kevinvandijk | KevinZhao
KevinZhao | ksze
ksze | Juice10
Juice10 | Fovty
Fovty | Jdo300
Jdo300 | -| hesara
hesara | | | | | | - +|mrubens
mrubens|saoudrizwan
saoudrizwan|cte
cte|daniel-lxs
daniel-lxs|samhvw8
samhvw8|hannesrudolph
hannesrudolph| +|:---:|:---:|:---:|:---:|:---:|:---:| +|KJ7LNW
KJ7LNW|a8trejo
a8trejo|MuriloFP
MuriloFP|ColemanRoo
ColemanRoo|canrobins13
canrobins13|stea9499
stea9499| +|joemanley201
joemanley201|System233
System233|jr
jr|nissa-seru
nissa-seru|jquanton
jquanton|roomote-agent
roomote-agent| +|NyxJae
NyxJae|d-oit
d-oit|elianiva
elianiva|qdaxb
qdaxb|punkpeye
punkpeye|wkordalski
wkordalski| +|SannidhyaSah
SannidhyaSah|xyOz-dev
xyOz-dev|chrarnoldus
chrarnoldus|sachasayan
sachasayan|Smartsheet-JB-Brown
Smartsheet-JB-Brown|monotykamary
monotykamary| +|cannuri
cannuri|feifei325
feifei325|zhangtony239
zhangtony239|shariqriazz
shariqriazz|vigneshsubbiah16
vigneshsubbiah16|pugazhendhi-m
pugazhendhi-m| +|lloydchang
lloydchang|dtrugman
dtrugman|Szpadel
Szpadel|hassoncs
hassoncs|liwilliam2021
liwilliam2021|lupuletic
lupuletic| +|kiwina
kiwina|Premshay
Premshay|psv2522
psv2522|olweraltuve
olweraltuve|diarmidmackenzie
diarmidmackenzie|ChuKhaLi
ChuKhaLi| +|PeterDaveHello
PeterDaveHello|aheizi
aheizi|nbihan-mediware
nbihan-mediware|noritaka1166
noritaka1166|RaySinner
RaySinner|afshawnlotfi
afshawnlotfi| +|dleffel
dleffel|StevenTCramer
StevenTCramer|Ruakij
Ruakij|pdecat
pdecat|kyle-apex
kyle-apex|emshvac
emshvac| +|Lunchb0ne
Lunchb0ne|SmartManoj
SmartManoj|vagadiya
vagadiya|slytechnical
slytechnical|dlab-anton
dlab-anton|arthurauffray
arthurauffray| +|upamune
upamune|NamesMT
NamesMT|taylorwilsdon
taylorwilsdon|sammcj
sammcj|p12tic
p12tic|gtaylor
gtaylor| +|brunobergher
brunobergher|aitoroses
aitoroses|ross
ross|mr-ryan-james
mr-ryan-james|heyseth
heyseth|taisukeoe
taisukeoe| +|avtc
avtc|eonghk
eonghk|GOODBOY008
GOODBOY008|kcwhite
kcwhite|ronyblum
ronyblum|teddyOOXX
teddyOOXX| +|vincentsong
vincentsong|yongjer
yongjer|zeozeozeo
zeozeozeo|ashktn
ashktn|franekp
franekp|yt3trees
yt3trees| +|seedlord
seedlord|bramburn
bramburn|anton-otee
anton-otee|benzntech
benzntech|axkirillov
axkirillov|olearycrew
olearycrew| +|catrielmuller
catrielmuller|devxpain
devxpain|snoyiatk
snoyiatk|GitlyHallows
GitlyHallows|jcbdev
jcbdev|Chenjiayuan195
Chenjiayuan195| +|julionav
julionav|KanTakahiro
KanTakahiro|SplittyDev
SplittyDev|mdp
mdp|napter
napter|philfung
philfung| +|bannzai
bannzai|bbenshalom
bbenshalom|chris-garrett
chris-garrett|dairui1
dairui1|dqroid
dqroid|janaki-sasidhar
janaki-sasidhar| +|forestyoo
forestyoo|hatsu38
hatsu38|hongzio
hongzio|im47cn
im47cn|shoopapa
shoopapa|jwcraig
jwcraig| +|axmo
axmo|asychin
asychin|amittell
amittell|Yoshino-Yukitaro
Yoshino-Yukitaro|Yikai-Liao
Yikai-Liao|zxdvd
zxdvd| +|s97712
s97712|vladstudio
vladstudio|vivekfyi
vivekfyi|HahaBill
HahaBill|tmsjngx0
tmsjngx0|TGlide
TGlide| +|Githubguy132010
Githubguy132010|tgfjt
tgfjt|maekawataiki
maekawataiki|nevermorec
nevermorec|PretzelVector
PretzelVector|zetaloop
zetaloop| +|cdlliuy
cdlliuy|user202729
user202729|thill2323
thill2323|takakoutso
takakoutso|student20880
student20880|shubhamgupta731
shubhamgupta731| +|shohei-ihaya
shohei-ihaya|shivamd1810
shivamd1810|shaybc
shaybc|sensei-woo
sensei-woo|samir-nimbly
samir-nimbly|robertheadley
robertheadley| +|refactorthis
refactorthis|qingyuan1109
qingyuan1109|pokutuna
pokutuna|philipnext
philipnext|village-way
village-way|oprstchn
oprstchn| +|nobu007
nobu007|mosleyit
mosleyit|moqimoqidea
moqimoqidea|mlopezr
mlopezr|mecab
mecab|olup
olup| +|lightrabbit
lightrabbit|lhish
lhish|kohii
kohii|kinandan
kinandan|AlexandruSmirnov
AlexandruSmirnov|pfitz
pfitz| +|ExactDoug
ExactDoug|celestial-vault
celestial-vault|linegel
linegel|edwin-truthsearch-io
edwin-truthsearch-io|EamonNerbonne
EamonNerbonne|dbasclpy
dbasclpy| +|dflatline
dflatline|Deon588
Deon588|dleen
dleen|CW-B-W
CW-B-W|chadgauth
chadgauth|thecolorblue
thecolorblue| +|bogdan0083
bogdan0083|benashby
benashby|Atlogit
Atlogit|atlasgong
atlasgong|AntiMoron
AntiMoron|andrewshu2000
andrewshu2000| +|andreastempsch
andreastempsch|alasano
alasano|QuinsZouls
QuinsZouls|HadesArchitect
HadesArchitect|alarno
alarno|nexon33
nexon33| +|adilhafeez
adilhafeez|adamwlarson
adamwlarson|adamhill
adamhill|AMHesch
AMHesch|adambrand
adambrand|samsilveira
samsilveira| +|01Rian
01Rian|RSO
RSO|RandalSchwartz
RandalSchwartz|SECKainersdorfer
SECKainersdorfer|R-omk
R-omk|Sarke
Sarke| +|PaperBoardOfficial
PaperBoardOfficial|OlegOAndreev
OlegOAndreev|Naam
Naam|NaccOll
NaccOll|kvokka
kvokka|ecmasx
ecmasx| +|mollux
mollux|marvijo-code
marvijo-code|markijbema
markijbema|mamertofabian
mamertofabian|monkeyDluffy6017
monkeyDluffy6017|libertyteeth
libertyteeth| +|shtse8
shtse8|Rexarrior
Rexarrior|kevinvandijk
kevinvandijk|KevinZhao
KevinZhao|ksze
ksze|Juice10
Juice10| +|snova-jorgep
snova-jorgep|Fovty
Fovty|Jdo300
Jdo300|hesara
hesara|DeXtroTip
DeXtroTip| | ## Licencia diff --git a/locales/fr/README.md b/locales/fr/README.md index 852e0169a6..7ae93b252c 100644 --- a/locales/fr/README.md +++ b/locales/fr/README.md @@ -181,47 +181,45 @@ Nous adorons les contributions de la communauté ! Commencez par lire notre [CON Merci à tous nos contributeurs qui ont aidé à améliorer Roo Code ! - -| mrubens
mrubens | saoudrizwan
saoudrizwan | cte
cte | daniel-lxs
daniel-lxs | samhvw8
samhvw8 | hannesrudolph
hannesrudolph | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
KJ7LNW | a8trejo
a8trejo | MuriloFP
MuriloFP | ColemanRoo
ColemanRoo | canrobins13
canrobins13 | stea9499
stea9499 | -| joemanley201
joemanley201 | System233
System233 | jr
jr | nissa-seru
nissa-seru | jquanton
jquanton | roomote-agent
roomote-agent | -| NyxJae
NyxJae | d-oit
d-oit | elianiva
elianiva | qdaxb
qdaxb | punkpeye
punkpeye | wkordalski
wkordalski | -| SannidhyaSah
SannidhyaSah | xyOz-dev
xyOz-dev | chrarnoldus
chrarnoldus | sachasayan
sachasayan | Smartsheet-JB-Brown
Smartsheet-JB-Brown | monotykamary
monotykamary | -| cannuri
cannuri | feifei325
feifei325 | zhangtony239
zhangtony239 | shariqriazz
shariqriazz | vigneshsubbiah16
vigneshsubbiah16 | pugazhendhi-m
pugazhendhi-m | -| lloydchang
lloydchang | dtrugman
dtrugman | Szpadel
Szpadel | lupuletic
lupuletic | kiwina
kiwina | liwilliam2021
liwilliam2021 | -| Premshay
Premshay | psv2522
psv2522 | olweraltuve
olweraltuve | diarmidmackenzie
diarmidmackenzie | hassoncs
hassoncs | ChuKhaLi
ChuKhaLi | -| PeterDaveHello
PeterDaveHello | aheizi
aheizi | nbihan-mediware
nbihan-mediware | noritaka1166
noritaka1166 | RaySinner
RaySinner | afshawnlotfi
afshawnlotfi | -| dleffel
dleffel | StevenTCramer
StevenTCramer | Ruakij
Ruakij | pdecat
pdecat | kyle-apex
kyle-apex | emshvac
emshvac | -| Lunchb0ne
Lunchb0ne | SmartManoj
SmartManoj | vagadiya
vagadiya | slytechnical
slytechnical | dlab-anton
dlab-anton | arthurauffray
arthurauffray | -| upamune
upamune | NamesMT
NamesMT | taylorwilsdon
taylorwilsdon | sammcj
sammcj | p12tic
p12tic | gtaylor
gtaylor | -| brunobergher
brunobergher | aitoroses
aitoroses | ross
ross | mr-ryan-james
mr-ryan-james | heyseth
heyseth | taisukeoe
taisukeoe | -| avtc
avtc | eonghk
eonghk | GOODBOY008
GOODBOY008 | kcwhite
kcwhite | ronyblum
ronyblum | teddyOOXX
teddyOOXX | -| vincentsong
vincentsong | yongjer
yongjer | zeozeozeo
zeozeozeo | ashktn
ashktn | franekp
franekp | yt3trees
yt3trees | -| seedlord
seedlord | bramburn
bramburn | anton-otee
anton-otee | benzntech
benzntech | axkirillov
axkirillov | olearycrew
olearycrew | -| catrielmuller
catrielmuller | devxpain
devxpain | snoyiatk
snoyiatk | GitlyHallows
GitlyHallows | jcbdev
jcbdev | Chenjiayuan195
Chenjiayuan195 | -| julionav
julionav | KanTakahiro
KanTakahiro | SplittyDev
SplittyDev | mdp
mdp | napter
napter | philfung
philfung | -| bbenshalom
bbenshalom | chris-garrett
chris-garrett | dairui1
dairui1 | dqroid
dqroid | janaki-sasidhar
janaki-sasidhar | forestyoo
forestyoo | -| hatsu38
hatsu38 | hongzio
hongzio | im47cn
im47cn | shoopapa
shoopapa | jwcraig
jwcraig | kinandan
kinandan | -| bannzai
bannzai | axmo
axmo | asychin
asychin | amittell
amittell | Yoshino-Yukitaro
Yoshino-Yukitaro | Yikai-Liao
Yikai-Liao | -| zxdvd
zxdvd | s97712
s97712 | vladstudio
vladstudio | vivekfyi
vivekfyi | HahaBill
HahaBill | tmsjngx0
tmsjngx0 | -| TGlide
TGlide | Githubguy132010
Githubguy132010 | nevermorec
nevermorec | PretzelVector
PretzelVector | zetaloop
zetaloop | cdlliuy
cdlliuy | -| user202729
user202729 | thill2323
thill2323 | takakoutso
takakoutso | student20880
student20880 | shubhamgupta731
shubhamgupta731 | shohei-ihaya
shohei-ihaya | -| shivamd1810
shivamd1810 | shaybc
shaybc | sensei-woo
sensei-woo | samir-nimbly
samir-nimbly | robertheadley
robertheadley | refactorthis
refactorthis | -| qingyuan1109
qingyuan1109 | pokutuna
pokutuna | philipnext
philipnext | village-way
village-way | oprstchn
oprstchn | nobu007
nobu007 | -| mosleyit
mosleyit | moqimoqidea
moqimoqidea | mlopezr
mlopezr | mecab
mecab | olup
olup | lightrabbit
lightrabbit | -| lhish
lhish | kohii
kohii | tgfjt
tgfjt | DeXtroTip
DeXtroTip | pfitz
pfitz | ExactDoug
ExactDoug | -| celestial-vault
celestial-vault | linegel
linegel | edwin-truthsearch-io
edwin-truthsearch-io | EamonNerbonne
EamonNerbonne | dbasclpy
dbasclpy | dflatline
dflatline | -| Deon588
Deon588 | dleen
dleen | CW-B-W
CW-B-W | chadgauth
chadgauth | thecolorblue
thecolorblue | bogdan0083
bogdan0083 | -| benashby
benashby | Atlogit
Atlogit | atlasgong
atlasgong | andrewshu2000
andrewshu2000 | andreastempsch
andreastempsch | alasano
alasano | -| QuinsZouls
QuinsZouls | HadesArchitect
HadesArchitect | alarno
alarno | nexon33
nexon33 | adilhafeez
adilhafeez | adamwlarson
adamwlarson | -| adamhill
adamhill | AMHesch
AMHesch | maekawataiki
maekawataiki | AlexandruSmirnov
AlexandruSmirnov | samsilveira
samsilveira | 01Rian
01Rian | -| RSO
RSO | RandalSchwartz
RandalSchwartz | SECKainersdorfer
SECKainersdorfer | R-omk
R-omk | Sarke
Sarke | PaperBoardOfficial
PaperBoardOfficial | -| OlegOAndreev
OlegOAndreev | Naam
Naam | kvokka
kvokka | ecmasx
ecmasx | mollux
mollux | marvijo-code
marvijo-code | -| markijbema
markijbema | mamertofabian
mamertofabian | monkeyDluffy6017
monkeyDluffy6017 | libertyteeth
libertyteeth | shtse8
shtse8 | Rexarrior
Rexarrior | -| kevinvandijk
kevinvandijk | KevinZhao
KevinZhao | ksze
ksze | Juice10
Juice10 | Fovty
Fovty | Jdo300
Jdo300 | -| hesara
hesara | | | | | | - +|mrubens
mrubens|saoudrizwan
saoudrizwan|cte
cte|daniel-lxs
daniel-lxs|samhvw8
samhvw8|hannesrudolph
hannesrudolph| +|:---:|:---:|:---:|:---:|:---:|:---:| +|KJ7LNW
KJ7LNW|a8trejo
a8trejo|MuriloFP
MuriloFP|ColemanRoo
ColemanRoo|canrobins13
canrobins13|stea9499
stea9499| +|joemanley201
joemanley201|System233
System233|jr
jr|nissa-seru
nissa-seru|jquanton
jquanton|roomote-agent
roomote-agent| +|NyxJae
NyxJae|d-oit
d-oit|elianiva
elianiva|qdaxb
qdaxb|punkpeye
punkpeye|wkordalski
wkordalski| +|SannidhyaSah
SannidhyaSah|xyOz-dev
xyOz-dev|chrarnoldus
chrarnoldus|sachasayan
sachasayan|Smartsheet-JB-Brown
Smartsheet-JB-Brown|monotykamary
monotykamary| +|cannuri
cannuri|feifei325
feifei325|zhangtony239
zhangtony239|shariqriazz
shariqriazz|vigneshsubbiah16
vigneshsubbiah16|pugazhendhi-m
pugazhendhi-m| +|lloydchang
lloydchang|dtrugman
dtrugman|Szpadel
Szpadel|hassoncs
hassoncs|liwilliam2021
liwilliam2021|lupuletic
lupuletic| +|kiwina
kiwina|Premshay
Premshay|psv2522
psv2522|olweraltuve
olweraltuve|diarmidmackenzie
diarmidmackenzie|ChuKhaLi
ChuKhaLi| +|PeterDaveHello
PeterDaveHello|aheizi
aheizi|nbihan-mediware
nbihan-mediware|noritaka1166
noritaka1166|RaySinner
RaySinner|afshawnlotfi
afshawnlotfi| +|dleffel
dleffel|StevenTCramer
StevenTCramer|Ruakij
Ruakij|pdecat
pdecat|kyle-apex
kyle-apex|emshvac
emshvac| +|Lunchb0ne
Lunchb0ne|SmartManoj
SmartManoj|vagadiya
vagadiya|slytechnical
slytechnical|dlab-anton
dlab-anton|arthurauffray
arthurauffray| +|upamune
upamune|NamesMT
NamesMT|taylorwilsdon
taylorwilsdon|sammcj
sammcj|p12tic
p12tic|gtaylor
gtaylor| +|brunobergher
brunobergher|aitoroses
aitoroses|ross
ross|mr-ryan-james
mr-ryan-james|heyseth
heyseth|taisukeoe
taisukeoe| +|avtc
avtc|eonghk
eonghk|GOODBOY008
GOODBOY008|kcwhite
kcwhite|ronyblum
ronyblum|teddyOOXX
teddyOOXX| +|vincentsong
vincentsong|yongjer
yongjer|zeozeozeo
zeozeozeo|ashktn
ashktn|franekp
franekp|yt3trees
yt3trees| +|seedlord
seedlord|bramburn
bramburn|anton-otee
anton-otee|benzntech
benzntech|axkirillov
axkirillov|olearycrew
olearycrew| +|catrielmuller
catrielmuller|devxpain
devxpain|snoyiatk
snoyiatk|GitlyHallows
GitlyHallows|jcbdev
jcbdev|Chenjiayuan195
Chenjiayuan195| +|julionav
julionav|KanTakahiro
KanTakahiro|SplittyDev
SplittyDev|mdp
mdp|napter
napter|philfung
philfung| +|bannzai
bannzai|bbenshalom
bbenshalom|chris-garrett
chris-garrett|dairui1
dairui1|dqroid
dqroid|janaki-sasidhar
janaki-sasidhar| +|forestyoo
forestyoo|hatsu38
hatsu38|hongzio
hongzio|im47cn
im47cn|shoopapa
shoopapa|jwcraig
jwcraig| +|axmo
axmo|asychin
asychin|amittell
amittell|Yoshino-Yukitaro
Yoshino-Yukitaro|Yikai-Liao
Yikai-Liao|zxdvd
zxdvd| +|s97712
s97712|vladstudio
vladstudio|vivekfyi
vivekfyi|HahaBill
HahaBill|tmsjngx0
tmsjngx0|TGlide
TGlide| +|Githubguy132010
Githubguy132010|tgfjt
tgfjt|maekawataiki
maekawataiki|nevermorec
nevermorec|PretzelVector
PretzelVector|zetaloop
zetaloop| +|cdlliuy
cdlliuy|user202729
user202729|thill2323
thill2323|takakoutso
takakoutso|student20880
student20880|shubhamgupta731
shubhamgupta731| +|shohei-ihaya
shohei-ihaya|shivamd1810
shivamd1810|shaybc
shaybc|sensei-woo
sensei-woo|samir-nimbly
samir-nimbly|robertheadley
robertheadley| +|refactorthis
refactorthis|qingyuan1109
qingyuan1109|pokutuna
pokutuna|philipnext
philipnext|village-way
village-way|oprstchn
oprstchn| +|nobu007
nobu007|mosleyit
mosleyit|moqimoqidea
moqimoqidea|mlopezr
mlopezr|mecab
mecab|olup
olup| +|lightrabbit
lightrabbit|lhish
lhish|kohii
kohii|kinandan
kinandan|AlexandruSmirnov
AlexandruSmirnov|pfitz
pfitz| +|ExactDoug
ExactDoug|celestial-vault
celestial-vault|linegel
linegel|edwin-truthsearch-io
edwin-truthsearch-io|EamonNerbonne
EamonNerbonne|dbasclpy
dbasclpy| +|dflatline
dflatline|Deon588
Deon588|dleen
dleen|CW-B-W
CW-B-W|chadgauth
chadgauth|thecolorblue
thecolorblue| +|bogdan0083
bogdan0083|benashby
benashby|Atlogit
Atlogit|atlasgong
atlasgong|AntiMoron
AntiMoron|andrewshu2000
andrewshu2000| +|andreastempsch
andreastempsch|alasano
alasano|QuinsZouls
QuinsZouls|HadesArchitect
HadesArchitect|alarno
alarno|nexon33
nexon33| +|adilhafeez
adilhafeez|adamwlarson
adamwlarson|adamhill
adamhill|AMHesch
AMHesch|adambrand
adambrand|samsilveira
samsilveira| +|01Rian
01Rian|RSO
RSO|RandalSchwartz
RandalSchwartz|SECKainersdorfer
SECKainersdorfer|R-omk
R-omk|Sarke
Sarke| +|PaperBoardOfficial
PaperBoardOfficial|OlegOAndreev
OlegOAndreev|Naam
Naam|NaccOll
NaccOll|kvokka
kvokka|ecmasx
ecmasx| +|mollux
mollux|marvijo-code
marvijo-code|markijbema
markijbema|mamertofabian
mamertofabian|monkeyDluffy6017
monkeyDluffy6017|libertyteeth
libertyteeth| +|shtse8
shtse8|Rexarrior
Rexarrior|kevinvandijk
kevinvandijk|KevinZhao
KevinZhao|ksze
ksze|Juice10
Juice10| +|snova-jorgep
snova-jorgep|Fovty
Fovty|Jdo300
Jdo300|hesara
hesara|DeXtroTip
DeXtroTip| | ## Licence diff --git a/locales/hi/README.md b/locales/hi/README.md index e3538597d9..1de6b51de2 100644 --- a/locales/hi/README.md +++ b/locales/hi/README.md @@ -181,47 +181,45 @@ code --install-extension bin/roo-cline-.vsix Roo Code को बेहतर बनाने में मदद करने वाले हमारे सभी योगदानकर्ताओं को धन्यवाद! - -| mrubens
mrubens | saoudrizwan
saoudrizwan | cte
cte | daniel-lxs
daniel-lxs | samhvw8
samhvw8 | hannesrudolph
hannesrudolph | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
KJ7LNW | a8trejo
a8trejo | MuriloFP
MuriloFP | ColemanRoo
ColemanRoo | canrobins13
canrobins13 | stea9499
stea9499 | -| joemanley201
joemanley201 | System233
System233 | jr
jr | nissa-seru
nissa-seru | jquanton
jquanton | roomote-agent
roomote-agent | -| NyxJae
NyxJae | d-oit
d-oit | elianiva
elianiva | qdaxb
qdaxb | punkpeye
punkpeye | wkordalski
wkordalski | -| SannidhyaSah
SannidhyaSah | xyOz-dev
xyOz-dev | chrarnoldus
chrarnoldus | sachasayan
sachasayan | Smartsheet-JB-Brown
Smartsheet-JB-Brown | monotykamary
monotykamary | -| cannuri
cannuri | feifei325
feifei325 | zhangtony239
zhangtony239 | shariqriazz
shariqriazz | vigneshsubbiah16
vigneshsubbiah16 | pugazhendhi-m
pugazhendhi-m | -| lloydchang
lloydchang | dtrugman
dtrugman | Szpadel
Szpadel | lupuletic
lupuletic | kiwina
kiwina | liwilliam2021
liwilliam2021 | -| Premshay
Premshay | psv2522
psv2522 | olweraltuve
olweraltuve | diarmidmackenzie
diarmidmackenzie | hassoncs
hassoncs | ChuKhaLi
ChuKhaLi | -| PeterDaveHello
PeterDaveHello | aheizi
aheizi | nbihan-mediware
nbihan-mediware | noritaka1166
noritaka1166 | RaySinner
RaySinner | afshawnlotfi
afshawnlotfi | -| dleffel
dleffel | StevenTCramer
StevenTCramer | Ruakij
Ruakij | pdecat
pdecat | kyle-apex
kyle-apex | emshvac
emshvac | -| Lunchb0ne
Lunchb0ne | SmartManoj
SmartManoj | vagadiya
vagadiya | slytechnical
slytechnical | dlab-anton
dlab-anton | arthurauffray
arthurauffray | -| upamune
upamune | NamesMT
NamesMT | taylorwilsdon
taylorwilsdon | sammcj
sammcj | p12tic
p12tic | gtaylor
gtaylor | -| brunobergher
brunobergher | aitoroses
aitoroses | ross
ross | mr-ryan-james
mr-ryan-james | heyseth
heyseth | taisukeoe
taisukeoe | -| avtc
avtc | eonghk
eonghk | GOODBOY008
GOODBOY008 | kcwhite
kcwhite | ronyblum
ronyblum | teddyOOXX
teddyOOXX | -| vincentsong
vincentsong | yongjer
yongjer | zeozeozeo
zeozeozeo | ashktn
ashktn | franekp
franekp | yt3trees
yt3trees | -| seedlord
seedlord | bramburn
bramburn | anton-otee
anton-otee | benzntech
benzntech | axkirillov
axkirillov | olearycrew
olearycrew | -| catrielmuller
catrielmuller | devxpain
devxpain | snoyiatk
snoyiatk | GitlyHallows
GitlyHallows | jcbdev
jcbdev | Chenjiayuan195
Chenjiayuan195 | -| julionav
julionav | KanTakahiro
KanTakahiro | SplittyDev
SplittyDev | mdp
mdp | napter
napter | philfung
philfung | -| bbenshalom
bbenshalom | chris-garrett
chris-garrett | dairui1
dairui1 | dqroid
dqroid | janaki-sasidhar
janaki-sasidhar | forestyoo
forestyoo | -| hatsu38
hatsu38 | hongzio
hongzio | im47cn
im47cn | shoopapa
shoopapa | jwcraig
jwcraig | kinandan
kinandan | -| bannzai
bannzai | axmo
axmo | asychin
asychin | amittell
amittell | Yoshino-Yukitaro
Yoshino-Yukitaro | Yikai-Liao
Yikai-Liao | -| zxdvd
zxdvd | s97712
s97712 | vladstudio
vladstudio | vivekfyi
vivekfyi | HahaBill
HahaBill | tmsjngx0
tmsjngx0 | -| TGlide
TGlide | Githubguy132010
Githubguy132010 | nevermorec
nevermorec | PretzelVector
PretzelVector | zetaloop
zetaloop | cdlliuy
cdlliuy | -| user202729
user202729 | thill2323
thill2323 | takakoutso
takakoutso | student20880
student20880 | shubhamgupta731
shubhamgupta731 | shohei-ihaya
shohei-ihaya | -| shivamd1810
shivamd1810 | shaybc
shaybc | sensei-woo
sensei-woo | samir-nimbly
samir-nimbly | robertheadley
robertheadley | refactorthis
refactorthis | -| qingyuan1109
qingyuan1109 | pokutuna
pokutuna | philipnext
philipnext | village-way
village-way | oprstchn
oprstchn | nobu007
nobu007 | -| mosleyit
mosleyit | moqimoqidea
moqimoqidea | mlopezr
mlopezr | mecab
mecab | olup
olup | lightrabbit
lightrabbit | -| lhish
lhish | kohii
kohii | tgfjt
tgfjt | DeXtroTip
DeXtroTip | pfitz
pfitz | ExactDoug
ExactDoug | -| celestial-vault
celestial-vault | linegel
linegel | edwin-truthsearch-io
edwin-truthsearch-io | EamonNerbonne
EamonNerbonne | dbasclpy
dbasclpy | dflatline
dflatline | -| Deon588
Deon588 | dleen
dleen | CW-B-W
CW-B-W | chadgauth
chadgauth | thecolorblue
thecolorblue | bogdan0083
bogdan0083 | -| benashby
benashby | Atlogit
Atlogit | atlasgong
atlasgong | andrewshu2000
andrewshu2000 | andreastempsch
andreastempsch | alasano
alasano | -| QuinsZouls
QuinsZouls | HadesArchitect
HadesArchitect | alarno
alarno | nexon33
nexon33 | adilhafeez
adilhafeez | adamwlarson
adamwlarson | -| adamhill
adamhill | AMHesch
AMHesch | maekawataiki
maekawataiki | AlexandruSmirnov
AlexandruSmirnov | samsilveira
samsilveira | 01Rian
01Rian | -| RSO
RSO | RandalSchwartz
RandalSchwartz | SECKainersdorfer
SECKainersdorfer | R-omk
R-omk | Sarke
Sarke | PaperBoardOfficial
PaperBoardOfficial | -| OlegOAndreev
OlegOAndreev | Naam
Naam | kvokka
kvokka | ecmasx
ecmasx | mollux
mollux | marvijo-code
marvijo-code | -| markijbema
markijbema | mamertofabian
mamertofabian | monkeyDluffy6017
monkeyDluffy6017 | libertyteeth
libertyteeth | shtse8
shtse8 | Rexarrior
Rexarrior | -| kevinvandijk
kevinvandijk | KevinZhao
KevinZhao | ksze
ksze | Juice10
Juice10 | Fovty
Fovty | Jdo300
Jdo300 | -| hesara
hesara | | | | | | - +|mrubens
mrubens|saoudrizwan
saoudrizwan|cte
cte|daniel-lxs
daniel-lxs|samhvw8
samhvw8|hannesrudolph
hannesrudolph| +|:---:|:---:|:---:|:---:|:---:|:---:| +|KJ7LNW
KJ7LNW|a8trejo
a8trejo|MuriloFP
MuriloFP|ColemanRoo
ColemanRoo|canrobins13
canrobins13|stea9499
stea9499| +|joemanley201
joemanley201|System233
System233|jr
jr|nissa-seru
nissa-seru|jquanton
jquanton|roomote-agent
roomote-agent| +|NyxJae
NyxJae|d-oit
d-oit|elianiva
elianiva|qdaxb
qdaxb|punkpeye
punkpeye|wkordalski
wkordalski| +|SannidhyaSah
SannidhyaSah|xyOz-dev
xyOz-dev|chrarnoldus
chrarnoldus|sachasayan
sachasayan|Smartsheet-JB-Brown
Smartsheet-JB-Brown|monotykamary
monotykamary| +|cannuri
cannuri|feifei325
feifei325|zhangtony239
zhangtony239|shariqriazz
shariqriazz|vigneshsubbiah16
vigneshsubbiah16|pugazhendhi-m
pugazhendhi-m| +|lloydchang
lloydchang|dtrugman
dtrugman|Szpadel
Szpadel|hassoncs
hassoncs|liwilliam2021
liwilliam2021|lupuletic
lupuletic| +|kiwina
kiwina|Premshay
Premshay|psv2522
psv2522|olweraltuve
olweraltuve|diarmidmackenzie
diarmidmackenzie|ChuKhaLi
ChuKhaLi| +|PeterDaveHello
PeterDaveHello|aheizi
aheizi|nbihan-mediware
nbihan-mediware|noritaka1166
noritaka1166|RaySinner
RaySinner|afshawnlotfi
afshawnlotfi| +|dleffel
dleffel|StevenTCramer
StevenTCramer|Ruakij
Ruakij|pdecat
pdecat|kyle-apex
kyle-apex|emshvac
emshvac| +|Lunchb0ne
Lunchb0ne|SmartManoj
SmartManoj|vagadiya
vagadiya|slytechnical
slytechnical|dlab-anton
dlab-anton|arthurauffray
arthurauffray| +|upamune
upamune|NamesMT
NamesMT|taylorwilsdon
taylorwilsdon|sammcj
sammcj|p12tic
p12tic|gtaylor
gtaylor| +|brunobergher
brunobergher|aitoroses
aitoroses|ross
ross|mr-ryan-james
mr-ryan-james|heyseth
heyseth|taisukeoe
taisukeoe| +|avtc
avtc|eonghk
eonghk|GOODBOY008
GOODBOY008|kcwhite
kcwhite|ronyblum
ronyblum|teddyOOXX
teddyOOXX| +|vincentsong
vincentsong|yongjer
yongjer|zeozeozeo
zeozeozeo|ashktn
ashktn|franekp
franekp|yt3trees
yt3trees| +|seedlord
seedlord|bramburn
bramburn|anton-otee
anton-otee|benzntech
benzntech|axkirillov
axkirillov|olearycrew
olearycrew| +|catrielmuller
catrielmuller|devxpain
devxpain|snoyiatk
snoyiatk|GitlyHallows
GitlyHallows|jcbdev
jcbdev|Chenjiayuan195
Chenjiayuan195| +|julionav
julionav|KanTakahiro
KanTakahiro|SplittyDev
SplittyDev|mdp
mdp|napter
napter|philfung
philfung| +|bannzai
bannzai|bbenshalom
bbenshalom|chris-garrett
chris-garrett|dairui1
dairui1|dqroid
dqroid|janaki-sasidhar
janaki-sasidhar| +|forestyoo
forestyoo|hatsu38
hatsu38|hongzio
hongzio|im47cn
im47cn|shoopapa
shoopapa|jwcraig
jwcraig| +|axmo
axmo|asychin
asychin|amittell
amittell|Yoshino-Yukitaro
Yoshino-Yukitaro|Yikai-Liao
Yikai-Liao|zxdvd
zxdvd| +|s97712
s97712|vladstudio
vladstudio|vivekfyi
vivekfyi|HahaBill
HahaBill|tmsjngx0
tmsjngx0|TGlide
TGlide| +|Githubguy132010
Githubguy132010|tgfjt
tgfjt|maekawataiki
maekawataiki|nevermorec
nevermorec|PretzelVector
PretzelVector|zetaloop
zetaloop| +|cdlliuy
cdlliuy|user202729
user202729|thill2323
thill2323|takakoutso
takakoutso|student20880
student20880|shubhamgupta731
shubhamgupta731| +|shohei-ihaya
shohei-ihaya|shivamd1810
shivamd1810|shaybc
shaybc|sensei-woo
sensei-woo|samir-nimbly
samir-nimbly|robertheadley
robertheadley| +|refactorthis
refactorthis|qingyuan1109
qingyuan1109|pokutuna
pokutuna|philipnext
philipnext|village-way
village-way|oprstchn
oprstchn| +|nobu007
nobu007|mosleyit
mosleyit|moqimoqidea
moqimoqidea|mlopezr
mlopezr|mecab
mecab|olup
olup| +|lightrabbit
lightrabbit|lhish
lhish|kohii
kohii|kinandan
kinandan|AlexandruSmirnov
AlexandruSmirnov|pfitz
pfitz| +|ExactDoug
ExactDoug|celestial-vault
celestial-vault|linegel
linegel|edwin-truthsearch-io
edwin-truthsearch-io|EamonNerbonne
EamonNerbonne|dbasclpy
dbasclpy| +|dflatline
dflatline|Deon588
Deon588|dleen
dleen|CW-B-W
CW-B-W|chadgauth
chadgauth|thecolorblue
thecolorblue| +|bogdan0083
bogdan0083|benashby
benashby|Atlogit
Atlogit|atlasgong
atlasgong|AntiMoron
AntiMoron|andrewshu2000
andrewshu2000| +|andreastempsch
andreastempsch|alasano
alasano|QuinsZouls
QuinsZouls|HadesArchitect
HadesArchitect|alarno
alarno|nexon33
nexon33| +|adilhafeez
adilhafeez|adamwlarson
adamwlarson|adamhill
adamhill|AMHesch
AMHesch|adambrand
adambrand|samsilveira
samsilveira| +|01Rian
01Rian|RSO
RSO|RandalSchwartz
RandalSchwartz|SECKainersdorfer
SECKainersdorfer|R-omk
R-omk|Sarke
Sarke| +|PaperBoardOfficial
PaperBoardOfficial|OlegOAndreev
OlegOAndreev|Naam
Naam|NaccOll
NaccOll|kvokka
kvokka|ecmasx
ecmasx| +|mollux
mollux|marvijo-code
marvijo-code|markijbema
markijbema|mamertofabian
mamertofabian|monkeyDluffy6017
monkeyDluffy6017|libertyteeth
libertyteeth| +|shtse8
shtse8|Rexarrior
Rexarrior|kevinvandijk
kevinvandijk|KevinZhao
KevinZhao|ksze
ksze|Juice10
Juice10| +|snova-jorgep
snova-jorgep|Fovty
Fovty|Jdo300
Jdo300|hesara
hesara|DeXtroTip
DeXtroTip| | ## लाइसेंस diff --git a/locales/id/README.md b/locales/id/README.md index c97c557054..535d3005bd 100644 --- a/locales/id/README.md +++ b/locales/id/README.md @@ -175,47 +175,45 @@ Kami menyukai kontribusi komunitas! Mulai dengan membaca [CONTRIBUTING.md](CONTR Terima kasih kepada semua kontributor kami yang telah membantu membuat Roo Code lebih baik! - -| mrubens
mrubens | saoudrizwan
saoudrizwan | cte
cte | daniel-lxs
daniel-lxs | samhvw8
samhvw8 | hannesrudolph
hannesrudolph | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
KJ7LNW | a8trejo
a8trejo | MuriloFP
MuriloFP | ColemanRoo
ColemanRoo | canrobins13
canrobins13 | stea9499
stea9499 | -| joemanley201
joemanley201 | System233
System233 | jr
jr | nissa-seru
nissa-seru | jquanton
jquanton | roomote-agent
roomote-agent | -| NyxJae
NyxJae | d-oit
d-oit | elianiva
elianiva | qdaxb
qdaxb | punkpeye
punkpeye | wkordalski
wkordalski | -| SannidhyaSah
SannidhyaSah | xyOz-dev
xyOz-dev | chrarnoldus
chrarnoldus | sachasayan
sachasayan | Smartsheet-JB-Brown
Smartsheet-JB-Brown | monotykamary
monotykamary | -| cannuri
cannuri | feifei325
feifei325 | zhangtony239
zhangtony239 | shariqriazz
shariqriazz | vigneshsubbiah16
vigneshsubbiah16 | pugazhendhi-m
pugazhendhi-m | -| lloydchang
lloydchang | dtrugman
dtrugman | Szpadel
Szpadel | lupuletic
lupuletic | kiwina
kiwina | liwilliam2021
liwilliam2021 | -| Premshay
Premshay | psv2522
psv2522 | olweraltuve
olweraltuve | diarmidmackenzie
diarmidmackenzie | hassoncs
hassoncs | ChuKhaLi
ChuKhaLi | -| PeterDaveHello
PeterDaveHello | aheizi
aheizi | nbihan-mediware
nbihan-mediware | noritaka1166
noritaka1166 | RaySinner
RaySinner | afshawnlotfi
afshawnlotfi | -| dleffel
dleffel | StevenTCramer
StevenTCramer | Ruakij
Ruakij | pdecat
pdecat | kyle-apex
kyle-apex | emshvac
emshvac | -| Lunchb0ne
Lunchb0ne | SmartManoj
SmartManoj | vagadiya
vagadiya | slytechnical
slytechnical | dlab-anton
dlab-anton | arthurauffray
arthurauffray | -| upamune
upamune | NamesMT
NamesMT | taylorwilsdon
taylorwilsdon | sammcj
sammcj | p12tic
p12tic | gtaylor
gtaylor | -| brunobergher
brunobergher | aitoroses
aitoroses | ross
ross | mr-ryan-james
mr-ryan-james | heyseth
heyseth | taisukeoe
taisukeoe | -| avtc
avtc | eonghk
eonghk | GOODBOY008
GOODBOY008 | kcwhite
kcwhite | ronyblum
ronyblum | teddyOOXX
teddyOOXX | -| vincentsong
vincentsong | yongjer
yongjer | zeozeozeo
zeozeozeo | ashktn
ashktn | franekp
franekp | yt3trees
yt3trees | -| seedlord
seedlord | bramburn
bramburn | anton-otee
anton-otee | benzntech
benzntech | axkirillov
axkirillov | olearycrew
olearycrew | -| catrielmuller
catrielmuller | devxpain
devxpain | snoyiatk
snoyiatk | GitlyHallows
GitlyHallows | jcbdev
jcbdev | Chenjiayuan195
Chenjiayuan195 | -| julionav
julionav | KanTakahiro
KanTakahiro | SplittyDev
SplittyDev | mdp
mdp | napter
napter | philfung
philfung | -| bbenshalom
bbenshalom | chris-garrett
chris-garrett | dairui1
dairui1 | dqroid
dqroid | janaki-sasidhar
janaki-sasidhar | forestyoo
forestyoo | -| hatsu38
hatsu38 | hongzio
hongzio | im47cn
im47cn | shoopapa
shoopapa | jwcraig
jwcraig | kinandan
kinandan | -| bannzai
bannzai | axmo
axmo | asychin
asychin | amittell
amittell | Yoshino-Yukitaro
Yoshino-Yukitaro | Yikai-Liao
Yikai-Liao | -| zxdvd
zxdvd | s97712
s97712 | vladstudio
vladstudio | vivekfyi
vivekfyi | HahaBill
HahaBill | tmsjngx0
tmsjngx0 | -| TGlide
TGlide | Githubguy132010
Githubguy132010 | nevermorec
nevermorec | PretzelVector
PretzelVector | zetaloop
zetaloop | cdlliuy
cdlliuy | -| user202729
user202729 | thill2323
thill2323 | takakoutso
takakoutso | student20880
student20880 | shubhamgupta731
shubhamgupta731 | shohei-ihaya
shohei-ihaya | -| shivamd1810
shivamd1810 | shaybc
shaybc | sensei-woo
sensei-woo | samir-nimbly
samir-nimbly | robertheadley
robertheadley | refactorthis
refactorthis | -| qingyuan1109
qingyuan1109 | pokutuna
pokutuna | philipnext
philipnext | village-way
village-way | oprstchn
oprstchn | nobu007
nobu007 | -| mosleyit
mosleyit | moqimoqidea
moqimoqidea | mlopezr
mlopezr | mecab
mecab | olup
olup | lightrabbit
lightrabbit | -| lhish
lhish | kohii
kohii | tgfjt
tgfjt | DeXtroTip
DeXtroTip | pfitz
pfitz | ExactDoug
ExactDoug | -| celestial-vault
celestial-vault | linegel
linegel | edwin-truthsearch-io
edwin-truthsearch-io | EamonNerbonne
EamonNerbonne | dbasclpy
dbasclpy | dflatline
dflatline | -| Deon588
Deon588 | dleen
dleen | CW-B-W
CW-B-W | chadgauth
chadgauth | thecolorblue
thecolorblue | bogdan0083
bogdan0083 | -| benashby
benashby | Atlogit
Atlogit | atlasgong
atlasgong | andrewshu2000
andrewshu2000 | andreastempsch
andreastempsch | alasano
alasano | -| QuinsZouls
QuinsZouls | HadesArchitect
HadesArchitect | alarno
alarno | nexon33
nexon33 | adilhafeez
adilhafeez | adamwlarson
adamwlarson | -| adamhill
adamhill | AMHesch
AMHesch | maekawataiki
maekawataiki | AlexandruSmirnov
AlexandruSmirnov | samsilveira
samsilveira | 01Rian
01Rian | -| RSO
RSO | RandalSchwartz
RandalSchwartz | SECKainersdorfer
SECKainersdorfer | R-omk
R-omk | Sarke
Sarke | PaperBoardOfficial
PaperBoardOfficial | -| OlegOAndreev
OlegOAndreev | Naam
Naam | kvokka
kvokka | ecmasx
ecmasx | mollux
mollux | marvijo-code
marvijo-code | -| markijbema
markijbema | mamertofabian
mamertofabian | monkeyDluffy6017
monkeyDluffy6017 | libertyteeth
libertyteeth | shtse8
shtse8 | Rexarrior
Rexarrior | -| kevinvandijk
kevinvandijk | KevinZhao
KevinZhao | ksze
ksze | Juice10
Juice10 | Fovty
Fovty | Jdo300
Jdo300 | -| hesara
hesara | | | | | | - +|mrubens
mrubens|saoudrizwan
saoudrizwan|cte
cte|daniel-lxs
daniel-lxs|samhvw8
samhvw8|hannesrudolph
hannesrudolph| +|:---:|:---:|:---:|:---:|:---:|:---:| +|KJ7LNW
KJ7LNW|a8trejo
a8trejo|MuriloFP
MuriloFP|ColemanRoo
ColemanRoo|canrobins13
canrobins13|stea9499
stea9499| +|joemanley201
joemanley201|System233
System233|jr
jr|nissa-seru
nissa-seru|jquanton
jquanton|roomote-agent
roomote-agent| +|NyxJae
NyxJae|d-oit
d-oit|elianiva
elianiva|qdaxb
qdaxb|punkpeye
punkpeye|wkordalski
wkordalski| +|SannidhyaSah
SannidhyaSah|xyOz-dev
xyOz-dev|chrarnoldus
chrarnoldus|sachasayan
sachasayan|Smartsheet-JB-Brown
Smartsheet-JB-Brown|monotykamary
monotykamary| +|cannuri
cannuri|feifei325
feifei325|zhangtony239
zhangtony239|shariqriazz
shariqriazz|vigneshsubbiah16
vigneshsubbiah16|pugazhendhi-m
pugazhendhi-m| +|lloydchang
lloydchang|dtrugman
dtrugman|Szpadel
Szpadel|hassoncs
hassoncs|liwilliam2021
liwilliam2021|lupuletic
lupuletic| +|kiwina
kiwina|Premshay
Premshay|psv2522
psv2522|olweraltuve
olweraltuve|diarmidmackenzie
diarmidmackenzie|ChuKhaLi
ChuKhaLi| +|PeterDaveHello
PeterDaveHello|aheizi
aheizi|nbihan-mediware
nbihan-mediware|noritaka1166
noritaka1166|RaySinner
RaySinner|afshawnlotfi
afshawnlotfi| +|dleffel
dleffel|StevenTCramer
StevenTCramer|Ruakij
Ruakij|pdecat
pdecat|kyle-apex
kyle-apex|emshvac
emshvac| +|Lunchb0ne
Lunchb0ne|SmartManoj
SmartManoj|vagadiya
vagadiya|slytechnical
slytechnical|dlab-anton
dlab-anton|arthurauffray
arthurauffray| +|upamune
upamune|NamesMT
NamesMT|taylorwilsdon
taylorwilsdon|sammcj
sammcj|p12tic
p12tic|gtaylor
gtaylor| +|brunobergher
brunobergher|aitoroses
aitoroses|ross
ross|mr-ryan-james
mr-ryan-james|heyseth
heyseth|taisukeoe
taisukeoe| +|avtc
avtc|eonghk
eonghk|GOODBOY008
GOODBOY008|kcwhite
kcwhite|ronyblum
ronyblum|teddyOOXX
teddyOOXX| +|vincentsong
vincentsong|yongjer
yongjer|zeozeozeo
zeozeozeo|ashktn
ashktn|franekp
franekp|yt3trees
yt3trees| +|seedlord
seedlord|bramburn
bramburn|anton-otee
anton-otee|benzntech
benzntech|axkirillov
axkirillov|olearycrew
olearycrew| +|catrielmuller
catrielmuller|devxpain
devxpain|snoyiatk
snoyiatk|GitlyHallows
GitlyHallows|jcbdev
jcbdev|Chenjiayuan195
Chenjiayuan195| +|julionav
julionav|KanTakahiro
KanTakahiro|SplittyDev
SplittyDev|mdp
mdp|napter
napter|philfung
philfung| +|bannzai
bannzai|bbenshalom
bbenshalom|chris-garrett
chris-garrett|dairui1
dairui1|dqroid
dqroid|janaki-sasidhar
janaki-sasidhar| +|forestyoo
forestyoo|hatsu38
hatsu38|hongzio
hongzio|im47cn
im47cn|shoopapa
shoopapa|jwcraig
jwcraig| +|axmo
axmo|asychin
asychin|amittell
amittell|Yoshino-Yukitaro
Yoshino-Yukitaro|Yikai-Liao
Yikai-Liao|zxdvd
zxdvd| +|s97712
s97712|vladstudio
vladstudio|vivekfyi
vivekfyi|HahaBill
HahaBill|tmsjngx0
tmsjngx0|TGlide
TGlide| +|Githubguy132010
Githubguy132010|tgfjt
tgfjt|maekawataiki
maekawataiki|nevermorec
nevermorec|PretzelVector
PretzelVector|zetaloop
zetaloop| +|cdlliuy
cdlliuy|user202729
user202729|thill2323
thill2323|takakoutso
takakoutso|student20880
student20880|shubhamgupta731
shubhamgupta731| +|shohei-ihaya
shohei-ihaya|shivamd1810
shivamd1810|shaybc
shaybc|sensei-woo
sensei-woo|samir-nimbly
samir-nimbly|robertheadley
robertheadley| +|refactorthis
refactorthis|qingyuan1109
qingyuan1109|pokutuna
pokutuna|philipnext
philipnext|village-way
village-way|oprstchn
oprstchn| +|nobu007
nobu007|mosleyit
mosleyit|moqimoqidea
moqimoqidea|mlopezr
mlopezr|mecab
mecab|olup
olup| +|lightrabbit
lightrabbit|lhish
lhish|kohii
kohii|kinandan
kinandan|AlexandruSmirnov
AlexandruSmirnov|pfitz
pfitz| +|ExactDoug
ExactDoug|celestial-vault
celestial-vault|linegel
linegel|edwin-truthsearch-io
edwin-truthsearch-io|EamonNerbonne
EamonNerbonne|dbasclpy
dbasclpy| +|dflatline
dflatline|Deon588
Deon588|dleen
dleen|CW-B-W
CW-B-W|chadgauth
chadgauth|thecolorblue
thecolorblue| +|bogdan0083
bogdan0083|benashby
benashby|Atlogit
Atlogit|atlasgong
atlasgong|AntiMoron
AntiMoron|andrewshu2000
andrewshu2000| +|andreastempsch
andreastempsch|alasano
alasano|QuinsZouls
QuinsZouls|HadesArchitect
HadesArchitect|alarno
alarno|nexon33
nexon33| +|adilhafeez
adilhafeez|adamwlarson
adamwlarson|adamhill
adamhill|AMHesch
AMHesch|adambrand
adambrand|samsilveira
samsilveira| +|01Rian
01Rian|RSO
RSO|RandalSchwartz
RandalSchwartz|SECKainersdorfer
SECKainersdorfer|R-omk
R-omk|Sarke
Sarke| +|PaperBoardOfficial
PaperBoardOfficial|OlegOAndreev
OlegOAndreev|Naam
Naam|NaccOll
NaccOll|kvokka
kvokka|ecmasx
ecmasx| +|mollux
mollux|marvijo-code
marvijo-code|markijbema
markijbema|mamertofabian
mamertofabian|monkeyDluffy6017
monkeyDluffy6017|libertyteeth
libertyteeth| +|shtse8
shtse8|Rexarrior
Rexarrior|kevinvandijk
kevinvandijk|KevinZhao
KevinZhao|ksze
ksze|Juice10
Juice10| +|snova-jorgep
snova-jorgep|Fovty
Fovty|Jdo300
Jdo300|hesara
hesara|DeXtroTip
DeXtroTip| | ## License diff --git a/locales/it/README.md b/locales/it/README.md index 63f4bdb408..e7483a882d 100644 --- a/locales/it/README.md +++ b/locales/it/README.md @@ -181,47 +181,45 @@ Amiamo i contributi della community! Inizia leggendo il nostro [CONTRIBUTING.md] Grazie a tutti i nostri contributori che hanno aiutato a migliorare Roo Code! - -| mrubens
mrubens | saoudrizwan
saoudrizwan | cte
cte | daniel-lxs
daniel-lxs | samhvw8
samhvw8 | hannesrudolph
hannesrudolph | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
KJ7LNW | a8trejo
a8trejo | MuriloFP
MuriloFP | ColemanRoo
ColemanRoo | canrobins13
canrobins13 | stea9499
stea9499 | -| joemanley201
joemanley201 | System233
System233 | jr
jr | nissa-seru
nissa-seru | jquanton
jquanton | roomote-agent
roomote-agent | -| NyxJae
NyxJae | d-oit
d-oit | elianiva
elianiva | qdaxb
qdaxb | punkpeye
punkpeye | wkordalski
wkordalski | -| SannidhyaSah
SannidhyaSah | xyOz-dev
xyOz-dev | chrarnoldus
chrarnoldus | sachasayan
sachasayan | Smartsheet-JB-Brown
Smartsheet-JB-Brown | monotykamary
monotykamary | -| cannuri
cannuri | feifei325
feifei325 | zhangtony239
zhangtony239 | shariqriazz
shariqriazz | vigneshsubbiah16
vigneshsubbiah16 | pugazhendhi-m
pugazhendhi-m | -| lloydchang
lloydchang | dtrugman
dtrugman | Szpadel
Szpadel | lupuletic
lupuletic | kiwina
kiwina | liwilliam2021
liwilliam2021 | -| Premshay
Premshay | psv2522
psv2522 | olweraltuve
olweraltuve | diarmidmackenzie
diarmidmackenzie | hassoncs
hassoncs | ChuKhaLi
ChuKhaLi | -| PeterDaveHello
PeterDaveHello | aheizi
aheizi | nbihan-mediware
nbihan-mediware | noritaka1166
noritaka1166 | RaySinner
RaySinner | afshawnlotfi
afshawnlotfi | -| dleffel
dleffel | StevenTCramer
StevenTCramer | Ruakij
Ruakij | pdecat
pdecat | kyle-apex
kyle-apex | emshvac
emshvac | -| Lunchb0ne
Lunchb0ne | SmartManoj
SmartManoj | vagadiya
vagadiya | slytechnical
slytechnical | dlab-anton
dlab-anton | arthurauffray
arthurauffray | -| upamune
upamune | NamesMT
NamesMT | taylorwilsdon
taylorwilsdon | sammcj
sammcj | p12tic
p12tic | gtaylor
gtaylor | -| brunobergher
brunobergher | aitoroses
aitoroses | ross
ross | mr-ryan-james
mr-ryan-james | heyseth
heyseth | taisukeoe
taisukeoe | -| avtc
avtc | eonghk
eonghk | GOODBOY008
GOODBOY008 | kcwhite
kcwhite | ronyblum
ronyblum | teddyOOXX
teddyOOXX | -| vincentsong
vincentsong | yongjer
yongjer | zeozeozeo
zeozeozeo | ashktn
ashktn | franekp
franekp | yt3trees
yt3trees | -| seedlord
seedlord | bramburn
bramburn | anton-otee
anton-otee | benzntech
benzntech | axkirillov
axkirillov | olearycrew
olearycrew | -| catrielmuller
catrielmuller | devxpain
devxpain | snoyiatk
snoyiatk | GitlyHallows
GitlyHallows | jcbdev
jcbdev | Chenjiayuan195
Chenjiayuan195 | -| julionav
julionav | KanTakahiro
KanTakahiro | SplittyDev
SplittyDev | mdp
mdp | napter
napter | philfung
philfung | -| bbenshalom
bbenshalom | chris-garrett
chris-garrett | dairui1
dairui1 | dqroid
dqroid | janaki-sasidhar
janaki-sasidhar | forestyoo
forestyoo | -| hatsu38
hatsu38 | hongzio
hongzio | im47cn
im47cn | shoopapa
shoopapa | jwcraig
jwcraig | kinandan
kinandan | -| bannzai
bannzai | axmo
axmo | asychin
asychin | amittell
amittell | Yoshino-Yukitaro
Yoshino-Yukitaro | Yikai-Liao
Yikai-Liao | -| zxdvd
zxdvd | s97712
s97712 | vladstudio
vladstudio | vivekfyi
vivekfyi | HahaBill
HahaBill | tmsjngx0
tmsjngx0 | -| TGlide
TGlide | Githubguy132010
Githubguy132010 | nevermorec
nevermorec | PretzelVector
PretzelVector | zetaloop
zetaloop | cdlliuy
cdlliuy | -| user202729
user202729 | thill2323
thill2323 | takakoutso
takakoutso | student20880
student20880 | shubhamgupta731
shubhamgupta731 | shohei-ihaya
shohei-ihaya | -| shivamd1810
shivamd1810 | shaybc
shaybc | sensei-woo
sensei-woo | samir-nimbly
samir-nimbly | robertheadley
robertheadley | refactorthis
refactorthis | -| qingyuan1109
qingyuan1109 | pokutuna
pokutuna | philipnext
philipnext | village-way
village-way | oprstchn
oprstchn | nobu007
nobu007 | -| mosleyit
mosleyit | moqimoqidea
moqimoqidea | mlopezr
mlopezr | mecab
mecab | olup
olup | lightrabbit
lightrabbit | -| lhish
lhish | kohii
kohii | tgfjt
tgfjt | DeXtroTip
DeXtroTip | pfitz
pfitz | ExactDoug
ExactDoug | -| celestial-vault
celestial-vault | linegel
linegel | edwin-truthsearch-io
edwin-truthsearch-io | EamonNerbonne
EamonNerbonne | dbasclpy
dbasclpy | dflatline
dflatline | -| Deon588
Deon588 | dleen
dleen | CW-B-W
CW-B-W | chadgauth
chadgauth | thecolorblue
thecolorblue | bogdan0083
bogdan0083 | -| benashby
benashby | Atlogit
Atlogit | atlasgong
atlasgong | andrewshu2000
andrewshu2000 | andreastempsch
andreastempsch | alasano
alasano | -| QuinsZouls
QuinsZouls | HadesArchitect
HadesArchitect | alarno
alarno | nexon33
nexon33 | adilhafeez
adilhafeez | adamwlarson
adamwlarson | -| adamhill
adamhill | AMHesch
AMHesch | maekawataiki
maekawataiki | AlexandruSmirnov
AlexandruSmirnov | samsilveira
samsilveira | 01Rian
01Rian | -| RSO
RSO | RandalSchwartz
RandalSchwartz | SECKainersdorfer
SECKainersdorfer | R-omk
R-omk | Sarke
Sarke | PaperBoardOfficial
PaperBoardOfficial | -| OlegOAndreev
OlegOAndreev | Naam
Naam | kvokka
kvokka | ecmasx
ecmasx | mollux
mollux | marvijo-code
marvijo-code | -| markijbema
markijbema | mamertofabian
mamertofabian | monkeyDluffy6017
monkeyDluffy6017 | libertyteeth
libertyteeth | shtse8
shtse8 | Rexarrior
Rexarrior | -| kevinvandijk
kevinvandijk | KevinZhao
KevinZhao | ksze
ksze | Juice10
Juice10 | Fovty
Fovty | Jdo300
Jdo300 | -| hesara
hesara | | | | | | - +|mrubens
mrubens|saoudrizwan
saoudrizwan|cte
cte|daniel-lxs
daniel-lxs|samhvw8
samhvw8|hannesrudolph
hannesrudolph| +|:---:|:---:|:---:|:---:|:---:|:---:| +|KJ7LNW
KJ7LNW|a8trejo
a8trejo|MuriloFP
MuriloFP|ColemanRoo
ColemanRoo|canrobins13
canrobins13|stea9499
stea9499| +|joemanley201
joemanley201|System233
System233|jr
jr|nissa-seru
nissa-seru|jquanton
jquanton|roomote-agent
roomote-agent| +|NyxJae
NyxJae|d-oit
d-oit|elianiva
elianiva|qdaxb
qdaxb|punkpeye
punkpeye|wkordalski
wkordalski| +|SannidhyaSah
SannidhyaSah|xyOz-dev
xyOz-dev|chrarnoldus
chrarnoldus|sachasayan
sachasayan|Smartsheet-JB-Brown
Smartsheet-JB-Brown|monotykamary
monotykamary| +|cannuri
cannuri|feifei325
feifei325|zhangtony239
zhangtony239|shariqriazz
shariqriazz|vigneshsubbiah16
vigneshsubbiah16|pugazhendhi-m
pugazhendhi-m| +|lloydchang
lloydchang|dtrugman
dtrugman|Szpadel
Szpadel|hassoncs
hassoncs|liwilliam2021
liwilliam2021|lupuletic
lupuletic| +|kiwina
kiwina|Premshay
Premshay|psv2522
psv2522|olweraltuve
olweraltuve|diarmidmackenzie
diarmidmackenzie|ChuKhaLi
ChuKhaLi| +|PeterDaveHello
PeterDaveHello|aheizi
aheizi|nbihan-mediware
nbihan-mediware|noritaka1166
noritaka1166|RaySinner
RaySinner|afshawnlotfi
afshawnlotfi| +|dleffel
dleffel|StevenTCramer
StevenTCramer|Ruakij
Ruakij|pdecat
pdecat|kyle-apex
kyle-apex|emshvac
emshvac| +|Lunchb0ne
Lunchb0ne|SmartManoj
SmartManoj|vagadiya
vagadiya|slytechnical
slytechnical|dlab-anton
dlab-anton|arthurauffray
arthurauffray| +|upamune
upamune|NamesMT
NamesMT|taylorwilsdon
taylorwilsdon|sammcj
sammcj|p12tic
p12tic|gtaylor
gtaylor| +|brunobergher
brunobergher|aitoroses
aitoroses|ross
ross|mr-ryan-james
mr-ryan-james|heyseth
heyseth|taisukeoe
taisukeoe| +|avtc
avtc|eonghk
eonghk|GOODBOY008
GOODBOY008|kcwhite
kcwhite|ronyblum
ronyblum|teddyOOXX
teddyOOXX| +|vincentsong
vincentsong|yongjer
yongjer|zeozeozeo
zeozeozeo|ashktn
ashktn|franekp
franekp|yt3trees
yt3trees| +|seedlord
seedlord|bramburn
bramburn|anton-otee
anton-otee|benzntech
benzntech|axkirillov
axkirillov|olearycrew
olearycrew| +|catrielmuller
catrielmuller|devxpain
devxpain|snoyiatk
snoyiatk|GitlyHallows
GitlyHallows|jcbdev
jcbdev|Chenjiayuan195
Chenjiayuan195| +|julionav
julionav|KanTakahiro
KanTakahiro|SplittyDev
SplittyDev|mdp
mdp|napter
napter|philfung
philfung| +|bannzai
bannzai|bbenshalom
bbenshalom|chris-garrett
chris-garrett|dairui1
dairui1|dqroid
dqroid|janaki-sasidhar
janaki-sasidhar| +|forestyoo
forestyoo|hatsu38
hatsu38|hongzio
hongzio|im47cn
im47cn|shoopapa
shoopapa|jwcraig
jwcraig| +|axmo
axmo|asychin
asychin|amittell
amittell|Yoshino-Yukitaro
Yoshino-Yukitaro|Yikai-Liao
Yikai-Liao|zxdvd
zxdvd| +|s97712
s97712|vladstudio
vladstudio|vivekfyi
vivekfyi|HahaBill
HahaBill|tmsjngx0
tmsjngx0|TGlide
TGlide| +|Githubguy132010
Githubguy132010|tgfjt
tgfjt|maekawataiki
maekawataiki|nevermorec
nevermorec|PretzelVector
PretzelVector|zetaloop
zetaloop| +|cdlliuy
cdlliuy|user202729
user202729|thill2323
thill2323|takakoutso
takakoutso|student20880
student20880|shubhamgupta731
shubhamgupta731| +|shohei-ihaya
shohei-ihaya|shivamd1810
shivamd1810|shaybc
shaybc|sensei-woo
sensei-woo|samir-nimbly
samir-nimbly|robertheadley
robertheadley| +|refactorthis
refactorthis|qingyuan1109
qingyuan1109|pokutuna
pokutuna|philipnext
philipnext|village-way
village-way|oprstchn
oprstchn| +|nobu007
nobu007|mosleyit
mosleyit|moqimoqidea
moqimoqidea|mlopezr
mlopezr|mecab
mecab|olup
olup| +|lightrabbit
lightrabbit|lhish
lhish|kohii
kohii|kinandan
kinandan|AlexandruSmirnov
AlexandruSmirnov|pfitz
pfitz| +|ExactDoug
ExactDoug|celestial-vault
celestial-vault|linegel
linegel|edwin-truthsearch-io
edwin-truthsearch-io|EamonNerbonne
EamonNerbonne|dbasclpy
dbasclpy| +|dflatline
dflatline|Deon588
Deon588|dleen
dleen|CW-B-W
CW-B-W|chadgauth
chadgauth|thecolorblue
thecolorblue| +|bogdan0083
bogdan0083|benashby
benashby|Atlogit
Atlogit|atlasgong
atlasgong|AntiMoron
AntiMoron|andrewshu2000
andrewshu2000| +|andreastempsch
andreastempsch|alasano
alasano|QuinsZouls
QuinsZouls|HadesArchitect
HadesArchitect|alarno
alarno|nexon33
nexon33| +|adilhafeez
adilhafeez|adamwlarson
adamwlarson|adamhill
adamhill|AMHesch
AMHesch|adambrand
adambrand|samsilveira
samsilveira| +|01Rian
01Rian|RSO
RSO|RandalSchwartz
RandalSchwartz|SECKainersdorfer
SECKainersdorfer|R-omk
R-omk|Sarke
Sarke| +|PaperBoardOfficial
PaperBoardOfficial|OlegOAndreev
OlegOAndreev|Naam
Naam|NaccOll
NaccOll|kvokka
kvokka|ecmasx
ecmasx| +|mollux
mollux|marvijo-code
marvijo-code|markijbema
markijbema|mamertofabian
mamertofabian|monkeyDluffy6017
monkeyDluffy6017|libertyteeth
libertyteeth| +|shtse8
shtse8|Rexarrior
Rexarrior|kevinvandijk
kevinvandijk|KevinZhao
KevinZhao|ksze
ksze|Juice10
Juice10| +|snova-jorgep
snova-jorgep|Fovty
Fovty|Jdo300
Jdo300|hesara
hesara|DeXtroTip
DeXtroTip| | ## Licenza diff --git a/locales/ja/README.md b/locales/ja/README.md index 2deed765e4..294c3b29d4 100644 --- a/locales/ja/README.md +++ b/locales/ja/README.md @@ -181,47 +181,45 @@ code --install-extension bin/roo-cline-.vsix Roo Codeの改善に貢献してくれたすべての貢献者に感謝します！ - -| mrubens
mrubens | saoudrizwan
saoudrizwan | cte
cte | daniel-lxs
daniel-lxs | samhvw8
samhvw8 | hannesrudolph
hannesrudolph | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
KJ7LNW | a8trejo
a8trejo | MuriloFP
MuriloFP | ColemanRoo
ColemanRoo | canrobins13
canrobins13 | stea9499
stea9499 | -| joemanley201
joemanley201 | System233
System233 | jr
jr | nissa-seru
nissa-seru | jquanton
jquanton | roomote-agent
roomote-agent | -| NyxJae
NyxJae | d-oit
d-oit | elianiva
elianiva | qdaxb
qdaxb | punkpeye
punkpeye | wkordalski
wkordalski | -| SannidhyaSah
SannidhyaSah | xyOz-dev
xyOz-dev | chrarnoldus
chrarnoldus | sachasayan
sachasayan | Smartsheet-JB-Brown
Smartsheet-JB-Brown | monotykamary
monotykamary | -| cannuri
cannuri | feifei325
feifei325 | zhangtony239
zhangtony239 | shariqriazz
shariqriazz | vigneshsubbiah16
vigneshsubbiah16 | pugazhendhi-m
pugazhendhi-m | -| lloydchang
lloydchang | dtrugman
dtrugman | Szpadel
Szpadel | lupuletic
lupuletic | kiwina
kiwina | liwilliam2021
liwilliam2021 | -| Premshay
Premshay | psv2522
psv2522 | olweraltuve
olweraltuve | diarmidmackenzie
diarmidmackenzie | hassoncs
hassoncs | ChuKhaLi
ChuKhaLi | -| PeterDaveHello
PeterDaveHello | aheizi
aheizi | nbihan-mediware
nbihan-mediware | noritaka1166
noritaka1166 | RaySinner
RaySinner | afshawnlotfi
afshawnlotfi | -| dleffel
dleffel | StevenTCramer
StevenTCramer | Ruakij
Ruakij | pdecat
pdecat | kyle-apex
kyle-apex | emshvac
emshvac | -| Lunchb0ne
Lunchb0ne | SmartManoj
SmartManoj | vagadiya
vagadiya | slytechnical
slytechnical | dlab-anton
dlab-anton | arthurauffray
arthurauffray | -| upamune
upamune | NamesMT
NamesMT | taylorwilsdon
taylorwilsdon | sammcj
sammcj | p12tic
p12tic | gtaylor
gtaylor | -| brunobergher
brunobergher | aitoroses
aitoroses | ross
ross | mr-ryan-james
mr-ryan-james | heyseth
heyseth | taisukeoe
taisukeoe | -| avtc
avtc | eonghk
eonghk | GOODBOY008
GOODBOY008 | kcwhite
kcwhite | ronyblum
ronyblum | teddyOOXX
teddyOOXX | -| vincentsong
vincentsong | yongjer
yongjer | zeozeozeo
zeozeozeo | ashktn
ashktn | franekp
franekp | yt3trees
yt3trees | -| seedlord
seedlord | bramburn
bramburn | anton-otee
anton-otee | benzntech
benzntech | axkirillov
axkirillov | olearycrew
olearycrew | -| catrielmuller
catrielmuller | devxpain
devxpain | snoyiatk
snoyiatk | GitlyHallows
GitlyHallows | jcbdev
jcbdev | Chenjiayuan195
Chenjiayuan195 | -| julionav
julionav | KanTakahiro
KanTakahiro | SplittyDev
SplittyDev | mdp
mdp | napter
napter | philfung
philfung | -| bbenshalom
bbenshalom | chris-garrett
chris-garrett | dairui1
dairui1 | dqroid
dqroid | janaki-sasidhar
janaki-sasidhar | forestyoo
forestyoo | -| hatsu38
hatsu38 | hongzio
hongzio | im47cn
im47cn | shoopapa
shoopapa | jwcraig
jwcraig | kinandan
kinandan | -| bannzai
bannzai | axmo
axmo | asychin
asychin | amittell
amittell | Yoshino-Yukitaro
Yoshino-Yukitaro | Yikai-Liao
Yikai-Liao | -| zxdvd
zxdvd | s97712
s97712 | vladstudio
vladstudio | vivekfyi
vivekfyi | HahaBill
HahaBill | tmsjngx0
tmsjngx0 | -| TGlide
TGlide | Githubguy132010
Githubguy132010 | nevermorec
nevermorec | PretzelVector
PretzelVector | zetaloop
zetaloop | cdlliuy
cdlliuy | -| user202729
user202729 | thill2323
thill2323 | takakoutso
takakoutso | student20880
student20880 | shubhamgupta731
shubhamgupta731 | shohei-ihaya
shohei-ihaya | -| shivamd1810
shivamd1810 | shaybc
shaybc | sensei-woo
sensei-woo | samir-nimbly
samir-nimbly | robertheadley
robertheadley | refactorthis
refactorthis | -| qingyuan1109
qingyuan1109 | pokutuna
pokutuna | philipnext
philipnext | village-way
village-way | oprstchn
oprstchn | nobu007
nobu007 | -| mosleyit
mosleyit | moqimoqidea
moqimoqidea | mlopezr
mlopezr | mecab
mecab | olup
olup | lightrabbit
lightrabbit | -| lhish
lhish | kohii
kohii | tgfjt
tgfjt | DeXtroTip
DeXtroTip | pfitz
pfitz | ExactDoug
ExactDoug | -| celestial-vault
celestial-vault | linegel
linegel | edwin-truthsearch-io
edwin-truthsearch-io | EamonNerbonne
EamonNerbonne | dbasclpy
dbasclpy | dflatline
dflatline | -| Deon588
Deon588 | dleen
dleen | CW-B-W
CW-B-W | chadgauth
chadgauth | thecolorblue
thecolorblue | bogdan0083
bogdan0083 | -| benashby
benashby | Atlogit
Atlogit | atlasgong
atlasgong | andrewshu2000
andrewshu2000 | andreastempsch
andreastempsch | alasano
alasano | -| QuinsZouls
QuinsZouls | HadesArchitect
HadesArchitect | alarno
alarno | nexon33
nexon33 | adilhafeez
adilhafeez | adamwlarson
adamwlarson | -| adamhill
adamhill | AMHesch
AMHesch | maekawataiki
maekawataiki | AlexandruSmirnov
AlexandruSmirnov | samsilveira
samsilveira | 01Rian
01Rian | -| RSO
RSO | RandalSchwartz
RandalSchwartz | SECKainersdorfer
SECKainersdorfer | R-omk
R-omk | Sarke
Sarke | PaperBoardOfficial
PaperBoardOfficial | -| OlegOAndreev
OlegOAndreev | Naam
Naam | kvokka
kvokka | ecmasx
ecmasx | mollux
mollux | marvijo-code
marvijo-code | -| markijbema
markijbema | mamertofabian
mamertofabian | monkeyDluffy6017
monkeyDluffy6017 | libertyteeth
libertyteeth | shtse8
shtse8 | Rexarrior
Rexarrior | -| kevinvandijk
kevinvandijk | KevinZhao
KevinZhao | ksze
ksze | Juice10
Juice10 | Fovty
Fovty | Jdo300
Jdo300 | -| hesara
hesara | | | | | | - +|mrubens
mrubens|saoudrizwan
saoudrizwan|cte
cte|daniel-lxs
daniel-lxs|samhvw8
samhvw8|hannesrudolph
hannesrudolph| +|:---:|:---:|:---:|:---:|:---:|:---:| +|KJ7LNW
KJ7LNW|a8trejo
a8trejo|MuriloFP
MuriloFP|ColemanRoo
ColemanRoo|canrobins13
canrobins13|stea9499
stea9499| +|joemanley201
joemanley201|System233
System233|jr
jr|nissa-seru
nissa-seru|jquanton
jquanton|roomote-agent
roomote-agent| +|NyxJae
NyxJae|d-oit
d-oit|elianiva
elianiva|qdaxb
qdaxb|punkpeye
punkpeye|wkordalski
wkordalski| +|SannidhyaSah
SannidhyaSah|xyOz-dev
xyOz-dev|chrarnoldus
chrarnoldus|sachasayan
sachasayan|Smartsheet-JB-Brown
Smartsheet-JB-Brown|monotykamary
monotykamary| +|cannuri
cannuri|feifei325
feifei325|zhangtony239
zhangtony239|shariqriazz
shariqriazz|vigneshsubbiah16
vigneshsubbiah16|pugazhendhi-m
pugazhendhi-m| +|lloydchang
lloydchang|dtrugman
dtrugman|Szpadel
Szpadel|hassoncs
hassoncs|liwilliam2021
liwilliam2021|lupuletic
lupuletic| +|kiwina
kiwina|Premshay
Premshay|psv2522
psv2522|olweraltuve
olweraltuve|diarmidmackenzie
diarmidmackenzie|ChuKhaLi
ChuKhaLi| +|PeterDaveHello
PeterDaveHello|aheizi
aheizi|nbihan-mediware
nbihan-mediware|noritaka1166
noritaka1166|RaySinner
RaySinner|afshawnlotfi
afshawnlotfi| +|dleffel
dleffel|StevenTCramer
StevenTCramer|Ruakij
Ruakij|pdecat
pdecat|kyle-apex
kyle-apex|emshvac
emshvac| +|Lunchb0ne
Lunchb0ne|SmartManoj
SmartManoj|vagadiya
vagadiya|slytechnical
slytechnical|dlab-anton
dlab-anton|arthurauffray
arthurauffray| +|upamune
upamune|NamesMT
NamesMT|taylorwilsdon
taylorwilsdon|sammcj
sammcj|p12tic
p12tic|gtaylor
gtaylor| +|brunobergher
brunobergher|aitoroses
aitoroses|ross
ross|mr-ryan-james
mr-ryan-james|heyseth
heyseth|taisukeoe
taisukeoe| +|avtc
avtc|eonghk
eonghk|GOODBOY008
GOODBOY008|kcwhite
kcwhite|ronyblum
ronyblum|teddyOOXX
teddyOOXX| +|vincentsong
vincentsong|yongjer
yongjer|zeozeozeo
zeozeozeo|ashktn
ashktn|franekp
franekp|yt3trees
yt3trees| +|seedlord
seedlord|bramburn
bramburn|anton-otee
anton-otee|benzntech
benzntech|axkirillov
axkirillov|olearycrew
olearycrew| +|catrielmuller
catrielmuller|devxpain
devxpain|snoyiatk
snoyiatk|GitlyHallows
GitlyHallows|jcbdev
jcbdev|Chenjiayuan195
Chenjiayuan195| +|julionav
julionav|KanTakahiro
KanTakahiro|SplittyDev
SplittyDev|mdp
mdp|napter
napter|philfung
philfung| +|bannzai
bannzai|bbenshalom
bbenshalom|chris-garrett
chris-garrett|dairui1
dairui1|dqroid
dqroid|janaki-sasidhar
janaki-sasidhar| +|forestyoo
forestyoo|hatsu38
hatsu38|hongzio
hongzio|im47cn
im47cn|shoopapa
shoopapa|jwcraig
jwcraig| +|axmo
axmo|asychin
asychin|amittell
amittell|Yoshino-Yukitaro
Yoshino-Yukitaro|Yikai-Liao
Yikai-Liao|zxdvd
zxdvd| +|s97712
s97712|vladstudio
vladstudio|vivekfyi
vivekfyi|HahaBill
HahaBill|tmsjngx0
tmsjngx0|TGlide
TGlide| +|Githubguy132010
Githubguy132010|tgfjt
tgfjt|maekawataiki
maekawataiki|nevermorec
nevermorec|PretzelVector
PretzelVector|zetaloop
zetaloop| +|cdlliuy
cdlliuy|user202729
user202729|thill2323
thill2323|takakoutso
takakoutso|student20880
student20880|shubhamgupta731
shubhamgupta731| +|shohei-ihaya
shohei-ihaya|shivamd1810
shivamd1810|shaybc
shaybc|sensei-woo
sensei-woo|samir-nimbly
samir-nimbly|robertheadley
robertheadley| +|refactorthis
refactorthis|qingyuan1109
qingyuan1109|pokutuna
pokutuna|philipnext
philipnext|village-way
village-way|oprstchn
oprstchn| +|nobu007
nobu007|mosleyit
mosleyit|moqimoqidea
moqimoqidea|mlopezr
mlopezr|mecab
mecab|olup
olup| +|lightrabbit
lightrabbit|lhish
lhish|kohii
kohii|kinandan
kinandan|AlexandruSmirnov
AlexandruSmirnov|pfitz
pfitz| +|ExactDoug
ExactDoug|celestial-vault
celestial-vault|linegel
linegel|edwin-truthsearch-io
edwin-truthsearch-io|EamonNerbonne
EamonNerbonne|dbasclpy
dbasclpy| +|dflatline
dflatline|Deon588
Deon588|dleen
dleen|CW-B-W
CW-B-W|chadgauth
chadgauth|thecolorblue
thecolorblue| +|bogdan0083
bogdan0083|benashby
benashby|Atlogit
Atlogit|atlasgong
atlasgong|AntiMoron
AntiMoron|andrewshu2000
andrewshu2000| +|andreastempsch
andreastempsch|alasano
alasano|QuinsZouls
QuinsZouls|HadesArchitect
HadesArchitect|alarno
alarno|nexon33
nexon33| +|adilhafeez
adilhafeez|adamwlarson
adamwlarson|adamhill
adamhill|AMHesch
AMHesch|adambrand
adambrand|samsilveira
samsilveira| +|01Rian
01Rian|RSO
RSO|RandalSchwartz
RandalSchwartz|SECKainersdorfer
SECKainersdorfer|R-omk
R-omk|Sarke
Sarke| +|PaperBoardOfficial
PaperBoardOfficial|OlegOAndreev
OlegOAndreev|Naam
Naam|NaccOll
NaccOll|kvokka
kvokka|ecmasx
ecmasx| +|mollux
mollux|marvijo-code
marvijo-code|markijbema
markijbema|mamertofabian
mamertofabian|monkeyDluffy6017
monkeyDluffy6017|libertyteeth
libertyteeth| +|shtse8
shtse8|Rexarrior
Rexarrior|kevinvandijk
kevinvandijk|KevinZhao
KevinZhao|ksze
ksze|Juice10
Juice10| +|snova-jorgep
snova-jorgep|Fovty
Fovty|Jdo300
Jdo300|hesara
hesara|DeXtroTip
DeXtroTip| | ## ライセンス diff --git a/locales/ko/README.md b/locales/ko/README.md index 4c3df318a8..81164a5e44 100644 --- a/locales/ko/README.md +++ b/locales/ko/README.md @@ -181,47 +181,45 @@ code --install-extension bin/roo-cline-.vsix Roo Code를 더 좋게 만드는 데 도움을 준 모든 기여자에게 감사드립니다! - -| mrubens
mrubens | saoudrizwan
saoudrizwan | cte
cte | daniel-lxs
daniel-lxs | samhvw8
samhvw8 | hannesrudolph
hannesrudolph | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
KJ7LNW | a8trejo
a8trejo | MuriloFP
MuriloFP | ColemanRoo
ColemanRoo | canrobins13
canrobins13 | stea9499
stea9499 | -| joemanley201
joemanley201 | System233
System233 | jr
jr | nissa-seru
nissa-seru | jquanton
jquanton | roomote-agent
roomote-agent | -| NyxJae
NyxJae | d-oit
d-oit | elianiva
elianiva | qdaxb
qdaxb | punkpeye
punkpeye | wkordalski
wkordalski | -| SannidhyaSah
SannidhyaSah | xyOz-dev
xyOz-dev | chrarnoldus
chrarnoldus | sachasayan
sachasayan | Smartsheet-JB-Brown
Smartsheet-JB-Brown | monotykamary
monotykamary | -| cannuri
cannuri | feifei325
feifei325 | zhangtony239
zhangtony239 | shariqriazz
shariqriazz | vigneshsubbiah16
vigneshsubbiah16 | pugazhendhi-m
pugazhendhi-m | -| lloydchang
lloydchang | dtrugman
dtrugman | Szpadel
Szpadel | lupuletic
lupuletic | kiwina
kiwina | liwilliam2021
liwilliam2021 | -| Premshay
Premshay | psv2522
psv2522 | olweraltuve
olweraltuve | diarmidmackenzie
diarmidmackenzie | hassoncs
hassoncs | ChuKhaLi
ChuKhaLi | -| PeterDaveHello
PeterDaveHello | aheizi
aheizi | nbihan-mediware
nbihan-mediware | noritaka1166
noritaka1166 | RaySinner
RaySinner | afshawnlotfi
afshawnlotfi | -| dleffel
dleffel | StevenTCramer
StevenTCramer | Ruakij
Ruakij | pdecat
pdecat | kyle-apex
kyle-apex | emshvac
emshvac | -| Lunchb0ne
Lunchb0ne | SmartManoj
SmartManoj | vagadiya
vagadiya | slytechnical
slytechnical | dlab-anton
dlab-anton | arthurauffray
arthurauffray | -| upamune
upamune | NamesMT
NamesMT | taylorwilsdon
taylorwilsdon | sammcj
sammcj | p12tic
p12tic | gtaylor
gtaylor | -| brunobergher
brunobergher | aitoroses
aitoroses | ross
ross | mr-ryan-james
mr-ryan-james | heyseth
heyseth | taisukeoe
taisukeoe | -| avtc
avtc | eonghk
eonghk | GOODBOY008
GOODBOY008 | kcwhite
kcwhite | ronyblum
ronyblum | teddyOOXX
teddyOOXX | -| vincentsong
vincentsong | yongjer
yongjer | zeozeozeo
zeozeozeo | ashktn
ashktn | franekp
franekp | yt3trees
yt3trees | -| seedlord
seedlord | bramburn
bramburn | anton-otee
anton-otee | benzntech
benzntech | axkirillov
axkirillov | olearycrew
olearycrew | -| catrielmuller
catrielmuller | devxpain
devxpain | snoyiatk
snoyiatk | GitlyHallows
GitlyHallows | jcbdev
jcbdev | Chenjiayuan195
Chenjiayuan195 | -| julionav
julionav | KanTakahiro
KanTakahiro | SplittyDev
SplittyDev | mdp
mdp | napter
napter | philfung
philfung | -| bbenshalom
bbenshalom | chris-garrett
chris-garrett | dairui1
dairui1 | dqroid
dqroid | janaki-sasidhar
janaki-sasidhar | forestyoo
forestyoo | -| hatsu38
hatsu38 | hongzio
hongzio | im47cn
im47cn | shoopapa
shoopapa | jwcraig
jwcraig | kinandan
kinandan | -| bannzai
bannzai | axmo
axmo | asychin
asychin | amittell
amittell | Yoshino-Yukitaro
Yoshino-Yukitaro | Yikai-Liao
Yikai-Liao | -| zxdvd
zxdvd | s97712
s97712 | vladstudio
vladstudio | vivekfyi
vivekfyi | HahaBill
HahaBill | tmsjngx0
tmsjngx0 | -| TGlide
TGlide | Githubguy132010
Githubguy132010 | nevermorec
nevermorec | PretzelVector
PretzelVector | zetaloop
zetaloop | cdlliuy
cdlliuy | -| user202729
user202729 | thill2323
thill2323 | takakoutso
takakoutso | student20880
student20880 | shubhamgupta731
shubhamgupta731 | shohei-ihaya
shohei-ihaya | -| shivamd1810
shivamd1810 | shaybc
shaybc | sensei-woo
sensei-woo | samir-nimbly
samir-nimbly | robertheadley
robertheadley | refactorthis
refactorthis | -| qingyuan1109
qingyuan1109 | pokutuna
pokutuna | philipnext
philipnext | village-way
village-way | oprstchn
oprstchn | nobu007
nobu007 | -| mosleyit
mosleyit | moqimoqidea
moqimoqidea | mlopezr
mlopezr | mecab
mecab | olup
olup | lightrabbit
lightrabbit | -| lhish
lhish | kohii
kohii | tgfjt
tgfjt | DeXtroTip
DeXtroTip | pfitz
pfitz | ExactDoug
ExactDoug | -| celestial-vault
celestial-vault | linegel
linegel | edwin-truthsearch-io
edwin-truthsearch-io | EamonNerbonne
EamonNerbonne | dbasclpy
dbasclpy | dflatline
dflatline | -| Deon588
Deon588 | dleen
dleen | CW-B-W
CW-B-W | chadgauth
chadgauth | thecolorblue
thecolorblue | bogdan0083
bogdan0083 | -| benashby
benashby | Atlogit
Atlogit | atlasgong
atlasgong | andrewshu2000
andrewshu2000 | andreastempsch
andreastempsch | alasano
alasano | -| QuinsZouls
QuinsZouls | HadesArchitect
HadesArchitect | alarno
alarno | nexon33
nexon33 | adilhafeez
adilhafeez | adamwlarson
adamwlarson | -| adamhill
adamhill | AMHesch
AMHesch | maekawataiki
maekawataiki | AlexandruSmirnov
AlexandruSmirnov | samsilveira
samsilveira | 01Rian
01Rian | -| RSO
RSO | RandalSchwartz
RandalSchwartz | SECKainersdorfer
SECKainersdorfer | R-omk
R-omk | Sarke
Sarke | PaperBoardOfficial
PaperBoardOfficial | -| OlegOAndreev
OlegOAndreev | Naam
Naam | kvokka
kvokka | ecmasx
ecmasx | mollux
mollux | marvijo-code
marvijo-code | -| markijbema
markijbema | mamertofabian
mamertofabian | monkeyDluffy6017
monkeyDluffy6017 | libertyteeth
libertyteeth | shtse8
shtse8 | Rexarrior
Rexarrior | -| kevinvandijk
kevinvandijk | KevinZhao
KevinZhao | ksze
ksze | Juice10
Juice10 | Fovty
Fovty | Jdo300
Jdo300 | -| hesara
hesara | | | | | | - +|mrubens
mrubens|saoudrizwan
saoudrizwan|cte
cte|daniel-lxs
daniel-lxs|samhvw8
samhvw8|hannesrudolph
hannesrudolph| +|:---:|:---:|:---:|:---:|:---:|:---:| +|KJ7LNW
KJ7LNW|a8trejo
a8trejo|MuriloFP
MuriloFP|ColemanRoo
ColemanRoo|canrobins13
canrobins13|stea9499
stea9499| +|joemanley201
joemanley201|System233
System233|jr
jr|nissa-seru
nissa-seru|jquanton
jquanton|roomote-agent
roomote-agent| +|NyxJae
NyxJae|d-oit
d-oit|elianiva
elianiva|qdaxb
qdaxb|punkpeye
punkpeye|wkordalski
wkordalski| +|SannidhyaSah
SannidhyaSah|xyOz-dev
xyOz-dev|chrarnoldus
chrarnoldus|sachasayan
sachasayan|Smartsheet-JB-Brown
Smartsheet-JB-Brown|monotykamary
monotykamary| +|cannuri
cannuri|feifei325
feifei325|zhangtony239
zhangtony239|shariqriazz
shariqriazz|vigneshsubbiah16
vigneshsubbiah16|pugazhendhi-m
pugazhendhi-m| +|lloydchang
lloydchang|dtrugman
dtrugman|Szpadel
Szpadel|hassoncs
hassoncs|liwilliam2021
liwilliam2021|lupuletic
lupuletic| +|kiwina
kiwina|Premshay
Premshay|psv2522
psv2522|olweraltuve
olweraltuve|diarmidmackenzie
diarmidmackenzie|ChuKhaLi
ChuKhaLi| +|PeterDaveHello
PeterDaveHello|aheizi
aheizi|nbihan-mediware
nbihan-mediware|noritaka1166
noritaka1166|RaySinner
RaySinner|afshawnlotfi
afshawnlotfi| +|dleffel
dleffel|StevenTCramer
StevenTCramer|Ruakij
Ruakij|pdecat
pdecat|kyle-apex
kyle-apex|emshvac
emshvac| +|Lunchb0ne
Lunchb0ne|SmartManoj
SmartManoj|vagadiya
vagadiya|slytechnical
slytechnical|dlab-anton
dlab-anton|arthurauffray
arthurauffray| +|upamune
upamune|NamesMT
NamesMT|taylorwilsdon
taylorwilsdon|sammcj
sammcj|p12tic
p12tic|gtaylor
gtaylor| +|brunobergher
brunobergher|aitoroses
aitoroses|ross
ross|mr-ryan-james
mr-ryan-james|heyseth
heyseth|taisukeoe
taisukeoe| +|avtc
avtc|eonghk
eonghk|GOODBOY008
GOODBOY008|kcwhite
kcwhite|ronyblum
ronyblum|teddyOOXX
teddyOOXX| +|vincentsong
vincentsong|yongjer
yongjer|zeozeozeo
zeozeozeo|ashktn
ashktn|franekp
franekp|yt3trees
yt3trees| +|seedlord
seedlord|bramburn
bramburn|anton-otee
anton-otee|benzntech
benzntech|axkirillov
axkirillov|olearycrew
olearycrew| +|catrielmuller
catrielmuller|devxpain
devxpain|snoyiatk
snoyiatk|GitlyHallows
GitlyHallows|jcbdev
jcbdev|Chenjiayuan195
Chenjiayuan195| +|julionav
julionav|KanTakahiro
KanTakahiro|SplittyDev
SplittyDev|mdp
mdp|napter
napter|philfung
philfung| +|bannzai
bannzai|bbenshalom
bbenshalom|chris-garrett
chris-garrett|dairui1
dairui1|dqroid
dqroid|janaki-sasidhar
janaki-sasidhar| +|forestyoo
forestyoo|hatsu38
hatsu38|hongzio
hongzio|im47cn
im47cn|shoopapa
shoopapa|jwcraig
jwcraig| +|axmo
axmo|asychin
asychin|amittell
amittell|Yoshino-Yukitaro
Yoshino-Yukitaro|Yikai-Liao
Yikai-Liao|zxdvd
zxdvd| +|s97712
s97712|vladstudio
vladstudio|vivekfyi
vivekfyi|HahaBill
HahaBill|tmsjngx0
tmsjngx0|TGlide
TGlide| +|Githubguy132010
Githubguy132010|tgfjt
tgfjt|maekawataiki
maekawataiki|nevermorec
nevermorec|PretzelVector
PretzelVector|zetaloop
zetaloop| +|cdlliuy
cdlliuy|user202729
user202729|thill2323
thill2323|takakoutso
takakoutso|student20880
student20880|shubhamgupta731
shubhamgupta731| +|shohei-ihaya
shohei-ihaya|shivamd1810
shivamd1810|shaybc
shaybc|sensei-woo
sensei-woo|samir-nimbly
samir-nimbly|robertheadley
robertheadley| +|refactorthis
refactorthis|qingyuan1109
qingyuan1109|pokutuna
pokutuna|philipnext
philipnext|village-way
village-way|oprstchn
oprstchn| +|nobu007
nobu007|mosleyit
mosleyit|moqimoqidea
moqimoqidea|mlopezr
mlopezr|mecab
mecab|olup
olup| +|lightrabbit
lightrabbit|lhish
lhish|kohii
kohii|kinandan
kinandan|AlexandruSmirnov
AlexandruSmirnov|pfitz
pfitz| +|ExactDoug
ExactDoug|celestial-vault
celestial-vault|linegel
linegel|edwin-truthsearch-io
edwin-truthsearch-io|EamonNerbonne
EamonNerbonne|dbasclpy
dbasclpy| +|dflatline
dflatline|Deon588
Deon588|dleen
dleen|CW-B-W
CW-B-W|chadgauth
chadgauth|thecolorblue
thecolorblue| +|bogdan0083
bogdan0083|benashby
benashby|Atlogit
Atlogit|atlasgong
atlasgong|AntiMoron
AntiMoron|andrewshu2000
andrewshu2000| +|andreastempsch
andreastempsch|alasano
alasano|QuinsZouls
QuinsZouls|HadesArchitect
HadesArchitect|alarno
alarno|nexon33
nexon33| +|adilhafeez
adilhafeez|adamwlarson
adamwlarson|adamhill
adamhill|AMHesch
AMHesch|adambrand
adambrand|samsilveira
samsilveira| +|01Rian
01Rian|RSO
RSO|RandalSchwartz
RandalSchwartz|SECKainersdorfer
SECKainersdorfer|R-omk
R-omk|Sarke
Sarke| +|PaperBoardOfficial
PaperBoardOfficial|OlegOAndreev
OlegOAndreev|Naam
Naam|NaccOll
NaccOll|kvokka
kvokka|ecmasx
ecmasx| +|mollux
mollux|marvijo-code
marvijo-code|markijbema
markijbema|mamertofabian
mamertofabian|monkeyDluffy6017
monkeyDluffy6017|libertyteeth
libertyteeth| +|shtse8
shtse8|Rexarrior
Rexarrior|kevinvandijk
kevinvandijk|KevinZhao
KevinZhao|ksze
ksze|Juice10
Juice10| +|snova-jorgep
snova-jorgep|Fovty
Fovty|Jdo300
Jdo300|hesara
hesara|DeXtroTip
DeXtroTip| | ## 라이선스 diff --git a/locales/nl/README.md b/locales/nl/README.md index ae4551e931..2e54742564 100644 --- a/locales/nl/README.md +++ b/locales/nl/README.md @@ -181,47 +181,45 @@ We houden van bijdragen uit de community! Begin met het lezen van onze [CONTRIBU Dank aan alle bijdragers die Roo Code beter hebben gemaakt! - -| mrubens
mrubens | saoudrizwan
saoudrizwan | cte
cte | daniel-lxs
daniel-lxs | samhvw8
samhvw8 | hannesrudolph
hannesrudolph | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
KJ7LNW | a8trejo
a8trejo | MuriloFP
MuriloFP | ColemanRoo
ColemanRoo | canrobins13
canrobins13 | stea9499
stea9499 | -| joemanley201
joemanley201 | System233
System233 | jr
jr | nissa-seru
nissa-seru | jquanton
jquanton | roomote-agent
roomote-agent | -| NyxJae
NyxJae | d-oit
d-oit | elianiva
elianiva | qdaxb
qdaxb | punkpeye
punkpeye | wkordalski
wkordalski | -| SannidhyaSah
SannidhyaSah | xyOz-dev
xyOz-dev | chrarnoldus
chrarnoldus | sachasayan
sachasayan | Smartsheet-JB-Brown
Smartsheet-JB-Brown | monotykamary
monotykamary | -| cannuri
cannuri | feifei325
feifei325 | zhangtony239
zhangtony239 | shariqriazz
shariqriazz | vigneshsubbiah16
vigneshsubbiah16 | pugazhendhi-m
pugazhendhi-m | -| lloydchang
lloydchang | dtrugman
dtrugman | Szpadel
Szpadel | lupuletic
lupuletic | kiwina
kiwina | liwilliam2021
liwilliam2021 | -| Premshay
Premshay | psv2522
psv2522 | olweraltuve
olweraltuve | diarmidmackenzie
diarmidmackenzie | hassoncs
hassoncs | ChuKhaLi
ChuKhaLi | -| PeterDaveHello
PeterDaveHello | aheizi
aheizi | nbihan-mediware
nbihan-mediware | noritaka1166
noritaka1166 | RaySinner
RaySinner | afshawnlotfi
afshawnlotfi | -| dleffel
dleffel | StevenTCramer
StevenTCramer | Ruakij
Ruakij | pdecat
pdecat | kyle-apex
kyle-apex | emshvac
emshvac | -| Lunchb0ne
Lunchb0ne | SmartManoj
SmartManoj | vagadiya
vagadiya | slytechnical
slytechnical | dlab-anton
dlab-anton | arthurauffray
arthurauffray | -| upamune
upamune | NamesMT
NamesMT | taylorwilsdon
taylorwilsdon | sammcj
sammcj | p12tic
p12tic | gtaylor
gtaylor | -| brunobergher
brunobergher | aitoroses
aitoroses | ross
ross | mr-ryan-james
mr-ryan-james | heyseth
heyseth | taisukeoe
taisukeoe | -| avtc
avtc | eonghk
eonghk | GOODBOY008
GOODBOY008 | kcwhite
kcwhite | ronyblum
ronyblum | teddyOOXX
teddyOOXX | -| vincentsong
vincentsong | yongjer
yongjer | zeozeozeo
zeozeozeo | ashktn
ashktn | franekp
franekp | yt3trees
yt3trees | -| seedlord
seedlord | bramburn
bramburn | anton-otee
anton-otee | benzntech
benzntech | axkirillov
axkirillov | olearycrew
olearycrew | -| catrielmuller
catrielmuller | devxpain
devxpain | snoyiatk
snoyiatk | GitlyHallows
GitlyHallows | jcbdev
jcbdev | Chenjiayuan195
Chenjiayuan195 | -| julionav
julionav | KanTakahiro
KanTakahiro | SplittyDev
SplittyDev | mdp
mdp | napter
napter | philfung
philfung | -| bbenshalom
bbenshalom | chris-garrett
chris-garrett | dairui1
dairui1 | dqroid
dqroid | janaki-sasidhar
janaki-sasidhar | forestyoo
forestyoo | -| hatsu38
hatsu38 | hongzio
hongzio | im47cn
im47cn | shoopapa
shoopapa | jwcraig
jwcraig | kinandan
kinandan | -| bannzai
bannzai | axmo
axmo | asychin
asychin | amittell
amittell | Yoshino-Yukitaro
Yoshino-Yukitaro | Yikai-Liao
Yikai-Liao | -| zxdvd
zxdvd | s97712
s97712 | vladstudio
vladstudio | vivekfyi
vivekfyi | HahaBill
HahaBill | tmsjngx0
tmsjngx0 | -| TGlide
TGlide | Githubguy132010
Githubguy132010 | nevermorec
nevermorec | PretzelVector
PretzelVector | zetaloop
zetaloop | cdlliuy
cdlliuy | -| user202729
user202729 | thill2323
thill2323 | takakoutso
takakoutso | student20880
student20880 | shubhamgupta731
shubhamgupta731 | shohei-ihaya
shohei-ihaya | -| shivamd1810
shivamd1810 | shaybc
shaybc | sensei-woo
sensei-woo | samir-nimbly
samir-nimbly | robertheadley
robertheadley | refactorthis
refactorthis | -| qingyuan1109
qingyuan1109 | pokutuna
pokutuna | philipnext
philipnext | village-way
village-way | oprstchn
oprstchn | nobu007
nobu007 | -| mosleyit
mosleyit | moqimoqidea
moqimoqidea | mlopezr
mlopezr | mecab
mecab | olup
olup | lightrabbit
lightrabbit | -| lhish
lhish | kohii
kohii | tgfjt
tgfjt | DeXtroTip
DeXtroTip | pfitz
pfitz | ExactDoug
ExactDoug | -| celestial-vault
celestial-vault | linegel
linegel | edwin-truthsearch-io
edwin-truthsearch-io | EamonNerbonne
EamonNerbonne | dbasclpy
dbasclpy | dflatline
dflatline | -| Deon588
Deon588 | dleen
dleen | CW-B-W
CW-B-W | chadgauth
chadgauth | thecolorblue
thecolorblue | bogdan0083
bogdan0083 | -| benashby
benashby | Atlogit
Atlogit | atlasgong
atlasgong | andrewshu2000
andrewshu2000 | andreastempsch
andreastempsch | alasano
alasano | -| QuinsZouls
QuinsZouls | HadesArchitect
HadesArchitect | alarno
alarno | nexon33
nexon33 | adilhafeez
adilhafeez | adamwlarson
adamwlarson | -| adamhill
adamhill | AMHesch
AMHesch | maekawataiki
maekawataiki | AlexandruSmirnov
AlexandruSmirnov | samsilveira
samsilveira | 01Rian
01Rian | -| RSO
RSO | RandalSchwartz
RandalSchwartz | SECKainersdorfer
SECKainersdorfer | R-omk
R-omk | Sarke
Sarke | PaperBoardOfficial
PaperBoardOfficial | -| OlegOAndreev
OlegOAndreev | Naam
Naam | kvokka
kvokka | ecmasx
ecmasx | mollux
mollux | marvijo-code
marvijo-code | -| markijbema
markijbema | mamertofabian
mamertofabian | monkeyDluffy6017
monkeyDluffy6017 | libertyteeth
libertyteeth | shtse8
shtse8 | Rexarrior
Rexarrior | -| kevinvandijk
kevinvandijk | KevinZhao
KevinZhao | ksze
ksze | Juice10
Juice10 | Fovty
Fovty | Jdo300
Jdo300 | -| hesara
hesara | | | | | | - +|mrubens
mrubens|saoudrizwan
saoudrizwan|cte
cte|daniel-lxs
daniel-lxs|samhvw8
samhvw8|hannesrudolph
hannesrudolph| +|:---:|:---:|:---:|:---:|:---:|:---:| +|KJ7LNW
KJ7LNW|a8trejo
a8trejo|MuriloFP
MuriloFP|ColemanRoo
ColemanRoo|canrobins13
canrobins13|stea9499
stea9499| +|joemanley201
joemanley201|System233
System233|jr
jr|nissa-seru
nissa-seru|jquanton
jquanton|roomote-agent
roomote-agent| +|NyxJae
NyxJae|d-oit
d-oit|elianiva
elianiva|qdaxb
qdaxb|punkpeye
punkpeye|wkordalski
wkordalski| +|SannidhyaSah
SannidhyaSah|xyOz-dev
xyOz-dev|chrarnoldus
chrarnoldus|sachasayan
sachasayan|Smartsheet-JB-Brown
Smartsheet-JB-Brown|monotykamary
monotykamary| +|cannuri
cannuri|feifei325
feifei325|zhangtony239
zhangtony239|shariqriazz
shariqriazz|vigneshsubbiah16
vigneshsubbiah16|pugazhendhi-m
pugazhendhi-m| +|lloydchang
lloydchang|dtrugman
dtrugman|Szpadel
Szpadel|hassoncs
hassoncs|liwilliam2021
liwilliam2021|lupuletic
lupuletic| +|kiwina
kiwina|Premshay
Premshay|psv2522
psv2522|olweraltuve
olweraltuve|diarmidmackenzie
diarmidmackenzie|ChuKhaLi
ChuKhaLi| +|PeterDaveHello
PeterDaveHello|aheizi
aheizi|nbihan-mediware
nbihan-mediware|noritaka1166
noritaka1166|RaySinner
RaySinner|afshawnlotfi
afshawnlotfi| +|dleffel
dleffel|StevenTCramer
StevenTCramer|Ruakij
Ruakij|pdecat
pdecat|kyle-apex
kyle-apex|emshvac
emshvac| +|Lunchb0ne
Lunchb0ne|SmartManoj
SmartManoj|vagadiya
vagadiya|slytechnical
slytechnical|dlab-anton
dlab-anton|arthurauffray
arthurauffray| +|upamune
upamune|NamesMT
NamesMT|taylorwilsdon
taylorwilsdon|sammcj
sammcj|p12tic
p12tic|gtaylor
gtaylor| +|brunobergher
brunobergher|aitoroses
aitoroses|ross
ross|mr-ryan-james
mr-ryan-james|heyseth
heyseth|taisukeoe
taisukeoe| +|avtc
avtc|eonghk
eonghk|GOODBOY008
GOODBOY008|kcwhite
kcwhite|ronyblum
ronyblum|teddyOOXX
teddyOOXX| +|vincentsong
vincentsong|yongjer
yongjer|zeozeozeo
zeozeozeo|ashktn
ashktn|franekp
franekp|yt3trees
yt3trees| +|seedlord
seedlord|bramburn
bramburn|anton-otee
anton-otee|benzntech
benzntech|axkirillov
axkirillov|olearycrew
olearycrew| +|catrielmuller
catrielmuller|devxpain
devxpain|snoyiatk
snoyiatk|GitlyHallows
GitlyHallows|jcbdev
jcbdev|Chenjiayuan195
Chenjiayuan195| +|julionav
julionav|KanTakahiro
KanTakahiro|SplittyDev
SplittyDev|mdp
mdp|napter
napter|philfung
philfung| +|bannzai
bannzai|bbenshalom
bbenshalom|chris-garrett
chris-garrett|dairui1
dairui1|dqroid
dqroid|janaki-sasidhar
janaki-sasidhar| +|forestyoo
forestyoo|hatsu38
hatsu38|hongzio
hongzio|im47cn
im47cn|shoopapa
shoopapa|jwcraig
jwcraig| +|axmo
axmo|asychin
asychin|amittell
amittell|Yoshino-Yukitaro
Yoshino-Yukitaro|Yikai-Liao
Yikai-Liao|zxdvd
zxdvd| +|s97712
s97712|vladstudio
vladstudio|vivekfyi
vivekfyi|HahaBill
HahaBill|tmsjngx0
tmsjngx0|TGlide
TGlide| +|Githubguy132010
Githubguy132010|tgfjt
tgfjt|maekawataiki
maekawataiki|nevermorec
nevermorec|PretzelVector
PretzelVector|zetaloop
zetaloop| +|cdlliuy
cdlliuy|user202729
user202729|thill2323
thill2323|takakoutso
takakoutso|student20880
student20880|shubhamgupta731
shubhamgupta731| +|shohei-ihaya
shohei-ihaya|shivamd1810
shivamd1810|shaybc
shaybc|sensei-woo
sensei-woo|samir-nimbly
samir-nimbly|robertheadley
robertheadley| +|refactorthis
refactorthis|qingyuan1109
qingyuan1109|pokutuna
pokutuna|philipnext
philipnext|village-way
village-way|oprstchn
oprstchn| +|nobu007
nobu007|mosleyit
mosleyit|moqimoqidea
moqimoqidea|mlopezr
mlopezr|mecab
mecab|olup
olup| +|lightrabbit
lightrabbit|lhish
lhish|kohii
kohii|kinandan
kinandan|AlexandruSmirnov
AlexandruSmirnov|pfitz
pfitz| +|ExactDoug
ExactDoug|celestial-vault
celestial-vault|linegel
linegel|edwin-truthsearch-io
edwin-truthsearch-io|EamonNerbonne
EamonNerbonne|dbasclpy
dbasclpy| +|dflatline
dflatline|Deon588
Deon588|dleen
dleen|CW-B-W
CW-B-W|chadgauth
chadgauth|thecolorblue
thecolorblue| +|bogdan0083
bogdan0083|benashby
benashby|Atlogit
Atlogit|atlasgong
atlasgong|AntiMoron
AntiMoron|andrewshu2000
andrewshu2000| +|andreastempsch
andreastempsch|alasano
alasano|QuinsZouls
QuinsZouls|HadesArchitect
HadesArchitect|alarno
alarno|nexon33
nexon33| +|adilhafeez
adilhafeez|adamwlarson
adamwlarson|adamhill
adamhill|AMHesch
AMHesch|adambrand
adambrand|samsilveira
samsilveira| +|01Rian
01Rian|RSO
RSO|RandalSchwartz
RandalSchwartz|SECKainersdorfer
SECKainersdorfer|R-omk
R-omk|Sarke
Sarke| +|PaperBoardOfficial
PaperBoardOfficial|OlegOAndreev
OlegOAndreev|Naam
Naam|NaccOll
NaccOll|kvokka
kvokka|ecmasx
ecmasx| +|mollux
mollux|marvijo-code
marvijo-code|markijbema
markijbema|mamertofabian
mamertofabian|monkeyDluffy6017
monkeyDluffy6017|libertyteeth
libertyteeth| +|shtse8
shtse8|Rexarrior
Rexarrior|kevinvandijk
kevinvandijk|KevinZhao
KevinZhao|ksze
ksze|Juice10
Juice10| +|snova-jorgep
snova-jorgep|Fovty
Fovty|Jdo300
Jdo300|hesara
hesara|DeXtroTip
DeXtroTip| | ## Licentie diff --git a/locales/pl/README.md b/locales/pl/README.md index 4d4cf2ee56..819b0fe989 100644 --- a/locales/pl/README.md +++ b/locales/pl/README.md @@ -181,47 +181,45 @@ Kochamy wkład społeczności! Zacznij od przeczytania naszego [CONTRIBUTING.md] Dziękujemy wszystkim naszym współtwórcom, którzy pomogli ulepszyć Roo Code! - -| mrubens
mrubens | saoudrizwan
saoudrizwan | cte
cte | daniel-lxs
daniel-lxs | samhvw8
samhvw8 | hannesrudolph
hannesrudolph | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
KJ7LNW | a8trejo
a8trejo | MuriloFP
MuriloFP | ColemanRoo
ColemanRoo | canrobins13
canrobins13 | stea9499
stea9499 | -| joemanley201
joemanley201 | System233
System233 | jr
jr | nissa-seru
nissa-seru | jquanton
jquanton | roomote-agent
roomote-agent | -| NyxJae
NyxJae | d-oit
d-oit | elianiva
elianiva | qdaxb
qdaxb | punkpeye
punkpeye | wkordalski
wkordalski | -| SannidhyaSah
SannidhyaSah | xyOz-dev
xyOz-dev | chrarnoldus
chrarnoldus | sachasayan
sachasayan | Smartsheet-JB-Brown
Smartsheet-JB-Brown | monotykamary
monotykamary | -| cannuri
cannuri | feifei325
feifei325 | zhangtony239
zhangtony239 | shariqriazz
shariqriazz | vigneshsubbiah16
vigneshsubbiah16 | pugazhendhi-m
pugazhendhi-m | -| lloydchang
lloydchang | dtrugman
dtrugman | Szpadel
Szpadel | lupuletic
lupuletic | kiwina
kiwina | liwilliam2021
liwilliam2021 | -| Premshay
Premshay | psv2522
psv2522 | olweraltuve
olweraltuve | diarmidmackenzie
diarmidmackenzie | hassoncs
hassoncs | ChuKhaLi
ChuKhaLi | -| PeterDaveHello
PeterDaveHello | aheizi
aheizi | nbihan-mediware
nbihan-mediware | noritaka1166
noritaka1166 | RaySinner
RaySinner | afshawnlotfi
afshawnlotfi | -| dleffel
dleffel | StevenTCramer
StevenTCramer | Ruakij
Ruakij | pdecat
pdecat | kyle-apex
kyle-apex | emshvac
emshvac | -| Lunchb0ne
Lunchb0ne | SmartManoj
SmartManoj | vagadiya
vagadiya | slytechnical
slytechnical | dlab-anton
dlab-anton | arthurauffray
arthurauffray | -| upamune
upamune | NamesMT
NamesMT | taylorwilsdon
taylorwilsdon | sammcj
sammcj | p12tic
p12tic | gtaylor
gtaylor | -| brunobergher
brunobergher | aitoroses
aitoroses | ross
ross | mr-ryan-james
mr-ryan-james | heyseth
heyseth | taisukeoe
taisukeoe | -| avtc
avtc | eonghk
eonghk | GOODBOY008
GOODBOY008 | kcwhite
kcwhite | ronyblum
ronyblum | teddyOOXX
teddyOOXX | -| vincentsong
vincentsong | yongjer
yongjer | zeozeozeo
zeozeozeo | ashktn
ashktn | franekp
franekp | yt3trees
yt3trees | -| seedlord
seedlord | bramburn
bramburn | anton-otee
anton-otee | benzntech
benzntech | axkirillov
axkirillov | olearycrew
olearycrew | -| catrielmuller
catrielmuller | devxpain
devxpain | snoyiatk
snoyiatk | GitlyHallows
GitlyHallows | jcbdev
jcbdev | Chenjiayuan195
Chenjiayuan195 | -| julionav
julionav | KanTakahiro
KanTakahiro | SplittyDev
SplittyDev | mdp
mdp | napter
napter | philfung
philfung | -| bbenshalom
bbenshalom | chris-garrett
chris-garrett | dairui1
dairui1 | dqroid
dqroid | janaki-sasidhar
janaki-sasidhar | forestyoo
forestyoo | -| hatsu38
hatsu38 | hongzio
hongzio | im47cn
im47cn | shoopapa
shoopapa | jwcraig
jwcraig | kinandan
kinandan | -| bannzai
bannzai | axmo
axmo | asychin
asychin | amittell
amittell | Yoshino-Yukitaro
Yoshino-Yukitaro | Yikai-Liao
Yikai-Liao | -| zxdvd
zxdvd | s97712
s97712 | vladstudio
vladstudio | vivekfyi
vivekfyi | HahaBill
HahaBill | tmsjngx0
tmsjngx0 | -| TGlide
TGlide | Githubguy132010
Githubguy132010 | nevermorec
nevermorec | PretzelVector
PretzelVector | zetaloop
zetaloop | cdlliuy
cdlliuy | -| user202729
user202729 | thill2323
thill2323 | takakoutso
takakoutso | student20880
student20880 | shubhamgupta731
shubhamgupta731 | shohei-ihaya
shohei-ihaya | -| shivamd1810
shivamd1810 | shaybc
shaybc | sensei-woo
sensei-woo | samir-nimbly
samir-nimbly | robertheadley
robertheadley | refactorthis
refactorthis | -| qingyuan1109
qingyuan1109 | pokutuna
pokutuna | philipnext
philipnext | village-way
village-way | oprstchn
oprstchn | nobu007
nobu007 | -| mosleyit
mosleyit | moqimoqidea
moqimoqidea | mlopezr
mlopezr | mecab
mecab | olup
olup | lightrabbit
lightrabbit | -| lhish
lhish | kohii
kohii | tgfjt
tgfjt | DeXtroTip
DeXtroTip | pfitz
pfitz | ExactDoug
ExactDoug | -| celestial-vault
celestial-vault | linegel
linegel | edwin-truthsearch-io
edwin-truthsearch-io | EamonNerbonne
EamonNerbonne | dbasclpy
dbasclpy | dflatline
dflatline | -| Deon588
Deon588 | dleen
dleen | CW-B-W
CW-B-W | chadgauth
chadgauth | thecolorblue
thecolorblue | bogdan0083
bogdan0083 | -| benashby
benashby | Atlogit
Atlogit | atlasgong
atlasgong | andrewshu2000
andrewshu2000 | andreastempsch
andreastempsch | alasano
alasano | -| QuinsZouls
QuinsZouls | HadesArchitect
HadesArchitect | alarno
alarno | nexon33
nexon33 | adilhafeez
adilhafeez | adamwlarson
adamwlarson | -| adamhill
adamhill | AMHesch
AMHesch | maekawataiki
maekawataiki | AlexandruSmirnov
AlexandruSmirnov | samsilveira
samsilveira | 01Rian
01Rian | -| RSO
RSO | RandalSchwartz
RandalSchwartz | SECKainersdorfer
SECKainersdorfer | R-omk
R-omk | Sarke
Sarke | PaperBoardOfficial
PaperBoardOfficial | -| OlegOAndreev
OlegOAndreev | Naam
Naam | kvokka
kvokka | ecmasx
ecmasx | mollux
mollux | marvijo-code
marvijo-code | -| markijbema
markijbema | mamertofabian
mamertofabian | monkeyDluffy6017
monkeyDluffy6017 | libertyteeth
libertyteeth | shtse8
shtse8 | Rexarrior
Rexarrior | -| kevinvandijk
kevinvandijk | KevinZhao
KevinZhao | ksze
ksze | Juice10
Juice10 | Fovty
Fovty | Jdo300
Jdo300 | -| hesara
hesara | | | | | | - +|mrubens
mrubens|saoudrizwan
saoudrizwan|cte
cte|daniel-lxs
daniel-lxs|samhvw8
samhvw8|hannesrudolph
hannesrudolph| +|:---:|:---:|:---:|:---:|:---:|:---:| +|KJ7LNW
KJ7LNW|a8trejo
a8trejo|MuriloFP
MuriloFP|ColemanRoo
ColemanRoo|canrobins13
canrobins13|stea9499
stea9499| +|joemanley201
joemanley201|System233
System233|jr
jr|nissa-seru
nissa-seru|jquanton
jquanton|roomote-agent
roomote-agent| +|NyxJae
NyxJae|d-oit
d-oit|elianiva
elianiva|qdaxb
qdaxb|punkpeye
punkpeye|wkordalski
wkordalski| +|SannidhyaSah
SannidhyaSah|xyOz-dev
xyOz-dev|chrarnoldus
chrarnoldus|sachasayan
sachasayan|Smartsheet-JB-Brown
Smartsheet-JB-Brown|monotykamary
monotykamary| +|cannuri
cannuri|feifei325
feifei325|zhangtony239
zhangtony239|shariqriazz
shariqriazz|vigneshsubbiah16
vigneshsubbiah16|pugazhendhi-m
pugazhendhi-m| +|lloydchang
lloydchang|dtrugman
dtrugman|Szpadel
Szpadel|hassoncs
hassoncs|liwilliam2021
liwilliam2021|lupuletic
lupuletic| +|kiwina
kiwina|Premshay
Premshay|psv2522
psv2522|olweraltuve
olweraltuve|diarmidmackenzie
diarmidmackenzie|ChuKhaLi
ChuKhaLi| +|PeterDaveHello
PeterDaveHello|aheizi
aheizi|nbihan-mediware
nbihan-mediware|noritaka1166
noritaka1166|RaySinner
RaySinner|afshawnlotfi
afshawnlotfi| +|dleffel
dleffel|StevenTCramer
StevenTCramer|Ruakij
Ruakij|pdecat
pdecat|kyle-apex
kyle-apex|emshvac
emshvac| +|Lunchb0ne
Lunchb0ne|SmartManoj
SmartManoj|vagadiya
vagadiya|slytechnical
slytechnical|dlab-anton
dlab-anton|arthurauffray
arthurauffray| +|upamune
upamune|NamesMT
NamesMT|taylorwilsdon
taylorwilsdon|sammcj
sammcj|p12tic
p12tic|gtaylor
gtaylor| +|brunobergher
brunobergher|aitoroses
aitoroses|ross
ross|mr-ryan-james
mr-ryan-james|heyseth
heyseth|taisukeoe
taisukeoe| +|avtc
avtc|eonghk
eonghk|GOODBOY008
GOODBOY008|kcwhite
kcwhite|ronyblum
ronyblum|teddyOOXX
teddyOOXX| +|vincentsong
vincentsong|yongjer
yongjer|zeozeozeo
zeozeozeo|ashktn
ashktn|franekp
franekp|yt3trees
yt3trees| +|seedlord
seedlord|bramburn
bramburn|anton-otee
anton-otee|benzntech
benzntech|axkirillov
axkirillov|olearycrew
olearycrew| +|catrielmuller
catrielmuller|devxpain
devxpain|snoyiatk
snoyiatk|GitlyHallows
GitlyHallows|jcbdev
jcbdev|Chenjiayuan195
Chenjiayuan195| +|julionav
julionav|KanTakahiro
KanTakahiro|SplittyDev
SplittyDev|mdp
mdp|napter
napter|philfung
philfung| +|bannzai
bannzai|bbenshalom
bbenshalom|chris-garrett
chris-garrett|dairui1
dairui1|dqroid
dqroid|janaki-sasidhar
janaki-sasidhar| +|forestyoo
forestyoo|hatsu38
hatsu38|hongzio
hongzio|im47cn
im47cn|shoopapa
shoopapa|jwcraig
jwcraig| +|axmo
axmo|asychin
asychin|amittell
amittell|Yoshino-Yukitaro
Yoshino-Yukitaro|Yikai-Liao
Yikai-Liao|zxdvd
zxdvd| +|s97712
s97712|vladstudio
vladstudio|vivekfyi
vivekfyi|HahaBill
HahaBill|tmsjngx0
tmsjngx0|TGlide
TGlide| +|Githubguy132010
Githubguy132010|tgfjt
tgfjt|maekawataiki
maekawataiki|nevermorec
nevermorec|PretzelVector
PretzelVector|zetaloop
zetaloop| +|cdlliuy
cdlliuy|user202729
user202729|thill2323
thill2323|takakoutso
takakoutso|student20880
student20880|shubhamgupta731
shubhamgupta731| +|shohei-ihaya
shohei-ihaya|shivamd1810
shivamd1810|shaybc
shaybc|sensei-woo
sensei-woo|samir-nimbly
samir-nimbly|robertheadley
robertheadley| +|refactorthis
refactorthis|qingyuan1109
qingyuan1109|pokutuna
pokutuna|philipnext
philipnext|village-way
village-way|oprstchn
oprstchn| +|nobu007
nobu007|mosleyit
mosleyit|moqimoqidea
moqimoqidea|mlopezr
mlopezr|mecab
mecab|olup
olup| +|lightrabbit
lightrabbit|lhish
lhish|kohii
kohii|kinandan
kinandan|AlexandruSmirnov
AlexandruSmirnov|pfitz
pfitz| +|ExactDoug
ExactDoug|celestial-vault
celestial-vault|linegel
linegel|edwin-truthsearch-io
edwin-truthsearch-io|EamonNerbonne
EamonNerbonne|dbasclpy
dbasclpy| +|dflatline
dflatline|Deon588
Deon588|dleen
dleen|CW-B-W
CW-B-W|chadgauth
chadgauth|thecolorblue
thecolorblue| +|bogdan0083
bogdan0083|benashby
benashby|Atlogit
Atlogit|atlasgong
atlasgong|AntiMoron
AntiMoron|andrewshu2000
andrewshu2000| +|andreastempsch
andreastempsch|alasano
alasano|QuinsZouls
QuinsZouls|HadesArchitect
HadesArchitect|alarno
alarno|nexon33
nexon33| +|adilhafeez
adilhafeez|adamwlarson
adamwlarson|adamhill
adamhill|AMHesch
AMHesch|adambrand
adambrand|samsilveira
samsilveira| +|01Rian
01Rian|RSO
RSO|RandalSchwartz
RandalSchwartz|SECKainersdorfer
SECKainersdorfer|R-omk
R-omk|Sarke
Sarke| +|PaperBoardOfficial
PaperBoardOfficial|OlegOAndreev
OlegOAndreev|Naam
Naam|NaccOll
NaccOll|kvokka
kvokka|ecmasx
ecmasx| +|mollux
mollux|marvijo-code
marvijo-code|markijbema
markijbema|mamertofabian
mamertofabian|monkeyDluffy6017
monkeyDluffy6017|libertyteeth
libertyteeth| +|shtse8
shtse8|Rexarrior
Rexarrior|kevinvandijk
kevinvandijk|KevinZhao
KevinZhao|ksze
ksze|Juice10
Juice10| +|snova-jorgep
snova-jorgep|Fovty
Fovty|Jdo300
Jdo300|hesara
hesara|DeXtroTip
DeXtroTip| | ## Licencja diff --git a/locales/pt-BR/README.md b/locales/pt-BR/README.md index 6335fad2ae..d660b8f11b 100644 --- a/locales/pt-BR/README.md +++ b/locales/pt-BR/README.md @@ -181,47 +181,45 @@ Adoramos contribuições da comunidade! Comece lendo nosso [CONTRIBUTING.md](CON Obrigado a todos os nossos contribuidores que ajudaram a tornar o Roo Code melhor! - -| mrubens
mrubens | saoudrizwan
saoudrizwan | cte
cte | daniel-lxs
daniel-lxs | samhvw8
samhvw8 | hannesrudolph
hannesrudolph | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
KJ7LNW | a8trejo
a8trejo | MuriloFP
MuriloFP | ColemanRoo
ColemanRoo | canrobins13
canrobins13 | stea9499
stea9499 | -| joemanley201
joemanley201 | System233
System233 | jr
jr | nissa-seru
nissa-seru | jquanton
jquanton | roomote-agent
roomote-agent | -| NyxJae
NyxJae | d-oit
d-oit | elianiva
elianiva | qdaxb
qdaxb | punkpeye
punkpeye | wkordalski
wkordalski | -| SannidhyaSah
SannidhyaSah | xyOz-dev
xyOz-dev | chrarnoldus
chrarnoldus | sachasayan
sachasayan | Smartsheet-JB-Brown
Smartsheet-JB-Brown | monotykamary
monotykamary | -| cannuri
cannuri | feifei325
feifei325 | zhangtony239
zhangtony239 | shariqriazz
shariqriazz | vigneshsubbiah16
vigneshsubbiah16 | pugazhendhi-m
pugazhendhi-m | -| lloydchang
lloydchang | dtrugman
dtrugman | Szpadel
Szpadel | lupuletic
lupuletic | kiwina
kiwina | liwilliam2021
liwilliam2021 | -| Premshay
Premshay | psv2522
psv2522 | olweraltuve
olweraltuve | diarmidmackenzie
diarmidmackenzie | hassoncs
hassoncs | ChuKhaLi
ChuKhaLi | -| PeterDaveHello
PeterDaveHello | aheizi
aheizi | nbihan-mediware
nbihan-mediware | noritaka1166
noritaka1166 | RaySinner
RaySinner | afshawnlotfi
afshawnlotfi | -| dleffel
dleffel | StevenTCramer
StevenTCramer | Ruakij
Ruakij | pdecat
pdecat | kyle-apex
kyle-apex | emshvac
emshvac | -| Lunchb0ne
Lunchb0ne | SmartManoj
SmartManoj | vagadiya
vagadiya | slytechnical
slytechnical | dlab-anton
dlab-anton | arthurauffray
arthurauffray | -| upamune
upamune | NamesMT
NamesMT | taylorwilsdon
taylorwilsdon | sammcj
sammcj | p12tic
p12tic | gtaylor
gtaylor | -| brunobergher
brunobergher | aitoroses
aitoroses | ross
ross | mr-ryan-james
mr-ryan-james | heyseth
heyseth | taisukeoe
taisukeoe | -| avtc
avtc | eonghk
eonghk | GOODBOY008
GOODBOY008 | kcwhite
kcwhite | ronyblum
ronyblum | teddyOOXX
teddyOOXX | -| vincentsong
vincentsong | yongjer
yongjer | zeozeozeo
zeozeozeo | ashktn
ashktn | franekp
franekp | yt3trees
yt3trees | -| seedlord
seedlord | bramburn
bramburn | anton-otee
anton-otee | benzntech
benzntech | axkirillov
axkirillov | olearycrew
olearycrew | -| catrielmuller
catrielmuller | devxpain
devxpain | snoyiatk
snoyiatk | GitlyHallows
GitlyHallows | jcbdev
jcbdev | Chenjiayuan195
Chenjiayuan195 | -| julionav
julionav | KanTakahiro
KanTakahiro | SplittyDev
SplittyDev | mdp
mdp | napter
napter | philfung
philfung | -| bbenshalom
bbenshalom | chris-garrett
chris-garrett | dairui1
dairui1 | dqroid
dqroid | janaki-sasidhar
janaki-sasidhar | forestyoo
forestyoo | -| hatsu38
hatsu38 | hongzio
hongzio | im47cn
im47cn | shoopapa
shoopapa | jwcraig
jwcraig | kinandan
kinandan | -| bannzai
bannzai | axmo
axmo | asychin
asychin | amittell
amittell | Yoshino-Yukitaro
Yoshino-Yukitaro | Yikai-Liao
Yikai-Liao | -| zxdvd
zxdvd | s97712
s97712 | vladstudio
vladstudio | vivekfyi
vivekfyi | HahaBill
HahaBill | tmsjngx0
tmsjngx0 | -| TGlide
TGlide | Githubguy132010
Githubguy132010 | nevermorec
nevermorec | PretzelVector
PretzelVector | zetaloop
zetaloop | cdlliuy
cdlliuy | -| user202729
user202729 | thill2323
thill2323 | takakoutso
takakoutso | student20880
student20880 | shubhamgupta731
shubhamgupta731 | shohei-ihaya
shohei-ihaya | -| shivamd1810
shivamd1810 | shaybc
shaybc | sensei-woo
sensei-woo | samir-nimbly
samir-nimbly | robertheadley
robertheadley | refactorthis
refactorthis | -| qingyuan1109
qingyuan1109 | pokutuna
pokutuna | philipnext
philipnext | village-way
village-way | oprstchn
oprstchn | nobu007
nobu007 | -| mosleyit
mosleyit | moqimoqidea
moqimoqidea | mlopezr
mlopezr | mecab
mecab | olup
olup | lightrabbit
lightrabbit | -| lhish
lhish | kohii
kohii | tgfjt
tgfjt | DeXtroTip
DeXtroTip | pfitz
pfitz | ExactDoug
ExactDoug | -| celestial-vault
celestial-vault | linegel
linegel | edwin-truthsearch-io
edwin-truthsearch-io | EamonNerbonne
EamonNerbonne | dbasclpy
dbasclpy | dflatline
dflatline | -| Deon588
Deon588 | dleen
dleen | CW-B-W
CW-B-W | chadgauth
chadgauth | thecolorblue
thecolorblue | bogdan0083
bogdan0083 | -| benashby
benashby | Atlogit
Atlogit | atlasgong
atlasgong | andrewshu2000
andrewshu2000 | andreastempsch
andreastempsch | alasano
alasano | -| QuinsZouls
QuinsZouls | HadesArchitect
HadesArchitect | alarno
alarno | nexon33
nexon33 | adilhafeez
adilhafeez | adamwlarson
adamwlarson | -| adamhill
adamhill | AMHesch
AMHesch | maekawataiki
maekawataiki | AlexandruSmirnov
AlexandruSmirnov | samsilveira
samsilveira | 01Rian
01Rian | -| RSO
RSO | RandalSchwartz
RandalSchwartz | SECKainersdorfer
SECKainersdorfer | R-omk
R-omk | Sarke
Sarke | PaperBoardOfficial
PaperBoardOfficial | -| OlegOAndreev
OlegOAndreev | Naam
Naam | kvokka
kvokka | ecmasx
ecmasx | mollux
mollux | marvijo-code
marvijo-code | -| markijbema
markijbema | mamertofabian
mamertofabian | monkeyDluffy6017
monkeyDluffy6017 | libertyteeth
libertyteeth | shtse8
shtse8 | Rexarrior
Rexarrior | -| kevinvandijk
kevinvandijk | KevinZhao
KevinZhao | ksze
ksze | Juice10
Juice10 | Fovty
Fovty | Jdo300
Jdo300 | -| hesara
hesara | | | | | | - +|mrubens
mrubens|saoudrizwan
saoudrizwan|cte
cte|daniel-lxs
daniel-lxs|samhvw8
samhvw8|hannesrudolph
hannesrudolph| +|:---:|:---:|:---:|:---:|:---:|:---:| +|KJ7LNW
KJ7LNW|a8trejo
a8trejo|MuriloFP
MuriloFP|ColemanRoo
ColemanRoo|canrobins13
canrobins13|stea9499
stea9499| +|joemanley201
joemanley201|System233
System233|jr
jr|nissa-seru
nissa-seru|jquanton
jquanton|roomote-agent
roomote-agent| +|NyxJae
NyxJae|d-oit
d-oit|elianiva
elianiva|qdaxb
qdaxb|punkpeye
punkpeye|wkordalski
wkordalski| +|SannidhyaSah
SannidhyaSah|xyOz-dev
xyOz-dev|chrarnoldus
chrarnoldus|sachasayan
sachasayan|Smartsheet-JB-Brown
Smartsheet-JB-Brown|monotykamary
monotykamary| +|cannuri
cannuri|feifei325
feifei325|zhangtony239
zhangtony239|shariqriazz
shariqriazz|vigneshsubbiah16
vigneshsubbiah16|pugazhendhi-m
pugazhendhi-m| +|lloydchang
lloydchang|dtrugman
dtrugman|Szpadel
Szpadel|hassoncs
hassoncs|liwilliam2021
liwilliam2021|lupuletic
lupuletic| +|kiwina
kiwina|Premshay
Premshay|psv2522
psv2522|olweraltuve
olweraltuve|diarmidmackenzie
diarmidmackenzie|ChuKhaLi
ChuKhaLi| +|PeterDaveHello
PeterDaveHello|aheizi
aheizi|nbihan-mediware
nbihan-mediware|noritaka1166
noritaka1166|RaySinner
RaySinner|afshawnlotfi
afshawnlotfi| +|dleffel
dleffel|StevenTCramer
StevenTCramer|Ruakij
Ruakij|pdecat
pdecat|kyle-apex
kyle-apex|emshvac
emshvac| +|Lunchb0ne
Lunchb0ne|SmartManoj
SmartManoj|vagadiya
vagadiya|slytechnical
slytechnical|dlab-anton
dlab-anton|arthurauffray
arthurauffray| +|upamune
upamune|NamesMT
NamesMT|taylorwilsdon
taylorwilsdon|sammcj
sammcj|p12tic
p12tic|gtaylor
gtaylor| +|brunobergher
brunobergher|aitoroses
aitoroses|ross
ross|mr-ryan-james
mr-ryan-james|heyseth
heyseth|taisukeoe
taisukeoe| +|avtc
avtc|eonghk
eonghk|GOODBOY008
GOODBOY008|kcwhite
kcwhite|ronyblum
ronyblum|teddyOOXX
teddyOOXX| +|vincentsong
vincentsong|yongjer
yongjer|zeozeozeo
zeozeozeo|ashktn
ashktn|franekp
franekp|yt3trees
yt3trees| +|seedlord
seedlord|bramburn
bramburn|anton-otee
anton-otee|benzntech
benzntech|axkirillov
axkirillov|olearycrew
olearycrew| +|catrielmuller
catrielmuller|devxpain
devxpain|snoyiatk
snoyiatk|GitlyHallows
GitlyHallows|jcbdev
jcbdev|Chenjiayuan195
Chenjiayuan195| +|julionav
julionav|KanTakahiro
KanTakahiro|SplittyDev
SplittyDev|mdp
mdp|napter
napter|philfung
philfung| +|bannzai
bannzai|bbenshalom
bbenshalom|chris-garrett
chris-garrett|dairui1
dairui1|dqroid
dqroid|janaki-sasidhar
janaki-sasidhar| +|forestyoo
forestyoo|hatsu38
hatsu38|hongzio
hongzio|im47cn
im47cn|shoopapa
shoopapa|jwcraig
jwcraig| +|axmo
axmo|asychin
asychin|amittell
amittell|Yoshino-Yukitaro
Yoshino-Yukitaro|Yikai-Liao
Yikai-Liao|zxdvd
zxdvd| +|s97712
s97712|vladstudio
vladstudio|vivekfyi
vivekfyi|HahaBill
HahaBill|tmsjngx0
tmsjngx0|TGlide
TGlide| +|Githubguy132010
Githubguy132010|tgfjt
tgfjt|maekawataiki
maekawataiki|nevermorec
nevermorec|PretzelVector
PretzelVector|zetaloop
zetaloop| +|cdlliuy
cdlliuy|user202729
user202729|thill2323
thill2323|takakoutso
takakoutso|student20880
student20880|shubhamgupta731
shubhamgupta731| +|shohei-ihaya
shohei-ihaya|shivamd1810
shivamd1810|shaybc
shaybc|sensei-woo
sensei-woo|samir-nimbly
samir-nimbly|robertheadley
robertheadley| +|refactorthis
refactorthis|qingyuan1109
qingyuan1109|pokutuna
pokutuna|philipnext
philipnext|village-way
village-way|oprstchn
oprstchn| +|nobu007
nobu007|mosleyit
mosleyit|moqimoqidea
moqimoqidea|mlopezr
mlopezr|mecab
mecab|olup
olup| +|lightrabbit
lightrabbit|lhish
lhish|kohii
kohii|kinandan
kinandan|AlexandruSmirnov
AlexandruSmirnov|pfitz
pfitz| +|ExactDoug
ExactDoug|celestial-vault
celestial-vault|linegel
linegel|edwin-truthsearch-io
edwin-truthsearch-io|EamonNerbonne
EamonNerbonne|dbasclpy
dbasclpy| +|dflatline
dflatline|Deon588
Deon588|dleen
dleen|CW-B-W
CW-B-W|chadgauth
chadgauth|thecolorblue
thecolorblue| +|bogdan0083
bogdan0083|benashby
benashby|Atlogit
Atlogit|atlasgong
atlasgong|AntiMoron
AntiMoron|andrewshu2000
andrewshu2000| +|andreastempsch
andreastempsch|alasano
alasano|QuinsZouls
QuinsZouls|HadesArchitect
HadesArchitect|alarno
alarno|nexon33
nexon33| +|adilhafeez
adilhafeez|adamwlarson
adamwlarson|adamhill
adamhill|AMHesch
AMHesch|adambrand
adambrand|samsilveira
samsilveira| +|01Rian
01Rian|RSO
RSO|RandalSchwartz
RandalSchwartz|SECKainersdorfer
SECKainersdorfer|R-omk
R-omk|Sarke
Sarke| +|PaperBoardOfficial
PaperBoardOfficial|OlegOAndreev
OlegOAndreev|Naam
Naam|NaccOll
NaccOll|kvokka
kvokka|ecmasx
ecmasx| +|mollux
mollux|marvijo-code
marvijo-code|markijbema
markijbema|mamertofabian
mamertofabian|monkeyDluffy6017
monkeyDluffy6017|libertyteeth
libertyteeth| +|shtse8
shtse8|Rexarrior
Rexarrior|kevinvandijk
kevinvandijk|KevinZhao
KevinZhao|ksze
ksze|Juice10
Juice10| +|snova-jorgep
snova-jorgep|Fovty
Fovty|Jdo300
Jdo300|hesara
hesara|DeXtroTip
DeXtroTip| | ## Licença diff --git a/locales/ru/README.md b/locales/ru/README.md index 2ae9f0ce1e..9483dfac79 100644 --- a/locales/ru/README.md +++ b/locales/ru/README.md @@ -181,47 +181,45 @@ code --install-extension bin/roo-cline-.vsix Спасибо всем нашим участникам, которые помогли сделать Roo Code лучше! - -| mrubens
mrubens | saoudrizwan
saoudrizwan | cte
cte | daniel-lxs
daniel-lxs | samhvw8
samhvw8 | hannesrudolph
hannesrudolph | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
KJ7LNW | a8trejo
a8trejo | MuriloFP
MuriloFP | ColemanRoo
ColemanRoo | canrobins13
canrobins13 | stea9499
stea9499 | -| joemanley201
joemanley201 | System233
System233 | jr
jr | nissa-seru
nissa-seru | jquanton
jquanton | roomote-agent
roomote-agent | -| NyxJae
NyxJae | d-oit
d-oit | elianiva
elianiva | qdaxb
qdaxb | punkpeye
punkpeye | wkordalski
wkordalski | -| SannidhyaSah
SannidhyaSah | xyOz-dev
xyOz-dev | chrarnoldus
chrarnoldus | sachasayan
sachasayan | Smartsheet-JB-Brown
Smartsheet-JB-Brown | monotykamary
monotykamary | -| cannuri
cannuri | feifei325
feifei325 | zhangtony239
zhangtony239 | shariqriazz
shariqriazz | vigneshsubbiah16
vigneshsubbiah16 | pugazhendhi-m
pugazhendhi-m | -| lloydchang
lloydchang | dtrugman
dtrugman | Szpadel
Szpadel | lupuletic
lupuletic | kiwina
kiwina | liwilliam2021
liwilliam2021 | -| Premshay
Premshay | psv2522
psv2522 | olweraltuve
olweraltuve | diarmidmackenzie
diarmidmackenzie | hassoncs
hassoncs | ChuKhaLi
ChuKhaLi | -| PeterDaveHello
PeterDaveHello | aheizi
aheizi | nbihan-mediware
nbihan-mediware | noritaka1166
noritaka1166 | RaySinner
RaySinner | afshawnlotfi
afshawnlotfi | -| dleffel
dleffel | StevenTCramer
StevenTCramer | Ruakij
Ruakij | pdecat
pdecat | kyle-apex
kyle-apex | emshvac
emshvac | -| Lunchb0ne
Lunchb0ne | SmartManoj
SmartManoj | vagadiya
vagadiya | slytechnical
slytechnical | dlab-anton
dlab-anton | arthurauffray
arthurauffray | -| upamune
upamune | NamesMT
NamesMT | taylorwilsdon
taylorwilsdon | sammcj
sammcj | p12tic
p12tic | gtaylor
gtaylor | -| brunobergher
brunobergher | aitoroses
aitoroses | ross
ross | mr-ryan-james
mr-ryan-james | heyseth
heyseth | taisukeoe
taisukeoe | -| avtc
avtc | eonghk
eonghk | GOODBOY008
GOODBOY008 | kcwhite
kcwhite | ronyblum
ronyblum | teddyOOXX
teddyOOXX | -| vincentsong
vincentsong | yongjer
yongjer | zeozeozeo
zeozeozeo | ashktn
ashktn | franekp
franekp | yt3trees
yt3trees | -| seedlord
seedlord | bramburn
bramburn | anton-otee
anton-otee | benzntech
benzntech | axkirillov
axkirillov | olearycrew
olearycrew | -| catrielmuller
catrielmuller | devxpain
devxpain | snoyiatk
snoyiatk | GitlyHallows
GitlyHallows | jcbdev
jcbdev | Chenjiayuan195
Chenjiayuan195 | -| julionav
julionav | KanTakahiro
KanTakahiro | SplittyDev
SplittyDev | mdp
mdp | napter
napter | philfung
philfung | -| bbenshalom
bbenshalom | chris-garrett
chris-garrett | dairui1
dairui1 | dqroid
dqroid | janaki-sasidhar
janaki-sasidhar | forestyoo
forestyoo | -| hatsu38
hatsu38 | hongzio
hongzio | im47cn
im47cn | shoopapa
shoopapa | jwcraig
jwcraig | kinandan
kinandan | -| bannzai
bannzai | axmo
axmo | asychin
asychin | amittell
amittell | Yoshino-Yukitaro
Yoshino-Yukitaro | Yikai-Liao
Yikai-Liao | -| zxdvd
zxdvd | s97712
s97712 | vladstudio
vladstudio | vivekfyi
vivekfyi | HahaBill
HahaBill | tmsjngx0
tmsjngx0 | -| TGlide
TGlide | Githubguy132010
Githubguy132010 | nevermorec
nevermorec | PretzelVector
PretzelVector | zetaloop
zetaloop | cdlliuy
cdlliuy | -| user202729
user202729 | thill2323
thill2323 | takakoutso
takakoutso | student20880
student20880 | shubhamgupta731
shubhamgupta731 | shohei-ihaya
shohei-ihaya | -| shivamd1810
shivamd1810 | shaybc
shaybc | sensei-woo
sensei-woo | samir-nimbly
samir-nimbly | robertheadley
robertheadley | refactorthis
refactorthis | -| qingyuan1109
qingyuan1109 | pokutuna
pokutuna | philipnext
philipnext | village-way
village-way | oprstchn
oprstchn | nobu007
nobu007 | -| mosleyit
mosleyit | moqimoqidea
moqimoqidea | mlopezr
mlopezr | mecab
mecab | olup
olup | lightrabbit
lightrabbit | -| lhish
lhish | kohii
kohii | tgfjt
tgfjt | DeXtroTip
DeXtroTip | pfitz
pfitz | ExactDoug
ExactDoug | -| celestial-vault
celestial-vault | linegel
linegel | edwin-truthsearch-io
edwin-truthsearch-io | EamonNerbonne
EamonNerbonne | dbasclpy
dbasclpy | dflatline
dflatline | -| Deon588
Deon588 | dleen
dleen | CW-B-W
CW-B-W | chadgauth
chadgauth | thecolorblue
thecolorblue | bogdan0083
bogdan0083 | -| benashby
benashby | Atlogit
Atlogit | atlasgong
atlasgong | andrewshu2000
andrewshu2000 | andreastempsch
andreastempsch | alasano
alasano | -| QuinsZouls
QuinsZouls | HadesArchitect
HadesArchitect | alarno
alarno | nexon33
nexon33 | adilhafeez
adilhafeez | adamwlarson
adamwlarson | -| adamhill
adamhill | AMHesch
AMHesch | maekawataiki
maekawataiki | AlexandruSmirnov
AlexandruSmirnov | samsilveira
samsilveira | 01Rian
01Rian | -| RSO
RSO | RandalSchwartz
RandalSchwartz | SECKainersdorfer
SECKainersdorfer | R-omk
R-omk | Sarke
Sarke | PaperBoardOfficial
PaperBoardOfficial | -| OlegOAndreev
OlegOAndreev | Naam
Naam | kvokka
kvokka | ecmasx
ecmasx | mollux
mollux | marvijo-code
marvijo-code | -| markijbema
markijbema | mamertofabian
mamertofabian | monkeyDluffy6017
monkeyDluffy6017 | libertyteeth
libertyteeth | shtse8
shtse8 | Rexarrior
Rexarrior | -| kevinvandijk
kevinvandijk | KevinZhao
KevinZhao | ksze
ksze | Juice10
Juice10 | Fovty
Fovty | Jdo300
Jdo300 | -| hesara
hesara | | | | | | - +|mrubens
mrubens|saoudrizwan
saoudrizwan|cte
cte|daniel-lxs
daniel-lxs|samhvw8
samhvw8|hannesrudolph
hannesrudolph| +|:---:|:---:|:---:|:---:|:---:|:---:| +|KJ7LNW
KJ7LNW|a8trejo
a8trejo|MuriloFP
MuriloFP|ColemanRoo
ColemanRoo|canrobins13
canrobins13|stea9499
stea9499| +|joemanley201
joemanley201|System233
System233|jr
jr|nissa-seru
nissa-seru|jquanton
jquanton|roomote-agent
roomote-agent| +|NyxJae
NyxJae|d-oit
d-oit|elianiva
elianiva|qdaxb
qdaxb|punkpeye
punkpeye|wkordalski
wkordalski| +|SannidhyaSah
SannidhyaSah|xyOz-dev
xyOz-dev|chrarnoldus
chrarnoldus|sachasayan
sachasayan|Smartsheet-JB-Brown
Smartsheet-JB-Brown|monotykamary
monotykamary| +|cannuri
cannuri|feifei325
feifei325|zhangtony239
zhangtony239|shariqriazz
shariqriazz|vigneshsubbiah16
vigneshsubbiah16|pugazhendhi-m
pugazhendhi-m| +|lloydchang
lloydchang|dtrugman
dtrugman|Szpadel
Szpadel|hassoncs
hassoncs|liwilliam2021
liwilliam2021|lupuletic
lupuletic| +|kiwina
kiwina|Premshay
Premshay|psv2522
psv2522|olweraltuve
olweraltuve|diarmidmackenzie
diarmidmackenzie|ChuKhaLi
ChuKhaLi| +|PeterDaveHello
PeterDaveHello|aheizi
aheizi|nbihan-mediware
nbihan-mediware|noritaka1166
noritaka1166|RaySinner
RaySinner|afshawnlotfi
afshawnlotfi| +|dleffel
dleffel|StevenTCramer
StevenTCramer|Ruakij
Ruakij|pdecat
pdecat|kyle-apex
kyle-apex|emshvac
emshvac| +|Lunchb0ne
Lunchb0ne|SmartManoj
SmartManoj|vagadiya
vagadiya|slytechnical
slytechnical|dlab-anton
dlab-anton|arthurauffray
arthurauffray| +|upamune
upamune|NamesMT
NamesMT|taylorwilsdon
taylorwilsdon|sammcj
sammcj|p12tic
p12tic|gtaylor
gtaylor| +|brunobergher
brunobergher|aitoroses
aitoroses|ross
ross|mr-ryan-james
mr-ryan-james|heyseth
heyseth|taisukeoe
taisukeoe| +|avtc
avtc|eonghk
eonghk|GOODBOY008
GOODBOY008|kcwhite
kcwhite|ronyblum
ronyblum|teddyOOXX
teddyOOXX| +|vincentsong
vincentsong|yongjer
yongjer|zeozeozeo
zeozeozeo|ashktn
ashktn|franekp
franekp|yt3trees
yt3trees| +|seedlord
seedlord|bramburn
bramburn|anton-otee
anton-otee|benzntech
benzntech|axkirillov
axkirillov|olearycrew
olearycrew| +|catrielmuller
catrielmuller|devxpain
devxpain|snoyiatk
snoyiatk|GitlyHallows
GitlyHallows|jcbdev
jcbdev|Chenjiayuan195
Chenjiayuan195| +|julionav
julionav|KanTakahiro
KanTakahiro|SplittyDev
SplittyDev|mdp
mdp|napter
napter|philfung
philfung| +|bannzai
bannzai|bbenshalom
bbenshalom|chris-garrett
chris-garrett|dairui1
dairui1|dqroid
dqroid|janaki-sasidhar
janaki-sasidhar| +|forestyoo
forestyoo|hatsu38
hatsu38|hongzio
hongzio|im47cn
im47cn|shoopapa
shoopapa|jwcraig
jwcraig| +|axmo
axmo|asychin
asychin|amittell
amittell|Yoshino-Yukitaro
Yoshino-Yukitaro|Yikai-Liao
Yikai-Liao|zxdvd
zxdvd| +|s97712
s97712|vladstudio
vladstudio|vivekfyi
vivekfyi|HahaBill
HahaBill|tmsjngx0
tmsjngx0|TGlide
TGlide| +|Githubguy132010
Githubguy132010|tgfjt
tgfjt|maekawataiki
maekawataiki|nevermorec
nevermorec|PretzelVector
PretzelVector|zetaloop
zetaloop| +|cdlliuy
cdlliuy|user202729
user202729|thill2323
thill2323|takakoutso
takakoutso|student20880
student20880|shubhamgupta731
shubhamgupta731| +|shohei-ihaya
shohei-ihaya|shivamd1810
shivamd1810|shaybc
shaybc|sensei-woo
sensei-woo|samir-nimbly
samir-nimbly|robertheadley
robertheadley| +|refactorthis
refactorthis|qingyuan1109
qingyuan1109|pokutuna
pokutuna|philipnext
philipnext|village-way
village-way|oprstchn
oprstchn| +|nobu007
nobu007|mosleyit
mosleyit|moqimoqidea
moqimoqidea|mlopezr
mlopezr|mecab
mecab|olup
olup| +|lightrabbit
lightrabbit|lhish
lhish|kohii
kohii|kinandan
kinandan|AlexandruSmirnov
AlexandruSmirnov|pfitz
pfitz| +|ExactDoug
ExactDoug|celestial-vault
celestial-vault|linegel
linegel|edwin-truthsearch-io
edwin-truthsearch-io|EamonNerbonne
EamonNerbonne|dbasclpy
dbasclpy| +|dflatline
dflatline|Deon588
Deon588|dleen
dleen|CW-B-W
CW-B-W|chadgauth
chadgauth|thecolorblue
thecolorblue| +|bogdan0083
bogdan0083|benashby
benashby|Atlogit
Atlogit|atlasgong
atlasgong|AntiMoron
AntiMoron|andrewshu2000
andrewshu2000| +|andreastempsch
andreastempsch|alasano
alasano|QuinsZouls
QuinsZouls|HadesArchitect
HadesArchitect|alarno
alarno|nexon33
nexon33| +|adilhafeez
adilhafeez|adamwlarson
adamwlarson|adamhill
adamhill|AMHesch
AMHesch|adambrand
adambrand|samsilveira
samsilveira| +|01Rian
01Rian|RSO
RSO|RandalSchwartz
RandalSchwartz|SECKainersdorfer
SECKainersdorfer|R-omk
R-omk|Sarke
Sarke| +|PaperBoardOfficial
PaperBoardOfficial|OlegOAndreev
OlegOAndreev|Naam
Naam|NaccOll
NaccOll|kvokka
kvokka|ecmasx
ecmasx| +|mollux
mollux|marvijo-code
marvijo-code|markijbema
markijbema|mamertofabian
mamertofabian|monkeyDluffy6017
monkeyDluffy6017|libertyteeth
libertyteeth| +|shtse8
shtse8|Rexarrior
Rexarrior|kevinvandijk
kevinvandijk|KevinZhao
KevinZhao|ksze
ksze|Juice10
Juice10| +|snova-jorgep
snova-jorgep|Fovty
Fovty|Jdo300
Jdo300|hesara
hesara|DeXtroTip
DeXtroTip| | ## Лицензия diff --git a/locales/tr/README.md b/locales/tr/README.md index 122799bf72..bcdb6d8f68 100644 --- a/locales/tr/README.md +++ b/locales/tr/README.md @@ -181,47 +181,45 @@ Topluluk katkılarını seviyoruz! [CONTRIBUTING.md](CONTRIBUTING.md) dosyasın Roo Code'u daha iyi hale getirmeye yardımcı olan tüm katkıda bulunanlara teşekkür ederiz! - -| mrubens
mrubens | saoudrizwan
saoudrizwan | cte
cte | daniel-lxs
daniel-lxs | samhvw8
samhvw8 | hannesrudolph
hannesrudolph | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
KJ7LNW | a8trejo
a8trejo | MuriloFP
MuriloFP | ColemanRoo
ColemanRoo | canrobins13
canrobins13 | stea9499
stea9499 | -| joemanley201
joemanley201 | System233
System233 | jr
jr | nissa-seru
nissa-seru | jquanton
jquanton | roomote-agent
roomote-agent | -| NyxJae
NyxJae | d-oit
d-oit | elianiva
elianiva | qdaxb
qdaxb | punkpeye
punkpeye | wkordalski
wkordalski | -| SannidhyaSah
SannidhyaSah | xyOz-dev
xyOz-dev | chrarnoldus
chrarnoldus | sachasayan
sachasayan | Smartsheet-JB-Brown
Smartsheet-JB-Brown | monotykamary
monotykamary | -| cannuri
cannuri | feifei325
feifei325 | zhangtony239
zhangtony239 | shariqriazz
shariqriazz | vigneshsubbiah16
vigneshsubbiah16 | pugazhendhi-m
pugazhendhi-m | -| lloydchang
lloydchang | dtrugman
dtrugman | Szpadel
Szpadel | lupuletic
lupuletic | kiwina
kiwina | liwilliam2021
liwilliam2021 | -| Premshay
Premshay | psv2522
psv2522 | olweraltuve
olweraltuve | diarmidmackenzie
diarmidmackenzie | hassoncs
hassoncs | ChuKhaLi
ChuKhaLi | -| PeterDaveHello
PeterDaveHello | aheizi
aheizi | nbihan-mediware
nbihan-mediware | noritaka1166
noritaka1166 | RaySinner
RaySinner | afshawnlotfi
afshawnlotfi | -| dleffel
dleffel | StevenTCramer
StevenTCramer | Ruakij
Ruakij | pdecat
pdecat | kyle-apex
kyle-apex | emshvac
emshvac | -| Lunchb0ne
Lunchb0ne | SmartManoj
SmartManoj | vagadiya
vagadiya | slytechnical
slytechnical | dlab-anton
dlab-anton | arthurauffray
arthurauffray | -| upamune
upamune | NamesMT
NamesMT | taylorwilsdon
taylorwilsdon | sammcj
sammcj | p12tic
p12tic | gtaylor
gtaylor | -| brunobergher
brunobergher | aitoroses
aitoroses | ross
ross | mr-ryan-james
mr-ryan-james | heyseth
heyseth | taisukeoe
taisukeoe | -| avtc
avtc | eonghk
eonghk | GOODBOY008
GOODBOY008 | kcwhite
kcwhite | ronyblum
ronyblum | teddyOOXX
teddyOOXX | -| vincentsong
vincentsong | yongjer
yongjer | zeozeozeo
zeozeozeo | ashktn
ashktn | franekp
franekp | yt3trees
yt3trees | -| seedlord
seedlord | bramburn
bramburn | anton-otee
anton-otee | benzntech
benzntech | axkirillov
axkirillov | olearycrew
olearycrew | -| catrielmuller
catrielmuller | devxpain
devxpain | snoyiatk
snoyiatk | GitlyHallows
GitlyHallows | jcbdev
jcbdev | Chenjiayuan195
Chenjiayuan195 | -| julionav
julionav | KanTakahiro
KanTakahiro | SplittyDev
SplittyDev | mdp
mdp | napter
napter | philfung
philfung | -| bbenshalom
bbenshalom | chris-garrett
chris-garrett | dairui1
dairui1 | dqroid
dqroid | janaki-sasidhar
janaki-sasidhar | forestyoo
forestyoo | -| hatsu38
hatsu38 | hongzio
hongzio | im47cn
im47cn | shoopapa
shoopapa | jwcraig
jwcraig | kinandan
kinandan | -| bannzai
bannzai | axmo
axmo | asychin
asychin | amittell
amittell | Yoshino-Yukitaro
Yoshino-Yukitaro | Yikai-Liao
Yikai-Liao | -| zxdvd
zxdvd | s97712
s97712 | vladstudio
vladstudio | vivekfyi
vivekfyi | HahaBill
HahaBill | tmsjngx0
tmsjngx0 | -| TGlide
TGlide | Githubguy132010
Githubguy132010 | nevermorec
nevermorec | PretzelVector
PretzelVector | zetaloop
zetaloop | cdlliuy
cdlliuy | -| user202729
user202729 | thill2323
thill2323 | takakoutso
takakoutso | student20880
student20880 | shubhamgupta731
shubhamgupta731 | shohei-ihaya
shohei-ihaya | -| shivamd1810
shivamd1810 | shaybc
shaybc | sensei-woo
sensei-woo | samir-nimbly
samir-nimbly | robertheadley
robertheadley | refactorthis
refactorthis | -| qingyuan1109
qingyuan1109 | pokutuna
pokutuna | philipnext
philipnext | village-way
village-way | oprstchn
oprstchn | nobu007
nobu007 | -| mosleyit
mosleyit | moqimoqidea
moqimoqidea | mlopezr
mlopezr | mecab
mecab | olup
olup | lightrabbit
lightrabbit | -| lhish
lhish | kohii
kohii | tgfjt
tgfjt | DeXtroTip
DeXtroTip | pfitz
pfitz | ExactDoug
ExactDoug | -| celestial-vault
celestial-vault | linegel
linegel | edwin-truthsearch-io
edwin-truthsearch-io | EamonNerbonne
EamonNerbonne | dbasclpy
dbasclpy | dflatline
dflatline | -| Deon588
Deon588 | dleen
dleen | CW-B-W
CW-B-W | chadgauth
chadgauth | thecolorblue
thecolorblue | bogdan0083
bogdan0083 | -| benashby
benashby | Atlogit
Atlogit | atlasgong
atlasgong | andrewshu2000
andrewshu2000 | andreastempsch
andreastempsch | alasano
alasano | -| QuinsZouls
QuinsZouls | HadesArchitect
HadesArchitect | alarno
alarno | nexon33
nexon33 | adilhafeez
adilhafeez | adamwlarson
adamwlarson | -| adamhill
adamhill | AMHesch
AMHesch | maekawataiki
maekawataiki | AlexandruSmirnov
AlexandruSmirnov | samsilveira
samsilveira | 01Rian
01Rian | -| RSO
RSO | RandalSchwartz
RandalSchwartz | SECKainersdorfer
SECKainersdorfer | R-omk
R-omk | Sarke
Sarke | PaperBoardOfficial
PaperBoardOfficial | -| OlegOAndreev
OlegOAndreev | Naam
Naam | kvokka
kvokka | ecmasx
ecmasx | mollux
mollux | marvijo-code
marvijo-code | -| markijbema
markijbema | mamertofabian
mamertofabian | monkeyDluffy6017
monkeyDluffy6017 | libertyteeth
libertyteeth | shtse8
shtse8 | Rexarrior
Rexarrior | -| kevinvandijk
kevinvandijk | KevinZhao
KevinZhao | ksze
ksze | Juice10
Juice10 | Fovty
Fovty | Jdo300
Jdo300 | -| hesara
hesara | | | | | | - +|mrubens
mrubens|saoudrizwan
saoudrizwan|cte
cte|daniel-lxs
daniel-lxs|samhvw8
samhvw8|hannesrudolph
hannesrudolph| +|:---:|:---:|:---:|:---:|:---:|:---:| +|KJ7LNW
KJ7LNW|a8trejo
a8trejo|MuriloFP
MuriloFP|ColemanRoo
ColemanRoo|canrobins13
canrobins13|stea9499
stea9499| +|joemanley201
joemanley201|System233
System233|jr
jr|nissa-seru
nissa-seru|jquanton
jquanton|roomote-agent
roomote-agent| +|NyxJae
NyxJae|d-oit
d-oit|elianiva
elianiva|qdaxb
qdaxb|punkpeye
punkpeye|wkordalski
wkordalski| +|SannidhyaSah
SannidhyaSah|xyOz-dev
xyOz-dev|chrarnoldus
chrarnoldus|sachasayan
sachasayan|Smartsheet-JB-Brown
Smartsheet-JB-Brown|monotykamary
monotykamary| +|cannuri
cannuri|feifei325
feifei325|zhangtony239
zhangtony239|shariqriazz
shariqriazz|vigneshsubbiah16
vigneshsubbiah16|pugazhendhi-m
pugazhendhi-m| +|lloydchang
lloydchang|dtrugman
dtrugman|Szpadel
Szpadel|hassoncs
hassoncs|liwilliam2021
liwilliam2021|lupuletic
lupuletic| +|kiwina
kiwina|Premshay
Premshay|psv2522
psv2522|olweraltuve
olweraltuve|diarmidmackenzie
diarmidmackenzie|ChuKhaLi
ChuKhaLi| +|PeterDaveHello
PeterDaveHello|aheizi
aheizi|nbihan-mediware
nbihan-mediware|noritaka1166
noritaka1166|RaySinner
RaySinner|afshawnlotfi
afshawnlotfi| +|dleffel
dleffel|StevenTCramer
StevenTCramer|Ruakij
Ruakij|pdecat
pdecat|kyle-apex
kyle-apex|emshvac
emshvac| +|Lunchb0ne
Lunchb0ne|SmartManoj
SmartManoj|vagadiya
vagadiya|slytechnical
slytechnical|dlab-anton
dlab-anton|arthurauffray
arthurauffray| +|upamune
upamune|NamesMT
NamesMT|taylorwilsdon
taylorwilsdon|sammcj
sammcj|p12tic
p12tic|gtaylor
gtaylor| +|brunobergher
brunobergher|aitoroses
aitoroses|ross
ross|mr-ryan-james
mr-ryan-james|heyseth
heyseth|taisukeoe
taisukeoe| +|avtc
avtc|eonghk
eonghk|GOODBOY008
GOODBOY008|kcwhite
kcwhite|ronyblum
ronyblum|teddyOOXX
teddyOOXX| +|vincentsong
vincentsong|yongjer
yongjer|zeozeozeo
zeozeozeo|ashktn
ashktn|franekp
franekp|yt3trees
yt3trees| +|seedlord
seedlord|bramburn
bramburn|anton-otee
anton-otee|benzntech
benzntech|axkirillov
axkirillov|olearycrew
olearycrew| +|catrielmuller
catrielmuller|devxpain
devxpain|snoyiatk
snoyiatk|GitlyHallows
GitlyHallows|jcbdev
jcbdev|Chenjiayuan195
Chenjiayuan195| +|julionav
julionav|KanTakahiro
KanTakahiro|SplittyDev
SplittyDev|mdp
mdp|napter
napter|philfung
philfung| +|bannzai
bannzai|bbenshalom
bbenshalom|chris-garrett
chris-garrett|dairui1
dairui1|dqroid
dqroid|janaki-sasidhar
janaki-sasidhar| +|forestyoo
forestyoo|hatsu38
hatsu38|hongzio
hongzio|im47cn
im47cn|shoopapa
shoopapa|jwcraig
jwcraig| +|axmo
axmo|asychin
asychin|amittell
amittell|Yoshino-Yukitaro
Yoshino-Yukitaro|Yikai-Liao
Yikai-Liao|zxdvd
zxdvd| +|s97712
s97712|vladstudio
vladstudio|vivekfyi
vivekfyi|HahaBill
HahaBill|tmsjngx0
tmsjngx0|TGlide
TGlide| +|Githubguy132010
Githubguy132010|tgfjt
tgfjt|maekawataiki
maekawataiki|nevermorec
nevermorec|PretzelVector
PretzelVector|zetaloop
zetaloop| +|cdlliuy
cdlliuy|user202729
user202729|thill2323
thill2323|takakoutso
takakoutso|student20880
student20880|shubhamgupta731
shubhamgupta731| +|shohei-ihaya
shohei-ihaya|shivamd1810
shivamd1810|shaybc
shaybc|sensei-woo
sensei-woo|samir-nimbly
samir-nimbly|robertheadley
robertheadley| +|refactorthis
refactorthis|qingyuan1109
qingyuan1109|pokutuna
pokutuna|philipnext
philipnext|village-way
village-way|oprstchn
oprstchn| +|nobu007
nobu007|mosleyit
mosleyit|moqimoqidea
moqimoqidea|mlopezr
mlopezr|mecab
mecab|olup
olup| +|lightrabbit
lightrabbit|lhish
lhish|kohii
kohii|kinandan
kinandan|AlexandruSmirnov
AlexandruSmirnov|pfitz
pfitz| +|ExactDoug
ExactDoug|celestial-vault
celestial-vault|linegel
linegel|edwin-truthsearch-io
edwin-truthsearch-io|EamonNerbonne
EamonNerbonne|dbasclpy
dbasclpy| +|dflatline
dflatline|Deon588
Deon588|dleen
dleen|CW-B-W
CW-B-W|chadgauth
chadgauth|thecolorblue
thecolorblue| +|bogdan0083
bogdan0083|benashby
benashby|Atlogit
Atlogit|atlasgong
atlasgong|AntiMoron
AntiMoron|andrewshu2000
andrewshu2000| +|andreastempsch
andreastempsch|alasano
alasano|QuinsZouls
QuinsZouls|HadesArchitect
HadesArchitect|alarno
alarno|nexon33
nexon33| +|adilhafeez
adilhafeez|adamwlarson
adamwlarson|adamhill
adamhill|AMHesch
AMHesch|adambrand
adambrand|samsilveira
samsilveira| +|01Rian
01Rian|RSO
RSO|RandalSchwartz
RandalSchwartz|SECKainersdorfer
SECKainersdorfer|R-omk
R-omk|Sarke
Sarke| +|PaperBoardOfficial
PaperBoardOfficial|OlegOAndreev
OlegOAndreev|Naam
Naam|NaccOll
NaccOll|kvokka
kvokka|ecmasx
ecmasx| +|mollux
mollux|marvijo-code
marvijo-code|markijbema
markijbema|mamertofabian
mamertofabian|monkeyDluffy6017
monkeyDluffy6017|libertyteeth
libertyteeth| +|shtse8
shtse8|Rexarrior
Rexarrior|kevinvandijk
kevinvandijk|KevinZhao
KevinZhao|ksze
ksze|Juice10
Juice10| +|snova-jorgep
snova-jorgep|Fovty
Fovty|Jdo300
Jdo300|hesara
hesara|DeXtroTip
DeXtroTip| | ## Lisans diff --git a/locales/vi/README.md b/locales/vi/README.md index da26fdc6b5..11e2d7f008 100644 --- a/locales/vi/README.md +++ b/locales/vi/README.md @@ -181,47 +181,45 @@ Chúng tôi rất hoan nghênh đóng góp từ cộng đồng! Bắt đầu b Cảm ơn tất cả những người đóng góp đã giúp cải thiện Roo Code! - -| mrubens
mrubens | saoudrizwan
saoudrizwan | cte
cte | daniel-lxs
daniel-lxs | samhvw8
samhvw8 | hannesrudolph
hannesrudolph | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
KJ7LNW | a8trejo
a8trejo | MuriloFP
MuriloFP | ColemanRoo
ColemanRoo | canrobins13
canrobins13 | stea9499
stea9499 | -| joemanley201
joemanley201 | System233
System233 | jr
jr | nissa-seru
nissa-seru | jquanton
jquanton | roomote-agent
roomote-agent | -| NyxJae
NyxJae | d-oit
d-oit | elianiva
elianiva | qdaxb
qdaxb | punkpeye
punkpeye | wkordalski
wkordalski | -| SannidhyaSah
SannidhyaSah | xyOz-dev
xyOz-dev | chrarnoldus
chrarnoldus | sachasayan
sachasayan | Smartsheet-JB-Brown
Smartsheet-JB-Brown | monotykamary
monotykamary | -| cannuri
cannuri | feifei325
feifei325 | zhangtony239
zhangtony239 | shariqriazz
shariqriazz | vigneshsubbiah16
vigneshsubbiah16 | pugazhendhi-m
pugazhendhi-m | -| lloydchang
lloydchang | dtrugman
dtrugman | Szpadel
Szpadel | lupuletic
lupuletic | kiwina
kiwina | liwilliam2021
liwilliam2021 | -| Premshay
Premshay | psv2522
psv2522 | olweraltuve
olweraltuve | diarmidmackenzie
diarmidmackenzie | hassoncs
hassoncs | ChuKhaLi
ChuKhaLi | -| PeterDaveHello
PeterDaveHello | aheizi
aheizi | nbihan-mediware
nbihan-mediware | noritaka1166
noritaka1166 | RaySinner
RaySinner | afshawnlotfi
afshawnlotfi | -| dleffel
dleffel | StevenTCramer
StevenTCramer | Ruakij
Ruakij | pdecat
pdecat | kyle-apex
kyle-apex | emshvac
emshvac | -| Lunchb0ne
Lunchb0ne | SmartManoj
SmartManoj | vagadiya
vagadiya | slytechnical
slytechnical | dlab-anton
dlab-anton | arthurauffray
arthurauffray | -| upamune
upamune | NamesMT
NamesMT | taylorwilsdon
taylorwilsdon | sammcj
sammcj | p12tic
p12tic | gtaylor
gtaylor | -| brunobergher
brunobergher | aitoroses
aitoroses | ross
ross | mr-ryan-james
mr-ryan-james | heyseth
heyseth | taisukeoe
taisukeoe | -| avtc
avtc | eonghk
eonghk | GOODBOY008
GOODBOY008 | kcwhite
kcwhite | ronyblum
ronyblum | teddyOOXX
teddyOOXX | -| vincentsong
vincentsong | yongjer
yongjer | zeozeozeo
zeozeozeo | ashktn
ashktn | franekp
franekp | yt3trees
yt3trees | -| seedlord
seedlord | bramburn
bramburn | anton-otee
anton-otee | benzntech
benzntech | axkirillov
axkirillov | olearycrew
olearycrew | -| catrielmuller
catrielmuller | devxpain
devxpain | snoyiatk
snoyiatk | GitlyHallows
GitlyHallows | jcbdev
jcbdev | Chenjiayuan195
Chenjiayuan195 | -| julionav
julionav | KanTakahiro
KanTakahiro | SplittyDev
SplittyDev | mdp
mdp | napter
napter | philfung
philfung | -| bbenshalom
bbenshalom | chris-garrett
chris-garrett | dairui1
dairui1 | dqroid
dqroid | janaki-sasidhar
janaki-sasidhar | forestyoo
forestyoo | -| hatsu38
hatsu38 | hongzio
hongzio | im47cn
im47cn | shoopapa
shoopapa | jwcraig
jwcraig | kinandan
kinandan | -| bannzai
bannzai | axmo
axmo | asychin
asychin | amittell
amittell | Yoshino-Yukitaro
Yoshino-Yukitaro | Yikai-Liao
Yikai-Liao | -| zxdvd
zxdvd | s97712
s97712 | vladstudio
vladstudio | vivekfyi
vivekfyi | HahaBill
HahaBill | tmsjngx0
tmsjngx0 | -| TGlide
TGlide | Githubguy132010
Githubguy132010 | nevermorec
nevermorec | PretzelVector
PretzelVector | zetaloop
zetaloop | cdlliuy
cdlliuy | -| user202729
user202729 | thill2323
thill2323 | takakoutso
takakoutso | student20880
student20880 | shubhamgupta731
shubhamgupta731 | shohei-ihaya
shohei-ihaya | -| shivamd1810
shivamd1810 | shaybc
shaybc | sensei-woo
sensei-woo | samir-nimbly
samir-nimbly | robertheadley
robertheadley | refactorthis
refactorthis | -| qingyuan1109
qingyuan1109 | pokutuna
pokutuna | philipnext
philipnext | village-way
village-way | oprstchn
oprstchn | nobu007
nobu007 | -| mosleyit
mosleyit | moqimoqidea
moqimoqidea | mlopezr
mlopezr | mecab
mecab | olup
olup | lightrabbit
lightrabbit | -| lhish
lhish | kohii
kohii | tgfjt
tgfjt | DeXtroTip
DeXtroTip | pfitz
pfitz | ExactDoug
ExactDoug | -| celestial-vault
celestial-vault | linegel
linegel | edwin-truthsearch-io
edwin-truthsearch-io | EamonNerbonne
EamonNerbonne | dbasclpy
dbasclpy | dflatline
dflatline | -| Deon588
Deon588 | dleen
dleen | CW-B-W
CW-B-W | chadgauth
chadgauth | thecolorblue
thecolorblue | bogdan0083
bogdan0083 | -| benashby
benashby | Atlogit
Atlogit | atlasgong
atlasgong | andrewshu2000
andrewshu2000 | andreastempsch
andreastempsch | alasano
alasano | -| QuinsZouls
QuinsZouls | HadesArchitect
HadesArchitect | alarno
alarno | nexon33
nexon33 | adilhafeez
adilhafeez | adamwlarson
adamwlarson | -| adamhill
adamhill | AMHesch
AMHesch | maekawataiki
maekawataiki | AlexandruSmirnov
AlexandruSmirnov | samsilveira
samsilveira | 01Rian
01Rian | -| RSO
RSO | RandalSchwartz
RandalSchwartz | SECKainersdorfer
SECKainersdorfer | R-omk
R-omk | Sarke
Sarke | PaperBoardOfficial
PaperBoardOfficial | -| OlegOAndreev
OlegOAndreev | Naam
Naam | kvokka
kvokka | ecmasx
ecmasx | mollux
mollux | marvijo-code
marvijo-code | -| markijbema
markijbema | mamertofabian
mamertofabian | monkeyDluffy6017
monkeyDluffy6017 | libertyteeth
libertyteeth | shtse8
shtse8 | Rexarrior
Rexarrior | -| kevinvandijk
kevinvandijk | KevinZhao
KevinZhao | ksze
ksze | Juice10
Juice10 | Fovty
Fovty | Jdo300
Jdo300 | -| hesara
hesara | | | | | | - +|mrubens
mrubens|saoudrizwan
saoudrizwan|cte
cte|daniel-lxs
daniel-lxs|samhvw8
samhvw8|hannesrudolph
hannesrudolph| +|:---:|:---:|:---:|:---:|:---:|:---:| +|KJ7LNW
KJ7LNW|a8trejo
a8trejo|MuriloFP
MuriloFP|ColemanRoo
ColemanRoo|canrobins13
canrobins13|stea9499
stea9499| +|joemanley201
joemanley201|System233
System233|jr
jr|nissa-seru
nissa-seru|jquanton
jquanton|roomote-agent
roomote-agent| +|NyxJae
NyxJae|d-oit
d-oit|elianiva
elianiva|qdaxb
qdaxb|punkpeye
punkpeye|wkordalski
wkordalski| +|SannidhyaSah
SannidhyaSah|xyOz-dev
xyOz-dev|chrarnoldus
chrarnoldus|sachasayan
sachasayan|Smartsheet-JB-Brown
Smartsheet-JB-Brown|monotykamary
monotykamary| +|cannuri
cannuri|feifei325
feifei325|zhangtony239
zhangtony239|shariqriazz
shariqriazz|vigneshsubbiah16
vigneshsubbiah16|pugazhendhi-m
pugazhendhi-m| +|lloydchang
lloydchang|dtrugman
dtrugman|Szpadel
Szpadel|hassoncs
hassoncs|liwilliam2021
liwilliam2021|lupuletic
lupuletic| +|kiwina
kiwina|Premshay
Premshay|psv2522
psv2522|olweraltuve
olweraltuve|diarmidmackenzie
diarmidmackenzie|ChuKhaLi
ChuKhaLi| +|PeterDaveHello
PeterDaveHello|aheizi
aheizi|nbihan-mediware
nbihan-mediware|noritaka1166
noritaka1166|RaySinner
RaySinner|afshawnlotfi
afshawnlotfi| +|dleffel
dleffel|StevenTCramer
StevenTCramer|Ruakij
Ruakij|pdecat
pdecat|kyle-apex
kyle-apex|emshvac
emshvac| +|Lunchb0ne
Lunchb0ne|SmartManoj
SmartManoj|vagadiya
vagadiya|slytechnical
slytechnical|dlab-anton
dlab-anton|arthurauffray
arthurauffray| +|upamune
upamune|NamesMT
NamesMT|taylorwilsdon
taylorwilsdon|sammcj
sammcj|p12tic
p12tic|gtaylor
gtaylor| +|brunobergher
brunobergher|aitoroses
aitoroses|ross
ross|mr-ryan-james
mr-ryan-james|heyseth
heyseth|taisukeoe
taisukeoe| +|avtc
avtc|eonghk
eonghk|GOODBOY008
GOODBOY008|kcwhite
kcwhite|ronyblum
ronyblum|teddyOOXX
teddyOOXX| +|vincentsong
vincentsong|yongjer
yongjer|zeozeozeo
zeozeozeo|ashktn
ashktn|franekp
franekp|yt3trees
yt3trees| +|seedlord
seedlord|bramburn
bramburn|anton-otee
anton-otee|benzntech
benzntech|axkirillov
axkirillov|olearycrew
olearycrew| +|catrielmuller
catrielmuller|devxpain
devxpain|snoyiatk
snoyiatk|GitlyHallows
GitlyHallows|jcbdev
jcbdev|Chenjiayuan195
Chenjiayuan195| +|julionav
julionav|KanTakahiro
KanTakahiro|SplittyDev
SplittyDev|mdp
mdp|napter
napter|philfung
philfung| +|bannzai
bannzai|bbenshalom
bbenshalom|chris-garrett
chris-garrett|dairui1
dairui1|dqroid
dqroid|janaki-sasidhar
janaki-sasidhar| +|forestyoo
forestyoo|hatsu38
hatsu38|hongzio
hongzio|im47cn
im47cn|shoopapa
shoopapa|jwcraig
jwcraig| +|axmo
axmo|asychin
asychin|amittell
amittell|Yoshino-Yukitaro
Yoshino-Yukitaro|Yikai-Liao
Yikai-Liao|zxdvd
zxdvd| +|s97712
s97712|vladstudio
vladstudio|vivekfyi
vivekfyi|HahaBill
HahaBill|tmsjngx0
tmsjngx0|TGlide
TGlide| +|Githubguy132010
Githubguy132010|tgfjt
tgfjt|maekawataiki
maekawataiki|nevermorec
nevermorec|PretzelVector
PretzelVector|zetaloop
zetaloop| +|cdlliuy
cdlliuy|user202729
user202729|thill2323
thill2323|takakoutso
takakoutso|student20880
student20880|shubhamgupta731
shubhamgupta731| +|shohei-ihaya
shohei-ihaya|shivamd1810
shivamd1810|shaybc
shaybc|sensei-woo
sensei-woo|samir-nimbly
samir-nimbly|robertheadley
robertheadley| +|refactorthis
refactorthis|qingyuan1109
qingyuan1109|pokutuna
pokutuna|philipnext
philipnext|village-way
village-way|oprstchn
oprstchn| +|nobu007
nobu007|mosleyit
mosleyit|moqimoqidea
moqimoqidea|mlopezr
mlopezr|mecab
mecab|olup
olup| +|lightrabbit
lightrabbit|lhish
lhish|kohii
kohii|kinandan
kinandan|AlexandruSmirnov
AlexandruSmirnov|pfitz
pfitz| +|ExactDoug
ExactDoug|celestial-vault
celestial-vault|linegel
linegel|edwin-truthsearch-io
edwin-truthsearch-io|EamonNerbonne
EamonNerbonne|dbasclpy
dbasclpy| +|dflatline
dflatline|Deon588
Deon588|dleen
dleen|CW-B-W
CW-B-W|chadgauth
chadgauth|thecolorblue
thecolorblue| +|bogdan0083
bogdan0083|benashby
benashby|Atlogit
Atlogit|atlasgong
atlasgong|AntiMoron
AntiMoron|andrewshu2000
andrewshu2000| +|andreastempsch
andreastempsch|alasano
alasano|QuinsZouls
QuinsZouls|HadesArchitect
HadesArchitect|alarno
alarno|nexon33
nexon33| +|adilhafeez
adilhafeez|adamwlarson
adamwlarson|adamhill
adamhill|AMHesch
AMHesch|adambrand
adambrand|samsilveira
samsilveira| +|01Rian
01Rian|RSO
RSO|RandalSchwartz
RandalSchwartz|SECKainersdorfer
SECKainersdorfer|R-omk
R-omk|Sarke
Sarke| +|PaperBoardOfficial
PaperBoardOfficial|OlegOAndreev
OlegOAndreev|Naam
Naam|NaccOll
NaccOll|kvokka
kvokka|ecmasx
ecmasx| +|mollux
mollux|marvijo-code
marvijo-code|markijbema
markijbema|mamertofabian
mamertofabian|monkeyDluffy6017
monkeyDluffy6017|libertyteeth
libertyteeth| +|shtse8
shtse8|Rexarrior
Rexarrior|kevinvandijk
kevinvandijk|KevinZhao
KevinZhao|ksze
ksze|Juice10
Juice10| +|snova-jorgep
snova-jorgep|Fovty
Fovty|Jdo300
Jdo300|hesara
hesara|DeXtroTip
DeXtroTip| | ## Giấy Phép diff --git a/locales/zh-CN/README.md b/locales/zh-CN/README.md index 39f913feac..c65d09fbaf 100644 --- a/locales/zh-CN/README.md +++ b/locales/zh-CN/README.md @@ -181,47 +181,45 @@ code --install-extension bin/roo-cline-.vsix 感谢所有帮助改进 Roo Code 的贡献者！ - -| mrubens
mrubens | saoudrizwan
saoudrizwan | cte
cte | daniel-lxs
daniel-lxs | samhvw8
samhvw8 | hannesrudolph
hannesrudolph | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
KJ7LNW | a8trejo
a8trejo | MuriloFP
MuriloFP | ColemanRoo
ColemanRoo | canrobins13
canrobins13 | stea9499
stea9499 | -| joemanley201
joemanley201 | System233
System233 | jr
jr | nissa-seru
nissa-seru | jquanton
jquanton | roomote-agent
roomote-agent | -| NyxJae
NyxJae | d-oit
d-oit | elianiva
elianiva | qdaxb
qdaxb | punkpeye
punkpeye | wkordalski
wkordalski | -| SannidhyaSah
SannidhyaSah | xyOz-dev
xyOz-dev | chrarnoldus
chrarnoldus | sachasayan
sachasayan | Smartsheet-JB-Brown
Smartsheet-JB-Brown | monotykamary
monotykamary | -| cannuri
cannuri | feifei325
feifei325 | zhangtony239
zhangtony239 | shariqriazz
shariqriazz | vigneshsubbiah16
vigneshsubbiah16 | pugazhendhi-m
pugazhendhi-m | -| lloydchang
lloydchang | dtrugman
dtrugman | Szpadel
Szpadel | lupuletic
lupuletic | kiwina
kiwina | liwilliam2021
liwilliam2021 | -| Premshay
Premshay | psv2522
psv2522 | olweraltuve
olweraltuve | diarmidmackenzie
diarmidmackenzie | hassoncs
hassoncs | ChuKhaLi
ChuKhaLi | -| PeterDaveHello
PeterDaveHello | aheizi
aheizi | nbihan-mediware
nbihan-mediware | noritaka1166
noritaka1166 | RaySinner
RaySinner | afshawnlotfi
afshawnlotfi | -| dleffel
dleffel | StevenTCramer
StevenTCramer | Ruakij
Ruakij | pdecat
pdecat | kyle-apex
kyle-apex | emshvac
emshvac | -| Lunchb0ne
Lunchb0ne | SmartManoj
SmartManoj | vagadiya
vagadiya | slytechnical
slytechnical | dlab-anton
dlab-anton | arthurauffray
arthurauffray | -| upamune
upamune | NamesMT
NamesMT | taylorwilsdon
taylorwilsdon | sammcj
sammcj | p12tic
p12tic | gtaylor
gtaylor | -| brunobergher
brunobergher | aitoroses
aitoroses | ross
ross | mr-ryan-james
mr-ryan-james | heyseth
heyseth | taisukeoe
taisukeoe | -| avtc
avtc | eonghk
eonghk | GOODBOY008
GOODBOY008 | kcwhite
kcwhite | ronyblum
ronyblum | teddyOOXX
teddyOOXX | -| vincentsong
vincentsong | yongjer
yongjer | zeozeozeo
zeozeozeo | ashktn
ashktn | franekp
franekp | yt3trees
yt3trees | -| seedlord
seedlord | bramburn
bramburn | anton-otee
anton-otee | benzntech
benzntech | axkirillov
axkirillov | olearycrew
olearycrew | -| catrielmuller
catrielmuller | devxpain
devxpain | snoyiatk
snoyiatk | GitlyHallows
GitlyHallows | jcbdev
jcbdev | Chenjiayuan195
Chenjiayuan195 | -| julionav
julionav | KanTakahiro
KanTakahiro | SplittyDev
SplittyDev | mdp
mdp | napter
napter | philfung
philfung | -| bbenshalom
bbenshalom | chris-garrett
chris-garrett | dairui1
dairui1 | dqroid
dqroid | janaki-sasidhar
janaki-sasidhar | forestyoo
forestyoo | -| hatsu38
hatsu38 | hongzio
hongzio | im47cn
im47cn | shoopapa
shoopapa | jwcraig
jwcraig | kinandan
kinandan | -| bannzai
bannzai | axmo
axmo | asychin
asychin | amittell
amittell | Yoshino-Yukitaro
Yoshino-Yukitaro | Yikai-Liao
Yikai-Liao | -| zxdvd
zxdvd | s97712
s97712 | vladstudio
vladstudio | vivekfyi
vivekfyi | HahaBill
HahaBill | tmsjngx0
tmsjngx0 | -| TGlide
TGlide | Githubguy132010
Githubguy132010 | nevermorec
nevermorec | PretzelVector
PretzelVector | zetaloop
zetaloop | cdlliuy
cdlliuy | -| user202729
user202729 | thill2323
thill2323 | takakoutso
takakoutso | student20880
student20880 | shubhamgupta731
shubhamgupta731 | shohei-ihaya
shohei-ihaya | -| shivamd1810
shivamd1810 | shaybc
shaybc | sensei-woo
sensei-woo | samir-nimbly
samir-nimbly | robertheadley
robertheadley | refactorthis
refactorthis | -| qingyuan1109
qingyuan1109 | pokutuna
pokutuna | philipnext
philipnext | village-way
village-way | oprstchn
oprstchn | nobu007
nobu007 | -| mosleyit
mosleyit | moqimoqidea
moqimoqidea | mlopezr
mlopezr | mecab
mecab | olup
olup | lightrabbit
lightrabbit | -| lhish
lhish | kohii
kohii | tgfjt
tgfjt | DeXtroTip
DeXtroTip | pfitz
pfitz | ExactDoug
ExactDoug | -| celestial-vault
celestial-vault | linegel
linegel | edwin-truthsearch-io
edwin-truthsearch-io | EamonNerbonne
EamonNerbonne | dbasclpy
dbasclpy | dflatline
dflatline | -| Deon588
Deon588 | dleen
dleen | CW-B-W
CW-B-W | chadgauth
chadgauth | thecolorblue
thecolorblue | bogdan0083
bogdan0083 | -| benashby
benashby | Atlogit
Atlogit | atlasgong
atlasgong | andrewshu2000
andrewshu2000 | andreastempsch
andreastempsch | alasano
alasano | -| QuinsZouls
QuinsZouls | HadesArchitect
HadesArchitect | alarno
alarno | nexon33
nexon33 | adilhafeez
adilhafeez | adamwlarson
adamwlarson | -| adamhill
adamhill | AMHesch
AMHesch | maekawataiki
maekawataiki | AlexandruSmirnov
AlexandruSmirnov | samsilveira
samsilveira | 01Rian
01Rian | -| RSO
RSO | RandalSchwartz
RandalSchwartz | SECKainersdorfer
SECKainersdorfer | R-omk
R-omk | Sarke
Sarke | PaperBoardOfficial
PaperBoardOfficial | -| OlegOAndreev
OlegOAndreev | Naam
Naam | kvokka
kvokka | ecmasx
ecmasx | mollux
mollux | marvijo-code
marvijo-code | -| markijbema
markijbema | mamertofabian
mamertofabian | monkeyDluffy6017
monkeyDluffy6017 | libertyteeth
libertyteeth | shtse8
shtse8 | Rexarrior
Rexarrior | -| kevinvandijk
kevinvandijk | KevinZhao
KevinZhao | ksze
ksze | Juice10
Juice10 | Fovty
Fovty | Jdo300
Jdo300 | -| hesara
hesara | | | | | | - +|mrubens
mrubens|saoudrizwan
saoudrizwan|cte
cte|daniel-lxs
daniel-lxs|samhvw8
samhvw8|hannesrudolph
hannesrudolph| +|:---:|:---:|:---:|:---:|:---:|:---:| +|KJ7LNW
KJ7LNW|a8trejo
a8trejo|MuriloFP
MuriloFP|ColemanRoo
ColemanRoo|canrobins13
canrobins13|stea9499
stea9499| +|joemanley201
joemanley201|System233
System233|jr
jr|nissa-seru
nissa-seru|jquanton
jquanton|roomote-agent
roomote-agent| +|NyxJae
NyxJae|d-oit
d-oit|elianiva
elianiva|qdaxb
qdaxb|punkpeye
punkpeye|wkordalski
wkordalski| +|SannidhyaSah
SannidhyaSah|xyOz-dev
xyOz-dev|chrarnoldus
chrarnoldus|sachasayan
sachasayan|Smartsheet-JB-Brown
Smartsheet-JB-Brown|monotykamary
monotykamary| +|cannuri
cannuri|feifei325
feifei325|zhangtony239
zhangtony239|shariqriazz
shariqriazz|vigneshsubbiah16
vigneshsubbiah16|pugazhendhi-m
pugazhendhi-m| +|lloydchang
lloydchang|dtrugman
dtrugman|Szpadel
Szpadel|hassoncs
hassoncs|liwilliam2021
liwilliam2021|lupuletic
lupuletic| +|kiwina
kiwina|Premshay
Premshay|psv2522
psv2522|olweraltuve
olweraltuve|diarmidmackenzie
diarmidmackenzie|ChuKhaLi
ChuKhaLi| +|PeterDaveHello
PeterDaveHello|aheizi
aheizi|nbihan-mediware
nbihan-mediware|noritaka1166
noritaka1166|RaySinner
RaySinner|afshawnlotfi
afshawnlotfi| +|dleffel
dleffel|StevenTCramer
StevenTCramer|Ruakij
Ruakij|pdecat
pdecat|kyle-apex
kyle-apex|emshvac
emshvac| +|Lunchb0ne
Lunchb0ne|SmartManoj
SmartManoj|vagadiya
vagadiya|slytechnical
slytechnical|dlab-anton
dlab-anton|arthurauffray
arthurauffray| +|upamune
upamune|NamesMT
NamesMT|taylorwilsdon
taylorwilsdon|sammcj
sammcj|p12tic
p12tic|gtaylor
gtaylor| +|brunobergher
brunobergher|aitoroses
aitoroses|ross
ross|mr-ryan-james
mr-ryan-james|heyseth
heyseth|taisukeoe
taisukeoe| +|avtc
avtc|eonghk
eonghk|GOODBOY008
GOODBOY008|kcwhite
kcwhite|ronyblum
ronyblum|teddyOOXX
teddyOOXX| +|vincentsong
vincentsong|yongjer
yongjer|zeozeozeo
zeozeozeo|ashktn
ashktn|franekp
franekp|yt3trees
yt3trees| +|seedlord
seedlord|bramburn
bramburn|anton-otee
anton-otee|benzntech
benzntech|axkirillov
axkirillov|olearycrew
olearycrew| +|catrielmuller
catrielmuller|devxpain
devxpain|snoyiatk
snoyiatk|GitlyHallows
GitlyHallows|jcbdev
jcbdev|Chenjiayuan195
Chenjiayuan195| +|julionav
julionav|KanTakahiro
KanTakahiro|SplittyDev
SplittyDev|mdp
mdp|napter
napter|philfung
philfung| +|bannzai
bannzai|bbenshalom
bbenshalom|chris-garrett
chris-garrett|dairui1
dairui1|dqroid
dqroid|janaki-sasidhar
janaki-sasidhar| +|forestyoo
forestyoo|hatsu38
hatsu38|hongzio
hongzio|im47cn
im47cn|shoopapa
shoopapa|jwcraig
jwcraig| +|axmo
axmo|asychin
asychin|amittell
amittell|Yoshino-Yukitaro
Yoshino-Yukitaro|Yikai-Liao
Yikai-Liao|zxdvd
zxdvd| +|s97712
s97712|vladstudio
vladstudio|vivekfyi
vivekfyi|HahaBill
HahaBill|tmsjngx0
tmsjngx0|TGlide
TGlide| +|Githubguy132010
Githubguy132010|tgfjt
tgfjt|maekawataiki
maekawataiki|nevermorec
nevermorec|PretzelVector
PretzelVector|zetaloop
zetaloop| +|cdlliuy
cdlliuy|user202729
user202729|thill2323
thill2323|takakoutso
takakoutso|student20880
student20880|shubhamgupta731
shubhamgupta731| +|shohei-ihaya
shohei-ihaya|shivamd1810
shivamd1810|shaybc
shaybc|sensei-woo
sensei-woo|samir-nimbly
samir-nimbly|robertheadley
robertheadley| +|refactorthis
refactorthis|qingyuan1109
qingyuan1109|pokutuna
pokutuna|philipnext
philipnext|village-way
village-way|oprstchn
oprstchn| +|nobu007
nobu007|mosleyit
mosleyit|moqimoqidea
moqimoqidea|mlopezr
mlopezr|mecab
mecab|olup
olup| +|lightrabbit
lightrabbit|lhish
lhish|kohii
kohii|kinandan
kinandan|AlexandruSmirnov
AlexandruSmirnov|pfitz
pfitz| +|ExactDoug
ExactDoug|celestial-vault
celestial-vault|linegel
linegel|edwin-truthsearch-io
edwin-truthsearch-io|EamonNerbonne
EamonNerbonne|dbasclpy
dbasclpy| +|dflatline
dflatline|Deon588
Deon588|dleen
dleen|CW-B-W
CW-B-W|chadgauth
chadgauth|thecolorblue
thecolorblue| +|bogdan0083
bogdan0083|benashby
benashby|Atlogit
Atlogit|atlasgong
atlasgong|AntiMoron
AntiMoron|andrewshu2000
andrewshu2000| +|andreastempsch
andreastempsch|alasano
alasano|QuinsZouls
QuinsZouls|HadesArchitect
HadesArchitect|alarno
alarno|nexon33
nexon33| +|adilhafeez
adilhafeez|adamwlarson
adamwlarson|adamhill
adamhill|AMHesch
AMHesch|adambrand
adambrand|samsilveira
samsilveira| +|01Rian
01Rian|RSO
RSO|RandalSchwartz
RandalSchwartz|SECKainersdorfer
SECKainersdorfer|R-omk
R-omk|Sarke
Sarke| +|PaperBoardOfficial
PaperBoardOfficial|OlegOAndreev
OlegOAndreev|Naam
Naam|NaccOll
NaccOll|kvokka
kvokka|ecmasx
ecmasx| +|mollux
mollux|marvijo-code
marvijo-code|markijbema
markijbema|mamertofabian
mamertofabian|monkeyDluffy6017
monkeyDluffy6017|libertyteeth
libertyteeth| +|shtse8
shtse8|Rexarrior
Rexarrior|kevinvandijk
kevinvandijk|KevinZhao
KevinZhao|ksze
ksze|Juice10
Juice10| +|snova-jorgep
snova-jorgep|Fovty
Fovty|Jdo300
Jdo300|hesara
hesara|DeXtroTip
DeXtroTip| | ## 许可证 diff --git a/locales/zh-TW/README.md b/locales/zh-TW/README.md index 6491f5695d..0765e28ba2 100644 --- a/locales/zh-TW/README.md +++ b/locales/zh-TW/README.md @@ -182,47 +182,45 @@ code --install-extension bin/roo-cline-.vsix 感謝所有幫助改進 Roo Code 的貢獻者！ - -| mrubens
mrubens | saoudrizwan
saoudrizwan | cte
cte | daniel-lxs
daniel-lxs | samhvw8
samhvw8 | hannesrudolph
hannesrudolph | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
KJ7LNW | a8trejo
a8trejo | MuriloFP
MuriloFP | ColemanRoo
ColemanRoo | canrobins13
canrobins13 | stea9499
stea9499 | -| joemanley201
joemanley201 | System233
System233 | jr
jr | nissa-seru
nissa-seru | jquanton
jquanton | roomote-agent
roomote-agent | -| NyxJae
NyxJae | d-oit
d-oit | elianiva
elianiva | qdaxb
qdaxb | punkpeye
punkpeye | wkordalski
wkordalski | -| SannidhyaSah
SannidhyaSah | xyOz-dev
xyOz-dev | chrarnoldus
chrarnoldus | sachasayan
sachasayan | Smartsheet-JB-Brown
Smartsheet-JB-Brown | monotykamary
monotykamary | -| cannuri
cannuri | feifei325
feifei325 | zhangtony239
zhangtony239 | shariqriazz
shariqriazz | vigneshsubbiah16
vigneshsubbiah16 | pugazhendhi-m
pugazhendhi-m | -| lloydchang
lloydchang | dtrugman
dtrugman | Szpadel
Szpadel | lupuletic
lupuletic | kiwina
kiwina | liwilliam2021
liwilliam2021 | -| Premshay
Premshay | psv2522
psv2522 | olweraltuve
olweraltuve | diarmidmackenzie
diarmidmackenzie | hassoncs
hassoncs | ChuKhaLi
ChuKhaLi | -| PeterDaveHello
PeterDaveHello | aheizi
aheizi | nbihan-mediware
nbihan-mediware | noritaka1166
noritaka1166 | RaySinner
RaySinner | afshawnlotfi
afshawnlotfi | -| dleffel
dleffel | StevenTCramer
StevenTCramer | Ruakij
Ruakij | pdecat
pdecat | kyle-apex
kyle-apex | emshvac
emshvac | -| Lunchb0ne
Lunchb0ne | SmartManoj
SmartManoj | vagadiya
vagadiya | slytechnical
slytechnical | dlab-anton
dlab-anton | arthurauffray
arthurauffray | -| upamune
upamune | NamesMT
NamesMT | taylorwilsdon
taylorwilsdon | sammcj
sammcj | p12tic
p12tic | gtaylor
gtaylor | -| brunobergher
brunobergher | aitoroses
aitoroses | ross
ross | mr-ryan-james
mr-ryan-james | heyseth
heyseth | taisukeoe
taisukeoe | -| avtc
avtc | eonghk
eonghk | GOODBOY008
GOODBOY008 | kcwhite
kcwhite | ronyblum
ronyblum | teddyOOXX
teddyOOXX | -| vincentsong
vincentsong | yongjer
yongjer | zeozeozeo
zeozeozeo | ashktn
ashktn | franekp
franekp | yt3trees
yt3trees | -| seedlord
seedlord | bramburn
bramburn | anton-otee
anton-otee | benzntech
benzntech | axkirillov
axkirillov | olearycrew
olearycrew | -| catrielmuller
catrielmuller | devxpain
devxpain | snoyiatk
snoyiatk | GitlyHallows
GitlyHallows | jcbdev
jcbdev | Chenjiayuan195
Chenjiayuan195 | -| julionav
julionav | KanTakahiro
KanTakahiro | SplittyDev
SplittyDev | mdp
mdp | napter
napter | philfung
philfung | -| bbenshalom
bbenshalom | chris-garrett
chris-garrett | dairui1
dairui1 | dqroid
dqroid | janaki-sasidhar
janaki-sasidhar | forestyoo
forestyoo | -| hatsu38
hatsu38 | hongzio
hongzio | im47cn
im47cn | shoopapa
shoopapa | jwcraig
jwcraig | kinandan
kinandan | -| bannzai
bannzai | axmo
axmo | asychin
asychin | amittell
amittell | Yoshino-Yukitaro
Yoshino-Yukitaro | Yikai-Liao
Yikai-Liao | -| zxdvd
zxdvd | s97712
s97712 | vladstudio
vladstudio | vivekfyi
vivekfyi | HahaBill
HahaBill | tmsjngx0
tmsjngx0 | -| TGlide
TGlide | Githubguy132010
Githubguy132010 | nevermorec
nevermorec | PretzelVector
PretzelVector | zetaloop
zetaloop | cdlliuy
cdlliuy | -| user202729
user202729 | thill2323
thill2323 | takakoutso
takakoutso | student20880
student20880 | shubhamgupta731
shubhamgupta731 | shohei-ihaya
shohei-ihaya | -| shivamd1810
shivamd1810 | shaybc
shaybc | sensei-woo
sensei-woo | samir-nimbly
samir-nimbly | robertheadley
robertheadley | refactorthis
refactorthis | -| qingyuan1109
qingyuan1109 | pokutuna
pokutuna | philipnext
philipnext | village-way
village-way | oprstchn
oprstchn | nobu007
nobu007 | -| mosleyit
mosleyit | moqimoqidea
moqimoqidea | mlopezr
mlopezr | mecab
mecab | olup
olup | lightrabbit
lightrabbit | -| lhish
lhish | kohii
kohii | tgfjt
tgfjt | DeXtroTip
DeXtroTip | pfitz
pfitz | ExactDoug
ExactDoug | -| celestial-vault
celestial-vault | linegel
linegel | edwin-truthsearch-io
edwin-truthsearch-io | EamonNerbonne
EamonNerbonne | dbasclpy
dbasclpy | dflatline
dflatline | -| Deon588
Deon588 | dleen
dleen | CW-B-W
CW-B-W | chadgauth
chadgauth | thecolorblue
thecolorblue | bogdan0083
bogdan0083 | -| benashby
benashby | Atlogit
Atlogit | atlasgong
atlasgong | andrewshu2000
andrewshu2000 | andreastempsch
andreastempsch | alasano
alasano | -| QuinsZouls
QuinsZouls | HadesArchitect
HadesArchitect | alarno
alarno | nexon33
nexon33 | adilhafeez
adilhafeez | adamwlarson
adamwlarson | -| adamhill
adamhill | AMHesch
AMHesch | maekawataiki
maekawataiki | AlexandruSmirnov
AlexandruSmirnov | samsilveira
samsilveira | 01Rian
01Rian | -| RSO
RSO | RandalSchwartz
RandalSchwartz | SECKainersdorfer
SECKainersdorfer | R-omk
R-omk | Sarke
Sarke | PaperBoardOfficial
PaperBoardOfficial | -| OlegOAndreev
OlegOAndreev | Naam
Naam | kvokka
kvokka | ecmasx
ecmasx | mollux
mollux | marvijo-code
marvijo-code | -| markijbema
markijbema | mamertofabian
mamertofabian | monkeyDluffy6017
monkeyDluffy6017 | libertyteeth
libertyteeth | shtse8
shtse8 | Rexarrior
Rexarrior | -| kevinvandijk
kevinvandijk | KevinZhao
KevinZhao | ksze
ksze | Juice10
Juice10 | Fovty
Fovty | Jdo300
Jdo300 | -| hesara
hesara | | | | | | - +|mrubens
mrubens|saoudrizwan
saoudrizwan|cte
cte|daniel-lxs
daniel-lxs|samhvw8
samhvw8|hannesrudolph
hannesrudolph| +|:---:|:---:|:---:|:---:|:---:|:---:| +|KJ7LNW
KJ7LNW|a8trejo
a8trejo|MuriloFP
MuriloFP|ColemanRoo
ColemanRoo|canrobins13
canrobins13|stea9499
stea9499| +|joemanley201
joemanley201|System233
System233|jr
jr|nissa-seru
nissa-seru|jquanton
jquanton|roomote-agent
roomote-agent| +|NyxJae
NyxJae|d-oit
d-oit|elianiva
elianiva|qdaxb
qdaxb|punkpeye
punkpeye|wkordalski
wkordalski| +|SannidhyaSah
SannidhyaSah|xyOz-dev
xyOz-dev|chrarnoldus
chrarnoldus|sachasayan
sachasayan|Smartsheet-JB-Brown
Smartsheet-JB-Brown|monotykamary
monotykamary| +|cannuri
cannuri|feifei325
feifei325|zhangtony239
zhangtony239|shariqriazz
shariqriazz|vigneshsubbiah16
vigneshsubbiah16|pugazhendhi-m
pugazhendhi-m| +|lloydchang
lloydchang|dtrugman
dtrugman|Szpadel
Szpadel|hassoncs
hassoncs|liwilliam2021
liwilliam2021|lupuletic
lupuletic| +|kiwina
kiwina|Premshay
Premshay|psv2522
psv2522|olweraltuve
olweraltuve|diarmidmackenzie
diarmidmackenzie|ChuKhaLi
ChuKhaLi| +|PeterDaveHello
PeterDaveHello|aheizi
aheizi|nbihan-mediware
nbihan-mediware|noritaka1166
noritaka1166|RaySinner
RaySinner|afshawnlotfi
afshawnlotfi| +|dleffel
dleffel|StevenTCramer
StevenTCramer|Ruakij
Ruakij|pdecat
pdecat|kyle-apex
kyle-apex|emshvac
emshvac| +|Lunchb0ne
Lunchb0ne|SmartManoj
SmartManoj|vagadiya
vagadiya|slytechnical
slytechnical|dlab-anton
dlab-anton|arthurauffray
arthurauffray| +|upamune
upamune|NamesMT
NamesMT|taylorwilsdon
taylorwilsdon|sammcj
sammcj|p12tic
p12tic|gtaylor
gtaylor| +|brunobergher
brunobergher|aitoroses
aitoroses|ross
ross|mr-ryan-james
mr-ryan-james|heyseth
heyseth|taisukeoe
taisukeoe| +|avtc
avtc|eonghk
eonghk|GOODBOY008
GOODBOY008|kcwhite
kcwhite|ronyblum
ronyblum|teddyOOXX
teddyOOXX| +|vincentsong
vincentsong|yongjer
yongjer|zeozeozeo
zeozeozeo|ashktn
ashktn|franekp
franekp|yt3trees
yt3trees| +|seedlord
seedlord|bramburn
bramburn|anton-otee
anton-otee|benzntech
benzntech|axkirillov
axkirillov|olearycrew
olearycrew| +|catrielmuller
catrielmuller|devxpain
devxpain|snoyiatk
snoyiatk|GitlyHallows
GitlyHallows|jcbdev
jcbdev|Chenjiayuan195
Chenjiayuan195| +|julionav
julionav|KanTakahiro
KanTakahiro|SplittyDev
SplittyDev|mdp
mdp|napter
napter|philfung
philfung| +|bannzai
bannzai|bbenshalom
bbenshalom|chris-garrett
chris-garrett|dairui1
dairui1|dqroid
dqroid|janaki-sasidhar
janaki-sasidhar| +|forestyoo
forestyoo|hatsu38
hatsu38|hongzio
hongzio|im47cn
im47cn|shoopapa
shoopapa|jwcraig
jwcraig| +|axmo
axmo|asychin
asychin|amittell
amittell|Yoshino-Yukitaro
Yoshino-Yukitaro|Yikai-Liao
Yikai-Liao|zxdvd
zxdvd| +|s97712
s97712|vladstudio
vladstudio|vivekfyi
vivekfyi|HahaBill
HahaBill|tmsjngx0
tmsjngx0|TGlide
TGlide| +|Githubguy132010
Githubguy132010|tgfjt
tgfjt|maekawataiki
maekawataiki|nevermorec
nevermorec|PretzelVector
PretzelVector|zetaloop
zetaloop| +|cdlliuy
cdlliuy|user202729
user202729|thill2323
thill2323|takakoutso
takakoutso|student20880
student20880|shubhamgupta731
shubhamgupta731| +|shohei-ihaya
shohei-ihaya|shivamd1810
shivamd1810|shaybc
shaybc|sensei-woo
sensei-woo|samir-nimbly
samir-nimbly|robertheadley
robertheadley| +|refactorthis
refactorthis|qingyuan1109
qingyuan1109|pokutuna
pokutuna|philipnext
philipnext|village-way
village-way|oprstchn
oprstchn| +|nobu007
nobu007|mosleyit
mosleyit|moqimoqidea
moqimoqidea|mlopezr
mlopezr|mecab
mecab|olup
olup| +|lightrabbit
lightrabbit|lhish
lhish|kohii
kohii|kinandan
kinandan|AlexandruSmirnov
AlexandruSmirnov|pfitz
pfitz| +|ExactDoug
ExactDoug|celestial-vault
celestial-vault|linegel
linegel|edwin-truthsearch-io
edwin-truthsearch-io|EamonNerbonne
EamonNerbonne|dbasclpy
dbasclpy| +|dflatline
dflatline|Deon588
Deon588|dleen
dleen|CW-B-W
CW-B-W|chadgauth
chadgauth|thecolorblue
thecolorblue| +|bogdan0083
bogdan0083|benashby
benashby|Atlogit
Atlogit|atlasgong
atlasgong|AntiMoron
AntiMoron|andrewshu2000
andrewshu2000| +|andreastempsch
andreastempsch|alasano
alasano|QuinsZouls
QuinsZouls|HadesArchitect
HadesArchitect|alarno
alarno|nexon33
nexon33| +|adilhafeez
adilhafeez|adamwlarson
adamwlarson|adamhill
adamhill|AMHesch
AMHesch|adambrand
adambrand|samsilveira
samsilveira| +|01Rian
01Rian|RSO
RSO|RandalSchwartz
RandalSchwartz|SECKainersdorfer
SECKainersdorfer|R-omk
R-omk|Sarke
Sarke| +|PaperBoardOfficial
PaperBoardOfficial|OlegOAndreev
OlegOAndreev|Naam
Naam|NaccOll
NaccOll|kvokka
kvokka|ecmasx
ecmasx| +|mollux
mollux|marvijo-code
marvijo-code|markijbema
markijbema|mamertofabian
mamertofabian|monkeyDluffy6017
monkeyDluffy6017|libertyteeth
libertyteeth| +|shtse8
shtse8|Rexarrior
Rexarrior|kevinvandijk
kevinvandijk|KevinZhao
KevinZhao|ksze
ksze|Juice10
Juice10| +|snova-jorgep
snova-jorgep|Fovty
Fovty|Jdo300
Jdo300|hesara
hesara|DeXtroTip
DeXtroTip| | ## 授權 From 38c6c7a101a8552a422ccc881dddee91031c99a5 Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Wed, 30 Jul 2025 22:23:51 -0400 Subject: [PATCH 016/253] feat: add zai-org/GLM-4.5-FP8 model to Chutes AI provider (#6441) Co-authored-by: Roo Code --- packages/types/src/providers/chutes.ts | 11 +++++++++++ src/api/providers/__tests__/chutes.spec.ts | 23 ++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/packages/types/src/providers/chutes.ts b/packages/types/src/providers/chutes.ts index 98a2f4f360..95946122a3 100644 --- a/packages/types/src/providers/chutes.ts +++ b/packages/types/src/providers/chutes.ts @@ -26,6 +26,7 @@ export type ChutesModelId = | "microsoft/MAI-DS-R1-FP8" | "tngtech/DeepSeek-R1T-Chimera" | "zai-org/GLM-4.5-Air" + | "zai-org/GLM-4.5-FP8" export const chutesDefaultModelId: ChutesModelId = "deepseek-ai/DeepSeek-R1-0528" @@ -247,4 +248,14 @@ export const chutesModels = { description: "GLM-4.5-Air model with 151,329 token context window and 106B total parameters with 12B activated.", }, + "zai-org/GLM-4.5-FP8": { + maxTokens: 32768, + contextWindow: 131072, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0, + outputPrice: 0, + description: + "GLM-4.5-FP8 model with 128k token context window, optimized for agent-based applications with MoE architecture.", + }, } as const satisfies Record diff --git a/src/api/providers/__tests__/chutes.spec.ts b/src/api/providers/__tests__/chutes.spec.ts index 35cb183dae..911c848b12 100644 --- a/src/api/providers/__tests__/chutes.spec.ts +++ b/src/api/providers/__tests__/chutes.spec.ts @@ -208,6 +208,29 @@ describe("ChutesHandler", () => { ) }) + it("should return zai-org/GLM-4.5-FP8 model with correct configuration", () => { + const testModelId: ChutesModelId = "zai-org/GLM-4.5-FP8" + const handlerWithModel = new ChutesHandler({ + apiModelId: testModelId, + chutesApiKey: "test-chutes-api-key", + }) + const model = handlerWithModel.getModel() + expect(model.id).toBe(testModelId) + expect(model.info).toEqual( + expect.objectContaining({ + maxTokens: 32768, + contextWindow: 131072, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0, + outputPrice: 0, + description: + "GLM-4.5-FP8 model with 128k token context window, optimized for agent-based applications with MoE architecture.", + temperature: 0.5, // Default temperature for non-DeepSeek models + }), + ) + }) + it("completePrompt method should return text from Chutes API", async () => { const expectedResponse = "This is a test response from Chutes" mockCreate.mockResolvedValueOnce({ choices: [{ message: { content: expectedResponse } }] }) From ccd8ab9ffccbcddc8931ed6f4166da87f82d7a2a Mon Sep 17 00:00:00 2001 From: Daniel <57051444+daniel-lxs@users.noreply.github.com> Date: Wed, 30 Jul 2025 21:24:43 -0500 Subject: [PATCH 017/253] Fix: Kill button for execute_command tool (#6457) --- .../terminal/ExecaTerminalProcess.ts | 87 +++++++++++++++---- 1 file changed, 72 insertions(+), 15 deletions(-) diff --git a/src/integrations/terminal/ExecaTerminalProcess.ts b/src/integrations/terminal/ExecaTerminalProcess.ts index 1c48d88aa6..2f8ebfa7a8 100644 --- a/src/integrations/terminal/ExecaTerminalProcess.ts +++ b/src/integrations/terminal/ExecaTerminalProcess.ts @@ -9,6 +9,8 @@ export class ExecaTerminalProcess extends BaseTerminalProcess { private terminalRef: WeakRef private aborted = false private pid?: number + private subprocess?: ReturnType + private pidUpdatePromise?: Promise constructor(terminal: RooTerminal) { super() @@ -36,7 +38,7 @@ export class ExecaTerminalProcess extends BaseTerminalProcess { try { this.isHot = true - const subprocess = execa({ + this.subprocess = execa({ shell: true, cwd: this.terminal.getCurrentWorkingDirectory(), all: true, @@ -48,9 +50,37 @@ export class ExecaTerminalProcess extends BaseTerminalProcess { }, })`${command}` - this.pid = subprocess.pid - const stream = subprocess.iterable({ from: "all", preserveNewlines: true }) - this.terminal.setActiveStream(stream, subprocess.pid) + this.pid = this.subprocess.pid + + // When using shell: true, the PID is for the shell, not the actual command + // Find the actual command PID after a small delay + if (this.pid) { + this.pidUpdatePromise = new Promise((resolve) => { + setTimeout(() => { + psTree(this.pid!, (err, children) => { + if (!err && children.length > 0) { + // Update PID to the first child (the actual command) + const actualPid = parseInt(children[0].PID) + if (!isNaN(actualPid)) { + this.pid = actualPid + } + } + resolve() + }) + }, 100) + }) + } + + const rawStream = this.subprocess.iterable({ from: "all", preserveNewlines: true }) + + // Wrap the stream to ensure all chunks are strings (execa can return Uint8Array) + const stream = (async function* () { + for await (const chunk of rawStream) { + yield typeof chunk === "string" ? chunk : new TextDecoder().decode(chunk) + } + })() + + this.terminal.setActiveStream(stream, this.pid) for await (const line of stream) { if (this.aborted) { @@ -77,7 +107,7 @@ export class ExecaTerminalProcess extends BaseTerminalProcess { timeoutId = setTimeout(() => { try { - subprocess.kill("SIGKILL") + this.subprocess?.kill("SIGKILL") } catch (e) {} resolve() @@ -85,7 +115,7 @@ export class ExecaTerminalProcess extends BaseTerminalProcess { }) try { - await Promise.race([subprocess, kill]) + await Promise.race([this.subprocess, kill]) } catch (error) { console.log( `[ExecaTerminalProcess#run] subprocess termination error: ${error instanceof Error ? error.message : String(error)}`, @@ -109,6 +139,7 @@ export class ExecaTerminalProcess extends BaseTerminalProcess { this.emit("shell_execution_complete", { exitCode: 1 }) } + this.subprocess = undefined } this.terminal.setActiveStream(undefined) @@ -116,6 +147,7 @@ export class ExecaTerminalProcess extends BaseTerminalProcess { this.stopHotTimer() this.emit("completed", this.fullOutput) this.emit("continue") + this.subprocess = undefined } public override continue() { @@ -127,7 +159,41 @@ export class ExecaTerminalProcess extends BaseTerminalProcess { public override abort() { this.aborted = true + // Function to perform the kill operations + const performKill = () => { + // Try to kill using the subprocess object + if (this.subprocess) { + try { + this.subprocess.kill("SIGKILL") + } catch (e) { + console.warn( + `[ExecaTerminalProcess#abort] Failed to kill subprocess: ${e instanceof Error ? e.message : String(e)}`, + ) + } + } + + // Kill the stored PID (which should be the actual command after our update) + if (this.pid) { + try { + process.kill(this.pid, "SIGKILL") + } catch (e) { + console.warn( + `[ExecaTerminalProcess#abort] Failed to kill process ${this.pid}: ${e instanceof Error ? e.message : String(e)}`, + ) + } + } + } + + // If PID update is in progress, wait for it before killing + if (this.pidUpdatePromise) { + this.pidUpdatePromise.then(performKill).catch(() => performKill()) + } else { + performKill() + } + + // Continue with the rest of the abort logic if (this.pid) { + // Also check for any child processes psTree(this.pid, async (err, children) => { if (!err) { const pids = children.map((p) => parseInt(p.PID)) @@ -148,15 +214,6 @@ export class ExecaTerminalProcess extends BaseTerminalProcess { ) } }) - - try { - console.error(`[ExecaTerminalProcess#abort] SIGKILL parent -> ${this.pid}`) - process.kill(this.pid, "SIGKILL") - } catch (e) { - console.warn( - `[ExecaTerminalProcess#abort] Failed to send SIGKILL to main PID ${this.pid}: ${e instanceof Error ? e.message : String(e)}`, - ) - } } } From 4d9cf8f721cfb0f3d89a7b0858e125f7ae5cff05 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 30 Jul 2025 22:49:19 -0400 Subject: [PATCH 018/253] fix(deps): update dependency recharts to v2.15.4 (#4971) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- pnpm-lock.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c70669d452..ffb499d57c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -295,7 +295,7 @@ importers: version: 5.5.0(react@18.3.1) recharts: specifier: ^2.15.3 - version: 2.15.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 2.15.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) tailwind-merge: specifier: ^3.3.0 version: 3.3.0 @@ -8254,8 +8254,8 @@ packages: recharts-scale@0.4.5: resolution: {integrity: sha512-kivNFO+0OcUNu7jQquLXAxz1FIwZj8nrj+YkOKc5694NbjCvcT6aSZiIzNzd2Kul4o4rTto8QVR9lMNtxD4G1w==} - recharts@2.15.3: - resolution: {integrity: sha512-EdOPzTwcFSuqtvkDoaM5ws/Km1+WTAO2eizL7rqiG0V2UVhTnz0m7J2i0CjVPUCdEkZImaWvXLbZDS2H5t6GFQ==} + recharts@2.15.4: + resolution: {integrity: sha512-UT/q6fwS3c1dHbXv2uFgYJ9BMFHu3fwnd7AYZaEQhXuYQ4hgsxLvsUXzGdKeZrW5xopzDCvuA2N41WJ88I7zIw==} engines: {node: '>=14'} peerDependencies: react: ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 @@ -18252,7 +18252,7 @@ snapshots: dependencies: decimal.js-light: 2.5.1 - recharts@2.15.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + recharts@2.15.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: clsx: 2.1.1 eventemitter3: 4.0.7 From b7410dce8cf2c9b577a5eca994d348aa081c9199 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 30 Jul 2025 22:49:35 -0400 Subject: [PATCH 019/253] chore(deps): update dependency lint-staged to v16.1.2 (#4965) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- pnpm-lock.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ffb499d57c..3e7bb79b64 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -39,7 +39,7 @@ importers: version: 5.60.2(@types/node@22.15.29)(typescript@5.8.3) lint-staged: specifier: ^16.0.0 - version: 16.1.0 + version: 16.1.2 mkdirp: specifier: ^3.0.1 version: 3.0.1 @@ -6891,8 +6891,8 @@ packages: linkify-it@5.0.0: resolution: {integrity: sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==} - lint-staged@16.1.0: - resolution: {integrity: sha512-HkpQh69XHxgCjObjejBT3s2ILwNjFx8M3nw+tJ/ssBauDlIpkx2RpqWSi1fBgkXLSSXnbR3iEq1NkVtpvV+FLQ==} + lint-staged@16.1.2: + resolution: {integrity: sha512-sQKw2Si2g9KUZNY3XNvRuDq4UJqpHwF0/FQzZR2M7I5MvtpWvibikCjUVJzZdGE0ByurEl3KQNvsGetd1ty1/Q==} engines: {node: '>=20.17'} hasBin: true @@ -16544,7 +16544,7 @@ snapshots: dependencies: uc.micro: 2.1.0 - lint-staged@16.1.0: + lint-staged@16.1.2: dependencies: chalk: 5.4.1 commander: 14.0.0 From 01f5320b4d4179779c4e1740888d1c3e8defdeff Mon Sep 17 00:00:00 2001 From: KJ7LNW <93454819+KJ7LNW@users.noreply.github.com> Date: Wed, 30 Jul 2025 19:53:06 -0700 Subject: [PATCH 020/253] fix: Remove misleading task resumption message (#5851) Co-authored-by: Eric Wheeler Co-authored-by: Daniel Riccio --- src/core/task/Task.ts | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/src/core/task/Task.ts b/src/core/task/Task.ts index 38c67b5021..9d68640fd8 100644 --- a/src/core/task/Task.ts +++ b/src/core/task/Task.ts @@ -1170,32 +1170,26 @@ export class Task extends EventEmitter { return "just now" })() - const lastTaskResumptionIndex = newUserContent.findIndex( - (x) => x.type === "text" && x.text.startsWith("[TASK RESUMPTION]"), - ) - if (lastTaskResumptionIndex !== -1) { - newUserContent.splice(lastTaskResumptionIndex, newUserContent.length - lastTaskResumptionIndex) + if (responseText) { + newUserContent.push({ + type: "text", + text: `\n\nNew instructions for task continuation:\n\n${responseText}\n`, + }) } - const wasRecent = lastClineMessage?.ts && Date.now() - lastClineMessage.ts < 30_000 - - newUserContent.push({ - type: "text", - text: - `[TASK RESUMPTION] This task was interrupted ${agoText}. It may or may not be complete, so please reassess the task context. Be aware that the project state may have changed since then. If the task has not been completed, retry the last step before interruption and proceed with completing the task.\n\nNote: If you previously attempted a tool use that the user did not provide a result for, you should assume the tool use was not successful and assess whether you should retry. If the last tool was a browser_action, the browser has been closed and you must launch a new browser if needed.${ - wasRecent - ? "\n\nIMPORTANT: If the last tool use was a write_to_file that was interrupted, the file was reverted back to its original state before the interrupted edit, and you do NOT need to re-read the file as you already have its up-to-date contents." - : "" - }` + - (responseText - ? `\n\nNew instructions for task continuation:\n\n${responseText}\n` - : ""), - }) - if (responseImages && responseImages.length > 0) { newUserContent.push(...formatResponse.imageBlocks(responseImages)) } + // Ensure we have at least some content to send to the API + // If newUserContent is empty, add a minimal resumption message + if (newUserContent.length === 0) { + newUserContent.push({ + type: "text", + text: "[TASK RESUMPTION] Resuming task...", + }) + } + await this.overwriteApiConversationHistory(modifiedApiConversationHistory) console.log(`[subtasks] task ${this.taskId}.${this.instanceId} resuming from history item`) From c47e85704808b8afa49be831dd56bdb9a86bc9f7 Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Wed, 30 Jul 2025 23:27:18 -0400 Subject: [PATCH 021/253] feat: set horizon-alpha model max tokens to 32k for OpenRouter (#6470) Co-authored-by: Roo Code --- .../fetchers/__tests__/openrouter.spec.ts | 50 ++++++++++++++++++- src/api/providers/fetchers/openrouter.ts | 5 ++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/src/api/providers/fetchers/__tests__/openrouter.spec.ts b/src/api/providers/fetchers/__tests__/openrouter.spec.ts index f0ebead30f..e1f8d64acd 100644 --- a/src/api/providers/fetchers/__tests__/openrouter.spec.ts +++ b/src/api/providers/fetchers/__tests__/openrouter.spec.ts @@ -11,7 +11,7 @@ import { OPEN_ROUTER_REQUIRED_REASONING_BUDGET_MODELS, } from "@roo-code/types" -import { getOpenRouterModelEndpoints, getOpenRouterModels } from "../openrouter" +import { getOpenRouterModelEndpoints, getOpenRouterModels, parseOpenRouterModel } from "../openrouter" nockBack.fixtures = path.join(__dirname, "fixtures") nockBack.setMode("lockdown") @@ -251,4 +251,52 @@ describe("OpenRouter API", () => { nockDone() }) }) + + describe("parseOpenRouterModel", () => { + it("sets horizon-alpha model to 32k max tokens", () => { + const mockModel = { + name: "Horizon Alpha", + description: "Test model", + context_length: 128000, + max_completion_tokens: 128000, + pricing: { + prompt: "0.000003", + completion: "0.000015", + }, + } + + const result = parseOpenRouterModel({ + id: "openrouter/horizon-alpha", + model: mockModel, + modality: "text", + maxTokens: 128000, + }) + + expect(result.maxTokens).toBe(32768) + expect(result.contextWindow).toBe(128000) + }) + + it("does not override max tokens for other models", () => { + const mockModel = { + name: "Other Model", + description: "Test model", + context_length: 128000, + max_completion_tokens: 64000, + pricing: { + prompt: "0.000003", + completion: "0.000015", + }, + } + + const result = parseOpenRouterModel({ + id: "openrouter/other-model", + model: mockModel, + modality: "text", + maxTokens: 64000, + }) + + expect(result.maxTokens).toBe(64000) + expect(result.contextWindow).toBe(128000) + }) + }) }) diff --git a/src/api/providers/fetchers/openrouter.ts b/src/api/providers/fetchers/openrouter.ts index 027f8c54fb..34e2ec595f 100644 --- a/src/api/providers/fetchers/openrouter.ts +++ b/src/api/providers/fetchers/openrouter.ts @@ -232,5 +232,10 @@ export const parseOpenRouterModel = ({ modelInfo.maxTokens = anthropicModels["claude-3-7-sonnet-20250219:thinking"].maxTokens } + // Set horizon-alpha model to 32k max tokens + if (id === "openrouter/horizon-alpha") { + modelInfo.maxTokens = 32768 + } + return modelInfo } From d70adaced9be51976fbac2a6b913a505d4de60c2 Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Wed, 30 Jul 2025 23:37:42 -0400 Subject: [PATCH 022/253] Revert experiments with nightly marketplace config (#6472) --- CHANGELOG-NIGHTLY.md | 1 - apps/vscode-nightly/esbuild.mjs | 4 ++-- apps/vscode-nightly/package.nightly.json | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 CHANGELOG-NIGHTLY.md diff --git a/CHANGELOG-NIGHTLY.md b/CHANGELOG-NIGHTLY.md deleted file mode 100644 index 72fd331162..0000000000 --- a/CHANGELOG-NIGHTLY.md +++ /dev/null @@ -1 +0,0 @@ -changelog-test diff --git a/apps/vscode-nightly/esbuild.mjs b/apps/vscode-nightly/esbuild.mjs index 842f858090..e45dbd3c3e 100644 --- a/apps/vscode-nightly/esbuild.mjs +++ b/apps/vscode-nightly/esbuild.mjs @@ -63,8 +63,8 @@ async function main() { build.onEnd(() => { copyPaths( [ - ["../README.vscode.md", "README.md"], - ["../CHANGELOG-NIGHTLY.md", "CHANGELOG.md"], + ["../README.md", "README.md"], + ["../CHANGELOG.md", "CHANGELOG.md"], ["../LICENSE", "LICENSE"], ["../.env", ".env", { optional: true }], [".vscodeignore", ".vscodeignore"], diff --git a/apps/vscode-nightly/package.nightly.json b/apps/vscode-nightly/package.nightly.json index 971bc2ff7d..94bc2c8b67 100644 --- a/apps/vscode-nightly/package.nightly.json +++ b/apps/vscode-nightly/package.nightly.json @@ -2,6 +2,5 @@ "name": "roo-code-nightly", "version": "0.0.1", "icon": "assets/icons/icon-nightly.png", - "scripts": {}, - "contributes": {} + "scripts": {} } From f04e7b0cc5de303c7560d800e7d0dbcad3b6da4f Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Thu, 31 Jul 2025 00:08:06 -0400 Subject: [PATCH 023/253] Release v3.25.4 (#6473) --- .changeset/v3.25.4.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .changeset/v3.25.4.md diff --git a/.changeset/v3.25.4.md b/.changeset/v3.25.4.md new file mode 100644 index 0000000000..1be61cb531 --- /dev/null +++ b/.changeset/v3.25.4.md @@ -0,0 +1,16 @@ +--- +"roo-cline": patch +--- + +- feat: add SambaNova provider integration (#6077 by @snova-jorgep, PR by @snova-jorgep) +- feat: add Doubao provider integration (thanks @AntiMoron!) +- feat: set horizon-alpha model max tokens to 32k for OpenRouter (thanks @app/roomote!) +- feat: add zai-org/GLM-4.5-FP8 model to Chutes AI provider (#6440 by @leakless21, PR by @app/roomote) +- feat: add symlink support for AGENTS.md file loading (thanks @app/roomote!) +- feat: optionally add task history context to prompt enhancement (thanks @liwilliam2021!) +- fix: remove misleading task resumption message (#5850 by @KJ7LNW, PR by @KJ7LNW) +- feat: add pattern to support Databricks /invocations endpoints (thanks @adambrand!) +- fix: resolve navigator global error by updating mammoth and bluebird dependencies (#6356 by @hishtadlut, PR by @app/roomote) +- feat: enhance token counting by extracting text from messages using VSCode LM API (#6112 by @sebinseban, PR by @NaccOll) +- feat: auto-refresh marketplace data when organization settings change (thanks @app/roomote!) +- fix: kill button for execute_command tool (thanks @daniel-lxs!) From 2f8fd889a52d83d588f9e958476ed5b8dd211a91 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 31 Jul 2025 00:13:50 -0400 Subject: [PATCH 024/253] Changeset version bump (#6474) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens --- .changeset/v3.25.4.md | 16 ---------------- CHANGELOG.md | 15 +++++++++++++++ src/package.json | 2 +- 3 files changed, 16 insertions(+), 17 deletions(-) delete mode 100644 .changeset/v3.25.4.md diff --git a/.changeset/v3.25.4.md b/.changeset/v3.25.4.md deleted file mode 100644 index 1be61cb531..0000000000 --- a/.changeset/v3.25.4.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -"roo-cline": patch ---- - -- feat: add SambaNova provider integration (#6077 by @snova-jorgep, PR by @snova-jorgep) -- feat: add Doubao provider integration (thanks @AntiMoron!) -- feat: set horizon-alpha model max tokens to 32k for OpenRouter (thanks @app/roomote!) -- feat: add zai-org/GLM-4.5-FP8 model to Chutes AI provider (#6440 by @leakless21, PR by @app/roomote) -- feat: add symlink support for AGENTS.md file loading (thanks @app/roomote!) -- feat: optionally add task history context to prompt enhancement (thanks @liwilliam2021!) -- fix: remove misleading task resumption message (#5850 by @KJ7LNW, PR by @KJ7LNW) -- feat: add pattern to support Databricks /invocations endpoints (thanks @adambrand!) -- fix: resolve navigator global error by updating mammoth and bluebird dependencies (#6356 by @hishtadlut, PR by @app/roomote) -- feat: enhance token counting by extracting text from messages using VSCode LM API (#6112 by @sebinseban, PR by @NaccOll) -- feat: auto-refresh marketplace data when organization settings change (thanks @app/roomote!) -- fix: kill button for execute_command tool (thanks @daniel-lxs!) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80dd3921c1..56b2ac7b6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # Roo Code Changelog +## [3.25.4] - 2025-07-30 + +- feat: add SambaNova provider integration (#6077 by @snova-jorgep, PR by @snova-jorgep) +- feat: add Doubao provider integration (thanks @AntiMoron!) +- feat: set horizon-alpha model max tokens to 32k for OpenRouter (thanks @app/roomote!) +- feat: add zai-org/GLM-4.5-FP8 model to Chutes AI provider (#6440 by @leakless21, PR by @app/roomote) +- feat: add symlink support for AGENTS.md file loading (thanks @app/roomote!) +- feat: optionally add task history context to prompt enhancement (thanks @liwilliam2021!) +- fix: remove misleading task resumption message (#5850 by @KJ7LNW, PR by @KJ7LNW) +- feat: add pattern to support Databricks /invocations endpoints (thanks @adambrand!) +- fix: resolve navigator global error by updating mammoth and bluebird dependencies (#6356 by @hishtadlut, PR by @app/roomote) +- feat: enhance token counting by extracting text from messages using VSCode LM API (#6112 by @sebinseban, PR by @NaccOll) +- feat: auto-refresh marketplace data when organization settings change (thanks @app/roomote!) +- fix: kill button for execute_command tool (thanks @daniel-lxs!) + ## [3.25.3] - 2025-07-30 - Allow queueing messages with images diff --git a/src/package.json b/src/package.json index 8503d2bdc6..d29a00e80b 100644 --- a/src/package.json +++ b/src/package.json @@ -3,7 +3,7 @@ "displayName": "%extension.displayName%", "description": "%extension.description%", "publisher": "RooVeterinaryInc", - "version": "3.25.3", + "version": "3.25.4", "icon": "assets/icons/icon.png", "galleryBanner": { "color": "#617A91", From e13083e5325b0638feedafb172a5364b369e4792 Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Thu, 31 Jul 2025 01:21:19 -0400 Subject: [PATCH 025/253] Skip interpolation for non-existent slash commands (#6475) Co-authored-by: Roo Code Co-authored-by: Matt Rubens --- src/__tests__/command-mentions.spec.ts | 77 ++++++++++++++++++++++---- src/core/mentions/index.ts | 58 ++++++++++++------- 2 files changed, 104 insertions(+), 31 deletions(-) diff --git a/src/__tests__/command-mentions.spec.ts b/src/__tests__/command-mentions.spec.ts index d4de0bbba7..b120f3720c 100644 --- a/src/__tests__/command-mentions.spec.ts +++ b/src/__tests__/command-mentions.spec.ts @@ -62,16 +62,31 @@ describe("Command Mentions", () => { }) it("should handle multiple commands in message", async () => { + const setupContent = "# Setup Environment\n\nRun the following commands:\n```bash\nnpm install\n```" + const deployContent = "# Deploy Environment\n\nRun the following commands:\n```bash\nnpm run deploy\n```" + mockGetCommand .mockResolvedValueOnce({ name: "setup", - content: "# Setup instructions", + content: setupContent, source: "project", filePath: "/project/.roo/commands/setup.md", }) .mockResolvedValueOnce({ name: "deploy", - content: "# Deploy instructions", + content: deployContent, + source: "project", + filePath: "/project/.roo/commands/deploy.md", + }) + .mockResolvedValueOnce({ + name: "setup", + content: setupContent, + source: "project", + filePath: "/project/.roo/commands/setup.md", + }) + .mockResolvedValueOnce({ + name: "deploy", + content: deployContent, source: "project", filePath: "/project/.roo/commands/deploy.md", }) @@ -82,33 +97,55 @@ describe("Command Mentions", () => { expect(mockGetCommand).toHaveBeenCalledWith("/test/cwd", "setup") expect(mockGetCommand).toHaveBeenCalledWith("/test/cwd", "deploy") - expect(mockGetCommand).toHaveBeenCalledTimes(2) // Both commands called + expect(mockGetCommand).toHaveBeenCalledTimes(2) // Each unique command called once (optimized) expect(result).toContain('') - expect(result).toContain("# Setup instructions") + expect(result).toContain("# Setup Environment") expect(result).toContain('') - expect(result).toContain("# Deploy instructions") + expect(result).toContain("# Deploy Environment") }) - it("should handle non-existent command gracefully", async () => { + it("should leave non-existent commands unchanged", async () => { + mockGetCommand.mockReset() mockGetCommand.mockResolvedValue(undefined) const input = "/nonexistent command" const result = await callParseMentions(input) expect(mockGetCommand).toHaveBeenCalledWith("/test/cwd", "nonexistent") - expect(result).toContain('') - expect(result).toContain("Command 'nonexistent' not found") - expect(result).toContain("") + // The command should remain unchanged in the text + expect(result).toBe("/nonexistent command") + // Should not contain any command tags + expect(result).not.toContain('') + expect(result).not.toContain("Command 'nonexistent' not found") }) - it("should handle command loading errors", async () => { + it("should handle command loading errors during existence check", async () => { + mockGetCommand.mockReset() mockGetCommand.mockRejectedValue(new Error("Failed to load command")) const input = "/error-command test" const result = await callParseMentions(input) + // When getCommand throws an error during existence check, + // the command is treated as non-existent and left unchanged + expect(result).toBe("/error-command test") + expect(result).not.toContain('') + }) + + it("should handle command loading errors during processing", async () => { + // With optimization, command is loaded once and cached + mockGetCommand.mockResolvedValue({ + name: "error-command", + content: "# Error command", + source: "project", + filePath: "/project/.roo/commands/error-command.md", + }) + + const input = "/error-command test" + const result = await callParseMentions(input) + expect(result).toContain('') - expect(result).toContain("Error loading command") + expect(result).toContain("# Error command") expect(result).toContain("") }) @@ -246,13 +283,29 @@ npm install }) describe("command mention text transformation", () => { - it("should transform command mentions at start of message", async () => { + it("should transform existing command mentions at start of message", async () => { + mockGetCommand.mockResolvedValue({ + name: "setup", + content: "# Setup instructions", + source: "project", + filePath: "/project/.roo/commands/setup.md", + }) + const input = "/setup the project" const result = await callParseMentions(input) expect(result).toContain("Command 'setup' (see below for command content)") }) + it("should leave non-existent command mentions unchanged", async () => { + mockGetCommand.mockResolvedValue(undefined) + + const input = "/nonexistent the project" + const result = await callParseMentions(input) + + expect(result).toBe("/nonexistent the project") + }) + it("should process multiple commands in message", async () => { mockGetCommand .mockResolvedValueOnce({ diff --git a/src/core/mentions/index.ts b/src/core/mentions/index.ts index b6a9dd4d0d..ed3060859b 100644 --- a/src/core/mentions/index.ts +++ b/src/core/mentions/index.ts @@ -18,7 +18,7 @@ import { UrlContentFetcher } from "../../services/browser/UrlContentFetcher" import { FileContextTracker } from "../context-tracking/FileContextTracker" import { RooIgnoreController } from "../ignore/RooIgnoreController" -import { getCommand } from "../../services/command/commands" +import { getCommand, type Command } from "../../services/command/commands" import { t } from "../../i18n" @@ -86,13 +86,38 @@ export async function parseMentions( maxReadFileLine?: number, ): Promise { const mentions: Set = new Set() - const commandMentions: Set = new Set() + const validCommands: Map = new Map() - // First pass: extract command mentions (starting with /) - let parsedText = text.replace(commandRegexGlobal, (match, commandName) => { - commandMentions.add(commandName) - return `Command '${commandName}' (see below for command content)` - }) + // First pass: check which command mentions exist and cache the results + const commandMatches = Array.from(text.matchAll(commandRegexGlobal)) + const uniqueCommandNames = new Set(commandMatches.map(([, commandName]) => commandName)) + + const commandExistenceChecks = await Promise.all( + Array.from(uniqueCommandNames).map(async (commandName) => { + try { + const command = await getCommand(cwd, commandName) + return { commandName, command } + } catch (error) { + // If there's an error checking command existence, treat it as non-existent + return { commandName, command: undefined } + } + }), + ) + + // Store valid commands for later use + for (const { commandName, command } of commandExistenceChecks) { + if (command) { + validCommands.set(commandName, command) + } + } + + // Only replace text for commands that actually exist + let parsedText = text + for (const [match, commandName] of commandMatches) { + if (validCommands.has(commandName)) { + parsedText = parsedText.replace(match, `Command '${commandName}' (see below for command content)`) + } + } // Second pass: handle regular mentions parsedText = parsedText.replace(mentionRegexGlobal, (match, mention) => { @@ -213,20 +238,15 @@ export async function parseMentions( } } - // Process command mentions - for (const commandName of commandMentions) { + // Process valid command mentions using cached results + for (const [commandName, command] of validCommands) { try { - const command = await getCommand(cwd, commandName) - if (command) { - let commandOutput = "" - if (command.description) { - commandOutput += `Description: ${command.description}\n\n` - } - commandOutput += command.content - parsedText += `\n\n\n${commandOutput}\n` - } else { - parsedText += `\n\n\nCommand '${commandName}' not found. Available commands can be found in .roo/commands/ or ~/.roo/commands/\n` + let commandOutput = "" + if (command.description) { + commandOutput += `Description: ${command.description}\n\n` } + commandOutput += command.content + parsedText += `\n\n\n${commandOutput}\n` } catch (error) { parsedText += `\n\n\nError loading command '${commandName}': ${error.message}\n` } From 816dc75681defc9c2fd0945000ed065584dceda8 Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Thu, 31 Jul 2025 10:45:16 -0400 Subject: [PATCH 026/253] fix: improve Claude Code ENOENT error handling with installation guidance (#5867) Co-authored-by: Roo Code --- src/i18n/locales/ca/common.json | 3 +- src/i18n/locales/de/common.json | 3 +- src/i18n/locales/en/common.json | 3 +- src/i18n/locales/es/common.json | 3 +- src/i18n/locales/fr/common.json | 7 +- src/i18n/locales/hi/common.json | 9 +- src/i18n/locales/id/common.json | 9 +- src/i18n/locales/it/common.json | 9 +- src/i18n/locales/ja/common.json | 9 +- src/i18n/locales/ko/common.json | 9 +- src/i18n/locales/nl/common.json | 9 +- src/i18n/locales/pl/common.json | 9 +- src/i18n/locales/pt-BR/common.json | 9 +- src/i18n/locales/ru/common.json | 9 +- src/i18n/locales/tr/common.json | 9 +- src/i18n/locales/vi/common.json | 9 +- src/i18n/locales/zh-CN/common.json | 9 +- src/i18n/locales/zh-TW/common.json | 3 +- .../claude-code/__tests__/run.spec.ts | 231 ++++++++++++++++++ src/integrations/claude-code/run.ts | 53 +++- 20 files changed, 355 insertions(+), 59 deletions(-) diff --git a/src/i18n/locales/ca/common.json b/src/i18n/locales/ca/common.json index 0fba764080..394c08dbd7 100644 --- a/src/i18n/locales/ca/common.json +++ b/src/i18n/locales/ca/common.json @@ -86,7 +86,8 @@ "errorOutput": "Sortida d'error: {{output}}", "processExitedWithError": "El procés Claude Code ha sortit amb codi {{exitCode}}. Sortida d'error: {{output}}", "stoppedWithReason": "Claude Code s'ha aturat per la raó: {{reason}}", - "apiKeyModelPlanMismatch": "Les claus API i els plans de subscripció permeten models diferents. Assegura't que el model seleccionat estigui inclòs al teu pla." + "apiKeyModelPlanMismatch": "Les claus API i els plans de subscripció permeten models diferents. Assegura't que el model seleccionat estigui inclòs al teu pla.", + "notFound": "No s'ha trobat l'executable Claude Code '{{claudePath}}'.\n\nInstal·la Claude Code CLI:\n1. Visita {{installationUrl}} per descarregar Claude Code\n2. Segueix les instruccions d'instal·lació per al teu sistema operatiu\n3. Assegura't que la comanda 'claude' estigui disponible al teu PATH\n4. Alternativament, configura una ruta personalitzada a la configuració de Roo sota 'Ruta de Claude Code'\n\nError original: {{originalError}}" }, "gemini": { "generate_stream": "Error del flux de context de generació de Gemini: {{error}}", diff --git a/src/i18n/locales/de/common.json b/src/i18n/locales/de/common.json index 1c60189b2f..0e51a1644d 100644 --- a/src/i18n/locales/de/common.json +++ b/src/i18n/locales/de/common.json @@ -83,7 +83,8 @@ "errorOutput": "Fehlerausgabe: {{output}}", "processExitedWithError": "Claude Code Prozess wurde mit Code {{exitCode}} beendet. Fehlerausgabe: {{output}}", "stoppedWithReason": "Claude Code wurde mit Grund gestoppt: {{reason}}", - "apiKeyModelPlanMismatch": "API-Schlüssel und Abonnement-Pläne erlauben verschiedene Modelle. Stelle sicher, dass das ausgewählte Modell in deinem Plan enthalten ist." + "apiKeyModelPlanMismatch": "API-Schlüssel und Abonnement-Pläne erlauben verschiedene Modelle. Stelle sicher, dass das ausgewählte Modell in deinem Plan enthalten ist.", + "notFound": "Claude Code ausführbare Datei '{{claudePath}}' nicht gefunden.\n\nBitte installiere Claude Code CLI:\n1. Besuche {{installationUrl}} um Claude Code herunterzuladen\n2. Folge den Installationsanweisungen für dein Betriebssystem\n3. Stelle sicher, dass der 'claude' Befehl in deinem PATH verfügbar ist\n4. Alternativ konfiguriere einen benutzerdefinierten Pfad in den Roo-Einstellungen unter 'Claude Code Pfad'\n\nUrsprünglicher Fehler: {{originalError}}" }, "gemini": { "generate_stream": "Fehler beim Generieren des Kontext-Streams von Gemini: {{error}}", diff --git a/src/i18n/locales/en/common.json b/src/i18n/locales/en/common.json index 114e129f45..57454cbfe6 100644 --- a/src/i18n/locales/en/common.json +++ b/src/i18n/locales/en/common.json @@ -83,7 +83,8 @@ "errorOutput": "Error output: {{output}}", "processExitedWithError": "Claude Code process exited with code {{exitCode}}. Error output: {{output}}", "stoppedWithReason": "Claude Code stopped with reason: {{reason}}", - "apiKeyModelPlanMismatch": "API keys and subscription plans allow different models. Make sure the selected model is included in your plan." + "apiKeyModelPlanMismatch": "API keys and subscription plans allow different models. Make sure the selected model is included in your plan.", + "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { "generate_stream": "Gemini generate context stream error: {{error}}", diff --git a/src/i18n/locales/es/common.json b/src/i18n/locales/es/common.json index 62ab4dcb6e..32ae5f284e 100644 --- a/src/i18n/locales/es/common.json +++ b/src/i18n/locales/es/common.json @@ -83,7 +83,8 @@ "errorOutput": "Salida de error: {{output}}", "processExitedWithError": "El proceso de Claude Code terminó con código {{exitCode}}. Salida de error: {{output}}", "stoppedWithReason": "Claude Code se detuvo por la razón: {{reason}}", - "apiKeyModelPlanMismatch": "Las claves API y los planes de suscripción permiten diferentes modelos. Asegúrate de que el modelo seleccionado esté incluido en tu plan." + "apiKeyModelPlanMismatch": "Las claves API y los planes de suscripción permiten diferentes modelos. Asegúrate de que el modelo seleccionado esté incluido en tu plan.", + "notFound": "Ejecutable de Claude Code '{{claudePath}}' no encontrado.\n\nPor favor instala Claude Code CLI:\n1. Visita {{installationUrl}} para descargar Claude Code\n2. Sigue las instrucciones de instalación para tu sistema operativo\n3. Asegúrate de que el comando 'claude' esté disponible en tu PATH\n4. Alternativamente, configura una ruta personalizada en la configuración de Roo bajo 'Ruta de Claude Code'\n\nError original: {{originalError}}" }, "gemini": { "generate_stream": "Error del stream de contexto de generación de Gemini: {{error}}", diff --git a/src/i18n/locales/fr/common.json b/src/i18n/locales/fr/common.json index aae4d5d7b1..3f256a3488 100644 --- a/src/i18n/locales/fr/common.json +++ b/src/i18n/locales/fr/common.json @@ -83,11 +83,12 @@ "errorOutput": "Sortie d'erreur : {{output}}", "processExitedWithError": "Le processus Claude Code s'est terminé avec le code {{exitCode}}. Sortie d'erreur : {{output}}", "stoppedWithReason": "Claude Code s'est arrêté pour la raison : {{reason}}", - "apiKeyModelPlanMismatch": "Les clés API et les plans d'abonnement permettent différents modèles. Assurez-vous que le modèle sélectionné est inclus dans votre plan." + "apiKeyModelPlanMismatch": "Les clés API et les plans d'abonnement permettent différents modèles. Assurez-vous que le modèle sélectionné est inclus dans votre plan.", + "notFound": "Exécutable Claude Code '{{claudePath}}' introuvable.\n\nVeuillez installer Claude Code CLI :\n1. Visitez {{installationUrl}} pour télécharger Claude Code\n2. Suivez les instructions d'installation pour votre système d'exploitation\n3. Assurez-vous que la commande 'claude' est disponible dans votre PATH\n4. Alternativement, configurez un chemin personnalisé dans les paramètres Roo sous 'Chemin de Claude Code'\n\nErreur originale : {{originalError}}" }, "gemini": { - "generate_stream": "Erreur du flux de contexte de génération Gemini : {{error}}", - "generate_complete_prompt": "Erreur d'achèvement de Gemini : {{error}}", + "generate_stream": "Erreur du flux de contexte de génération Gemini : {{error}}", + "generate_complete_prompt": "Erreur d'achèvement de Gemini : {{error}}", "sources": "Sources :" } }, diff --git a/src/i18n/locales/hi/common.json b/src/i18n/locales/hi/common.json index fae7c42be9..6ffc87a9eb 100644 --- a/src/i18n/locales/hi/common.json +++ b/src/i18n/locales/hi/common.json @@ -83,12 +83,13 @@ "errorOutput": "त्रुटि आउटपुट: {{output}}", "processExitedWithError": "Claude Code प्रक्रिया कोड {{exitCode}} के साथ समाप्त हुई। त्रुटि आउटपुट: {{output}}", "stoppedWithReason": "Claude Code इस कारण से रुका: {{reason}}", - "apiKeyModelPlanMismatch": "API कुंजी और सब्सक्रिप्शन प्लान अलग-अलग मॉडल की अनुमति देते हैं। सुनिश्चित करें कि चयनित मॉडल आपकी योजना में शामिल है।" + "apiKeyModelPlanMismatch": "API keys and subscription plans allow different models. Make sure the selected model is included in your plan.", + "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "जेमिनी जनरेट कॉन्टेक्स्ट स्ट्रीम त्रुटि: {{error}}", - "generate_complete_prompt": "जेमिनी समापन त्रुटि: {{error}}", - "sources": "स्रोत:" + "generate_stream": "Gemini generate context stream error: {{error}}", + "generate_complete_prompt": "Gemini completion error: {{error}}", + "sources": "Sources:" } }, "warnings": { diff --git a/src/i18n/locales/id/common.json b/src/i18n/locales/id/common.json index eb2db5ac84..fdd619ec4d 100644 --- a/src/i18n/locales/id/common.json +++ b/src/i18n/locales/id/common.json @@ -83,12 +83,13 @@ "errorOutput": "Output error: {{output}}", "processExitedWithError": "Proses Claude Code keluar dengan kode {{exitCode}}. Output error: {{output}}", "stoppedWithReason": "Claude Code berhenti karena alasan: {{reason}}", - "apiKeyModelPlanMismatch": "Kunci API dan paket berlangganan memungkinkan model yang berbeda. Pastikan model yang dipilih termasuk dalam paket Anda." + "apiKeyModelPlanMismatch": "API keys and subscription plans allow different models. Make sure the selected model is included in your plan.", + "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Kesalahan aliran konteks pembuatan Gemini: {{error}}", - "generate_complete_prompt": "Kesalahan penyelesaian Gemini: {{error}}", - "sources": "Sumber:" + "generate_stream": "Gemini generate context stream error: {{error}}", + "generate_complete_prompt": "Gemini completion error: {{error}}", + "sources": "Sources:" } }, "warnings": { diff --git a/src/i18n/locales/it/common.json b/src/i18n/locales/it/common.json index a7ef4b075a..92cbf64316 100644 --- a/src/i18n/locales/it/common.json +++ b/src/i18n/locales/it/common.json @@ -83,12 +83,13 @@ "errorOutput": "Output di errore: {{output}}", "processExitedWithError": "Il processo Claude Code è terminato con codice {{exitCode}}. Output di errore: {{output}}", "stoppedWithReason": "Claude Code si è fermato per il motivo: {{reason}}", - "apiKeyModelPlanMismatch": "Le chiavi API e i piani di abbonamento consentono modelli diversi. Assicurati che il modello selezionato sia incluso nel tuo piano." + "apiKeyModelPlanMismatch": "API keys and subscription plans allow different models. Make sure the selected model is included in your plan.", + "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Errore del flusso di contesto di generazione Gemini: {{error}}", - "generate_complete_prompt": "Errore di completamento Gemini: {{error}}", - "sources": "Fonti:" + "generate_stream": "Gemini generate context stream error: {{error}}", + "generate_complete_prompt": "Gemini completion error: {{error}}", + "sources": "Sources:" } }, "warnings": { diff --git a/src/i18n/locales/ja/common.json b/src/i18n/locales/ja/common.json index 6e7e0b8a3e..c82aa6b90d 100644 --- a/src/i18n/locales/ja/common.json +++ b/src/i18n/locales/ja/common.json @@ -83,12 +83,13 @@ "errorOutput": "エラー出力：{{output}}", "processExitedWithError": "Claude Code プロセスがコード {{exitCode}} で終了しました。エラー出力：{{output}}", "stoppedWithReason": "Claude Code が理由により停止しました：{{reason}}", - "apiKeyModelPlanMismatch": "API キーとサブスクリプションプランでは異なるモデルが利用可能です。選択したモデルがプランに含まれていることを確認してください。" + "apiKeyModelPlanMismatch": "API keys and subscription plans allow different models. Make sure the selected model is included in your plan.", + "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Gemini 生成コンテキスト ストリーム エラー: {{error}}", - "generate_complete_prompt": "Gemini 完了エラー: {{error}}", - "sources": "ソース:" + "generate_stream": "Gemini generate context stream error: {{error}}", + "generate_complete_prompt": "Gemini completion error: {{error}}", + "sources": "Sources:" } }, "warnings": { diff --git a/src/i18n/locales/ko/common.json b/src/i18n/locales/ko/common.json index 1d0a5f3c4a..d9d178a39c 100644 --- a/src/i18n/locales/ko/common.json +++ b/src/i18n/locales/ko/common.json @@ -83,12 +83,13 @@ "errorOutput": "오류 출력: {{output}}", "processExitedWithError": "Claude Code 프로세스가 코드 {{exitCode}}로 종료되었습니다. 오류 출력: {{output}}", "stoppedWithReason": "Claude Code가 다음 이유로 중지되었습니다: {{reason}}", - "apiKeyModelPlanMismatch": "API 키와 구독 플랜에서 다른 모델을 허용합니다. 선택한 모델이 플랜에 포함되어 있는지 확인하세요." + "apiKeyModelPlanMismatch": "API keys and subscription plans allow different models. Make sure the selected model is included in your plan.", + "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Gemini 생성 컨텍스트 스트림 오류: {{error}}", - "generate_complete_prompt": "Gemini 완료 오류: {{error}}", - "sources": "출처:" + "generate_stream": "Gemini generate context stream error: {{error}}", + "generate_complete_prompt": "Gemini completion error: {{error}}", + "sources": "Sources:" } }, "warnings": { diff --git a/src/i18n/locales/nl/common.json b/src/i18n/locales/nl/common.json index bb7d3c0f23..277b1d7445 100644 --- a/src/i18n/locales/nl/common.json +++ b/src/i18n/locales/nl/common.json @@ -83,12 +83,13 @@ "errorOutput": "Foutuitvoer: {{output}}", "processExitedWithError": "Claude Code proces beëindigd met code {{exitCode}}. Foutuitvoer: {{output}}", "stoppedWithReason": "Claude Code gestopt om reden: {{reason}}", - "apiKeyModelPlanMismatch": "API-sleutels en abonnementsplannen staan verschillende modellen toe. Zorg ervoor dat het geselecteerde model is opgenomen in je plan." + "apiKeyModelPlanMismatch": "API keys and subscription plans allow different models. Make sure the selected model is included in your plan.", + "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Fout bij het genereren van contextstream door Gemini: {{error}}", - "generate_complete_prompt": "Fout bij het voltooien door Gemini: {{error}}", - "sources": "Bronnen:" + "generate_stream": "Gemini generate context stream error: {{error}}", + "generate_complete_prompt": "Gemini completion error: {{error}}", + "sources": "Sources:" } }, "warnings": { diff --git a/src/i18n/locales/pl/common.json b/src/i18n/locales/pl/common.json index 953f52ea79..ce0597e241 100644 --- a/src/i18n/locales/pl/common.json +++ b/src/i18n/locales/pl/common.json @@ -83,12 +83,13 @@ "errorOutput": "Wyjście błędu: {{output}}", "processExitedWithError": "Proces Claude Code zakończył się kodem {{exitCode}}. Wyjście błędu: {{output}}", "stoppedWithReason": "Claude Code zatrzymał się z powodu: {{reason}}", - "apiKeyModelPlanMismatch": "Klucze API i plany subskrypcji pozwalają na różne modele. Upewnij się, że wybrany model jest zawarty w twoim planie." + "apiKeyModelPlanMismatch": "API keys and subscription plans allow different models. Make sure the selected model is included in your plan.", + "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Błąd strumienia kontekstu generowania Gemini: {{error}}", - "generate_complete_prompt": "Błąd uzupełniania Gemini: {{error}}", - "sources": "Źródła:" + "generate_stream": "Gemini generate context stream error: {{error}}", + "generate_complete_prompt": "Gemini completion error: {{error}}", + "sources": "Sources:" } }, "warnings": { diff --git a/src/i18n/locales/pt-BR/common.json b/src/i18n/locales/pt-BR/common.json index 21aca727a1..96912bf9a4 100644 --- a/src/i18n/locales/pt-BR/common.json +++ b/src/i18n/locales/pt-BR/common.json @@ -87,12 +87,13 @@ "errorOutput": "Saída de erro: {{output}}", "processExitedWithError": "O processo Claude Code saiu com código {{exitCode}}. Saída de erro: {{output}}", "stoppedWithReason": "Claude Code parou pela razão: {{reason}}", - "apiKeyModelPlanMismatch": "Chaves de API e planos de assinatura permitem modelos diferentes. Certifique-se de que o modelo selecionado esteja incluído no seu plano." + "apiKeyModelPlanMismatch": "API keys and subscription plans allow different models. Make sure the selected model is included in your plan.", + "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Erro de fluxo de contexto de geração do Gemini: {{error}}", - "generate_complete_prompt": "Erro de conclusão do Gemini: {{error}}", - "sources": "Fontes:" + "generate_stream": "Gemini generate context stream error: {{error}}", + "generate_complete_prompt": "Gemini completion error: {{error}}", + "sources": "Sources:" } }, "warnings": { diff --git a/src/i18n/locales/ru/common.json b/src/i18n/locales/ru/common.json index 30913e16e9..7f469da787 100644 --- a/src/i18n/locales/ru/common.json +++ b/src/i18n/locales/ru/common.json @@ -83,12 +83,13 @@ "errorOutput": "Вывод ошибки: {{output}}", "processExitedWithError": "Процесс Claude Code завершился с кодом {{exitCode}}. Вывод ошибки: {{output}}", "stoppedWithReason": "Claude Code остановился по причине: {{reason}}", - "apiKeyModelPlanMismatch": "API-ключи и планы подписки позволяют использовать разные модели. Убедитесь, что выбранная модель включена в ваш план." + "apiKeyModelPlanMismatch": "API keys and subscription plans allow different models. Make sure the selected model is included in your plan.", + "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Ошибка потока контекста генерации Gemini: {{error}}", - "generate_complete_prompt": "Ошибка завершения Gemini: {{error}}", - "sources": "Источники:" + "generate_stream": "Gemini generate context stream error: {{error}}", + "generate_complete_prompt": "Gemini completion error: {{error}}", + "sources": "Sources:" } }, "warnings": { diff --git a/src/i18n/locales/tr/common.json b/src/i18n/locales/tr/common.json index 6892c7c8f1..c100172e61 100644 --- a/src/i18n/locales/tr/common.json +++ b/src/i18n/locales/tr/common.json @@ -83,12 +83,13 @@ "errorOutput": "Hata çıktısı: {{output}}", "processExitedWithError": "Claude Code işlemi {{exitCode}} koduyla çıktı. Hata çıktısı: {{output}}", "stoppedWithReason": "Claude Code şu nedenle durdu: {{reason}}", - "apiKeyModelPlanMismatch": "API anahtarları ve abonelik planları farklı modellere izin verir. Seçilen modelin planınıza dahil olduğundan emin olun." + "apiKeyModelPlanMismatch": "API keys and subscription plans allow different models. Make sure the selected model is included in your plan.", + "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Gemini oluşturma bağlam akışı hatası: {{error}}", - "generate_complete_prompt": "Gemini tamamlama hatası: {{error}}", - "sources": "Kaynaklar:" + "generate_stream": "Gemini generate context stream error: {{error}}", + "generate_complete_prompt": "Gemini completion error: {{error}}", + "sources": "Sources:" } }, "warnings": { diff --git a/src/i18n/locales/vi/common.json b/src/i18n/locales/vi/common.json index f88120098d..9a2fe23c77 100644 --- a/src/i18n/locales/vi/common.json +++ b/src/i18n/locales/vi/common.json @@ -83,12 +83,13 @@ "errorOutput": "Đầu ra lỗi: {{output}}", "processExitedWithError": "Tiến trình Claude Code thoát với mã {{exitCode}}. Đầu ra lỗi: {{output}}", "stoppedWithReason": "Claude Code dừng lại vì lý do: {{reason}}", - "apiKeyModelPlanMismatch": "Khóa API và gói đăng ký cho phép các mô hình khác nhau. Đảm bảo rằng mô hình đã chọn được bao gồm trong gói của bạn." + "apiKeyModelPlanMismatch": "API keys and subscription plans allow different models. Make sure the selected model is included in your plan.", + "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Lỗi luồng ngữ cảnh tạo Gemini: {{error}}", - "generate_complete_prompt": "Lỗi hoàn thành Gemini: {{error}}", - "sources": "Nguồn:" + "generate_stream": "Gemini generate context stream error: {{error}}", + "generate_complete_prompt": "Gemini completion error: {{error}}", + "sources": "Sources:" } }, "warnings": { diff --git a/src/i18n/locales/zh-CN/common.json b/src/i18n/locales/zh-CN/common.json index e81b7d589a..9dba8dada9 100644 --- a/src/i18n/locales/zh-CN/common.json +++ b/src/i18n/locales/zh-CN/common.json @@ -88,12 +88,13 @@ "errorOutput": "错误输出：{{output}}", "processExitedWithError": "Claude Code 进程退出，退出码：{{exitCode}}。错误输出：{{output}}", "stoppedWithReason": "Claude Code 停止，原因：{{reason}}", - "apiKeyModelPlanMismatch": "API 密钥和订阅计划支持不同的模型。请确保所选模型包含在您的计划中。" + "apiKeyModelPlanMismatch": "API keys and subscription plans allow different models. Make sure the selected model is included in your plan.", + "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Gemini 生成上下文流错误：{{error}}", - "generate_complete_prompt": "Gemini 完成错误：{{error}}", - "sources": "来源：" + "generate_stream": "Gemini generate context stream error: {{error}}", + "generate_complete_prompt": "Gemini completion error: {{error}}", + "sources": "Sources:" } }, "warnings": { diff --git a/src/i18n/locales/zh-TW/common.json b/src/i18n/locales/zh-TW/common.json index 1c800d4d37..1167e49220 100644 --- a/src/i18n/locales/zh-TW/common.json +++ b/src/i18n/locales/zh-TW/common.json @@ -82,7 +82,8 @@ "errorOutput": "錯誤輸出：{{output}}", "processExitedWithError": "Claude Code 程序退出，退出碼：{{exitCode}}。錯誤輸出：{{output}}", "stoppedWithReason": "Claude Code 停止，原因：{{reason}}", - "apiKeyModelPlanMismatch": "API 金鑰和訂閱方案允許不同的模型。請確保所選模型包含在您的方案中。" + "apiKeyModelPlanMismatch": "API 金鑰和訂閱方案允許不同的模型。請確保所選模型包含在您的方案中。", + "notFound": "找不到 Claude Code 可執行檔案 '{{claudePath}}'。\n\n請安裝 Claude Code CLI：\n1. 造訪 {{installationUrl}} 下載 Claude Code\n2. 依照作業系統的安裝說明進行操作\n3. 確保 'claude' 指令在 PATH 中可用\n4. 或者在 Roo 設定中的 'Claude Code 路徑' 下設定自訂路徑\n\n原始錯誤：{{originalError}}" }, "gemini": { "generate_stream": "Gemini 產生內容串流錯誤：{{error}}", diff --git a/src/integrations/claude-code/__tests__/run.spec.ts b/src/integrations/claude-code/__tests__/run.spec.ts index 27af274447..fa5aedcd36 100644 --- a/src/integrations/claude-code/__tests__/run.spec.ts +++ b/src/integrations/claude-code/__tests__/run.spec.ts @@ -1,5 +1,21 @@ import { describe, test, expect, vi, beforeEach, afterEach } from "vitest" +// Mock i18n system +vi.mock("../../i18n", () => ({ + t: vi.fn((key: string, options?: Record) => { + // Mock the specific translation key used in the code + if (key === "errors.claudeCode.notFound") { + const claudePath = options?.claudePath || "claude" + const installationUrl = options?.installationUrl || "https://docs.anthropic.com/en/docs/claude-code/setup" + const originalError = options?.originalError || "spawn claude ENOENT" + + return `Claude Code executable '${claudePath}' not found.\n\nPlease install Claude Code CLI:\n1. Visit ${installationUrl} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: ${originalError}` + } + // Return the key as fallback for other translations + return key + }), +})) + // Mock os module vi.mock("os", () => ({ platform: vi.fn(() => "darwin"), // Default to non-Windows @@ -100,6 +116,8 @@ describe("runClaudeCode", () => { callback() return {} as any }) + // Clear module cache to ensure fresh imports + vi.resetModules() }) afterEach(() => { @@ -289,4 +307,217 @@ describe("runClaudeCode", () => { consoleErrorSpy.mockRestore() await generator.return(undefined) }) + + test("should handle ENOENT errors during process spawn with helpful error message", async () => { + const { runClaudeCode } = await import("../run") + + // Mock execa to throw ENOENT error + const enoentError = new Error("spawn claude ENOENT") + ;(enoentError as any).code = "ENOENT" + mockExeca.mockImplementationOnce(() => { + throw enoentError + }) + + const options = { + systemPrompt: "You are a helpful assistant", + messages: [{ role: "user" as const, content: "Hello" }], + } + + const generator = runClaudeCode(options) + + // Should throw enhanced ENOENT error + await expect(generator.next()).rejects.toThrow(/errors\.claudeCode\.notFound/) + }) + + test("should handle ENOENT errors during process execution with helpful error message", async () => { + const { runClaudeCode } = await import("../run") + + // Create a mock process that emits ENOENT error + const mockProcessWithError = createMockProcess() + const enoentError = new Error("spawn claude ENOENT") + ;(enoentError as any).code = "ENOENT" + + mockProcessWithError.on = vi.fn((event, callback) => { + if (event === "error") { + // Emit ENOENT error immediately + callback(enoentError) + } else if (event === "close") { + // Don't emit close event in this test + } + }) + + // Mock readline to not yield any data when there's an error + const mockReadlineForError = { + [Symbol.asyncIterator]() { + return { + async next() { + // Don't yield anything - simulate error before any output + return { done: true, value: undefined } + }, + } + }, + close: vi.fn(), + } + + const readline = await import("readline") + vi.mocked(readline.default.createInterface).mockReturnValueOnce(mockReadlineForError as any) + + mockExeca.mockReturnValueOnce(mockProcessWithError) + + const options = { + systemPrompt: "You are a helpful assistant", + messages: [{ role: "user" as const, content: "Hello" }], + } + + const generator = runClaudeCode(options) + + // Should throw enhanced ENOENT error + await expect(generator.next()).rejects.toThrow(/errors\.claudeCode\.notFound/) + }) + + test("should handle ENOENT errors with custom claude path", async () => { + const { runClaudeCode } = await import("../run") + + const customPath = "/custom/path/to/claude" + const enoentError = new Error(`spawn ${customPath} ENOENT`) + ;(enoentError as any).code = "ENOENT" + mockExeca.mockImplementationOnce(() => { + throw enoentError + }) + + const options = { + systemPrompt: "You are a helpful assistant", + messages: [{ role: "user" as const, content: "Hello" }], + path: customPath, + } + + const generator = runClaudeCode(options) + + // Should throw enhanced ENOENT error with custom path + await expect(generator.next()).rejects.toThrow(/errors\.claudeCode\.notFound/) + }) + + test("should preserve non-ENOENT errors during process spawn", async () => { + const { runClaudeCode } = await import("../run") + + // Mock execa to throw non-ENOENT error + const otherError = new Error("Permission denied") + mockExeca.mockImplementationOnce(() => { + throw otherError + }) + + const options = { + systemPrompt: "You are a helpful assistant", + messages: [{ role: "user" as const, content: "Hello" }], + } + + const generator = runClaudeCode(options) + + // Should throw original error, not enhanced ENOENT error + await expect(generator.next()).rejects.toThrow("Permission denied") + }) + + test("should preserve non-ENOENT errors during process execution", async () => { + const { runClaudeCode } = await import("../run") + + // Create a mock process that emits non-ENOENT error + const mockProcessWithError = createMockProcess() + const otherError = new Error("Permission denied") + + mockProcessWithError.on = vi.fn((event, callback) => { + if (event === "error") { + // Emit non-ENOENT error immediately + callback(otherError) + } else if (event === "close") { + // Don't emit close event in this test + } + }) + + // Mock readline to not yield any data when there's an error + const mockReadlineForError = { + [Symbol.asyncIterator]() { + return { + async next() { + // Don't yield anything - simulate error before any output + return { done: true, value: undefined } + }, + } + }, + close: vi.fn(), + } + + const readline = await import("readline") + vi.mocked(readline.default.createInterface).mockReturnValueOnce(mockReadlineForError as any) + + mockExeca.mockReturnValueOnce(mockProcessWithError) + + const options = { + systemPrompt: "You are a helpful assistant", + messages: [{ role: "user" as const, content: "Hello" }], + } + + const generator = runClaudeCode(options) + + // Should throw original error, not enhanced ENOENT error + await expect(generator.next()).rejects.toThrow("Permission denied") + }) + + test("should prioritize ClaudeCodeNotFoundError over generic exit code errors", async () => { + const { runClaudeCode } = await import("../run") + + // Create a mock process that emits ENOENT error and then exits with non-zero code + const mockProcessWithError = createMockProcess() + const enoentError = new Error("spawn claude ENOENT") + ;(enoentError as any).code = "ENOENT" + + let resolveProcess: (value: { exitCode: number }) => void + const processPromise = new Promise<{ exitCode: number }>((resolve) => { + resolveProcess = resolve + }) + + mockProcessWithError.on = vi.fn((event, callback) => { + if (event === "error") { + // Emit ENOENT error immediately + callback(enoentError) + } else if (event === "close") { + // Emit non-zero exit code + setTimeout(() => { + callback(1) + resolveProcess({ exitCode: 1 }) + }, 10) + } + }) + + mockProcessWithError.then = processPromise.then.bind(processPromise) + mockProcessWithError.catch = processPromise.catch.bind(processPromise) + mockProcessWithError.finally = processPromise.finally.bind(processPromise) + + // Mock readline to not yield any data when there's an error + const mockReadlineForError = { + [Symbol.asyncIterator]() { + return { + async next() { + // Don't yield anything - simulate error before any output + return { done: true, value: undefined } + }, + } + }, + close: vi.fn(), + } + + const readline = await import("readline") + vi.mocked(readline.default.createInterface).mockReturnValueOnce(mockReadlineForError as any) + + mockExeca.mockReturnValueOnce(mockProcessWithError) + + const options = { + systemPrompt: "You are a helpful assistant", + messages: [{ role: "user" as const, content: "Hello" }], + } + + const generator = runClaudeCode(options) + + // Should throw ClaudeCodeNotFoundError, not generic exit code error + await expect(generator.next()).rejects.toThrow(/errors\.claudeCode\.notFound/) + }) }) diff --git a/src/integrations/claude-code/run.ts b/src/integrations/claude-code/run.ts index 65e32bd96f..3f438df0fc 100644 --- a/src/integrations/claude-code/run.ts +++ b/src/integrations/claude-code/run.ts @@ -5,9 +5,13 @@ import { ClaudeCodeMessage } from "./types" import readline from "readline" import { CLAUDE_CODE_DEFAULT_MAX_OUTPUT_TOKENS } from "@roo-code/types" import * as os from "os" +import { t } from "../../i18n" const cwd = vscode.workspace.workspaceFolders?.map((folder) => folder.uri.fsPath).at(0) +// Claude Code installation URL - can be easily updated if needed +const CLAUDE_CODE_INSTALLATION_URL = "https://docs.anthropic.com/en/docs/claude-code/setup" + type ClaudeCodeOptions = { systemPrompt: string messages: Anthropic.Messages.MessageParam[] @@ -25,7 +29,18 @@ type ProcessState = { export async function* runClaudeCode( options: ClaudeCodeOptions & { maxOutputTokens?: number }, ): AsyncGenerator { - const process = runProcess(options) + const claudePath = options.path || "claude" + let process + + try { + process = runProcess(options) + } catch (error: any) { + // Handle ENOENT errors immediately when spawning the process + if (error.code === "ENOENT" || error.message?.includes("ENOENT")) { + throw createClaudeCodeNotFoundError(claudePath, error) + } + throw error + } const rl = readline.createInterface({ input: process.stdout, @@ -48,7 +63,14 @@ export async function* runClaudeCode( }) process.on("error", (err) => { - processState.error = err + // Enhance ENOENT errors with helpful installation guidance + if (err.message.includes("ENOENT") || (err as any).code === "ENOENT") { + processState.error = createClaudeCodeNotFoundError(claudePath, err) + } else { + processState.error = err + } + // Close the readline interface to break out of the loop + rl.close() }) for await (const line of rl) { @@ -67,6 +89,11 @@ export async function* runClaudeCode( } } + // Check for errors that occurred during processing + if (processState.error) { + throw processState.error + } + // We rely on the assistant message. If the output was truncated, it's better having a poorly formatted message // from which to extract something, than throwing an error/showing the model didn't return any messages. if (processState.partialData && processState.partialData.startsWith(`{"type":"assistant"`)) { @@ -75,7 +102,12 @@ export async function* runClaudeCode( const { exitCode } = await process if (exitCode !== null && exitCode !== 0) { - const errorOutput = processState.error?.message || processState.stderrLogs?.trim() + // If we have a specific ENOENT error, throw that instead + if (processState.error && (processState.error as any).name === "ClaudeCodeNotFoundError") { + throw processState.error + } + + const errorOutput = (processState.error as any)?.message || processState.stderrLogs?.trim() throw new Error( `Claude Code process exited with code ${exitCode}.${errorOutput ? ` Error output: ${errorOutput}` : ""}`, ) @@ -223,3 +255,18 @@ function attemptParseChunk(data: string): ClaudeCodeMessage | null { return null } } + +/** + * Creates a user-friendly error message for Claude Code ENOENT errors + */ +function createClaudeCodeNotFoundError(claudePath: string, originalError: Error): Error { + const errorMessage = t("errors.claudeCode.notFound", { + claudePath, + installationUrl: CLAUDE_CODE_INSTALLATION_URL, + originalError: originalError.message, + }) + + const error = new Error(errorMessage) + error.name = "ClaudeCodeNotFoundError" + return error +} From de359a465c67aefc67553aa2b464591b602c4bdc Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Thu, 31 Jul 2025 11:28:43 -0400 Subject: [PATCH 027/253] Handle more variations of chaining and subshell command validation (#6486) --- .../__tests__/command-validation.spec.ts | 55 +++++++++++ webview-ui/src/utils/command-validation.ts | 94 +++++++++++++------ 2 files changed, 120 insertions(+), 29 deletions(-) diff --git a/webview-ui/src/utils/__tests__/command-validation.spec.ts b/webview-ui/src/utils/__tests__/command-validation.spec.ts index f16fc00044..29370c471f 100644 --- a/webview-ui/src/utils/__tests__/command-validation.spec.ts +++ b/webview-ui/src/utils/__tests__/command-validation.spec.ts @@ -21,6 +21,14 @@ describe("Command Validation", () => { expect(parseCommand("npm test || npm run build")).toEqual(["npm test", "npm run build"]) expect(parseCommand("npm test; npm run build")).toEqual(["npm test", "npm run build"]) expect(parseCommand("npm test | npm run build")).toEqual(["npm test", "npm run build"]) + expect(parseCommand("npm test & npm run build")).toEqual(["npm test", "npm run build"]) + }) + + it("handles & operator for background execution", () => { + expect(parseCommand("ls & whoami")).toEqual(["ls", "whoami"]) + expect(parseCommand("ls & whoami & pwd")).toEqual(["ls", "whoami", "pwd"]) + expect(parseCommand("ls && whoami & pwd || echo done")).toEqual(["ls", "whoami", "pwd", "echo done"]) + expect(parseCommand("ls&whoami")).toEqual(["ls", "whoami"]) }) it("preserves quoted content", () => { @@ -48,6 +56,53 @@ describe("Command Validation", () => { expect(containsSubshell("echo hello")).toBe(false) // no subshells }) + it("detects subshell grouping patterns", () => { + // Basic subshell grouping with shell operators + expect(containsSubshell("(ls; rm file)")).toBe(true) + expect(containsSubshell("(cd /tmp && rm -rf *)")).toBe(true) + expect(containsSubshell("(command1 || command2)")).toBe(true) + expect(containsSubshell("(ls | grep test)")).toBe(true) + expect(containsSubshell("(sleep 10 & echo done)")).toBe(true) + + // Nested subshells + expect(containsSubshell("(cd /tmp && (rm -rf * || echo failed))")).toBe(true) + + // Multiple operators in subshell + expect(containsSubshell("(cmd1; cmd2 && cmd3 | cmd4)")).toBe(true) + + // Subshell with spaces + expect(containsSubshell("( ls ; rm file )")).toBe(true) + }) + + it("does NOT detect legitimate parentheses usage", () => { + // Function calls should not be flagged as subshells + expect(containsSubshell("myfunction(arg1, arg2)")).toBe(false) + expect(containsSubshell("func( arg1, arg2 )")).toBe(false) + + // Simple parentheses without operators + expect(containsSubshell("(simple text)")).toBe(false) + + // Parentheses in strings + expect(containsSubshell('echo "this (has) parentheses"')).toBe(false) + + // Empty parentheses + expect(containsSubshell("()")).toBe(false) + }) + + it("handles mixed subshell patterns", () => { + // Mixed subshell types + expect(containsSubshell("(echo $(date); rm file)")).toBe(true) + + // Subshell with command substitution + expect(containsSubshell("(ls `pwd`; echo done)")).toBe(true) + + // No subshells + expect(containsSubshell("echo hello world")).toBe(false) + + // Empty string + expect(containsSubshell("")).toBe(false) + }) + it("handles empty and whitespace input", () => { expect(parseCommand("")).toEqual([]) expect(parseCommand(" ")).toEqual([]) diff --git a/webview-ui/src/utils/command-validation.ts b/webview-ui/src/utils/command-validation.ts index f1d0c211cb..700aed554b 100644 --- a/webview-ui/src/utils/command-validation.ts +++ b/webview-ui/src/utils/command-validation.ts @@ -36,18 +36,18 @@ type ShellToken = string | { op: string } | { command: string } * * ## Command Processing Pipeline: * - * 1. **Subshell Detection**: Commands containing $() or `` are blocked if denylist exists - * 2. **Command Parsing**: Split chained commands (&&, ||, ;, |) into individual commands - * 3. **Pattern Matching**: For each command, find longest matching prefixes in both lists - * 4. **Decision Logic**: Apply longest prefix match rule to determine approval/denial - * 5. **Aggregation**: Combine decisions (any denial blocks the entire command chain) + * 1. **Subshell Detection**: Commands containing dangerous patterns like $(), ``, or (cmd1; cmd2) are flagged as security risks + * 2. **Command Parsing**: Split chained commands (&&, ||, ;, |, &) into individual commands for separate validation + * 3. **Pattern Matching**: For each individual command, find the longest matching prefix in both allowlist and denylist + * 4. **Decision Logic**: Apply longest prefix match rule - more specific (longer) matches take precedence + * 5. **Aggregation**: Combine individual decisions - if any command is denied, the entire chain is denied * * ## Security Considerations: * - * - **Subshell Protection**: Prevents command injection via $(command), `command`, or process substitution - * - **Chain Analysis**: Each command in a chain (cmd1 && cmd2) is validated separately - * - **Case Insensitive**: All matching is case-insensitive for consistency - * - **Whitespace Handling**: Commands are trimmed and normalized before matching + * - **Subshell Protection**: Detects and blocks command injection attempts via command substitution, process substitution, and subshell grouping + * - **Chain Analysis**: Each command in a chain (cmd1 && cmd2) is validated separately to prevent bypassing via chaining + * - **Case Insensitive**: All pattern matching is case-insensitive for consistent behavior across different input styles + * - **Whitespace Handling**: Commands are trimmed and normalized before matching to prevent whitespace-based bypasses * * ## Configuration Merging: * @@ -59,37 +59,73 @@ type ShellToken = string | { op: string } | { command: string } */ /** - * Detect subshell usage and command substitution patterns: - * - $() - command substitution - * - `` - backticks (legacy command substitution) - * - <() - process substitution (input) - * - >() - process substitution (output) - * - $(()) - arithmetic expansion - * - $[] - arithmetic expansion (alternative syntax) + * Detect subshell usage and command substitution patterns that could be security risks. + * + * Subshells allow executing commands in isolated environments and can be used to bypass + * command validation by hiding dangerous commands inside substitution patterns. + * + * Detected patterns: + * - $() - command substitution: executes command and substitutes output + * - `` - backticks (legacy command substitution): same as $() but older syntax + * - <() - process substitution (input): creates temporary file descriptor for command output + * - >() - process substitution (output): creates temporary file descriptor for command input + * - $(()) - arithmetic expansion: evaluates mathematical expressions (can contain commands) + * - $[] - arithmetic expansion (alternative syntax): same as $(()) but older syntax + * - (cmd1; cmd2) - subshell grouping: executes multiple commands in isolated subshell + * + * @param source - The command string to analyze for subshell patterns + * @returns true if any subshell patterns are detected, false otherwise * * @example * ```typescript - * containsSubshell("echo $(date)") // true - command substitution - * containsSubshell("echo `date`") // true - backtick substitution - * containsSubshell("diff <(sort f1)") // true - process substitution - * containsSubshell("echo $((1+2))") // true - arithmetic expansion - * containsSubshell("echo $[1+2]") // true - arithmetic expansion (alt) - * containsSubshell("echo hello") // false - no subshells + * // Command substitution - executes 'date' and substitutes its output + * containsSubshell("echo $(date)") // true + * + * // Backtick substitution - legacy syntax for command substitution + * containsSubshell("echo `date`") // true + * + * // Process substitution - creates file descriptor for command output + * containsSubshell("diff <(sort f1)") // true + * + * // Arithmetic expansion - can contain command execution + * containsSubshell("echo $((1+2))") // true + * containsSubshell("echo $[1+2]") // true + * + * // Subshell grouping - executes commands in isolated environment + * containsSubshell("(ls; rm file)") // true + * containsSubshell("(cd /tmp && rm -rf *)") // true + * + * // Safe patterns that should NOT be flagged + * containsSubshell("func(arg1, arg2)") // false - function call, not subshell + * containsSubshell("echo hello") // false - no subshell patterns + * containsSubshell("(simple text)") // false - no shell operators in parentheses * ``` */ export function containsSubshell(source: string): boolean { - return /(\$\()|`|(<\(|>\()|(\$\(\()|(\$\[)/.test(source) + // Check for command substitution, process substitution, and arithmetic expansion patterns + // These patterns allow executing commands and substituting their output, which can bypass validation + const commandSubstitutionPatterns = /(\$\()|`|(<\(|>\()|(\$\(\()|(\$\[)/.test(source) + + // Check for subshell grouping: parentheses containing shell command operators + // Pattern explanation: \( = literal opening paren, [^)]* = any chars except closing paren, + // [;&|]+ = one or more shell operators (semicolon, ampersand, pipe), [^)]* = any chars except closing paren, \) = literal closing paren + // This detects dangerous patterns like: (cmd1; cmd2), (cmd1 && cmd2), (cmd1 || cmd2), (cmd1 | cmd2), (cmd1 & cmd2) + // But avoids false positives like function calls: func(arg1, arg2) - no shell operators inside + const subshellGroupingPattern = /\([^)]*[;&|]+[^)]*\)/.test(source) + + // Return true if any subshell pattern is detected + return commandSubstitutionPatterns || subshellGroupingPattern } /** * Split a command string into individual sub-commands by - * chaining operators (&&, ||, ;, or |) and newlines. + * chaining operators (&&, ||, ;, |, or &) and newlines. * * Uses shell-quote to properly handle: * - Quoted strings (preserves quotes) * - Subshell commands ($(cmd), `cmd`, <(cmd), >(cmd)) * - PowerShell redirections (2>&1) - * - Chain operators (&&, ||, ;, |) + * - Chain operators (&&, ||, ;, |, &) * - Newlines as command separators */ export function parseCommand(command: string): string[] { @@ -228,7 +264,7 @@ function parseCommandLine(command: string): string[] { // Simple fallback: split by common operators const fallbackCommands = processedCommand - .split(/(?:&&|\|\||;|\|)/) + .split(/(?:&&|\|\||;|\||&)/) .map((cmd) => cmd.trim()) .filter((cmd) => cmd.length > 0) @@ -253,13 +289,13 @@ function parseCommandLine(command: string): string[] { for (const token of tokens) { if (typeof token === "object" && "op" in token) { // Chain operator - split command - if (["&&", "||", ";", "|"].includes(token.op)) { + if (["&&", "||", ";", "|", "&"].includes(token.op)) { if (currentCommand.length > 0) { commands.push(currentCommand.join(" ")) currentCommand = [] } } else { - // Other operators (>, &) are part of the command + // Other operators (>) are part of the command currentCommand.push(token.op) } } else if (typeof token === "string") { @@ -436,7 +472,7 @@ export type CommandDecision = "auto_approve" | "auto_deny" | "ask_user" * * **Decision Logic:** * 1. **Subshell Protection**: If subshells ($() or ``) are present and denylist exists → auto-deny - * 2. **Command Parsing**: Split command chains (&&, ||, ;, |) into individual commands + * 2. **Command Parsing**: Split command chains (&&, ||, ;, |, &) into individual commands * 3. **Individual Validation**: For each sub-command, apply longest prefix match rule * 4. **Aggregation**: Combine decisions using "any denial blocks all" principle * From 74672fafcbd3c171c149e31510757151690aa6f8 Mon Sep 17 00:00:00 2001 From: Daniel <57051444+daniel-lxs@users.noreply.github.com> Date: Thu, 31 Jul 2025 10:36:40 -0500 Subject: [PATCH 028/253] fix: restore message sending when clicking save button (#6487) --- webview-ui/src/components/chat/ChatView.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx index bc9c36a6c2..1fe93eb470 100644 --- a/webview-ui/src/components/chat/ChatView.tsx +++ b/webview-ui/src/components/chat/ChatView.tsx @@ -1912,7 +1912,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction handlePrimaryButtonClick()}> + onClick={() => handlePrimaryButtonClick(inputValue, selectedImages)}> {primaryButtonText} @@ -1934,7 +1934,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction handleSecondaryButtonClick()}> + onClick={() => handleSecondaryButtonClick(inputValue, selectedImages)}> {isStreaming ? t("chat:cancel.title") : secondaryButtonText} From 1a013b44165d81b40db1c100174a7103c4114af9 Mon Sep 17 00:00:00 2001 From: "Piotr Wilkin (ilintar)" Date: Thu, 31 Jul 2025 21:31:04 +0200 Subject: [PATCH 029/253] fix: LM Studio model context length (#5075) (#6183) Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com> Co-authored-by: Daniel <57051444+daniel-lxs@users.noreply.github.com> Co-authored-by: Daniel Riccio --- .../fetchers/__tests__/lmstudio.test.ts | 2 +- src/api/providers/fetchers/lmstudio.ts | 50 ++++++++++++++++--- src/api/providers/fetchers/modelCache.ts | 6 ++- src/api/providers/lm-studio.ts | 15 ++++-- src/core/webview/ClineProvider.ts | 21 ++++++++ .../webview/__tests__/ClineProvider.spec.ts | 28 +++++++++++ .../__tests__/webviewMessageHandler.spec.ts | 42 ++++++++++++++++ src/core/webview/webviewMessageHandler.ts | 4 +- src/shared/ExtensionMessage.ts | 4 +- .../settings/providers/LMStudio.tsx | 23 +++++---- .../components/ui/hooks/useLmStudioModels.ts | 39 +++++++++++++++ .../components/ui/hooks/useSelectedModel.ts | 21 ++++++-- 12 files changed, 223 insertions(+), 32 deletions(-) create mode 100644 webview-ui/src/components/ui/hooks/useLmStudioModels.ts diff --git a/src/api/providers/fetchers/__tests__/lmstudio.test.ts b/src/api/providers/fetchers/__tests__/lmstudio.test.ts index 98fe5db32e..ff9a109e50 100644 --- a/src/api/providers/fetchers/__tests__/lmstudio.test.ts +++ b/src/api/providers/fetchers/__tests__/lmstudio.test.ts @@ -118,7 +118,7 @@ describe("LMStudio Fetcher", () => { expect(MockedLMStudioClientConstructor).toHaveBeenCalledWith({ baseUrl: lmsUrl }) expect(mockListDownloadedModels).toHaveBeenCalledTimes(1) expect(mockListDownloadedModels).toHaveBeenCalledWith("llm") - expect(mockListLoaded).not.toHaveBeenCalled() + expect(mockListLoaded).toHaveBeenCalled() // we now call it to get context data const expectedParsedModel = parseLMStudioModel(mockLLMInfo) expect(result).toEqual({ [mockLLMInfo.path]: expectedParsedModel }) diff --git a/src/api/providers/fetchers/lmstudio.ts b/src/api/providers/fetchers/lmstudio.ts index 4b7ece71ea..976822c67d 100644 --- a/src/api/providers/fetchers/lmstudio.ts +++ b/src/api/providers/fetchers/lmstudio.ts @@ -1,6 +1,38 @@ import { ModelInfo, lMStudioDefaultModelInfo } from "@roo-code/types" import { LLM, LLMInfo, LLMInstanceInfo, LMStudioClient } from "@lmstudio/sdk" import axios from "axios" +import { flushModels, getModels } from "./modelCache" + +const modelsWithLoadedDetails = new Set() + +export const hasLoadedFullDetails = (modelId: string): boolean => { + return modelsWithLoadedDetails.has(modelId) +} + +export const forceFullModelDetailsLoad = async (baseUrl: string, modelId: string): Promise => { + try { + // test the connection to LM Studio first + // errors will be caught further down + await axios.get(`${baseUrl}/v1/models`) + const lmsUrl = baseUrl.replace(/^http:\/\//, "ws://").replace(/^https:\/\//, "wss://") + + const client = new LMStudioClient({ baseUrl: lmsUrl }) + await client.llm.model(modelId) + await flushModels("lmstudio") + await getModels({ provider: "lmstudio" }) // force cache update now + + // Mark this model as having full details loaded + modelsWithLoadedDetails.add(modelId) + } catch (error) { + if (error.code === "ECONNREFUSED") { + console.warn(`Error connecting to LMStudio at ${baseUrl}`) + } else { + console.error( + `Error refreshing LMStudio model details: ${JSON.stringify(error, Object.getOwnPropertyNames(error), 2)}`, + ) + } + } +} export const parseLMStudioModel = (rawModel: LLMInstanceInfo | LLMInfo): ModelInfo => { // Handle both LLMInstanceInfo (from loaded models) and LLMInfo (from downloaded models) @@ -19,6 +51,8 @@ export const parseLMStudioModel = (rawModel: LLMInstanceInfo | LLMInfo): ModelIn } export async function getLMStudioModels(baseUrl = "http://localhost:1234"): Promise> { + // clear the set of models that have full details loaded + modelsWithLoadedDetails.clear() // clearing the input can leave an empty string; use the default in that case baseUrl = baseUrl === "" ? "http://localhost:1234" : baseUrl @@ -46,15 +80,15 @@ export async function getLMStudioModels(baseUrl = "http://localhost:1234"): Prom } } catch (error) { console.warn("Failed to list downloaded models, falling back to loaded models only") + } + // We want to list loaded models *anyway* since they provide valuable extra info (context size) + const loadedModels = (await client.llm.listLoaded().then((models: LLM[]) => { + return Promise.all(models.map((m) => m.getModelInfo())) + })) as Array - // Fall back to listing only loaded models - const loadedModels = (await client.llm.listLoaded().then((models: LLM[]) => { - return Promise.all(models.map((m) => m.getModelInfo())) - })) as Array - - for (const lmstudioModel of loadedModels) { - models[lmstudioModel.modelKey] = parseLMStudioModel(lmstudioModel) - } + for (const lmstudioModel of loadedModels) { + models[lmstudioModel.modelKey] = parseLMStudioModel(lmstudioModel) + modelsWithLoadedDetails.add(lmstudioModel.modelKey) } } catch (error) { if (error.code === "ECONNREFUSED") { diff --git a/src/api/providers/fetchers/modelCache.ts b/src/api/providers/fetchers/modelCache.ts index fef700268d..dd6bc01ba1 100644 --- a/src/api/providers/fetchers/modelCache.ts +++ b/src/api/providers/fetchers/modelCache.ts @@ -47,7 +47,7 @@ async function readModels(router: RouterName): Promise */ export const getModels = async (options: GetModelsOptions): Promise => { const { provider } = options - let models = memoryCache.get(provider) + let models = getModelsFromCache(provider) if (models) { return models } @@ -113,3 +113,7 @@ export const getModels = async (options: GetModelsOptions): Promise export const flushModels = async (router: RouterName) => { memoryCache.del(router) } + +export function getModelsFromCache(provider: string) { + return memoryCache.get(provider) +} diff --git a/src/api/providers/lm-studio.ts b/src/api/providers/lm-studio.ts index f032e2d560..6c49920bd1 100644 --- a/src/api/providers/lm-studio.ts +++ b/src/api/providers/lm-studio.ts @@ -13,6 +13,7 @@ import { ApiStream } from "../transform/stream" import { BaseProvider } from "./base-provider" import type { SingleCompletionHandler, ApiHandlerCreateMessageMetadata } from "../index" +import { getModels, getModelsFromCache } from "./fetchers/modelCache" export class LmStudioHandler extends BaseProvider implements SingleCompletionHandler { protected options: ApiHandlerOptions @@ -131,9 +132,17 @@ export class LmStudioHandler extends BaseProvider implements SingleCompletionHan } override getModel(): { id: string; info: ModelInfo } { - return { - id: this.options.lmStudioModelId || "", - info: openAiModelInfoSaneDefaults, + const models = getModelsFromCache("lmstudio") + if (models && this.options.lmStudioModelId && models[this.options.lmStudioModelId]) { + return { + id: this.options.lmStudioModelId, + info: models[this.options.lmStudioModelId], + } + } else { + return { + id: this.options.lmStudioModelId || "", + info: openAiModelInfoSaneDefaults, + } } } diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index e013525e06..686066f214 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -70,6 +70,7 @@ import { WebviewMessage } from "../../shared/WebviewMessage" import { EMBEDDING_MODEL_PROFILES } from "../../shared/embeddingModels" import { ProfileValidator } from "../../shared/ProfileValidator" import { getWorkspaceGitInfo } from "../../utils/git" +import { forceFullModelDetailsLoad, hasLoadedFullDetails } from "../../api/providers/fetchers/lmstudio" /** * https://github.com/microsoft/vscode-webview-ui-toolkit-samples/blob/main/default/weather-webview/src/providers/WeatherViewProvider.ts @@ -163,6 +164,9 @@ export class ClineProvider // Add this cline instance into the stack that represents the order of all the called tasks. this.clineStack.push(cline) + // Perform special setup provider specific tasks + await this.performPreparationTasks(cline) + // Ensure getState() resolves correctly. const state = await this.getState() @@ -171,6 +175,23 @@ export class ClineProvider } } + async performPreparationTasks(cline: Task) { + // LMStudio: we need to force model loading in order to read its context size; we do it now since we're starting a task with that model selected + if (cline.apiConfiguration && cline.apiConfiguration.apiProvider === "lmstudio") { + try { + if (!hasLoadedFullDetails(cline.apiConfiguration.lmStudioModelId!)) { + await forceFullModelDetailsLoad( + cline.apiConfiguration.lmStudioBaseUrl ?? "http://localhost:1234", + cline.apiConfiguration.lmStudioModelId!, + ) + } + } catch (error) { + this.log(`Failed to load full model details for LM Studio: ${error}`) + vscode.window.showErrorMessage(error.message) + } + } + } + // Removes and destroys the top Cline instance (the current finished task), // activating the previous one (resuming the parent task). async removeClineFromStack() { diff --git a/src/core/webview/__tests__/ClineProvider.spec.ts b/src/core/webview/__tests__/ClineProvider.spec.ts index 2e70f80f99..d19ab1e650 100644 --- a/src/core/webview/__tests__/ClineProvider.spec.ts +++ b/src/core/webview/__tests__/ClineProvider.spec.ts @@ -16,6 +16,7 @@ import { Task, TaskOptions } from "../../task/Task" import { safeWriteJson } from "../../../utils/safeWriteJson" import { ClineProvider } from "../ClineProvider" +import { AsyncInvokeOutputDataConfig } from "@aws-sdk/client-bedrock-runtime" // Mock setup must come before imports vi.mock("../../prompts/sections/custom-instructions") @@ -2840,6 +2841,33 @@ describe("ClineProvider - Router Models", () => { }, }) }) + + test("handles requestLmStudioModels with proper response", async () => { + await provider.resolveWebviewView(mockWebviewView) + const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as any).mock.calls[0][0] + + vi.spyOn(provider, "getState").mockResolvedValue({ + apiConfiguration: { + lmStudioModelId: "model-1", + lmStudioBaseUrl: "http://localhost:1234", + }, + } as any) + + const mockModels = { + "model-1": { maxTokens: 4096, contextWindow: 8192, description: "Test model", supportsPromptCache: false }, + } + const { getModels } = await import("../../../api/providers/fetchers/modelCache") + vi.mocked(getModels).mockResolvedValue(mockModels) + + await messageHandler({ + type: "requestLmStudioModels", + }) + + expect(getModels).toHaveBeenCalledWith({ + provider: "lmstudio", + baseUrl: "http://localhost:1234", + }) + }) }) describe("ClineProvider - Comprehensive Edit/Delete Edge Cases", () => { diff --git a/src/core/webview/__tests__/webviewMessageHandler.spec.ts b/src/core/webview/__tests__/webviewMessageHandler.spec.ts index 284ee98944..9a1683e464 100644 --- a/src/core/webview/__tests__/webviewMessageHandler.spec.ts +++ b/src/core/webview/__tests__/webviewMessageHandler.spec.ts @@ -94,6 +94,48 @@ vi.mock("../../../utils/fs") vi.mock("../../../utils/path") vi.mock("../../../utils/globalContext") +describe("webviewMessageHandler - requestLmStudioModels", () => { + beforeEach(() => { + vi.clearAllMocks() + mockClineProvider.getState = vi.fn().mockResolvedValue({ + apiConfiguration: { + lmStudioModelId: "model-1", + lmStudioBaseUrl: "http://localhost:1234", + }, + }) + }) + + it("successfully fetches models from LMStudio", async () => { + const mockModels: ModelRecord = { + "model-1": { + maxTokens: 4096, + contextWindow: 8192, + supportsPromptCache: false, + description: "Test model 1", + }, + "model-2": { + maxTokens: 8192, + contextWindow: 16384, + supportsPromptCache: false, + description: "Test model 2", + }, + } + + mockGetModels.mockResolvedValue(mockModels) + + await webviewMessageHandler(mockClineProvider, { + type: "requestLmStudioModels", + }) + + expect(mockGetModels).toHaveBeenCalledWith({ provider: "lmstudio", baseUrl: "http://localhost:1234" }) + + expect(mockClineProvider.postMessageToWebview).toHaveBeenCalledWith({ + type: "lmStudioModels", + lmStudioModels: mockModels, + }) + }) +}) + describe("webviewMessageHandler - requestRouterModels", () => { beforeEach(() => { vi.clearAllMocks() diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts index b1b62229c9..bd1fb2220c 100644 --- a/src/core/webview/webviewMessageHandler.ts +++ b/src/core/webview/webviewMessageHandler.ts @@ -584,7 +584,7 @@ export const webviewMessageHandler = async ( } else if (routerName === "lmstudio" && Object.keys(result.value.models).length > 0) { provider.postMessageToWebview({ type: "lmStudioModels", - lmStudioModels: Object.keys(result.value.models), + lmStudioModels: result.value.models, }) } } else { @@ -648,7 +648,7 @@ export const webviewMessageHandler = async ( if (Object.keys(lmStudioModels).length > 0) { provider.postMessageToWebview({ type: "lmStudioModels", - lmStudioModels: Object.keys(lmStudioModels), + lmStudioModels: lmStudioModels, }) } } catch (error) { diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts index 1e562bb9ee..883e254da5 100644 --- a/src/shared/ExtensionMessage.ts +++ b/src/shared/ExtensionMessage.ts @@ -16,7 +16,7 @@ import { GitCommit } from "../utils/git" import { McpServer } from "./mcp" import { Mode } from "./modes" -import { RouterModels } from "./api" +import { ModelRecord, RouterModels } from "./api" import type { MarketplaceItem } from "@roo-code/types" // Command interface for frontend/backend communication @@ -146,7 +146,7 @@ export interface ExtensionMessage { routerModels?: RouterModels openAiModels?: string[] ollamaModels?: string[] - lmStudioModels?: string[] + lmStudioModels?: ModelRecord vsCodeLmModels?: { vendor?: string; family?: string; version?: string; id?: string }[] huggingFaceModels?: Array<{ id: string diff --git a/webview-ui/src/components/settings/providers/LMStudio.tsx b/webview-ui/src/components/settings/providers/LMStudio.tsx index a907e43e1b..e3401aa62c 100644 --- a/webview-ui/src/components/settings/providers/LMStudio.tsx +++ b/webview-ui/src/components/settings/providers/LMStudio.tsx @@ -12,6 +12,7 @@ import { useRouterModels } from "@src/components/ui/hooks/useRouterModels" import { vscode } from "@src/utils/vscode" import { inputEventTransform } from "../transforms" +import { ModelRecord } from "@roo/api" type LMStudioProps = { apiConfiguration: ProviderSettings @@ -21,7 +22,7 @@ type LMStudioProps = { export const LMStudio = ({ apiConfiguration, setApiConfigurationField }: LMStudioProps) => { const { t } = useAppTranslation() - const [lmStudioModels, setLmStudioModels] = useState([]) + const [lmStudioModels, setLmStudioModels] = useState({}) const routerModels = useRouterModels() const handleInputChange = useCallback( @@ -41,7 +42,7 @@ export const LMStudio = ({ apiConfiguration, setApiConfigurationField }: LMStudi switch (message.type) { case "lmStudioModels": { - const newModels = message.lmStudioModels ?? [] + const newModels = message.lmStudioModels ?? {} setLmStudioModels(newModels) } break @@ -62,7 +63,7 @@ export const LMStudio = ({ apiConfiguration, setApiConfigurationField }: LMStudi if (!selectedModel) return false // Check if model exists in local LM Studio models - if (lmStudioModels.length > 0 && lmStudioModels.includes(selectedModel)) { + if (Object.keys(lmStudioModels).length > 0 && selectedModel in lmStudioModels) { return false // Model is available locally } @@ -83,7 +84,7 @@ export const LMStudio = ({ apiConfiguration, setApiConfigurationField }: LMStudi if (!draftModel) return false // Check if model exists in local LM Studio models - if (lmStudioModels.length > 0 && lmStudioModels.includes(draftModel)) { + if (Object.keys(lmStudioModels).length > 0 && draftModel in lmStudioModels) { return false // Model is available locally } @@ -125,15 +126,15 @@ export const LMStudio = ({ apiConfiguration, setApiConfigurationField }: LMStudi
)} - {lmStudioModels.length > 0 && ( + {Object.keys(lmStudioModels).length > 0 && ( - {lmStudioModels.map((model) => ( + {Object.keys(lmStudioModels).map((model) => ( {model} @@ -175,23 +176,23 @@ export const LMStudio = ({ apiConfiguration, setApiConfigurationField }: LMStudi )} - {lmStudioModels.length > 0 && ( + {Object.keys(lmStudioModels).length > 0 && ( <>
{t("settings:providers.lmStudio.selectDraftModel")}
- {lmStudioModels.map((model) => ( + {Object.keys(lmStudioModels).map((model) => ( {model} ))} - {lmStudioModels.length === 0 && ( + {Object.keys(lmStudioModels).length === 0 && (
+ new Promise((resolve, reject) => { + const cleanup = () => { + window.removeEventListener("message", handler) + } + + const timeout = setTimeout(() => { + cleanup() + reject(new Error("LM Studio models request timed out")) + }, 10000) + + const handler = (event: MessageEvent) => { + const message: ExtensionMessage = event.data + + if (message.type === "lmStudioModels") { + clearTimeout(timeout) + cleanup() + + if (message.lmStudioModels) { + resolve(message.lmStudioModels) + } else { + reject(new Error("No LMStudio models in response")) + } + } + } + + window.addEventListener("message", handler) + vscode.postMessage({ type: "requestLmStudioModels" }) + }) + +export const useLmStudioModels = (modelId?: string) => + useQuery({ queryKey: ["lmStudioModels"], queryFn: () => (modelId ? getLmStudioModels() : {}) }) diff --git a/webview-ui/src/components/ui/hooks/useSelectedModel.ts b/webview-ui/src/components/ui/hooks/useSelectedModel.ts index 6bda83ab94..0bd4fe047c 100644 --- a/webview-ui/src/components/ui/hooks/useSelectedModel.ts +++ b/webview-ui/src/components/ui/hooks/useSelectedModel.ts @@ -40,20 +40,24 @@ import { doubaoDefaultModelId, } from "@roo-code/types" -import type { RouterModels } from "@roo/api" +import type { ModelRecord, RouterModels } from "@roo/api" import { useRouterModels } from "./useRouterModels" import { useOpenRouterModelProviders } from "./useOpenRouterModelProviders" +import { useLmStudioModels } from "./useLmStudioModels" export const useSelectedModel = (apiConfiguration?: ProviderSettings) => { const provider = apiConfiguration?.apiProvider || "anthropic" const openRouterModelId = provider === "openrouter" ? apiConfiguration?.openRouterModelId : undefined + const lmStudioModelId = provider === "lmstudio" ? apiConfiguration?.lmStudioModelId : undefined const routerModels = useRouterModels() const openRouterModelProviders = useOpenRouterModelProviders(openRouterModelId) + const lmStudioModels = useLmStudioModels(lmStudioModelId) const { id, info } = apiConfiguration && + (typeof lmStudioModelId === "undefined" || typeof lmStudioModels.data !== "undefined") && typeof routerModels.data !== "undefined" && typeof openRouterModelProviders.data !== "undefined" ? getSelectedModel({ @@ -61,6 +65,7 @@ export const useSelectedModel = (apiConfiguration?: ProviderSettings) => { apiConfiguration, routerModels: routerModels.data, openRouterModelProviders: openRouterModelProviders.data, + lmStudioModels: lmStudioModels.data, }) : { id: anthropicDefaultModelId, info: undefined } @@ -68,8 +73,14 @@ export const useSelectedModel = (apiConfiguration?: ProviderSettings) => { provider, id, info, - isLoading: routerModels.isLoading || openRouterModelProviders.isLoading, - isError: routerModels.isError || openRouterModelProviders.isError, + isLoading: + routerModels.isLoading || + openRouterModelProviders.isLoading || + (apiConfiguration?.lmStudioModelId && lmStudioModels!.isLoading), + isError: + routerModels.isError || + openRouterModelProviders.isError || + (apiConfiguration?.lmStudioModelId && lmStudioModels!.isError), } } @@ -78,11 +89,13 @@ function getSelectedModel({ apiConfiguration, routerModels, openRouterModelProviders, + lmStudioModels, }: { provider: ProviderName apiConfiguration: ProviderSettings routerModels: RouterModels openRouterModelProviders: Record + lmStudioModels: ModelRecord | undefined }): { id: string; info: ModelInfo | undefined } { // the `undefined` case are used to show the invalid selection to prevent // users from seeing the default model if their selection is invalid @@ -213,7 +226,7 @@ function getSelectedModel({ } case "lmstudio": { const id = apiConfiguration.lmStudioModelId ?? "" - const info = routerModels.lmstudio && routerModels.lmstudio[id] + const info = lmStudioModels && lmStudioModels[apiConfiguration.lmStudioModelId!] return { id, info: info || undefined, From 1da82b2db0c364b88f8684f5fcd4182b803af176 Mon Sep 17 00:00:00 2001 From: Chris Hasson Date: Thu, 31 Jul 2025 21:33:09 +0200 Subject: [PATCH 030/253] Add auto-approved cost limits (#6484) Co-authored-by: Daniel Riccio --- packages/types/src/global-settings.ts | 1 + src/core/task/AutoApprovalHandler.ts | 144 ++++++++++ src/core/task/Task.ts | 24 +- .../__tests__/AutoApprovalHandler.spec.ts | 249 ++++++++++++++++++ src/core/webview/ClineProvider.ts | 3 + src/core/webview/webviewMessageHandler.ts | 4 + src/shared/ExtensionMessage.ts | 1 + src/shared/WebviewMessage.ts | 1 + .../src/components/chat/AutoApproveMenu.tsx | 47 +--- .../chat/AutoApprovedRequestLimitWarning.tsx | 19 +- .../common/DecoratedVSCodeTextField.tsx | 92 +++++++ .../components/common/FormattedTextField.tsx | 119 +++++++++ .../__tests__/FormattedTextField.spec.tsx | 219 +++++++++++++++ .../settings/AutoApproveSettings.tsx | 13 + .../src/components/settings/MaxCostInput.tsx | 41 +++ .../components/settings/MaxLimitInputs.tsx | 32 +++ .../components/settings/MaxRequestsInput.tsx | 40 +++ .../src/components/settings/SettingsView.tsx | 2 + .../settings/__tests__/MaxCostInput.spec.tsx | 84 ++++++ .../__tests__/MaxRequestsInput.spec.tsx | 87 ++++++ .../src/context/ExtensionStateContext.tsx | 2 + webview-ui/src/i18n/locales/ca/chat.json | 5 + webview-ui/src/i18n/locales/ca/settings.json | 10 +- webview-ui/src/i18n/locales/de/chat.json | 5 + webview-ui/src/i18n/locales/de/settings.json | 10 +- webview-ui/src/i18n/locales/en/chat.json | 5 + webview-ui/src/i18n/locales/en/settings.json | 10 +- webview-ui/src/i18n/locales/es/chat.json | 5 + webview-ui/src/i18n/locales/es/settings.json | 10 +- webview-ui/src/i18n/locales/fr/chat.json | 5 + webview-ui/src/i18n/locales/fr/settings.json | 8 +- webview-ui/src/i18n/locales/hi/chat.json | 5 + webview-ui/src/i18n/locales/hi/settings.json | 10 +- webview-ui/src/i18n/locales/id/chat.json | 5 + webview-ui/src/i18n/locales/id/settings.json | 10 +- webview-ui/src/i18n/locales/it/chat.json | 5 + webview-ui/src/i18n/locales/it/settings.json | 10 +- webview-ui/src/i18n/locales/ja/chat.json | 5 + webview-ui/src/i18n/locales/ja/settings.json | 10 +- webview-ui/src/i18n/locales/ko/chat.json | 5 + webview-ui/src/i18n/locales/ko/settings.json | 10 +- webview-ui/src/i18n/locales/nl/chat.json | 5 + webview-ui/src/i18n/locales/nl/settings.json | 10 +- webview-ui/src/i18n/locales/pl/chat.json | 5 + webview-ui/src/i18n/locales/pl/settings.json | 10 +- webview-ui/src/i18n/locales/pt-BR/chat.json | 5 + .../src/i18n/locales/pt-BR/settings.json | 10 +- webview-ui/src/i18n/locales/ru/chat.json | 5 + webview-ui/src/i18n/locales/ru/settings.json | 10 +- webview-ui/src/i18n/locales/tr/chat.json | 5 + webview-ui/src/i18n/locales/tr/settings.json | 10 +- webview-ui/src/i18n/locales/vi/chat.json | 5 + webview-ui/src/i18n/locales/vi/settings.json | 10 +- webview-ui/src/i18n/locales/zh-CN/chat.json | 5 + .../src/i18n/locales/zh-CN/settings.json | 10 +- webview-ui/src/i18n/locales/zh-TW/chat.json | 5 + .../src/i18n/locales/zh-TW/settings.json | 10 +- 57 files changed, 1404 insertions(+), 88 deletions(-) create mode 100644 src/core/task/AutoApprovalHandler.ts create mode 100644 src/core/task/__tests__/AutoApprovalHandler.spec.ts create mode 100644 webview-ui/src/components/common/DecoratedVSCodeTextField.tsx create mode 100644 webview-ui/src/components/common/FormattedTextField.tsx create mode 100644 webview-ui/src/components/common/__tests__/FormattedTextField.spec.tsx create mode 100644 webview-ui/src/components/settings/MaxCostInput.tsx create mode 100644 webview-ui/src/components/settings/MaxLimitInputs.tsx create mode 100644 webview-ui/src/components/settings/MaxRequestsInput.tsx create mode 100644 webview-ui/src/components/settings/__tests__/MaxCostInput.spec.tsx create mode 100644 webview-ui/src/components/settings/__tests__/MaxRequestsInput.spec.tsx diff --git a/packages/types/src/global-settings.ts b/packages/types/src/global-settings.ts index 8916263d5d..82f1426349 100644 --- a/packages/types/src/global-settings.ts +++ b/packages/types/src/global-settings.ts @@ -68,6 +68,7 @@ export const globalSettingsSchema = z.object({ commandTimeoutAllowlist: z.array(z.string()).optional(), preventCompletionWithOpenTodos: z.boolean().optional(), allowedMaxRequests: z.number().nullish(), + allowedMaxCost: z.number().nullish(), autoCondenseContext: z.boolean().optional(), autoCondenseContextPercent: z.number().optional(), maxConcurrentFileReads: z.number().optional(), diff --git a/src/core/task/AutoApprovalHandler.ts b/src/core/task/AutoApprovalHandler.ts new file mode 100644 index 0000000000..33821ddfa2 --- /dev/null +++ b/src/core/task/AutoApprovalHandler.ts @@ -0,0 +1,144 @@ +import { GlobalState, ClineMessage, ClineAsk } from "@roo-code/types" +import { getApiMetrics } from "../../shared/getApiMetrics" +import { ClineAskResponse } from "../../shared/WebviewMessage" + +export interface AutoApprovalResult { + shouldProceed: boolean + requiresApproval: boolean + approvalType?: "requests" | "cost" + approvalCount?: number | string +} + +export class AutoApprovalHandler { + private consecutiveAutoApprovedRequestsCount: number = 0 + private consecutiveAutoApprovedCost: number = 0 + + /** + * Check if auto-approval limits have been reached and handle user approval if needed + */ + async checkAutoApprovalLimits( + state: GlobalState | undefined, + messages: ClineMessage[], + askForApproval: ( + type: ClineAsk, + data: string, + ) => Promise<{ response: ClineAskResponse; text?: string; images?: string[] }>, + ): Promise { + // Check request count limit + const requestResult = await this.checkRequestLimit(state, askForApproval) + if (!requestResult.shouldProceed || requestResult.requiresApproval) { + return requestResult + } + + // Check cost limit + const costResult = await this.checkCostLimit(state, messages, askForApproval) + return costResult + } + + /** + * Increment the request counter and check if limit is exceeded + */ + private async checkRequestLimit( + state: GlobalState | undefined, + askForApproval: ( + type: ClineAsk, + data: string, + ) => Promise<{ response: ClineAskResponse; text?: string; images?: string[] }>, + ): Promise { + const maxRequests = state?.allowedMaxRequests || Infinity + + // Increment the counter for each new API request + this.consecutiveAutoApprovedRequestsCount++ + + if (this.consecutiveAutoApprovedRequestsCount > maxRequests) { + const { response } = await askForApproval( + "auto_approval_max_req_reached", + JSON.stringify({ count: maxRequests, type: "requests" }), + ) + + // If we get past the promise, it means the user approved and did not start a new task + if (response === "yesButtonClicked") { + this.consecutiveAutoApprovedRequestsCount = 0 + return { + shouldProceed: true, + requiresApproval: true, + approvalType: "requests", + approvalCount: maxRequests, + } + } + + return { + shouldProceed: false, + requiresApproval: true, + approvalType: "requests", + approvalCount: maxRequests, + } + } + + return { shouldProceed: true, requiresApproval: false } + } + + /** + * Calculate current cost and check if limit is exceeded + */ + private async checkCostLimit( + state: GlobalState | undefined, + messages: ClineMessage[], + askForApproval: ( + type: ClineAsk, + data: string, + ) => Promise<{ response: ClineAskResponse; text?: string; images?: string[] }>, + ): Promise { + const maxCost = state?.allowedMaxCost || Infinity + + // Calculate total cost from messages + this.consecutiveAutoApprovedCost = getApiMetrics(messages).totalCost + + // Use epsilon for floating-point comparison to avoid precision issues + const EPSILON = 0.0001 + if (this.consecutiveAutoApprovedCost > maxCost + EPSILON) { + const { response } = await askForApproval( + "auto_approval_max_req_reached", + JSON.stringify({ count: maxCost.toFixed(2), type: "cost" }), + ) + + // If we get past the promise, it means the user approved and did not start a new task + if (response === "yesButtonClicked") { + // Note: We don't reset the cost to 0 here because the actual cost + // is calculated from the messages. This is different from the request count. + return { + shouldProceed: true, + requiresApproval: true, + approvalType: "cost", + approvalCount: maxCost.toFixed(2), + } + } + + return { + shouldProceed: false, + requiresApproval: true, + approvalType: "cost", + approvalCount: maxCost.toFixed(2), + } + } + + return { shouldProceed: true, requiresApproval: false } + } + + /** + * Reset the request counter (typically called when starting a new task) + */ + resetRequestCount(): void { + this.consecutiveAutoApprovedRequestsCount = 0 + } + + /** + * Get current approval state for debugging/testing + */ + getApprovalState(): { requestCount: number; currentCost: number } { + return { + requestCount: this.consecutiveAutoApprovedRequestsCount, + currentCost: this.consecutiveAutoApprovedCost, + } + } +} diff --git a/src/core/task/Task.ts b/src/core/task/Task.ts index 9d68640fd8..9df9a225d1 100644 --- a/src/core/task/Task.ts +++ b/src/core/task/Task.ts @@ -92,6 +92,7 @@ import { ApiMessage } from "../task-persistence/apiMessages" import { getMessagesSinceLastSummary, summarizeConversation } from "../condense" import { maybeRemoveImageBlocks } from "../../api/transform/image-cleaning" import { restoreTodoListForTask } from "../tools/updateTodoListTool" +import { AutoApprovalHandler } from "./AutoApprovalHandler" const MAX_EXPONENTIAL_BACKOFF_SECONDS = 600 // 10 minutes @@ -199,7 +200,7 @@ export class Task extends EventEmitter { readonly apiConfiguration: ProviderSettings api: ApiHandler private static lastGlobalApiRequestTime?: number - private consecutiveAutoApprovedRequestsCount: number = 0 + private autoApprovalHandler: AutoApprovalHandler /** * Reset the global API request timestamp. This should only be used for testing. @@ -302,6 +303,7 @@ export class Task extends EventEmitter { this.apiConfiguration = apiConfiguration this.api = buildApiHandler(apiConfiguration) + this.autoApprovalHandler = new AutoApprovalHandler() this.urlContentFetcher = new UrlContentFetcher(provider.context) this.browserSession = new BrowserSession(provider.context) @@ -1968,18 +1970,16 @@ export class Task extends EventEmitter { ({ role, content }) => ({ role, content }), ) - // Check if we've reached the maximum number of auto-approved requests - const maxRequests = state?.allowedMaxRequests || Infinity + // Check auto-approval limits + const approvalResult = await this.autoApprovalHandler.checkAutoApprovalLimits( + state, + this.combineMessages(this.clineMessages.slice(1)), + async (type, data) => this.ask(type, data), + ) - // Increment the counter for each new API request - this.consecutiveAutoApprovedRequestsCount++ - - if (this.consecutiveAutoApprovedRequestsCount > maxRequests) { - const { response } = await this.ask("auto_approval_max_req_reached", JSON.stringify({ count: maxRequests })) - // If we get past the promise, it means the user approved and did not start a new task - if (response === "yesButtonClicked") { - this.consecutiveAutoApprovedRequestsCount = 0 - } + if (!approvalResult.shouldProceed) { + // User did not approve, task should be aborted + throw new Error("Auto-approval limit reached and user did not approve continuation") } const metadata: ApiHandlerCreateMessageMetadata = { diff --git a/src/core/task/__tests__/AutoApprovalHandler.spec.ts b/src/core/task/__tests__/AutoApprovalHandler.spec.ts new file mode 100644 index 0000000000..e200948a33 --- /dev/null +++ b/src/core/task/__tests__/AutoApprovalHandler.spec.ts @@ -0,0 +1,249 @@ +import { describe, it, expect, vi, beforeEach } from "vitest" +import { AutoApprovalHandler } from "../AutoApprovalHandler" +import { GlobalState, ClineMessage } from "@roo-code/types" + +// Mock getApiMetrics +vi.mock("../../../shared/getApiMetrics", () => ({ + getApiMetrics: vi.fn(), +})) + +import { getApiMetrics } from "../../../shared/getApiMetrics" + +describe("AutoApprovalHandler", () => { + let handler: AutoApprovalHandler + let mockAskForApproval: any + let mockState: GlobalState + const mockGetApiMetrics = getApiMetrics as any + + beforeEach(() => { + handler = new AutoApprovalHandler() + mockAskForApproval = vi.fn() + mockState = {} as GlobalState + vi.clearAllMocks() + + // Default mock for getApiMetrics + mockGetApiMetrics.mockReturnValue({ totalCost: 0 }) + }) + + describe("checkAutoApprovalLimits", () => { + it("should proceed when no limits are set", async () => { + const messages: ClineMessage[] = [] + const result = await handler.checkAutoApprovalLimits(mockState, messages, mockAskForApproval) + + expect(result.shouldProceed).toBe(true) + expect(result.requiresApproval).toBe(false) + expect(mockAskForApproval).not.toHaveBeenCalled() + }) + + it("should check request limit before cost limit", async () => { + mockState.allowedMaxRequests = 1 + mockState.allowedMaxCost = 10 + const messages: ClineMessage[] = [] + + // First call should be under limit + const result1 = await handler.checkAutoApprovalLimits(mockState, messages, mockAskForApproval) + expect(result1.shouldProceed).toBe(true) + expect(result1.requiresApproval).toBe(false) + + // Second call should trigger request limit + mockAskForApproval.mockResolvedValue({ response: "yesButtonClicked" }) + const result2 = await handler.checkAutoApprovalLimits(mockState, messages, mockAskForApproval) + + expect(mockAskForApproval).toHaveBeenCalledWith( + "auto_approval_max_req_reached", + JSON.stringify({ count: 1, type: "requests" }), + ) + expect(result2.shouldProceed).toBe(true) + expect(result2.requiresApproval).toBe(true) + expect(result2.approvalType).toBe("requests") + }) + }) + + describe("request limit handling", () => { + beforeEach(() => { + mockState.allowedMaxRequests = 3 + }) + + it("should increment request count on each check", async () => { + const messages: ClineMessage[] = [] + + // Check state after each call + for (let i = 1; i <= 3; i++) { + await handler.checkAutoApprovalLimits(mockState, messages, mockAskForApproval) + const state = handler.getApprovalState() + expect(state.requestCount).toBe(i) + } + }) + + it("should ask for approval when limit is exceeded", async () => { + const messages: ClineMessage[] = [] + + // Make 3 requests (within limit) + for (let i = 0; i < 3; i++) { + await handler.checkAutoApprovalLimits(mockState, messages, mockAskForApproval) + } + expect(mockAskForApproval).not.toHaveBeenCalled() + + // 4th request should trigger approval + mockAskForApproval.mockResolvedValue({ response: "yesButtonClicked" }) + const result = await handler.checkAutoApprovalLimits(mockState, messages, mockAskForApproval) + + expect(mockAskForApproval).toHaveBeenCalledWith( + "auto_approval_max_req_reached", + JSON.stringify({ count: 3, type: "requests" }), + ) + expect(result.shouldProceed).toBe(true) + expect(result.requiresApproval).toBe(true) + }) + + it("should reset count when user approves", async () => { + const messages: ClineMessage[] = [] + + // Exceed limit + for (let i = 0; i < 3; i++) { + await handler.checkAutoApprovalLimits(mockState, messages, mockAskForApproval) + } + + // 4th request should trigger approval and reset + mockAskForApproval.mockResolvedValue({ response: "yesButtonClicked" }) + await handler.checkAutoApprovalLimits(mockState, messages, mockAskForApproval) + + // Count should be reset + const state = handler.getApprovalState() + expect(state.requestCount).toBe(0) + }) + + it("should not proceed when user rejects", async () => { + const messages: ClineMessage[] = [] + + // Exceed limit + for (let i = 0; i < 3; i++) { + await handler.checkAutoApprovalLimits(mockState, messages, mockAskForApproval) + } + + // 4th request with rejection + mockAskForApproval.mockResolvedValue({ response: "noButtonClicked" }) + const result = await handler.checkAutoApprovalLimits(mockState, messages, mockAskForApproval) + + expect(result.shouldProceed).toBe(false) + expect(result.requiresApproval).toBe(true) + }) + }) + + describe("cost limit handling", () => { + beforeEach(() => { + mockState.allowedMaxCost = 5.0 + }) + + it("should calculate cost from messages", async () => { + const messages: ClineMessage[] = [] + + mockGetApiMetrics.mockReturnValue({ totalCost: 3.5 }) + const result = await handler.checkAutoApprovalLimits(mockState, messages, mockAskForApproval) + + expect(mockGetApiMetrics).toHaveBeenCalledWith(messages) + expect(result.shouldProceed).toBe(true) + expect(result.requiresApproval).toBe(false) + }) + + it("should ask for approval when cost limit is exceeded", async () => { + const messages: ClineMessage[] = [] + + mockGetApiMetrics.mockReturnValue({ totalCost: 5.5 }) + mockAskForApproval.mockResolvedValue({ response: "yesButtonClicked" }) + + const result = await handler.checkAutoApprovalLimits(mockState, messages, mockAskForApproval) + + expect(mockAskForApproval).toHaveBeenCalledWith( + "auto_approval_max_req_reached", + JSON.stringify({ count: "5.00", type: "cost" }), + ) + expect(result.shouldProceed).toBe(true) + expect(result.requiresApproval).toBe(true) + expect(result.approvalType).toBe("cost") + }) + + it("should handle floating-point precision correctly", async () => { + const messages: ClineMessage[] = [] + + // Test edge case where cost is exactly at limit (should not trigger) + mockGetApiMetrics.mockReturnValue({ totalCost: 5.0 }) + const result1 = await handler.checkAutoApprovalLimits(mockState, messages, mockAskForApproval) + expect(result1.requiresApproval).toBe(false) + + // Test with slight floating-point error (should not trigger) + mockGetApiMetrics.mockReturnValue({ totalCost: 5.00009 }) + const result2 = await handler.checkAutoApprovalLimits(mockState, messages, mockAskForApproval) + expect(result2.requiresApproval).toBe(false) + + // Test when actually exceeded (should trigger) + mockGetApiMetrics.mockReturnValue({ totalCost: 5.001 }) + mockAskForApproval.mockResolvedValue({ response: "yesButtonClicked" }) + const result3 = await handler.checkAutoApprovalLimits(mockState, messages, mockAskForApproval) + expect(result3.requiresApproval).toBe(true) + }) + + it("should not reset cost to zero on approval", async () => { + const messages: ClineMessage[] = [] + + mockGetApiMetrics.mockReturnValue({ totalCost: 6.0 }) + mockAskForApproval.mockResolvedValue({ response: "yesButtonClicked" }) + + await handler.checkAutoApprovalLimits(mockState, messages, mockAskForApproval) + + // Cost should still be calculated from messages, not reset + const state = handler.getApprovalState() + expect(state.currentCost).toBe(6.0) + }) + }) + + describe("combined limits", () => { + it("should handle both request and cost limits", async () => { + mockState.allowedMaxRequests = 2 + mockState.allowedMaxCost = 10.0 + const messages: ClineMessage[] = [] + + mockGetApiMetrics.mockReturnValue({ totalCost: 3.0 }) + + // First two requests should pass + for (let i = 0; i < 2; i++) { + const result = await handler.checkAutoApprovalLimits(mockState, messages, mockAskForApproval) + expect(result.shouldProceed).toBe(true) + expect(result.requiresApproval).toBe(false) + } + + // Third request should trigger request limit (not cost limit) + mockAskForApproval.mockResolvedValue({ response: "yesButtonClicked" }) + const result = await handler.checkAutoApprovalLimits(mockState, messages, mockAskForApproval) + + expect(mockAskForApproval).toHaveBeenCalledWith( + "auto_approval_max_req_reached", + JSON.stringify({ count: 2, type: "requests" }), + ) + expect(result.shouldProceed).toBe(true) + expect(result.requiresApproval).toBe(true) + expect(result.approvalType).toBe("requests") + }) + }) + + describe("resetRequestCount", () => { + it("should reset the request counter", async () => { + mockState.allowedMaxRequests = 5 + const messages: ClineMessage[] = [] + + // Make some requests + for (let i = 0; i < 3; i++) { + await handler.checkAutoApprovalLimits(mockState, messages, mockAskForApproval) + } + + let state = handler.getApprovalState() + expect(state.requestCount).toBe(3) + + // Reset + handler.resetRequestCount() + + state = handler.getApprovalState() + expect(state.requestCount).toBe(0) + }) + }) +}) diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index 686066f214..99c2a514b2 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -1467,6 +1467,7 @@ export class ClineProvider alwaysAllowSubtasks, alwaysAllowUpdateTodoList, allowedMaxRequests, + allowedMaxCost, autoCondenseContext, autoCondenseContextPercent, soundEnabled, @@ -1562,6 +1563,7 @@ export class ClineProvider alwaysAllowSubtasks: alwaysAllowSubtasks ?? false, alwaysAllowUpdateTodoList: alwaysAllowUpdateTodoList ?? false, allowedMaxRequests, + allowedMaxCost, autoCondenseContext: autoCondenseContext ?? true, autoCondenseContextPercent: autoCondenseContextPercent ?? 100, uriScheme: vscode.env.uriScheme, @@ -1758,6 +1760,7 @@ export class ClineProvider followupAutoApproveTimeoutMs: stateValues.followupAutoApproveTimeoutMs ?? 60000, diagnosticsEnabled: stateValues.diagnosticsEnabled ?? true, allowedMaxRequests: stateValues.allowedMaxRequests, + allowedMaxCost: stateValues.allowedMaxCost, autoCondenseContext: stateValues.autoCondenseContext ?? true, autoCondenseContextPercent: stateValues.autoCondenseContextPercent ?? 100, taskHistory: stateValues.taskHistory, diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts index bd1fb2220c..fdb7e90425 100644 --- a/src/core/webview/webviewMessageHandler.ts +++ b/src/core/webview/webviewMessageHandler.ts @@ -332,6 +332,10 @@ export const webviewMessageHandler = async ( await updateGlobalState("allowedMaxRequests", message.value) await provider.postStateToWebview() break + case "allowedMaxCost": + await updateGlobalState("allowedMaxCost", message.value) + await provider.postStateToWebview() + break case "alwaysAllowSubtasks": await updateGlobalState("alwaysAllowSubtasks", message.bool) await provider.postStateToWebview() diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts index 883e254da5..930edeac73 100644 --- a/src/shared/ExtensionMessage.ts +++ b/src/shared/ExtensionMessage.ts @@ -222,6 +222,7 @@ export type ExtensionState = Pick< | "allowedCommands" | "deniedCommands" | "allowedMaxRequests" + | "allowedMaxCost" | "browserToolEnabled" | "browserViewportSize" | "screenshotQuality" diff --git a/src/shared/WebviewMessage.ts b/src/shared/WebviewMessage.ts index 0b0cc06880..cb8759d851 100644 --- a/src/shared/WebviewMessage.ts +++ b/src/shared/WebviewMessage.ts @@ -80,6 +80,7 @@ export interface WebviewMessage { | "alwaysAllowMcp" | "alwaysAllowModeSwitch" | "allowedMaxRequests" + | "allowedMaxCost" | "alwaysAllowSubtasks" | "alwaysAllowUpdateTodoList" | "autoCondenseContext" diff --git a/webview-ui/src/components/chat/AutoApproveMenu.tsx b/webview-ui/src/components/chat/AutoApproveMenu.tsx index 0feafae15d..c97af13593 100644 --- a/webview-ui/src/components/chat/AutoApproveMenu.tsx +++ b/webview-ui/src/components/chat/AutoApproveMenu.tsx @@ -1,11 +1,12 @@ import { memo, useCallback, useMemo, useState } from "react" import { Trans } from "react-i18next" -import { VSCodeCheckbox, VSCodeLink, VSCodeTextField } from "@vscode/webview-ui-toolkit/react" +import { VSCodeCheckbox, VSCodeLink } from "@vscode/webview-ui-toolkit/react" import { vscode } from "@src/utils/vscode" import { useExtensionState } from "@src/context/ExtensionStateContext" import { useAppTranslation } from "@src/i18n/TranslationContext" import { AutoApproveToggle, AutoApproveSetting, autoApproveSettingsConfig } from "../settings/AutoApproveToggle" +import { MaxLimitInputs } from "../settings/MaxLimitInputs" import { StandardTooltip } from "@src/components/ui" import { useAutoApprovalState } from "@src/hooks/useAutoApprovalState" import { useAutoApprovalToggles } from "@src/hooks/useAutoApprovalToggles" @@ -22,6 +23,7 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => { setAutoApprovalEnabled, alwaysApproveResubmit, allowedMaxRequests, + allowedMaxCost, setAlwaysAllowReadOnly, setAlwaysAllowWrite, setAlwaysAllowExecute, @@ -33,6 +35,7 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => { setAlwaysAllowFollowupQuestions, setAlwaysAllowUpdateTodoList, setAllowedMaxRequests, + setAllowedMaxCost, } = useExtensionState() const { t } = useAppTranslation() @@ -243,42 +246,12 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => { - {/* Auto-approve API request count limit input row inspired by Cline */} -
- - : - - { - const input = e.target as HTMLInputElement - // Remove any non-numeric characters - input.value = input.value.replace(/[^0-9]/g, "") - const value = parseInt(input.value) - const parsedValue = !isNaN(value) && value > 0 ? value : undefined - setAllowedMaxRequests(parsedValue) - vscode.postMessage({ type: "allowedMaxRequests", value: parsedValue }) - }} - style={{ flex: 1 }} - /> -
-
- -
+ setAllowedMaxRequests(value)} + onMaxCostChange={(value) => setAllowedMaxCost(value)} + />
)} diff --git a/webview-ui/src/components/chat/AutoApprovedRequestLimitWarning.tsx b/webview-ui/src/components/chat/AutoApprovedRequestLimitWarning.tsx index 1c454e0082..6f019a84c8 100644 --- a/webview-ui/src/components/chat/AutoApprovedRequestLimitWarning.tsx +++ b/webview-ui/src/components/chat/AutoApprovedRequestLimitWarning.tsx @@ -12,18 +12,29 @@ type AutoApprovedRequestLimitWarningProps = { export const AutoApprovedRequestLimitWarning = memo(({ message }: AutoApprovedRequestLimitWarningProps) => { const [buttonClicked, setButtonClicked] = useState(false) - const { count } = JSON.parse(message.text ?? "{}") + const { count, type = "requests" } = JSON.parse(message.text ?? "{}") if (buttonClicked) { return null } + const isCostLimit = type === "cost" + const titleKey = isCostLimit + ? "ask.autoApprovedCostLimitReached.title" + : "ask.autoApprovedRequestLimitReached.title" + const descriptionKey = isCostLimit + ? "ask.autoApprovedCostLimitReached.description" + : "ask.autoApprovedRequestLimitReached.description" + const buttonKey = isCostLimit + ? "ask.autoApprovedCostLimitReached.button" + : "ask.autoApprovedRequestLimitReached.button" + return ( <>
- +
@@ -37,7 +48,7 @@ export const AutoApprovedRequestLimitWarning = memo(({ message }: AutoApprovedRe justifyContent: "center", }}>
- +
- + diff --git a/webview-ui/src/components/common/DecoratedVSCodeTextField.tsx b/webview-ui/src/components/common/DecoratedVSCodeTextField.tsx new file mode 100644 index 0000000000..5e03525ccb --- /dev/null +++ b/webview-ui/src/components/common/DecoratedVSCodeTextField.tsx @@ -0,0 +1,92 @@ +import { cn } from "@/lib/utils" +import { VSCodeTextField } from "@vscode/webview-ui-toolkit/react" +import { forwardRef, useCallback, useRef, ReactNode, ComponentRef, ComponentProps } from "react" + +// Type for web components that have shadow DOM +interface WebComponentWithShadowRoot extends HTMLElement { + shadowRoot: ShadowRoot | null +} + +export interface VSCodeTextFieldWithNodesProps extends ComponentProps { + leftNodes?: ReactNode[] + rightNodes?: ReactNode[] +} + +function VSCodeTextFieldWithNodesInner( + props: VSCodeTextFieldWithNodesProps, + forwardedRef: React.Ref, +) { + const { className, style, "data-testid": dataTestId, leftNodes, rightNodes, ...restProps } = props + + const inputRef = useRef(null) + + // Callback ref to get access to the underlying input element. + // VSCodeTextField doesn't expose this directly so we have to query for it! + const handleVSCodeFieldRef = useCallback( + (element: ComponentRef) => { + if (!element) return + + const webComponent = element as unknown as WebComponentWithShadowRoot + const inputElement = + webComponent.shadowRoot?.querySelector?.("input") || webComponent.querySelector?.("input") + if (inputElement && inputElement instanceof HTMLInputElement) { + inputRef.current = inputElement + if (typeof forwardedRef === "function") { + forwardedRef?.(inputElement) + } else if (forwardedRef) { + ;(forwardedRef as React.MutableRefObject).current = inputElement + } + } + }, + [forwardedRef], + ) + + const focusInput = useCallback(async () => { + if (inputRef.current && document.activeElement !== inputRef.current) { + setTimeout(() => { + inputRef.current?.focus() + }) + } + }, []) + + const hasLeftNodes = leftNodes && leftNodes.filter(Boolean).length > 0 + const hasRightNodes = rightNodes && rightNodes.filter(Boolean).length > 0 + + return ( +
+ {hasLeftNodes && ( +
{leftNodes}
+ )} + + + + {hasRightNodes && ( +
{rightNodes}
+ )} + + {/* Absolutely positioned focus border overlay */} +
+
+ ) +} + +export const DecoratedVSCodeTextField = forwardRef(VSCodeTextFieldWithNodesInner) diff --git a/webview-ui/src/components/common/FormattedTextField.tsx b/webview-ui/src/components/common/FormattedTextField.tsx new file mode 100644 index 0000000000..6e952bd769 --- /dev/null +++ b/webview-ui/src/components/common/FormattedTextField.tsx @@ -0,0 +1,119 @@ +import { useCallback, forwardRef, useState, useEffect } from "react" +import { DecoratedVSCodeTextField, VSCodeTextFieldWithNodesProps } from "./DecoratedVSCodeTextField" + +export interface InputFormatter { + /** + * Parse the raw input string into the typed value + */ + parse: (input: string) => T | undefined + + /** + * Format the typed value for display in the input field + */ + format: (value: T | undefined) => string + + /** + * Filter/transform the input as the user types (optional) + */ + filter?: (input: string) => string +} + +interface FormattedTextFieldProps extends Omit { + value: T | undefined + onValueChange: (value: T | undefined) => void + formatter: InputFormatter +} + +function FormattedTextFieldInner( + { value, onValueChange, formatter, ...restProps }: FormattedTextFieldProps, + forwardedRef: React.Ref, +) { + const [rawInput, setRawInput] = useState("") + const [isTyping, setIsTyping] = useState(false) + + // Update raw input when external value changes (but not when we're actively typing) + useEffect(() => { + if (!isTyping) { + setRawInput(formatter.format(value)) + } + }, [value, formatter, isTyping]) + + const handleInput = useCallback( + (e: React.FormEvent) => { + const input = e.target as HTMLInputElement + setIsTyping(true) + + let filteredValue = input.value + if (formatter.filter) { + filteredValue = formatter.filter(input.value) + input.value = filteredValue + } + + setRawInput(filteredValue) + const parsedValue = formatter.parse(filteredValue) + onValueChange(parsedValue) + }, + [formatter, onValueChange], + ) + + const handleBlur = useCallback(() => { + setIsTyping(false) + // On blur, format the value properly + setRawInput(formatter.format(value)) + }, [formatter, value]) + + const displayValue = isTyping ? rawInput : formatter.format(value) + + return ( + + ) +} + +export const FormattedTextField = forwardRef(FormattedTextFieldInner as any) as ( + props: FormattedTextFieldProps & { ref?: React.Ref }, +) => React.ReactElement + +// Common formatters for reuse +export const unlimitedIntegerFormatter: InputFormatter = { + parse: (input: string) => { + if (input.trim() === "") return undefined + const value = parseInt(input) + return !isNaN(value) && value > 0 ? value : undefined + }, + format: (value: number | undefined) => { + return value === undefined || value === Infinity ? "" : value.toString() + }, + filter: (input: string) => input.replace(/[^0-9]/g, ""), +} + +export const unlimitedDecimalFormatter: InputFormatter = { + parse: (input: string) => { + if (input.trim() === "") return undefined + const value = parseFloat(input) + return !isNaN(value) && value >= 0 ? value : undefined + }, + format: (value: number | undefined) => { + return value === undefined || value === Infinity ? "" : value.toString() + }, + filter: (input: string) => { + // Remove all non-numeric and non-dot characters + let cleanValue = input.replace(/[^0-9.]/g, "") + + // Handle multiple dots - keep only the first one + const firstDotIndex = cleanValue.indexOf(".") + if (firstDotIndex !== -1) { + // Keep everything up to and including the first dot, then remove any additional dots + const beforeDot = cleanValue.substring(0, firstDotIndex + 1) + const afterDot = cleanValue.substring(firstDotIndex + 1).replace(/\./g, "") + cleanValue = beforeDot + afterDot + } + + return cleanValue + }, +} diff --git a/webview-ui/src/components/common/__tests__/FormattedTextField.spec.tsx b/webview-ui/src/components/common/__tests__/FormattedTextField.spec.tsx new file mode 100644 index 0000000000..637a0b5061 --- /dev/null +++ b/webview-ui/src/components/common/__tests__/FormattedTextField.spec.tsx @@ -0,0 +1,219 @@ +import React from "react" +import { describe, it, expect, vi } from "vitest" +import { render, screen, fireEvent } from "@testing-library/react" +import { FormattedTextField, unlimitedIntegerFormatter, unlimitedDecimalFormatter } from "../FormattedTextField" + +// Mock VSCodeTextField to render as regular HTML input for testing +vi.mock("@vscode/webview-ui-toolkit/react", () => ({ + VSCodeTextField: ({ value, onInput, onBlur, placeholder, "data-testid": dataTestId }: any) => ( + onInput({ target: { value: e.target.value } })} + onBlur={onBlur} + placeholder={placeholder} + data-testid={dataTestId} + /> + ), +})) + +describe("FormattedTextField", () => { + describe("unlimitedIntegerFormatter", () => { + it("should parse valid integers", () => { + expect(unlimitedIntegerFormatter.parse("123")).toBe(123) + expect(unlimitedIntegerFormatter.parse("1")).toBe(1) + }) + + it("should return undefined for empty input (unlimited)", () => { + expect(unlimitedIntegerFormatter.parse("")).toBeUndefined() + expect(unlimitedIntegerFormatter.parse(" ")).toBeUndefined() + }) + + it("should return undefined for invalid inputs", () => { + expect(unlimitedIntegerFormatter.parse("0")).toBeUndefined() + expect(unlimitedIntegerFormatter.parse("-5")).toBeUndefined() + expect(unlimitedIntegerFormatter.parse("abc")).toBeUndefined() + }) + + it("should format numbers correctly, treating undefined/Infinity as empty", () => { + expect(unlimitedIntegerFormatter.format(123)).toBe("123") + expect(unlimitedIntegerFormatter.format(undefined)).toBe("") + expect(unlimitedIntegerFormatter.format(Infinity)).toBe("") + }) + + it("should filter non-numeric characters", () => { + expect(unlimitedIntegerFormatter.filter?.("123abc")).toBe("123") + expect(unlimitedIntegerFormatter.filter?.("a1b2c3")).toBe("123") + }) + }) + + describe("FormattedTextField component", () => { + it("should render with correct initial value", () => { + const mockOnChange = vi.fn() + render( + , + ) + + const input = screen.getByTestId("test-input") as HTMLInputElement + expect(input.value).toBe("123") + }) + + it("should render as HTML input (mock verification)", () => { + const mockOnChange = vi.fn() + render( + , + ) + + const input = screen.getByTestId("test-input") + expect(input.tagName).toBe("INPUT") + expect(input).toHaveAttribute("type", "text") + }) + + it("should call onValueChange when input changes", () => { + const mockOnChange = vi.fn() + render( + , + ) + + const input = screen.getByTestId("test-input") + fireEvent.change(input, { target: { value: "456" } }) + expect(mockOnChange).toHaveBeenCalledWith(456) + }) + + it("should apply input filtering", () => { + const mockOnChange = vi.fn() + render( + , + ) + + const input = screen.getByTestId("test-input") as HTMLInputElement + fireEvent.change(input, { target: { value: "123abc" } }) + expect(mockOnChange).toHaveBeenCalledWith(123) + }) + }) + + describe("unlimitedDecimalFormatter", () => { + it("should parse valid decimal numbers", () => { + expect(unlimitedDecimalFormatter.parse("123.45")).toBe(123.45) + expect(unlimitedDecimalFormatter.parse("0.5")).toBe(0.5) + expect(unlimitedDecimalFormatter.parse("1")).toBe(1) + expect(unlimitedDecimalFormatter.parse("0")).toBe(0) + }) + + it("should return undefined for empty input (unlimited)", () => { + expect(unlimitedDecimalFormatter.parse("")).toBeUndefined() + expect(unlimitedDecimalFormatter.parse(" ")).toBeUndefined() + }) + + it("should return undefined for invalid inputs", () => { + expect(unlimitedDecimalFormatter.parse("-5")).toBeUndefined() + expect(unlimitedDecimalFormatter.parse("abc")).toBeUndefined() + }) + + it("should format numbers correctly, treating undefined/Infinity as empty", () => { + expect(unlimitedDecimalFormatter.format(123.45)).toBe("123.45") + expect(unlimitedDecimalFormatter.format(0)).toBe("0") + expect(unlimitedDecimalFormatter.format(undefined)).toBe("") + expect(unlimitedDecimalFormatter.format(Infinity)).toBe("") + }) + + it("should filter non-numeric characters except dots", () => { + expect(unlimitedDecimalFormatter.filter?.("123.45abc")).toBe("123.45") + expect(unlimitedDecimalFormatter.filter?.("a1b2.c3")).toBe("12.3") + }) + + it("should handle multiple dots by keeping only the first one", () => { + expect(unlimitedDecimalFormatter.filter?.("1.2.3.4")).toBe("1.234") + expect(unlimitedDecimalFormatter.filter?.("..123")).toBe(".123") + expect(unlimitedDecimalFormatter.filter?.("1..2")).toBe("1.2") + }) + + it("should preserve trailing dots during typing", () => { + const mockOnChange = vi.fn() + render( + , + ) + + const input = screen.getByTestId("decimal-input") as HTMLInputElement + + // Type "1." + fireEvent.change(input, { target: { value: "1." } }) + + // The input should show "1." (preserving the dot) + expect(input.value).toBe("1.") + // But the parsed value should be 1 + expect(mockOnChange).toHaveBeenCalledWith(1) + }) + + it("should format properly on blur", async () => { + const mockOnChange = vi.fn() + render( + , + ) + + const input = screen.getByTestId("decimal-input") as HTMLInputElement + + // Initially shows formatted value + expect(input.value).toBe("1") + + // Type "1." + fireEvent.change(input, { target: { value: "1." } }) + expect(input.value).toBe("1.") + + // On blur, should format back to "1" + fireEvent.blur(input) + + // Wait for state update + await new Promise((resolve) => setTimeout(resolve, 0)) + expect(input.value).toBe("1") + }) + }) + + describe("FormattedTextField with decimal formatter", () => { + it("should handle decimal input correctly", () => { + const mockOnChange = vi.fn() + render( + , + ) + + const input = screen.getByTestId("test-input") + fireEvent.change(input, { target: { value: "12.34" } }) + expect(mockOnChange).toHaveBeenCalledWith(12.34) + }) + }) +}) diff --git a/webview-ui/src/components/settings/AutoApproveSettings.tsx b/webview-ui/src/components/settings/AutoApproveSettings.tsx index 1a93fee01a..95c311422a 100644 --- a/webview-ui/src/components/settings/AutoApproveSettings.tsx +++ b/webview-ui/src/components/settings/AutoApproveSettings.tsx @@ -10,6 +10,7 @@ import { SetCachedStateField } from "./types" import { SectionHeader } from "./SectionHeader" import { Section } from "./Section" import { AutoApproveToggle } from "./AutoApproveToggle" +import { MaxLimitInputs } from "./MaxLimitInputs" import { useExtensionState } from "@/context/ExtensionStateContext" import { useAutoApprovalState } from "@/hooks/useAutoApprovalState" import { useAutoApprovalToggles } from "@/hooks/useAutoApprovalToggles" @@ -31,6 +32,8 @@ type AutoApproveSettingsProps = HTMLAttributes & { alwaysAllowUpdateTodoList?: boolean followupAutoApproveTimeoutMs?: number allowedCommands?: string[] + allowedMaxRequests?: number | undefined + allowedMaxCost?: number | undefined deniedCommands?: string[] setCachedStateField: SetCachedStateField< | "alwaysAllowReadOnly" @@ -48,6 +51,8 @@ type AutoApproveSettingsProps = HTMLAttributes & { | "alwaysAllowFollowupQuestions" | "followupAutoApproveTimeoutMs" | "allowedCommands" + | "allowedMaxRequests" + | "allowedMaxCost" | "deniedCommands" | "alwaysAllowUpdateTodoList" > @@ -70,6 +75,8 @@ export const AutoApproveSettings = ({ followupAutoApproveTimeoutMs = 60000, alwaysAllowUpdateTodoList, allowedCommands, + allowedMaxRequests, + allowedMaxCost, deniedCommands, setCachedStateField, ...props @@ -152,6 +159,12 @@ export const AutoApproveSettings = ({ alwaysAllowUpdateTodoList={alwaysAllowUpdateTodoList} onToggle={(key, value) => setCachedStateField(key, value)} /> + setCachedStateField("allowedMaxRequests", value)} + onMaxCostChange={(value) => setCachedStateField("allowedMaxCost", value)} + /> {/* ADDITIONAL SETTINGS */} diff --git a/webview-ui/src/components/settings/MaxCostInput.tsx b/webview-ui/src/components/settings/MaxCostInput.tsx new file mode 100644 index 0000000000..369d1bfe35 --- /dev/null +++ b/webview-ui/src/components/settings/MaxCostInput.tsx @@ -0,0 +1,41 @@ +import { useTranslation } from "react-i18next" +import { vscode } from "@/utils/vscode" +import { useCallback } from "react" +import { FormattedTextField, unlimitedDecimalFormatter } from "../common/FormattedTextField" + +interface MaxCostInputProps { + allowedMaxCost?: number + onValueChange: (value: number | undefined) => void +} + +export function MaxCostInput({ allowedMaxCost, onValueChange }: MaxCostInputProps) { + const { t } = useTranslation() + + const handleValueChange = useCallback( + (value: number | undefined) => { + onValueChange(value) + vscode.postMessage({ type: "allowedMaxCost", value }) + }, + [onValueChange], + ) + + return ( +
+
+ +
{t("settings:autoApprove.apiCostLimit.title")}
+
+
+ $]} + /> +
+
+ ) +} diff --git a/webview-ui/src/components/settings/MaxLimitInputs.tsx b/webview-ui/src/components/settings/MaxLimitInputs.tsx new file mode 100644 index 0000000000..0508843180 --- /dev/null +++ b/webview-ui/src/components/settings/MaxLimitInputs.tsx @@ -0,0 +1,32 @@ +import React from "react" +import { useTranslation } from "react-i18next" +import { MaxRequestsInput } from "./MaxRequestsInput" +import { MaxCostInput } from "./MaxCostInput" + +export interface MaxLimitInputsProps { + allowedMaxRequests?: number + allowedMaxCost?: number + onMaxRequestsChange: (value: number | undefined) => void + onMaxCostChange: (value: number | undefined) => void +} + +export const MaxLimitInputs: React.FC = ({ + allowedMaxRequests, + allowedMaxCost, + onMaxRequestsChange, + onMaxCostChange, +}) => { + const { t } = useTranslation() + + return ( +
+
+ + +
+
+ {t("settings:autoApprove.maxLimits.description")} +
+
+ ) +} diff --git a/webview-ui/src/components/settings/MaxRequestsInput.tsx b/webview-ui/src/components/settings/MaxRequestsInput.tsx new file mode 100644 index 0000000000..d0609f4e8e --- /dev/null +++ b/webview-ui/src/components/settings/MaxRequestsInput.tsx @@ -0,0 +1,40 @@ +import { useTranslation } from "react-i18next" +import { vscode } from "@/utils/vscode" +import { useCallback } from "react" +import { FormattedTextField, unlimitedIntegerFormatter } from "../common/FormattedTextField" + +interface MaxRequestsInputProps { + allowedMaxRequests?: number + onValueChange: (value: number | undefined) => void +} + +export function MaxRequestsInput({ allowedMaxRequests, onValueChange }: MaxRequestsInputProps) { + const { t } = useTranslation() + + const handleValueChange = useCallback( + (value: number | undefined) => { + onValueChange(value) + vscode.postMessage({ type: "allowedMaxRequests", value }) + }, + [onValueChange], + ) + + return ( +
+
+ +
{t("settings:autoApprove.apiRequestLimit.title")}
+
+
+ +
+
+ ) +} diff --git a/webview-ui/src/components/settings/SettingsView.tsx b/webview-ui/src/components/settings/SettingsView.tsx index 9cfd9b64e5..630b59485d 100644 --- a/webview-ui/src/components/settings/SettingsView.tsx +++ b/webview-ui/src/components/settings/SettingsView.tsx @@ -125,6 +125,7 @@ const SettingsView = forwardRef(({ onDone, t allowedCommands, deniedCommands, allowedMaxRequests, + allowedMaxCost, language, alwaysAllowBrowser, alwaysAllowExecute, @@ -291,6 +292,7 @@ const SettingsView = forwardRef(({ onDone, t vscode.postMessage({ type: "allowedCommands", commands: allowedCommands ?? [] }) vscode.postMessage({ type: "deniedCommands", commands: deniedCommands ?? [] }) vscode.postMessage({ type: "allowedMaxRequests", value: allowedMaxRequests ?? undefined }) + vscode.postMessage({ type: "allowedMaxCost", value: allowedMaxCost ?? undefined }) vscode.postMessage({ type: "autoCondenseContext", bool: autoCondenseContext }) vscode.postMessage({ type: "autoCondenseContextPercent", value: autoCondenseContextPercent }) vscode.postMessage({ type: "browserToolEnabled", bool: browserToolEnabled }) diff --git a/webview-ui/src/components/settings/__tests__/MaxCostInput.spec.tsx b/webview-ui/src/components/settings/__tests__/MaxCostInput.spec.tsx new file mode 100644 index 0000000000..b57d1cba6c --- /dev/null +++ b/webview-ui/src/components/settings/__tests__/MaxCostInput.spec.tsx @@ -0,0 +1,84 @@ +import { render, screen, fireEvent } from "@testing-library/react" +import { vi } from "vitest" +import { MaxCostInput } from "../MaxCostInput" + +vi.mock("@/utils/vscode", () => ({ + vscode: { postMessage: vi.fn() }, +})) + +vi.mock("react-i18next", () => ({ + useTranslation: () => { + const translations: Record = { + "settings:autoApprove.apiCostLimit.title": "Max API Cost", + "settings:autoApprove.apiCostLimit.unlimited": "Unlimited", + } + return { t: (key: string) => translations[key] || key } + }, +})) + +describe("MaxCostInput", () => { + const mockOnValueChange = vi.fn() + + beforeEach(() => { + mockOnValueChange.mockClear() + }) + + it("shows empty input when allowedMaxCost is undefined", () => { + render() + + const input = screen.getByPlaceholderText("Unlimited") + expect(input).toHaveValue("") + }) + + it("shows formatted cost value when allowedMaxCost is provided", () => { + render() + + const input = screen.getByPlaceholderText("Unlimited") + expect(input).toHaveValue("5.5") + }) + + it("calls onValueChange when input changes", () => { + render() + + const input = screen.getByPlaceholderText("Unlimited") + fireEvent.input(input, { target: { value: "10.25" } }) + + expect(mockOnValueChange).toHaveBeenCalledWith(10.25) + }) + + it("calls onValueChange with undefined when input is cleared", () => { + render() + + const input = screen.getByPlaceholderText("Unlimited") + fireEvent.input(input, { target: { value: "" } }) + + expect(mockOnValueChange).toHaveBeenCalledWith(undefined) + }) + + it("handles decimal input correctly", () => { + render() + + const input = screen.getByPlaceholderText("Unlimited") + fireEvent.input(input, { target: { value: "2.99" } }) + + expect(mockOnValueChange).toHaveBeenCalledWith(2.99) + }) + + it("accepts zero as a valid value", () => { + render() + + const input = screen.getByPlaceholderText("Unlimited") + fireEvent.input(input, { target: { value: "0" } }) + + expect(mockOnValueChange).toHaveBeenCalledWith(0) + }) + + it("allows typing decimal values starting with zero", () => { + render() + + const input = screen.getByPlaceholderText("Unlimited") + fireEvent.input(input, { target: { value: "0.15" } }) + + expect(mockOnValueChange).toHaveBeenCalledWith(0.15) + }) +}) diff --git a/webview-ui/src/components/settings/__tests__/MaxRequestsInput.spec.tsx b/webview-ui/src/components/settings/__tests__/MaxRequestsInput.spec.tsx new file mode 100644 index 0000000000..94940e4569 --- /dev/null +++ b/webview-ui/src/components/settings/__tests__/MaxRequestsInput.spec.tsx @@ -0,0 +1,87 @@ +import { render, screen, fireEvent } from "@testing-library/react" +import { vi } from "vitest" +import { MaxRequestsInput } from "../MaxRequestsInput" + +vi.mock("@/utils/vscode", () => ({ + vscode: { postMessage: vi.fn() }, +})) + +vi.mock("react-i18next", () => ({ + useTranslation: () => { + const translations: Record = { + "settings:autoApprove.apiRequestLimit.title": "Max Count", + "settings:autoApprove.apiRequestLimit.unlimited": "Unlimited", + } + return { t: (key: string) => translations[key] || key } + }, +})) + +describe("MaxRequestsInput", () => { + const mockOnValueChange = vi.fn() + + beforeEach(() => { + mockOnValueChange.mockClear() + }) + + it("shows empty input when allowedMaxRequests is undefined", () => { + render() + + const input = screen.getByPlaceholderText("Unlimited") + expect(input).toHaveValue("") + }) + + it("shows formatted request value when allowedMaxRequests is provided", () => { + render() + + const input = screen.getByPlaceholderText("Unlimited") + expect(input).toHaveValue("10") + }) + + it("calls onValueChange when input changes", () => { + render() + + const input = screen.getByPlaceholderText("Unlimited") + fireEvent.input(input, { target: { value: "5" } }) + + expect(mockOnValueChange).toHaveBeenCalledWith(5) + }) + + it("calls onValueChange with undefined when input is cleared", () => { + render() + + const input = screen.getByPlaceholderText("Unlimited") + fireEvent.input(input, { target: { value: "" } }) + + expect(mockOnValueChange).toHaveBeenCalledWith(undefined) + }) + + it("handles integer input correctly", () => { + render() + + const input = screen.getByPlaceholderText("Unlimited") + fireEvent.input(input, { target: { value: "25" } }) + + expect(mockOnValueChange).toHaveBeenCalledWith(25) + }) + + it("rejects zero and negative values", () => { + render() + + const input = screen.getByPlaceholderText("Unlimited") + + fireEvent.input(input, { target: { value: "0" } }) + expect(mockOnValueChange).toHaveBeenCalledWith(undefined) + + fireEvent.input(input, { target: { value: "-5" } }) + expect(mockOnValueChange).toHaveBeenCalledWith(undefined) + }) + + it("filters non-numeric characters", () => { + render() + + const input = screen.getByPlaceholderText("Unlimited") + fireEvent.input(input, { target: { value: "123abc" } }) + + expect(mockOnValueChange).toHaveBeenCalledWith(123) + }) +}) diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx index 33537b58ac..da7ab63358 100644 --- a/webview-ui/src/context/ExtensionStateContext.tsx +++ b/webview-ui/src/context/ExtensionStateContext.tsx @@ -71,6 +71,7 @@ export interface ExtensionStateContextType extends ExtensionState { setAllowedCommands: (value: string[]) => void setDeniedCommands: (value: string[]) => void setAllowedMaxRequests: (value: number | undefined) => void + setAllowedMaxCost: (value: number | undefined) => void setSoundEnabled: (value: boolean) => void setSoundVolume: (value: number) => void terminalShellIntegrationTimeout?: number @@ -429,6 +430,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode setAllowedCommands: (value) => setState((prevState) => ({ ...prevState, allowedCommands: value })), setDeniedCommands: (value) => setState((prevState) => ({ ...prevState, deniedCommands: value })), setAllowedMaxRequests: (value) => setState((prevState) => ({ ...prevState, allowedMaxRequests: value })), + setAllowedMaxCost: (value) => setState((prevState) => ({ ...prevState, allowedMaxCost: value })), setSoundEnabled: (value) => setState((prevState) => ({ ...prevState, soundEnabled: value })), setSoundVolume: (value) => setState((prevState) => ({ ...prevState, soundVolume: value })), setTtsEnabled: (value) => setState((prevState) => ({ ...prevState, ttsEnabled: value })), diff --git a/webview-ui/src/i18n/locales/ca/chat.json b/webview-ui/src/i18n/locales/ca/chat.json index da0eb00a44..2188e9b706 100644 --- a/webview-ui/src/i18n/locales/ca/chat.json +++ b/webview-ui/src/i18n/locales/ca/chat.json @@ -314,6 +314,11 @@ "title": "S'ha arribat al límit de sol·licituds aprovades automàticament", "description": "Roo ha arribat al límit aprovat automàticament de {{count}} sol·licitud(s) d'API. Vols reiniciar el comptador i continuar amb la tasca?", "button": "Reiniciar i continuar" + }, + "autoApprovedCostLimitReached": { + "title": "S'ha arribat al límit de cost d'aprovació automàtica", + "button": "Restableix i continua", + "description": "Roo ha arribat al límit de cost aprovat automàticament de ${{count}}. Vols restablir el cost i continuar amb la tasca?" } }, "codebaseSearch": { diff --git a/webview-ui/src/i18n/locales/ca/settings.json b/webview-ui/src/i18n/locales/ca/settings.json index 3da1f5e50e..eb26482d96 100644 --- a/webview-ui/src/i18n/locales/ca/settings.json +++ b/webview-ui/src/i18n/locales/ca/settings.json @@ -197,7 +197,14 @@ "description": "Fes aquesta quantitat de sol·licituds API automàticament abans de demanar aprovació per continuar amb la tasca.", "unlimited": "Il·limitat" }, - "selectOptionsFirst": "Seleccioneu almenys una opció a continuació per activar l'aprovació automàtica" + "selectOptionsFirst": "Seleccioneu almenys una opció a continuació per activar l'aprovació automàtica", + "apiCostLimit": { + "title": "Cost Màxim", + "unlimited": "Il·limitat" + }, + "maxLimits": { + "description": "Fes sol·licituds automàticament fins a aquests límits abans de demanar aprovació per continuar." + } }, "providers": { "providerDocumentation": "Documentació de {{provider}}", @@ -308,7 +315,6 @@ "cacheUsageNote": "Nota: Si no veieu l'ús de la caché, proveu de seleccionar un model diferent i després tornar a seleccionar el model desitjat.", "vscodeLmModel": "Model de llenguatge", "vscodeLmWarning": "Nota: Aquesta és una integració molt experimental i el suport del proveïdor variarà. Si rebeu un error sobre un model no compatible, és un problema del proveïdor.", - "geminiParameters": { "urlContext": { "title": "Activa el context d'URL", diff --git a/webview-ui/src/i18n/locales/de/chat.json b/webview-ui/src/i18n/locales/de/chat.json index 36c03c9309..a9c2a385f9 100644 --- a/webview-ui/src/i18n/locales/de/chat.json +++ b/webview-ui/src/i18n/locales/de/chat.json @@ -314,6 +314,11 @@ "title": "Limit für automatisch genehmigte Anfragen erreicht", "description": "Roo hat das automatisch genehmigte Limit von {{count}} API-Anfrage(n) erreicht. Möchtest du den Zähler zurücksetzen und mit der Aufgabe fortfahren?", "button": "Zurücksetzen und fortfahren" + }, + "autoApprovedCostLimitReached": { + "description": "Roo hat das automatisch genehmigte Kostenlimit von ${{count}} erreicht. Möchten Sie die Kosten zurücksetzen und mit der Aufgabe fortfahren?", + "title": "Kostengrenze für automatische Genehmigung erreicht", + "button": "Zurücksetzen und Fortfahren" } }, "codebaseSearch": { diff --git a/webview-ui/src/i18n/locales/de/settings.json b/webview-ui/src/i18n/locales/de/settings.json index a96b41f0c3..1915b67433 100644 --- a/webview-ui/src/i18n/locales/de/settings.json +++ b/webview-ui/src/i18n/locales/de/settings.json @@ -197,7 +197,14 @@ "description": "Automatisch so viele API-Anfragen stellen, bevor du um die Erlaubnis gebeten wirst, mit der Aufgabe fortzufahren.", "unlimited": "Unbegrenzt" }, - "selectOptionsFirst": "Wähle mindestens eine Option unten aus, um die automatische Genehmigung zu aktivieren" + "selectOptionsFirst": "Wähle mindestens eine Option unten aus, um die automatische Genehmigung zu aktivieren", + "apiCostLimit": { + "title": "Maximale Kosten", + "unlimited": "Unbegrenzt" + }, + "maxLimits": { + "description": "Anfragen bis zu diesen Grenzwerten automatisch stellen, bevor um Genehmigung zur Fortsetzung gebeten wird." + } }, "providers": { "providerDocumentation": "{{provider}}-Dokumentation", @@ -308,7 +315,6 @@ "cacheUsageNote": "Hinweis: Wenn Sie keine Cache-Nutzung sehen, versuchen Sie ein anderes Modell auszuwählen und dann Ihr gewünschtes Modell erneut auszuwählen.", "vscodeLmModel": "Sprachmodell", "vscodeLmWarning": "Hinweis: Dies ist eine sehr experimentelle Integration und die Anbieterunterstützung variiert. Wenn Sie einen Fehler über ein nicht unterstütztes Modell erhalten, liegt das Problem auf Anbieterseite.", - "geminiParameters": { "urlContext": { "title": "URL-Kontext aktivieren", diff --git a/webview-ui/src/i18n/locales/en/chat.json b/webview-ui/src/i18n/locales/en/chat.json index b33ddd4ab4..48d55172a5 100644 --- a/webview-ui/src/i18n/locales/en/chat.json +++ b/webview-ui/src/i18n/locales/en/chat.json @@ -332,6 +332,11 @@ "title": "Auto-Approved Request Limit Reached", "description": "Roo has reached the auto-approved limit of {{count}} API request(s). Would you like to reset the count and proceed with the task?", "button": "Reset and Continue" + }, + "autoApprovedCostLimitReached": { + "title": "Auto-Approved Cost Limit Reached", + "description": "Roo has reached the auto-approved cost limit of ${{count}}. Would you like to reset the cost and proceed with the task?", + "button": "Reset and Continue" } }, "indexingStatus": { diff --git a/webview-ui/src/i18n/locales/en/settings.json b/webview-ui/src/i18n/locales/en/settings.json index 5f67268bd9..019d49bc63 100644 --- a/webview-ui/src/i18n/locales/en/settings.json +++ b/webview-ui/src/i18n/locales/en/settings.json @@ -191,10 +191,16 @@ "description": "Automatically update the to-do list without requiring approval" }, "apiRequestLimit": { - "title": "Max Requests", - "description": "Automatically make this many API requests before asking for approval to continue with the task.", + "title": "Max Count", "unlimited": "Unlimited" }, + "apiCostLimit": { + "title": "Max Cost", + "unlimited": "Unlimited" + }, + "maxLimits": { + "description": "Automatically make requests up to these limits before asking for approval to continue." + }, "toggleAriaLabel": "Toggle auto-approval", "disabledAriaLabel": "Auto-approval disabled - select options first", "selectOptionsFirst": "Select at least one option below to enable auto-approval" diff --git a/webview-ui/src/i18n/locales/es/chat.json b/webview-ui/src/i18n/locales/es/chat.json index 156af85012..e1cd0b262a 100644 --- a/webview-ui/src/i18n/locales/es/chat.json +++ b/webview-ui/src/i18n/locales/es/chat.json @@ -314,6 +314,11 @@ "title": "Límite de Solicitudes Auto-aprobadas Alcanzado", "description": "Roo ha alcanzado el límite auto-aprobado de {{count}} solicitud(es) API. ¿Deseas reiniciar el contador y continuar con la tarea?", "button": "Reiniciar y Continuar" + }, + "autoApprovedCostLimitReached": { + "title": "Límite de Costo Auto-Aprobado Alcanzado", + "description": "Roo ha alcanzado el límite de costo autoaprobado de ${{count}}. ¿Le gustaría reiniciar el costo y continuar con la tarea?", + "button": "Reiniciar y continuar" } }, "codebaseSearch": { diff --git a/webview-ui/src/i18n/locales/es/settings.json b/webview-ui/src/i18n/locales/es/settings.json index c4c7fb39c0..31f12e59c0 100644 --- a/webview-ui/src/i18n/locales/es/settings.json +++ b/webview-ui/src/i18n/locales/es/settings.json @@ -197,7 +197,14 @@ "description": "Realizar automáticamente esta cantidad de solicitudes a la API antes de pedir aprobación para continuar con la tarea.", "unlimited": "Ilimitado" }, - "selectOptionsFirst": "Selecciona al menos una opción a continuación para habilitar la aprobación automática" + "selectOptionsFirst": "Selecciona al menos una opción a continuación para habilitar la aprobación automática", + "apiCostLimit": { + "title": "Costo Máximo", + "unlimited": "Ilimitado" + }, + "maxLimits": { + "description": "Realizar automáticamente solicitudes hasta estos límites antes de pedir aprobación para continuar." + } }, "providers": { "providerDocumentation": "Documentación de {{provider}}", @@ -318,7 +325,6 @@ "description": "Permite que Gemini busque en Google información actual y fundamente las respuestas en datos en tiempo real. Útil para consultas que requieren información actualizada." } }, - "googleCloudSetup": { "title": "Para usar Google Cloud Vertex AI, necesita:", "step1": "1. Crear una cuenta de Google Cloud, habilitar la API de Vertex AI y habilitar los modelos Claude deseados.", diff --git a/webview-ui/src/i18n/locales/fr/chat.json b/webview-ui/src/i18n/locales/fr/chat.json index 959db06b39..b06ed48ea9 100644 --- a/webview-ui/src/i18n/locales/fr/chat.json +++ b/webview-ui/src/i18n/locales/fr/chat.json @@ -314,6 +314,11 @@ "title": "Limite de requêtes auto-approuvées atteinte", "description": "Roo a atteint la limite auto-approuvée de {{count}} requête(s) API. Souhaitez-vous réinitialiser le compteur et poursuivre la tâche ?", "button": "Réinitialiser et continuer" + }, + "autoApprovedCostLimitReached": { + "title": "Limite de coût en auto-approbation atteinte", + "description": "Roo a atteint la limite de coût auto-approuvée de ${{count}}. Souhaitez-vous réinitialiser le coût et poursuivre la tâche ?", + "button": "Réinitialiser et Continuer" } }, "codebaseSearch": { diff --git a/webview-ui/src/i18n/locales/fr/settings.json b/webview-ui/src/i18n/locales/fr/settings.json index e00b0c0559..439560d0e9 100644 --- a/webview-ui/src/i18n/locales/fr/settings.json +++ b/webview-ui/src/i18n/locales/fr/settings.json @@ -197,6 +197,13 @@ "title": "Requêtes maximales", "description": "Effectuer automatiquement ce nombre de requêtes API avant de demander l'approbation pour continuer la tâche.", "unlimited": "Illimité" + }, + "apiCostLimit": { + "unlimited": "Illimité", + "title": "Coût maximum" + }, + "maxLimits": { + "description": "Effectuer automatiquement des requêtes jusqu'à ces limites avant de demander une autorisation pour continuer." } }, "providers": { @@ -318,7 +325,6 @@ "description": "Permet à Gemini d'effectuer des recherches sur Google pour obtenir des informations actuelles et fonder les réponses sur des données en temps réel. Utile pour les requêtes nécessitant des informations à jour." } }, - "googleCloudSetup": { "title": "Pour utiliser Google Cloud Vertex AI, vous devez :", "step1": "1. Créer un compte Google Cloud, activer l'API Vertex AI et activer les modèles Claude souhaités.", diff --git a/webview-ui/src/i18n/locales/hi/chat.json b/webview-ui/src/i18n/locales/hi/chat.json index 21d81e4b88..1c912c3d70 100644 --- a/webview-ui/src/i18n/locales/hi/chat.json +++ b/webview-ui/src/i18n/locales/hi/chat.json @@ -314,6 +314,11 @@ "title": "स्वत:-स्वीकृत अनुरोध सीमा पहुंची", "description": "Roo {{count}} API अनुरोध(धों) की स्वत:-स्वीकृत सीमा तक पहुंच गया है। क्या आप गणना को रीसेट करके कार्य जारी रखना चाहते हैं?", "button": "रीसेट करें और जारी रखें" + }, + "autoApprovedCostLimitReached": { + "title": "स्वत:-अनुमोदित लागत सीमा पहुँच गई", + "button": "रीसेट करें और जारी रखें", + "description": "Roo ने स्वचालित-स्वीकृत लागत सीमा ${{count}} तक पहुंच गई है। क्या आप लागत को रीसेट करके कार्य जारी रखना चाहेंगे?" } }, "codebaseSearch": { diff --git a/webview-ui/src/i18n/locales/hi/settings.json b/webview-ui/src/i18n/locales/hi/settings.json index 2497ffe6da..2429ddaa94 100644 --- a/webview-ui/src/i18n/locales/hi/settings.json +++ b/webview-ui/src/i18n/locales/hi/settings.json @@ -197,7 +197,14 @@ "description": "कार्य जारी रखने के लिए अनुमति मांगने से पहले स्वचालित रूप से इतने API अनुरोध करें।", "unlimited": "असीमित" }, - "selectOptionsFirst": "स्वतः-अनुमोदन सक्षम करने के लिए नीचे से कम से कम एक विकल्प चुनें" + "selectOptionsFirst": "स्वतः-अनुमोदन सक्षम करने के लिए नीचे से कम से कम एक विकल्प चुनें", + "apiCostLimit": { + "unlimited": "असीमित", + "title": "अधिकतम लागत" + }, + "maxLimits": { + "description": "स्वचालित रूप से जारी रखने के लिए अनुमोदन माँगने से पहले इन सीमाओं तक अनुरोध करें।" + } }, "providers": { "providerDocumentation": "{{provider}} दस्तावेज़ीकरण", @@ -318,7 +325,6 @@ "description": "Gemini को वास्तविक समय के डेटा पर आधारित उत्तर प्रदान करने के लिए Google पर जानकारी खोजने और उत्तरों को ग्राउंड करने की अनुमति देता है। अद्यतित जानकारी की आवश्यकता वाली क्वेरीज़ के लिए उपयोगी।" } }, - "googleCloudSetup": { "title": "Google Cloud Vertex AI का उपयोग करने के लिए, आपको आवश्यकता है:", "step1": "1. Google Cloud खाता बनाएं, Vertex AI API सक्षम करें और वांछित Claude मॉडल सक्षम करें।", diff --git a/webview-ui/src/i18n/locales/id/chat.json b/webview-ui/src/i18n/locales/id/chat.json index fd594480a8..2a4345191e 100644 --- a/webview-ui/src/i18n/locales/id/chat.json +++ b/webview-ui/src/i18n/locales/id/chat.json @@ -335,6 +335,11 @@ "title": "Batas Permintaan yang Disetujui Otomatis Tercapai", "description": "Roo telah mencapai batas {{count}} permintaan API yang disetujui otomatis. Apakah kamu ingin mengatur ulang hitungan dan melanjutkan tugas?", "button": "Atur Ulang dan Lanjutkan" + }, + "autoApprovedCostLimitReached": { + "description": "Roo telah mencapai batas biaya yang disetujui secara otomatis sebesar ${{count}}. Apakah Anda ingin mengatur ulang biaya dan melanjutkan tugas ini?", + "button": "Reset dan Lanjutkan", + "title": "Batas Biaya Otomatis-Disetujui Tercapai" } }, "indexingStatus": { diff --git a/webview-ui/src/i18n/locales/id/settings.json b/webview-ui/src/i18n/locales/id/settings.json index 3665c99c1b..5c85ec3856 100644 --- a/webview-ui/src/i18n/locales/id/settings.json +++ b/webview-ui/src/i18n/locales/id/settings.json @@ -201,7 +201,14 @@ "description": "Secara otomatis membuat sejumlah permintaan API ini sebelum meminta persetujuan untuk melanjutkan tugas.", "unlimited": "Tidak terbatas" }, - "selectOptionsFirst": "Pilih setidaknya satu opsi di bawah ini untuk mengaktifkan persetujuan otomatis" + "selectOptionsFirst": "Pilih setidaknya satu opsi di bawah ini untuk mengaktifkan persetujuan otomatis", + "apiCostLimit": { + "title": "Biaya Maksimal", + "unlimited": "Tidak Terbatas" + }, + "maxLimits": { + "description": "Secara otomatis membuat permintaan hingga batas ini sebelum meminta persetujuan untuk melanjutkan." + } }, "providers": { "providerDocumentation": "Dokumentasi {{provider}}", @@ -322,7 +329,6 @@ "description": "Memungkinkan Gemini mencari informasi terkini di Google dan mendasarkan respons pada data waktu nyata. Berguna untuk kueri yang memerlukan informasi terkini." } }, - "googleCloudSetup": { "title": "Untuk menggunakan Google Cloud Vertex AI, kamu perlu:", "step1": "1. Buat akun Google Cloud, aktifkan Vertex AI API & aktifkan model Claude yang diinginkan.", diff --git a/webview-ui/src/i18n/locales/it/chat.json b/webview-ui/src/i18n/locales/it/chat.json index 5b92e06322..d36a20f3da 100644 --- a/webview-ui/src/i18n/locales/it/chat.json +++ b/webview-ui/src/i18n/locales/it/chat.json @@ -314,6 +314,11 @@ "title": "Limite di Richieste Auto-approvate Raggiunto", "description": "Roo ha raggiunto il limite auto-approvato di {{count}} richiesta/e API. Vuoi reimpostare il contatore e procedere con l'attività?", "button": "Reimposta e Continua" + }, + "autoApprovedCostLimitReached": { + "title": "Limite di costo auto-approvato raggiunto", + "button": "Reimposta e Continua", + "description": "Roo ha raggiunto il limite di costo approvato automaticamente di ${{count}}. Vuoi reimpostare il costo e procedere con l'attività?" } }, "codebaseSearch": { diff --git a/webview-ui/src/i18n/locales/it/settings.json b/webview-ui/src/i18n/locales/it/settings.json index 056b0f9124..90b95ac5e5 100644 --- a/webview-ui/src/i18n/locales/it/settings.json +++ b/webview-ui/src/i18n/locales/it/settings.json @@ -197,7 +197,14 @@ "description": "Esegui automaticamente questo numero di richieste API prima di chiedere l'approvazione per continuare con l'attività.", "unlimited": "Illimitato" }, - "selectOptionsFirst": "Seleziona almeno un'opzione qui sotto per abilitare l'approvazione automatica" + "selectOptionsFirst": "Seleziona almeno un'opzione qui sotto per abilitare l'approvazione automatica", + "apiCostLimit": { + "unlimited": "Illimitato", + "title": "Costo massimo" + }, + "maxLimits": { + "description": "Esegui automaticamente richieste fino a questi limiti prima di chiedere l'approvazione per continuare." + } }, "providers": { "providerDocumentation": "Documentazione {{provider}}", @@ -318,7 +325,6 @@ "description": "Consente a Gemini di cercare informazioni aggiornate su Google e basare le risposte su dati in tempo reale. Utile per query che richiedono informazioni aggiornate." } }, - "googleCloudSetup": { "title": "Per utilizzare Google Cloud Vertex AI, è necessario:", "step1": "1. Creare un account Google Cloud, abilitare l'API Vertex AI e abilitare i modelli Claude desiderati.", diff --git a/webview-ui/src/i18n/locales/ja/chat.json b/webview-ui/src/i18n/locales/ja/chat.json index 0ed516f2b7..1b268f007d 100644 --- a/webview-ui/src/i18n/locales/ja/chat.json +++ b/webview-ui/src/i18n/locales/ja/chat.json @@ -314,6 +314,11 @@ "title": "自動承認リクエスト制限に達しました", "description": "Rooは{{count}}件のAPI自動承認リクエスト制限に達しました。カウントをリセットしてタスクを続行しますか？", "button": "リセットして続行" + }, + "autoApprovedCostLimitReached": { + "title": "自動承認コスト制限に達しました", + "description": "Rooは自動承認されたコスト制限の${{count}}に達しました。コストをリセットしてタスクを続行しますか？", + "button": "リセットして続ける" } }, "codebaseSearch": { diff --git a/webview-ui/src/i18n/locales/ja/settings.json b/webview-ui/src/i18n/locales/ja/settings.json index 3b38277b86..5370d00688 100644 --- a/webview-ui/src/i18n/locales/ja/settings.json +++ b/webview-ui/src/i18n/locales/ja/settings.json @@ -197,7 +197,14 @@ "description": "タスクを続行するための承認を求める前に、自動的にこの数のAPIリクエストを行います。", "unlimited": "無制限" }, - "selectOptionsFirst": "自動承認を有効にするには、以下のオプションを少なくとも1つ選択してください" + "selectOptionsFirst": "自動承認を有効にするには、以下のオプションを少なくとも1つ選択してください", + "apiCostLimit": { + "unlimited": "無制限", + "title": "最大料金" + }, + "maxLimits": { + "description": "これらの上限まで自動的にリクエストを行い、その後継続の承認を求めます。" + } }, "providers": { "providerDocumentation": "{{provider}}のドキュメント", @@ -318,7 +325,6 @@ "description": "GeminiがGoogleを検索して最新情報を取得し、リアルタイムデータに基づいて応答をグラウンディングできるようにします。最新情報が必要なクエリに便利です。" } }, - "googleCloudSetup": { "title": "Google Cloud Vertex AIを使用するには：", "step1": "1. Google Cloudアカウントを作成し、Vertex AI APIを有効にして、希望するClaudeモデルを有効にします。", diff --git a/webview-ui/src/i18n/locales/ko/chat.json b/webview-ui/src/i18n/locales/ko/chat.json index 95f783b085..147ed8fa5b 100644 --- a/webview-ui/src/i18n/locales/ko/chat.json +++ b/webview-ui/src/i18n/locales/ko/chat.json @@ -314,6 +314,11 @@ "title": "자동 승인 요청 한도 도달", "description": "Roo가 {{count}}개의 API 요청(들)에 대한 자동 승인 한도에 도달했습니다. 카운트를 재설정하고 작업을 계속하시겠습니까?", "button": "재설정 후 계속" + }, + "autoApprovedCostLimitReached": { + "description": "Roo가 자동 승인된 비용 한도인 ${{count}}에 도달했습니다. 비용을 초기화하고 작업을 계속하시겠습니까?", + "title": "자동 승인 비용 한도에 도달함", + "button": "재설정 후 계속하기" } }, "codebaseSearch": { diff --git a/webview-ui/src/i18n/locales/ko/settings.json b/webview-ui/src/i18n/locales/ko/settings.json index 89739f4c4a..1f1bf869d2 100644 --- a/webview-ui/src/i18n/locales/ko/settings.json +++ b/webview-ui/src/i18n/locales/ko/settings.json @@ -197,7 +197,14 @@ "description": "작업을 계속하기 위한 승인을 요청하기 전에 자동으로 이 수의 API 요청을 수행합니다.", "unlimited": "무제한" }, - "selectOptionsFirst": "자동 승인을 활성화하려면 아래에서 하나 이상의 옵션을 선택하세요" + "selectOptionsFirst": "자동 승인을 활성화하려면 아래에서 하나 이상의 옵션을 선택하세요", + "apiCostLimit": { + "unlimited": "무제한", + "title": "최대 비용" + }, + "maxLimits": { + "description": "이러한 한도까지 자동으로 요청을 수행한 후, 계속 진행하기 위한 승인을 요청합니다." + } }, "providers": { "providerDocumentation": "{{provider}} 문서", @@ -318,7 +325,6 @@ "description": "Gemini가 최신 정보를 얻기 위해 Google을 검색하고 응답을 실시간 데이터에 근거하도록 합니다. 최신 정보가 필요한 쿼리에 유용합니다." } }, - "googleCloudSetup": { "title": "Google Cloud Vertex AI를 사용하려면:", "step1": "1. Google Cloud 계정을 만들고, Vertex AI API를 활성화하고, 원하는 Claude 모델을 활성화하세요.", diff --git a/webview-ui/src/i18n/locales/nl/chat.json b/webview-ui/src/i18n/locales/nl/chat.json index 4bfaf467f6..9789f634a5 100644 --- a/webview-ui/src/i18n/locales/nl/chat.json +++ b/webview-ui/src/i18n/locales/nl/chat.json @@ -314,6 +314,11 @@ "title": "Limiet voor automatisch goedgekeurde verzoeken bereikt", "description": "Roo heeft de automatisch goedgekeurde limiet van {{count}} API-verzoek(en) bereikt. Wil je de teller resetten en doorgaan met de taak?", "button": "Resetten en doorgaan" + }, + "autoApprovedCostLimitReached": { + "title": "Limiet voor automatisch goedgekeurde kosten bereikt", + "button": "Resetten en doorgaan", + "description": "Roo heeft de automatisch goedgekeurde kostenlimiet van ${{count}} bereikt. Wilt u de kosten resetten en doorgaan met de taak?" } }, "codebaseSearch": { diff --git a/webview-ui/src/i18n/locales/nl/settings.json b/webview-ui/src/i18n/locales/nl/settings.json index 7d8721ffd8..d026540e67 100644 --- a/webview-ui/src/i18n/locales/nl/settings.json +++ b/webview-ui/src/i18n/locales/nl/settings.json @@ -197,7 +197,14 @@ "description": "Voer automatisch dit aantal API-verzoeken uit voordat om goedkeuring wordt gevraagd om door te gaan met de taak.", "unlimited": "Onbeperkt" }, - "selectOptionsFirst": "Selecteer ten minste één optie hieronder om automatische goedkeuring in te schakelen" + "selectOptionsFirst": "Selecteer ten minste één optie hieronder om automatische goedkeuring in te schakelen", + "apiCostLimit": { + "title": "Max kosten", + "unlimited": "Onbeperkt" + }, + "maxLimits": { + "description": "Automatisch verzoeken indienen tot aan deze limieten voordat om goedkeuring wordt gevraagd om door te gaan." + } }, "providers": { "providerDocumentation": "{{provider}} documentatie", @@ -318,7 +325,6 @@ "description": "Staat Gemini toe om Google te doorzoeken voor actuele informatie en antwoorden op realtime gegevens te baseren. Handig voor vragen die actuele informatie vereisen." } }, - "googleCloudSetup": { "title": "Om Google Cloud Vertex AI te gebruiken, moet je:", "step1": "1. Maak een Google Cloud-account aan, schakel de Vertex AI API in en activeer de gewenste Claude-modellen.", diff --git a/webview-ui/src/i18n/locales/pl/chat.json b/webview-ui/src/i18n/locales/pl/chat.json index 10ee653582..ff1c1dbe89 100644 --- a/webview-ui/src/i18n/locales/pl/chat.json +++ b/webview-ui/src/i18n/locales/pl/chat.json @@ -314,6 +314,11 @@ "title": "Osiągnięto limit automatycznie zatwierdzonych żądań", "description": "Roo osiągnął automatycznie zatwierdzony limit {{count}} żądania/żądań API. Czy chcesz zresetować licznik i kontynuować zadanie?", "button": "Zresetuj i kontynuuj" + }, + "autoApprovedCostLimitReached": { + "button": "Zresetuj i Kontynuuj", + "title": "Osiągnięto limit kosztów z automatycznym zatwierdzaniem", + "description": "Roo osiągnął automatycznie zatwierdzony limit kosztów wynoszący ${{count}}. Czy chcesz zresetować koszt i kontynuować zadanie?" } }, "codebaseSearch": { diff --git a/webview-ui/src/i18n/locales/pl/settings.json b/webview-ui/src/i18n/locales/pl/settings.json index 5a23d2137d..b4d64b1e65 100644 --- a/webview-ui/src/i18n/locales/pl/settings.json +++ b/webview-ui/src/i18n/locales/pl/settings.json @@ -197,7 +197,14 @@ "description": "Automatycznie wykonaj tyle żądań API przed poproszeniem o zgodę na kontynuowanie zadania.", "unlimited": "Bez limitu" }, - "selectOptionsFirst": "Wybierz co najmniej jedną opcję poniżej, aby włączyć automatyczne zatwierdzanie" + "selectOptionsFirst": "Wybierz co najmniej jedną opcję poniżej, aby włączyć automatyczne zatwierdzanie", + "apiCostLimit": { + "title": "Maksymalny koszt", + "unlimited": "Bez limitu" + }, + "maxLimits": { + "description": "Automatycznie składaj zapytania do tych limitów przed poproszeniem o zgodę na kontynuowanie." + } }, "providers": { "providerDocumentation": "Dokumentacja {{provider}}", @@ -318,7 +325,6 @@ "description": "Pozwala Gemini przeszukiwać Google w celu uzyskania aktualnych informacji i opierać odpowiedzi na danych w czasie rzeczywistym. Przydatne w zapytaniach wymagających najnowszych informacji." } }, - "googleCloudSetup": { "title": "Aby korzystać z Google Cloud Vertex AI, potrzebujesz:", "step1": "1. Utworzyć konto Google Cloud, włączyć API Vertex AI i włączyć żądane modele Claude.", diff --git a/webview-ui/src/i18n/locales/pt-BR/chat.json b/webview-ui/src/i18n/locales/pt-BR/chat.json index b286f5c0ad..69f197ad2e 100644 --- a/webview-ui/src/i18n/locales/pt-BR/chat.json +++ b/webview-ui/src/i18n/locales/pt-BR/chat.json @@ -314,6 +314,11 @@ "title": "Limite de Solicitações Auto-aprovadas Atingido", "description": "Roo atingiu o limite auto-aprovado de {{count}} solicitação(ões) de API. Deseja redefinir a contagem e prosseguir com a tarefa?", "button": "Redefinir e Continuar" + }, + "autoApprovedCostLimitReached": { + "title": "Limite de Custo com Aprovação Automática Atingido", + "description": "Roo atingiu o limite de custo com aprovação automática de US${{count}}. Você gostaria de redefinir o custo e prosseguir com a tarefa?", + "button": "Redefinir e Continuar" } }, "codebaseSearch": { diff --git a/webview-ui/src/i18n/locales/pt-BR/settings.json b/webview-ui/src/i18n/locales/pt-BR/settings.json index 2e39982d27..b117212e6d 100644 --- a/webview-ui/src/i18n/locales/pt-BR/settings.json +++ b/webview-ui/src/i18n/locales/pt-BR/settings.json @@ -197,7 +197,14 @@ "description": "Fazer automaticamente este número de requisições à API antes de pedir aprovação para continuar com a tarefa.", "unlimited": "Ilimitado" }, - "selectOptionsFirst": "Selecione pelo menos uma opção abaixo para habilitar a aprovação automática" + "selectOptionsFirst": "Selecione pelo menos uma opção abaixo para habilitar a aprovação automática", + "apiCostLimit": { + "title": "Custo máximo", + "unlimited": "Ilimitado" + }, + "maxLimits": { + "description": "Fazer solicitações automaticamente até estes limites antes de pedir aprovação para continuar." + } }, "providers": { "providerDocumentation": "Documentação do {{provider}}", @@ -318,7 +325,6 @@ "description": "Permite que o Gemini pesquise informações atuais no Google e fundamente as respostas em dados em tempo real. Útil para consultas que requerem informações atualizadas." } }, - "googleCloudSetup": { "title": "Para usar o Google Cloud Vertex AI, você precisa:", "step1": "1. Criar uma conta Google Cloud, ativar a API Vertex AI e ativar os modelos Claude desejados.", diff --git a/webview-ui/src/i18n/locales/ru/chat.json b/webview-ui/src/i18n/locales/ru/chat.json index af3e9aadf8..579d688a5a 100644 --- a/webview-ui/src/i18n/locales/ru/chat.json +++ b/webview-ui/src/i18n/locales/ru/chat.json @@ -314,6 +314,11 @@ "title": "Достигнут лимит автоматически одобренных запросов", "description": "Roo достиг автоматически одобренного лимита в {{count}} API-запрос(ов). Хотите сбросить счетчик и продолжить задачу?", "button": "Сбросить и продолжить" + }, + "autoApprovedCostLimitReached": { + "title": "Достигнут лимит автоматически одобряемых расходов", + "button": "Сбросить и продолжить", + "description": "Ру достиг автоматически утвержденного лимита расходов в размере ${{count}}. Хотите сбросить расходы и продолжить выполнение задачи?" } }, "codebaseSearch": { diff --git a/webview-ui/src/i18n/locales/ru/settings.json b/webview-ui/src/i18n/locales/ru/settings.json index 76c3877e10..cf657948be 100644 --- a/webview-ui/src/i18n/locales/ru/settings.json +++ b/webview-ui/src/i18n/locales/ru/settings.json @@ -197,7 +197,14 @@ "description": "Автоматически выполнять это количество API-запросов перед запросом разрешения на продолжение задачи.", "unlimited": "Без ограничений" }, - "selectOptionsFirst": "Выберите хотя бы один вариант ниже, чтобы включить автоодобрение" + "selectOptionsFirst": "Выберите хотя бы один вариант ниже, чтобы включить автоодобрение", + "apiCostLimit": { + "title": "Максимальная стоимость", + "unlimited": "Безлимитный" + }, + "maxLimits": { + "description": "Автоматически выполнять запросы до указанных лимитов, прежде чем запрашивать разрешение на продолжение." + } }, "providers": { "providerDocumentation": "Документация {{provider}}", @@ -318,7 +325,6 @@ "description": "Позволяет Gemini искать актуальную информацию в Google и основывать ответы на данных в реальном времени. Полезно для запросов, требующих актуальной информации." } }, - "googleCloudSetup": { "title": "Для использования Google Cloud Vertex AI необходимо:", "step1": "1. Создайте аккаунт Google Cloud, включите Vertex AI API и нужные модели Claude.", diff --git a/webview-ui/src/i18n/locales/tr/chat.json b/webview-ui/src/i18n/locales/tr/chat.json index e6868b5db1..a9ffb31f90 100644 --- a/webview-ui/src/i18n/locales/tr/chat.json +++ b/webview-ui/src/i18n/locales/tr/chat.json @@ -314,6 +314,11 @@ "title": "Otomatik Onaylanan İstek Limiti Aşıldı", "description": "Roo, {{count}} API isteği/istekleri için otomatik onaylanan limite ulaştı. Sayacı sıfırlamak ve göreve devam etmek istiyor musunuz?", "button": "Sıfırla ve Devam Et" + }, + "autoApprovedCostLimitReached": { + "title": "Otomatik Onaylanan Maliyet Sınırına Ulaşıldı", + "description": "Roo otomatik olarak onaylanmış ${{count}} maliyet sınırına ulaştı. Maliyeti sıfırlamak ve göreve devam etmek ister misiniz?", + "button": "Sıfırla ve Devam Et" } }, "codebaseSearch": { diff --git a/webview-ui/src/i18n/locales/tr/settings.json b/webview-ui/src/i18n/locales/tr/settings.json index 26a295ffae..216da83dff 100644 --- a/webview-ui/src/i18n/locales/tr/settings.json +++ b/webview-ui/src/i18n/locales/tr/settings.json @@ -197,7 +197,14 @@ "description": "Göreve devam etmek için onay istemeden önce bu sayıda API isteği otomatik olarak yap.", "unlimited": "Sınırsız" }, - "selectOptionsFirst": "Otomatik onayı etkinleştirmek için aşağıdan en az bir seçenek seçin" + "selectOptionsFirst": "Otomatik onayı etkinleştirmek için aşağıdan en az bir seçenek seçin", + "apiCostLimit": { + "unlimited": "Sınırsız", + "title": "Maksimum Maliyet" + }, + "maxLimits": { + "description": "Bu sınırlara ulaşana kadar otomatik olarak istekleri yap, sonrasında devam etmek için onay iste." + } }, "providers": { "providerDocumentation": "{{provider}} Dokümantasyonu", @@ -318,7 +325,6 @@ "description": "Gemini'nin güncel bilgileri almak için Google'da arama yapmasına ve yanıtları gerçek zamanlı verilere dayandırmasına izin verir. Güncel bilgi gerektiren sorgular için kullanışlıdır." } }, - "googleCloudSetup": { "title": "Google Cloud Vertex AI'yi kullanmak için şunları yapmanız gerekir:", "step1": "1. Google Cloud hesabı oluşturun, Vertex AI API'sini etkinleştirin ve istediğiniz Claude modellerini etkinleştirin.", diff --git a/webview-ui/src/i18n/locales/vi/chat.json b/webview-ui/src/i18n/locales/vi/chat.json index 2b86060ceb..dc24e40122 100644 --- a/webview-ui/src/i18n/locales/vi/chat.json +++ b/webview-ui/src/i18n/locales/vi/chat.json @@ -314,6 +314,11 @@ "title": "Đã Đạt Giới Hạn Yêu Cầu Tự Động Phê Duyệt", "description": "Roo đã đạt đến giới hạn tự động phê duyệt là {{count}} yêu cầu API. Bạn có muốn đặt lại bộ đếm và tiếp tục nhiệm vụ không?", "button": "Đặt lại và Tiếp tục" + }, + "autoApprovedCostLimitReached": { + "button": "Đặt lại và Tiếp tục", + "title": "Đã Đạt Giới Hạn Chi Phí Tự Động Phê Duyệt", + "description": "Roo đã đạt đến giới hạn chi phí tự động phê duyệt là ${{count}}. Bạn có muốn đặt lại chi phí và tiếp tục với nhiệm vụ không?" } }, "codebaseSearch": { diff --git a/webview-ui/src/i18n/locales/vi/settings.json b/webview-ui/src/i18n/locales/vi/settings.json index 48f63bdf42..6a12c91200 100644 --- a/webview-ui/src/i18n/locales/vi/settings.json +++ b/webview-ui/src/i18n/locales/vi/settings.json @@ -197,7 +197,14 @@ "description": "Tự động thực hiện số lượng API request này trước khi yêu cầu phê duyệt để tiếp tục với nhiệm vụ.", "unlimited": "Không giới hạn" }, - "selectOptionsFirst": "Chọn ít nhất một tùy chọn bên dưới để bật tự động phê duyệt" + "selectOptionsFirst": "Chọn ít nhất một tùy chọn bên dưới để bật tự động phê duyệt", + "apiCostLimit": { + "title": "Chi phí tối đa", + "unlimited": "Không giới hạn" + }, + "maxLimits": { + "description": "Tự động thực hiện các yêu cầu lên đến các giới hạn này trước khi xin phê duyệt để tiếp tục." + } }, "providers": { "providerDocumentation": "Tài liệu {{provider}}", @@ -318,7 +325,6 @@ "description": "Cho phép Gemini tìm kiếm trên Google để lấy thông tin mới nhất và căn cứ phản hồi dựa trên dữ liệu thời gian thực. Hữu ích cho các truy vấn yêu cầu thông tin cập nhật." } }, - "googleCloudSetup": { "title": "Để sử dụng Google Cloud Vertex AI, bạn cần:", "step1": "1. Tạo tài khoản Google Cloud, kích hoạt Vertex AI API và kích hoạt các mô hình Claude mong muốn.", diff --git a/webview-ui/src/i18n/locales/zh-CN/chat.json b/webview-ui/src/i18n/locales/zh-CN/chat.json index dc21acee0b..6035ff78bf 100644 --- a/webview-ui/src/i18n/locales/zh-CN/chat.json +++ b/webview-ui/src/i18n/locales/zh-CN/chat.json @@ -314,6 +314,11 @@ "title": "已达自动批准请求限制", "description": "Roo 已达到 {{count}} 次 API 请求的自动批准限制。您想重置计数并继续任务吗？", "button": "重置并继续" + }, + "autoApprovedCostLimitReached": { + "title": "已达到自动批准的费用限额", + "description": "Roo已经达到了${{count}}的自动批准成本限制。您想重置成本并继续任务吗？", + "button": "重置并继续" } }, "codebaseSearch": { diff --git a/webview-ui/src/i18n/locales/zh-CN/settings.json b/webview-ui/src/i18n/locales/zh-CN/settings.json index 6d46e337c5..52b8802bc6 100644 --- a/webview-ui/src/i18n/locales/zh-CN/settings.json +++ b/webview-ui/src/i18n/locales/zh-CN/settings.json @@ -197,7 +197,14 @@ "description": "在请求批准以继续执行任务之前，自动发出此数量的 API 请求。", "unlimited": "无限制" }, - "selectOptionsFirst": "请至少选择以下一个选项以启用自动批准" + "selectOptionsFirst": "请至少选择以下一个选项以启用自动批准", + "apiCostLimit": { + "title": "最高费用", + "unlimited": "无限" + }, + "maxLimits": { + "description": "在请求批准继续之前，自动发出请求，最多不超过这些限制。" + } }, "providers": { "providerDocumentation": "{{provider}} 文档", @@ -308,7 +315,6 @@ "cacheUsageNote": "提示：若未显示缓存使用情况，请切换模型后重新选择", "vscodeLmModel": "VSCode LM 模型", "vscodeLmWarning": "注意：这是一个非常实验性的集成，提供商支持会有所不同。如果您收到有关不支持模型的错误，则这是提供商方面的问题。", - "geminiParameters": { "urlContext": { "title": "启用 URL 上下文", diff --git a/webview-ui/src/i18n/locales/zh-TW/chat.json b/webview-ui/src/i18n/locales/zh-TW/chat.json index fc38009186..63dfd06f1d 100644 --- a/webview-ui/src/i18n/locales/zh-TW/chat.json +++ b/webview-ui/src/i18n/locales/zh-TW/chat.json @@ -314,6 +314,11 @@ "title": "已達自動核准請求限制", "description": "Roo 已達到 {{count}} 次 API 請求的自動核准限制。您想要重設計數並繼續工作嗎？", "button": "重設並繼續" + }, + "autoApprovedCostLimitReached": { + "title": "已达到自动批准成本上限", + "button": "重置并继续", + "description": "Roo已达到自动批准的成本限制${{count}}。您想要重置成本并继续任务吗？" } }, "codebaseSearch": { diff --git a/webview-ui/src/i18n/locales/zh-TW/settings.json b/webview-ui/src/i18n/locales/zh-TW/settings.json index ffd852397f..c90080cb3a 100644 --- a/webview-ui/src/i18n/locales/zh-TW/settings.json +++ b/webview-ui/src/i18n/locales/zh-TW/settings.json @@ -197,7 +197,14 @@ "description": "在請求批准以繼續執行工作之前，自動發出此數量的 API 請求。", "unlimited": "無限制" }, - "selectOptionsFirst": "請至少選擇以下一個選項以啟用自動核准" + "selectOptionsFirst": "請至少選擇以下一個選項以啟用自動核准", + "apiCostLimit": { + "unlimited": "无限", + "title": "最高费用" + }, + "maxLimits": { + "description": "在请求获得继续操作的批准前，自动发送请求直至达到这些限制。" + } }, "providers": { "providerDocumentation": "{{provider}} 文件", @@ -308,7 +315,6 @@ "cacheUsageNote": "注意：如果您沒有看到快取使用情況，請嘗試選擇其他模型，然後重新選擇您想要的模型。", "vscodeLmModel": "語言模型", "vscodeLmWarning": "注意：此整合功能仍處於實驗階段，各供應商的支援程度可能不同。如果出現模型不支援的錯誤，通常是供應商方面的問題。", - "geminiParameters": { "urlContext": { "title": "啟用 URL 上下文", From 5041880da09f73e5fa4e0b9fd0efa8d483dff4bf Mon Sep 17 00:00:00 2001 From: Daniel <57051444+daniel-lxs@users.noreply.github.com> Date: Thu, 31 Jul 2025 15:20:11 -0500 Subject: [PATCH 031/253] fix: handle Qdrant deletion errors gracefully to prevent indexing interruption (#6296) --- .../code-index/processors/file-watcher.ts | 11 +++- src/services/code-index/processors/scanner.ts | 31 +++++++--- .../code-index/vector-store/qdrant-client.ts | 61 +++++++++++++++---- 3 files changed, 78 insertions(+), 25 deletions(-) diff --git a/src/services/code-index/processors/file-watcher.ts b/src/services/code-index/processors/file-watcher.ts index 6dc1cd1835..c59d471449 100644 --- a/src/services/code-index/processors/file-watcher.ts +++ b/src/services/code-index/processors/file-watcher.ts @@ -204,15 +204,20 @@ export class FileWatcher implements IFileWatcher { currentFile: path, }) } - } catch (error) { - overallBatchError = error as Error + } catch (error: any) { + const errorStatus = error?.status || error?.response?.status || error?.statusCode + const errorMessage = error instanceof Error ? error.message : String(error) + // Log telemetry for deletion error TelemetryService.instance.captureEvent(TelemetryEventName.CODE_INDEX_ERROR, { - error: sanitizeErrorMessage(overallBatchError.message), + error: sanitizeErrorMessage(errorMessage), location: "deletePointsByMultipleFilePaths", errorType: "deletion_error", + errorStatus: errorStatus, }) + // Mark all paths as error + overallBatchError = error as Error for (const path of pathsToExplicitlyDelete) { batchResults.push({ path, status: "error", error: error as Error }) processedCountInBatch++ diff --git a/src/services/code-index/processors/scanner.ts b/src/services/code-index/processors/scanner.ts index 3203076d12..27362b8b74 100644 --- a/src/services/code-index/processors/scanner.ts +++ b/src/services/code-index/processors/scanner.ts @@ -281,17 +281,24 @@ export class DirectoryScanner implements IDirectoryScanner { try { await this.qdrantClient.deletePointsByFilePath(cachedFilePath) await this.cacheManager.deleteHash(cachedFilePath) - } catch (error) { + } catch (error: any) { + const errorStatus = error?.status || error?.response?.status || error?.statusCode + const errorMessage = error instanceof Error ? error.message : String(error) + console.error( `[DirectoryScanner] Failed to delete points for ${cachedFilePath} in workspace ${scanWorkspace}:`, error, ) + TelemetryService.instance.captureEvent(TelemetryEventName.CODE_INDEX_ERROR, { - error: sanitizeErrorMessage(error instanceof Error ? error.message : String(error)), + error: sanitizeErrorMessage(errorMessage), stack: error instanceof Error ? sanitizeErrorMessage(error.stack || "") : undefined, location: "scanDirectory:deleteRemovedFiles", + errorStatus: errorStatus, }) + if (onError) { + // Report error to error handler onError( error instanceof Error ? new Error( @@ -304,7 +311,8 @@ export class DirectoryScanner implements IDirectoryScanner { ), ) } - // Decide if we should re-throw or just log + // Log error and continue processing instead of re-throwing + console.error(`Failed to delete points for removed file: ${cachedFilePath}`, error) } } } @@ -347,25 +355,30 @@ export class DirectoryScanner implements IDirectoryScanner { if (uniqueFilePaths.length > 0) { try { await this.qdrantClient.deletePointsByMultipleFilePaths(uniqueFilePaths) - } catch (deleteError) { + } catch (deleteError: any) { + const errorStatus = + deleteError?.status || deleteError?.response?.status || deleteError?.statusCode + const errorMessage = deleteError instanceof Error ? deleteError.message : String(deleteError) + console.error( `[DirectoryScanner] Failed to delete points for ${uniqueFilePaths.length} files before upsert in workspace ${scanWorkspace}:`, deleteError, ) + TelemetryService.instance.captureEvent(TelemetryEventName.CODE_INDEX_ERROR, { - error: sanitizeErrorMessage( - deleteError instanceof Error ? deleteError.message : String(deleteError), - ), + error: sanitizeErrorMessage(errorMessage), stack: deleteError instanceof Error ? sanitizeErrorMessage(deleteError.stack || "") : undefined, location: "processBatch:deletePointsByMultipleFilePaths", fileCount: uniqueFilePaths.length, + errorStatus: errorStatus, }) - // Re-throw the error with workspace context + + // Re-throw with workspace context throw new Error( - `Failed to delete points for ${uniqueFilePaths.length} files. Workspace: ${scanWorkspace}. ${deleteError instanceof Error ? deleteError.message : String(deleteError)}`, + `Failed to delete points for ${uniqueFilePaths.length} files. Workspace: ${scanWorkspace}. ${errorMessage}`, { cause: deleteError }, ) } diff --git a/src/services/code-index/vector-store/qdrant-client.ts b/src/services/code-index/vector-store/qdrant-client.ts index 5121d65b97..0218e37295 100644 --- a/src/services/code-index/vector-store/qdrant-client.ts +++ b/src/services/code-index/vector-store/qdrant-client.ts @@ -423,27 +423,62 @@ export class QdrantVectorStore implements IVectorStore { } try { + // First check if the collection exists + const collectionExists = await this.collectionExists() + if (!collectionExists) { + console.warn( + `[QdrantVectorStore] Skipping deletion - collection "${this.collectionName}" does not exist`, + ) + return + } + const workspaceRoot = getWorkspacePath() - const normalizedPaths = filePaths.map((filePath) => { - const absolutePath = path.resolve(workspaceRoot, filePath) - return path.normalize(absolutePath) + + // Build filters using pathSegments to match the indexed fields + const filters = filePaths.map((filePath) => { + // IMPORTANT: Use the relative path to match what's stored in upsertPoints + // upsertPoints stores the relative filePath, not the absolute path + const relativePath = path.isAbsolute(filePath) ? path.relative(workspaceRoot, filePath) : filePath + + // Normalize the relative path + const normalizedRelativePath = path.normalize(relativePath) + + // Split the path into segments like we do in upsertPoints + const segments = normalizedRelativePath.split(path.sep).filter(Boolean) + + // Create a filter that matches all segments of the path + // This ensures we only delete points that match the exact file path + const mustConditions = segments.map((segment, index) => ({ + key: `pathSegments.${index}`, + match: { value: segment }, + })) + + return { must: mustConditions } }) - const filter = { - should: normalizedPaths.map((normalizedPath) => ({ - key: "filePath", - match: { - value: normalizedPath, - }, - })), - } + // Use 'should' to match any of the file paths (OR condition) + const filter = filters.length === 1 ? filters[0] : { should: filters } await this.client.delete(this.collectionName, { filter, wait: true, }) - } catch (error) { - console.error("Failed to delete points by file paths:", error) + } catch (error: any) { + // Extract more detailed error information + const errorMessage = error?.message || String(error) + const errorStatus = error?.status || error?.response?.status || error?.statusCode + const errorDetails = error?.response?.data || error?.data || "" + + console.error(`[QdrantVectorStore] Failed to delete points by file paths:`, { + error: errorMessage, + status: errorStatus, + details: errorDetails, + collection: this.collectionName, + fileCount: filePaths.length, + // Include first few file paths for debugging (avoid logging too many) + samplePaths: filePaths.slice(0, 3), + }) + throw error } } From 079fc22a666a9f4ac80438826f7b96669dc826a2 Mon Sep 17 00:00:00 2001 From: Kevin Taylor Date: Fri, 1 Aug 2025 07:17:54 +0900 Subject: [PATCH 032/253] Add Cerebras as a provider (#6392) --- packages/types/src/global-settings.ts | 1 + packages/types/src/provider-settings.ts | 7 + packages/types/src/providers/cerebras.ts | 46 +++ packages/types/src/providers/index.ts | 1 + src/api/index.ts | 3 + src/api/providers/__tests__/cerebras.spec.ts | 178 ++++++++++ src/api/providers/cerebras.ts | 327 ++++++++++++++++++ src/api/providers/index.ts | 1 + src/i18n/locales/ca/common.json | 9 + src/i18n/locales/de/common.json | 9 + src/i18n/locales/en/common.json | 9 + src/i18n/locales/es/common.json | 9 + src/i18n/locales/fr/common.json | 9 + src/i18n/locales/hi/common.json | 15 +- src/i18n/locales/id/common.json | 15 +- src/i18n/locales/it/common.json | 15 +- src/i18n/locales/ja/common.json | 15 +- src/i18n/locales/ko/common.json | 15 +- src/i18n/locales/nl/common.json | 15 +- src/i18n/locales/pl/common.json | 15 +- src/i18n/locales/pt-BR/common.json | 15 +- src/i18n/locales/ru/common.json | 15 +- src/i18n/locales/tr/common.json | 15 +- src/i18n/locales/vi/common.json | 15 +- src/i18n/locales/zh-CN/common.json | 15 +- src/i18n/locales/zh-TW/common.json | 9 + .../src/components/settings/ApiOptions.tsx | 7 + .../src/components/settings/constants.ts | 3 + .../settings/providers/Cerebras.tsx | 50 +++ .../components/settings/providers/index.ts | 1 + .../components/ui/hooks/useSelectedModel.ts | 7 + webview-ui/src/i18n/locales/ca/settings.json | 2 + webview-ui/src/i18n/locales/de/settings.json | 2 + webview-ui/src/i18n/locales/en/settings.json | 2 + webview-ui/src/i18n/locales/es/settings.json | 2 + webview-ui/src/i18n/locales/fr/settings.json | 2 + webview-ui/src/i18n/locales/hi/settings.json | 2 + webview-ui/src/i18n/locales/id/settings.json | 2 + webview-ui/src/i18n/locales/it/settings.json | 2 + webview-ui/src/i18n/locales/ja/settings.json | 2 + webview-ui/src/i18n/locales/ko/settings.json | 2 + webview-ui/src/i18n/locales/nl/settings.json | 2 + webview-ui/src/i18n/locales/pl/settings.json | 2 + .../src/i18n/locales/pt-BR/settings.json | 2 + webview-ui/src/i18n/locales/ru/settings.json | 2 + webview-ui/src/i18n/locales/tr/settings.json | 2 + webview-ui/src/i18n/locales/vi/settings.json | 2 + .../src/i18n/locales/zh-CN/settings.json | 2 + .../src/i18n/locales/zh-TW/settings.json | 2 + webview-ui/src/utils/validate.ts | 5 + 50 files changed, 871 insertions(+), 36 deletions(-) create mode 100644 packages/types/src/providers/cerebras.ts create mode 100644 src/api/providers/__tests__/cerebras.spec.ts create mode 100644 src/api/providers/cerebras.ts create mode 100644 webview-ui/src/components/settings/providers/Cerebras.tsx diff --git a/packages/types/src/global-settings.ts b/packages/types/src/global-settings.ts index 82f1426349..6de4d7413f 100644 --- a/packages/types/src/global-settings.ts +++ b/packages/types/src/global-settings.ts @@ -174,6 +174,7 @@ export const SECRET_STATE_KEYS = [ "openAiApiKey", "geminiApiKey", "openAiNativeApiKey", + "cerebrasApiKey", "deepSeekApiKey", "moonshotApiKey", "mistralApiKey", diff --git a/packages/types/src/provider-settings.ts b/packages/types/src/provider-settings.ts index e13dc9d639..2ad6c87ddd 100644 --- a/packages/types/src/provider-settings.ts +++ b/packages/types/src/provider-settings.ts @@ -34,6 +34,7 @@ export const providerNames = [ "chutes", "litellm", "huggingface", + "cerebras", "sambanova", ] as const @@ -248,6 +249,10 @@ const litellmSchema = baseProviderSettingsSchema.extend({ litellmUsePromptCache: z.boolean().optional(), }) +const cerebrasSchema = apiModelIdProviderModelSchema.extend({ + cerebrasApiKey: z.string().optional(), +}) + const sambaNovaSchema = apiModelIdProviderModelSchema.extend({ sambaNovaApiKey: z.string().optional(), }) @@ -283,6 +288,7 @@ export const providerSettingsSchemaDiscriminated = z.discriminatedUnion("apiProv huggingFaceSchema.merge(z.object({ apiProvider: z.literal("huggingface") })), chutesSchema.merge(z.object({ apiProvider: z.literal("chutes") })), litellmSchema.merge(z.object({ apiProvider: z.literal("litellm") })), + cerebrasSchema.merge(z.object({ apiProvider: z.literal("cerebras") })), sambaNovaSchema.merge(z.object({ apiProvider: z.literal("sambanova") })), defaultSchema, ]) @@ -315,6 +321,7 @@ export const providerSettingsSchema = z.object({ ...huggingFaceSchema.shape, ...chutesSchema.shape, ...litellmSchema.shape, + ...cerebrasSchema.shape, ...sambaNovaSchema.shape, ...codebaseIndexProviderSchema.shape, }) diff --git a/packages/types/src/providers/cerebras.ts b/packages/types/src/providers/cerebras.ts new file mode 100644 index 0000000000..c5ad100123 --- /dev/null +++ b/packages/types/src/providers/cerebras.ts @@ -0,0 +1,46 @@ +import type { ModelInfo } from "../model.js" + +// https://inference-docs.cerebras.ai/api-reference/chat-completions +export type CerebrasModelId = keyof typeof cerebrasModels + +export const cerebrasDefaultModelId: CerebrasModelId = "qwen-3-235b-a22b-instruct-2507" + +export const cerebrasModels = { + "llama-3.3-70b": { + maxTokens: 64000, + contextWindow: 64000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0, + outputPrice: 0, + description: "Smart model with ~2600 tokens/s", + }, + "qwen-3-32b": { + maxTokens: 64000, + contextWindow: 64000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0, + outputPrice: 0, + description: "SOTA coding performance with ~2500 tokens/s", + }, + "qwen-3-235b-a22b": { + maxTokens: 40000, + contextWindow: 40000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0, + outputPrice: 0, + description: "SOTA performance with ~1400 tokens/s", + }, + "qwen-3-235b-a22b-instruct-2507": { + maxTokens: 64000, + contextWindow: 64000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0, + outputPrice: 0, + description: "SOTA performance with ~1400 tokens/s", + supportsReasoningEffort: true, + }, +} as const satisfies Record diff --git a/packages/types/src/providers/index.ts b/packages/types/src/providers/index.ts index d6676b885a..d6584e70ec 100644 --- a/packages/types/src/providers/index.ts +++ b/packages/types/src/providers/index.ts @@ -1,5 +1,6 @@ export * from "./anthropic.js" export * from "./bedrock.js" +export * from "./cerebras.js" export * from "./chutes.js" export * from "./claude-code.js" export * from "./deepseek.js" diff --git a/src/api/index.ts b/src/api/index.ts index f726063a82..5daa53396f 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -8,6 +8,7 @@ import { GlamaHandler, AnthropicHandler, AwsBedrockHandler, + CerebrasHandler, OpenRouterHandler, VertexHandler, AnthropicVertexHandler, @@ -119,6 +120,8 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler { return new ChutesHandler(options) case "litellm": return new LiteLLMHandler(options) + case "cerebras": + return new CerebrasHandler(options) case "sambanova": return new SambaNovaHandler(options) default: diff --git a/src/api/providers/__tests__/cerebras.spec.ts b/src/api/providers/__tests__/cerebras.spec.ts new file mode 100644 index 0000000000..1ab319ef26 --- /dev/null +++ b/src/api/providers/__tests__/cerebras.spec.ts @@ -0,0 +1,178 @@ +import { describe, it, expect, vi, beforeEach } from "vitest" + +// Mock i18n +vi.mock("../../i18n", () => ({ + t: vi.fn((key: string, params?: Record) => { + // Return a simplified mock translation for testing + if (key.startsWith("common:errors.cerebras.")) { + return `Mocked: ${key.replace("common:errors.cerebras.", "")}` + } + return key + }), +})) + +// Mock DEFAULT_HEADERS +vi.mock("../constants", () => ({ + DEFAULT_HEADERS: { + "HTTP-Referer": "https://github.com/RooVetGit/Roo-Cline", + "X-Title": "Roo Code", + "User-Agent": "RooCode/1.0.0", + }, +})) + +import { CerebrasHandler } from "../cerebras" +import { cerebrasModels, type CerebrasModelId } from "@roo-code/types" + +// Mock fetch globally +global.fetch = vi.fn() + +describe("CerebrasHandler", () => { + let handler: CerebrasHandler + const mockOptions = { + cerebrasApiKey: "test-api-key", + apiModelId: "llama-3.3-70b" as CerebrasModelId, + } + + beforeEach(() => { + vi.clearAllMocks() + handler = new CerebrasHandler(mockOptions) + }) + + describe("constructor", () => { + it("should throw error when API key is missing", () => { + expect(() => new CerebrasHandler({ cerebrasApiKey: "" })).toThrow("Cerebras API key is required") + }) + + it("should initialize with valid API key", () => { + expect(() => new CerebrasHandler(mockOptions)).not.toThrow() + }) + }) + + describe("getModel", () => { + it("should return correct model info", () => { + const { id, info } = handler.getModel() + expect(id).toBe("llama-3.3-70b") + expect(info).toEqual(cerebrasModels["llama-3.3-70b"]) + }) + + it("should fallback to default model when apiModelId is not provided", () => { + const handlerWithoutModel = new CerebrasHandler({ cerebrasApiKey: "test" }) + const { id } = handlerWithoutModel.getModel() + expect(id).toBe("qwen-3-235b-a22b-instruct-2507") // cerebrasDefaultModelId + }) + }) + + describe("message conversion", () => { + it("should strip thinking tokens from assistant messages", () => { + // This would test the stripThinkingTokens function + // Implementation details would test the regex functionality + }) + + it("should flatten complex message content to strings", () => { + // This would test the flattenMessageContent function + // Test various content types: strings, arrays, image objects + }) + + it("should convert OpenAI messages to Cerebras format", () => { + // This would test the convertToCerebrasMessages function + // Ensure all messages have string content and proper role/content structure + }) + }) + + describe("createMessage", () => { + it("should make correct API request", async () => { + // Mock successful API response + const mockResponse = { + ok: true, + body: { + getReader: () => ({ + read: vi.fn().mockResolvedValueOnce({ done: true, value: new Uint8Array() }), + releaseLock: vi.fn(), + }), + }, + } + vi.mocked(fetch).mockResolvedValueOnce(mockResponse as any) + + const generator = handler.createMessage("System prompt", []) + await generator.next() // Actually start the generator to trigger the fetch call + + // Test that fetch was called with correct parameters + expect(fetch).toHaveBeenCalledWith( + "https://api.cerebras.ai/v1/chat/completions", + expect.objectContaining({ + method: "POST", + headers: expect.objectContaining({ + "Content-Type": "application/json", + Authorization: "Bearer test-api-key", + "HTTP-Referer": "https://github.com/RooVetGit/Roo-Cline", + "X-Title": "Roo Code", + "User-Agent": "RooCode/1.0.0", + }), + }), + ) + }) + + it("should handle API errors properly", async () => { + const mockErrorResponse = { + ok: false, + status: 400, + text: () => Promise.resolve('{"error": {"message": "Bad Request"}}'), + } + vi.mocked(fetch).mockResolvedValueOnce(mockErrorResponse as any) + + const generator = handler.createMessage("System prompt", []) + // Since the mock isn't working, let's just check that an error is thrown + await expect(generator.next()).rejects.toThrow() + }) + + it("should parse streaming responses correctly", async () => { + // Test streaming response parsing + // Mock ReadableStream with various data chunks + // Verify thinking token extraction and usage tracking + }) + + it("should handle temperature clamping", async () => { + const handlerWithTemp = new CerebrasHandler({ + ...mockOptions, + modelTemperature: 2.0, // Above Cerebras max of 1.5 + }) + + vi.mocked(fetch).mockResolvedValueOnce({ + ok: true, + body: { getReader: () => ({ read: () => Promise.resolve({ done: true }), releaseLock: vi.fn() }) }, + } as any) + + await handlerWithTemp.createMessage("test", []).next() + + const requestBody = JSON.parse(vi.mocked(fetch).mock.calls[0][1]?.body as string) + expect(requestBody.temperature).toBe(1.5) // Should be clamped + }) + }) + + describe("completePrompt", () => { + it("should handle non-streaming completion", async () => { + const mockResponse = { + ok: true, + json: () => + Promise.resolve({ + choices: [{ message: { content: "Test response" } }], + }), + } + vi.mocked(fetch).mockResolvedValueOnce(mockResponse as any) + + const result = await handler.completePrompt("Test prompt") + expect(result).toBe("Test response") + }) + }) + + describe("token usage and cost calculation", () => { + it("should track token usage properly", () => { + // Test that lastUsage is updated correctly + // Test getApiCost returns calculated cost based on actual usage + }) + + it("should provide usage estimates when API doesn't return usage", () => { + // Test fallback token estimation logic + }) + }) +}) diff --git a/src/api/providers/cerebras.ts b/src/api/providers/cerebras.ts new file mode 100644 index 0000000000..364477866b --- /dev/null +++ b/src/api/providers/cerebras.ts @@ -0,0 +1,327 @@ +import { Anthropic } from "@anthropic-ai/sdk" + +import { type CerebrasModelId, cerebrasDefaultModelId, cerebrasModels } from "@roo-code/types" + +import type { ApiHandlerOptions } from "../../shared/api" +import { calculateApiCostOpenAI } from "../../shared/cost" +import { ApiStream } from "../transform/stream" +import { convertToOpenAiMessages } from "../transform/openai-format" +import { XmlMatcher } from "../../utils/xml-matcher" + +import type { ApiHandlerCreateMessageMetadata, SingleCompletionHandler } from "../index" +import { BaseProvider } from "./base-provider" +import { DEFAULT_HEADERS } from "./constants" +import { t } from "../../i18n" + +const CEREBRAS_BASE_URL = "https://api.cerebras.ai/v1" +const CEREBRAS_DEFAULT_TEMPERATURE = 0 + +/** + * Removes thinking tokens from text to prevent model confusion when processing conversation history. + * This is crucial because models can get confused by their own thinking tokens in input. + */ +function stripThinkingTokens(text: string): string { + // Remove ... blocks entirely, including nested ones + return text.replace(/[\s\S]*?<\/think>/g, "").trim() +} + +/** + * Flattens OpenAI message content to simple strings that Cerebras can handle. + * Cerebras doesn't support complex content arrays like OpenAI does. + */ +function flattenMessageContent(content: any): string { + if (typeof content === "string") { + return content + } + + if (Array.isArray(content)) { + return content + .map((part) => { + if (typeof part === "string") { + return part + } + if (part.type === "text") { + return part.text || "" + } + if (part.type === "image_url") { + return "[Image]" // Placeholder for images since Cerebras doesn't support images + } + return "" + }) + .filter(Boolean) + .join("\n") + } + + // Fallback for any other content types + return String(content || "") +} + +/** + * Converts OpenAI messages to Cerebras-compatible format with simple string content. + * Also strips thinking tokens from assistant messages to prevent model confusion. + */ +function convertToCerebrasMessages(openaiMessages: any[]): Array<{ role: string; content: string }> { + return openaiMessages + .map((msg) => { + let content = flattenMessageContent(msg.content) + + // Strip thinking tokens from assistant messages to prevent confusion + if (msg.role === "assistant") { + content = stripThinkingTokens(content) + } + + return { + role: msg.role, + content, + } + }) + .filter((msg) => msg.content.trim() !== "") // Remove empty messages +} + +export class CerebrasHandler extends BaseProvider implements SingleCompletionHandler { + private apiKey: string + private providerModels: typeof cerebrasModels + private defaultProviderModelId: CerebrasModelId + private options: ApiHandlerOptions + private lastUsage: { inputTokens: number; outputTokens: number } = { inputTokens: 0, outputTokens: 0 } + + constructor(options: ApiHandlerOptions) { + super() + this.options = options + this.apiKey = options.cerebrasApiKey || "" + this.providerModels = cerebrasModels + this.defaultProviderModelId = cerebrasDefaultModelId + + if (!this.apiKey) { + throw new Error("Cerebras API key is required") + } + } + + getModel(): { id: CerebrasModelId; info: (typeof cerebrasModels)[CerebrasModelId] } { + const modelId = (this.options.apiModelId as CerebrasModelId) || this.defaultProviderModelId + return { + id: modelId, + info: this.providerModels[modelId], + } + } + + async *createMessage( + systemPrompt: string, + messages: Anthropic.Messages.MessageParam[], + metadata?: ApiHandlerCreateMessageMetadata, + ): ApiStream { + const { + id: model, + info: { maxTokens: max_tokens }, + } = this.getModel() + const temperature = this.options.modelTemperature ?? CEREBRAS_DEFAULT_TEMPERATURE + + // Convert Anthropic messages to OpenAI format, then flatten for Cerebras + // This will automatically strip thinking tokens from assistant messages + const openaiMessages = convertToOpenAiMessages(messages) + const cerebrasMessages = convertToCerebrasMessages(openaiMessages) + + // Prepare request body following Cerebras API specification exactly + const requestBody = { + model, + messages: [{ role: "system", content: systemPrompt }, ...cerebrasMessages], + stream: true, + // Use max_completion_tokens (Cerebras-specific parameter) + ...(max_tokens && max_tokens > 0 && max_tokens <= 32768 ? { max_completion_tokens: max_tokens } : {}), + // Clamp temperature to Cerebras range (0 to 1.5) + ...(temperature !== undefined && temperature !== CEREBRAS_DEFAULT_TEMPERATURE + ? { + temperature: Math.max(0, Math.min(1.5, temperature)), + } + : {}), + } + + try { + const response = await fetch(`${CEREBRAS_BASE_URL}/chat/completions`, { + method: "POST", + headers: { + ...DEFAULT_HEADERS, + "Content-Type": "application/json", + Authorization: `Bearer ${this.apiKey}`, + }, + body: JSON.stringify(requestBody), + }) + + if (!response.ok) { + const errorText = await response.text() + + let errorMessage = "Unknown error" + try { + const errorJson = JSON.parse(errorText) + errorMessage = errorJson.error?.message || errorJson.message || JSON.stringify(errorJson, null, 2) + } catch { + errorMessage = errorText || `HTTP ${response.status}` + } + + // Provide more actionable error messages + if (response.status === 401) { + throw new Error(t("common:errors.cerebras.authenticationFailed")) + } else if (response.status === 403) { + throw new Error(t("common:errors.cerebras.accessForbidden")) + } else if (response.status === 429) { + throw new Error(t("common:errors.cerebras.rateLimitExceeded")) + } else if (response.status >= 500) { + throw new Error(t("common:errors.cerebras.serverError", { status: response.status })) + } else { + throw new Error( + t("common:errors.cerebras.genericError", { status: response.status, message: errorMessage }), + ) + } + } + + if (!response.body) { + throw new Error(t("common:errors.cerebras.noResponseBody")) + } + + // Initialize XmlMatcher to parse ... tags + const matcher = new XmlMatcher( + "think", + (chunk) => + ({ + type: chunk.matched ? "reasoning" : "text", + text: chunk.data, + }) as const, + ) + + const reader = response.body.getReader() + const decoder = new TextDecoder() + let buffer = "" + let inputTokens = 0 + let outputTokens = 0 + + try { + while (true) { + const { done, value } = await reader.read() + if (done) break + + buffer += decoder.decode(value, { stream: true }) + const lines = buffer.split("\n") + buffer = lines.pop() || "" // Keep the last incomplete line in the buffer + + for (const line of lines) { + if (line.trim() === "") continue + + try { + if (line.startsWith("data: ")) { + const jsonStr = line.slice(6).trim() + if (jsonStr === "[DONE]") { + continue + } + + const parsed = JSON.parse(jsonStr) + + // Handle text content - parse for thinking tokens + if (parsed.choices?.[0]?.delta?.content) { + const content = parsed.choices[0].delta.content + + // Use XmlMatcher to parse ... tags + for (const chunk of matcher.update(content)) { + yield chunk + } + } + + // Handle usage information if available + if (parsed.usage) { + inputTokens = parsed.usage.prompt_tokens || 0 + outputTokens = parsed.usage.completion_tokens || 0 + } + } + } catch (error) { + // Silently ignore malformed streaming data lines + } + } + } + } finally { + reader.releaseLock() + } + + // Process any remaining content in the matcher + for (const chunk of matcher.final()) { + yield chunk + } + + // Provide token usage estimate if not available from API + if (inputTokens === 0 || outputTokens === 0) { + const inputText = systemPrompt + cerebrasMessages.map((m) => m.content).join("") + inputTokens = inputTokens || Math.ceil(inputText.length / 4) // Rough estimate: 4 chars per token + outputTokens = outputTokens || Math.ceil((max_tokens || 1000) / 10) // Rough estimate + } + + // Store usage for cost calculation + this.lastUsage = { inputTokens, outputTokens } + + yield { + type: "usage", + inputTokens, + outputTokens, + } + } catch (error) { + if (error instanceof Error) { + throw new Error(t("common:errors.cerebras.completionError", { error: error.message })) + } + throw error + } + } + + async completePrompt(prompt: string): Promise { + const { id: model } = this.getModel() + + // Prepare request body for non-streaming completion + const requestBody = { + model, + messages: [{ role: "user", content: prompt }], + stream: false, + } + + try { + const response = await fetch(`${CEREBRAS_BASE_URL}/chat/completions`, { + method: "POST", + headers: { + ...DEFAULT_HEADERS, + "Content-Type": "application/json", + Authorization: `Bearer ${this.apiKey}`, + }, + body: JSON.stringify(requestBody), + }) + + if (!response.ok) { + const errorText = await response.text() + + // Provide consistent error handling with createMessage + if (response.status === 401) { + throw new Error(t("common:errors.cerebras.authenticationFailed")) + } else if (response.status === 403) { + throw new Error(t("common:errors.cerebras.accessForbidden")) + } else if (response.status === 429) { + throw new Error(t("common:errors.cerebras.rateLimitExceeded")) + } else if (response.status >= 500) { + throw new Error(t("common:errors.cerebras.serverError", { status: response.status })) + } else { + throw new Error( + t("common:errors.cerebras.genericError", { status: response.status, message: errorText }), + ) + } + } + + const result = await response.json() + return result.choices?.[0]?.message?.content || "" + } catch (error) { + if (error instanceof Error) { + throw new Error(t("common:errors.cerebras.completionError", { error: error.message })) + } + throw error + } + } + + getApiCost(metadata: ApiHandlerCreateMessageMetadata): number { + const { info } = this.getModel() + // Use actual token usage from the last request + const { inputTokens, outputTokens } = this.lastUsage + return calculateApiCostOpenAI(info, inputTokens, outputTokens) + } +} diff --git a/src/api/providers/index.ts b/src/api/providers/index.ts index 7b35e02f15..a1b8f25536 100644 --- a/src/api/providers/index.ts +++ b/src/api/providers/index.ts @@ -1,6 +1,7 @@ export { AnthropicVertexHandler } from "./anthropic-vertex" export { AnthropicHandler } from "./anthropic" export { AwsBedrockHandler } from "./bedrock" +export { CerebrasHandler } from "./cerebras" export { ChutesHandler } from "./chutes" export { ClaudeCodeHandler } from "./claude-code" export { DeepSeekHandler } from "./deepseek" diff --git a/src/i18n/locales/ca/common.json b/src/i18n/locales/ca/common.json index 394c08dbd7..ad2af15efa 100644 --- a/src/i18n/locales/ca/common.json +++ b/src/i18n/locales/ca/common.json @@ -94,6 +94,15 @@ "generate_complete_prompt": "Error de finalització de Gemini: {{error}}", "sources": "Fonts:" }, + "cerebras": { + "authenticationFailed": "Ha fallat l'autenticació de l'API de Cerebras. Comproveu que la vostra clau d'API sigui vàlida i no hagi caducat.", + "accessForbidden": "Accés denegat a l'API de Cerebras. La vostra clau d'API pot no tenir accés al model o funcionalitat sol·licitats.", + "rateLimitExceeded": "S'ha superat el límit de velocitat de l'API de Cerebras. Espereu abans de fer una altra sol·licitud.", + "serverError": "Error del servidor de l'API de Cerebras ({{status}}). Torneu-ho a provar més tard.", + "genericError": "Error de l'API de Cerebras ({{status}}): {{message}}", + "noResponseBody": "Error de l'API de Cerebras: No hi ha cos de resposta", + "completionError": "Error de finalització de Cerebras: {{error}}" + }, "mode_import_failed": "Ha fallat la importació del mode: {{error}}" }, "warnings": { diff --git a/src/i18n/locales/de/common.json b/src/i18n/locales/de/common.json index 0e51a1644d..1dd8bd89e6 100644 --- a/src/i18n/locales/de/common.json +++ b/src/i18n/locales/de/common.json @@ -90,6 +90,15 @@ "generate_stream": "Fehler beim Generieren des Kontext-Streams von Gemini: {{error}}", "generate_complete_prompt": "Fehler bei der Vervollständigung durch Gemini: {{error}}", "sources": "Quellen:" + }, + "cerebras": { + "authenticationFailed": "Cerebras API-Authentifizierung fehlgeschlagen. Bitte überprüfe, ob dein API-Schlüssel gültig und nicht abgelaufen ist.", + "accessForbidden": "Cerebras API-Zugriff verweigert. Dein API-Schlüssel hat möglicherweise keinen Zugriff auf das angeforderte Modell oder die Funktion.", + "rateLimitExceeded": "Cerebras API-Ratenlimit überschritten. Bitte warte, bevor du eine weitere Anfrage stellst.", + "serverError": "Cerebras API-Serverfehler ({{status}}). Bitte versuche es später erneut.", + "genericError": "Cerebras API-Fehler ({{status}}): {{message}}", + "noResponseBody": "Cerebras API-Fehler: Kein Antworttext vorhanden", + "completionError": "Cerebras-Vervollständigungsfehler: {{error}}" } }, "warnings": { diff --git a/src/i18n/locales/en/common.json b/src/i18n/locales/en/common.json index 57454cbfe6..c8deee5cf4 100644 --- a/src/i18n/locales/en/common.json +++ b/src/i18n/locales/en/common.json @@ -90,6 +90,15 @@ "generate_stream": "Gemini generate context stream error: {{error}}", "generate_complete_prompt": "Gemini completion error: {{error}}", "sources": "Sources:" + }, + "cerebras": { + "authenticationFailed": "Cerebras API authentication failed. Please check your API key is valid and not expired.", + "accessForbidden": "Cerebras API access forbidden. Your API key may not have access to the requested model or feature.", + "rateLimitExceeded": "Cerebras API rate limit exceeded. Please wait before making another request.", + "serverError": "Cerebras API server error ({{status}}). Please try again later.", + "genericError": "Cerebras API Error ({{status}}): {{message}}", + "noResponseBody": "Cerebras API Error: No response body", + "completionError": "Cerebras completion error: {{error}}" } }, "warnings": { diff --git a/src/i18n/locales/es/common.json b/src/i18n/locales/es/common.json index 32ae5f284e..47acd8e26a 100644 --- a/src/i18n/locales/es/common.json +++ b/src/i18n/locales/es/common.json @@ -90,6 +90,15 @@ "generate_stream": "Error del stream de contexto de generación de Gemini: {{error}}", "generate_complete_prompt": "Error de finalización de Gemini: {{error}}", "sources": "Fuentes:" + }, + "cerebras": { + "authenticationFailed": "Falló la autenticación de la API de Cerebras. Verifica que tu clave de API sea válida y no haya expirado.", + "accessForbidden": "Acceso prohibido a la API de Cerebras. Tu clave de API puede no tener acceso al modelo o función solicitada.", + "rateLimitExceeded": "Se excedió el límite de velocidad de la API de Cerebras. Espera antes de hacer otra solicitud.", + "serverError": "Error del servidor de la API de Cerebras ({{status}}). Inténtalo de nuevo más tarde.", + "genericError": "Error de la API de Cerebras ({{status}}): {{message}}", + "noResponseBody": "Error de la API de Cerebras: Sin cuerpo de respuesta", + "completionError": "Error de finalización de Cerebras: {{error}}" } }, "warnings": { diff --git a/src/i18n/locales/fr/common.json b/src/i18n/locales/fr/common.json index 3f256a3488..0103c8694e 100644 --- a/src/i18n/locales/fr/common.json +++ b/src/i18n/locales/fr/common.json @@ -90,6 +90,15 @@ "generate_stream": "Erreur du flux de contexte de génération Gemini : {{error}}", "generate_complete_prompt": "Erreur d'achèvement de Gemini : {{error}}", "sources": "Sources :" + }, + "cerebras": { + "authenticationFailed": "Échec de l'authentification de l'API Cerebras. Vérifiez que votre clé API est valide et n'a pas expiré.", + "accessForbidden": "Accès interdit à l'API Cerebras. Votre clé API peut ne pas avoir accès au modèle ou à la fonction demandée.", + "rateLimitExceeded": "Limite de débit de l'API Cerebras dépassée. Veuillez attendre avant de faire une autre demande.", + "serverError": "Erreur du serveur de l'API Cerebras ({{status}}). Veuillez réessayer plus tard.", + "genericError": "Erreur de l'API Cerebras ({{status}}) : {{message}}", + "noResponseBody": "Erreur de l'API Cerebras : Aucun corps de réponse", + "completionError": "Erreur d'achèvement de Cerebras : {{error}}" } }, "warnings": { diff --git a/src/i18n/locales/hi/common.json b/src/i18n/locales/hi/common.json index 6ffc87a9eb..c18bf8fa7b 100644 --- a/src/i18n/locales/hi/common.json +++ b/src/i18n/locales/hi/common.json @@ -87,9 +87,18 @@ "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Gemini generate context stream error: {{error}}", - "generate_complete_prompt": "Gemini completion error: {{error}}", - "sources": "Sources:" + "generate_stream": "जेमिनी जनरेट कॉन्टेक्स्ट स्ट्रीम त्रुटि: {{error}}", + "generate_complete_prompt": "जेमिनी समापन त्रुटि: {{error}}", + "sources": "स्रोत:" + }, + "cerebras": { + "authenticationFailed": "Cerebras API प्रमाणीकरण विफल हुआ। कृपया जांचें कि आपकी API कुंजी वैध है और समाप्त नहीं हुई है।", + "accessForbidden": "Cerebras API पहुंच निषेध। आपकी API कुंजी का अनुरोधित मॉडल या सुविधा तक पहुंच नहीं हो सकती है।", + "rateLimitExceeded": "Cerebras API दर सीमा पार हो गई। कृपया दूसरा अनुरोध करने से पहले प्रतीक्षा करें।", + "serverError": "Cerebras API सर्वर त्रुटि ({{status}})। कृपया बाद में पुनः प्रयास करें।", + "genericError": "Cerebras API त्रुटि ({{status}}): {{message}}", + "noResponseBody": "Cerebras API त्रुटि: कोई प्रतिक्रिया मुख्य भाग नहीं", + "completionError": "Cerebras पूर्णता त्रुटि: {{error}}" } }, "warnings": { diff --git a/src/i18n/locales/id/common.json b/src/i18n/locales/id/common.json index fdd619ec4d..eb36b9e898 100644 --- a/src/i18n/locales/id/common.json +++ b/src/i18n/locales/id/common.json @@ -87,9 +87,18 @@ "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Gemini generate context stream error: {{error}}", - "generate_complete_prompt": "Gemini completion error: {{error}}", - "sources": "Sources:" + "generate_stream": "Kesalahan aliran konteks pembuatan Gemini: {{error}}", + "generate_complete_prompt": "Kesalahan penyelesaian Gemini: {{error}}", + "sources": "Sumber:" + }, + "cerebras": { + "authenticationFailed": "Autentikasi API Cerebras gagal. Silakan periksa apakah kunci API Anda valid dan belum kedaluwarsa.", + "accessForbidden": "Akses API Cerebras ditolak. Kunci API Anda mungkin tidak memiliki akses ke model atau fitur yang diminta.", + "rateLimitExceeded": "Batas kecepatan API Cerebras terlampaui. Silakan tunggu sebelum membuat permintaan lain.", + "serverError": "Kesalahan server API Cerebras ({{status}}). Silakan coba lagi nanti.", + "genericError": "Kesalahan API Cerebras ({{status}}): {{message}}", + "noResponseBody": "Kesalahan API Cerebras: Tidak ada isi respons", + "completionError": "Kesalahan penyelesaian Cerebras: {{error}}" } }, "warnings": { diff --git a/src/i18n/locales/it/common.json b/src/i18n/locales/it/common.json index 92cbf64316..9d0b36f03d 100644 --- a/src/i18n/locales/it/common.json +++ b/src/i18n/locales/it/common.json @@ -87,9 +87,18 @@ "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Gemini generate context stream error: {{error}}", - "generate_complete_prompt": "Gemini completion error: {{error}}", - "sources": "Sources:" + "generate_stream": "Errore del flusso di contesto di generazione Gemini: {{error}}", + "generate_complete_prompt": "Errore di completamento Gemini: {{error}}", + "sources": "Fonti:" + }, + "cerebras": { + "authenticationFailed": "Autenticazione API Cerebras fallita. Verifica che la tua chiave API sia valida e non scaduta.", + "accessForbidden": "Accesso API Cerebras negato. La tua chiave API potrebbe non avere accesso al modello o alla funzione richiesta.", + "rateLimitExceeded": "Limite di velocità API Cerebras superato. Attendi prima di fare un'altra richiesta.", + "serverError": "Errore del server API Cerebras ({{status}}). Riprova più tardi.", + "genericError": "Errore API Cerebras ({{status}}): {{message}}", + "noResponseBody": "Errore API Cerebras: Nessun corpo di risposta", + "completionError": "Errore di completamento Cerebras: {{error}}" } }, "warnings": { diff --git a/src/i18n/locales/ja/common.json b/src/i18n/locales/ja/common.json index c82aa6b90d..6451ed3533 100644 --- a/src/i18n/locales/ja/common.json +++ b/src/i18n/locales/ja/common.json @@ -87,9 +87,18 @@ "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Gemini generate context stream error: {{error}}", - "generate_complete_prompt": "Gemini completion error: {{error}}", - "sources": "Sources:" + "generate_stream": "Gemini 生成コンテキスト ストリーム エラー: {{error}}", + "generate_complete_prompt": "Gemini 完了エラー: {{error}}", + "sources": "ソース:" + }, + "cerebras": { + "authenticationFailed": "Cerebras API認証が失敗しました。APIキーが有効で期限切れではないことを確認してください。", + "accessForbidden": "Cerebras APIアクセスが禁止されています。あなたのAPIキーは要求されたモデルや機能にアクセスできない可能性があります。", + "rateLimitExceeded": "Cerebras APIレート制限を超過しました。別のリクエストを行う前にお待ちください。", + "serverError": "Cerebras APIサーバーエラー ({{status}})。しばらくしてからもう一度お試しください。", + "genericError": "Cerebras APIエラー ({{status}}): {{message}}", + "noResponseBody": "Cerebras APIエラー: レスポンスボディなし", + "completionError": "Cerebras完了エラー: {{error}}" } }, "warnings": { diff --git a/src/i18n/locales/ko/common.json b/src/i18n/locales/ko/common.json index d9d178a39c..fc97d75dc5 100644 --- a/src/i18n/locales/ko/common.json +++ b/src/i18n/locales/ko/common.json @@ -87,9 +87,18 @@ "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Gemini generate context stream error: {{error}}", - "generate_complete_prompt": "Gemini completion error: {{error}}", - "sources": "Sources:" + "generate_stream": "Gemini 생성 컨텍스트 스트림 오류: {{error}}", + "generate_complete_prompt": "Gemini 완료 오류: {{error}}", + "sources": "출처:" + }, + "cerebras": { + "authenticationFailed": "Cerebras API 인증에 실패했습니다. API 키가 유효하고 만료되지 않았는지 확인하세요.", + "accessForbidden": "Cerebras API 액세스가 금지되었습니다. API 키가 요청된 모델이나 기능에 액세스할 수 없을 수 있습니다.", + "rateLimitExceeded": "Cerebras API 속도 제한을 초과했습니다. 다른 요청을 하기 전에 기다리세요.", + "serverError": "Cerebras API 서버 오류 ({{status}}). 나중에 다시 시도하세요.", + "genericError": "Cerebras API 오류 ({{status}}): {{message}}", + "noResponseBody": "Cerebras API 오류: 응답 본문 없음", + "completionError": "Cerebras 완료 오류: {{error}}" } }, "warnings": { diff --git a/src/i18n/locales/nl/common.json b/src/i18n/locales/nl/common.json index 277b1d7445..f722093b37 100644 --- a/src/i18n/locales/nl/common.json +++ b/src/i18n/locales/nl/common.json @@ -87,9 +87,18 @@ "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Gemini generate context stream error: {{error}}", - "generate_complete_prompt": "Gemini completion error: {{error}}", - "sources": "Sources:" + "generate_stream": "Fout bij het genereren van contextstream door Gemini: {{error}}", + "generate_complete_prompt": "Fout bij het voltooien door Gemini: {{error}}", + "sources": "Bronnen:" + }, + "cerebras": { + "authenticationFailed": "Cerebras API-authenticatie mislukt. Controleer of je API-sleutel geldig is en niet verlopen.", + "accessForbidden": "Cerebras API-toegang geweigerd. Je API-sleutel heeft mogelijk geen toegang tot het gevraagde model of de functie.", + "rateLimitExceeded": "Cerebras API-snelheidslimiet overschreden. Wacht voordat je een ander verzoek doet.", + "serverError": "Cerebras API-serverfout ({{status}}). Probeer het later opnieuw.", + "genericError": "Cerebras API-fout ({{status}}): {{message}}", + "noResponseBody": "Cerebras API-fout: Geen responslichaam", + "completionError": "Cerebras-voltooiingsfout: {{error}}" } }, "warnings": { diff --git a/src/i18n/locales/pl/common.json b/src/i18n/locales/pl/common.json index ce0597e241..8dea06033f 100644 --- a/src/i18n/locales/pl/common.json +++ b/src/i18n/locales/pl/common.json @@ -87,9 +87,18 @@ "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Gemini generate context stream error: {{error}}", - "generate_complete_prompt": "Gemini completion error: {{error}}", - "sources": "Sources:" + "generate_stream": "Błąd strumienia kontekstu generowania Gemini: {{error}}", + "generate_complete_prompt": "Błąd uzupełniania Gemini: {{error}}", + "sources": "Źródła:" + }, + "cerebras": { + "authenticationFailed": "Uwierzytelnianie API Cerebras nie powiodło się. Sprawdź, czy twój klucz API jest ważny i nie wygasł.", + "accessForbidden": "Dostęp do API Cerebras zabroniony. Twój klucz API może nie mieć dostępu do żądanego modelu lub funkcji.", + "rateLimitExceeded": "Przekroczono limit szybkości API Cerebras. Poczekaj przed wykonaniem kolejnego żądania.", + "serverError": "Błąd serwera API Cerebras ({{status}}). Spróbuj ponownie później.", + "genericError": "Błąd API Cerebras ({{status}}): {{message}}", + "noResponseBody": "Błąd API Cerebras: Brak treści odpowiedzi", + "completionError": "Błąd uzupełniania Cerebras: {{error}}" } }, "warnings": { diff --git a/src/i18n/locales/pt-BR/common.json b/src/i18n/locales/pt-BR/common.json index 96912bf9a4..b0af270d4c 100644 --- a/src/i18n/locales/pt-BR/common.json +++ b/src/i18n/locales/pt-BR/common.json @@ -91,9 +91,18 @@ "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Gemini generate context stream error: {{error}}", - "generate_complete_prompt": "Gemini completion error: {{error}}", - "sources": "Sources:" + "generate_stream": "Erro de fluxo de contexto de geração do Gemini: {{error}}", + "generate_complete_prompt": "Erro de conclusão do Gemini: {{error}}", + "sources": "Fontes:" + }, + "cerebras": { + "authenticationFailed": "Falha na autenticação da API Cerebras. Verifique se sua chave de API é válida e não expirou.", + "accessForbidden": "Acesso à API Cerebras negado. Sua chave de API pode não ter acesso ao modelo ou recurso solicitado.", + "rateLimitExceeded": "Limite de taxa da API Cerebras excedido. Aguarde antes de fazer outra solicitação.", + "serverError": "Erro do servidor da API Cerebras ({{status}}). Tente novamente mais tarde.", + "genericError": "Erro da API Cerebras ({{status}}): {{message}}", + "noResponseBody": "Erro da API Cerebras: Sem corpo de resposta", + "completionError": "Erro de conclusão do Cerebras: {{error}}" } }, "warnings": { diff --git a/src/i18n/locales/ru/common.json b/src/i18n/locales/ru/common.json index 7f469da787..716d42febc 100644 --- a/src/i18n/locales/ru/common.json +++ b/src/i18n/locales/ru/common.json @@ -87,9 +87,18 @@ "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Gemini generate context stream error: {{error}}", - "generate_complete_prompt": "Gemini completion error: {{error}}", - "sources": "Sources:" + "generate_stream": "Ошибка потока контекста генерации Gemini: {{error}}", + "generate_complete_prompt": "Ошибка завершения Gemini: {{error}}", + "sources": "Источники:" + }, + "cerebras": { + "authenticationFailed": "Ошибка аутентификации Cerebras API. Убедитесь, что ваш API-ключ действителен и не истек.", + "accessForbidden": "Доступ к Cerebras API запрещен. Ваш API-ключ может не иметь доступа к запрашиваемой модели или функции.", + "rateLimitExceeded": "Превышен лимит скорости Cerebras API. Подождите перед отправкой следующего запроса.", + "serverError": "Ошибка сервера Cerebras API ({{status}}). Попробуйте позже.", + "genericError": "Ошибка Cerebras API ({{status}}): {{message}}", + "noResponseBody": "Ошибка Cerebras API: Нет тела ответа", + "completionError": "Ошибка завершения Cerebras: {{error}}" } }, "warnings": { diff --git a/src/i18n/locales/tr/common.json b/src/i18n/locales/tr/common.json index c100172e61..18324d723f 100644 --- a/src/i18n/locales/tr/common.json +++ b/src/i18n/locales/tr/common.json @@ -87,9 +87,18 @@ "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Gemini generate context stream error: {{error}}", - "generate_complete_prompt": "Gemini completion error: {{error}}", - "sources": "Sources:" + "generate_stream": "Gemini oluşturma bağlam akışı hatası: {{error}}", + "generate_complete_prompt": "Gemini tamamlama hatası: {{error}}", + "sources": "Kaynaklar:" + }, + "cerebras": { + "authenticationFailed": "Cerebras API kimlik doğrulama başarısız oldu. API anahtarınızın geçerli olduğunu ve süresi dolmadığını kontrol edin.", + "accessForbidden": "Cerebras API erişimi yasak. API anahtarınız istenen modele veya özelliğe erişimi olmayabilir.", + "rateLimitExceeded": "Cerebras API hız sınırı aşıldı. Başka bir istek yapmadan önce bekleyin.", + "serverError": "Cerebras API sunucu hatası ({{status}}). Lütfen daha sonra tekrar deneyin.", + "genericError": "Cerebras API Hatası ({{status}}): {{message}}", + "noResponseBody": "Cerebras API Hatası: Yanıt gövdesi yok", + "completionError": "Cerebras tamamlama hatası: {{error}}" } }, "warnings": { diff --git a/src/i18n/locales/vi/common.json b/src/i18n/locales/vi/common.json index 9a2fe23c77..772371555e 100644 --- a/src/i18n/locales/vi/common.json +++ b/src/i18n/locales/vi/common.json @@ -87,9 +87,18 @@ "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Gemini generate context stream error: {{error}}", - "generate_complete_prompt": "Gemini completion error: {{error}}", - "sources": "Sources:" + "generate_stream": "Lỗi luồng ngữ cảnh tạo Gemini: {{error}}", + "generate_complete_prompt": "Lỗi hoàn thành Gemini: {{error}}", + "sources": "Nguồn:" + }, + "cerebras": { + "authenticationFailed": "Xác thực API Cerebras thất bại. Vui lòng kiểm tra khóa API của bạn có hợp lệ và chưa hết hạn.", + "accessForbidden": "Truy cập API Cerebras bị từ chối. Khóa API của bạn có thể không có quyền truy cập vào mô hình hoặc tính năng được yêu cầu.", + "rateLimitExceeded": "Vượt quá giới hạn tốc độ API Cerebras. Vui lòng chờ trước khi thực hiện yêu cầu khác.", + "serverError": "Lỗi máy chủ API Cerebras ({{status}}). Vui lòng thử lại sau.", + "genericError": "Lỗi API Cerebras ({{status}}): {{message}}", + "noResponseBody": "Lỗi API Cerebras: Không có nội dung phản hồi", + "completionError": "Lỗi hoàn thành Cerebras: {{error}}" } }, "warnings": { diff --git a/src/i18n/locales/zh-CN/common.json b/src/i18n/locales/zh-CN/common.json index 9dba8dada9..c06ce9d9fd 100644 --- a/src/i18n/locales/zh-CN/common.json +++ b/src/i18n/locales/zh-CN/common.json @@ -92,9 +92,18 @@ "notFound": "Claude Code executable '{{claudePath}}' not found.\n\nPlease install Claude Code CLI:\n1. Visit {{installationUrl}} to download Claude Code\n2. Follow the installation instructions for your operating system\n3. Ensure the 'claude' command is available in your PATH\n4. Alternatively, configure a custom path in Roo settings under 'Claude Code Path'\n\nOriginal error: {{originalError}}" }, "gemini": { - "generate_stream": "Gemini generate context stream error: {{error}}", - "generate_complete_prompt": "Gemini completion error: {{error}}", - "sources": "Sources:" + "generate_stream": "Gemini 生成上下文流错误：{{error}}", + "generate_complete_prompt": "Gemini 完成错误：{{error}}", + "sources": "来源：" + }, + "cerebras": { + "authenticationFailed": "Cerebras API 身份验证失败。请检查你的 API 密钥是否有效且未过期。", + "accessForbidden": "Cerebras API 访问被禁止。你的 API 密钥可能无法访问请求的模型或功能。", + "rateLimitExceeded": "Cerebras API 速率限制已超出。请稍等后再发起另一个请求。", + "serverError": "Cerebras API 服务器错误 ({{status}})。请稍后重试。", + "genericError": "Cerebras API 错误 ({{status}})：{{message}}", + "noResponseBody": "Cerebras API 错误：无响应主体", + "completionError": "Cerebras 完成错误：{{error}}" } }, "warnings": { diff --git a/src/i18n/locales/zh-TW/common.json b/src/i18n/locales/zh-TW/common.json index 1167e49220..f443ef9777 100644 --- a/src/i18n/locales/zh-TW/common.json +++ b/src/i18n/locales/zh-TW/common.json @@ -90,6 +90,15 @@ "generate_complete_prompt": "Gemini 完成錯誤：{{error}}", "sources": "來源：" }, + "cerebras": { + "authenticationFailed": "Cerebras API 驗證失敗。請檢查您的 API 金鑰是否有效且未過期。", + "accessForbidden": "Cerebras API 存取被拒絕。您的 API 金鑰可能無法存取所請求的模型或功能。", + "rateLimitExceeded": "Cerebras API 速率限制已超出。請稍候再發出另一個請求。", + "serverError": "Cerebras API 伺服器錯誤 ({{status}})。請稍後重試。", + "genericError": "Cerebras API 錯誤 ({{status}})：{{message}}", + "noResponseBody": "Cerebras API 錯誤：無回應主體", + "completionError": "Cerebras 完成錯誤：{{error}}" + }, "mode_import_failed": "匯入模式失敗：{{error}}" }, "warnings": { diff --git a/webview-ui/src/components/settings/ApiOptions.tsx b/webview-ui/src/components/settings/ApiOptions.tsx index 5b9d90b343..d70ca553ac 100644 --- a/webview-ui/src/components/settings/ApiOptions.tsx +++ b/webview-ui/src/components/settings/ApiOptions.tsx @@ -23,6 +23,7 @@ import { mistralDefaultModelId, xaiDefaultModelId, groqDefaultModelId, + cerebrasDefaultModelId, chutesDefaultModelId, bedrockDefaultModelId, vertexDefaultModelId, @@ -55,6 +56,7 @@ import { import { Anthropic, Bedrock, + Cerebras, Chutes, ClaudeCode, DeepSeek, @@ -290,6 +292,7 @@ const ApiOptions = ({ requesty: { field: "requestyModelId", default: requestyDefaultModelId }, litellm: { field: "litellmModelId", default: litellmDefaultModelId }, anthropic: { field: "apiModelId", default: anthropicDefaultModelId }, + cerebras: { field: "apiModelId", default: cerebrasDefaultModelId }, "claude-code": { field: "apiModelId", default: claudeCodeDefaultModelId }, "openai-native": { field: "apiModelId", default: openAiNativeDefaultModelId }, gemini: { field: "apiModelId", default: geminiDefaultModelId }, @@ -506,6 +509,10 @@ const ApiOptions = ({ )} + {selectedProvider === "cerebras" && ( + + )} + {selectedProvider === "chutes" && ( )} diff --git a/webview-ui/src/components/settings/constants.ts b/webview-ui/src/components/settings/constants.ts index b8aa84cb72..fae35b1693 100644 --- a/webview-ui/src/components/settings/constants.ts +++ b/webview-ui/src/components/settings/constants.ts @@ -3,6 +3,7 @@ import { type ModelInfo, anthropicModels, bedrockModels, + cerebrasModels, claudeCodeModels, deepSeekModels, moonshotModels, @@ -21,6 +22,7 @@ export const MODELS_BY_PROVIDER: Partial void +} + +export const Cerebras = ({ apiConfiguration, setApiConfigurationField }: CerebrasProps) => { + const { t } = useAppTranslation() + + const handleInputChange = useCallback( + ( + field: K, + transform: (event: E) => ProviderSettings[K] = inputEventTransform, + ) => + (event: E | Event) => { + setApiConfigurationField(field, transform(event as E)) + }, + [setApiConfigurationField], + ) + + return ( + <> + + + +
+ {t("settings:providers.apiKeyStorageNotice")} +
+ {!apiConfiguration?.cerebrasApiKey && ( + + {t("settings:providers.getCerebrasApiKey")} + + )} + + ) +} diff --git a/webview-ui/src/components/settings/providers/index.ts b/webview-ui/src/components/settings/providers/index.ts index 13420b2679..47430a0cc8 100644 --- a/webview-ui/src/components/settings/providers/index.ts +++ b/webview-ui/src/components/settings/providers/index.ts @@ -1,5 +1,6 @@ export { Anthropic } from "./Anthropic" export { Bedrock } from "./Bedrock" +export { Cerebras } from "./Cerebras" export { Chutes } from "./Chutes" export { ClaudeCode } from "./ClaudeCode" export { DeepSeek } from "./DeepSeek" diff --git a/webview-ui/src/components/ui/hooks/useSelectedModel.ts b/webview-ui/src/components/ui/hooks/useSelectedModel.ts index 0bd4fe047c..22de35accc 100644 --- a/webview-ui/src/components/ui/hooks/useSelectedModel.ts +++ b/webview-ui/src/components/ui/hooks/useSelectedModel.ts @@ -6,6 +6,8 @@ import { anthropicModels, bedrockDefaultModelId, bedrockModels, + cerebrasDefaultModelId, + cerebrasModels, deepSeekDefaultModelId, deepSeekModels, moonshotDefaultModelId, @@ -246,6 +248,11 @@ function getSelectedModel({ const info = claudeCodeModels[id as keyof typeof claudeCodeModels] return { id, info: { ...openAiModelInfoSaneDefaults, ...info } } } + case "cerebras": { + const id = apiConfiguration.apiModelId ?? cerebrasDefaultModelId + const info = cerebrasModels[id as keyof typeof cerebrasModels] + return { id, info } + } case "sambanova": { const id = apiConfiguration.apiModelId ?? sambaNovaDefaultModelId const info = sambaNovaModels[id as keyof typeof sambaNovaModels] diff --git a/webview-ui/src/i18n/locales/ca/settings.json b/webview-ui/src/i18n/locales/ca/settings.json index eb26482d96..82c8f40516 100644 --- a/webview-ui/src/i18n/locales/ca/settings.json +++ b/webview-ui/src/i18n/locales/ca/settings.json @@ -256,6 +256,8 @@ "anthropicApiKey": "Clau API d'Anthropic", "getAnthropicApiKey": "Obtenir clau API d'Anthropic", "anthropicUseAuthToken": "Passar la clau API d'Anthropic com a capçalera d'autorització en lloc de X-Api-Key", + "cerebrasApiKey": "Clau API de Cerebras", + "getCerebrasApiKey": "Obtenir clau API de Cerebras", "chutesApiKey": "Clau API de Chutes", "getChutesApiKey": "Obtenir clau API de Chutes", "deepSeekApiKey": "Clau API de DeepSeek", diff --git a/webview-ui/src/i18n/locales/de/settings.json b/webview-ui/src/i18n/locales/de/settings.json index 1915b67433..df61c3142e 100644 --- a/webview-ui/src/i18n/locales/de/settings.json +++ b/webview-ui/src/i18n/locales/de/settings.json @@ -258,6 +258,8 @@ "anthropicApiKey": "Anthropic API-Schlüssel", "getAnthropicApiKey": "Anthropic API-Schlüssel erhalten", "anthropicUseAuthToken": "Anthropic API-Schlüssel als Authorization-Header anstelle von X-Api-Key übergeben", + "cerebrasApiKey": "Cerebras API-Schlüssel", + "getCerebrasApiKey": "Cerebras API-Schlüssel erhalten", "chutesApiKey": "Chutes API-Schlüssel", "getChutesApiKey": "Chutes API-Schlüssel erhalten", "deepSeekApiKey": "DeepSeek API-Schlüssel", diff --git a/webview-ui/src/i18n/locales/en/settings.json b/webview-ui/src/i18n/locales/en/settings.json index 019d49bc63..11c575bdf3 100644 --- a/webview-ui/src/i18n/locales/en/settings.json +++ b/webview-ui/src/i18n/locales/en/settings.json @@ -255,6 +255,8 @@ "anthropicApiKey": "Anthropic API Key", "getAnthropicApiKey": "Get Anthropic API Key", "anthropicUseAuthToken": "Pass Anthropic API Key as Authorization header instead of X-Api-Key", + "cerebrasApiKey": "Cerebras API Key", + "getCerebrasApiKey": "Get Cerebras API Key", "chutesApiKey": "Chutes API Key", "getChutesApiKey": "Get Chutes API Key", "deepSeekApiKey": "DeepSeek API Key", diff --git a/webview-ui/src/i18n/locales/es/settings.json b/webview-ui/src/i18n/locales/es/settings.json index 31f12e59c0..3afeb091ef 100644 --- a/webview-ui/src/i18n/locales/es/settings.json +++ b/webview-ui/src/i18n/locales/es/settings.json @@ -256,6 +256,8 @@ "anthropicApiKey": "Clave API de Anthropic", "getAnthropicApiKey": "Obtener clave API de Anthropic", "anthropicUseAuthToken": "Pasar la clave API de Anthropic como encabezado de autorización en lugar de X-Api-Key", + "cerebrasApiKey": "Clave API de Cerebras", + "getCerebrasApiKey": "Obtener clave API de Cerebras", "chutesApiKey": "Clave API de Chutes", "getChutesApiKey": "Obtener clave API de Chutes", "deepSeekApiKey": "Clave API de DeepSeek", diff --git a/webview-ui/src/i18n/locales/fr/settings.json b/webview-ui/src/i18n/locales/fr/settings.json index 439560d0e9..5b1c0431fe 100644 --- a/webview-ui/src/i18n/locales/fr/settings.json +++ b/webview-ui/src/i18n/locales/fr/settings.json @@ -256,6 +256,8 @@ "anthropicApiKey": "Clé API Anthropic", "getAnthropicApiKey": "Obtenir la clé API Anthropic", "anthropicUseAuthToken": "Passer la clé API Anthropic comme en-tête d'autorisation au lieu de X-Api-Key", + "cerebrasApiKey": "Clé API Cerebras", + "getCerebrasApiKey": "Obtenir la clé API Cerebras", "chutesApiKey": "Clé API Chutes", "getChutesApiKey": "Obtenir la clé API Chutes", "deepSeekApiKey": "Clé API DeepSeek", diff --git a/webview-ui/src/i18n/locales/hi/settings.json b/webview-ui/src/i18n/locales/hi/settings.json index 2429ddaa94..0c7ab3a0bc 100644 --- a/webview-ui/src/i18n/locales/hi/settings.json +++ b/webview-ui/src/i18n/locales/hi/settings.json @@ -256,6 +256,8 @@ "anthropicApiKey": "Anthropic API कुंजी", "getAnthropicApiKey": "Anthropic API कुंजी प्राप्त करें", "anthropicUseAuthToken": "X-Api-Key के बजाय Anthropic API कुंजी को Authorization हेडर के रूप में पास करें", + "cerebrasApiKey": "Cerebras API कुंजी", + "getCerebrasApiKey": "Cerebras API कुंजी प्राप्त करें", "chutesApiKey": "Chutes API कुंजी", "getChutesApiKey": "Chutes API कुंजी प्राप्त करें", "deepSeekApiKey": "DeepSeek API कुंजी", diff --git a/webview-ui/src/i18n/locales/id/settings.json b/webview-ui/src/i18n/locales/id/settings.json index 5c85ec3856..fc1b1915ab 100644 --- a/webview-ui/src/i18n/locales/id/settings.json +++ b/webview-ui/src/i18n/locales/id/settings.json @@ -260,6 +260,8 @@ "anthropicApiKey": "Anthropic API Key", "getAnthropicApiKey": "Dapatkan Anthropic API Key", "anthropicUseAuthToken": "Kirim Anthropic API Key sebagai Authorization header alih-alih X-Api-Key", + "cerebrasApiKey": "Cerebras API Key", + "getCerebrasApiKey": "Dapatkan Cerebras API Key", "chutesApiKey": "Chutes API Key", "getChutesApiKey": "Dapatkan Chutes API Key", "deepSeekApiKey": "DeepSeek API Key", diff --git a/webview-ui/src/i18n/locales/it/settings.json b/webview-ui/src/i18n/locales/it/settings.json index 90b95ac5e5..3b82f073b3 100644 --- a/webview-ui/src/i18n/locales/it/settings.json +++ b/webview-ui/src/i18n/locales/it/settings.json @@ -256,6 +256,8 @@ "anthropicApiKey": "Chiave API Anthropic", "getAnthropicApiKey": "Ottieni chiave API Anthropic", "anthropicUseAuthToken": "Passa la chiave API Anthropic come header di autorizzazione invece di X-Api-Key", + "cerebrasApiKey": "Chiave API Cerebras", + "getCerebrasApiKey": "Ottieni chiave API Cerebras", "chutesApiKey": "Chiave API Chutes", "getChutesApiKey": "Ottieni chiave API Chutes", "deepSeekApiKey": "Chiave API DeepSeek", diff --git a/webview-ui/src/i18n/locales/ja/settings.json b/webview-ui/src/i18n/locales/ja/settings.json index 5370d00688..321b269a8a 100644 --- a/webview-ui/src/i18n/locales/ja/settings.json +++ b/webview-ui/src/i18n/locales/ja/settings.json @@ -256,6 +256,8 @@ "anthropicApiKey": "Anthropic APIキー", "getAnthropicApiKey": "Anthropic APIキーを取得", "anthropicUseAuthToken": "Anthropic APIキーをX-Api-Keyの代わりにAuthorizationヘッダーとして渡す", + "cerebrasApiKey": "Cerebras APIキー", + "getCerebrasApiKey": "Cerebras APIキーを取得", "chutesApiKey": "Chutes APIキー", "getChutesApiKey": "Chutes APIキーを取得", "deepSeekApiKey": "DeepSeek APIキー", diff --git a/webview-ui/src/i18n/locales/ko/settings.json b/webview-ui/src/i18n/locales/ko/settings.json index 1f1bf869d2..d286ac71a2 100644 --- a/webview-ui/src/i18n/locales/ko/settings.json +++ b/webview-ui/src/i18n/locales/ko/settings.json @@ -256,6 +256,8 @@ "anthropicApiKey": "Anthropic API 키", "getAnthropicApiKey": "Anthropic API 키 받기", "anthropicUseAuthToken": "X-Api-Key 대신 Authorization 헤더로 Anthropic API 키 전달", + "cerebrasApiKey": "Cerebras API 키", + "getCerebrasApiKey": "Cerebras API 키 가져오기", "chutesApiKey": "Chutes API 키", "getChutesApiKey": "Chutes API 키 받기", "deepSeekApiKey": "DeepSeek API 키", diff --git a/webview-ui/src/i18n/locales/nl/settings.json b/webview-ui/src/i18n/locales/nl/settings.json index d026540e67..e8c1db5ace 100644 --- a/webview-ui/src/i18n/locales/nl/settings.json +++ b/webview-ui/src/i18n/locales/nl/settings.json @@ -256,6 +256,8 @@ "anthropicApiKey": "Anthropic API-sleutel", "getAnthropicApiKey": "Anthropic API-sleutel ophalen", "anthropicUseAuthToken": "Anthropic API-sleutel als Authorization-header doorgeven in plaats van X-Api-Key", + "cerebrasApiKey": "Cerebras API-sleutel", + "getCerebrasApiKey": "Cerebras API-sleutel verkrijgen", "chutesApiKey": "Chutes API-sleutel", "getChutesApiKey": "Chutes API-sleutel ophalen", "deepSeekApiKey": "DeepSeek API-sleutel", diff --git a/webview-ui/src/i18n/locales/pl/settings.json b/webview-ui/src/i18n/locales/pl/settings.json index b4d64b1e65..ab208ffe14 100644 --- a/webview-ui/src/i18n/locales/pl/settings.json +++ b/webview-ui/src/i18n/locales/pl/settings.json @@ -256,6 +256,8 @@ "anthropicApiKey": "Klucz API Anthropic", "getAnthropicApiKey": "Uzyskaj klucz API Anthropic", "anthropicUseAuthToken": "Przekaż klucz API Anthropic jako nagłówek Authorization zamiast X-Api-Key", + "cerebrasApiKey": "Klucz API Cerebras", + "getCerebrasApiKey": "Pobierz klucz API Cerebras", "chutesApiKey": "Klucz API Chutes", "getChutesApiKey": "Uzyskaj klucz API Chutes", "deepSeekApiKey": "Klucz API DeepSeek", diff --git a/webview-ui/src/i18n/locales/pt-BR/settings.json b/webview-ui/src/i18n/locales/pt-BR/settings.json index b117212e6d..6bcfbb564c 100644 --- a/webview-ui/src/i18n/locales/pt-BR/settings.json +++ b/webview-ui/src/i18n/locales/pt-BR/settings.json @@ -256,6 +256,8 @@ "anthropicApiKey": "Chave de API Anthropic", "getAnthropicApiKey": "Obter chave de API Anthropic", "anthropicUseAuthToken": "Passar a chave de API Anthropic como cabeçalho Authorization em vez de X-Api-Key", + "cerebrasApiKey": "Chave de API Cerebras", + "getCerebrasApiKey": "Obter chave de API Cerebras", "chutesApiKey": "Chave de API Chutes", "getChutesApiKey": "Obter chave de API Chutes", "deepSeekApiKey": "Chave de API DeepSeek", diff --git a/webview-ui/src/i18n/locales/ru/settings.json b/webview-ui/src/i18n/locales/ru/settings.json index cf657948be..8d52241d6c 100644 --- a/webview-ui/src/i18n/locales/ru/settings.json +++ b/webview-ui/src/i18n/locales/ru/settings.json @@ -256,6 +256,8 @@ "anthropicApiKey": "Anthropic API-ключ", "getAnthropicApiKey": "Получить Anthropic API-ключ", "anthropicUseAuthToken": "Передавать Anthropic API-ключ как Authorization-заголовок вместо X-Api-Key", + "cerebrasApiKey": "Cerebras API-ключ", + "getCerebrasApiKey": "Получить Cerebras API-ключ", "chutesApiKey": "Chutes API-ключ", "getChutesApiKey": "Получить Chutes API-ключ", "deepSeekApiKey": "DeepSeek API-ключ", diff --git a/webview-ui/src/i18n/locales/tr/settings.json b/webview-ui/src/i18n/locales/tr/settings.json index 216da83dff..486dad0540 100644 --- a/webview-ui/src/i18n/locales/tr/settings.json +++ b/webview-ui/src/i18n/locales/tr/settings.json @@ -256,6 +256,8 @@ "anthropicApiKey": "Anthropic API Anahtarı", "getAnthropicApiKey": "Anthropic API Anahtarı Al", "anthropicUseAuthToken": "Anthropic API Anahtarını X-Api-Key yerine Authorization başlığı olarak geçir", + "cerebrasApiKey": "Cerebras API Anahtarı", + "getCerebrasApiKey": "Cerebras API Anahtarını Al", "chutesApiKey": "Chutes API Anahtarı", "getChutesApiKey": "Chutes API Anahtarı Al", "deepSeekApiKey": "DeepSeek API Anahtarı", diff --git a/webview-ui/src/i18n/locales/vi/settings.json b/webview-ui/src/i18n/locales/vi/settings.json index 6a12c91200..dbe0e73736 100644 --- a/webview-ui/src/i18n/locales/vi/settings.json +++ b/webview-ui/src/i18n/locales/vi/settings.json @@ -256,6 +256,8 @@ "anthropicApiKey": "Khóa API Anthropic", "getAnthropicApiKey": "Lấy khóa API Anthropic", "anthropicUseAuthToken": "Truyền khóa API Anthropic dưới dạng tiêu đề Authorization thay vì X-Api-Key", + "cerebrasApiKey": "Khóa API Cerebras", + "getCerebrasApiKey": "Lấy khóa API Cerebras", "chutesApiKey": "Khóa API Chutes", "getChutesApiKey": "Lấy khóa API Chutes", "deepSeekApiKey": "Khóa API DeepSeek", diff --git a/webview-ui/src/i18n/locales/zh-CN/settings.json b/webview-ui/src/i18n/locales/zh-CN/settings.json index 52b8802bc6..32e5c96d02 100644 --- a/webview-ui/src/i18n/locales/zh-CN/settings.json +++ b/webview-ui/src/i18n/locales/zh-CN/settings.json @@ -256,6 +256,8 @@ "anthropicApiKey": "Anthropic API 密钥", "getAnthropicApiKey": "获取 Anthropic API 密钥", "anthropicUseAuthToken": "将 Anthropic API 密钥作为 Authorization 标头传递，而不是 X-Api-Key", + "cerebrasApiKey": "Cerebras API 密钥", + "getCerebrasApiKey": "获取 Cerebras API 密钥", "chutesApiKey": "Chutes API 密钥", "getChutesApiKey": "获取 Chutes API 密钥", "deepSeekApiKey": "DeepSeek API 密钥", diff --git a/webview-ui/src/i18n/locales/zh-TW/settings.json b/webview-ui/src/i18n/locales/zh-TW/settings.json index c90080cb3a..b8e09bc373 100644 --- a/webview-ui/src/i18n/locales/zh-TW/settings.json +++ b/webview-ui/src/i18n/locales/zh-TW/settings.json @@ -256,6 +256,8 @@ "anthropicApiKey": "Anthropic API 金鑰", "getAnthropicApiKey": "取得 Anthropic API 金鑰", "anthropicUseAuthToken": "將 Anthropic API 金鑰作為 Authorization 標頭傳遞，而非使用 X-Api-Key", + "cerebrasApiKey": "Cerebras API 金鑰", + "getCerebrasApiKey": "取得 Cerebras API 金鑰", "chutesApiKey": "Chutes API 金鑰", "getChutesApiKey": "取得 Chutes API 金鑰", "deepSeekApiKey": "DeepSeek API 金鑰", diff --git a/webview-ui/src/utils/validate.ts b/webview-ui/src/utils/validate.ts index ed546cccc7..3b85ef9919 100644 --- a/webview-ui/src/utils/validate.ts +++ b/webview-ui/src/utils/validate.ts @@ -110,6 +110,11 @@ function validateModelsAndKeysProvided(apiConfiguration: ProviderSettings): stri return i18next.t("settings:validation.modelId") } break + case "cerebras": + if (!apiConfiguration.cerebrasApiKey) { + return i18next.t("settings:validation.apiKey") + } + break } return undefined From 6e835de82f3d848da83fa74cfc72bc2e3af2ad1b Mon Sep 17 00:00:00 2001 From: John Richmond <5629+jr@users.noreply.github.com> Date: Thu, 31 Jul 2025 15:30:30 -0700 Subject: [PATCH 033/253] Cloud service cleanup callbacks / move to events (#6519) * Cloud: use events in SettingsService * Cloud: simplify AuthService events * Cloud: convert CloudService to an EventEmitter * Apply suggestions from code review Co-authored-by: roomote[bot] <219738659+roomote[bot]@users.noreply.github.com> --------- Co-authored-by: roomote[bot] <219738659+roomote[bot]@users.noreply.github.com> --- packages/cloud/src/CloudService.ts | 63 +-- packages/cloud/src/CloudSettingsService.ts | 50 +- .../cloud/src/__tests__/CloudService.test.ts | 131 ++++- .../__tests__/CloudSettingsService.test.ts | 476 ++++++++++++++++++ .../auth/StaticTokenAuthService.spec.ts | 12 +- .../src/__tests__/auth/WebAuthService.spec.ts | 112 +++-- packages/cloud/src/auth/AuthService.ts | 10 +- .../cloud/src/auth/StaticTokenAuthService.ts | 2 +- packages/cloud/src/auth/WebAuthService.ts | 30 +- packages/cloud/src/types.ts | 8 +- src/extension.ts | 13 +- 11 files changed, 764 insertions(+), 143 deletions(-) create mode 100644 packages/cloud/src/__tests__/CloudSettingsService.test.ts diff --git a/packages/cloud/src/CloudService.ts b/packages/cloud/src/CloudService.ts index 30d1545b23..ff33671a40 100644 --- a/packages/cloud/src/CloudService.ts +++ b/packages/cloud/src/CloudService.ts @@ -1,4 +1,5 @@ import * as vscode from "vscode" +import EventEmitter from "events" import type { CloudUserInfo, @@ -10,7 +11,7 @@ import type { } from "@roo-code/types" import { TelemetryService } from "@roo-code/telemetry" -import { CloudServiceCallbacks } from "./types" +import { CloudServiceEvents } from "./types" import type { AuthService } from "./auth" import { WebAuthService, StaticTokenAuthService } from "./auth" import type { SettingsService } from "./SettingsService" @@ -19,25 +20,37 @@ import { StaticSettingsService } from "./StaticSettingsService" import { TelemetryClient } from "./TelemetryClient" import { ShareService, TaskNotFoundError } from "./ShareService" -export class CloudService { +type AuthStateChangedPayload = CloudServiceEvents["auth-state-changed"][0] +type AuthUserInfoPayload = CloudServiceEvents["user-info"][0] +type SettingsPayload = CloudServiceEvents["settings-updated"][0] + +export class CloudService extends EventEmitter implements vscode.Disposable { private static _instance: CloudService | null = null private context: vscode.ExtensionContext - private callbacks: CloudServiceCallbacks - private authListener: () => void + private authStateListener: (data: AuthStateChangedPayload) => void + private authUserInfoListener: (data: AuthUserInfoPayload) => void private authService: AuthService | null = null + private settingsListener: (data: SettingsPayload) => void private settingsService: SettingsService | null = null private telemetryClient: TelemetryClient | null = null private shareService: ShareService | null = null private isInitialized = false private log: (...args: unknown[]) => void - private constructor(context: vscode.ExtensionContext, callbacks: CloudServiceCallbacks) { + private constructor(context: vscode.ExtensionContext, log?: (...args: unknown[]) => void) { + super() + this.context = context - this.callbacks = callbacks - this.log = callbacks.log || console.log - this.authListener = () => { - this.callbacks.stateChanged?.() + this.log = log || console.log + this.authStateListener = (data: AuthStateChangedPayload) => { + this.emit("auth-state-changed", data) + } + this.authUserInfoListener = (data: AuthUserInfoPayload) => { + this.emit("user-info", data) + } + this.settingsListener = (data: SettingsPayload) => { + this.emit("settings-updated", data) } } @@ -57,11 +70,8 @@ export class CloudService { await this.authService.initialize() - this.authService.on("attempting-session", this.authListener) - this.authService.on("inactive-session", this.authListener) - this.authService.on("active-session", this.authListener) - this.authService.on("logged-out", this.authListener) - this.authService.on("user-info", this.authListener) + this.authService.on("auth-state-changed", this.authStateListener) + this.authService.on("user-info", this.authUserInfoListener) // Check for static settings environment variable. const staticOrgSettings = process.env.ROO_CODE_CLOUD_ORG_SETTINGS @@ -69,14 +79,11 @@ export class CloudService { if (staticOrgSettings && staticOrgSettings.length > 0) { this.settingsService = new StaticSettingsService(staticOrgSettings, this.log) } else { - const cloudSettingsService = new CloudSettingsService( - this.context, - this.authService, - () => this.callbacks.stateChanged?.(), - this.log, - ) - + const cloudSettingsService = new CloudSettingsService(this.context, this.authService, this.log) cloudSettingsService.initialize() + + cloudSettingsService.on("settings-updated", this.settingsListener) + this.settingsService = cloudSettingsService } @@ -219,13 +226,13 @@ export class CloudService { public dispose(): void { if (this.authService) { - this.authService.off("attempting-session", this.authListener) - this.authService.off("inactive-session", this.authListener) - this.authService.off("active-session", this.authListener) - this.authService.off("logged-out", this.authListener) - this.authService.off("user-info", this.authListener) + this.authService.off("auth-state-changed", this.authStateListener) + this.authService.off("user-info", this.authUserInfoListener) } if (this.settingsService) { + if (this.settingsService instanceof CloudSettingsService) { + this.settingsService.off("settings-updated", this.settingsListener) + } this.settingsService.dispose() } @@ -248,13 +255,13 @@ export class CloudService { static async createInstance( context: vscode.ExtensionContext, - callbacks: CloudServiceCallbacks = {}, + log?: (...args: unknown[]) => void, ): Promise { if (this._instance) { throw new Error("CloudService instance already created") } - this._instance = new CloudService(context, callbacks) + this._instance = new CloudService(context, log) await this._instance.initialize() return this._instance } diff --git a/packages/cloud/src/CloudSettingsService.ts b/packages/cloud/src/CloudSettingsService.ts index 6692d8141d..4ce52774db 100644 --- a/packages/cloud/src/CloudSettingsService.ts +++ b/packages/cloud/src/CloudSettingsService.ts @@ -1,4 +1,5 @@ import * as vscode from "vscode" +import EventEmitter from "events" import { ORGANIZATION_ALLOW_ALL, @@ -8,32 +9,38 @@ import { } from "@roo-code/types" import { getRooCodeApiUrl } from "./Config" -import type { AuthService } from "./auth" +import type { AuthService, AuthState } from "./auth" import { RefreshTimer } from "./RefreshTimer" import type { SettingsService } from "./SettingsService" const ORGANIZATION_SETTINGS_CACHE_KEY = "organization-settings" -export class CloudSettingsService implements SettingsService { +export interface SettingsServiceEvents { + "settings-updated": [ + data: { + settings: OrganizationSettings + previousSettings: OrganizationSettings | undefined + }, + ] +} + +export class CloudSettingsService extends EventEmitter implements SettingsService { private context: vscode.ExtensionContext private authService: AuthService private settings: OrganizationSettings | undefined = undefined private timer: RefreshTimer private log: (...args: unknown[]) => void - constructor( - context: vscode.ExtensionContext, - authService: AuthService, - callback: () => void, - log?: (...args: unknown[]) => void, - ) { + constructor(context: vscode.ExtensionContext, authService: AuthService, log?: (...args: unknown[]) => void) { + super() + this.context = context this.authService = authService this.log = log || console.log this.timer = new RefreshTimer({ callback: async () => { - return await this.fetchSettings(callback) + return await this.fetchSettings() }, successInterval: 30000, initialBackoffMs: 1000, @@ -49,13 +56,16 @@ export class CloudSettingsService implements SettingsService { this.removeSettings() } - this.authService.on("active-session", () => { - this.timer.start() - }) + this.authService.on("auth-state-changed", (data: { state: AuthState; previousState: AuthState }) => { + if (data.state === "active-session") { + this.timer.start() + } else if (data.previousState === "active-session") { + this.timer.stop() - this.authService.on("logged-out", () => { - this.timer.stop() - this.removeSettings() + if (data.state === "logged-out") { + this.removeSettings() + } + } }) if (this.authService.hasActiveSession()) { @@ -63,7 +73,7 @@ export class CloudSettingsService implements SettingsService { } } - private async fetchSettings(callback: () => void): Promise { + private async fetchSettings(): Promise { const token = this.authService.getSessionToken() if (!token) { @@ -97,9 +107,14 @@ export class CloudSettingsService implements SettingsService { const newSettings = result.data if (!this.settings || this.settings.version !== newSettings.version) { + const previousSettings = this.settings this.settings = newSettings await this.cacheSettings() - callback() + + this.emit("settings-updated", { + settings: this.settings, + previousSettings, + }) } return true @@ -131,6 +146,7 @@ export class CloudSettingsService implements SettingsService { } public dispose(): void { + this.removeAllListeners() this.timer.stop() } } diff --git a/packages/cloud/src/__tests__/CloudService.test.ts b/packages/cloud/src/__tests__/CloudService.test.ts index 1384b6de6b..fd3ae9b9c0 100644 --- a/packages/cloud/src/__tests__/CloudService.test.ts +++ b/packages/cloud/src/__tests__/CloudService.test.ts @@ -9,7 +9,6 @@ import { CloudSettingsService } from "../CloudSettingsService" import { ShareService, TaskNotFoundError } from "../ShareService" import { TelemetryClient } from "../TelemetryClient" import { TelemetryService } from "@roo-code/telemetry" -import { CloudServiceCallbacks } from "../types" vi.mock("vscode", () => ({ ExtensionContext: vi.fn(), @@ -59,6 +58,8 @@ describe("CloudService", () => { getSettings: ReturnType getAllowList: ReturnType dispose: ReturnType + on: ReturnType + off: ReturnType } let mockShareService: { shareTask: ReturnType @@ -131,6 +132,8 @@ describe("CloudService", () => { getSettings: vi.fn(), getAllowList: vi.fn(), dispose: vi.fn(), + on: vi.fn(), + off: vi.fn(), } mockShareService = { @@ -168,20 +171,21 @@ describe("CloudService", () => { describe("createInstance", () => { it("should create and initialize CloudService instance", async () => { - const callbacks = { - stateChanged: vi.fn(), - } + const mockLog = vi.fn() - const cloudService = await CloudService.createInstance(mockContext, callbacks) + const cloudService = await CloudService.createInstance(mockContext, mockLog) expect(cloudService).toBeInstanceOf(CloudService) expect(WebAuthService).toHaveBeenCalledWith(mockContext, expect.any(Function)) - expect(CloudSettingsService).toHaveBeenCalledWith( - mockContext, - mockAuthService, - expect.any(Function), - expect.any(Function), - ) + expect(CloudSettingsService).toHaveBeenCalledWith(mockContext, mockAuthService, expect.any(Function)) + }) + + it("should set up event listeners for CloudSettingsService", async () => { + const mockLog = vi.fn() + + await CloudService.createInstance(mockContext, mockLog) + + expect(mockSettingsService.on).toHaveBeenCalledWith("settings-updated", expect.any(Function)) }) it("should throw error if instance already exists", async () => { @@ -195,11 +199,9 @@ describe("CloudService", () => { describe("authentication methods", () => { let cloudService: CloudService - let callbacks: CloudServiceCallbacks beforeEach(async () => { - callbacks = { stateChanged: vi.fn() } - cloudService = await CloudService.createInstance(mockContext, callbacks) + cloudService = await CloudService.createInstance(mockContext) }) it("should delegate login to AuthService", async () => { @@ -382,6 +384,105 @@ describe("CloudService", () => { expect(mockSettingsService.dispose).toHaveBeenCalled() }) + + it("should remove event listeners from CloudSettingsService", async () => { + // Create a mock that will pass the instanceof check + const mockCloudSettingsService = Object.create(CloudSettingsService.prototype) + Object.assign(mockCloudSettingsService, { + initialize: vi.fn(), + getSettings: vi.fn(), + getAllowList: vi.fn(), + dispose: vi.fn(), + on: vi.fn(), + off: vi.fn(), + }) + + // Override the mock to return our properly typed instance + vi.mocked(CloudSettingsService).mockImplementation(() => mockCloudSettingsService) + + const cloudService = await CloudService.createInstance(mockContext) + + // Verify the listener was added + expect(mockCloudSettingsService.on).toHaveBeenCalledWith("settings-updated", expect.any(Function)) + + // Get the listener function that was registered + const registeredListener = mockCloudSettingsService.on.mock.calls.find( + (call: unknown[]) => call[0] === "settings-updated", + )?.[1] + + cloudService.dispose() + + // Verify the listener was removed with the same function + expect(mockCloudSettingsService.off).toHaveBeenCalledWith("settings-updated", registeredListener) + }) + + it("should handle disposal when using StaticSettingsService", async () => { + // Reset the instance first + CloudService.resetInstance() + + // Mock a StaticSettingsService (which doesn't extend CloudSettingsService) + const mockStaticSettingsService = { + initialize: vi.fn(), + getSettings: vi.fn(), + getAllowList: vi.fn(), + dispose: vi.fn(), + on: vi.fn(), // Add on method to avoid initialization error + off: vi.fn(), // Add off method for disposal + } + + // Override the mock to return a service that won't pass instanceof check + vi.mocked(CloudSettingsService).mockImplementation( + () => mockStaticSettingsService as unknown as CloudSettingsService, + ) + + // This should not throw even though the service doesn't pass instanceof check + const _cloudService = await CloudService.createInstance(mockContext) + + // Should not throw when disposing + expect(() => _cloudService.dispose()).not.toThrow() + + // Should still call dispose on the settings service + expect(mockStaticSettingsService.dispose).toHaveBeenCalled() + // Should NOT call off method since it's not a CloudSettingsService instance + expect(mockStaticSettingsService.off).not.toHaveBeenCalled() + }) + }) + + describe("settings event handling", () => { + let _cloudService: CloudService + + beforeEach(async () => { + _cloudService = await CloudService.createInstance(mockContext) + }) + + it("should emit settings-updated event when settings are updated", async () => { + const settingsListener = vi.fn() + _cloudService.on("settings-updated", settingsListener) + + // Get the settings listener that was registered with the settings service + const serviceSettingsListener = mockSettingsService.on.mock.calls.find( + (call) => call[0] === "settings-updated", + )?.[1] + + expect(serviceSettingsListener).toBeDefined() + + // Simulate settings update event + const settingsData = { + settings: { + version: 2, + defaultSettings: {}, + allowList: { allowAll: true, providers: {} }, + }, + previousSettings: { + version: 1, + defaultSettings: {}, + allowList: { allowAll: true, providers: {} }, + }, + } + serviceSettingsListener(settingsData) + + expect(settingsListener).toHaveBeenCalledWith(settingsData) + }) }) describe("shareTask with ClineMessage retry logic", () => { @@ -397,7 +498,7 @@ describe("CloudService", () => { mockAuthService.hasOrIsAcquiringActiveSession.mockReturnValue(true) mockAuthService.getState.mockReturnValue("active") - cloudService = await CloudService.createInstance(mockContext, {}) + cloudService = await CloudService.createInstance(mockContext) }) it("should call shareTask without retry when successful", async () => { diff --git a/packages/cloud/src/__tests__/CloudSettingsService.test.ts b/packages/cloud/src/__tests__/CloudSettingsService.test.ts new file mode 100644 index 0000000000..e9d0ae3c93 --- /dev/null +++ b/packages/cloud/src/__tests__/CloudSettingsService.test.ts @@ -0,0 +1,476 @@ +import * as vscode from "vscode" +import { CloudSettingsService } from "../CloudSettingsService" +import { RefreshTimer } from "../RefreshTimer" +import type { AuthService } from "../auth" +import type { OrganizationSettings } from "@roo-code/types" + +// Mock dependencies +vi.mock("../RefreshTimer") +vi.mock("../Config", () => ({ + getRooCodeApiUrl: vi.fn().mockReturnValue("https://api.example.com"), +})) + +// Mock fetch globally +global.fetch = vi.fn() + +describe("CloudSettingsService", () => { + let mockContext: vscode.ExtensionContext + let mockAuthService: { + getState: ReturnType + getSessionToken: ReturnType + hasActiveSession: ReturnType + on: ReturnType + } + let mockRefreshTimer: { + start: ReturnType + stop: ReturnType + } + let cloudSettingsService: CloudSettingsService + let mockLog: ReturnType + + const mockSettings: OrganizationSettings = { + version: 1, + defaultSettings: {}, + allowList: { + allowAll: true, + providers: {}, + }, + } + + beforeEach(() => { + vi.clearAllMocks() + + mockContext = { + globalState: { + get: vi.fn(), + update: vi.fn().mockResolvedValue(undefined), + }, + } as unknown as vscode.ExtensionContext + + mockAuthService = { + getState: vi.fn().mockReturnValue("logged-out"), + getSessionToken: vi.fn(), + hasActiveSession: vi.fn().mockReturnValue(false), + on: vi.fn(), + } + + mockRefreshTimer = { + start: vi.fn(), + stop: vi.fn(), + } + + mockLog = vi.fn() + + // Mock RefreshTimer constructor + vi.mocked(RefreshTimer).mockImplementation(() => mockRefreshTimer as unknown as RefreshTimer) + + cloudSettingsService = new CloudSettingsService(mockContext, mockAuthService as unknown as AuthService, mockLog) + }) + + afterEach(() => { + cloudSettingsService.dispose() + }) + + describe("constructor", () => { + it("should create CloudSettingsService with proper dependencies", () => { + expect(cloudSettingsService).toBeInstanceOf(CloudSettingsService) + expect(RefreshTimer).toHaveBeenCalledWith({ + callback: expect.any(Function), + successInterval: 30000, + initialBackoffMs: 1000, + maxBackoffMs: 30000, + }) + }) + + it("should use console.log as default logger when none provided", () => { + const service = new CloudSettingsService(mockContext, mockAuthService as unknown as AuthService) + expect(service).toBeInstanceOf(CloudSettingsService) + }) + }) + + describe("initialize", () => { + it("should load cached settings on initialization", () => { + const cachedSettings = { + version: 1, + defaultSettings: {}, + allowList: { allowAll: true, providers: {} }, + } + + // Create a fresh mock context for this test + const testContext = { + globalState: { + get: vi.fn().mockReturnValue(cachedSettings), + update: vi.fn().mockResolvedValue(undefined), + }, + } as unknown as vscode.ExtensionContext + + // Mock auth service to not be logged out + const testAuthService = { + getState: vi.fn().mockReturnValue("active"), + getSessionToken: vi.fn(), + hasActiveSession: vi.fn().mockReturnValue(false), + on: vi.fn(), + } + + // Create a new instance to test initialization + const testService = new CloudSettingsService( + testContext, + testAuthService as unknown as AuthService, + mockLog, + ) + testService.initialize() + + expect(testContext.globalState.get).toHaveBeenCalledWith("organization-settings") + expect(testService.getSettings()).toEqual(cachedSettings) + + testService.dispose() + }) + + it("should clear cached settings if user is logged out", async () => { + const cachedSettings = { + version: 1, + defaultSettings: {}, + allowList: { allowAll: true, providers: {} }, + } + mockContext.globalState.get = vi.fn().mockReturnValue(cachedSettings) + mockAuthService.getState.mockReturnValue("logged-out") + + cloudSettingsService.initialize() + + expect(mockContext.globalState.update).toHaveBeenCalledWith("organization-settings", undefined) + }) + + it("should set up auth service event listeners", () => { + cloudSettingsService.initialize() + + expect(mockAuthService.on).toHaveBeenCalledWith("auth-state-changed", expect.any(Function)) + }) + + it("should start timer if user has active session", () => { + mockAuthService.hasActiveSession.mockReturnValue(true) + + cloudSettingsService.initialize() + + expect(mockRefreshTimer.start).toHaveBeenCalled() + }) + + it("should not start timer if user has no active session", () => { + mockAuthService.hasActiveSession.mockReturnValue(false) + + cloudSettingsService.initialize() + + expect(mockRefreshTimer.start).not.toHaveBeenCalled() + }) + }) + + describe("event emission", () => { + beforeEach(() => { + cloudSettingsService.initialize() + }) + + it("should emit 'settings-updated' event when settings change", async () => { + const eventSpy = vi.fn() + cloudSettingsService.on("settings-updated", eventSpy) + + mockAuthService.getSessionToken.mockReturnValue("valid-token") + vi.mocked(fetch).mockResolvedValue({ + ok: true, + json: vi.fn().mockResolvedValue(mockSettings), + } as unknown as Response) + + // Get the callback function passed to RefreshTimer + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + await timerCallback() + + expect(eventSpy).toHaveBeenCalledWith({ + settings: mockSettings, + previousSettings: undefined, + }) + }) + + it("should emit event with previous settings when updating existing settings", async () => { + const eventSpy = vi.fn() + + const previousSettings = { + version: 1, + defaultSettings: {}, + allowList: { allowAll: true, providers: {} }, + } + const newSettings = { + version: 2, + defaultSettings: {}, + allowList: { allowAll: true, providers: {} }, + } + + // Create a fresh mock context for this test + const testContext = { + globalState: { + get: vi.fn().mockReturnValue(previousSettings), + update: vi.fn().mockResolvedValue(undefined), + }, + } as unknown as vscode.ExtensionContext + + // Mock auth service to not be logged out + const testAuthService = { + getState: vi.fn().mockReturnValue("active"), + getSessionToken: vi.fn().mockReturnValue("valid-token"), + hasActiveSession: vi.fn().mockReturnValue(false), + on: vi.fn(), + } + + // Create a new service instance with cached settings + const testService = new CloudSettingsService( + testContext, + testAuthService as unknown as AuthService, + mockLog, + ) + testService.on("settings-updated", eventSpy) + testService.initialize() + + vi.mocked(fetch).mockResolvedValue({ + ok: true, + json: vi.fn().mockResolvedValue(newSettings), + } as unknown as Response) + + // Get the callback function passed to RefreshTimer for this instance + const timerCallback = + vi.mocked(RefreshTimer).mock.calls[vi.mocked(RefreshTimer).mock.calls.length - 1][0].callback + await timerCallback() + + expect(eventSpy).toHaveBeenCalledWith({ + settings: newSettings, + previousSettings, + }) + + testService.dispose() + }) + + it("should not emit event when settings version is unchanged", async () => { + const eventSpy = vi.fn() + + // Create a fresh mock context for this test + const testContext = { + globalState: { + get: vi.fn().mockReturnValue(mockSettings), + update: vi.fn().mockResolvedValue(undefined), + }, + } as unknown as vscode.ExtensionContext + + // Mock auth service to not be logged out + const testAuthService = { + getState: vi.fn().mockReturnValue("active"), + getSessionToken: vi.fn().mockReturnValue("valid-token"), + hasActiveSession: vi.fn().mockReturnValue(false), + on: vi.fn(), + } + + // Create a new service instance with cached settings + const testService = new CloudSettingsService( + testContext, + testAuthService as unknown as AuthService, + mockLog, + ) + testService.on("settings-updated", eventSpy) + testService.initialize() + + vi.mocked(fetch).mockResolvedValue({ + ok: true, + json: vi.fn().mockResolvedValue(mockSettings), // Same version + } as unknown as Response) + + // Get the callback function passed to RefreshTimer for this instance + const timerCallback = + vi.mocked(RefreshTimer).mock.calls[vi.mocked(RefreshTimer).mock.calls.length - 1][0].callback + await timerCallback() + + expect(eventSpy).not.toHaveBeenCalled() + + testService.dispose() + }) + + it("should not emit event when fetch fails", async () => { + const eventSpy = vi.fn() + cloudSettingsService.on("settings-updated", eventSpy) + + mockAuthService.getSessionToken.mockReturnValue("valid-token") + vi.mocked(fetch).mockResolvedValue({ + ok: false, + status: 500, + statusText: "Internal Server Error", + } as unknown as Response) + + // Get the callback function passed to RefreshTimer + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + await timerCallback() + + expect(eventSpy).not.toHaveBeenCalled() + }) + + it("should not emit event when no auth token available", async () => { + const eventSpy = vi.fn() + cloudSettingsService.on("settings-updated", eventSpy) + + mockAuthService.getSessionToken.mockReturnValue(null) + + // Get the callback function passed to RefreshTimer + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + await timerCallback() + + expect(eventSpy).not.toHaveBeenCalled() + expect(fetch).not.toHaveBeenCalled() + }) + }) + + describe("fetchSettings", () => { + beforeEach(() => { + cloudSettingsService.initialize() + }) + + it("should fetch and cache settings successfully", async () => { + mockAuthService.getSessionToken.mockReturnValue("valid-token") + vi.mocked(fetch).mockResolvedValue({ + ok: true, + json: vi.fn().mockResolvedValue(mockSettings), + } as unknown as Response) + + // Get the callback function passed to RefreshTimer + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + const result = await timerCallback() + + expect(result).toBe(true) + expect(fetch).toHaveBeenCalledWith("https://api.example.com/api/organization-settings", { + headers: { + Authorization: "Bearer valid-token", + }, + }) + expect(mockContext.globalState.update).toHaveBeenCalledWith("organization-settings", mockSettings) + }) + + it("should handle fetch errors gracefully", async () => { + mockAuthService.getSessionToken.mockReturnValue("valid-token") + vi.mocked(fetch).mockRejectedValue(new Error("Network error")) + + // Get the callback function passed to RefreshTimer + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + const result = await timerCallback() + + expect(result).toBe(false) + expect(mockLog).toHaveBeenCalledWith( + "[cloud-settings] Error fetching organization settings:", + expect.any(Error), + ) + }) + + it("should handle invalid response format", async () => { + mockAuthService.getSessionToken.mockReturnValue("valid-token") + vi.mocked(fetch).mockResolvedValue({ + ok: true, + json: vi.fn().mockResolvedValue({ invalid: "data" }), + } as unknown as Response) + + // Get the callback function passed to RefreshTimer + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + const result = await timerCallback() + + expect(result).toBe(false) + expect(mockLog).toHaveBeenCalledWith( + "[cloud-settings] Invalid organization settings format:", + expect.any(Object), + ) + }) + }) + + describe("getAllowList", () => { + it("should return settings allowList when available", () => { + mockContext.globalState.get = vi.fn().mockReturnValue(mockSettings) + cloudSettingsService.initialize() + + const allowList = cloudSettingsService.getAllowList() + expect(allowList).toEqual(mockSettings.allowList) + }) + + it("should return default allow all when no settings available", () => { + const allowList = cloudSettingsService.getAllowList() + expect(allowList).toEqual({ allowAll: true, providers: {} }) + }) + }) + + describe("getSettings", () => { + it("should return current settings", () => { + // Create a fresh mock context for this test + const testContext = { + globalState: { + get: vi.fn().mockReturnValue(mockSettings), + update: vi.fn().mockResolvedValue(undefined), + }, + } as unknown as vscode.ExtensionContext + + // Mock auth service to not be logged out + const testAuthService = { + getState: vi.fn().mockReturnValue("active"), + getSessionToken: vi.fn(), + hasActiveSession: vi.fn().mockReturnValue(false), + on: vi.fn(), + } + + const testService = new CloudSettingsService( + testContext, + testAuthService as unknown as AuthService, + mockLog, + ) + testService.initialize() + + const settings = testService.getSettings() + expect(settings).toEqual(mockSettings) + + testService.dispose() + }) + + it("should return undefined when no settings available", () => { + const settings = cloudSettingsService.getSettings() + expect(settings).toBeUndefined() + }) + }) + + describe("dispose", () => { + it("should remove all listeners and stop timer", () => { + const removeAllListenersSpy = vi.spyOn(cloudSettingsService, "removeAllListeners") + + cloudSettingsService.dispose() + + expect(removeAllListenersSpy).toHaveBeenCalled() + expect(mockRefreshTimer.stop).toHaveBeenCalled() + }) + }) + + describe("auth service event handlers", () => { + it("should start timer when auth-state-changed event is triggered with active-session", () => { + cloudSettingsService.initialize() + + // Get the auth-state-changed handler + const authStateChangedHandler = mockAuthService.on.mock.calls.find( + (call) => call[0] === "auth-state-changed", + )?.[1] + expect(authStateChangedHandler).toBeDefined() + + // Simulate active-session state change + authStateChangedHandler({ state: "active-session", previousState: "attempting-session" }) + expect(mockRefreshTimer.start).toHaveBeenCalled() + }) + + it("should stop timer and remove settings when auth-state-changed event is triggered with logged-out", async () => { + cloudSettingsService.initialize() + + // Get the auth-state-changed handler + const authStateChangedHandler = mockAuthService.on.mock.calls.find( + (call) => call[0] === "auth-state-changed", + )?.[1] + expect(authStateChangedHandler).toBeDefined() + + // Simulate logged-out state change from active-session + await authStateChangedHandler({ state: "logged-out", previousState: "active-session" }) + expect(mockRefreshTimer.stop).toHaveBeenCalled() + expect(mockContext.globalState.update).toHaveBeenCalledWith("organization-settings", undefined) + }) + }) +}) diff --git a/packages/cloud/src/__tests__/auth/StaticTokenAuthService.spec.ts b/packages/cloud/src/__tests__/auth/StaticTokenAuthService.spec.ts index cbf3a7b998..f1ab7f9abc 100644 --- a/packages/cloud/src/__tests__/auth/StaticTokenAuthService.spec.ts +++ b/packages/cloud/src/__tests__/auth/StaticTokenAuthService.spec.ts @@ -79,13 +79,13 @@ describe("StaticTokenAuthService", () => { expect(authService.getState()).toBe("active-session") }) - it("should emit active-session event on initialize", async () => { + it("should emit auth-state-changed event on initialize", async () => { const spy = vi.fn() - authService.on("active-session", spy) + authService.on("auth-state-changed", spy) await authService.initialize() - expect(spy).toHaveBeenCalledWith({ previousState: "initializing" }) + expect(spy).toHaveBeenCalledWith({ state: "active-session", previousState: "initializing" }) }) it("should log successful initialization", async () => { @@ -158,15 +158,15 @@ describe("StaticTokenAuthService", () => { describe("event emission", () => { it("should be able to register and emit events", async () => { - const activeSessionSpy = vi.fn() + const authStateChangedSpy = vi.fn() const userInfoSpy = vi.fn() - authService.on("active-session", activeSessionSpy) + authService.on("auth-state-changed", authStateChangedSpy) authService.on("user-info", userInfoSpy) await authService.initialize() - expect(activeSessionSpy).toHaveBeenCalledWith({ previousState: "initializing" }) + expect(authStateChangedSpy).toHaveBeenCalledWith({ state: "active-session", previousState: "initializing" }) // user-info event is not emitted in static token mode expect(userInfoSpy).not.toHaveBeenCalled() }) diff --git a/packages/cloud/src/__tests__/auth/WebAuthService.spec.ts b/packages/cloud/src/__tests__/auth/WebAuthService.spec.ts index 0e6681c20b..457e1d706d 100644 --- a/packages/cloud/src/__tests__/auth/WebAuthService.spec.ts +++ b/packages/cloud/src/__tests__/auth/WebAuthService.spec.ts @@ -165,34 +165,37 @@ describe("WebAuthService", () => { it("should transition to logged-out when no credentials exist", async () => { mockContext.secrets.get.mockResolvedValue(undefined) - const loggedOutSpy = vi.fn() - authService.on("logged-out", loggedOutSpy) + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) await authService.initialize() expect(authService.getState()).toBe("logged-out") - expect(loggedOutSpy).toHaveBeenCalledWith({ previousState: "initializing" }) + expect(authStateChangedSpy).toHaveBeenCalledWith({ state: "logged-out", previousState: "initializing" }) }) it("should transition to attempting-session when valid credentials exist", async () => { const credentials = { clientToken: "test-token", sessionId: "test-session" } mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - const attemptingSessionSpy = vi.fn() - authService.on("attempting-session", attemptingSessionSpy) + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) await authService.initialize() expect(authService.getState()).toBe("attempting-session") - expect(attemptingSessionSpy).toHaveBeenCalledWith({ previousState: "initializing" }) + expect(authStateChangedSpy).toHaveBeenCalledWith({ + state: "attempting-session", + previousState: "initializing", + }) expect(mockTimer.start).toHaveBeenCalled() }) it("should handle invalid credentials gracefully", async () => { mockContext.secrets.get.mockResolvedValue("invalid-json") - const loggedOutSpy = vi.fn() - authService.on("logged-out", loggedOutSpy) + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) await authService.initialize() @@ -214,13 +217,13 @@ describe("WebAuthService", () => { const newCredentials = { clientToken: "new-token", sessionId: "new-session" } mockContext.secrets.get.mockResolvedValue(JSON.stringify(newCredentials)) - const attemptingSessionSpy = vi.fn() - authService.on("attempting-session", attemptingSessionSpy) + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) onDidChangeCallback!({ key: "clerk-auth-credentials" }) await new Promise((resolve) => setTimeout(resolve, 0)) // Wait for async handling - expect(attemptingSessionSpy).toHaveBeenCalled() + expect(authStateChangedSpy).toHaveBeenCalled() }) }) @@ -344,13 +347,13 @@ describe("WebAuthService", () => { statusText: "Bad Request", }) - const loggedOutSpy = vi.fn() - authService.on("logged-out", loggedOutSpy) + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) await expect(authService.handleCallback("auth-code", storedState)).rejects.toThrow( "Failed to handle Roo Code Cloud callback", ) - expect(loggedOutSpy).toHaveBeenCalled() + expect(authStateChangedSpy).toHaveBeenCalled() }) }) @@ -503,9 +506,9 @@ describe("WebAuthService", () => { }), }) - const activeSessionSpy = vi.fn() + const authStateChangedSpy = vi.fn() const userInfoSpy = vi.fn() - authService.on("active-session", activeSessionSpy) + authService.on("auth-state-changed", authStateChangedSpy) authService.on("user-info", userInfoSpy) // Trigger refresh by calling the timer callback @@ -518,7 +521,10 @@ describe("WebAuthService", () => { expect(authService.getState()).toBe("active-session") expect(authService.hasActiveSession()).toBe(true) expect(authService.getSessionToken()).toBe("new-jwt-token") - expect(activeSessionSpy).toHaveBeenCalledWith({ previousState: "attempting-session" }) + expect(authStateChangedSpy).toHaveBeenCalledWith({ + state: "active-session", + previousState: "attempting-session", + }) expect(userInfoSpy).toHaveBeenCalledWith({ userInfo: { name: "John Doe", @@ -560,8 +566,8 @@ describe("WebAuthService", () => { statusText: "Internal Server Error", }) - const inactiveSessionSpy = vi.fn() - authService.on("inactive-session", inactiveSessionSpy) + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) // Verify we start in attempting-session state expect(authService.getState()).toBe("attempting-session") @@ -574,7 +580,10 @@ describe("WebAuthService", () => { // Should transition to inactive-session after first failure expect(authService.getState()).toBe("inactive-session") expect(authService["isFirstRefreshAttempt"]).toBe(false) - expect(inactiveSessionSpy).toHaveBeenCalledWith({ previousState: "attempting-session" }) + expect(authStateChangedSpy).toHaveBeenCalledWith({ + state: "inactive-session", + previousState: "attempting-session", + }) }) it("should not transition to inactive-session on subsequent failures", async () => { @@ -592,14 +601,14 @@ describe("WebAuthService", () => { expect(authService.getState()).toBe("inactive-session") expect(authService["isFirstRefreshAttempt"]).toBe(false) - const inactiveSessionSpy = vi.fn() - authService.on("inactive-session", inactiveSessionSpy) + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) // Subsequent failure should not trigger another transition await expect(timerCallback()).rejects.toThrow() expect(authService.getState()).toBe("inactive-session") - expect(inactiveSessionSpy).not.toHaveBeenCalled() + expect(authStateChangedSpy).not.toHaveBeenCalled() }) it("should clear credentials on 401 during first refresh attempt (bug fix)", async () => { @@ -610,8 +619,8 @@ describe("WebAuthService", () => { statusText: "Unauthorized", }) - const loggedOutSpy = vi.fn() - authService.on("logged-out", loggedOutSpy) + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback await expect(timerCallback()).rejects.toThrow() @@ -625,7 +634,10 @@ describe("WebAuthService", () => { await authService["handleCredentialsChange"]() expect(authService.getState()).toBe("logged-out") - expect(loggedOutSpy).toHaveBeenCalledWith({ previousState: "attempting-session" }) + expect(authStateChangedSpy).toHaveBeenCalledWith({ + state: "logged-out", + previousState: "attempting-session", + }) }) }) @@ -788,28 +800,31 @@ describe("WebAuthService", () => { }) describe("event emissions", () => { - it("should emit logged-out event", async () => { - const loggedOutSpy = vi.fn() - authService.on("logged-out", loggedOutSpy) + it("should emit auth-state-changed event for logged-out", async () => { + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) await authService.initialize() - expect(loggedOutSpy).toHaveBeenCalledWith({ previousState: "initializing" }) + expect(authStateChangedSpy).toHaveBeenCalledWith({ state: "logged-out", previousState: "initializing" }) }) - it("should emit attempting-session event", async () => { + it("should emit auth-state-changed event for attempting-session", async () => { const credentials = { clientToken: "test-token", sessionId: "test-session" } mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - const attemptingSessionSpy = vi.fn() - authService.on("attempting-session", attemptingSessionSpy) + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) await authService.initialize() - expect(attemptingSessionSpy).toHaveBeenCalledWith({ previousState: "initializing" }) + expect(authStateChangedSpy).toHaveBeenCalledWith({ + state: "attempting-session", + previousState: "initializing", + }) }) - it("should emit active-session event", async () => { + it("should emit auth-state-changed event for active-session", async () => { // Set up with credentials const credentials = { clientToken: "test-token", sessionId: "test-session" } mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) @@ -835,8 +850,8 @@ describe("WebAuthService", () => { }), }) - const activeSessionSpy = vi.fn() - authService.on("active-session", activeSessionSpy) + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback await timerCallback() @@ -844,7 +859,10 @@ describe("WebAuthService", () => { // Wait for async operations to complete await new Promise((resolve) => setTimeout(resolve, 0)) - expect(activeSessionSpy).toHaveBeenCalledWith({ previousState: "attempting-session" }) + expect(authStateChangedSpy).toHaveBeenCalledWith({ + state: "active-session", + previousState: "attempting-session", + }) }) it("should emit user-info event", async () => { @@ -1035,13 +1053,13 @@ describe("WebAuthService", () => { const newCredentials = { clientToken: "new-token", sessionId: "new-session" } mockContext.secrets.get.mockResolvedValue(JSON.stringify(newCredentials)) - const attemptingSessionSpy = vi.fn() - service.on("attempting-session", attemptingSessionSpy) + const authStateChangedSpy = vi.fn() + service.on("auth-state-changed", authStateChangedSpy) onDidChangeCallback!({ key: `clerk-auth-credentials-${customUrl}` }) await new Promise((resolve) => setTimeout(resolve, 0)) // Wait for async handling - expect(attemptingSessionSpy).toHaveBeenCalled() + expect(authStateChangedSpy).toHaveBeenCalled() }) it("should not respond to changes on different scoped keys", async () => { @@ -1058,14 +1076,14 @@ describe("WebAuthService", () => { const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) await service.initialize() - const inactiveSessionSpy = vi.fn() - service.on("inactive-session", inactiveSessionSpy) + const authStateChangedSpy = vi.fn() + service.on("auth-state-changed", authStateChangedSpy) // Simulate credentials change event with different scoped key onDidChangeCallback!({ key: "clerk-auth-credentials-https://other.clerk.com" }) await new Promise((resolve) => setTimeout(resolve, 0)) // Wait for async handling - expect(inactiveSessionSpy).not.toHaveBeenCalled() + expect(authStateChangedSpy).not.toHaveBeenCalled() }) it("should not respond to changes on default key when using scoped key", async () => { @@ -1082,14 +1100,14 @@ describe("WebAuthService", () => { const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) await service.initialize() - const inactiveSessionSpy = vi.fn() - service.on("inactive-session", inactiveSessionSpy) + const authStateChangedSpy = vi.fn() + service.on("auth-state-changed", authStateChangedSpy) // Simulate credentials change event with default key onDidChangeCallback!({ key: "clerk-auth-credentials" }) await new Promise((resolve) => setTimeout(resolve, 0)) // Wait for async handling - expect(inactiveSessionSpy).not.toHaveBeenCalled() + expect(authStateChangedSpy).not.toHaveBeenCalled() }) }) }) diff --git a/packages/cloud/src/auth/AuthService.ts b/packages/cloud/src/auth/AuthService.ts index 11ed5161ed..57e026d72a 100644 --- a/packages/cloud/src/auth/AuthService.ts +++ b/packages/cloud/src/auth/AuthService.ts @@ -2,10 +2,12 @@ import EventEmitter from "events" import type { CloudUserInfo } from "@roo-code/types" export interface AuthServiceEvents { - "attempting-session": [data: { previousState: AuthState }] - "inactive-session": [data: { previousState: AuthState }] - "active-session": [data: { previousState: AuthState }] - "logged-out": [data: { previousState: AuthState }] + "auth-state-changed": [ + data: { + state: AuthState + previousState: AuthState + }, + ] "user-info": [data: { userInfo: CloudUserInfo }] } diff --git a/packages/cloud/src/auth/StaticTokenAuthService.ts b/packages/cloud/src/auth/StaticTokenAuthService.ts index 11fc18d3fb..507f82c9f6 100644 --- a/packages/cloud/src/auth/StaticTokenAuthService.ts +++ b/packages/cloud/src/auth/StaticTokenAuthService.ts @@ -18,7 +18,7 @@ export class StaticTokenAuthService extends EventEmitter impl public async initialize(): Promise { const previousState: AuthState = "initializing" this.state = "active-session" - this.emit("active-session", { previousState }) + this.emit("auth-state-changed", { state: this.state, previousState }) this.log("[auth] Static token auth service initialized in active-session state") } diff --git a/packages/cloud/src/auth/WebAuthService.ts b/packages/cloud/src/auth/WebAuthService.ts index 82d3122426..8fd892f44f 100644 --- a/packages/cloud/src/auth/WebAuthService.ts +++ b/packages/cloud/src/auth/WebAuthService.ts @@ -113,6 +113,12 @@ export class WebAuthService extends EventEmitter implements A }) } + private changeState(newState: AuthState): void { + const previousState = this.state + this.state = newState + this.emit("auth-state-changed", { state: newState, previousState }) + } + private async handleCredentialsChange(): Promise { try { const credentials = await this.loadCredentials() @@ -138,14 +144,11 @@ export class WebAuthService extends EventEmitter implements A private transitionToLoggedOut(): void { this.timer.stop() - const previousState = this.state - this.credentials = null this.sessionToken = null this.userInfo = null - this.state = "logged-out" - this.emit("logged-out", { previousState }) + this.changeState("logged-out") this.log("[auth] Transitioned to logged-out state") } @@ -153,14 +156,11 @@ export class WebAuthService extends EventEmitter implements A private transitionToAttemptingSession(credentials: AuthCredentials): void { this.credentials = credentials - const previousState = this.state - this.state = "attempting-session" - this.sessionToken = null this.userInfo = null this.isFirstRefreshAttempt = true - this.emit("attempting-session", { previousState }) + this.changeState("attempting-session") this.timer.start() @@ -168,13 +168,10 @@ export class WebAuthService extends EventEmitter implements A } private transitionToInactiveSession(): void { - const previousState = this.state - this.state = "inactive-session" - this.sessionToken = null this.userInfo = null - this.emit("inactive-session", { previousState }) + this.changeState("inactive-session") this.log("[auth] Transitioned to inactive-session state") } @@ -302,9 +299,7 @@ export class WebAuthService extends EventEmitter implements A this.log("[auth] Successfully authenticated with Roo Code Cloud") } catch (error) { this.log(`[auth] Error handling Roo Code Cloud callback: ${error}`) - const previousState = this.state - this.state = "logged-out" - this.emit("logged-out", { previousState }) + this.changeState("logged-out") throw new Error(`Failed to handle Roo Code Cloud callback: ${error}`) } } @@ -388,12 +383,13 @@ export class WebAuthService extends EventEmitter implements A try { const previousState = this.state this.sessionToken = await this.clerkCreateSessionToken() - this.state = "active-session" if (previousState !== "active-session") { + this.changeState("active-session") this.log("[auth] Transitioned to active-session state") - this.emit("active-session", { previousState }) this.fetchUserInfo() + } else { + this.state = "active-session" } } catch (error) { if (error instanceof InvalidClientTokenError) { diff --git a/packages/cloud/src/types.ts b/packages/cloud/src/types.ts index 0139bb78ec..78275b32e2 100644 --- a/packages/cloud/src/types.ts +++ b/packages/cloud/src/types.ts @@ -1,4 +1,4 @@ -export interface CloudServiceCallbacks { - stateChanged?: () => void - log?: (...args: unknown[]) => void -} +import { AuthServiceEvents } from "./auth" +import { SettingsServiceEvents } from "./CloudSettingsService" + +export type CloudServiceEvents = AuthServiceEvents & SettingsServiceEvents diff --git a/src/extension.ts b/src/extension.ts index bd43bcbf8a..60c61aada7 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -75,10 +75,15 @@ export async function activate(context: vscode.ExtensionContext) { const cloudLogger = createDualLogger(createOutputChannelLogger(outputChannel)) // Initialize Roo Code Cloud service. - await CloudService.createInstance(context, { - stateChanged: () => ClineProvider.getVisibleInstance()?.postStateToWebview(), - log: cloudLogger, - }) + const cloudService = await CloudService.createInstance(context, cloudLogger) + const postStateListener = () => { + ClineProvider.getVisibleInstance()?.postStateToWebview() + } + cloudService.on("auth-state-changed", postStateListener) + cloudService.on("user-info", postStateListener) + cloudService.on("settings-updated", postStateListener) + // Add to subscriptions for proper cleanup on deactivate + context.subscriptions.push(cloudService) // Initialize MDM service const mdmService = await MdmService.createInstance(cloudLogger) From c6e7ac41fcfb933ffc0b7cc6cebc5f5a77a4fe46 Mon Sep 17 00:00:00 2001 From: thill2323 Date: Thu, 31 Jul 2025 19:08:06 -0400 Subject: [PATCH 034/253] Phase 1 website updates (#6085) Co-authored-by: Daniel Riccio --- .../web-roo-code/public/RooCode-Badge-blk.svg | 1 + .../public/RooCode-Badge-white.svg | 6180 +++++++++++++++++ apps/web-roo-code/src/app/enterprise/page.tsx | 168 +- apps/web-roo-code/src/app/page.tsx | 11 +- .../src/components/chromes/footer.tsx | 254 +- .../src/components/chromes/nav-bar.tsx | 23 +- .../components/enterprise/contact-form.tsx | 2 +- .../src/components/homepage/faq-section.tsx | 207 +- .../components/homepage/features-mobile.tsx | 6 +- .../src/components/homepage/features.tsx | 53 +- .../components/homepage/install-section.tsx | 102 +- .../homepage/testimonials-mobile.tsx | 30 +- .../src/components/homepage/testimonials.tsx | 56 +- apps/web-roo-code/src/lib/constants.ts | 6 + 14 files changed, 6774 insertions(+), 325 deletions(-) create mode 100644 apps/web-roo-code/public/RooCode-Badge-blk.svg create mode 100644 apps/web-roo-code/public/RooCode-Badge-white.svg diff --git a/apps/web-roo-code/public/RooCode-Badge-blk.svg b/apps/web-roo-code/public/RooCode-Badge-blk.svg new file mode 100644 index 0000000000..0ee7987cbb --- /dev/null +++ b/apps/web-roo-code/public/RooCode-Badge-blk.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/web-roo-code/public/RooCode-Badge-white.svg b/apps/web-roo-code/public/RooCode-Badge-white.svg new file mode 100644 index 0000000000..8e406be8cd --- /dev/null +++ b/apps/web-roo-code/public/RooCode-Badge-white.svg @@ -0,0 +1,6180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +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 +s81oPpnge6vip000491MyTAnh06mNbScZmXW0NJWtrEjIsqkvlJwyDVEkikVhQoSLkC4UGECGowg +QoQDAhGAIwMKEixcoEABDgvqV6sUAQJw06OcSk+LI1gkvzy0JNPg2Ow+8G5MiEiceFVSN7yisiJy +2blSdC47zY0UUVa66FxGhK/zzEq/4/YdhS7tdEHbjPjNoxQ6+xjrjsyTtvmY3JSadvvRNe2GLJt2 +U+hm0w6xRvV2pugym3/aJV7GR8uOWIfHs315PLu2CW3SvkKcPFvHx6Gt0uiejuhjntw56ww9RZSH +ebW2ytKvyfVxiE6yFQnzXu2n8NJ2tNJ+t92sl2c2qTvukmj8uTLB89nYxj6yja885QOxN/YZpd10 +yow3vrxxlauZ9WeeMndz1aQj8SzFddj08ooQ03w46Eq6OjBrmIRnVXkpeqyOxPZ8T3yZ5VFZesQK +a6yOuvmU1VxdjVVR3ZNs6sQyL0R5ITqeRlVnWWfZSqqLJQrOydnjdOBVYSZuz/1uzr2S0nEoMyRm +JsERvEJLshmn8jw5hO6NTMdVGnpaaDNpJanVNqUcq6N9Tq9KpKNuitIme4hDWbLZWjqOd6X31MJX +NsnsM0dkIjIbm3rNSE5mQ2R1YKFrWUfyyqGzUqJVEY6d6IaWdthLOGZ3xbGqsbOkWQ1OD+vEiugs +c27p7LC7YlqV1B1ZzLLV7FV5d4hqOvapbwxrzh2TyRzzu9aZyhrrjBX2DBNXNHUk/WU2NT3dmIyZ +FSLWLZMSoRSNVVIWrUcpIpLWYXe9OsvOeFNpHfn8ta0kHYWUZaN8CaLPanQsntmNYOGZlY76IB4m +nlhp0D5kdTsmncwcotnkLf9iifU1h5mXVr7je1aStzZfUoep7pI6Ln/t1X9iHpJ667A92ysrRKmj +8G7PeUeSHfxfOPe7fz4kla+TOygRy26yMwdS+uzslyMdY+2OU6cKxQ5CHLwUEzt+aIMjgx25o+Ps +9WKHSQYvddDL9WWm1NETox2GTdthZor1cFYPK2kzT55NOG3NdfCOV6eX8TAZ3TT3Dc7U3FdNEqL7 +5pTpMzlMs7xZV9VCdtSYzjo1hGhHy0K7Ix3asXRHsdLmI6L0zOSFknYUPzeTRDvoc7tEOmotDSWx +TRvimZVlc4wu83bkGYvugz3JpP+ILJlWlEhyO+7Gii6zNS66zN6O17zoqC+jMrwUu8tYVmfsXpcj +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 +qPdh8NJmHPCcTXQ5aC99hm8mUHDXaLPQVvr83kmdYLsHUs/GOayzdxD17JvvnJ/pg6tn/ODqos3D +rgTq7Q5JCnaDIgNvnG+dLQPYNrvA9bIzDhxe9G7uDKEbnXXrZVyLQQPfMOGLbzFo4HcZmFlZGMzf +mXYmzMaF2VPbZuP+GE8b68DNtGExgWxjNolxXBswnfxyh1YWo8emzb7dZLyPbeBkGDTwMq8LvAbD +kJXjimXxumIucrMY7xg2cA0QJvAxr68snk0W07emlSFs48oUtnFnDNtmmUO2rcsbV8t/GBjXXsDA +fZgGl7axDi5qZWIuaPJYNs13yLrRZFk3msxlbduB0x028A4Wvji9QYPNhjpnS0urCovJAdoe2gUm +rComLCYuKiaqt5qJislKi4lLq4rppsKi4qKSYqJiomL6OWI1U1jvYIFNDa6P7UKDnAw1UxVTgqic +PLY9PTStgzsOTFlVWlhTXVdUXFVcTFRUXHdeTFV7aGRMa3VfOXJOWw4HqqspKiysqq6uKq2sqa6q +rKupri2qqqquKjqtLqsqrqyuq6krLa4tq6suqqyrKywqqyoqqymrqioqLiotrikqLiouK6stq60u +rK2trawtuq2urCsrriurKastKyqrramtrq2tqasrqq0pq6qrq6utKywuqqspq64sKy2rrK4rrqwu +ri2tLissC1NUV1taVltWXFdTV1lcV1Sygpy2HAtVWVdaWFlWWVhWWV1dbTkWtrCupqysqriwqLS2 +pqqurKzorC4wVfUtqiourasqrayuKisrLasqrS0sLi0rLa4pKystK60srikrLCkrrqwuqiksLSss +raqrriksLC0srSorKywtLa0rrSsuLqsuLCstLa0sLa2uKS0tqi0tLa0traktrS0tqiquLaypLS2r +LS2uqqurLC6tKi4tLSurqSourSoura6pLa0qqi0tLawurKqpLS0tLi0tLS2tLK2tKaosra2srSks +LSqqK6wrrawurS0srSysqa6srqwpri2trK6uKa2rLaqpqq2pKq2srqwpraytqaysLCwrrSmqnZqO +NzQ3IQv41IyUoRnegcUvGJO4kIWcH/BvRcUT5ChxHI7DYXgMf+EwXIbPcBt+w3F4DYfhMRyGw/As +d+Ev/IXX8BgOw2E4DI/hM5yG63AezrT09CII9wXEGgYTek3ckMVD++JRUgw4ExQCbsFBlUugHeGn +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 +5teHh0/LIGFND0/gOjeNCHZC/nDcVNzx2Qn54/HTMkiY81TJHaerE7lN1iZznI89JjPBOzxIsqiC +ZjgFARnDOAmGLCqaFpd7EMUvDB1xp5geTsRz+A+/4TScBobDvPCXGT7DZbL8JYbP8Bcewzmv4TUc +h+9kibjWVIOsYJsX0AjFL60xDQx8YwBoOcWwpJle2BCahkFMbH6FsHIyBpnsdISl9LQUAtZ05FG5 +CbZBoxNxRo5O8A0ZnV4eKEC9O1x4Itpwwfm98aJTXIME5+MMUUrSH3yDQA6YNYypfO0QAUvgfxim +uJgBA/xpRiiGc+6S5Vn+gsN7eJuYAwxjHxsCxwts58ZYyPpYCoe2sRYxyB4G2JmFQKR0HvZQsvm9 +0ULTq+PFpncHCk0vjhmcYhopNsU3VjkZc3xuJuJI5UzEwdqJSIOGJ+cRwM9PI3+cHprAZRbQRG1y +CJSuohUp/W2sRUzBOMRXkJNHCnxOwgIORRPEabgNh+Ex3IW7ZPmLi0sO9+E7HIjX8JwXLsM5d+E0 +/IYH4TBxDhGukGpwXqAbD2As08sEk5IvChFQyiWHj0sG0CObBMBvtj6R20zs8anp5VEi8zAHC02w +jhGglEASLV1YQfucFCK+NNwhA7PQx4xNRB6um2EdrJjeGzg2xTZcPz80kYtkgsVmGx/RHo63yH5j +LVohIooX+FrWFGfQQ8SDeA7XycpwHT7De1xmeA6f4TQchstkOeec8yx/4ZxzzjnnnLtwGC7Da/gN +r+E4PIbP8Cx/4TP8huNwHu7DjXhUURSPM4sgNqaiodMb22np58SGJSATGp6dTfzABwRAdkyCgHeU +AoAeGjmkEZMQVsemdwcKzW8PEprfHCUywTRaZH5vqND83oixiWjDxKb4xupmIo5UTkYcn5uLPDo3 +HW8EW0xlOXU5dM6bVtWc1hYVl1QOHRcXFRdTFlWV1VQVFRWXFFWVFRbVFlWb2hXXlVqaVBabFZfU +FVYWltQWmtWaFFYVV1oW2loVm1YaWpcV1RZVldWVFJcWFZcUW1saltTWGhaWFBaa1RYbmlba1hbV +1dQVFV4VFhUHLq0pKiqtqioupiqsLCazp5wHe3leZlRVG7yimB4wJTDDMqMyi2JywHRhg8yhQ92g +rQprK61tTU0LbU1Nikurq0sqS8sKS4rrCg1LSostiwuNbUvtwgZZRttDu+CHpkV7u5vzYnNDo9vA +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 +n7gssf+UHjPl/8u47JTRorE8EUIoSZZQYuNDBZdhGep1iV3Kz45oGOB8U0K4aYw51+9JfREhdQ6U +k+qPDGevuFts0s7oSZwTqMWAdAsK4WZgwBTKIVB+ojCwBYXjiPvgZxMLFMI1MaJ66sGiodX+WSTX +x3/Xa/LtBAmSwtYKLEwwweD27VgiEkBgAUF1TVbfGV7en6Z3zJ2CID6dZS4dtCAKKUkNNtKTQ8zi +dxi1BRUZuZlP/CcOrYC3VBv94VFxWdZPceVlhL7qCCbkx02VqtkO14J57YUXN7H+9+sKRaKp4WAr +m67v64aIu4mgELGNgFGSKeet0q2ttECpiFIfwCrXrXRp9yjUrchSawzlsZJ8WT2/KzEz4kWDh9Gx +ol6MRBtoYSAcIXbNlzpoOYQDqJHouiuRDTe3IrUhgMMYur/cZ/9t1JY/ivyWSPS194ZiRogt4OTZ +T2wWNdrSWUgtgVPhIlwAdCBIoZL9t46nB6b9VJnm3Ig6B+S1X48JU2plIb8WIcSZsF55b25vR1G+ +SvuruuMT8rue4OxuPwgVrubxzGO83ZgTkQosRmhJsD18+YoMTT3k24WL3rZQ61ZsDtkuTOo6uZ55 +o7K8xdOcGEbHGiXy4EKCJLx4eTK55KG5b+NUBgEcCgAEC11kNDE4YjdiOC0yZjg2MS04MmEzLTdh +YmViN2Q3YWRiYTQ3YTQxZmIxLWUwMDktNGNmNC1iNGE0LWVhMGRmNDhkOGMzMDk0IDYyOC4yNTIz +NWQ2MzEyNTUtNWIyYy00M2ExLTlkYzMtZTI1YzEyZjU2NTg5N2QzOGI0Y2UtNjZkYS00ZjUzLThj +OWMtNjBlNGE0MzkwNzE3ODEzNDYwMy4yNTIxMjUyMzc4OC4zNzIzLSBRBQkp4YPXAyar/abqIAvA +Wk0auFbjaUtrdkDdrINTNXxB25yS4NsJwRtciAZIakA5cULn3Ih1qmZKDjRrNxBMQBekCycZu0QI +T0pgfjtXtxke4M7x4K7zYeNON3Ss6QI8wTmh8GLWGI3/pnr4FrDALiASsHC+gf6bPGeiUBzoTQr4 +34S8bOkFF7r+AkEP2OSjAHpbtBA0cDfJA/z//////////6LZ/8aWYYQNY+2XW5J8YIRqZUUt9f71 +2wC3qN0lpSQhqVoU/sP+ZgQBAAH7ALRLejMkSIREfjForbnFoNE13gW6QwI3OM1TvQ+Iba29EgQ9 +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 +F4sGIpwrNIvAIpEYLiQAjYMJEzhCKl40gE44UHgovKw0JDiYhCRAIizyVJQFhQdEnqyIrkB4iETg +CZq0PJQQTA5ESjBxoKsQYHLLA7QrJxYpEsFg4EEBPx8CTO7TkUgwcZ+Ok5A1WAkLzMR0ErKKygMh +KB18E84oyAvpACmmQLOUSgYkeJBKDQ8ebB6hDgQhKwngUkMh8gN3idCgYJaSSkdByoClgcBzgaCz +EDqI8HIAIkM27mRmBK1jI2TLtBGyGtDFxmdJDOcpbTyNiYUxHJRYGHpUhDxLYjjTqAiFTBUhUwCi +qFDgGVWYSVRRNA8rnytwHp8CVelToOTFPhdycWJhIyAgdrE0DR4qagKBFhoYUgZYIDFJsRBCwtpI +Ea2sfC7GAMwGCQnFgCsxXEhNChgEiMCKWhPO6AAEVkxKFhlsQRJZCk4TIg0QBygYdIhOp1LK52FD +NjNKWGBbYlGyJRZbsrslW2KBeGiIC/RBD+aKTp4SxoNaZCh0oZJQqKJWKPQJeUL2KbGoKBYQQ+c6 +oc5Cp8RigyFUKlAhYOaA8VNRpwFhUlEWn8+nxPOxVVGgjgcfSjgOVYIOhJMFARBEnCZCMJwQi9DV +YItGJ6eiWCReKpkSBALDqUFLwQKR0jUEmovvqJIadt/r87df6yY3+qGjOy7ub7+xm/7+9f9u33rf +tmdv5t1eeOfZ/sjN7WpCS/233lt4R5WOPR3f29U3h4n8yNbaxv6b15u5rmfZnLdsq26r7bzPb02I +t7jt6qvtqFL6+9m37Tq8Tl5zP/11eJs1VHdsTs71t2bMxGRNPFf9V+aF6Gr/bmfP2H2N506VNr3v +x5Ztjr/0tN1f3Q050xYxr9N51+JtEHGvlS29e63n3+vvp/LyrRu/vdta3LQ8M9xsXu7+mc66EPHO +WLX70tauby7GOzTh6t8e7+lyxOte0+61iSib/NVbPbtru971XEfl5Dw7O+PcY9zG4+vUVttvXKe4 +8cvd/zde9XZ3a7t1ipQLWjP7bVKXkx1PM+2MHTERnymX18VuewpFfXlf09vfbHnTi612msa59lNt +1+yu+9H8fVuzn4+Z19rXfaqhr26/s/vnXa6mPvu6417m0mvP5ktk3zezpY2Mzmf3CxFfc9P1vM/l +33392m1XIlIoaq7u74erE3e1c3XiRteZv9uXFRmfzYVNm5WPO5cnUg027eiId47fq2jmyxRN2N2G +eda8Sw0fs3d18dcd8vM22lvq6kNNRzZXX1x9SJlKvp1+zHts658TL90/E9f/77q2uumu/6NKmsq/ +zpBRl/saFxqmvfUZmjsvNKRMjJzu/4e30pAqYWamWufKw/PndlU1X3moqM3MhmjKdkbexl16qL63 +v/iQsW1ZTdp4zP6rqssYf/FtX5X9Ti3NV7OplKx26K5uubLXz43ZOG9lH2UqmajS5tnz9h43zp/f +m6ret9iaiLjZa7Vf3Cjv42mbvTNr6v0lrv+vcX872t83I3by7X3+0r0Nqp5Zui139t6did8+H1P9 +dO0eVXq2vtXrbpuvt3zPVJHXeHlNqL7/v3yPKrG3n7nip/k5Ol8moqah83q+zR7rItvzo6e25T67 +3rnpud6aLuvNxf67Nes863v0he3BQKlQJpNpDVstdxdno2W/692vNEqFKplKj7rN+Xy6XhdZb1Vx +vR5lKpmoUlq36ll64v+fcmanId7m2t0X+Tbviezo//5vcs1PXz3ub+Zev9+08zPjVluXt1nHX/0+ +bX1/fktEM8R1jo+u58646/KoUrYtmr7tr0z+RP3vXlyal+h8uqbNS/My0zHN7dbmUaUNXlrmWr1r +7l6rZmxqnGbNhqYNtruamS0fLmV15t+8XaxHNdigY7o5+3HnL9ejJDZ8VA1DLrul7/LGtbZfZrv1 +5b2b64qc+MubH5vNLC/P1jdr+609um8u9FtbQ8101YV+/96s+G64CzeurIaL7e690Le/mVH171Ye +LrfupSI23it29jYaN6It3iNrIiKuKrvc/rbhfl6uY6RQGB+XX61PfbFvzvQcMRn1fvH15Xk6d5qt +9l5WRm3W12xU/l7s99Rl3599qIwLF7vbmLebM10+z82RURcuUij2iuqWe7fLfne/e9knL6qdm92t ++6RQNp8uFMreZ6d1+/ZiRVdGtW1Gc/nPXsPszdWKFMoGL73xfiHjBi85HXEzFVcypv+xyybV9vIw +Hdk++RYXlx9nYubdrmRESoVC2T/EM1726dymy37Z+SyXndHW/vbfq25qb679bOTjXEzus93TRcbb +v92/Dft17+tZrt5nYn5/s7tifh7rbW7av70pJtseYnNfbzb3OyMu7unCB23QG3etN9/2/Gv2/2yM +r47+yrvuKZSNo7eb9W9/+/2ysxsn5+oGbZjZ1HO7vZf3bTbZfns/W3/xY//yPsplo952ZojboI3a +ot6mNeP6bmW2w1Q+bN83P757blPEy9637XbVRfP/dX7IqWx/qKcufPnKfq6+0I9CQb388+vslRvu +Y37DvjXbc/brXJp+z23elqp4n8l53MvdmTM33Vf+Kadt6u6xy/ueuzHKdyrv5uajre8NKvJhp2Y/ +ojunJuM38vqmUDabtu92zZq93j957zoXl61Z2c0wH5f6Pfuj3d/xulz+LWf3vS/1oxpsPLe5PRUz +c9mDNsztrOmvjiv/qBnSxlCFQnnjZrNUzL1Dzuzmxb7pzEfUT/62td34/Wupt9r37dLy1HP3d/Px +U3O1UyibtW7lXsZ7wzf3NW9jtdW/yTN8NbbOzsw9tjPFxNWJf5/+aKufcllNw8duvefFT6E8vqG1 +ffafbTobmtn2MuVPzc27lb9x3eP+9FvsZdh2aSv/NVebvfnZ2De7+/gXPoWyud3GvcM2ez0zvlvv +m3zPxn5Ey7W/XrdT91/uG0025k5dQ3M3xbZ3RV/u6PmX/27LrY0T99x5uZ8Z5yH+3bLhte5Z4tre +KG6/5Snq/lL+7Ey941vbm0zuzm3VNtRWyzdLu7WPfd+3b9m2tkGby+xVfTRkW7vKp9eWaddmyH+Y +3Y/r2lzb+BL32dRQuQ/X9ebOX3H1HD9/rS2vze9c+PF5GVfdsvnwFB3XNYWy6c9rDBSFxkRVVRWV +smISEwAYlplNygmGZibltLJJWTGJSaEx2aQAwGRmhTqluDAwOR1IWTHZqCoKBDqlCMDEtOBlIsLU +jSCGTYdiQdPPtHlDBW0UKdOmDXUz005NVIMNth1og9Z6i/z6/yuRkticyUQ1UKFQOPl+03ExYh8f +Yv7dYkTKBcU6eS//1mWDf2zLv45fUZPRMh9vIau97rbxX+ZCvsN+Nf7k2+/c/mX3e7S1h3qafy6I +bfy59pBC2evntOWH94nLz4WXuz1Nlx8yHuo5rwtjt3UvP6RQvLnNUJcPTbnZ9q6XL2jDe9bnyar9 +e6uPqNi6yxXN77ixFw/5k9He7ReiriUa8mXbSjxF9t7GlXi4f78Wr5uRHzGVL1tT29pbz1V52fKu +uRcnG/cb7rpL92Vr3lx37Yf/bCiLu7rcUNmFQnk0P093W27omHin+C64x7yth73akELxbH3/Nbe1 +huzmiPzdnqj+rvaX6NvP54uO/siXzPu2ekHm+JzXSw0501Ff10VVvb9Zc6khhWJt/Put/ItnyO15 ++bed3rphT3RMz2vut2vfZVzlXUyhbB6V7/xbEw95df3tHNcZGppzrqqLWjurmSuvM6QatJ/Z3une +ukMVCsVl77V79d+3HrIbu6C4mF+y853/4T7/+efSv0M9VuR1eVvupX9UA9/2t/81Xf1ualszS95t +dN5UY1umeahtqIvT5a/b3Bf//dW2cZVxF2eemzYfci5OvbO/1P29xcmJzKe4K5NVdw9zZVIo2reW +vbcyb61NLf9d8jIP7TCPQnH8NDU3W4+3yWNEBm3W3OzfXN/3beXf2+H640o1ZW/sffO0/1d7vNTV +O+XleN/Hb+7cuhyxnxuX41Eo7eruyWtRl+2ykVNRz21vLe3vMu2729Kvndne+9GwcS1+Zqd1d7o4 +p6MvCv4739rq471PXI2adpevry6M/52+b9yr8SgUZER87bSleY22f5uWnZr6i/pvy767NHXXEZkV +fZ2Nm7WXJmt3euKieSIuztJeZ29vLnvPXOt9Ntxl3/fJa7anpj/HfHtGLDnrcTa6u1r/LvfbPTYT +m6m68qUt96NKq3mqy768Vff5vvN/s/VanX9Zz9NQNZef8vE9ZnOiIhvvLe9UfX1b20s1P2tGY/U3 +TOZfPXVD18V9m8ve5FT0a181Z2z+/jb95M7Ffc/Gt59rssNza9Ne3EeVdnvvmz3Xdyo2cvq37/pW +bm5Lt9te31TpFI/V3df5adolpu+tmdBxu3GxhLZ6qcpL/ex0l21XfWnqOrKbrfXb11u0w3ftv8t+ +U1+Zbs1m/N5vaeLk1zZMu13tRzUwZT5P3lv2V8I0dGzWs9NnTXfHbHOTZ3r7si3+rX6uw7ZF5DO9 +xHX4aPmGlrYOjyqtszKz+rXzKSI++i2/9udrTv+z5fefmKvovva01/Bs2fR8fsubnGvvqJLpvfad +48q7w/1jfdvlZEX2xWzbu6bq27uY8XzX2RFZkS1Rs70z7RV52V2arvf5sZrSLjV/jXHZHVU6bvy2 +XD1+Pu1D9cw8bb3Gy9dVy17MrYtpx92qzep4n4fqK7f/9FVP2f6tj9dXW9d++d1muxmbM5OXu2/9 +3YY38RH98vaPrRl1/SXfslufYroerz9zV0Nf0za7dYimZUs//MVr6kP27pX6/enZ5rbqZ6z3jsv1 +NpyNpt3Nq+jH97nfZr/23Jz5Fu/z25mvceY6b7P6tafpJvO6v2/ff8Zbq+7ter67jlWf1+/2ci2D +Nrnob4x9/N/9Zr7he9RFdnv/xZynvny47I5vqi7pucdpr30ot8umnZtO5dbHNnTe+0TeN0fMX8yG +jHqM7WvLj72YQZt9ZVXMVL38XsqgjSOit2lz+v0pd2uj5Vrq4R+qLV3QKeOb/h7vp2trmi7Tc/5z +XhfOzka37mV6FMq9uvb5JVpztne/r+u76eY2d9PZ8fxTjZ/X63W2LzrfNTOf4umi9/YqN7p1rlvk +T+bm3sVrh2273ot3d9PUF2/2szLn370v33tV915j/eWbiXiaa/fr37q3ft3t0+1/W3Nbvw8bNU+b +/821dR3b7/GjL+X71NtcZhfD1jdsZF3KR6Fs8O85Vds+eV0vtzbbbjq76Lueeva6s97ETnxv1tdV +/d80NNc9Vd7//eWceMyGrmfrtzPzuXvdfSVnqiMfqrPivS5j6y4uZRQXCiX5FRNtNfPxrb+v9+8z +6yYvL+ZLZsP7Nt21e5/Hzbu21i5u6Hzs3PYoa6qm6urm+L7JxisXtNFWfrbPVV7Ltzn97c9Etu7l +d8/F7F+Zqqn2m6edixe08V++XX7ztXzmp4vLFjZPedzlGl7zqS9vE26fboONc6ryLXV7ZP67Zbhp +7rT79MvHY0s2O71djIdpn7y9mCbG1EMrJfP6Mjz9TVRP5WV4G23cdMtVvEVlZVNr1WVo5vu41o5r +p/2Zyxa9le397dFdTX8N0xffbc7s0HH3HZff+rIX3/U9N3PrmpyPPZAOqDTz9IE4nORAkONQ0EGK +QIi2AZMSAAAQQBIQRyWzybKMGQAUAARmRjA8MjYgJhSNB6PiiEQQR0EghUEQR0EMhLIcsogyGwBI +AkqHU+lARaEWJTbQ9rTp34Cflz6qCVGrttneDSzBebORgE9GoRAC7VBz8Z+aAmdD8EVeJcEPx3AS +tV3sTURy86/sNKt0pHjeglSATE0azZNspb/U8Sa8K/1Aulrp73Zd6efX00InP2bFUGmxepiW7BIT +1z/1oa2qPS6AQ050lqnzvDMgyVibXT9mAZDA81Gm2wttRm/X1MdVl7l2NdwBWVpuk/fHRnto8hkG +QbtWD7GajyL/UROxBVzIiUpCVgXOAfbadchTHqY8AwZ+Hf5Bs7gMNF7vh5OEhmNk85rfZ1oU8YLN +aht/Mcycul6SRiiMt5GuVT4iUDO7f4wS5+aAUyYRXQYT7aT014JCfe3QIDgQH39OtKGuVNpUjWPZ +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 + + + + \ No newline at end of file diff --git a/apps/web-roo-code/src/app/enterprise/page.tsx b/apps/web-roo-code/src/app/enterprise/page.tsx index d2c38fba05..ca15857ffd 100644 --- a/apps/web-roo-code/src/app/enterprise/page.tsx +++ b/apps/web-roo-code/src/app/enterprise/page.tsx @@ -1,4 +1,4 @@ -import { Code, CheckCircle, Shield, Users, Zap, Workflow, Lock } from "lucide-react" +import { Code, CheckCircle, Shield, Zap, Workflow, Lock, ArrowRight, DollarSign, Search, Network } from "lucide-react" import { Button } from "@/components/ui" import { AnimatedText } from "@/components/animated-text" @@ -10,7 +10,7 @@ export default async function Enterprise() { return ( <> {/* Hero Section */} -
+
@@ -34,26 +34,19 @@ export default async function Enterprise() { @@ -110,9 +103,11 @@ export default async function Enterprise() {
{/* Card 1 */} -
-
- +
+
+
+ +

Centralized AI Management Hub

@@ -136,9 +131,11 @@ export default async function Enterprise() {

{/* Card 2 */} -
-
- +
+
+
+ +

Real-Time Usage Visibility

@@ -161,9 +158,11 @@ export default async function Enterprise() {

{/* Card 3 */} -
-
- +
+
+
+ +

Enterprise-Grade Governance

@@ -187,9 +186,11 @@ export default async function Enterprise() {

{/* Card 4 */} -
-
- +
+
+
+ +

5-Minute Control-Plane Setup

@@ -213,9 +214,11 @@ export default async function Enterprise() {

{/* Card 5 */} -
-
- +
+
+
+ +

Manage AI Development Costs

@@ -238,9 +241,11 @@ export default async function Enterprise() {

{/* Card 6 */} -
-
- +
+
+
+ +

Zero Friction for Developers

@@ -392,8 +397,10 @@ export default async function Enterprise() {

-
- +
+
+ +

Enterprise-Grade Security

@@ -423,20 +430,31 @@ export default async function Enterprise() {

-
+
- +
+
+ +
+

Security-First Design

-

+

Every feature built with enterprise security requirements in mind

+
-
@@ -444,30 +462,44 @@ export default async function Enterprise() {
{/* CTA Section */} -
-
-
-

- Ready to Transform Your Development Process? -

-

- Join our early access program and be among the first to experience the power of Roo Code - Cloud for Enterprise. -

-
-
-

Become an Early Access Partner

-

- Collaborate in shaping Roo Code's enterprise solution. +

+
+
+
+
+
+
+

+ Ready to Transform Your Development Process? +

+

+ Join our early access program and be among the first to experience the power of Roo + Code Cloud for Enterprise.

- -
-
-

Request a Demo

-

- See Roo Code's enterprise capabilities in action. -

- +
+
+

Become an Early Access Partner

+

+ Collaborate in shaping Roo Code's enterprise solution. +

+ +
+
+

Request a Demo

+

+ See Roo Code's enterprise capabilities in action. +

+ +
+
diff --git a/apps/web-roo-code/src/app/page.tsx b/apps/web-roo-code/src/app/page.tsx index 971332b105..a7fd810a66 100644 --- a/apps/web-roo-code/src/app/page.tsx +++ b/apps/web-roo-code/src/app/page.tsx @@ -21,7 +21,7 @@ export default async function Home() { return ( <> -
+
@@ -64,12 +64,15 @@ export default async function Home() { -
diff --git a/apps/web-roo-code/src/components/chromes/footer.tsx b/apps/web-roo-code/src/components/chromes/footer.tsx index 4c2b036190..b6a17cebe5 100644 --- a/apps/web-roo-code/src/components/chromes/footer.tsx +++ b/apps/web-roo-code/src/components/chromes/footer.tsx @@ -4,7 +4,7 @@ import { useState, useRef, useEffect } from "react" import Link from "next/link" import Image from "next/image" import { ChevronDown } from "lucide-react" -import { FaBluesky, FaDiscord, FaGithub, FaLinkedin, FaReddit, FaTiktok, FaXTwitter, FaYoutube } from "react-icons/fa6" +import { useTheme } from "next-themes" import { EXTERNAL_LINKS, INTERNAL_LINKS } from "@/lib/constants" import { useLogoSrc } from "@/lib/hooks/use-logo-src" @@ -14,6 +14,7 @@ export function Footer() { const [privacyDropdownOpen, setPrivacyDropdownOpen] = useState(false) const dropdownRef = useRef(null) const logoSrc = useLogoSrc() + const { resolvedTheme } = useTheme() // Close dropdown when clicking outside useEffect(() => { @@ -39,72 +40,21 @@ export function Footer() {

Empowering developers to build better software faster with AI-powered tools and insights.

- + + {/* Made with Roo Code */} + + Made with Roo Code +
@@ -126,6 +76,15 @@ export function Footer() { Enterprise +
  • + + Evals + +
    • -
  • - - Testimonials - -

  • Resources

     -
    • -
    -
    - -
    +
    +
    +

    Company

    +
    diff --git a/apps/web-roo-code/src/components/chromes/nav-bar.tsx b/apps/web-roo-code/src/components/chromes/nav-bar.tsx index 336c6236e1..ca6a4d4b4f 100644 --- a/apps/web-roo-code/src/components/chromes/nav-bar.tsx +++ b/apps/web-roo-code/src/components/chromes/nav-bar.tsx @@ -46,11 +46,6 @@ export function NavBar({ stars, downloads }: NavBarProps) { className="text-muted-foreground transition-transform duration-200 hover:scale-105 hover:text-foreground max-lg:hidden"> Testimonials - - FAQ - @@ -68,10 +63,11 @@ export function NavBar({ stars, downloads }: NavBarProps) { Docs - Careers + Community
    @@ -102,7 +98,7 @@ export function NavBar({ stars, downloads }: NavBarProps) { + className="hidden items-center gap-1.5 rounded-md bg-primary px-4 py-2 text-sm font-medium text-primary-foreground transition-all duration-200 hover:bg-primary/80 hover:shadow-lg hover:scale-105 md:flex"> Install · @@ -150,12 +146,6 @@ export function NavBar({ stars, downloads }: NavBarProps) { onClick={() => setIsMenuOpen(false)}> Testimonials - setIsMenuOpen(false)}> - FAQ - setIsMenuOpen(false)}> - Careers + Community
    diff --git a/apps/web-roo-code/src/components/enterprise/contact-form.tsx b/apps/web-roo-code/src/components/enterprise/contact-form.tsx index b90435e1f3..00909f9fef 100644 --- a/apps/web-roo-code/src/components/enterprise/contact-form.tsx +++ b/apps/web-roo-code/src/components/enterprise/contact-form.tsx @@ -149,7 +149,7 @@ export function ContactForm({ formType, buttonText, buttonClassName }: ContactFo return ( - + diff --git a/apps/web-roo-code/src/components/homepage/faq-section.tsx b/apps/web-roo-code/src/components/homepage/faq-section.tsx index e870474661..3004c885aa 100644 --- a/apps/web-roo-code/src/components/homepage/faq-section.tsx +++ b/apps/web-roo-code/src/components/homepage/faq-section.tsx @@ -4,64 +4,233 @@ import { useState } from "react" import { motion } from "framer-motion" import { ChevronDown } from "lucide-react" import { cn } from "@/lib/utils" +import Link from "next/link" interface FAQItem { question: string - answer: string + answer: React.ReactNode } const faqs: FAQItem[] = [ { question: "What exactly is Roo Code?", - answer: "Roo Code is an open-source, AI-powered coding assistant that runs in VS Code. It goes beyond simple autocompletion by reading and writing across multiple files, executing commands, and adapting to your workflow—like having a whole dev team right inside your editor.", + answer: ( + <> + Roo Code is an open-source, AI-powered coding assistant that runs in VS Code. It goes beyond simple + autocompletion by reading and writing across multiple files, executing commands, and adapting to your + workflow—like having a whole dev team right inside your editor. + + ), }, { question: "How does Roo Code differ from Copilot, Cursor, or Windsurf?", - answer: "Open & Customizable: Roo Code is open-source and allows you to integrate any AI model (OpenAI, Anthropic, local LLMs, etc.). Multi-File Edits: It can read, refactor, and update multiple files at once for more holistic changes. Agentic Abilities: Roo Code can run tests, open a browser, or do deeper tasks than a typical AI autocomplete. Permission-Based: You control and approve any file changes or command executions.", + answer: ( + <> + Roo Code is open-source and fully customizable, letting you integrate any AI model you + choose (e.g, OpenAI, Anthropic, local LLMs, etc.). It's built for multi-file edits + , so it can read, refactor, and update multiple files at once for holistic code changes. Its{" "} + agentic abilities go beyond a typical AI autocomplete, enabling it to run tests, open a + browser, and handle deeper tasks. And you're always in control: Roo Code is{" "} + permission-based, meaning you can control and approve any file changes or command + executions. + + ), }, { question: "Is Roo Code really free?", - answer: "Yes! Roo Code is completely free and open-source. You'll only pay for the AI model usage if you use a paid API (like OpenAI). If you choose free or self-hosted models, there's no cost at all.", + answer: ( + <> + Yes! Roo Code is completely free and open-source. You'll only pay for the AI model usage if you use + a paid API (like OpenAI). If you choose free or self-hosted models, there's no cost at all. + + ), }, { question: "Will my code stay private?", - answer: "Yes. Because Roo Code is an extension in your local VS Code, your code never leaves your machine unless you connect to an external AI API. Even then, you control exactly what is sent to the AI model. You can use tools like .rooignore to exclude sensitive files, and you can also run Roo Code with offline/local models for full privacy.", + answer: ( + <> + Yes. Because Roo Code is an extension in your local VS Code, your code never leaves your machine unless + you connect to an external AI API. Even then, you control exactly what is sent to the AI model. You can + use tools like .rooignore to exclude sensitive files, and you can also run Roo Code with offline/local + models for full privacy. + + ), }, { question: "Which AI models does Roo Code support?", - answer: "Roo Code is model-agnostic. It works with: OpenAI models (GPT-3.5, GPT-4, etc.), Anthropic Claude, Local LLMs (through APIs or special plugins), Any other API that follows Roo Code's Model Context Protocol (MCP).", + answer: ( + <> + Roo Code is fully model-agnostic, giving you the flexibility to work with whatever AI models you prefer. + It supports OpenAI models (like GPT-4o, GPT-4, and o1), Anthropic's Claude (including Claude 3.5 + Sonnet), Google's Gemini models, and local LLMs via APIs or specialized plugins. You can even + connect any other model that follows Roo Code's Model Context Protocol (MCP). + + ), }, { question: "Does Roo Code support my programming language?", - answer: "Likely yes! Roo Code supports a wide range of languages—Python, Java, C#, JavaScript/TypeScript, Go, Rust, etc. Since it leverages the AI model's understanding, new or lesser-known languages may also work, depending on model support.", + answer: ( + <> + Likely yes! Roo Code supports a wide range of languages—Python, Java, C#, JavaScript/TypeScript, Go, + Rust, etc. Since it leverages the AI model's understanding, new or lesser-known languages may also + work, depending on model support. + + ), }, { question: "How do I install and get started?", - answer: "Install Roo Code from the VS Code Marketplace (or GitHub). Add your AI keys (OpenAI, Anthropic, or other) in the extension settings. Open the Roo panel (the rocket icon) in VS Code, and start typing commands in plain English!", + answer: ( + <> + Install Roo Code from the{" "} + + VS Code Marketplace + {" "} + (or GitHub). Add your AI keys (OpenAI, Anthropic, or other) in the extension settings. Open the Roo + panel (the rocket icon) in VS Code, and start typing commands in plain English!{" "} + + Watch our tutorial to help you get started. + + + ), }, { question: "Can it handle large, enterprise-scale projects?", - answer: "Absolutely. Roo Code uses efficient strategies (like partial-file analysis, summarization, or user-specified context) to handle large codebases. Enterprises especially appreciate the on-prem or self-hosted model option for compliance and security needs.", + answer: ( + <> + Absolutely. Roo Code uses efficient strategies (like partial-file analysis, summarization, or + user-specified context) to handle large codebases. Enterprises especially appreciate the on-prem or + self-hosted model option for compliance and security needs.{" "} + + Learn more about Roo Code for enterprise. + + + ), }, { question: "Is it safe for enterprise use?", - answer: "Yes. Roo Code was designed with enterprise in mind: Self-host AI models or choose your own provider. Permission gating on file writes and commands. Auditable: The entire code is open-source, so you know exactly how it operates.", + answer: ( + <> + Yes. Roo Code was built for enterprise environments. You can self-host AI models or use your own trusted + provider. All file changes and commands go through permission gating, so nothing runs without your + approval. And because Roo Code is fully open-source, it's auditable—you can review exactly how it + works before deploying it.{" "} + + Learn more about Roo Code for enterprise. + + + ), }, { question: "Can Roo Code run commands and tests automatically?", - answer: "Yes! One of Roo Code's superpowers is command execution (optional and fully permission-based). It can: Run npm install or any terminal command you grant permission for. Execute your test suites. Open a web browser for integration tests.", + answer: ( + <> + Yes! One of Roo Code's biggest strengths is its ability to execute commands—always optional and + fully permission-based. It can run terminal commands like npm install, execute your test suites, and + even open a web browser for integration testing when you approve it. + + ), }, { question: "What if I just want a casual coding 'vibe'?", - answer: 'Roo Code shines for both serious enterprise development and casual "vibe coding." You can ask it to quickly prototype ideas, refactor on the fly, or provide design suggestions—without a rigid, step-by-step process.', + answer: ( + <> + Roo Code shines for both serious enterprise development and casual "vibe coding." You can ask + it to quickly prototype ideas, refactor on the fly, or provide design suggestions—without a rigid, + step-by-step process. + + ), }, { question: "Can I contribute to Roo Code?", - answer: "Yes, please do! Roo Code is open-source on GitHub. Submit issues, suggest features, or open a pull request. There's also an active community on Discord and Reddit if you want to share feedback or help others.", + answer: ( + <> + Yes, please do! Roo Code is open-source on{" "} + + GitHub + + . Submit issues, suggest features, or open a pull request. There's also an active community on{" "} + + Discord + {" "} + and{" "} + + Reddit + {" "} + if you want to share feedback or help others. + + ), }, { question: "Where can I learn more or get help?", - answer: "Check out: Official Documentation for setup and advanced guides. Discord & Reddit channels for community support. YouTube tutorials and blog posts from fellow developers showcasing real-world usage.", + answer: ( + <> + Check out our{" "} + + official documentation + {" "} + for both a quick-start set up and advanced guides. You can also get community support on{" "} + + Discord + {" "} + and{" "} + + Reddit + + . You can also check out our{" "} + + YouTube + {" "} + tutorials and{" "} + + blog posts + {" "} + from fellow developers showcasing real-world usage. + + ), }, ] @@ -84,10 +253,8 @@ export function FAQSection() { duration: 0.6, ease: [0.21, 0.45, 0.27, 0.9], }}> -

    - Frequently Asked Questions -

    -

    +

    Frequently Asked Questions

    +

    Everything you need to know about Roo Code and how it can transform your development workflow.

    @@ -125,9 +292,7 @@ export function FAQSection() { "overflow-hidden transition-all duration-300 ease-in-out", openIndex === index ? "max-h-96 pb-6" : "max-h-0", )}> -
    -

    {faq.answer}

    -
    +
    {faq.answer}
    diff --git a/apps/web-roo-code/src/components/homepage/features-mobile.tsx b/apps/web-roo-code/src/components/homepage/features-mobile.tsx index 7e623ecfd4..e924afd4bf 100644 --- a/apps/web-roo-code/src/components/homepage/features-mobile.tsx +++ b/apps/web-roo-code/src/components/homepage/features-mobile.tsx @@ -60,10 +60,10 @@ export function FeaturesMobile() {
    {features.map((feature, index) => (
    -
    -
    +
    +
    -
    {feature.icon}
    +
    {feature.icon}

    {feature.title}

    diff --git a/apps/web-roo-code/src/components/homepage/features.tsx b/apps/web-roo-code/src/components/homepage/features.tsx index ce5534ab6e..4c71946d80 100644 --- a/apps/web-roo-code/src/components/homepage/features.tsx +++ b/apps/web-roo-code/src/components/homepage/features.tsx @@ -1,7 +1,7 @@ "use client" import { motion } from "framer-motion" -import { FaRobot, FaCode, FaBrain, FaTools, FaTerminal, FaPuzzlePiece, FaGlobe } from "react-icons/fa" +import { Bot, Code, Brain, Wrench, Terminal, Puzzle, Globe, Shield, Zap } from "lucide-react" import { FeaturesMobile } from "./features-mobile" import { ReactNode } from "react" @@ -10,58 +10,62 @@ export interface Feature { icon: ReactNode title: string description: string - size: "small" | "large" } export const features: Feature[] = [ { - icon: , + icon: , title: "Your AI Dev Team in VS Code", description: "Roo Code puts a team of agentic AI assistants directly in your editor, with the power to plan, write, and fix code across multiple files.", - size: "large", }, { - icon: , + icon: , title: "Multiple Specialized Modes", description: "From coding to debugging to architecture, Roo Code has a mode for every dev scenario—just switch on the fly.", - size: "small", }, { - icon: , + icon: , title: "Deep Project-wide Context", description: "Roo Code reads your entire codebase, preserving valid code through diff-based edits for seamless multi-file refactors.", - size: "small", }, { - icon: , + icon: , title: "Open-Source and Model-Agnostic", description: "Bring your own model or use local AI—no vendor lock-in. Roo Code is free, open, and adaptable to your needs.", - size: "large", }, { - icon: , + icon: , title: "Guarded Command Execution", description: "Approve or deny commands as needed. Roo Code automates your dev workflow while keeping oversight firmly in your hands.", - size: "small", }, { - icon: , + icon: , title: "Fully Customizable", description: - "Create or tweak modes, define usage rules, and shape Roo Code’s behavior precisely—your code, your way.", - size: "small", + "Create or tweak modes, define usage rules, and shape Roo Code's behavior precisely—your code, your way.", }, { - icon: , + icon: , title: "Automated Browser Actions", description: "Seamlessly test and verify your web app directly from VS Code—Roo Code can open a browser, run checks, and more.", - size: "small", + }, + { + icon: , + title: "Secure by Design", + description: + "Security-first from the ground up, Roo Code meets rigorous standards without slowing you down. Monitoring and strict policies keep your code safe at scale.", + }, + { + icon: , + title: "Seamless Setup and Workflows", + description: + "Get started in minutes—no heavy configs. Roo Code fits alongside your existing tools and dev flow, while supercharging your productivity.", }, ] @@ -127,7 +131,7 @@ export function Features() { duration: 0.6, ease: [0.21, 0.45, 0.27, 0.9], }}> -

    +

    Powerful features for modern developers.

    @@ -148,15 +152,12 @@ export function Features() { viewport={{ once: true }}>

    {features.map((feature, index) => ( - -
    -
    -
    + +
    +
    +
    -
    {feature.icon}
    + {feature.icon}

    {feature.title}

    diff --git a/apps/web-roo-code/src/components/homepage/install-section.tsx b/apps/web-roo-code/src/components/homepage/install-section.tsx index 224a83cee3..5da3a7d4ae 100644 --- a/apps/web-roo-code/src/components/homepage/install-section.tsx +++ b/apps/web-roo-code/src/components/homepage/install-section.tsx @@ -23,59 +23,73 @@ export function InstallSection({ downloads }: InstallSectionProps) { } return ( -
    +
    + {/* Enhanced background with better contrast */} +
    -
    +
    +
    -
    -

    - Install Roo Code — Open & Flexible -

    -

    - Roo Code is open-source, model-agnostic, and developer-focused. Install from the VS Code - Marketplace or the CLI in minutes, then bring your own AI model. -

    -
    - -
    -
    - - - VSCode Marketplace - {downloads !== null && ( - <> - - · - - {downloads} Downloads - - )} - -
    - -
    -
    -
    -
    -
    Install via CLI
    -
    -
    - 
    -										
-											code --install-extension RooVeterinaryInc.roo-cline
-										
-
    +
    + {/* Enhanced container with better visual separation */} +
    + {/* Subtle gradient overlay */} +
    + +
    + {/* Updated h2 to match other sections */} +

    + Install Roo Code — Open & Flexible +

    +

    + Roo Code is open-source, model-agnostic, and developer-focused. Install from the VS Code + Marketplace or the CLI in minutes, then bring your own AI model. +

    + +
    + {/* Enhanced VSCode Marketplace button */} + +
    +
    + + + VSCode Marketplace + {downloads !== null && ( + <> + · + {downloads} Downloads + + )} + +
    + + + {/* Enhanced CLI install section */} +
    +
    +
    +
    +
    Install via CLI
    +
    +
    + 
    +												
+													code --install-extension RooVeterinaryInc.roo-cline
+												
+
    +
    +
    diff --git a/apps/web-roo-code/src/components/homepage/testimonials-mobile.tsx b/apps/web-roo-code/src/components/homepage/testimonials-mobile.tsx index e4b3b6863a..8b90d27b5a 100644 --- a/apps/web-roo-code/src/components/homepage/testimonials-mobile.tsx +++ b/apps/web-roo-code/src/components/homepage/testimonials-mobile.tsx @@ -18,23 +18,37 @@ export function TestimonialsMobile() {
    {testimonials.map((testimonial) => (
    -
    +
    - + + + + + + + + + + -
    -

    +

    +

    "{testimonial.quote}"

    -
    -

    {testimonial.name}

    -

    +

    +

    + {testimonial.name} +

    +

    {testimonial.role} at {testimonial.company}

    diff --git a/apps/web-roo-code/src/components/homepage/testimonials.tsx b/apps/web-roo-code/src/components/homepage/testimonials.tsx index 8ffed444cc..4df5849d46 100644 --- a/apps/web-roo-code/src/components/homepage/testimonials.tsx +++ b/apps/web-roo-code/src/components/homepage/testimonials.tsx @@ -109,7 +109,7 @@ export function Testimonials() { duration: 0.6, ease: [0.21, 0.45, 0.27, 0.9], }}> -

    +

    Empowering developers worldwide.

    @@ -135,10 +135,10 @@ export function Testimonials() { key={testimonial.id} variants={itemVariants} className={`group relative ${index % 2 === 0 ? "md:translate-y-4" : "md:translate-y-12"}`}> -

    -
    +
    +
    {testimonial.image && ( -
    +
    )} -
    -
    - - - +
    +
    +
    + + + + + + + + + + + + +
    + +

    + {testimonial.quote} +

    -

    - {testimonial.quote} -

    - -
    -
    -

    {testimonial.name}

    -

    +

    +
    +

    + {testimonial.name} +

    +

    {testimonial.role} at {testimonial.company}

    diff --git a/apps/web-roo-code/src/lib/constants.ts b/apps/web-roo-code/src/lib/constants.ts index 9f769e2967..50898978ce 100644 --- a/apps/web-roo-code/src/lib/constants.ts +++ b/apps/web-roo-code/src/lib/constants.ts @@ -1,5 +1,6 @@ export const EXTERNAL_LINKS = { GITHUB: "https://github.com/RooCodeInc/Roo-Code", + GITHUB_DISCUSSIONS: "https://github.com/RooCodeInc/Roo-Code/discussions", DISCORD: "https://discord.gg/roocode", REDDIT: "https://reddit.com/r/RooCode", X: "https://x.com/roo_code", @@ -18,6 +19,11 @@ export const EXTERNAL_LINKS = { TUTORIALS: "https://docs.roocode.com/tutorial-videos", MARKETPLACE: "https://marketplace.visualstudio.com/items?itemName=RooVeterinaryInc.roo-cline", SECURITY: "https://trust.roocode.com", + EVALS: "https://roocode.com/evals", + BLOG: "https://blog.roocode.com", + OFFICE_HOURS_PODCAST: "https://www.youtube.com/@RooCodeYT/podcasts", + FAQ: "https://roocode.com/#faq", + TESTIMONIALS: "https://roocode.com/#testimonials", } export const INTERNAL_LINKS = { From 5c057623336cd5c3b2e0d43fbf7c5b0f23a7613c Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Thu, 31 Jul 2025 19:27:55 -0400 Subject: [PATCH 035/253] Revert "Migrate evals database when deploying roo-code-website" (#6525) --- .github/workflows/website-deploy.yml | 17 ++++++----------- packages/evals/package.json | 5 +++-- .../db/migrations/0001_add_timeout_to_runs.sql | 1 + 3 files changed, 10 insertions(+), 13 deletions(-) create mode 100644 packages/evals/src/db/migrations/0001_add_timeout_to_runs.sql diff --git a/.github/workflows/website-deploy.yml b/.github/workflows/website-deploy.yml index cd18a3e766..20eea4288a 100644 --- a/.github/workflows/website-deploy.yml +++ b/.github/workflows/website-deploy.yml @@ -5,7 +5,7 @@ on: branches: - main paths: - - "apps/web-roo-code/**" + - 'apps/web-roo-code/**' workflow_dispatch: env: @@ -21,11 +21,11 @@ jobs: - name: Check if VERCEL_TOKEN exists id: check run: | - if [ -n "${{ secrets.VERCEL_TOKEN }}" ]; then - echo "has-vercel-token=true" >> $GITHUB_OUTPUT - else - echo "has-vercel-token=false" >> $GITHUB_OUTPUT - fi + if [ -n "${{ secrets.VERCEL_TOKEN }}" ]; then + echo "has-vercel-token=true" >> $GITHUB_OUTPUT + else + echo "has-vercel-token=false" >> $GITHUB_OUTPUT + fi deploy: runs-on: ubuntu-latest @@ -36,11 +36,6 @@ jobs: uses: actions/checkout@v4 - name: Setup Node.js and pnpm uses: ./.github/actions/setup-node-pnpm - - name: Migrate evals database - run: pnpm db:migrate:production - working-directory: packages/evals - env: - DATABASE_URL: ${{ secrets.EVALS_DATABASE_URL }} - name: Install Vercel CLI run: npm install --global vercel@canary - name: Pull Vercel Environment Information diff --git a/packages/evals/package.json b/packages/evals/package.json index a918a2a586..83690a99c4 100644 --- a/packages/evals/package.json +++ b/packages/evals/package.json @@ -15,8 +15,9 @@ "drizzle-kit:production": "dotenvx run -f .env.production -- tsx node_modules/drizzle-kit/bin.cjs", "db:generate": "pnpm drizzle-kit generate", "db:migrate": "pnpm drizzle-kit migrate", - "db:migrate:production": "pnpm drizzle-kit:production migrate", - "db:push:test": "pnpm drizzle-kit:test push", + "db:push": "pnpm drizzle-kit push", + "db:test:push": "pnpm drizzle-kit:test push", + "db:production:push": "pnpm drizzle-kit:production push", "db:up": "dotenvx run -f .env.development .env.local -- docker compose up -d db", "db:down": "dotenvx run -f .env.development .env.local -- docker compose down db", "redis:up": "dotenvx run -f .env.development .env.local -- docker compose up -d redis", diff --git a/packages/evals/src/db/migrations/0001_add_timeout_to_runs.sql b/packages/evals/src/db/migrations/0001_add_timeout_to_runs.sql new file mode 100644 index 0000000000..16d3cc1bdd --- /dev/null +++ b/packages/evals/src/db/migrations/0001_add_timeout_to_runs.sql @@ -0,0 +1 @@ +ALTER TABLE "runs" ADD COLUMN "timeout" integer DEFAULT 5 NOT NULL; \ No newline at end of file From 836371c36a629a3279a75960f5b35f906311897c Mon Sep 17 00:00:00 2001 From: Will Li Date: Thu, 31 Jul 2025 19:00:32 -0700 Subject: [PATCH 036/253] fix: linter not applied to locales/*/README.md (#6477) fix --- .github/workflows/update-contributors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index d04f7b86d8..c3c9327607 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -24,7 +24,7 @@ jobs: - name: Update contributors and format run: | pnpm update-contributors - npx prettier --write README.md + npx prettier --write README.md locales/*/README.md if git diff --quiet; then echo "changes=false" >> $GITHUB_OUTPUT; else echo "changes=true" >> $GITHUB_OUTPUT; fi id: check-changes env: From 305a5da36917ea958a548c4767bb167d47a06750 Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Fri, 1 Aug 2025 07:49:42 -0400 Subject: [PATCH 037/253] Clean up the auto-approve UI (#6538) * Clean up the auto-approve UI * Update webview-ui/src/components/settings/AutoApproveSettings.tsx Co-authored-by: roomote[bot] <219738659+roomote[bot]@users.noreply.github.com> * Fix * Translations --------- Co-authored-by: roomote[bot] <219738659+roomote[bot]@users.noreply.github.com> --- .../src/components/chat/AutoApproveMenu.tsx | 12 -- .../settings/AutoApproveSettings.tsx | 103 ++++++++++-------- .../components/settings/AutoApproveToggle.tsx | 19 ++-- .../src/components/settings/MaxCostInput.tsx | 30 +++-- .../components/settings/MaxLimitInputs.tsx | 2 +- .../components/settings/MaxRequestsInput.tsx | 28 +++-- webview-ui/src/i18n/locales/ca/settings.json | 1 + webview-ui/src/i18n/locales/de/settings.json | 1 + webview-ui/src/i18n/locales/en/settings.json | 1 + webview-ui/src/i18n/locales/es/settings.json | 1 + webview-ui/src/i18n/locales/fr/settings.json | 1 + webview-ui/src/i18n/locales/hi/settings.json | 1 + webview-ui/src/i18n/locales/id/settings.json | 1 + webview-ui/src/i18n/locales/it/settings.json | 1 + webview-ui/src/i18n/locales/ja/settings.json | 1 + webview-ui/src/i18n/locales/ko/settings.json | 1 + webview-ui/src/i18n/locales/nl/settings.json | 1 + webview-ui/src/i18n/locales/pl/settings.json | 1 + .../src/i18n/locales/pt-BR/settings.json | 1 + webview-ui/src/i18n/locales/ru/settings.json | 1 + webview-ui/src/i18n/locales/tr/settings.json | 1 + webview-ui/src/i18n/locales/vi/settings.json | 1 + .../src/i18n/locales/zh-CN/settings.json | 1 + .../src/i18n/locales/zh-TW/settings.json | 1 + 24 files changed, 110 insertions(+), 102 deletions(-) diff --git a/webview-ui/src/components/chat/AutoApproveMenu.tsx b/webview-ui/src/components/chat/AutoApproveMenu.tsx index c97af13593..e6accfd87d 100644 --- a/webview-ui/src/components/chat/AutoApproveMenu.tsx +++ b/webview-ui/src/components/chat/AutoApproveMenu.tsx @@ -6,7 +6,6 @@ import { vscode } from "@src/utils/vscode" import { useExtensionState } from "@src/context/ExtensionStateContext" import { useAppTranslation } from "@src/i18n/TranslationContext" import { AutoApproveToggle, AutoApproveSetting, autoApproveSettingsConfig } from "../settings/AutoApproveToggle" -import { MaxLimitInputs } from "../settings/MaxLimitInputs" import { StandardTooltip } from "@src/components/ui" import { useAutoApprovalState } from "@src/hooks/useAutoApprovalState" import { useAutoApprovalToggles } from "@src/hooks/useAutoApprovalToggles" @@ -22,8 +21,6 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => { autoApprovalEnabled, setAutoApprovalEnabled, alwaysApproveResubmit, - allowedMaxRequests, - allowedMaxCost, setAlwaysAllowReadOnly, setAlwaysAllowWrite, setAlwaysAllowExecute, @@ -34,8 +31,6 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => { setAlwaysApproveResubmit, setAlwaysAllowFollowupQuestions, setAlwaysAllowUpdateTodoList, - setAllowedMaxRequests, - setAllowedMaxCost, } = useExtensionState() const { t } = useAppTranslation() @@ -245,13 +240,6 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => {
    - - setAllowedMaxRequests(value)} - onMaxCostChange={(value) => setAllowedMaxCost(value)} - />
    )}
    diff --git a/webview-ui/src/components/settings/AutoApproveSettings.tsx b/webview-ui/src/components/settings/AutoApproveSettings.tsx index 95c311422a..5ce44c747d 100644 --- a/webview-ui/src/components/settings/AutoApproveSettings.tsx +++ b/webview-ui/src/components/settings/AutoApproveSettings.tsx @@ -1,5 +1,5 @@ import { HTMLAttributes, useState } from "react" -import { X } from "lucide-react" +import { X, CheckCheck } from "lucide-react" import { useAppTranslation } from "@/i18n/TranslationContext" import { VSCodeCheckbox } from "@vscode/webview-ui-toolkit/react" @@ -114,57 +114,68 @@ export const AutoApproveSettings = ({ return (
    - +
    - {!hasEnabledOptions ? ( - - { - // Do nothing when no options are enabled - return - }} - /> - - ) : ( - { - const newValue = !(autoApprovalEnabled ?? false) - setAutoApprovalEnabled(newValue) - vscode.postMessage({ type: "autoApprovalEnabled", bool: newValue }) - }} - /> - )} - +
    {t("settings:sections.autoApprove")}
    - setCachedStateField(key, value)} - /> - setCachedStateField("allowedMaxRequests", value)} - onMaxCostChange={(value) => setCachedStateField("allowedMaxCost", value)} - /> +
    +
    + {!hasEnabledOptions ? ( + + { + // Do nothing when no options are enabled + return + }}> + {t("settings:autoApprove.enabled")} + + + ) : ( + { + const newValue = !(autoApprovalEnabled ?? false) + setAutoApprovalEnabled(newValue) + vscode.postMessage({ type: "autoApprovalEnabled", bool: newValue }) + }}> + {t("settings:autoApprove.enabled")} + + )} +
    + {t("settings:autoApprove.description")} +
    +
    + + setCachedStateField(key, value)} + /> + + setCachedStateField("allowedMaxRequests", value)} + onMaxCostChange={(value) => setCachedStateField("allowedMaxCost", value)} + /> +
    {/* ADDITIONAL SETTINGS */} diff --git a/webview-ui/src/components/settings/AutoApproveToggle.tsx b/webview-ui/src/components/settings/AutoApproveToggle.tsx index e8b51b01ef..e6540f3d89 100644 --- a/webview-ui/src/components/settings/AutoApproveToggle.tsx +++ b/webview-ui/src/components/settings/AutoApproveToggle.tsx @@ -109,13 +109,7 @@ export const AutoApproveToggle = ({ onToggle, ...props }: AutoApproveToggleProps const { t } = useAppTranslation() return ( -
    +
    {Object.values(autoApproveSettingsConfig).map(({ key, descriptionKey, labelKey, icon, testId }) => ( ))} diff --git a/webview-ui/src/components/settings/MaxCostInput.tsx b/webview-ui/src/components/settings/MaxCostInput.tsx index 369d1bfe35..944b987d27 100644 --- a/webview-ui/src/components/settings/MaxCostInput.tsx +++ b/webview-ui/src/components/settings/MaxCostInput.tsx @@ -20,22 +20,20 @@ export function MaxCostInput({ allowedMaxCost, onValueChange }: MaxCostInputProp ) return ( -
    -
    + <> +
    -
    - $]} - /> -
    -
    + {t("settings:autoApprove.apiCostLimit.title")}: + + $]} + /> + ) } diff --git a/webview-ui/src/components/settings/MaxLimitInputs.tsx b/webview-ui/src/components/settings/MaxLimitInputs.tsx index 0508843180..c09d886eb3 100644 --- a/webview-ui/src/components/settings/MaxLimitInputs.tsx +++ b/webview-ui/src/components/settings/MaxLimitInputs.tsx @@ -20,7 +20,7 @@ export const MaxLimitInputs: React.FC = ({ return (
    -
    +
    diff --git a/webview-ui/src/components/settings/MaxRequestsInput.tsx b/webview-ui/src/components/settings/MaxRequestsInput.tsx index d0609f4e8e..ba9497cd2d 100644 --- a/webview-ui/src/components/settings/MaxRequestsInput.tsx +++ b/webview-ui/src/components/settings/MaxRequestsInput.tsx @@ -20,21 +20,19 @@ export function MaxRequestsInput({ allowedMaxRequests, onValueChange }: MaxReque ) return ( -
    -
    + <> +
    -
    - -
    -
    + {t("settings:autoApprove.apiRequestLimit.title")}: + + + ) } diff --git a/webview-ui/src/i18n/locales/ca/settings.json b/webview-ui/src/i18n/locales/ca/settings.json index 82c8f40516..9ab98a8980 100644 --- a/webview-ui/src/i18n/locales/ca/settings.json +++ b/webview-ui/src/i18n/locales/ca/settings.json @@ -127,6 +127,7 @@ }, "autoApprove": { "description": "Permet que Roo realitzi operacions automàticament sense requerir aprovació. Activeu aquesta configuració només si confieu plenament en la IA i enteneu els riscos de seguretat associats.", + "enabled": "Auto-aprovació activada", "toggleAriaLabel": "Commuta l'aprovació automàtica", "disabledAriaLabel": "Aprovació automàtica desactivada: seleccioneu primer les opcions", "readOnly": { diff --git a/webview-ui/src/i18n/locales/de/settings.json b/webview-ui/src/i18n/locales/de/settings.json index df61c3142e..667b313468 100644 --- a/webview-ui/src/i18n/locales/de/settings.json +++ b/webview-ui/src/i18n/locales/de/settings.json @@ -127,6 +127,7 @@ }, "autoApprove": { "description": "Erlaubt Roo, Operationen automatisch ohne Genehmigung durchzuführen. Aktiviere diese Einstellungen nur, wenn du der KI vollständig vertraust und die damit verbundenen Sicherheitsrisiken verstehst.", + "enabled": "Auto-Genehmigung aktiviert", "toggleAriaLabel": "Automatische Genehmigung umschalten", "disabledAriaLabel": "Automatische Genehmigung deaktiviert - zuerst Optionen auswählen", "readOnly": { diff --git a/webview-ui/src/i18n/locales/en/settings.json b/webview-ui/src/i18n/locales/en/settings.json index 11c575bdf3..46c15556c8 100644 --- a/webview-ui/src/i18n/locales/en/settings.json +++ b/webview-ui/src/i18n/locales/en/settings.json @@ -127,6 +127,7 @@ }, "autoApprove": { "description": "Allow Roo to automatically perform operations without requiring approval. Enable these settings only if you fully trust the AI and understand the associated security risks.", + "enabled": "Auto-Approve Enabled", "readOnly": { "label": "Read", "description": "When enabled, Roo will automatically view directory contents and read files without requiring you to click the Approve button.", diff --git a/webview-ui/src/i18n/locales/es/settings.json b/webview-ui/src/i18n/locales/es/settings.json index 3afeb091ef..0f41e6ddda 100644 --- a/webview-ui/src/i18n/locales/es/settings.json +++ b/webview-ui/src/i18n/locales/es/settings.json @@ -127,6 +127,7 @@ }, "autoApprove": { "description": "Permitir que Roo realice operaciones automáticamente sin requerir aprobación. Habilite esta configuración solo si confía plenamente en la IA y comprende los riesgos de seguridad asociados.", + "enabled": "Auto-aprobación habilitada", "toggleAriaLabel": "Alternar aprobación automática", "disabledAriaLabel": "Aprobación automática desactivada: seleccione primero las opciones", "readOnly": { diff --git a/webview-ui/src/i18n/locales/fr/settings.json b/webview-ui/src/i18n/locales/fr/settings.json index 5b1c0431fe..5af186e6b1 100644 --- a/webview-ui/src/i18n/locales/fr/settings.json +++ b/webview-ui/src/i18n/locales/fr/settings.json @@ -127,6 +127,7 @@ }, "autoApprove": { "description": "Permettre à Roo d'effectuer automatiquement des opérations sans requérir d'approbation. Activez ces paramètres uniquement si vous faites entièrement confiance à l'IA et que vous comprenez les risques de sécurité associés.", + "enabled": "Auto-approbation activée", "toggleAriaLabel": "Activer/désactiver l'approbation automatique", "disabledAriaLabel": "Approbation automatique désactivée - sélectionnez d'abord les options", "selectOptionsFirst": "Sélectionnez au moins une option ci-dessous pour activer l'approbation automatique", diff --git a/webview-ui/src/i18n/locales/hi/settings.json b/webview-ui/src/i18n/locales/hi/settings.json index 0c7ab3a0bc..e3743a531e 100644 --- a/webview-ui/src/i18n/locales/hi/settings.json +++ b/webview-ui/src/i18n/locales/hi/settings.json @@ -127,6 +127,7 @@ }, "autoApprove": { "description": "Roo को अनुमोदन की आवश्यकता के बिना स्वचालित रूप से ऑपरेशन करने की अनुमति दें। इन सेटिंग्स को केवल तभी सक्षम करें जब आप AI पर पूरी तरह से भरोसा करते हों और संबंधित सुरक्षा जोखिमों को समझते हों।", + "enabled": "स्वत:-अनुमोदन सक्षम", "toggleAriaLabel": "स्वतः-अनुमोदन टॉगल करें", "disabledAriaLabel": "स्वतः-अनुमोदन अक्षम - पहले विकल्प चुनें", "readOnly": { diff --git a/webview-ui/src/i18n/locales/id/settings.json b/webview-ui/src/i18n/locales/id/settings.json index fc1b1915ab..0f47712f21 100644 --- a/webview-ui/src/i18n/locales/id/settings.json +++ b/webview-ui/src/i18n/locales/id/settings.json @@ -127,6 +127,7 @@ }, "autoApprove": { "description": "Izinkan Roo untuk secara otomatis melakukan operasi tanpa memerlukan persetujuan. Aktifkan pengaturan ini hanya jika kamu sepenuhnya mempercayai AI dan memahami risiko keamanan yang terkait.", + "enabled": "Auto-Approve Diaktifkan", "toggleAriaLabel": "Beralih persetujuan otomatis", "disabledAriaLabel": "Persetujuan otomatis dinonaktifkan - pilih opsi terlebih dahulu", "readOnly": { diff --git a/webview-ui/src/i18n/locales/it/settings.json b/webview-ui/src/i18n/locales/it/settings.json index 3b82f073b3..e5bc317eff 100644 --- a/webview-ui/src/i18n/locales/it/settings.json +++ b/webview-ui/src/i18n/locales/it/settings.json @@ -127,6 +127,7 @@ }, "autoApprove": { "description": "Permetti a Roo di eseguire automaticamente operazioni senza richiedere approvazione. Abilita queste impostazioni solo se ti fidi completamente dell'IA e comprendi i rischi di sicurezza associati.", + "enabled": "Auto-approvazione abilitata", "toggleAriaLabel": "Attiva/disattiva approvazione automatica", "disabledAriaLabel": "Approvazione automatica disabilitata - seleziona prima le opzioni", "readOnly": { diff --git a/webview-ui/src/i18n/locales/ja/settings.json b/webview-ui/src/i18n/locales/ja/settings.json index 321b269a8a..ab4cda177a 100644 --- a/webview-ui/src/i18n/locales/ja/settings.json +++ b/webview-ui/src/i18n/locales/ja/settings.json @@ -127,6 +127,7 @@ }, "autoApprove": { "description": "Rooが承認なしで自動的に操作を実行できるようにします。AIを完全に信頼し、関連するセキュリティリスクを理解している場合にのみ、これらの設定を有効にしてください。", + "enabled": "自動承認が有効", "toggleAriaLabel": "自動承認の切り替え", "disabledAriaLabel": "自動承認が無効です - 最初にオプションを選択してください", "readOnly": { diff --git a/webview-ui/src/i18n/locales/ko/settings.json b/webview-ui/src/i18n/locales/ko/settings.json index d286ac71a2..adad29a152 100644 --- a/webview-ui/src/i18n/locales/ko/settings.json +++ b/webview-ui/src/i18n/locales/ko/settings.json @@ -127,6 +127,7 @@ }, "autoApprove": { "description": "Roo가 승인 없이 자동으로 작업을 수행할 수 있도록 허용합니다. AI를 완전히 신뢰하고 관련 보안 위험을 이해하는 경우에만 이러한 설정을 활성화하세요.", + "enabled": "자동 승인 활성화됨", "toggleAriaLabel": "자동 승인 전환", "disabledAriaLabel": "자동 승인 비활성화됨 - 먼저 옵션을 선택하세요", "readOnly": { diff --git a/webview-ui/src/i18n/locales/nl/settings.json b/webview-ui/src/i18n/locales/nl/settings.json index e8c1db5ace..e635c8d2c8 100644 --- a/webview-ui/src/i18n/locales/nl/settings.json +++ b/webview-ui/src/i18n/locales/nl/settings.json @@ -127,6 +127,7 @@ }, "autoApprove": { "description": "Sta Roo toe om automatisch handelingen uit te voeren zonder goedkeuring. Schakel deze instellingen alleen in als je de AI volledig vertrouwt en de bijbehorende beveiligingsrisico's begrijpt.", + "enabled": "Auto-goedkeuren ingeschakeld", "toggleAriaLabel": "Automatisch goedkeuren in-/uitschakelen", "disabledAriaLabel": "Automatisch goedkeuren uitgeschakeld - selecteer eerst opties", "readOnly": { diff --git a/webview-ui/src/i18n/locales/pl/settings.json b/webview-ui/src/i18n/locales/pl/settings.json index ab208ffe14..d176693143 100644 --- a/webview-ui/src/i18n/locales/pl/settings.json +++ b/webview-ui/src/i18n/locales/pl/settings.json @@ -127,6 +127,7 @@ }, "autoApprove": { "description": "Pozwól Roo na automatyczne wykonywanie operacji bez wymagania zatwierdzenia. Włącz te ustawienia tylko jeśli w pełni ufasz AI i rozumiesz związane z tym zagrożenia bezpieczeństwa.", + "enabled": "Auto-zatwierdzanie włączone", "toggleAriaLabel": "Przełącz automatyczne zatwierdzanie", "disabledAriaLabel": "Automatyczne zatwierdzanie wyłączone - najpierw wybierz opcje", "readOnly": { diff --git a/webview-ui/src/i18n/locales/pt-BR/settings.json b/webview-ui/src/i18n/locales/pt-BR/settings.json index 6bcfbb564c..a646229164 100644 --- a/webview-ui/src/i18n/locales/pt-BR/settings.json +++ b/webview-ui/src/i18n/locales/pt-BR/settings.json @@ -127,6 +127,7 @@ }, "autoApprove": { "description": "Permitir que o Roo realize operações automaticamente sem exigir aprovação. Ative essas configurações apenas se confiar totalmente na IA e compreender os riscos de segurança associados.", + "enabled": "Aprovação automática habilitada", "toggleAriaLabel": "Alternar aprovação automática", "disabledAriaLabel": "Aprovação automática desativada - selecione as opções primeiro", "readOnly": { diff --git a/webview-ui/src/i18n/locales/ru/settings.json b/webview-ui/src/i18n/locales/ru/settings.json index 8d52241d6c..7476f0cb0a 100644 --- a/webview-ui/src/i18n/locales/ru/settings.json +++ b/webview-ui/src/i18n/locales/ru/settings.json @@ -127,6 +127,7 @@ }, "autoApprove": { "description": "Разрешить Roo автоматически выполнять операции без необходимости одобрения. Включайте эти параметры только если полностью доверяете ИИ и понимаете связанные с этим риски безопасности.", + "enabled": "Автоодобрение включено", "toggleAriaLabel": "Переключить автоодобрение", "disabledAriaLabel": "Автоодобрение отключено - сначала выберите опции", "readOnly": { diff --git a/webview-ui/src/i18n/locales/tr/settings.json b/webview-ui/src/i18n/locales/tr/settings.json index 486dad0540..07e8dac1d6 100644 --- a/webview-ui/src/i18n/locales/tr/settings.json +++ b/webview-ui/src/i18n/locales/tr/settings.json @@ -127,6 +127,7 @@ }, "autoApprove": { "description": "Roo'nun onay gerektirmeden otomatik olarak işlemler gerçekleştirmesine izin verin. Bu ayarları yalnızca yapay zekaya tamamen güveniyorsanız ve ilgili güvenlik risklerini anlıyorsanız etkinleştirin.", + "enabled": "Oto-onay etkinleştirildi", "toggleAriaLabel": "Otomatik onayı değiştir", "disabledAriaLabel": "Otomatik onay devre dışı - önce seçenekleri belirleyin", "readOnly": { diff --git a/webview-ui/src/i18n/locales/vi/settings.json b/webview-ui/src/i18n/locales/vi/settings.json index dbe0e73736..e1b91860b8 100644 --- a/webview-ui/src/i18n/locales/vi/settings.json +++ b/webview-ui/src/i18n/locales/vi/settings.json @@ -127,6 +127,7 @@ }, "autoApprove": { "description": "Cho phép Roo tự động thực hiện các hoạt động mà không cần phê duyệt. Chỉ bật những cài đặt này nếu bạn hoàn toàn tin tưởng AI và hiểu rõ các rủi ro bảo mật liên quan.", + "enabled": "Phê duyệt tự động đã bật", "toggleAriaLabel": "Chuyển đổi tự động phê duyệt", "disabledAriaLabel": "Tự động phê duyệt bị vô hiệu hóa - hãy chọn các tùy chọn trước", "readOnly": { diff --git a/webview-ui/src/i18n/locales/zh-CN/settings.json b/webview-ui/src/i18n/locales/zh-CN/settings.json index 32e5c96d02..2b390f349c 100644 --- a/webview-ui/src/i18n/locales/zh-CN/settings.json +++ b/webview-ui/src/i18n/locales/zh-CN/settings.json @@ -127,6 +127,7 @@ }, "autoApprove": { "description": "允许 Roo 自动执行操作而无需批准。只有在您完全信任 AI 并了解相关安全风险的情况下才启用这些设置。", + "enabled": "自动批准已启用", "toggleAriaLabel": "切换自动批准", "disabledAriaLabel": "自动批准已禁用 - 请先选择选项", "readOnly": { diff --git a/webview-ui/src/i18n/locales/zh-TW/settings.json b/webview-ui/src/i18n/locales/zh-TW/settings.json index b8e09bc373..b1ec67b8db 100644 --- a/webview-ui/src/i18n/locales/zh-TW/settings.json +++ b/webview-ui/src/i18n/locales/zh-TW/settings.json @@ -127,6 +127,7 @@ }, "autoApprove": { "description": "允許 Roo 無需核准即執行操作。僅在您完全信任 AI 並了解相關安全風險時啟用這些設定。", + "enabled": "自動核准已啟用", "toggleAriaLabel": "切換自動核准", "disabledAriaLabel": "自動核准已停用 - 請先選取選項", "readOnly": { From ebfd384ac4446cefb06c78c63b51b11816f20f99 Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Fri, 1 Aug 2025 11:58:57 -0400 Subject: [PATCH 038/253] More tolerant search/replace match (#6537) Co-authored-by: Roo Code --- .../__tests__/multi-search-replace.spec.ts | 45 +++++++++++++++++++ .../strategies/multi-file-search-replace.ts | 17 ++++--- .../diff/strategies/multi-search-replace.ts | 15 ++++--- 3 files changed, 64 insertions(+), 13 deletions(-) diff --git a/src/core/diff/strategies/__tests__/multi-search-replace.spec.ts b/src/core/diff/strategies/__tests__/multi-search-replace.spec.ts index 23900fc142..b25286f5fa 100644 --- a/src/core/diff/strategies/__tests__/multi-search-replace.spec.ts +++ b/src/core/diff/strategies/__tests__/multi-search-replace.spec.ts @@ -13,6 +13,51 @@ describe("MultiSearchReplaceDiffStrategy", () => { expect(strategy["validateMarkerSequencing"](diff).success).toBe(true) }) + it("validates correct marker sequence with extra > in SEARCH", () => { + const diff = "<<<<<<< SEARCH>\n" + "some content\n" + "=======\n" + "new content\n" + ">>>>>>> REPLACE" + expect(strategy["validateMarkerSequencing"](diff).success).toBe(true) + }) + + it("validates correct marker sequence with multiple > in SEARCH", () => { + const diff = "<<<<<<< SEARCH>>\n" + "some content\n" + "=======\n" + "new content\n" + ">>>>>>> REPLACE" + expect(strategy["validateMarkerSequencing"](diff).success).toBe(false) + }) + + it("validates mixed cases with and without extra > in the same diff", () => { + const diff = + "<<<<<<< SEARCH>\n" + + "content1\n" + + "=======\n" + + "new1\n" + + ">>>>>>> REPLACE\n\n" + + "<<<<<<< SEARCH\n" + + "content2\n" + + "=======\n" + + "new2\n" + + ">>>>>>> REPLACE" + expect(strategy["validateMarkerSequencing"](diff).success).toBe(true) + }) + + it("validates extra > with whitespace variations", () => { + const diff1 = "<<<<<<< SEARCH> \n" + "some content\n" + "=======\n" + "new content\n" + ">>>>>>> REPLACE" + expect(strategy["validateMarkerSequencing"](diff1).success).toBe(true) + + const diff2 = "<<<<<<< SEARCH >\n" + "some content\n" + "=======\n" + "new content\n" + ">>>>>>> REPLACE" + expect(strategy["validateMarkerSequencing"](diff2).success).toBe(false) + }) + + it("validates extra > with line numbers", () => { + const diff = + "<<<<<<< SEARCH>\n" + + ":start_line:10\n" + + "-------\n" + + "content1\n" + + "=======\n" + + "new1\n" + + ">>>>>>> REPLACE" + expect(strategy["validateMarkerSequencing"](diff).success).toBe(true) + }) + it("validates multiple correct marker sequences", () => { const diff = "<<<<<<< SEARCH\n" + diff --git a/src/core/diff/strategies/multi-file-search-replace.ts b/src/core/diff/strategies/multi-file-search-replace.ts index 5ec223477c..c71d3c3807 100644 --- a/src/core/diff/strategies/multi-file-search-replace.ts +++ b/src/core/diff/strategies/multi-file-search-replace.ts @@ -259,7 +259,10 @@ Each file requires its own path, start_line, and diff elements. const state = { current: State.START, line: 0 } - const SEARCH = "<<<<<<< SEARCH" + // Pattern allows optional '>' after SEARCH to handle AI-generated diffs + // (e.g., Sonnet 4 sometimes adds an extra '>') + const SEARCH_PATTERN = /^<<<<<<< SEARCH>?$/ + const SEARCH = SEARCH_PATTERN.source.replace(/[\^$]/g, "") // Remove regex anchors for display const SEP = "=======" const REPLACE = ">>>>>>> REPLACE" const SEARCH_PREFIX = "<<<<<<< " @@ -329,7 +332,7 @@ Each file requires its own path, start_line, and diff elements. }) const lines = diffContent.split("\n") - const searchCount = lines.filter((l) => l.trim() === SEARCH).length + const searchCount = lines.filter((l) => SEARCH_PATTERN.test(l.trim())).length const sepCount = lines.filter((l) => l.trim() === SEP).length const replaceCount = lines.filter((l) => l.trim() === REPLACE).length @@ -357,12 +360,12 @@ Each file requires its own path, start_line, and diff elements. : reportMergeConflictError(SEP, SEARCH) if (marker === REPLACE) return reportInvalidDiffError(REPLACE, SEARCH) if (marker.startsWith(REPLACE_PREFIX)) return reportMergeConflictError(marker, SEARCH) - if (marker === SEARCH) state.current = State.AFTER_SEARCH + if (SEARCH_PATTERN.test(marker)) state.current = State.AFTER_SEARCH else if (marker.startsWith(SEARCH_PREFIX)) return reportMergeConflictError(marker, SEARCH) break case State.AFTER_SEARCH: - if (marker === SEARCH) return reportInvalidDiffError(SEARCH, SEP) + if (SEARCH_PATTERN.test(marker)) return reportInvalidDiffError(SEARCH_PATTERN.source, SEP) if (marker.startsWith(SEARCH_PREFIX)) return reportMergeConflictError(marker, SEARCH) if (marker === REPLACE) return reportInvalidDiffError(REPLACE, SEP) if (marker.startsWith(REPLACE_PREFIX)) return reportMergeConflictError(marker, SEARCH) @@ -370,7 +373,7 @@ Each file requires its own path, start_line, and diff elements. break case State.AFTER_SEPARATOR: - if (marker === SEARCH) return reportInvalidDiffError(SEARCH, REPLACE) + if (SEARCH_PATTERN.test(marker)) return reportInvalidDiffError(SEARCH_PATTERN.source, REPLACE) if (marker.startsWith(SEARCH_PREFIX)) return reportMergeConflictError(marker, REPLACE) if (marker === SEP) return likelyBadStructure @@ -456,7 +459,7 @@ Each file requires its own path, start_line, and diff elements. /* Regex parts: 1. (?:^|\n) Ensures the first marker starts at the beginning of the file or right after a newline. - 2. (??\s*\n Matches the line "<<<<<<< SEARCH" with optional '>' (ignoring any trailing spaces) – the negative lookbehind makes sure it isn't escaped. 3. ((?:\:start_line:\s*(\d+)\s*\n))? Optionally matches a ":start_line:" line. The outer capturing group is group 1 and the inner (\d+) is group 2. 4. ((?:\:end_line:\s*(\d+)\s*\n))? Optionally matches a ":end_line:" line. Group 3 is the whole match and group 4 is the digits. 5. ((?>>>>>> REPLACE)(?=\n|$)/g, + /(?:^|\n)(??\s*\n((?:\:start_line:\s*(\d+)\s*\n))?((?:\:end_line:\s*(\d+)\s*\n))?((?>>>>>> REPLACE)(?=\n|$)/g, ), ] diff --git a/src/core/diff/strategies/multi-search-replace.ts b/src/core/diff/strategies/multi-search-replace.ts index d4c14b169f..a6a9913203 100644 --- a/src/core/diff/strategies/multi-search-replace.ts +++ b/src/core/diff/strategies/multi-search-replace.ts @@ -198,7 +198,10 @@ Only use a single line of '=======' between search and replacement content, beca } const state = { current: State.START, line: 0 } - const SEARCH = "<<<<<<< SEARCH" + // Pattern allows optional '>' after SEARCH to handle AI-generated diffs + // (e.g., Sonnet 4 sometimes adds an extra '>') + const SEARCH_PATTERN = /^<<<<<<< SEARCH>?$/ + const SEARCH = SEARCH_PATTERN.source.replace(/[\^$]/g, "") // Remove regex anchors for display const SEP = "=======" const REPLACE = ">>>>>>> REPLACE" const SEARCH_PREFIX = "<<<<<<<" @@ -268,7 +271,7 @@ Only use a single line of '=======' between search and replacement content, beca }) const lines = diffContent.split("\n") - const searchCount = lines.filter((l) => l.trim() === SEARCH).length + const searchCount = lines.filter((l) => SEARCH_PATTERN.test(l.trim())).length const sepCount = lines.filter((l) => l.trim() === SEP).length const replaceCount = lines.filter((l) => l.trim() === REPLACE).length @@ -296,12 +299,12 @@ Only use a single line of '=======' between search and replacement content, beca : reportMergeConflictError(SEP, SEARCH) if (marker === REPLACE) return reportInvalidDiffError(REPLACE, SEARCH) if (marker.startsWith(REPLACE_PREFIX)) return reportMergeConflictError(marker, SEARCH) - if (marker === SEARCH) state.current = State.AFTER_SEARCH + if (SEARCH_PATTERN.test(marker)) state.current = State.AFTER_SEARCH else if (marker.startsWith(SEARCH_PREFIX)) return reportMergeConflictError(marker, SEARCH) break case State.AFTER_SEARCH: - if (marker === SEARCH) return reportInvalidDiffError(SEARCH, SEP) + if (SEARCH_PATTERN.test(marker)) return reportInvalidDiffError(SEARCH_PATTERN.source, SEP) if (marker.startsWith(SEARCH_PREFIX)) return reportMergeConflictError(marker, SEARCH) if (marker === REPLACE) return reportInvalidDiffError(REPLACE, SEP) if (marker.startsWith(REPLACE_PREFIX)) return reportMergeConflictError(marker, SEARCH) @@ -309,7 +312,7 @@ Only use a single line of '=======' between search and replacement content, beca break case State.AFTER_SEPARATOR: - if (marker === SEARCH) return reportInvalidDiffError(SEARCH, REPLACE) + if (SEARCH_PATTERN.test(marker)) return reportInvalidDiffError(SEARCH_PATTERN.source, REPLACE) if (marker.startsWith(SEARCH_PREFIX)) return reportMergeConflictError(marker, REPLACE) if (marker === SEP) return likelyBadStructure @@ -378,7 +381,7 @@ Only use a single line of '=======' between search and replacement content, beca let matches = [ ...diffContent.matchAll( - /(?:^|\n)(?>>>>>> REPLACE)(?=\n|$)/g, + /(?:^|\n)(??\s*\n((?:\:start_line:\s*(\d+)\s*\n))?((?:\:end_line:\s*(\d+)\s*\n))?((?>>>>>> REPLACE)(?=\n|$)/g, ), ] From 7cbb37df74a70adb32832c8c210f6c5a4f2a8b24 Mon Sep 17 00:00:00 2001 From: Daniel <57051444+daniel-lxs@users.noreply.github.com> Date: Fri, 1 Aug 2025 13:55:45 -0500 Subject: [PATCH 039/253] fix: Fix VB.NET indexing by implementing fallback chunking system (#6552) --- .../processors/__tests__/parser.vb.spec.ts | 263 ++++++++++++++++++ src/services/code-index/processors/parser.ts | 7 +- .../code-index/shared/supported-extensions.ts | 29 ++ src/services/tree-sitter/index.ts | 2 + 4 files changed, 300 insertions(+), 1 deletion(-) create mode 100644 src/services/code-index/processors/__tests__/parser.vb.spec.ts diff --git a/src/services/code-index/processors/__tests__/parser.vb.spec.ts b/src/services/code-index/processors/__tests__/parser.vb.spec.ts new file mode 100644 index 0000000000..3448ed6737 --- /dev/null +++ b/src/services/code-index/processors/__tests__/parser.vb.spec.ts @@ -0,0 +1,263 @@ +import { describe, it, expect, beforeEach, vi } from "vitest" +import { CodeParser } from "../parser" +import * as path from "path" + +// Mock TelemetryService +vi.mock("../../../../../packages/telemetry/src/TelemetryService", () => ({ + TelemetryService: { + instance: { + captureEvent: vi.fn(), + }, + }, +})) + +import { shouldUseFallbackChunking } from "../../shared/supported-extensions" + +describe("CodeParser - VB.NET and Fallback Extensions Support", () => { + let parser: CodeParser + + beforeEach(() => { + parser = new CodeParser() + }) + + it("should use fallback chunking for VB.NET files", async () => { + // First verify that shouldUseFallbackChunking works + expect(shouldUseFallbackChunking(".vb")).toBe(true) + + const vbContent = ` +Imports System +Imports System.Collections.Generic +Imports System.Linq + +Namespace MyApplication + Public Class Calculator + Private _history As New List(Of String)() + + Public Function Add(a As Integer, b As Integer) As Integer + Dim result As Integer = a + b + _history.Add($"{a} + {b} = {result}") + Return result + End Function + + Public Function Subtract(a As Integer, b As Integer) As Integer + Dim result As Integer = a - b + _history.Add($"{a} - {b} = {result}") + Return result + End Function + + Public Function Multiply(a As Integer, b As Integer) As Integer + Dim result As Integer = a * b + _history.Add($"{a} * {b} = {result}") + Return result + End Function + + Public Function Divide(a As Integer, b As Integer) As Double + If b = 0 Then + Throw New DivideByZeroException("Cannot divide by zero") + End If + Dim result As Double = CDbl(a) / CDbl(b) + _history.Add($"{a} / {b} = {result}") + Return result + End Function + + Public Function GetHistory() As List(Of String) + Return New List(Of String)(_history) + End Function + + Public Sub ClearHistory() + _history.Clear() + End Sub + End Class + + Public Module Program + Sub Main(args As String()) + Dim calc As New Calculator() + + Console.WriteLine("Calculator Demo") + Console.WriteLine("===============") + + Console.WriteLine($"10 + 5 = {calc.Add(10, 5)}") + Console.WriteLine($"10 - 5 = {calc.Subtract(10, 5)}") + Console.WriteLine($"10 * 5 = {calc.Multiply(10, 5)}") + Console.WriteLine($"10 / 5 = {calc.Divide(10, 5)}") + + Console.WriteLine() + Console.WriteLine("History:") + For Each entry In calc.GetHistory() + Console.WriteLine($" {entry}") + Next + End Sub + End Module +End Namespace +`.trim() + + const result = await parser.parseFile("test.vb", { + content: vbContent, + fileHash: "test-hash", + }) + + // Should have results from fallback chunking + expect(result.length).toBeGreaterThan(0) + + // Check that all blocks are of type 'fallback_chunk' + result.forEach((block) => { + expect(block.type).toBe("fallback_chunk") + }) + + // Verify content is properly chunked + const totalContent = result.map((block) => block.content).join("\n") + expect(totalContent).toBe(vbContent) + + // Verify file path is correct + expect(result[0].file_path).toBe("test.vb") + }) + + it("should handle large VB.NET files with proper chunking", async () => { + // Create a large VB.NET file content + const largeVbContent = + ` +Imports System +Imports System.Collections.Generic + +Namespace LargeApplication +` + + // Generate many classes to create a large file + Array.from( + { length: 50 }, + (_, i) => ` + Public Class TestClass${i} + Private _id As Integer = ${i} + Private _name As String = "Class ${i}" + Private _data As New Dictionary(Of String, Object)() + + Public Property Id As Integer + Get + Return _id + End Get + Set(value As Integer) + _id = value + End Set + End Property + + Public Property Name As String + Get + Return _name + End Get + Set(value As String) + _name = value + End Set + End Property + + Public Sub ProcessData() + For i As Integer = 0 To 100 + _data.Add($"key_{i}", $"value_{i}") + Next + End Sub + + Public Function GetData() As Dictionary(Of String, Object) + Return New Dictionary(Of String, Object)(_data) + End Function + End Class +`, + ).join("\n") + + ` +End Namespace +` + + const result = await parser.parseFile("large-test.vb", { + content: largeVbContent, + fileHash: "large-test-hash", + }) + + // Should have multiple chunks due to size + expect(result.length).toBeGreaterThan(1) + + // All chunks should be fallback chunks + result.forEach((block) => { + expect(block.type).toBe("fallback_chunk") + }) + + // Verify chunks don't exceed max size + result.forEach((block) => { + expect(block.content.length).toBeLessThanOrEqual(150000) // MAX_BLOCK_CHARS * MAX_CHARS_TOLERANCE_FACTOR + }) + }) + + it("should handle empty VB.NET files", async () => { + const emptyContent = "" + + const result = await parser.parseFile("empty.vb", { + content: emptyContent, + fileHash: "empty-hash", + }) + + // Should return empty array for empty content + expect(result).toEqual([]) + }) + + it("should handle small VB.NET files below minimum chunk size", async () => { + const smallContent = "Imports System" + + const result = await parser.parseFile("small.vb", { + content: smallContent, + fileHash: "small-hash", + }) + + // Should return empty array for content below MIN_BLOCK_CHARS + expect(result).toEqual([]) + }) + + it("should use fallback chunking for other configured fallback extensions", async () => { + // Test with Scala which is in our fallback list + const content = `object ScalaExample { + def main(args: Array[String]): Unit = { + println("This is a Scala file that should use fallback chunking") + val numbers = List(1, 2, 3, 4, 5) + val doubled = numbers.map(_ * 2) + println(s"Doubled numbers: $doubled") + } + + def factorial(n: Int): Int = { + if (n <= 1) 1 + else n * factorial(n - 1) + } + }` + + const result = await parser.parseFile("test.scala", { + content: content, + fileHash: "test-hash-scala", + }) + + // Should have results from fallback chunking + expect(result.length).toBeGreaterThan(0) + + // Check that all blocks are of type 'fallback_chunk' + result.forEach((block) => { + expect(block.type).toBe("fallback_chunk") + }) + }) +}) + +describe("Fallback Extensions Configuration", () => { + it("should correctly identify extensions that need fallback chunking", () => { + // Extensions that should use fallback + expect(shouldUseFallbackChunking(".vb")).toBe(true) + expect(shouldUseFallbackChunking(".scala")).toBe(true) + + // Extensions that should not use fallback (have working parsers) + expect(shouldUseFallbackChunking(".js")).toBe(false) + expect(shouldUseFallbackChunking(".ts")).toBe(false) + expect(shouldUseFallbackChunking(".py")).toBe(false) + expect(shouldUseFallbackChunking(".java")).toBe(false) + expect(shouldUseFallbackChunking(".cs")).toBe(false) + expect(shouldUseFallbackChunking(".go")).toBe(false) + expect(shouldUseFallbackChunking(".rs")).toBe(false) + }) + + it("should be case-insensitive", () => { + expect(shouldUseFallbackChunking(".VB")).toBe(true) + expect(shouldUseFallbackChunking(".Vb")).toBe(true) + expect(shouldUseFallbackChunking(".SCALA")).toBe(true) + expect(shouldUseFallbackChunking(".Scala")).toBe(true) + }) +}) diff --git a/src/services/code-index/processors/parser.ts b/src/services/code-index/processors/parser.ts index 96d747c4c9..8611884ade 100644 --- a/src/services/code-index/processors/parser.ts +++ b/src/services/code-index/processors/parser.ts @@ -5,7 +5,7 @@ import { Node } from "web-tree-sitter" import { LanguageParser, loadRequiredLanguageParsers } from "../../tree-sitter/languageParser" import { parseMarkdown } from "../../tree-sitter/markdownParser" import { ICodeParser, CodeBlock } from "../interfaces" -import { scannerExtensions } from "../shared/supported-extensions" +import { scannerExtensions, shouldUseFallbackChunking } from "../shared/supported-extensions" import { MAX_BLOCK_CHARS, MIN_BLOCK_CHARS, MIN_CHUNK_REMAINDER_CHARS, MAX_CHARS_TOLERANCE_FACTOR } from "../constants" import { TelemetryService } from "@roo-code/telemetry" import { TelemetryEventName } from "@roo-code/types" @@ -101,6 +101,11 @@ export class CodeParser implements ICodeParser { return this.parseMarkdownContent(filePath, content, fileHash, seenSegmentHashes) } + // Check if this extension should use fallback chunking + if (shouldUseFallbackChunking(`.${ext}`)) { + return this._performFallbackChunking(filePath, content, fileHash, seenSegmentHashes) + } + // Check if we already have the parser loaded if (!this.loadedParsers[ext]) { const pendingLoad = this.pendingLoads.get(ext) diff --git a/src/services/code-index/shared/supported-extensions.ts b/src/services/code-index/shared/supported-extensions.ts index a5205631a6..16afddf828 100644 --- a/src/services/code-index/shared/supported-extensions.ts +++ b/src/services/code-index/shared/supported-extensions.ts @@ -2,3 +2,32 @@ import { extensions as allExtensions } from "../../tree-sitter" // Include all extensions including markdown for the scanner export const scannerExtensions = allExtensions + +/** + * Extensions that should always use fallback chunking instead of tree-sitter parsing. + * These are typically languages that don't have a proper WASM parser available + * or where the parser doesn't work correctly. + * + * NOTE: Only extensions that are already in the supported extensions list can be added here. + * To add support for new file types, they must first be added to the tree-sitter extensions list. + * + * HOW TO ADD A NEW FALLBACK EXTENSION: + * 1. First ensure the extension is in src/services/tree-sitter/index.ts extensions array + * 2. Add the extension to the fallbackExtensions array below + * 3. The file will automatically use length-based chunking for indexing + * + * Note: Do NOT remove parser cases from languageParser.ts as they may be used elsewhere + */ +export const fallbackExtensions = [ + ".vb", // Visual Basic .NET - no dedicated WASM parser + ".scala", // Scala - uses fallback chunking instead of Lua query workaround +] + +/** + * Check if a file extension should use fallback chunking + * @param extension File extension (including the dot) + * @returns true if the extension should use fallback chunking + */ +export function shouldUseFallbackChunking(extension: string): boolean { + return fallbackExtensions.includes(extension.toLowerCase()) +} diff --git a/src/services/tree-sitter/index.ts b/src/services/tree-sitter/index.ts index c0813e6509..145ba84730 100644 --- a/src/services/tree-sitter/index.ts +++ b/src/services/tree-sitter/index.ts @@ -89,6 +89,8 @@ const extensions = [ // Embedded Template "ejs", "erb", + // Visual Basic .NET + "vb", ].map((e) => `.${e}`) export { extensions } From 88272e9b02487e2c8e895487cd6296319bb70667 Mon Sep 17 00:00:00 2001 From: Kevin Taylor Date: Sat, 2 Aug 2025 04:29:33 +0900 Subject: [PATCH 040/253] Add Qwen 3 Coder from Cerebras (#6562) Co-authored-by: Matt Rubens --- packages/types/src/providers/cerebras.ts | 48 ++++++++++++++------ src/api/providers/__tests__/cerebras.spec.ts | 2 +- src/api/providers/cerebras.ts | 15 ++++-- 3 files changed, 47 insertions(+), 18 deletions(-) diff --git a/packages/types/src/providers/cerebras.ts b/packages/types/src/providers/cerebras.ts index c5ad100123..2bec81562b 100644 --- a/packages/types/src/providers/cerebras.ts +++ b/packages/types/src/providers/cerebras.ts @@ -3,9 +3,38 @@ import type { ModelInfo } from "../model.js" // https://inference-docs.cerebras.ai/api-reference/chat-completions export type CerebrasModelId = keyof typeof cerebrasModels -export const cerebrasDefaultModelId: CerebrasModelId = "qwen-3-235b-a22b-instruct-2507" +export const cerebrasDefaultModelId: CerebrasModelId = "qwen-3-coder-480b-free" export const cerebrasModels = { + "qwen-3-coder-480b-free": { + maxTokens: 40000, + contextWindow: 64000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0, + outputPrice: 0, + description: + "SOTA coding model with ~2000 tokens/s ($0 free tier)\n\n• Use this if you don't have a Cerebras subscription\n• 64K context window\n• Rate limits: 150K TPM, 1M TPH/TPD, 10 RPM, 100 RPH/RPD\n\nUpgrade for higher limits: [https://cloud.cerebras.ai/?utm=roocode](https://cloud.cerebras.ai/?utm=roocode)", + }, + "qwen-3-coder-480b": { + maxTokens: 40000, + contextWindow: 128000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0, + outputPrice: 0, + description: + "SOTA coding model with ~2000 tokens/s ($50/$250 paid tiers)\n\n• Use this if you have a Cerebras subscription\n• 131K context window with higher rate limits", + }, + "qwen-3-235b-a22b-instruct-2507": { + maxTokens: 64000, + contextWindow: 64000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0, + outputPrice: 0, + description: "Intelligent model with ~1400 tokens/s", + }, "llama-3.3-70b": { maxTokens: 64000, contextWindow: 64000, @@ -13,7 +42,7 @@ export const cerebrasModels = { supportsPromptCache: false, inputPrice: 0, outputPrice: 0, - description: "Smart model with ~2600 tokens/s", + description: "Powerful model with ~2600 tokens/s", }, "qwen-3-32b": { maxTokens: 64000, @@ -24,23 +53,14 @@ export const cerebrasModels = { outputPrice: 0, description: "SOTA coding performance with ~2500 tokens/s", }, - "qwen-3-235b-a22b": { + "qwen-3-235b-a22b-thinking-2507": { maxTokens: 40000, - contextWindow: 40000, + contextWindow: 65000, supportsImages: false, supportsPromptCache: false, inputPrice: 0, outputPrice: 0, - description: "SOTA performance with ~1400 tokens/s", - }, - "qwen-3-235b-a22b-instruct-2507": { - maxTokens: 64000, - contextWindow: 64000, - supportsImages: false, - supportsPromptCache: false, - inputPrice: 0, - outputPrice: 0, - description: "SOTA performance with ~1400 tokens/s", + description: "SOTA performance with ~1500 tokens/s", supportsReasoningEffort: true, }, } as const satisfies Record diff --git a/src/api/providers/__tests__/cerebras.spec.ts b/src/api/providers/__tests__/cerebras.spec.ts index 1ab319ef26..2b7668435f 100644 --- a/src/api/providers/__tests__/cerebras.spec.ts +++ b/src/api/providers/__tests__/cerebras.spec.ts @@ -58,7 +58,7 @@ describe("CerebrasHandler", () => { it("should fallback to default model when apiModelId is not provided", () => { const handlerWithoutModel = new CerebrasHandler({ cerebrasApiKey: "test" }) const { id } = handlerWithoutModel.getModel() - expect(id).toBe("qwen-3-235b-a22b-instruct-2507") // cerebrasDefaultModelId + expect(id).toBe("qwen-3-coder-480b") // cerebrasDefaultModelId (routed) }) }) diff --git a/src/api/providers/cerebras.ts b/src/api/providers/cerebras.ts index 364477866b..a0421844e8 100644 --- a/src/api/providers/cerebras.ts +++ b/src/api/providers/cerebras.ts @@ -98,10 +98,19 @@ export class CerebrasHandler extends BaseProvider implements SingleCompletionHan } getModel(): { id: CerebrasModelId; info: (typeof cerebrasModels)[CerebrasModelId] } { - const modelId = (this.options.apiModelId as CerebrasModelId) || this.defaultProviderModelId + const originalModelId = (this.options.apiModelId as CerebrasModelId) || this.defaultProviderModelId + + // Route both qwen coder models to the same actual model ID for API calls + // This allows them to have different rate limits/descriptions in the UI + // while using the same underlying model + let apiModelId = originalModelId + if (originalModelId === "qwen-3-coder-480b-free") { + apiModelId = "qwen-3-coder-480b" + } + return { - id: modelId, - info: this.providerModels[modelId], + id: apiModelId, + info: this.providerModels[originalModelId], // Use original model info for rate limits/descriptions } } From b9cd1e1b2c8713582ab0f4f5767e73ea07fd3b29 Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Fri, 1 Aug 2025 15:34:27 -0400 Subject: [PATCH 041/253] Release v3.25.5 (#6564) --- .changeset/v3.25.5.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .changeset/v3.25.5.md diff --git a/.changeset/v3.25.5.md b/.changeset/v3.25.5.md new file mode 100644 index 0000000000..03dd0c9804 --- /dev/null +++ b/.changeset/v3.25.5.md @@ -0,0 +1,19 @@ +--- +"roo-cline": patch +--- + +- Fix: Improve Claude Code ENOENT error handling with installation guidance (#5866 by @JamieJ1, PR by @app/roomote) +- Fix: LM Studio model context length (#5075 by @Angular-Angel, PR by @pwilkin) +- Fix: VB.NET indexing by implementing fallback chunking system (#6420 by @JensvanZutphen, PR by @daniel-lxs) +- Add auto-approved cost limits (thanks @hassoncs!) +- Add Cerebras as a provider (thanks @kevint-cerebras!) +- Add Qwen 3 Coder from Cerebras (thanks @kevint-cerebras!) +- Fix: Handle Qdrant deletion errors gracefully to prevent indexing interruption (thanks @daniel-lxs!) +- Fix: Restore message sending when clicking save button (thanks @daniel-lxs!) +- Fix: Linter not applied to locales/\*/README.md (thanks @liwilliam2021!) +- Handle more variations of chaining and subshell command validation +- More tolerant search/replace match +- Clean up the auto-approve UI (thanks @mrubens!) +- Skip interpolation for non-existent slash commands (thanks @app/roomote!) +- Cloud service cleanup callbacks / move to events +- Phase 1 website updates (thanks @thill2323!) From f7b2bb038420477e20574ae2a157660387c50365 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 1 Aug 2025 15:39:30 -0400 Subject: [PATCH 042/253] Changeset version bump (#6565) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens --- .changeset/v3.25.5.md | 19 ------------------- CHANGELOG.md | 16 ++++++++++++++++ src/package.json | 2 +- 3 files changed, 17 insertions(+), 20 deletions(-) delete mode 100644 .changeset/v3.25.5.md diff --git a/.changeset/v3.25.5.md b/.changeset/v3.25.5.md deleted file mode 100644 index 03dd0c9804..0000000000 --- a/.changeset/v3.25.5.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -"roo-cline": patch ---- - -- Fix: Improve Claude Code ENOENT error handling with installation guidance (#5866 by @JamieJ1, PR by @app/roomote) -- Fix: LM Studio model context length (#5075 by @Angular-Angel, PR by @pwilkin) -- Fix: VB.NET indexing by implementing fallback chunking system (#6420 by @JensvanZutphen, PR by @daniel-lxs) -- Add auto-approved cost limits (thanks @hassoncs!) -- Add Cerebras as a provider (thanks @kevint-cerebras!) -- Add Qwen 3 Coder from Cerebras (thanks @kevint-cerebras!) -- Fix: Handle Qdrant deletion errors gracefully to prevent indexing interruption (thanks @daniel-lxs!) -- Fix: Restore message sending when clicking save button (thanks @daniel-lxs!) -- Fix: Linter not applied to locales/\*/README.md (thanks @liwilliam2021!) -- Handle more variations of chaining and subshell command validation -- More tolerant search/replace match -- Clean up the auto-approve UI (thanks @mrubens!) -- Skip interpolation for non-existent slash commands (thanks @app/roomote!) -- Cloud service cleanup callbacks / move to events -- Phase 1 website updates (thanks @thill2323!) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56b2ac7b6c..3b2403bce2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Roo Code Changelog +## [3.25.5] - 2025-08-01 + +- Fix: Improve Claude Code ENOENT error handling with installation guidance (#5866 by @JamieJ1, PR by @app/roomote) +- Fix: LM Studio model context length (#5075 by @Angular-Angel, PR by @pwilkin) +- Fix: VB.NET indexing by implementing fallback chunking system (#6420 by @JensvanZutphen, PR by @daniel-lxs) +- Add auto-approved cost limits (thanks @hassoncs!) +- Add Cerebras as a provider (thanks @kevint-cerebras!) +- Add Qwen 3 Coder from Cerebras (thanks @kevint-cerebras!) +- Fix: Handle Qdrant deletion errors gracefully to prevent indexing interruption (thanks @daniel-lxs!) +- Fix: Restore message sending when clicking save button (thanks @daniel-lxs!) +- Fix: Linter not applied to locales/\*/README.md (thanks @liwilliam2021!) +- Handle more variations of chaining and subshell command validation +- More tolerant search/replace match +- Clean up the auto-approve UI (thanks @mrubens!) +- Skip interpolation for non-existent slash commands (thanks @app/roomote!) + ## [3.25.4] - 2025-07-30 - feat: add SambaNova provider integration (#6077 by @snova-jorgep, PR by @snova-jorgep) diff --git a/src/package.json b/src/package.json index d29a00e80b..91eb40dde6 100644 --- a/src/package.json +++ b/src/package.json @@ -3,7 +3,7 @@ "displayName": "%extension.displayName%", "description": "%extension.description%", "publisher": "RooVeterinaryInc", - "version": "3.25.4", + "version": "3.25.5", "icon": "assets/icons/icon.png", "galleryBanner": { "color": "#617A91", From 8353ca2519ef14e3abae4c74657f6e12bf94dbd1 Mon Sep 17 00:00:00 2001 From: John Richmond <5629+jr@users.noreply.github.com> Date: Fri, 1 Aug 2025 13:00:09 -0700 Subject: [PATCH 043/253] Cloud: support syncing provider profiles from the cloud (#6540) --- packages/types/src/cloud.ts | 2 + packages/types/src/provider-settings.ts | 7 + src/core/config/ProviderSettingsManager.ts | 228 ++++++++- .../__tests__/ProviderSettingsManager.spec.ts | 445 +++++++++++++++++- src/core/webview/ClineProvider.ts | 76 +++ 5 files changed, 747 insertions(+), 11 deletions(-) diff --git a/packages/types/src/cloud.ts b/packages/types/src/cloud.ts index 5ef90b6e5a..c8acc2bcae 100644 --- a/packages/types/src/cloud.ts +++ b/packages/types/src/cloud.ts @@ -2,6 +2,7 @@ import { z } from "zod" import { globalSettingsSchema } from "./global-settings.js" import { mcpMarketplaceItemSchema } from "./marketplace.js" +import { discriminatedProviderSettingsWithIdSchema } from "./provider-settings.js" /** * CloudUserInfo @@ -114,6 +115,7 @@ export const organizationSettingsSchema = z.object({ hiddenMcps: z.array(z.string()).optional(), hideMarketplaceMcps: z.boolean().optional(), mcps: z.array(mcpMarketplaceItemSchema).optional(), + providerProfiles: z.record(z.string(), discriminatedProviderSettingsWithIdSchema).optional(), }) export type OrganizationSettings = z.infer diff --git a/packages/types/src/provider-settings.ts b/packages/types/src/provider-settings.ts index 2ad6c87ddd..207c60a524 100644 --- a/packages/types/src/provider-settings.ts +++ b/packages/types/src/provider-settings.ts @@ -327,6 +327,13 @@ export const providerSettingsSchema = z.object({ }) export type ProviderSettings = z.infer + +export const providerSettingsWithIdSchema = providerSettingsSchema.extend({ id: z.string().optional() }) +export const discriminatedProviderSettingsWithIdSchema = providerSettingsSchemaDiscriminated.and( + z.object({ id: z.string().optional() }), +) +export type ProviderSettingsWithId = z.infer + export const PROVIDER_SETTINGS_KEYS = providerSettingsSchema.keyof().options export const MODEL_ID_KEYS: Partial[] = [ diff --git a/src/core/config/ProviderSettingsManager.ts b/src/core/config/ProviderSettingsManager.ts index 350c8136f2..1d2e96b9c0 100644 --- a/src/core/config/ProviderSettingsManager.ts +++ b/src/core/config/ProviderSettingsManager.ts @@ -1,27 +1,30 @@ import { ExtensionContext } from "vscode" import { z, ZodError } from "zod" +import deepEqual from "fast-deep-equal" import { - type ProviderSettingsEntry, - providerSettingsSchema, - providerSettingsSchemaDiscriminated, + type ProviderSettingsWithId, + providerSettingsWithIdSchema, + discriminatedProviderSettingsWithIdSchema, + isSecretStateKey, + ProviderSettingsEntry, DEFAULT_CONSECUTIVE_MISTAKE_LIMIT, } from "@roo-code/types" import { TelemetryService } from "@roo-code/telemetry" import { Mode, modes } from "../../shared/modes" -const providerSettingsWithIdSchema = providerSettingsSchema.extend({ id: z.string().optional() }) -const discriminatedProviderSettingsWithIdSchema = providerSettingsSchemaDiscriminated.and( - z.object({ id: z.string().optional() }), -) - -type ProviderSettingsWithId = z.infer +export interface SyncCloudProfilesResult { + hasChanges: boolean + activeProfileChanged: boolean + activeProfileId: string +} export const providerProfilesSchema = z.object({ currentApiConfigName: z.string(), apiConfigs: z.record(z.string(), providerSettingsWithIdSchema), modeApiConfigs: z.record(z.string(), z.string()).optional(), + cloudProfileIds: z.array(z.string()).optional(), migrations: z .object({ rateLimitSecondsMigrated: z.boolean().optional(), @@ -304,7 +307,7 @@ export class ProviderSettingsManager { const id = config.id || existingId || this.generateId() // Filter out settings from other providers. - const filteredConfig = providerSettingsSchemaDiscriminated.parse(config) + const filteredConfig = discriminatedProviderSettingsWithIdSchema.parse(config) providerProfiles.apiConfigs[name] = { ...filteredConfig, id } await this.store(providerProfiles) return id @@ -529,4 +532,209 @@ export class ProviderSettingsManager { throw new Error(`Failed to write provider profiles to secrets: ${error}`) } } + + private findUniqueProfileName(baseName: string, existingNames: Set): string { + if (!existingNames.has(baseName)) { + return baseName + } + + // Try _local first + const localName = `${baseName}_local` + if (!existingNames.has(localName)) { + return localName + } + + // Try _1, _2, etc. + let counter = 1 + let candidateName: string + do { + candidateName = `${baseName}_${counter}` + counter++ + } while (existingNames.has(candidateName)) + + return candidateName + } + + public async syncCloudProfiles( + cloudProfiles: Record, + currentActiveProfileName?: string, + ): Promise { + try { + return await this.lock(async () => { + const providerProfiles = await this.load() + const changedProfiles: string[] = [] + const existingNames = new Set(Object.keys(providerProfiles.apiConfigs)) + + let activeProfileChanged = false + let activeProfileId = "" + + if (currentActiveProfileName && providerProfiles.apiConfigs[currentActiveProfileName]) { + activeProfileId = providerProfiles.apiConfigs[currentActiveProfileName].id || "" + } + + const currentCloudIds = new Set(providerProfiles.cloudProfileIds || []) + const newCloudIds = new Set( + Object.values(cloudProfiles) + .map((p) => p.id) + .filter((id): id is string => Boolean(id)), + ) + + // Step 1: Delete profiles that are cloud-managed but not in the new cloud profiles + for (const [name, profile] of Object.entries(providerProfiles.apiConfigs)) { + if (profile.id && currentCloudIds.has(profile.id) && !newCloudIds.has(profile.id)) { + // Check if we're deleting the active profile + if (name === currentActiveProfileName) { + activeProfileChanged = true + activeProfileId = "" // Clear the active profile ID since it's being deleted + } + delete providerProfiles.apiConfigs[name] + changedProfiles.push(name) + existingNames.delete(name) + } + } + + // Step 2: Process each cloud profile + for (const [cloudName, cloudProfile] of Object.entries(cloudProfiles)) { + if (!cloudProfile.id) { + continue // Skip profiles without IDs + } + + // Find existing profile with matching ID + const existingEntry = Object.entries(providerProfiles.apiConfigs).find( + ([_, profile]) => profile.id === cloudProfile.id, + ) + + if (existingEntry) { + // Step 3: Update existing profile + const [existingName, existingProfile] = existingEntry + + // Check if this is the active profile + const isActiveProfile = existingName === currentActiveProfileName + + // Merge settings, preserving secret keys + const updatedProfile: ProviderSettingsWithId = { ...cloudProfile } + for (const [key, value] of Object.entries(existingProfile)) { + if (isSecretStateKey(key) && value !== undefined) { + ;(updatedProfile as any)[key] = value + } + } + + // Check if the profile actually changed using deepEqual + const profileChanged = !deepEqual(existingProfile, updatedProfile) + + // Handle name change + if (existingName !== cloudName) { + // Remove old entry + delete providerProfiles.apiConfigs[existingName] + existingNames.delete(existingName) + + // Handle name conflict + let finalName = cloudName + if (existingNames.has(cloudName)) { + // There's a conflict - rename the existing non-cloud profile + const conflictingProfile = providerProfiles.apiConfigs[cloudName] + if (conflictingProfile.id !== cloudProfile.id) { + const newName = this.findUniqueProfileName(cloudName, existingNames) + providerProfiles.apiConfigs[newName] = conflictingProfile + existingNames.add(newName) + changedProfiles.push(newName) + } + delete providerProfiles.apiConfigs[cloudName] + existingNames.delete(cloudName) + } + + // Add updated profile with new name + providerProfiles.apiConfigs[finalName] = updatedProfile + existingNames.add(finalName) + changedProfiles.push(finalName) + if (existingName !== finalName) { + changedProfiles.push(existingName) // Mark old name as changed (deleted) + } + + // If this was the active profile, mark it as changed + if (isActiveProfile) { + activeProfileChanged = true + activeProfileId = cloudProfile.id || "" + } + } else if (profileChanged) { + // Same name, but profile content changed - update in place + providerProfiles.apiConfigs[existingName] = updatedProfile + changedProfiles.push(existingName) + + // If this was the active profile and settings changed, mark it as changed + if (isActiveProfile) { + activeProfileChanged = true + activeProfileId = cloudProfile.id || "" + } + } + // If name is the same and profile hasn't changed, do nothing + } else { + // Step 4: Add new cloud profile + let finalName = cloudName + + // Handle name conflict with existing non-cloud profile + if (existingNames.has(cloudName)) { + const existingProfile = providerProfiles.apiConfigs[cloudName] + if (existingProfile.id !== cloudProfile.id) { + // Rename the existing profile + const newName = this.findUniqueProfileName(cloudName, existingNames) + providerProfiles.apiConfigs[newName] = existingProfile + existingNames.add(newName) + changedProfiles.push(newName) + + // Remove the old entry + delete providerProfiles.apiConfigs[cloudName] + existingNames.delete(cloudName) + } + } + + // Add the new cloud profile (without secret keys) + const newProfile: ProviderSettingsWithId = { ...cloudProfile } + // Remove any secret keys from cloud profile + for (const key of Object.keys(newProfile)) { + if (isSecretStateKey(key)) { + delete (newProfile as any)[key] + } + } + + providerProfiles.apiConfigs[finalName] = newProfile + existingNames.add(finalName) + changedProfiles.push(finalName) + } + } + + // Step 5: Handle case where all profiles might be deleted + if (Object.keys(providerProfiles.apiConfigs).length === 0 && changedProfiles.length > 0) { + // Create a default profile only if we have changed profiles + const defaultProfile = { id: this.generateId() } + providerProfiles.apiConfigs["default"] = defaultProfile + activeProfileChanged = true + activeProfileId = defaultProfile.id || "" + changedProfiles.push("default") + } + + // Step 6: If active profile was deleted, find a replacement + if (activeProfileChanged && !activeProfileId) { + const firstProfile = Object.values(providerProfiles.apiConfigs)[0] + if (firstProfile?.id) { + activeProfileId = firstProfile.id + } + } + + // Step 7: Update cloudProfileIds + providerProfiles.cloudProfileIds = Array.from(newCloudIds) + + // Save the updated profiles + await this.store(providerProfiles) + + return { + hasChanges: changedProfiles.length > 0, + activeProfileChanged, + activeProfileId, + } + }) + } catch (error) { + throw new Error(`Failed to sync cloud profiles: ${error}`) + } + } } diff --git a/src/core/config/__tests__/ProviderSettingsManager.spec.ts b/src/core/config/__tests__/ProviderSettingsManager.spec.ts index e52c1974b6..e95d2b100b 100644 --- a/src/core/config/__tests__/ProviderSettingsManager.spec.ts +++ b/src/core/config/__tests__/ProviderSettingsManager.spec.ts @@ -4,7 +4,7 @@ import { ExtensionContext } from "vscode" import type { ProviderSettings } from "@roo-code/types" -import { ProviderSettingsManager, ProviderProfiles } from "../ProviderSettingsManager" +import { ProviderSettingsManager, ProviderProfiles, SyncCloudProfilesResult } from "../ProviderSettingsManager" // Mock VSCode ExtensionContext const mockSecrets = { @@ -678,4 +678,447 @@ describe("ProviderSettingsManager", () => { ) }) }) + + describe("syncCloudProfiles", () => { + it("should add new cloud profiles without secret keys", async () => { + const existingConfig: ProviderProfiles = { + currentApiConfigName: "default", + apiConfigs: { + default: { id: "default-id" }, + }, + cloudProfileIds: [], + } + + mockSecrets.get.mockResolvedValue(JSON.stringify(existingConfig)) + + const cloudProfiles = { + "cloud-profile": { + id: "cloud-id-1", + apiProvider: "anthropic" as const, + apiKey: "secret-key", // This should be removed + apiModelId: "claude-3-opus-20240229", + }, + } + + const result = await providerSettingsManager.syncCloudProfiles(cloudProfiles) + + expect(result.hasChanges).toBe(true) + expect(result.activeProfileChanged).toBe(false) + expect(result.activeProfileId).toBe("") + + const storedConfig = JSON.parse(mockSecrets.store.mock.calls[0][1]) + expect(storedConfig.apiConfigs["cloud-profile"]).toEqual({ + id: "cloud-id-1", + apiProvider: "anthropic", + apiModelId: "claude-3-opus-20240229", + // apiKey should be removed + }) + expect(storedConfig.cloudProfileIds).toEqual(["cloud-id-1"]) + }) + + it("should update existing cloud profiles by ID, preserving secret keys", async () => { + const existingConfig: ProviderProfiles = { + currentApiConfigName: "default", + apiConfigs: { + default: { id: "default-id" }, + "existing-cloud": { + id: "cloud-id-1", + apiProvider: "anthropic" as const, + apiKey: "existing-secret", + apiModelId: "claude-3-haiku-20240307", + }, + }, + cloudProfileIds: ["cloud-id-1"], + } + + mockSecrets.get.mockResolvedValue(JSON.stringify(existingConfig)) + + const cloudProfiles = { + "updated-name": { + id: "cloud-id-1", + apiProvider: "anthropic" as const, + apiKey: "new-secret", // Should be ignored + apiModelId: "claude-3-opus-20240229", + }, + } + + const result = await providerSettingsManager.syncCloudProfiles(cloudProfiles) + + expect(result.hasChanges).toBe(true) + expect(result.activeProfileChanged).toBe(false) + expect(result.activeProfileId).toBe("") + + const storedConfig = JSON.parse(mockSecrets.store.mock.calls[0][1]) + expect(storedConfig.apiConfigs["updated-name"]).toEqual({ + id: "cloud-id-1", + apiProvider: "anthropic", + apiKey: "existing-secret", // Preserved + apiModelId: "claude-3-opus-20240229", // Updated + }) + expect(storedConfig.apiConfigs["existing-cloud"]).toBeUndefined() + expect(storedConfig.cloudProfileIds).toEqual(["cloud-id-1"]) + }) + + it("should delete cloud profiles not in the new cloud profiles", async () => { + const existingConfig: ProviderProfiles = { + currentApiConfigName: "default", + apiConfigs: { + default: { id: "default-id" }, + "cloud-profile-1": { id: "cloud-id-1", apiProvider: "anthropic" as const }, + "cloud-profile-2": { id: "cloud-id-2", apiProvider: "openai" as const }, + }, + cloudProfileIds: ["cloud-id-1", "cloud-id-2"], + } + + mockSecrets.get.mockResolvedValue(JSON.stringify(existingConfig)) + + const cloudProfiles = { + "cloud-profile-1": { + id: "cloud-id-1", + apiProvider: "anthropic" as const, + }, + // cloud-profile-2 is missing, should be deleted + } + + const result = await providerSettingsManager.syncCloudProfiles(cloudProfiles) + + expect(result.hasChanges).toBe(true) + expect(result.activeProfileChanged).toBe(false) + expect(result.activeProfileId).toBe("") + + const storedConfig = JSON.parse(mockSecrets.store.mock.calls[0][1]) + expect(storedConfig.apiConfigs["cloud-profile-1"]).toBeDefined() + expect(storedConfig.apiConfigs["cloud-profile-2"]).toBeUndefined() + expect(storedConfig.cloudProfileIds).toEqual(["cloud-id-1"]) + }) + + it("should rename existing non-cloud profile when cloud profile has same name", async () => { + const existingConfig: ProviderProfiles = { + currentApiConfigName: "default", + apiConfigs: { + default: { id: "default-id" }, + "conflict-name": { id: "local-id", apiProvider: "openai" as const }, + }, + cloudProfileIds: [], + } + + mockSecrets.get.mockResolvedValue(JSON.stringify(existingConfig)) + + const cloudProfiles = { + "conflict-name": { + id: "cloud-id-1", + apiProvider: "anthropic" as const, + }, + } + + const result = await providerSettingsManager.syncCloudProfiles(cloudProfiles) + + expect(result.hasChanges).toBe(true) + expect(result.activeProfileChanged).toBe(false) + expect(result.activeProfileId).toBe("") + + const storedConfig = JSON.parse(mockSecrets.store.mock.calls[0][1]) + expect(storedConfig.apiConfigs["conflict-name"]).toEqual({ + id: "cloud-id-1", + apiProvider: "anthropic", + }) + expect(storedConfig.apiConfigs["conflict-name_local"]).toEqual({ + id: "local-id", + apiProvider: "openai", + }) + expect(storedConfig.cloudProfileIds).toEqual(["cloud-id-1"]) + }) + + it("should handle multiple naming conflicts with incremental suffixes", async () => { + const existingConfig: ProviderProfiles = { + currentApiConfigName: "default", + apiConfigs: { + default: { id: "default-id" }, + "conflict-name": { id: "local-id-1", apiProvider: "openai" as const }, + "conflict-name_local": { id: "local-id-2", apiProvider: "vertex" as const }, + }, + cloudProfileIds: [], + } + + mockSecrets.get.mockResolvedValue(JSON.stringify(existingConfig)) + + const cloudProfiles = { + "conflict-name": { + id: "cloud-id-1", + apiProvider: "anthropic" as const, + }, + } + + const result = await providerSettingsManager.syncCloudProfiles(cloudProfiles) + + expect(result.hasChanges).toBe(true) + expect(result.activeProfileChanged).toBe(false) + expect(result.activeProfileId).toBe("") + + const storedConfig = JSON.parse(mockSecrets.store.mock.calls[0][1]) + expect(storedConfig.apiConfigs["conflict-name"]).toEqual({ + id: "cloud-id-1", + apiProvider: "anthropic", + }) + expect(storedConfig.apiConfigs["conflict-name_1"]).toEqual({ + id: "local-id-1", + apiProvider: "openai", + }) + expect(storedConfig.apiConfigs["conflict-name_local"]).toEqual({ + id: "local-id-2", + apiProvider: "vertex", + }) + }) + + it("should handle empty cloud profiles by deleting all cloud-managed profiles", async () => { + const existingConfig: ProviderProfiles = { + currentApiConfigName: "default", + apiConfigs: { + default: { id: "default-id" }, + "cloud-profile-1": { id: "cloud-id-1", apiProvider: "anthropic" as const }, + "cloud-profile-2": { id: "cloud-id-2", apiProvider: "openai" as const }, + }, + cloudProfileIds: ["cloud-id-1", "cloud-id-2"], + } + + mockSecrets.get.mockResolvedValue(JSON.stringify(existingConfig)) + + const cloudProfiles = {} + + const result = await providerSettingsManager.syncCloudProfiles(cloudProfiles) + + expect(result.hasChanges).toBe(true) + expect(result.activeProfileChanged).toBe(false) + expect(result.activeProfileId).toBe("") + + const storedConfig = JSON.parse(mockSecrets.store.mock.calls[0][1]) + expect(storedConfig.apiConfigs["cloud-profile-1"]).toBeUndefined() + expect(storedConfig.apiConfigs["cloud-profile-2"]).toBeUndefined() + expect(storedConfig.apiConfigs["default"]).toBeDefined() + expect(storedConfig.cloudProfileIds).toEqual([]) + }) + + it("should skip cloud profiles without IDs", async () => { + const existingConfig: ProviderProfiles = { + currentApiConfigName: "default", + apiConfigs: { + default: { id: "default-id" }, + }, + cloudProfileIds: [], + } + + mockSecrets.get.mockResolvedValue(JSON.stringify(existingConfig)) + + const cloudProfiles = { + "valid-profile": { + id: "cloud-id-1", + apiProvider: "anthropic" as const, + }, + "invalid-profile": { + // Missing id + apiProvider: "openai" as const, + }, + } + + const result = await providerSettingsManager.syncCloudProfiles(cloudProfiles) + + expect(result.hasChanges).toBe(true) + expect(result.activeProfileChanged).toBe(false) + expect(result.activeProfileId).toBe("") + + const storedConfig = JSON.parse(mockSecrets.store.mock.calls[0][1]) + expect(storedConfig.apiConfigs["valid-profile"]).toBeDefined() + expect(storedConfig.apiConfigs["invalid-profile"]).toBeUndefined() + expect(storedConfig.cloudProfileIds).toEqual(["cloud-id-1"]) + }) + + it("should handle complex sync scenario with multiple operations", async () => { + const existingConfig: ProviderProfiles = { + currentApiConfigName: "default", + apiConfigs: { + default: { id: "default-id" }, + "keep-cloud": { id: "cloud-id-1", apiProvider: "anthropic" as const, apiKey: "secret1" }, + "delete-cloud": { id: "cloud-id-2", apiProvider: "openai" as const }, + "rename-me": { id: "local-id", apiProvider: "vertex" as const }, + }, + cloudProfileIds: ["cloud-id-1", "cloud-id-2"], + } + + mockSecrets.get.mockResolvedValue(JSON.stringify(existingConfig)) + + const cloudProfiles = { + "updated-keep": { + id: "cloud-id-1", + apiProvider: "anthropic" as const, + apiKey: "new-secret", // Should be ignored + apiModelId: "claude-3-opus-20240229", + }, + "rename-me": { + id: "cloud-id-3", + apiProvider: "openai" as const, + }, + // delete-cloud is missing (should be deleted) + // new profile + "new-cloud": { + id: "cloud-id-4", + apiProvider: "vertex" as const, + }, + } + + const result = await providerSettingsManager.syncCloudProfiles(cloudProfiles) + + expect(result.hasChanges).toBe(true) + expect(result.activeProfileChanged).toBe(false) + expect(result.activeProfileId).toBe("") + + const storedConfig = JSON.parse(mockSecrets.store.mock.calls[0][1]) + + // Check deletions + expect(storedConfig.apiConfigs["delete-cloud"]).toBeUndefined() + expect(storedConfig.apiConfigs["keep-cloud"]).toBeUndefined() + + // Check updates + expect(storedConfig.apiConfigs["updated-keep"]).toEqual({ + id: "cloud-id-1", + apiProvider: "anthropic", + apiKey: "secret1", // preserved + apiModelId: "claude-3-opus-20240229", + }) + + // Check renames + expect(storedConfig.apiConfigs["rename-me_local"]).toEqual({ + id: "local-id", + apiProvider: "vertex", + }) + expect(storedConfig.apiConfigs["rename-me"]).toEqual({ + id: "cloud-id-3", + apiProvider: "openai", + }) + + // Check new additions + expect(storedConfig.apiConfigs["new-cloud"]).toEqual({ + id: "cloud-id-4", + apiProvider: "vertex", + }) + + expect(storedConfig.cloudProfileIds).toEqual(["cloud-id-1", "cloud-id-3", "cloud-id-4"]) + }) + + it("should throw error if secrets storage fails", async () => { + mockSecrets.get.mockResolvedValue( + JSON.stringify({ + currentApiConfigName: "default", + apiConfigs: { default: { id: "default-id" } }, + cloudProfileIds: [], + }), + ) + mockSecrets.store.mockRejectedValue(new Error("Storage failed")) + + await expect(providerSettingsManager.syncCloudProfiles({})).rejects.toThrow( + "Failed to sync cloud profiles: Error: Failed to write provider profiles to secrets: Error: Storage failed", + ) + }) + + it("should track active profile changes when active profile is updated", async () => { + const existingConfig: ProviderProfiles = { + currentApiConfigName: "active-profile", + apiConfigs: { + "active-profile": { + id: "active-id", + apiProvider: "anthropic" as const, + apiKey: "old-key", + }, + }, + cloudProfileIds: ["active-id"], + } + + mockSecrets.get.mockResolvedValue(JSON.stringify(existingConfig)) + + const cloudProfiles = { + "active-profile": { + id: "active-id", + apiProvider: "anthropic" as const, + apiModelId: "claude-3-opus-20240229", // Updated setting + }, + } + + const result = await providerSettingsManager.syncCloudProfiles(cloudProfiles, "active-profile") + + expect(result.hasChanges).toBe(true) + expect(result.activeProfileChanged).toBe(true) + expect(result.activeProfileId).toBe("active-id") + }) + + it("should track active profile changes when active profile is deleted", async () => { + const existingConfig: ProviderProfiles = { + currentApiConfigName: "active-profile", + apiConfigs: { + "active-profile": { id: "active-id", apiProvider: "anthropic" as const }, + "backup-profile": { id: "backup-id", apiProvider: "openai" as const }, + }, + cloudProfileIds: ["active-id"], + } + + mockSecrets.get.mockResolvedValue(JSON.stringify(existingConfig)) + + const cloudProfiles = {} // Active profile deleted + + const result = await providerSettingsManager.syncCloudProfiles(cloudProfiles, "active-profile") + + expect(result.hasChanges).toBe(true) + expect(result.activeProfileChanged).toBe(true) + expect(result.activeProfileId).toBe("backup-id") // Should switch to first available + }) + + it("should create default profile when all profiles are deleted", async () => { + const existingConfig: ProviderProfiles = { + currentApiConfigName: "only-profile", + apiConfigs: { + "only-profile": { id: "only-id", apiProvider: "anthropic" as const }, + }, + cloudProfileIds: ["only-id"], + } + + mockSecrets.get.mockResolvedValue(JSON.stringify(existingConfig)) + + const cloudProfiles = {} // All profiles deleted + + const result = await providerSettingsManager.syncCloudProfiles(cloudProfiles, "only-profile") + + expect(result.hasChanges).toBe(true) + expect(result.activeProfileChanged).toBe(true) + expect(result.activeProfileId).toBeTruthy() // Should have new default profile ID + + const storedConfig = JSON.parse(mockSecrets.store.mock.calls[0][1]) + expect(storedConfig.apiConfigs["default"]).toBeDefined() + expect(storedConfig.apiConfigs["default"].id).toBe(result.activeProfileId) + }) + + it("should not mark active profile as changed when it's not affected", async () => { + const existingConfig: ProviderProfiles = { + currentApiConfigName: "local-profile", + apiConfigs: { + "local-profile": { id: "local-id", apiProvider: "anthropic" as const }, + "cloud-profile": { id: "cloud-id", apiProvider: "openai" as const }, + }, + cloudProfileIds: ["cloud-id"], + } + + mockSecrets.get.mockResolvedValue(JSON.stringify(existingConfig)) + + const cloudProfiles = { + "cloud-profile": { + id: "cloud-id", + apiProvider: "openai" as const, + apiModelId: "gpt-4", // Updated cloud profile + }, + } + + const result = await providerSettingsManager.syncCloudProfiles(cloudProfiles, "local-profile") + + expect(result.hasChanges).toBe(true) + expect(result.activeProfileChanged).toBe(false) + expect(result.activeProfileId).toBe("local-id") + }) + }) }) diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index 99c2a514b2..980eb1f07b 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -15,6 +15,7 @@ import { type ProviderSettings, type RooCodeSettings, type ProviderSettingsEntry, + type ProviderSettingsWithId, type TelemetryProperties, type TelemetryPropertiesProvider, type CodeActionId, @@ -153,6 +154,76 @@ export class ClineProvider }) this.marketplaceManager = new MarketplaceManager(this.context, this.customModesManager) + + // Initialize cloud profile sync + this.initializeCloudProfileSync().catch((error) => { + this.log(`Failed to initialize cloud profile sync: ${error}`) + }) + } + + /** + * Initialize cloud profile synchronization + */ + private async initializeCloudProfileSync() { + try { + // Check if authenticated and sync profiles + if (CloudService.hasInstance() && CloudService.instance.isAuthenticated()) { + await this.syncCloudProfiles() + } + + // Set up listener for future updates + if (CloudService.hasInstance()) { + CloudService.instance.on("settings-updated", this.handleCloudSettingsUpdate) + } + } catch (error) { + this.log(`Error in initializeCloudProfileSync: ${error}`) + } + } + + /** + * Handle cloud settings updates + */ + private handleCloudSettingsUpdate = async () => { + try { + await this.syncCloudProfiles() + } catch (error) { + this.log(`Error handling cloud settings update: ${error}`) + } + } + + /** + * Synchronize cloud profiles with local profiles + */ + private async syncCloudProfiles() { + try { + const settings = CloudService.instance.getOrganizationSettings() + if (!settings?.providerProfiles) { + return + } + + const currentApiConfigName = this.getGlobalState("currentApiConfigName") + const result = await this.providerSettingsManager.syncCloudProfiles( + settings.providerProfiles, + currentApiConfigName, + ) + + if (result.hasChanges) { + // Update list + await this.updateGlobalState("listApiConfigMeta", await this.providerSettingsManager.listConfig()) + + if (result.activeProfileChanged && result.activeProfileId) { + // Reload full settings for new active profile + const profile = await this.providerSettingsManager.getProfile({ + id: result.activeProfileId, + }) + await this.activateProviderProfile({ name: profile.name }) + } + + await this.postStateToWebview() + } + } catch (error) { + this.log(`Error syncing cloud profiles: ${error}`) + } } // Adds a new Cline instance to clineStack, marking the start of a new task. @@ -282,6 +353,11 @@ export class ClineProvider this.clearWebviewResources() + // Clean up cloud service event listener + if (CloudService.hasInstance()) { + CloudService.instance.off("settings-updated", this.handleCloudSettingsUpdate) + } + while (this.disposables.length) { const x = this.disposables.pop() From 69685c779db74036fabcc4e77109f2808d3079d0 Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Fri, 1 Aug 2025 13:14:55 -0700 Subject: [PATCH 044/253] chore: bump @roo-code/types to v1.41.0 (#6568) Co-authored-by: Roo Code --- packages/types/npm/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/types/npm/package.json b/packages/types/npm/package.json index 3ab21bda2c..3f3e3e113d 100644 --- a/packages/types/npm/package.json +++ b/packages/types/npm/package.json @@ -1,6 +1,6 @@ { "name": "@roo-code/types", - "version": "1.40.0", + "version": "1.41.0", "description": "TypeScript type definitions for Roo Code.", "publishConfig": { "access": "public", From 19c157e51cb6f3130f064cdd2bc875c7017664eb Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Fri, 1 Aug 2025 21:11:24 -0400 Subject: [PATCH 045/253] feat: set horizon-beta model max tokens to 32k for OpenRouter (#6577) Co-authored-by: Roo Code --- .../fetchers/__tests__/openrouter.spec.ts | 23 +++++++++++++++++++ src/api/providers/fetchers/openrouter.ts | 5 ++++ 2 files changed, 28 insertions(+) diff --git a/src/api/providers/fetchers/__tests__/openrouter.spec.ts b/src/api/providers/fetchers/__tests__/openrouter.spec.ts index e1f8d64acd..5b620395c0 100644 --- a/src/api/providers/fetchers/__tests__/openrouter.spec.ts +++ b/src/api/providers/fetchers/__tests__/openrouter.spec.ts @@ -276,6 +276,29 @@ describe("OpenRouter API", () => { expect(result.contextWindow).toBe(128000) }) + it("sets horizon-beta model to 32k max tokens", () => { + const mockModel = { + name: "Horizon Beta", + description: "Test model", + context_length: 128000, + max_completion_tokens: 128000, + pricing: { + prompt: "0.000003", + completion: "0.000015", + }, + } + + const result = parseOpenRouterModel({ + id: "openrouter/horizon-beta", + model: mockModel, + modality: "text", + maxTokens: 128000, + }) + + expect(result.maxTokens).toBe(32768) + expect(result.contextWindow).toBe(128000) + }) + it("does not override max tokens for other models", () => { const mockModel = { name: "Other Model", diff --git a/src/api/providers/fetchers/openrouter.ts b/src/api/providers/fetchers/openrouter.ts index 34e2ec595f..bb3b97e7aa 100644 --- a/src/api/providers/fetchers/openrouter.ts +++ b/src/api/providers/fetchers/openrouter.ts @@ -237,5 +237,10 @@ export const parseOpenRouterModel = ({ modelInfo.maxTokens = 32768 } + // Set horizon-beta model to 32k max tokens + if (id === "openrouter/horizon-beta") { + modelInfo.maxTokens = 32768 + } + return modelInfo } From b5a54ba48dbd5dc618731477c66980575bed1c77 Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Fri, 1 Aug 2025 21:28:49 -0400 Subject: [PATCH 046/253] Release v3.25.6 (#6578) Co-authored-by: Roo Code --- .changeset/v3.25.6.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changeset/v3.25.6.md diff --git a/.changeset/v3.25.6.md b/.changeset/v3.25.6.md new file mode 100644 index 0000000000..1000332b50 --- /dev/null +++ b/.changeset/v3.25.6.md @@ -0,0 +1,7 @@ +--- +"roo-cline": patch +--- + +- Add support for syncing provider profiles from the cloud (thanks @jr!) +- Set horizon-beta model max tokens to 32k for OpenRouter (requested by @hannesrudolph, PR by @app/roomote) +- Bump @roo-code/types to v1.41.0 (thanks @app/roomote!) From c666340bd63cb0d84b24324b444cdb5dc5835744 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 1 Aug 2025 21:30:54 -0400 Subject: [PATCH 047/253] Update contributors list (#6506) Co-authored-by: mrubens <2600+mrubens@users.noreply.github.com> --- README.md | 79 ++++++++++++++++++++-------------------- locales/ca/README.md | 81 +++++++++++++++++++++-------------------- locales/de/README.md | 81 +++++++++++++++++++++-------------------- locales/es/README.md | 81 +++++++++++++++++++++-------------------- locales/fr/README.md | 81 +++++++++++++++++++++-------------------- locales/hi/README.md | 81 +++++++++++++++++++++-------------------- locales/id/README.md | 81 +++++++++++++++++++++-------------------- locales/it/README.md | 81 +++++++++++++++++++++-------------------- locales/ja/README.md | 81 +++++++++++++++++++++-------------------- locales/ko/README.md | 81 +++++++++++++++++++++-------------------- locales/nl/README.md | 81 +++++++++++++++++++++-------------------- locales/pl/README.md | 81 +++++++++++++++++++++-------------------- locales/pt-BR/README.md | 81 +++++++++++++++++++++-------------------- locales/ru/README.md | 81 +++++++++++++++++++++-------------------- locales/tr/README.md | 81 +++++++++++++++++++++-------------------- locales/vi/README.md | 81 +++++++++++++++++++++-------------------- locales/zh-CN/README.md | 81 +++++++++++++++++++++-------------------- locales/zh-TW/README.md | 81 +++++++++++++++++++++-------------------- 18 files changed, 754 insertions(+), 702 deletions(-) diff --git a/README.md b/README.md index 38e58264cf..08f8f81806 100644 --- a/README.md +++ b/README.md @@ -208,45 +208,46 @@ Thanks to all our contributors who have helped make Roo Code better! -| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | -| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | MuriloFP
    MuriloFP     | ColemanRoo
    ColemanRoo     | canrobins13
    canrobins13     | stea9499
    stea9499     | -| joemanley201
    joemanley201     | System233
    System233     | jr
    jr     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | -| NyxJae
    NyxJae     | d-oit
    d-oit     | elianiva
    elianiva     | qdaxb
    qdaxb     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | -| SannidhyaSah
    SannidhyaSah     | xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | -| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | -| lloydchang
    lloydchang     | dtrugman
    dtrugman     | Szpadel
    Szpadel     | hassoncs
    hassoncs     | liwilliam2021
    liwilliam2021     | lupuletic
    lupuletic     | -| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | -| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | -| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | -| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | -| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | -| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | -| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | -| vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | yt3trees
    yt3trees     | -| seedlord
    seedlord     | bramburn
    bramburn     | anton-otee
    anton-otee     | benzntech
    benzntech     | axkirillov
    axkirillov     | olearycrew
    olearycrew     | -| catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | -| julionav
    julionav     | KanTakahiro
    KanTakahiro     | SplittyDev
    SplittyDev     | mdp
    mdp     | napter
    napter     | philfung
    philfung     | -| bannzai
    bannzai     | bbenshalom
    bbenshalom     | chris-garrett
    chris-garrett     | dairui1
    dairui1     | dqroid
    dqroid     | janaki-sasidhar
    janaki-sasidhar     | -| forestyoo
    forestyoo     | hatsu38
    hatsu38     | hongzio
    hongzio     | im47cn
    im47cn     | shoopapa
    shoopapa     | jwcraig
    jwcraig     | -| axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | -| s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | -| Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | nevermorec
    nevermorec     | PretzelVector
    PretzelVector     | zetaloop
    zetaloop     | -| cdlliuy
    cdlliuy     | user202729
    user202729     | thill2323
    thill2323     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | -| shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | robertheadley
    robertheadley     | -| refactorthis
    refactorthis     | qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | -| nobu007
    nobu007     | mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | -| lightrabbit
    lightrabbit     | lhish
    lhish     | kohii
    kohii     | kinandan
    kinandan     | AlexandruSmirnov
    AlexandruSmirnov     | pfitz
    pfitz     | -| ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | -| dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | -| bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | -| andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | alarno
    alarno     | nexon33
    nexon33     | -| adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | adambrand
    adambrand     | samsilveira
    samsilveira     | -| 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | Sarke
    Sarke     | -| PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | kvokka
    kvokka     | ecmasx
    ecmasx     | -| mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | -| shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | ksze
    ksze     | Juice10
    Juice10     | -| snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | DeXtroTip
    DeXtroTip     | | +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | +| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | +| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | +| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | +| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | +| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | +| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | +| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | +| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | +| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | +| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | +| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | +| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | +| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | +| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | +| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | +| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | +| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | +| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | +| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | +| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | +| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | +| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | +| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | +| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | +| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | +| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | +| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | +| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | +| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | +| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | +| DeXtroTip
    DeXtroTip     | | | | | | diff --git a/locales/ca/README.md b/locales/ca/README.md index 0bc417753c..cd38392ab9 100644 --- a/locales/ca/README.md +++ b/locales/ca/README.md @@ -181,45 +181,48 @@ Ens encanten les contribucions de la comunitat! Comenceu llegint el nostre [CONT Gràcies a tots els nostres col·laboradors que han ajudat a millorar Roo Code! -|mrubens
    mrubens    |saoudrizwan
    saoudrizwan    |cte
    cte    |daniel-lxs
    daniel-lxs    |samhvw8
    samhvw8    |hannesrudolph
    hannesrudolph    | -|:---:|:---:|:---:|:---:|:---:|:---:| -|KJ7LNW
    KJ7LNW    |a8trejo
    a8trejo    |MuriloFP
    MuriloFP    |ColemanRoo
    ColemanRoo    |canrobins13
    canrobins13    |stea9499
    stea9499    | -|joemanley201
    joemanley201    |System233
    System233    |jr
    jr    |nissa-seru
    nissa-seru    |jquanton
    jquanton    |roomote-agent
    roomote-agent    | -|NyxJae
    NyxJae    |d-oit
    d-oit    |elianiva
    elianiva    |qdaxb
    qdaxb    |punkpeye
    punkpeye    |wkordalski
    wkordalski    | -|SannidhyaSah
    SannidhyaSah    |xyOz-dev
    xyOz-dev    |chrarnoldus
    chrarnoldus    |sachasayan
    sachasayan    |Smartsheet-JB-Brown
    Smartsheet-JB-Brown    |monotykamary
    monotykamary    | -|cannuri
    cannuri    |feifei325
    feifei325    |zhangtony239
    zhangtony239    |shariqriazz
    shariqriazz    |vigneshsubbiah16
    vigneshsubbiah16    |pugazhendhi-m
    pugazhendhi-m    | -|lloydchang
    lloydchang    |dtrugman
    dtrugman    |Szpadel
    Szpadel    |hassoncs
    hassoncs    |liwilliam2021
    liwilliam2021    |lupuletic
    lupuletic    | -|kiwina
    kiwina    |Premshay
    Premshay    |psv2522
    psv2522    |olweraltuve
    olweraltuve    |diarmidmackenzie
    diarmidmackenzie    |ChuKhaLi
    ChuKhaLi    | -|PeterDaveHello
    PeterDaveHello    |aheizi
    aheizi    |nbihan-mediware
    nbihan-mediware    |noritaka1166
    noritaka1166    |RaySinner
    RaySinner    |afshawnlotfi
    afshawnlotfi    | -|dleffel
    dleffel    |StevenTCramer
    StevenTCramer    |Ruakij
    Ruakij    |pdecat
    pdecat    |kyle-apex
    kyle-apex    |emshvac
    emshvac    | -|Lunchb0ne
    Lunchb0ne    |SmartManoj
    SmartManoj    |vagadiya
    vagadiya    |slytechnical
    slytechnical    |dlab-anton
    dlab-anton    |arthurauffray
    arthurauffray    | -|upamune
    upamune    |NamesMT
    NamesMT    |taylorwilsdon
    taylorwilsdon    |sammcj
    sammcj    |p12tic
    p12tic    |gtaylor
    gtaylor    | -|brunobergher
    brunobergher    |aitoroses
    aitoroses    |ross
    ross    |mr-ryan-james
    mr-ryan-james    |heyseth
    heyseth    |taisukeoe
    taisukeoe    | -|avtc
    avtc    |eonghk
    eonghk    |GOODBOY008
    GOODBOY008    |kcwhite
    kcwhite    |ronyblum
    ronyblum    |teddyOOXX
    teddyOOXX    | -|vincentsong
    vincentsong    |yongjer
    yongjer    |zeozeozeo
    zeozeozeo    |ashktn
    ashktn    |franekp
    franekp    |yt3trees
    yt3trees    | -|seedlord
    seedlord    |bramburn
    bramburn    |anton-otee
    anton-otee    |benzntech
    benzntech    |axkirillov
    axkirillov    |olearycrew
    olearycrew    | -|catrielmuller
    catrielmuller    |devxpain
    devxpain    |snoyiatk
    snoyiatk    |GitlyHallows
    GitlyHallows    |jcbdev
    jcbdev    |Chenjiayuan195
    Chenjiayuan195    | -|julionav
    julionav    |KanTakahiro
    KanTakahiro    |SplittyDev
    SplittyDev    |mdp
    mdp    |napter
    napter    |philfung
    philfung    | -|bannzai
    bannzai    |bbenshalom
    bbenshalom    |chris-garrett
    chris-garrett    |dairui1
    dairui1    |dqroid
    dqroid    |janaki-sasidhar
    janaki-sasidhar    | -|forestyoo
    forestyoo    |hatsu38
    hatsu38    |hongzio
    hongzio    |im47cn
    im47cn    |shoopapa
    shoopapa    |jwcraig
    jwcraig    | -|axmo
    axmo    |asychin
    asychin    |amittell
    amittell    |Yoshino-Yukitaro
    Yoshino-Yukitaro    |Yikai-Liao
    Yikai-Liao    |zxdvd
    zxdvd    | -|s97712
    s97712    |vladstudio
    vladstudio    |vivekfyi
    vivekfyi    |HahaBill
    HahaBill    |tmsjngx0
    tmsjngx0    |TGlide
    TGlide    | -|Githubguy132010
    Githubguy132010    |tgfjt
    tgfjt    |maekawataiki
    maekawataiki    |nevermorec
    nevermorec    |PretzelVector
    PretzelVector    |zetaloop
    zetaloop    | -|cdlliuy
    cdlliuy    |user202729
    user202729    |thill2323
    thill2323    |takakoutso
    takakoutso    |student20880
    student20880    |shubhamgupta731
    shubhamgupta731    | -|shohei-ihaya
    shohei-ihaya    |shivamd1810
    shivamd1810    |shaybc
    shaybc    |sensei-woo
    sensei-woo    |samir-nimbly
    samir-nimbly    |robertheadley
    robertheadley    | -|refactorthis
    refactorthis    |qingyuan1109
    qingyuan1109    |pokutuna
    pokutuna    |philipnext
    philipnext    |village-way
    village-way    |oprstchn
    oprstchn    | -|nobu007
    nobu007    |mosleyit
    mosleyit    |moqimoqidea
    moqimoqidea    |mlopezr
    mlopezr    |mecab
    mecab    |olup
    olup    | -|lightrabbit
    lightrabbit    |lhish
    lhish    |kohii
    kohii    |kinandan
    kinandan    |AlexandruSmirnov
    AlexandruSmirnov    |pfitz
    pfitz    | -|ExactDoug
    ExactDoug    |celestial-vault
    celestial-vault    |linegel
    linegel    |edwin-truthsearch-io
    edwin-truthsearch-io    |EamonNerbonne
    EamonNerbonne    |dbasclpy
    dbasclpy    | -|dflatline
    dflatline    |Deon588
    Deon588    |dleen
    dleen    |CW-B-W
    CW-B-W    |chadgauth
    chadgauth    |thecolorblue
    thecolorblue    | -|bogdan0083
    bogdan0083    |benashby
    benashby    |Atlogit
    Atlogit    |atlasgong
    atlasgong    |AntiMoron
    AntiMoron    |andrewshu2000
    andrewshu2000    | -|andreastempsch
    andreastempsch    |alasano
    alasano    |QuinsZouls
    QuinsZouls    |HadesArchitect
    HadesArchitect    |alarno
    alarno    |nexon33
    nexon33    | -|adilhafeez
    adilhafeez    |adamwlarson
    adamwlarson    |adamhill
    adamhill    |AMHesch
    AMHesch    |adambrand
    adambrand    |samsilveira
    samsilveira    | -|01Rian
    01Rian    |RSO
    RSO    |RandalSchwartz
    RandalSchwartz    |SECKainersdorfer
    SECKainersdorfer    |R-omk
    R-omk    |Sarke
    Sarke    | -|PaperBoardOfficial
    PaperBoardOfficial    |OlegOAndreev
    OlegOAndreev    |Naam
    Naam    |NaccOll
    NaccOll    |kvokka
    kvokka    |ecmasx
    ecmasx    | -|mollux
    mollux    |marvijo-code
    marvijo-code    |markijbema
    markijbema    |mamertofabian
    mamertofabian    |monkeyDluffy6017
    monkeyDluffy6017    |libertyteeth
    libertyteeth    | -|shtse8
    shtse8    |Rexarrior
    Rexarrior    |kevinvandijk
    kevinvandijk    |KevinZhao
    KevinZhao    |ksze
    ksze    |Juice10
    Juice10    | -|snova-jorgep
    snova-jorgep    |Fovty
    Fovty    |Jdo300
    Jdo300    |hesara
    hesara    |DeXtroTip
    DeXtroTip    | | + +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | +| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | +| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | +| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | +| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | +| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | +| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | +| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | +| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | +| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | +| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | +| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | +| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | +| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | +| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | +| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | +| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | +| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | +| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | +| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | +| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | +| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | +| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | +| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | +| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | +| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | +| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | +| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | +| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | +| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | +| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | +| DeXtroTip
    DeXtroTip     | | | | | | + ## Llicència diff --git a/locales/de/README.md b/locales/de/README.md index 46f724a160..e25e161e8a 100644 --- a/locales/de/README.md +++ b/locales/de/README.md @@ -181,45 +181,48 @@ Wir lieben Community-Beiträge! Beginnen Sie mit dem Lesen unserer [CONTRIBUTING Danke an alle unsere Mitwirkenden, die geholfen haben, Roo Code zu verbessern! -|mrubens
    mrubens    |saoudrizwan
    saoudrizwan    |cte
    cte    |daniel-lxs
    daniel-lxs    |samhvw8
    samhvw8    |hannesrudolph
    hannesrudolph    | -|:---:|:---:|:---:|:---:|:---:|:---:| -|KJ7LNW
    KJ7LNW    |a8trejo
    a8trejo    |MuriloFP
    MuriloFP    |ColemanRoo
    ColemanRoo    |canrobins13
    canrobins13    |stea9499
    stea9499    | -|joemanley201
    joemanley201    |System233
    System233    |jr
    jr    |nissa-seru
    nissa-seru    |jquanton
    jquanton    |roomote-agent
    roomote-agent    | -|NyxJae
    NyxJae    |d-oit
    d-oit    |elianiva
    elianiva    |qdaxb
    qdaxb    |punkpeye
    punkpeye    |wkordalski
    wkordalski    | -|SannidhyaSah
    SannidhyaSah    |xyOz-dev
    xyOz-dev    |chrarnoldus
    chrarnoldus    |sachasayan
    sachasayan    |Smartsheet-JB-Brown
    Smartsheet-JB-Brown    |monotykamary
    monotykamary    | -|cannuri
    cannuri    |feifei325
    feifei325    |zhangtony239
    zhangtony239    |shariqriazz
    shariqriazz    |vigneshsubbiah16
    vigneshsubbiah16    |pugazhendhi-m
    pugazhendhi-m    | -|lloydchang
    lloydchang    |dtrugman
    dtrugman    |Szpadel
    Szpadel    |hassoncs
    hassoncs    |liwilliam2021
    liwilliam2021    |lupuletic
    lupuletic    | -|kiwina
    kiwina    |Premshay
    Premshay    |psv2522
    psv2522    |olweraltuve
    olweraltuve    |diarmidmackenzie
    diarmidmackenzie    |ChuKhaLi
    ChuKhaLi    | -|PeterDaveHello
    PeterDaveHello    |aheizi
    aheizi    |nbihan-mediware
    nbihan-mediware    |noritaka1166
    noritaka1166    |RaySinner
    RaySinner    |afshawnlotfi
    afshawnlotfi    | -|dleffel
    dleffel    |StevenTCramer
    StevenTCramer    |Ruakij
    Ruakij    |pdecat
    pdecat    |kyle-apex
    kyle-apex    |emshvac
    emshvac    | -|Lunchb0ne
    Lunchb0ne    |SmartManoj
    SmartManoj    |vagadiya
    vagadiya    |slytechnical
    slytechnical    |dlab-anton
    dlab-anton    |arthurauffray
    arthurauffray    | -|upamune
    upamune    |NamesMT
    NamesMT    |taylorwilsdon
    taylorwilsdon    |sammcj
    sammcj    |p12tic
    p12tic    |gtaylor
    gtaylor    | -|brunobergher
    brunobergher    |aitoroses
    aitoroses    |ross
    ross    |mr-ryan-james
    mr-ryan-james    |heyseth
    heyseth    |taisukeoe
    taisukeoe    | -|avtc
    avtc    |eonghk
    eonghk    |GOODBOY008
    GOODBOY008    |kcwhite
    kcwhite    |ronyblum
    ronyblum    |teddyOOXX
    teddyOOXX    | -|vincentsong
    vincentsong    |yongjer
    yongjer    |zeozeozeo
    zeozeozeo    |ashktn
    ashktn    |franekp
    franekp    |yt3trees
    yt3trees    | -|seedlord
    seedlord    |bramburn
    bramburn    |anton-otee
    anton-otee    |benzntech
    benzntech    |axkirillov
    axkirillov    |olearycrew
    olearycrew    | -|catrielmuller
    catrielmuller    |devxpain
    devxpain    |snoyiatk
    snoyiatk    |GitlyHallows
    GitlyHallows    |jcbdev
    jcbdev    |Chenjiayuan195
    Chenjiayuan195    | -|julionav
    julionav    |KanTakahiro
    KanTakahiro    |SplittyDev
    SplittyDev    |mdp
    mdp    |napter
    napter    |philfung
    philfung    | -|bannzai
    bannzai    |bbenshalom
    bbenshalom    |chris-garrett
    chris-garrett    |dairui1
    dairui1    |dqroid
    dqroid    |janaki-sasidhar
    janaki-sasidhar    | -|forestyoo
    forestyoo    |hatsu38
    hatsu38    |hongzio
    hongzio    |im47cn
    im47cn    |shoopapa
    shoopapa    |jwcraig
    jwcraig    | -|axmo
    axmo    |asychin
    asychin    |amittell
    amittell    |Yoshino-Yukitaro
    Yoshino-Yukitaro    |Yikai-Liao
    Yikai-Liao    |zxdvd
    zxdvd    | -|s97712
    s97712    |vladstudio
    vladstudio    |vivekfyi
    vivekfyi    |HahaBill
    HahaBill    |tmsjngx0
    tmsjngx0    |TGlide
    TGlide    | -|Githubguy132010
    Githubguy132010    |tgfjt
    tgfjt    |maekawataiki
    maekawataiki    |nevermorec
    nevermorec    |PretzelVector
    PretzelVector    |zetaloop
    zetaloop    | -|cdlliuy
    cdlliuy    |user202729
    user202729    |thill2323
    thill2323    |takakoutso
    takakoutso    |student20880
    student20880    |shubhamgupta731
    shubhamgupta731    | -|shohei-ihaya
    shohei-ihaya    |shivamd1810
    shivamd1810    |shaybc
    shaybc    |sensei-woo
    sensei-woo    |samir-nimbly
    samir-nimbly    |robertheadley
    robertheadley    | -|refactorthis
    refactorthis    |qingyuan1109
    qingyuan1109    |pokutuna
    pokutuna    |philipnext
    philipnext    |village-way
    village-way    |oprstchn
    oprstchn    | -|nobu007
    nobu007    |mosleyit
    mosleyit    |moqimoqidea
    moqimoqidea    |mlopezr
    mlopezr    |mecab
    mecab    |olup
    olup    | -|lightrabbit
    lightrabbit    |lhish
    lhish    |kohii
    kohii    |kinandan
    kinandan    |AlexandruSmirnov
    AlexandruSmirnov    |pfitz
    pfitz    | -|ExactDoug
    ExactDoug    |celestial-vault
    celestial-vault    |linegel
    linegel    |edwin-truthsearch-io
    edwin-truthsearch-io    |EamonNerbonne
    EamonNerbonne    |dbasclpy
    dbasclpy    | -|dflatline
    dflatline    |Deon588
    Deon588    |dleen
    dleen    |CW-B-W
    CW-B-W    |chadgauth
    chadgauth    |thecolorblue
    thecolorblue    | -|bogdan0083
    bogdan0083    |benashby
    benashby    |Atlogit
    Atlogit    |atlasgong
    atlasgong    |AntiMoron
    AntiMoron    |andrewshu2000
    andrewshu2000    | -|andreastempsch
    andreastempsch    |alasano
    alasano    |QuinsZouls
    QuinsZouls    |HadesArchitect
    HadesArchitect    |alarno
    alarno    |nexon33
    nexon33    | -|adilhafeez
    adilhafeez    |adamwlarson
    adamwlarson    |adamhill
    adamhill    |AMHesch
    AMHesch    |adambrand
    adambrand    |samsilveira
    samsilveira    | -|01Rian
    01Rian    |RSO
    RSO    |RandalSchwartz
    RandalSchwartz    |SECKainersdorfer
    SECKainersdorfer    |R-omk
    R-omk    |Sarke
    Sarke    | -|PaperBoardOfficial
    PaperBoardOfficial    |OlegOAndreev
    OlegOAndreev    |Naam
    Naam    |NaccOll
    NaccOll    |kvokka
    kvokka    |ecmasx
    ecmasx    | -|mollux
    mollux    |marvijo-code
    marvijo-code    |markijbema
    markijbema    |mamertofabian
    mamertofabian    |monkeyDluffy6017
    monkeyDluffy6017    |libertyteeth
    libertyteeth    | -|shtse8
    shtse8    |Rexarrior
    Rexarrior    |kevinvandijk
    kevinvandijk    |KevinZhao
    KevinZhao    |ksze
    ksze    |Juice10
    Juice10    | -|snova-jorgep
    snova-jorgep    |Fovty
    Fovty    |Jdo300
    Jdo300    |hesara
    hesara    |DeXtroTip
    DeXtroTip    | | + +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | +| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | +| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | +| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | +| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | +| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | +| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | +| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | +| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | +| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | +| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | +| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | +| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | +| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | +| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | +| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | +| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | +| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | +| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | +| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | +| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | +| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | +| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | +| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | +| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | +| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | +| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | +| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | +| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | +| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | +| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | +| DeXtroTip
    DeXtroTip     | | | | | | + ## Lizenz diff --git a/locales/es/README.md b/locales/es/README.md index 299df96be2..46b2c71aa2 100644 --- a/locales/es/README.md +++ b/locales/es/README.md @@ -181,45 +181,48 @@ Usamos [changesets](https://github.com/changesets/changesets) para versionar y p ¡Gracias a todos nuestros colaboradores que han ayudado a mejorar Roo Code! -|mrubens
    mrubens    |saoudrizwan
    saoudrizwan    |cte
    cte    |daniel-lxs
    daniel-lxs    |samhvw8
    samhvw8    |hannesrudolph
    hannesrudolph    | -|:---:|:---:|:---:|:---:|:---:|:---:| -|KJ7LNW
    KJ7LNW    |a8trejo
    a8trejo    |MuriloFP
    MuriloFP    |ColemanRoo
    ColemanRoo    |canrobins13
    canrobins13    |stea9499
    stea9499    | -|joemanley201
    joemanley201    |System233
    System233    |jr
    jr    |nissa-seru
    nissa-seru    |jquanton
    jquanton    |roomote-agent
    roomote-agent    | -|NyxJae
    NyxJae    |d-oit
    d-oit    |elianiva
    elianiva    |qdaxb
    qdaxb    |punkpeye
    punkpeye    |wkordalski
    wkordalski    | -|SannidhyaSah
    SannidhyaSah    |xyOz-dev
    xyOz-dev    |chrarnoldus
    chrarnoldus    |sachasayan
    sachasayan    |Smartsheet-JB-Brown
    Smartsheet-JB-Brown    |monotykamary
    monotykamary    | -|cannuri
    cannuri    |feifei325
    feifei325    |zhangtony239
    zhangtony239    |shariqriazz
    shariqriazz    |vigneshsubbiah16
    vigneshsubbiah16    |pugazhendhi-m
    pugazhendhi-m    | -|lloydchang
    lloydchang    |dtrugman
    dtrugman    |Szpadel
    Szpadel    |hassoncs
    hassoncs    |liwilliam2021
    liwilliam2021    |lupuletic
    lupuletic    | -|kiwina
    kiwina    |Premshay
    Premshay    |psv2522
    psv2522    |olweraltuve
    olweraltuve    |diarmidmackenzie
    diarmidmackenzie    |ChuKhaLi
    ChuKhaLi    | -|PeterDaveHello
    PeterDaveHello    |aheizi
    aheizi    |nbihan-mediware
    nbihan-mediware    |noritaka1166
    noritaka1166    |RaySinner
    RaySinner    |afshawnlotfi
    afshawnlotfi    | -|dleffel
    dleffel    |StevenTCramer
    StevenTCramer    |Ruakij
    Ruakij    |pdecat
    pdecat    |kyle-apex
    kyle-apex    |emshvac
    emshvac    | -|Lunchb0ne
    Lunchb0ne    |SmartManoj
    SmartManoj    |vagadiya
    vagadiya    |slytechnical
    slytechnical    |dlab-anton
    dlab-anton    |arthurauffray
    arthurauffray    | -|upamune
    upamune    |NamesMT
    NamesMT    |taylorwilsdon
    taylorwilsdon    |sammcj
    sammcj    |p12tic
    p12tic    |gtaylor
    gtaylor    | -|brunobergher
    brunobergher    |aitoroses
    aitoroses    |ross
    ross    |mr-ryan-james
    mr-ryan-james    |heyseth
    heyseth    |taisukeoe
    taisukeoe    | -|avtc
    avtc    |eonghk
    eonghk    |GOODBOY008
    GOODBOY008    |kcwhite
    kcwhite    |ronyblum
    ronyblum    |teddyOOXX
    teddyOOXX    | -|vincentsong
    vincentsong    |yongjer
    yongjer    |zeozeozeo
    zeozeozeo    |ashktn
    ashktn    |franekp
    franekp    |yt3trees
    yt3trees    | -|seedlord
    seedlord    |bramburn
    bramburn    |anton-otee
    anton-otee    |benzntech
    benzntech    |axkirillov
    axkirillov    |olearycrew
    olearycrew    | -|catrielmuller
    catrielmuller    |devxpain
    devxpain    |snoyiatk
    snoyiatk    |GitlyHallows
    GitlyHallows    |jcbdev
    jcbdev    |Chenjiayuan195
    Chenjiayuan195    | -|julionav
    julionav    |KanTakahiro
    KanTakahiro    |SplittyDev
    SplittyDev    |mdp
    mdp    |napter
    napter    |philfung
    philfung    | -|bannzai
    bannzai    |bbenshalom
    bbenshalom    |chris-garrett
    chris-garrett    |dairui1
    dairui1    |dqroid
    dqroid    |janaki-sasidhar
    janaki-sasidhar    | -|forestyoo
    forestyoo    |hatsu38
    hatsu38    |hongzio
    hongzio    |im47cn
    im47cn    |shoopapa
    shoopapa    |jwcraig
    jwcraig    | -|axmo
    axmo    |asychin
    asychin    |amittell
    amittell    |Yoshino-Yukitaro
    Yoshino-Yukitaro    |Yikai-Liao
    Yikai-Liao    |zxdvd
    zxdvd    | -|s97712
    s97712    |vladstudio
    vladstudio    |vivekfyi
    vivekfyi    |HahaBill
    HahaBill    |tmsjngx0
    tmsjngx0    |TGlide
    TGlide    | -|Githubguy132010
    Githubguy132010    |tgfjt
    tgfjt    |maekawataiki
    maekawataiki    |nevermorec
    nevermorec    |PretzelVector
    PretzelVector    |zetaloop
    zetaloop    | -|cdlliuy
    cdlliuy    |user202729
    user202729    |thill2323
    thill2323    |takakoutso
    takakoutso    |student20880
    student20880    |shubhamgupta731
    shubhamgupta731    | -|shohei-ihaya
    shohei-ihaya    |shivamd1810
    shivamd1810    |shaybc
    shaybc    |sensei-woo
    sensei-woo    |samir-nimbly
    samir-nimbly    |robertheadley
    robertheadley    | -|refactorthis
    refactorthis    |qingyuan1109
    qingyuan1109    |pokutuna
    pokutuna    |philipnext
    philipnext    |village-way
    village-way    |oprstchn
    oprstchn    | -|nobu007
    nobu007    |mosleyit
    mosleyit    |moqimoqidea
    moqimoqidea    |mlopezr
    mlopezr    |mecab
    mecab    |olup
    olup    | -|lightrabbit
    lightrabbit    |lhish
    lhish    |kohii
    kohii    |kinandan
    kinandan    |AlexandruSmirnov
    AlexandruSmirnov    |pfitz
    pfitz    | -|ExactDoug
    ExactDoug    |celestial-vault
    celestial-vault    |linegel
    linegel    |edwin-truthsearch-io
    edwin-truthsearch-io    |EamonNerbonne
    EamonNerbonne    |dbasclpy
    dbasclpy    | -|dflatline
    dflatline    |Deon588
    Deon588    |dleen
    dleen    |CW-B-W
    CW-B-W    |chadgauth
    chadgauth    |thecolorblue
    thecolorblue    | -|bogdan0083
    bogdan0083    |benashby
    benashby    |Atlogit
    Atlogit    |atlasgong
    atlasgong    |AntiMoron
    AntiMoron    |andrewshu2000
    andrewshu2000    | -|andreastempsch
    andreastempsch    |alasano
    alasano    |QuinsZouls
    QuinsZouls    |HadesArchitect
    HadesArchitect    |alarno
    alarno    |nexon33
    nexon33    | -|adilhafeez
    adilhafeez    |adamwlarson
    adamwlarson    |adamhill
    adamhill    |AMHesch
    AMHesch    |adambrand
    adambrand    |samsilveira
    samsilveira    | -|01Rian
    01Rian    |RSO
    RSO    |RandalSchwartz
    RandalSchwartz    |SECKainersdorfer
    SECKainersdorfer    |R-omk
    R-omk    |Sarke
    Sarke    | -|PaperBoardOfficial
    PaperBoardOfficial    |OlegOAndreev
    OlegOAndreev    |Naam
    Naam    |NaccOll
    NaccOll    |kvokka
    kvokka    |ecmasx
    ecmasx    | -|mollux
    mollux    |marvijo-code
    marvijo-code    |markijbema
    markijbema    |mamertofabian
    mamertofabian    |monkeyDluffy6017
    monkeyDluffy6017    |libertyteeth
    libertyteeth    | -|shtse8
    shtse8    |Rexarrior
    Rexarrior    |kevinvandijk
    kevinvandijk    |KevinZhao
    KevinZhao    |ksze
    ksze    |Juice10
    Juice10    | -|snova-jorgep
    snova-jorgep    |Fovty
    Fovty    |Jdo300
    Jdo300    |hesara
    hesara    |DeXtroTip
    DeXtroTip    | | + +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | +| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | +| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | +| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | +| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | +| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | +| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | +| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | +| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | +| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | +| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | +| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | +| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | +| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | +| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | +| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | +| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | +| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | +| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | +| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | +| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | +| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | +| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | +| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | +| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | +| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | +| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | +| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | +| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | +| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | +| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | +| DeXtroTip
    DeXtroTip     | | | | | | + ## Licencia diff --git a/locales/fr/README.md b/locales/fr/README.md index 7ae93b252c..322553da92 100644 --- a/locales/fr/README.md +++ b/locales/fr/README.md @@ -181,45 +181,48 @@ Nous adorons les contributions de la communauté ! Commencez par lire notre [CON Merci à tous nos contributeurs qui ont aidé à améliorer Roo Code ! -|mrubens
    mrubens    |saoudrizwan
    saoudrizwan    |cte
    cte    |daniel-lxs
    daniel-lxs    |samhvw8
    samhvw8    |hannesrudolph
    hannesrudolph    | -|:---:|:---:|:---:|:---:|:---:|:---:| -|KJ7LNW
    KJ7LNW    |a8trejo
    a8trejo    |MuriloFP
    MuriloFP    |ColemanRoo
    ColemanRoo    |canrobins13
    canrobins13    |stea9499
    stea9499    | -|joemanley201
    joemanley201    |System233
    System233    |jr
    jr    |nissa-seru
    nissa-seru    |jquanton
    jquanton    |roomote-agent
    roomote-agent    | -|NyxJae
    NyxJae    |d-oit
    d-oit    |elianiva
    elianiva    |qdaxb
    qdaxb    |punkpeye
    punkpeye    |wkordalski
    wkordalski    | -|SannidhyaSah
    SannidhyaSah    |xyOz-dev
    xyOz-dev    |chrarnoldus
    chrarnoldus    |sachasayan
    sachasayan    |Smartsheet-JB-Brown
    Smartsheet-JB-Brown    |monotykamary
    monotykamary    | -|cannuri
    cannuri    |feifei325
    feifei325    |zhangtony239
    zhangtony239    |shariqriazz
    shariqriazz    |vigneshsubbiah16
    vigneshsubbiah16    |pugazhendhi-m
    pugazhendhi-m    | -|lloydchang
    lloydchang    |dtrugman
    dtrugman    |Szpadel
    Szpadel    |hassoncs
    hassoncs    |liwilliam2021
    liwilliam2021    |lupuletic
    lupuletic    | -|kiwina
    kiwina    |Premshay
    Premshay    |psv2522
    psv2522    |olweraltuve
    olweraltuve    |diarmidmackenzie
    diarmidmackenzie    |ChuKhaLi
    ChuKhaLi    | -|PeterDaveHello
    PeterDaveHello    |aheizi
    aheizi    |nbihan-mediware
    nbihan-mediware    |noritaka1166
    noritaka1166    |RaySinner
    RaySinner    |afshawnlotfi
    afshawnlotfi    | -|dleffel
    dleffel    |StevenTCramer
    StevenTCramer    |Ruakij
    Ruakij    |pdecat
    pdecat    |kyle-apex
    kyle-apex    |emshvac
    emshvac    | -|Lunchb0ne
    Lunchb0ne    |SmartManoj
    SmartManoj    |vagadiya
    vagadiya    |slytechnical
    slytechnical    |dlab-anton
    dlab-anton    |arthurauffray
    arthurauffray    | -|upamune
    upamune    |NamesMT
    NamesMT    |taylorwilsdon
    taylorwilsdon    |sammcj
    sammcj    |p12tic
    p12tic    |gtaylor
    gtaylor    | -|brunobergher
    brunobergher    |aitoroses
    aitoroses    |ross
    ross    |mr-ryan-james
    mr-ryan-james    |heyseth
    heyseth    |taisukeoe
    taisukeoe    | -|avtc
    avtc    |eonghk
    eonghk    |GOODBOY008
    GOODBOY008    |kcwhite
    kcwhite    |ronyblum
    ronyblum    |teddyOOXX
    teddyOOXX    | -|vincentsong
    vincentsong    |yongjer
    yongjer    |zeozeozeo
    zeozeozeo    |ashktn
    ashktn    |franekp
    franekp    |yt3trees
    yt3trees    | -|seedlord
    seedlord    |bramburn
    bramburn    |anton-otee
    anton-otee    |benzntech
    benzntech    |axkirillov
    axkirillov    |olearycrew
    olearycrew    | -|catrielmuller
    catrielmuller    |devxpain
    devxpain    |snoyiatk
    snoyiatk    |GitlyHallows
    GitlyHallows    |jcbdev
    jcbdev    |Chenjiayuan195
    Chenjiayuan195    | -|julionav
    julionav    |KanTakahiro
    KanTakahiro    |SplittyDev
    SplittyDev    |mdp
    mdp    |napter
    napter    |philfung
    philfung    | -|bannzai
    bannzai    |bbenshalom
    bbenshalom    |chris-garrett
    chris-garrett    |dairui1
    dairui1    |dqroid
    dqroid    |janaki-sasidhar
    janaki-sasidhar    | -|forestyoo
    forestyoo    |hatsu38
    hatsu38    |hongzio
    hongzio    |im47cn
    im47cn    |shoopapa
    shoopapa    |jwcraig
    jwcraig    | -|axmo
    axmo    |asychin
    asychin    |amittell
    amittell    |Yoshino-Yukitaro
    Yoshino-Yukitaro    |Yikai-Liao
    Yikai-Liao    |zxdvd
    zxdvd    | -|s97712
    s97712    |vladstudio
    vladstudio    |vivekfyi
    vivekfyi    |HahaBill
    HahaBill    |tmsjngx0
    tmsjngx0    |TGlide
    TGlide    | -|Githubguy132010
    Githubguy132010    |tgfjt
    tgfjt    |maekawataiki
    maekawataiki    |nevermorec
    nevermorec    |PretzelVector
    PretzelVector    |zetaloop
    zetaloop    | -|cdlliuy
    cdlliuy    |user202729
    user202729    |thill2323
    thill2323    |takakoutso
    takakoutso    |student20880
    student20880    |shubhamgupta731
    shubhamgupta731    | -|shohei-ihaya
    shohei-ihaya    |shivamd1810
    shivamd1810    |shaybc
    shaybc    |sensei-woo
    sensei-woo    |samir-nimbly
    samir-nimbly    |robertheadley
    robertheadley    | -|refactorthis
    refactorthis    |qingyuan1109
    qingyuan1109    |pokutuna
    pokutuna    |philipnext
    philipnext    |village-way
    village-way    |oprstchn
    oprstchn    | -|nobu007
    nobu007    |mosleyit
    mosleyit    |moqimoqidea
    moqimoqidea    |mlopezr
    mlopezr    |mecab
    mecab    |olup
    olup    | -|lightrabbit
    lightrabbit    |lhish
    lhish    |kohii
    kohii    |kinandan
    kinandan    |AlexandruSmirnov
    AlexandruSmirnov    |pfitz
    pfitz    | -|ExactDoug
    ExactDoug    |celestial-vault
    celestial-vault    |linegel
    linegel    |edwin-truthsearch-io
    edwin-truthsearch-io    |EamonNerbonne
    EamonNerbonne    |dbasclpy
    dbasclpy    | -|dflatline
    dflatline    |Deon588
    Deon588    |dleen
    dleen    |CW-B-W
    CW-B-W    |chadgauth
    chadgauth    |thecolorblue
    thecolorblue    | -|bogdan0083
    bogdan0083    |benashby
    benashby    |Atlogit
    Atlogit    |atlasgong
    atlasgong    |AntiMoron
    AntiMoron    |andrewshu2000
    andrewshu2000    | -|andreastempsch
    andreastempsch    |alasano
    alasano    |QuinsZouls
    QuinsZouls    |HadesArchitect
    HadesArchitect    |alarno
    alarno    |nexon33
    nexon33    | -|adilhafeez
    adilhafeez    |adamwlarson
    adamwlarson    |adamhill
    adamhill    |AMHesch
    AMHesch    |adambrand
    adambrand    |samsilveira
    samsilveira    | -|01Rian
    01Rian    |RSO
    RSO    |RandalSchwartz
    RandalSchwartz    |SECKainersdorfer
    SECKainersdorfer    |R-omk
    R-omk    |Sarke
    Sarke    | -|PaperBoardOfficial
    PaperBoardOfficial    |OlegOAndreev
    OlegOAndreev    |Naam
    Naam    |NaccOll
    NaccOll    |kvokka
    kvokka    |ecmasx
    ecmasx    | -|mollux
    mollux    |marvijo-code
    marvijo-code    |markijbema
    markijbema    |mamertofabian
    mamertofabian    |monkeyDluffy6017
    monkeyDluffy6017    |libertyteeth
    libertyteeth    | -|shtse8
    shtse8    |Rexarrior
    Rexarrior    |kevinvandijk
    kevinvandijk    |KevinZhao
    KevinZhao    |ksze
    ksze    |Juice10
    Juice10    | -|snova-jorgep
    snova-jorgep    |Fovty
    Fovty    |Jdo300
    Jdo300    |hesara
    hesara    |DeXtroTip
    DeXtroTip    | | + +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | +| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | +| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | +| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | +| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | +| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | +| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | +| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | +| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | +| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | +| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | +| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | +| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | +| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | +| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | +| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | +| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | +| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | +| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | +| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | +| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | +| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | +| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | +| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | +| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | +| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | +| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | +| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | +| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | +| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | +| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | +| DeXtroTip
    DeXtroTip     | | | | | | + ## Licence diff --git a/locales/hi/README.md b/locales/hi/README.md index 1de6b51de2..79412b5160 100644 --- a/locales/hi/README.md +++ b/locales/hi/README.md @@ -181,45 +181,48 @@ code --install-extension bin/roo-cline-.vsix Roo Code को बेहतर बनाने में मदद करने वाले हमारे सभी योगदानकर्ताओं को धन्यवाद! -|mrubens
    mrubens    |saoudrizwan
    saoudrizwan    |cte
    cte    |daniel-lxs
    daniel-lxs    |samhvw8
    samhvw8    |hannesrudolph
    hannesrudolph    | -|:---:|:---:|:---:|:---:|:---:|:---:| -|KJ7LNW
    KJ7LNW    |a8trejo
    a8trejo    |MuriloFP
    MuriloFP    |ColemanRoo
    ColemanRoo    |canrobins13
    canrobins13    |stea9499
    stea9499    | -|joemanley201
    joemanley201    |System233
    System233    |jr
    jr    |nissa-seru
    nissa-seru    |jquanton
    jquanton    |roomote-agent
    roomote-agent    | -|NyxJae
    NyxJae    |d-oit
    d-oit    |elianiva
    elianiva    |qdaxb
    qdaxb    |punkpeye
    punkpeye    |wkordalski
    wkordalski    | -|SannidhyaSah
    SannidhyaSah    |xyOz-dev
    xyOz-dev    |chrarnoldus
    chrarnoldus    |sachasayan
    sachasayan    |Smartsheet-JB-Brown
    Smartsheet-JB-Brown    |monotykamary
    monotykamary    | -|cannuri
    cannuri    |feifei325
    feifei325    |zhangtony239
    zhangtony239    |shariqriazz
    shariqriazz    |vigneshsubbiah16
    vigneshsubbiah16    |pugazhendhi-m
    pugazhendhi-m    | -|lloydchang
    lloydchang    |dtrugman
    dtrugman    |Szpadel
    Szpadel    |hassoncs
    hassoncs    |liwilliam2021
    liwilliam2021    |lupuletic
    lupuletic    | -|kiwina
    kiwina    |Premshay
    Premshay    |psv2522
    psv2522    |olweraltuve
    olweraltuve    |diarmidmackenzie
    diarmidmackenzie    |ChuKhaLi
    ChuKhaLi    | -|PeterDaveHello
    PeterDaveHello    |aheizi
    aheizi    |nbihan-mediware
    nbihan-mediware    |noritaka1166
    noritaka1166    |RaySinner
    RaySinner    |afshawnlotfi
    afshawnlotfi    | -|dleffel
    dleffel    |StevenTCramer
    StevenTCramer    |Ruakij
    Ruakij    |pdecat
    pdecat    |kyle-apex
    kyle-apex    |emshvac
    emshvac    | -|Lunchb0ne
    Lunchb0ne    |SmartManoj
    SmartManoj    |vagadiya
    vagadiya    |slytechnical
    slytechnical    |dlab-anton
    dlab-anton    |arthurauffray
    arthurauffray    | -|upamune
    upamune    |NamesMT
    NamesMT    |taylorwilsdon
    taylorwilsdon    |sammcj
    sammcj    |p12tic
    p12tic    |gtaylor
    gtaylor    | -|brunobergher
    brunobergher    |aitoroses
    aitoroses    |ross
    ross    |mr-ryan-james
    mr-ryan-james    |heyseth
    heyseth    |taisukeoe
    taisukeoe    | -|avtc
    avtc    |eonghk
    eonghk    |GOODBOY008
    GOODBOY008    |kcwhite
    kcwhite    |ronyblum
    ronyblum    |teddyOOXX
    teddyOOXX    | -|vincentsong
    vincentsong    |yongjer
    yongjer    |zeozeozeo
    zeozeozeo    |ashktn
    ashktn    |franekp
    franekp    |yt3trees
    yt3trees    | -|seedlord
    seedlord    |bramburn
    bramburn    |anton-otee
    anton-otee    |benzntech
    benzntech    |axkirillov
    axkirillov    |olearycrew
    olearycrew    | -|catrielmuller
    catrielmuller    |devxpain
    devxpain    |snoyiatk
    snoyiatk    |GitlyHallows
    GitlyHallows    |jcbdev
    jcbdev    |Chenjiayuan195
    Chenjiayuan195    | -|julionav
    julionav    |KanTakahiro
    KanTakahiro    |SplittyDev
    SplittyDev    |mdp
    mdp    |napter
    napter    |philfung
    philfung    | -|bannzai
    bannzai    |bbenshalom
    bbenshalom    |chris-garrett
    chris-garrett    |dairui1
    dairui1    |dqroid
    dqroid    |janaki-sasidhar
    janaki-sasidhar    | -|forestyoo
    forestyoo    |hatsu38
    hatsu38    |hongzio
    hongzio    |im47cn
    im47cn    |shoopapa
    shoopapa    |jwcraig
    jwcraig    | -|axmo
    axmo    |asychin
    asychin    |amittell
    amittell    |Yoshino-Yukitaro
    Yoshino-Yukitaro    |Yikai-Liao
    Yikai-Liao    |zxdvd
    zxdvd    | -|s97712
    s97712    |vladstudio
    vladstudio    |vivekfyi
    vivekfyi    |HahaBill
    HahaBill    |tmsjngx0
    tmsjngx0    |TGlide
    TGlide    | -|Githubguy132010
    Githubguy132010    |tgfjt
    tgfjt    |maekawataiki
    maekawataiki    |nevermorec
    nevermorec    |PretzelVector
    PretzelVector    |zetaloop
    zetaloop    | -|cdlliuy
    cdlliuy    |user202729
    user202729    |thill2323
    thill2323    |takakoutso
    takakoutso    |student20880
    student20880    |shubhamgupta731
    shubhamgupta731    | -|shohei-ihaya
    shohei-ihaya    |shivamd1810
    shivamd1810    |shaybc
    shaybc    |sensei-woo
    sensei-woo    |samir-nimbly
    samir-nimbly    |robertheadley
    robertheadley    | -|refactorthis
    refactorthis    |qingyuan1109
    qingyuan1109    |pokutuna
    pokutuna    |philipnext
    philipnext    |village-way
    village-way    |oprstchn
    oprstchn    | -|nobu007
    nobu007    |mosleyit
    mosleyit    |moqimoqidea
    moqimoqidea    |mlopezr
    mlopezr    |mecab
    mecab    |olup
    olup    | -|lightrabbit
    lightrabbit    |lhish
    lhish    |kohii
    kohii    |kinandan
    kinandan    |AlexandruSmirnov
    AlexandruSmirnov    |pfitz
    pfitz    | -|ExactDoug
    ExactDoug    |celestial-vault
    celestial-vault    |linegel
    linegel    |edwin-truthsearch-io
    edwin-truthsearch-io    |EamonNerbonne
    EamonNerbonne    |dbasclpy
    dbasclpy    | -|dflatline
    dflatline    |Deon588
    Deon588    |dleen
    dleen    |CW-B-W
    CW-B-W    |chadgauth
    chadgauth    |thecolorblue
    thecolorblue    | -|bogdan0083
    bogdan0083    |benashby
    benashby    |Atlogit
    Atlogit    |atlasgong
    atlasgong    |AntiMoron
    AntiMoron    |andrewshu2000
    andrewshu2000    | -|andreastempsch
    andreastempsch    |alasano
    alasano    |QuinsZouls
    QuinsZouls    |HadesArchitect
    HadesArchitect    |alarno
    alarno    |nexon33
    nexon33    | -|adilhafeez
    adilhafeez    |adamwlarson
    adamwlarson    |adamhill
    adamhill    |AMHesch
    AMHesch    |adambrand
    adambrand    |samsilveira
    samsilveira    | -|01Rian
    01Rian    |RSO
    RSO    |RandalSchwartz
    RandalSchwartz    |SECKainersdorfer
    SECKainersdorfer    |R-omk
    R-omk    |Sarke
    Sarke    | -|PaperBoardOfficial
    PaperBoardOfficial    |OlegOAndreev
    OlegOAndreev    |Naam
    Naam    |NaccOll
    NaccOll    |kvokka
    kvokka    |ecmasx
    ecmasx    | -|mollux
    mollux    |marvijo-code
    marvijo-code    |markijbema
    markijbema    |mamertofabian
    mamertofabian    |monkeyDluffy6017
    monkeyDluffy6017    |libertyteeth
    libertyteeth    | -|shtse8
    shtse8    |Rexarrior
    Rexarrior    |kevinvandijk
    kevinvandijk    |KevinZhao
    KevinZhao    |ksze
    ksze    |Juice10
    Juice10    | -|snova-jorgep
    snova-jorgep    |Fovty
    Fovty    |Jdo300
    Jdo300    |hesara
    hesara    |DeXtroTip
    DeXtroTip    | | + +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | +| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | +| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | +| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | +| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | +| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | +| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | +| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | +| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | +| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | +| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | +| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | +| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | +| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | +| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | +| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | +| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | +| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | +| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | +| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | +| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | +| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | +| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | +| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | +| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | +| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | +| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | +| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | +| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | +| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | +| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | +| DeXtroTip
    DeXtroTip     | | | | | | + ## लाइसेंस diff --git a/locales/id/README.md b/locales/id/README.md index 535d3005bd..23a241e8e8 100644 --- a/locales/id/README.md +++ b/locales/id/README.md @@ -175,45 +175,48 @@ Kami menyukai kontribusi komunitas! Mulai dengan membaca [CONTRIBUTING.md](CONTR Terima kasih kepada semua kontributor kami yang telah membantu membuat Roo Code lebih baik! -|mrubens
    mrubens    |saoudrizwan
    saoudrizwan    |cte
    cte    |daniel-lxs
    daniel-lxs    |samhvw8
    samhvw8    |hannesrudolph
    hannesrudolph    | -|:---:|:---:|:---:|:---:|:---:|:---:| -|KJ7LNW
    KJ7LNW    |a8trejo
    a8trejo    |MuriloFP
    MuriloFP    |ColemanRoo
    ColemanRoo    |canrobins13
    canrobins13    |stea9499
    stea9499    | -|joemanley201
    joemanley201    |System233
    System233    |jr
    jr    |nissa-seru
    nissa-seru    |jquanton
    jquanton    |roomote-agent
    roomote-agent    | -|NyxJae
    NyxJae    |d-oit
    d-oit    |elianiva
    elianiva    |qdaxb
    qdaxb    |punkpeye
    punkpeye    |wkordalski
    wkordalski    | -|SannidhyaSah
    SannidhyaSah    |xyOz-dev
    xyOz-dev    |chrarnoldus
    chrarnoldus    |sachasayan
    sachasayan    |Smartsheet-JB-Brown
    Smartsheet-JB-Brown    |monotykamary
    monotykamary    | -|cannuri
    cannuri    |feifei325
    feifei325    |zhangtony239
    zhangtony239    |shariqriazz
    shariqriazz    |vigneshsubbiah16
    vigneshsubbiah16    |pugazhendhi-m
    pugazhendhi-m    | -|lloydchang
    lloydchang    |dtrugman
    dtrugman    |Szpadel
    Szpadel    |hassoncs
    hassoncs    |liwilliam2021
    liwilliam2021    |lupuletic
    lupuletic    | -|kiwina
    kiwina    |Premshay
    Premshay    |psv2522
    psv2522    |olweraltuve
    olweraltuve    |diarmidmackenzie
    diarmidmackenzie    |ChuKhaLi
    ChuKhaLi    | -|PeterDaveHello
    PeterDaveHello    |aheizi
    aheizi    |nbihan-mediware
    nbihan-mediware    |noritaka1166
    noritaka1166    |RaySinner
    RaySinner    |afshawnlotfi
    afshawnlotfi    | -|dleffel
    dleffel    |StevenTCramer
    StevenTCramer    |Ruakij
    Ruakij    |pdecat
    pdecat    |kyle-apex
    kyle-apex    |emshvac
    emshvac    | -|Lunchb0ne
    Lunchb0ne    |SmartManoj
    SmartManoj    |vagadiya
    vagadiya    |slytechnical
    slytechnical    |dlab-anton
    dlab-anton    |arthurauffray
    arthurauffray    | -|upamune
    upamune    |NamesMT
    NamesMT    |taylorwilsdon
    taylorwilsdon    |sammcj
    sammcj    |p12tic
    p12tic    |gtaylor
    gtaylor    | -|brunobergher
    brunobergher    |aitoroses
    aitoroses    |ross
    ross    |mr-ryan-james
    mr-ryan-james    |heyseth
    heyseth    |taisukeoe
    taisukeoe    | -|avtc
    avtc    |eonghk
    eonghk    |GOODBOY008
    GOODBOY008    |kcwhite
    kcwhite    |ronyblum
    ronyblum    |teddyOOXX
    teddyOOXX    | -|vincentsong
    vincentsong    |yongjer
    yongjer    |zeozeozeo
    zeozeozeo    |ashktn
    ashktn    |franekp
    franekp    |yt3trees
    yt3trees    | -|seedlord
    seedlord    |bramburn
    bramburn    |anton-otee
    anton-otee    |benzntech
    benzntech    |axkirillov
    axkirillov    |olearycrew
    olearycrew    | -|catrielmuller
    catrielmuller    |devxpain
    devxpain    |snoyiatk
    snoyiatk    |GitlyHallows
    GitlyHallows    |jcbdev
    jcbdev    |Chenjiayuan195
    Chenjiayuan195    | -|julionav
    julionav    |KanTakahiro
    KanTakahiro    |SplittyDev
    SplittyDev    |mdp
    mdp    |napter
    napter    |philfung
    philfung    | -|bannzai
    bannzai    |bbenshalom
    bbenshalom    |chris-garrett
    chris-garrett    |dairui1
    dairui1    |dqroid
    dqroid    |janaki-sasidhar
    janaki-sasidhar    | -|forestyoo
    forestyoo    |hatsu38
    hatsu38    |hongzio
    hongzio    |im47cn
    im47cn    |shoopapa
    shoopapa    |jwcraig
    jwcraig    | -|axmo
    axmo    |asychin
    asychin    |amittell
    amittell    |Yoshino-Yukitaro
    Yoshino-Yukitaro    |Yikai-Liao
    Yikai-Liao    |zxdvd
    zxdvd    | -|s97712
    s97712    |vladstudio
    vladstudio    |vivekfyi
    vivekfyi    |HahaBill
    HahaBill    |tmsjngx0
    tmsjngx0    |TGlide
    TGlide    | -|Githubguy132010
    Githubguy132010    |tgfjt
    tgfjt    |maekawataiki
    maekawataiki    |nevermorec
    nevermorec    |PretzelVector
    PretzelVector    |zetaloop
    zetaloop    | -|cdlliuy
    cdlliuy    |user202729
    user202729    |thill2323
    thill2323    |takakoutso
    takakoutso    |student20880
    student20880    |shubhamgupta731
    shubhamgupta731    | -|shohei-ihaya
    shohei-ihaya    |shivamd1810
    shivamd1810    |shaybc
    shaybc    |sensei-woo
    sensei-woo    |samir-nimbly
    samir-nimbly    |robertheadley
    robertheadley    | -|refactorthis
    refactorthis    |qingyuan1109
    qingyuan1109    |pokutuna
    pokutuna    |philipnext
    philipnext    |village-way
    village-way    |oprstchn
    oprstchn    | -|nobu007
    nobu007    |mosleyit
    mosleyit    |moqimoqidea
    moqimoqidea    |mlopezr
    mlopezr    |mecab
    mecab    |olup
    olup    | -|lightrabbit
    lightrabbit    |lhish
    lhish    |kohii
    kohii    |kinandan
    kinandan    |AlexandruSmirnov
    AlexandruSmirnov    |pfitz
    pfitz    | -|ExactDoug
    ExactDoug    |celestial-vault
    celestial-vault    |linegel
    linegel    |edwin-truthsearch-io
    edwin-truthsearch-io    |EamonNerbonne
    EamonNerbonne    |dbasclpy
    dbasclpy    | -|dflatline
    dflatline    |Deon588
    Deon588    |dleen
    dleen    |CW-B-W
    CW-B-W    |chadgauth
    chadgauth    |thecolorblue
    thecolorblue    | -|bogdan0083
    bogdan0083    |benashby
    benashby    |Atlogit
    Atlogit    |atlasgong
    atlasgong    |AntiMoron
    AntiMoron    |andrewshu2000
    andrewshu2000    | -|andreastempsch
    andreastempsch    |alasano
    alasano    |QuinsZouls
    QuinsZouls    |HadesArchitect
    HadesArchitect    |alarno
    alarno    |nexon33
    nexon33    | -|adilhafeez
    adilhafeez    |adamwlarson
    adamwlarson    |adamhill
    adamhill    |AMHesch
    AMHesch    |adambrand
    adambrand    |samsilveira
    samsilveira    | -|01Rian
    01Rian    |RSO
    RSO    |RandalSchwartz
    RandalSchwartz    |SECKainersdorfer
    SECKainersdorfer    |R-omk
    R-omk    |Sarke
    Sarke    | -|PaperBoardOfficial
    PaperBoardOfficial    |OlegOAndreev
    OlegOAndreev    |Naam
    Naam    |NaccOll
    NaccOll    |kvokka
    kvokka    |ecmasx
    ecmasx    | -|mollux
    mollux    |marvijo-code
    marvijo-code    |markijbema
    markijbema    |mamertofabian
    mamertofabian    |monkeyDluffy6017
    monkeyDluffy6017    |libertyteeth
    libertyteeth    | -|shtse8
    shtse8    |Rexarrior
    Rexarrior    |kevinvandijk
    kevinvandijk    |KevinZhao
    KevinZhao    |ksze
    ksze    |Juice10
    Juice10    | -|snova-jorgep
    snova-jorgep    |Fovty
    Fovty    |Jdo300
    Jdo300    |hesara
    hesara    |DeXtroTip
    DeXtroTip    | | + +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | +| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | +| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | +| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | +| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | +| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | +| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | +| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | +| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | +| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | +| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | +| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | +| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | +| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | +| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | +| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | +| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | +| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | +| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | +| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | +| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | +| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | +| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | +| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | +| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | +| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | +| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | +| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | +| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | +| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | +| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | +| DeXtroTip
    DeXtroTip     | | | | | | + ## License diff --git a/locales/it/README.md b/locales/it/README.md index e7483a882d..248b23bc13 100644 --- a/locales/it/README.md +++ b/locales/it/README.md @@ -181,45 +181,48 @@ Amiamo i contributi della community! Inizia leggendo il nostro [CONTRIBUTING.md] Grazie a tutti i nostri contributori che hanno aiutato a migliorare Roo Code! -|mrubens
    mrubens    |saoudrizwan
    saoudrizwan    |cte
    cte    |daniel-lxs
    daniel-lxs    |samhvw8
    samhvw8    |hannesrudolph
    hannesrudolph    | -|:---:|:---:|:---:|:---:|:---:|:---:| -|KJ7LNW
    KJ7LNW    |a8trejo
    a8trejo    |MuriloFP
    MuriloFP    |ColemanRoo
    ColemanRoo    |canrobins13
    canrobins13    |stea9499
    stea9499    | -|joemanley201
    joemanley201    |System233
    System233    |jr
    jr    |nissa-seru
    nissa-seru    |jquanton
    jquanton    |roomote-agent
    roomote-agent    | -|NyxJae
    NyxJae    |d-oit
    d-oit    |elianiva
    elianiva    |qdaxb
    qdaxb    |punkpeye
    punkpeye    |wkordalski
    wkordalski    | -|SannidhyaSah
    SannidhyaSah    |xyOz-dev
    xyOz-dev    |chrarnoldus
    chrarnoldus    |sachasayan
    sachasayan    |Smartsheet-JB-Brown
    Smartsheet-JB-Brown    |monotykamary
    monotykamary    | -|cannuri
    cannuri    |feifei325
    feifei325    |zhangtony239
    zhangtony239    |shariqriazz
    shariqriazz    |vigneshsubbiah16
    vigneshsubbiah16    |pugazhendhi-m
    pugazhendhi-m    | -|lloydchang
    lloydchang    |dtrugman
    dtrugman    |Szpadel
    Szpadel    |hassoncs
    hassoncs    |liwilliam2021
    liwilliam2021    |lupuletic
    lupuletic    | -|kiwina
    kiwina    |Premshay
    Premshay    |psv2522
    psv2522    |olweraltuve
    olweraltuve    |diarmidmackenzie
    diarmidmackenzie    |ChuKhaLi
    ChuKhaLi    | -|PeterDaveHello
    PeterDaveHello    |aheizi
    aheizi    |nbihan-mediware
    nbihan-mediware    |noritaka1166
    noritaka1166    |RaySinner
    RaySinner    |afshawnlotfi
    afshawnlotfi    | -|dleffel
    dleffel    |StevenTCramer
    StevenTCramer    |Ruakij
    Ruakij    |pdecat
    pdecat    |kyle-apex
    kyle-apex    |emshvac
    emshvac    | -|Lunchb0ne
    Lunchb0ne    |SmartManoj
    SmartManoj    |vagadiya
    vagadiya    |slytechnical
    slytechnical    |dlab-anton
    dlab-anton    |arthurauffray
    arthurauffray    | -|upamune
    upamune    |NamesMT
    NamesMT    |taylorwilsdon
    taylorwilsdon    |sammcj
    sammcj    |p12tic
    p12tic    |gtaylor
    gtaylor    | -|brunobergher
    brunobergher    |aitoroses
    aitoroses    |ross
    ross    |mr-ryan-james
    mr-ryan-james    |heyseth
    heyseth    |taisukeoe
    taisukeoe    | -|avtc
    avtc    |eonghk
    eonghk    |GOODBOY008
    GOODBOY008    |kcwhite
    kcwhite    |ronyblum
    ronyblum    |teddyOOXX
    teddyOOXX    | -|vincentsong
    vincentsong    |yongjer
    yongjer    |zeozeozeo
    zeozeozeo    |ashktn
    ashktn    |franekp
    franekp    |yt3trees
    yt3trees    | -|seedlord
    seedlord    |bramburn
    bramburn    |anton-otee
    anton-otee    |benzntech
    benzntech    |axkirillov
    axkirillov    |olearycrew
    olearycrew    | -|catrielmuller
    catrielmuller    |devxpain
    devxpain    |snoyiatk
    snoyiatk    |GitlyHallows
    GitlyHallows    |jcbdev
    jcbdev    |Chenjiayuan195
    Chenjiayuan195    | -|julionav
    julionav    |KanTakahiro
    KanTakahiro    |SplittyDev
    SplittyDev    |mdp
    mdp    |napter
    napter    |philfung
    philfung    | -|bannzai
    bannzai    |bbenshalom
    bbenshalom    |chris-garrett
    chris-garrett    |dairui1
    dairui1    |dqroid
    dqroid    |janaki-sasidhar
    janaki-sasidhar    | -|forestyoo
    forestyoo    |hatsu38
    hatsu38    |hongzio
    hongzio    |im47cn
    im47cn    |shoopapa
    shoopapa    |jwcraig
    jwcraig    | -|axmo
    axmo    |asychin
    asychin    |amittell
    amittell    |Yoshino-Yukitaro
    Yoshino-Yukitaro    |Yikai-Liao
    Yikai-Liao    |zxdvd
    zxdvd    | -|s97712
    s97712    |vladstudio
    vladstudio    |vivekfyi
    vivekfyi    |HahaBill
    HahaBill    |tmsjngx0
    tmsjngx0    |TGlide
    TGlide    | -|Githubguy132010
    Githubguy132010    |tgfjt
    tgfjt    |maekawataiki
    maekawataiki    |nevermorec
    nevermorec    |PretzelVector
    PretzelVector    |zetaloop
    zetaloop    | -|cdlliuy
    cdlliuy    |user202729
    user202729    |thill2323
    thill2323    |takakoutso
    takakoutso    |student20880
    student20880    |shubhamgupta731
    shubhamgupta731    | -|shohei-ihaya
    shohei-ihaya    |shivamd1810
    shivamd1810    |shaybc
    shaybc    |sensei-woo
    sensei-woo    |samir-nimbly
    samir-nimbly    |robertheadley
    robertheadley    | -|refactorthis
    refactorthis    |qingyuan1109
    qingyuan1109    |pokutuna
    pokutuna    |philipnext
    philipnext    |village-way
    village-way    |oprstchn
    oprstchn    | -|nobu007
    nobu007    |mosleyit
    mosleyit    |moqimoqidea
    moqimoqidea    |mlopezr
    mlopezr    |mecab
    mecab    |olup
    olup    | -|lightrabbit
    lightrabbit    |lhish
    lhish    |kohii
    kohii    |kinandan
    kinandan    |AlexandruSmirnov
    AlexandruSmirnov    |pfitz
    pfitz    | -|ExactDoug
    ExactDoug    |celestial-vault
    celestial-vault    |linegel
    linegel    |edwin-truthsearch-io
    edwin-truthsearch-io    |EamonNerbonne
    EamonNerbonne    |dbasclpy
    dbasclpy    | -|dflatline
    dflatline    |Deon588
    Deon588    |dleen
    dleen    |CW-B-W
    CW-B-W    |chadgauth
    chadgauth    |thecolorblue
    thecolorblue    | -|bogdan0083
    bogdan0083    |benashby
    benashby    |Atlogit
    Atlogit    |atlasgong
    atlasgong    |AntiMoron
    AntiMoron    |andrewshu2000
    andrewshu2000    | -|andreastempsch
    andreastempsch    |alasano
    alasano    |QuinsZouls
    QuinsZouls    |HadesArchitect
    HadesArchitect    |alarno
    alarno    |nexon33
    nexon33    | -|adilhafeez
    adilhafeez    |adamwlarson
    adamwlarson    |adamhill
    adamhill    |AMHesch
    AMHesch    |adambrand
    adambrand    |samsilveira
    samsilveira    | -|01Rian
    01Rian    |RSO
    RSO    |RandalSchwartz
    RandalSchwartz    |SECKainersdorfer
    SECKainersdorfer    |R-omk
    R-omk    |Sarke
    Sarke    | -|PaperBoardOfficial
    PaperBoardOfficial    |OlegOAndreev
    OlegOAndreev    |Naam
    Naam    |NaccOll
    NaccOll    |kvokka
    kvokka    |ecmasx
    ecmasx    | -|mollux
    mollux    |marvijo-code
    marvijo-code    |markijbema
    markijbema    |mamertofabian
    mamertofabian    |monkeyDluffy6017
    monkeyDluffy6017    |libertyteeth
    libertyteeth    | -|shtse8
    shtse8    |Rexarrior
    Rexarrior    |kevinvandijk
    kevinvandijk    |KevinZhao
    KevinZhao    |ksze
    ksze    |Juice10
    Juice10    | -|snova-jorgep
    snova-jorgep    |Fovty
    Fovty    |Jdo300
    Jdo300    |hesara
    hesara    |DeXtroTip
    DeXtroTip    | | + +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | +| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | +| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | +| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | +| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | +| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | +| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | +| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | +| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | +| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | +| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | +| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | +| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | +| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | +| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | +| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | +| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | +| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | +| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | +| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | +| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | +| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | +| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | +| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | +| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | +| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | +| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | +| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | +| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | +| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | +| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | +| DeXtroTip
    DeXtroTip     | | | | | | + ## Licenza diff --git a/locales/ja/README.md b/locales/ja/README.md index 294c3b29d4..a176f59a06 100644 --- a/locales/ja/README.md +++ b/locales/ja/README.md @@ -181,45 +181,48 @@ code --install-extension bin/roo-cline-.vsix Roo Codeの改善に貢献してくれたすべての貢献者に感謝します！ -|mrubens
    mrubens    |saoudrizwan
    saoudrizwan    |cte
    cte    |daniel-lxs
    daniel-lxs    |samhvw8
    samhvw8    |hannesrudolph
    hannesrudolph    | -|:---:|:---:|:---:|:---:|:---:|:---:| -|KJ7LNW
    KJ7LNW    |a8trejo
    a8trejo    |MuriloFP
    MuriloFP    |ColemanRoo
    ColemanRoo    |canrobins13
    canrobins13    |stea9499
    stea9499    | -|joemanley201
    joemanley201    |System233
    System233    |jr
    jr    |nissa-seru
    nissa-seru    |jquanton
    jquanton    |roomote-agent
    roomote-agent    | -|NyxJae
    NyxJae    |d-oit
    d-oit    |elianiva
    elianiva    |qdaxb
    qdaxb    |punkpeye
    punkpeye    |wkordalski
    wkordalski    | -|SannidhyaSah
    SannidhyaSah    |xyOz-dev
    xyOz-dev    |chrarnoldus
    chrarnoldus    |sachasayan
    sachasayan    |Smartsheet-JB-Brown
    Smartsheet-JB-Brown    |monotykamary
    monotykamary    | -|cannuri
    cannuri    |feifei325
    feifei325    |zhangtony239
    zhangtony239    |shariqriazz
    shariqriazz    |vigneshsubbiah16
    vigneshsubbiah16    |pugazhendhi-m
    pugazhendhi-m    | -|lloydchang
    lloydchang    |dtrugman
    dtrugman    |Szpadel
    Szpadel    |hassoncs
    hassoncs    |liwilliam2021
    liwilliam2021    |lupuletic
    lupuletic    | -|kiwina
    kiwina    |Premshay
    Premshay    |psv2522
    psv2522    |olweraltuve
    olweraltuve    |diarmidmackenzie
    diarmidmackenzie    |ChuKhaLi
    ChuKhaLi    | -|PeterDaveHello
    PeterDaveHello    |aheizi
    aheizi    |nbihan-mediware
    nbihan-mediware    |noritaka1166
    noritaka1166    |RaySinner
    RaySinner    |afshawnlotfi
    afshawnlotfi    | -|dleffel
    dleffel    |StevenTCramer
    StevenTCramer    |Ruakij
    Ruakij    |pdecat
    pdecat    |kyle-apex
    kyle-apex    |emshvac
    emshvac    | -|Lunchb0ne
    Lunchb0ne    |SmartManoj
    SmartManoj    |vagadiya
    vagadiya    |slytechnical
    slytechnical    |dlab-anton
    dlab-anton    |arthurauffray
    arthurauffray    | -|upamune
    upamune    |NamesMT
    NamesMT    |taylorwilsdon
    taylorwilsdon    |sammcj
    sammcj    |p12tic
    p12tic    |gtaylor
    gtaylor    | -|brunobergher
    brunobergher    |aitoroses
    aitoroses    |ross
    ross    |mr-ryan-james
    mr-ryan-james    |heyseth
    heyseth    |taisukeoe
    taisukeoe    | -|avtc
    avtc    |eonghk
    eonghk    |GOODBOY008
    GOODBOY008    |kcwhite
    kcwhite    |ronyblum
    ronyblum    |teddyOOXX
    teddyOOXX    | -|vincentsong
    vincentsong    |yongjer
    yongjer    |zeozeozeo
    zeozeozeo    |ashktn
    ashktn    |franekp
    franekp    |yt3trees
    yt3trees    | -|seedlord
    seedlord    |bramburn
    bramburn    |anton-otee
    anton-otee    |benzntech
    benzntech    |axkirillov
    axkirillov    |olearycrew
    olearycrew    | -|catrielmuller
    catrielmuller    |devxpain
    devxpain    |snoyiatk
    snoyiatk    |GitlyHallows
    GitlyHallows    |jcbdev
    jcbdev    |Chenjiayuan195
    Chenjiayuan195    | -|julionav
    julionav    |KanTakahiro
    KanTakahiro    |SplittyDev
    SplittyDev    |mdp
    mdp    |napter
    napter    |philfung
    philfung    | -|bannzai
    bannzai    |bbenshalom
    bbenshalom    |chris-garrett
    chris-garrett    |dairui1
    dairui1    |dqroid
    dqroid    |janaki-sasidhar
    janaki-sasidhar    | -|forestyoo
    forestyoo    |hatsu38
    hatsu38    |hongzio
    hongzio    |im47cn
    im47cn    |shoopapa
    shoopapa    |jwcraig
    jwcraig    | -|axmo
    axmo    |asychin
    asychin    |amittell
    amittell    |Yoshino-Yukitaro
    Yoshino-Yukitaro    |Yikai-Liao
    Yikai-Liao    |zxdvd
    zxdvd    | -|s97712
    s97712    |vladstudio
    vladstudio    |vivekfyi
    vivekfyi    |HahaBill
    HahaBill    |tmsjngx0
    tmsjngx0    |TGlide
    TGlide    | -|Githubguy132010
    Githubguy132010    |tgfjt
    tgfjt    |maekawataiki
    maekawataiki    |nevermorec
    nevermorec    |PretzelVector
    PretzelVector    |zetaloop
    zetaloop    | -|cdlliuy
    cdlliuy    |user202729
    user202729    |thill2323
    thill2323    |takakoutso
    takakoutso    |student20880
    student20880    |shubhamgupta731
    shubhamgupta731    | -|shohei-ihaya
    shohei-ihaya    |shivamd1810
    shivamd1810    |shaybc
    shaybc    |sensei-woo
    sensei-woo    |samir-nimbly
    samir-nimbly    |robertheadley
    robertheadley    | -|refactorthis
    refactorthis    |qingyuan1109
    qingyuan1109    |pokutuna
    pokutuna    |philipnext
    philipnext    |village-way
    village-way    |oprstchn
    oprstchn    | -|nobu007
    nobu007    |mosleyit
    mosleyit    |moqimoqidea
    moqimoqidea    |mlopezr
    mlopezr    |mecab
    mecab    |olup
    olup    | -|lightrabbit
    lightrabbit    |lhish
    lhish    |kohii
    kohii    |kinandan
    kinandan    |AlexandruSmirnov
    AlexandruSmirnov    |pfitz
    pfitz    | -|ExactDoug
    ExactDoug    |celestial-vault
    celestial-vault    |linegel
    linegel    |edwin-truthsearch-io
    edwin-truthsearch-io    |EamonNerbonne
    EamonNerbonne    |dbasclpy
    dbasclpy    | -|dflatline
    dflatline    |Deon588
    Deon588    |dleen
    dleen    |CW-B-W
    CW-B-W    |chadgauth
    chadgauth    |thecolorblue
    thecolorblue    | -|bogdan0083
    bogdan0083    |benashby
    benashby    |Atlogit
    Atlogit    |atlasgong
    atlasgong    |AntiMoron
    AntiMoron    |andrewshu2000
    andrewshu2000    | -|andreastempsch
    andreastempsch    |alasano
    alasano    |QuinsZouls
    QuinsZouls    |HadesArchitect
    HadesArchitect    |alarno
    alarno    |nexon33
    nexon33    | -|adilhafeez
    adilhafeez    |adamwlarson
    adamwlarson    |adamhill
    adamhill    |AMHesch
    AMHesch    |adambrand
    adambrand    |samsilveira
    samsilveira    | -|01Rian
    01Rian    |RSO
    RSO    |RandalSchwartz
    RandalSchwartz    |SECKainersdorfer
    SECKainersdorfer    |R-omk
    R-omk    |Sarke
    Sarke    | -|PaperBoardOfficial
    PaperBoardOfficial    |OlegOAndreev
    OlegOAndreev    |Naam
    Naam    |NaccOll
    NaccOll    |kvokka
    kvokka    |ecmasx
    ecmasx    | -|mollux
    mollux    |marvijo-code
    marvijo-code    |markijbema
    markijbema    |mamertofabian
    mamertofabian    |monkeyDluffy6017
    monkeyDluffy6017    |libertyteeth
    libertyteeth    | -|shtse8
    shtse8    |Rexarrior
    Rexarrior    |kevinvandijk
    kevinvandijk    |KevinZhao
    KevinZhao    |ksze
    ksze    |Juice10
    Juice10    | -|snova-jorgep
    snova-jorgep    |Fovty
    Fovty    |Jdo300
    Jdo300    |hesara
    hesara    |DeXtroTip
    DeXtroTip    | | + +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | +| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | +| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | +| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | +| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | +| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | +| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | +| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | +| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | +| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | +| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | +| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | +| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | +| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | +| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | +| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | +| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | +| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | +| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | +| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | +| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | +| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | +| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | +| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | +| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | +| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | +| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | +| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | +| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | +| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | +| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | +| DeXtroTip
    DeXtroTip     | | | | | | + ## ライセンス diff --git a/locales/ko/README.md b/locales/ko/README.md index 81164a5e44..3533175c2c 100644 --- a/locales/ko/README.md +++ b/locales/ko/README.md @@ -181,45 +181,48 @@ code --install-extension bin/roo-cline-.vsix Roo Code를 더 좋게 만드는 데 도움을 준 모든 기여자에게 감사드립니다! -|mrubens
    mrubens    |saoudrizwan
    saoudrizwan    |cte
    cte    |daniel-lxs
    daniel-lxs    |samhvw8
    samhvw8    |hannesrudolph
    hannesrudolph    | -|:---:|:---:|:---:|:---:|:---:|:---:| -|KJ7LNW
    KJ7LNW    |a8trejo
    a8trejo    |MuriloFP
    MuriloFP    |ColemanRoo
    ColemanRoo    |canrobins13
    canrobins13    |stea9499
    stea9499    | -|joemanley201
    joemanley201    |System233
    System233    |jr
    jr    |nissa-seru
    nissa-seru    |jquanton
    jquanton    |roomote-agent
    roomote-agent    | -|NyxJae
    NyxJae    |d-oit
    d-oit    |elianiva
    elianiva    |qdaxb
    qdaxb    |punkpeye
    punkpeye    |wkordalski
    wkordalski    | -|SannidhyaSah
    SannidhyaSah    |xyOz-dev
    xyOz-dev    |chrarnoldus
    chrarnoldus    |sachasayan
    sachasayan    |Smartsheet-JB-Brown
    Smartsheet-JB-Brown    |monotykamary
    monotykamary    | -|cannuri
    cannuri    |feifei325
    feifei325    |zhangtony239
    zhangtony239    |shariqriazz
    shariqriazz    |vigneshsubbiah16
    vigneshsubbiah16    |pugazhendhi-m
    pugazhendhi-m    | -|lloydchang
    lloydchang    |dtrugman
    dtrugman    |Szpadel
    Szpadel    |hassoncs
    hassoncs    |liwilliam2021
    liwilliam2021    |lupuletic
    lupuletic    | -|kiwina
    kiwina    |Premshay
    Premshay    |psv2522
    psv2522    |olweraltuve
    olweraltuve    |diarmidmackenzie
    diarmidmackenzie    |ChuKhaLi
    ChuKhaLi    | -|PeterDaveHello
    PeterDaveHello    |aheizi
    aheizi    |nbihan-mediware
    nbihan-mediware    |noritaka1166
    noritaka1166    |RaySinner
    RaySinner    |afshawnlotfi
    afshawnlotfi    | -|dleffel
    dleffel    |StevenTCramer
    StevenTCramer    |Ruakij
    Ruakij    |pdecat
    pdecat    |kyle-apex
    kyle-apex    |emshvac
    emshvac    | -|Lunchb0ne
    Lunchb0ne    |SmartManoj
    SmartManoj    |vagadiya
    vagadiya    |slytechnical
    slytechnical    |dlab-anton
    dlab-anton    |arthurauffray
    arthurauffray    | -|upamune
    upamune    |NamesMT
    NamesMT    |taylorwilsdon
    taylorwilsdon    |sammcj
    sammcj    |p12tic
    p12tic    |gtaylor
    gtaylor    | -|brunobergher
    brunobergher    |aitoroses
    aitoroses    |ross
    ross    |mr-ryan-james
    mr-ryan-james    |heyseth
    heyseth    |taisukeoe
    taisukeoe    | -|avtc
    avtc    |eonghk
    eonghk    |GOODBOY008
    GOODBOY008    |kcwhite
    kcwhite    |ronyblum
    ronyblum    |teddyOOXX
    teddyOOXX    | -|vincentsong
    vincentsong    |yongjer
    yongjer    |zeozeozeo
    zeozeozeo    |ashktn
    ashktn    |franekp
    franekp    |yt3trees
    yt3trees    | -|seedlord
    seedlord    |bramburn
    bramburn    |anton-otee
    anton-otee    |benzntech
    benzntech    |axkirillov
    axkirillov    |olearycrew
    olearycrew    | -|catrielmuller
    catrielmuller    |devxpain
    devxpain    |snoyiatk
    snoyiatk    |GitlyHallows
    GitlyHallows    |jcbdev
    jcbdev    |Chenjiayuan195
    Chenjiayuan195    | -|julionav
    julionav    |KanTakahiro
    KanTakahiro    |SplittyDev
    SplittyDev    |mdp
    mdp    |napter
    napter    |philfung
    philfung    | -|bannzai
    bannzai    |bbenshalom
    bbenshalom    |chris-garrett
    chris-garrett    |dairui1
    dairui1    |dqroid
    dqroid    |janaki-sasidhar
    janaki-sasidhar    | -|forestyoo
    forestyoo    |hatsu38
    hatsu38    |hongzio
    hongzio    |im47cn
    im47cn    |shoopapa
    shoopapa    |jwcraig
    jwcraig    | -|axmo
    axmo    |asychin
    asychin    |amittell
    amittell    |Yoshino-Yukitaro
    Yoshino-Yukitaro    |Yikai-Liao
    Yikai-Liao    |zxdvd
    zxdvd    | -|s97712
    s97712    |vladstudio
    vladstudio    |vivekfyi
    vivekfyi    |HahaBill
    HahaBill    |tmsjngx0
    tmsjngx0    |TGlide
    TGlide    | -|Githubguy132010
    Githubguy132010    |tgfjt
    tgfjt    |maekawataiki
    maekawataiki    |nevermorec
    nevermorec    |PretzelVector
    PretzelVector    |zetaloop
    zetaloop    | -|cdlliuy
    cdlliuy    |user202729
    user202729    |thill2323
    thill2323    |takakoutso
    takakoutso    |student20880
    student20880    |shubhamgupta731
    shubhamgupta731    | -|shohei-ihaya
    shohei-ihaya    |shivamd1810
    shivamd1810    |shaybc
    shaybc    |sensei-woo
    sensei-woo    |samir-nimbly
    samir-nimbly    |robertheadley
    robertheadley    | -|refactorthis
    refactorthis    |qingyuan1109
    qingyuan1109    |pokutuna
    pokutuna    |philipnext
    philipnext    |village-way
    village-way    |oprstchn
    oprstchn    | -|nobu007
    nobu007    |mosleyit
    mosleyit    |moqimoqidea
    moqimoqidea    |mlopezr
    mlopezr    |mecab
    mecab    |olup
    olup    | -|lightrabbit
    lightrabbit    |lhish
    lhish    |kohii
    kohii    |kinandan
    kinandan    |AlexandruSmirnov
    AlexandruSmirnov    |pfitz
    pfitz    | -|ExactDoug
    ExactDoug    |celestial-vault
    celestial-vault    |linegel
    linegel    |edwin-truthsearch-io
    edwin-truthsearch-io    |EamonNerbonne
    EamonNerbonne    |dbasclpy
    dbasclpy    | -|dflatline
    dflatline    |Deon588
    Deon588    |dleen
    dleen    |CW-B-W
    CW-B-W    |chadgauth
    chadgauth    |thecolorblue
    thecolorblue    | -|bogdan0083
    bogdan0083    |benashby
    benashby    |Atlogit
    Atlogit    |atlasgong
    atlasgong    |AntiMoron
    AntiMoron    |andrewshu2000
    andrewshu2000    | -|andreastempsch
    andreastempsch    |alasano
    alasano    |QuinsZouls
    QuinsZouls    |HadesArchitect
    HadesArchitect    |alarno
    alarno    |nexon33
    nexon33    | -|adilhafeez
    adilhafeez    |adamwlarson
    adamwlarson    |adamhill
    adamhill    |AMHesch
    AMHesch    |adambrand
    adambrand    |samsilveira
    samsilveira    | -|01Rian
    01Rian    |RSO
    RSO    |RandalSchwartz
    RandalSchwartz    |SECKainersdorfer
    SECKainersdorfer    |R-omk
    R-omk    |Sarke
    Sarke    | -|PaperBoardOfficial
    PaperBoardOfficial    |OlegOAndreev
    OlegOAndreev    |Naam
    Naam    |NaccOll
    NaccOll    |kvokka
    kvokka    |ecmasx
    ecmasx    | -|mollux
    mollux    |marvijo-code
    marvijo-code    |markijbema
    markijbema    |mamertofabian
    mamertofabian    |monkeyDluffy6017
    monkeyDluffy6017    |libertyteeth
    libertyteeth    | -|shtse8
    shtse8    |Rexarrior
    Rexarrior    |kevinvandijk
    kevinvandijk    |KevinZhao
    KevinZhao    |ksze
    ksze    |Juice10
    Juice10    | -|snova-jorgep
    snova-jorgep    |Fovty
    Fovty    |Jdo300
    Jdo300    |hesara
    hesara    |DeXtroTip
    DeXtroTip    | | + +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | +| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | +| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | +| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | +| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | +| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | +| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | +| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | +| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | +| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | +| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | +| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | +| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | +| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | +| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | +| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | +| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | +| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | +| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | +| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | +| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | +| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | +| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | +| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | +| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | +| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | +| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | +| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | +| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | +| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | +| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | +| DeXtroTip
    DeXtroTip     | | | | | | + ## 라이선스 diff --git a/locales/nl/README.md b/locales/nl/README.md index 2e54742564..224d793fae 100644 --- a/locales/nl/README.md +++ b/locales/nl/README.md @@ -181,45 +181,48 @@ We houden van bijdragen uit de community! Begin met het lezen van onze [CONTRIBU Dank aan alle bijdragers die Roo Code beter hebben gemaakt! -|mrubens
    mrubens    |saoudrizwan
    saoudrizwan    |cte
    cte    |daniel-lxs
    daniel-lxs    |samhvw8
    samhvw8    |hannesrudolph
    hannesrudolph    | -|:---:|:---:|:---:|:---:|:---:|:---:| -|KJ7LNW
    KJ7LNW    |a8trejo
    a8trejo    |MuriloFP
    MuriloFP    |ColemanRoo
    ColemanRoo    |canrobins13
    canrobins13    |stea9499
    stea9499    | -|joemanley201
    joemanley201    |System233
    System233    |jr
    jr    |nissa-seru
    nissa-seru    |jquanton
    jquanton    |roomote-agent
    roomote-agent    | -|NyxJae
    NyxJae    |d-oit
    d-oit    |elianiva
    elianiva    |qdaxb
    qdaxb    |punkpeye
    punkpeye    |wkordalski
    wkordalski    | -|SannidhyaSah
    SannidhyaSah    |xyOz-dev
    xyOz-dev    |chrarnoldus
    chrarnoldus    |sachasayan
    sachasayan    |Smartsheet-JB-Brown
    Smartsheet-JB-Brown    |monotykamary
    monotykamary    | -|cannuri
    cannuri    |feifei325
    feifei325    |zhangtony239
    zhangtony239    |shariqriazz
    shariqriazz    |vigneshsubbiah16
    vigneshsubbiah16    |pugazhendhi-m
    pugazhendhi-m    | -|lloydchang
    lloydchang    |dtrugman
    dtrugman    |Szpadel
    Szpadel    |hassoncs
    hassoncs    |liwilliam2021
    liwilliam2021    |lupuletic
    lupuletic    | -|kiwina
    kiwina    |Premshay
    Premshay    |psv2522
    psv2522    |olweraltuve
    olweraltuve    |diarmidmackenzie
    diarmidmackenzie    |ChuKhaLi
    ChuKhaLi    | -|PeterDaveHello
    PeterDaveHello    |aheizi
    aheizi    |nbihan-mediware
    nbihan-mediware    |noritaka1166
    noritaka1166    |RaySinner
    RaySinner    |afshawnlotfi
    afshawnlotfi    | -|dleffel
    dleffel    |StevenTCramer
    StevenTCramer    |Ruakij
    Ruakij    |pdecat
    pdecat    |kyle-apex
    kyle-apex    |emshvac
    emshvac    | -|Lunchb0ne
    Lunchb0ne    |SmartManoj
    SmartManoj    |vagadiya
    vagadiya    |slytechnical
    slytechnical    |dlab-anton
    dlab-anton    |arthurauffray
    arthurauffray    | -|upamune
    upamune    |NamesMT
    NamesMT    |taylorwilsdon
    taylorwilsdon    |sammcj
    sammcj    |p12tic
    p12tic    |gtaylor
    gtaylor    | -|brunobergher
    brunobergher    |aitoroses
    aitoroses    |ross
    ross    |mr-ryan-james
    mr-ryan-james    |heyseth
    heyseth    |taisukeoe
    taisukeoe    | -|avtc
    avtc    |eonghk
    eonghk    |GOODBOY008
    GOODBOY008    |kcwhite
    kcwhite    |ronyblum
    ronyblum    |teddyOOXX
    teddyOOXX    | -|vincentsong
    vincentsong    |yongjer
    yongjer    |zeozeozeo
    zeozeozeo    |ashktn
    ashktn    |franekp
    franekp    |yt3trees
    yt3trees    | -|seedlord
    seedlord    |bramburn
    bramburn    |anton-otee
    anton-otee    |benzntech
    benzntech    |axkirillov
    axkirillov    |olearycrew
    olearycrew    | -|catrielmuller
    catrielmuller    |devxpain
    devxpain    |snoyiatk
    snoyiatk    |GitlyHallows
    GitlyHallows    |jcbdev
    jcbdev    |Chenjiayuan195
    Chenjiayuan195    | -|julionav
    julionav    |KanTakahiro
    KanTakahiro    |SplittyDev
    SplittyDev    |mdp
    mdp    |napter
    napter    |philfung
    philfung    | -|bannzai
    bannzai    |bbenshalom
    bbenshalom    |chris-garrett
    chris-garrett    |dairui1
    dairui1    |dqroid
    dqroid    |janaki-sasidhar
    janaki-sasidhar    | -|forestyoo
    forestyoo    |hatsu38
    hatsu38    |hongzio
    hongzio    |im47cn
    im47cn    |shoopapa
    shoopapa    |jwcraig
    jwcraig    | -|axmo
    axmo    |asychin
    asychin    |amittell
    amittell    |Yoshino-Yukitaro
    Yoshino-Yukitaro    |Yikai-Liao
    Yikai-Liao    |zxdvd
    zxdvd    | -|s97712
    s97712    |vladstudio
    vladstudio    |vivekfyi
    vivekfyi    |HahaBill
    HahaBill    |tmsjngx0
    tmsjngx0    |TGlide
    TGlide    | -|Githubguy132010
    Githubguy132010    |tgfjt
    tgfjt    |maekawataiki
    maekawataiki    |nevermorec
    nevermorec    |PretzelVector
    PretzelVector    |zetaloop
    zetaloop    | -|cdlliuy
    cdlliuy    |user202729
    user202729    |thill2323
    thill2323    |takakoutso
    takakoutso    |student20880
    student20880    |shubhamgupta731
    shubhamgupta731    | -|shohei-ihaya
    shohei-ihaya    |shivamd1810
    shivamd1810    |shaybc
    shaybc    |sensei-woo
    sensei-woo    |samir-nimbly
    samir-nimbly    |robertheadley
    robertheadley    | -|refactorthis
    refactorthis    |qingyuan1109
    qingyuan1109    |pokutuna
    pokutuna    |philipnext
    philipnext    |village-way
    village-way    |oprstchn
    oprstchn    | -|nobu007
    nobu007    |mosleyit
    mosleyit    |moqimoqidea
    moqimoqidea    |mlopezr
    mlopezr    |mecab
    mecab    |olup
    olup    | -|lightrabbit
    lightrabbit    |lhish
    lhish    |kohii
    kohii    |kinandan
    kinandan    |AlexandruSmirnov
    AlexandruSmirnov    |pfitz
    pfitz    | -|ExactDoug
    ExactDoug    |celestial-vault
    celestial-vault    |linegel
    linegel    |edwin-truthsearch-io
    edwin-truthsearch-io    |EamonNerbonne
    EamonNerbonne    |dbasclpy
    dbasclpy    | -|dflatline
    dflatline    |Deon588
    Deon588    |dleen
    dleen    |CW-B-W
    CW-B-W    |chadgauth
    chadgauth    |thecolorblue
    thecolorblue    | -|bogdan0083
    bogdan0083    |benashby
    benashby    |Atlogit
    Atlogit    |atlasgong
    atlasgong    |AntiMoron
    AntiMoron    |andrewshu2000
    andrewshu2000    | -|andreastempsch
    andreastempsch    |alasano
    alasano    |QuinsZouls
    QuinsZouls    |HadesArchitect
    HadesArchitect    |alarno
    alarno    |nexon33
    nexon33    | -|adilhafeez
    adilhafeez    |adamwlarson
    adamwlarson    |adamhill
    adamhill    |AMHesch
    AMHesch    |adambrand
    adambrand    |samsilveira
    samsilveira    | -|01Rian
    01Rian    |RSO
    RSO    |RandalSchwartz
    RandalSchwartz    |SECKainersdorfer
    SECKainersdorfer    |R-omk
    R-omk    |Sarke
    Sarke    | -|PaperBoardOfficial
    PaperBoardOfficial    |OlegOAndreev
    OlegOAndreev    |Naam
    Naam    |NaccOll
    NaccOll    |kvokka
    kvokka    |ecmasx
    ecmasx    | -|mollux
    mollux    |marvijo-code
    marvijo-code    |markijbema
    markijbema    |mamertofabian
    mamertofabian    |monkeyDluffy6017
    monkeyDluffy6017    |libertyteeth
    libertyteeth    | -|shtse8
    shtse8    |Rexarrior
    Rexarrior    |kevinvandijk
    kevinvandijk    |KevinZhao
    KevinZhao    |ksze
    ksze    |Juice10
    Juice10    | -|snova-jorgep
    snova-jorgep    |Fovty
    Fovty    |Jdo300
    Jdo300    |hesara
    hesara    |DeXtroTip
    DeXtroTip    | | + +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | +| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | +| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | +| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | +| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | +| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | +| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | +| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | +| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | +| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | +| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | +| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | +| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | +| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | +| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | +| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | +| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | +| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | +| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | +| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | +| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | +| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | +| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | +| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | +| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | +| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | +| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | +| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | +| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | +| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | +| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | +| DeXtroTip
    DeXtroTip     | | | | | | + ## Licentie diff --git a/locales/pl/README.md b/locales/pl/README.md index 819b0fe989..6b406f2fb3 100644 --- a/locales/pl/README.md +++ b/locales/pl/README.md @@ -181,45 +181,48 @@ Kochamy wkład społeczności! Zacznij od przeczytania naszego [CONTRIBUTING.md] Dziękujemy wszystkim naszym współtwórcom, którzy pomogli ulepszyć Roo Code! -|mrubens
    mrubens    |saoudrizwan
    saoudrizwan    |cte
    cte    |daniel-lxs
    daniel-lxs    |samhvw8
    samhvw8    |hannesrudolph
    hannesrudolph    | -|:---:|:---:|:---:|:---:|:---:|:---:| -|KJ7LNW
    KJ7LNW    |a8trejo
    a8trejo    |MuriloFP
    MuriloFP    |ColemanRoo
    ColemanRoo    |canrobins13
    canrobins13    |stea9499
    stea9499    | -|joemanley201
    joemanley201    |System233
    System233    |jr
    jr    |nissa-seru
    nissa-seru    |jquanton
    jquanton    |roomote-agent
    roomote-agent    | -|NyxJae
    NyxJae    |d-oit
    d-oit    |elianiva
    elianiva    |qdaxb
    qdaxb    |punkpeye
    punkpeye    |wkordalski
    wkordalski    | -|SannidhyaSah
    SannidhyaSah    |xyOz-dev
    xyOz-dev    |chrarnoldus
    chrarnoldus    |sachasayan
    sachasayan    |Smartsheet-JB-Brown
    Smartsheet-JB-Brown    |monotykamary
    monotykamary    | -|cannuri
    cannuri    |feifei325
    feifei325    |zhangtony239
    zhangtony239    |shariqriazz
    shariqriazz    |vigneshsubbiah16
    vigneshsubbiah16    |pugazhendhi-m
    pugazhendhi-m    | -|lloydchang
    lloydchang    |dtrugman
    dtrugman    |Szpadel
    Szpadel    |hassoncs
    hassoncs    |liwilliam2021
    liwilliam2021    |lupuletic
    lupuletic    | -|kiwina
    kiwina    |Premshay
    Premshay    |psv2522
    psv2522    |olweraltuve
    olweraltuve    |diarmidmackenzie
    diarmidmackenzie    |ChuKhaLi
    ChuKhaLi    | -|PeterDaveHello
    PeterDaveHello    |aheizi
    aheizi    |nbihan-mediware
    nbihan-mediware    |noritaka1166
    noritaka1166    |RaySinner
    RaySinner    |afshawnlotfi
    afshawnlotfi    | -|dleffel
    dleffel    |StevenTCramer
    StevenTCramer    |Ruakij
    Ruakij    |pdecat
    pdecat    |kyle-apex
    kyle-apex    |emshvac
    emshvac    | -|Lunchb0ne
    Lunchb0ne    |SmartManoj
    SmartManoj    |vagadiya
    vagadiya    |slytechnical
    slytechnical    |dlab-anton
    dlab-anton    |arthurauffray
    arthurauffray    | -|upamune
    upamune    |NamesMT
    NamesMT    |taylorwilsdon
    taylorwilsdon    |sammcj
    sammcj    |p12tic
    p12tic    |gtaylor
    gtaylor    | -|brunobergher
    brunobergher    |aitoroses
    aitoroses    |ross
    ross    |mr-ryan-james
    mr-ryan-james    |heyseth
    heyseth    |taisukeoe
    taisukeoe    | -|avtc
    avtc    |eonghk
    eonghk    |GOODBOY008
    GOODBOY008    |kcwhite
    kcwhite    |ronyblum
    ronyblum    |teddyOOXX
    teddyOOXX    | -|vincentsong
    vincentsong    |yongjer
    yongjer    |zeozeozeo
    zeozeozeo    |ashktn
    ashktn    |franekp
    franekp    |yt3trees
    yt3trees    | -|seedlord
    seedlord    |bramburn
    bramburn    |anton-otee
    anton-otee    |benzntech
    benzntech    |axkirillov
    axkirillov    |olearycrew
    olearycrew    | -|catrielmuller
    catrielmuller    |devxpain
    devxpain    |snoyiatk
    snoyiatk    |GitlyHallows
    GitlyHallows    |jcbdev
    jcbdev    |Chenjiayuan195
    Chenjiayuan195    | -|julionav
    julionav    |KanTakahiro
    KanTakahiro    |SplittyDev
    SplittyDev    |mdp
    mdp    |napter
    napter    |philfung
    philfung    | -|bannzai
    bannzai    |bbenshalom
    bbenshalom    |chris-garrett
    chris-garrett    |dairui1
    dairui1    |dqroid
    dqroid    |janaki-sasidhar
    janaki-sasidhar    | -|forestyoo
    forestyoo    |hatsu38
    hatsu38    |hongzio
    hongzio    |im47cn
    im47cn    |shoopapa
    shoopapa    |jwcraig
    jwcraig    | -|axmo
    axmo    |asychin
    asychin    |amittell
    amittell    |Yoshino-Yukitaro
    Yoshino-Yukitaro    |Yikai-Liao
    Yikai-Liao    |zxdvd
    zxdvd    | -|s97712
    s97712    |vladstudio
    vladstudio    |vivekfyi
    vivekfyi    |HahaBill
    HahaBill    |tmsjngx0
    tmsjngx0    |TGlide
    TGlide    | -|Githubguy132010
    Githubguy132010    |tgfjt
    tgfjt    |maekawataiki
    maekawataiki    |nevermorec
    nevermorec    |PretzelVector
    PretzelVector    |zetaloop
    zetaloop    | -|cdlliuy
    cdlliuy    |user202729
    user202729    |thill2323
    thill2323    |takakoutso
    takakoutso    |student20880
    student20880    |shubhamgupta731
    shubhamgupta731    | -|shohei-ihaya
    shohei-ihaya    |shivamd1810
    shivamd1810    |shaybc
    shaybc    |sensei-woo
    sensei-woo    |samir-nimbly
    samir-nimbly    |robertheadley
    robertheadley    | -|refactorthis
    refactorthis    |qingyuan1109
    qingyuan1109    |pokutuna
    pokutuna    |philipnext
    philipnext    |village-way
    village-way    |oprstchn
    oprstchn    | -|nobu007
    nobu007    |mosleyit
    mosleyit    |moqimoqidea
    moqimoqidea    |mlopezr
    mlopezr    |mecab
    mecab    |olup
    olup    | -|lightrabbit
    lightrabbit    |lhish
    lhish    |kohii
    kohii    |kinandan
    kinandan    |AlexandruSmirnov
    AlexandruSmirnov    |pfitz
    pfitz    | -|ExactDoug
    ExactDoug    |celestial-vault
    celestial-vault    |linegel
    linegel    |edwin-truthsearch-io
    edwin-truthsearch-io    |EamonNerbonne
    EamonNerbonne    |dbasclpy
    dbasclpy    | -|dflatline
    dflatline    |Deon588
    Deon588    |dleen
    dleen    |CW-B-W
    CW-B-W    |chadgauth
    chadgauth    |thecolorblue
    thecolorblue    | -|bogdan0083
    bogdan0083    |benashby
    benashby    |Atlogit
    Atlogit    |atlasgong
    atlasgong    |AntiMoron
    AntiMoron    |andrewshu2000
    andrewshu2000    | -|andreastempsch
    andreastempsch    |alasano
    alasano    |QuinsZouls
    QuinsZouls    |HadesArchitect
    HadesArchitect    |alarno
    alarno    |nexon33
    nexon33    | -|adilhafeez
    adilhafeez    |adamwlarson
    adamwlarson    |adamhill
    adamhill    |AMHesch
    AMHesch    |adambrand
    adambrand    |samsilveira
    samsilveira    | -|01Rian
    01Rian    |RSO
    RSO    |RandalSchwartz
    RandalSchwartz    |SECKainersdorfer
    SECKainersdorfer    |R-omk
    R-omk    |Sarke
    Sarke    | -|PaperBoardOfficial
    PaperBoardOfficial    |OlegOAndreev
    OlegOAndreev    |Naam
    Naam    |NaccOll
    NaccOll    |kvokka
    kvokka    |ecmasx
    ecmasx    | -|mollux
    mollux    |marvijo-code
    marvijo-code    |markijbema
    markijbema    |mamertofabian
    mamertofabian    |monkeyDluffy6017
    monkeyDluffy6017    |libertyteeth
    libertyteeth    | -|shtse8
    shtse8    |Rexarrior
    Rexarrior    |kevinvandijk
    kevinvandijk    |KevinZhao
    KevinZhao    |ksze
    ksze    |Juice10
    Juice10    | -|snova-jorgep
    snova-jorgep    |Fovty
    Fovty    |Jdo300
    Jdo300    |hesara
    hesara    |DeXtroTip
    DeXtroTip    | | + +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | +| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | +| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | +| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | +| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | +| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | +| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | +| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | +| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | +| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | +| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | +| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | +| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | +| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | +| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | +| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | +| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | +| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | +| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | +| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | +| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | +| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | +| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | +| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | +| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | +| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | +| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | +| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | +| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | +| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | +| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | +| DeXtroTip
    DeXtroTip     | | | | | | + ## Licencja diff --git a/locales/pt-BR/README.md b/locales/pt-BR/README.md index d660b8f11b..a1e1adc9c2 100644 --- a/locales/pt-BR/README.md +++ b/locales/pt-BR/README.md @@ -181,45 +181,48 @@ Adoramos contribuições da comunidade! Comece lendo nosso [CONTRIBUTING.md](CON Obrigado a todos os nossos contribuidores que ajudaram a tornar o Roo Code melhor! -|mrubens
    mrubens    |saoudrizwan
    saoudrizwan    |cte
    cte    |daniel-lxs
    daniel-lxs    |samhvw8
    samhvw8    |hannesrudolph
    hannesrudolph    | -|:---:|:---:|:---:|:---:|:---:|:---:| -|KJ7LNW
    KJ7LNW    |a8trejo
    a8trejo    |MuriloFP
    MuriloFP    |ColemanRoo
    ColemanRoo    |canrobins13
    canrobins13    |stea9499
    stea9499    | -|joemanley201
    joemanley201    |System233
    System233    |jr
    jr    |nissa-seru
    nissa-seru    |jquanton
    jquanton    |roomote-agent
    roomote-agent    | -|NyxJae
    NyxJae    |d-oit
    d-oit    |elianiva
    elianiva    |qdaxb
    qdaxb    |punkpeye
    punkpeye    |wkordalski
    wkordalski    | -|SannidhyaSah
    SannidhyaSah    |xyOz-dev
    xyOz-dev    |chrarnoldus
    chrarnoldus    |sachasayan
    sachasayan    |Smartsheet-JB-Brown
    Smartsheet-JB-Brown    |monotykamary
    monotykamary    | -|cannuri
    cannuri    |feifei325
    feifei325    |zhangtony239
    zhangtony239    |shariqriazz
    shariqriazz    |vigneshsubbiah16
    vigneshsubbiah16    |pugazhendhi-m
    pugazhendhi-m    | -|lloydchang
    lloydchang    |dtrugman
    dtrugman    |Szpadel
    Szpadel    |hassoncs
    hassoncs    |liwilliam2021
    liwilliam2021    |lupuletic
    lupuletic    | -|kiwina
    kiwina    |Premshay
    Premshay    |psv2522
    psv2522    |olweraltuve
    olweraltuve    |diarmidmackenzie
    diarmidmackenzie    |ChuKhaLi
    ChuKhaLi    | -|PeterDaveHello
    PeterDaveHello    |aheizi
    aheizi    |nbihan-mediware
    nbihan-mediware    |noritaka1166
    noritaka1166    |RaySinner
    RaySinner    |afshawnlotfi
    afshawnlotfi    | -|dleffel
    dleffel    |StevenTCramer
    StevenTCramer    |Ruakij
    Ruakij    |pdecat
    pdecat    |kyle-apex
    kyle-apex    |emshvac
    emshvac    | -|Lunchb0ne
    Lunchb0ne    |SmartManoj
    SmartManoj    |vagadiya
    vagadiya    |slytechnical
    slytechnical    |dlab-anton
    dlab-anton    |arthurauffray
    arthurauffray    | -|upamune
    upamune    |NamesMT
    NamesMT    |taylorwilsdon
    taylorwilsdon    |sammcj
    sammcj    |p12tic
    p12tic    |gtaylor
    gtaylor    | -|brunobergher
    brunobergher    |aitoroses
    aitoroses    |ross
    ross    |mr-ryan-james
    mr-ryan-james    |heyseth
    heyseth    |taisukeoe
    taisukeoe    | -|avtc
    avtc    |eonghk
    eonghk    |GOODBOY008
    GOODBOY008    |kcwhite
    kcwhite    |ronyblum
    ronyblum    |teddyOOXX
    teddyOOXX    | -|vincentsong
    vincentsong    |yongjer
    yongjer    |zeozeozeo
    zeozeozeo    |ashktn
    ashktn    |franekp
    franekp    |yt3trees
    yt3trees    | -|seedlord
    seedlord    |bramburn
    bramburn    |anton-otee
    anton-otee    |benzntech
    benzntech    |axkirillov
    axkirillov    |olearycrew
    olearycrew    | -|catrielmuller
    catrielmuller    |devxpain
    devxpain    |snoyiatk
    snoyiatk    |GitlyHallows
    GitlyHallows    |jcbdev
    jcbdev    |Chenjiayuan195
    Chenjiayuan195    | -|julionav
    julionav    |KanTakahiro
    KanTakahiro    |SplittyDev
    SplittyDev    |mdp
    mdp    |napter
    napter    |philfung
    philfung    | -|bannzai
    bannzai    |bbenshalom
    bbenshalom    |chris-garrett
    chris-garrett    |dairui1
    dairui1    |dqroid
    dqroid    |janaki-sasidhar
    janaki-sasidhar    | -|forestyoo
    forestyoo    |hatsu38
    hatsu38    |hongzio
    hongzio    |im47cn
    im47cn    |shoopapa
    shoopapa    |jwcraig
    jwcraig    | -|axmo
    axmo    |asychin
    asychin    |amittell
    amittell    |Yoshino-Yukitaro
    Yoshino-Yukitaro    |Yikai-Liao
    Yikai-Liao    |zxdvd
    zxdvd    | -|s97712
    s97712    |vladstudio
    vladstudio    |vivekfyi
    vivekfyi    |HahaBill
    HahaBill    |tmsjngx0
    tmsjngx0    |TGlide
    TGlide    | -|Githubguy132010
    Githubguy132010    |tgfjt
    tgfjt    |maekawataiki
    maekawataiki    |nevermorec
    nevermorec    |PretzelVector
    PretzelVector    |zetaloop
    zetaloop    | -|cdlliuy
    cdlliuy    |user202729
    user202729    |thill2323
    thill2323    |takakoutso
    takakoutso    |student20880
    student20880    |shubhamgupta731
    shubhamgupta731    | -|shohei-ihaya
    shohei-ihaya    |shivamd1810
    shivamd1810    |shaybc
    shaybc    |sensei-woo
    sensei-woo    |samir-nimbly
    samir-nimbly    |robertheadley
    robertheadley    | -|refactorthis
    refactorthis    |qingyuan1109
    qingyuan1109    |pokutuna
    pokutuna    |philipnext
    philipnext    |village-way
    village-way    |oprstchn
    oprstchn    | -|nobu007
    nobu007    |mosleyit
    mosleyit    |moqimoqidea
    moqimoqidea    |mlopezr
    mlopezr    |mecab
    mecab    |olup
    olup    | -|lightrabbit
    lightrabbit    |lhish
    lhish    |kohii
    kohii    |kinandan
    kinandan    |AlexandruSmirnov
    AlexandruSmirnov    |pfitz
    pfitz    | -|ExactDoug
    ExactDoug    |celestial-vault
    celestial-vault    |linegel
    linegel    |edwin-truthsearch-io
    edwin-truthsearch-io    |EamonNerbonne
    EamonNerbonne    |dbasclpy
    dbasclpy    | -|dflatline
    dflatline    |Deon588
    Deon588    |dleen
    dleen    |CW-B-W
    CW-B-W    |chadgauth
    chadgauth    |thecolorblue
    thecolorblue    | -|bogdan0083
    bogdan0083    |benashby
    benashby    |Atlogit
    Atlogit    |atlasgong
    atlasgong    |AntiMoron
    AntiMoron    |andrewshu2000
    andrewshu2000    | -|andreastempsch
    andreastempsch    |alasano
    alasano    |QuinsZouls
    QuinsZouls    |HadesArchitect
    HadesArchitect    |alarno
    alarno    |nexon33
    nexon33    | -|adilhafeez
    adilhafeez    |adamwlarson
    adamwlarson    |adamhill
    adamhill    |AMHesch
    AMHesch    |adambrand
    adambrand    |samsilveira
    samsilveira    | -|01Rian
    01Rian    |RSO
    RSO    |RandalSchwartz
    RandalSchwartz    |SECKainersdorfer
    SECKainersdorfer    |R-omk
    R-omk    |Sarke
    Sarke    | -|PaperBoardOfficial
    PaperBoardOfficial    |OlegOAndreev
    OlegOAndreev    |Naam
    Naam    |NaccOll
    NaccOll    |kvokka
    kvokka    |ecmasx
    ecmasx    | -|mollux
    mollux    |marvijo-code
    marvijo-code    |markijbema
    markijbema    |mamertofabian
    mamertofabian    |monkeyDluffy6017
    monkeyDluffy6017    |libertyteeth
    libertyteeth    | -|shtse8
    shtse8    |Rexarrior
    Rexarrior    |kevinvandijk
    kevinvandijk    |KevinZhao
    KevinZhao    |ksze
    ksze    |Juice10
    Juice10    | -|snova-jorgep
    snova-jorgep    |Fovty
    Fovty    |Jdo300
    Jdo300    |hesara
    hesara    |DeXtroTip
    DeXtroTip    | | + +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | +| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | +| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | +| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | +| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | +| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | +| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | +| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | +| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | +| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | +| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | +| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | +| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | +| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | +| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | +| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | +| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | +| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | +| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | +| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | +| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | +| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | +| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | +| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | +| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | +| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | +| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | +| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | +| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | +| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | +| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | +| DeXtroTip
    DeXtroTip     | | | | | | + ## Licença diff --git a/locales/ru/README.md b/locales/ru/README.md index 9483dfac79..11b34b0def 100644 --- a/locales/ru/README.md +++ b/locales/ru/README.md @@ -181,45 +181,48 @@ code --install-extension bin/roo-cline-.vsix Спасибо всем нашим участникам, которые помогли сделать Roo Code лучше! -|mrubens
    mrubens    |saoudrizwan
    saoudrizwan    |cte
    cte    |daniel-lxs
    daniel-lxs    |samhvw8
    samhvw8    |hannesrudolph
    hannesrudolph    | -|:---:|:---:|:---:|:---:|:---:|:---:| -|KJ7LNW
    KJ7LNW    |a8trejo
    a8trejo    |MuriloFP
    MuriloFP    |ColemanRoo
    ColemanRoo    |canrobins13
    canrobins13    |stea9499
    stea9499    | -|joemanley201
    joemanley201    |System233
    System233    |jr
    jr    |nissa-seru
    nissa-seru    |jquanton
    jquanton    |roomote-agent
    roomote-agent    | -|NyxJae
    NyxJae    |d-oit
    d-oit    |elianiva
    elianiva    |qdaxb
    qdaxb    |punkpeye
    punkpeye    |wkordalski
    wkordalski    | -|SannidhyaSah
    SannidhyaSah    |xyOz-dev
    xyOz-dev    |chrarnoldus
    chrarnoldus    |sachasayan
    sachasayan    |Smartsheet-JB-Brown
    Smartsheet-JB-Brown    |monotykamary
    monotykamary    | -|cannuri
    cannuri    |feifei325
    feifei325    |zhangtony239
    zhangtony239    |shariqriazz
    shariqriazz    |vigneshsubbiah16
    vigneshsubbiah16    |pugazhendhi-m
    pugazhendhi-m    | -|lloydchang
    lloydchang    |dtrugman
    dtrugman    |Szpadel
    Szpadel    |hassoncs
    hassoncs    |liwilliam2021
    liwilliam2021    |lupuletic
    lupuletic    | -|kiwina
    kiwina    |Premshay
    Premshay    |psv2522
    psv2522    |olweraltuve
    olweraltuve    |diarmidmackenzie
    diarmidmackenzie    |ChuKhaLi
    ChuKhaLi    | -|PeterDaveHello
    PeterDaveHello    |aheizi
    aheizi    |nbihan-mediware
    nbihan-mediware    |noritaka1166
    noritaka1166    |RaySinner
    RaySinner    |afshawnlotfi
    afshawnlotfi    | -|dleffel
    dleffel    |StevenTCramer
    StevenTCramer    |Ruakij
    Ruakij    |pdecat
    pdecat    |kyle-apex
    kyle-apex    |emshvac
    emshvac    | -|Lunchb0ne
    Lunchb0ne    |SmartManoj
    SmartManoj    |vagadiya
    vagadiya    |slytechnical
    slytechnical    |dlab-anton
    dlab-anton    |arthurauffray
    arthurauffray    | -|upamune
    upamune    |NamesMT
    NamesMT    |taylorwilsdon
    taylorwilsdon    |sammcj
    sammcj    |p12tic
    p12tic    |gtaylor
    gtaylor    | -|brunobergher
    brunobergher    |aitoroses
    aitoroses    |ross
    ross    |mr-ryan-james
    mr-ryan-james    |heyseth
    heyseth    |taisukeoe
    taisukeoe    | -|avtc
    avtc    |eonghk
    eonghk    |GOODBOY008
    GOODBOY008    |kcwhite
    kcwhite    |ronyblum
    ronyblum    |teddyOOXX
    teddyOOXX    | -|vincentsong
    vincentsong    |yongjer
    yongjer    |zeozeozeo
    zeozeozeo    |ashktn
    ashktn    |franekp
    franekp    |yt3trees
    yt3trees    | -|seedlord
    seedlord    |bramburn
    bramburn    |anton-otee
    anton-otee    |benzntech
    benzntech    |axkirillov
    axkirillov    |olearycrew
    olearycrew    | -|catrielmuller
    catrielmuller    |devxpain
    devxpain    |snoyiatk
    snoyiatk    |GitlyHallows
    GitlyHallows    |jcbdev
    jcbdev    |Chenjiayuan195
    Chenjiayuan195    | -|julionav
    julionav    |KanTakahiro
    KanTakahiro    |SplittyDev
    SplittyDev    |mdp
    mdp    |napter
    napter    |philfung
    philfung    | -|bannzai
    bannzai    |bbenshalom
    bbenshalom    |chris-garrett
    chris-garrett    |dairui1
    dairui1    |dqroid
    dqroid    |janaki-sasidhar
    janaki-sasidhar    | -|forestyoo
    forestyoo    |hatsu38
    hatsu38    |hongzio
    hongzio    |im47cn
    im47cn    |shoopapa
    shoopapa    |jwcraig
    jwcraig    | -|axmo
    axmo    |asychin
    asychin    |amittell
    amittell    |Yoshino-Yukitaro
    Yoshino-Yukitaro    |Yikai-Liao
    Yikai-Liao    |zxdvd
    zxdvd    | -|s97712
    s97712    |vladstudio
    vladstudio    |vivekfyi
    vivekfyi    |HahaBill
    HahaBill    |tmsjngx0
    tmsjngx0    |TGlide
    TGlide    | -|Githubguy132010
    Githubguy132010    |tgfjt
    tgfjt    |maekawataiki
    maekawataiki    |nevermorec
    nevermorec    |PretzelVector
    PretzelVector    |zetaloop
    zetaloop    | -|cdlliuy
    cdlliuy    |user202729
    user202729    |thill2323
    thill2323    |takakoutso
    takakoutso    |student20880
    student20880    |shubhamgupta731
    shubhamgupta731    | -|shohei-ihaya
    shohei-ihaya    |shivamd1810
    shivamd1810    |shaybc
    shaybc    |sensei-woo
    sensei-woo    |samir-nimbly
    samir-nimbly    |robertheadley
    robertheadley    | -|refactorthis
    refactorthis    |qingyuan1109
    qingyuan1109    |pokutuna
    pokutuna    |philipnext
    philipnext    |village-way
    village-way    |oprstchn
    oprstchn    | -|nobu007
    nobu007    |mosleyit
    mosleyit    |moqimoqidea
    moqimoqidea    |mlopezr
    mlopezr    |mecab
    mecab    |olup
    olup    | -|lightrabbit
    lightrabbit    |lhish
    lhish    |kohii
    kohii    |kinandan
    kinandan    |AlexandruSmirnov
    AlexandruSmirnov    |pfitz
    pfitz    | -|ExactDoug
    ExactDoug    |celestial-vault
    celestial-vault    |linegel
    linegel    |edwin-truthsearch-io
    edwin-truthsearch-io    |EamonNerbonne
    EamonNerbonne    |dbasclpy
    dbasclpy    | -|dflatline
    dflatline    |Deon588
    Deon588    |dleen
    dleen    |CW-B-W
    CW-B-W    |chadgauth
    chadgauth    |thecolorblue
    thecolorblue    | -|bogdan0083
    bogdan0083    |benashby
    benashby    |Atlogit
    Atlogit    |atlasgong
    atlasgong    |AntiMoron
    AntiMoron    |andrewshu2000
    andrewshu2000    | -|andreastempsch
    andreastempsch    |alasano
    alasano    |QuinsZouls
    QuinsZouls    |HadesArchitect
    HadesArchitect    |alarno
    alarno    |nexon33
    nexon33    | -|adilhafeez
    adilhafeez    |adamwlarson
    adamwlarson    |adamhill
    adamhill    |AMHesch
    AMHesch    |adambrand
    adambrand    |samsilveira
    samsilveira    | -|01Rian
    01Rian    |RSO
    RSO    |RandalSchwartz
    RandalSchwartz    |SECKainersdorfer
    SECKainersdorfer    |R-omk
    R-omk    |Sarke
    Sarke    | -|PaperBoardOfficial
    PaperBoardOfficial    |OlegOAndreev
    OlegOAndreev    |Naam
    Naam    |NaccOll
    NaccOll    |kvokka
    kvokka    |ecmasx
    ecmasx    | -|mollux
    mollux    |marvijo-code
    marvijo-code    |markijbema
    markijbema    |mamertofabian
    mamertofabian    |monkeyDluffy6017
    monkeyDluffy6017    |libertyteeth
    libertyteeth    | -|shtse8
    shtse8    |Rexarrior
    Rexarrior    |kevinvandijk
    kevinvandijk    |KevinZhao
    KevinZhao    |ksze
    ksze    |Juice10
    Juice10    | -|snova-jorgep
    snova-jorgep    |Fovty
    Fovty    |Jdo300
    Jdo300    |hesara
    hesara    |DeXtroTip
    DeXtroTip    | | + +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | +| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | +| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | +| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | +| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | +| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | +| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | +| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | +| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | +| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | +| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | +| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | +| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | +| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | +| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | +| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | +| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | +| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | +| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | +| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | +| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | +| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | +| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | +| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | +| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | +| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | +| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | +| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | +| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | +| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | +| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | +| DeXtroTip
    DeXtroTip     | | | | | | + ## Лицензия diff --git a/locales/tr/README.md b/locales/tr/README.md index bcdb6d8f68..e8de93840a 100644 --- a/locales/tr/README.md +++ b/locales/tr/README.md @@ -181,45 +181,48 @@ Topluluk katkılarını seviyoruz! [CONTRIBUTING.md](CONTRIBUTING.md) dosyasın Roo Code'u daha iyi hale getirmeye yardımcı olan tüm katkıda bulunanlara teşekkür ederiz! -|mrubens
    mrubens    |saoudrizwan
    saoudrizwan    |cte
    cte    |daniel-lxs
    daniel-lxs    |samhvw8
    samhvw8    |hannesrudolph
    hannesrudolph    | -|:---:|:---:|:---:|:---:|:---:|:---:| -|KJ7LNW
    KJ7LNW    |a8trejo
    a8trejo    |MuriloFP
    MuriloFP    |ColemanRoo
    ColemanRoo    |canrobins13
    canrobins13    |stea9499
    stea9499    | -|joemanley201
    joemanley201    |System233
    System233    |jr
    jr    |nissa-seru
    nissa-seru    |jquanton
    jquanton    |roomote-agent
    roomote-agent    | -|NyxJae
    NyxJae    |d-oit
    d-oit    |elianiva
    elianiva    |qdaxb
    qdaxb    |punkpeye
    punkpeye    |wkordalski
    wkordalski    | -|SannidhyaSah
    SannidhyaSah    |xyOz-dev
    xyOz-dev    |chrarnoldus
    chrarnoldus    |sachasayan
    sachasayan    |Smartsheet-JB-Brown
    Smartsheet-JB-Brown    |monotykamary
    monotykamary    | -|cannuri
    cannuri    |feifei325
    feifei325    |zhangtony239
    zhangtony239    |shariqriazz
    shariqriazz    |vigneshsubbiah16
    vigneshsubbiah16    |pugazhendhi-m
    pugazhendhi-m    | -|lloydchang
    lloydchang    |dtrugman
    dtrugman    |Szpadel
    Szpadel    |hassoncs
    hassoncs    |liwilliam2021
    liwilliam2021    |lupuletic
    lupuletic    | -|kiwina
    kiwina    |Premshay
    Premshay    |psv2522
    psv2522    |olweraltuve
    olweraltuve    |diarmidmackenzie
    diarmidmackenzie    |ChuKhaLi
    ChuKhaLi    | -|PeterDaveHello
    PeterDaveHello    |aheizi
    aheizi    |nbihan-mediware
    nbihan-mediware    |noritaka1166
    noritaka1166    |RaySinner
    RaySinner    |afshawnlotfi
    afshawnlotfi    | -|dleffel
    dleffel    |StevenTCramer
    StevenTCramer    |Ruakij
    Ruakij    |pdecat
    pdecat    |kyle-apex
    kyle-apex    |emshvac
    emshvac    | -|Lunchb0ne
    Lunchb0ne    |SmartManoj
    SmartManoj    |vagadiya
    vagadiya    |slytechnical
    slytechnical    |dlab-anton
    dlab-anton    |arthurauffray
    arthurauffray    | -|upamune
    upamune    |NamesMT
    NamesMT    |taylorwilsdon
    taylorwilsdon    |sammcj
    sammcj    |p12tic
    p12tic    |gtaylor
    gtaylor    | -|brunobergher
    brunobergher    |aitoroses
    aitoroses    |ross
    ross    |mr-ryan-james
    mr-ryan-james    |heyseth
    heyseth    |taisukeoe
    taisukeoe    | -|avtc
    avtc    |eonghk
    eonghk    |GOODBOY008
    GOODBOY008    |kcwhite
    kcwhite    |ronyblum
    ronyblum    |teddyOOXX
    teddyOOXX    | -|vincentsong
    vincentsong    |yongjer
    yongjer    |zeozeozeo
    zeozeozeo    |ashktn
    ashktn    |franekp
    franekp    |yt3trees
    yt3trees    | -|seedlord
    seedlord    |bramburn
    bramburn    |anton-otee
    anton-otee    |benzntech
    benzntech    |axkirillov
    axkirillov    |olearycrew
    olearycrew    | -|catrielmuller
    catrielmuller    |devxpain
    devxpain    |snoyiatk
    snoyiatk    |GitlyHallows
    GitlyHallows    |jcbdev
    jcbdev    |Chenjiayuan195
    Chenjiayuan195    | -|julionav
    julionav    |KanTakahiro
    KanTakahiro    |SplittyDev
    SplittyDev    |mdp
    mdp    |napter
    napter    |philfung
    philfung    | -|bannzai
    bannzai    |bbenshalom
    bbenshalom    |chris-garrett
    chris-garrett    |dairui1
    dairui1    |dqroid
    dqroid    |janaki-sasidhar
    janaki-sasidhar    | -|forestyoo
    forestyoo    |hatsu38
    hatsu38    |hongzio
    hongzio    |im47cn
    im47cn    |shoopapa
    shoopapa    |jwcraig
    jwcraig    | -|axmo
    axmo    |asychin
    asychin    |amittell
    amittell    |Yoshino-Yukitaro
    Yoshino-Yukitaro    |Yikai-Liao
    Yikai-Liao    |zxdvd
    zxdvd    | -|s97712
    s97712    |vladstudio
    vladstudio    |vivekfyi
    vivekfyi    |HahaBill
    HahaBill    |tmsjngx0
    tmsjngx0    |TGlide
    TGlide    | -|Githubguy132010
    Githubguy132010    |tgfjt
    tgfjt    |maekawataiki
    maekawataiki    |nevermorec
    nevermorec    |PretzelVector
    PretzelVector    |zetaloop
    zetaloop    | -|cdlliuy
    cdlliuy    |user202729
    user202729    |thill2323
    thill2323    |takakoutso
    takakoutso    |student20880
    student20880    |shubhamgupta731
    shubhamgupta731    | -|shohei-ihaya
    shohei-ihaya    |shivamd1810
    shivamd1810    |shaybc
    shaybc    |sensei-woo
    sensei-woo    |samir-nimbly
    samir-nimbly    |robertheadley
    robertheadley    | -|refactorthis
    refactorthis    |qingyuan1109
    qingyuan1109    |pokutuna
    pokutuna    |philipnext
    philipnext    |village-way
    village-way    |oprstchn
    oprstchn    | -|nobu007
    nobu007    |mosleyit
    mosleyit    |moqimoqidea
    moqimoqidea    |mlopezr
    mlopezr    |mecab
    mecab    |olup
    olup    | -|lightrabbit
    lightrabbit    |lhish
    lhish    |kohii
    kohii    |kinandan
    kinandan    |AlexandruSmirnov
    AlexandruSmirnov    |pfitz
    pfitz    | -|ExactDoug
    ExactDoug    |celestial-vault
    celestial-vault    |linegel
    linegel    |edwin-truthsearch-io
    edwin-truthsearch-io    |EamonNerbonne
    EamonNerbonne    |dbasclpy
    dbasclpy    | -|dflatline
    dflatline    |Deon588
    Deon588    |dleen
    dleen    |CW-B-W
    CW-B-W    |chadgauth
    chadgauth    |thecolorblue
    thecolorblue    | -|bogdan0083
    bogdan0083    |benashby
    benashby    |Atlogit
    Atlogit    |atlasgong
    atlasgong    |AntiMoron
    AntiMoron    |andrewshu2000
    andrewshu2000    | -|andreastempsch
    andreastempsch    |alasano
    alasano    |QuinsZouls
    QuinsZouls    |HadesArchitect
    HadesArchitect    |alarno
    alarno    |nexon33
    nexon33    | -|adilhafeez
    adilhafeez    |adamwlarson
    adamwlarson    |adamhill
    adamhill    |AMHesch
    AMHesch    |adambrand
    adambrand    |samsilveira
    samsilveira    | -|01Rian
    01Rian    |RSO
    RSO    |RandalSchwartz
    RandalSchwartz    |SECKainersdorfer
    SECKainersdorfer    |R-omk
    R-omk    |Sarke
    Sarke    | -|PaperBoardOfficial
    PaperBoardOfficial    |OlegOAndreev
    OlegOAndreev    |Naam
    Naam    |NaccOll
    NaccOll    |kvokka
    kvokka    |ecmasx
    ecmasx    | -|mollux
    mollux    |marvijo-code
    marvijo-code    |markijbema
    markijbema    |mamertofabian
    mamertofabian    |monkeyDluffy6017
    monkeyDluffy6017    |libertyteeth
    libertyteeth    | -|shtse8
    shtse8    |Rexarrior
    Rexarrior    |kevinvandijk
    kevinvandijk    |KevinZhao
    KevinZhao    |ksze
    ksze    |Juice10
    Juice10    | -|snova-jorgep
    snova-jorgep    |Fovty
    Fovty    |Jdo300
    Jdo300    |hesara
    hesara    |DeXtroTip
    DeXtroTip    | | + +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | +| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | +| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | +| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | +| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | +| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | +| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | +| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | +| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | +| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | +| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | +| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | +| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | +| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | +| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | +| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | +| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | +| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | +| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | +| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | +| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | +| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | +| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | +| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | +| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | +| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | +| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | +| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | +| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | +| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | +| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | +| DeXtroTip
    DeXtroTip     | | | | | | + ## Lisans diff --git a/locales/vi/README.md b/locales/vi/README.md index 11e2d7f008..e638ad9ed9 100644 --- a/locales/vi/README.md +++ b/locales/vi/README.md @@ -181,45 +181,48 @@ Chúng tôi rất hoan nghênh đóng góp từ cộng đồng! Bắt đầu b Cảm ơn tất cả những người đóng góp đã giúp cải thiện Roo Code! -|mrubens
    mrubens    |saoudrizwan
    saoudrizwan    |cte
    cte    |daniel-lxs
    daniel-lxs    |samhvw8
    samhvw8    |hannesrudolph
    hannesrudolph    | -|:---:|:---:|:---:|:---:|:---:|:---:| -|KJ7LNW
    KJ7LNW    |a8trejo
    a8trejo    |MuriloFP
    MuriloFP    |ColemanRoo
    ColemanRoo    |canrobins13
    canrobins13    |stea9499
    stea9499    | -|joemanley201
    joemanley201    |System233
    System233    |jr
    jr    |nissa-seru
    nissa-seru    |jquanton
    jquanton    |roomote-agent
    roomote-agent    | -|NyxJae
    NyxJae    |d-oit
    d-oit    |elianiva
    elianiva    |qdaxb
    qdaxb    |punkpeye
    punkpeye    |wkordalski
    wkordalski    | -|SannidhyaSah
    SannidhyaSah    |xyOz-dev
    xyOz-dev    |chrarnoldus
    chrarnoldus    |sachasayan
    sachasayan    |Smartsheet-JB-Brown
    Smartsheet-JB-Brown    |monotykamary
    monotykamary    | -|cannuri
    cannuri    |feifei325
    feifei325    |zhangtony239
    zhangtony239    |shariqriazz
    shariqriazz    |vigneshsubbiah16
    vigneshsubbiah16    |pugazhendhi-m
    pugazhendhi-m    | -|lloydchang
    lloydchang    |dtrugman
    dtrugman    |Szpadel
    Szpadel    |hassoncs
    hassoncs    |liwilliam2021
    liwilliam2021    |lupuletic
    lupuletic    | -|kiwina
    kiwina    |Premshay
    Premshay    |psv2522
    psv2522    |olweraltuve
    olweraltuve    |diarmidmackenzie
    diarmidmackenzie    |ChuKhaLi
    ChuKhaLi    | -|PeterDaveHello
    PeterDaveHello    |aheizi
    aheizi    |nbihan-mediware
    nbihan-mediware    |noritaka1166
    noritaka1166    |RaySinner
    RaySinner    |afshawnlotfi
    afshawnlotfi    | -|dleffel
    dleffel    |StevenTCramer
    StevenTCramer    |Ruakij
    Ruakij    |pdecat
    pdecat    |kyle-apex
    kyle-apex    |emshvac
    emshvac    | -|Lunchb0ne
    Lunchb0ne    |SmartManoj
    SmartManoj    |vagadiya
    vagadiya    |slytechnical
    slytechnical    |dlab-anton
    dlab-anton    |arthurauffray
    arthurauffray    | -|upamune
    upamune    |NamesMT
    NamesMT    |taylorwilsdon
    taylorwilsdon    |sammcj
    sammcj    |p12tic
    p12tic    |gtaylor
    gtaylor    | -|brunobergher
    brunobergher    |aitoroses
    aitoroses    |ross
    ross    |mr-ryan-james
    mr-ryan-james    |heyseth
    heyseth    |taisukeoe
    taisukeoe    | -|avtc
    avtc    |eonghk
    eonghk    |GOODBOY008
    GOODBOY008    |kcwhite
    kcwhite    |ronyblum
    ronyblum    |teddyOOXX
    teddyOOXX    | -|vincentsong
    vincentsong    |yongjer
    yongjer    |zeozeozeo
    zeozeozeo    |ashktn
    ashktn    |franekp
    franekp    |yt3trees
    yt3trees    | -|seedlord
    seedlord    |bramburn
    bramburn    |anton-otee
    anton-otee    |benzntech
    benzntech    |axkirillov
    axkirillov    |olearycrew
    olearycrew    | -|catrielmuller
    catrielmuller    |devxpain
    devxpain    |snoyiatk
    snoyiatk    |GitlyHallows
    GitlyHallows    |jcbdev
    jcbdev    |Chenjiayuan195
    Chenjiayuan195    | -|julionav
    julionav    |KanTakahiro
    KanTakahiro    |SplittyDev
    SplittyDev    |mdp
    mdp    |napter
    napter    |philfung
    philfung    | -|bannzai
    bannzai    |bbenshalom
    bbenshalom    |chris-garrett
    chris-garrett    |dairui1
    dairui1    |dqroid
    dqroid    |janaki-sasidhar
    janaki-sasidhar    | -|forestyoo
    forestyoo    |hatsu38
    hatsu38    |hongzio
    hongzio    |im47cn
    im47cn    |shoopapa
    shoopapa    |jwcraig
    jwcraig    | -|axmo
    axmo    |asychin
    asychin    |amittell
    amittell    |Yoshino-Yukitaro
    Yoshino-Yukitaro    |Yikai-Liao
    Yikai-Liao    |zxdvd
    zxdvd    | -|s97712
    s97712    |vladstudio
    vladstudio    |vivekfyi
    vivekfyi    |HahaBill
    HahaBill    |tmsjngx0
    tmsjngx0    |TGlide
    TGlide    | -|Githubguy132010
    Githubguy132010    |tgfjt
    tgfjt    |maekawataiki
    maekawataiki    |nevermorec
    nevermorec    |PretzelVector
    PretzelVector    |zetaloop
    zetaloop    | -|cdlliuy
    cdlliuy    |user202729
    user202729    |thill2323
    thill2323    |takakoutso
    takakoutso    |student20880
    student20880    |shubhamgupta731
    shubhamgupta731    | -|shohei-ihaya
    shohei-ihaya    |shivamd1810
    shivamd1810    |shaybc
    shaybc    |sensei-woo
    sensei-woo    |samir-nimbly
    samir-nimbly    |robertheadley
    robertheadley    | -|refactorthis
    refactorthis    |qingyuan1109
    qingyuan1109    |pokutuna
    pokutuna    |philipnext
    philipnext    |village-way
    village-way    |oprstchn
    oprstchn    | -|nobu007
    nobu007    |mosleyit
    mosleyit    |moqimoqidea
    moqimoqidea    |mlopezr
    mlopezr    |mecab
    mecab    |olup
    olup    | -|lightrabbit
    lightrabbit    |lhish
    lhish    |kohii
    kohii    |kinandan
    kinandan    |AlexandruSmirnov
    AlexandruSmirnov    |pfitz
    pfitz    | -|ExactDoug
    ExactDoug    |celestial-vault
    celestial-vault    |linegel
    linegel    |edwin-truthsearch-io
    edwin-truthsearch-io    |EamonNerbonne
    EamonNerbonne    |dbasclpy
    dbasclpy    | -|dflatline
    dflatline    |Deon588
    Deon588    |dleen
    dleen    |CW-B-W
    CW-B-W    |chadgauth
    chadgauth    |thecolorblue
    thecolorblue    | -|bogdan0083
    bogdan0083    |benashby
    benashby    |Atlogit
    Atlogit    |atlasgong
    atlasgong    |AntiMoron
    AntiMoron    |andrewshu2000
    andrewshu2000    | -|andreastempsch
    andreastempsch    |alasano
    alasano    |QuinsZouls
    QuinsZouls    |HadesArchitect
    HadesArchitect    |alarno
    alarno    |nexon33
    nexon33    | -|adilhafeez
    adilhafeez    |adamwlarson
    adamwlarson    |adamhill
    adamhill    |AMHesch
    AMHesch    |adambrand
    adambrand    |samsilveira
    samsilveira    | -|01Rian
    01Rian    |RSO
    RSO    |RandalSchwartz
    RandalSchwartz    |SECKainersdorfer
    SECKainersdorfer    |R-omk
    R-omk    |Sarke
    Sarke    | -|PaperBoardOfficial
    PaperBoardOfficial    |OlegOAndreev
    OlegOAndreev    |Naam
    Naam    |NaccOll
    NaccOll    |kvokka
    kvokka    |ecmasx
    ecmasx    | -|mollux
    mollux    |marvijo-code
    marvijo-code    |markijbema
    markijbema    |mamertofabian
    mamertofabian    |monkeyDluffy6017
    monkeyDluffy6017    |libertyteeth
    libertyteeth    | -|shtse8
    shtse8    |Rexarrior
    Rexarrior    |kevinvandijk
    kevinvandijk    |KevinZhao
    KevinZhao    |ksze
    ksze    |Juice10
    Juice10    | -|snova-jorgep
    snova-jorgep    |Fovty
    Fovty    |Jdo300
    Jdo300    |hesara
    hesara    |DeXtroTip
    DeXtroTip    | | + +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | +| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | +| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | +| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | +| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | +| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | +| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | +| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | +| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | +| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | +| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | +| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | +| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | +| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | +| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | +| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | +| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | +| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | +| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | +| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | +| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | +| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | +| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | +| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | +| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | +| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | +| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | +| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | +| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | +| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | +| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | +| DeXtroTip
    DeXtroTip     | | | | | | + ## Giấy Phép diff --git a/locales/zh-CN/README.md b/locales/zh-CN/README.md index c65d09fbaf..c357522763 100644 --- a/locales/zh-CN/README.md +++ b/locales/zh-CN/README.md @@ -181,45 +181,48 @@ code --install-extension bin/roo-cline-.vsix 感谢所有帮助改进 Roo Code 的贡献者！ -|mrubens
    mrubens    |saoudrizwan
    saoudrizwan    |cte
    cte    |daniel-lxs
    daniel-lxs    |samhvw8
    samhvw8    |hannesrudolph
    hannesrudolph    | -|:---:|:---:|:---:|:---:|:---:|:---:| -|KJ7LNW
    KJ7LNW    |a8trejo
    a8trejo    |MuriloFP
    MuriloFP    |ColemanRoo
    ColemanRoo    |canrobins13
    canrobins13    |stea9499
    stea9499    | -|joemanley201
    joemanley201    |System233
    System233    |jr
    jr    |nissa-seru
    nissa-seru    |jquanton
    jquanton    |roomote-agent
    roomote-agent    | -|NyxJae
    NyxJae    |d-oit
    d-oit    |elianiva
    elianiva    |qdaxb
    qdaxb    |punkpeye
    punkpeye    |wkordalski
    wkordalski    | -|SannidhyaSah
    SannidhyaSah    |xyOz-dev
    xyOz-dev    |chrarnoldus
    chrarnoldus    |sachasayan
    sachasayan    |Smartsheet-JB-Brown
    Smartsheet-JB-Brown    |monotykamary
    monotykamary    | -|cannuri
    cannuri    |feifei325
    feifei325    |zhangtony239
    zhangtony239    |shariqriazz
    shariqriazz    |vigneshsubbiah16
    vigneshsubbiah16    |pugazhendhi-m
    pugazhendhi-m    | -|lloydchang
    lloydchang    |dtrugman
    dtrugman    |Szpadel
    Szpadel    |hassoncs
    hassoncs    |liwilliam2021
    liwilliam2021    |lupuletic
    lupuletic    | -|kiwina
    kiwina    |Premshay
    Premshay    |psv2522
    psv2522    |olweraltuve
    olweraltuve    |diarmidmackenzie
    diarmidmackenzie    |ChuKhaLi
    ChuKhaLi    | -|PeterDaveHello
    PeterDaveHello    |aheizi
    aheizi    |nbihan-mediware
    nbihan-mediware    |noritaka1166
    noritaka1166    |RaySinner
    RaySinner    |afshawnlotfi
    afshawnlotfi    | -|dleffel
    dleffel    |StevenTCramer
    StevenTCramer    |Ruakij
    Ruakij    |pdecat
    pdecat    |kyle-apex
    kyle-apex    |emshvac
    emshvac    | -|Lunchb0ne
    Lunchb0ne    |SmartManoj
    SmartManoj    |vagadiya
    vagadiya    |slytechnical
    slytechnical    |dlab-anton
    dlab-anton    |arthurauffray
    arthurauffray    | -|upamune
    upamune    |NamesMT
    NamesMT    |taylorwilsdon
    taylorwilsdon    |sammcj
    sammcj    |p12tic
    p12tic    |gtaylor
    gtaylor    | -|brunobergher
    brunobergher    |aitoroses
    aitoroses    |ross
    ross    |mr-ryan-james
    mr-ryan-james    |heyseth
    heyseth    |taisukeoe
    taisukeoe    | -|avtc
    avtc    |eonghk
    eonghk    |GOODBOY008
    GOODBOY008    |kcwhite
    kcwhite    |ronyblum
    ronyblum    |teddyOOXX
    teddyOOXX    | -|vincentsong
    vincentsong    |yongjer
    yongjer    |zeozeozeo
    zeozeozeo    |ashktn
    ashktn    |franekp
    franekp    |yt3trees
    yt3trees    | -|seedlord
    seedlord    |bramburn
    bramburn    |anton-otee
    anton-otee    |benzntech
    benzntech    |axkirillov
    axkirillov    |olearycrew
    olearycrew    | -|catrielmuller
    catrielmuller    |devxpain
    devxpain    |snoyiatk
    snoyiatk    |GitlyHallows
    GitlyHallows    |jcbdev
    jcbdev    |Chenjiayuan195
    Chenjiayuan195    | -|julionav
    julionav    |KanTakahiro
    KanTakahiro    |SplittyDev
    SplittyDev    |mdp
    mdp    |napter
    napter    |philfung
    philfung    | -|bannzai
    bannzai    |bbenshalom
    bbenshalom    |chris-garrett
    chris-garrett    |dairui1
    dairui1    |dqroid
    dqroid    |janaki-sasidhar
    janaki-sasidhar    | -|forestyoo
    forestyoo    |hatsu38
    hatsu38    |hongzio
    hongzio    |im47cn
    im47cn    |shoopapa
    shoopapa    |jwcraig
    jwcraig    | -|axmo
    axmo    |asychin
    asychin    |amittell
    amittell    |Yoshino-Yukitaro
    Yoshino-Yukitaro    |Yikai-Liao
    Yikai-Liao    |zxdvd
    zxdvd    | -|s97712
    s97712    |vladstudio
    vladstudio    |vivekfyi
    vivekfyi    |HahaBill
    HahaBill    |tmsjngx0
    tmsjngx0    |TGlide
    TGlide    | -|Githubguy132010
    Githubguy132010    |tgfjt
    tgfjt    |maekawataiki
    maekawataiki    |nevermorec
    nevermorec    |PretzelVector
    PretzelVector    |zetaloop
    zetaloop    | -|cdlliuy
    cdlliuy    |user202729
    user202729    |thill2323
    thill2323    |takakoutso
    takakoutso    |student20880
    student20880    |shubhamgupta731
    shubhamgupta731    | -|shohei-ihaya
    shohei-ihaya    |shivamd1810
    shivamd1810    |shaybc
    shaybc    |sensei-woo
    sensei-woo    |samir-nimbly
    samir-nimbly    |robertheadley
    robertheadley    | -|refactorthis
    refactorthis    |qingyuan1109
    qingyuan1109    |pokutuna
    pokutuna    |philipnext
    philipnext    |village-way
    village-way    |oprstchn
    oprstchn    | -|nobu007
    nobu007    |mosleyit
    mosleyit    |moqimoqidea
    moqimoqidea    |mlopezr
    mlopezr    |mecab
    mecab    |olup
    olup    | -|lightrabbit
    lightrabbit    |lhish
    lhish    |kohii
    kohii    |kinandan
    kinandan    |AlexandruSmirnov
    AlexandruSmirnov    |pfitz
    pfitz    | -|ExactDoug
    ExactDoug    |celestial-vault
    celestial-vault    |linegel
    linegel    |edwin-truthsearch-io
    edwin-truthsearch-io    |EamonNerbonne
    EamonNerbonne    |dbasclpy
    dbasclpy    | -|dflatline
    dflatline    |Deon588
    Deon588    |dleen
    dleen    |CW-B-W
    CW-B-W    |chadgauth
    chadgauth    |thecolorblue
    thecolorblue    | -|bogdan0083
    bogdan0083    |benashby
    benashby    |Atlogit
    Atlogit    |atlasgong
    atlasgong    |AntiMoron
    AntiMoron    |andrewshu2000
    andrewshu2000    | -|andreastempsch
    andreastempsch    |alasano
    alasano    |QuinsZouls
    QuinsZouls    |HadesArchitect
    HadesArchitect    |alarno
    alarno    |nexon33
    nexon33    | -|adilhafeez
    adilhafeez    |adamwlarson
    adamwlarson    |adamhill
    adamhill    |AMHesch
    AMHesch    |adambrand
    adambrand    |samsilveira
    samsilveira    | -|01Rian
    01Rian    |RSO
    RSO    |RandalSchwartz
    RandalSchwartz    |SECKainersdorfer
    SECKainersdorfer    |R-omk
    R-omk    |Sarke
    Sarke    | -|PaperBoardOfficial
    PaperBoardOfficial    |OlegOAndreev
    OlegOAndreev    |Naam
    Naam    |NaccOll
    NaccOll    |kvokka
    kvokka    |ecmasx
    ecmasx    | -|mollux
    mollux    |marvijo-code
    marvijo-code    |markijbema
    markijbema    |mamertofabian
    mamertofabian    |monkeyDluffy6017
    monkeyDluffy6017    |libertyteeth
    libertyteeth    | -|shtse8
    shtse8    |Rexarrior
    Rexarrior    |kevinvandijk
    kevinvandijk    |KevinZhao
    KevinZhao    |ksze
    ksze    |Juice10
    Juice10    | -|snova-jorgep
    snova-jorgep    |Fovty
    Fovty    |Jdo300
    Jdo300    |hesara
    hesara    |DeXtroTip
    DeXtroTip    | | + +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | +| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | +| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | +| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | +| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | +| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | +| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | +| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | +| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | +| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | +| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | +| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | +| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | +| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | +| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | +| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | +| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | +| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | +| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | +| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | +| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | +| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | +| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | +| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | +| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | +| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | +| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | +| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | +| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | +| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | +| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | +| DeXtroTip
    DeXtroTip     | | | | | | + ## 许可证 diff --git a/locales/zh-TW/README.md b/locales/zh-TW/README.md index 0765e28ba2..8e9cd5a0cc 100644 --- a/locales/zh-TW/README.md +++ b/locales/zh-TW/README.md @@ -182,45 +182,48 @@ code --install-extension bin/roo-cline-.vsix 感謝所有幫助改進 Roo Code 的貢獻者！ -|mrubens
    mrubens    |saoudrizwan
    saoudrizwan    |cte
    cte    |daniel-lxs
    daniel-lxs    |samhvw8
    samhvw8    |hannesrudolph
    hannesrudolph    | -|:---:|:---:|:---:|:---:|:---:|:---:| -|KJ7LNW
    KJ7LNW    |a8trejo
    a8trejo    |MuriloFP
    MuriloFP    |ColemanRoo
    ColemanRoo    |canrobins13
    canrobins13    |stea9499
    stea9499    | -|joemanley201
    joemanley201    |System233
    System233    |jr
    jr    |nissa-seru
    nissa-seru    |jquanton
    jquanton    |roomote-agent
    roomote-agent    | -|NyxJae
    NyxJae    |d-oit
    d-oit    |elianiva
    elianiva    |qdaxb
    qdaxb    |punkpeye
    punkpeye    |wkordalski
    wkordalski    | -|SannidhyaSah
    SannidhyaSah    |xyOz-dev
    xyOz-dev    |chrarnoldus
    chrarnoldus    |sachasayan
    sachasayan    |Smartsheet-JB-Brown
    Smartsheet-JB-Brown    |monotykamary
    monotykamary    | -|cannuri
    cannuri    |feifei325
    feifei325    |zhangtony239
    zhangtony239    |shariqriazz
    shariqriazz    |vigneshsubbiah16
    vigneshsubbiah16    |pugazhendhi-m
    pugazhendhi-m    | -|lloydchang
    lloydchang    |dtrugman
    dtrugman    |Szpadel
    Szpadel    |hassoncs
    hassoncs    |liwilliam2021
    liwilliam2021    |lupuletic
    lupuletic    | -|kiwina
    kiwina    |Premshay
    Premshay    |psv2522
    psv2522    |olweraltuve
    olweraltuve    |diarmidmackenzie
    diarmidmackenzie    |ChuKhaLi
    ChuKhaLi    | -|PeterDaveHello
    PeterDaveHello    |aheizi
    aheizi    |nbihan-mediware
    nbihan-mediware    |noritaka1166
    noritaka1166    |RaySinner
    RaySinner    |afshawnlotfi
    afshawnlotfi    | -|dleffel
    dleffel    |StevenTCramer
    StevenTCramer    |Ruakij
    Ruakij    |pdecat
    pdecat    |kyle-apex
    kyle-apex    |emshvac
    emshvac    | -|Lunchb0ne
    Lunchb0ne    |SmartManoj
    SmartManoj    |vagadiya
    vagadiya    |slytechnical
    slytechnical    |dlab-anton
    dlab-anton    |arthurauffray
    arthurauffray    | -|upamune
    upamune    |NamesMT
    NamesMT    |taylorwilsdon
    taylorwilsdon    |sammcj
    sammcj    |p12tic
    p12tic    |gtaylor
    gtaylor    | -|brunobergher
    brunobergher    |aitoroses
    aitoroses    |ross
    ross    |mr-ryan-james
    mr-ryan-james    |heyseth
    heyseth    |taisukeoe
    taisukeoe    | -|avtc
    avtc    |eonghk
    eonghk    |GOODBOY008
    GOODBOY008    |kcwhite
    kcwhite    |ronyblum
    ronyblum    |teddyOOXX
    teddyOOXX    | -|vincentsong
    vincentsong    |yongjer
    yongjer    |zeozeozeo
    zeozeozeo    |ashktn
    ashktn    |franekp
    franekp    |yt3trees
    yt3trees    | -|seedlord
    seedlord    |bramburn
    bramburn    |anton-otee
    anton-otee    |benzntech
    benzntech    |axkirillov
    axkirillov    |olearycrew
    olearycrew    | -|catrielmuller
    catrielmuller    |devxpain
    devxpain    |snoyiatk
    snoyiatk    |GitlyHallows
    GitlyHallows    |jcbdev
    jcbdev    |Chenjiayuan195
    Chenjiayuan195    | -|julionav
    julionav    |KanTakahiro
    KanTakahiro    |SplittyDev
    SplittyDev    |mdp
    mdp    |napter
    napter    |philfung
    philfung    | -|bannzai
    bannzai    |bbenshalom
    bbenshalom    |chris-garrett
    chris-garrett    |dairui1
    dairui1    |dqroid
    dqroid    |janaki-sasidhar
    janaki-sasidhar    | -|forestyoo
    forestyoo    |hatsu38
    hatsu38    |hongzio
    hongzio    |im47cn
    im47cn    |shoopapa
    shoopapa    |jwcraig
    jwcraig    | -|axmo
    axmo    |asychin
    asychin    |amittell
    amittell    |Yoshino-Yukitaro
    Yoshino-Yukitaro    |Yikai-Liao
    Yikai-Liao    |zxdvd
    zxdvd    | -|s97712
    s97712    |vladstudio
    vladstudio    |vivekfyi
    vivekfyi    |HahaBill
    HahaBill    |tmsjngx0
    tmsjngx0    |TGlide
    TGlide    | -|Githubguy132010
    Githubguy132010    |tgfjt
    tgfjt    |maekawataiki
    maekawataiki    |nevermorec
    nevermorec    |PretzelVector
    PretzelVector    |zetaloop
    zetaloop    | -|cdlliuy
    cdlliuy    |user202729
    user202729    |thill2323
    thill2323    |takakoutso
    takakoutso    |student20880
    student20880    |shubhamgupta731
    shubhamgupta731    | -|shohei-ihaya
    shohei-ihaya    |shivamd1810
    shivamd1810    |shaybc
    shaybc    |sensei-woo
    sensei-woo    |samir-nimbly
    samir-nimbly    |robertheadley
    robertheadley    | -|refactorthis
    refactorthis    |qingyuan1109
    qingyuan1109    |pokutuna
    pokutuna    |philipnext
    philipnext    |village-way
    village-way    |oprstchn
    oprstchn    | -|nobu007
    nobu007    |mosleyit
    mosleyit    |moqimoqidea
    moqimoqidea    |mlopezr
    mlopezr    |mecab
    mecab    |olup
    olup    | -|lightrabbit
    lightrabbit    |lhish
    lhish    |kohii
    kohii    |kinandan
    kinandan    |AlexandruSmirnov
    AlexandruSmirnov    |pfitz
    pfitz    | -|ExactDoug
    ExactDoug    |celestial-vault
    celestial-vault    |linegel
    linegel    |edwin-truthsearch-io
    edwin-truthsearch-io    |EamonNerbonne
    EamonNerbonne    |dbasclpy
    dbasclpy    | -|dflatline
    dflatline    |Deon588
    Deon588    |dleen
    dleen    |CW-B-W
    CW-B-W    |chadgauth
    chadgauth    |thecolorblue
    thecolorblue    | -|bogdan0083
    bogdan0083    |benashby
    benashby    |Atlogit
    Atlogit    |atlasgong
    atlasgong    |AntiMoron
    AntiMoron    |andrewshu2000
    andrewshu2000    | -|andreastempsch
    andreastempsch    |alasano
    alasano    |QuinsZouls
    QuinsZouls    |HadesArchitect
    HadesArchitect    |alarno
    alarno    |nexon33
    nexon33    | -|adilhafeez
    adilhafeez    |adamwlarson
    adamwlarson    |adamhill
    adamhill    |AMHesch
    AMHesch    |adambrand
    adambrand    |samsilveira
    samsilveira    | -|01Rian
    01Rian    |RSO
    RSO    |RandalSchwartz
    RandalSchwartz    |SECKainersdorfer
    SECKainersdorfer    |R-omk
    R-omk    |Sarke
    Sarke    | -|PaperBoardOfficial
    PaperBoardOfficial    |OlegOAndreev
    OlegOAndreev    |Naam
    Naam    |NaccOll
    NaccOll    |kvokka
    kvokka    |ecmasx
    ecmasx    | -|mollux
    mollux    |marvijo-code
    marvijo-code    |markijbema
    markijbema    |mamertofabian
    mamertofabian    |monkeyDluffy6017
    monkeyDluffy6017    |libertyteeth
    libertyteeth    | -|shtse8
    shtse8    |Rexarrior
    Rexarrior    |kevinvandijk
    kevinvandijk    |KevinZhao
    KevinZhao    |ksze
    ksze    |Juice10
    Juice10    | -|snova-jorgep
    snova-jorgep    |Fovty
    Fovty    |Jdo300
    Jdo300    |hesara
    hesara    |DeXtroTip
    DeXtroTip    | | + +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | +| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | +| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | +| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | +| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | +| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | +| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | +| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | +| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | +| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | +| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | +| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | +| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | +| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | +| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | +| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | +| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | +| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | +| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | +| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | +| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | +| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | +| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | +| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | +| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | +| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | +| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | +| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | +| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | +| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | +| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | +| DeXtroTip
    DeXtroTip     | | | | | | + ## 授權 From 8513263a6789a2cb0e67d9b15987a1b028825481 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 1 Aug 2025 21:32:31 -0400 Subject: [PATCH 048/253] Changeset version bump (#6579) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens --- .changeset/v3.25.6.md | 7 ------- CHANGELOG.md | 5 +++++ src/package.json | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 .changeset/v3.25.6.md diff --git a/.changeset/v3.25.6.md b/.changeset/v3.25.6.md deleted file mode 100644 index 1000332b50..0000000000 --- a/.changeset/v3.25.6.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"roo-cline": patch ---- - -- Add support for syncing provider profiles from the cloud (thanks @jr!) -- Set horizon-beta model max tokens to 32k for OpenRouter (requested by @hannesrudolph, PR by @app/roomote) -- Bump @roo-code/types to v1.41.0 (thanks @app/roomote!) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b2403bce2..312f5f290e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Roo Code Changelog +## [3.25.6] - 2025-08-01 + +- Set horizon-beta model max tokens to 32k for OpenRouter (requested by @hannesrudolph, PR by @app/roomote) +- Add support for syncing provider profiles from the cloud + ## [3.25.5] - 2025-08-01 - Fix: Improve Claude Code ENOENT error handling with installation guidance (#5866 by @JamieJ1, PR by @app/roomote) diff --git a/src/package.json b/src/package.json index 91eb40dde6..cf60242533 100644 --- a/src/package.json +++ b/src/package.json @@ -3,7 +3,7 @@ "displayName": "%extension.displayName%", "description": "%extension.description%", "publisher": "RooVeterinaryInc", - "version": "3.25.5", + "version": "3.25.6", "icon": "assets/icons/icon.png", "galleryBanner": { "color": "#617A91", From b2d2a2c5d2cab21512fdc0e46a6018097fe4ca10 Mon Sep 17 00:00:00 2001 From: Chris Estreich Date: Sat, 2 Aug 2025 11:12:44 -0700 Subject: [PATCH 049/253] Task and TaskProvider event emitter cleanup + a few new events (#6606) Co-authored-by: Roo Code --- .../src/suite/markdown-lists.test.ts | 10 +- apps/vscode-e2e/src/suite/modes.test.ts | 4 +- apps/vscode-e2e/src/suite/subtasks.test.ts | 6 +- apps/vscode-e2e/src/suite/task.test.ts | 4 +- .../src/suite/tools/apply-diff.test.ts | 62 +++--- .../src/suite/tools/execute-command.test.ts | 50 ++--- .../src/suite/tools/insert-content.test.ts | 50 ++--- .../src/suite/tools/list-files.test.ts | 34 ++-- .../src/suite/tools/read-file.test.ts | 62 +++--- .../suite/tools/search-and-replace.test.ts | 50 ++--- .../src/suite/tools/search-files.test.ts | 66 +++--- .../src/suite/tools/use-mcp-tool.test.ts | 54 ++--- .../src/suite/tools/write-to-file.test.ts | 26 +-- apps/vscode-e2e/src/suite/utils.ts | 6 +- packages/cloud/src/CloudAPI.ts | 122 +++++++++++ packages/cloud/src/CloudService.ts | 13 +- packages/cloud/src/CloudSettingsService.ts | 2 +- packages/cloud/src/CloudShareService.ts | 43 ++++ packages/cloud/src/ShareService.ts | 88 -------- packages/cloud/src/StaticSettingsService.ts | 2 +- packages/cloud/src/TelemetryClient.ts | 2 +- .../cloud/src/__tests__/CloudService.test.ts | 10 +- .../__tests__/CloudSettingsService.test.ts | 6 +- ...vice.test.ts => CloudShareService.test.ts} | 40 ++-- .../src/__tests__/auth/WebAuthService.spec.ts | 30 +-- packages/cloud/src/auth/AuthService.ts | 1 + .../cloud/src/auth/StaticTokenAuthService.ts | 3 + packages/cloud/src/auth/WebAuthService.ts | 43 ++-- packages/cloud/src/{Config.ts => config.ts} | 2 - packages/cloud/src/errors.ts | 42 ++++ packages/cloud/src/index.ts | 4 +- packages/types/src/api.ts | 21 +- packages/types/src/cloud.ts | 1 + packages/types/src/events.ts | 192 ++++++++++++++++++ packages/types/src/index.ts | 10 +- packages/types/src/ipc.ts | 164 ++------------- packages/types/src/message.ts | 20 ++ packages/types/src/task.ts | 98 +++++++++ src/core/task/Task.ts | 89 ++++---- src/core/tools/attemptCompletionTool.ts | 9 +- src/core/tools/newTaskTool.ts | 6 +- src/core/webview/ClineProvider.ts | 92 +++++---- .../webview/__tests__/ClineProvider.spec.ts | 2 +- .../ClineProvider.sticky-mode.spec.ts | 43 +++- src/extension/api.ts | 117 +++++++---- .../components/ui/hooks/useSelectedModel.ts | 2 +- 46 files changed, 1119 insertions(+), 684 deletions(-) create mode 100644 packages/cloud/src/CloudAPI.ts create mode 100644 packages/cloud/src/CloudShareService.ts delete mode 100644 packages/cloud/src/ShareService.ts rename packages/cloud/src/__tests__/{ShareService.test.ts => CloudShareService.test.ts} (86%) rename packages/cloud/src/{Config.ts => config.ts} (81%) create mode 100644 packages/cloud/src/errors.ts create mode 100644 packages/types/src/events.ts create mode 100644 packages/types/src/task.ts diff --git a/apps/vscode-e2e/src/suite/markdown-lists.test.ts b/apps/vscode-e2e/src/suite/markdown-lists.test.ts index a229d9c270..9b5c1bd845 100644 --- a/apps/vscode-e2e/src/suite/markdown-lists.test.ts +++ b/apps/vscode-e2e/src/suite/markdown-lists.test.ts @@ -1,6 +1,6 @@ import * as assert from "assert" -import type { ClineMessage } from "@roo-code/types" +import { RooCodeEventName, type ClineMessage } from "@roo-code/types" import { waitUntilCompleted } from "./utils" import { setDefaultSuiteTimeout } from "./test-utils" @@ -13,7 +13,7 @@ suite("Markdown List Rendering", function () { const messages: ClineMessage[] = [] - api.on("message", ({ message }: { message: ClineMessage }) => { + api.on(RooCodeEventName.Message, ({ message }: { message: ClineMessage }) => { if (message.type === "say" && message.partial === false) { messages.push(message) } @@ -50,7 +50,7 @@ suite("Markdown List Rendering", function () { const messages: ClineMessage[] = [] - api.on("message", ({ message }: { message: ClineMessage }) => { + api.on(RooCodeEventName.Message, ({ message }: { message: ClineMessage }) => { if (message.type === "say" && message.partial === false) { messages.push(message) } @@ -87,7 +87,7 @@ suite("Markdown List Rendering", function () { const messages: ClineMessage[] = [] - api.on("message", ({ message }: { message: ClineMessage }) => { + api.on(RooCodeEventName.Message, ({ message }: { message: ClineMessage }) => { if (message.type === "say" && message.partial === false) { messages.push(message) } @@ -139,7 +139,7 @@ suite("Markdown List Rendering", function () { const messages: ClineMessage[] = [] - api.on("message", ({ message }: { message: ClineMessage }) => { + api.on(RooCodeEventName.Message, ({ message }: { message: ClineMessage }) => { if (message.type === "say" && message.partial === false) { messages.push(message) } diff --git a/apps/vscode-e2e/src/suite/modes.test.ts b/apps/vscode-e2e/src/suite/modes.test.ts index 81d8a2b7fb..7982f3cf22 100644 --- a/apps/vscode-e2e/src/suite/modes.test.ts +++ b/apps/vscode-e2e/src/suite/modes.test.ts @@ -1,5 +1,7 @@ import * as assert from "assert" +import { RooCodeEventName } from "@roo-code/types" + import { waitUntilCompleted } from "./utils" import { setDefaultSuiteTimeout } from "./test-utils" @@ -9,7 +11,7 @@ suite("Roo Code Modes", function () { test("Should handle switching modes correctly", async () => { const modes: string[] = [] - globalThis.api.on("taskModeSwitched", (_taskId, mode) => modes.push(mode)) + globalThis.api.on(RooCodeEventName.TaskModeSwitched, (_taskId, mode) => modes.push(mode)) const switchModesTaskId = await globalThis.api.startNewTask({ configuration: { mode: "code", alwaysAllowModeSwitch: true, autoApprovalEnabled: true }, diff --git a/apps/vscode-e2e/src/suite/subtasks.test.ts b/apps/vscode-e2e/src/suite/subtasks.test.ts index adf1b2be89..e3e3457520 100644 --- a/apps/vscode-e2e/src/suite/subtasks.test.ts +++ b/apps/vscode-e2e/src/suite/subtasks.test.ts @@ -1,6 +1,6 @@ import * as assert from "assert" -import type { ClineMessage } from "@roo-code/types" +import { RooCodeEventName, type ClineMessage } from "@roo-code/types" import { sleep, waitFor, waitUntilCompleted } from "./utils" @@ -10,7 +10,7 @@ suite.skip("Roo Code Subtasks", () => { const messages: Record = {} - api.on("message", ({ taskId, message }) => { + api.on(RooCodeEventName.Message, ({ taskId, message }) => { if (message.type === "say" && message.partial === false) { messages[taskId] = messages[taskId] || [] messages[taskId].push(message) @@ -37,7 +37,7 @@ suite.skip("Roo Code Subtasks", () => { let spawnedTaskId: string | undefined = undefined // Wait for the subtask to be spawned and then cancel it. - api.on("taskSpawned", (_, childTaskId) => (spawnedTaskId = childTaskId)) + api.on(RooCodeEventName.TaskSpawned, (_, childTaskId) => (spawnedTaskId = childTaskId)) await waitFor(() => !!spawnedTaskId) await sleep(1_000) // Give the task a chance to start and populate the history. await api.cancelCurrentTask() diff --git a/apps/vscode-e2e/src/suite/task.test.ts b/apps/vscode-e2e/src/suite/task.test.ts index 31e03271b5..10e4e4f9a6 100644 --- a/apps/vscode-e2e/src/suite/task.test.ts +++ b/apps/vscode-e2e/src/suite/task.test.ts @@ -1,6 +1,6 @@ import * as assert from "assert" -import type { ClineMessage } from "@roo-code/types" +import { RooCodeEventName, type ClineMessage } from "@roo-code/types" import { waitUntilCompleted } from "./utils" import { setDefaultSuiteTimeout } from "./test-utils" @@ -13,7 +13,7 @@ suite("Roo Code Task", function () { const messages: ClineMessage[] = [] - api.on("message", ({ message }) => { + api.on(RooCodeEventName.Message, ({ message }) => { if (message.type === "say" && message.partial === false) { messages.push(message) } diff --git a/apps/vscode-e2e/src/suite/tools/apply-diff.test.ts b/apps/vscode-e2e/src/suite/tools/apply-diff.test.ts index 6e6dbc5995..729d6839b1 100644 --- a/apps/vscode-e2e/src/suite/tools/apply-diff.test.ts +++ b/apps/vscode-e2e/src/suite/tools/apply-diff.test.ts @@ -3,7 +3,7 @@ import * as fs from "fs/promises" import * as path from "path" import * as vscode from "vscode" -import type { ClineMessage } from "@roo-code/types" +import { RooCodeEventName, type ClineMessage } from "@roo-code/types" import { waitFor, sleep } from "../utils" import { setDefaultSuiteTimeout } from "../test-utils" @@ -192,7 +192,7 @@ function validateInput(input) { } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -201,7 +201,7 @@ function validateInput(input) { console.log("Task started:", id) } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { @@ -209,7 +209,7 @@ function validateInput(input) { console.log("Task completed:", id) } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -260,9 +260,9 @@ ${testFile.content}\nAssume the file exists and you can modify it directly.`, console.log("Test passed! apply_diff tool executed and file modified successfully") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -305,7 +305,7 @@ ${testFile.content}\nAssume the file exists and you can modify it directly.`, } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -314,7 +314,7 @@ ${testFile.content}\nAssume the file exists and you can modify it directly.`, console.log("Task started:", id) } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { @@ -322,7 +322,7 @@ ${testFile.content}\nAssume the file exists and you can modify it directly.`, console.log("Task completed:", id) } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -375,9 +375,9 @@ ${testFile.content}\nAssume the file exists and you can modify it directly.`, console.log("Test passed! apply_diff tool executed and multiple replacements applied successfully") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -424,7 +424,7 @@ function keepThis() { } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -432,14 +432,14 @@ function keepThis() { taskStarted = true } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -487,9 +487,9 @@ ${testFile.content}\nAssume the file exists and you can modify it directly.`, console.log("Test passed! apply_diff tool executed and targeted modification successful") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -532,7 +532,7 @@ ${testFile.content}\nAssume the file exists and you can modify it directly.`, } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -540,14 +540,14 @@ ${testFile.content}\nAssume the file exists and you can modify it directly.`, taskStarted = true } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -598,9 +598,9 @@ Assume the file exists and you can modify it directly.`, console.log("Test passed! apply_diff attempted and error handled gracefully") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -663,7 +663,7 @@ function checkInput(input) { } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -672,7 +672,7 @@ function checkInput(input) { console.log("Task started:", id) } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { @@ -680,7 +680,7 @@ function checkInput(input) { console.log("Task completed:", id) } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -742,9 +742,9 @@ Assume the file exists and you can modify it directly.`, console.log("Test passed! apply_diff tool executed and multiple search/replace blocks applied successfully") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) }) diff --git a/apps/vscode-e2e/src/suite/tools/execute-command.test.ts b/apps/vscode-e2e/src/suite/tools/execute-command.test.ts index 21933d0879..f207dae685 100644 --- a/apps/vscode-e2e/src/suite/tools/execute-command.test.ts +++ b/apps/vscode-e2e/src/suite/tools/execute-command.test.ts @@ -3,7 +3,7 @@ import * as fs from "fs/promises" import * as path from "path" import * as vscode from "vscode" -import type { ClineMessage } from "@roo-code/types" +import { RooCodeEventName, type ClineMessage } from "@roo-code/types" import { waitFor, sleep, waitUntilCompleted } from "../utils" import { setDefaultSuiteTimeout } from "../test-utils" @@ -145,7 +145,7 @@ suite("Roo Code execute_command Tool", function () { } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -154,7 +154,7 @@ suite("Roo Code execute_command Tool", function () { console.log("Task started:", id) } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { @@ -162,7 +162,7 @@ suite("Roo Code execute_command Tool", function () { console.log("Task completed:", id) } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -208,9 +208,9 @@ Then use the attempt_completion tool to complete the task. Do not suggest any co console.log("Test passed! Command executed successfully") } finally { // Clean up event listeners - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -251,7 +251,7 @@ Then use the attempt_completion tool to complete the task. Do not suggest any co } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -260,7 +260,7 @@ Then use the attempt_completion tool to complete the task. Do not suggest any co console.log("Task started:", id) } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { @@ -268,7 +268,7 @@ Then use the attempt_completion tool to complete the task. Do not suggest any co console.log("Task completed:", id) } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -320,9 +320,9 @@ Avoid at all costs suggesting a command when using the attempt_completion tool`, console.log("Test passed! Command executed in custom directory") } finally { // Clean up event listeners - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) // Clean up subdirectory try { @@ -365,7 +365,7 @@ Avoid at all costs suggesting a command when using the attempt_completion tool`, } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -374,7 +374,7 @@ Avoid at all costs suggesting a command when using the attempt_completion tool`, console.log("Task started:", id) } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { @@ -382,7 +382,7 @@ Avoid at all costs suggesting a command when using the attempt_completion tool`, console.log("Task completed:", id) } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -440,9 +440,9 @@ After both commands are executed, use the attempt_completion tool to complete th console.log("Test passed! Multiple commands executed successfully") } finally { // Clean up event listeners - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -484,7 +484,7 @@ After both commands are executed, use the attempt_completion tool to complete th } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -493,7 +493,7 @@ After both commands are executed, use the attempt_completion tool to complete th console.log("Task started:", id) } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { @@ -501,7 +501,7 @@ After both commands are executed, use the attempt_completion tool to complete th console.log("Task completed:", id) } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -550,9 +550,9 @@ Avoid at all costs suggesting a command when using the attempt_completion tool`, console.log("Test passed! Long-running command handled successfully") } finally { // Clean up event listeners - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) }) diff --git a/apps/vscode-e2e/src/suite/tools/insert-content.test.ts b/apps/vscode-e2e/src/suite/tools/insert-content.test.ts index c9d65d0d0b..4dd0c20928 100644 --- a/apps/vscode-e2e/src/suite/tools/insert-content.test.ts +++ b/apps/vscode-e2e/src/suite/tools/insert-content.test.ts @@ -3,7 +3,7 @@ import * as fs from "fs/promises" import * as path from "path" import * as vscode from "vscode" -import type { ClineMessage } from "@roo-code/types" +import { RooCodeEventName, type ClineMessage } from "@roo-code/types" import { waitFor, sleep } from "../utils" import { setDefaultSuiteTimeout } from "../test-utils" @@ -145,7 +145,7 @@ ${testFile.content}` } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -154,7 +154,7 @@ ${testFile.content}` console.log("Task started:", id) } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { @@ -162,7 +162,7 @@ ${testFile.content}` console.log("Task completed:", id) } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -221,9 +221,9 @@ Assume the file exists and you can modify it directly.`, console.log("Test passed! insert_content tool executed and content inserted at beginning successfully") } finally { - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) try { @@ -286,7 +286,7 @@ ${insertContent}` } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -295,7 +295,7 @@ ${insertContent}` console.log("Task started:", id) } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { @@ -303,7 +303,7 @@ ${insertContent}` console.log("Task completed:", id) } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -388,7 +388,7 @@ ${testFile.content}` } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -397,7 +397,7 @@ ${testFile.content}` console.log("Task started:", id) } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { @@ -405,7 +405,7 @@ ${testFile.content}` console.log("Task completed:", id) } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -490,7 +490,7 @@ And this is the second line` } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -499,7 +499,7 @@ And this is the second line` console.log("Task started:", id) } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { @@ -507,7 +507,7 @@ And this is the second line` console.log("Task completed:", id) } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -572,9 +572,9 @@ The file is currently empty. Assume the file exists and you can modify it direct "Test passed! insert_content tool executed and content inserted into empty file successfully", ) } finally { - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) // Check if the file was modified correctly @@ -600,9 +600,9 @@ The file is currently empty. Assume the file exists and you can modify it direct console.log("Test passed! insert_content tool executed and multiline content inserted successfully") } finally { - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) assert.strictEqual(insertContentExecuted, true, "insert_content tool should have been executed") @@ -619,9 +619,9 @@ The file is currently empty. Assume the file exists and you can modify it direct console.log("Test passed! insert_content tool executed and content inserted at end successfully") } finally { - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) // Tests will be added here one by one diff --git a/apps/vscode-e2e/src/suite/tools/list-files.test.ts b/apps/vscode-e2e/src/suite/tools/list-files.test.ts index c374e79515..5a1fd6cc3b 100644 --- a/apps/vscode-e2e/src/suite/tools/list-files.test.ts +++ b/apps/vscode-e2e/src/suite/tools/list-files.test.ts @@ -3,7 +3,7 @@ import * as fs from "fs/promises" import * as path from "path" import * as vscode from "vscode" -import type { ClineMessage } from "@roo-code/types" +import { RooCodeEventName, type ClineMessage } from "@roo-code/types" import { waitFor, sleep } from "../utils" import { setDefaultSuiteTimeout } from "../test-utils" @@ -207,7 +207,7 @@ This directory contains various files and subdirectories for testing the list_fi } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -215,7 +215,7 @@ This directory contains various files and subdirectories for testing the list_fi taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -271,8 +271,8 @@ This directory contains various files and subdirectories for testing the list_fi console.log("Test passed! Directory listing (non-recursive) executed successfully") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -310,7 +310,7 @@ This directory contains various files and subdirectories for testing the list_fi } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -318,7 +318,7 @@ This directory contains various files and subdirectories for testing the list_fi taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -381,8 +381,8 @@ This directory contains various files and subdirectories for testing the list_fi console.log("Test passed! Directory listing (recursive) executed successfully") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -420,7 +420,7 @@ This directory contains various files and subdirectories for testing the list_fi } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -428,7 +428,7 @@ This directory contains various files and subdirectories for testing the list_fi taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -499,8 +499,8 @@ This directory contains various files and subdirectories for testing the list_fi await fs.rm(testDir, { recursive: true, force: true }) } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -523,7 +523,7 @@ This directory contains various files and subdirectories for testing the list_fi } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -531,7 +531,7 @@ This directory contains various files and subdirectories for testing the list_fi taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -569,8 +569,8 @@ This directory contains various files and subdirectories for testing the list_fi console.log("Test passed! Workspace root directory listing executed successfully") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) }) diff --git a/apps/vscode-e2e/src/suite/tools/read-file.test.ts b/apps/vscode-e2e/src/suite/tools/read-file.test.ts index 007e88b21c..99e3f18457 100644 --- a/apps/vscode-e2e/src/suite/tools/read-file.test.ts +++ b/apps/vscode-e2e/src/suite/tools/read-file.test.ts @@ -4,7 +4,7 @@ import * as path from "path" import * as os from "os" import * as vscode from "vscode" -import type { ClineMessage } from "@roo-code/types" +import { RooCodeEventName, type ClineMessage } from "@roo-code/types" import { waitFor, sleep } from "../utils" import { setDefaultSuiteTimeout } from "../test-utils" @@ -180,7 +180,7 @@ suite("Roo Code read_file Tool", function () { console.log("AI response:", message.text?.substring(0, 200)) } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -189,7 +189,7 @@ suite("Roo Code read_file Tool", function () { console.log("Task started:", id) } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { @@ -197,7 +197,7 @@ suite("Roo Code read_file Tool", function () { console.log("Task completed:", id) } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -259,9 +259,9 @@ suite("Roo Code read_file Tool", function () { console.log("Test passed! File read successfully with correct content") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -314,7 +314,7 @@ suite("Roo Code read_file Tool", function () { console.log("AI response:", message.text?.substring(0, 200)) } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -322,7 +322,7 @@ suite("Roo Code read_file Tool", function () { taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -371,8 +371,8 @@ suite("Roo Code read_file Tool", function () { console.log("Test passed! Multiline file read successfully with correct content") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -425,7 +425,7 @@ suite("Roo Code read_file Tool", function () { console.log("AI response:", message.text?.substring(0, 200)) } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -433,7 +433,7 @@ suite("Roo Code read_file Tool", function () { taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -484,8 +484,8 @@ suite("Roo Code read_file Tool", function () { console.log("Test passed! File read with line range successfully") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -512,7 +512,7 @@ suite("Roo Code read_file Tool", function () { } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -520,7 +520,7 @@ suite("Roo Code read_file Tool", function () { taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -556,8 +556,8 @@ suite("Roo Code read_file Tool", function () { console.log("Test passed! Non-existent file handled correctly") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -585,7 +585,7 @@ suite("Roo Code read_file Tool", function () { console.log("AI response:", message.text?.substring(0, 200)) } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -593,7 +593,7 @@ suite("Roo Code read_file Tool", function () { taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -627,8 +627,8 @@ suite("Roo Code read_file Tool", function () { console.log("Test passed! XML file read successfully") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -651,7 +651,7 @@ suite("Roo Code read_file Tool", function () { } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -659,7 +659,7 @@ suite("Roo Code read_file Tool", function () { taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -700,8 +700,8 @@ Assume both files exist and you can read them directly. Read each file and tell console.log("Test passed! Multiple files read successfully") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -729,7 +729,7 @@ Assume both files exist and you can read them directly. Read each file and tell console.log("AI response:", message.text?.substring(0, 200)) } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -737,7 +737,7 @@ Assume both files exist and you can read them directly. Read each file and tell taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -771,8 +771,8 @@ Assume both files exist and you can read them directly. Read each file and tell console.log("Test passed! Large file read efficiently") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) }) diff --git a/apps/vscode-e2e/src/suite/tools/search-and-replace.test.ts b/apps/vscode-e2e/src/suite/tools/search-and-replace.test.ts index 459b109350..801a829a74 100644 --- a/apps/vscode-e2e/src/suite/tools/search-and-replace.test.ts +++ b/apps/vscode-e2e/src/suite/tools/search-and-replace.test.ts @@ -3,7 +3,7 @@ import * as fs from "fs/promises" import * as path from "path" import * as vscode from "vscode" -import type { ClineMessage } from "@roo-code/types" +import { RooCodeEventName, type ClineMessage } from "@roo-code/types" import { waitFor, sleep } from "../utils" import { setDefaultSuiteTimeout } from "../test-utils" @@ -175,7 +175,7 @@ Final content`, } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -184,7 +184,7 @@ Final content`, console.log("Task started:", id) } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { @@ -192,7 +192,7 @@ Final content`, console.log("Task completed:", id) } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -249,9 +249,9 @@ Assume the file exists and you can modify it directly.`, console.log("Test passed! search_and_replace tool executed and file modified successfully") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -303,7 +303,7 @@ function anotherNewFunction() { } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -312,7 +312,7 @@ function anotherNewFunction() { console.log("Task started:", id) } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { @@ -320,7 +320,7 @@ function anotherNewFunction() { console.log("Task completed:", id) } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -378,9 +378,9 @@ Use the search_and_replace tool twice - once for each replacement.`, console.log("Test passed! search_and_replace tool executed with regex successfully") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -429,7 +429,7 @@ Final content` } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -438,7 +438,7 @@ Final content` console.log("Task started:", id) } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { @@ -446,7 +446,7 @@ Final content` console.log("Task completed:", id) } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -503,9 +503,9 @@ Assume the file exists and you can modify it directly.`, console.log("Test passed! search_and_replace tool executed and replaced multiple matches successfully") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -549,7 +549,7 @@ Assume the file exists and you can modify it directly.`, } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -558,7 +558,7 @@ Assume the file exists and you can modify it directly.`, console.log("Task started:", id) } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { @@ -566,7 +566,7 @@ Assume the file exists and you can modify it directly.`, console.log("Task completed:", id) } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -623,9 +623,9 @@ Assume the file exists and you can modify it directly.`, console.log("Test passed! search_and_replace tool executed and handled no matches correctly") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) }) diff --git a/apps/vscode-e2e/src/suite/tools/search-files.test.ts b/apps/vscode-e2e/src/suite/tools/search-files.test.ts index cc28739943..98cfd1b3ee 100644 --- a/apps/vscode-e2e/src/suite/tools/search-files.test.ts +++ b/apps/vscode-e2e/src/suite/tools/search-files.test.ts @@ -3,7 +3,7 @@ import * as fs from "fs/promises" import * as path from "path" import * as vscode from "vscode" -import type { ClineMessage } from "@roo-code/types" +import { RooCodeEventName, type ClineMessage } from "@roo-code/types" import { waitFor, sleep } from "../utils" import { setDefaultSuiteTimeout } from "../test-utils" @@ -323,7 +323,7 @@ The search should find matches across different file types and provide context f } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -331,7 +331,7 @@ The search should find matches across different file types and provide context f taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -397,8 +397,8 @@ The search should find matches across different file types and provide context f console.log("Test passed! Function definitions found successfully with validated results") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -421,7 +421,7 @@ The search should find matches across different file types and provide context f } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -429,7 +429,7 @@ The search should find matches across different file types and provide context f taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -464,8 +464,8 @@ The search should find matches across different file types and provide context f console.log("Test passed! TODO comments found successfully") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -488,7 +488,7 @@ The search should find matches across different file types and provide context f } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -496,7 +496,7 @@ The search should find matches across different file types and provide context f taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -530,8 +530,8 @@ The search should find matches across different file types and provide context f console.log("Test passed! TypeScript interfaces found with file pattern filter") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -554,7 +554,7 @@ The search should find matches across different file types and provide context f } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -562,7 +562,7 @@ The search should find matches across different file types and provide context f taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -598,8 +598,8 @@ The search should find matches across different file types and provide context f console.log("Test passed! JSON configuration keys found successfully") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -622,7 +622,7 @@ The search should find matches across different file types and provide context f } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -630,7 +630,7 @@ The search should find matches across different file types and provide context f taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -663,8 +663,8 @@ The search should find matches across different file types and provide context f console.log("Test passed! Nested directory search completed successfully") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -690,7 +690,7 @@ The search should find matches across different file types and provide context f } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -698,7 +698,7 @@ The search should find matches across different file types and provide context f taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -731,8 +731,8 @@ The search should find matches across different file types and provide context f console.log("Test passed! Complex regex pattern search completed successfully") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -775,7 +775,7 @@ The search should find matches across different file types and provide context f console.log("AI completion message:", message.text?.substring(0, 300)) } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -783,7 +783,7 @@ The search should find matches across different file types and provide context f taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -859,8 +859,8 @@ The search should find matches across different file types and provide context f console.log("Test passed! No-match scenario handled correctly") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -883,7 +883,7 @@ The search should find matches across different file types and provide context f } } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -891,7 +891,7 @@ The search should find matches across different file types and provide context f taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -927,8 +927,8 @@ The search should find matches across different file types and provide context f console.log("Test passed! Class definitions and async methods found successfully") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) }) diff --git a/apps/vscode-e2e/src/suite/tools/use-mcp-tool.test.ts b/apps/vscode-e2e/src/suite/tools/use-mcp-tool.test.ts index 8e83dd7e4b..380a77d179 100644 --- a/apps/vscode-e2e/src/suite/tools/use-mcp-tool.test.ts +++ b/apps/vscode-e2e/src/suite/tools/use-mcp-tool.test.ts @@ -4,7 +4,7 @@ import * as path from "path" import * as os from "os" import * as vscode from "vscode" -import type { ClineMessage } from "@roo-code/types" +import { RooCodeEventName, type ClineMessage } from "@roo-code/types" import { waitFor, sleep } from "../utils" import { setDefaultSuiteTimeout } from "../test-utils" @@ -167,7 +167,7 @@ suite.skip("Roo Code use_mcp_tool Tool", function () { console.error("Error:", message.text) } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -176,7 +176,7 @@ suite.skip("Roo Code use_mcp_tool Tool", function () { console.log("Task started:", id) } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { @@ -184,7 +184,7 @@ suite.skip("Roo Code use_mcp_tool Tool", function () { console.log("Task completed:", id) } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) await sleep(2000) // Wait for Roo Code to fully initialize // Trigger MCP server detection by opening and modifying the file @@ -284,9 +284,9 @@ suite.skip("Roo Code use_mcp_tool Tool", function () { console.log("Test passed! MCP read_file tool used successfully and task completed") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -344,7 +344,7 @@ suite.skip("Roo Code use_mcp_tool Tool", function () { console.error("Error:", message.text) } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -352,7 +352,7 @@ suite.skip("Roo Code use_mcp_tool Tool", function () { _taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -413,8 +413,8 @@ suite.skip("Roo Code use_mcp_tool Tool", function () { console.log("Test passed! MCP write_file tool used successfully and task completed") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -472,7 +472,7 @@ suite.skip("Roo Code use_mcp_tool Tool", function () { console.error("Error:", message.text) } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -480,7 +480,7 @@ suite.skip("Roo Code use_mcp_tool Tool", function () { _taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -552,8 +552,8 @@ suite.skip("Roo Code use_mcp_tool Tool", function () { console.log("Test passed! MCP list_directory tool used successfully and task completed") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -611,7 +611,7 @@ suite.skip("Roo Code use_mcp_tool Tool", function () { console.error("Error:", message.text) } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -619,7 +619,7 @@ suite.skip("Roo Code use_mcp_tool Tool", function () { _taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -691,8 +691,8 @@ suite.skip("Roo Code use_mcp_tool Tool", function () { console.log("Test passed! MCP directory_tree tool used successfully and task completed") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -730,7 +730,7 @@ suite.skip("Roo Code use_mcp_tool Tool", function () { console.log("Attempt completion called:", message.text?.substring(0, 200)) } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -738,7 +738,7 @@ suite.skip("Roo Code use_mcp_tool Tool", function () { _taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -762,8 +762,8 @@ suite.skip("Roo Code use_mcp_tool Tool", function () { console.log("Test passed! MCP error handling verified and task completed") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -832,7 +832,7 @@ suite.skip("Roo Code use_mcp_tool Tool", function () { console.error("Error:", message.text) } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task completion const taskCompletedHandler = (id: string) => { @@ -840,7 +840,7 @@ suite.skip("Roo Code use_mcp_tool Tool", function () { _taskCompleted = true } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -921,8 +921,8 @@ suite.skip("Roo Code use_mcp_tool Tool", function () { console.log("Test passed! MCP message format validation successful and task completed") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) }) diff --git a/apps/vscode-e2e/src/suite/tools/write-to-file.test.ts b/apps/vscode-e2e/src/suite/tools/write-to-file.test.ts index 814213b2bc..dea51386cf 100644 --- a/apps/vscode-e2e/src/suite/tools/write-to-file.test.ts +++ b/apps/vscode-e2e/src/suite/tools/write-to-file.test.ts @@ -3,7 +3,7 @@ import * as fs from "fs/promises" import * as path from "path" import * as os from "os" -import type { ClineMessage } from "@roo-code/types" +import { RooCodeEventName, type ClineMessage } from "@roo-code/types" import { waitFor, sleep } from "../utils" import { setDefaultSuiteTimeout } from "../test-utils" @@ -110,7 +110,7 @@ suite("Roo Code write_to_file Tool", function () { console.log("AI response:", message.text?.substring(0, 200)) } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -119,7 +119,7 @@ suite("Roo Code write_to_file Tool", function () { console.log("Task started:", id) } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { @@ -127,7 +127,7 @@ suite("Roo Code write_to_file Tool", function () { console.log("Task completed:", id) } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -259,9 +259,9 @@ suite("Roo Code write_to_file Tool", function () { console.log("write_to_file tool was properly executed") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) @@ -302,7 +302,7 @@ suite("Roo Code write_to_file Tool", function () { console.log("Tool request:", message.text?.substring(0, 200)) } } - api.on("message", messageHandler) + api.on(RooCodeEventName.Message, messageHandler) // Listen for task events const taskStartedHandler = (id: string) => { @@ -311,7 +311,7 @@ suite("Roo Code write_to_file Tool", function () { console.log("Task started:", id) } } - api.on("taskStarted", taskStartedHandler) + api.on(RooCodeEventName.TaskStarted, taskStartedHandler) const taskCompletedHandler = (id: string) => { if (id === taskId) { @@ -319,7 +319,7 @@ suite("Roo Code write_to_file Tool", function () { console.log("Task completed:", id) } } - api.on("taskCompleted", taskCompletedHandler) + api.on(RooCodeEventName.TaskCompleted, taskCompletedHandler) let taskId: string try { @@ -440,9 +440,9 @@ suite("Roo Code write_to_file Tool", function () { console.log("write_to_file tool was properly executed") } finally { // Clean up - api.off("message", messageHandler) - api.off("taskStarted", taskStartedHandler) - api.off("taskCompleted", taskCompletedHandler) + api.off(RooCodeEventName.Message, messageHandler) + api.off(RooCodeEventName.TaskStarted, taskStartedHandler) + api.off(RooCodeEventName.TaskCompleted, taskCompletedHandler) } }) }) diff --git a/apps/vscode-e2e/src/suite/utils.ts b/apps/vscode-e2e/src/suite/utils.ts index d41fa9e8ed..874ded9acc 100644 --- a/apps/vscode-e2e/src/suite/utils.ts +++ b/apps/vscode-e2e/src/suite/utils.ts @@ -1,4 +1,4 @@ -import type { RooCodeAPI } from "@roo-code/types" +import { RooCodeEventName, type RooCodeAPI } from "@roo-code/types" type WaitForOptions = { timeout?: number @@ -46,7 +46,7 @@ type WaitUntilAbortedOptions = WaitForOptions & { export const waitUntilAborted = async ({ api, taskId, ...options }: WaitUntilAbortedOptions) => { const set = new Set() - api.on("taskAborted", (taskId) => set.add(taskId)) + api.on(RooCodeEventName.TaskAborted, (taskId) => set.add(taskId)) await waitFor(() => set.has(taskId), options) } @@ -57,7 +57,7 @@ type WaitUntilCompletedOptions = WaitForOptions & { export const waitUntilCompleted = async ({ api, taskId, ...options }: WaitUntilCompletedOptions) => { const set = new Set() - api.on("taskCompleted", (taskId) => set.add(taskId)) + api.on(RooCodeEventName.TaskCompleted, (taskId) => set.add(taskId)) await waitFor(() => set.has(taskId), options) } diff --git a/packages/cloud/src/CloudAPI.ts b/packages/cloud/src/CloudAPI.ts new file mode 100644 index 0000000000..52c3c2521d --- /dev/null +++ b/packages/cloud/src/CloudAPI.ts @@ -0,0 +1,122 @@ +import { type ShareVisibility, type ShareResponse, shareResponseSchema } from "@roo-code/types" + +import { getRooCodeApiUrl } from "./config" +import type { AuthService } from "./auth" +import { getUserAgent } from "./utils" +import { AuthenticationError, CloudAPIError, NetworkError, TaskNotFoundError } from "./errors" + +interface CloudAPIRequestOptions extends Omit { + timeout?: number + headers?: Record +} + +export class CloudAPI { + private authService: AuthService + private log: (...args: unknown[]) => void + private baseUrl: string + + constructor(authService: AuthService, log?: (...args: unknown[]) => void) { + this.authService = authService + this.log = log || console.log + this.baseUrl = getRooCodeApiUrl() + } + + private async request( + endpoint: string, + options: CloudAPIRequestOptions & { + parseResponse?: (data: unknown) => T + } = {}, + ): Promise { + const { timeout = 10000, parseResponse, headers = {}, ...fetchOptions } = options + + const sessionToken = this.authService.getSessionToken() + + if (!sessionToken) { + throw new AuthenticationError() + } + + const url = `${this.baseUrl}${endpoint}` + + const requestHeaders = { + "Content-Type": "application/json", + Authorization: `Bearer ${sessionToken}`, + "User-Agent": getUserAgent(), + ...headers, + } + + try { + const response = await fetch(url, { + ...fetchOptions, + headers: requestHeaders, + signal: AbortSignal.timeout(timeout), + }) + + if (!response.ok) { + await this.handleErrorResponse(response, endpoint) + } + + const data = await response.json() + + if (parseResponse) { + return parseResponse(data) + } + + return data as T + } catch (error) { + if (error instanceof TypeError && error.message.includes("fetch")) { + throw new NetworkError(`Network error while calling ${endpoint}`) + } + + if (error instanceof CloudAPIError) { + throw error + } + + if (error instanceof Error && error.name === "AbortError") { + throw new CloudAPIError(`Request to ${endpoint} timed out`, undefined, undefined) + } + + throw new CloudAPIError( + `Unexpected error while calling ${endpoint}: ${error instanceof Error ? error.message : String(error)}`, + ) + } + } + + private async handleErrorResponse(response: Response, endpoint: string): Promise { + let responseBody: unknown + + try { + responseBody = await response.json() + } catch { + responseBody = await response.text() + } + + switch (response.status) { + case 401: + throw new AuthenticationError() + case 404: + if (endpoint.includes("/share")) { + throw new TaskNotFoundError() + } + throw new CloudAPIError(`Resource not found: ${endpoint}`, 404, responseBody) + default: + throw new CloudAPIError( + `HTTP ${response.status}: ${response.statusText}`, + response.status, + responseBody, + ) + } + } + + async shareTask(taskId: string, visibility: ShareVisibility = "organization"): Promise { + this.log(`[CloudAPI] Sharing task ${taskId} with visibility: ${visibility}`) + + const response = await this.request("/api/extension/share", { + method: "POST", + body: JSON.stringify({ taskId, visibility }), + parseResponse: (data) => shareResponseSchema.parse(data), + }) + + this.log("[CloudAPI] Share response:", response) + return response + } +} diff --git a/packages/cloud/src/CloudService.ts b/packages/cloud/src/CloudService.ts index ff33671a40..7777d6b220 100644 --- a/packages/cloud/src/CloudService.ts +++ b/packages/cloud/src/CloudService.ts @@ -12,13 +12,15 @@ import type { import { TelemetryService } from "@roo-code/telemetry" import { CloudServiceEvents } from "./types" +import { TaskNotFoundError } from "./errors" import type { AuthService } from "./auth" import { WebAuthService, StaticTokenAuthService } from "./auth" import type { SettingsService } from "./SettingsService" import { CloudSettingsService } from "./CloudSettingsService" import { StaticSettingsService } from "./StaticSettingsService" import { TelemetryClient } from "./TelemetryClient" -import { ShareService, TaskNotFoundError } from "./ShareService" +import { CloudShareService } from "./CloudShareService" +import { CloudAPI } from "./CloudAPI" type AuthStateChangedPayload = CloudServiceEvents["auth-state-changed"][0] type AuthUserInfoPayload = CloudServiceEvents["user-info"][0] @@ -34,7 +36,8 @@ export class CloudService extends EventEmitter implements vs private settingsListener: (data: SettingsPayload) => void private settingsService: SettingsService | null = null private telemetryClient: TelemetryClient | null = null - private shareService: ShareService | null = null + private shareService: CloudShareService | null = null + private cloudAPI: CloudAPI | null = null private isInitialized = false private log: (...args: unknown[]) => void @@ -87,8 +90,9 @@ export class CloudService extends EventEmitter implements vs this.settingsService = cloudSettingsService } + this.cloudAPI = new CloudAPI(this.authService, this.log) this.telemetryClient = new TelemetryClient(this.authService, this.settingsService) - this.shareService = new ShareService(this.authService, this.settingsService, this.log) + this.shareService = new CloudShareService(this.cloudAPI, this.settingsService, this.log) try { TelemetryService.instance.register(this.telemetryClient) @@ -209,7 +213,7 @@ export class CloudService extends EventEmitter implements vs return await this.shareService!.shareTask(taskId, visibility) } catch (error) { if (error instanceof TaskNotFoundError && clineMessages) { - // Backfill messages and retry + // Backfill messages and retry. await this.telemetryClient!.backfillMessages(clineMessages, taskId) return await this.shareService!.shareTask(taskId, visibility) } @@ -229,6 +233,7 @@ export class CloudService extends EventEmitter implements vs this.authService.off("auth-state-changed", this.authStateListener) this.authService.off("user-info", this.authUserInfoListener) } + if (this.settingsService) { if (this.settingsService instanceof CloudSettingsService) { this.settingsService.off("settings-updated", this.settingsListener) diff --git a/packages/cloud/src/CloudSettingsService.ts b/packages/cloud/src/CloudSettingsService.ts index 4ce52774db..c842d800fc 100644 --- a/packages/cloud/src/CloudSettingsService.ts +++ b/packages/cloud/src/CloudSettingsService.ts @@ -8,7 +8,7 @@ import { organizationSettingsSchema, } from "@roo-code/types" -import { getRooCodeApiUrl } from "./Config" +import { getRooCodeApiUrl } from "./config" import type { AuthService, AuthState } from "./auth" import { RefreshTimer } from "./RefreshTimer" import type { SettingsService } from "./SettingsService" diff --git a/packages/cloud/src/CloudShareService.ts b/packages/cloud/src/CloudShareService.ts new file mode 100644 index 0000000000..91e0f6aa3f --- /dev/null +++ b/packages/cloud/src/CloudShareService.ts @@ -0,0 +1,43 @@ +import * as vscode from "vscode" + +import type { ShareResponse, ShareVisibility } from "@roo-code/types" + +import type { CloudAPI } from "./CloudAPI" +import type { SettingsService } from "./SettingsService" + +export class CloudShareService { + private cloudAPI: CloudAPI + private settingsService: SettingsService + private log: (...args: unknown[]) => void + + constructor(cloudAPI: CloudAPI, settingsService: SettingsService, log?: (...args: unknown[]) => void) { + this.cloudAPI = cloudAPI + this.settingsService = settingsService + this.log = log || console.log + } + + async shareTask(taskId: string, visibility: ShareVisibility = "organization"): Promise { + try { + const response = await this.cloudAPI.shareTask(taskId, visibility) + + if (response.success && response.shareUrl) { + // Copy to clipboard. + await vscode.env.clipboard.writeText(response.shareUrl) + } + + return response + } catch (error) { + this.log("[ShareService] Error sharing task:", error) + throw error + } + } + + async canShareTask(): Promise { + try { + return !!this.settingsService.getSettings()?.cloudSettings?.enableTaskSharing + } catch (error) { + this.log("[ShareService] Error checking if task can be shared:", error) + return false + } + } +} diff --git a/packages/cloud/src/ShareService.ts b/packages/cloud/src/ShareService.ts deleted file mode 100644 index 5dcc7cae3f..0000000000 --- a/packages/cloud/src/ShareService.ts +++ /dev/null @@ -1,88 +0,0 @@ -import * as vscode from "vscode" - -import { shareResponseSchema } from "@roo-code/types" -import { getRooCodeApiUrl } from "./Config" -import type { AuthService } from "./auth" -import type { SettingsService } from "./SettingsService" -import { getUserAgent } from "./utils" - -export type ShareVisibility = "organization" | "public" - -export class TaskNotFoundError extends Error { - constructor(taskId?: string) { - super(taskId ? `Task '${taskId}' not found` : "Task not found") - Object.setPrototypeOf(this, TaskNotFoundError.prototype) - } -} - -export class ShareService { - private authService: AuthService - private settingsService: SettingsService - private log: (...args: unknown[]) => void - - constructor(authService: AuthService, settingsService: SettingsService, log?: (...args: unknown[]) => void) { - this.authService = authService - this.settingsService = settingsService - this.log = log || console.log - } - - /** - * Share a task with specified visibility - * Returns the share response data - */ - async shareTask(taskId: string, visibility: ShareVisibility = "organization") { - try { - const sessionToken = this.authService.getSessionToken() - if (!sessionToken) { - throw new Error("Authentication required") - } - - const response = await fetch(`${getRooCodeApiUrl()}/api/extension/share`, { - method: "POST", - headers: { - "Content-Type": "application/json", - Authorization: `Bearer ${sessionToken}`, - "User-Agent": getUserAgent(), - }, - body: JSON.stringify({ taskId, visibility }), - signal: AbortSignal.timeout(10000), - }) - - if (!response.ok) { - if (response.status === 404) { - throw new TaskNotFoundError(taskId) - } - throw new Error(`HTTP ${response.status}: ${response.statusText}`) - } - - const data = shareResponseSchema.parse(await response.json()) - this.log("[share] Share link created successfully:", data) - - if (data.success && data.shareUrl) { - // Copy to clipboard - await vscode.env.clipboard.writeText(data.shareUrl) - } - - return data - } catch (error) { - this.log("[share] Error sharing task:", error) - throw error - } - } - - /** - * Check if sharing is available - */ - async canShareTask(): Promise { - try { - if (!this.authService.isAuthenticated()) { - return false - } - - return !!this.settingsService.getSettings()?.cloudSettings?.enableTaskSharing - } catch (error) { - this.log("[share] Error checking if task can be shared:", error) - return false - } - } -} diff --git a/packages/cloud/src/StaticSettingsService.ts b/packages/cloud/src/StaticSettingsService.ts index 3aac37bda5..97e6cf7ea8 100644 --- a/packages/cloud/src/StaticSettingsService.ts +++ b/packages/cloud/src/StaticSettingsService.ts @@ -36,6 +36,6 @@ export class StaticSettingsService implements SettingsService { } public dispose(): void { - // No resources to clean up for static settings + // No resources to clean up for static settings. } } diff --git a/packages/cloud/src/TelemetryClient.ts b/packages/cloud/src/TelemetryClient.ts index e33843a30c..727da03432 100644 --- a/packages/cloud/src/TelemetryClient.ts +++ b/packages/cloud/src/TelemetryClient.ts @@ -6,7 +6,7 @@ import { } from "@roo-code/types" import { BaseTelemetryClient } from "@roo-code/telemetry" -import { getRooCodeApiUrl } from "./Config" +import { getRooCodeApiUrl } from "./config" import type { AuthService } from "./auth" import type { SettingsService } from "./SettingsService" diff --git a/packages/cloud/src/__tests__/CloudService.test.ts b/packages/cloud/src/__tests__/CloudService.test.ts index fd3ae9b9c0..607b21de34 100644 --- a/packages/cloud/src/__tests__/CloudService.test.ts +++ b/packages/cloud/src/__tests__/CloudService.test.ts @@ -1,14 +1,16 @@ // npx vitest run src/__tests__/CloudService.test.ts import * as vscode from "vscode" + import type { ClineMessage } from "@roo-code/types" +import { TelemetryService } from "@roo-code/telemetry" import { CloudService } from "../CloudService" import { WebAuthService } from "../auth/WebAuthService" import { CloudSettingsService } from "../CloudSettingsService" -import { ShareService, TaskNotFoundError } from "../ShareService" +import { CloudShareService } from "../CloudShareService" import { TelemetryClient } from "../TelemetryClient" -import { TelemetryService } from "@roo-code/telemetry" +import { TaskNotFoundError } from "../errors" vi.mock("vscode", () => ({ ExtensionContext: vi.fn(), @@ -30,7 +32,7 @@ vi.mock("../auth/WebAuthService") vi.mock("../CloudSettingsService") -vi.mock("../ShareService") +vi.mock("../CloudShareService") vi.mock("../TelemetryClient") @@ -154,7 +156,7 @@ describe("CloudService", () => { vi.mocked(WebAuthService).mockImplementation(() => mockAuthService as unknown as WebAuthService) vi.mocked(CloudSettingsService).mockImplementation(() => mockSettingsService as unknown as CloudSettingsService) - vi.mocked(ShareService).mockImplementation(() => mockShareService as unknown as ShareService) + vi.mocked(CloudShareService).mockImplementation(() => mockShareService as unknown as CloudShareService) vi.mocked(TelemetryClient).mockImplementation(() => mockTelemetryClient as unknown as TelemetryClient) vi.mocked(TelemetryService.hasInstance).mockReturnValue(true) diff --git a/packages/cloud/src/__tests__/CloudSettingsService.test.ts b/packages/cloud/src/__tests__/CloudSettingsService.test.ts index e9d0ae3c93..4a85383ba4 100644 --- a/packages/cloud/src/__tests__/CloudSettingsService.test.ts +++ b/packages/cloud/src/__tests__/CloudSettingsService.test.ts @@ -6,8 +6,8 @@ import type { OrganizationSettings } from "@roo-code/types" // Mock dependencies vi.mock("../RefreshTimer") -vi.mock("../Config", () => ({ - getRooCodeApiUrl: vi.fn().mockReturnValue("https://api.example.com"), +vi.mock("../config", () => ({ + getRooCodeApiUrl: vi.fn().mockReturnValue("https://app.roocode.com"), })) // Mock fetch globally @@ -338,7 +338,7 @@ describe("CloudSettingsService", () => { const result = await timerCallback() expect(result).toBe(true) - expect(fetch).toHaveBeenCalledWith("https://api.example.com/api/organization-settings", { + expect(fetch).toHaveBeenCalledWith("https://app.roocode.com/api/organization-settings", { headers: { Authorization: "Bearer valid-token", }, diff --git a/packages/cloud/src/__tests__/ShareService.test.ts b/packages/cloud/src/__tests__/CloudShareService.test.ts similarity index 86% rename from packages/cloud/src/__tests__/ShareService.test.ts rename to packages/cloud/src/__tests__/CloudShareService.test.ts index dd5b669603..6fae1fbb9f 100644 --- a/packages/cloud/src/__tests__/ShareService.test.ts +++ b/packages/cloud/src/__tests__/CloudShareService.test.ts @@ -3,9 +3,11 @@ import type { MockedFunction } from "vitest" import * as vscode from "vscode" -import { ShareService, TaskNotFoundError } from "../ShareService" -import type { AuthService } from "../auth" +import { CloudAPI } from "../CloudAPI" +import { CloudShareService } from "../CloudShareService" import type { SettingsService } from "../SettingsService" +import type { AuthService } from "../auth" +import { CloudAPIError, TaskNotFoundError } from "../errors" // Mock fetch const mockFetch = vi.fn() @@ -44,10 +46,11 @@ vi.mock("../utils", () => ({ getUserAgent: () => "Roo-Code 1.0.0", })) -describe("ShareService", () => { - let shareService: ShareService +describe("CloudShareService", () => { + let shareService: CloudShareService let mockAuthService: AuthService let mockSettingsService: SettingsService + let mockCloudAPI: CloudAPI let mockLog: MockedFunction<(...args: unknown[]) => void> beforeEach(() => { @@ -65,7 +68,8 @@ describe("ShareService", () => { getSettings: vi.fn(), } as any - shareService = new ShareService(mockAuthService, mockSettingsService, mockLog) + mockCloudAPI = new CloudAPI(mockAuthService, mockLog) + shareService = new CloudShareService(mockCloudAPI, mockSettingsService, mockLog) }) describe("shareTask", () => { @@ -189,12 +193,12 @@ describe("ShareService", () => { ok: false, status: 404, statusText: "Not Found", + json: vi.fn().mockRejectedValue(new Error("Invalid JSON")), + text: vi.fn().mockResolvedValue("Not Found"), }) await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow(TaskNotFoundError) - await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow( - "Task 'task-123' not found", - ) + await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow("Task not found") }) it("should throw generic Error for non-404 HTTP errors", async () => { @@ -203,12 +207,14 @@ describe("ShareService", () => { ok: false, status: 500, statusText: "Internal Server Error", + json: vi.fn().mockRejectedValue(new Error("Invalid JSON")), + text: vi.fn().mockResolvedValue("Internal Server Error"), }) + await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow(CloudAPIError) await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow( "HTTP 500: Internal Server Error", ) - await expect(shareService.shareTask("task-123", "organization")).rejects.not.toThrow(TaskNotFoundError) }) it("should create TaskNotFoundError with correct properties", async () => { @@ -217,6 +223,8 @@ describe("ShareService", () => { ok: false, status: 404, statusText: "Not Found", + json: vi.fn().mockRejectedValue(new Error("Invalid JSON")), + text: vi.fn().mockResolvedValue("Not Found"), }) try { @@ -225,7 +233,7 @@ describe("ShareService", () => { } catch (error) { expect(error).toBeInstanceOf(TaskNotFoundError) expect(error).toBeInstanceOf(Error) - expect((error as TaskNotFoundError).message).toBe("Task 'task-123' not found") + expect((error as TaskNotFoundError).message).toBe("Task not found") } }) }) @@ -277,8 +285,8 @@ describe("ShareService", () => { expect(result).toBe(false) }) - it("should return false when not authenticated", async () => { - ;(mockAuthService.isAuthenticated as any).mockReturnValue(false) + it("should return false when settings service returns undefined", async () => { + ;(mockSettingsService.getSettings as any).mockReturnValue(undefined) const result = await shareService.canShareTask() @@ -286,13 +294,17 @@ describe("ShareService", () => { }) it("should handle errors gracefully", async () => { - ;(mockAuthService.isAuthenticated as any).mockImplementation(() => { - throw new Error("Auth error") + ;(mockSettingsService.getSettings as any).mockImplementation(() => { + throw new Error("Settings error") }) const result = await shareService.canShareTask() expect(result).toBe(false) + expect(mockLog).toHaveBeenCalledWith( + "[ShareService] Error checking if task can be shared:", + expect.any(Error), + ) }) }) }) diff --git a/packages/cloud/src/__tests__/auth/WebAuthService.spec.ts b/packages/cloud/src/__tests__/auth/WebAuthService.spec.ts index 457e1d706d..82fd964b7f 100644 --- a/packages/cloud/src/__tests__/auth/WebAuthService.spec.ts +++ b/packages/cloud/src/__tests__/auth/WebAuthService.spec.ts @@ -1,17 +1,17 @@ -// npx vitest run src/__tests__/AuthService.spec.ts +// npx vitest run src/__tests__/auth/WebAuthService.spec.ts -import { vi, Mock, beforeEach, afterEach, describe, it, expect } from "vitest" +import { type Mock } from "vitest" import crypto from "crypto" import * as vscode from "vscode" import { WebAuthService } from "../../auth/WebAuthService" import { RefreshTimer } from "../../RefreshTimer" -import * as Config from "../../Config" -import * as utils from "../../utils" +import { getClerkBaseUrl, getRooCodeApiUrl } from "../../config" +import { getUserAgent } from "../../utils" // Mock external dependencies vi.mock("../../RefreshTimer") -vi.mock("../../Config") +vi.mock("../../config") vi.mock("../../utils") vi.mock("crypto") @@ -101,11 +101,11 @@ describe("WebAuthService", () => { MockedRefreshTimer.mockImplementation(() => mockTimer as unknown as RefreshTimer) // Setup config mocks - use production URL by default to maintain existing test behavior - vi.mocked(Config.getClerkBaseUrl).mockReturnValue("https://clerk.roocode.com") - vi.mocked(Config.getRooCodeApiUrl).mockReturnValue("https://api.test.com") + vi.mocked(getClerkBaseUrl).mockReturnValue("https://clerk.roocode.com") + vi.mocked(getRooCodeApiUrl).mockReturnValue("https://api.test.com") // Setup utils mock - vi.mocked(utils.getUserAgent).mockReturnValue("Roo-Code 1.0.0") + vi.mocked(getUserAgent).mockReturnValue("Roo-Code 1.0.0") // Setup crypto mock vi.mocked(crypto.randomBytes).mockReturnValue(Buffer.from("test-random-bytes") as never) @@ -977,7 +977,7 @@ describe("WebAuthService", () => { describe("auth credentials key scoping", () => { it("should use default key when getClerkBaseUrl returns production URL", async () => { // Mock getClerkBaseUrl to return production URL - vi.mocked(Config.getClerkBaseUrl).mockReturnValue("https://clerk.roocode.com") + vi.mocked(getClerkBaseUrl).mockReturnValue("https://clerk.roocode.com") const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) const credentials = { clientToken: "test-token", sessionId: "test-session" } @@ -994,7 +994,7 @@ describe("WebAuthService", () => { it("should use scoped key when getClerkBaseUrl returns custom URL", async () => { const customUrl = "https://custom.clerk.com" // Mock getClerkBaseUrl to return custom URL - vi.mocked(Config.getClerkBaseUrl).mockReturnValue(customUrl) + vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) const credentials = { clientToken: "test-token", sessionId: "test-session" } @@ -1010,7 +1010,7 @@ describe("WebAuthService", () => { it("should load credentials using scoped key", async () => { const customUrl = "https://custom.clerk.com" - vi.mocked(Config.getClerkBaseUrl).mockReturnValue(customUrl) + vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) const credentials = { clientToken: "test-token", sessionId: "test-session" } @@ -1025,7 +1025,7 @@ describe("WebAuthService", () => { it("should clear credentials using scoped key", async () => { const customUrl = "https://custom.clerk.com" - vi.mocked(Config.getClerkBaseUrl).mockReturnValue(customUrl) + vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) @@ -1037,7 +1037,7 @@ describe("WebAuthService", () => { it("should listen for changes on scoped key", async () => { const customUrl = "https://custom.clerk.com" - vi.mocked(Config.getClerkBaseUrl).mockReturnValue(customUrl) + vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) let onDidChangeCallback: (e: { key: string }) => void @@ -1064,7 +1064,7 @@ describe("WebAuthService", () => { it("should not respond to changes on different scoped keys", async () => { const customUrl = "https://custom.clerk.com" - vi.mocked(Config.getClerkBaseUrl).mockReturnValue(customUrl) + vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) let onDidChangeCallback: (e: { key: string }) => void @@ -1088,7 +1088,7 @@ describe("WebAuthService", () => { it("should not respond to changes on default key when using scoped key", async () => { const customUrl = "https://custom.clerk.com" - vi.mocked(Config.getClerkBaseUrl).mockReturnValue(customUrl) + vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) let onDidChangeCallback: (e: { key: string }) => void diff --git a/packages/cloud/src/auth/AuthService.ts b/packages/cloud/src/auth/AuthService.ts index 57e026d72a..a49ad0104d 100644 --- a/packages/cloud/src/auth/AuthService.ts +++ b/packages/cloud/src/auth/AuthService.ts @@ -1,4 +1,5 @@ import EventEmitter from "events" + import type { CloudUserInfo } from "@roo-code/types" export interface AuthServiceEvents { diff --git a/packages/cloud/src/auth/StaticTokenAuthService.ts b/packages/cloud/src/auth/StaticTokenAuthService.ts index 507f82c9f6..04821006d5 100644 --- a/packages/cloud/src/auth/StaticTokenAuthService.ts +++ b/packages/cloud/src/auth/StaticTokenAuthService.ts @@ -1,6 +1,9 @@ import EventEmitter from "events" + import * as vscode from "vscode" + import type { CloudUserInfo } from "@roo-code/types" + import type { AuthService, AuthServiceEvents, AuthState } from "./AuthService" export class StaticTokenAuthService extends EventEmitter implements AuthService { diff --git a/packages/cloud/src/auth/WebAuthService.ts b/packages/cloud/src/auth/WebAuthService.ts index 8fd892f44f..b94957950b 100644 --- a/packages/cloud/src/auth/WebAuthService.ts +++ b/packages/cloud/src/auth/WebAuthService.ts @@ -6,11 +6,19 @@ import { z } from "zod" import type { CloudUserInfo, CloudOrganizationMembership } from "@roo-code/types" -import { getClerkBaseUrl, getRooCodeApiUrl, PRODUCTION_CLERK_BASE_URL } from "../Config" -import { RefreshTimer } from "../RefreshTimer" +import { getClerkBaseUrl, getRooCodeApiUrl, PRODUCTION_CLERK_BASE_URL } from "../config" import { getUserAgent } from "../utils" +import { InvalidClientTokenError } from "../errors" +import { RefreshTimer } from "../RefreshTimer" + import type { AuthService, AuthServiceEvents, AuthState } from "./AuthService" +const AUTH_STATE_KEY = "clerk-auth-state" + +/** + * AuthCredentials + */ + const authCredentialsSchema = z.object({ clientToken: z.string().min(1, "Client token cannot be empty"), sessionId: z.string().min(1, "Session ID cannot be empty"), @@ -19,7 +27,9 @@ const authCredentialsSchema = z.object({ type AuthCredentials = z.infer -const AUTH_STATE_KEY = "clerk-auth-state" +/** + * Clerk Schemas + */ const clerkSignInResponseSchema = z.object({ response: z.object({ @@ -33,8 +43,9 @@ const clerkCreateSessionTokenResponseSchema = z.object({ const clerkMeResponseSchema = z.object({ response: z.object({ - first_name: z.string().optional().nullable(), - last_name: z.string().optional().nullable(), + id: z.string().optional(), + first_name: z.string().nullish(), + last_name: z.string().nullish(), image_url: z.string().optional(), primary_email_address_id: z.string().optional(), email_addresses: z @@ -69,13 +80,6 @@ const clerkOrganizationMembershipsSchema = z.object({ ), }) -class InvalidClientTokenError extends Error { - constructor() { - super("Invalid/Expired client token") - Object.setPrototypeOf(this, InvalidClientTokenError.prototype) - } -} - export class WebAuthService extends EventEmitter implements AuthService { private context: vscode.ExtensionContext private timer: RefreshTimer @@ -94,8 +98,9 @@ export class WebAuthService extends EventEmitter implements A this.context = context this.log = log || console.log - // Calculate auth credentials key based on Clerk base URL + // Calculate auth credentials key based on Clerk base URL. const clerkBaseUrl = getClerkBaseUrl() + if (clerkBaseUrl !== PRODUCTION_CLERK_BASE_URL) { this.authCredentialsKey = `clerk-auth-credentials-${clerkBaseUrl}` } else { @@ -514,9 +519,13 @@ export class WebAuthService extends EventEmitter implements A throw new Error(`HTTP ${response.status}: ${response.statusText}`) } - const { response: userData } = clerkMeResponseSchema.parse(await response.json()) + const payload = await response.json() + const { response: userData } = clerkMeResponseSchema.parse(payload) - const userInfo: CloudUserInfo = {} + const userInfo: CloudUserInfo = { + id: userData.id, + picture: userData.image_url, + } const names = [userData.first_name, userData.last_name].filter((name) => !!name) userInfo.name = names.length > 0 ? names.join(" ") : undefined @@ -529,8 +538,6 @@ export class WebAuthService extends EventEmitter implements A )?.email_address } - userInfo.picture = userData.image_url - // Fetch organization info if user is in organization context try { const storedOrgId = this.getStoredOrganizationId() @@ -544,6 +551,7 @@ export class WebAuthService extends EventEmitter implements A if (userMembership) { this.setUserOrganizationInfo(userInfo, userMembership) + this.log("[auth] User in organization context:", { id: userMembership.organization.id, name: userMembership.organization.name, @@ -562,6 +570,7 @@ export class WebAuthService extends EventEmitter implements A if (primaryOrgMembership) { this.setUserOrganizationInfo(userInfo, primaryOrgMembership) + this.log("[auth] Legacy credentials: Found organization membership:", { id: primaryOrgMembership.organization.id, name: primaryOrgMembership.organization.name, diff --git a/packages/cloud/src/Config.ts b/packages/cloud/src/config.ts similarity index 81% rename from packages/cloud/src/Config.ts rename to packages/cloud/src/config.ts index 08b0cc7a18..e682d718ce 100644 --- a/packages/cloud/src/Config.ts +++ b/packages/cloud/src/config.ts @@ -1,7 +1,5 @@ -// Production constants export const PRODUCTION_CLERK_BASE_URL = "https://clerk.roocode.com" export const PRODUCTION_ROO_CODE_API_URL = "https://app.roocode.com" -// Functions with environment variable fallbacks export const getClerkBaseUrl = () => process.env.CLERK_BASE_URL || PRODUCTION_CLERK_BASE_URL export const getRooCodeApiUrl = () => process.env.ROO_CODE_API_URL || PRODUCTION_ROO_CODE_API_URL diff --git a/packages/cloud/src/errors.ts b/packages/cloud/src/errors.ts new file mode 100644 index 0000000000..7400f26b39 --- /dev/null +++ b/packages/cloud/src/errors.ts @@ -0,0 +1,42 @@ +export class CloudAPIError extends Error { + constructor( + message: string, + public statusCode?: number, + public responseBody?: unknown, + ) { + super(message) + this.name = "CloudAPIError" + Object.setPrototypeOf(this, CloudAPIError.prototype) + } +} + +export class TaskNotFoundError extends CloudAPIError { + constructor(taskId?: string) { + super(taskId ? `Task '${taskId}' not found` : "Task not found", 404) + this.name = "TaskNotFoundError" + Object.setPrototypeOf(this, TaskNotFoundError.prototype) + } +} + +export class AuthenticationError extends CloudAPIError { + constructor(message = "Authentication required") { + super(message, 401) + this.name = "AuthenticationError" + Object.setPrototypeOf(this, AuthenticationError.prototype) + } +} + +export class NetworkError extends CloudAPIError { + constructor(message = "Network error occurred") { + super(message) + this.name = "NetworkError" + Object.setPrototypeOf(this, NetworkError.prototype) + } +} + +export class InvalidClientTokenError extends Error { + constructor() { + super("Invalid/Expired client token") + Object.setPrototypeOf(this, InvalidClientTokenError.prototype) + } +} diff --git a/packages/cloud/src/index.ts b/packages/cloud/src/index.ts index 9770f349c6..55f7d908dd 100644 --- a/packages/cloud/src/index.ts +++ b/packages/cloud/src/index.ts @@ -1,2 +1,4 @@ +export * from "./config" + +export * from "./CloudAPI" export * from "./CloudService" -export * from "./Config" diff --git a/packages/types/src/api.ts b/packages/types/src/api.ts index 6fb181b573..e61e1e6106 100644 --- a/packages/types/src/api.ts +++ b/packages/types/src/api.ts @@ -1,27 +1,12 @@ import type { EventEmitter } from "events" import type { Socket } from "net" +import type { RooCodeEvents } from "./events.js" import type { RooCodeSettings } from "./global-settings.js" import type { ProviderSettingsEntry, ProviderSettings } from "./provider-settings.js" -import type { ClineMessage, TokenUsage } from "./message.js" -import type { ToolUsage, ToolName } from "./tool.js" -import type { IpcMessage, IpcServerEvents, IsSubtask } from "./ipc.js" +import type { IpcMessage, IpcServerEvents } from "./ipc.js" -// TODO: Make sure this matches `RooCodeEvents` from `@roo-code/types`. -export interface RooCodeAPIEvents { - message: [data: { taskId: string; action: "created" | "updated"; message: ClineMessage }] - taskCreated: [taskId: string] - taskStarted: [taskId: string] - taskModeSwitched: [taskId: string, mode: string] - taskPaused: [taskId: string] - taskUnpaused: [taskId: string] - taskAskResponded: [taskId: string] - taskAborted: [taskId: string] - taskSpawned: [parentTaskId: string, childTaskId: string] - taskCompleted: [taskId: string, tokenUsage: TokenUsage, toolUsage: ToolUsage, isSubtask: IsSubtask] - taskTokenUsageUpdated: [taskId: string, tokenUsage: TokenUsage] - taskToolFailed: [taskId: string, toolName: ToolName, error: string] -} +export type RooCodeAPIEvents = RooCodeEvents export interface RooCodeAPI extends EventEmitter { /** diff --git a/packages/types/src/cloud.ts b/packages/types/src/cloud.ts index c8acc2bcae..a4eb9f96a8 100644 --- a/packages/types/src/cloud.ts +++ b/packages/types/src/cloud.ts @@ -9,6 +9,7 @@ import { discriminatedProviderSettingsWithIdSchema } from "./provider-settings.j */ export interface CloudUserInfo { + id?: string name?: string email?: string picture?: string diff --git a/packages/types/src/events.ts b/packages/types/src/events.ts new file mode 100644 index 0000000000..42c389ab60 --- /dev/null +++ b/packages/types/src/events.ts @@ -0,0 +1,192 @@ +import { z } from "zod" + +import { clineMessageSchema, tokenUsageSchema } from "./message.js" +import { toolNamesSchema, toolUsageSchema } from "./tool.js" + +/** + * RooCodeEventName + */ + +export enum RooCodeEventName { + // Task Provider Lifecycle + TaskCreated = "taskCreated", + + // Task Lifecycle + TaskStarted = "taskStarted", + TaskCompleted = "taskCompleted", + TaskAborted = "taskAborted", + TaskFocused = "taskFocused", + TaskUnfocused = "taskUnfocused", + TaskActive = "taskActive", + TaskIdle = "taskIdle", + + // Subtask Lifecycle + TaskPaused = "taskPaused", + TaskUnpaused = "taskUnpaused", + TaskSpawned = "taskSpawned", + + // Task Execution + Message = "message", + TaskModeSwitched = "taskModeSwitched", + TaskAskResponded = "taskAskResponded", + + // Task Analytics + TaskTokenUsageUpdated = "taskTokenUsageUpdated", + TaskToolFailed = "taskToolFailed", + + // Evals + EvalPass = "evalPass", + EvalFail = "evalFail", +} + +/** + * RooCodeEvents + */ + +export const rooCodeEventsSchema = z.object({ + [RooCodeEventName.TaskCreated]: z.tuple([z.string()]), + + [RooCodeEventName.TaskStarted]: z.tuple([z.string()]), + [RooCodeEventName.TaskCompleted]: z.tuple([ + z.string(), + tokenUsageSchema, + toolUsageSchema, + z.object({ + isSubtask: z.boolean(), + }), + ]), + [RooCodeEventName.TaskAborted]: z.tuple([z.string()]), + [RooCodeEventName.TaskFocused]: z.tuple([z.string()]), + [RooCodeEventName.TaskUnfocused]: z.tuple([z.string()]), + [RooCodeEventName.TaskActive]: z.tuple([z.string()]), + [RooCodeEventName.TaskIdle]: z.tuple([z.string()]), + + [RooCodeEventName.TaskPaused]: z.tuple([z.string()]), + [RooCodeEventName.TaskUnpaused]: z.tuple([z.string()]), + [RooCodeEventName.TaskSpawned]: z.tuple([z.string(), z.string()]), + + [RooCodeEventName.Message]: z.tuple([ + z.object({ + taskId: z.string(), + action: z.union([z.literal("created"), z.literal("updated")]), + message: clineMessageSchema, + }), + ]), + [RooCodeEventName.TaskModeSwitched]: z.tuple([z.string(), z.string()]), + [RooCodeEventName.TaskAskResponded]: z.tuple([z.string()]), + + [RooCodeEventName.TaskToolFailed]: z.tuple([z.string(), toolNamesSchema, z.string()]), + [RooCodeEventName.TaskTokenUsageUpdated]: z.tuple([z.string(), tokenUsageSchema]), +}) + +export type RooCodeEvents = z.infer + +/** + * TaskEvent + */ + +export const taskEventSchema = z.discriminatedUnion("eventName", [ + // Task Provider Lifecycle + z.object({ + eventName: z.literal(RooCodeEventName.TaskCreated), + payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskCreated], + taskId: z.number().optional(), + }), + + // Task Lifecycle + z.object({ + eventName: z.literal(RooCodeEventName.TaskStarted), + payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskStarted], + taskId: z.number().optional(), + }), + z.object({ + eventName: z.literal(RooCodeEventName.TaskCompleted), + payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskCompleted], + taskId: z.number().optional(), + }), + z.object({ + eventName: z.literal(RooCodeEventName.TaskAborted), + payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskAborted], + taskId: z.number().optional(), + }), + z.object({ + eventName: z.literal(RooCodeEventName.TaskFocused), + payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskFocused], + taskId: z.number().optional(), + }), + z.object({ + eventName: z.literal(RooCodeEventName.TaskUnfocused), + payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskUnfocused], + taskId: z.number().optional(), + }), + z.object({ + eventName: z.literal(RooCodeEventName.TaskActive), + payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskActive], + taskId: z.number().optional(), + }), + z.object({ + eventName: z.literal(RooCodeEventName.TaskIdle), + payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskIdle], + taskId: z.number().optional(), + }), + + // Subtask Lifecycle + z.object({ + eventName: z.literal(RooCodeEventName.TaskPaused), + payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskPaused], + taskId: z.number().optional(), + }), + z.object({ + eventName: z.literal(RooCodeEventName.TaskUnpaused), + payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskUnpaused], + taskId: z.number().optional(), + }), + z.object({ + eventName: z.literal(RooCodeEventName.TaskSpawned), + payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskSpawned], + taskId: z.number().optional(), + }), + + // Task Execution + z.object({ + eventName: z.literal(RooCodeEventName.Message), + payload: rooCodeEventsSchema.shape[RooCodeEventName.Message], + taskId: z.number().optional(), + }), + z.object({ + eventName: z.literal(RooCodeEventName.TaskModeSwitched), + payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskModeSwitched], + taskId: z.number().optional(), + }), + z.object({ + eventName: z.literal(RooCodeEventName.TaskAskResponded), + payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskAskResponded], + taskId: z.number().optional(), + }), + + // Task Analytics + z.object({ + eventName: z.literal(RooCodeEventName.TaskToolFailed), + payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskToolFailed], + taskId: z.number().optional(), + }), + z.object({ + eventName: z.literal(RooCodeEventName.TaskTokenUsageUpdated), + payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskTokenUsageUpdated], + taskId: z.number().optional(), + }), + + // Evals + z.object({ + eventName: z.literal(RooCodeEventName.EvalPass), + payload: z.undefined(), + taskId: z.number(), + }), + z.object({ + eventName: z.literal(RooCodeEventName.EvalFail), + payload: z.undefined(), + taskId: z.number(), + }), +]) + +export type TaskEvent = z.infer diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts index 44937da235..dcbb1c4f54 100644 --- a/packages/types/src/index.ts +++ b/packages/types/src/index.ts @@ -1,8 +1,7 @@ -export * from "./providers/index.js" - export * from "./api.js" -export * from "./codebase-index.js" export * from "./cloud.js" +export * from "./codebase-index.js" +export * from "./events.js" export * from "./experiment.js" export * from "./followup.js" export * from "./global-settings.js" @@ -15,9 +14,12 @@ export * from "./mode.js" export * from "./model.js" export * from "./provider-settings.js" export * from "./sharing.js" +export * from "./task.js" +export * from "./todo.js" export * from "./telemetry.js" export * from "./terminal.js" export * from "./tool.js" export * from "./type-fu.js" export * from "./vscode.js" -export * from "./todo.js" + +export * from "./providers/index.js" diff --git a/packages/types/src/ipc.ts b/packages/types/src/ipc.ts index 28accde9de..22cba1dea8 100644 --- a/packages/types/src/ipc.ts +++ b/packages/types/src/ipc.ts @@ -1,60 +1,28 @@ import { z } from "zod" -import { clineMessageSchema, tokenUsageSchema } from "./message.js" -import { toolNamesSchema, toolUsageSchema } from "./tool.js" +import { type TaskEvent, taskEventSchema } from "./events.js" import { rooCodeSettingsSchema } from "./global-settings.js" /** - * isSubtaskSchema - */ -export const isSubtaskSchema = z.object({ - isSubtask: z.boolean(), -}) -export type IsSubtask = z.infer - -/** - * RooCodeEvent + * IpcMessageType */ -export enum RooCodeEventName { - Message = "message", - TaskCreated = "taskCreated", - TaskStarted = "taskStarted", - TaskModeSwitched = "taskModeSwitched", - TaskPaused = "taskPaused", - TaskUnpaused = "taskUnpaused", - TaskAskResponded = "taskAskResponded", - TaskAborted = "taskAborted", - TaskSpawned = "taskSpawned", - TaskCompleted = "taskCompleted", - TaskTokenUsageUpdated = "taskTokenUsageUpdated", - TaskToolFailed = "taskToolFailed", - EvalPass = "evalPass", - EvalFail = "evalFail", +export enum IpcMessageType { + Connect = "Connect", + Disconnect = "Disconnect", + Ack = "Ack", + TaskCommand = "TaskCommand", + TaskEvent = "TaskEvent", } -export const rooCodeEventsSchema = z.object({ - [RooCodeEventName.Message]: z.tuple([ - z.object({ - taskId: z.string(), - action: z.union([z.literal("created"), z.literal("updated")]), - message: clineMessageSchema, - }), - ]), - [RooCodeEventName.TaskCreated]: z.tuple([z.string()]), - [RooCodeEventName.TaskStarted]: z.tuple([z.string()]), - [RooCodeEventName.TaskModeSwitched]: z.tuple([z.string(), z.string()]), - [RooCodeEventName.TaskPaused]: z.tuple([z.string()]), - [RooCodeEventName.TaskUnpaused]: z.tuple([z.string()]), - [RooCodeEventName.TaskAskResponded]: z.tuple([z.string()]), - [RooCodeEventName.TaskAborted]: z.tuple([z.string()]), - [RooCodeEventName.TaskSpawned]: z.tuple([z.string(), z.string()]), - [RooCodeEventName.TaskCompleted]: z.tuple([z.string(), tokenUsageSchema, toolUsageSchema, isSubtaskSchema]), - [RooCodeEventName.TaskTokenUsageUpdated]: z.tuple([z.string(), tokenUsageSchema]), - [RooCodeEventName.TaskToolFailed]: z.tuple([z.string(), toolNamesSchema, z.string()]), -}) +/** + * IpcOrigin + */ -export type RooCodeEvents = z.infer +export enum IpcOrigin { + Client = "client", + Server = "server", +} /** * Ack @@ -69,7 +37,7 @@ export const ackSchema = z.object({ export type Ack = z.infer /** - * TaskCommand + * TaskCommandName */ export enum TaskCommandName { @@ -78,6 +46,10 @@ export enum TaskCommandName { CloseTask = "CloseTask", } +/** + * TaskCommand + */ + export const taskCommandSchema = z.discriminatedUnion("commandName", [ z.object({ commandName: z.literal(TaskCommandName.StartNewTask), @@ -100,102 +72,10 @@ export const taskCommandSchema = z.discriminatedUnion("commandName", [ export type TaskCommand = z.infer -/** - * TaskEvent - */ - -export const taskEventSchema = z.discriminatedUnion("eventName", [ - z.object({ - eventName: z.literal(RooCodeEventName.Message), - payload: rooCodeEventsSchema.shape[RooCodeEventName.Message], - taskId: z.number().optional(), - }), - z.object({ - eventName: z.literal(RooCodeEventName.TaskCreated), - payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskCreated], - taskId: z.number().optional(), - }), - z.object({ - eventName: z.literal(RooCodeEventName.TaskStarted), - payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskStarted], - taskId: z.number().optional(), - }), - z.object({ - eventName: z.literal(RooCodeEventName.TaskModeSwitched), - payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskModeSwitched], - taskId: z.number().optional(), - }), - z.object({ - eventName: z.literal(RooCodeEventName.TaskPaused), - payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskPaused], - taskId: z.number().optional(), - }), - z.object({ - eventName: z.literal(RooCodeEventName.TaskUnpaused), - payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskUnpaused], - taskId: z.number().optional(), - }), - z.object({ - eventName: z.literal(RooCodeEventName.TaskAskResponded), - payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskAskResponded], - taskId: z.number().optional(), - }), - z.object({ - eventName: z.literal(RooCodeEventName.TaskAborted), - payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskAborted], - taskId: z.number().optional(), - }), - z.object({ - eventName: z.literal(RooCodeEventName.TaskSpawned), - payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskSpawned], - taskId: z.number().optional(), - }), - z.object({ - eventName: z.literal(RooCodeEventName.TaskCompleted), - payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskCompleted], - taskId: z.number().optional(), - }), - z.object({ - eventName: z.literal(RooCodeEventName.TaskTokenUsageUpdated), - payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskTokenUsageUpdated], - taskId: z.number().optional(), - }), - z.object({ - eventName: z.literal(RooCodeEventName.TaskToolFailed), - payload: rooCodeEventsSchema.shape[RooCodeEventName.TaskToolFailed], - taskId: z.number().optional(), - }), - z.object({ - eventName: z.literal(RooCodeEventName.EvalPass), - payload: z.undefined(), - taskId: z.number(), - }), - z.object({ - eventName: z.literal(RooCodeEventName.EvalFail), - payload: z.undefined(), - taskId: z.number(), - }), -]) - -export type TaskEvent = z.infer - /** * IpcMessage */ -export enum IpcMessageType { - Connect = "Connect", - Disconnect = "Disconnect", - Ack = "Ack", - TaskCommand = "TaskCommand", - TaskEvent = "TaskEvent", -} - -export enum IpcOrigin { - Client = "client", - Server = "server", -} - export const ipcMessageSchema = z.discriminatedUnion("type", [ z.object({ type: z.literal(IpcMessageType.Ack), @@ -219,7 +99,7 @@ export const ipcMessageSchema = z.discriminatedUnion("type", [ export type IpcMessage = z.infer /** - * Client + * IpcClientEvents */ export type IpcClientEvents = { @@ -231,7 +111,7 @@ export type IpcClientEvents = { } /** - * Server + * IpcServerEvents */ export type IpcServerEvents = { diff --git a/packages/types/src/message.ts b/packages/types/src/message.ts index eaec2ad886..21baf3f203 100644 --- a/packages/types/src/message.ts +++ b/packages/types/src/message.ts @@ -44,6 +44,26 @@ export const clineAskSchema = z.enum(clineAsks) export type ClineAsk = z.infer +/** + * BlockingAsk + */ + +export const blockingAsks: ClineAsk[] = [ + "api_req_failed", + "mistake_limit_reached", + "completion_result", + "resume_task", + "resume_completed_task", + "command_output", + "auto_approval_max_req_reached", +] as const + +export type BlockingAsk = (typeof blockingAsks)[number] + +export function isBlockingAsk(ask: ClineAsk): ask is BlockingAsk { + return blockingAsks.includes(ask) +} + /** * ClineSay */ diff --git a/packages/types/src/task.ts b/packages/types/src/task.ts new file mode 100644 index 0000000000..4da1a1f6f5 --- /dev/null +++ b/packages/types/src/task.ts @@ -0,0 +1,98 @@ +import { RooCodeEventName } from "./events.js" +import { type ClineMessage, type BlockingAsk, type TokenUsage } from "./message.js" +import { type ToolUsage, type ToolName } from "./tool.js" + +/** + * TaskProviderLike + */ + +export interface TaskProviderState { + mode?: string +} + +export interface TaskProviderLike { + readonly cwd: string + + getCurrentCline(): TaskLike | undefined + getCurrentTaskStack(): string[] + + initClineWithTask(text?: string, images?: string[], parentTask?: TaskLike): Promise + cancelTask(): Promise + clearTask(): Promise + postStateToWebview(): Promise + + getState(): Promise + + postMessageToWebview(message: unknown): Promise + + on( + event: K, + listener: (...args: TaskProviderEvents[K]) => void | Promise, + ): this + + off( + event: K, + listener: (...args: TaskProviderEvents[K]) => void | Promise, + ): this + + context: { + extension?: { + packageJSON?: { + version?: string + } + } + } +} + +export type TaskProviderEvents = { + [RooCodeEventName.TaskCreated]: [task: TaskLike] + + // Proxied from the Task EventEmitter. + [RooCodeEventName.TaskStarted]: [taskId: string] + [RooCodeEventName.TaskCompleted]: [taskId: string, tokenUsage: TokenUsage, toolUsage: ToolUsage] + [RooCodeEventName.TaskAborted]: [taskId: string] + [RooCodeEventName.TaskFocused]: [taskId: string] + [RooCodeEventName.TaskUnfocused]: [taskId: string] + [RooCodeEventName.TaskActive]: [taskId: string] + [RooCodeEventName.TaskIdle]: [taskId: string] +} + +/** + * TaskLike + */ + +export interface TaskLike { + readonly taskId: string + readonly rootTask?: TaskLike + readonly blockingAsk?: BlockingAsk + + on(event: K, listener: (...args: TaskEvents[K]) => void | Promise): this + off(event: K, listener: (...args: TaskEvents[K]) => void | Promise): this + + setMessageResponse(text: string, images?: string[]): void +} + +export type TaskEvents = { + // Task Lifecycle + [RooCodeEventName.TaskStarted]: [] + [RooCodeEventName.TaskCompleted]: [taskId: string, tokenUsage: TokenUsage, toolUsage: ToolUsage] + [RooCodeEventName.TaskAborted]: [] + [RooCodeEventName.TaskFocused]: [] + [RooCodeEventName.TaskUnfocused]: [] + [RooCodeEventName.TaskActive]: [taskId: string] + [RooCodeEventName.TaskIdle]: [taskId: string] + + // Subtask Lifecycle + [RooCodeEventName.TaskPaused]: [] + [RooCodeEventName.TaskUnpaused]: [] + [RooCodeEventName.TaskSpawned]: [taskId: string] + + // Task Execution + [RooCodeEventName.Message]: [{ action: "created" | "updated"; message: ClineMessage }] + [RooCodeEventName.TaskModeSwitched]: [taskId: string, mode: string] + [RooCodeEventName.TaskAskResponded]: [] + + // Task Analytics + [RooCodeEventName.TaskToolFailed]: [taskId: string, tool: ToolName, error: string] + [RooCodeEventName.TaskTokenUsageUpdated]: [taskId: string, tokenUsage: TokenUsage] +} diff --git a/src/core/task/Task.ts b/src/core/task/Task.ts index 9df9a225d1..84797b815c 100644 --- a/src/core/task/Task.ts +++ b/src/core/task/Task.ts @@ -10,21 +10,26 @@ import pWaitFor from "p-wait-for" import { serializeError } from "serialize-error" import { + type TaskLike, + type TaskEvents, type ProviderSettings, type TokenUsage, type ToolUsage, type ToolName, type ContextCondense, - type ClineAsk, type ClineMessage, type ClineSay, + type ClineAsk, + type BlockingAsk, type ToolProgressStatus, - DEFAULT_CONSECUTIVE_MISTAKE_LIMIT, type HistoryItem, + RooCodeEventName, TelemetryEventName, TodoItem, getApiProtocol, getModelId, + DEFAULT_CONSECUTIVE_MISTAKE_LIMIT, + isBlockingAsk, } from "@roo-code/types" import { TelemetryService } from "@roo-code/telemetry" import { CloudService } from "@roo-code/cloud" @@ -96,24 +101,6 @@ import { AutoApprovalHandler } from "./AutoApprovalHandler" const MAX_EXPONENTIAL_BACKOFF_SECONDS = 600 // 10 minutes -export type TaskEvents = { - message: [{ action: "created" | "updated"; message: ClineMessage }] - taskStarted: [] - taskModeSwitched: [taskId: string, mode: string] - taskPaused: [] - taskUnpaused: [] - taskAskResponded: [] - taskAborted: [] - taskSpawned: [taskId: string] - taskCompleted: [taskId: string, tokenUsage: TokenUsage, toolUsage: ToolUsage] - taskTokenUsageUpdated: [taskId: string, tokenUsage: TokenUsage] - taskToolFailed: [taskId: string, tool: ToolName, error: string] -} - -export type TaskEventHandlers = { - [K in keyof TaskEvents]: (...args: TaskEvents[K]) => void | Promise -} - export type TaskOptions = { provider: ClineProvider apiConfiguration: ProviderSettings @@ -132,7 +119,7 @@ export type TaskOptions = { onCreated?: (task: Task) => void } -export class Task extends EventEmitter { +export class Task extends EventEmitter implements TaskLike { todoList?: TodoItem[] readonly taskId: string readonly instanceId: string @@ -189,6 +176,7 @@ export class Task extends EventEmitter { providerRef: WeakRef private readonly globalStoragePath: string abort: boolean = false + blockingAsk?: BlockingAsk didFinishAbortingStream = false abandoned = false isInitialized = false @@ -545,7 +533,7 @@ export class Task extends EventEmitter { this.clineMessages.push(message) const provider = this.providerRef.deref() await provider?.postStateToWebview() - this.emit("message", { action: "created", message }) + this.emit(RooCodeEventName.Message, { action: "created", message }) await this.saveClineMessages() const shouldCaptureMessage = message.partial !== true && CloudService.isEnabled() @@ -567,7 +555,7 @@ export class Task extends EventEmitter { private async updateClineMessage(message: ClineMessage) { const provider = this.providerRef.deref() await provider?.postMessageToWebview({ type: "messageUpdated", clineMessage: message }) - this.emit("message", { action: "updated", message }) + this.emit(RooCodeEventName.Message, { action: "updated", message }) const shouldCaptureMessage = message.partial !== true && CloudService.isEnabled() @@ -596,7 +584,7 @@ export class Task extends EventEmitter { mode: this._taskMode || defaultModeSlug, // Use the task's own mode, not the current provider mode }) - this.emit("taskTokenUsageUpdated", this.taskId, tokenUsage) + this.emit(RooCodeEventName.TaskTokenUsageUpdated, this.taskId, tokenUsage) await this.providerRef.deref()?.updateTaskHistory(historyItem) } catch (error) { @@ -702,7 +690,17 @@ export class Task extends EventEmitter { await this.addToClineMessages({ ts: askTs, type: "ask", ask: type, text, isProtected }) } + // Detect if the task will enter an idle state. + const isReady = this.askResponse !== undefined || this.lastMessageTs !== askTs + + if (!partial && !isReady && isBlockingAsk(type)) { + this.blockingAsk = type + this.emit(RooCodeEventName.TaskIdle, this.taskId) + } + + console.log(`[Task#${this.taskId}] pWaitFor askResponse(${type}) -> blocking`) await pWaitFor(() => this.askResponse !== undefined || this.lastMessageTs !== askTs, { interval: 100 }) + console.log(`[Task#${this.taskId}] pWaitFor askResponse(${type}) -> unblocked (${this.askResponse})`) if (this.lastMessageTs !== askTs) { // Could happen if we send multiple asks in a row i.e. with @@ -715,11 +713,22 @@ export class Task extends EventEmitter { this.askResponse = undefined this.askResponseText = undefined this.askResponseImages = undefined - this.emit("taskAskResponded") + + // Switch back to an active state. + if (this.blockingAsk) { + this.blockingAsk = undefined + this.emit(RooCodeEventName.TaskActive, this.taskId) + } + + this.emit(RooCodeEventName.TaskAskResponded) return result } - async handleWebviewAskResponse(askResponse: ClineAskResponse, text?: string, images?: string[]) { + public setMessageResponse(text: string, images?: string[]) { + this.handleWebviewAskResponse("messageResponse", text, images) + } + + handleWebviewAskResponse(askResponse: ClineAskResponse, text?: string, images?: string[]) { this.askResponse = askResponse this.askResponseText = text this.askResponseImages = images @@ -947,7 +956,7 @@ export class Task extends EventEmitter { public async resumePausedTask(lastMessage: string) { // Release this Cline instance from paused state. this.isPaused = false - this.emit("taskUnpaused") + this.emit(RooCodeEventName.TaskUnpaused) // Fake an answer from the subtask that it has completed running and // this is the result of what it has done add the message to the chat @@ -981,7 +990,10 @@ export class Task extends EventEmitter { modifiedClineMessages.splice(lastRelevantMessageIndex + 1) } - // since we don't use api_req_finished anymore, we need to check if the last api_req_started has a cost value, if it doesn't and no cancellation reason to present, then we remove it since it indicates an api request without any partial content streamed + // Since we don't use `api_req_finished` anymore, we need to check if the + // last `api_req_started` has a cost value, if it doesn't and no + // cancellation reason to present, then we remove it since it indicates + // an api request without any partial content streamed. const lastApiReqStartedIndex = findLastIndex( modifiedClineMessages, (m) => m.type === "say" && m.say === "api_req_started", @@ -990,6 +1002,7 @@ export class Task extends EventEmitter { if (lastApiReqStartedIndex !== -1) { const lastApiReqStarted = modifiedClineMessages[lastApiReqStartedIndex] const { cost, cancelReason }: ClineApiReqInfo = JSON.parse(lastApiReqStarted.text || "{}") + if (cost === undefined && cancelReason === undefined) { modifiedClineMessages.splice(lastApiReqStartedIndex, 1) } @@ -1009,7 +1022,7 @@ export class Task extends EventEmitter { const lastClineMessage = this.clineMessages .slice() .reverse() - .find((m) => !(m.ask === "resume_task" || m.ask === "resume_completed_task")) // could be multiple resume tasks + .find((m) => !(m.ask === "resume_task" || m.ask === "resume_completed_task")) // Could be multiple resume tasks. let askType: ClineAsk if (lastClineMessage?.ask === "completion_result") { @@ -1020,9 +1033,11 @@ export class Task extends EventEmitter { this.isInitialized = true - const { response, text, images } = await this.ask(askType) // calls poststatetowebview + const { response, text, images } = await this.ask(askType) // Calls `postStateToWebview`. + let responseText: string | undefined let responseImages: string[] | undefined + if (response === "messageResponse") { await this.say("user_feedback", text, images) responseText = text @@ -1200,6 +1215,8 @@ export class Task extends EventEmitter { } public dispose(): void { + console.log(`[Task] disposing task ${this.taskId}.${this.instanceId}`) + // Stop waiting for child task completion. if (this.pauseInterval) { clearInterval(this.pauseInterval) @@ -1261,7 +1278,7 @@ export class Task extends EventEmitter { } this.abort = true - this.emit("taskAborted") + this.emit(RooCodeEventName.TaskAborted) try { this.dispose() // Call the centralized dispose method @@ -1303,11 +1320,11 @@ export class Task extends EventEmitter { let nextUserContent = userContent let includeFileDetails = true - this.emit("taskStarted") + this.emit(RooCodeEventName.TaskStarted) while (!this.abort) { const didEndLoop = await this.recursivelyMakeClineRequests(nextUserContent, includeFileDetails) - includeFileDetails = false // we only need file details the first time + includeFileDetails = false // We only need file details the first time. // The way this agentic loop works is that cline will be given a // task that he then calls tools to complete. Unless there's an @@ -1633,13 +1650,13 @@ export class Task extends EventEmitter { // If this.abort is already true, it means the user clicked cancel, so we should // treat this as "user_cancelled" rather than "streaming_failed" const cancelReason = this.abort ? "user_cancelled" : "streaming_failed" + const streamingFailedMessage = this.abort ? undefined : (error.message ?? JSON.stringify(serializeError(error), null, 2)) - // Now call abortTask after determining the cancel reason + // Now call abortTask after determining the cancel reason. await this.abortTask() - await abortStream(cancelReason, streamingFailedMessage) const history = await provider?.getTaskWithId(this.taskId) @@ -2126,7 +2143,7 @@ export class Task extends EventEmitter { this.toolUsage[toolName].failures++ if (error) { - this.emit("taskToolFailed", this.taskId, toolName, error) + this.emit(RooCodeEventName.TaskToolFailed, this.taskId, toolName, error) } } diff --git a/src/core/tools/attemptCompletionTool.ts b/src/core/tools/attemptCompletionTool.ts index ef7881854f..5074d7f4e8 100644 --- a/src/core/tools/attemptCompletionTool.ts +++ b/src/core/tools/attemptCompletionTool.ts @@ -1,6 +1,7 @@ import Anthropic from "@anthropic-ai/sdk" import * as vscode from "vscode" +import { RooCodeEventName } from "@roo-code/types" import { TelemetryService } from "@roo-code/telemetry" import { Task } from "../task/Task" @@ -41,11 +42,13 @@ export async function attemptCompletionTool( if (preventCompletionWithOpenTodos && hasIncompleteTodos) { cline.consecutiveMistakeCount++ cline.recordToolError("attempt_completion") + pushToolResult( formatResponse.toolError( "Cannot complete task while there are incomplete todos. Please finish all todos before attempting completion.", ), ) + return } @@ -67,12 +70,12 @@ export async function attemptCompletionTool( await cline.say("completion_result", removeClosingTag("result", result), undefined, false) TelemetryService.instance.captureTaskCompleted(cline.taskId) - cline.emit("taskCompleted", cline.taskId, cline.getTokenUsage(), cline.toolUsage) + cline.emit(RooCodeEventName.TaskCompleted, cline.taskId, cline.getTokenUsage(), cline.toolUsage) await cline.ask("command", removeClosingTag("command", command), block.partial).catch(() => {}) } } else { - // no command, still outputting partial result + // No command, still outputting partial result await cline.say("completion_result", removeClosingTag("result", result), undefined, block.partial) } return @@ -90,7 +93,7 @@ export async function attemptCompletionTool( // Users must use execute_command tool separately before attempt_completion await cline.say("completion_result", result, undefined, false) TelemetryService.instance.captureTaskCompleted(cline.taskId) - cline.emit("taskCompleted", cline.taskId, cline.getTokenUsage(), cline.toolUsage) + cline.emit(RooCodeEventName.TaskCompleted, cline.taskId, cline.getTokenUsage(), cline.toolUsage) if (cline.parentTask) { const didApprove = await askFinishSubTaskApproval() diff --git a/src/core/tools/newTaskTool.ts b/src/core/tools/newTaskTool.ts index cc56659d02..46a1fe5d9b 100644 --- a/src/core/tools/newTaskTool.ts +++ b/src/core/tools/newTaskTool.ts @@ -1,5 +1,7 @@ import delay from "delay" +import { RooCodeEventName } from "@roo-code/types" + import { ToolUse, AskApproval, HandleError, PushToolResult, RemoveClosingTag } from "../../shared/tools" import { Task } from "../task/Task" import { defaultModeSlug, getModeBySlug } from "../../shared/modes" @@ -93,14 +95,14 @@ export async function newTaskTool( // Delay to allow mode change to take effect await delay(500) - cline.emit("taskSpawned", newCline.taskId) + cline.emit(RooCodeEventName.TaskSpawned, newCline.taskId) pushToolResult(`Successfully created new task in ${targetMode.name} mode with message: ${unescapedMessage}`) // Set the isPaused flag to true so the parent // task can wait for the sub-task to finish. cline.isPaused = true - cline.emit("taskPaused") + cline.emit(RooCodeEventName.TaskPaused) return } diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index 980eb1f07b..ed8f8a27d1 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -10,6 +10,8 @@ import pWaitFor from "p-wait-for" import * as vscode from "vscode" import { + type TaskProviderLike, + type TaskProviderEvents, type GlobalState, type ProviderName, type ProviderSettings, @@ -24,6 +26,7 @@ import { type TerminalActionPromptType, type HistoryItem, type CloudUserInfo, + RooCodeEventName, requestyDefaultModelId, openRouterDefaultModelId, glamaDefaultModelId, @@ -34,8 +37,6 @@ import { import { TelemetryService } from "@roo-code/telemetry" import { CloudService, getRooCodeApiUrl } from "@roo-code/cloud" -import { t } from "../../i18n" -import { setPanel } from "../../activate/registerCommands" import { Package } from "../../shared/package" import { findLast } from "../../shared/array" import { supportPrompt } from "../../shared/support-prompt" @@ -44,10 +45,15 @@ import { ExtensionMessage, MarketplaceInstalledMetadata } from "../../shared/Ext import { Mode, defaultModeSlug, getModeBySlug } from "../../shared/modes" import { experimentDefault } from "../../shared/experiments" import { formatLanguage } from "../../shared/language" +import { WebviewMessage } from "../../shared/WebviewMessage" +import { EMBEDDING_MODEL_PROFILES } from "../../shared/embeddingModels" +import { ProfileValidator } from "../../shared/ProfileValidator" + import { Terminal } from "../../integrations/terminal/Terminal" import { downloadTask } from "../../integrations/misc/export-markdown" import { getTheme } from "../../integrations/theme/getTheme" import WorkspaceTracker from "../../integrations/workspace/WorkspaceTracker" + import { McpHub } from "../../services/mcp/McpHub" import { McpServerManager } from "../../services/mcp/McpServerManager" import { MarketplaceManager } from "../../services/marketplace" @@ -55,36 +61,37 @@ import { ShadowCheckpointService } from "../../services/checkpoints/ShadowCheckp import { CodeIndexManager } from "../../services/code-index/manager" import type { IndexProgressUpdate } from "../../services/code-index/interfaces/manager" import { MdmService } from "../../services/mdm/MdmService" + import { fileExistsAtPath } from "../../utils/fs" import { setTtsEnabled, setTtsSpeed } from "../../utils/tts" +import { getWorkspaceGitInfo } from "../../utils/git" +import { getWorkspacePath } from "../../utils/path" + +import { setPanel } from "../../activate/registerCommands" + +import { t } from "../../i18n" + +import { buildApiHandler } from "../../api" +import { forceFullModelDetailsLoad, hasLoadedFullDetails } from "../../api/providers/fetchers/lmstudio" + import { ContextProxy } from "../config/ContextProxy" import { ProviderSettingsManager } from "../config/ProviderSettingsManager" import { CustomModesManager } from "../config/CustomModesManager" -import { buildApiHandler } from "../../api" import { Task, TaskOptions } from "../task/Task" +import { getSystemPromptFilePath } from "../prompts/sections/custom-system-prompt" + +import { webviewMessageHandler } from "./webviewMessageHandler" import { getNonce } from "./getNonce" import { getUri } from "./getUri" -import { getSystemPromptFilePath } from "../prompts/sections/custom-system-prompt" -import { getWorkspacePath } from "../../utils/path" -import { webviewMessageHandler } from "./webviewMessageHandler" -import { WebviewMessage } from "../../shared/WebviewMessage" -import { EMBEDDING_MODEL_PROFILES } from "../../shared/embeddingModels" -import { ProfileValidator } from "../../shared/ProfileValidator" -import { getWorkspaceGitInfo } from "../../utils/git" -import { forceFullModelDetailsLoad, hasLoadedFullDetails } from "../../api/providers/fetchers/lmstudio" /** * https://github.com/microsoft/vscode-webview-ui-toolkit-samples/blob/main/default/weather-webview/src/providers/WeatherViewProvider.ts * https://github.com/KumarVariable/vscode-extension-sidebar-html/blob/master/src/customSidebarViewProvider.ts */ -export type ClineProviderEvents = { - taskCreated: [task: Task] -} - export class ClineProvider - extends EventEmitter - implements vscode.WebviewViewProvider, TelemetryPropertiesProvider + extends EventEmitter + implements vscode.WebviewViewProvider, TelemetryPropertiesProvider, TaskProviderLike { // Used in package.json as the view's id. This value cannot be changed due // to how VSCode caches views based on their id, and updating the id would @@ -155,7 +162,7 @@ export class ClineProvider this.marketplaceManager = new MarketplaceManager(this.context, this.customModesManager) - // Initialize cloud profile sync + // Initialize Roo Code Cloud profile sync. this.initializeCloudProfileSync().catch((error) => { this.log(`Failed to initialize cloud profile sync: ${error}`) }) @@ -226,17 +233,18 @@ export class ClineProvider } } - // Adds a new Cline instance to clineStack, marking the start of a new task. + // Adds a new Task instance to clineStack, marking the start of a new task. // The instance is pushed to the top of the stack (LIFO order). // When the task is completed, the top instance is removed, reactivating the previous task. - async addClineToStack(cline: Task) { - console.log(`[subtasks] adding task ${cline.taskId}.${cline.instanceId} to stack`) + async addClineToStack(task: Task) { + console.log(`[subtasks] adding task ${task.taskId}.${task.instanceId} to stack`) // Add this cline instance into the stack that represents the order of all the called tasks. - this.clineStack.push(cline) + this.clineStack.push(task) + task.emit(RooCodeEventName.TaskFocused) - // Perform special setup provider specific tasks - await this.performPreparationTasks(cline) + // Perform special setup provider specific tasks. + await this.performPreparationTasks(task) // Ensure getState() resolves correctly. const state = await this.getState() @@ -247,7 +255,8 @@ export class ClineProvider } async performPreparationTasks(cline: Task) { - // LMStudio: we need to force model loading in order to read its context size; we do it now since we're starting a task with that model selected + // LMStudio: We need to force model loading in order to read its context + // size; we do it now since we're starting a task with that model selected. if (cline.apiConfiguration && cline.apiConfiguration.apiProvider === "lmstudio") { try { if (!hasLoadedFullDetails(cline.apiConfiguration.lmStudioModelId!)) { @@ -271,24 +280,26 @@ export class ClineProvider } // Pop the top Cline instance from the stack. - let cline = this.clineStack.pop() + let task = this.clineStack.pop() - if (cline) { - console.log(`[subtasks] removing task ${cline.taskId}.${cline.instanceId} from stack`) + if (task) { + console.log(`[subtasks] removing task ${task.taskId}.${task.instanceId} from stack`) try { // Abort the running task and set isAbandoned to true so // all running promises will exit as well. - await cline.abortTask(true) + await task.abortTask(true) } catch (e) { this.log( - `[subtasks] encountered error while aborting task ${cline.taskId}.${cline.instanceId}: ${e.message}`, + `[subtasks] encountered error while aborting task ${task.taskId}.${task.instanceId}: ${e.message}`, ) } + task.emit(RooCodeEventName.TaskUnfocused) + // Make sure no reference kept, once promises end it will be // garbage collected. - cline = undefined + task = undefined } } @@ -343,8 +354,13 @@ export class ClineProvider async dispose() { this.log("Disposing ClineProvider...") - await this.removeClineFromStack() - this.log("Cleared task") + + // Clear all tasks from the stack. + while (this.clineStack.length > 0) { + await this.removeClineFromStack() + } + + this.log("Cleared all tasks") if (this.view && "dispose" in this.view) { this.view.dispose() @@ -375,6 +391,9 @@ export class ClineProvider this.log("Disposed all disposables") ClineProvider.activeInstances.delete(this) + // Clean up any event listeners attached to this provider + this.removeAllListeners() + McpServerManager.unregisterProvider(this) } @@ -403,6 +422,7 @@ export class ClineProvider public static async isActiveTask(): Promise { const visibleProvider = await ClineProvider.getInstance() + if (!visibleProvider) { return false } @@ -653,7 +673,7 @@ export class ClineProvider rootTask: this.clineStack.length > 0 ? this.clineStack[0] : undefined, parentTask, taskNumber: this.clineStack.length + 1, - onCreated: (instance) => this.emit("taskCreated", instance), + onCreated: (instance) => this.emit(RooCodeEventName.TaskCreated, instance), ...options, }) @@ -732,7 +752,7 @@ export class ClineProvider rootTask: historyItem.rootTask, parentTask: historyItem.parentTask, taskNumber: historyItem.number, - onCreated: (instance) => this.emit("taskCreated", instance), + onCreated: (instance) => this.emit(RooCodeEventName.TaskCreated, instance), }) await this.addClineToStack(task) @@ -942,7 +962,7 @@ export class ClineProvider if (cline) { TelemetryService.instance.captureModeSwitch(cline.taskId, newMode) - cline.emit("taskModeSwitched", cline.taskId, newMode) + cline.emit(RooCodeEventName.TaskModeSwitched, cline.taskId, newMode) // Store the current mode in case we need to rollback const previousMode = (cline as any)._taskMode diff --git a/src/core/webview/__tests__/ClineProvider.spec.ts b/src/core/webview/__tests__/ClineProvider.spec.ts index d19ab1e650..66c1db55a8 100644 --- a/src/core/webview/__tests__/ClineProvider.spec.ts +++ b/src/core/webview/__tests__/ClineProvider.spec.ts @@ -16,7 +16,6 @@ import { Task, TaskOptions } from "../../task/Task" import { safeWriteJson } from "../../../utils/safeWriteJson" import { ClineProvider } from "../ClineProvider" -import { AsyncInvokeOutputDataConfig } from "@aws-sdk/client-bedrock-runtime" // Mock setup must come before imports vi.mock("../../prompts/sections/custom-instructions") @@ -215,6 +214,7 @@ vi.mock("../../task/Task", () => ({ setParentTask: vi.fn(), setRootTask: vi.fn(), taskId: taskId || "test-task-id", + emit: vi.fn(), }), ), })) diff --git a/src/core/webview/__tests__/ClineProvider.sticky-mode.spec.ts b/src/core/webview/__tests__/ClineProvider.sticky-mode.spec.ts index 6b19b47a38..e7eff427cf 100644 --- a/src/core/webview/__tests__/ClineProvider.sticky-mode.spec.ts +++ b/src/core/webview/__tests__/ClineProvider.sticky-mode.spec.ts @@ -900,12 +900,18 @@ describe("ClineProvider - Sticky Mode", () => { it("should handle errors during mode switch gracefully", async () => { await provider.resolveWebviewView(mockWebviewView) - // Create a mock task that throws on emit + // Create a mock task that throws on emit only for specific events + let emitCallCount = 0 const mockTask = { taskId: "test-task-id", _taskMode: "code", - emit: vi.fn().mockImplementation(() => { - throw new Error("Emit failed") + emit: vi.fn().mockImplementation((event) => { + emitCallCount++ + // Only throw on the second emit call (taskModeSwitched event) + // The first call is for TaskFocused in addClineToStack + if (emitCallCount === 2 && event === "taskModeSwitched") { + throw new Error("Emit failed") + } }), saveClineMessages: vi.fn(), clineMessages: [], @@ -915,13 +921,42 @@ describe("ClineProvider - Sticky Mode", () => { // Add task to provider stack await provider.addClineToStack(mockTask as any) + // Mock getGlobalState to return task history + vi.spyOn(provider as any, "getGlobalState").mockReturnValue([ + { + id: mockTask.taskId, + ts: Date.now(), + task: "Test task", + number: 1, + tokensIn: 0, + tokensOut: 0, + cacheWrites: 0, + cacheReads: 0, + totalCost: 0, + }, + ]) + + // Mock updateTaskHistory + vi.spyOn(provider, "updateTaskHistory").mockImplementation(() => Promise.resolve([])) + // Mock console.error to suppress error output const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {}) + // Clear previous mock calls to isolate this test + vi.mocked(mockContext.globalState.update).mockClear() + // The handleModeSwitch method doesn't catch errors from emit, so it will throw - // This is the actual behavior based on the test failure + // The error is thrown before the task's mode is updated await expect(provider.handleModeSwitch("architect")).rejects.toThrow("Emit failed") + // Since the error is thrown before updating the task's _taskMode, + // neither the task mode nor global state are updated + const modeCalls = vi.mocked(mockContext.globalState.update).mock.calls.filter((call) => call[0] === "mode") + expect(modeCalls.length).toBe(0) + + // The task's mode should NOT have been updated since the error occurred first + expect(mockTask._taskMode).toBe("code") + consoleErrorSpy.mockRestore() }) diff --git a/src/extension/api.ts b/src/extension/api.ts index fba10d041a..49710c32e4 100644 --- a/src/extension/api.ts +++ b/src/extension/api.ts @@ -5,22 +5,21 @@ import * as path from "path" import * as os from "os" import { - RooCodeAPI, - RooCodeSettings, - RooCodeEvents, + type RooCodeAPI, + type RooCodeSettings, + type RooCodeEvents, + type ProviderSettings, + type ProviderSettingsEntry, + type TaskEvent, RooCodeEventName, - ProviderSettings, - ProviderSettingsEntry, + TaskCommandName, isSecretStateKey, IpcOrigin, IpcMessageType, - TaskCommandName, - TaskEvent, } from "@roo-code/types" import { IpcServer } from "@roo-code/ipc" import { Package } from "../shared/package" -import { getWorkspacePath } from "../utils/path" import { ClineProvider } from "../core/webview/ClineProvider" import { openClineInNewTab } from "../activate/registerCommands" @@ -214,58 +213,86 @@ export class API extends EventEmitter implements RooCodeAPI { } private registerListeners(provider: ClineProvider) { - provider.on("taskCreated", (cline) => { - cline.on("taskStarted", async () => { - this.emit(RooCodeEventName.TaskStarted, cline.taskId) - this.taskMap.set(cline.taskId, provider) - await this.fileLog(`[${new Date().toISOString()}] taskStarted -> ${cline.taskId}\n`) + provider.on(RooCodeEventName.TaskCreated, (task) => { + // Task Lifecycle + + task.on(RooCodeEventName.TaskStarted, async () => { + this.emit(RooCodeEventName.TaskStarted, task.taskId) + this.taskMap.set(task.taskId, provider) + await this.fileLog(`[${new Date().toISOString()}] taskStarted -> ${task.taskId}\n`) }) - cline.on("message", async (message) => { - this.emit(RooCodeEventName.Message, { taskId: cline.taskId, ...message }) + task.on(RooCodeEventName.TaskCompleted, async (_, tokenUsage, toolUsage) => { + let isSubtask = false + + if (typeof task.rootTask !== "undefined") { + isSubtask = true + } + + this.emit(RooCodeEventName.TaskCompleted, task.taskId, tokenUsage, toolUsage, { isSubtask: isSubtask }) + this.taskMap.delete(task.taskId) + + await this.fileLog( + `[${new Date().toISOString()}] taskCompleted -> ${task.taskId} | ${JSON.stringify(tokenUsage, null, 2)} | ${JSON.stringify(toolUsage, null, 2)}\n`, + ) + }) + + task.on(RooCodeEventName.TaskAborted, () => { + this.emit(RooCodeEventName.TaskAborted, task.taskId) + this.taskMap.delete(task.taskId) + }) + + // Optional: + // RooCodeEventName.TaskFocused + // RooCodeEventName.TaskUnfocused + // RooCodeEventName.TaskActive + // RooCodeEventName.TaskIdle + + // Subtask Lifecycle + + task.on(RooCodeEventName.TaskPaused, () => { + this.emit(RooCodeEventName.TaskPaused, task.taskId) + }) + + task.on(RooCodeEventName.TaskUnpaused, () => { + this.emit(RooCodeEventName.TaskUnpaused, task.taskId) + }) + + task.on(RooCodeEventName.TaskSpawned, (childTaskId) => { + this.emit(RooCodeEventName.TaskSpawned, task.taskId, childTaskId) + }) + + // Task Execution + + task.on(RooCodeEventName.Message, async (message) => { + this.emit(RooCodeEventName.Message, { taskId: task.taskId, ...message }) if (message.message.partial !== true) { await this.fileLog(`[${new Date().toISOString()}] ${JSON.stringify(message.message, null, 2)}\n`) } }) - cline.on("taskModeSwitched", (taskId, mode) => this.emit(RooCodeEventName.TaskModeSwitched, taskId, mode)) - - cline.on("taskAskResponded", () => this.emit(RooCodeEventName.TaskAskResponded, cline.taskId)) - - cline.on("taskAborted", () => { - this.emit(RooCodeEventName.TaskAborted, cline.taskId) - this.taskMap.delete(cline.taskId) + task.on(RooCodeEventName.TaskModeSwitched, (taskId, mode) => { + this.emit(RooCodeEventName.TaskModeSwitched, taskId, mode) }) - cline.on("taskCompleted", async (_, tokenUsage, toolUsage) => { - let isSubtask = false - - if (cline.rootTask != undefined) { - isSubtask = true - } - - this.emit(RooCodeEventName.TaskCompleted, cline.taskId, tokenUsage, toolUsage, { isSubtask: isSubtask }) - this.taskMap.delete(cline.taskId) - - await this.fileLog( - `[${new Date().toISOString()}] taskCompleted -> ${cline.taskId} | ${JSON.stringify(tokenUsage, null, 2)} | ${JSON.stringify(toolUsage, null, 2)}\n`, - ) + task.on(RooCodeEventName.TaskAskResponded, () => { + this.emit(RooCodeEventName.TaskAskResponded, task.taskId) }) - cline.on("taskSpawned", (childTaskId) => this.emit(RooCodeEventName.TaskSpawned, cline.taskId, childTaskId)) - cline.on("taskPaused", () => this.emit(RooCodeEventName.TaskPaused, cline.taskId)) - cline.on("taskUnpaused", () => this.emit(RooCodeEventName.TaskUnpaused, cline.taskId)) + // Task Analytics - cline.on("taskTokenUsageUpdated", (_, usage) => - this.emit(RooCodeEventName.TaskTokenUsageUpdated, cline.taskId, usage), - ) + task.on(RooCodeEventName.TaskToolFailed, (taskId, tool, error) => { + this.emit(RooCodeEventName.TaskToolFailed, taskId, tool, error) + }) - cline.on("taskToolFailed", (taskId, tool, error) => - this.emit(RooCodeEventName.TaskToolFailed, taskId, tool, error), - ) + task.on(RooCodeEventName.TaskTokenUsageUpdated, (_, usage) => { + this.emit(RooCodeEventName.TaskTokenUsageUpdated, task.taskId, usage) + }) - this.emit(RooCodeEventName.TaskCreated, cline.taskId) + // Let's go! + + this.emit(RooCodeEventName.TaskCreated, task.taskId) }) } diff --git a/webview-ui/src/components/ui/hooks/useSelectedModel.ts b/webview-ui/src/components/ui/hooks/useSelectedModel.ts index 22de35accc..0c6a84a65e 100644 --- a/webview-ui/src/components/ui/hooks/useSelectedModel.ts +++ b/webview-ui/src/components/ui/hooks/useSelectedModel.ts @@ -251,7 +251,7 @@ function getSelectedModel({ case "cerebras": { const id = apiConfiguration.apiModelId ?? cerebrasDefaultModelId const info = cerebrasModels[id as keyof typeof cerebrasModels] - return { id, info } + return { id, info } } case "sambanova": { const id = apiConfiguration.apiModelId ?? sambaNovaDefaultModelId From 3f966dfaa38e22b0e130f3e721122249339b3faf Mon Sep 17 00:00:00 2001 From: Chris Estreich Date: Sat, 2 Aug 2025 13:27:59 -0700 Subject: [PATCH 050/253] Bump @roo-code/types to v1.42.0 (#6610) --- packages/types/npm/package.json | 7 ++++--- packages/types/package.json | 2 +- packages/types/tsup.config.ts | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/types/npm/package.json b/packages/types/npm/package.json index 3f3e3e113d..1dfbd57676 100644 --- a/packages/types/npm/package.json +++ b/packages/types/npm/package.json @@ -1,10 +1,11 @@ { "name": "@roo-code/types", - "version": "1.41.0", + "version": "1.42.0", "description": "TypeScript type definitions for Roo Code.", "publishConfig": { "access": "public", - "name": "@roo-code/types" + "name": "@roo-code/types", + "registry": "https://registry.npmjs.org/" }, "author": "Roo Code Team", "license": "MIT", @@ -15,7 +16,7 @@ "bugs": { "url": "https://github.com/RooCodeInc/Roo-Code/issues" }, - "homepage": "https://github.com/RooCodeInc/Roo-Code/tree/main/packages/types", + "homepage": "https://roocode.com", "keywords": [ "roo", "roo-code", diff --git a/packages/types/package.json b/packages/types/package.json index 341b98fe0d..e9ba5a2851 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@roo-code/types", - "version": "0.0.0", + "private": true, "type": "module", "main": "./dist/index.cjs", "exports": { diff --git a/packages/types/tsup.config.ts b/packages/types/tsup.config.ts index 9c96eb1901..38b458806a 100644 --- a/packages/types/tsup.config.ts +++ b/packages/types/tsup.config.ts @@ -4,8 +4,8 @@ export default defineConfig({ entry: ["src/index.ts"], format: ["cjs", "esm"], dts: true, - clean: false, splitting: false, sourcemap: true, + clean: true, outDir: "dist", }) From 82a007a211497f7390b6349b8186c2fce3130c42 Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Sun, 3 Aug 2025 02:15:45 -0400 Subject: [PATCH 051/253] Fix the UI for approving chained commands (#6623) --- .../src/components/chat/CommandExecution.tsx | 1 - .../chat/CommandPatternSelector.tsx | 11 +--- .../chat/__tests__/CommandExecution.spec.tsx | 52 +++++++++++-------- .../__tests__/CommandPatternSelector.spec.tsx | 41 ++++++++------- 4 files changed, 53 insertions(+), 52 deletions(-) diff --git a/webview-ui/src/components/chat/CommandExecution.tsx b/webview-ui/src/components/chat/CommandExecution.tsx index 23d60a7a99..c5844bd542 100644 --- a/webview-ui/src/components/chat/CommandExecution.tsx +++ b/webview-ui/src/components/chat/CommandExecution.tsx @@ -192,7 +192,6 @@ export const CommandExecution = ({ executionId, text, icon, title }: CommandExec
    {command && command.trim() && ( = ({ - command, patterns, allowedCommands, deniedCommands, @@ -37,13 +35,8 @@ export const CommandPatternSelector: React.FC = ({ // Create a combined list with full command first, then patterns const allPatterns = useMemo(() => { - // Trim the command to ensure consistency with extracted patterns - const trimmedCommand = command.trim() - const fullCommandPattern: CommandPattern = { pattern: trimmedCommand } - // Create a set to track unique patterns we've already seen const seenPatterns = new Set() - seenPatterns.add(trimmedCommand) // Add the trimmed full command first // Filter out any patterns that are duplicates or are the same as the full command const uniquePatterns = patterns.filter((p) => { @@ -54,8 +47,8 @@ export const CommandPatternSelector: React.FC = ({ return true }) - return [fullCommandPattern, ...uniquePatterns] - }, [command, patterns]) + return uniquePatterns + }, [patterns]) const getPatternStatus = (pattern: string): "allowed" | "denied" | "none" => { if (allowedCommands.includes(pattern)) return "allowed" diff --git a/webview-ui/src/components/chat/__tests__/CommandExecution.spec.tsx b/webview-ui/src/components/chat/__tests__/CommandExecution.spec.tsx index f59cb9a2ea..e25e9029f8 100644 --- a/webview-ui/src/components/chat/__tests__/CommandExecution.spec.tsx +++ b/webview-ui/src/components/chat/__tests__/CommandExecution.spec.tsx @@ -22,11 +22,13 @@ vi.mock("../../common/CodeBlock", () => ({ })) vi.mock("../CommandPatternSelector", () => ({ - CommandPatternSelector: ({ command, onAllowPatternChange, onDenyPatternChange }: any) => ( + CommandPatternSelector: ({ patterns, onAllowPatternChange, onDenyPatternChange }: any) => (
    - {command} - - + {patterns.map((pattern: any, index: number) => ( + {pattern.pattern} + ))} + +
    ), })) @@ -104,7 +106,7 @@ describe("CommandExecution", () => { , ) - const allowButton = screen.getByText("Allow git push") + const allowButton = screen.getByText("Allow") fireEvent.click(allowButton) expect(mockExtensionState.setAllowedCommands).toHaveBeenCalledWith(["npm", "git push"]) @@ -120,7 +122,7 @@ describe("CommandExecution", () => { , ) - const denyButton = screen.getByText("Deny docker run") + const denyButton = screen.getByText("Deny") fireEvent.click(denyButton) expect(mockExtensionState.setAllowedCommands).toHaveBeenCalledWith(["npm"]) @@ -143,7 +145,7 @@ describe("CommandExecution", () => { , ) - const allowButton = screen.getByText("Allow npm test") + const allowButton = screen.getByText("Allow") fireEvent.click(allowButton) // "npm test" is already in allowedCommands, so it should be removed @@ -167,7 +169,7 @@ describe("CommandExecution", () => { , ) - const denyButton = screen.getByText("Deny rm -rf") + const denyButton = screen.getByText("Deny") fireEvent.click(denyButton) // "rm -rf" is already in deniedCommands, so it should be removed @@ -223,7 +225,8 @@ Suggested patterns: npm, npm install, npm run` const selector = screen.getByTestId("command-pattern-selector") expect(selector).toBeInTheDocument() - expect(selector).toHaveTextContent("ls -la | grep test") + // Should show one of the individual commands from the pipe + expect(selector.textContent).toMatch(/ls -la|grep test/) }) it("should handle commands with && operator", () => { @@ -235,7 +238,8 @@ Suggested patterns: npm, npm install, npm run` const selector = screen.getByTestId("command-pattern-selector") expect(selector).toBeInTheDocument() - expect(selector).toHaveTextContent("npm install && npm test") + // Should show one of the individual commands from the && chain + expect(selector.textContent).toMatch(/npm install|npm test|npm/) }) it("should not show pattern selector for empty commands", () => { @@ -301,7 +305,7 @@ Output here` , ) - const allowButton = screen.getByText("Allow rm file.txt") + const allowButton = screen.getByText("Allow") fireEvent.click(allowButton) // "rm file.txt" should be removed from denied and added to allowed @@ -321,7 +325,8 @@ Output here` const selector = screen.getByTestId("command-pattern-selector") expect(selector).toBeInTheDocument() - expect(selector).toHaveTextContent("npm install && npm test || echo 'failed'") + // Should show one of the individual commands from the complex chain + expect(selector.textContent).toMatch(/npm install|npm test|echo|npm/) }) it("should handle commands with output", () => { @@ -356,7 +361,8 @@ Other output here` const selector = screen.getByTestId("command-pattern-selector") expect(selector).toBeInTheDocument() - expect(selector).toHaveTextContent("echo $(whoami) && git status") + // Should show one of the individual commands + expect(selector.textContent).toMatch(/echo|whoami|git status|git/) }) it("should handle commands with backtick subshells", () => { @@ -368,7 +374,8 @@ Other output here` const selector = screen.getByTestId("command-pattern-selector") expect(selector).toBeInTheDocument() - expect(selector).toHaveTextContent("git commit -m `date`") + // Should show one of the individual commands + expect(selector.textContent).toMatch(/git commit|date|git/) }) it("should handle commands with special characters", () => { @@ -380,7 +387,8 @@ Other output here` const selector = screen.getByTestId("command-pattern-selector") expect(selector).toBeInTheDocument() - expect(selector).toHaveTextContent("cd ~/projects && npm start") + // Should show one of the individual commands + expect(selector.textContent).toMatch(/cd ~\/projects|npm start|cd|npm/) }) it("should handle commands with mixed content including output", () => { @@ -421,7 +429,7 @@ Running tests... ) // Click to allow "git push origin main" - const allowButton = screen.getByText("Allow git push origin main") + const allowButton = screen.getByText("Allow") fireEvent.click(allowButton) // Should add to allowed and remove from denied @@ -442,10 +450,10 @@ Running tests... // Should still render the command expect(screen.getByTestId("code-block")).toHaveTextContent("echo 'test with unclosed quote") - // Should show pattern selector with the full command + // Should show pattern selector with a command pattern const selector = screen.getByTestId("command-pattern-selector") expect(selector).toBeInTheDocument() - expect(selector).toHaveTextContent("echo 'test with unclosed quote") + expect(selector.textContent).toMatch(/echo/) }) it("should handle empty or whitespace-only commands", () => { @@ -525,8 +533,8 @@ Output: const selector = screen.getByTestId("command-pattern-selector") expect(selector).toBeInTheDocument() - // Should show the full command in the selector - expect(selector).toHaveTextContent("wc -l *.go *.java") + // Should show a command pattern + expect(selector.textContent).toMatch(/wc/) // The output should still be displayed in the code block expect(codeBlocks.length).toBeGreaterThan(1) @@ -548,8 +556,8 @@ Output: const selector = screen.getByTestId("command-pattern-selector") expect(selector).toBeInTheDocument() - // Should show the full command in the selector - expect(selector).toHaveTextContent("wc -l *.go *.java") + // Should show a command pattern + expect(selector.textContent).toMatch(/wc/) // The output should still be displayed in the code block const codeBlocks = screen.getAllByTestId("code-block") diff --git a/webview-ui/src/components/chat/__tests__/CommandPatternSelector.spec.tsx b/webview-ui/src/components/chat/__tests__/CommandPatternSelector.spec.tsx index 18c5ddd5aa..c39d8afad3 100644 --- a/webview-ui/src/components/chat/__tests__/CommandPatternSelector.spec.tsx +++ b/webview-ui/src/components/chat/__tests__/CommandPatternSelector.spec.tsx @@ -26,8 +26,8 @@ const TestWrapper = ({ children }: { children: React.ReactNode }) => { const defaultProps = { - command: "npm install express", patterns: [ + { pattern: "npm install express", description: "Full command" }, { pattern: "npm install", description: "Install npm packages" }, { pattern: "npm *", description: "Any npm command" }, ], @@ -51,7 +51,7 @@ describe("CommandPatternSelector", () => { expect(screen.getByText("chat:commandExecution.manageCommands")).toBeInTheDocument() }) - it("should show full command as first pattern when expanded", () => { + it("should show patterns when expanded", () => { render( @@ -62,8 +62,9 @@ describe("CommandPatternSelector", () => { const expandButton = screen.getByRole("button") fireEvent.click(expandButton) - // Check that the full command is shown + // Check that the patterns are shown expect(screen.getByText("npm install express")).toBeInTheDocument() + expect(screen.getByText("- Full command")).toBeInTheDocument() }) it("should show extracted patterns when expanded", () => { @@ -95,9 +96,9 @@ describe("CommandPatternSelector", () => { const expandButton = screen.getByRole("button") fireEvent.click(expandButton) - // Click on the full command pattern - const fullCommandDiv = screen.getByText("npm install express").closest("div") - fireEvent.click(fullCommandDiv!) + // Click on a pattern + const patternDiv = screen.getByText("npm install express").closest("div") + fireEvent.click(patternDiv!) // An input should appear const input = screen.getByDisplayValue("npm install express") as HTMLInputElement @@ -168,9 +169,9 @@ describe("CommandPatternSelector", () => { const expandButton = screen.getByRole("button") fireEvent.click(expandButton) - // Find the full command pattern row and click allow - const fullCommandPattern = screen.getByText("npm install express").closest(".ml-5") - const allowButton = fullCommandPattern?.querySelector('button[aria-label*="addToAllowed"]') + // Find a pattern row and click allow + const patternRow = screen.getByText("npm install express").closest(".ml-5") + const allowButton = patternRow?.querySelector('button[aria-label*="addToAllowed"]') fireEvent.click(allowButton!) // Check that the callback was called with the pattern @@ -194,9 +195,9 @@ describe("CommandPatternSelector", () => { const expandButton = screen.getByRole("button") fireEvent.click(expandButton) - // Find the full command pattern row and click deny - const fullCommandPattern = screen.getByText("npm install express").closest(".ml-5") - const denyButton = fullCommandPattern?.querySelector('button[aria-label*="addToDenied"]') + // Find a pattern row and click deny + const patternRow = screen.getByText("npm install express").closest(".ml-5") + const denyButton = patternRow?.querySelector('button[aria-label*="addToDenied"]') fireEvent.click(denyButton!) // Check that the callback was called with the pattern @@ -220,11 +221,11 @@ describe("CommandPatternSelector", () => { const expandButton = screen.getByRole("button") fireEvent.click(expandButton) - // Click on the full command pattern to edit - const fullCommandDiv = screen.getByText("npm install express").closest("div") - fireEvent.click(fullCommandDiv!) + // Click on a pattern to edit + const patternDiv = screen.getByText("npm install express").closest("div") + fireEvent.click(patternDiv!) - // Edit the command + // Edit the pattern const input = screen.getByDisplayValue("npm install express") as HTMLInputElement fireEvent.change(input, { target: { value: "npm install react" } }) @@ -254,11 +255,11 @@ describe("CommandPatternSelector", () => { const expandButton = screen.getByRole("button") fireEvent.click(expandButton) - // Click on the full command pattern to edit - const fullCommandDiv = screen.getByText("npm install express").closest("div") - fireEvent.click(fullCommandDiv!) + // Click on a pattern to edit + const patternDiv = screen.getByText("npm install express").closest("div") + fireEvent.click(patternDiv!) - // Edit the command + // Edit the pattern const input = screen.getByDisplayValue("npm install express") as HTMLInputElement fireEvent.change(input, { target: { value: "npm install react" } }) From a88238f68b8d0e14104a6d5b9b6d1e0f78522676 Mon Sep 17 00:00:00 2001 From: NaccOll Date: Sun, 3 Aug 2025 20:26:33 +0800 Subject: [PATCH 052/253] feat: conditionally include reminder section based on todo list config (#6411) * feat: conditionally include reminder section based on todo list configuration * feat: add tests for REMINDERS section based on todoListEnabled configuration --- .../__tests__/getEnvironmentDetails.spec.ts | 29 +++++++++++++++++++ src/core/environment/getEnvironmentDetails.ts | 6 +++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/core/environment/__tests__/getEnvironmentDetails.spec.ts b/src/core/environment/__tests__/getEnvironmentDetails.spec.ts index a1b8691e70..780feed2f6 100644 --- a/src/core/environment/__tests__/getEnvironmentDetails.spec.ts +++ b/src/core/environment/__tests__/getEnvironmentDetails.spec.ts @@ -361,4 +361,33 @@ describe("getEnvironmentDetails", () => { await expect(getEnvironmentDetails(mockCline as Task)).resolves.not.toThrow() }) + it("should include REMINDERS section when todoListEnabled is true", async () => { + mockProvider.getState.mockResolvedValue({ + ...mockState, + apiConfiguration: { todoListEnabled: true }, + }) + const cline = { ...mockCline, todoList: [{ content: "test", status: "pending" }] } + const result = await getEnvironmentDetails(cline as Task) + expect(result).toContain("REMINDERS") + }) + + it("should NOT include REMINDERS section when todoListEnabled is false", async () => { + mockProvider.getState.mockResolvedValue({ + ...mockState, + apiConfiguration: { todoListEnabled: false }, + }) + const cline = { ...mockCline, todoList: [{ content: "test", status: "pending" }] } + const result = await getEnvironmentDetails(cline as Task) + expect(result).not.toContain("REMINDERS") + }) + + it("should include REMINDERS section when todoListEnabled is undefined", async () => { + mockProvider.getState.mockResolvedValue({ + ...mockState, + apiConfiguration: {}, + }) + const cline = { ...mockCline, todoList: [{ content: "test", status: "pending" }] } + const result = await getEnvironmentDetails(cline as Task) + expect(result).toContain("REMINDERS") + }) }) diff --git a/src/core/environment/getEnvironmentDetails.ts b/src/core/environment/getEnvironmentDetails.ts index 5a0a15962c..fbc1f2dc57 100644 --- a/src/core/environment/getEnvironmentDetails.ts +++ b/src/core/environment/getEnvironmentDetails.ts @@ -268,6 +268,10 @@ export async function getEnvironmentDetails(cline: Task, includeFileDetails: boo } } - const reminderSection = formatReminderSection(cline.todoList) + const todoListEnabled = + state && typeof state.apiConfiguration?.todoListEnabled === "boolean" + ? state.apiConfiguration.todoListEnabled + : true + const reminderSection = todoListEnabled ? formatReminderSection(cline.todoList) : "" return `\n${details.trim()}\n${reminderSection}\n` } From a5b55dac8b55c334f33c9acfb1129b27c144fec0 Mon Sep 17 00:00:00 2001 From: NaccOll Date: Mon, 4 Aug 2025 07:21:45 +0800 Subject: [PATCH 053/253] Changing checkpoint timing and ensuring checkpoints work (#6359) * feat: Before requesting, ensure checkpoint is initialized * Generate a checkpoint before modifying the code * refactor: streamline checkpoint handling and enhance getCheckpoints method * Blocked waiting for checkpoint initialization timing to change * cancel checkpoint restore limit * fix: ensure checkpoint service is undefined on initialization error and improve checkpoint diff handling * refactor: simplify checkpoint service initialization and cleanup unused variables in CheckpointMenu * fix: prevent race condition in checkpoint service initialization - Only assign service to cline.checkpointService after successful initialization - Add proper cleanup on initialization failure - Prevents service from being in inconsistent state if Git check fails * fix: remove checkpoint save from presentAssistantMessage for update_todo_list case --------- Co-authored-by: Daniel Riccio --- .../presentAssistantMessage.ts | 31 +++-- src/core/checkpoints/index.ts | 113 ++++++--------- src/core/task/Task.ts | 2 + .../checkpoints/ShadowCheckpointService.ts | 4 + .../chat/checkpoints/CheckpointMenu.tsx | 131 ++++++++---------- 5 files changed, 135 insertions(+), 146 deletions(-) diff --git a/src/core/assistant-message/presentAssistantMessage.ts b/src/core/assistant-message/presentAssistantMessage.ts index ee3fa148b4..acdc7f5412 100644 --- a/src/core/assistant-message/presentAssistantMessage.ts +++ b/src/core/assistant-message/presentAssistantMessage.ts @@ -25,7 +25,6 @@ import { switchModeTool } from "../tools/switchModeTool" import { attemptCompletionTool } from "../tools/attemptCompletionTool" import { newTaskTool } from "../tools/newTaskTool" -import { checkpointSave } from "../checkpoints" import { updateTodoListTool } from "../tools/updateTodoListTool" import { formatResponse } from "../prompts/responses" @@ -411,6 +410,7 @@ export async function presentAssistantMessage(cline: Task) { switch (block.name) { case "write_to_file": + await checkpointSaveAndMark(cline) await writeToFileTool(cline, block, askApproval, handleError, pushToolResult, removeClosingTag) break case "update_todo_list": @@ -430,8 +430,10 @@ export async function presentAssistantMessage(cline: Task) { } if (isMultiFileApplyDiffEnabled) { + await checkpointSaveAndMark(cline) await applyDiffTool(cline, block, askApproval, handleError, pushToolResult, removeClosingTag) } else { + await checkpointSaveAndMark(cline) await applyDiffToolLegacy( cline, block, @@ -444,9 +446,11 @@ export async function presentAssistantMessage(cline: Task) { break } case "insert_content": + await checkpointSaveAndMark(cline) await insertContentTool(cline, block, askApproval, handleError, pushToolResult, removeClosingTag) break case "search_and_replace": + await checkpointSaveAndMark(cline) await searchAndReplaceTool(cline, block, askApproval, handleError, pushToolResult, removeClosingTag) break case "read_file": @@ -527,14 +531,6 @@ export async function presentAssistantMessage(cline: Task) { break } - const recentlyModifiedFiles = cline.fileContextTracker.getAndClearCheckpointPossibleFile() - - if (recentlyModifiedFiles.length > 0) { - // TODO: We can track what file changes were made and only - // checkpoint those files, this will be save storage. - await checkpointSave(cline) - } - // Seeing out of bounds is fine, it means that the next too call is being // built up and ready to add to assistantMessageContent to present. // When you see the UI inactive during this, it means that a tool is @@ -583,3 +579,20 @@ export async function presentAssistantMessage(cline: Task) { presentAssistantMessage(cline) } } + +/** + * save checkpoint and mark done in the current streaming task. + * @param task The Task instance to checkpoint save and mark. + * @returns + */ +async function checkpointSaveAndMark(task: Task) { + if (task.currentStreamingDidCheckpoint) { + return + } + try { + await task.checkpointSave(true) + task.currentStreamingDidCheckpoint = true + } catch (error) { + console.error(`[Task#presentAssistantMessage] Error saving checkpoint: ${error.message}`, error) + } +} diff --git a/src/core/checkpoints/index.ts b/src/core/checkpoints/index.ts index 02fb5dfc5a..f08dc24e16 100644 --- a/src/core/checkpoints/index.ts +++ b/src/core/checkpoints/index.ts @@ -16,18 +16,29 @@ import { DIFF_VIEW_URI_SCHEME } from "../../integrations/editor/DiffViewProvider import { CheckpointServiceOptions, RepoPerTaskCheckpointService } from "../../services/checkpoints" -export function getCheckpointService(cline: Task) { +export async function getCheckpointService( + cline: Task, + { interval = 250, timeout = 15_000 }: { interval?: number; timeout?: number } = {}, +) { if (!cline.enableCheckpoints) { return undefined } if (cline.checkpointService) { - return cline.checkpointService - } - - if (cline.checkpointServiceInitializing) { - console.log("[Task#getCheckpointService] checkpoint service is still initializing") - return undefined + if (cline.checkpointServiceInitializing) { + console.log("[Task#getCheckpointService] checkpoint service is still initializing") + const service = cline.checkpointService + await pWaitFor( + () => { + console.log("[Task#getCheckpointService] waiting for service to initialize") + return service.isInitialized + }, + { interval, timeout }, + ) + return service.isInitialized ? cline.checkpointService : undefined + } else { + return cline.checkpointService + } } const provider = cline.providerRef.deref() @@ -69,15 +80,20 @@ export function getCheckpointService(cline: Task) { } const service = RepoPerTaskCheckpointService.create(options) - cline.checkpointServiceInitializing = true // Check if Git is installed before initializing the service - // Note: This is intentionally fire-and-forget to match the original IIFE pattern - // The service is returned immediately while Git check happens asynchronously - checkGitInstallation(cline, service, log, provider) - - return service + // Only assign the service after successful initialization + try { + await checkGitInstallation(cline, service, log, provider) + cline.checkpointService = service + return service + } catch (err) { + // Clean up on failure + cline.checkpointServiceInitializing = false + cline.enableCheckpoints = false + throw err + } } catch (err) { log(`[Task#getCheckpointService] ${err.message}`) cline.enableCheckpoints = false @@ -115,22 +131,7 @@ async function checkGitInstallation( // Git is installed, proceed with initialization service.on("initialize", () => { log("[Task#getCheckpointService] service initialized") - - try { - const isCheckpointNeeded = - typeof cline.clineMessages.find(({ say }) => say === "checkpoint_saved") === "undefined" - - cline.checkpointService = service - cline.checkpointServiceInitializing = false - - if (isCheckpointNeeded) { - log("[Task#getCheckpointService] no checkpoints found, saving initial checkpoint") - checkpointSave(cline) - } - } catch (err) { - log("[Task#getCheckpointService] caught error in on('initialize'), disabling checkpoints") - cline.enableCheckpoints = false - } + cline.checkpointServiceInitializing = false }) service.on("checkpoint", ({ isFirst, fromHash: from, toHash: to }) => { @@ -153,11 +154,12 @@ async function checkGitInstallation( }) log("[Task#getCheckpointService] initializing shadow git") - - service.initShadowGit().catch((err) => { + try { + await service.initShadowGit() + } catch (err) { log(`[Task#getCheckpointService] initShadowGit -> ${err.message}`) cline.enableCheckpoints = false - }) + } } catch (err) { log(`[Task#getCheckpointService] Unexpected error during Git check: ${err.message}`) console.error("Git check error:", err) @@ -166,33 +168,8 @@ async function checkGitInstallation( } } -async function getInitializedCheckpointService( - cline: Task, - { interval = 250, timeout = 15_000 }: { interval?: number; timeout?: number } = {}, -) { - const service = getCheckpointService(cline) - - if (!service || service.isInitialized) { - return service - } - - try { - await pWaitFor( - () => { - console.log("[Task#getCheckpointService] waiting for service to initialize") - return service.isInitialized - }, - { interval, timeout }, - ) - - return service - } catch (err) { - return undefined - } -} - export async function checkpointSave(cline: Task, force = false) { - const service = getCheckpointService(cline) + const service = await getCheckpointService(cline) if (!service) { return @@ -221,7 +198,7 @@ export type CheckpointRestoreOptions = { } export async function checkpointRestore(cline: Task, { ts, commitHash, mode }: CheckpointRestoreOptions) { - const service = await getInitializedCheckpointService(cline) + const service = await getCheckpointService(cline) if (!service) { return @@ -289,7 +266,7 @@ export type CheckpointDiffOptions = { } export async function checkpointDiff(cline: Task, { ts, previousCommitHash, commitHash, mode }: CheckpointDiffOptions) { - const service = await getInitializedCheckpointService(cline) + const service = await getCheckpointService(cline) if (!service) { return @@ -297,17 +274,19 @@ export async function checkpointDiff(cline: Task, { ts, previousCommitHash, comm TelemetryService.instance.captureCheckpointDiffed(cline.taskId) - if (!previousCommitHash && mode === "checkpoint") { - const previousCheckpoint = cline.clineMessages - .filter(({ say }) => say === "checkpoint_saved") - .sort((a, b) => b.ts - a.ts) - .find((message) => message.ts < ts) + let prevHash = commitHash + let nextHash: string | undefined - previousCommitHash = previousCheckpoint?.text + const checkpoints = typeof service.getCheckpoints === "function" ? service.getCheckpoints() : [] + const idx = checkpoints.indexOf(commitHash) + if (idx !== -1 && idx < checkpoints.length - 1) { + nextHash = checkpoints[idx + 1] + } else { + nextHash = undefined } try { - const changes = await service.getDiff({ from: previousCommitHash, to: commitHash }) + const changes = await service.getDiff({ from: prevHash, to: nextHash }) if (!changes?.length) { vscode.window.showInformationMessage("No changes found.") diff --git a/src/core/task/Task.ts b/src/core/task/Task.ts index 84797b815c..6eef70158f 100644 --- a/src/core/task/Task.ts +++ b/src/core/task/Task.ts @@ -240,6 +240,7 @@ export class Task extends EventEmitter implements TaskLike { isWaitingForFirstChunk = false isStreaming = false currentStreamingContentIndex = 0 + currentStreamingDidCheckpoint = false assistantMessageContent: AssistantMessageContent[] = [] presentAssistantMessageLocked = false presentAssistantMessageHasPendingUpdates = false @@ -1543,6 +1544,7 @@ export class Task extends EventEmitter implements TaskLike { // Reset streaming state. this.currentStreamingContentIndex = 0 + this.currentStreamingDidCheckpoint = false this.assistantMessageContent = [] this.didCompleteReadingStream = false this.userMessageContent = [] diff --git a/src/services/checkpoints/ShadowCheckpointService.ts b/src/services/checkpoints/ShadowCheckpointService.ts index be2c86852a..280cbd8118 100644 --- a/src/services/checkpoints/ShadowCheckpointService.ts +++ b/src/services/checkpoints/ShadowCheckpointService.ts @@ -38,6 +38,10 @@ export abstract class ShadowCheckpointService extends EventEmitter { return !!this.git } + public getCheckpoints(): string[] { + return this._checkpoints.slice() + } + constructor(taskId: string, checkpointsDir: string, workspaceDir: string, log: (message: string) => void) { super() diff --git a/webview-ui/src/components/chat/checkpoints/CheckpointMenu.tsx b/webview-ui/src/components/chat/checkpoints/CheckpointMenu.tsx index 21b4f486c7..eba47699ab 100644 --- a/webview-ui/src/components/chat/checkpoints/CheckpointMenu.tsx +++ b/webview-ui/src/components/chat/checkpoints/CheckpointMenu.tsx @@ -22,9 +22,6 @@ export const CheckpointMenu = ({ ts, commitHash, currentHash, checkpoint }: Chec const portalContainer = useRooPortal("roo-portal") const isCurrent = currentHash === commitHash - const isFirst = checkpoint.isFirst - const isDiffAvailable = !isFirst - const isRestoreAvailable = !isFirst || !isCurrent const previousCommitHash = checkpoint?.from @@ -47,78 +44,72 @@ export const CheckpointMenu = ({ ts, commitHash, currentHash, checkpoint }: Chec return (
    - {isDiffAvailable && ( - - + + + + { + setIsOpen(open) + setIsConfirming(false) + }}> + + + + - )} - {isRestoreAvailable && ( - { - setIsOpen(open) - setIsConfirming(false) - }}> - - - - - - -
    - {!isCurrent && ( -
    - +
    + {t("chat:checkpoint.menu.restoreFilesDescription")} +
    +
    + )} +
    +
    + {!isConfirming ? ( + + ) : ( + <> + + + + )} + {isConfirming ? ( +
    + {t("chat:checkpoint.menu.cannotUndo")} +
    + ) : (
    - {t("chat:checkpoint.menu.restoreFilesDescription")} + {t("chat:checkpoint.menu.restoreFilesAndTaskDescription")}
    -
    - )} - {!isFirst && ( -
    -
    - {!isConfirming ? ( - - ) : ( - <> - - - - )} - {isConfirming ? ( -
    - {t("chat:checkpoint.menu.cannotUndo")} -
    - ) : ( -
    - {t("chat:checkpoint.menu.restoreFilesAndTaskDescription")} -
    - )} -
    -
    - )} + )} +
    -     -     - )} +
    + +
    ) } From fd7550f463ca5d707a48ee8697a5728c15318858 Mon Sep 17 00:00:00 2001 From: Chris Estreich Date: Sun, 3 Aug 2025 19:38:40 -0700 Subject: [PATCH 054/253] Bump @roo-code/types to v1.43.0 (#6640) --- packages/types/README.md | 23 ----------------------- packages/types/npm/package.json | 7 +++++-- packages/types/package.json | 3 +-- 3 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 packages/types/README.md diff --git a/packages/types/README.md b/packages/types/README.md deleted file mode 100644 index 635c380139..0000000000 --- a/packages/types/README.md +++ /dev/null @@ -1,23 +0,0 @@ -# @roo-code/types - -### Publish to NPM - -First authenticate with NPM: - -```sh -npm login -``` - -Next, manually bump the NPM package version: - -```sh -cd packages/types/npm && npm version minor && cd - -``` - -Finally, publish to NPM: - -```sh -pnpm --filter @roo-code/types npm:publish -``` - -Note that you'll be asked for an MFA code to complete the publish. diff --git a/packages/types/npm/package.json b/packages/types/npm/package.json index 1dfbd57676..10a4805127 100644 --- a/packages/types/npm/package.json +++ b/packages/types/npm/package.json @@ -1,6 +1,6 @@ { "name": "@roo-code/types", - "version": "1.42.0", + "version": "1.43.0", "description": "TypeScript type definitions for Roo Code.", "publishConfig": { "access": "public", @@ -37,5 +37,8 @@ }, "files": [ "dist" - ] + ], + "dependencies": { + "zod": "^3.25.61" + } } diff --git a/packages/types/package.json b/packages/types/package.json index e9ba5a2851..35d0560276 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -18,8 +18,7 @@ "check-types": "tsc --noEmit", "test": "vitest run", "build": "tsup", - "npm:publish:test": "tsup --outDir npm/dist && cd npm && npm publish --dry-run", - "npm:publish": "tsup --outDir npm/dist && cd npm && npm publish", + "npm:publish": "cd npm && npm version minor && cd - && tsup --outDir npm/dist && cd npm && npm publish", "clean": "rimraf dist npm/dist .turbo" }, "dependencies": { From a1439c1f9684bddaa6204938aef61fade7aa361f Mon Sep 17 00:00:00 2001 From: Chris Estreich Date: Sun, 3 Aug 2025 19:43:33 -0700 Subject: [PATCH 055/253] Use @roo-code/cloud from npm (#6611) --- packages/cloud/eslint.config.mjs | 4 - packages/cloud/package.json | 25 - packages/cloud/src/CloudAPI.ts | 122 -- packages/cloud/src/CloudService.ts | 288 ----- packages/cloud/src/CloudSettingsService.ts | 152 --- packages/cloud/src/CloudShareService.ts | 43 - packages/cloud/src/RefreshTimer.ts | 154 --- packages/cloud/src/SettingsService.ts | 23 - packages/cloud/src/StaticSettingsService.ts | 41 - packages/cloud/src/TelemetryClient.ts | 169 --- packages/cloud/src/__mocks__/vscode.ts | 57 - .../CloudService.integration.test.ts | 146 --- .../cloud/src/__tests__/CloudService.test.ts | 604 --------- .../__tests__/CloudSettingsService.test.ts | 476 ------- .../src/__tests__/CloudShareService.test.ts | 310 ----- .../cloud/src/__tests__/RefreshTimer.test.ts | 210 ---- .../__tests__/StaticSettingsService.test.ts | 102 -- .../src/__tests__/TelemetryClient.test.ts | 738 ----------- .../auth/StaticTokenAuthService.spec.ts | 174 --- .../src/__tests__/auth/WebAuthService.spec.ts | 1113 ----------------- packages/cloud/src/auth/AuthService.ts | 36 - .../cloud/src/auth/StaticTokenAuthService.ts | 71 -- packages/cloud/src/auth/WebAuthService.ts | 646 ---------- packages/cloud/src/auth/index.ts | 3 - packages/cloud/src/config.ts | 5 - packages/cloud/src/errors.ts | 42 - packages/cloud/src/index.ts | 4 - packages/cloud/src/types.ts | 4 - packages/cloud/src/utils.ts | 10 - packages/cloud/tsconfig.json | 5 - packages/cloud/vitest.config.ts | 14 - pnpm-lock.yaml | 217 ++-- src/extension.ts | 13 + src/package.json | 2 +- 34 files changed, 149 insertions(+), 5874 deletions(-) delete mode 100644 packages/cloud/eslint.config.mjs delete mode 100644 packages/cloud/package.json delete mode 100644 packages/cloud/src/CloudAPI.ts delete mode 100644 packages/cloud/src/CloudService.ts delete mode 100644 packages/cloud/src/CloudSettingsService.ts delete mode 100644 packages/cloud/src/CloudShareService.ts delete mode 100644 packages/cloud/src/RefreshTimer.ts delete mode 100644 packages/cloud/src/SettingsService.ts delete mode 100644 packages/cloud/src/StaticSettingsService.ts delete mode 100644 packages/cloud/src/TelemetryClient.ts delete mode 100644 packages/cloud/src/__mocks__/vscode.ts delete mode 100644 packages/cloud/src/__tests__/CloudService.integration.test.ts delete mode 100644 packages/cloud/src/__tests__/CloudService.test.ts delete mode 100644 packages/cloud/src/__tests__/CloudSettingsService.test.ts delete mode 100644 packages/cloud/src/__tests__/CloudShareService.test.ts delete mode 100644 packages/cloud/src/__tests__/RefreshTimer.test.ts delete mode 100644 packages/cloud/src/__tests__/StaticSettingsService.test.ts delete mode 100644 packages/cloud/src/__tests__/TelemetryClient.test.ts delete mode 100644 packages/cloud/src/__tests__/auth/StaticTokenAuthService.spec.ts delete mode 100644 packages/cloud/src/__tests__/auth/WebAuthService.spec.ts delete mode 100644 packages/cloud/src/auth/AuthService.ts delete mode 100644 packages/cloud/src/auth/StaticTokenAuthService.ts delete mode 100644 packages/cloud/src/auth/WebAuthService.ts delete mode 100644 packages/cloud/src/auth/index.ts delete mode 100644 packages/cloud/src/config.ts delete mode 100644 packages/cloud/src/errors.ts delete mode 100644 packages/cloud/src/index.ts delete mode 100644 packages/cloud/src/types.ts delete mode 100644 packages/cloud/src/utils.ts delete mode 100644 packages/cloud/tsconfig.json delete mode 100644 packages/cloud/vitest.config.ts diff --git a/packages/cloud/eslint.config.mjs b/packages/cloud/eslint.config.mjs deleted file mode 100644 index 694bf73664..0000000000 --- a/packages/cloud/eslint.config.mjs +++ /dev/null @@ -1,4 +0,0 @@ -import { config } from "@roo-code/config-eslint/base" - -/** @type {import("eslint").Linter.Config} */ -export default [...config] diff --git a/packages/cloud/package.json b/packages/cloud/package.json deleted file mode 100644 index d67b5ae7eb..0000000000 --- a/packages/cloud/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "@roo-code/cloud", - "description": "Roo Code Cloud VSCode integration.", - "version": "0.0.0", - "type": "module", - "exports": "./src/index.ts", - "scripts": { - "lint": "eslint src --ext=ts --max-warnings=0", - "check-types": "tsc --noEmit", - "test": "vitest run", - "clean": "rimraf dist .turbo" - }, - "dependencies": { - "@roo-code/telemetry": "workspace:^", - "@roo-code/types": "workspace:^", - "zod": "^3.25.61" - }, - "devDependencies": { - "@roo-code/config-eslint": "workspace:^", - "@roo-code/config-typescript": "workspace:^", - "@types/node": "20.x", - "@types/vscode": "^1.84.0", - "vitest": "^3.2.3" - } -} diff --git a/packages/cloud/src/CloudAPI.ts b/packages/cloud/src/CloudAPI.ts deleted file mode 100644 index 52c3c2521d..0000000000 --- a/packages/cloud/src/CloudAPI.ts +++ /dev/null @@ -1,122 +0,0 @@ -import { type ShareVisibility, type ShareResponse, shareResponseSchema } from "@roo-code/types" - -import { getRooCodeApiUrl } from "./config" -import type { AuthService } from "./auth" -import { getUserAgent } from "./utils" -import { AuthenticationError, CloudAPIError, NetworkError, TaskNotFoundError } from "./errors" - -interface CloudAPIRequestOptions extends Omit { - timeout?: number - headers?: Record -} - -export class CloudAPI { - private authService: AuthService - private log: (...args: unknown[]) => void - private baseUrl: string - - constructor(authService: AuthService, log?: (...args: unknown[]) => void) { - this.authService = authService - this.log = log || console.log - this.baseUrl = getRooCodeApiUrl() - } - - private async request( - endpoint: string, - options: CloudAPIRequestOptions & { - parseResponse?: (data: unknown) => T - } = {}, - ): Promise { - const { timeout = 10000, parseResponse, headers = {}, ...fetchOptions } = options - - const sessionToken = this.authService.getSessionToken() - - if (!sessionToken) { - throw new AuthenticationError() - } - - const url = `${this.baseUrl}${endpoint}` - - const requestHeaders = { - "Content-Type": "application/json", - Authorization: `Bearer ${sessionToken}`, - "User-Agent": getUserAgent(), - ...headers, - } - - try { - const response = await fetch(url, { - ...fetchOptions, - headers: requestHeaders, - signal: AbortSignal.timeout(timeout), - }) - - if (!response.ok) { - await this.handleErrorResponse(response, endpoint) - } - - const data = await response.json() - - if (parseResponse) { - return parseResponse(data) - } - - return data as T - } catch (error) { - if (error instanceof TypeError && error.message.includes("fetch")) { - throw new NetworkError(`Network error while calling ${endpoint}`) - } - - if (error instanceof CloudAPIError) { - throw error - } - - if (error instanceof Error && error.name === "AbortError") { - throw new CloudAPIError(`Request to ${endpoint} timed out`, undefined, undefined) - } - - throw new CloudAPIError( - `Unexpected error while calling ${endpoint}: ${error instanceof Error ? error.message : String(error)}`, - ) - } - } - - private async handleErrorResponse(response: Response, endpoint: string): Promise { - let responseBody: unknown - - try { - responseBody = await response.json() - } catch { - responseBody = await response.text() - } - - switch (response.status) { - case 401: - throw new AuthenticationError() - case 404: - if (endpoint.includes("/share")) { - throw new TaskNotFoundError() - } - throw new CloudAPIError(`Resource not found: ${endpoint}`, 404, responseBody) - default: - throw new CloudAPIError( - `HTTP ${response.status}: ${response.statusText}`, - response.status, - responseBody, - ) - } - } - - async shareTask(taskId: string, visibility: ShareVisibility = "organization"): Promise { - this.log(`[CloudAPI] Sharing task ${taskId} with visibility: ${visibility}`) - - const response = await this.request("/api/extension/share", { - method: "POST", - body: JSON.stringify({ taskId, visibility }), - parseResponse: (data) => shareResponseSchema.parse(data), - }) - - this.log("[CloudAPI] Share response:", response) - return response - } -} diff --git a/packages/cloud/src/CloudService.ts b/packages/cloud/src/CloudService.ts deleted file mode 100644 index 7777d6b220..0000000000 --- a/packages/cloud/src/CloudService.ts +++ /dev/null @@ -1,288 +0,0 @@ -import * as vscode from "vscode" -import EventEmitter from "events" - -import type { - CloudUserInfo, - TelemetryEvent, - OrganizationAllowList, - OrganizationSettings, - ClineMessage, - ShareVisibility, -} from "@roo-code/types" -import { TelemetryService } from "@roo-code/telemetry" - -import { CloudServiceEvents } from "./types" -import { TaskNotFoundError } from "./errors" -import type { AuthService } from "./auth" -import { WebAuthService, StaticTokenAuthService } from "./auth" -import type { SettingsService } from "./SettingsService" -import { CloudSettingsService } from "./CloudSettingsService" -import { StaticSettingsService } from "./StaticSettingsService" -import { TelemetryClient } from "./TelemetryClient" -import { CloudShareService } from "./CloudShareService" -import { CloudAPI } from "./CloudAPI" - -type AuthStateChangedPayload = CloudServiceEvents["auth-state-changed"][0] -type AuthUserInfoPayload = CloudServiceEvents["user-info"][0] -type SettingsPayload = CloudServiceEvents["settings-updated"][0] - -export class CloudService extends EventEmitter implements vscode.Disposable { - private static _instance: CloudService | null = null - - private context: vscode.ExtensionContext - private authStateListener: (data: AuthStateChangedPayload) => void - private authUserInfoListener: (data: AuthUserInfoPayload) => void - private authService: AuthService | null = null - private settingsListener: (data: SettingsPayload) => void - private settingsService: SettingsService | null = null - private telemetryClient: TelemetryClient | null = null - private shareService: CloudShareService | null = null - private cloudAPI: CloudAPI | null = null - private isInitialized = false - private log: (...args: unknown[]) => void - - private constructor(context: vscode.ExtensionContext, log?: (...args: unknown[]) => void) { - super() - - this.context = context - this.log = log || console.log - this.authStateListener = (data: AuthStateChangedPayload) => { - this.emit("auth-state-changed", data) - } - this.authUserInfoListener = (data: AuthUserInfoPayload) => { - this.emit("user-info", data) - } - this.settingsListener = (data: SettingsPayload) => { - this.emit("settings-updated", data) - } - } - - public async initialize(): Promise { - if (this.isInitialized) { - return - } - - try { - const cloudToken = process.env.ROO_CODE_CLOUD_TOKEN - - if (cloudToken && cloudToken.length > 0) { - this.authService = new StaticTokenAuthService(this.context, cloudToken, this.log) - } else { - this.authService = new WebAuthService(this.context, this.log) - } - - await this.authService.initialize() - - this.authService.on("auth-state-changed", this.authStateListener) - this.authService.on("user-info", this.authUserInfoListener) - - // Check for static settings environment variable. - const staticOrgSettings = process.env.ROO_CODE_CLOUD_ORG_SETTINGS - - if (staticOrgSettings && staticOrgSettings.length > 0) { - this.settingsService = new StaticSettingsService(staticOrgSettings, this.log) - } else { - const cloudSettingsService = new CloudSettingsService(this.context, this.authService, this.log) - cloudSettingsService.initialize() - - cloudSettingsService.on("settings-updated", this.settingsListener) - - this.settingsService = cloudSettingsService - } - - this.cloudAPI = new CloudAPI(this.authService, this.log) - this.telemetryClient = new TelemetryClient(this.authService, this.settingsService) - this.shareService = new CloudShareService(this.cloudAPI, this.settingsService, this.log) - - try { - TelemetryService.instance.register(this.telemetryClient) - } catch (error) { - this.log("[CloudService] Failed to register TelemetryClient:", error) - } - - this.isInitialized = true - } catch (error) { - this.log("[CloudService] Failed to initialize:", error) - throw new Error(`Failed to initialize CloudService: ${error}`) - } - } - - // AuthService - - public async login(): Promise { - this.ensureInitialized() - return this.authService!.login() - } - - public async logout(): Promise { - this.ensureInitialized() - return this.authService!.logout() - } - - public isAuthenticated(): boolean { - this.ensureInitialized() - return this.authService!.isAuthenticated() - } - - public hasActiveSession(): boolean { - this.ensureInitialized() - return this.authService!.hasActiveSession() - } - - public hasOrIsAcquiringActiveSession(): boolean { - this.ensureInitialized() - return this.authService!.hasOrIsAcquiringActiveSession() - } - - public getUserInfo(): CloudUserInfo | null { - this.ensureInitialized() - return this.authService!.getUserInfo() - } - - public getOrganizationId(): string | null { - this.ensureInitialized() - const userInfo = this.authService!.getUserInfo() - return userInfo?.organizationId || null - } - - public getOrganizationName(): string | null { - this.ensureInitialized() - const userInfo = this.authService!.getUserInfo() - return userInfo?.organizationName || null - } - - public getOrganizationRole(): string | null { - this.ensureInitialized() - const userInfo = this.authService!.getUserInfo() - return userInfo?.organizationRole || null - } - - public hasStoredOrganizationId(): boolean { - this.ensureInitialized() - return this.authService!.getStoredOrganizationId() !== null - } - - public getStoredOrganizationId(): string | null { - this.ensureInitialized() - return this.authService!.getStoredOrganizationId() - } - - public getAuthState(): string { - this.ensureInitialized() - return this.authService!.getState() - } - - public async handleAuthCallback( - code: string | null, - state: string | null, - organizationId?: string | null, - ): Promise { - this.ensureInitialized() - return this.authService!.handleCallback(code, state, organizationId) - } - - // SettingsService - - public getAllowList(): OrganizationAllowList { - this.ensureInitialized() - return this.settingsService!.getAllowList() - } - - public getOrganizationSettings(): OrganizationSettings | undefined { - this.ensureInitialized() - return this.settingsService!.getSettings() - } - - // TelemetryClient - - public captureEvent(event: TelemetryEvent): void { - this.ensureInitialized() - this.telemetryClient!.capture(event) - } - - // ShareService - - public async shareTask( - taskId: string, - visibility: ShareVisibility = "organization", - clineMessages?: ClineMessage[], - ) { - this.ensureInitialized() - - try { - return await this.shareService!.shareTask(taskId, visibility) - } catch (error) { - if (error instanceof TaskNotFoundError && clineMessages) { - // Backfill messages and retry. - await this.telemetryClient!.backfillMessages(clineMessages, taskId) - return await this.shareService!.shareTask(taskId, visibility) - } - throw error - } - } - - public async canShareTask(): Promise { - this.ensureInitialized() - return this.shareService!.canShareTask() - } - - // Lifecycle - - public dispose(): void { - if (this.authService) { - this.authService.off("auth-state-changed", this.authStateListener) - this.authService.off("user-info", this.authUserInfoListener) - } - - if (this.settingsService) { - if (this.settingsService instanceof CloudSettingsService) { - this.settingsService.off("settings-updated", this.settingsListener) - } - this.settingsService.dispose() - } - - this.isInitialized = false - } - - private ensureInitialized(): void { - if (!this.isInitialized) { - throw new Error("CloudService not initialized.") - } - } - - static get instance(): CloudService { - if (!this._instance) { - throw new Error("CloudService not initialized") - } - - return this._instance - } - - static async createInstance( - context: vscode.ExtensionContext, - log?: (...args: unknown[]) => void, - ): Promise { - if (this._instance) { - throw new Error("CloudService instance already created") - } - - this._instance = new CloudService(context, log) - await this._instance.initialize() - return this._instance - } - - static hasInstance(): boolean { - return this._instance !== null && this._instance.isInitialized - } - - static resetInstance(): void { - if (this._instance) { - this._instance.dispose() - this._instance = null - } - } - - static isEnabled(): boolean { - return !!this._instance?.isAuthenticated() - } -} diff --git a/packages/cloud/src/CloudSettingsService.ts b/packages/cloud/src/CloudSettingsService.ts deleted file mode 100644 index c842d800fc..0000000000 --- a/packages/cloud/src/CloudSettingsService.ts +++ /dev/null @@ -1,152 +0,0 @@ -import * as vscode from "vscode" -import EventEmitter from "events" - -import { - ORGANIZATION_ALLOW_ALL, - OrganizationAllowList, - OrganizationSettings, - organizationSettingsSchema, -} from "@roo-code/types" - -import { getRooCodeApiUrl } from "./config" -import type { AuthService, AuthState } from "./auth" -import { RefreshTimer } from "./RefreshTimer" -import type { SettingsService } from "./SettingsService" - -const ORGANIZATION_SETTINGS_CACHE_KEY = "organization-settings" - -export interface SettingsServiceEvents { - "settings-updated": [ - data: { - settings: OrganizationSettings - previousSettings: OrganizationSettings | undefined - }, - ] -} - -export class CloudSettingsService extends EventEmitter implements SettingsService { - private context: vscode.ExtensionContext - private authService: AuthService - private settings: OrganizationSettings | undefined = undefined - private timer: RefreshTimer - private log: (...args: unknown[]) => void - - constructor(context: vscode.ExtensionContext, authService: AuthService, log?: (...args: unknown[]) => void) { - super() - - this.context = context - this.authService = authService - this.log = log || console.log - - this.timer = new RefreshTimer({ - callback: async () => { - return await this.fetchSettings() - }, - successInterval: 30000, - initialBackoffMs: 1000, - maxBackoffMs: 30000, - }) - } - - public initialize(): void { - this.loadCachedSettings() - - // Clear cached settings if we have missed a log out. - if (this.authService.getState() == "logged-out" && this.settings) { - this.removeSettings() - } - - this.authService.on("auth-state-changed", (data: { state: AuthState; previousState: AuthState }) => { - if (data.state === "active-session") { - this.timer.start() - } else if (data.previousState === "active-session") { - this.timer.stop() - - if (data.state === "logged-out") { - this.removeSettings() - } - } - }) - - if (this.authService.hasActiveSession()) { - this.timer.start() - } - } - - private async fetchSettings(): Promise { - const token = this.authService.getSessionToken() - - if (!token) { - return false - } - - try { - const response = await fetch(`${getRooCodeApiUrl()}/api/organization-settings`, { - headers: { - Authorization: `Bearer ${token}`, - }, - }) - - if (!response.ok) { - this.log( - "[cloud-settings] Failed to fetch organization settings:", - response.status, - response.statusText, - ) - return false - } - - const data = await response.json() - const result = organizationSettingsSchema.safeParse(data) - - if (!result.success) { - this.log("[cloud-settings] Invalid organization settings format:", result.error) - return false - } - - const newSettings = result.data - - if (!this.settings || this.settings.version !== newSettings.version) { - const previousSettings = this.settings - this.settings = newSettings - await this.cacheSettings() - - this.emit("settings-updated", { - settings: this.settings, - previousSettings, - }) - } - - return true - } catch (error) { - this.log("[cloud-settings] Error fetching organization settings:", error) - return false - } - } - - private async cacheSettings(): Promise { - await this.context.globalState.update(ORGANIZATION_SETTINGS_CACHE_KEY, this.settings) - } - - private loadCachedSettings(): void { - this.settings = this.context.globalState.get(ORGANIZATION_SETTINGS_CACHE_KEY) - } - - public getAllowList(): OrganizationAllowList { - return this.settings?.allowList || ORGANIZATION_ALLOW_ALL - } - - public getSettings(): OrganizationSettings | undefined { - return this.settings - } - - private async removeSettings(): Promise { - this.settings = undefined - await this.cacheSettings() - } - - public dispose(): void { - this.removeAllListeners() - this.timer.stop() - } -} diff --git a/packages/cloud/src/CloudShareService.ts b/packages/cloud/src/CloudShareService.ts deleted file mode 100644 index 91e0f6aa3f..0000000000 --- a/packages/cloud/src/CloudShareService.ts +++ /dev/null @@ -1,43 +0,0 @@ -import * as vscode from "vscode" - -import type { ShareResponse, ShareVisibility } from "@roo-code/types" - -import type { CloudAPI } from "./CloudAPI" -import type { SettingsService } from "./SettingsService" - -export class CloudShareService { - private cloudAPI: CloudAPI - private settingsService: SettingsService - private log: (...args: unknown[]) => void - - constructor(cloudAPI: CloudAPI, settingsService: SettingsService, log?: (...args: unknown[]) => void) { - this.cloudAPI = cloudAPI - this.settingsService = settingsService - this.log = log || console.log - } - - async shareTask(taskId: string, visibility: ShareVisibility = "organization"): Promise { - try { - const response = await this.cloudAPI.shareTask(taskId, visibility) - - if (response.success && response.shareUrl) { - // Copy to clipboard. - await vscode.env.clipboard.writeText(response.shareUrl) - } - - return response - } catch (error) { - this.log("[ShareService] Error sharing task:", error) - throw error - } - } - - async canShareTask(): Promise { - try { - return !!this.settingsService.getSettings()?.cloudSettings?.enableTaskSharing - } catch (error) { - this.log("[ShareService] Error checking if task can be shared:", error) - return false - } - } -} diff --git a/packages/cloud/src/RefreshTimer.ts b/packages/cloud/src/RefreshTimer.ts deleted file mode 100644 index e7294222d7..0000000000 --- a/packages/cloud/src/RefreshTimer.ts +++ /dev/null @@ -1,154 +0,0 @@ -/** - * RefreshTimer - A utility for executing a callback with configurable retry behavior - * - * This timer executes a callback function and schedules the next execution based on the result: - * - If the callback succeeds (returns true), it schedules the next attempt after a fixed interval - * - If the callback fails (returns false), it uses exponential backoff up to a maximum interval - */ - -/** - * Configuration options for the RefreshTimer - */ -export interface RefreshTimerOptions { - /** - * The callback function to execute - * Should return a Promise that resolves to a boolean indicating success (true) or failure (false) - */ - callback: () => Promise - - /** - * Time in milliseconds to wait before next attempt after success - * @default 50000 (50 seconds) - */ - successInterval?: number - - /** - * Initial backoff time in milliseconds for the first failure - * @default 1000 (1 second) - */ - initialBackoffMs?: number - - /** - * Maximum backoff time in milliseconds - * @default 300000 (5 minutes) - */ - maxBackoffMs?: number -} - -/** - * A timer utility that executes a callback with configurable retry behavior - */ -export class RefreshTimer { - private callback: () => Promise - private successInterval: number - private initialBackoffMs: number - private maxBackoffMs: number - private currentBackoffMs: number - private attemptCount: number - private timerId: NodeJS.Timeout | null - private isRunning: boolean - - /** - * Creates a new RefreshTimer - * - * @param options Configuration options for the timer - */ - constructor(options: RefreshTimerOptions) { - this.callback = options.callback - this.successInterval = options.successInterval ?? 50000 // 50 seconds - this.initialBackoffMs = options.initialBackoffMs ?? 1000 // 1 second - this.maxBackoffMs = options.maxBackoffMs ?? 300000 // 5 minutes - this.currentBackoffMs = this.initialBackoffMs - this.attemptCount = 0 - this.timerId = null - this.isRunning = false - } - - /** - * Starts the timer and executes the callback immediately - */ - public start(): void { - if (this.isRunning) { - return - } - - this.isRunning = true - - // Execute the callback immediately - this.executeCallback() - } - - /** - * Stops the timer and cancels any pending execution - */ - public stop(): void { - if (!this.isRunning) { - return - } - - if (this.timerId) { - clearTimeout(this.timerId) - this.timerId = null - } - - this.isRunning = false - } - - /** - * Resets the backoff state and attempt count - * Does not affect whether the timer is running - */ - public reset(): void { - this.currentBackoffMs = this.initialBackoffMs - this.attemptCount = 0 - } - - /** - * Schedules the next attempt based on the success/failure of the current attempt - * - * @param wasSuccessful Whether the current attempt was successful - */ - private scheduleNextAttempt(wasSuccessful: boolean): void { - if (!this.isRunning) { - return - } - - if (wasSuccessful) { - // Reset backoff on success - this.currentBackoffMs = this.initialBackoffMs - this.attemptCount = 0 - - this.timerId = setTimeout(() => this.executeCallback(), this.successInterval) - } else { - // Increment attempt count - this.attemptCount++ - - // Calculate backoff time with exponential increase - // Formula: initialBackoff * 2^(attemptCount - 1) - this.currentBackoffMs = Math.min( - this.initialBackoffMs * Math.pow(2, this.attemptCount - 1), - this.maxBackoffMs, - ) - - this.timerId = setTimeout(() => this.executeCallback(), this.currentBackoffMs) - } - } - - /** - * Executes the callback and handles the result - */ - private async executeCallback(): Promise { - if (!this.isRunning) { - return - } - - try { - const result = await this.callback() - - this.scheduleNextAttempt(result) - } catch (_error) { - // Treat errors as failed attempts - this.scheduleNextAttempt(false) - } - } -} diff --git a/packages/cloud/src/SettingsService.ts b/packages/cloud/src/SettingsService.ts deleted file mode 100644 index c1027dc25c..0000000000 --- a/packages/cloud/src/SettingsService.ts +++ /dev/null @@ -1,23 +0,0 @@ -import type { OrganizationAllowList, OrganizationSettings } from "@roo-code/types" - -/** - * Interface for settings services that provide organization settings - */ -export interface SettingsService { - /** - * Get the organization allow list - * @returns The organization allow list or default if none available - */ - getAllowList(): OrganizationAllowList - - /** - * Get the current organization settings - * @returns The organization settings or undefined if none available - */ - getSettings(): OrganizationSettings | undefined - - /** - * Dispose of the settings service and clean up resources - */ - dispose(): void -} diff --git a/packages/cloud/src/StaticSettingsService.ts b/packages/cloud/src/StaticSettingsService.ts deleted file mode 100644 index 97e6cf7ea8..0000000000 --- a/packages/cloud/src/StaticSettingsService.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { - ORGANIZATION_ALLOW_ALL, - OrganizationAllowList, - OrganizationSettings, - organizationSettingsSchema, -} from "@roo-code/types" - -import type { SettingsService } from "./SettingsService" - -export class StaticSettingsService implements SettingsService { - private settings: OrganizationSettings - private log: (...args: unknown[]) => void - - constructor(envValue: string, log?: (...args: unknown[]) => void) { - this.log = log || console.log - this.settings = this.parseEnvironmentSettings(envValue) - } - - private parseEnvironmentSettings(envValue: string): OrganizationSettings { - try { - const decodedValue = Buffer.from(envValue, "base64").toString("utf-8") - const parsedJson = JSON.parse(decodedValue) - return organizationSettingsSchema.parse(parsedJson) - } catch (error) { - this.log(`[StaticSettingsService] failed to parse static settings: ${error.message}`, error) - throw new Error("Failed to parse static settings", { cause: error }) - } - } - - public getAllowList(): OrganizationAllowList { - return this.settings?.allowList || ORGANIZATION_ALLOW_ALL - } - - public getSettings(): OrganizationSettings | undefined { - return this.settings - } - - public dispose(): void { - // No resources to clean up for static settings. - } -} diff --git a/packages/cloud/src/TelemetryClient.ts b/packages/cloud/src/TelemetryClient.ts deleted file mode 100644 index 727da03432..0000000000 --- a/packages/cloud/src/TelemetryClient.ts +++ /dev/null @@ -1,169 +0,0 @@ -import { - TelemetryEventName, - type TelemetryEvent, - rooCodeTelemetryEventSchema, - type ClineMessage, -} from "@roo-code/types" -import { BaseTelemetryClient } from "@roo-code/telemetry" - -import { getRooCodeApiUrl } from "./config" -import type { AuthService } from "./auth" -import type { SettingsService } from "./SettingsService" - -export class TelemetryClient extends BaseTelemetryClient { - constructor( - private authService: AuthService, - private settingsService: SettingsService, - debug = false, - ) { - super( - { - type: "exclude", - events: [TelemetryEventName.TASK_CONVERSATION_MESSAGE], - }, - debug, - ) - } - - private async fetch(path: string, options: RequestInit) { - if (!this.authService.isAuthenticated()) { - return - } - - const token = this.authService.getSessionToken() - - if (!token) { - console.error(`[TelemetryClient#fetch] Unauthorized: No session token available.`) - return - } - - const response = await fetch(`${getRooCodeApiUrl()}/api/${path}`, { - ...options, - headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json" }, - }) - - if (!response.ok) { - console.error( - `[TelemetryClient#fetch] ${options.method} ${path} -> ${response.status} ${response.statusText}`, - ) - } - } - - public override async capture(event: TelemetryEvent) { - if (!this.isTelemetryEnabled() || !this.isEventCapturable(event.event)) { - if (this.debug) { - console.info(`[TelemetryClient#capture] Skipping event: ${event.event}`) - } - - return - } - - const payload = { - type: event.event, - properties: await this.getEventProperties(event), - } - - if (this.debug) { - console.info(`[TelemetryClient#capture] ${JSON.stringify(payload)}`) - } - - const result = rooCodeTelemetryEventSchema.safeParse(payload) - - if (!result.success) { - console.error( - `[TelemetryClient#capture] Invalid telemetry event: ${result.error.message} - ${JSON.stringify(payload)}`, - ) - - return - } - - try { - await this.fetch(`events`, { method: "POST", body: JSON.stringify(result.data) }) - } catch (error) { - console.error(`[TelemetryClient#capture] Error sending telemetry event: ${error}`) - } - } - - public async backfillMessages(messages: ClineMessage[], taskId: string): Promise { - if (!this.authService.isAuthenticated()) { - if (this.debug) { - console.info(`[TelemetryClient#backfillMessages] Skipping: Not authenticated`) - } - return - } - - const token = this.authService.getSessionToken() - - if (!token) { - console.error(`[TelemetryClient#backfillMessages] Unauthorized: No session token available.`) - return - } - - try { - const mergedProperties = await this.getEventProperties({ - event: TelemetryEventName.TASK_MESSAGE, - properties: { taskId }, - }) - - const formData = new FormData() - formData.append("taskId", taskId) - formData.append("properties", JSON.stringify(mergedProperties)) - - formData.append( - "file", - new File([JSON.stringify(messages)], "task.json", { - type: "application/json", - }), - ) - - if (this.debug) { - console.info( - `[TelemetryClient#backfillMessages] Uploading ${messages.length} messages for task ${taskId}`, - ) - } - - // Custom fetch for multipart - don't set Content-Type header (let browser set it) - const response = await fetch(`${getRooCodeApiUrl()}/api/events/backfill`, { - method: "POST", - headers: { - Authorization: `Bearer ${token}`, - // Note: No Content-Type header - browser will set multipart/form-data with boundary - }, - body: formData, - }) - - if (!response.ok) { - console.error( - `[TelemetryClient#backfillMessages] POST events/backfill -> ${response.status} ${response.statusText}`, - ) - } else if (this.debug) { - console.info(`[TelemetryClient#backfillMessages] Successfully uploaded messages for task ${taskId}`) - } - } catch (error) { - console.error(`[TelemetryClient#backfillMessages] Error uploading messages: ${error}`) - } - } - - public override updateTelemetryState(_didUserOptIn: boolean) {} - - public override isTelemetryEnabled(): boolean { - return true - } - - protected override isEventCapturable(eventName: TelemetryEventName): boolean { - // Ensure that this event type is supported by the telemetry client - if (!super.isEventCapturable(eventName)) { - return false - } - - // Only record message telemetry if a cloud account is present and explicitly configured to record messages - if (eventName === TelemetryEventName.TASK_MESSAGE) { - return this.settingsService.getSettings()?.cloudSettings?.recordTaskMessages || false - } - - // Other telemetry types are capturable at this point - return true - } - - public override async shutdown() {} -} diff --git a/packages/cloud/src/__mocks__/vscode.ts b/packages/cloud/src/__mocks__/vscode.ts deleted file mode 100644 index ac9082375e..0000000000 --- a/packages/cloud/src/__mocks__/vscode.ts +++ /dev/null @@ -1,57 +0,0 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ - -export const window = { - showInformationMessage: vi.fn(), - showErrorMessage: vi.fn(), -} - -export const env = { - openExternal: vi.fn(), -} - -export const Uri = { - parse: vi.fn((uri: string) => ({ toString: () => uri })), -} - -export interface ExtensionContext { - secrets: { - get: (key: string) => Promise - store: (key: string, value: string) => Promise - delete: (key: string) => Promise - onDidChange: (listener: (e: { key: string }) => void) => { dispose: () => void } - } - globalState: { - get: (key: string) => T | undefined - update: (key: string, value: any) => Promise - } - subscriptions: any[] - extension?: { - packageJSON?: { - version?: string - publisher?: string - name?: string - } - } -} - -// Mock implementation for tests -export const mockExtensionContext: ExtensionContext = { - secrets: { - get: vi.fn().mockResolvedValue(undefined), - store: vi.fn().mockResolvedValue(undefined), - delete: vi.fn().mockResolvedValue(undefined), - onDidChange: vi.fn().mockReturnValue({ dispose: vi.fn() }), - }, - globalState: { - get: vi.fn().mockReturnValue(undefined), - update: vi.fn().mockResolvedValue(undefined), - }, - subscriptions: [], - extension: { - packageJSON: { - version: "1.0.0", - publisher: "RooVeterinaryInc", - name: "roo-cline", - }, - }, -} diff --git a/packages/cloud/src/__tests__/CloudService.integration.test.ts b/packages/cloud/src/__tests__/CloudService.integration.test.ts deleted file mode 100644 index f3cef27718..0000000000 --- a/packages/cloud/src/__tests__/CloudService.integration.test.ts +++ /dev/null @@ -1,146 +0,0 @@ -// npx vitest run src/__tests__/CloudService.integration.test.ts - -import * as vscode from "vscode" -import { CloudService } from "../CloudService" -import { StaticSettingsService } from "../StaticSettingsService" -import { CloudSettingsService } from "../CloudSettingsService" - -vi.mock("vscode", () => ({ - ExtensionContext: vi.fn(), - window: { - showInformationMessage: vi.fn(), - showErrorMessage: vi.fn(), - }, - env: { - openExternal: vi.fn(), - }, - Uri: { - parse: vi.fn(), - }, -})) - -describe("CloudService Integration - Settings Service Selection", () => { - let mockContext: vscode.ExtensionContext - - beforeEach(() => { - CloudService.resetInstance() - - mockContext = { - subscriptions: [], - workspaceState: { - get: vi.fn(), - update: vi.fn(), - keys: vi.fn().mockReturnValue([]), - }, - secrets: { - get: vi.fn(), - store: vi.fn(), - delete: vi.fn(), - onDidChange: vi.fn().mockReturnValue({ dispose: vi.fn() }), - }, - globalState: { - get: vi.fn(), - update: vi.fn(), - setKeysForSync: vi.fn(), - keys: vi.fn().mockReturnValue([]), - }, - extensionUri: { scheme: "file", path: "/mock/path" }, - extensionPath: "/mock/path", - extensionMode: 1, - asAbsolutePath: vi.fn((relativePath: string) => `/mock/path/${relativePath}`), - storageUri: { scheme: "file", path: "/mock/storage" }, - extension: { - packageJSON: { - version: "1.0.0", - }, - }, - } as unknown as vscode.ExtensionContext - }) - - afterEach(() => { - CloudService.resetInstance() - delete process.env.ROO_CODE_CLOUD_ORG_SETTINGS - delete process.env.ROO_CODE_CLOUD_TOKEN - }) - - it("should use CloudSettingsService when no environment variable is set", async () => { - // Ensure no environment variables are set - delete process.env.ROO_CODE_CLOUD_ORG_SETTINGS - delete process.env.ROO_CODE_CLOUD_TOKEN - - const cloudService = await CloudService.createInstance(mockContext) - - // Access the private settingsService to check its type - const settingsService = (cloudService as unknown as { settingsService: unknown }).settingsService - expect(settingsService).toBeInstanceOf(CloudSettingsService) - }) - - it("should use StaticSettingsService when ROO_CODE_CLOUD_ORG_SETTINGS is set", async () => { - const validSettings = { - version: 1, - cloudSettings: { - recordTaskMessages: true, - enableTaskSharing: true, - taskShareExpirationDays: 30, - }, - defaultSettings: { - enableCheckpoints: true, - }, - allowList: { - allowAll: true, - providers: {}, - }, - } - - // Set the environment variable - process.env.ROO_CODE_CLOUD_ORG_SETTINGS = Buffer.from(JSON.stringify(validSettings)).toString("base64") - - const cloudService = await CloudService.createInstance(mockContext) - - // Access the private settingsService to check its type - const settingsService = (cloudService as unknown as { settingsService: unknown }).settingsService - expect(settingsService).toBeInstanceOf(StaticSettingsService) - - // Verify the settings are correctly loaded - expect(cloudService.getAllowList()).toEqual(validSettings.allowList) - }) - - it("should throw error when ROO_CODE_CLOUD_ORG_SETTINGS contains invalid data", async () => { - // Set invalid environment variable - process.env.ROO_CODE_CLOUD_ORG_SETTINGS = "invalid-base64-data" - - await expect(CloudService.createInstance(mockContext)).rejects.toThrow("Failed to initialize CloudService") - }) - - it("should prioritize static token auth when both environment variables are set", async () => { - const validSettings = { - version: 1, - cloudSettings: { - recordTaskMessages: true, - enableTaskSharing: true, - taskShareExpirationDays: 30, - }, - defaultSettings: { - enableCheckpoints: true, - }, - allowList: { - allowAll: true, - providers: {}, - }, - } - - // Set both environment variables - process.env.ROO_CODE_CLOUD_TOKEN = "test-token" - process.env.ROO_CODE_CLOUD_ORG_SETTINGS = Buffer.from(JSON.stringify(validSettings)).toString("base64") - - const cloudService = await CloudService.createInstance(mockContext) - - // Should use StaticSettingsService for settings - const settingsService = (cloudService as unknown as { settingsService: unknown }).settingsService - expect(settingsService).toBeInstanceOf(StaticSettingsService) - - // Should use StaticTokenAuthService for auth (from the existing logic) - expect(cloudService.isAuthenticated()).toBe(true) - expect(cloudService.hasActiveSession()).toBe(true) - }) -}) diff --git a/packages/cloud/src/__tests__/CloudService.test.ts b/packages/cloud/src/__tests__/CloudService.test.ts deleted file mode 100644 index 607b21de34..0000000000 --- a/packages/cloud/src/__tests__/CloudService.test.ts +++ /dev/null @@ -1,604 +0,0 @@ -// npx vitest run src/__tests__/CloudService.test.ts - -import * as vscode from "vscode" - -import type { ClineMessage } from "@roo-code/types" -import { TelemetryService } from "@roo-code/telemetry" - -import { CloudService } from "../CloudService" -import { WebAuthService } from "../auth/WebAuthService" -import { CloudSettingsService } from "../CloudSettingsService" -import { CloudShareService } from "../CloudShareService" -import { TelemetryClient } from "../TelemetryClient" -import { TaskNotFoundError } from "../errors" - -vi.mock("vscode", () => ({ - ExtensionContext: vi.fn(), - window: { - showInformationMessage: vi.fn(), - showErrorMessage: vi.fn(), - }, - env: { - openExternal: vi.fn(), - }, - Uri: { - parse: vi.fn(), - }, -})) - -vi.mock("@roo-code/telemetry") - -vi.mock("../auth/WebAuthService") - -vi.mock("../CloudSettingsService") - -vi.mock("../CloudShareService") - -vi.mock("../TelemetryClient") - -describe("CloudService", () => { - let mockContext: vscode.ExtensionContext - let mockAuthService: { - initialize: ReturnType - login: ReturnType - logout: ReturnType - isAuthenticated: ReturnType - hasActiveSession: ReturnType - hasOrIsAcquiringActiveSession: ReturnType - getUserInfo: ReturnType - getState: ReturnType - getSessionToken: ReturnType - handleCallback: ReturnType - getStoredOrganizationId: ReturnType - on: ReturnType - off: ReturnType - once: ReturnType - emit: ReturnType - } - let mockSettingsService: { - initialize: ReturnType - getSettings: ReturnType - getAllowList: ReturnType - dispose: ReturnType - on: ReturnType - off: ReturnType - } - let mockShareService: { - shareTask: ReturnType - canShareTask: ReturnType - } - let mockTelemetryClient: { - backfillMessages: ReturnType - } - let mockTelemetryService: { - hasInstance: ReturnType - instance: { - register: ReturnType - } - } - - beforeEach(() => { - CloudService.resetInstance() - - mockContext = { - subscriptions: [], - workspaceState: { - get: vi.fn(), - update: vi.fn(), - keys: vi.fn().mockReturnValue([]), - }, - secrets: { - get: vi.fn(), - store: vi.fn(), - delete: vi.fn(), - onDidChange: vi.fn().mockReturnValue({ dispose: vi.fn() }), - }, - globalState: { - get: vi.fn(), - update: vi.fn(), - setKeysForSync: vi.fn(), - keys: vi.fn().mockReturnValue([]), - }, - extensionUri: { scheme: "file", path: "/mock/path" }, - extensionPath: "/mock/path", - extensionMode: 1, - asAbsolutePath: vi.fn((relativePath: string) => `/mock/path/${relativePath}`), - storageUri: { scheme: "file", path: "/mock/storage" }, - extension: { - packageJSON: { - version: "1.0.0", - }, - }, - } as unknown as vscode.ExtensionContext - - mockAuthService = { - initialize: vi.fn().mockResolvedValue(undefined), - login: vi.fn(), - logout: vi.fn(), - isAuthenticated: vi.fn().mockReturnValue(false), - hasActiveSession: vi.fn().mockReturnValue(false), - hasOrIsAcquiringActiveSession: vi.fn().mockReturnValue(false), - getUserInfo: vi.fn(), - getState: vi.fn().mockReturnValue("logged-out"), - getSessionToken: vi.fn(), - handleCallback: vi.fn(), - getStoredOrganizationId: vi.fn().mockReturnValue(null), - on: vi.fn(), - off: vi.fn(), - once: vi.fn(), - emit: vi.fn(), - } - - mockSettingsService = { - initialize: vi.fn(), - getSettings: vi.fn(), - getAllowList: vi.fn(), - dispose: vi.fn(), - on: vi.fn(), - off: vi.fn(), - } - - mockShareService = { - shareTask: vi.fn(), - canShareTask: vi.fn().mockResolvedValue(true), - } - - mockTelemetryClient = { - backfillMessages: vi.fn().mockResolvedValue(undefined), - } - - mockTelemetryService = { - hasInstance: vi.fn().mockReturnValue(true), - instance: { - register: vi.fn(), - }, - } - - vi.mocked(WebAuthService).mockImplementation(() => mockAuthService as unknown as WebAuthService) - vi.mocked(CloudSettingsService).mockImplementation(() => mockSettingsService as unknown as CloudSettingsService) - vi.mocked(CloudShareService).mockImplementation(() => mockShareService as unknown as CloudShareService) - vi.mocked(TelemetryClient).mockImplementation(() => mockTelemetryClient as unknown as TelemetryClient) - - vi.mocked(TelemetryService.hasInstance).mockReturnValue(true) - Object.defineProperty(TelemetryService, "instance", { - get: () => mockTelemetryService.instance, - configurable: true, - }) - }) - - afterEach(() => { - vi.clearAllMocks() - CloudService.resetInstance() - }) - - describe("createInstance", () => { - it("should create and initialize CloudService instance", async () => { - const mockLog = vi.fn() - - const cloudService = await CloudService.createInstance(mockContext, mockLog) - - expect(cloudService).toBeInstanceOf(CloudService) - expect(WebAuthService).toHaveBeenCalledWith(mockContext, expect.any(Function)) - expect(CloudSettingsService).toHaveBeenCalledWith(mockContext, mockAuthService, expect.any(Function)) - }) - - it("should set up event listeners for CloudSettingsService", async () => { - const mockLog = vi.fn() - - await CloudService.createInstance(mockContext, mockLog) - - expect(mockSettingsService.on).toHaveBeenCalledWith("settings-updated", expect.any(Function)) - }) - - it("should throw error if instance already exists", async () => { - await CloudService.createInstance(mockContext) - - await expect(CloudService.createInstance(mockContext)).rejects.toThrow( - "CloudService instance already created", - ) - }) - }) - - describe("authentication methods", () => { - let cloudService: CloudService - - beforeEach(async () => { - cloudService = await CloudService.createInstance(mockContext) - }) - - it("should delegate login to AuthService", async () => { - await cloudService.login() - expect(mockAuthService.login).toHaveBeenCalled() - }) - - it("should delegate logout to AuthService", async () => { - await cloudService.logout() - expect(mockAuthService.logout).toHaveBeenCalled() - }) - - it("should delegate isAuthenticated to AuthService", () => { - const result = cloudService.isAuthenticated() - expect(mockAuthService.isAuthenticated).toHaveBeenCalled() - expect(result).toBe(false) - }) - - it("should delegate hasActiveSession to AuthService", () => { - const result = cloudService.hasActiveSession() - expect(mockAuthService.hasActiveSession).toHaveBeenCalled() - expect(result).toBe(false) - }) - - it("should delegate getUserInfo to AuthService", async () => { - await cloudService.getUserInfo() - expect(mockAuthService.getUserInfo).toHaveBeenCalled() - }) - - it("should return organization ID from user info", () => { - const mockUserInfo = { - name: "Test User", - email: "test@example.com", - organizationId: "org_123", - organizationName: "Test Org", - organizationRole: "admin", - } - mockAuthService.getUserInfo.mockReturnValue(mockUserInfo) - - const result = cloudService.getOrganizationId() - expect(mockAuthService.getUserInfo).toHaveBeenCalled() - expect(result).toBe("org_123") - }) - - it("should return null when no organization ID available", () => { - mockAuthService.getUserInfo.mockReturnValue(null) - - const result = cloudService.getOrganizationId() - expect(result).toBe(null) - }) - - it("should return organization name from user info", () => { - const mockUserInfo = { - name: "Test User", - email: "test@example.com", - organizationId: "org_123", - organizationName: "Test Org", - organizationRole: "admin", - } - mockAuthService.getUserInfo.mockReturnValue(mockUserInfo) - - const result = cloudService.getOrganizationName() - expect(mockAuthService.getUserInfo).toHaveBeenCalled() - expect(result).toBe("Test Org") - }) - - it("should return null when no organization name available", () => { - mockAuthService.getUserInfo.mockReturnValue(null) - - const result = cloudService.getOrganizationName() - expect(result).toBe(null) - }) - - it("should return organization role from user info", () => { - const mockUserInfo = { - name: "Test User", - email: "test@example.com", - organizationId: "org_123", - organizationName: "Test Org", - organizationRole: "admin", - } - mockAuthService.getUserInfo.mockReturnValue(mockUserInfo) - - const result = cloudService.getOrganizationRole() - expect(mockAuthService.getUserInfo).toHaveBeenCalled() - expect(result).toBe("admin") - }) - - it("should return null when no organization role available", () => { - mockAuthService.getUserInfo.mockReturnValue(null) - - const result = cloudService.getOrganizationRole() - expect(result).toBe(null) - }) - - it("should delegate getAuthState to AuthService", () => { - const result = cloudService.getAuthState() - expect(mockAuthService.getState).toHaveBeenCalled() - expect(result).toBe("logged-out") - }) - - it("should delegate handleAuthCallback to AuthService", async () => { - await cloudService.handleAuthCallback("code", "state") - expect(mockAuthService.handleCallback).toHaveBeenCalledWith("code", "state", undefined) - }) - - it("should delegate handleAuthCallback with organizationId to AuthService", async () => { - await cloudService.handleAuthCallback("code", "state", "org_123") - expect(mockAuthService.handleCallback).toHaveBeenCalledWith("code", "state", "org_123") - }) - - it("should return stored organization ID from AuthService", () => { - mockAuthService.getStoredOrganizationId.mockReturnValue("org_456") - - const result = cloudService.getStoredOrganizationId() - expect(mockAuthService.getStoredOrganizationId).toHaveBeenCalled() - expect(result).toBe("org_456") - }) - - it("should return null when no stored organization ID available", () => { - mockAuthService.getStoredOrganizationId.mockReturnValue(null) - - const result = cloudService.getStoredOrganizationId() - expect(result).toBe(null) - }) - - it("should return true when stored organization ID exists", () => { - mockAuthService.getStoredOrganizationId.mockReturnValue("org_789") - - const result = cloudService.hasStoredOrganizationId() - expect(result).toBe(true) - }) - - it("should return false when no stored organization ID exists", () => { - mockAuthService.getStoredOrganizationId.mockReturnValue(null) - - const result = cloudService.hasStoredOrganizationId() - expect(result).toBe(false) - }) - }) - - describe("organization settings methods", () => { - let cloudService: CloudService - - beforeEach(async () => { - cloudService = await CloudService.createInstance(mockContext) - }) - - it("should delegate getAllowList to SettingsService", () => { - cloudService.getAllowList() - expect(mockSettingsService.getAllowList).toHaveBeenCalled() - }) - }) - - describe("error handling", () => { - it("should throw error when accessing methods before initialization", () => { - expect(() => CloudService.instance.login()).toThrow("CloudService not initialized") - }) - - it("should throw error when accessing instance before creation", () => { - expect(() => CloudService.instance).toThrow("CloudService not initialized") - }) - }) - - describe("hasInstance", () => { - it("should return false when no instance exists", () => { - expect(CloudService.hasInstance()).toBe(false) - }) - - it("should return true when instance exists and is initialized", async () => { - await CloudService.createInstance(mockContext) - expect(CloudService.hasInstance()).toBe(true) - }) - }) - - describe("dispose", () => { - it("should dispose of all services and clean up", async () => { - const cloudService = await CloudService.createInstance(mockContext) - cloudService.dispose() - - expect(mockSettingsService.dispose).toHaveBeenCalled() - }) - - it("should remove event listeners from CloudSettingsService", async () => { - // Create a mock that will pass the instanceof check - const mockCloudSettingsService = Object.create(CloudSettingsService.prototype) - Object.assign(mockCloudSettingsService, { - initialize: vi.fn(), - getSettings: vi.fn(), - getAllowList: vi.fn(), - dispose: vi.fn(), - on: vi.fn(), - off: vi.fn(), - }) - - // Override the mock to return our properly typed instance - vi.mocked(CloudSettingsService).mockImplementation(() => mockCloudSettingsService) - - const cloudService = await CloudService.createInstance(mockContext) - - // Verify the listener was added - expect(mockCloudSettingsService.on).toHaveBeenCalledWith("settings-updated", expect.any(Function)) - - // Get the listener function that was registered - const registeredListener = mockCloudSettingsService.on.mock.calls.find( - (call: unknown[]) => call[0] === "settings-updated", - )?.[1] - - cloudService.dispose() - - // Verify the listener was removed with the same function - expect(mockCloudSettingsService.off).toHaveBeenCalledWith("settings-updated", registeredListener) - }) - - it("should handle disposal when using StaticSettingsService", async () => { - // Reset the instance first - CloudService.resetInstance() - - // Mock a StaticSettingsService (which doesn't extend CloudSettingsService) - const mockStaticSettingsService = { - initialize: vi.fn(), - getSettings: vi.fn(), - getAllowList: vi.fn(), - dispose: vi.fn(), - on: vi.fn(), // Add on method to avoid initialization error - off: vi.fn(), // Add off method for disposal - } - - // Override the mock to return a service that won't pass instanceof check - vi.mocked(CloudSettingsService).mockImplementation( - () => mockStaticSettingsService as unknown as CloudSettingsService, - ) - - // This should not throw even though the service doesn't pass instanceof check - const _cloudService = await CloudService.createInstance(mockContext) - - // Should not throw when disposing - expect(() => _cloudService.dispose()).not.toThrow() - - // Should still call dispose on the settings service - expect(mockStaticSettingsService.dispose).toHaveBeenCalled() - // Should NOT call off method since it's not a CloudSettingsService instance - expect(mockStaticSettingsService.off).not.toHaveBeenCalled() - }) - }) - - describe("settings event handling", () => { - let _cloudService: CloudService - - beforeEach(async () => { - _cloudService = await CloudService.createInstance(mockContext) - }) - - it("should emit settings-updated event when settings are updated", async () => { - const settingsListener = vi.fn() - _cloudService.on("settings-updated", settingsListener) - - // Get the settings listener that was registered with the settings service - const serviceSettingsListener = mockSettingsService.on.mock.calls.find( - (call) => call[0] === "settings-updated", - )?.[1] - - expect(serviceSettingsListener).toBeDefined() - - // Simulate settings update event - const settingsData = { - settings: { - version: 2, - defaultSettings: {}, - allowList: { allowAll: true, providers: {} }, - }, - previousSettings: { - version: 1, - defaultSettings: {}, - allowList: { allowAll: true, providers: {} }, - }, - } - serviceSettingsListener(settingsData) - - expect(settingsListener).toHaveBeenCalledWith(settingsData) - }) - }) - - describe("shareTask with ClineMessage retry logic", () => { - let cloudService: CloudService - - beforeEach(async () => { - // Reset mocks for shareTask tests - vi.clearAllMocks() - - // Reset authentication state for shareTask tests - mockAuthService.isAuthenticated.mockReturnValue(true) - mockAuthService.hasActiveSession.mockReturnValue(true) - mockAuthService.hasOrIsAcquiringActiveSession.mockReturnValue(true) - mockAuthService.getState.mockReturnValue("active") - - cloudService = await CloudService.createInstance(mockContext) - }) - - it("should call shareTask without retry when successful", async () => { - const taskId = "test-task-id" - const visibility = "organization" - const clineMessages: ClineMessage[] = [ - { - ts: Date.now(), - type: "say", - say: "text", - text: "Hello world", - }, - ] - - const expectedResult = { success: true, shareUrl: "https://example.com/share/123" } - mockShareService.shareTask.mockResolvedValue(expectedResult) - - const result = await cloudService.shareTask(taskId, visibility, clineMessages) - - expect(mockShareService.shareTask).toHaveBeenCalledTimes(1) - expect(mockShareService.shareTask).toHaveBeenCalledWith(taskId, visibility) - expect(mockTelemetryClient.backfillMessages).not.toHaveBeenCalled() - expect(result).toEqual(expectedResult) - }) - - it("should retry with backfill when TaskNotFoundError occurs", async () => { - const taskId = "test-task-id" - const visibility = "organization" - const clineMessages: ClineMessage[] = [ - { - ts: Date.now(), - type: "say", - say: "text", - text: "Hello world", - }, - ] - - const expectedResult = { success: true, shareUrl: "https://example.com/share/123" } - - // First call throws TaskNotFoundError, second call succeeds - mockShareService.shareTask - .mockRejectedValueOnce(new TaskNotFoundError(taskId)) - .mockResolvedValueOnce(expectedResult) - - const result = await cloudService.shareTask(taskId, visibility, clineMessages) - - expect(mockShareService.shareTask).toHaveBeenCalledTimes(2) - expect(mockShareService.shareTask).toHaveBeenNthCalledWith(1, taskId, visibility) - expect(mockShareService.shareTask).toHaveBeenNthCalledWith(2, taskId, visibility) - expect(mockTelemetryClient.backfillMessages).toHaveBeenCalledTimes(1) - expect(mockTelemetryClient.backfillMessages).toHaveBeenCalledWith(clineMessages, taskId) - expect(result).toEqual(expectedResult) - }) - - it("should not retry when TaskNotFoundError occurs but no clineMessages provided", async () => { - const taskId = "test-task-id" - const visibility = "organization" - - const taskNotFoundError = new TaskNotFoundError(taskId) - mockShareService.shareTask.mockRejectedValue(taskNotFoundError) - - await expect(cloudService.shareTask(taskId, visibility)).rejects.toThrow(TaskNotFoundError) - - expect(mockShareService.shareTask).toHaveBeenCalledTimes(1) - expect(mockTelemetryClient.backfillMessages).not.toHaveBeenCalled() - }) - - it("should not retry when non-TaskNotFoundError occurs", async () => { - const taskId = "test-task-id" - const visibility = "organization" - const clineMessages: ClineMessage[] = [ - { - ts: Date.now(), - type: "say", - say: "text", - text: "Hello world", - }, - ] - - const genericError = new Error("Some other error") - mockShareService.shareTask.mockRejectedValue(genericError) - - await expect(cloudService.shareTask(taskId, visibility, clineMessages)).rejects.toThrow(genericError) - - expect(mockShareService.shareTask).toHaveBeenCalledTimes(1) - expect(mockTelemetryClient.backfillMessages).not.toHaveBeenCalled() - }) - - it("should work with default parameters", async () => { - const taskId = "test-task-id" - const expectedResult = { success: true, shareUrl: "https://example.com/share/123" } - mockShareService.shareTask.mockResolvedValue(expectedResult) - - const result = await cloudService.shareTask(taskId) - - expect(mockShareService.shareTask).toHaveBeenCalledTimes(1) - expect(mockShareService.shareTask).toHaveBeenCalledWith(taskId, "organization") - expect(result).toEqual(expectedResult) - }) - }) -}) diff --git a/packages/cloud/src/__tests__/CloudSettingsService.test.ts b/packages/cloud/src/__tests__/CloudSettingsService.test.ts deleted file mode 100644 index 4a85383ba4..0000000000 --- a/packages/cloud/src/__tests__/CloudSettingsService.test.ts +++ /dev/null @@ -1,476 +0,0 @@ -import * as vscode from "vscode" -import { CloudSettingsService } from "../CloudSettingsService" -import { RefreshTimer } from "../RefreshTimer" -import type { AuthService } from "../auth" -import type { OrganizationSettings } from "@roo-code/types" - -// Mock dependencies -vi.mock("../RefreshTimer") -vi.mock("../config", () => ({ - getRooCodeApiUrl: vi.fn().mockReturnValue("https://app.roocode.com"), -})) - -// Mock fetch globally -global.fetch = vi.fn() - -describe("CloudSettingsService", () => { - let mockContext: vscode.ExtensionContext - let mockAuthService: { - getState: ReturnType - getSessionToken: ReturnType - hasActiveSession: ReturnType - on: ReturnType - } - let mockRefreshTimer: { - start: ReturnType - stop: ReturnType - } - let cloudSettingsService: CloudSettingsService - let mockLog: ReturnType - - const mockSettings: OrganizationSettings = { - version: 1, - defaultSettings: {}, - allowList: { - allowAll: true, - providers: {}, - }, - } - - beforeEach(() => { - vi.clearAllMocks() - - mockContext = { - globalState: { - get: vi.fn(), - update: vi.fn().mockResolvedValue(undefined), - }, - } as unknown as vscode.ExtensionContext - - mockAuthService = { - getState: vi.fn().mockReturnValue("logged-out"), - getSessionToken: vi.fn(), - hasActiveSession: vi.fn().mockReturnValue(false), - on: vi.fn(), - } - - mockRefreshTimer = { - start: vi.fn(), - stop: vi.fn(), - } - - mockLog = vi.fn() - - // Mock RefreshTimer constructor - vi.mocked(RefreshTimer).mockImplementation(() => mockRefreshTimer as unknown as RefreshTimer) - - cloudSettingsService = new CloudSettingsService(mockContext, mockAuthService as unknown as AuthService, mockLog) - }) - - afterEach(() => { - cloudSettingsService.dispose() - }) - - describe("constructor", () => { - it("should create CloudSettingsService with proper dependencies", () => { - expect(cloudSettingsService).toBeInstanceOf(CloudSettingsService) - expect(RefreshTimer).toHaveBeenCalledWith({ - callback: expect.any(Function), - successInterval: 30000, - initialBackoffMs: 1000, - maxBackoffMs: 30000, - }) - }) - - it("should use console.log as default logger when none provided", () => { - const service = new CloudSettingsService(mockContext, mockAuthService as unknown as AuthService) - expect(service).toBeInstanceOf(CloudSettingsService) - }) - }) - - describe("initialize", () => { - it("should load cached settings on initialization", () => { - const cachedSettings = { - version: 1, - defaultSettings: {}, - allowList: { allowAll: true, providers: {} }, - } - - // Create a fresh mock context for this test - const testContext = { - globalState: { - get: vi.fn().mockReturnValue(cachedSettings), - update: vi.fn().mockResolvedValue(undefined), - }, - } as unknown as vscode.ExtensionContext - - // Mock auth service to not be logged out - const testAuthService = { - getState: vi.fn().mockReturnValue("active"), - getSessionToken: vi.fn(), - hasActiveSession: vi.fn().mockReturnValue(false), - on: vi.fn(), - } - - // Create a new instance to test initialization - const testService = new CloudSettingsService( - testContext, - testAuthService as unknown as AuthService, - mockLog, - ) - testService.initialize() - - expect(testContext.globalState.get).toHaveBeenCalledWith("organization-settings") - expect(testService.getSettings()).toEqual(cachedSettings) - - testService.dispose() - }) - - it("should clear cached settings if user is logged out", async () => { - const cachedSettings = { - version: 1, - defaultSettings: {}, - allowList: { allowAll: true, providers: {} }, - } - mockContext.globalState.get = vi.fn().mockReturnValue(cachedSettings) - mockAuthService.getState.mockReturnValue("logged-out") - - cloudSettingsService.initialize() - - expect(mockContext.globalState.update).toHaveBeenCalledWith("organization-settings", undefined) - }) - - it("should set up auth service event listeners", () => { - cloudSettingsService.initialize() - - expect(mockAuthService.on).toHaveBeenCalledWith("auth-state-changed", expect.any(Function)) - }) - - it("should start timer if user has active session", () => { - mockAuthService.hasActiveSession.mockReturnValue(true) - - cloudSettingsService.initialize() - - expect(mockRefreshTimer.start).toHaveBeenCalled() - }) - - it("should not start timer if user has no active session", () => { - mockAuthService.hasActiveSession.mockReturnValue(false) - - cloudSettingsService.initialize() - - expect(mockRefreshTimer.start).not.toHaveBeenCalled() - }) - }) - - describe("event emission", () => { - beforeEach(() => { - cloudSettingsService.initialize() - }) - - it("should emit 'settings-updated' event when settings change", async () => { - const eventSpy = vi.fn() - cloudSettingsService.on("settings-updated", eventSpy) - - mockAuthService.getSessionToken.mockReturnValue("valid-token") - vi.mocked(fetch).mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue(mockSettings), - } as unknown as Response) - - // Get the callback function passed to RefreshTimer - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await timerCallback() - - expect(eventSpy).toHaveBeenCalledWith({ - settings: mockSettings, - previousSettings: undefined, - }) - }) - - it("should emit event with previous settings when updating existing settings", async () => { - const eventSpy = vi.fn() - - const previousSettings = { - version: 1, - defaultSettings: {}, - allowList: { allowAll: true, providers: {} }, - } - const newSettings = { - version: 2, - defaultSettings: {}, - allowList: { allowAll: true, providers: {} }, - } - - // Create a fresh mock context for this test - const testContext = { - globalState: { - get: vi.fn().mockReturnValue(previousSettings), - update: vi.fn().mockResolvedValue(undefined), - }, - } as unknown as vscode.ExtensionContext - - // Mock auth service to not be logged out - const testAuthService = { - getState: vi.fn().mockReturnValue("active"), - getSessionToken: vi.fn().mockReturnValue("valid-token"), - hasActiveSession: vi.fn().mockReturnValue(false), - on: vi.fn(), - } - - // Create a new service instance with cached settings - const testService = new CloudSettingsService( - testContext, - testAuthService as unknown as AuthService, - mockLog, - ) - testService.on("settings-updated", eventSpy) - testService.initialize() - - vi.mocked(fetch).mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue(newSettings), - } as unknown as Response) - - // Get the callback function passed to RefreshTimer for this instance - const timerCallback = - vi.mocked(RefreshTimer).mock.calls[vi.mocked(RefreshTimer).mock.calls.length - 1][0].callback - await timerCallback() - - expect(eventSpy).toHaveBeenCalledWith({ - settings: newSettings, - previousSettings, - }) - - testService.dispose() - }) - - it("should not emit event when settings version is unchanged", async () => { - const eventSpy = vi.fn() - - // Create a fresh mock context for this test - const testContext = { - globalState: { - get: vi.fn().mockReturnValue(mockSettings), - update: vi.fn().mockResolvedValue(undefined), - }, - } as unknown as vscode.ExtensionContext - - // Mock auth service to not be logged out - const testAuthService = { - getState: vi.fn().mockReturnValue("active"), - getSessionToken: vi.fn().mockReturnValue("valid-token"), - hasActiveSession: vi.fn().mockReturnValue(false), - on: vi.fn(), - } - - // Create a new service instance with cached settings - const testService = new CloudSettingsService( - testContext, - testAuthService as unknown as AuthService, - mockLog, - ) - testService.on("settings-updated", eventSpy) - testService.initialize() - - vi.mocked(fetch).mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue(mockSettings), // Same version - } as unknown as Response) - - // Get the callback function passed to RefreshTimer for this instance - const timerCallback = - vi.mocked(RefreshTimer).mock.calls[vi.mocked(RefreshTimer).mock.calls.length - 1][0].callback - await timerCallback() - - expect(eventSpy).not.toHaveBeenCalled() - - testService.dispose() - }) - - it("should not emit event when fetch fails", async () => { - const eventSpy = vi.fn() - cloudSettingsService.on("settings-updated", eventSpy) - - mockAuthService.getSessionToken.mockReturnValue("valid-token") - vi.mocked(fetch).mockResolvedValue({ - ok: false, - status: 500, - statusText: "Internal Server Error", - } as unknown as Response) - - // Get the callback function passed to RefreshTimer - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await timerCallback() - - expect(eventSpy).not.toHaveBeenCalled() - }) - - it("should not emit event when no auth token available", async () => { - const eventSpy = vi.fn() - cloudSettingsService.on("settings-updated", eventSpy) - - mockAuthService.getSessionToken.mockReturnValue(null) - - // Get the callback function passed to RefreshTimer - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await timerCallback() - - expect(eventSpy).not.toHaveBeenCalled() - expect(fetch).not.toHaveBeenCalled() - }) - }) - - describe("fetchSettings", () => { - beforeEach(() => { - cloudSettingsService.initialize() - }) - - it("should fetch and cache settings successfully", async () => { - mockAuthService.getSessionToken.mockReturnValue("valid-token") - vi.mocked(fetch).mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue(mockSettings), - } as unknown as Response) - - // Get the callback function passed to RefreshTimer - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - const result = await timerCallback() - - expect(result).toBe(true) - expect(fetch).toHaveBeenCalledWith("https://app.roocode.com/api/organization-settings", { - headers: { - Authorization: "Bearer valid-token", - }, - }) - expect(mockContext.globalState.update).toHaveBeenCalledWith("organization-settings", mockSettings) - }) - - it("should handle fetch errors gracefully", async () => { - mockAuthService.getSessionToken.mockReturnValue("valid-token") - vi.mocked(fetch).mockRejectedValue(new Error("Network error")) - - // Get the callback function passed to RefreshTimer - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - const result = await timerCallback() - - expect(result).toBe(false) - expect(mockLog).toHaveBeenCalledWith( - "[cloud-settings] Error fetching organization settings:", - expect.any(Error), - ) - }) - - it("should handle invalid response format", async () => { - mockAuthService.getSessionToken.mockReturnValue("valid-token") - vi.mocked(fetch).mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue({ invalid: "data" }), - } as unknown as Response) - - // Get the callback function passed to RefreshTimer - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - const result = await timerCallback() - - expect(result).toBe(false) - expect(mockLog).toHaveBeenCalledWith( - "[cloud-settings] Invalid organization settings format:", - expect.any(Object), - ) - }) - }) - - describe("getAllowList", () => { - it("should return settings allowList when available", () => { - mockContext.globalState.get = vi.fn().mockReturnValue(mockSettings) - cloudSettingsService.initialize() - - const allowList = cloudSettingsService.getAllowList() - expect(allowList).toEqual(mockSettings.allowList) - }) - - it("should return default allow all when no settings available", () => { - const allowList = cloudSettingsService.getAllowList() - expect(allowList).toEqual({ allowAll: true, providers: {} }) - }) - }) - - describe("getSettings", () => { - it("should return current settings", () => { - // Create a fresh mock context for this test - const testContext = { - globalState: { - get: vi.fn().mockReturnValue(mockSettings), - update: vi.fn().mockResolvedValue(undefined), - }, - } as unknown as vscode.ExtensionContext - - // Mock auth service to not be logged out - const testAuthService = { - getState: vi.fn().mockReturnValue("active"), - getSessionToken: vi.fn(), - hasActiveSession: vi.fn().mockReturnValue(false), - on: vi.fn(), - } - - const testService = new CloudSettingsService( - testContext, - testAuthService as unknown as AuthService, - mockLog, - ) - testService.initialize() - - const settings = testService.getSettings() - expect(settings).toEqual(mockSettings) - - testService.dispose() - }) - - it("should return undefined when no settings available", () => { - const settings = cloudSettingsService.getSettings() - expect(settings).toBeUndefined() - }) - }) - - describe("dispose", () => { - it("should remove all listeners and stop timer", () => { - const removeAllListenersSpy = vi.spyOn(cloudSettingsService, "removeAllListeners") - - cloudSettingsService.dispose() - - expect(removeAllListenersSpy).toHaveBeenCalled() - expect(mockRefreshTimer.stop).toHaveBeenCalled() - }) - }) - - describe("auth service event handlers", () => { - it("should start timer when auth-state-changed event is triggered with active-session", () => { - cloudSettingsService.initialize() - - // Get the auth-state-changed handler - const authStateChangedHandler = mockAuthService.on.mock.calls.find( - (call) => call[0] === "auth-state-changed", - )?.[1] - expect(authStateChangedHandler).toBeDefined() - - // Simulate active-session state change - authStateChangedHandler({ state: "active-session", previousState: "attempting-session" }) - expect(mockRefreshTimer.start).toHaveBeenCalled() - }) - - it("should stop timer and remove settings when auth-state-changed event is triggered with logged-out", async () => { - cloudSettingsService.initialize() - - // Get the auth-state-changed handler - const authStateChangedHandler = mockAuthService.on.mock.calls.find( - (call) => call[0] === "auth-state-changed", - )?.[1] - expect(authStateChangedHandler).toBeDefined() - - // Simulate logged-out state change from active-session - await authStateChangedHandler({ state: "logged-out", previousState: "active-session" }) - expect(mockRefreshTimer.stop).toHaveBeenCalled() - expect(mockContext.globalState.update).toHaveBeenCalledWith("organization-settings", undefined) - }) - }) -}) diff --git a/packages/cloud/src/__tests__/CloudShareService.test.ts b/packages/cloud/src/__tests__/CloudShareService.test.ts deleted file mode 100644 index 6fae1fbb9f..0000000000 --- a/packages/cloud/src/__tests__/CloudShareService.test.ts +++ /dev/null @@ -1,310 +0,0 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ - -import type { MockedFunction } from "vitest" -import * as vscode from "vscode" - -import { CloudAPI } from "../CloudAPI" -import { CloudShareService } from "../CloudShareService" -import type { SettingsService } from "../SettingsService" -import type { AuthService } from "../auth" -import { CloudAPIError, TaskNotFoundError } from "../errors" - -// Mock fetch -const mockFetch = vi.fn() -global.fetch = mockFetch as any - -// Mock vscode -vi.mock("vscode", () => ({ - window: { - showInformationMessage: vi.fn(), - showErrorMessage: vi.fn(), - showQuickPick: vi.fn(), - }, - env: { - clipboard: { - writeText: vi.fn(), - }, - openExternal: vi.fn(), - }, - Uri: { - parse: vi.fn(), - }, - extensions: { - getExtension: vi.fn(() => ({ - packageJSON: { version: "1.0.0" }, - })), - }, -})) - -// Mock config -vi.mock("../Config", () => ({ - getRooCodeApiUrl: () => "https://app.roocode.com", -})) - -// Mock utils -vi.mock("../utils", () => ({ - getUserAgent: () => "Roo-Code 1.0.0", -})) - -describe("CloudShareService", () => { - let shareService: CloudShareService - let mockAuthService: AuthService - let mockSettingsService: SettingsService - let mockCloudAPI: CloudAPI - let mockLog: MockedFunction<(...args: unknown[]) => void> - - beforeEach(() => { - vi.clearAllMocks() - mockFetch.mockClear() - - mockLog = vi.fn() - mockAuthService = { - hasActiveSession: vi.fn(), - getSessionToken: vi.fn(), - isAuthenticated: vi.fn(), - } as any - - mockSettingsService = { - getSettings: vi.fn(), - } as any - - mockCloudAPI = new CloudAPI(mockAuthService, mockLog) - shareService = new CloudShareService(mockCloudAPI, mockSettingsService, mockLog) - }) - - describe("shareTask", () => { - it("should share task with organization visibility and copy to clipboard", async () => { - const mockResponseData = { - success: true, - shareUrl: "https://app.roocode.com/share/abc123", - } - - ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") - mockFetch.mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue(mockResponseData), - }) - - const result = await shareService.shareTask("task-123", "organization") - - expect(result.success).toBe(true) - expect(result.shareUrl).toBe("https://app.roocode.com/share/abc123") - expect(mockFetch).toHaveBeenCalledWith("https://app.roocode.com/api/extension/share", { - method: "POST", - headers: { - "Content-Type": "application/json", - Authorization: "Bearer session-token", - "User-Agent": "Roo-Code 1.0.0", - }, - body: JSON.stringify({ taskId: "task-123", visibility: "organization" }), - signal: expect.any(AbortSignal), - }) - expect(vscode.env.clipboard.writeText).toHaveBeenCalledWith("https://app.roocode.com/share/abc123") - }) - - it("should share task with public visibility", async () => { - const mockResponseData = { - success: true, - shareUrl: "https://app.roocode.com/share/abc123", - } - - ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") - mockFetch.mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue(mockResponseData), - }) - - const result = await shareService.shareTask("task-123", "public") - - expect(result.success).toBe(true) - expect(mockFetch).toHaveBeenCalledWith("https://app.roocode.com/api/extension/share", { - method: "POST", - headers: { - "Content-Type": "application/json", - Authorization: "Bearer session-token", - "User-Agent": "Roo-Code 1.0.0", - }, - body: JSON.stringify({ taskId: "task-123", visibility: "public" }), - signal: expect.any(AbortSignal), - }) - }) - - it("should default to organization visibility when not specified", async () => { - const mockResponseData = { - success: true, - shareUrl: "https://app.roocode.com/share/abc123", - } - - ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") - mockFetch.mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue(mockResponseData), - }) - - const result = await shareService.shareTask("task-123") - - expect(result.success).toBe(true) - expect(mockFetch).toHaveBeenCalledWith("https://app.roocode.com/api/extension/share", { - method: "POST", - headers: { - "Content-Type": "application/json", - Authorization: "Bearer session-token", - "User-Agent": "Roo-Code 1.0.0", - }, - body: JSON.stringify({ taskId: "task-123", visibility: "organization" }), - signal: expect.any(AbortSignal), - }) - }) - - it("should handle API error response", async () => { - const mockResponseData = { - success: false, - error: "Task not found", - } - - ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") - mockFetch.mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue(mockResponseData), - }) - - const result = await shareService.shareTask("task-123", "organization") - - expect(result.success).toBe(false) - expect(result.error).toBe("Task not found") - }) - - it("should handle authentication errors", async () => { - ;(mockAuthService.getSessionToken as any).mockReturnValue(null) - - await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow("Authentication required") - }) - - it("should handle unexpected errors", async () => { - ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") - mockFetch.mockRejectedValue(new Error("Network error")) - - await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow("Network error") - }) - - it("should throw TaskNotFoundError for 404 responses", async () => { - ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") - mockFetch.mockResolvedValue({ - ok: false, - status: 404, - statusText: "Not Found", - json: vi.fn().mockRejectedValue(new Error("Invalid JSON")), - text: vi.fn().mockResolvedValue("Not Found"), - }) - - await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow(TaskNotFoundError) - await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow("Task not found") - }) - - it("should throw generic Error for non-404 HTTP errors", async () => { - ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") - mockFetch.mockResolvedValue({ - ok: false, - status: 500, - statusText: "Internal Server Error", - json: vi.fn().mockRejectedValue(new Error("Invalid JSON")), - text: vi.fn().mockResolvedValue("Internal Server Error"), - }) - - await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow(CloudAPIError) - await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow( - "HTTP 500: Internal Server Error", - ) - }) - - it("should create TaskNotFoundError with correct properties", async () => { - ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") - mockFetch.mockResolvedValue({ - ok: false, - status: 404, - statusText: "Not Found", - json: vi.fn().mockRejectedValue(new Error("Invalid JSON")), - text: vi.fn().mockResolvedValue("Not Found"), - }) - - try { - await shareService.shareTask("task-123", "organization") - expect.fail("Expected TaskNotFoundError to be thrown") - } catch (error) { - expect(error).toBeInstanceOf(TaskNotFoundError) - expect(error).toBeInstanceOf(Error) - expect((error as TaskNotFoundError).message).toBe("Task not found") - } - }) - }) - - describe("canShareTask", () => { - it("should return true when authenticated and sharing is enabled", async () => { - ;(mockAuthService.isAuthenticated as any).mockReturnValue(true) - ;(mockSettingsService.getSettings as any).mockReturnValue({ - cloudSettings: { - enableTaskSharing: true, - }, - }) - - const result = await shareService.canShareTask() - - expect(result).toBe(true) - }) - - it("should return false when authenticated but sharing is disabled", async () => { - ;(mockAuthService.isAuthenticated as any).mockReturnValue(true) - ;(mockSettingsService.getSettings as any).mockReturnValue({ - cloudSettings: { - enableTaskSharing: false, - }, - }) - - const result = await shareService.canShareTask() - - expect(result).toBe(false) - }) - - it("should return false when authenticated and sharing setting is undefined (default)", async () => { - ;(mockAuthService.isAuthenticated as any).mockReturnValue(true) - ;(mockSettingsService.getSettings as any).mockReturnValue({ - cloudSettings: {}, - }) - - const result = await shareService.canShareTask() - - expect(result).toBe(false) - }) - - it("should return false when authenticated and no settings available (default)", async () => { - ;(mockAuthService.isAuthenticated as any).mockReturnValue(true) - ;(mockSettingsService.getSettings as any).mockReturnValue(undefined) - - const result = await shareService.canShareTask() - - expect(result).toBe(false) - }) - - it("should return false when settings service returns undefined", async () => { - ;(mockSettingsService.getSettings as any).mockReturnValue(undefined) - - const result = await shareService.canShareTask() - - expect(result).toBe(false) - }) - - it("should handle errors gracefully", async () => { - ;(mockSettingsService.getSettings as any).mockImplementation(() => { - throw new Error("Settings error") - }) - - const result = await shareService.canShareTask() - - expect(result).toBe(false) - expect(mockLog).toHaveBeenCalledWith( - "[ShareService] Error checking if task can be shared:", - expect.any(Error), - ) - }) - }) -}) diff --git a/packages/cloud/src/__tests__/RefreshTimer.test.ts b/packages/cloud/src/__tests__/RefreshTimer.test.ts deleted file mode 100644 index 2f87488568..0000000000 --- a/packages/cloud/src/__tests__/RefreshTimer.test.ts +++ /dev/null @@ -1,210 +0,0 @@ -// npx vitest run src/__tests__/RefreshTimer.test.ts - -import type { Mock } from "vitest" - -import { RefreshTimer } from "../RefreshTimer" - -vi.useFakeTimers() - -describe("RefreshTimer", () => { - let mockCallback: Mock - let refreshTimer: RefreshTimer - - beforeEach(() => { - mockCallback = vi.fn() - mockCallback.mockResolvedValue(true) - }) - - afterEach(() => { - if (refreshTimer) { - refreshTimer.stop() - } - - vi.clearAllTimers() - vi.clearAllMocks() - }) - - it("should execute callback immediately when started", () => { - refreshTimer = new RefreshTimer({ - callback: mockCallback, - }) - - refreshTimer.start() - - expect(mockCallback).toHaveBeenCalledTimes(1) - }) - - it("should schedule next attempt after success interval when callback succeeds", async () => { - mockCallback.mockResolvedValue(true) - - refreshTimer = new RefreshTimer({ - callback: mockCallback, - successInterval: 50000, // 50 seconds - }) - - refreshTimer.start() - - // Fast-forward to execute the first callback - await Promise.resolve() - - expect(mockCallback).toHaveBeenCalledTimes(1) - - // Fast-forward 50 seconds - vi.advanceTimersByTime(50000) - - // Callback should be called again - expect(mockCallback).toHaveBeenCalledTimes(2) - }) - - it("should use exponential backoff when callback fails", async () => { - mockCallback.mockResolvedValue(false) - - refreshTimer = new RefreshTimer({ - callback: mockCallback, - initialBackoffMs: 1000, // 1 second - }) - - refreshTimer.start() - - // Fast-forward to execute the first callback - await Promise.resolve() - - expect(mockCallback).toHaveBeenCalledTimes(1) - - // Fast-forward 1 second - vi.advanceTimersByTime(1000) - - // Callback should be called again - expect(mockCallback).toHaveBeenCalledTimes(2) - - // Fast-forward to execute the second callback - await Promise.resolve() - - // Fast-forward 2 seconds - vi.advanceTimersByTime(2000) - - // Callback should be called again - expect(mockCallback).toHaveBeenCalledTimes(3) - - // Fast-forward to execute the third callback - await Promise.resolve() - }) - - it("should not exceed maximum backoff interval", async () => { - mockCallback.mockResolvedValue(false) - - refreshTimer = new RefreshTimer({ - callback: mockCallback, - initialBackoffMs: 1000, // 1 second - maxBackoffMs: 5000, // 5 seconds - }) - - refreshTimer.start() - - // Fast-forward through multiple failures to reach max backoff - await Promise.resolve() // First attempt - vi.advanceTimersByTime(1000) - - await Promise.resolve() // Second attempt (backoff = 2000ms) - vi.advanceTimersByTime(2000) - - await Promise.resolve() // Third attempt (backoff = 4000ms) - vi.advanceTimersByTime(4000) - - await Promise.resolve() // Fourth attempt (backoff would be 8000ms but max is 5000ms) - - // Should be capped at maxBackoffMs (no way to verify without logger) - }) - - it("should reset backoff after a successful attempt", async () => { - // First call fails, second succeeds, third fails - mockCallback.mockResolvedValueOnce(false).mockResolvedValueOnce(true).mockResolvedValueOnce(false) - - refreshTimer = new RefreshTimer({ - callback: mockCallback, - initialBackoffMs: 1000, - successInterval: 5000, - }) - - refreshTimer.start() - - // First attempt (fails) - await Promise.resolve() - - // Fast-forward 1 second - vi.advanceTimersByTime(1000) - - // Second attempt (succeeds) - await Promise.resolve() - - // Fast-forward 5 seconds - vi.advanceTimersByTime(5000) - - // Third attempt (fails) - await Promise.resolve() - - // Backoff should be reset to initial value (no way to verify without logger) - }) - - it("should handle errors in callback as failures", async () => { - mockCallback.mockRejectedValue(new Error("Test error")) - - refreshTimer = new RefreshTimer({ - callback: mockCallback, - initialBackoffMs: 1000, - }) - - refreshTimer.start() - - // Fast-forward to execute the callback - await Promise.resolve() - - // Error should be treated as a failure (no way to verify without logger) - }) - - it("should stop the timer and cancel pending executions", () => { - refreshTimer = new RefreshTimer({ - callback: mockCallback, - }) - - refreshTimer.start() - - // Stop the timer - refreshTimer.stop() - - // Fast-forward a long time - vi.advanceTimersByTime(1000000) - - // Callback should only have been called once (the initial call) - expect(mockCallback).toHaveBeenCalledTimes(1) - }) - - it("should reset the backoff state", async () => { - mockCallback.mockResolvedValue(false) - - refreshTimer = new RefreshTimer({ - callback: mockCallback, - initialBackoffMs: 1000, - }) - - refreshTimer.start() - - // Fast-forward through a few failures - await Promise.resolve() - vi.advanceTimersByTime(1000) - - await Promise.resolve() - vi.advanceTimersByTime(2000) - - // Reset the timer - refreshTimer.reset() - - // Stop and restart to trigger a new execution - refreshTimer.stop() - refreshTimer.start() - - await Promise.resolve() - - // Backoff should be back to initial value (no way to verify without logger) - }) -}) diff --git a/packages/cloud/src/__tests__/StaticSettingsService.test.ts b/packages/cloud/src/__tests__/StaticSettingsService.test.ts deleted file mode 100644 index 26c0ada9cd..0000000000 --- a/packages/cloud/src/__tests__/StaticSettingsService.test.ts +++ /dev/null @@ -1,102 +0,0 @@ -// npx vitest run src/__tests__/StaticSettingsService.test.ts - -import { StaticSettingsService } from "../StaticSettingsService" - -describe("StaticSettingsService", () => { - const validSettings = { - version: 1, - cloudSettings: { - recordTaskMessages: true, - enableTaskSharing: true, - taskShareExpirationDays: 30, - }, - defaultSettings: { - enableCheckpoints: true, - maxOpenTabsContext: 10, - }, - allowList: { - allowAll: false, - providers: { - anthropic: { - allowAll: true, - }, - }, - }, - } - - const validBase64 = Buffer.from(JSON.stringify(validSettings)).toString("base64") - - describe("constructor", () => { - it("should parse valid base64 encoded JSON settings", () => { - const service = new StaticSettingsService(validBase64) - expect(service.getSettings()).toEqual(validSettings) - }) - - it("should throw error for invalid base64", () => { - expect(() => new StaticSettingsService("invalid-base64!@#")).toThrow("Failed to parse static settings") - }) - - it("should throw error for invalid JSON", () => { - const invalidJson = Buffer.from("{ invalid json }").toString("base64") - expect(() => new StaticSettingsService(invalidJson)).toThrow("Failed to parse static settings") - }) - - it("should throw error for invalid schema", () => { - const invalidSettings = { invalid: "schema" } - const invalidBase64 = Buffer.from(JSON.stringify(invalidSettings)).toString("base64") - expect(() => new StaticSettingsService(invalidBase64)).toThrow("Failed to parse static settings") - }) - }) - - describe("getAllowList", () => { - it("should return the allow list from settings", () => { - const service = new StaticSettingsService(validBase64) - expect(service.getAllowList()).toEqual(validSettings.allowList) - }) - }) - - describe("getSettings", () => { - it("should return the parsed settings", () => { - const service = new StaticSettingsService(validBase64) - expect(service.getSettings()).toEqual(validSettings) - }) - }) - - describe("dispose", () => { - it("should be a no-op for static settings", () => { - const service = new StaticSettingsService(validBase64) - expect(() => service.dispose()).not.toThrow() - }) - }) - - describe("logging", () => { - it("should use provided logger for errors", () => { - const mockLog = vi.fn() - expect(() => new StaticSettingsService("invalid-base64!@#", mockLog)).toThrow() - - expect(mockLog).toHaveBeenCalledWith( - expect.stringContaining("[StaticSettingsService] failed to parse static settings:"), - expect.any(Error), - ) - }) - - it("should use console.log as default logger for errors", () => { - const consoleSpy = vi.spyOn(console, "log").mockImplementation(() => {}) - expect(() => new StaticSettingsService("invalid-base64!@#")).toThrow() - - expect(consoleSpy).toHaveBeenCalledWith( - expect.stringContaining("[StaticSettingsService] failed to parse static settings:"), - expect.any(Error), - ) - - consoleSpy.mockRestore() - }) - - it("should not log anything for successful parsing", () => { - const mockLog = vi.fn() - new StaticSettingsService(validBase64, mockLog) - - expect(mockLog).not.toHaveBeenCalled() - }) - }) -}) diff --git a/packages/cloud/src/__tests__/TelemetryClient.test.ts b/packages/cloud/src/__tests__/TelemetryClient.test.ts deleted file mode 100644 index e4c62b1e4e..0000000000 --- a/packages/cloud/src/__tests__/TelemetryClient.test.ts +++ /dev/null @@ -1,738 +0,0 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ - -// npx vitest run src/__tests__/TelemetryClient.test.ts - -import { type TelemetryPropertiesProvider, TelemetryEventName } from "@roo-code/types" - -import { TelemetryClient } from "../TelemetryClient" - -const mockFetch = vi.fn() -global.fetch = mockFetch as any - -describe("TelemetryClient", () => { - const getPrivateProperty = (instance: any, propertyName: string): T => { - return instance[propertyName] - } - - let mockAuthService: any - let mockSettingsService: any - - beforeEach(() => { - vi.clearAllMocks() - - // Create a mock AuthService instead of using the singleton - mockAuthService = { - getSessionToken: vi.fn().mockReturnValue("mock-token"), - getState: vi.fn().mockReturnValue("active-session"), - isAuthenticated: vi.fn().mockReturnValue(true), - hasActiveSession: vi.fn().mockReturnValue(true), - } - - // Create a mock SettingsService - mockSettingsService = { - getSettings: vi.fn().mockReturnValue({ - cloudSettings: { - recordTaskMessages: true, - }, - }), - } - - mockFetch.mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue({}), - }) - - vi.spyOn(console, "info").mockImplementation(() => {}) - vi.spyOn(console, "error").mockImplementation(() => {}) - }) - - afterEach(() => { - vi.restoreAllMocks() - }) - - describe("isEventCapturable", () => { - it("should return true for events not in exclude list", () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( - client, - "isEventCapturable", - ).bind(client) - - expect(isEventCapturable(TelemetryEventName.TASK_CREATED)).toBe(true) - expect(isEventCapturable(TelemetryEventName.LLM_COMPLETION)).toBe(true) - expect(isEventCapturable(TelemetryEventName.MODE_SWITCH)).toBe(true) - expect(isEventCapturable(TelemetryEventName.TOOL_USED)).toBe(true) - }) - - it("should return false for events in exclude list", () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( - client, - "isEventCapturable", - ).bind(client) - - expect(isEventCapturable(TelemetryEventName.TASK_CONVERSATION_MESSAGE)).toBe(false) - }) - - it("should return true for TASK_MESSAGE events when recordTaskMessages is true", () => { - mockSettingsService.getSettings.mockReturnValue({ - cloudSettings: { - recordTaskMessages: true, - }, - }) - - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( - client, - "isEventCapturable", - ).bind(client) - - expect(isEventCapturable(TelemetryEventName.TASK_MESSAGE)).toBe(true) - }) - - it("should return false for TASK_MESSAGE events when recordTaskMessages is false", () => { - mockSettingsService.getSettings.mockReturnValue({ - cloudSettings: { - recordTaskMessages: false, - }, - }) - - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( - client, - "isEventCapturable", - ).bind(client) - - expect(isEventCapturable(TelemetryEventName.TASK_MESSAGE)).toBe(false) - }) - - it("should return false for TASK_MESSAGE events when recordTaskMessages is undefined", () => { - mockSettingsService.getSettings.mockReturnValue({ - cloudSettings: {}, - }) - - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( - client, - "isEventCapturable", - ).bind(client) - - expect(isEventCapturable(TelemetryEventName.TASK_MESSAGE)).toBe(false) - }) - - it("should return false for TASK_MESSAGE events when cloudSettings is undefined", () => { - mockSettingsService.getSettings.mockReturnValue({}) - - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( - client, - "isEventCapturable", - ).bind(client) - - expect(isEventCapturable(TelemetryEventName.TASK_MESSAGE)).toBe(false) - }) - - it("should return false for TASK_MESSAGE events when getSettings returns undefined", () => { - mockSettingsService.getSettings.mockReturnValue(undefined) - - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( - client, - "isEventCapturable", - ).bind(client) - - expect(isEventCapturable(TelemetryEventName.TASK_MESSAGE)).toBe(false) - }) - }) - - describe("getEventProperties", () => { - it("should merge provider properties with event properties", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const mockProvider: TelemetryPropertiesProvider = { - getTelemetryProperties: vi.fn().mockResolvedValue({ - appVersion: "1.0.0", - vscodeVersion: "1.60.0", - platform: "darwin", - editorName: "vscode", - language: "en", - mode: "code", - }), - } - - client.setProvider(mockProvider) - - const getEventProperties = getPrivateProperty< - (event: { event: TelemetryEventName; properties?: Record }) => Promise> - >(client, "getEventProperties").bind(client) - - const result = await getEventProperties({ - event: TelemetryEventName.TASK_CREATED, - properties: { - customProp: "value", - mode: "override", // This should override the provider's mode. - }, - }) - - expect(result).toEqual({ - appVersion: "1.0.0", - vscodeVersion: "1.60.0", - platform: "darwin", - editorName: "vscode", - language: "en", - mode: "override", // Event property takes precedence. - customProp: "value", - }) - - expect(mockProvider.getTelemetryProperties).toHaveBeenCalledTimes(1) - }) - - it("should handle errors from provider gracefully", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const mockProvider: TelemetryPropertiesProvider = { - getTelemetryProperties: vi.fn().mockRejectedValue(new Error("Provider error")), - } - - const consoleErrorSpy = vi.spyOn(console, "error") - - client.setProvider(mockProvider) - - const getEventProperties = getPrivateProperty< - (event: { event: TelemetryEventName; properties?: Record }) => Promise> - >(client, "getEventProperties").bind(client) - - const result = await getEventProperties({ - event: TelemetryEventName.TASK_CREATED, - properties: { customProp: "value" }, - }) - - expect(result).toEqual({ customProp: "value" }) - expect(consoleErrorSpy).toHaveBeenCalledWith( - expect.stringContaining("Error getting telemetry properties: Provider error"), - ) - }) - - it("should return event properties when no provider is set", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const getEventProperties = getPrivateProperty< - (event: { event: TelemetryEventName; properties?: Record }) => Promise> - >(client, "getEventProperties").bind(client) - - const result = await getEventProperties({ - event: TelemetryEventName.TASK_CREATED, - properties: { customProp: "value" }, - }) - - expect(result).toEqual({ customProp: "value" }) - }) - }) - - describe("capture", () => { - it("should not capture events that are not capturable", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - await client.capture({ - event: TelemetryEventName.TASK_CONVERSATION_MESSAGE, // In exclude list. - properties: { test: "value" }, - }) - - expect(mockFetch).not.toHaveBeenCalled() - }) - - it("should not capture TASK_MESSAGE events when recordTaskMessages is false", async () => { - mockSettingsService.getSettings.mockReturnValue({ - cloudSettings: { - recordTaskMessages: false, - }, - }) - - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - await client.capture({ - event: TelemetryEventName.TASK_MESSAGE, - properties: { - taskId: "test-task-id", - message: { - ts: 1, - type: "say", - say: "text", - text: "test message", - }, - }, - }) - - expect(mockFetch).not.toHaveBeenCalled() - }) - - it("should not capture TASK_MESSAGE events when recordTaskMessages is undefined", async () => { - mockSettingsService.getSettings.mockReturnValue({ - cloudSettings: {}, - }) - - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - await client.capture({ - event: TelemetryEventName.TASK_MESSAGE, - properties: { - taskId: "test-task-id", - message: { - ts: 1, - type: "say", - say: "text", - text: "test message", - }, - }, - }) - - expect(mockFetch).not.toHaveBeenCalled() - }) - - it("should not send request when schema validation fails", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - await client.capture({ - event: TelemetryEventName.TASK_CREATED, - properties: { test: "value" }, - }) - - expect(mockFetch).not.toHaveBeenCalled() - expect(console.error).toHaveBeenCalledWith(expect.stringContaining("Invalid telemetry event")) - }) - - it("should send request when event is capturable and validation passes", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const providerProperties = { - appName: "roo-code", - appVersion: "1.0.0", - vscodeVersion: "1.60.0", - platform: "darwin", - editorName: "vscode", - language: "en", - mode: "code", - } - - const eventProperties = { - taskId: "test-task-id", - } - - const mockValidatedData = { - type: TelemetryEventName.TASK_CREATED, - properties: { - ...providerProperties, - taskId: "test-task-id", - }, - } - - const mockProvider: TelemetryPropertiesProvider = { - getTelemetryProperties: vi.fn().mockResolvedValue(providerProperties), - } - - client.setProvider(mockProvider) - - await client.capture({ - event: TelemetryEventName.TASK_CREATED, - properties: eventProperties, - }) - - expect(mockFetch).toHaveBeenCalledWith( - "https://app.roocode.com/api/events", - expect.objectContaining({ - method: "POST", - body: JSON.stringify(mockValidatedData), - }), - ) - }) - - it("should attempt to capture TASK_MESSAGE events when recordTaskMessages is true", async () => { - mockSettingsService.getSettings.mockReturnValue({ - cloudSettings: { - recordTaskMessages: true, - }, - }) - - const eventProperties = { - appName: "roo-code", - appVersion: "1.0.0", - vscodeVersion: "1.60.0", - platform: "darwin", - editorName: "vscode", - language: "en", - mode: "code", - taskId: "test-task-id", - message: { - ts: 1, - type: "say", - say: "text", - text: "test message", - }, - } - - const mockValidatedData = { - type: TelemetryEventName.TASK_MESSAGE, - properties: eventProperties, - } - - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - await client.capture({ - event: TelemetryEventName.TASK_MESSAGE, - properties: eventProperties, - }) - - expect(mockFetch).toHaveBeenCalledWith( - "https://app.roocode.com/api/events", - expect.objectContaining({ - method: "POST", - body: JSON.stringify(mockValidatedData), - }), - ) - }) - - it("should handle fetch errors gracefully", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - mockFetch.mockRejectedValue(new Error("Network error")) - - await expect( - client.capture({ - event: TelemetryEventName.TASK_CREATED, - properties: { test: "value" }, - }), - ).resolves.not.toThrow() - }) - }) - - describe("telemetry state methods", () => { - it("should always return true for isTelemetryEnabled", () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - expect(client.isTelemetryEnabled()).toBe(true) - }) - - it("should have empty implementations for updateTelemetryState and shutdown", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - client.updateTelemetryState(true) - await client.shutdown() - }) - }) - - describe("backfillMessages", () => { - it("should not send request when not authenticated", async () => { - mockAuthService.isAuthenticated.mockReturnValue(false) - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const messages = [ - { - ts: 1, - type: "say" as const, - say: "text" as const, - text: "test message", - }, - ] - - await client.backfillMessages(messages, "test-task-id") - - expect(mockFetch).not.toHaveBeenCalled() - }) - - it("should not send request when no session token available", async () => { - mockAuthService.getSessionToken.mockReturnValue(null) - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const messages = [ - { - ts: 1, - type: "say" as const, - say: "text" as const, - text: "test message", - }, - ] - - await client.backfillMessages(messages, "test-task-id") - - expect(mockFetch).not.toHaveBeenCalled() - expect(console.error).toHaveBeenCalledWith( - "[TelemetryClient#backfillMessages] Unauthorized: No session token available.", - ) - }) - - it("should send FormData request with correct structure when authenticated", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const providerProperties = { - appName: "roo-code", - appVersion: "1.0.0", - vscodeVersion: "1.60.0", - platform: "darwin", - editorName: "vscode", - language: "en", - mode: "code", - } - - const mockProvider: TelemetryPropertiesProvider = { - getTelemetryProperties: vi.fn().mockResolvedValue(providerProperties), - } - - client.setProvider(mockProvider) - - const messages = [ - { - ts: 1, - type: "say" as const, - say: "text" as const, - text: "test message 1", - }, - { - ts: 2, - type: "ask" as const, - ask: "followup" as const, - text: "test question", - }, - ] - - await client.backfillMessages(messages, "test-task-id") - - expect(mockFetch).toHaveBeenCalledWith( - "https://app.roocode.com/api/events/backfill", - expect.objectContaining({ - method: "POST", - headers: { - Authorization: "Bearer mock-token", - }, - body: expect.any(FormData), - }), - ) - - // Verify FormData contents - const call = mockFetch.mock.calls[0] - const formData = call[1].body as FormData - - expect(formData.get("taskId")).toBe("test-task-id") - - // Parse and compare properties as objects since JSON.stringify order can vary - const propertiesJson = formData.get("properties") as string - const parsedProperties = JSON.parse(propertiesJson) - expect(parsedProperties).toEqual({ - taskId: "test-task-id", - ...providerProperties, - }) - // The messages are stored as a File object under the "file" key - const fileField = formData.get("file") as File - expect(fileField).toBeInstanceOf(File) - expect(fileField.name).toBe("task.json") - expect(fileField.type).toBe("application/json") - - // Read the file content to verify the messages - const fileContent = await fileField.text() - expect(fileContent).toBe(JSON.stringify(messages)) - }) - - it("should handle provider errors gracefully", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const mockProvider: TelemetryPropertiesProvider = { - getTelemetryProperties: vi.fn().mockRejectedValue(new Error("Provider error")), - } - - client.setProvider(mockProvider) - - const messages = [ - { - ts: 1, - type: "say" as const, - say: "text" as const, - text: "test message", - }, - ] - - await client.backfillMessages(messages, "test-task-id") - - expect(mockFetch).toHaveBeenCalledWith( - "https://app.roocode.com/api/events/backfill", - expect.objectContaining({ - method: "POST", - headers: { - Authorization: "Bearer mock-token", - }, - body: expect.any(FormData), - }), - ) - - // Verify FormData contents - should still work with just taskId - const call = mockFetch.mock.calls[0] - const formData = call[1].body as FormData - - expect(formData.get("taskId")).toBe("test-task-id") - expect(formData.get("properties")).toBe( - JSON.stringify({ - taskId: "test-task-id", - }), - ) - // The messages are stored as a File object under the "file" key - const fileField = formData.get("file") as File - expect(fileField).toBeInstanceOf(File) - expect(fileField.name).toBe("task.json") - expect(fileField.type).toBe("application/json") - - // Read the file content to verify the messages - const fileContent = await fileField.text() - expect(fileContent).toBe(JSON.stringify(messages)) - }) - - it("should work without provider set", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const messages = [ - { - ts: 1, - type: "say" as const, - say: "text" as const, - text: "test message", - }, - ] - - await client.backfillMessages(messages, "test-task-id") - - expect(mockFetch).toHaveBeenCalledWith( - "https://app.roocode.com/api/events/backfill", - expect.objectContaining({ - method: "POST", - headers: { - Authorization: "Bearer mock-token", - }, - body: expect.any(FormData), - }), - ) - - // Verify FormData contents - should work with just taskId - const call = mockFetch.mock.calls[0] - const formData = call[1].body as FormData - - expect(formData.get("taskId")).toBe("test-task-id") - expect(formData.get("properties")).toBe( - JSON.stringify({ - taskId: "test-task-id", - }), - ) - // The messages are stored as a File object under the "file" key - const fileField = formData.get("file") as File - expect(fileField).toBeInstanceOf(File) - expect(fileField.name).toBe("task.json") - expect(fileField.type).toBe("application/json") - - // Read the file content to verify the messages - const fileContent = await fileField.text() - expect(fileContent).toBe(JSON.stringify(messages)) - }) - - it("should handle fetch errors gracefully", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - mockFetch.mockRejectedValue(new Error("Network error")) - - const messages = [ - { - ts: 1, - type: "say" as const, - say: "text" as const, - text: "test message", - }, - ] - - await expect(client.backfillMessages(messages, "test-task-id")).resolves.not.toThrow() - - expect(console.error).toHaveBeenCalledWith( - expect.stringContaining( - "[TelemetryClient#backfillMessages] Error uploading messages: Error: Network error", - ), - ) - }) - - it("should handle HTTP error responses", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - mockFetch.mockResolvedValue({ - ok: false, - status: 404, - statusText: "Not Found", - }) - - const messages = [ - { - ts: 1, - type: "say" as const, - say: "text" as const, - text: "test message", - }, - ] - - await client.backfillMessages(messages, "test-task-id") - - expect(console.error).toHaveBeenCalledWith( - "[TelemetryClient#backfillMessages] POST events/backfill -> 404 Not Found", - ) - }) - - it("should log debug information when debug is enabled", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService, true) - - const messages = [ - { - ts: 1, - type: "say" as const, - say: "text" as const, - text: "test message", - }, - ] - - await client.backfillMessages(messages, "test-task-id") - - expect(console.info).toHaveBeenCalledWith( - "[TelemetryClient#backfillMessages] Uploading 1 messages for task test-task-id", - ) - expect(console.info).toHaveBeenCalledWith( - "[TelemetryClient#backfillMessages] Successfully uploaded messages for task test-task-id", - ) - }) - - it("should handle empty messages array", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - await client.backfillMessages([], "test-task-id") - - expect(mockFetch).toHaveBeenCalledWith( - "https://app.roocode.com/api/events/backfill", - expect.objectContaining({ - method: "POST", - headers: { - Authorization: "Bearer mock-token", - }, - body: expect.any(FormData), - }), - ) - - // Verify FormData contents - const call = mockFetch.mock.calls[0] - const formData = call[1].body as FormData - - // The messages are stored as a File object under the "file" key - const fileField = formData.get("file") as File - expect(fileField).toBeInstanceOf(File) - expect(fileField.name).toBe("task.json") - expect(fileField.type).toBe("application/json") - - // Read the file content to verify the empty messages array - const fileContent = await fileField.text() - expect(fileContent).toBe("[]") - }) - }) -}) diff --git a/packages/cloud/src/__tests__/auth/StaticTokenAuthService.spec.ts b/packages/cloud/src/__tests__/auth/StaticTokenAuthService.spec.ts deleted file mode 100644 index f1ab7f9abc..0000000000 --- a/packages/cloud/src/__tests__/auth/StaticTokenAuthService.spec.ts +++ /dev/null @@ -1,174 +0,0 @@ -import { describe, it, expect, beforeEach, vi } from "vitest" -import * as vscode from "vscode" - -import { StaticTokenAuthService } from "../../auth/StaticTokenAuthService" - -// Mock vscode -vi.mock("vscode", () => ({ - window: { - showInformationMessage: vi.fn(), - }, - env: { - openExternal: vi.fn(), - uriScheme: "vscode", - }, - Uri: { - parse: vi.fn(), - }, -})) - -describe("StaticTokenAuthService", () => { - let authService: StaticTokenAuthService - let mockContext: vscode.ExtensionContext - let mockLog: (...args: unknown[]) => void - const testToken = "test-static-token" - - beforeEach(() => { - mockLog = vi.fn() - - // Create a minimal mock that satisfies the constructor requirements - const mockContextPartial = { - extension: { - packageJSON: { - publisher: "TestPublisher", - name: "test-extension", - }, - }, - globalState: { - get: vi.fn(), - update: vi.fn(), - }, - secrets: { - get: vi.fn(), - store: vi.fn(), - delete: vi.fn(), - onDidChange: vi.fn(), - }, - subscriptions: [], - } - - // Use type assertion for test mocking - mockContext = mockContextPartial as unknown as vscode.ExtensionContext - - authService = new StaticTokenAuthService(mockContext, testToken, mockLog) - }) - - afterEach(() => { - vi.clearAllMocks() - }) - - describe("constructor", () => { - it("should create instance and log static token mode", () => { - expect(authService).toBeInstanceOf(StaticTokenAuthService) - expect(mockLog).toHaveBeenCalledWith("[auth] Using static token authentication mode") - }) - - it("should use console.log as default logger", () => { - const serviceWithoutLog = new StaticTokenAuthService( - mockContext as unknown as vscode.ExtensionContext, - testToken, - ) - // Can't directly test console.log usage, but constructor should not throw - expect(serviceWithoutLog).toBeInstanceOf(StaticTokenAuthService) - }) - }) - - describe("initialize", () => { - it("should start in active-session state", async () => { - await authService.initialize() - expect(authService.getState()).toBe("active-session") - }) - - it("should emit auth-state-changed event on initialize", async () => { - const spy = vi.fn() - authService.on("auth-state-changed", spy) - - await authService.initialize() - - expect(spy).toHaveBeenCalledWith({ state: "active-session", previousState: "initializing" }) - }) - - it("should log successful initialization", async () => { - await authService.initialize() - expect(mockLog).toHaveBeenCalledWith("[auth] Static token auth service initialized in active-session state") - }) - }) - - describe("getSessionToken", () => { - it("should return the provided token", () => { - expect(authService.getSessionToken()).toBe(testToken) - }) - - it("should return different token when constructed with different token", () => { - const differentToken = "different-token" - const differentService = new StaticTokenAuthService(mockContext, differentToken, mockLog) - expect(differentService.getSessionToken()).toBe(differentToken) - }) - }) - - describe("getUserInfo", () => { - it("should return empty object", () => { - expect(authService.getUserInfo()).toEqual({}) - }) - }) - - describe("getStoredOrganizationId", () => { - it("should return null", () => { - expect(authService.getStoredOrganizationId()).toBeNull() - }) - }) - - describe("authentication state methods", () => { - it("should always return true for isAuthenticated", () => { - expect(authService.isAuthenticated()).toBe(true) - }) - - it("should always return true for hasActiveSession", () => { - expect(authService.hasActiveSession()).toBe(true) - }) - - it("should always return true for hasOrIsAcquiringActiveSession", () => { - expect(authService.hasOrIsAcquiringActiveSession()).toBe(true) - }) - - it("should return active-session for getState", () => { - expect(authService.getState()).toBe("active-session") - }) - }) - - describe("disabled authentication methods", () => { - const expectedErrorMessage = "Authentication methods are disabled in StaticTokenAuthService" - - it("should throw error for login", async () => { - await expect(authService.login()).rejects.toThrow(expectedErrorMessage) - }) - - it("should throw error for logout", async () => { - await expect(authService.logout()).rejects.toThrow(expectedErrorMessage) - }) - - it("should throw error for handleCallback", async () => { - await expect(authService.handleCallback("code", "state")).rejects.toThrow(expectedErrorMessage) - }) - - it("should throw error for handleCallback with organization", async () => { - await expect(authService.handleCallback("code", "state", "org_123")).rejects.toThrow(expectedErrorMessage) - }) - }) - - describe("event emission", () => { - it("should be able to register and emit events", async () => { - const authStateChangedSpy = vi.fn() - const userInfoSpy = vi.fn() - - authService.on("auth-state-changed", authStateChangedSpy) - authService.on("user-info", userInfoSpy) - - await authService.initialize() - - expect(authStateChangedSpy).toHaveBeenCalledWith({ state: "active-session", previousState: "initializing" }) - // user-info event is not emitted in static token mode - expect(userInfoSpy).not.toHaveBeenCalled() - }) - }) -}) diff --git a/packages/cloud/src/__tests__/auth/WebAuthService.spec.ts b/packages/cloud/src/__tests__/auth/WebAuthService.spec.ts deleted file mode 100644 index 82fd964b7f..0000000000 --- a/packages/cloud/src/__tests__/auth/WebAuthService.spec.ts +++ /dev/null @@ -1,1113 +0,0 @@ -// npx vitest run src/__tests__/auth/WebAuthService.spec.ts - -import { type Mock } from "vitest" -import crypto from "crypto" -import * as vscode from "vscode" - -import { WebAuthService } from "../../auth/WebAuthService" -import { RefreshTimer } from "../../RefreshTimer" -import { getClerkBaseUrl, getRooCodeApiUrl } from "../../config" -import { getUserAgent } from "../../utils" - -// Mock external dependencies -vi.mock("../../RefreshTimer") -vi.mock("../../config") -vi.mock("../../utils") -vi.mock("crypto") - -// Mock fetch globally -const mockFetch = vi.fn() -global.fetch = mockFetch - -// Mock vscode module -vi.mock("vscode", () => ({ - window: { - showInformationMessage: vi.fn(), - showErrorMessage: vi.fn(), - }, - env: { - openExternal: vi.fn(), - uriScheme: "vscode", - }, - Uri: { - parse: vi.fn((uri: string) => ({ toString: () => uri })), - }, -})) - -describe("WebAuthService", () => { - let authService: WebAuthService - let mockTimer: { - start: Mock - stop: Mock - reset: Mock - } - let mockLog: Mock - let mockContext: { - subscriptions: { push: Mock } - secrets: { - get: Mock - store: Mock - delete: Mock - onDidChange: Mock - } - globalState: { - get: Mock - update: Mock - } - extension: { - packageJSON: { - version: string - publisher: string - name: string - } - } - } - - beforeEach(() => { - // Reset all mocks - vi.clearAllMocks() - - // Setup mock context with proper subscriptions array - mockContext = { - subscriptions: { - push: vi.fn(), - }, - secrets: { - get: vi.fn().mockResolvedValue(undefined), - store: vi.fn().mockResolvedValue(undefined), - delete: vi.fn().mockResolvedValue(undefined), - onDidChange: vi.fn().mockReturnValue({ dispose: vi.fn() }), - }, - globalState: { - get: vi.fn().mockReturnValue(undefined), - update: vi.fn().mockResolvedValue(undefined), - }, - extension: { - packageJSON: { - version: "1.0.0", - publisher: "RooVeterinaryInc", - name: "roo-cline", - }, - }, - } - - // Setup timer mock - mockTimer = { - start: vi.fn(), - stop: vi.fn(), - reset: vi.fn(), - } - const MockedRefreshTimer = vi.mocked(RefreshTimer) - MockedRefreshTimer.mockImplementation(() => mockTimer as unknown as RefreshTimer) - - // Setup config mocks - use production URL by default to maintain existing test behavior - vi.mocked(getClerkBaseUrl).mockReturnValue("https://clerk.roocode.com") - vi.mocked(getRooCodeApiUrl).mockReturnValue("https://api.test.com") - - // Setup utils mock - vi.mocked(getUserAgent).mockReturnValue("Roo-Code 1.0.0") - - // Setup crypto mock - vi.mocked(crypto.randomBytes).mockReturnValue(Buffer.from("test-random-bytes") as never) - - // Setup log mock - mockLog = vi.fn() - - authService = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - }) - - afterEach(() => { - vi.clearAllMocks() - }) - - describe("constructor", () => { - it("should initialize with correct default values", () => { - expect(authService.getState()).toBe("initializing") - expect(authService.isAuthenticated()).toBe(false) - expect(authService.hasActiveSession()).toBe(false) - expect(authService.getSessionToken()).toBeUndefined() - expect(authService.getUserInfo()).toBeNull() - }) - - it("should create RefreshTimer with correct configuration", () => { - expect(RefreshTimer).toHaveBeenCalledWith({ - callback: expect.any(Function), - successInterval: 50_000, - initialBackoffMs: 1_000, - maxBackoffMs: 300_000, - }) - }) - - it("should use console.log as default logger", () => { - const serviceWithoutLog = new WebAuthService(mockContext as unknown as vscode.ExtensionContext) - // Can't directly test console.log usage, but constructor should not throw - expect(serviceWithoutLog).toBeInstanceOf(WebAuthService) - }) - }) - - describe("initialize", () => { - it("should handle credentials change and setup event listener", async () => { - await authService.initialize() - - expect(mockContext.subscriptions.push).toHaveBeenCalled() - expect(mockContext.secrets.onDidChange).toHaveBeenCalled() - }) - - it("should not initialize twice", async () => { - await authService.initialize() - const firstCallCount = vi.mocked(mockContext.secrets.onDidChange).mock.calls.length - - await authService.initialize() - expect(mockContext.secrets.onDidChange).toHaveBeenCalledTimes(firstCallCount) - expect(mockLog).toHaveBeenCalledWith("[auth] initialize() called after already initialized") - }) - - it("should transition to logged-out when no credentials exist", async () => { - mockContext.secrets.get.mockResolvedValue(undefined) - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - await authService.initialize() - - expect(authService.getState()).toBe("logged-out") - expect(authStateChangedSpy).toHaveBeenCalledWith({ state: "logged-out", previousState: "initializing" }) - }) - - it("should transition to attempting-session when valid credentials exist", async () => { - const credentials = { clientToken: "test-token", sessionId: "test-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - await authService.initialize() - - expect(authService.getState()).toBe("attempting-session") - expect(authStateChangedSpy).toHaveBeenCalledWith({ - state: "attempting-session", - previousState: "initializing", - }) - expect(mockTimer.start).toHaveBeenCalled() - }) - - it("should handle invalid credentials gracefully", async () => { - mockContext.secrets.get.mockResolvedValue("invalid-json") - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - await authService.initialize() - - expect(authService.getState()).toBe("logged-out") - expect(mockLog).toHaveBeenCalledWith("[auth] Failed to parse stored credentials:", expect.any(Error)) - }) - - it("should handle credentials change events", async () => { - let onDidChangeCallback: (e: { key: string }) => void - - mockContext.secrets.onDidChange.mockImplementation((callback: (e: { key: string }) => void) => { - onDidChangeCallback = callback - return { dispose: vi.fn() } - }) - - await authService.initialize() - - // Simulate credentials change event - const newCredentials = { clientToken: "new-token", sessionId: "new-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(newCredentials)) - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - onDidChangeCallback!({ key: "clerk-auth-credentials" }) - await new Promise((resolve) => setTimeout(resolve, 0)) // Wait for async handling - - expect(authStateChangedSpy).toHaveBeenCalled() - }) - }) - - describe("login", () => { - beforeEach(async () => { - await authService.initialize() - }) - - it("should generate state and open external URL", async () => { - const mockOpenExternal = vi.fn() - const vscode = await import("vscode") - vi.mocked(vscode.env.openExternal).mockImplementation(mockOpenExternal) - - await authService.login() - - expect(crypto.randomBytes).toHaveBeenCalledWith(16) - expect(mockContext.globalState.update).toHaveBeenCalledWith( - "clerk-auth-state", - "746573742d72616e646f6d2d6279746573", - ) - expect(mockOpenExternal).toHaveBeenCalledWith( - expect.objectContaining({ - toString: expect.any(Function), - }), - ) - }) - - it("should use package.json values for redirect URI", async () => { - const mockOpenExternal = vi.fn() - const vscode = await import("vscode") - vi.mocked(vscode.env.openExternal).mockImplementation(mockOpenExternal) - - await authService.login() - - const expectedUrl = - "https://api.test.com/extension/sign-in?state=746573742d72616e646f6d2d6279746573&auth_redirect=vscode%3A%2F%2FRooVeterinaryInc.roo-cline" - expect(mockOpenExternal).toHaveBeenCalledWith( - expect.objectContaining({ - toString: expect.any(Function), - }), - ) - - // Verify the actual URL - const calledUri = mockOpenExternal.mock.calls[0][0] - expect(calledUri.toString()).toBe(expectedUrl) - }) - - it("should handle errors during login", async () => { - vi.mocked(crypto.randomBytes).mockImplementation(() => { - throw new Error("Crypto error") - }) - - await expect(authService.login()).rejects.toThrow("Failed to initiate Roo Code Cloud authentication") - expect(mockLog).toHaveBeenCalledWith("[auth] Error initiating Roo Code Cloud auth: Error: Crypto error") - }) - }) - - describe("handleCallback", () => { - beforeEach(async () => { - await authService.initialize() - }) - - it("should handle invalid parameters", async () => { - const vscode = await import("vscode") - const mockShowInfo = vi.fn() - vi.mocked(vscode.window.showInformationMessage).mockImplementation(mockShowInfo) - - await authService.handleCallback(null, "state") - expect(mockShowInfo).toHaveBeenCalledWith("Invalid Roo Code Cloud sign in url") - - await authService.handleCallback("code", null) - expect(mockShowInfo).toHaveBeenCalledWith("Invalid Roo Code Cloud sign in url") - }) - - it("should validate state parameter", async () => { - mockContext.globalState.get.mockReturnValue("stored-state") - - await expect(authService.handleCallback("code", "different-state")).rejects.toThrow( - "Failed to handle Roo Code Cloud callback", - ) - expect(mockLog).toHaveBeenCalledWith("[auth] State mismatch in callback") - }) - - it("should successfully handle valid callback", async () => { - const storedState = "valid-state" - mockContext.globalState.get.mockReturnValue(storedState) - - // Mock successful Clerk sign-in response - const mockResponse = { - ok: true, - json: () => - Promise.resolve({ - response: { created_session_id: "session-123" }, - }), - headers: { - get: (header: string) => (header === "authorization" ? "Bearer token-123" : null), - }, - } - mockFetch.mockResolvedValue(mockResponse) - - const vscode = await import("vscode") - const mockShowInfo = vi.fn() - vi.mocked(vscode.window.showInformationMessage).mockImplementation(mockShowInfo) - - await authService.handleCallback("auth-code", storedState) - - expect(mockContext.secrets.store).toHaveBeenCalledWith( - "clerk-auth-credentials", - JSON.stringify({ clientToken: "Bearer token-123", sessionId: "session-123", organizationId: null }), - ) - expect(mockShowInfo).toHaveBeenCalledWith("Successfully authenticated with Roo Code Cloud") - }) - - it("should handle Clerk API errors", async () => { - const storedState = "valid-state" - mockContext.globalState.get.mockReturnValue(storedState) - - mockFetch.mockResolvedValue({ - ok: false, - status: 400, - statusText: "Bad Request", - }) - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - await expect(authService.handleCallback("auth-code", storedState)).rejects.toThrow( - "Failed to handle Roo Code Cloud callback", - ) - expect(authStateChangedSpy).toHaveBeenCalled() - }) - }) - - describe("logout", () => { - beforeEach(async () => { - await authService.initialize() - }) - - it("should clear credentials and call Clerk logout", async () => { - // Set up credentials first by simulating a login state - const credentials = { clientToken: "test-token", sessionId: "test-session" } - - // Manually set the credentials in the service - authService["credentials"] = credentials - - // Mock successful logout response - mockFetch.mockResolvedValue({ ok: true }) - - const vscode = await import("vscode") - const mockShowInfo = vi.fn() - vi.mocked(vscode.window.showInformationMessage).mockImplementation(mockShowInfo) - - await authService.logout() - - expect(mockContext.secrets.delete).toHaveBeenCalledWith("clerk-auth-credentials") - expect(mockContext.globalState.update).toHaveBeenCalledWith("clerk-auth-state", undefined) - expect(mockFetch).toHaveBeenCalledWith( - "https://clerk.roocode.com/v1/client/sessions/test-session/remove", - expect.objectContaining({ - method: "POST", - headers: expect.objectContaining({ - Authorization: "Bearer test-token", - }), - }), - ) - expect(mockShowInfo).toHaveBeenCalledWith("Logged out from Roo Code Cloud") - }) - - it("should handle logout without credentials", async () => { - const vscode = await import("vscode") - const mockShowInfo = vi.fn() - vi.mocked(vscode.window.showInformationMessage).mockImplementation(mockShowInfo) - - await authService.logout() - - expect(mockContext.secrets.delete).toHaveBeenCalled() - expect(mockFetch).not.toHaveBeenCalled() - expect(mockShowInfo).toHaveBeenCalledWith("Logged out from Roo Code Cloud") - }) - - it("should handle Clerk logout errors gracefully", async () => { - // Set up credentials first by simulating a login state - const credentials = { clientToken: "test-token", sessionId: "test-session" } - - // Manually set the credentials in the service - authService["credentials"] = credentials - - // Mock failed logout response - mockFetch.mockRejectedValue(new Error("Network error")) - - const vscode = await import("vscode") - const mockShowInfo = vi.fn() - vi.mocked(vscode.window.showInformationMessage).mockImplementation(mockShowInfo) - - await authService.logout() - - expect(mockLog).toHaveBeenCalledWith("[auth] Error calling clerkLogout:", expect.any(Error)) - expect(mockShowInfo).toHaveBeenCalledWith("Logged out from Roo Code Cloud") - }) - }) - - describe("state management", () => { - it("should return correct state", () => { - expect(authService.getState()).toBe("initializing") - }) - - it("should return correct authentication status", async () => { - await authService.initialize() - expect(authService.isAuthenticated()).toBe(false) - - // Create a new service instance with credentials - const credentials = { clientToken: "test-token", sessionId: "test-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - - const authenticatedService = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - await authenticatedService.initialize() - - expect(authenticatedService.isAuthenticated()).toBe(true) - expect(authenticatedService.hasActiveSession()).toBe(false) - }) - - it("should return session token only for active sessions", () => { - expect(authService.getSessionToken()).toBeUndefined() - - // Manually set state to active-session for testing - // This would normally happen through refreshSession - authService["state"] = "active-session" - authService["sessionToken"] = "test-jwt" - - expect(authService.getSessionToken()).toBe("test-jwt") - }) - - it("should return correct values for new methods", async () => { - await authService.initialize() - expect(authService.hasOrIsAcquiringActiveSession()).toBe(false) - - // Create a new service instance with credentials (attempting-session) - const credentials = { clientToken: "test-token", sessionId: "test-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - - const attemptingService = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - await attemptingService.initialize() - - expect(attemptingService.hasOrIsAcquiringActiveSession()).toBe(true) - expect(attemptingService.hasActiveSession()).toBe(false) - - // Manually set state to active-session for testing - attemptingService["state"] = "active-session" - expect(attemptingService.hasOrIsAcquiringActiveSession()).toBe(true) - expect(attemptingService.hasActiveSession()).toBe(true) - }) - }) - - describe("session refresh", () => { - beforeEach(async () => { - // Set up with credentials - const credentials = { clientToken: "test-token", sessionId: "test-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - await authService.initialize() - }) - - it("should refresh session successfully", async () => { - // Mock successful token creation and user info fetch - mockFetch - .mockResolvedValueOnce({ - ok: true, - json: () => Promise.resolve({ jwt: "new-jwt-token" }), - }) - .mockResolvedValueOnce({ - ok: true, - json: () => - Promise.resolve({ - response: { - first_name: "John", - last_name: "Doe", - image_url: "https://example.com/avatar.jpg", - primary_email_address_id: "email-1", - email_addresses: [{ id: "email-1", email_address: "john@example.com" }], - }, - }), - }) - - const authStateChangedSpy = vi.fn() - const userInfoSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - authService.on("user-info", userInfoSpy) - - // Trigger refresh by calling the timer callback - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await timerCallback() - - // Wait for async operations to complete - await new Promise((resolve) => setTimeout(resolve, 0)) - - expect(authService.getState()).toBe("active-session") - expect(authService.hasActiveSession()).toBe(true) - expect(authService.getSessionToken()).toBe("new-jwt-token") - expect(authStateChangedSpy).toHaveBeenCalledWith({ - state: "active-session", - previousState: "attempting-session", - }) - expect(userInfoSpy).toHaveBeenCalledWith({ - userInfo: { - name: "John Doe", - email: "john@example.com", - picture: "https://example.com/avatar.jpg", - }, - }) - }) - - it("should handle invalid client token error", async () => { - // Mock 401 response (invalid token) - mockFetch.mockResolvedValue({ - ok: false, - status: 401, - statusText: "Unauthorized", - }) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - - await expect(timerCallback()).rejects.toThrow() - expect(mockContext.secrets.delete).toHaveBeenCalledWith("clerk-auth-credentials") - expect(mockLog).toHaveBeenCalledWith("[auth] Invalid/Expired client token: clearing credentials") - }) - - it("should handle network errors during refresh", async () => { - mockFetch.mockRejectedValue(new Error("Network error")) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - - await expect(timerCallback()).rejects.toThrow("Network error") - expect(mockLog).toHaveBeenCalledWith("[auth] Failed to refresh session", expect.any(Error)) - }) - - it("should transition to inactive-session on first attempt failure", async () => { - // Mock failed token creation response - mockFetch.mockResolvedValue({ - ok: false, - status: 500, - statusText: "Internal Server Error", - }) - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - // Verify we start in attempting-session state - expect(authService.getState()).toBe("attempting-session") - expect(authService["isFirstRefreshAttempt"]).toBe(true) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - - await expect(timerCallback()).rejects.toThrow() - - // Should transition to inactive-session after first failure - expect(authService.getState()).toBe("inactive-session") - expect(authService["isFirstRefreshAttempt"]).toBe(false) - expect(authStateChangedSpy).toHaveBeenCalledWith({ - state: "inactive-session", - previousState: "attempting-session", - }) - }) - - it("should not transition to inactive-session on subsequent failures", async () => { - // First, transition to inactive-session by failing the first attempt - mockFetch.mockResolvedValue({ - ok: false, - status: 500, - statusText: "Internal Server Error", - }) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await expect(timerCallback()).rejects.toThrow() - - // Verify we're now in inactive-session - expect(authService.getState()).toBe("inactive-session") - expect(authService["isFirstRefreshAttempt"]).toBe(false) - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - // Subsequent failure should not trigger another transition - await expect(timerCallback()).rejects.toThrow() - - expect(authService.getState()).toBe("inactive-session") - expect(authStateChangedSpy).not.toHaveBeenCalled() - }) - - it("should clear credentials on 401 during first refresh attempt (bug fix)", async () => { - // Mock 401 response during first refresh attempt - mockFetch.mockResolvedValue({ - ok: false, - status: 401, - statusText: "Unauthorized", - }) - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await expect(timerCallback()).rejects.toThrow() - - // Should clear credentials (not just transition to inactive-session) - expect(mockContext.secrets.delete).toHaveBeenCalledWith("clerk-auth-credentials") - expect(mockLog).toHaveBeenCalledWith("[auth] Invalid/Expired client token: clearing credentials") - - // Simulate credentials cleared event - mockContext.secrets.get.mockResolvedValue(undefined) - await authService["handleCredentialsChange"]() - - expect(authService.getState()).toBe("logged-out") - expect(authStateChangedSpy).toHaveBeenCalledWith({ - state: "logged-out", - previousState: "attempting-session", - }) - }) - }) - - describe("user info", () => { - it("should return null initially", () => { - expect(authService.getUserInfo()).toBeNull() - }) - - it("should parse user info correctly for personal accounts", async () => { - // Set up with credentials for personal account (no organizationId) - const credentials = { clientToken: "test-token", sessionId: "test-session", organizationId: null } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - await authService.initialize() - - // Clear previous mock calls - mockFetch.mockClear() - - // Mock successful responses - mockFetch - .mockResolvedValueOnce({ - ok: true, - json: () => Promise.resolve({ jwt: "jwt-token" }), - }) - .mockResolvedValueOnce({ - ok: true, - json: () => - Promise.resolve({ - response: { - first_name: "Jane", - last_name: "Smith", - image_url: "https://example.com/jane.jpg", - primary_email_address_id: "email-2", - email_addresses: [ - { id: "email-1", email_address: "jane.old@example.com" }, - { id: "email-2", email_address: "jane@example.com" }, - ], - }, - }), - }) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await timerCallback() - - // Wait for async operations to complete - await new Promise((resolve) => setTimeout(resolve, 0)) - - const userInfo = authService.getUserInfo() - expect(userInfo).toEqual({ - name: "Jane Smith", - email: "jane@example.com", - picture: "https://example.com/jane.jpg", - }) - }) - - it("should parse user info correctly for organization accounts", async () => { - // Set up with credentials for organization account - const credentials = { clientToken: "test-token", sessionId: "test-session", organizationId: "org_1" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - await authService.initialize() - - // Clear previous mock calls - mockFetch.mockClear() - - // Mock successful responses - mockFetch - .mockResolvedValueOnce({ - ok: true, - json: () => Promise.resolve({ jwt: "jwt-token" }), - }) - .mockResolvedValueOnce({ - ok: true, - json: () => - Promise.resolve({ - response: { - first_name: "Jane", - last_name: "Smith", - image_url: "https://example.com/jane.jpg", - primary_email_address_id: "email-2", - email_addresses: [ - { id: "email-1", email_address: "jane.old@example.com" }, - { id: "email-2", email_address: "jane@example.com" }, - ], - }, - }), - }) - .mockResolvedValueOnce({ - ok: true, - json: () => - Promise.resolve({ - response: [ - { - id: "org_member_id_1", - role: "member", - organization: { - id: "org_1", - name: "Org 1", - }, - }, - ], - }), - }) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await timerCallback() - - // Wait for async operations to complete - await new Promise((resolve) => setTimeout(resolve, 0)) - - const userInfo = authService.getUserInfo() - expect(userInfo).toEqual({ - name: "Jane Smith", - email: "jane@example.com", - picture: "https://example.com/jane.jpg", - organizationId: "org_1", - organizationName: "Org 1", - organizationRole: "member", - }) - }) - - it("should handle missing user info fields", async () => { - // Set up with credentials for personal account (no organizationId) - const credentials = { clientToken: "test-token", sessionId: "test-session", organizationId: null } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - await authService.initialize() - - // Clear previous mock calls - mockFetch.mockClear() - - // Mock responses with minimal data - mockFetch - .mockResolvedValueOnce({ - ok: true, - json: () => Promise.resolve({ jwt: "jwt-token" }), - }) - .mockResolvedValueOnce({ - ok: true, - json: () => - Promise.resolve({ - response: { - first_name: "John", - last_name: "Doe", - // Missing other fields - }, - }), - }) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await timerCallback() - - // Wait for async operations to complete - await new Promise((resolve) => setTimeout(resolve, 0)) - - const userInfo = authService.getUserInfo() - expect(userInfo).toEqual({ - name: "John Doe", - email: undefined, - picture: undefined, - }) - }) - }) - - describe("event emissions", () => { - it("should emit auth-state-changed event for logged-out", async () => { - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - await authService.initialize() - - expect(authStateChangedSpy).toHaveBeenCalledWith({ state: "logged-out", previousState: "initializing" }) - }) - - it("should emit auth-state-changed event for attempting-session", async () => { - const credentials = { clientToken: "test-token", sessionId: "test-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - await authService.initialize() - - expect(authStateChangedSpy).toHaveBeenCalledWith({ - state: "attempting-session", - previousState: "initializing", - }) - }) - - it("should emit auth-state-changed event for active-session", async () => { - // Set up with credentials - const credentials = { clientToken: "test-token", sessionId: "test-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - await authService.initialize() - - // Clear previous mock calls - mockFetch.mockClear() - - // Mock both the token creation and user info fetch - mockFetch - .mockResolvedValueOnce({ - ok: true, - json: () => Promise.resolve({ jwt: "jwt-token" }), - }) - .mockResolvedValueOnce({ - ok: true, - json: () => - Promise.resolve({ - response: { - first_name: "Test", - last_name: "User", - }, - }), - }) - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await timerCallback() - - // Wait for async operations to complete - await new Promise((resolve) => setTimeout(resolve, 0)) - - expect(authStateChangedSpy).toHaveBeenCalledWith({ - state: "active-session", - previousState: "attempting-session", - }) - }) - - it("should emit user-info event", async () => { - // Set up with credentials - const credentials = { clientToken: "test-token", sessionId: "test-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - await authService.initialize() - - // Clear previous mock calls - mockFetch.mockClear() - - mockFetch - .mockResolvedValueOnce({ - ok: true, - json: () => Promise.resolve({ jwt: "jwt-token" }), - }) - .mockResolvedValueOnce({ - ok: true, - json: () => - Promise.resolve({ - response: { - first_name: "Test", - last_name: "User", - }, - }), - }) - - const userInfoSpy = vi.fn() - authService.on("user-info", userInfoSpy) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await timerCallback() - - // Wait for async operations to complete - await new Promise((resolve) => setTimeout(resolve, 0)) - - expect(userInfoSpy).toHaveBeenCalledWith({ - userInfo: { - name: "Test User", - email: undefined, - picture: undefined, - }, - }) - }) - }) - - describe("error handling", () => { - it("should handle credentials change errors", async () => { - mockContext.secrets.get.mockRejectedValue(new Error("Storage error")) - - await authService.initialize() - - expect(mockLog).toHaveBeenCalledWith("[auth] Error handling credentials change:", expect.any(Error)) - }) - - it("should handle malformed JSON in credentials", async () => { - mockContext.secrets.get.mockResolvedValue("invalid-json{") - - await authService.initialize() - - expect(authService.getState()).toBe("logged-out") - expect(mockLog).toHaveBeenCalledWith("[auth] Failed to parse stored credentials:", expect.any(Error)) - }) - - it("should handle invalid credentials schema", async () => { - mockContext.secrets.get.mockResolvedValue(JSON.stringify({ invalid: "data" })) - - await authService.initialize() - - expect(authService.getState()).toBe("logged-out") - expect(mockLog).toHaveBeenCalledWith("[auth] Invalid credentials format:", expect.any(Array)) - }) - - it("should handle missing authorization header in sign-in response", async () => { - const storedState = "valid-state" - mockContext.globalState.get.mockReturnValue(storedState) - - mockFetch.mockResolvedValue({ - ok: true, - json: () => - Promise.resolve({ - response: { created_session_id: "session-123" }, - }), - headers: { - get: () => null, // No authorization header - }, - }) - - await expect(authService.handleCallback("auth-code", storedState)).rejects.toThrow( - "Failed to handle Roo Code Cloud callback", - ) - }) - }) - - describe("timer integration", () => { - it("should stop timer on logged-out transition", async () => { - await authService.initialize() - - expect(mockTimer.stop).toHaveBeenCalled() - }) - - it("should start timer on attempting-session transition", async () => { - const credentials = { clientToken: "test-token", sessionId: "test-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - - await authService.initialize() - - expect(mockTimer.start).toHaveBeenCalled() - }) - }) - - describe("auth credentials key scoping", () => { - it("should use default key when getClerkBaseUrl returns production URL", async () => { - // Mock getClerkBaseUrl to return production URL - vi.mocked(getClerkBaseUrl).mockReturnValue("https://clerk.roocode.com") - - const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - const credentials = { clientToken: "test-token", sessionId: "test-session" } - - await service.initialize() - await service["storeCredentials"](credentials) - - expect(mockContext.secrets.store).toHaveBeenCalledWith( - "clerk-auth-credentials", - JSON.stringify(credentials), - ) - }) - - it("should use scoped key when getClerkBaseUrl returns custom URL", async () => { - const customUrl = "https://custom.clerk.com" - // Mock getClerkBaseUrl to return custom URL - vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) - - const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - const credentials = { clientToken: "test-token", sessionId: "test-session" } - - await service.initialize() - await service["storeCredentials"](credentials) - - expect(mockContext.secrets.store).toHaveBeenCalledWith( - `clerk-auth-credentials-${customUrl}`, - JSON.stringify(credentials), - ) - }) - - it("should load credentials using scoped key", async () => { - const customUrl = "https://custom.clerk.com" - vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) - - const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - const credentials = { clientToken: "test-token", sessionId: "test-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - - await service.initialize() - const loadedCredentials = await service["loadCredentials"]() - - expect(mockContext.secrets.get).toHaveBeenCalledWith(`clerk-auth-credentials-${customUrl}`) - expect(loadedCredentials).toEqual(credentials) - }) - - it("should clear credentials using scoped key", async () => { - const customUrl = "https://custom.clerk.com" - vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) - - const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - - await service.initialize() - await service["clearCredentials"]() - - expect(mockContext.secrets.delete).toHaveBeenCalledWith(`clerk-auth-credentials-${customUrl}`) - }) - - it("should listen for changes on scoped key", async () => { - const customUrl = "https://custom.clerk.com" - vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) - - let onDidChangeCallback: (e: { key: string }) => void - - mockContext.secrets.onDidChange.mockImplementation((callback: (e: { key: string }) => void) => { - onDidChangeCallback = callback - return { dispose: vi.fn() } - }) - - const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - await service.initialize() - - // Simulate credentials change event with scoped key - const newCredentials = { clientToken: "new-token", sessionId: "new-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(newCredentials)) - - const authStateChangedSpy = vi.fn() - service.on("auth-state-changed", authStateChangedSpy) - - onDidChangeCallback!({ key: `clerk-auth-credentials-${customUrl}` }) - await new Promise((resolve) => setTimeout(resolve, 0)) // Wait for async handling - - expect(authStateChangedSpy).toHaveBeenCalled() - }) - - it("should not respond to changes on different scoped keys", async () => { - const customUrl = "https://custom.clerk.com" - vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) - - let onDidChangeCallback: (e: { key: string }) => void - - mockContext.secrets.onDidChange.mockImplementation((callback: (e: { key: string }) => void) => { - onDidChangeCallback = callback - return { dispose: vi.fn() } - }) - - const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - await service.initialize() - - const authStateChangedSpy = vi.fn() - service.on("auth-state-changed", authStateChangedSpy) - - // Simulate credentials change event with different scoped key - onDidChangeCallback!({ key: "clerk-auth-credentials-https://other.clerk.com" }) - await new Promise((resolve) => setTimeout(resolve, 0)) // Wait for async handling - - expect(authStateChangedSpy).not.toHaveBeenCalled() - }) - - it("should not respond to changes on default key when using scoped key", async () => { - const customUrl = "https://custom.clerk.com" - vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) - - let onDidChangeCallback: (e: { key: string }) => void - - mockContext.secrets.onDidChange.mockImplementation((callback: (e: { key: string }) => void) => { - onDidChangeCallback = callback - return { dispose: vi.fn() } - }) - - const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - await service.initialize() - - const authStateChangedSpy = vi.fn() - service.on("auth-state-changed", authStateChangedSpy) - - // Simulate credentials change event with default key - onDidChangeCallback!({ key: "clerk-auth-credentials" }) - await new Promise((resolve) => setTimeout(resolve, 0)) // Wait for async handling - - expect(authStateChangedSpy).not.toHaveBeenCalled() - }) - }) -}) diff --git a/packages/cloud/src/auth/AuthService.ts b/packages/cloud/src/auth/AuthService.ts deleted file mode 100644 index a49ad0104d..0000000000 --- a/packages/cloud/src/auth/AuthService.ts +++ /dev/null @@ -1,36 +0,0 @@ -import EventEmitter from "events" - -import type { CloudUserInfo } from "@roo-code/types" - -export interface AuthServiceEvents { - "auth-state-changed": [ - data: { - state: AuthState - previousState: AuthState - }, - ] - "user-info": [data: { userInfo: CloudUserInfo }] -} - -export type AuthState = "initializing" | "logged-out" | "active-session" | "attempting-session" | "inactive-session" - -export interface AuthService extends EventEmitter { - // Lifecycle - initialize(): Promise - - // Authentication methods - login(): Promise - logout(): Promise - handleCallback(code: string | null, state: string | null, organizationId?: string | null): Promise - - // State methods - getState(): AuthState - isAuthenticated(): boolean - hasActiveSession(): boolean - hasOrIsAcquiringActiveSession(): boolean - - // Token and user info - getSessionToken(): string | undefined - getUserInfo(): CloudUserInfo | null - getStoredOrganizationId(): string | null -} diff --git a/packages/cloud/src/auth/StaticTokenAuthService.ts b/packages/cloud/src/auth/StaticTokenAuthService.ts deleted file mode 100644 index 04821006d5..0000000000 --- a/packages/cloud/src/auth/StaticTokenAuthService.ts +++ /dev/null @@ -1,71 +0,0 @@ -import EventEmitter from "events" - -import * as vscode from "vscode" - -import type { CloudUserInfo } from "@roo-code/types" - -import type { AuthService, AuthServiceEvents, AuthState } from "./AuthService" - -export class StaticTokenAuthService extends EventEmitter implements AuthService { - private state: AuthState = "active-session" - private token: string - private log: (...args: unknown[]) => void - - constructor(context: vscode.ExtensionContext, token: string, log?: (...args: unknown[]) => void) { - super() - this.token = token - this.log = log || console.log - this.log("[auth] Using static token authentication mode") - } - - public async initialize(): Promise { - const previousState: AuthState = "initializing" - this.state = "active-session" - this.emit("auth-state-changed", { state: this.state, previousState }) - this.log("[auth] Static token auth service initialized in active-session state") - } - - public async login(): Promise { - throw new Error("Authentication methods are disabled in StaticTokenAuthService") - } - - public async logout(): Promise { - throw new Error("Authentication methods are disabled in StaticTokenAuthService") - } - - public async handleCallback( - _code: string | null, - _state: string | null, - _organizationId?: string | null, - ): Promise { - throw new Error("Authentication methods are disabled in StaticTokenAuthService") - } - - public getState(): AuthState { - return this.state - } - - public getSessionToken(): string | undefined { - return this.token - } - - public isAuthenticated(): boolean { - return true - } - - public hasActiveSession(): boolean { - return true - } - - public hasOrIsAcquiringActiveSession(): boolean { - return true - } - - public getUserInfo(): CloudUserInfo | null { - return {} - } - - public getStoredOrganizationId(): string | null { - return null - } -} diff --git a/packages/cloud/src/auth/WebAuthService.ts b/packages/cloud/src/auth/WebAuthService.ts deleted file mode 100644 index b94957950b..0000000000 --- a/packages/cloud/src/auth/WebAuthService.ts +++ /dev/null @@ -1,646 +0,0 @@ -import crypto from "crypto" -import EventEmitter from "events" - -import * as vscode from "vscode" -import { z } from "zod" - -import type { CloudUserInfo, CloudOrganizationMembership } from "@roo-code/types" - -import { getClerkBaseUrl, getRooCodeApiUrl, PRODUCTION_CLERK_BASE_URL } from "../config" -import { getUserAgent } from "../utils" -import { InvalidClientTokenError } from "../errors" -import { RefreshTimer } from "../RefreshTimer" - -import type { AuthService, AuthServiceEvents, AuthState } from "./AuthService" - -const AUTH_STATE_KEY = "clerk-auth-state" - -/** - * AuthCredentials - */ - -const authCredentialsSchema = z.object({ - clientToken: z.string().min(1, "Client token cannot be empty"), - sessionId: z.string().min(1, "Session ID cannot be empty"), - organizationId: z.string().nullable().optional(), -}) - -type AuthCredentials = z.infer - -/** - * Clerk Schemas - */ - -const clerkSignInResponseSchema = z.object({ - response: z.object({ - created_session_id: z.string(), - }), -}) - -const clerkCreateSessionTokenResponseSchema = z.object({ - jwt: z.string(), -}) - -const clerkMeResponseSchema = z.object({ - response: z.object({ - id: z.string().optional(), - first_name: z.string().nullish(), - last_name: z.string().nullish(), - image_url: z.string().optional(), - primary_email_address_id: z.string().optional(), - email_addresses: z - .array( - z.object({ - id: z.string(), - email_address: z.string(), - }), - ) - .optional(), - }), -}) - -const clerkOrganizationMembershipsSchema = z.object({ - response: z.array( - z.object({ - id: z.string(), - role: z.string(), - permissions: z.array(z.string()).optional(), - created_at: z.number().optional(), - updated_at: z.number().optional(), - organization: z.object({ - id: z.string(), - name: z.string(), - slug: z.string().optional(), - image_url: z.string().optional(), - has_image: z.boolean().optional(), - created_at: z.number().optional(), - updated_at: z.number().optional(), - }), - }), - ), -}) - -export class WebAuthService extends EventEmitter implements AuthService { - private context: vscode.ExtensionContext - private timer: RefreshTimer - private state: AuthState = "initializing" - private log: (...args: unknown[]) => void - private readonly authCredentialsKey: string - - private credentials: AuthCredentials | null = null - private sessionToken: string | null = null - private userInfo: CloudUserInfo | null = null - private isFirstRefreshAttempt: boolean = false - - constructor(context: vscode.ExtensionContext, log?: (...args: unknown[]) => void) { - super() - - this.context = context - this.log = log || console.log - - // Calculate auth credentials key based on Clerk base URL. - const clerkBaseUrl = getClerkBaseUrl() - - if (clerkBaseUrl !== PRODUCTION_CLERK_BASE_URL) { - this.authCredentialsKey = `clerk-auth-credentials-${clerkBaseUrl}` - } else { - this.authCredentialsKey = "clerk-auth-credentials" - } - - this.timer = new RefreshTimer({ - callback: async () => { - await this.refreshSession() - return true - }, - successInterval: 50_000, - initialBackoffMs: 1_000, - maxBackoffMs: 300_000, - }) - } - - private changeState(newState: AuthState): void { - const previousState = this.state - this.state = newState - this.emit("auth-state-changed", { state: newState, previousState }) - } - - private async handleCredentialsChange(): Promise { - try { - const credentials = await this.loadCredentials() - - if (credentials) { - if ( - this.credentials === null || - this.credentials.clientToken !== credentials.clientToken || - this.credentials.sessionId !== credentials.sessionId - ) { - this.transitionToAttemptingSession(credentials) - } - } else { - if (this.state !== "logged-out") { - this.transitionToLoggedOut() - } - } - } catch (error) { - this.log("[auth] Error handling credentials change:", error) - } - } - - private transitionToLoggedOut(): void { - this.timer.stop() - - this.credentials = null - this.sessionToken = null - this.userInfo = null - - this.changeState("logged-out") - - this.log("[auth] Transitioned to logged-out state") - } - - private transitionToAttemptingSession(credentials: AuthCredentials): void { - this.credentials = credentials - - this.sessionToken = null - this.userInfo = null - this.isFirstRefreshAttempt = true - - this.changeState("attempting-session") - - this.timer.start() - - this.log("[auth] Transitioned to attempting-session state") - } - - private transitionToInactiveSession(): void { - this.sessionToken = null - this.userInfo = null - - this.changeState("inactive-session") - - this.log("[auth] Transitioned to inactive-session state") - } - - /** - * Initialize the auth state - * - * This method loads tokens from storage and determines the current auth state. - * It also starts the refresh timer if we have an active session. - */ - public async initialize(): Promise { - if (this.state !== "initializing") { - this.log("[auth] initialize() called after already initialized") - return - } - - await this.handleCredentialsChange() - - this.context.subscriptions.push( - this.context.secrets.onDidChange((e) => { - if (e.key === this.authCredentialsKey) { - this.handleCredentialsChange() - } - }), - ) - } - - private async storeCredentials(credentials: AuthCredentials): Promise { - await this.context.secrets.store(this.authCredentialsKey, JSON.stringify(credentials)) - } - - private async loadCredentials(): Promise { - const credentialsJson = await this.context.secrets.get(this.authCredentialsKey) - if (!credentialsJson) return null - - try { - const parsedJson = JSON.parse(credentialsJson) - const credentials = authCredentialsSchema.parse(parsedJson) - - // Migration: If no organizationId but we have userInfo, add it - if (credentials.organizationId === undefined && this.userInfo?.organizationId) { - credentials.organizationId = this.userInfo.organizationId - await this.storeCredentials(credentials) - this.log("[auth] Migrated credentials with organizationId") - } - - return credentials - } catch (error) { - if (error instanceof z.ZodError) { - this.log("[auth] Invalid credentials format:", error.errors) - } else { - this.log("[auth] Failed to parse stored credentials:", error) - } - return null - } - } - - private async clearCredentials(): Promise { - await this.context.secrets.delete(this.authCredentialsKey) - } - - /** - * Start the login process - * - * This method initiates the authentication flow by generating a state parameter - * and opening the browser to the authorization URL. - */ - public async login(): Promise { - try { - // Generate a cryptographically random state parameter. - const state = crypto.randomBytes(16).toString("hex") - await this.context.globalState.update(AUTH_STATE_KEY, state) - const packageJSON = this.context.extension?.packageJSON - const publisher = packageJSON?.publisher ?? "RooVeterinaryInc" - const name = packageJSON?.name ?? "roo-cline" - const params = new URLSearchParams({ - state, - auth_redirect: `${vscode.env.uriScheme}://${publisher}.${name}`, - }) - const url = `${getRooCodeApiUrl()}/extension/sign-in?${params.toString()}` - await vscode.env.openExternal(vscode.Uri.parse(url)) - } catch (error) { - this.log(`[auth] Error initiating Roo Code Cloud auth: ${error}`) - throw new Error(`Failed to initiate Roo Code Cloud authentication: ${error}`) - } - } - - /** - * Handle the callback from Roo Code Cloud - * - * This method is called when the user is redirected back to the extension - * after authenticating with Roo Code Cloud. - * - * @param code The authorization code from the callback - * @param state The state parameter from the callback - * @param organizationId The organization ID from the callback (null for personal accounts) - */ - public async handleCallback( - code: string | null, - state: string | null, - organizationId?: string | null, - ): Promise { - if (!code || !state) { - vscode.window.showInformationMessage("Invalid Roo Code Cloud sign in url") - return - } - - try { - // Validate state parameter to prevent CSRF attacks. - const storedState = this.context.globalState.get(AUTH_STATE_KEY) - - if (state !== storedState) { - this.log("[auth] State mismatch in callback") - throw new Error("Invalid state parameter. Authentication request may have been tampered with.") - } - - const credentials = await this.clerkSignIn(code) - - // Set organizationId (null for personal accounts) - credentials.organizationId = organizationId || null - - await this.storeCredentials(credentials) - - vscode.window.showInformationMessage("Successfully authenticated with Roo Code Cloud") - this.log("[auth] Successfully authenticated with Roo Code Cloud") - } catch (error) { - this.log(`[auth] Error handling Roo Code Cloud callback: ${error}`) - this.changeState("logged-out") - throw new Error(`Failed to handle Roo Code Cloud callback: ${error}`) - } - } - - /** - * Log out - * - * This method removes all stored tokens and stops the refresh timer. - */ - public async logout(): Promise { - const oldCredentials = this.credentials - - try { - // Clear credentials from storage - onDidChange will handle state transitions - await this.clearCredentials() - await this.context.globalState.update(AUTH_STATE_KEY, undefined) - - if (oldCredentials) { - try { - await this.clerkLogout(oldCredentials) - } catch (error) { - this.log("[auth] Error calling clerkLogout:", error) - } - } - - vscode.window.showInformationMessage("Logged out from Roo Code Cloud") - this.log("[auth] Logged out from Roo Code Cloud") - } catch (error) { - this.log(`[auth] Error logging out from Roo Code Cloud: ${error}`) - throw new Error(`Failed to log out from Roo Code Cloud: ${error}`) - } - } - - public getState(): AuthState { - return this.state - } - - public getSessionToken(): string | undefined { - if (this.state === "active-session" && this.sessionToken) { - return this.sessionToken - } - - return - } - - /** - * Check if the user is authenticated - * - * @returns True if the user is authenticated (has an active, attempting, or inactive session) - */ - public isAuthenticated(): boolean { - return ( - this.state === "active-session" || this.state === "attempting-session" || this.state === "inactive-session" - ) - } - - public hasActiveSession(): boolean { - return this.state === "active-session" - } - - /** - * Check if the user has an active session or is currently attempting to acquire one - * - * @returns True if the user has an active session or is attempting to get one - */ - public hasOrIsAcquiringActiveSession(): boolean { - return this.state === "active-session" || this.state === "attempting-session" - } - - /** - * Refresh the session - * - * This method refreshes the session token using the client token. - */ - private async refreshSession(): Promise { - if (!this.credentials) { - this.log("[auth] Cannot refresh session: missing credentials") - return - } - - try { - const previousState = this.state - this.sessionToken = await this.clerkCreateSessionToken() - - if (previousState !== "active-session") { - this.changeState("active-session") - this.log("[auth] Transitioned to active-session state") - this.fetchUserInfo() - } else { - this.state = "active-session" - } - } catch (error) { - if (error instanceof InvalidClientTokenError) { - this.log("[auth] Invalid/Expired client token: clearing credentials") - this.clearCredentials() - } else if (this.isFirstRefreshAttempt && this.state === "attempting-session") { - this.isFirstRefreshAttempt = false - this.transitionToInactiveSession() - } - this.log("[auth] Failed to refresh session", error) - throw error - } - } - - private async fetchUserInfo(): Promise { - if (!this.credentials) { - return - } - - this.userInfo = await this.clerkMe() - this.emit("user-info", { userInfo: this.userInfo }) - } - - /** - * Extract user information from the ID token - * - * @returns User information from ID token claims or null if no ID token available - */ - public getUserInfo(): CloudUserInfo | null { - return this.userInfo - } - - /** - * Get the stored organization ID from credentials - * - * @returns The stored organization ID, null for personal accounts or if no credentials exist - */ - public getStoredOrganizationId(): string | null { - return this.credentials?.organizationId || null - } - - private async clerkSignIn(ticket: string): Promise { - const formData = new URLSearchParams() - formData.append("strategy", "ticket") - formData.append("ticket", ticket) - - const response = await fetch(`${getClerkBaseUrl()}/v1/client/sign_ins`, { - method: "POST", - headers: { - "Content-Type": "application/x-www-form-urlencoded", - "User-Agent": this.userAgent(), - }, - body: formData.toString(), - signal: AbortSignal.timeout(10000), - }) - - if (!response.ok) { - throw new Error(`HTTP ${response.status}: ${response.statusText}`) - } - - const { - response: { created_session_id: sessionId }, - } = clerkSignInResponseSchema.parse(await response.json()) - - // 3. Extract the client token from the Authorization header. - const clientToken = response.headers.get("authorization") - - if (!clientToken) { - throw new Error("No authorization header found in the response") - } - - return authCredentialsSchema.parse({ clientToken, sessionId }) - } - - private async clerkCreateSessionToken(): Promise { - const formData = new URLSearchParams() - formData.append("_is_native", "1") - - // Handle 3 cases for organization_id: - // 1. Have an org id: organization_id=THE_ORG_ID - // 2. Have a personal account: organization_id= (empty string) - // 3. Don't know if you have an org id (old style credentials): don't send organization_id param at all - const organizationId = this.getStoredOrganizationId() - if (this.credentials?.organizationId !== undefined) { - // We have organization context info (either org id or personal account) - formData.append("organization_id", organizationId || "") - } - // If organizationId is undefined, don't send the param at all (old credentials) - - const response = await fetch(`${getClerkBaseUrl()}/v1/client/sessions/${this.credentials!.sessionId}/tokens`, { - method: "POST", - headers: { - "Content-Type": "application/x-www-form-urlencoded", - Authorization: `Bearer ${this.credentials!.clientToken}`, - "User-Agent": this.userAgent(), - }, - body: formData.toString(), - signal: AbortSignal.timeout(10000), - }) - - if (response.status === 401 || response.status === 404) { - throw new InvalidClientTokenError() - } else if (!response.ok) { - throw new Error(`HTTP ${response.status}: ${response.statusText}`) - } - - const data = clerkCreateSessionTokenResponseSchema.parse(await response.json()) - - return data.jwt - } - - private async clerkMe(): Promise { - const response = await fetch(`${getClerkBaseUrl()}/v1/me`, { - headers: { - Authorization: `Bearer ${this.credentials!.clientToken}`, - "User-Agent": this.userAgent(), - }, - signal: AbortSignal.timeout(10000), - }) - - if (!response.ok) { - throw new Error(`HTTP ${response.status}: ${response.statusText}`) - } - - const payload = await response.json() - const { response: userData } = clerkMeResponseSchema.parse(payload) - - const userInfo: CloudUserInfo = { - id: userData.id, - picture: userData.image_url, - } - - const names = [userData.first_name, userData.last_name].filter((name) => !!name) - userInfo.name = names.length > 0 ? names.join(" ") : undefined - const primaryEmailAddressId = userData.primary_email_address_id - const emailAddresses = userData.email_addresses - - if (primaryEmailAddressId && emailAddresses) { - userInfo.email = emailAddresses.find( - (email: { id: string }) => primaryEmailAddressId === email.id, - )?.email_address - } - - // Fetch organization info if user is in organization context - try { - const storedOrgId = this.getStoredOrganizationId() - - if (this.credentials?.organizationId !== undefined) { - // We have organization context info - if (storedOrgId !== null) { - // User is in organization context - fetch user's memberships and filter - const orgMemberships = await this.clerkGetOrganizationMemberships() - const userMembership = this.findOrganizationMembership(orgMemberships, storedOrgId) - - if (userMembership) { - this.setUserOrganizationInfo(userInfo, userMembership) - - this.log("[auth] User in organization context:", { - id: userMembership.organization.id, - name: userMembership.organization.name, - role: userMembership.role, - }) - } else { - this.log("[auth] Warning: User not found in stored organization:", storedOrgId) - } - } else { - this.log("[auth] User in personal account context - not setting organization info") - } - } else { - // Old credentials without organization context - fetch organization info to determine context - const orgMemberships = await this.clerkGetOrganizationMemberships() - const primaryOrgMembership = this.findPrimaryOrganizationMembership(orgMemberships) - - if (primaryOrgMembership) { - this.setUserOrganizationInfo(userInfo, primaryOrgMembership) - - this.log("[auth] Legacy credentials: Found organization membership:", { - id: primaryOrgMembership.organization.id, - name: primaryOrgMembership.organization.name, - role: primaryOrgMembership.role, - }) - } else { - this.log("[auth] Legacy credentials: No organization memberships found") - } - } - } catch (error) { - this.log("[auth] Failed to fetch organization info:", error) - // Don't throw - organization info is optional - } - - return userInfo - } - - private findOrganizationMembership( - memberships: CloudOrganizationMembership[], - organizationId: string, - ): CloudOrganizationMembership | undefined { - return memberships?.find((membership) => membership.organization.id === organizationId) - } - - private findPrimaryOrganizationMembership( - memberships: CloudOrganizationMembership[], - ): CloudOrganizationMembership | undefined { - return memberships && memberships.length > 0 ? memberships[0] : undefined - } - - private setUserOrganizationInfo(userInfo: CloudUserInfo, membership: CloudOrganizationMembership): void { - userInfo.organizationId = membership.organization.id - userInfo.organizationName = membership.organization.name - userInfo.organizationRole = membership.role - userInfo.organizationImageUrl = membership.organization.image_url - } - - private async clerkGetOrganizationMemberships(): Promise { - const response = await fetch(`${getClerkBaseUrl()}/v1/me/organization_memberships`, { - headers: { - Authorization: `Bearer ${this.credentials!.clientToken}`, - "User-Agent": this.userAgent(), - }, - signal: AbortSignal.timeout(10000), - }) - - return clerkOrganizationMembershipsSchema.parse(await response.json()).response - } - - private async clerkLogout(credentials: AuthCredentials): Promise { - const formData = new URLSearchParams() - formData.append("_is_native", "1") - - const response = await fetch(`${getClerkBaseUrl()}/v1/client/sessions/${credentials.sessionId}/remove`, { - method: "POST", - headers: { - "Content-Type": "application/x-www-form-urlencoded", - Authorization: `Bearer ${credentials.clientToken}`, - "User-Agent": this.userAgent(), - }, - body: formData.toString(), - signal: AbortSignal.timeout(10000), - }) - - if (!response.ok) { - throw new Error(`HTTP ${response.status}: ${response.statusText}`) - } - } - - private userAgent(): string { - return getUserAgent(this.context) - } -} diff --git a/packages/cloud/src/auth/index.ts b/packages/cloud/src/auth/index.ts deleted file mode 100644 index b04a805295..0000000000 --- a/packages/cloud/src/auth/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export type { AuthService, AuthServiceEvents, AuthState } from "./AuthService" -export { WebAuthService } from "./WebAuthService" -export { StaticTokenAuthService } from "./StaticTokenAuthService" diff --git a/packages/cloud/src/config.ts b/packages/cloud/src/config.ts deleted file mode 100644 index e682d718ce..0000000000 --- a/packages/cloud/src/config.ts +++ /dev/null @@ -1,5 +0,0 @@ -export const PRODUCTION_CLERK_BASE_URL = "https://clerk.roocode.com" -export const PRODUCTION_ROO_CODE_API_URL = "https://app.roocode.com" - -export const getClerkBaseUrl = () => process.env.CLERK_BASE_URL || PRODUCTION_CLERK_BASE_URL -export const getRooCodeApiUrl = () => process.env.ROO_CODE_API_URL || PRODUCTION_ROO_CODE_API_URL diff --git a/packages/cloud/src/errors.ts b/packages/cloud/src/errors.ts deleted file mode 100644 index 7400f26b39..0000000000 --- a/packages/cloud/src/errors.ts +++ /dev/null @@ -1,42 +0,0 @@ -export class CloudAPIError extends Error { - constructor( - message: string, - public statusCode?: number, - public responseBody?: unknown, - ) { - super(message) - this.name = "CloudAPIError" - Object.setPrototypeOf(this, CloudAPIError.prototype) - } -} - -export class TaskNotFoundError extends CloudAPIError { - constructor(taskId?: string) { - super(taskId ? `Task '${taskId}' not found` : "Task not found", 404) - this.name = "TaskNotFoundError" - Object.setPrototypeOf(this, TaskNotFoundError.prototype) - } -} - -export class AuthenticationError extends CloudAPIError { - constructor(message = "Authentication required") { - super(message, 401) - this.name = "AuthenticationError" - Object.setPrototypeOf(this, AuthenticationError.prototype) - } -} - -export class NetworkError extends CloudAPIError { - constructor(message = "Network error occurred") { - super(message) - this.name = "NetworkError" - Object.setPrototypeOf(this, NetworkError.prototype) - } -} - -export class InvalidClientTokenError extends Error { - constructor() { - super("Invalid/Expired client token") - Object.setPrototypeOf(this, InvalidClientTokenError.prototype) - } -} diff --git a/packages/cloud/src/index.ts b/packages/cloud/src/index.ts deleted file mode 100644 index 55f7d908dd..0000000000 --- a/packages/cloud/src/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from "./config" - -export * from "./CloudAPI" -export * from "./CloudService" diff --git a/packages/cloud/src/types.ts b/packages/cloud/src/types.ts deleted file mode 100644 index 78275b32e2..0000000000 --- a/packages/cloud/src/types.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { AuthServiceEvents } from "./auth" -import { SettingsServiceEvents } from "./CloudSettingsService" - -export type CloudServiceEvents = AuthServiceEvents & SettingsServiceEvents diff --git a/packages/cloud/src/utils.ts b/packages/cloud/src/utils.ts deleted file mode 100644 index cf87aa5e28..0000000000 --- a/packages/cloud/src/utils.ts +++ /dev/null @@ -1,10 +0,0 @@ -import * as vscode from "vscode" - -/** - * Get the User-Agent string for API requests - * @param context Optional extension context for more accurate version detection - * @returns User-Agent string in format "Roo-Code {version}" - */ -export function getUserAgent(context?: vscode.ExtensionContext): string { - return `Roo-Code ${context?.extension?.packageJSON?.version || "unknown"}` -} diff --git a/packages/cloud/tsconfig.json b/packages/cloud/tsconfig.json deleted file mode 100644 index f599e2220d..0000000000 --- a/packages/cloud/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "@roo-code/config-typescript/vscode-library.json", - "include": ["src"], - "exclude": ["node_modules"] -} diff --git a/packages/cloud/vitest.config.ts b/packages/cloud/vitest.config.ts deleted file mode 100644 index 569f167543..0000000000 --- a/packages/cloud/vitest.config.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { defineConfig } from "vitest/config" - -export default defineConfig({ - test: { - globals: true, - environment: "node", - watch: false, - }, - resolve: { - alias: { - vscode: new URL("./src/__mocks__/vscode.ts", import.meta.url).pathname, - }, - }, -}) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3e7bb79b64..b2847df1a1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -353,34 +353,6 @@ importers: specifier: ^3.2.3 version: 3.2.4(@types/debug@4.1.12)(@types/node@20.17.57)(@vitest/ui@3.2.4)(jiti@2.4.2)(jsdom@26.1.0)(lightningcss@1.30.1)(tsx@4.19.4)(yaml@2.8.0) - packages/cloud: - dependencies: - '@roo-code/telemetry': - specifier: workspace:^ - version: link:../telemetry - '@roo-code/types': - specifier: workspace:^ - version: link:../types - zod: - specifier: ^3.25.61 - version: 3.25.61 - devDependencies: - '@roo-code/config-eslint': - specifier: workspace:^ - version: link:../config-eslint - '@roo-code/config-typescript': - specifier: workspace:^ - version: link:../config-typescript - '@types/node': - specifier: 20.x - version: 20.17.57 - '@types/vscode': - specifier: ^1.84.0 - version: 1.100.0 - vitest: - specifier: ^3.2.3 - version: 3.2.4(@types/debug@4.1.12)(@types/node@20.17.57)(@vitest/ui@3.2.4)(jiti@2.4.2)(jsdom@26.1.0)(lightningcss@1.30.1)(tsx@4.19.4)(yaml@2.8.0) - packages/config-eslint: devDependencies: '@eslint/js': @@ -591,8 +563,8 @@ importers: specifier: ^1.14.0 version: 1.14.0(typescript@5.8.3) '@roo-code/cloud': - specifier: workspace:^ - version: link:../packages/cloud + specifier: ^0.4.0 + version: 0.4.0 '@roo-code/ipc': specifier: workspace:^ version: link:../packages/ipc @@ -685,7 +657,7 @@ importers: version: 12.0.0 openai: specifier: ^5.0.0 - version: 5.5.1(ws@8.18.2)(zod@3.25.61) + version: 5.5.1(ws@8.18.3)(zod@3.25.61) os-name: specifier: ^6.0.0 version: 6.1.0 @@ -1447,6 +1419,10 @@ packages: resolution: {integrity: sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==} engines: {node: '>=6.9.0'} + '@babel/runtime@7.28.2': + resolution: {integrity: sha512-KHp2IflsnGywDjBWDkR9iEqiWSpc8GIi0lgTT3mOElT0PP1tG26P4tmFI2YvAdzgq9RGyoHZQEIEdZy6Ec5xCA==} + engines: {node: '>=6.9.0'} + '@babel/template@7.27.2': resolution: {integrity: sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==} engines: {node: '>=6.9.0'} @@ -1957,6 +1933,9 @@ packages: cpu: [x64] os: [win32] + '@ioredis/commands@1.3.0': + resolution: {integrity: sha512-M/T6Zewn7sDaBQEqIZ8Rb+i9y8qfGmq+5SDFSf9sA2lUZTmdDLVdOiQaeDp+Q4wElZ9HG1GAX5KhDaidp6LQsQ==} + '@isaacs/cliui@8.0.2': resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} engines: {node: '>=12'} @@ -2008,16 +1987,16 @@ packages: '@libsql/client@0.15.8': resolution: {integrity: sha512-TskygwF+ToZeWhPPT0WennyGrP3tmkKraaKopT2YwUjqD6DWDRm6SG5iy0VqnaO+HC9FNBCDX0oQPODU3gqqPQ==} - '@libsql/core@0.15.9': - resolution: {integrity: sha512-4OVdeAmuaCUq5hYT8NNn0nxlO9AcA/eTjXfUZ+QK8MT3Dz7Z76m73x7KxjU6I64WyXX98dauVH2b9XM+d84npw==} + '@libsql/core@0.15.10': + resolution: {integrity: sha512-fAMD+GnGQNdZ9zxeNC8AiExpKnou/97GJWkiDDZbTRHj3c9dvF1y4jsRQ0WE72m/CqTdbMGyU98yL0SJ9hQVeg==} - '@libsql/darwin-arm64@0.5.13': - resolution: {integrity: sha512-ASz/EAMLDLx3oq9PVvZ4zBXXHbz2TxtxUwX2xpTRFR4V4uSHAN07+jpLu3aK5HUBLuv58z7+GjaL5w/cyjR28Q==} + '@libsql/darwin-arm64@0.5.17': + resolution: {integrity: sha512-WTYG2skZsUnZmfZ2v7WFj7s3/5s2PfrYBZOWBKOnxHA8g4XCDc/4bFDaqob9Q2e88+GC7cWeJ8VNkVBFpD2Xxg==} cpu: [arm64] os: [darwin] - '@libsql/darwin-x64@0.5.13': - resolution: {integrity: sha512-kzglniv1difkq8opusSXM7u9H0WoEPeKxw0ixIfcGfvlCVMJ+t9UNtXmyNHW68ljdllje6a4C6c94iPmIYafYA==} + '@libsql/darwin-x64@0.5.17': + resolution: {integrity: sha512-ab0RlTR4KYrxgjNrZhAhY/10GibKoq6G0W4oi0kdm+eYiAv/Ip8GDMpSaZdAcoKA4T+iKR/ehczKHnMEB8MFxA==} cpu: [x64] os: [darwin] @@ -2031,38 +2010,38 @@ packages: '@libsql/isomorphic-ws@0.1.5': resolution: {integrity: sha512-DtLWIH29onUYR00i0GlQ3UdcTRC6EP4u9w/h9LxpUZJWRMARk6dQwZ6Jkd+QdwVpuAOrdxt18v0K2uIYR3fwFg==} - '@libsql/linux-arm-gnueabihf@0.5.13': - resolution: {integrity: sha512-UEW+VZN2r0mFkfztKOS7cqfS8IemuekbjUXbXCwULHtusww2QNCXvM5KU9eJCNE419SZCb0qaEWYytcfka8qeA==} + '@libsql/linux-arm-gnueabihf@0.5.17': + resolution: {integrity: sha512-PcASh4k47RqC+kMWAbLUKf1y6Do0q8vnUGi0yhKY4ghJcimMExViBimjbjYRSa+WIb/zh3QxNoXOhQAXx3tiuw==} cpu: [arm] os: [linux] - '@libsql/linux-arm-musleabihf@0.5.13': - resolution: {integrity: sha512-NMDgLqryYBv4Sr3WoO/m++XDjR5KLlw9r/JK4Ym6A1XBv2bxQQNhH0Lxx3bjLW8qqhBD4+0xfms4d2cOlexPyA==} + '@libsql/linux-arm-musleabihf@0.5.17': + resolution: {integrity: sha512-vxOkSLG9Wspit+SNle84nuIzMtr2G2qaxFzW7BhsZBjlZ8+kErf9RXcT2YJQdJYxmBYRbsOrc91gg0jLEQVCqg==} cpu: [arm] os: [linux] - '@libsql/linux-arm64-gnu@0.5.13': - resolution: {integrity: sha512-/wCxVdrwl1ee6D6LEjwl+w4SxuLm5UL9Kb1LD5n0bBGs0q+49ChdPPh7tp175iRgkcrTgl23emymvt1yj3KxVQ==} + '@libsql/linux-arm64-gnu@0.5.17': + resolution: {integrity: sha512-L8jnaN01TxjBJlDuDTX2W2BKzBkAOhcnKfCOf3xzvvygblxnDOK0whkYwIXeTfwtd/rr4jN/d6dZD/bcHiDxEQ==} cpu: [arm64] os: [linux] - '@libsql/linux-arm64-musl@0.5.13': - resolution: {integrity: sha512-xnVAbZIanUgX57XqeI5sNaDnVilp0Di5syCLSEo+bRyBobe/1IAeehNZpyVbCy91U2N6rH1C/mZU7jicVI9x+A==} + '@libsql/linux-arm64-musl@0.5.17': + resolution: {integrity: sha512-HfFD7TzQtmmTwyQsuiHhWZdMRtdNpKJ1p4tbMMTMRECk+971NFHrj69D64cc2ClVTAmn7fA9XibKPil7WN/Q7w==} cpu: [arm64] os: [linux] - '@libsql/linux-x64-gnu@0.5.13': - resolution: {integrity: sha512-/mfMRxcQAI9f8t7tU3QZyh25lXgXKzgin9B9TOSnchD73PWtsVhlyfA6qOCfjQl5kr4sHscdXD5Yb3KIoUgrpQ==} + '@libsql/linux-x64-gnu@0.5.17': + resolution: {integrity: sha512-5l3XxWqUPVFrtX0xnZaXwqsXs0BFbP4w6ahRFTPSdXU50YBfUOajFznJRB6bJTMsCvraDSD0IkHhjSNfrE1CuQ==} cpu: [x64] os: [linux] - '@libsql/linux-x64-musl@0.5.13': - resolution: {integrity: sha512-rdefPTpQCVwUjIQYbDLMv3qpd5MdrT0IeD0UZPGqhT9AWU8nJSQoj2lfyIDAWEz7PPOVCY4jHuEn7FS2sw9kRA==} + '@libsql/linux-x64-musl@0.5.17': + resolution: {integrity: sha512-FvSpWlwc+dIeYIFYlsSv+UdQ/NiZWr+SstwVji+QZ//8NnvzwWQU9cgP+Vpps6Qiq4jyYQm9chJhTYOVT9Y3BA==} cpu: [x64] os: [linux] - '@libsql/win32-x64-msvc@0.5.13': - resolution: {integrity: sha512-aNcmDrD1Ws+dNZIv9ECbxBQumqB9MlSVEykwfXJpqv/593nABb8Ttg5nAGUPtnADyaGDTrGvPPP81d/KsKho4Q==} + '@libsql/win32-x64-msvc@0.5.17': + resolution: {integrity: sha512-f5bGH8+3A5sn6Lrqg8FsQ09a1pYXPnKGXGTFiAYlfQXVst1tUTxDTugnuWcJYKXyzDe/T7ccxyIZXeSmPOhq8A==} cpu: [x64] os: [win32] @@ -3086,6 +3065,12 @@ packages: cpu: [x64] os: [win32] + '@roo-code/cloud@0.4.0': + resolution: {integrity: sha512-1a27RG2YjQFfsU5UlfbQnpj/K/6gYBcysp2FXaX9+VaaTh5ZzReQeHJ9uREnyE059zoFpVuNywwNxGadzyotWw==} + + '@roo-code/types@1.42.0': + resolution: {integrity: sha512-AITVSV6WFd17jE8lQXFy7PkHam8M+mMkT7o9ipGZZ3cV7SbrnmL/Hg/HjkA9lkdJYbcC5dEK94py8KVBQn8Umw==} + '@sec-ant/readable-stream@0.4.1': resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==} @@ -3886,8 +3871,8 @@ packages: '@types/node@20.19.1': resolution: {integrity: sha512-jJD50LtlD2dodAEO653i3YF04NWak6jN3ky+Ri3Em3mGR39/glWiboM/IePaRbgwSfqM1TpGXfAg8ohn/4dTgA==} - '@types/node@20.19.4': - resolution: {integrity: sha512-OP+We5WV8Xnbuvw0zC2m4qfB/BJvjyCwtNjhHdJxV1639SGSKrLmJkc3fMnp2Qy8nJyHp8RO6umxELN/dS1/EA==} + '@types/node@20.19.9': + resolution: {integrity: sha512-cuVNgarYWZqxRJDQHEB58GEONhOK79QVR/qYx4S7kcUObQvUwvFnYxJuuHUKm2aieN9X3yZB4LZsuYNU1Qphsw==} '@types/node@22.15.29': resolution: {integrity: sha512-LNdjOkUDlU1RZb8e1kOIUpN1qQUlzGkEtbVNo53vbrwDg5om6oduhm4SiUaPW5ASTXhAiP0jInWG8Qx9fVlOeQ==} @@ -5105,6 +5090,10 @@ packages: resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} engines: {node: '>=0.4.0'} + denque@2.1.0: + resolution: {integrity: sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==} + engines: {node: '>=0.10'} + depd@2.0.0: resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==} engines: {node: '>= 0.8'} @@ -6278,6 +6267,10 @@ packages: resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==} engines: {node: '>=12'} + ioredis@5.7.0: + resolution: {integrity: sha512-NUcA93i1lukyXU+riqEyPtSEkyFq8tX90uL659J+qpCZ3rEdViB/APC58oAhIh3+bJln2hzdlZbBZsGNrlsR8g==} + engines: {node: '>=12.22.0'} + ip-address@9.0.5: resolution: {integrity: sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==} engines: {node: '>= 12'} @@ -6745,8 +6738,8 @@ packages: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} - libsql@0.5.13: - resolution: {integrity: sha512-5Bwoa/CqzgkTwySgqHA5TsaUDRrdLIbdM4egdPcaAnqO3aC+qAgS6BwdzuZwARA5digXwiskogZ8H7Yy4XfdOg==} + libsql@0.5.17: + resolution: {integrity: sha512-RRlj5XQI9+Wq+/5UY8EnugSWfRmHEw4hn3DKlPrkUgZONsge1PwTtHcpStP6MSNi8ohcbsRgEHJaymA33a8cBw==} cpu: [x64, arm64, wasm32, arm] os: [darwin, linux, win32] @@ -6946,6 +6939,9 @@ packages: lodash.includes@4.3.0: resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==} + lodash.isarguments@3.1.0: + resolution: {integrity: sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==} + lodash.isboolean@3.0.3: resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==} @@ -8269,6 +8265,14 @@ packages: resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==} engines: {node: '>=8'} + redis-errors@1.2.0: + resolution: {integrity: sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==} + engines: {node: '>=4'} + + redis-parser@3.0.0: + resolution: {integrity: sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==} + engines: {node: '>=4'} + redis@5.5.5: resolution: {integrity: sha512-x7vpciikEY7nptGzQrE5I+/pvwFZJDadPk/uEoyGSg/pZ2m/CX2n5EhSgUh+S5T7Gz3uKM6YzWcXEu3ioAsdFQ==} engines: {node: '>= 18'} @@ -8682,6 +8686,9 @@ packages: stacktrace-js@2.0.2: resolution: {integrity: sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg==} + standard-as-callback@2.1.0: + resolution: {integrity: sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==} + statuses@2.0.1: resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} engines: {node: '>= 0.8'} @@ -9781,6 +9788,9 @@ packages: zod@3.25.61: resolution: {integrity: sha512-fzfJgUw78LTNnHujj9re1Ov/JJQkRZZGDMcYqSx7Hp4rPOkKywaFHq0S6GoHeXs0wGNE/sIOutkXgnwzrVOGCQ==} + zod@3.25.76: + resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==} + zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} @@ -10535,6 +10545,8 @@ snapshots: '@babel/runtime@7.27.6': {} + '@babel/runtime@7.28.2': {} + '@babel/template@7.27.2': dependencies: '@babel/code-frame': 7.27.1 @@ -11076,6 +11088,8 @@ snapshots: '@img/sharp-win32-x64@0.33.5': optional: true + '@ioredis/commands@1.3.0': {} + '@isaacs/cliui@8.0.2': dependencies: string-width: 5.1.2 @@ -11135,25 +11149,25 @@ snapshots: '@libsql/client@0.15.8': dependencies: - '@libsql/core': 0.15.9 + '@libsql/core': 0.15.10 '@libsql/hrana-client': 0.7.0 js-base64: 3.7.7 - libsql: 0.5.13 + libsql: 0.5.17 promise-limit: 2.7.0 transitivePeerDependencies: - bufferutil - utf-8-validate optional: true - '@libsql/core@0.15.9': + '@libsql/core@0.15.10': dependencies: js-base64: 3.7.7 optional: true - '@libsql/darwin-arm64@0.5.13': + '@libsql/darwin-arm64@0.5.17': optional: true - '@libsql/darwin-x64@0.5.13': + '@libsql/darwin-x64@0.5.17': optional: true '@libsql/hrana-client@0.7.0': @@ -11179,25 +11193,25 @@ snapshots: - utf-8-validate optional: true - '@libsql/linux-arm-gnueabihf@0.5.13': + '@libsql/linux-arm-gnueabihf@0.5.17': optional: true - '@libsql/linux-arm-musleabihf@0.5.13': + '@libsql/linux-arm-musleabihf@0.5.17': optional: true - '@libsql/linux-arm64-gnu@0.5.13': + '@libsql/linux-arm64-gnu@0.5.17': optional: true - '@libsql/linux-arm64-musl@0.5.13': + '@libsql/linux-arm64-musl@0.5.17': optional: true - '@libsql/linux-x64-gnu@0.5.13': + '@libsql/linux-x64-gnu@0.5.17': optional: true - '@libsql/linux-x64-musl@0.5.13': + '@libsql/linux-x64-musl@0.5.17': optional: true - '@libsql/win32-x64-msvc@0.5.13': + '@libsql/win32-x64-msvc@0.5.17': optional: true '@lmstudio/lms-isomorphic@0.4.5': @@ -12177,6 +12191,17 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.40.2': optional: true + '@roo-code/cloud@0.4.0': + dependencies: + '@roo-code/types': 1.42.0 + ioredis: 5.7.0 + p-wait-for: 5.0.2 + zod: 3.25.76 + transitivePeerDependencies: + - supports-color + + '@roo-code/types@1.42.0': {} + '@sec-ant/readable-stream@0.4.1': {} '@sevinf/maybe@0.5.0': {} @@ -12876,7 +12901,7 @@ snapshots: '@testing-library/dom@10.4.0': dependencies: '@babel/code-frame': 7.27.1 - '@babel/runtime': 7.27.6 + '@babel/runtime': 7.28.2 '@types/aria-query': 5.0.4 aria-query: 5.3.0 chalk: 4.1.2 @@ -13164,7 +13189,7 @@ snapshots: dependencies: undici-types: 6.21.0 - '@types/node@20.19.4': + '@types/node@20.19.9': dependencies: undici-types: 6.21.0 optional: true @@ -13232,7 +13257,7 @@ snapshots: '@types/ws@8.18.1': dependencies: - '@types/node': 20.19.4 + '@types/node': 20.19.9 optional: true '@types/yargs-parser@21.0.3': {} @@ -14557,6 +14582,8 @@ snapshots: delayed-stream@1.0.0: {} + denque@2.1.0: {} + depd@2.0.0: {} dequal@2.0.3: {} @@ -15936,6 +15963,20 @@ snapshots: internmap@2.0.3: {} + ioredis@5.7.0: + dependencies: + '@ioredis/commands': 1.3.0 + cluster-key-slot: 1.1.2 + debug: 4.4.1(supports-color@8.1.1) + denque: 2.1.0 + lodash.defaults: 4.2.0 + lodash.isarguments: 3.1.0 + redis-errors: 1.2.0 + redis-parser: 3.0.0 + standard-as-callback: 2.1.0 + transitivePeerDependencies: + - supports-color + ip-address@9.0.5: dependencies: jsbn: 1.1.0 @@ -16426,20 +16467,20 @@ snapshots: prelude-ls: 1.2.1 type-check: 0.4.0 - libsql@0.5.13: + libsql@0.5.17: dependencies: '@neon-rs/load': 0.0.4 detect-libc: 2.0.2 optionalDependencies: - '@libsql/darwin-arm64': 0.5.13 - '@libsql/darwin-x64': 0.5.13 - '@libsql/linux-arm-gnueabihf': 0.5.13 - '@libsql/linux-arm-musleabihf': 0.5.13 - '@libsql/linux-arm64-gnu': 0.5.13 - '@libsql/linux-arm64-musl': 0.5.13 - '@libsql/linux-x64-gnu': 0.5.13 - '@libsql/linux-x64-musl': 0.5.13 - '@libsql/win32-x64-msvc': 0.5.13 + '@libsql/darwin-arm64': 0.5.17 + '@libsql/darwin-x64': 0.5.17 + '@libsql/linux-arm-gnueabihf': 0.5.17 + '@libsql/linux-arm-musleabihf': 0.5.17 + '@libsql/linux-arm64-gnu': 0.5.17 + '@libsql/linux-arm64-musl': 0.5.17 + '@libsql/linux-x64-gnu': 0.5.17 + '@libsql/linux-x64-musl': 0.5.17 + '@libsql/win32-x64-msvc': 0.5.17 optional: true lie@3.3.0: @@ -16604,6 +16645,8 @@ snapshots: lodash.includes@4.3.0: {} + lodash.isarguments@3.1.0: {} + lodash.isboolean@3.0.3: {} lodash.isequal@4.5.0: {} @@ -17520,9 +17563,9 @@ snapshots: is-inside-container: 1.0.0 is-wsl: 3.1.0 - openai@5.5.1(ws@8.18.2)(zod@3.25.61): + openai@5.5.1(ws@8.18.3)(zod@3.25.61): optionalDependencies: - ws: 8.18.2 + ws: 8.18.3 zod: 3.25.61 option@0.2.4: {} @@ -18272,6 +18315,12 @@ snapshots: indent-string: 4.0.0 strip-indent: 3.0.0 + redis-errors@1.2.0: {} + + redis-parser@3.0.0: + dependencies: + redis-errors: 1.2.0 + redis@5.5.5: dependencies: '@redis/bloom': 5.5.5(@redis/client@5.5.5) @@ -18825,6 +18874,8 @@ snapshots: stack-generator: 2.0.10 stacktrace-gps: 3.1.2 + standard-as-callback@2.1.0: {} + statuses@2.0.1: {} std-env@3.9.0: {} @@ -20142,4 +20193,6 @@ snapshots: zod@3.25.61: {} + zod@3.25.76: {} + zwitch@2.0.4: {} diff --git a/src/extension.ts b/src/extension.ts index 60c61aada7..beb69b30b5 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -76,12 +76,25 @@ export async function activate(context: vscode.ExtensionContext) { // Initialize Roo Code Cloud service. const cloudService = await CloudService.createInstance(context, cloudLogger) + + try { + if (cloudService.telemetryClient) { + TelemetryService.instance.register(cloudService.telemetryClient) + } + } catch (error) { + outputChannel.appendLine( + `[CloudService] Failed to register TelemetryClient: ${error instanceof Error ? error.message : String(error)}`, + ) + } + const postStateListener = () => { ClineProvider.getVisibleInstance()?.postStateToWebview() } + cloudService.on("auth-state-changed", postStateListener) cloudService.on("user-info", postStateListener) cloudService.on("settings-updated", postStateListener) + // Add to subscriptions for proper cleanup on deactivate context.subscriptions.push(cloudService) diff --git a/src/package.json b/src/package.json index cf60242533..aa2110dfd5 100644 --- a/src/package.json +++ b/src/package.json @@ -420,7 +420,7 @@ "@mistralai/mistralai": "^1.3.6", "@modelcontextprotocol/sdk": "^1.9.0", "@qdrant/js-client-rest": "^1.14.0", - "@roo-code/cloud": "workspace:^", + "@roo-code/cloud": "^0.4.0", "@roo-code/ipc": "workspace:^", "@roo-code/telemetry": "workspace:^", "@roo-code/types": "workspace:^", From 2882d99ea8243e9a51322aa60e348b125533ae56 Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Mon, 4 Aug 2025 00:23:08 -0400 Subject: [PATCH 056/253] Remove 'Initial Checkpoint' terminology, use 'Checkpoint' consistently (#6643) Co-authored-by: Roo Code --- src/core/checkpoints/index.ts | 4 ++-- src/services/checkpoints/ShadowCheckpointService.ts | 5 ++--- .../checkpoints/__tests__/ShadowCheckpointService.spec.ts | 1 - src/services/checkpoints/types.ts | 1 - .../src/components/chat/checkpoints/CheckpointSaved.tsx | 4 +--- webview-ui/src/components/chat/checkpoints/schema.ts | 1 - webview-ui/src/i18n/locales/ca/chat.json | 1 - webview-ui/src/i18n/locales/de/chat.json | 1 - webview-ui/src/i18n/locales/en/chat.json | 1 - webview-ui/src/i18n/locales/es/chat.json | 1 - webview-ui/src/i18n/locales/fr/chat.json | 1 - webview-ui/src/i18n/locales/hi/chat.json | 1 - webview-ui/src/i18n/locales/id/chat.json | 1 - webview-ui/src/i18n/locales/it/chat.json | 1 - webview-ui/src/i18n/locales/ja/chat.json | 1 - webview-ui/src/i18n/locales/ko/chat.json | 1 - webview-ui/src/i18n/locales/nl/chat.json | 1 - webview-ui/src/i18n/locales/pl/chat.json | 1 - webview-ui/src/i18n/locales/pt-BR/chat.json | 1 - webview-ui/src/i18n/locales/ru/chat.json | 1 - webview-ui/src/i18n/locales/tr/chat.json | 1 - webview-ui/src/i18n/locales/vi/chat.json | 1 - webview-ui/src/i18n/locales/zh-CN/chat.json | 1 - webview-ui/src/i18n/locales/zh-TW/chat.json | 1 - 24 files changed, 5 insertions(+), 29 deletions(-) diff --git a/src/core/checkpoints/index.ts b/src/core/checkpoints/index.ts index f08dc24e16..25ae1a2032 100644 --- a/src/core/checkpoints/index.ts +++ b/src/core/checkpoints/index.ts @@ -134,12 +134,12 @@ async function checkGitInstallation( cline.checkpointServiceInitializing = false }) - service.on("checkpoint", ({ isFirst, fromHash: from, toHash: to }) => { + service.on("checkpoint", ({ fromHash: from, toHash: to }) => { try { provider?.postMessageToWebview({ type: "currentCheckpointUpdated", text: to }) cline - .say("checkpoint_saved", to, undefined, undefined, { isFirst, from, to }, undefined, { + .say("checkpoint_saved", to, undefined, undefined, { from, to }, undefined, { isNonInteractive: true, }) .catch((err) => { diff --git a/src/services/checkpoints/ShadowCheckpointService.ts b/src/services/checkpoints/ShadowCheckpointService.ts index 280cbd8118..03e019ed60 100644 --- a/src/services/checkpoints/ShadowCheckpointService.ts +++ b/src/services/checkpoints/ShadowCheckpointService.ts @@ -215,14 +215,13 @@ export abstract class ShadowCheckpointService extends EventEmitter { await this.stageAll(this.git) const commitArgs = options?.allowEmpty ? { "--allow-empty": null } : undefined const result = await this.git.commit(message, commitArgs) - const isFirst = this._checkpoints.length === 0 const fromHash = this._checkpoints[this._checkpoints.length - 1] ?? this.baseHash! const toHash = result.commit || fromHash this._checkpoints.push(toHash) const duration = Date.now() - startTime - if (isFirst || result.commit) { - this.emit("checkpoint", { type: "checkpoint", isFirst, fromHash, toHash, duration }) + if (result.commit) { + this.emit("checkpoint", { type: "checkpoint", fromHash, toHash, duration }) } if (result.commit) { diff --git a/src/services/checkpoints/__tests__/ShadowCheckpointService.spec.ts b/src/services/checkpoints/__tests__/ShadowCheckpointService.spec.ts index cba8eee8ba..4bf2529d59 100644 --- a/src/services/checkpoints/__tests__/ShadowCheckpointService.spec.ts +++ b/src/services/checkpoints/__tests__/ShadowCheckpointService.spec.ts @@ -693,7 +693,6 @@ describe.each([[RepoPerTaskCheckpointService, "RepoPerTaskCheckpointService"]])( expect(eventData.type).toBe("checkpoint") expect(eventData.toHash).toBe(result?.commit) expect(typeof eventData.duration).toBe("number") - expect(typeof eventData.isFirst).toBe("boolean") // Can be true or false depending on checkpoint history }) it("does not emit checkpoint event when no changes and allowEmpty=false", async () => { diff --git a/src/services/checkpoints/types.ts b/src/services/checkpoints/types.ts index 0b49c7266d..7513dae87b 100644 --- a/src/services/checkpoints/types.ts +++ b/src/services/checkpoints/types.ts @@ -25,7 +25,6 @@ export interface CheckpointEventMap { initialize: { type: "initialize"; workspaceDir: string; baseHash: string; created: boolean; duration: number } checkpoint: { type: "checkpoint" - isFirst: boolean fromHash: string toHash: string duration: number diff --git a/webview-ui/src/components/chat/checkpoints/CheckpointSaved.tsx b/webview-ui/src/components/chat/checkpoints/CheckpointSaved.tsx index 8daf0a3089..12ff65c86a 100644 --- a/webview-ui/src/components/chat/checkpoints/CheckpointSaved.tsx +++ b/webview-ui/src/components/chat/checkpoints/CheckpointSaved.tsx @@ -37,9 +37,7 @@ export const CheckpointSaved = ({ checkpoint, ...props }: CheckpointSavedProps)
    - - {metadata.isFirst ? t("chat:checkpoint.initial") : t("chat:checkpoint.regular")} - + {t("chat:checkpoint.regular")} {isCurrent && {t("chat:checkpoint.current")}}
    diff --git a/webview-ui/src/components/chat/checkpoints/schema.ts b/webview-ui/src/components/chat/checkpoints/schema.ts index 4acd32a6ab..3c72a75560 100644 --- a/webview-ui/src/components/chat/checkpoints/schema.ts +++ b/webview-ui/src/components/chat/checkpoints/schema.ts @@ -1,7 +1,6 @@ import { z } from "zod" export const checkpointSchema = z.object({ - isFirst: z.boolean(), from: z.string(), to: z.string(), }) diff --git a/webview-ui/src/i18n/locales/ca/chat.json b/webview-ui/src/i18n/locales/ca/chat.json index 2188e9b706..e83051c0dc 100644 --- a/webview-ui/src/i18n/locales/ca/chat.json +++ b/webview-ui/src/i18n/locales/ca/chat.json @@ -139,7 +139,6 @@ "streamingFailed": "Transmissió API ha fallat" }, "checkpoint": { - "initial": "Punt de control inicial", "regular": "Punt de control", "initializingWarning": "Encara s'està inicialitzant el punt de control... Si això triga massa, pots desactivar els punts de control a la configuració i reiniciar la teva tasca.", "menu": { diff --git a/webview-ui/src/i18n/locales/de/chat.json b/webview-ui/src/i18n/locales/de/chat.json index a9c2a385f9..345277eb7c 100644 --- a/webview-ui/src/i18n/locales/de/chat.json +++ b/webview-ui/src/i18n/locales/de/chat.json @@ -139,7 +139,6 @@ "streamingFailed": "API-Streaming fehlgeschlagen" }, "checkpoint": { - "initial": "Initialer Checkpoint", "regular": "Checkpoint", "initializingWarning": "Checkpoint wird noch initialisiert... Falls dies zu lange dauert, kannst du Checkpoints in den Einstellungen deaktivieren und deine Aufgabe neu starten.", "menu": { diff --git a/webview-ui/src/i18n/locales/en/chat.json b/webview-ui/src/i18n/locales/en/chat.json index 48d55172a5..07bcd770d7 100644 --- a/webview-ui/src/i18n/locales/en/chat.json +++ b/webview-ui/src/i18n/locales/en/chat.json @@ -145,7 +145,6 @@ "streamingFailed": "API Streaming Failed" }, "checkpoint": { - "initial": "Initial Checkpoint", "regular": "Checkpoint", "initializingWarning": "Still initializing checkpoint... If this takes too long, you can disable checkpoints in settings and restart your task.", "menu": { diff --git a/webview-ui/src/i18n/locales/es/chat.json b/webview-ui/src/i18n/locales/es/chat.json index e1cd0b262a..22c255dcb0 100644 --- a/webview-ui/src/i18n/locales/es/chat.json +++ b/webview-ui/src/i18n/locales/es/chat.json @@ -139,7 +139,6 @@ "streamingFailed": "Transmisión API falló" }, "checkpoint": { - "initial": "Punto de control inicial", "regular": "Punto de control", "initializingWarning": "Todavía inicializando el punto de control... Si esto tarda demasiado, puedes desactivar los puntos de control en la configuración y reiniciar tu tarea.", "menu": { diff --git a/webview-ui/src/i18n/locales/fr/chat.json b/webview-ui/src/i18n/locales/fr/chat.json index b06ed48ea9..e790440345 100644 --- a/webview-ui/src/i18n/locales/fr/chat.json +++ b/webview-ui/src/i18n/locales/fr/chat.json @@ -139,7 +139,6 @@ "streamingFailed": "Échec du streaming API" }, "checkpoint": { - "initial": "Point de contrôle initial", "regular": "Point de contrôle", "initializingWarning": "Initialisation du point de contrôle en cours... Si cela prend trop de temps, tu peux désactiver les points de contrôle dans les paramètres et redémarrer ta tâche.", "menu": { diff --git a/webview-ui/src/i18n/locales/hi/chat.json b/webview-ui/src/i18n/locales/hi/chat.json index 1c912c3d70..fc0785a7b8 100644 --- a/webview-ui/src/i18n/locales/hi/chat.json +++ b/webview-ui/src/i18n/locales/hi/chat.json @@ -139,7 +139,6 @@ "streamingFailed": "API स्ट्रीमिंग विफल हुई" }, "checkpoint": { - "initial": "प्रारंभिक चेकपॉइंट", "regular": "चेकपॉइंट", "initializingWarning": "चेकपॉइंट अभी भी आरंभ हो रहा है... अगर यह बहुत समय ले रहा है, तो आप सेटिंग्स में चेकपॉइंट को अक्षम कर सकते हैं और अपने कार्य को पुनः आरंभ कर सकते हैं।", "menu": { diff --git a/webview-ui/src/i18n/locales/id/chat.json b/webview-ui/src/i18n/locales/id/chat.json index 2a4345191e..ea2fcd63b5 100644 --- a/webview-ui/src/i18n/locales/id/chat.json +++ b/webview-ui/src/i18n/locales/id/chat.json @@ -148,7 +148,6 @@ "streamingFailed": "Streaming API Gagal" }, "checkpoint": { - "initial": "Checkpoint Awal", "regular": "Checkpoint", "initializingWarning": "Masih menginisialisasi checkpoint... Jika ini terlalu lama, kamu bisa menonaktifkan checkpoint di pengaturan dan restart tugas.", "menu": { diff --git a/webview-ui/src/i18n/locales/it/chat.json b/webview-ui/src/i18n/locales/it/chat.json index d36a20f3da..e82ffee145 100644 --- a/webview-ui/src/i18n/locales/it/chat.json +++ b/webview-ui/src/i18n/locales/it/chat.json @@ -142,7 +142,6 @@ "streamingFailed": "Streaming API fallito" }, "checkpoint": { - "initial": "Checkpoint iniziale", "regular": "Checkpoint", "initializingWarning": "Inizializzazione del checkpoint in corso... Se questa operazione richiede troppo tempo, puoi disattivare i checkpoint nelle impostazioni e riavviare l'attività.", "menu": { diff --git a/webview-ui/src/i18n/locales/ja/chat.json b/webview-ui/src/i18n/locales/ja/chat.json index 1b268f007d..bdc5df0324 100644 --- a/webview-ui/src/i18n/locales/ja/chat.json +++ b/webview-ui/src/i18n/locales/ja/chat.json @@ -139,7 +139,6 @@ "streamingFailed": "APIストリーミング失敗" }, "checkpoint": { - "initial": "初期チェックポイント", "regular": "チェックポイント", "initializingWarning": "チェックポイントの初期化中... 時間がかかりすぎる場合は、設定でチェックポイントを無効にしてタスクを再開できます。", "menu": { diff --git a/webview-ui/src/i18n/locales/ko/chat.json b/webview-ui/src/i18n/locales/ko/chat.json index 147ed8fa5b..01fa97989a 100644 --- a/webview-ui/src/i18n/locales/ko/chat.json +++ b/webview-ui/src/i18n/locales/ko/chat.json @@ -139,7 +139,6 @@ "streamingFailed": "API 스트리밍 실패" }, "checkpoint": { - "initial": "초기 체크포인트", "regular": "체크포인트", "initializingWarning": "체크포인트 초기화 중... 시간이 너무 오래 걸리면 설정에서 체크포인트를 비활성화하고 작업을 다시 시작할 수 있습니다.", "menu": { diff --git a/webview-ui/src/i18n/locales/nl/chat.json b/webview-ui/src/i18n/locales/nl/chat.json index 9789f634a5..70406c6e2b 100644 --- a/webview-ui/src/i18n/locales/nl/chat.json +++ b/webview-ui/src/i18n/locales/nl/chat.json @@ -134,7 +134,6 @@ "streamingFailed": "API-streaming mislukt" }, "checkpoint": { - "initial": "Initiële checkpoint", "regular": "Checkpoint", "initializingWarning": "Checkpoint wordt nog steeds geïnitialiseerd... Als dit te lang duurt, kun je checkpoints uitschakelen in de instellingen en je taak opnieuw starten.", "menu": { diff --git a/webview-ui/src/i18n/locales/pl/chat.json b/webview-ui/src/i18n/locales/pl/chat.json index ff1c1dbe89..6dd805b133 100644 --- a/webview-ui/src/i18n/locales/pl/chat.json +++ b/webview-ui/src/i18n/locales/pl/chat.json @@ -139,7 +139,6 @@ "streamingFailed": "Strumieniowanie API nie powiodło się" }, "checkpoint": { - "initial": "Początkowy punkt kontrolny", "regular": "Punkt kontrolny", "initializingWarning": "Trwa inicjalizacja punktu kontrolnego... Jeśli to trwa zbyt długo, możesz wyłączyć punkty kontrolne w ustawieniach i uruchomić zadanie ponownie.", "menu": { diff --git a/webview-ui/src/i18n/locales/pt-BR/chat.json b/webview-ui/src/i18n/locales/pt-BR/chat.json index 69f197ad2e..d8898b6e53 100644 --- a/webview-ui/src/i18n/locales/pt-BR/chat.json +++ b/webview-ui/src/i18n/locales/pt-BR/chat.json @@ -139,7 +139,6 @@ "streamingFailed": "Streaming API falhou" }, "checkpoint": { - "initial": "Ponto de verificação inicial", "regular": "Ponto de verificação", "initializingWarning": "Ainda inicializando ponto de verificação... Se isso demorar muito, você pode desativar os pontos de verificação nas configurações e reiniciar sua tarefa.", "menu": { diff --git a/webview-ui/src/i18n/locales/ru/chat.json b/webview-ui/src/i18n/locales/ru/chat.json index 579d688a5a..76b74b98a0 100644 --- a/webview-ui/src/i18n/locales/ru/chat.json +++ b/webview-ui/src/i18n/locales/ru/chat.json @@ -134,7 +134,6 @@ "streamingFailed": "Ошибка потокового API-запроса" }, "checkpoint": { - "initial": "Начальная точка сохранения", "regular": "Точка сохранения", "initializingWarning": "Точка сохранения еще инициализируется... Если это занимает слишком много времени, вы можете отключить точки сохранения в настройках и перезапустить задачу.", "menu": { diff --git a/webview-ui/src/i18n/locales/tr/chat.json b/webview-ui/src/i18n/locales/tr/chat.json index a9ffb31f90..272d4ddcf2 100644 --- a/webview-ui/src/i18n/locales/tr/chat.json +++ b/webview-ui/src/i18n/locales/tr/chat.json @@ -139,7 +139,6 @@ "streamingFailed": "API Akışı Başarısız" }, "checkpoint": { - "initial": "İlk Kontrol Noktası", "regular": "Kontrol Noktası", "initializingWarning": "Kontrol noktası hala başlatılıyor... Bu çok uzun sürerse, ayarlar bölümünden kontrol noktalarını devre dışı bırakabilir ve görevinizi yeniden başlatabilirsiniz.", "menu": { diff --git a/webview-ui/src/i18n/locales/vi/chat.json b/webview-ui/src/i18n/locales/vi/chat.json index dc24e40122..36045d9573 100644 --- a/webview-ui/src/i18n/locales/vi/chat.json +++ b/webview-ui/src/i18n/locales/vi/chat.json @@ -139,7 +139,6 @@ "streamingFailed": "Streaming API thất bại" }, "checkpoint": { - "initial": "Điểm kiểm tra ban đầu", "regular": "Điểm kiểm tra", "initializingWarning": "Đang khởi tạo điểm kiểm tra... Nếu quá trình này mất quá nhiều thời gian, bạn có thể vô hiệu hóa điểm kiểm tra trong cài đặt và khởi động lại tác vụ của bạn.", "menu": { diff --git a/webview-ui/src/i18n/locales/zh-CN/chat.json b/webview-ui/src/i18n/locales/zh-CN/chat.json index 6035ff78bf..85e053cf1a 100644 --- a/webview-ui/src/i18n/locales/zh-CN/chat.json +++ b/webview-ui/src/i18n/locales/zh-CN/chat.json @@ -139,7 +139,6 @@ "streamingFailed": "API流式传输失败" }, "checkpoint": { - "initial": "初始检查点", "regular": "检查点", "initializingWarning": "正在初始化检查点...如果耗时过长，你可以在设置中禁用检查点并重新启动任务。", "menu": { diff --git a/webview-ui/src/i18n/locales/zh-TW/chat.json b/webview-ui/src/i18n/locales/zh-TW/chat.json index 63dfd06f1d..eaa2e74767 100644 --- a/webview-ui/src/i18n/locales/zh-TW/chat.json +++ b/webview-ui/src/i18n/locales/zh-TW/chat.json @@ -139,7 +139,6 @@ "streamingFailed": "API 串流處理失敗" }, "checkpoint": { - "initial": "初始檢查點", "regular": "檢查點", "initializingWarning": "正在初始化檢查點...如果耗時過長，你可以在設定中停用檢查點並重新啟動任務。", "menu": { From 603c6c6aea128cb6687306953ee17fa8480ed323 Mon Sep 17 00:00:00 2001 From: NaccOll Date: Mon, 4 Aug 2025 21:52:21 +0800 Subject: [PATCH 057/253] style: update highlightLayer style and align to textarea (#6648) --- webview-ui/src/components/chat/ChatTextArea.tsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/webview-ui/src/components/chat/ChatTextArea.tsx b/webview-ui/src/components/chat/ChatTextArea.tsx index a52902f1e5..5135eca2f2 100644 --- a/webview-ui/src/components/chat/ChatTextArea.tsx +++ b/webview-ui/src/components/chat/ChatTextArea.tsx @@ -1011,8 +1011,14 @@ const ChatTextArea = forwardRef( "font-vscode-font-family", "text-vscode-editor-font-size", "leading-vscode-editor-line-height", - "py-2", - "px-[9px]", + isFocused + ? "border border-vscode-focusBorder outline outline-vscode-focusBorder" + : isDraggingOver + ? "border-2 border-dashed border-vscode-focusBorder" + : "border border-transparent", + isEditMode ? "pt-1.5 pb-10 px-2" : "py-1.5 px-2", + "px-[8px]", + "pr-9", "z-10", "forced-color-adjust-none", )} From f24c1e69a30caae616aee61545fa4d8ee37f5641 Mon Sep 17 00:00:00 2001 From: axb Date: Mon, 4 Aug 2025 22:02:30 +0800 Subject: [PATCH 058/253] use assistantMessageParser class instead of parseAssistantMessage (#5341) Co-authored-by: Daniel Riccio --- packages/types/src/experiment.ts | 3 +- .../AssistantMessageParser.ts | 251 +++++++++++ .../__tests__/AssistantMessageParser.spec.ts | 396 ++++++++++++++++++ src/core/task/Task.ts | 29 +- src/shared/__tests__/experiments.spec.ts | 3 + src/shared/experiments.ts | 2 + .../__tests__/ExtensionStateContext.spec.tsx | 2 + webview-ui/src/i18n/locales/ca/settings.json | 4 + webview-ui/src/i18n/locales/de/settings.json | 4 + webview-ui/src/i18n/locales/en/settings.json | 6 +- webview-ui/src/i18n/locales/es/settings.json | 4 + webview-ui/src/i18n/locales/fr/settings.json | 4 + webview-ui/src/i18n/locales/hi/settings.json | 4 + webview-ui/src/i18n/locales/id/settings.json | 4 + webview-ui/src/i18n/locales/it/settings.json | 4 + webview-ui/src/i18n/locales/ja/settings.json | 4 + webview-ui/src/i18n/locales/ko/settings.json | 4 + webview-ui/src/i18n/locales/nl/settings.json | 4 + webview-ui/src/i18n/locales/pl/settings.json | 4 + .../src/i18n/locales/pt-BR/settings.json | 4 + webview-ui/src/i18n/locales/ru/settings.json | 4 + webview-ui/src/i18n/locales/tr/settings.json | 4 + webview-ui/src/i18n/locales/vi/settings.json | 4 + .../src/i18n/locales/zh-CN/settings.json | 4 + .../src/i18n/locales/zh-TW/settings.json | 4 + 25 files changed, 755 insertions(+), 5 deletions(-) create mode 100644 src/core/assistant-message/AssistantMessageParser.ts create mode 100644 src/core/assistant-message/__tests__/AssistantMessageParser.spec.ts diff --git a/packages/types/src/experiment.ts b/packages/types/src/experiment.ts index 5424121d67..6574124629 100644 --- a/packages/types/src/experiment.ts +++ b/packages/types/src/experiment.ts @@ -6,7 +6,7 @@ import type { Keys, Equals, AssertEqual } from "./type-fu.js" * ExperimentId */ -export const experimentIds = ["powerSteering", "multiFileApplyDiff", "preventFocusDisruption"] as const +export const experimentIds = ["powerSteering", "multiFileApplyDiff", "preventFocusDisruption", "assistantMessageParser"] as const export const experimentIdsSchema = z.enum(experimentIds) @@ -20,6 +20,7 @@ export const experimentsSchema = z.object({ powerSteering: z.boolean().optional(), multiFileApplyDiff: z.boolean().optional(), preventFocusDisruption: z.boolean().optional(), + assistantMessageParser: z.boolean().optional(), }) export type Experiments = z.infer diff --git a/src/core/assistant-message/AssistantMessageParser.ts b/src/core/assistant-message/AssistantMessageParser.ts new file mode 100644 index 0000000000..364ec603f2 --- /dev/null +++ b/src/core/assistant-message/AssistantMessageParser.ts @@ -0,0 +1,251 @@ +import { type ToolName, toolNames } from "@roo-code/types" +import { TextContent, ToolUse, ToolParamName, toolParamNames } from "../../shared/tools" +import { AssistantMessageContent } from "./parseAssistantMessage" + +/** + * Parser for assistant messages. Maintains state between chunks + * to avoid reprocessing the entire message on each update. + */ +export class AssistantMessageParser { + private contentBlocks: AssistantMessageContent[] = [] + private currentTextContent: TextContent | undefined = undefined + private currentTextContentStartIndex = 0 + private currentToolUse: ToolUse | undefined = undefined + private currentToolUseStartIndex = 0 + private currentParamName: ToolParamName | undefined = undefined + private currentParamValueStartIndex = 0 + private readonly MAX_ACCUMULATOR_SIZE = 1024 * 1024 // 1MB limit + private readonly MAX_PARAM_LENGTH = 1024 * 100 // 100KB per parameter limit + private accumulator = "" + + /** + * Initialize a new AssistantMessageParser instance. + */ + constructor() { + this.reset() + } + + /** + * Reset the parser state. + */ + public reset(): void { + this.contentBlocks = [] + this.currentTextContent = undefined + this.currentTextContentStartIndex = 0 + this.currentToolUse = undefined + this.currentToolUseStartIndex = 0 + this.currentParamName = undefined + this.currentParamValueStartIndex = 0 + this.accumulator = "" + } + + /** + * Returns the current parsed content blocks + */ + + public getContentBlocks(): AssistantMessageContent[] { + // Return a shallow copy to prevent external mutation + return this.contentBlocks.slice() + } + /** + * Process a new chunk of text and update the parser state. + * @param chunk The new chunk of text to process. + */ + public processChunk(chunk: string): AssistantMessageContent[] { + if (this.accumulator.length + chunk.length > this.MAX_ACCUMULATOR_SIZE) { + throw new Error("Assistant message exceeds maximum allowed size") + } + // Store the current length of the accumulator before adding the new chunk + const accumulatorStartLength = this.accumulator.length + + for (let i = 0; i < chunk.length; i++) { + const char = chunk[i] + this.accumulator += char + const currentPosition = accumulatorStartLength + i + + // There should not be a param without a tool use. + if (this.currentToolUse && this.currentParamName) { + const currentParamValue = this.accumulator.slice(this.currentParamValueStartIndex) + if (currentParamValue.length > this.MAX_PARAM_LENGTH) { + // Reset to a safe state + this.currentParamName = undefined + this.currentParamValueStartIndex = 0 + continue + } + const paramClosingTag = `` + // Streamed param content: always write the currently accumulated value + if (currentParamValue.endsWith(paramClosingTag)) { + // End of param value. + // Do not trim content parameters to preserve newlines, but strip first and last newline only + const paramValue = currentParamValue.slice(0, -paramClosingTag.length) + this.currentToolUse.params[this.currentParamName] = + this.currentParamName === "content" + ? paramValue.replace(/^\n/, "").replace(/\n$/, "") + : paramValue.trim() + this.currentParamName = undefined + continue + } else { + // Partial param value is accumulating. + // Write the currently accumulated param content in real time + this.currentToolUse.params[this.currentParamName] = currentParamValue + continue + } + } + + // No currentParamName. + + if (this.currentToolUse) { + const currentToolValue = this.accumulator.slice(this.currentToolUseStartIndex) + const toolUseClosingTag = `` + if (currentToolValue.endsWith(toolUseClosingTag)) { + // End of a tool use. + this.currentToolUse.partial = false + + this.currentToolUse = undefined + continue + } else { + const possibleParamOpeningTags = toolParamNames.map((name) => `<${name}>`) + for (const paramOpeningTag of possibleParamOpeningTags) { + if (this.accumulator.endsWith(paramOpeningTag)) { + // Start of a new parameter. + const paramName = paramOpeningTag.slice(1, -1) + if (!toolParamNames.includes(paramName as ToolParamName)) { + // Handle invalid parameter name gracefully + continue + } + this.currentParamName = paramName as ToolParamName + this.currentParamValueStartIndex = this.accumulator.length + break + } + } + + // There's no current param, and not starting a new param. + + // Special case for write_to_file where file contents could + // contain the closing tag, in which case the param would have + // closed and we end up with the rest of the file contents here. + // To work around this, get the string between the starting + // content tag and the LAST content tag. + const contentParamName: ToolParamName = "content" + + if ( + this.currentToolUse.name === "write_to_file" && + this.accumulator.endsWith(``) + ) { + const toolContent = this.accumulator.slice(this.currentToolUseStartIndex) + const contentStartTag = `<${contentParamName}>` + const contentEndTag = `` + const contentStartIndex = toolContent.indexOf(contentStartTag) + contentStartTag.length + const contentEndIndex = toolContent.lastIndexOf(contentEndTag) + + if (contentStartIndex !== -1 && contentEndIndex !== -1 && contentEndIndex > contentStartIndex) { + // Don't trim content to preserve newlines, but strip first and last newline only + this.currentToolUse.params[contentParamName] = toolContent + .slice(contentStartIndex, contentEndIndex) + .replace(/^\n/, "") + .replace(/\n$/, "") + } + } + + // Partial tool value is accumulating. + continue + } + } + + // No currentToolUse. + + let didStartToolUse = false + const possibleToolUseOpeningTags = toolNames.map((name) => `<${name}>`) + + for (const toolUseOpeningTag of possibleToolUseOpeningTags) { + if (this.accumulator.endsWith(toolUseOpeningTag)) { + // Extract and validate the tool name + const extractedToolName = toolUseOpeningTag.slice(1, -1) + + // Check if the extracted tool name is valid + if (!toolNames.includes(extractedToolName as ToolName)) { + // Invalid tool name, treat as plain text and continue + continue + } + + // Start of a new tool use. + this.currentToolUse = { + type: "tool_use", + name: extractedToolName as ToolName, + params: {}, + partial: true, + } + + this.currentToolUseStartIndex = this.accumulator.length + + // This also indicates the end of the current text content. + if (this.currentTextContent) { + this.currentTextContent.partial = false + + // Remove the partially accumulated tool use tag from the + // end of text ( block === this.currentToolUse) + if (idx === -1) { + this.contentBlocks.push(this.currentToolUse) + } + + didStartToolUse = true + break + } + } + + if (!didStartToolUse) { + // No tool use, so it must be text either at the beginning or + // between tools. + if (this.currentTextContent === undefined) { + // If this is the first chunk and we're at the beginning of processing, + // set the start index to the current position in the accumulator + this.currentTextContentStartIndex = currentPosition + + // Create a new text content block and add it to contentBlocks + this.currentTextContent = { + type: "text", + content: this.accumulator.slice(this.currentTextContentStartIndex).trim(), + partial: true, + } + + // Add the new text content to contentBlocks immediately + // Ensures it appears in the UI right away + this.contentBlocks.push(this.currentTextContent) + } else { + // Update the existing text content + this.currentTextContent.content = this.accumulator.slice(this.currentTextContentStartIndex).trim() + } + } + } + // Do not call finalizeContentBlocks() here. + // Instead, update any partial blocks in the array and add new ones as they're completed. + // This matches the behavior of the original parseAssistantMessage function. + return this.getContentBlocks() + } + + /** + * Finalize any partial content blocks. + * Should be called after processing the last chunk. + */ + public finalizeContentBlocks(): void { + // Mark all partial blocks as complete + for (const block of this.contentBlocks) { + if (block.partial) { + block.partial = false + } + if (block.type === "text" && typeof block.content === "string") { + block.content = block.content.trim() + } + } + } +} diff --git a/src/core/assistant-message/__tests__/AssistantMessageParser.spec.ts b/src/core/assistant-message/__tests__/AssistantMessageParser.spec.ts new file mode 100644 index 0000000000..828bf9ed22 --- /dev/null +++ b/src/core/assistant-message/__tests__/AssistantMessageParser.spec.ts @@ -0,0 +1,396 @@ +// npx vitest src/core/assistant-message/__tests__/AssistantMessageParser.spec.ts + +import { describe, it, expect, beforeEach } from "vitest" +import { AssistantMessageParser } from "../AssistantMessageParser" +import { AssistantMessageContent } from "../parseAssistantMessage" +import { TextContent, ToolUse } from "../../../shared/tools" +import { toolNames } from "@roo-code/types" + +/** + * Helper to filter out empty text content blocks. + */ +const isEmptyTextContent = (block: any) => block.type === "text" && (block as TextContent).content === "" + +/** + * Helper to simulate streaming by feeding the parser deterministic "random"-sized chunks (1-10 chars). + * Uses a seeded pseudo-random number generator for deterministic chunking. + */ + +// Simple linear congruential generator (LCG) for deterministic pseudo-random numbers +function createSeededRandom(seed: number) { + let state = seed + return { + next: () => { + // LCG parameters from Numerical Recipes + state = (state * 1664525 + 1013904223) % 0x100000000 + return state / 0x100000000 + }, + } +} + +function streamChunks( + parser: AssistantMessageParser, + message: string, +): ReturnType { + let result: AssistantMessageContent[] = [] + let i = 0 + const rng = createSeededRandom(42) // Fixed seed for deterministic tests + while (i < message.length) { + // Deterministic chunk size between 1 and 10, but not exceeding message length + const chunkSize = Math.min(message.length - i, Math.floor(rng.next() * 10) + 1) + const chunk = message.slice(i, i + chunkSize) + result = parser.processChunk(chunk) + i += chunkSize + } + return result +} + +describe("AssistantMessageParser (streaming)", () => { + let parser: AssistantMessageParser + + beforeEach(() => { + parser = new AssistantMessageParser() + }) + + describe("text content streaming", () => { + it("should accumulate a simple text message chunk by chunk", () => { + const message = "Hello, this is a test." + const result = streamChunks(parser, message) + expect(result).toHaveLength(1) + expect(result[0]).toEqual({ + type: "text", + content: message, + partial: true, + }) + }) + + it("should accumulate multi-line text message chunk by chunk", () => { + const message = "Line 1\nLine 2\nLine 3" + const result = streamChunks(parser, message) + expect(result).toHaveLength(1) + expect(result[0]).toEqual({ + type: "text", + content: message, + partial: true, + }) + }) + }) + + describe("tool use streaming", () => { + it("should parse a tool use with parameter, streamed char by char", () => { + const message = "src/file.ts" + const result = streamChunks(parser, message).filter((block) => !isEmptyTextContent(block)) + expect(result).toHaveLength(1) + const toolUse = result[0] as ToolUse + expect(toolUse.type).toBe("tool_use") + expect(toolUse.name).toBe("read_file") + expect(toolUse.params.path).toBe("src/file.ts") + expect(toolUse.partial).toBe(false) + }) + + it("should mark tool use as partial when not closed", () => { + const message = "src/file.ts" + const result = streamChunks(parser, message).filter((block) => !isEmptyTextContent(block)) + expect(result).toHaveLength(1) + const toolUse = result[0] as ToolUse + expect(toolUse.type).toBe("tool_use") + expect(toolUse.name).toBe("read_file") + expect(toolUse.params.path).toBe("src/file.ts") + expect(toolUse.partial).toBe(true) + }) + + it("should handle a partial parameter in a tool use", () => { + const message = "src/file" + const result = streamChunks(parser, message).filter((block) => !isEmptyTextContent(block)) + expect(result).toHaveLength(1) + const toolUse = result[0] as ToolUse + expect(toolUse.type).toBe("tool_use") + expect(toolUse.name).toBe("read_file") + expect(toolUse.params.path).toBe("src/file") + expect(toolUse.partial).toBe(true) + }) + + it("should handle tool use with multiple parameters streamed", () => { + const message = + "src/file.ts1020" + const result = streamChunks(parser, message).filter((block) => !isEmptyTextContent(block)) + expect(result).toHaveLength(1) + const toolUse = result[0] as ToolUse + expect(toolUse.type).toBe("tool_use") + expect(toolUse.name).toBe("read_file") + expect(toolUse.params.path).toBe("src/file.ts") + expect(toolUse.params.start_line).toBe("10") + expect(toolUse.params.end_line).toBe("20") + expect(toolUse.partial).toBe(false) + }) + }) + + describe("mixed content streaming", () => { + it("should parse text followed by a tool use, streamed", () => { + const message = "Text before tool src/file.ts" + const result = streamChunks(parser, message) + expect(result).toHaveLength(2) + const textContent = result[0] as TextContent + expect(textContent.type).toBe("text") + expect(textContent.content).toBe("Text before tool") + expect(textContent.partial).toBe(false) + const toolUse = result[1] as ToolUse + expect(toolUse.type).toBe("tool_use") + expect(toolUse.name).toBe("read_file") + expect(toolUse.params.path).toBe("src/file.ts") + expect(toolUse.partial).toBe(false) + }) + + it("should parse a tool use followed by text, streamed", () => { + const message = "src/file.tsText after tool" + const result = streamChunks(parser, message).filter((block) => !isEmptyTextContent(block)) + expect(result).toHaveLength(2) + const toolUse = result[0] as ToolUse + expect(toolUse.type).toBe("tool_use") + expect(toolUse.name).toBe("read_file") + expect(toolUse.params.path).toBe("src/file.ts") + expect(toolUse.partial).toBe(false) + const textContent = result[1] as TextContent + expect(textContent.type).toBe("text") + expect(textContent.content).toBe("Text after tool") + expect(textContent.partial).toBe(true) + }) + + it("should parse multiple tool uses separated by text, streamed", () => { + const message = + "First: file1.tsSecond: file2.ts" + const result = streamChunks(parser, message) + expect(result).toHaveLength(4) + expect(result[0].type).toBe("text") + expect((result[0] as TextContent).content).toBe("First:") + expect(result[1].type).toBe("tool_use") + expect((result[1] as ToolUse).name).toBe("read_file") + expect((result[1] as ToolUse).params.path).toBe("file1.ts") + expect(result[2].type).toBe("text") + expect((result[2] as TextContent).content).toBe("Second:") + expect(result[3].type).toBe("tool_use") + expect((result[3] as ToolUse).name).toBe("read_file") + expect((result[3] as ToolUse).params.path).toBe("file2.ts") + }) + }) + + describe("special and edge cases", () => { + it("should handle the write_to_file tool with content that contains closing tags", () => { + const message = `src/file.ts + function example() { + // This has XML-like content: + return true; + } + 5` + + const result = streamChunks(parser, message).filter((block) => !isEmptyTextContent(block)) + + expect(result).toHaveLength(1) + const toolUse = result[0] as ToolUse + expect(toolUse.type).toBe("tool_use") + expect(toolUse.name).toBe("write_to_file") + expect(toolUse.params.path).toBe("src/file.ts") + expect(toolUse.params.line_count).toBe("5") + expect(toolUse.params.content).toContain("function example()") + expect(toolUse.params.content).toContain("// This has XML-like content: ") + expect(toolUse.params.content).toContain("return true;") + expect(toolUse.partial).toBe(false) + }) + it("should handle empty messages", () => { + const message = "" + const result = streamChunks(parser, message) + expect(result).toHaveLength(0) + }) + + it("should handle malformed tool use tags as plain text", () => { + const message = "This has a malformed tag" + const result = streamChunks(parser, message) + expect(result).toHaveLength(1) + expect(result[0].type).toBe("text") + expect((result[0] as TextContent).content).toBe(message) + }) + + it("should handle tool use with no parameters", () => { + const message = "" + const result = streamChunks(parser, message).filter((block) => !isEmptyTextContent(block)) + expect(result).toHaveLength(1) + const toolUse = result[0] as ToolUse + expect(toolUse.type).toBe("tool_use") + expect(toolUse.name).toBe("browser_action") + expect(Object.keys(toolUse.params).length).toBe(0) + expect(toolUse.partial).toBe(false) + }) + + it("should handle a tool use with a parameter containing XML-like content", () => { + const message = "
    .*
    src    " + const result = streamChunks(parser, message).filter((block) => !isEmptyTextContent(block)) + expect(result).toHaveLength(1) + const toolUse = result[0] as ToolUse + expect(toolUse.type).toBe("tool_use") + expect(toolUse.name).toBe("search_files") + expect(toolUse.params.regex).toBe("
    .*
    ") + expect(toolUse.params.path).toBe("src") + expect(toolUse.partial).toBe(false) + }) + + it("should handle consecutive tool uses without text in between", () => { + const message = "file1.tsfile2.ts" + const result = streamChunks(parser, message).filter((block) => !isEmptyTextContent(block)) + expect(result).toHaveLength(2) + const toolUse1 = result[0] as ToolUse + expect(toolUse1.type).toBe("tool_use") + expect(toolUse1.name).toBe("read_file") + expect(toolUse1.params.path).toBe("file1.ts") + expect(toolUse1.partial).toBe(false) + const toolUse2 = result[1] as ToolUse + expect(toolUse2.type).toBe("tool_use") + expect(toolUse2.name).toBe("read_file") + expect(toolUse2.params.path).toBe("file2.ts") + expect(toolUse2.partial).toBe(false) + }) + + it("should handle whitespace in parameters", () => { + const message = " src/file.ts " + const result = streamChunks(parser, message).filter((block) => !isEmptyTextContent(block)) + expect(result).toHaveLength(1) + const toolUse = result[0] as ToolUse + expect(toolUse.type).toBe("tool_use") + expect(toolUse.name).toBe("read_file") + expect(toolUse.params.path).toBe("src/file.ts") + expect(toolUse.partial).toBe(false) + }) + + it("should handle multi-line parameters", () => { + const message = `file.ts + line 1 + line 2 + line 3 + 3` + const result = streamChunks(parser, message).filter((block) => !isEmptyTextContent(block)) + + expect(result).toHaveLength(1) + const toolUse = result[0] as ToolUse + expect(toolUse.type).toBe("tool_use") + expect(toolUse.name).toBe("write_to_file") + expect(toolUse.params.path).toBe("file.ts") + expect(toolUse.params.content).toContain("line 1") + expect(toolUse.params.content).toContain("line 2") + expect(toolUse.params.content).toContain("line 3") + expect(toolUse.params.line_count).toBe("3") + expect(toolUse.partial).toBe(false) + }) + it("should handle a complex message with multiple content types", () => { + const message = `I'll help you with that task. + + src/index.ts + + Now let's modify the file: + + src/index.ts + // Updated content + console.log("Hello world"); + 2 + + Let's run the code: + + node src/index.ts` + + const result = streamChunks(parser, message) + + expect(result).toHaveLength(6) + + // First text block + expect(result[0].type).toBe("text") + expect((result[0] as TextContent).content).toBe("I'll help you with that task.") + + // First tool use (read_file) + expect(result[1].type).toBe("tool_use") + expect((result[1] as ToolUse).name).toBe("read_file") + + // Second text block + expect(result[2].type).toBe("text") + expect((result[2] as TextContent).content).toContain("Now let's modify the file:") + + // Second tool use (write_to_file) + expect(result[3].type).toBe("tool_use") + expect((result[3] as ToolUse).name).toBe("write_to_file") + + // Third text block + expect(result[4].type).toBe("text") + expect((result[4] as TextContent).content).toContain("Let's run the code:") + + // Third tool use (execute_command) + expect(result[5].type).toBe("tool_use") + expect((result[5] as ToolUse).name).toBe("execute_command") + }) + }) + + describe("size limit handling", () => { + it("should throw an error when MAX_ACCUMULATOR_SIZE is exceeded", () => { + // Create a message that exceeds 1MB (MAX_ACCUMULATOR_SIZE) + const largeMessage = "x".repeat(1024 * 1024 + 1) // 1MB + 1 byte + + expect(() => { + parser.processChunk(largeMessage) + }).toThrow("Assistant message exceeds maximum allowed size") + }) + + it("should gracefully handle a parameter that exceeds MAX_PARAM_LENGTH", () => { + // Create a parameter value that exceeds 100KB (MAX_PARAM_LENGTH) + const largeParamValue = "x".repeat(1024 * 100 + 1) // 100KB + 1 byte + const message = `test.txt${largeParamValue}After tool` + + // Process the message in chunks to simulate streaming + let result: AssistantMessageContent[] = [] + let error: Error | null = null + + try { + // Process the opening tags + result = parser.processChunk("test.txt") + + // Process the large parameter value in chunks + const chunkSize = 1000 + for (let i = 0; i < largeParamValue.length; i += chunkSize) { + const chunk = largeParamValue.slice(i, i + chunkSize) + result = parser.processChunk(chunk) + } + + // Process the closing tags and text after + result = parser.processChunk("After tool") + } catch (e) { + error = e as Error + } + + // Should not throw an error + expect(error).toBeNull() + + // Should have processed the content + expect(result.length).toBeGreaterThan(0) + + // The tool use should exist but the content parameter should be reset/empty + const toolUse = result.find((block) => block.type === "tool_use") as ToolUse + expect(toolUse).toBeDefined() + expect(toolUse.name).toBe("write_to_file") + expect(toolUse.params.path).toBe("test.txt") + + // The text after the tool should still be parsed + const textAfter = result.find( + (block) => block.type === "text" && (block as TextContent).content.includes("After tool"), + ) + expect(textAfter).toBeDefined() + }) + }) + + describe("finalizeContentBlocks", () => { + it("should mark all partial blocks as complete", () => { + const message = "src/file.ts" + streamChunks(parser, message) + let blocks = parser.getContentBlocks() + // The block may already be partial or not, depending on chunking. + // To ensure the test is robust, we only assert after finalizeContentBlocks. + parser.finalizeContentBlocks() + blocks = parser.getContentBlocks() + expect(blocks[0].partial).toBe(false) + }) + }) +}) diff --git a/src/core/task/Task.ts b/src/core/task/Task.ts index 6eef70158f..3cb6abe7f7 100644 --- a/src/core/task/Task.ts +++ b/src/core/task/Task.ts @@ -77,7 +77,8 @@ import { ToolRepetitionDetector } from "../tools/ToolRepetitionDetector" import { FileContextTracker } from "../context-tracking/FileContextTracker" import { RooIgnoreController } from "../ignore/RooIgnoreController" import { RooProtectedController } from "../protect/RooProtectedController" -import { type AssistantMessageContent, parseAssistantMessage, presentAssistantMessage } from "../assistant-message" +import { type AssistantMessageContent, presentAssistantMessage, parseAssistantMessage } from "../assistant-message" +import { AssistantMessageParser } from "../assistant-message/AssistantMessageParser" import { truncateConversationIfNeeded } from "../sliding-window" import { ClineProvider } from "../webview/ClineProvider" import { MultiSearchReplaceDiffStrategy } from "../diff/strategies/multi-search-replace" @@ -249,6 +250,8 @@ export class Task extends EventEmitter implements TaskLike { didRejectTool = false didAlreadyUseTool = false didCompleteReadingStream = false + assistantMessageParser?: AssistantMessageParser + isAssistantMessageParserEnabled = false constructor({ provider, @@ -1553,6 +1556,9 @@ export class Task extends EventEmitter implements TaskLike { this.didAlreadyUseTool = false this.presentAssistantMessageLocked = false this.presentAssistantMessageHasPendingUpdates = false + if (this.assistantMessageParser) { + this.assistantMessageParser.reset() + } await this.diffViewProvider.reset() @@ -1587,9 +1593,14 @@ export class Task extends EventEmitter implements TaskLike { case "text": { assistantMessage += chunk.text - // Parse raw assistant message into content blocks. + // Parse raw assistant message chunk into content blocks. const prevLength = this.assistantMessageContent.length - this.assistantMessageContent = parseAssistantMessage(assistantMessage) + if (this.isAssistantMessageParserEnabled && this.assistantMessageParser) { + this.assistantMessageContent = this.assistantMessageParser.processChunk(chunk.text) + } else { + // Use the old parsing method when experiment is disabled + this.assistantMessageContent = parseAssistantMessage(assistantMessage) + } if (this.assistantMessageContent.length > prevLength) { // New content we need to present, reset to @@ -1709,6 +1720,13 @@ export class Task extends EventEmitter implements TaskLike { // Can't just do this b/c a tool could be in the middle of executing. // this.assistantMessageContent.forEach((e) => (e.partial = false)) + // Now that the stream is complete, finalize any remaining partial content blocks + if (this.isAssistantMessageParserEnabled && this.assistantMessageParser) { + this.assistantMessageParser.finalizeContentBlocks() + this.assistantMessageContent = this.assistantMessageParser.getContentBlocks() + } + // When using old parser, no finalization needed - parsing already happened during streaming + if (partialBlocks.length > 0) { // If there is content to update then it will complete and // update `this.userMessageContentReady` to true, which we @@ -1722,6 +1740,11 @@ export class Task extends EventEmitter implements TaskLike { await this.saveClineMessages() await this.providerRef.deref()?.postStateToWebview() + // Reset parser after each complete conversation round + if (this.assistantMessageParser) { + this.assistantMessageParser.reset() + } + // Now add to apiConversationHistory. // Need to save assistant responses to file before proceeding to // tool use since user can exit at any moment and we wouldn't be diff --git a/src/shared/__tests__/experiments.spec.ts b/src/shared/__tests__/experiments.spec.ts index 607c1e0b04..21401dc759 100644 --- a/src/shared/__tests__/experiments.spec.ts +++ b/src/shared/__tests__/experiments.spec.ts @@ -29,6 +29,7 @@ describe("experiments", () => { powerSteering: false, multiFileApplyDiff: false, preventFocusDisruption: false, + assistantMessageParser: false, } expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.POWER_STEERING)).toBe(false) }) @@ -38,6 +39,7 @@ describe("experiments", () => { powerSteering: true, multiFileApplyDiff: false, preventFocusDisruption: false, + assistantMessageParser: false, } expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.POWER_STEERING)).toBe(true) }) @@ -47,6 +49,7 @@ describe("experiments", () => { powerSteering: false, multiFileApplyDiff: false, preventFocusDisruption: false, + assistantMessageParser: false, } expect(Experiments.isEnabled(experiments, EXPERIMENT_IDS.POWER_STEERING)).toBe(false) }) diff --git a/src/shared/experiments.ts b/src/shared/experiments.ts index 548b55f68c..4be89afa1a 100644 --- a/src/shared/experiments.ts +++ b/src/shared/experiments.ts @@ -4,6 +4,7 @@ export const EXPERIMENT_IDS = { MULTI_FILE_APPLY_DIFF: "multiFileApplyDiff", POWER_STEERING: "powerSteering", PREVENT_FOCUS_DISRUPTION: "preventFocusDisruption", + ASSISTANT_MESSAGE_PARSER: "assistantMessageParser", } as const satisfies Record type _AssertExperimentIds = AssertEqual>> @@ -18,6 +19,7 @@ export const experimentConfigsMap: Record = { MULTI_FILE_APPLY_DIFF: { enabled: false }, POWER_STEERING: { enabled: false }, PREVENT_FOCUS_DISRUPTION: { enabled: false }, + ASSISTANT_MESSAGE_PARSER: { enabled: false }, } export const experimentDefault = Object.fromEntries( diff --git a/webview-ui/src/context/__tests__/ExtensionStateContext.spec.tsx b/webview-ui/src/context/__tests__/ExtensionStateContext.spec.tsx index 7c69f39c2b..a688cac885 100644 --- a/webview-ui/src/context/__tests__/ExtensionStateContext.spec.tsx +++ b/webview-ui/src/context/__tests__/ExtensionStateContext.spec.tsx @@ -229,6 +229,7 @@ describe("mergeExtensionState", () => { concurrentFileReads: true, multiFileApplyDiff: true, preventFocusDisruption: false, + assistantMessageParser: false, } as Record, } @@ -246,6 +247,7 @@ describe("mergeExtensionState", () => { concurrentFileReads: true, multiFileApplyDiff: true, preventFocusDisruption: false, + assistantMessageParser: false, }) }) }) diff --git a/webview-ui/src/i18n/locales/ca/settings.json b/webview-ui/src/i18n/locales/ca/settings.json index 9ab98a8980..cc1bbf5680 100644 --- a/webview-ui/src/i18n/locales/ca/settings.json +++ b/webview-ui/src/i18n/locales/ca/settings.json @@ -686,6 +686,10 @@ "PREVENT_FOCUS_DISRUPTION": { "name": "Edició en segon pla", "description": "Quan s'activa, evita la interrupció del focus de l'editor. Les edicions de fitxers es produeixen en segon pla sense obrir la vista diff o robar el focus. Pots continuar treballant sense interrupcions mentre Roo fa canvis. Els fitxers poden obrir-se sense focus per capturar diagnòstics o romandre completament tancats." + }, + "ASSISTANT_MESSAGE_PARSER": { + "name": "Utilitza el nou analitzador de missatges", + "description": "Activa l'analitzador de missatges en streaming experimental que millora el rendiment en respostes llargues processant els missatges de manera més eficient." } }, "promptCaching": { diff --git a/webview-ui/src/i18n/locales/de/settings.json b/webview-ui/src/i18n/locales/de/settings.json index 667b313468..6bee80a8a6 100644 --- a/webview-ui/src/i18n/locales/de/settings.json +++ b/webview-ui/src/i18n/locales/de/settings.json @@ -686,6 +686,10 @@ "PREVENT_FOCUS_DISRUPTION": { "name": "Hintergrundbearbeitung", "description": "Verhindert Editor-Fokus-Störungen wenn aktiviert. Dateibearbeitungen erfolgen im Hintergrund ohne Öffnung von Diff-Ansichten oder Fokus-Diebstahl. Du kannst ungestört weiterarbeiten, während Roo Änderungen vornimmt. Dateien können ohne Fokus geöffnet werden, um Diagnosen zu erfassen oder vollständig geschlossen bleiben." + }, + "ASSISTANT_MESSAGE_PARSER": { + "name": "Neuen Nachrichtenparser verwenden", + "description": "Aktiviere den experimentellen Streaming-Nachrichtenparser, der lange Antworten durch effizientere Verarbeitung spürbar schneller macht." } }, "promptCaching": { diff --git a/webview-ui/src/i18n/locales/en/settings.json b/webview-ui/src/i18n/locales/en/settings.json index 46c15556c8..c52841ca83 100644 --- a/webview-ui/src/i18n/locales/en/settings.json +++ b/webview-ui/src/i18n/locales/en/settings.json @@ -682,9 +682,13 @@ "name": "Enable concurrent file edits", "description": "When enabled, Roo can edit multiple files in a single request. When disabled, Roo must edit files one at a time. Disabling this can help when working with less capable models or when you want more control over file modifications." }, - "PREVENT_FOCUS_DISRUPTION": { +"PREVENT_FOCUS_DISRUPTION": { "name": "Background editing", "description": "Prevent editor focus disruption when enabled. File edits happen in the background without opening diff views or stealing focus. You can continue working uninterrupted while Roo makes changes. Files can be opened without focus to capture diagnostics or kept closed entirely." + }, + "ASSISTANT_MESSAGE_PARSER": { + "name": "Use new message parser", + "description": "Enable the experimental streaming message parser that provides significant performance improvements for long assistant responses by processing messages more efficiently." } }, "promptCaching": { diff --git a/webview-ui/src/i18n/locales/es/settings.json b/webview-ui/src/i18n/locales/es/settings.json index 0f41e6ddda..42251f606a 100644 --- a/webview-ui/src/i18n/locales/es/settings.json +++ b/webview-ui/src/i18n/locales/es/settings.json @@ -686,6 +686,10 @@ "PREVENT_FOCUS_DISRUPTION": { "name": "Edición en segundo plano", "description": "Previene la interrupción del foco del editor cuando está habilitado. Las ediciones de archivos ocurren en segundo plano sin abrir vistas de diferencias o robar el foco. Puedes continuar trabajando sin interrupciones mientras Roo realiza cambios. Los archivos pueden abrirse sin foco para capturar diagnósticos o mantenerse completamente cerrados." + }, + "ASSISTANT_MESSAGE_PARSER": { + "name": "Usar el nuevo analizador de mensajes", + "description": "Activa el analizador de mensajes en streaming experimental que mejora el rendimiento en respuestas largas procesando los mensajes de forma más eficiente." } }, "promptCaching": { diff --git a/webview-ui/src/i18n/locales/fr/settings.json b/webview-ui/src/i18n/locales/fr/settings.json index 5af186e6b1..c527b2e42f 100644 --- a/webview-ui/src/i18n/locales/fr/settings.json +++ b/webview-ui/src/i18n/locales/fr/settings.json @@ -686,6 +686,10 @@ "PREVENT_FOCUS_DISRUPTION": { "name": "Édition en arrière-plan", "description": "Empêche la perturbation du focus de l'éditeur lorsqu'activé. Les modifications de fichiers se font en arrière-plan sans ouvrir de vues de différences ou voler le focus. Vous pouvez continuer à travailler sans interruption pendant que Roo effectue des changements. Les fichiers peuvent être ouverts sans focus pour capturer les diagnostics ou rester complètement fermés." + }, + "ASSISTANT_MESSAGE_PARSER": { + "name": "Utiliser le nouveau parseur de messages", + "description": "Active le parseur de messages en streaming expérimental qui accélère nettement les longues réponses en traitant les messages plus efficacement." } }, "promptCaching": { diff --git a/webview-ui/src/i18n/locales/hi/settings.json b/webview-ui/src/i18n/locales/hi/settings.json index e3743a531e..5130f818da 100644 --- a/webview-ui/src/i18n/locales/hi/settings.json +++ b/webview-ui/src/i18n/locales/hi/settings.json @@ -687,6 +687,10 @@ "PREVENT_FOCUS_DISRUPTION": { "name": "बैकग्राउंड संपादन", "description": "सक्षम होने पर एडिटर फोकस व्यवधान को रोकता है। फ़ाइल संपादन diff व्यू खोले बिना या फोकस चुराए बिना बैकग्राउंड में होता है। आप Roo के बदलाव करते समय बिना किसी बाधा के काम जारी रख सकते हैं। फ़ाइलें डायग्नोस्टिक्स कैप्चर करने के लिए बिना फोकस के खुल सकती हैं या पूरी तरह बंद रह सकती हैं।" + }, + "ASSISTANT_MESSAGE_PARSER": { + "name": "नए मैसेज पार्सर का उपयोग करें", + "description": "प्रायोगिक स्ट्रीमिंग मैसेज पार्सर सक्षम करें, जो लंबे उत्तरों के लिए संदेशों को अधिक कुशलता से प्रोसेस करके प्रदर्शन को बेहतर बनाता है।" } }, "promptCaching": { diff --git a/webview-ui/src/i18n/locales/id/settings.json b/webview-ui/src/i18n/locales/id/settings.json index 0f47712f21..f0285a5130 100644 --- a/webview-ui/src/i18n/locales/id/settings.json +++ b/webview-ui/src/i18n/locales/id/settings.json @@ -716,6 +716,10 @@ "PREVENT_FOCUS_DISRUPTION": { "name": "Pengeditan Latar Belakang", "description": "Ketika diaktifkan, mencegah gangguan fokus editor. Pengeditan file terjadi di latar belakang tanpa membuka tampilan diff atau mencuri fokus. Anda dapat terus bekerja tanpa gangguan saat Roo melakukan perubahan. File mungkin dibuka tanpa fokus untuk menangkap diagnostik atau tetap tertutup sepenuhnya." + }, + "ASSISTANT_MESSAGE_PARSER": { + "name": "Gunakan parser pesan baru", + "description": "Aktifkan parser pesan streaming eksperimental yang meningkatkan kinerja untuk respons panjang dengan memproses pesan lebih efisien." } }, "promptCaching": { diff --git a/webview-ui/src/i18n/locales/it/settings.json b/webview-ui/src/i18n/locales/it/settings.json index e5bc317eff..afdd7b3707 100644 --- a/webview-ui/src/i18n/locales/it/settings.json +++ b/webview-ui/src/i18n/locales/it/settings.json @@ -687,6 +687,10 @@ "PREVENT_FOCUS_DISRUPTION": { "name": "Modifica in background", "description": "Previene l'interruzione del focus dell'editor quando abilitato. Le modifiche ai file avvengono in background senza aprire viste di differenze o rubare il focus. Puoi continuare a lavorare senza interruzioni mentre Roo effettua modifiche. I file possono essere aperti senza focus per catturare diagnostiche o rimanere completamente chiusi." + }, + "ASSISTANT_MESSAGE_PARSER": { + "name": "Usa il nuovo parser dei messaggi", + "description": "Abilita il parser di messaggi in streaming sperimentale che migliora nettamente le risposte lunghe elaborando i messaggi in modo più efficiente." } }, "promptCaching": { diff --git a/webview-ui/src/i18n/locales/ja/settings.json b/webview-ui/src/i18n/locales/ja/settings.json index ab4cda177a..debc7ad2ab 100644 --- a/webview-ui/src/i18n/locales/ja/settings.json +++ b/webview-ui/src/i18n/locales/ja/settings.json @@ -687,6 +687,10 @@ "PREVENT_FOCUS_DISRUPTION": { "name": "バックグラウンド編集", "description": "有効にすると、エディターのフォーカス中断を防ぎます。ファイル編集は差分ビューを開いたりフォーカスを奪ったりすることなく、バックグラウンドで行われます。Rooが変更を行っている間も中断されることなく作業を続けることができます。ファイルは診断をキャプチャするためにフォーカスなしで開くか、完全に閉じたままにできます。" + }, + "ASSISTANT_MESSAGE_PARSER": { + "name": "新しいメッセージパーサーを使う", + "description": "実験的なストリーミングメッセージパーサーを有効にします。長い回答をより効率的に処理し、遅延を減らします。" } }, "promptCaching": { diff --git a/webview-ui/src/i18n/locales/ko/settings.json b/webview-ui/src/i18n/locales/ko/settings.json index adad29a152..d48012862f 100644 --- a/webview-ui/src/i18n/locales/ko/settings.json +++ b/webview-ui/src/i18n/locales/ko/settings.json @@ -687,6 +687,10 @@ "PREVENT_FOCUS_DISRUPTION": { "name": "백그라운드 편집", "description": "활성화하면 편집기 포커스 방해를 방지합니다. 파일 편집이 diff 뷰를 열거나 포커스를 빼앗지 않고 백그라운드에서 수행됩니다. Roo가 변경사항을 적용하는 동안 방해받지 않고 계속 작업할 수 있습니다. 파일은 진단을 캡처하기 위해 포커스 없이 열거나 완전히 닫힌 상태로 유지할 수 있습니다." + }, + "ASSISTANT_MESSAGE_PARSER": { + "name": "새 메시지 파서 사용", + "description": "실험적 스트리밍 메시지 파서를 활성화합니다. 긴 응답을 더 효율적으로 처리해 지연을 줄입니다." } }, "promptCaching": { diff --git a/webview-ui/src/i18n/locales/nl/settings.json b/webview-ui/src/i18n/locales/nl/settings.json index e635c8d2c8..7722244dd4 100644 --- a/webview-ui/src/i18n/locales/nl/settings.json +++ b/webview-ui/src/i18n/locales/nl/settings.json @@ -687,6 +687,10 @@ "PREVENT_FOCUS_DISRUPTION": { "name": "Achtergrondbewerking", "description": "Voorkomt editor focus verstoring wanneer ingeschakeld. Bestandsbewerkingen gebeuren op de achtergrond zonder diff-weergaven te openen of focus te stelen. Je kunt ononderbroken doorwerken terwijl Roo wijzigingen aanbrengt. Bestanden kunnen zonder focus worden geopend om diagnostiek vast te leggen of volledig gesloten blijven." + }, + "ASSISTANT_MESSAGE_PARSER": { + "name": "Nieuwe berichtparser gebruiken", + "description": "Schakel de experimentele streaming-berichtparser in die lange antwoorden sneller maakt door berichten efficiënter te verwerken." } }, "promptCaching": { diff --git a/webview-ui/src/i18n/locales/pl/settings.json b/webview-ui/src/i18n/locales/pl/settings.json index d176693143..130453764a 100644 --- a/webview-ui/src/i18n/locales/pl/settings.json +++ b/webview-ui/src/i18n/locales/pl/settings.json @@ -687,6 +687,10 @@ "PREVENT_FOCUS_DISRUPTION": { "name": "Edycja w tle", "description": "Zapobiega zakłócaniu fokusa edytora gdy włączone. Edycje plików odbywają się w tle bez otwierania widoków różnic lub kradzieży fokusa. Możesz kontynuować pracę bez przeszkód podczas gdy Roo wprowadza zmiany. Pliki mogą być otwierane bez fokusa aby przechwycić diagnostykę lub pozostać całkowicie zamknięte." + }, + "ASSISTANT_MESSAGE_PARSER": { + "name": "Użyj nowego parsera wiadomości", + "description": "Włącz eksperymentalny parser wiadomości w strumieniu, który przyspiesza długie odpowiedzi dzięki bardziej wydajnemu przetwarzaniu wiadomości." } }, "promptCaching": { diff --git a/webview-ui/src/i18n/locales/pt-BR/settings.json b/webview-ui/src/i18n/locales/pt-BR/settings.json index a646229164..05e20bfee2 100644 --- a/webview-ui/src/i18n/locales/pt-BR/settings.json +++ b/webview-ui/src/i18n/locales/pt-BR/settings.json @@ -687,6 +687,10 @@ "PREVENT_FOCUS_DISRUPTION": { "name": "Edição em segundo plano", "description": "Previne a interrupção do foco do editor quando habilitado. As edições de arquivos acontecem em segundo plano sem abrir visualizações de diferenças ou roubar o foco. Você pode continuar trabalhando sem interrupções enquanto o Roo faz alterações. Os arquivos podem ser abertos sem foco para capturar diagnósticos ou permanecer completamente fechados." + }, + "ASSISTANT_MESSAGE_PARSER": { + "name": "Usar o novo parser de mensagens", + "description": "Ativa o parser de mensagens em streaming experimental que acelera respostas longas ao processar as mensagens de forma mais eficiente." } }, "promptCaching": { diff --git a/webview-ui/src/i18n/locales/ru/settings.json b/webview-ui/src/i18n/locales/ru/settings.json index 7476f0cb0a..6eeb5f134a 100644 --- a/webview-ui/src/i18n/locales/ru/settings.json +++ b/webview-ui/src/i18n/locales/ru/settings.json @@ -687,6 +687,10 @@ "PREVENT_FOCUS_DISRUPTION": { "name": "Фоновое редактирование", "description": "Предотвращает нарушение фокуса редактора при включении. Редактирование файлов происходит в фоновом режиме без открытия представлений различий или кражи фокуса. Вы можете продолжать работать без перерывов, пока Roo вносит изменения. Файлы могут открываться без фокуса для захвата диагностики или оставаться полностью закрытыми." + }, + "ASSISTANT_MESSAGE_PARSER": { + "name": "Использовать новый парсер сообщений", + "description": "Включите экспериментальный потоковый парсер сообщений, который ускоряет длинные ответы благодаря более эффективной обработке сообщений." } }, "promptCaching": { diff --git a/webview-ui/src/i18n/locales/tr/settings.json b/webview-ui/src/i18n/locales/tr/settings.json index 07e8dac1d6..f58ab8ad5e 100644 --- a/webview-ui/src/i18n/locales/tr/settings.json +++ b/webview-ui/src/i18n/locales/tr/settings.json @@ -687,6 +687,10 @@ "PREVENT_FOCUS_DISRUPTION": { "name": "Arka plan düzenleme", "description": "Etkinleştirildiğinde editör odak kesintisini önler. Dosya düzenlemeleri diff görünümlerini açmadan veya odağı çalmadan arka planda gerçekleşir. Roo değişiklikler yaparken kesintisiz çalışmaya devam edebilirsiniz. Dosyalar tanılamayı yakalamak için odaksız açılabilir veya tamamen kapalı kalabilir." + }, + "ASSISTANT_MESSAGE_PARSER": { + "name": "Yeni mesaj ayrıştırıcıyı kullan", + "description": "Uzun yanıtları daha verimli işleyerek hızlandıran deneysel akış mesaj ayrıştırıcısını etkinleştir." } }, "promptCaching": { diff --git a/webview-ui/src/i18n/locales/vi/settings.json b/webview-ui/src/i18n/locales/vi/settings.json index e1b91860b8..0b8461b469 100644 --- a/webview-ui/src/i18n/locales/vi/settings.json +++ b/webview-ui/src/i18n/locales/vi/settings.json @@ -687,6 +687,10 @@ "PREVENT_FOCUS_DISRUPTION": { "name": "Chỉnh sửa nền", "description": "Khi được bật, ngăn chặn gián đoạn tiêu điểm trình soạn thảo. Việc chỉnh sửa tệp diễn ra ở nền mà không mở chế độ xem diff hoặc chiếm tiêu điểm. Bạn có thể tiếp tục làm việc không bị gián đoạn trong khi Roo thực hiện thay đổi. Các tệp có thể được mở mà không có tiêu điểm để thu thập chẩn đoán hoặc giữ hoàn toàn đóng." + }, + "ASSISTANT_MESSAGE_PARSER": { + "name": "Dùng bộ phân tích tin nhắn mới", + "description": "Bật bộ phân tích tin nhắn streaming thử nghiệm. Tính năng này tăng tốc phản hồi dài bằng cách xử lý tin nhắn hiệu quả hơn." } }, "promptCaching": { diff --git a/webview-ui/src/i18n/locales/zh-CN/settings.json b/webview-ui/src/i18n/locales/zh-CN/settings.json index 2b390f349c..f9e82bf87e 100644 --- a/webview-ui/src/i18n/locales/zh-CN/settings.json +++ b/webview-ui/src/i18n/locales/zh-CN/settings.json @@ -687,6 +687,10 @@ "PREVENT_FOCUS_DISRUPTION": { "name": "后台编辑", "description": "启用后防止编辑器焦点干扰。文件编辑在后台进行，不会打开差异视图或抢夺焦点。你可以在 Roo 进行更改时继续不受干扰地工作。文件可以在不获取焦点的情况下打开以捕获诊断信息，或保持完全关闭状态。" + }, + "ASSISTANT_MESSAGE_PARSER": { + "name": "使用新的消息解析器", + "description": "启用实验性的流式消息解析器。通过更高效地处理消息，可显著提升长回复的性能。" } }, "promptCaching": { diff --git a/webview-ui/src/i18n/locales/zh-TW/settings.json b/webview-ui/src/i18n/locales/zh-TW/settings.json index b1ec67b8db..f638a782b9 100644 --- a/webview-ui/src/i18n/locales/zh-TW/settings.json +++ b/webview-ui/src/i18n/locales/zh-TW/settings.json @@ -687,6 +687,10 @@ "PREVENT_FOCUS_DISRUPTION": { "name": "背景編輯", "description": "啟用後可防止編輯器焦點中斷。檔案編輯會在背景進行，不會開啟 diff 檢視或搶奪焦點。您可以在 Roo 進行變更時繼續不受干擾地工作。檔案可能會在不獲得焦點的情況下開啟以捕獲診斷，或保持完全關閉。" + }, + "ASSISTANT_MESSAGE_PARSER": { + "name": "使用全新訊息解析器", + "description": "啟用實驗性的串流訊息解析器。透過更有效率地處理訊息，能顯著提升長回覆的效能。" } }, "promptCaching": { From a921d059e138a9d8e657f66a36865586b02b44f3 Mon Sep 17 00:00:00 2001 From: jues <95405836+jues@users.noreply.github.com> Date: Mon, 4 Aug 2025 22:06:46 +0800 Subject: [PATCH 059/253] Add Z AI provider (#6657) Co-authored-by: wangshan --- packages/types/src/provider-settings.ts | 8 + packages/types/src/providers/index.ts | 1 + packages/types/src/providers/zai.ts | 105 ++++++++ src/api/index.ts | 3 + src/api/providers/__tests__/zai.spec.ts | 231 ++++++++++++++++++ src/api/providers/index.ts | 1 + src/api/providers/zai.ts | 31 +++ .../src/components/settings/ApiOptions.tsx | 14 ++ .../src/components/settings/constants.ts | 3 + .../src/components/settings/providers/ZAi.tsx | 76 ++++++ .../components/settings/providers/index.ts | 1 + .../components/ui/hooks/useSelectedModel.ts | 12 + webview-ui/src/i18n/locales/ca/settings.json | 4 + webview-ui/src/i18n/locales/de/settings.json | 4 + webview-ui/src/i18n/locales/en/settings.json | 4 + webview-ui/src/i18n/locales/es/settings.json | 4 + webview-ui/src/i18n/locales/fr/settings.json | 4 + webview-ui/src/i18n/locales/hi/settings.json | 4 + webview-ui/src/i18n/locales/id/settings.json | 4 + webview-ui/src/i18n/locales/it/settings.json | 4 + webview-ui/src/i18n/locales/ja/settings.json | 4 + webview-ui/src/i18n/locales/ko/settings.json | 4 + webview-ui/src/i18n/locales/nl/settings.json | 4 + webview-ui/src/i18n/locales/pl/settings.json | 4 + .../src/i18n/locales/pt-BR/settings.json | 4 + webview-ui/src/i18n/locales/ru/settings.json | 4 + webview-ui/src/i18n/locales/tr/settings.json | 4 + webview-ui/src/i18n/locales/vi/settings.json | 4 + .../src/i18n/locales/zh-CN/settings.json | 4 + .../src/i18n/locales/zh-TW/settings.json | 4 + 30 files changed, 558 insertions(+) create mode 100644 packages/types/src/providers/zai.ts create mode 100644 src/api/providers/__tests__/zai.spec.ts create mode 100644 src/api/providers/zai.ts create mode 100644 webview-ui/src/components/settings/providers/ZAi.tsx diff --git a/packages/types/src/provider-settings.ts b/packages/types/src/provider-settings.ts index 207c60a524..876f5114b6 100644 --- a/packages/types/src/provider-settings.ts +++ b/packages/types/src/provider-settings.ts @@ -36,6 +36,7 @@ export const providerNames = [ "huggingface", "cerebras", "sambanova", + "zai", ] as const export const providerNamesSchema = z.enum(providerNames) @@ -257,6 +258,11 @@ const sambaNovaSchema = apiModelIdProviderModelSchema.extend({ sambaNovaApiKey: z.string().optional(), }) +const zaiSchema = apiModelIdProviderModelSchema.extend({ + zaiApiKey: z.string().optional(), + zaiApiLine: z.union([z.literal("china"), z.literal("international")]).optional(), +}) + const defaultSchema = z.object({ apiProvider: z.undefined(), }) @@ -290,6 +296,7 @@ export const providerSettingsSchemaDiscriminated = z.discriminatedUnion("apiProv litellmSchema.merge(z.object({ apiProvider: z.literal("litellm") })), cerebrasSchema.merge(z.object({ apiProvider: z.literal("cerebras") })), sambaNovaSchema.merge(z.object({ apiProvider: z.literal("sambanova") })), + zaiSchema.merge(z.object({ apiProvider: z.literal("zai") })), defaultSchema, ]) @@ -323,6 +330,7 @@ export const providerSettingsSchema = z.object({ ...litellmSchema.shape, ...cerebrasSchema.shape, ...sambaNovaSchema.shape, + ...zaiSchema.shape, ...codebaseIndexProviderSchema.shape, }) diff --git a/packages/types/src/providers/index.ts b/packages/types/src/providers/index.ts index d6584e70ec..b0e316bf55 100644 --- a/packages/types/src/providers/index.ts +++ b/packages/types/src/providers/index.ts @@ -22,3 +22,4 @@ export * from "./vertex.js" export * from "./vscode-llm.js" export * from "./xai.js" export * from "./doubao.js" +export * from "./zai.js" diff --git a/packages/types/src/providers/zai.ts b/packages/types/src/providers/zai.ts new file mode 100644 index 0000000000..f724744827 --- /dev/null +++ b/packages/types/src/providers/zai.ts @@ -0,0 +1,105 @@ +import type { ModelInfo } from "../model.js" + +// Z AI +// https://docs.z.ai/guides/llm/glm-4.5 +// https://docs.z.ai/guides/overview/pricing + +export type InternationalZAiModelId = keyof typeof internationalZAiModels +export const internationalZAiDefaultModelId: InternationalZAiModelId = "glm-4.5" +export const internationalZAiModels = { + "glm-4.5": { + maxTokens: 98_304, + contextWindow: 131_072, + supportsImages: false, + supportsPromptCache: true, + inputPrice: 0.6, + outputPrice: 2.2, + cacheWritesPrice: 0, + cacheReadsPrice: 0.11, + description: + "GLM-4.5 is Zhipu's latest featured model. Its comprehensive capabilities in reasoning, coding, and agent reach the state-of-the-art (SOTA) level among open-source models, with a context length of up to 128k.", + }, + "glm-4.5-air": { + maxTokens: 98_304, + contextWindow: 131_072, + supportsImages: false, + supportsPromptCache: true, + inputPrice: 0.2, + outputPrice: 1.1, + cacheWritesPrice: 0, + cacheReadsPrice: 0.03, + description: + "GLM-4.5-Air is the lightweight version of GLM-4.5. It balances performance and cost-effectiveness, and can flexibly switch to hybrid thinking models.", + }, +} as const satisfies Record + +export type MainlandZAiModelId = keyof typeof mainlandZAiModels +export const mainlandZAiDefaultModelId: MainlandZAiModelId = "glm-4.5" +export const mainlandZAiModels = { + "glm-4.5": { + maxTokens: 98_304, + contextWindow: 131_072, + supportsImages: false, + supportsPromptCache: true, + inputPrice: 0.29, + outputPrice: 1.14, + cacheWritesPrice: 0, + cacheReadsPrice: 0.057, + description: + "GLM-4.5 is Zhipu's latest featured model. Its comprehensive capabilities in reasoning, coding, and agent reach the state-of-the-art (SOTA) level among open-source models, with a context length of up to 128k.", + tiers: [ + { + contextWindow: 32_000, + inputPrice: 0.21, + outputPrice: 1.0, + cacheReadsPrice: 0.043, + }, + { + contextWindow: 128_000, + inputPrice: 0.29, + outputPrice: 1.14, + cacheReadsPrice: 0.057, + }, + { + contextWindow: Infinity, + inputPrice: 0.29, + outputPrice: 1.14, + cacheReadsPrice: 0.057, + }, + ], + }, + "glm-4.5-air": { + maxTokens: 98_304, + contextWindow: 131_072, + supportsImages: false, + supportsPromptCache: true, + inputPrice: 0.1, + outputPrice: 0.6, + cacheWritesPrice: 0, + cacheReadsPrice: 0.02, + description: + "GLM-4.5-Air is the lightweight version of GLM-4.5. It balances performance and cost-effectiveness, and can flexibly switch to hybrid thinking models.", + tiers: [ + { + contextWindow: 32_000, + inputPrice: 0.07, + outputPrice: 0.4, + cacheReadsPrice: 0.014, + }, + { + contextWindow: 128_000, + inputPrice: 0.1, + outputPrice: 0.6, + cacheReadsPrice: 0.02, + }, + { + contextWindow: Infinity, + inputPrice: 0.1, + outputPrice: 0.6, + cacheReadsPrice: 0.02, + }, + ], + }, +} as const satisfies Record + +export const ZAI_DEFAULT_TEMPERATURE = 0 diff --git a/src/api/index.ts b/src/api/index.ts index 5daa53396f..3ad3705eba 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -33,6 +33,7 @@ import { ClaudeCodeHandler, SambaNovaHandler, DoubaoHandler, + ZAiHandler, } from "./providers" export interface SingleCompletionHandler { @@ -124,6 +125,8 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler { return new CerebrasHandler(options) case "sambanova": return new SambaNovaHandler(options) + case "zai": + return new ZAiHandler(options) default: apiProvider satisfies "gemini-cli" | undefined return new AnthropicHandler(options) diff --git a/src/api/providers/__tests__/zai.spec.ts b/src/api/providers/__tests__/zai.spec.ts new file mode 100644 index 0000000000..6b93aaa43b --- /dev/null +++ b/src/api/providers/__tests__/zai.spec.ts @@ -0,0 +1,231 @@ +// npx vitest run src/api/providers/__tests__/zai.spec.ts + +// Mock vscode first to avoid import errors +vitest.mock("vscode", () => ({})) + +import OpenAI from "openai" +import { Anthropic } from "@anthropic-ai/sdk" + +import { + type InternationalZAiModelId, + type MainlandZAiModelId, + internationalZAiDefaultModelId, + mainlandZAiDefaultModelId, + internationalZAiModels, + mainlandZAiModels, + ZAI_DEFAULT_TEMPERATURE, +} from "@roo-code/types" + +import { ZAiHandler } from "../zai" + +vitest.mock("openai", () => { + const createMock = vitest.fn() + return { + default: vitest.fn(() => ({ chat: { completions: { create: createMock } } })), + } +}) + +describe("ZAiHandler", () => { + let handler: ZAiHandler + let mockCreate: any + + beforeEach(() => { + vitest.clearAllMocks() + mockCreate = (OpenAI as unknown as any)().chat.completions.create + }) + + describe("International Z AI", () => { + beforeEach(() => { + handler = new ZAiHandler({ zaiApiKey: "test-zai-api-key", zaiApiLine: "international" }) + }) + + it("should use the correct international Z AI base URL", () => { + new ZAiHandler({ zaiApiKey: "test-zai-api-key", zaiApiLine: "international" }) + expect(OpenAI).toHaveBeenCalledWith(expect.objectContaining({ baseURL: "https://api.z.ai/api/paas/v4" })) + }) + + it("should use the provided API key for international", () => { + const zaiApiKey = "test-zai-api-key" + new ZAiHandler({ zaiApiKey, zaiApiLine: "international" }) + expect(OpenAI).toHaveBeenCalledWith(expect.objectContaining({ apiKey: zaiApiKey })) + }) + + it("should return international default model when no model is specified", () => { + const model = handler.getModel() + expect(model.id).toBe(internationalZAiDefaultModelId) + expect(model.info).toEqual(internationalZAiModels[internationalZAiDefaultModelId]) + }) + + it("should return specified international model when valid model is provided", () => { + const testModelId: InternationalZAiModelId = "glm-4.5-air" + const handlerWithModel = new ZAiHandler({ + apiModelId: testModelId, + zaiApiKey: "test-zai-api-key", + zaiApiLine: "international", + }) + const model = handlerWithModel.getModel() + expect(model.id).toBe(testModelId) + expect(model.info).toEqual(internationalZAiModels[testModelId]) + }) + }) + + describe("China Z AI", () => { + beforeEach(() => { + handler = new ZAiHandler({ zaiApiKey: "test-zai-api-key", zaiApiLine: "china" }) + }) + + it("should use the correct China Z AI base URL", () => { + new ZAiHandler({ zaiApiKey: "test-zai-api-key", zaiApiLine: "china" }) + expect(OpenAI).toHaveBeenCalledWith( + expect.objectContaining({ baseURL: "https://open.bigmodel.cn/api/paas/v4" }), + ) + }) + + it("should use the provided API key for China", () => { + const zaiApiKey = "test-zai-api-key" + new ZAiHandler({ zaiApiKey, zaiApiLine: "china" }) + expect(OpenAI).toHaveBeenCalledWith(expect.objectContaining({ apiKey: zaiApiKey })) + }) + + it("should return China default model when no model is specified", () => { + const model = handler.getModel() + expect(model.id).toBe(mainlandZAiDefaultModelId) + expect(model.info).toEqual(mainlandZAiModels[mainlandZAiDefaultModelId]) + }) + + it("should return specified China model when valid model is provided", () => { + const testModelId: MainlandZAiModelId = "glm-4.5-air" + const handlerWithModel = new ZAiHandler({ + apiModelId: testModelId, + zaiApiKey: "test-zai-api-key", + zaiApiLine: "china", + }) + const model = handlerWithModel.getModel() + expect(model.id).toBe(testModelId) + expect(model.info).toEqual(mainlandZAiModels[testModelId]) + }) + }) + + describe("Default behavior", () => { + it("should default to international when no zaiApiLine is specified", () => { + const handlerDefault = new ZAiHandler({ zaiApiKey: "test-zai-api-key" }) + expect(OpenAI).toHaveBeenCalledWith(expect.objectContaining({ baseURL: "https://api.z.ai/api/paas/v4" })) + + const model = handlerDefault.getModel() + expect(model.id).toBe(internationalZAiDefaultModelId) + expect(model.info).toEqual(internationalZAiModels[internationalZAiDefaultModelId]) + }) + + it("should use 'not-provided' as default API key when none is specified", () => { + new ZAiHandler({ zaiApiLine: "international" }) + expect(OpenAI).toHaveBeenCalledWith(expect.objectContaining({ apiKey: "not-provided" })) + }) + }) + + describe("API Methods", () => { + beforeEach(() => { + handler = new ZAiHandler({ zaiApiKey: "test-zai-api-key", zaiApiLine: "international" }) + }) + + it("completePrompt method should return text from Z AI API", async () => { + const expectedResponse = "This is a test response from Z AI" + mockCreate.mockResolvedValueOnce({ choices: [{ message: { content: expectedResponse } }] }) + const result = await handler.completePrompt("test prompt") + expect(result).toBe(expectedResponse) + }) + + it("should handle errors in completePrompt", async () => { + const errorMessage = "Z AI API error" + mockCreate.mockRejectedValueOnce(new Error(errorMessage)) + await expect(handler.completePrompt("test prompt")).rejects.toThrow( + `Z AI completion error: ${errorMessage}`, + ) + }) + + it("createMessage should yield text content from stream", async () => { + const testContent = "This is test content from Z AI stream" + + mockCreate.mockImplementationOnce(() => { + return { + [Symbol.asyncIterator]: () => ({ + next: vitest + .fn() + .mockResolvedValueOnce({ + done: false, + value: { choices: [{ delta: { content: testContent } }] }, + }) + .mockResolvedValueOnce({ done: true }), + }), + } + }) + + const stream = handler.createMessage("system prompt", []) + const firstChunk = await stream.next() + + expect(firstChunk.done).toBe(false) + expect(firstChunk.value).toEqual({ type: "text", text: testContent }) + }) + + it("createMessage should yield usage data from stream", async () => { + mockCreate.mockImplementationOnce(() => { + return { + [Symbol.asyncIterator]: () => ({ + next: vitest + .fn() + .mockResolvedValueOnce({ + done: false, + value: { + choices: [{ delta: {} }], + usage: { prompt_tokens: 10, completion_tokens: 20 }, + }, + }) + .mockResolvedValueOnce({ done: true }), + }), + } + }) + + const stream = handler.createMessage("system prompt", []) + const firstChunk = await stream.next() + + expect(firstChunk.done).toBe(false) + expect(firstChunk.value).toEqual({ type: "usage", inputTokens: 10, outputTokens: 20 }) + }) + + it("createMessage should pass correct parameters to Z AI client", async () => { + const modelId: InternationalZAiModelId = "glm-4.5" + const modelInfo = internationalZAiModels[modelId] + const handlerWithModel = new ZAiHandler({ + apiModelId: modelId, + zaiApiKey: "test-zai-api-key", + zaiApiLine: "international", + }) + + mockCreate.mockImplementationOnce(() => { + return { + [Symbol.asyncIterator]: () => ({ + async next() { + return { done: true } + }, + }), + } + }) + + const systemPrompt = "Test system prompt for Z AI" + const messages: Anthropic.Messages.MessageParam[] = [{ role: "user", content: "Test message for Z AI" }] + + const messageGenerator = handlerWithModel.createMessage(systemPrompt, messages) + await messageGenerator.next() + + expect(mockCreate).toHaveBeenCalledWith( + expect.objectContaining({ + model: modelId, + max_tokens: modelInfo.maxTokens, + temperature: ZAI_DEFAULT_TEMPERATURE, + messages: expect.arrayContaining([{ role: "system", content: systemPrompt }]), + stream: true, + stream_options: { include_usage: true }, + }), + ) + }) + }) +}) diff --git a/src/api/providers/index.ts b/src/api/providers/index.ts index a1b8f25536..dfcf87b6c9 100644 --- a/src/api/providers/index.ts +++ b/src/api/providers/index.ts @@ -26,3 +26,4 @@ export { UnboundHandler } from "./unbound" export { VertexHandler } from "./vertex" export { VsCodeLmHandler } from "./vscode-lm" export { XAIHandler } from "./xai" +export { ZAiHandler } from "./zai" diff --git a/src/api/providers/zai.ts b/src/api/providers/zai.ts new file mode 100644 index 0000000000..e37e37f01b --- /dev/null +++ b/src/api/providers/zai.ts @@ -0,0 +1,31 @@ +import { + internationalZAiModels, + mainlandZAiModels, + internationalZAiDefaultModelId, + mainlandZAiDefaultModelId, + type InternationalZAiModelId, + type MainlandZAiModelId, + ZAI_DEFAULT_TEMPERATURE, +} from "@roo-code/types" + +import type { ApiHandlerOptions } from "../../shared/api" + +import { BaseOpenAiCompatibleProvider } from "./base-openai-compatible-provider" + +export class ZAiHandler extends BaseOpenAiCompatibleProvider { + constructor(options: ApiHandlerOptions) { + const isChina = options.zaiApiLine === "china" + const models = isChina ? mainlandZAiModels : internationalZAiModels + const defaultModelId = isChina ? mainlandZAiDefaultModelId : internationalZAiDefaultModelId + + super({ + ...options, + providerName: "Z AI", + baseURL: isChina ? "https://open.bigmodel.cn/api/paas/v4" : "https://api.z.ai/api/paas/v4", + apiKey: options.zaiApiKey ?? "not-provided", + defaultProviderModelId: defaultModelId, + providerModels: models, + defaultTemperature: ZAI_DEFAULT_TEMPERATURE, + }) + } +} diff --git a/webview-ui/src/components/settings/ApiOptions.tsx b/webview-ui/src/components/settings/ApiOptions.tsx index d70ca553ac..6c521ecfdf 100644 --- a/webview-ui/src/components/settings/ApiOptions.tsx +++ b/webview-ui/src/components/settings/ApiOptions.tsx @@ -28,6 +28,8 @@ import { bedrockDefaultModelId, vertexDefaultModelId, sambaNovaDefaultModelId, + internationalZAiDefaultModelId, + mainlandZAiDefaultModelId, } from "@roo-code/types" import { vscode } from "@src/utils/vscode" @@ -79,6 +81,7 @@ import { Vertex, VSCodeLM, XAI, + ZAi, } from "./providers" import { MODELS_BY_PROVIDER, PROVIDERS } from "./constants" @@ -306,6 +309,13 @@ const ApiOptions = ({ bedrock: { field: "apiModelId", default: bedrockDefaultModelId }, vertex: { field: "apiModelId", default: vertexDefaultModelId }, sambanova: { field: "apiModelId", default: sambaNovaDefaultModelId }, + zai: { + field: "apiModelId", + default: + apiConfiguration.zaiApiLine === "china" + ? mainlandZAiDefaultModelId + : internationalZAiDefaultModelId, + }, openai: { field: "openAiModelId" }, ollama: { field: "ollamaModelId" }, lmstudio: { field: "lmStudioModelId" }, @@ -530,6 +540,10 @@ const ApiOptions = ({ )} + {selectedProvider === "zai" && ( + + )} + {selectedProvider === "human-relay" && ( <>
    diff --git a/webview-ui/src/components/settings/constants.ts b/webview-ui/src/components/settings/constants.ts index fae35b1693..c0ddaf89e1 100644 --- a/webview-ui/src/components/settings/constants.ts +++ b/webview-ui/src/components/settings/constants.ts @@ -16,6 +16,7 @@ import { chutesModels, sambaNovaModels, doubaoModels, + internationalZAiModels, } from "@roo-code/types" export const MODELS_BY_PROVIDER: Partial>> = { @@ -34,6 +35,7 @@ export const MODELS_BY_PROVIDER: Partial a.label.localeCompare(b.label)) diff --git a/webview-ui/src/components/settings/providers/ZAi.tsx b/webview-ui/src/components/settings/providers/ZAi.tsx new file mode 100644 index 0000000000..bc23f28346 --- /dev/null +++ b/webview-ui/src/components/settings/providers/ZAi.tsx @@ -0,0 +1,76 @@ +import { useCallback } from "react" +import { VSCodeTextField, VSCodeDropdown, VSCodeOption } from "@vscode/webview-ui-toolkit/react" + +import type { ProviderSettings } from "@roo-code/types" + +import { useAppTranslation } from "@src/i18n/TranslationContext" +import { VSCodeButtonLink } from "@src/components/common/VSCodeButtonLink" + +import { inputEventTransform } from "../transforms" +import { cn } from "@/lib/utils" + +type ZAiProps = { + apiConfiguration: ProviderSettings + setApiConfigurationField: (field: keyof ProviderSettings, value: ProviderSettings[keyof ProviderSettings]) => void +} + +export const ZAi = ({ apiConfiguration, setApiConfigurationField }: ZAiProps) => { + const { t } = useAppTranslation() + + const handleInputChange = useCallback( + ( + field: K, + transform: (event: E) => ProviderSettings[K] = inputEventTransform, + ) => + (event: E | Event) => { + setApiConfigurationField(field, transform(event as E)) + }, + [setApiConfigurationField], + ) + + return ( + <> +
    + + + + api.z.ai + + + open.bigmodel.cn + + +
    + {t("settings:providers.zaiEntrypointDescription")} +
    +
    +
    + + + +
    + {t("settings:providers.apiKeyStorageNotice")} +
    + {!apiConfiguration?.zaiApiKey && ( + + {t("settings:providers.getZaiApiKey")} + + )} +
    + + ) +} diff --git a/webview-ui/src/components/settings/providers/index.ts b/webview-ui/src/components/settings/providers/index.ts index 47430a0cc8..0f0048df0a 100644 --- a/webview-ui/src/components/settings/providers/index.ts +++ b/webview-ui/src/components/settings/providers/index.ts @@ -22,4 +22,5 @@ export { Unbound } from "./Unbound" export { Vertex } from "./Vertex" export { VSCodeLM } from "./VSCodeLM" export { XAI } from "./XAI" +export { ZAi } from "./ZAi" export { LiteLLM } from "./LiteLLM" diff --git a/webview-ui/src/components/ui/hooks/useSelectedModel.ts b/webview-ui/src/components/ui/hooks/useSelectedModel.ts index 0c6a84a65e..a191014981 100644 --- a/webview-ui/src/components/ui/hooks/useSelectedModel.ts +++ b/webview-ui/src/components/ui/hooks/useSelectedModel.ts @@ -40,6 +40,10 @@ import { sambaNovaDefaultModelId, doubaoModels, doubaoDefaultModelId, + internationalZAiDefaultModelId, + mainlandZAiDefaultModelId, + internationalZAiModels, + mainlandZAiModels, } from "@roo-code/types" import type { ModelRecord, RouterModels } from "@roo/api" @@ -203,6 +207,14 @@ function getSelectedModel({ const info = moonshotModels[id as keyof typeof moonshotModels] return { id, info } } + case "zai": { + const isChina = apiConfiguration.zaiApiLine === "china" + const models = isChina ? mainlandZAiModels : internationalZAiModels + const defaultModelId = isChina ? mainlandZAiDefaultModelId : internationalZAiDefaultModelId + const id = apiConfiguration.apiModelId ?? defaultModelId + const info = models[id as keyof typeof models] + return { id, info } + } case "openai-native": { const id = apiConfiguration.apiModelId ?? openAiNativeDefaultModelId const info = openAiNativeModels[id as keyof typeof openAiNativeModels] diff --git a/webview-ui/src/i18n/locales/ca/settings.json b/webview-ui/src/i18n/locales/ca/settings.json index cc1bbf5680..4ab333f48f 100644 --- a/webview-ui/src/i18n/locales/ca/settings.json +++ b/webview-ui/src/i18n/locales/ca/settings.json @@ -268,6 +268,10 @@ "moonshotApiKey": "Clau API de Moonshot", "getMoonshotApiKey": "Obtenir clau API de Moonshot", "moonshotBaseUrl": "Punt d'entrada de Moonshot", + "zaiApiKey": "Clau API de Z AI", + "getZaiApiKey": "Obtenir clau API de Z AI", + "zaiEntrypoint": "Punt d'entrada de Z AI", + "zaiEntrypointDescription": "Si us plau, seleccioneu el punt d'entrada de l'API apropiat segons la vostra ubicació. Si sou a la Xina, trieu open.bigmodel.cn. Altrament, trieu api.z.ai.", "geminiApiKey": "Clau API de Gemini", "getGroqApiKey": "Obtenir clau API de Groq", "groqApiKey": "Clau API de Groq", diff --git a/webview-ui/src/i18n/locales/de/settings.json b/webview-ui/src/i18n/locales/de/settings.json index 6bee80a8a6..ff893c3356 100644 --- a/webview-ui/src/i18n/locales/de/settings.json +++ b/webview-ui/src/i18n/locales/de/settings.json @@ -268,6 +268,10 @@ "moonshotApiKey": "Moonshot API-Schlüssel", "getMoonshotApiKey": "Moonshot API-Schlüssel erhalten", "moonshotBaseUrl": "Moonshot-Einstiegspunkt", + "zaiApiKey": "Z AI API-Schlüssel", + "getZaiApiKey": "Z AI API-Schlüssel erhalten", + "zaiEntrypoint": "Z AI Einstiegspunkt", + "zaiEntrypointDescription": "Bitte wählen Sie den entsprechenden API-Einstiegspunkt basierend auf Ihrem Standort. Wenn Sie sich in China befinden, wählen Sie open.bigmodel.cn. Andernfalls wählen Sie api.z.ai.", "geminiApiKey": "Gemini API-Schlüssel", "getGroqApiKey": "Groq API-Schlüssel erhalten", "groqApiKey": "Groq API-Schlüssel", diff --git a/webview-ui/src/i18n/locales/en/settings.json b/webview-ui/src/i18n/locales/en/settings.json index c52841ca83..a48213110a 100644 --- a/webview-ui/src/i18n/locales/en/settings.json +++ b/webview-ui/src/i18n/locales/en/settings.json @@ -267,6 +267,10 @@ "moonshotApiKey": "Moonshot API Key", "getMoonshotApiKey": "Get Moonshot API Key", "moonshotBaseUrl": "Moonshot Entrypoint", + "zaiApiKey": "Z AI API Key", + "getZaiApiKey": "Get Z AI API Key", + "zaiEntrypoint": "Z AI Entrypoint", + "zaiEntrypointDescription": "Please select the appropriate API entrypoint based on your location. If you are in China, choose open.bigmodel.cn. Otherwise, choose api.z.ai.", "geminiApiKey": "Gemini API Key", "getGroqApiKey": "Get Groq API Key", "groqApiKey": "Groq API Key", diff --git a/webview-ui/src/i18n/locales/es/settings.json b/webview-ui/src/i18n/locales/es/settings.json index 42251f606a..579426cdb6 100644 --- a/webview-ui/src/i18n/locales/es/settings.json +++ b/webview-ui/src/i18n/locales/es/settings.json @@ -268,6 +268,10 @@ "moonshotApiKey": "Clave API de Moonshot", "getMoonshotApiKey": "Obtener clave API de Moonshot", "moonshotBaseUrl": "Punto de entrada de Moonshot", + "zaiApiKey": "Clave API de Z AI", + "getZaiApiKey": "Obtener clave API de Z AI", + "zaiEntrypoint": "Punto de entrada de Z AI", + "zaiEntrypointDescription": "Por favor, seleccione el punto de entrada de API apropiado según su ubicación. Si está en China, elija open.bigmodel.cn. De lo contrario, elija api.z.ai.", "geminiApiKey": "Clave API de Gemini", "getGroqApiKey": "Obtener clave API de Groq", "groqApiKey": "Clave API de Groq", diff --git a/webview-ui/src/i18n/locales/fr/settings.json b/webview-ui/src/i18n/locales/fr/settings.json index c527b2e42f..52ac1aec34 100644 --- a/webview-ui/src/i18n/locales/fr/settings.json +++ b/webview-ui/src/i18n/locales/fr/settings.json @@ -268,6 +268,10 @@ "moonshotApiKey": "Clé API Moonshot", "getMoonshotApiKey": "Obtenir la clé API Moonshot", "moonshotBaseUrl": "Point d'entrée Moonshot", + "zaiApiKey": "Clé API Z AI", + "getZaiApiKey": "Obtenir la clé API Z AI", + "zaiEntrypoint": "Point d'entrée Z AI", + "zaiEntrypointDescription": "Veuillez sélectionner le point d'entrée API approprié en fonction de votre emplacement. Si vous êtes en Chine, choisissez open.bigmodel.cn. Sinon, choisissez api.z.ai.", "geminiApiKey": "Clé API Gemini", "getGroqApiKey": "Obtenir la clé API Groq", "groqApiKey": "Clé API Groq", diff --git a/webview-ui/src/i18n/locales/hi/settings.json b/webview-ui/src/i18n/locales/hi/settings.json index 5130f818da..7926ae5ba9 100644 --- a/webview-ui/src/i18n/locales/hi/settings.json +++ b/webview-ui/src/i18n/locales/hi/settings.json @@ -268,6 +268,10 @@ "moonshotApiKey": "Moonshot API कुंजी", "getMoonshotApiKey": "Moonshot API कुंजी प्राप्त करें", "moonshotBaseUrl": "Moonshot प्रवेश बिंदु", + "zaiApiKey": "Z AI API कुंजी", + "getZaiApiKey": "Z AI API कुंजी प्राप्त करें", + "zaiEntrypoint": "Z AI प्रवेश बिंदु", + "zaiEntrypointDescription": "कृपया अपने स्थान के आधार पर उपयुक्त API प्रवेश बिंदु का चयन करें। यदि आप चीन में हैं, तो open.bigmodel.cn चुनें। अन्यथा, api.z.ai चुनें।", "geminiApiKey": "Gemini API कुंजी", "getGroqApiKey": "Groq API कुंजी प्राप्त करें", "groqApiKey": "Groq API कुंजी", diff --git a/webview-ui/src/i18n/locales/id/settings.json b/webview-ui/src/i18n/locales/id/settings.json index f0285a5130..66e7cb53a1 100644 --- a/webview-ui/src/i18n/locales/id/settings.json +++ b/webview-ui/src/i18n/locales/id/settings.json @@ -272,6 +272,10 @@ "moonshotApiKey": "Kunci API Moonshot", "getMoonshotApiKey": "Dapatkan Kunci API Moonshot", "moonshotBaseUrl": "Titik Masuk Moonshot", + "zaiApiKey": "Kunci API Z AI", + "getZaiApiKey": "Dapatkan Kunci API Z AI", + "zaiEntrypoint": "Titik Masuk Z AI", + "zaiEntrypointDescription": "Silakan pilih titik masuk API yang sesuai berdasarkan lokasi Anda. Jika Anda berada di China, pilih open.bigmodel.cn. Jika tidak, pilih api.z.ai.", "geminiApiKey": "Gemini API Key", "getGroqApiKey": "Dapatkan Groq API Key", "groqApiKey": "Groq API Key", diff --git a/webview-ui/src/i18n/locales/it/settings.json b/webview-ui/src/i18n/locales/it/settings.json index afdd7b3707..4cfe6ff231 100644 --- a/webview-ui/src/i18n/locales/it/settings.json +++ b/webview-ui/src/i18n/locales/it/settings.json @@ -268,6 +268,10 @@ "moonshotApiKey": "Chiave API Moonshot", "getMoonshotApiKey": "Ottieni chiave API Moonshot", "moonshotBaseUrl": "Punto di ingresso Moonshot", + "zaiApiKey": "Chiave API Z AI", + "getZaiApiKey": "Ottieni chiave API Z AI", + "zaiEntrypoint": "Punto di ingresso Z AI", + "zaiEntrypointDescription": "Si prega di selezionare il punto di ingresso API appropriato in base alla propria posizione. Se ti trovi in Cina, scegli open.bigmodel.cn. Altrimenti, scegli api.z.ai.", "geminiApiKey": "Chiave API Gemini", "getGroqApiKey": "Ottieni chiave API Groq", "groqApiKey": "Chiave API Groq", diff --git a/webview-ui/src/i18n/locales/ja/settings.json b/webview-ui/src/i18n/locales/ja/settings.json index debc7ad2ab..a83d78ed39 100644 --- a/webview-ui/src/i18n/locales/ja/settings.json +++ b/webview-ui/src/i18n/locales/ja/settings.json @@ -268,6 +268,10 @@ "moonshotApiKey": "Moonshot APIキー", "getMoonshotApiKey": "Moonshot APIキーを取得", "moonshotBaseUrl": "Moonshot エントリーポイント", + "zaiApiKey": "Z AI APIキー", + "getZaiApiKey": "Z AI APIキーを取得", + "zaiEntrypoint": "Z AI エントリーポイント", + "zaiEntrypointDescription": "お住まいの地域に応じて適切な API エントリーポイントを選択してください。中国にお住まいの場合は open.bigmodel.cn を選択してください。それ以外の場合は api.z.ai を選択してください。", "geminiApiKey": "Gemini APIキー", "getGroqApiKey": "Groq APIキーを取得", "groqApiKey": "Groq APIキー", diff --git a/webview-ui/src/i18n/locales/ko/settings.json b/webview-ui/src/i18n/locales/ko/settings.json index d48012862f..708b1c7ada 100644 --- a/webview-ui/src/i18n/locales/ko/settings.json +++ b/webview-ui/src/i18n/locales/ko/settings.json @@ -268,6 +268,10 @@ "moonshotApiKey": "Moonshot API 키", "getMoonshotApiKey": "Moonshot API 키 받기", "moonshotBaseUrl": "Moonshot 엔트리포인트", + "zaiApiKey": "Z AI API 키", + "getZaiApiKey": "Z AI API 키 받기", + "zaiEntrypoint": "Z AI 엔트리포인트", + "zaiEntrypointDescription": "위치에 따라 적절한 API 엔트리포인트를 선택하세요. 중국에 있다면 open.bigmodel.cn을 선택하세요. 그렇지 않으면 api.z.ai를 선택하세요.", "geminiApiKey": "Gemini API 키", "getGroqApiKey": "Groq API 키 받기", "groqApiKey": "Groq API 키", diff --git a/webview-ui/src/i18n/locales/nl/settings.json b/webview-ui/src/i18n/locales/nl/settings.json index 7722244dd4..dca4ba5c71 100644 --- a/webview-ui/src/i18n/locales/nl/settings.json +++ b/webview-ui/src/i18n/locales/nl/settings.json @@ -268,6 +268,10 @@ "moonshotApiKey": "Moonshot API-sleutel", "getMoonshotApiKey": "Moonshot API-sleutel ophalen", "moonshotBaseUrl": "Moonshot-ingangspunt", + "zaiApiKey": "Z AI API-sleutel", + "getZaiApiKey": "Z AI API-sleutel ophalen", + "zaiEntrypoint": "Z AI-ingangspunt", + "zaiEntrypointDescription": "Selecteer het juiste API-ingangspunt op basis van uw locatie. Als u zich in China bevindt, kies dan open.bigmodel.cn. Anders kiest u api.z.ai.", "geminiApiKey": "Gemini API-sleutel", "getGroqApiKey": "Groq API-sleutel ophalen", "groqApiKey": "Groq API-sleutel", diff --git a/webview-ui/src/i18n/locales/pl/settings.json b/webview-ui/src/i18n/locales/pl/settings.json index 130453764a..5037ceb569 100644 --- a/webview-ui/src/i18n/locales/pl/settings.json +++ b/webview-ui/src/i18n/locales/pl/settings.json @@ -268,6 +268,10 @@ "moonshotApiKey": "Klucz API Moonshot", "getMoonshotApiKey": "Uzyskaj klucz API Moonshot", "moonshotBaseUrl": "Punkt wejścia Moonshot", + "zaiApiKey": "Klucz API Z AI", + "getZaiApiKey": "Uzyskaj klucz API Z AI", + "zaiEntrypoint": "Punkt wejścia Z AI", + "zaiEntrypointDescription": "Wybierz odpowiedni punkt wejścia API w zależności od swojej lokalizacji. Jeśli jesteś w Chinach, wybierz open.bigmodel.cn. W przeciwnym razie wybierz api.z.ai.", "geminiApiKey": "Klucz API Gemini", "getGroqApiKey": "Uzyskaj klucz API Groq", "groqApiKey": "Klucz API Groq", diff --git a/webview-ui/src/i18n/locales/pt-BR/settings.json b/webview-ui/src/i18n/locales/pt-BR/settings.json index 05e20bfee2..c862cee357 100644 --- a/webview-ui/src/i18n/locales/pt-BR/settings.json +++ b/webview-ui/src/i18n/locales/pt-BR/settings.json @@ -268,6 +268,10 @@ "moonshotApiKey": "Chave de API Moonshot", "getMoonshotApiKey": "Obter chave de API Moonshot", "moonshotBaseUrl": "Ponto de entrada Moonshot", + "zaiApiKey": "Chave de API Z AI", + "getZaiApiKey": "Obter chave de API Z AI", + "zaiEntrypoint": "Ponto de entrada Z AI", + "zaiEntrypointDescription": "Selecione o ponto de entrada da API apropriado com base na sua localização. Se você estiver na China, escolha open.bigmodel.cn. Caso contrário, escolha api.z.ai.", "geminiApiKey": "Chave de API Gemini", "getGroqApiKey": "Obter chave de API Groq", "groqApiKey": "Chave de API Groq", diff --git a/webview-ui/src/i18n/locales/ru/settings.json b/webview-ui/src/i18n/locales/ru/settings.json index 6eeb5f134a..25b147f57e 100644 --- a/webview-ui/src/i18n/locales/ru/settings.json +++ b/webview-ui/src/i18n/locales/ru/settings.json @@ -268,6 +268,10 @@ "moonshotApiKey": "Moonshot API-ключ", "getMoonshotApiKey": "Получить Moonshot API-ключ", "moonshotBaseUrl": "Точка входа Moonshot", + "zaiApiKey": "Z AI API-ключ", + "getZaiApiKey": "Получить Z AI API-ключ", + "zaiEntrypoint": "Точка входа Z AI", + "zaiEntrypointDescription": "Пожалуйста, выберите подходящую точку входа API в зависимости от вашего местоположения. Если вы находитесь в Китае, выберите open.bigmodel.cn. В противном случае выберите api.z.ai.", "geminiApiKey": "Gemini API-ключ", "getGroqApiKey": "Получить Groq API-ключ", "groqApiKey": "Groq API-ключ", diff --git a/webview-ui/src/i18n/locales/tr/settings.json b/webview-ui/src/i18n/locales/tr/settings.json index f58ab8ad5e..1aa6ce9783 100644 --- a/webview-ui/src/i18n/locales/tr/settings.json +++ b/webview-ui/src/i18n/locales/tr/settings.json @@ -268,6 +268,10 @@ "moonshotApiKey": "Moonshot API Anahtarı", "getMoonshotApiKey": "Moonshot API Anahtarı Al", "moonshotBaseUrl": "Moonshot Giriş Noktası", + "zaiApiKey": "Z AI API Anahtarı", + "getZaiApiKey": "Z AI API Anahtarı Al", + "zaiEntrypoint": "Z AI Giriş Noktası", + "zaiEntrypointDescription": "Konumunuza göre uygun API giriş noktasını seçin. Çin'de iseniz open.bigmodel.cn'yi seçin. Aksi takdirde api.z.ai'yi seçin.", "geminiApiKey": "Gemini API Anahtarı", "getGroqApiKey": "Groq API Anahtarı Al", "groqApiKey": "Groq API Anahtarı", diff --git a/webview-ui/src/i18n/locales/vi/settings.json b/webview-ui/src/i18n/locales/vi/settings.json index 0b8461b469..3449012f9c 100644 --- a/webview-ui/src/i18n/locales/vi/settings.json +++ b/webview-ui/src/i18n/locales/vi/settings.json @@ -268,6 +268,10 @@ "moonshotApiKey": "Khóa API Moonshot", "getMoonshotApiKey": "Lấy khóa API Moonshot", "moonshotBaseUrl": "Điểm vào Moonshot", + "zaiApiKey": "Khóa API Z AI", + "getZaiApiKey": "Lấy khóa API Z AI", + "zaiEntrypoint": "Điểm vào Z AI", + "zaiEntrypointDescription": "Vui lòng chọn điểm vào API phù hợp dựa trên vị trí của bạn. Nếu bạn ở Trung Quốc, hãy chọn open.bigmodel.cn. Ngược lại, hãy chọn api.z.ai.", "geminiApiKey": "Khóa API Gemini", "getGroqApiKey": "Lấy khóa API Groq", "groqApiKey": "Khóa API Groq", diff --git a/webview-ui/src/i18n/locales/zh-CN/settings.json b/webview-ui/src/i18n/locales/zh-CN/settings.json index f9e82bf87e..e7c53cf757 100644 --- a/webview-ui/src/i18n/locales/zh-CN/settings.json +++ b/webview-ui/src/i18n/locales/zh-CN/settings.json @@ -268,6 +268,10 @@ "moonshotApiKey": "Moonshot API 密钥", "getMoonshotApiKey": "获取 Moonshot API 密钥", "moonshotBaseUrl": "Moonshot 服务站点", + "zaiApiKey": "Z AI API 密钥", + "getZaiApiKey": "获取 Z AI API 密钥", + "zaiEntrypoint": "Z AI 服务站点", + "zaiEntrypointDescription": "请根据您的位置选择适当的 API 服务站点。如果您在中国，请选择 open.bigmodel.cn。否则，请选择 api.z.ai。", "geminiApiKey": "Gemini API 密钥", "getGroqApiKey": "获取 Groq API 密钥", "groqApiKey": "Groq API 密钥", diff --git a/webview-ui/src/i18n/locales/zh-TW/settings.json b/webview-ui/src/i18n/locales/zh-TW/settings.json index f638a782b9..cfdcd6e696 100644 --- a/webview-ui/src/i18n/locales/zh-TW/settings.json +++ b/webview-ui/src/i18n/locales/zh-TW/settings.json @@ -268,6 +268,10 @@ "moonshotApiKey": "Moonshot API 金鑰", "getMoonshotApiKey": "取得 Moonshot API 金鑰", "moonshotBaseUrl": "Moonshot 服務站點", + "zaiApiKey": "Z AI API 金鑰", + "getZaiApiKey": "取得 Z AI API 金鑰", + "zaiEntrypoint": "Z AI 服務站點", + "zaiEntrypointDescription": "請根據您的位置選擇適當的 API 服務站點。如果您在中國，請選擇 open.bigmodel.cn。否則，請選擇 api.z.ai。", "geminiApiKey": "Gemini API 金鑰", "getGroqApiKey": "取得 Groq API 金鑰", "groqApiKey": "Groq API 金鑰", From 4e8b17486b08d9fe1c8b9e4f1ac42908de966c1e Mon Sep 17 00:00:00 2001 From: Kaan <92330562+AyazKaan@users.noreply.github.com> Date: Mon, 4 Aug 2025 18:56:05 +0300 Subject: [PATCH 060/253] feat(ui): Make mode selection dropdowns responsive (#6422) --- webview-ui/src/components/modes/ModesView.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webview-ui/src/components/modes/ModesView.tsx b/webview-ui/src/components/modes/ModesView.tsx index c2b67bc450..93a429408a 100644 --- a/webview-ui/src/components/modes/ModesView.tsx +++ b/webview-ui/src/components/modes/ModesView.tsx @@ -615,9 +615,9 @@ const ModesView = ({ onDone }: ModesViewProps) => { variant="combobox" role="combobox" aria-expanded={open} - className="justify-between w-60" + className="justify-between w-full" data-testid="mode-select-trigger"> -
    {getCurrentMode()?.name || t("prompts:modes.selectMode")}
    +
    {getCurrentMode()?.name || t("prompts:modes.selectMode")}
    @@ -716,7 +716,7 @@ const ModesView = ({ onDone }: ModesViewProps) => { text: value, }) }}> - + From c34e4127718081cde6fddbc09294d37ecb8cb29c Mon Sep 17 00:00:00 2001 From: Chris Estreich Date: Mon, 4 Aug 2025 10:58:11 -0700 Subject: [PATCH 061/253] Bump @roo-code/types to v1.44.0 (#6675) --- packages/types/npm/package.json | 2 +- packages/types/src/cloud.ts | 1 + packages/types/src/global-settings.ts | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/types/npm/package.json b/packages/types/npm/package.json index 10a4805127..f73a83a7b6 100644 --- a/packages/types/npm/package.json +++ b/packages/types/npm/package.json @@ -1,6 +1,6 @@ { "name": "@roo-code/types", - "version": "1.43.0", + "version": "1.44.0", "description": "TypeScript type definitions for Roo Code.", "publishConfig": { "access": "public", diff --git a/packages/types/src/cloud.ts b/packages/types/src/cloud.ts index a4eb9f96a8..be9a039d43 100644 --- a/packages/types/src/cloud.ts +++ b/packages/types/src/cloud.ts @@ -17,6 +17,7 @@ export interface CloudUserInfo { organizationName?: string organizationRole?: string organizationImageUrl?: string + extensionBridgeEnabled?: boolean } /** diff --git a/packages/types/src/global-settings.ts b/packages/types/src/global-settings.ts index 6de4d7413f..41945ff470 100644 --- a/packages/types/src/global-settings.ts +++ b/packages/types/src/global-settings.ts @@ -134,6 +134,8 @@ export const globalSettingsSchema = z.object({ mcpEnabled: z.boolean().optional(), enableMcpServerCreation: z.boolean().optional(), + remoteControlEnabled: z.boolean().optional(), + mode: z.string().optional(), modeApiConfigs: z.record(z.string(), z.string()).optional(), customModes: z.array(modeConfigSchema).optional(), @@ -288,6 +290,8 @@ export const EVALS_SETTINGS: RooCodeSettings = { mcpEnabled: false, + remoteControlEnabled: false, + mode: "code", // "architect", customModes: [], From 7ca4901024854a27a66329d537592c4c96966162 Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Mon, 4 Aug 2025 11:03:34 -0700 Subject: [PATCH 062/253] fix: prevent empty mode names from being saved (fixes #5766) (#5767) * fix: prevent empty mode names from being saved (fixes #5766) - Add frontend validation in ModesView to prevent empty names from being saved - Add onBlur handler to restore original name if field is left empty - Add backend validation in CustomModesManager.updateCustomMode using modeConfigSchema - Provide user feedback when validation fails - Trim whitespace from mode names before validation This prevents YAML parsing errors caused by empty mode name fields. * fix: improve UX by allowing users to empty mode name field - Remove restriction that prevented users from emptying the name field - Remove onBlur handler that automatically restored original name - Allow backend validation to handle empty names and show appropriate errors - Users can now type freely but invalid saves are prevented by backend validation Addresses feedback from @daniel-lxs in PR #5767 * fix: allow emptying mode name field but prevent saving when invalid - Modified onBlur handler to check if name is empty before saving - If empty, revert to original name instead of saving empty value - This provides better UX as requested in PR review * fix: add proper JSON formatting to source map writes for Windows compatibility --------- Co-authored-by: Roo Code --- src/core/config/CustomModesManager.ts | 12 ++++++---- webview-ui/src/components/modes/ModesView.tsx | 22 +++++++++++++------ .../src/vite-plugins/sourcemapPlugin.ts | 4 ++-- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/core/config/CustomModesManager.ts b/src/core/config/CustomModesManager.ts index 095ed86cb7..a9a2e6a6b5 100644 --- a/src/core/config/CustomModesManager.ts +++ b/src/core/config/CustomModesManager.ts @@ -405,9 +405,13 @@ export class CustomModesManager { // Validate the mode configuration before saving const validationResult = modeConfigSchema.safeParse(config) if (!validationResult.success) { - const errors = validationResult.error.errors.map((e) => e.message).join(", ") - logger.error(`Invalid mode configuration for ${slug}`, { errors: validationResult.error.errors }) - throw new Error(`Invalid mode configuration: ${errors}`) + const errorMessages = validationResult.error.errors + .map((err) => `${err.path.join(".")}: ${err.message}`) + .join(", ") + const errorMessage = `Invalid mode configuration: ${errorMessages}` + logger.error("Mode validation failed", { slug, errors: validationResult.error.errors }) + vscode.window.showErrorMessage(t("common:customModes.errors.updateFailed", { error: errorMessage })) + return } const isProjectMode = config.source === "project" @@ -786,7 +790,7 @@ export class CustomModesManager { // This excludes the rules-{slug} folder from the path const relativePath = path.relative(modeRulesDir, filePath) // Normalize path to use forward slashes for cross-platform compatibility - const normalizedRelativePath = relativePath.replace(/\\/g, '/') + const normalizedRelativePath = relativePath.replace(/\\/g, "/") rulesFiles.push({ relativePath: normalizedRelativePath, content: content.trim() }) } } diff --git a/webview-ui/src/components/modes/ModesView.tsx b/webview-ui/src/components/modes/ModesView.tsx index 93a429408a..21c531937f 100644 --- a/webview-ui/src/components/modes/ModesView.tsx +++ b/webview-ui/src/components/modes/ModesView.tsx @@ -755,17 +755,25 @@ const ModesView = ({ onDone }: ModesViewProps) => { } }} onChange={(e) => { - setLocalModeName(e.target.value) + const newName = e.target.value + // Allow users to type freely, including emptying the field + setLocalModeName(newName) }} onBlur={() => { const customMode = findModeBySlug(visualMode, customModes) - if (customMode && localModeName.trim()) { + if (customMode) { + const trimmedName = localModeName.trim() // Only update if the name is not empty - updateCustomMode(visualMode, { - ...customMode, - name: localModeName, - source: customMode.source || "global", - }) + if (trimmedName) { + updateCustomMode(visualMode, { + ...customMode, + name: trimmedName, + source: customMode.source || "global", + }) + } else { + // Revert to the original name if empty + setLocalModeName(customMode.name) + } } // Clear the editing state setCurrentEditingModeSlug(null) diff --git a/webview-ui/src/vite-plugins/sourcemapPlugin.ts b/webview-ui/src/vite-plugins/sourcemapPlugin.ts index 9eb1e7b642..1449c888f2 100644 --- a/webview-ui/src/vite-plugins/sourcemapPlugin.ts +++ b/webview-ui/src/vite-plugins/sourcemapPlugin.ts @@ -88,8 +88,8 @@ export function sourcemapPlugin(): Plugin { }) } - // Write back the updated source map - fs.writeFileSync(mapPath, JSON.stringify(mapContent)) + // Write back the updated source map with proper formatting + fs.writeFileSync(mapPath, JSON.stringify(mapContent, null, 2)) console.log(`Updated source map for ${jsFile}`) } catch (error) { console.error(`Error processing source map for ${jsFile}:`, error) From 1d714c8ce4d925b7cc7c100702e215ee3cda1a48 Mon Sep 17 00:00:00 2001 From: Chris Estreich Date: Mon, 4 Aug 2025 13:58:14 -0700 Subject: [PATCH 063/253] Extension bridge (#6677) Co-authored-by: Matt Rubens --- pnpm-lock.yaml | 28 +++-- src/core/task/Task.ts | 29 ++++- src/core/webview/ClineProvider.ts | 115 +++++++++++++++++- src/core/webview/webviewMessageHandler.ts | 5 + src/extension.ts | 64 +++++----- src/package.json | 2 +- src/shared/ExtensionMessage.ts | 1 + src/shared/WebviewMessage.ts | 1 + src/utils/remoteControl.ts | 11 ++ .../src/components/account/AccountView.tsx | 71 ++++++++--- .../account/__tests__/AccountView.spec.tsx | 87 +++++++++++-- webview-ui/src/components/modes/ModesView.tsx | 4 +- .../src/context/ExtensionStateContext.tsx | 5 + webview-ui/src/i18n/locales/ca/account.json | 3 + webview-ui/src/i18n/locales/de/account.json | 3 + webview-ui/src/i18n/locales/en/account.json | 14 ++- webview-ui/src/i18n/locales/en/settings.json | 2 +- webview-ui/src/i18n/locales/es/account.json | 3 + webview-ui/src/i18n/locales/fr/account.json | 3 + webview-ui/src/i18n/locales/hi/account.json | 3 + webview-ui/src/i18n/locales/id/account.json | 3 + webview-ui/src/i18n/locales/it/account.json | 3 + webview-ui/src/i18n/locales/ja/account.json | 3 + webview-ui/src/i18n/locales/ko/account.json | 3 + webview-ui/src/i18n/locales/nl/account.json | 3 + webview-ui/src/i18n/locales/pl/account.json | 3 + .../src/i18n/locales/pt-BR/account.json | 3 + webview-ui/src/i18n/locales/ru/account.json | 3 + webview-ui/src/i18n/locales/tr/account.json | 3 + webview-ui/src/i18n/locales/vi/account.json | 3 + .../src/i18n/locales/zh-CN/account.json | 3 + .../src/i18n/locales/zh-TW/account.json | 3 + 32 files changed, 404 insertions(+), 86 deletions(-) create mode 100644 src/utils/remoteControl.ts diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b2847df1a1..0d952b6aeb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -563,8 +563,8 @@ importers: specifier: ^1.14.0 version: 1.14.0(typescript@5.8.3) '@roo-code/cloud': - specifier: ^0.4.0 - version: 0.4.0 + specifier: ^0.5.0 + version: 0.5.0 '@roo-code/ipc': specifier: workspace:^ version: link:../packages/ipc @@ -3065,11 +3065,11 @@ packages: cpu: [x64] os: [win32] - '@roo-code/cloud@0.4.0': - resolution: {integrity: sha512-1a27RG2YjQFfsU5UlfbQnpj/K/6gYBcysp2FXaX9+VaaTh5ZzReQeHJ9uREnyE059zoFpVuNywwNxGadzyotWw==} + '@roo-code/cloud@0.5.0': + resolution: {integrity: sha512-4u6Ce2Rmr5a9nxhjGUMRRWUWhZc63EmF/UJ/+Az5/1JARMOp0kHN5Pwqz2QAgfD137+TFSBKQORpiN0GXrdt2w==} - '@roo-code/types@1.42.0': - resolution: {integrity: sha512-AITVSV6WFd17jE8lQXFy7PkHam8M+mMkT7o9ipGZZ3cV7SbrnmL/Hg/HjkA9lkdJYbcC5dEK94py8KVBQn8Umw==} + '@roo-code/types@1.44.0': + resolution: {integrity: sha512-3xbW4pYaCgWuHF5qOsiXpIcd281dlFTe1zboUGgcUUsB414Hu3pQI86PdgJxVGtZgxtaca0eHTQ2Sqjqq8nPlA==} '@sec-ant/readable-stream@0.4.1': resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==} @@ -6267,8 +6267,8 @@ packages: resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==} engines: {node: '>=12'} - ioredis@5.7.0: - resolution: {integrity: sha512-NUcA93i1lukyXU+riqEyPtSEkyFq8tX90uL659J+qpCZ3rEdViB/APC58oAhIh3+bJln2hzdlZbBZsGNrlsR8g==} + ioredis@5.6.1: + resolution: {integrity: sha512-UxC0Yv1Y4WRJiGQxQkP0hfdL0/5/6YvdfOOClRgJ0qppSarkhneSa6UvkMkms0AkdGimSH3Ikqm+6mkMmX7vGA==} engines: {node: '>=12.22.0'} ip-address@9.0.5: @@ -12191,16 +12191,18 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.40.2': optional: true - '@roo-code/cloud@0.4.0': + '@roo-code/cloud@0.5.0': dependencies: - '@roo-code/types': 1.42.0 - ioredis: 5.7.0 + '@roo-code/types': 1.44.0 + ioredis: 5.6.1 p-wait-for: 5.0.2 zod: 3.25.76 transitivePeerDependencies: - supports-color - '@roo-code/types@1.42.0': {} + '@roo-code/types@1.44.0': + dependencies: + zod: 3.25.76 '@sec-ant/readable-stream@0.4.1': {} @@ -15963,7 +15965,7 @@ snapshots: internmap@2.0.3: {} - ioredis@5.7.0: + ioredis@5.6.1: dependencies: '@ioredis/commands': 1.3.0 cluster-key-slot: 1.1.2 diff --git a/src/core/task/Task.ts b/src/core/task/Task.ts index 3cb6abe7f7..e0c332d16f 100644 --- a/src/core/task/Task.ts +++ b/src/core/task/Task.ts @@ -32,7 +32,7 @@ import { isBlockingAsk, } from "@roo-code/types" import { TelemetryService } from "@roo-code/telemetry" -import { CloudService } from "@roo-code/cloud" +import { CloudService, TaskBridgeService } from "@roo-code/cloud" // api import { ApiHandler, ApiHandlerCreateMessageMetadata, buildApiHandler } from "../../api" @@ -118,6 +118,7 @@ export type TaskOptions = { parentTask?: Task taskNumber?: number onCreated?: (task: Task) => void + enableTaskBridge?: boolean } export class Task extends EventEmitter implements TaskLike { @@ -237,6 +238,9 @@ export class Task extends EventEmitter implements TaskLike { checkpointService?: RepoPerTaskCheckpointService checkpointServiceInitializing = false + // Task Bridge + taskBridgeService?: TaskBridgeService + // Streaming isWaitingForFirstChunk = false isStreaming = false @@ -268,6 +272,7 @@ export class Task extends EventEmitter implements TaskLike { parentTask, taskNumber = -1, onCreated, + enableTaskBridge = false, }: TaskOptions) { super() @@ -345,6 +350,11 @@ export class Task extends EventEmitter implements TaskLike { this.toolRepetitionDetector = new ToolRepetitionDetector(this.consecutiveMistakeLimit) + // Initialize TaskBridgeService only if enabled + if (enableTaskBridge) { + this.taskBridgeService = TaskBridgeService.getInstance() + } + onCreated?.(this) if (startTask) { @@ -931,6 +941,11 @@ export class Task extends EventEmitter implements TaskLike { // Start / Abort / Resume private async startTask(task?: string, images?: string[]): Promise { + if (this.taskBridgeService) { + await this.taskBridgeService.initialize() + await this.taskBridgeService.subscribeToTask(this) + } + // `conversationHistory` (for API) and `clineMessages` (for webview) // need to be in sync. // If the extension process were killed, then on restart the @@ -982,6 +997,11 @@ export class Task extends EventEmitter implements TaskLike { } private async resumeTaskFromHistory() { + if (this.taskBridgeService) { + await this.taskBridgeService.initialize() + await this.taskBridgeService.subscribeToTask(this) + } + const modifiedClineMessages = await this.getSavedClineMessages() // Remove any resume messages that may have been added before @@ -1227,6 +1247,13 @@ export class Task extends EventEmitter implements TaskLike { this.pauseInterval = undefined } + // Unsubscribe from TaskBridge service. + if (this.taskBridgeService) { + this.taskBridgeService + .unsubscribeFromTask(this.taskId) + .catch((error) => console.error("Error unsubscribing from task bridge:", error)) + } + // Release any terminals associated with this task. try { // Release any terminals associated with this task. diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index ed8f8a27d1..384de58be7 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -17,7 +17,6 @@ import { type ProviderSettings, type RooCodeSettings, type ProviderSettingsEntry, - type ProviderSettingsWithId, type TelemetryProperties, type TelemetryPropertiesProvider, type CodeActionId, @@ -66,6 +65,7 @@ import { fileExistsAtPath } from "../../utils/fs" import { setTtsEnabled, setTtsSpeed } from "../../utils/tts" import { getWorkspaceGitInfo } from "../../utils/git" import { getWorkspacePath } from "../../utils/path" +import { isRemoteControlEnabled } from "../../utils/remoteControl" import { setPanel } from "../../activate/registerCommands" @@ -111,6 +111,8 @@ export class ClineProvider protected mcpHub?: McpHub // Change from private to protected private marketplaceManager: MarketplaceManager private mdmService?: MdmService + private taskCreationCallback: (task: Task) => void + private taskEventListeners: WeakMap void>> = new WeakMap() public isViewLaunched = false public settingsImportedAt?: number @@ -162,6 +164,40 @@ export class ClineProvider this.marketplaceManager = new MarketplaceManager(this.context, this.customModesManager) + this.taskCreationCallback = (instance: Task) => { + this.emit(RooCodeEventName.TaskCreated, instance) + + // Create named listener functions so we can remove them later. + const onTaskStarted = () => this.emit(RooCodeEventName.TaskStarted, instance.taskId) + const onTaskCompleted = (taskId: string, tokenUsage: any, toolUsage: any) => + this.emit(RooCodeEventName.TaskCompleted, taskId, tokenUsage, toolUsage) + const onTaskAborted = () => this.emit(RooCodeEventName.TaskAborted, instance.taskId) + const onTaskFocused = () => this.emit(RooCodeEventName.TaskFocused, instance.taskId) + const onTaskUnfocused = () => this.emit(RooCodeEventName.TaskUnfocused, instance.taskId) + const onTaskActive = (taskId: string) => this.emit(RooCodeEventName.TaskActive, taskId) + const onTaskIdle = (taskId: string) => this.emit(RooCodeEventName.TaskIdle, taskId) + + // Attach the listeners. + instance.on(RooCodeEventName.TaskStarted, onTaskStarted) + instance.on(RooCodeEventName.TaskCompleted, onTaskCompleted) + instance.on(RooCodeEventName.TaskAborted, onTaskAborted) + instance.on(RooCodeEventName.TaskFocused, onTaskFocused) + instance.on(RooCodeEventName.TaskUnfocused, onTaskUnfocused) + instance.on(RooCodeEventName.TaskActive, onTaskActive) + instance.on(RooCodeEventName.TaskIdle, onTaskIdle) + + // Store the cleanup functions for later removal. + this.taskEventListeners.set(instance, [ + () => instance.off(RooCodeEventName.TaskStarted, onTaskStarted), + () => instance.off(RooCodeEventName.TaskCompleted, onTaskCompleted), + () => instance.off(RooCodeEventName.TaskAborted, onTaskAborted), + () => instance.off(RooCodeEventName.TaskFocused, onTaskFocused), + () => instance.off(RooCodeEventName.TaskUnfocused, onTaskUnfocused), + () => instance.off(RooCodeEventName.TaskActive, onTaskActive), + () => instance.off(RooCodeEventName.TaskIdle, onTaskIdle), + ]) + } + // Initialize Roo Code Cloud profile sync. this.initializeCloudProfileSync().catch((error) => { this.log(`Failed to initialize cloud profile sync: ${error}`) @@ -297,6 +333,14 @@ export class ClineProvider task.emit(RooCodeEventName.TaskUnfocused) + // Remove event listeners before clearing the reference. + const cleanupFunctions = this.taskEventListeners.get(task) + + if (cleanupFunctions) { + cleanupFunctions.forEach((cleanup) => cleanup()) + this.taskEventListeners.delete(task) + } + // Make sure no reference kept, once promises end it will be // garbage collected. task = undefined @@ -654,12 +698,17 @@ export class ClineProvider enableCheckpoints, fuzzyMatchThreshold, experiments, + cloudUserInfo, + remoteControlEnabled, } = await this.getState() if (!ProfileValidator.isProfileAllowed(apiConfiguration, organizationAllowList)) { throw new OrganizationAllowListViolationError(t("common:errors.violated_organization_allowlist")) } + // Determine if TaskBridge should be enabled + const enableTaskBridge = isRemoteControlEnabled(cloudUserInfo, remoteControlEnabled) + const task = new Task({ provider: this, apiConfiguration, @@ -673,7 +722,8 @@ export class ClineProvider rootTask: this.clineStack.length > 0 ? this.clineStack[0] : undefined, parentTask, taskNumber: this.clineStack.length + 1, - onCreated: (instance) => this.emit(RooCodeEventName.TaskCreated, instance), + onCreated: this.taskCreationCallback, + enableTaskBridge, ...options, }) @@ -738,8 +788,13 @@ export class ClineProvider enableCheckpoints, fuzzyMatchThreshold, experiments, + cloudUserInfo, + remoteControlEnabled, } = await this.getState() + // Determine if TaskBridge should be enabled + const enableTaskBridge = isRemoteControlEnabled(cloudUserInfo, remoteControlEnabled) + const task = new Task({ provider: this, apiConfiguration, @@ -752,7 +807,8 @@ export class ClineProvider rootTask: historyItem.rootTask, parentTask: historyItem.parentTask, taskNumber: historyItem.number, - onCreated: (instance) => this.emit(RooCodeEventName.TaskCreated, instance), + onCreated: this.taskCreationCallback, + enableTaskBridge, }) await this.addClineToStack(task) @@ -1631,6 +1687,7 @@ export class ClineProvider includeDiagnosticMessages, maxDiagnosticMessages, includeTaskHistoryInEnhance, + remoteControlEnabled, } = await this.getState() const telemetryKey = process.env.POSTHOG_API_KEY @@ -1758,6 +1815,7 @@ export class ClineProvider includeDiagnosticMessages: includeDiagnosticMessages ?? true, maxDiagnosticMessages: maxDiagnosticMessages ?? 50, includeTaskHistoryInEnhance: includeTaskHistoryInEnhance ?? false, + remoteControlEnabled: remoteControlEnabled ?? false, } } @@ -1945,6 +2003,8 @@ export class ClineProvider maxDiagnosticMessages: stateValues.maxDiagnosticMessages ?? 50, // Add includeTaskHistoryInEnhance setting includeTaskHistoryInEnhance: stateValues.includeTaskHistoryInEnhance ?? false, + // Add remoteControlEnabled setting + remoteControlEnabled: stateValues.remoteControlEnabled ?? false, } } @@ -2057,6 +2117,55 @@ export class ClineProvider return true } + /** + * Handle remote control enabled/disabled state changes + * Manages ExtensionBridgeService and TaskBridgeService lifecycle + */ + public async handleRemoteControlToggle(enabled: boolean): Promise { + const { + CloudService: CloudServiceImport, + ExtensionBridgeService, + TaskBridgeService, + } = await import("@roo-code/cloud") + const userInfo = CloudServiceImport.instance.getUserInfo() + + // Handle ExtensionBridgeService using static method + await ExtensionBridgeService.handleRemoteControlState(userInfo, enabled, this, (message: string) => + this.log(message), + ) + + if (isRemoteControlEnabled(userInfo, enabled)) { + // Set up TaskBridgeService for the currently active task if one exists + const currentTask = this.getCurrentCline() + if (currentTask && !currentTask.taskBridgeService) { + try { + currentTask.taskBridgeService = TaskBridgeService.getInstance() + await currentTask.taskBridgeService.subscribeToTask(currentTask) + this.log(`[TaskBridgeService] Subscribed current task ${currentTask.taskId} to TaskBridge`) + } catch (error) { + const message = `[TaskBridgeService#subscribeToTask] ${error instanceof Error ? error.message : String(error)}` + this.log(message) + console.error(message) + } + } + } else { + // Disconnect TaskBridgeService for all tasks in the stack + for (const task of this.clineStack) { + if (task.taskBridgeService) { + try { + await task.taskBridgeService.unsubscribeFromTask(task.taskId) + task.taskBridgeService = undefined + this.log(`[TaskBridgeService] Unsubscribed task ${task.taskId} from TaskBridge`) + } catch (error) { + const message = `[TaskBridgeService#unsubscribeFromTask] for task ${task.taskId}: ${error instanceof Error ? error.message : String(error)}` + this.log(message) + console.error(message) + } + } + } + } + } + /** * Returns properties to be included in every telemetry event * This method is called by the telemetry service to get context information diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts index fdb7e90425..743e3b0c13 100644 --- a/src/core/webview/webviewMessageHandler.ts +++ b/src/core/webview/webviewMessageHandler.ts @@ -906,6 +906,11 @@ export const webviewMessageHandler = async ( await updateGlobalState("enableMcpServerCreation", message.bool ?? true) await provider.postStateToWebview() break + case "remoteControlEnabled": + await updateGlobalState("remoteControlEnabled", message.bool ?? false) + await provider.handleRemoteControlToggle(message.bool ?? false) + await provider.postStateToWebview() + break case "refreshAllMcpServers": { const mcpHub = provider.getMcpHub() if (mcpHub) { diff --git a/src/extension.ts b/src/extension.ts index beb69b30b5..ea6ab4e1b4 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -12,7 +12,7 @@ try { console.warn("Failed to load environment variables:", e) } -import { CloudService } from "@roo-code/cloud" +import { CloudService, ExtensionBridgeService } from "@roo-code/cloud" import { TelemetryService, PostHogTelemetryClient } from "@roo-code/telemetry" import "./utils/path" // Necessary to have access to String.prototype.toPosix. @@ -29,6 +29,7 @@ import { CodeIndexManager } from "./services/code-index/manager" import { MdmService } from "./services/mdm/MdmService" import { migrateSettings } from "./utils/migrateSettings" import { autoImportSettings } from "./utils/autoImportSettings" +import { isRemoteControlEnabled } from "./utils/remoteControl" import { API } from "./extension/api" import { @@ -71,37 +72,13 @@ export async function activate(context: vscode.ExtensionContext) { console.warn("Failed to register PostHogTelemetryClient:", error) } - // Create logger for cloud services + // Create logger for cloud services. const cloudLogger = createDualLogger(createOutputChannelLogger(outputChannel)) - // Initialize Roo Code Cloud service. - const cloudService = await CloudService.createInstance(context, cloudLogger) - - try { - if (cloudService.telemetryClient) { - TelemetryService.instance.register(cloudService.telemetryClient) - } - } catch (error) { - outputChannel.appendLine( - `[CloudService] Failed to register TelemetryClient: ${error instanceof Error ? error.message : String(error)}`, - ) - } - - const postStateListener = () => { - ClineProvider.getVisibleInstance()?.postStateToWebview() - } - - cloudService.on("auth-state-changed", postStateListener) - cloudService.on("user-info", postStateListener) - cloudService.on("settings-updated", postStateListener) - - // Add to subscriptions for proper cleanup on deactivate - context.subscriptions.push(cloudService) - // Initialize MDM service const mdmService = await MdmService.createInstance(cloudLogger) - // Initialize i18n for internationalization support + // Initialize i18n for internationalization support. initializeI18n(context.globalState.get("language") ?? formatLanguage(vscode.env.language)) // Initialize terminal shell execution handlers. @@ -126,6 +103,29 @@ export async function activate(context: vscode.ExtensionContext) { ) } + // Initialize Roo Code Cloud service. + const cloudService = await CloudService.createInstance(context, cloudLogger) + + const postStateListener = () => ClineProvider.getVisibleInstance()?.postStateToWebview() + + cloudService.on("auth-state-changed", postStateListener) + cloudService.on("settings-updated", postStateListener) + + cloudService.on("user-info", ({ userInfo }) => { + postStateListener() + + // Check if remote control is enabled in user settings + const remoteControlEnabled = contextProxy.getValue("remoteControlEnabled") + + // Handle ExtensionBridgeService state using static method + ExtensionBridgeService.handleRemoteControlState(userInfo, remoteControlEnabled, provider, (message: string) => + outputChannel.appendLine(message), + ) + }) + + // Add to subscriptions for proper cleanup on deactivate. + context.subscriptions.push(cloudService) + const provider = new ClineProvider(context, outputChannel, "sidebar", contextProxy, codeIndexManager, mdmService) TelemetryService.instance.setProvider(provider) @@ -139,7 +139,7 @@ export async function activate(context: vscode.ExtensionContext) { }), ) - // Auto-import configuration if specified in settings + // Auto-import configuration if specified in settings. try { await autoImportSettings(outputChannel, { providerSettingsManager: provider.providerSettingsManager, @@ -232,6 +232,14 @@ export async function activate(context: vscode.ExtensionContext) { // This method is called when your extension is deactivated. export async function deactivate() { outputChannel.appendLine(`${Package.name} extension deactivated`) + + // Cleanup Extension Bridge service. + const extensionBridgeService = ExtensionBridgeService.getInstance() + + if (extensionBridgeService) { + await extensionBridgeService.disconnect() + } + await McpServerManager.cleanup(extensionContext) TelemetryService.instance.shutdown() TerminalRegistry.cleanup() diff --git a/src/package.json b/src/package.json index aa2110dfd5..d35f6f34dd 100644 --- a/src/package.json +++ b/src/package.json @@ -420,7 +420,7 @@ "@mistralai/mistralai": "^1.3.6", "@modelcontextprotocol/sdk": "^1.9.0", "@qdrant/js-client-rest": "^1.14.0", - "@roo-code/cloud": "^0.4.0", + "@roo-code/cloud": "^0.5.0", "@roo-code/ipc": "workspace:^", "@roo-code/telemetry": "workspace:^", "@roo-code/types": "workspace:^", diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts index 930edeac73..2313d7d177 100644 --- a/src/shared/ExtensionMessage.ts +++ b/src/shared/ExtensionMessage.ts @@ -270,6 +270,7 @@ export type ExtensionState = Pick< | "profileThresholds" | "includeDiagnosticMessages" | "maxDiagnosticMessages" + | "remoteControlEnabled" > & { version: string clineMessages: ClineMessage[] diff --git a/src/shared/WebviewMessage.ts b/src/shared/WebviewMessage.ts index cb8759d851..2d94896bf5 100644 --- a/src/shared/WebviewMessage.ts +++ b/src/shared/WebviewMessage.ts @@ -130,6 +130,7 @@ export interface WebviewMessage { | "terminalCompressProgressBar" | "mcpEnabled" | "enableMcpServerCreation" + | "remoteControlEnabled" | "searchCommits" | "alwaysApproveResubmit" | "requestDelaySeconds" diff --git a/src/utils/remoteControl.ts b/src/utils/remoteControl.ts new file mode 100644 index 0000000000..f003b522d1 --- /dev/null +++ b/src/utils/remoteControl.ts @@ -0,0 +1,11 @@ +import type { CloudUserInfo } from "@roo-code/types" + +/** + * Determines if remote control features should be enabled + * @param cloudUserInfo - User information from cloud service + * @param remoteControlEnabled - User's remote control setting + * @returns true if remote control should be enabled + */ +export function isRemoteControlEnabled(cloudUserInfo?: CloudUserInfo | null, remoteControlEnabled?: boolean): boolean { + return !!(cloudUserInfo?.id && cloudUserInfo.extensionBridgeEnabled && remoteControlEnabled) +} diff --git a/webview-ui/src/components/account/AccountView.tsx b/webview-ui/src/components/account/AccountView.tsx index e3d1a293a7..e36818cc3a 100644 --- a/webview-ui/src/components/account/AccountView.tsx +++ b/webview-ui/src/components/account/AccountView.tsx @@ -5,8 +5,12 @@ import type { CloudUserInfo } from "@roo-code/types" import { TelemetryEventName } from "@roo-code/types" import { useAppTranslation } from "@src/i18n/TranslationContext" +import { useExtensionState } from "@src/context/ExtensionStateContext" import { vscode } from "@src/utils/vscode" import { telemetryClient } from "@src/utils/TelemetryClient" +import { ToggleSwitch } from "@/components/ui/toggle-switch" + +import { History, PiggyBank, Router, SquareArrowOutUpRightIcon } from "lucide-react" type AccountViewProps = { userInfo: CloudUserInfo | null @@ -17,6 +21,7 @@ type AccountViewProps = { export const AccountView = ({ userInfo, isAuthenticated, cloudApiUrl, onDone }: AccountViewProps) => { const { t } = useAppTranslation() + const { remoteControlEnabled, setRemoteControlEnabled } = useExtensionState() const wasAuthenticatedRef = useRef(false) const rooLogoUri = (window as any).IMAGES_BASE_URI + "/roo-logo.svg" @@ -51,11 +56,17 @@ export const AccountView = ({ userInfo, isAuthenticated, cloudApiUrl, onDone }: vscode.postMessage({ type: "openExternal", url: cloudUrl }) } + const handleRemoteControlToggle = () => { + const newValue = !remoteControlEnabled + setRemoteControlEnabled(newValue) + vscode.postMessage({ type: "remoteControlEnabled", bool: newValue }) + } + return ( -
    +

    {t("account:title")}

    - + {t("settings:common.done")}
    @@ -77,13 +88,13 @@ export const AccountView = ({ userInfo, isAuthenticated, cloudApiUrl, onDone }: )}
    {userInfo.name && ( -

    {userInfo.name}

    +

    {userInfo.name}

    )} {userInfo?.email && ( -

    {userInfo?.email}

    +

    {userInfo?.email}

    )} {userInfo?.organizationName && ( -
    +
    {userInfo.organizationImageUrl && ( )} + + {/* Remote Control Toggle - only show if user has extension bridge enabled */} + {userInfo?.extensionBridgeEnabled && ( +
    +
    + + {t("account:remoteControl")} +
    +
    + {t("account:remoteControlDescription")} +
    +
    +
    + )} +
    {t("account:visitCloudWebsite")} @@ -125,30 +157,31 @@ export const AccountView = ({ userInfo, isAuthenticated, cloudApiUrl, onDone }:
    -

    +

    {t("account:cloudBenefitsTitle")}

    -

    - {t("account:cloudBenefitsSubtitle")} -

    -
      -
    • - • - {t("account:cloudBenefitHistory")} +
        +
      • + + {t("account:cloudBenefitWalkaway")}
        • -
      • - • +
      • + {t("account:cloudBenefitSharing")}
        • -
      • - • +
      • + + {t("account:cloudBenefitHistory")} +
        • +
      • + {t("account:cloudBenefitMetrics")}
    -
    - +
    + {t("account:connect")}
    diff --git a/webview-ui/src/components/account/__tests__/AccountView.spec.tsx b/webview-ui/src/components/account/__tests__/AccountView.spec.tsx index d6fd3013e6..2af759d615 100644 --- a/webview-ui/src/components/account/__tests__/AccountView.spec.tsx +++ b/webview-ui/src/components/account/__tests__/AccountView.spec.tsx @@ -11,11 +11,17 @@ vi.mock("@src/i18n/TranslationContext", () => ({ "settings:common.done": "Done", "account:signIn": "Connect to Roo Code Cloud", "account:cloudBenefitsTitle": "Connect to Roo Code Cloud", - "account:cloudBenefitsSubtitle": "Sync your prompts and telemetry to enable:", - "account:cloudBenefitHistory": "Online task history", - "account:cloudBenefitSharing": "Sharing and collaboration features", - "account:cloudBenefitMetrics": "Task, token, and cost-based usage metrics", + "account:cloudBenefitWalkaway": "Follow and control tasks from anywhere with Roomote Control", + "account:cloudBenefitSharing": "Share tasks with others", + "account:cloudBenefitHistory": "Access your task history", + "account:cloudBenefitMetrics": "Get a holistic view of your token consumption", "account:logOut": "Log out", + "account:connect": "Connect Now", + "account:visitCloudWebsite": "Visit Roo Code Cloud", + "account:remoteControl": "Roomote Control", + "account:remoteControlDescription": + "Enable following and interacting with tasks in this workspace with Roo Code Cloud", + "account:profilePicture": "Profile picture", } return translations[key] || key }, @@ -36,6 +42,14 @@ vi.mock("@src/utils/TelemetryClient", () => ({ }, })) +// Mock the extension state context +vi.mock("@src/context/ExtensionStateContext", () => ({ + useExtensionState: () => ({ + remoteControlEnabled: false, + setRemoteControlEnabled: vi.fn(), + }), +})) + // Mock window global for images Object.defineProperty(window, "IMAGES_BASE_URI", { value: "/images", @@ -55,13 +69,13 @@ describe("AccountView", () => { // Check that the benefits section is displayed expect(screen.getByRole("heading", { name: "Connect to Roo Code Cloud" })).toBeInTheDocument() - expect(screen.getByText("Sync your prompts and telemetry to enable:")).toBeInTheDocument() - expect(screen.getByText("Online task history")).toBeInTheDocument() - expect(screen.getByText("Sharing and collaboration features")).toBeInTheDocument() - expect(screen.getByText("Task, token, and cost-based usage metrics")).toBeInTheDocument() + expect(screen.getByText("Follow and control tasks from anywhere with Roomote Control")).toBeInTheDocument() + expect(screen.getByText("Share tasks with others")).toBeInTheDocument() + expect(screen.getByText("Access your task history")).toBeInTheDocument() + expect(screen.getByText("Get a holistic view of your token consumption")).toBeInTheDocument() // Check that the connect button is also present - expect(screen.getByText("account:connect")).toBeInTheDocument() + expect(screen.getByText("Connect Now")).toBeInTheDocument() }) it("should not display benefits when user is authenticated", () => { @@ -80,13 +94,60 @@ describe("AccountView", () => { ) // Check that the benefits section is NOT displayed - expect(screen.queryByText("Sync your prompts and telemetry to enable:")).not.toBeInTheDocument() - expect(screen.queryByText("Online task history")).not.toBeInTheDocument() - expect(screen.queryByText("Sharing and collaboration features")).not.toBeInTheDocument() - expect(screen.queryByText("Task, token, and cost-based usage metrics")).not.toBeInTheDocument() + expect( + screen.queryByText("Follow and control tasks from anywhere with Roomote Control"), + ).not.toBeInTheDocument() + expect(screen.queryByText("Share tasks with others")).not.toBeInTheDocument() + expect(screen.queryByText("Access your task history")).not.toBeInTheDocument() + expect(screen.queryByText("Get a holistic view of your token consumption")).not.toBeInTheDocument() // Check that user info is displayed instead expect(screen.getByText("Test User")).toBeInTheDocument() expect(screen.getByText("test@example.com")).toBeInTheDocument() }) + + it("should display remote control toggle when user has extension bridge enabled", () => { + const mockUserInfo = { + name: "Test User", + email: "test@example.com", + extensionBridgeEnabled: true, + } + + render( + {}} + />, + ) + + // Check that the remote control toggle is displayed + expect(screen.getByTestId("remote-control-toggle")).toBeInTheDocument() + expect(screen.getByText("Roomote Control")).toBeInTheDocument() + expect( + screen.getByText("Enable following and interacting with tasks in this workspace with Roo Code Cloud"), + ).toBeInTheDocument() + }) + + it("should not display remote control toggle when user does not have extension bridge enabled", () => { + const mockUserInfo = { + name: "Test User", + email: "test@example.com", + extensionBridgeEnabled: false, + } + + render( + {}} + />, + ) + + // Check that the remote control toggle is NOT displayed + expect(screen.queryByTestId("remote-control-toggle")).not.toBeInTheDocument() + expect(screen.queryByText("Roomote Control")).not.toBeInTheDocument() + }) }) diff --git a/webview-ui/src/components/modes/ModesView.tsx b/webview-ui/src/components/modes/ModesView.tsx index 21c531937f..d470f7a658 100644 --- a/webview-ui/src/components/modes/ModesView.tsx +++ b/webview-ui/src/components/modes/ModesView.tsx @@ -617,7 +617,9 @@ const ModesView = ({ onDone }: ModesViewProps) => { aria-expanded={open} className="justify-between w-full" data-testid="mode-select-trigger"> -
    {getCurrentMode()?.name || t("prompts:modes.selectMode")}
    +
    + {getCurrentMode()?.name || t("prompts:modes.selectMode")} +
    diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx index da7ab63358..12f13bdf55 100644 --- a/webview-ui/src/context/ExtensionStateContext.tsx +++ b/webview-ui/src/context/ExtensionStateContext.tsx @@ -97,6 +97,8 @@ export interface ExtensionStateContextType extends ExtensionState { setMcpEnabled: (value: boolean) => void enableMcpServerCreation: boolean setEnableMcpServerCreation: (value: boolean) => void + remoteControlEnabled: boolean + setRemoteControlEnabled: (value: boolean) => void alwaysApproveResubmit?: boolean setAlwaysApproveResubmit: (value: boolean) => void requestDelaySeconds: number @@ -195,6 +197,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode terminalShellIntegrationTimeout: 4000, mcpEnabled: true, enableMcpServerCreation: false, + remoteControlEnabled: false, alwaysApproveResubmit: false, requestDelaySeconds: 5, currentApiConfigName: "default", @@ -408,6 +411,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode profileThresholds: state.profileThresholds ?? {}, alwaysAllowFollowupQuestions, followupAutoApproveTimeoutMs, + remoteControlEnabled: state.remoteControlEnabled ?? false, setExperimentEnabled: (id, enabled) => setState((prevState) => ({ ...prevState, experiments: { ...prevState.experiments, [id]: enabled } })), setApiConfiguration, @@ -454,6 +458,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode setMcpEnabled: (value) => setState((prevState) => ({ ...prevState, mcpEnabled: value })), setEnableMcpServerCreation: (value) => setState((prevState) => ({ ...prevState, enableMcpServerCreation: value })), + setRemoteControlEnabled: (value) => setState((prevState) => ({ ...prevState, remoteControlEnabled: value })), setAlwaysApproveResubmit: (value) => setState((prevState) => ({ ...prevState, alwaysApproveResubmit: value })), setRequestDelaySeconds: (value) => setState((prevState) => ({ ...prevState, requestDelaySeconds: value })), setCurrentApiConfigName: (value) => setState((prevState) => ({ ...prevState, currentApiConfigName: value })), diff --git a/webview-ui/src/i18n/locales/ca/account.json b/webview-ui/src/i18n/locales/ca/account.json index a94a978b87..2804cc8dfa 100644 --- a/webview-ui/src/i18n/locales/ca/account.json +++ b/webview-ui/src/i18n/locales/ca/account.json @@ -10,5 +10,8 @@ "cloudBenefitHistory": "Historial de tasques en línia", "cloudBenefitSharing": "Funcions de compartició i col·laboració", "cloudBenefitMetrics": "Mètriques d'ús basades en tasques, tokens i costos", + "cloudBenefitWalkaway": "Segueix i controla tasques des de qualsevol lloc amb Roomote Control", + "remoteControl": "Roomote Control", + "remoteControlDescription": "Permet seguir i interactuar amb tasques en aquest espai de treball amb Roo Code Cloud", "visitCloudWebsite": "Visita Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/de/account.json b/webview-ui/src/i18n/locales/de/account.json index bd4d71eada..6edaf58fff 100644 --- a/webview-ui/src/i18n/locales/de/account.json +++ b/webview-ui/src/i18n/locales/de/account.json @@ -10,5 +10,8 @@ "cloudBenefitHistory": "Online-Aufgabenverlauf", "cloudBenefitSharing": "Freigabe- und Kollaborationsfunktionen", "cloudBenefitMetrics": "Aufgaben-, Token- und kostenbasierte Nutzungsmetriken", + "cloudBenefitWalkaway": "Verfolge und steuere Aufgaben von überall mit Roomote Control", + "remoteControl": "Roomote Control", + "remoteControlDescription": "Ermöglicht das Verfolgen und Interagieren mit Aufgaben in diesem Arbeitsbereich mit Roo Code Cloud", "visitCloudWebsite": "Roo Code Cloud besuchen" } diff --git a/webview-ui/src/i18n/locales/en/account.json b/webview-ui/src/i18n/locales/en/account.json index f900abb297..a73acef432 100644 --- a/webview-ui/src/i18n/locales/en/account.json +++ b/webview-ui/src/i18n/locales/en/account.json @@ -4,11 +4,13 @@ "logOut": "Log out", "testApiAuthentication": "Test API Authentication", "signIn": "Connect to Roo Code Cloud", - "connect": "Connect", + "connect": "Connect Now", "cloudBenefitsTitle": "Connect to Roo Code Cloud", - "cloudBenefitsSubtitle": "Sync your prompts and telemetry to enable:", - "cloudBenefitHistory": "Online task history", - "cloudBenefitSharing": "Sharing and collaboration features", - "cloudBenefitMetrics": "Task, token, and cost-based usage metrics", - "visitCloudWebsite": "Visit Roo Code Cloud" + "cloudBenefitWalkaway": "Follow and control tasks from anywhere with Roomote Control", + "cloudBenefitSharing": "Share tasks with others", + "cloudBenefitHistory": "Access your task history", + "cloudBenefitMetrics": "Get a holistic view of your token consumption", + "visitCloudWebsite": "Visit Roo Code Cloud", + "remoteControl": "Roomote Control", + "remoteControlDescription": "Enable following and interacting with tasks in this workspace with Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/en/settings.json b/webview-ui/src/i18n/locales/en/settings.json index a48213110a..b20482d1b2 100644 --- a/webview-ui/src/i18n/locales/en/settings.json +++ b/webview-ui/src/i18n/locales/en/settings.json @@ -686,7 +686,7 @@ "name": "Enable concurrent file edits", "description": "When enabled, Roo can edit multiple files in a single request. When disabled, Roo must edit files one at a time. Disabling this can help when working with less capable models or when you want more control over file modifications." }, -"PREVENT_FOCUS_DISRUPTION": { + "PREVENT_FOCUS_DISRUPTION": { "name": "Background editing", "description": "Prevent editor focus disruption when enabled. File edits happen in the background without opening diff views or stealing focus. You can continue working uninterrupted while Roo makes changes. Files can be opened without focus to capture diagnostics or kept closed entirely." }, diff --git a/webview-ui/src/i18n/locales/es/account.json b/webview-ui/src/i18n/locales/es/account.json index 2bda10e82f..c8398ae25a 100644 --- a/webview-ui/src/i18n/locales/es/account.json +++ b/webview-ui/src/i18n/locales/es/account.json @@ -10,5 +10,8 @@ "cloudBenefitHistory": "Historial de tareas en línea", "cloudBenefitSharing": "Funciones de compartir y colaboración", "cloudBenefitMetrics": "Métricas de uso basadas en tareas, tokens y costos", + "cloudBenefitWalkaway": "Sigue y controla tareas desde cualquier lugar con Roomote Control", + "remoteControl": "Roomote Control", + "remoteControlDescription": "Permite seguir e interactuar con tareas en este espacio de trabajo con Roo Code Cloud", "visitCloudWebsite": "Visitar Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/fr/account.json b/webview-ui/src/i18n/locales/fr/account.json index 1af4483c5c..e50d11af15 100644 --- a/webview-ui/src/i18n/locales/fr/account.json +++ b/webview-ui/src/i18n/locales/fr/account.json @@ -10,5 +10,8 @@ "cloudBenefitHistory": "Historique des tâches en ligne", "cloudBenefitSharing": "Fonctionnalités de partage et collaboration", "cloudBenefitMetrics": "Métriques d'utilisation basées sur les tâches, tokens et coûts", + "cloudBenefitWalkaway": "Suivez et contrôlez les tâches depuis n'importe où avec Roomote Control", + "remoteControl": "Roomote Control", + "remoteControlDescription": "Permet de suivre et d'interagir avec les tâches dans cet espace de travail avec Roo Code Cloud", "visitCloudWebsite": "Visiter Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/hi/account.json b/webview-ui/src/i18n/locales/hi/account.json index be6ea00d88..485bc00633 100644 --- a/webview-ui/src/i18n/locales/hi/account.json +++ b/webview-ui/src/i18n/locales/hi/account.json @@ -10,5 +10,8 @@ "cloudBenefitHistory": "ऑनलाइन कार्य इतिहास", "cloudBenefitSharing": "साझाकरण और सहयोग सुविधाएं", "cloudBenefitMetrics": "कार्य, token और लागत आधारित उपयोग मेट्रिक्स", + "cloudBenefitWalkaway": "Roomote Control के साथ कहीं से भी कार्यों को फॉलो और नियंत्रित करें", + "remoteControl": "Roomote Control", + "remoteControlDescription": "Roo Code Cloud के साथ इस वर्कस्पेस में कार्यों को फॉलो और इंटरैक्ट करने की सुविधा दें", "visitCloudWebsite": "Roo Code Cloud पर जाएं" } diff --git a/webview-ui/src/i18n/locales/id/account.json b/webview-ui/src/i18n/locales/id/account.json index 57f3fec0df..a3b6f4b97e 100644 --- a/webview-ui/src/i18n/locales/id/account.json +++ b/webview-ui/src/i18n/locales/id/account.json @@ -10,5 +10,8 @@ "cloudBenefitHistory": "Riwayat tugas online", "cloudBenefitSharing": "Fitur berbagi dan kolaborasi", "cloudBenefitMetrics": "Metrik penggunaan berdasarkan tugas, token, dan biaya", + "cloudBenefitWalkaway": "Ikuti dan kontrol tugas dari mana saja dengan Roomote Control", + "remoteControl": "Roomote Control", + "remoteControlDescription": "Memungkinkan mengikuti dan berinteraksi dengan tugas di workspace ini dengan Roo Code Cloud", "visitCloudWebsite": "Kunjungi Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/it/account.json b/webview-ui/src/i18n/locales/it/account.json index fda13f563c..7ffb569407 100644 --- a/webview-ui/src/i18n/locales/it/account.json +++ b/webview-ui/src/i18n/locales/it/account.json @@ -10,5 +10,8 @@ "cloudBenefitHistory": "Cronologia attività online", "cloudBenefitSharing": "Funzionalità di condivisione e collaborazione", "cloudBenefitMetrics": "Metriche di utilizzo basate su attività, token e costi", + "cloudBenefitWalkaway": "Segui e controlla le attività da qualsiasi luogo con Roomote Control", + "remoteControl": "Roomote Control", + "remoteControlDescription": "Abilita il monitoraggio e l'interazione con le attività in questo workspace con Roo Code Cloud", "visitCloudWebsite": "Visita Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/ja/account.json b/webview-ui/src/i18n/locales/ja/account.json index b41eaf7895..331d613f9b 100644 --- a/webview-ui/src/i18n/locales/ja/account.json +++ b/webview-ui/src/i18n/locales/ja/account.json @@ -10,5 +10,8 @@ "cloudBenefitHistory": "オンラインタスク履歴", "cloudBenefitSharing": "共有とコラボレーション機能", "cloudBenefitMetrics": "タスク、Token、コストベースの使用メトリクス", + "cloudBenefitWalkaway": "Roomote Controlでどこからでもタスクをフォローし制御", + "remoteControl": "Roomote Control", + "remoteControlDescription": "Roo Code Cloudでこのワークスペースのタスクをフォローし操作することを有効にする", "visitCloudWebsite": "Roo Code Cloudを訪問" } diff --git a/webview-ui/src/i18n/locales/ko/account.json b/webview-ui/src/i18n/locales/ko/account.json index 6ad06d43fa..98b09b6e3d 100644 --- a/webview-ui/src/i18n/locales/ko/account.json +++ b/webview-ui/src/i18n/locales/ko/account.json @@ -10,5 +10,8 @@ "cloudBenefitHistory": "온라인 작업 기록", "cloudBenefitSharing": "공유 및 협업 기능", "cloudBenefitMetrics": "작업, 토큰, 비용 기반 사용 메트릭", + "cloudBenefitWalkaway": "Roomote Control로 어디서나 작업을 팔로우하고 제어하세요", + "remoteControl": "Roomote Control", + "remoteControlDescription": "Roo Code Cloud로 이 워크스페이스의 작업을 팔로우하고 상호작용할 수 있게 합니다", "visitCloudWebsite": "Roo Code Cloud 방문" } diff --git a/webview-ui/src/i18n/locales/nl/account.json b/webview-ui/src/i18n/locales/nl/account.json index 15ceb1865b..94d08b4409 100644 --- a/webview-ui/src/i18n/locales/nl/account.json +++ b/webview-ui/src/i18n/locales/nl/account.json @@ -10,5 +10,8 @@ "cloudBenefitHistory": "Online taakgeschiedenis", "cloudBenefitSharing": "Deel- en samenwerkingsfuncties", "cloudBenefitMetrics": "Taak-, token- en kostengebaseerde gebruiksstatistieken", + "cloudBenefitWalkaway": "Volg en beheer taken van overal met Roomote Control", + "remoteControl": "Roomote Control", + "remoteControlDescription": "Schakel het volgen en interacteren met taken in deze workspace in met Roo Code Cloud", "visitCloudWebsite": "Bezoek Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/pl/account.json b/webview-ui/src/i18n/locales/pl/account.json index fdb0e4d894..b25f29b1bb 100644 --- a/webview-ui/src/i18n/locales/pl/account.json +++ b/webview-ui/src/i18n/locales/pl/account.json @@ -10,5 +10,8 @@ "cloudBenefitHistory": "Historia zadań online", "cloudBenefitSharing": "Funkcje udostępniania i współpracy", "cloudBenefitMetrics": "Metryki użycia oparte na zadaniach, tokenach i kosztach", + "cloudBenefitWalkaway": "Śledź i kontroluj zadania z dowolnego miejsca za pomocą Roomote Control", + "remoteControl": "Roomote Control", + "remoteControlDescription": "Umożliwia śledzenie i interakcję z zadaniami w tym obszarze roboczym za pomocą Roo Code Cloud", "visitCloudWebsite": "Odwiedź Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/pt-BR/account.json b/webview-ui/src/i18n/locales/pt-BR/account.json index 5492ca7520..5b4f457b99 100644 --- a/webview-ui/src/i18n/locales/pt-BR/account.json +++ b/webview-ui/src/i18n/locales/pt-BR/account.json @@ -10,5 +10,8 @@ "cloudBenefitHistory": "Histórico de tarefas online", "cloudBenefitSharing": "Recursos de compartilhamento e colaboração", "cloudBenefitMetrics": "Métricas de uso baseadas em tarefas, tokens e custos", + "cloudBenefitWalkaway": "Acompanhe e controle tarefas de qualquer lugar com Roomote Control", + "remoteControl": "Roomote Control", + "remoteControlDescription": "Permite acompanhar e interagir com tarefas neste workspace com Roo Code Cloud", "visitCloudWebsite": "Visitar Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/ru/account.json b/webview-ui/src/i18n/locales/ru/account.json index 1c8dcf5289..4f4a2de167 100644 --- a/webview-ui/src/i18n/locales/ru/account.json +++ b/webview-ui/src/i18n/locales/ru/account.json @@ -10,5 +10,8 @@ "cloudBenefitHistory": "Онлайн-история задач", "cloudBenefitSharing": "Функции обмена и совместной работы", "cloudBenefitMetrics": "Метрики использования на основе задач, токенов и затрат", + "cloudBenefitWalkaway": "Отслеживайте и управляйте задачами откуда угодно с Roomote Control", + "remoteControl": "Roomote Control", + "remoteControlDescription": "Позволяет отслеживать и взаимодействовать с задачами в этом рабочем пространстве с Roo Code Cloud", "visitCloudWebsite": "Посетить Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/tr/account.json b/webview-ui/src/i18n/locales/tr/account.json index a344ce940f..03131e3fb5 100644 --- a/webview-ui/src/i18n/locales/tr/account.json +++ b/webview-ui/src/i18n/locales/tr/account.json @@ -10,5 +10,8 @@ "cloudBenefitHistory": "Çevrimiçi görev geçmişi", "cloudBenefitSharing": "Paylaşım ve işbirliği özellikleri", "cloudBenefitMetrics": "Görev, token ve maliyet tabanlı kullanım metrikleri", + "cloudBenefitWalkaway": "Roomote Control ile görevleri her yerden takip et ve kontrol et", + "remoteControl": "Roomote Control", + "remoteControlDescription": "Bu çalışma alanındaki görevleri Roo Code Cloud ile takip etme ve etkileşim kurma imkanı sağlar", "visitCloudWebsite": "Roo Code Cloud'u ziyaret et" } diff --git a/webview-ui/src/i18n/locales/vi/account.json b/webview-ui/src/i18n/locales/vi/account.json index 0e826b75ad..3224160ba3 100644 --- a/webview-ui/src/i18n/locales/vi/account.json +++ b/webview-ui/src/i18n/locales/vi/account.json @@ -10,5 +10,8 @@ "cloudBenefitHistory": "Lịch sử tác vụ trực tuyến", "cloudBenefitSharing": "Tính năng chia sẻ và cộng tác", "cloudBenefitMetrics": "Số liệu sử dụng dựa trên tác vụ, token và chi phí", + "cloudBenefitWalkaway": "Theo dõi và điều khiển tác vụ từ bất kỳ đâu với Roomote Control", + "remoteControl": "Roomote Control", + "remoteControlDescription": "Cho phép theo dõi và tương tác với các tác vụ trong workspace này với Roo Code Cloud", "visitCloudWebsite": "Truy cập Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/zh-CN/account.json b/webview-ui/src/i18n/locales/zh-CN/account.json index 65a4c1d221..9e097472a0 100644 --- a/webview-ui/src/i18n/locales/zh-CN/account.json +++ b/webview-ui/src/i18n/locales/zh-CN/account.json @@ -10,5 +10,8 @@ "cloudBenefitHistory": "在线任务历史", "cloudBenefitSharing": "共享和协作功能", "cloudBenefitMetrics": "基于任务、Token 和成本的使用指标", + "cloudBenefitWalkaway": "使用 Roomote Control 随时随地跟踪和控制任务", + "remoteControl": "Roomote Control", + "remoteControlDescription": "允许通过 Roo Code Cloud 跟踪和操作此工作区中的任务", "visitCloudWebsite": "访问 Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/zh-TW/account.json b/webview-ui/src/i18n/locales/zh-TW/account.json index dca8d3231c..edd25dcf18 100644 --- a/webview-ui/src/i18n/locales/zh-TW/account.json +++ b/webview-ui/src/i18n/locales/zh-TW/account.json @@ -10,5 +10,8 @@ "cloudBenefitHistory": "線上工作歷史", "cloudBenefitSharing": "分享和協作功能", "cloudBenefitMetrics": "基於工作、Token 和成本的使用指標", + "cloudBenefitWalkaway": "使用 Roomote Control 隨時隨地追蹤和控制工作", + "remoteControl": "Roomote Control", + "remoteControlDescription": "允許透過 Roo Code Cloud 追蹤和操作此工作區中的工作", "visitCloudWebsite": "造訪 Roo Code Cloud" } From 4a9222b50e4e528e8d52defe53044c86711ab76b Mon Sep 17 00:00:00 2001 From: ershang-fireworks Date: Tue, 5 Aug 2025 10:27:12 +0800 Subject: [PATCH 064/253] Add the fireworks AI provider (#6652) * add fireworks provider * add tests * Update packages/types/src/providers/fireworks.ts Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com> * fix typo * another typo --------- Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com> --- .github/ISSUE_TEMPLATE/bug_report.yml | 1 + packages/types/src/global-settings.ts | 1 + packages/types/src/provider-settings.ts | 7 + packages/types/src/providers/fireworks.ts | 61 +++ packages/types/src/providers/index.ts | 1 + src/api/index.ts | 3 + src/api/providers/__tests__/fireworks.spec.ts | 355 ++++++++++++++++++ src/api/providers/fireworks.ts | 19 + src/api/providers/index.ts | 1 + src/shared/ProfileValidator.ts | 1 + src/shared/__tests__/ProfileValidator.spec.ts | 1 + .../src/components/settings/ApiOptions.tsx | 7 + .../src/components/settings/constants.ts | 3 + .../settings/providers/Fireworks.tsx | 50 +++ .../components/settings/providers/index.ts | 1 + .../components/ui/hooks/useSelectedModel.ts | 7 + webview-ui/src/i18n/locales/ca/settings.json | 2 + webview-ui/src/i18n/locales/de/settings.json | 2 + webview-ui/src/i18n/locales/en/settings.json | 2 + webview-ui/src/i18n/locales/es/settings.json | 2 + webview-ui/src/i18n/locales/fr/settings.json | 2 + webview-ui/src/i18n/locales/hi/settings.json | 2 + webview-ui/src/i18n/locales/id/settings.json | 2 + webview-ui/src/i18n/locales/it/settings.json | 2 + webview-ui/src/i18n/locales/ja/settings.json | 2 + webview-ui/src/i18n/locales/ko/settings.json | 2 + webview-ui/src/i18n/locales/nl/settings.json | 2 + webview-ui/src/i18n/locales/pl/settings.json | 2 + .../src/i18n/locales/pt-BR/settings.json | 2 + webview-ui/src/i18n/locales/ru/settings.json | 2 + webview-ui/src/i18n/locales/tr/settings.json | 2 + webview-ui/src/i18n/locales/vi/settings.json | 2 + .../src/i18n/locales/zh-CN/settings.json | 2 + .../src/i18n/locales/zh-TW/settings.json | 2 + webview-ui/src/utils/validate.ts | 5 + 35 files changed, 560 insertions(+) create mode 100644 packages/types/src/providers/fireworks.ts create mode 100644 src/api/providers/__tests__/fireworks.spec.ts create mode 100644 src/api/providers/fireworks.ts create mode 100644 webview-ui/src/components/settings/providers/Fireworks.tsx diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 03bbe9640a..965566a319 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -25,6 +25,7 @@ body: - AWS Bedrock - Chutes AI - DeepSeek + - Fireworks AI - Glama - Google Gemini - Google Vertex AI diff --git a/packages/types/src/global-settings.ts b/packages/types/src/global-settings.ts index 41945ff470..f5e9fc32bd 100644 --- a/packages/types/src/global-settings.ts +++ b/packages/types/src/global-settings.ts @@ -193,6 +193,7 @@ export const SECRET_STATE_KEYS = [ "codebaseIndexMistralApiKey", "huggingFaceApiKey", "sambaNovaApiKey", + "fireworksApiKey", ] as const satisfies readonly (keyof ProviderSettings)[] export type SecretState = Pick diff --git a/packages/types/src/provider-settings.ts b/packages/types/src/provider-settings.ts index 876f5114b6..dc51188df9 100644 --- a/packages/types/src/provider-settings.ts +++ b/packages/types/src/provider-settings.ts @@ -37,6 +37,7 @@ export const providerNames = [ "cerebras", "sambanova", "zai", + "fireworks", ] as const export const providerNamesSchema = z.enum(providerNames) @@ -263,6 +264,10 @@ const zaiSchema = apiModelIdProviderModelSchema.extend({ zaiApiLine: z.union([z.literal("china"), z.literal("international")]).optional(), }) +const fireworksSchema = apiModelIdProviderModelSchema.extend({ + fireworksApiKey: z.string().optional(), +}) + const defaultSchema = z.object({ apiProvider: z.undefined(), }) @@ -297,6 +302,7 @@ export const providerSettingsSchemaDiscriminated = z.discriminatedUnion("apiProv cerebrasSchema.merge(z.object({ apiProvider: z.literal("cerebras") })), sambaNovaSchema.merge(z.object({ apiProvider: z.literal("sambanova") })), zaiSchema.merge(z.object({ apiProvider: z.literal("zai") })), + fireworksSchema.merge(z.object({ apiProvider: z.literal("fireworks") })), defaultSchema, ]) @@ -331,6 +337,7 @@ export const providerSettingsSchema = z.object({ ...cerebrasSchema.shape, ...sambaNovaSchema.shape, ...zaiSchema.shape, + ...fireworksSchema.shape, ...codebaseIndexProviderSchema.shape, }) diff --git a/packages/types/src/providers/fireworks.ts b/packages/types/src/providers/fireworks.ts new file mode 100644 index 0000000000..80858f624e --- /dev/null +++ b/packages/types/src/providers/fireworks.ts @@ -0,0 +1,61 @@ +import type { ModelInfo } from "../model.js" + +export type FireworksModelId = + | "accounts/fireworks/models/kimi-k2-instruct" + | "accounts/fireworks/models/qwen3-235b-a22b-instruct-2507" + | "accounts/fireworks/models/qwen3-coder-480b-a35b-instruct" + | "accounts/fireworks/models/deepseek-r1-0528" + | "accounts/fireworks/models/deepseek-v3" + +export const fireworksDefaultModelId: FireworksModelId = "accounts/fireworks/models/kimi-k2-instruct" + +export const fireworksModels = { + "accounts/fireworks/models/kimi-k2-instruct": { + maxTokens: 16384, + contextWindow: 128000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.6, + outputPrice: 2.5, + description: + "Kimi K2 is a state-of-the-art mixture-of-experts (MoE) language model with 32 billion activated parameters and 1 trillion total parameters. Trained with the Muon optimizer, Kimi K2 achieves exceptional performance across frontier knowledge, reasoning, and coding tasks while being meticulously optimized for agentic capabilities.", + }, + "accounts/fireworks/models/qwen3-235b-a22b-instruct-2507": { + maxTokens: 32768, + contextWindow: 256000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.22, + outputPrice: 0.88, + description: "Latest Qwen3 thinking model, competitive against the best closed source models in Jul 2025.", + }, + "accounts/fireworks/models/qwen3-coder-480b-a35b-instruct": { + maxTokens: 32768, + contextWindow: 256000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.45, + outputPrice: 1.8, + description: "Qwen3's most agentic code model to date.", + }, + "accounts/fireworks/models/deepseek-r1-0528": { + maxTokens: 20480, + contextWindow: 160000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 3, + outputPrice: 8, + description: + "05/28 updated checkpoint of Deepseek R1. Its overall performance is now approaching that of leading models, such as O3 and Gemini 2.5 Pro. Compared to the previous version, the upgraded model shows significant improvements in handling complex reasoning tasks, and this version also offers a reduced hallucination rate, enhanced support for function calling, and better experience for vibe coding. Note that fine-tuning for this model is only available through contacting fireworks at https://fireworks.ai/company/contact-us.", + }, + "accounts/fireworks/models/deepseek-v3": { + maxTokens: 16384, + contextWindow: 128000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.9, + outputPrice: 0.9, + description: + "A strong Mixture-of-Experts (MoE) language model with 671B total parameters with 37B activated for each token from Deepseek. Note that fine-tuning for this model is only available through contacting fireworks at https://fireworks.ai/company/contact-us.", + }, +} as const satisfies Record diff --git a/packages/types/src/providers/index.ts b/packages/types/src/providers/index.ts index b0e316bf55..0ab27ea3dc 100644 --- a/packages/types/src/providers/index.ts +++ b/packages/types/src/providers/index.ts @@ -23,3 +23,4 @@ export * from "./vscode-llm.js" export * from "./xai.js" export * from "./doubao.js" export * from "./zai.js" +export * from "./fireworks.js" diff --git a/src/api/index.ts b/src/api/index.ts index 3ad3705eba..57b06f7bbd 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -34,6 +34,7 @@ import { SambaNovaHandler, DoubaoHandler, ZAiHandler, + FireworksHandler, } from "./providers" export interface SingleCompletionHandler { @@ -127,6 +128,8 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler { return new SambaNovaHandler(options) case "zai": return new ZAiHandler(options) + case "fireworks": + return new FireworksHandler(options) default: apiProvider satisfies "gemini-cli" | undefined return new AnthropicHandler(options) diff --git a/src/api/providers/__tests__/fireworks.spec.ts b/src/api/providers/__tests__/fireworks.spec.ts new file mode 100644 index 0000000000..21a88e80ba --- /dev/null +++ b/src/api/providers/__tests__/fireworks.spec.ts @@ -0,0 +1,355 @@ +// npx vitest run api/providers/__tests__/fireworks.spec.ts + +import { Anthropic } from "@anthropic-ai/sdk" +import OpenAI from "openai" + +import { type FireworksModelId, fireworksDefaultModelId, fireworksModels } from "@roo-code/types" + +import { FireworksHandler } from "../fireworks" + +// Create mock functions +const mockCreate = vi.fn() + +// Mock OpenAI module +vi.mock("openai", () => ({ + default: vi.fn(() => ({ + chat: { + completions: { + create: mockCreate, + }, + }, + })), +})) + +describe("FireworksHandler", () => { + let handler: FireworksHandler + + beforeEach(() => { + vi.clearAllMocks() + // Set up default mock implementation + mockCreate.mockImplementation(async () => ({ + [Symbol.asyncIterator]: async function* () { + yield { + choices: [ + { + delta: { content: "Test response" }, + index: 0, + }, + ], + usage: null, + } + yield { + choices: [ + { + delta: {}, + index: 0, + }, + ], + usage: { + prompt_tokens: 10, + completion_tokens: 5, + total_tokens: 15, + }, + } + }, + })) + handler = new FireworksHandler({ fireworksApiKey: "test-key" }) + }) + + afterEach(() => { + vi.restoreAllMocks() + }) + + it("should use the correct Fireworks base URL", () => { + new FireworksHandler({ fireworksApiKey: "test-fireworks-api-key" }) + expect(OpenAI).toHaveBeenCalledWith( + expect.objectContaining({ baseURL: "https://api.fireworks.ai/inference/v1" }), + ) + }) + + it("should use the provided API key", () => { + const fireworksApiKey = "test-fireworks-api-key" + new FireworksHandler({ fireworksApiKey }) + expect(OpenAI).toHaveBeenCalledWith(expect.objectContaining({ apiKey: fireworksApiKey })) + }) + + it("should throw error when API key is not provided", () => { + expect(() => new FireworksHandler({})).toThrow("API key is required") + }) + + it("should return default model when no model is specified", () => { + const model = handler.getModel() + expect(model.id).toBe(fireworksDefaultModelId) + expect(model.info).toEqual(expect.objectContaining(fireworksModels[fireworksDefaultModelId])) + }) + + it("should return specified model when valid model is provided", () => { + const testModelId: FireworksModelId = "accounts/fireworks/models/qwen3-235b-a22b-instruct-2507" + const handlerWithModel = new FireworksHandler({ + apiModelId: testModelId, + fireworksApiKey: "test-fireworks-api-key", + }) + const model = handlerWithModel.getModel() + expect(model.id).toBe(testModelId) + expect(model.info).toEqual(expect.objectContaining(fireworksModels[testModelId])) + }) + + it("should return Kimi K2 Instruct model with correct configuration", () => { + const testModelId: FireworksModelId = "accounts/fireworks/models/kimi-k2-instruct" + const handlerWithModel = new FireworksHandler({ + apiModelId: testModelId, + fireworksApiKey: "test-fireworks-api-key", + }) + const model = handlerWithModel.getModel() + expect(model.id).toBe(testModelId) + expect(model.info).toEqual( + expect.objectContaining({ + maxTokens: 16384, + contextWindow: 128000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.6, + outputPrice: 2.5, + description: expect.stringContaining("Kimi K2 is a state-of-the-art mixture-of-experts"), + }), + ) + }) + + it("should return Qwen3 235B model with correct configuration", () => { + const testModelId: FireworksModelId = "accounts/fireworks/models/qwen3-235b-a22b-instruct-2507" + const handlerWithModel = new FireworksHandler({ + apiModelId: testModelId, + fireworksApiKey: "test-fireworks-api-key", + }) + const model = handlerWithModel.getModel() + expect(model.id).toBe(testModelId) + expect(model.info).toEqual( + expect.objectContaining({ + maxTokens: 32768, + contextWindow: 256000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.22, + outputPrice: 0.88, + description: + "Latest Qwen3 thinking model, competitive against the best closed source models in Jul 2025.", + }), + ) + }) + + it("should return DeepSeek R1 model with correct configuration", () => { + const testModelId: FireworksModelId = "accounts/fireworks/models/deepseek-r1-0528" + const handlerWithModel = new FireworksHandler({ + apiModelId: testModelId, + fireworksApiKey: "test-fireworks-api-key", + }) + const model = handlerWithModel.getModel() + expect(model.id).toBe(testModelId) + expect(model.info).toEqual( + expect.objectContaining({ + maxTokens: 20480, + contextWindow: 160000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 3, + outputPrice: 8, + description: expect.stringContaining("05/28 updated checkpoint of Deepseek R1"), + }), + ) + }) + + it("should return DeepSeek V3 model with correct configuration", () => { + const testModelId: FireworksModelId = "accounts/fireworks/models/deepseek-v3" + const handlerWithModel = new FireworksHandler({ + apiModelId: testModelId, + fireworksApiKey: "test-fireworks-api-key", + }) + const model = handlerWithModel.getModel() + expect(model.id).toBe(testModelId) + expect(model.info).toEqual( + expect.objectContaining({ + maxTokens: 16384, + contextWindow: 128000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.9, + outputPrice: 0.9, + description: expect.stringContaining("strong Mixture-of-Experts (MoE) language model"), + }), + ) + }) + + it("completePrompt method should return text from Fireworks API", async () => { + const expectedResponse = "This is a test response from Fireworks" + mockCreate.mockResolvedValueOnce({ choices: [{ message: { content: expectedResponse } }] }) + const result = await handler.completePrompt("test prompt") + expect(result).toBe(expectedResponse) + }) + + it("should handle errors in completePrompt", async () => { + const errorMessage = "Fireworks API error" + mockCreate.mockRejectedValueOnce(new Error(errorMessage)) + await expect(handler.completePrompt("test prompt")).rejects.toThrow( + `Fireworks completion error: ${errorMessage}`, + ) + }) + + it("createMessage should yield text content from stream", async () => { + const testContent = "This is test content from Fireworks stream" + + mockCreate.mockImplementationOnce(() => { + return { + [Symbol.asyncIterator]: () => ({ + next: vi + .fn() + .mockResolvedValueOnce({ + done: false, + value: { choices: [{ delta: { content: testContent } }] }, + }) + .mockResolvedValueOnce({ done: true }), + }), + } + }) + + const stream = handler.createMessage("system prompt", []) + const firstChunk = await stream.next() + + expect(firstChunk.done).toBe(false) + expect(firstChunk.value).toEqual({ type: "text", text: testContent }) + }) + + it("createMessage should yield usage data from stream", async () => { + mockCreate.mockImplementationOnce(() => { + return { + [Symbol.asyncIterator]: () => ({ + next: vi + .fn() + .mockResolvedValueOnce({ + done: false, + value: { choices: [{ delta: {} }], usage: { prompt_tokens: 10, completion_tokens: 20 } }, + }) + .mockResolvedValueOnce({ done: true }), + }), + } + }) + + const stream = handler.createMessage("system prompt", []) + const firstChunk = await stream.next() + + expect(firstChunk.done).toBe(false) + expect(firstChunk.value).toEqual({ type: "usage", inputTokens: 10, outputTokens: 20 }) + }) + + it("createMessage should pass correct parameters to Fireworks client", async () => { + const modelId: FireworksModelId = "accounts/fireworks/models/kimi-k2-instruct" + const modelInfo = fireworksModels[modelId] + const handlerWithModel = new FireworksHandler({ + apiModelId: modelId, + fireworksApiKey: "test-fireworks-api-key", + }) + + mockCreate.mockImplementationOnce(() => { + return { + [Symbol.asyncIterator]: () => ({ + async next() { + return { done: true } + }, + }), + } + }) + + const systemPrompt = "Test system prompt for Fireworks" + const messages: Anthropic.Messages.MessageParam[] = [{ role: "user", content: "Test message for Fireworks" }] + + const messageGenerator = handlerWithModel.createMessage(systemPrompt, messages) + await messageGenerator.next() + + expect(mockCreate).toHaveBeenCalledWith( + expect.objectContaining({ + model: modelId, + max_tokens: modelInfo.maxTokens, + temperature: 0.5, + messages: expect.arrayContaining([{ role: "system", content: systemPrompt }]), + stream: true, + stream_options: { include_usage: true }, + }), + ) + }) + + it("should use default temperature of 0.5", () => { + const testModelId: FireworksModelId = "accounts/fireworks/models/kimi-k2-instruct" + const handlerWithModel = new FireworksHandler({ + apiModelId: testModelId, + fireworksApiKey: "test-fireworks-api-key", + }) + const model = handlerWithModel.getModel() + // The temperature is set in the constructor as defaultTemperature: 0.5 + // This test verifies the handler is configured with the correct default temperature + expect(handlerWithModel).toBeDefined() + }) + + it("should handle empty response in completePrompt", async () => { + mockCreate.mockResolvedValueOnce({ choices: [{ message: { content: null } }] }) + const result = await handler.completePrompt("test prompt") + expect(result).toBe("") + }) + + it("should handle missing choices in completePrompt", async () => { + mockCreate.mockResolvedValueOnce({ choices: [] }) + const result = await handler.completePrompt("test prompt") + expect(result).toBe("") + }) + + it("createMessage should handle stream with multiple chunks", async () => { + mockCreate.mockImplementationOnce(async () => ({ + [Symbol.asyncIterator]: async function* () { + yield { + choices: [ + { + delta: { content: "Hello" }, + index: 0, + }, + ], + usage: null, + } + yield { + choices: [ + { + delta: { content: " world" }, + index: 0, + }, + ], + usage: null, + } + yield { + choices: [ + { + delta: {}, + index: 0, + }, + ], + usage: { + prompt_tokens: 5, + completion_tokens: 10, + total_tokens: 15, + }, + } + }, + })) + + const systemPrompt = "You are a helpful assistant." + const messages: Anthropic.Messages.MessageParam[] = [{ role: "user", content: "Hi" }] + + const stream = handler.createMessage(systemPrompt, messages) + const chunks = [] + for await (const chunk of stream) { + chunks.push(chunk) + } + + expect(chunks).toEqual([ + { type: "text", text: "Hello" }, + { type: "text", text: " world" }, + { type: "usage", inputTokens: 5, outputTokens: 10 }, + ]) + }) +}) diff --git a/src/api/providers/fireworks.ts b/src/api/providers/fireworks.ts new file mode 100644 index 0000000000..db29e7bf3f --- /dev/null +++ b/src/api/providers/fireworks.ts @@ -0,0 +1,19 @@ +import { type FireworksModelId, fireworksDefaultModelId, fireworksModels } from "@roo-code/types" + +import type { ApiHandlerOptions } from "../../shared/api" + +import { BaseOpenAiCompatibleProvider } from "./base-openai-compatible-provider" + +export class FireworksHandler extends BaseOpenAiCompatibleProvider { + constructor(options: ApiHandlerOptions) { + super({ + ...options, + providerName: "Fireworks", + baseURL: "https://api.fireworks.ai/inference/v1", + apiKey: options.fireworksApiKey, + defaultProviderModelId: fireworksDefaultModelId, + providerModels: fireworksModels, + defaultTemperature: 0.5, + }) + } +} diff --git a/src/api/providers/index.ts b/src/api/providers/index.ts index dfcf87b6c9..890999aa25 100644 --- a/src/api/providers/index.ts +++ b/src/api/providers/index.ts @@ -27,3 +27,4 @@ export { VertexHandler } from "./vertex" export { VsCodeLmHandler } from "./vscode-lm" export { XAIHandler } from "./xai" export { ZAiHandler } from "./zai" +export { FireworksHandler } from "./fireworks" diff --git a/src/shared/ProfileValidator.ts b/src/shared/ProfileValidator.ts index 9cfba84aae..3dc8025ff8 100644 --- a/src/shared/ProfileValidator.ts +++ b/src/shared/ProfileValidator.ts @@ -68,6 +68,7 @@ export class ProfileValidator { case "groq": case "sambanova": case "chutes": + case "fireworks": return profile.apiModelId case "litellm": return profile.litellmModelId diff --git a/src/shared/__tests__/ProfileValidator.spec.ts b/src/shared/__tests__/ProfileValidator.spec.ts index 7ece0d8bf8..fa055a8157 100644 --- a/src/shared/__tests__/ProfileValidator.spec.ts +++ b/src/shared/__tests__/ProfileValidator.spec.ts @@ -193,6 +193,7 @@ describe("ProfileValidator", () => { "groq", "chutes", "sambanova", + "fireworks", ] apiModelProviders.forEach((provider) => { diff --git a/webview-ui/src/components/settings/ApiOptions.tsx b/webview-ui/src/components/settings/ApiOptions.tsx index 6c521ecfdf..204abe9c0f 100644 --- a/webview-ui/src/components/settings/ApiOptions.tsx +++ b/webview-ui/src/components/settings/ApiOptions.tsx @@ -30,6 +30,7 @@ import { sambaNovaDefaultModelId, internationalZAiDefaultModelId, mainlandZAiDefaultModelId, + fireworksDefaultModelId, } from "@roo-code/types" import { vscode } from "@src/utils/vscode" @@ -82,6 +83,7 @@ import { VSCodeLM, XAI, ZAi, + Fireworks, } from "./providers" import { MODELS_BY_PROVIDER, PROVIDERS } from "./constants" @@ -316,6 +318,7 @@ const ApiOptions = ({ ? mainlandZAiDefaultModelId : internationalZAiDefaultModelId, }, + fireworks: { field: "apiModelId", default: fireworksDefaultModelId }, openai: { field: "openAiModelId" }, ollama: { field: "ollamaModelId" }, lmstudio: { field: "lmStudioModelId" }, @@ -555,6 +558,10 @@ const ApiOptions = ({ )} + {selectedProvider === "fireworks" && ( + + )} + {selectedProviderModels.length > 0 && ( <>
    diff --git a/webview-ui/src/components/settings/constants.ts b/webview-ui/src/components/settings/constants.ts index c0ddaf89e1..90192f372b 100644 --- a/webview-ui/src/components/settings/constants.ts +++ b/webview-ui/src/components/settings/constants.ts @@ -17,6 +17,7 @@ import { sambaNovaModels, doubaoModels, internationalZAiModels, + fireworksModels, } from "@roo-code/types" export const MODELS_BY_PROVIDER: Partial>> = { @@ -36,6 +37,7 @@ export const MODELS_BY_PROVIDER: Partial a.label.localeCompare(b.label)) diff --git a/webview-ui/src/components/settings/providers/Fireworks.tsx b/webview-ui/src/components/settings/providers/Fireworks.tsx new file mode 100644 index 0000000000..bb8eb8aa58 --- /dev/null +++ b/webview-ui/src/components/settings/providers/Fireworks.tsx @@ -0,0 +1,50 @@ +import { useCallback } from "react" +import { VSCodeTextField } from "@vscode/webview-ui-toolkit/react" + +import type { ProviderSettings } from "@roo-code/types" + +import { useAppTranslation } from "@src/i18n/TranslationContext" +import { VSCodeButtonLink } from "@src/components/common/VSCodeButtonLink" + +import { inputEventTransform } from "../transforms" + +type FireworksProps = { + apiConfiguration: ProviderSettings + setApiConfigurationField: (field: keyof ProviderSettings, value: ProviderSettings[keyof ProviderSettings]) => void +} + +export const Fireworks = ({ apiConfiguration, setApiConfigurationField }: FireworksProps) => { + const { t } = useAppTranslation() + + const handleInputChange = useCallback( + ( + field: K, + transform: (event: E) => ProviderSettings[K] = inputEventTransform, + ) => + (event: E | Event) => { + setApiConfigurationField(field, transform(event as E)) + }, + [setApiConfigurationField], + ) + + return ( + <> + + + +
    + {t("settings:providers.apiKeyStorageNotice")} +
    + {!apiConfiguration?.fireworksApiKey && ( + + {t("settings:providers.getFireworksApiKey")} + + )} + + ) +} diff --git a/webview-ui/src/components/settings/providers/index.ts b/webview-ui/src/components/settings/providers/index.ts index 0f0048df0a..e8428eb66c 100644 --- a/webview-ui/src/components/settings/providers/index.ts +++ b/webview-ui/src/components/settings/providers/index.ts @@ -24,3 +24,4 @@ export { VSCodeLM } from "./VSCodeLM" export { XAI } from "./XAI" export { ZAi } from "./ZAi" export { LiteLLM } from "./LiteLLM" +export { Fireworks } from "./Fireworks" diff --git a/webview-ui/src/components/ui/hooks/useSelectedModel.ts b/webview-ui/src/components/ui/hooks/useSelectedModel.ts index a191014981..2ccf9d4071 100644 --- a/webview-ui/src/components/ui/hooks/useSelectedModel.ts +++ b/webview-ui/src/components/ui/hooks/useSelectedModel.ts @@ -44,6 +44,8 @@ import { mainlandZAiDefaultModelId, internationalZAiModels, mainlandZAiModels, + fireworksModels, + fireworksDefaultModelId, } from "@roo-code/types" import type { ModelRecord, RouterModels } from "@roo/api" @@ -270,6 +272,11 @@ function getSelectedModel({ const info = sambaNovaModels[id as keyof typeof sambaNovaModels] return { id, info } } + case "fireworks": { + const id = apiConfiguration.apiModelId ?? fireworksDefaultModelId + const info = fireworksModels[id as keyof typeof fireworksModels] + return { id, info } + } // case "anthropic": // case "human-relay": // case "fake-ai": diff --git a/webview-ui/src/i18n/locales/ca/settings.json b/webview-ui/src/i18n/locales/ca/settings.json index 4ab333f48f..e3f2713ffe 100644 --- a/webview-ui/src/i18n/locales/ca/settings.json +++ b/webview-ui/src/i18n/locales/ca/settings.json @@ -261,6 +261,8 @@ "getCerebrasApiKey": "Obtenir clau API de Cerebras", "chutesApiKey": "Clau API de Chutes", "getChutesApiKey": "Obtenir clau API de Chutes", + "fireworksApiKey": "Clau API de Fireworks", + "getFireworksApiKey": "Obtenir clau API de Fireworks", "deepSeekApiKey": "Clau API de DeepSeek", "getDeepSeekApiKey": "Obtenir clau API de DeepSeek", "doubaoApiKey": "Clau API de Doubao", diff --git a/webview-ui/src/i18n/locales/de/settings.json b/webview-ui/src/i18n/locales/de/settings.json index ff893c3356..a4a62b8391 100644 --- a/webview-ui/src/i18n/locales/de/settings.json +++ b/webview-ui/src/i18n/locales/de/settings.json @@ -263,6 +263,8 @@ "getCerebrasApiKey": "Cerebras API-Schlüssel erhalten", "chutesApiKey": "Chutes API-Schlüssel", "getChutesApiKey": "Chutes API-Schlüssel erhalten", + "fireworksApiKey": "Fireworks API-Schlüssel", + "getFireworksApiKey": "Fireworks API-Schlüssel erhalten", "deepSeekApiKey": "DeepSeek API-Schlüssel", "getDeepSeekApiKey": "DeepSeek API-Schlüssel erhalten", "moonshotApiKey": "Moonshot API-Schlüssel", diff --git a/webview-ui/src/i18n/locales/en/settings.json b/webview-ui/src/i18n/locales/en/settings.json index b20482d1b2..6e0f137504 100644 --- a/webview-ui/src/i18n/locales/en/settings.json +++ b/webview-ui/src/i18n/locales/en/settings.json @@ -260,6 +260,8 @@ "getCerebrasApiKey": "Get Cerebras API Key", "chutesApiKey": "Chutes API Key", "getChutesApiKey": "Get Chutes API Key", + "fireworksApiKey": "Fireworks API Key", + "getFireworksApiKey": "Get Fireworks API Key", "deepSeekApiKey": "DeepSeek API Key", "getDeepSeekApiKey": "Get DeepSeek API Key", "doubaoApiKey": "Doubao API Key", diff --git a/webview-ui/src/i18n/locales/es/settings.json b/webview-ui/src/i18n/locales/es/settings.json index 579426cdb6..e2db1463af 100644 --- a/webview-ui/src/i18n/locales/es/settings.json +++ b/webview-ui/src/i18n/locales/es/settings.json @@ -261,6 +261,8 @@ "getCerebrasApiKey": "Obtener clave API de Cerebras", "chutesApiKey": "Clave API de Chutes", "getChutesApiKey": "Obtener clave API de Chutes", + "fireworksApiKey": "Clave API de Fireworks", + "getFireworksApiKey": "Obtener clave API de Fireworks", "deepSeekApiKey": "Clave API de DeepSeek", "getDeepSeekApiKey": "Obtener clave API de DeepSeek", "doubaoApiKey": "Clave API de Doubao", diff --git a/webview-ui/src/i18n/locales/fr/settings.json b/webview-ui/src/i18n/locales/fr/settings.json index 52ac1aec34..26018a344b 100644 --- a/webview-ui/src/i18n/locales/fr/settings.json +++ b/webview-ui/src/i18n/locales/fr/settings.json @@ -261,6 +261,8 @@ "getCerebrasApiKey": "Obtenir la clé API Cerebras", "chutesApiKey": "Clé API Chutes", "getChutesApiKey": "Obtenir la clé API Chutes", + "fireworksApiKey": "Clé API Fireworks", + "getFireworksApiKey": "Obtenir la clé API Fireworks", "deepSeekApiKey": "Clé API DeepSeek", "getDeepSeekApiKey": "Obtenir la clé API DeepSeek", "doubaoApiKey": "Clé API Doubao", diff --git a/webview-ui/src/i18n/locales/hi/settings.json b/webview-ui/src/i18n/locales/hi/settings.json index 7926ae5ba9..7c8b280427 100644 --- a/webview-ui/src/i18n/locales/hi/settings.json +++ b/webview-ui/src/i18n/locales/hi/settings.json @@ -261,6 +261,8 @@ "getCerebrasApiKey": "Cerebras API कुंजी प्राप्त करें", "chutesApiKey": "Chutes API कुंजी", "getChutesApiKey": "Chutes API कुंजी प्राप्त करें", + "fireworksApiKey": "Fireworks API कुंजी", + "getFireworksApiKey": "Fireworks API कुंजी प्राप्त करें", "deepSeekApiKey": "DeepSeek API कुंजी", "getDeepSeekApiKey": "DeepSeek API कुंजी प्राप्त करें", "doubaoApiKey": "डौबाओ API कुंजी", diff --git a/webview-ui/src/i18n/locales/id/settings.json b/webview-ui/src/i18n/locales/id/settings.json index 66e7cb53a1..b4f9b113b3 100644 --- a/webview-ui/src/i18n/locales/id/settings.json +++ b/webview-ui/src/i18n/locales/id/settings.json @@ -265,6 +265,8 @@ "getCerebrasApiKey": "Dapatkan Cerebras API Key", "chutesApiKey": "Chutes API Key", "getChutesApiKey": "Dapatkan Chutes API Key", + "fireworksApiKey": "Fireworks API Key", + "getFireworksApiKey": "Dapatkan Fireworks API Key", "deepSeekApiKey": "DeepSeek API Key", "getDeepSeekApiKey": "Dapatkan DeepSeek API Key", "doubaoApiKey": "Kunci API Doubao", diff --git a/webview-ui/src/i18n/locales/it/settings.json b/webview-ui/src/i18n/locales/it/settings.json index 4cfe6ff231..82d7b2d041 100644 --- a/webview-ui/src/i18n/locales/it/settings.json +++ b/webview-ui/src/i18n/locales/it/settings.json @@ -261,6 +261,8 @@ "getCerebrasApiKey": "Ottieni chiave API Cerebras", "chutesApiKey": "Chiave API Chutes", "getChutesApiKey": "Ottieni chiave API Chutes", + "fireworksApiKey": "Chiave API Fireworks", + "getFireworksApiKey": "Ottieni chiave API Fireworks", "deepSeekApiKey": "Chiave API DeepSeek", "getDeepSeekApiKey": "Ottieni chiave API DeepSeek", "doubaoApiKey": "Chiave API Doubao", diff --git a/webview-ui/src/i18n/locales/ja/settings.json b/webview-ui/src/i18n/locales/ja/settings.json index a83d78ed39..dfa62ab32b 100644 --- a/webview-ui/src/i18n/locales/ja/settings.json +++ b/webview-ui/src/i18n/locales/ja/settings.json @@ -261,6 +261,8 @@ "getCerebrasApiKey": "Cerebras APIキーを取得", "chutesApiKey": "Chutes APIキー", "getChutesApiKey": "Chutes APIキーを取得", + "fireworksApiKey": "Fireworks APIキー", + "getFireworksApiKey": "Fireworks APIキーを取得", "deepSeekApiKey": "DeepSeek APIキー", "getDeepSeekApiKey": "DeepSeek APIキーを取得", "doubaoApiKey": "Doubao APIキー", diff --git a/webview-ui/src/i18n/locales/ko/settings.json b/webview-ui/src/i18n/locales/ko/settings.json index 708b1c7ada..219a5de54a 100644 --- a/webview-ui/src/i18n/locales/ko/settings.json +++ b/webview-ui/src/i18n/locales/ko/settings.json @@ -261,6 +261,8 @@ "getCerebrasApiKey": "Cerebras API 키 가져오기", "chutesApiKey": "Chutes API 키", "getChutesApiKey": "Chutes API 키 받기", + "fireworksApiKey": "Fireworks API 키", + "getFireworksApiKey": "Fireworks API 키 받기", "deepSeekApiKey": "DeepSeek API 키", "getDeepSeekApiKey": "DeepSeek API 키 받기", "doubaoApiKey": "Doubao API 키", diff --git a/webview-ui/src/i18n/locales/nl/settings.json b/webview-ui/src/i18n/locales/nl/settings.json index dca4ba5c71..735339bb66 100644 --- a/webview-ui/src/i18n/locales/nl/settings.json +++ b/webview-ui/src/i18n/locales/nl/settings.json @@ -261,6 +261,8 @@ "getCerebrasApiKey": "Cerebras API-sleutel verkrijgen", "chutesApiKey": "Chutes API-sleutel", "getChutesApiKey": "Chutes API-sleutel ophalen", + "fireworksApiKey": "Fireworks API-sleutel", + "getFireworksApiKey": "Fireworks API-sleutel ophalen", "deepSeekApiKey": "DeepSeek API-sleutel", "getDeepSeekApiKey": "DeepSeek API-sleutel ophalen", "doubaoApiKey": "Doubao API-sleutel", diff --git a/webview-ui/src/i18n/locales/pl/settings.json b/webview-ui/src/i18n/locales/pl/settings.json index 5037ceb569..e25eee34cf 100644 --- a/webview-ui/src/i18n/locales/pl/settings.json +++ b/webview-ui/src/i18n/locales/pl/settings.json @@ -261,6 +261,8 @@ "getCerebrasApiKey": "Pobierz klucz API Cerebras", "chutesApiKey": "Klucz API Chutes", "getChutesApiKey": "Uzyskaj klucz API Chutes", + "fireworksApiKey": "Klucz API Fireworks", + "getFireworksApiKey": "Uzyskaj klucz API Fireworks", "deepSeekApiKey": "Klucz API DeepSeek", "getDeepSeekApiKey": "Uzyskaj klucz API DeepSeek", "doubaoApiKey": "Klucz API Doubao", diff --git a/webview-ui/src/i18n/locales/pt-BR/settings.json b/webview-ui/src/i18n/locales/pt-BR/settings.json index c862cee357..e7243aa6f6 100644 --- a/webview-ui/src/i18n/locales/pt-BR/settings.json +++ b/webview-ui/src/i18n/locales/pt-BR/settings.json @@ -261,6 +261,8 @@ "getCerebrasApiKey": "Obter chave de API Cerebras", "chutesApiKey": "Chave de API Chutes", "getChutesApiKey": "Obter chave de API Chutes", + "fireworksApiKey": "Chave de API Fireworks", + "getFireworksApiKey": "Obter chave de API Fireworks", "deepSeekApiKey": "Chave de API DeepSeek", "getDeepSeekApiKey": "Obter chave de API DeepSeek", "doubaoApiKey": "Chave de API Doubao", diff --git a/webview-ui/src/i18n/locales/ru/settings.json b/webview-ui/src/i18n/locales/ru/settings.json index 25b147f57e..38e986ab88 100644 --- a/webview-ui/src/i18n/locales/ru/settings.json +++ b/webview-ui/src/i18n/locales/ru/settings.json @@ -261,6 +261,8 @@ "getCerebrasApiKey": "Получить Cerebras API-ключ", "chutesApiKey": "Chutes API-ключ", "getChutesApiKey": "Получить Chutes API-ключ", + "fireworksApiKey": "Fireworks API-ключ", + "getFireworksApiKey": "Получить Fireworks API-ключ", "deepSeekApiKey": "DeepSeek API-ключ", "getDeepSeekApiKey": "Получить DeepSeek API-ключ", "doubaoApiKey": "Doubao API-ключ", diff --git a/webview-ui/src/i18n/locales/tr/settings.json b/webview-ui/src/i18n/locales/tr/settings.json index 1aa6ce9783..b4b9fd13e4 100644 --- a/webview-ui/src/i18n/locales/tr/settings.json +++ b/webview-ui/src/i18n/locales/tr/settings.json @@ -261,6 +261,8 @@ "getCerebrasApiKey": "Cerebras API Anahtarını Al", "chutesApiKey": "Chutes API Anahtarı", "getChutesApiKey": "Chutes API Anahtarı Al", + "fireworksApiKey": "Fireworks API Anahtarı", + "getFireworksApiKey": "Fireworks API Anahtarı Al", "deepSeekApiKey": "DeepSeek API Anahtarı", "getDeepSeekApiKey": "DeepSeek API Anahtarı Al", "doubaoApiKey": "Doubao API Anahtarı", diff --git a/webview-ui/src/i18n/locales/vi/settings.json b/webview-ui/src/i18n/locales/vi/settings.json index 3449012f9c..cdae509d5e 100644 --- a/webview-ui/src/i18n/locales/vi/settings.json +++ b/webview-ui/src/i18n/locales/vi/settings.json @@ -261,6 +261,8 @@ "getCerebrasApiKey": "Lấy khóa API Cerebras", "chutesApiKey": "Khóa API Chutes", "getChutesApiKey": "Lấy khóa API Chutes", + "fireworksApiKey": "Khóa API Fireworks", + "getFireworksApiKey": "Lấy khóa API Fireworks", "deepSeekApiKey": "Khóa API DeepSeek", "getDeepSeekApiKey": "Lấy khóa API DeepSeek", "doubaoApiKey": "Khóa API Doubao", diff --git a/webview-ui/src/i18n/locales/zh-CN/settings.json b/webview-ui/src/i18n/locales/zh-CN/settings.json index e7c53cf757..aca901cc3e 100644 --- a/webview-ui/src/i18n/locales/zh-CN/settings.json +++ b/webview-ui/src/i18n/locales/zh-CN/settings.json @@ -261,6 +261,8 @@ "getCerebrasApiKey": "获取 Cerebras API 密钥", "chutesApiKey": "Chutes API 密钥", "getChutesApiKey": "获取 Chutes API 密钥", + "fireworksApiKey": "Fireworks API 密钥", + "getFireworksApiKey": "获取 Fireworks API 密钥", "deepSeekApiKey": "DeepSeek API 密钥", "getDeepSeekApiKey": "获取 DeepSeek API 密钥", "doubaoApiKey": "豆包 API 密钥", diff --git a/webview-ui/src/i18n/locales/zh-TW/settings.json b/webview-ui/src/i18n/locales/zh-TW/settings.json index cfdcd6e696..db3fc3c2cd 100644 --- a/webview-ui/src/i18n/locales/zh-TW/settings.json +++ b/webview-ui/src/i18n/locales/zh-TW/settings.json @@ -261,6 +261,8 @@ "getCerebrasApiKey": "取得 Cerebras API 金鑰", "chutesApiKey": "Chutes API 金鑰", "getChutesApiKey": "取得 Chutes API 金鑰", + "fireworksApiKey": "Fireworks API 金鑰", + "getFireworksApiKey": "取得 Fireworks API 金鑰", "deepSeekApiKey": "DeepSeek API 金鑰", "getDeepSeekApiKey": "取得 DeepSeek API 金鑰", "doubaoApiKey": "豆包 API 金鑰", diff --git a/webview-ui/src/utils/validate.ts b/webview-ui/src/utils/validate.ts index 3b85ef9919..b39060e665 100644 --- a/webview-ui/src/utils/validate.ts +++ b/webview-ui/src/utils/validate.ts @@ -115,6 +115,11 @@ function validateModelsAndKeysProvided(apiConfiguration: ProviderSettings): stri return i18next.t("settings:validation.apiKey") } break + case "fireworks": + if (!apiConfiguration.fireworksApiKey) { + return i18next.t("settings:validation.apiKey") + } + break } return undefined From 8a35b64b9b873094bd65af3e22b25ef78bf45712 Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Mon, 4 Aug 2025 19:29:38 -0700 Subject: [PATCH 065/253] fix: prevent MCP server creation when setting is disabled (#6613) * fix: prevent MCP server creation when setting is disabled - Modified getFetchInstructionsDescription to conditionally include create_mcp_server task - Updated getToolDescriptionsForMode to pass enableMcpServerCreation parameter - Added tests to verify the conditional behavior - Updated snapshot test to reflect the new expected behavior Fixes #6607 * fix: address review comments - add JSDoc, null test, and clarify default behavior --------- Co-authored-by: Roo Code --- .../mcp-server-creation-disabled.snap | 5 +- src/core/prompts/system.ts | 1 + .../__tests__/fetch-instructions.spec.ts | 53 +++++++++++++++++++ src/core/prompts/tools/fetch-instructions.ts | 35 +++++++++--- src/core/prompts/tools/index.ts | 8 ++- 5 files changed, 89 insertions(+), 13 deletions(-) create mode 100644 src/core/prompts/tools/__tests__/fetch-instructions.spec.ts diff --git a/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/mcp-server-creation-disabled.snap b/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/mcp-server-creation-disabled.snap index 632273dea0..b1fdcc2e32 100644 --- a/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/mcp-server-creation-disabled.snap +++ b/src/core/prompts/__tests__/__snapshots__/add-custom-instructions/mcp-server-creation-disabled.snap @@ -99,13 +99,12 @@ IMPORTANT: You MUST use this Efficient Reading Strategy: Description: Request to fetch instructions to perform a task Parameters: - task: (required) The task to get instructions for. This can take the following values: - create_mcp_server create_mode -Example: Requesting instructions to create an MCP Server +Example: Requesting instructions to create a Mode -create_mcp_server +create_mode ## search_files diff --git a/src/core/prompts/system.ts b/src/core/prompts/system.ts index cbe91903ee..227e79679d 100644 --- a/src/core/prompts/system.ts +++ b/src/core/prompts/system.ts @@ -105,6 +105,7 @@ ${getToolDescriptionsForMode( experiments, partialReadsEnabled, settings, + enableMcpServerCreation, )} ${getToolUseGuidelinesSection(codeIndexManager)} diff --git a/src/core/prompts/tools/__tests__/fetch-instructions.spec.ts b/src/core/prompts/tools/__tests__/fetch-instructions.spec.ts new file mode 100644 index 0000000000..29e7f0fca2 --- /dev/null +++ b/src/core/prompts/tools/__tests__/fetch-instructions.spec.ts @@ -0,0 +1,53 @@ +import { describe, it, expect } from "vitest" +import { getFetchInstructionsDescription } from "../fetch-instructions" + +describe("getFetchInstructionsDescription", () => { + it("should include create_mcp_server when enableMcpServerCreation is true", () => { + const description = getFetchInstructionsDescription(true) + + expect(description).toContain("create_mcp_server") + expect(description).toContain("create_mode") + expect(description).toContain("Example: Requesting instructions to create an MCP Server") + expect(description).toContain("create_mcp_server") + }) + + it("should include create_mcp_server when enableMcpServerCreation is undefined (default behavior)", () => { + const description = getFetchInstructionsDescription() + + expect(description).toContain("create_mcp_server") + expect(description).toContain("create_mode") + expect(description).toContain("Example: Requesting instructions to create an MCP Server") + expect(description).toContain("create_mcp_server") + }) + + it("should exclude create_mcp_server when enableMcpServerCreation is false", () => { + const description = getFetchInstructionsDescription(false) + + expect(description).not.toContain("create_mcp_server") + expect(description).toContain("create_mode") + expect(description).toContain("Example: Requesting instructions to create a Mode") + expect(description).toContain("create_mode") + expect(description).not.toContain("Example: Requesting instructions to create an MCP Server") + }) + + it("should have the correct structure", () => { + const description = getFetchInstructionsDescription(true) + + expect(description).toContain("## fetch_instructions") + expect(description).toContain("Description: Request to fetch instructions to perform a task") + expect(description).toContain("Parameters:") + expect(description).toContain("- task: (required) The task to get instructions for.") + expect(description).toContain("") + expect(description).toContain("") + }) + + it("should handle null value consistently (treat as default/undefined)", () => { + const description = getFetchInstructionsDescription(null as any) + + // Should behave the same as undefined (default to true) + expect(description).toContain("create_mcp_server") + expect(description).toContain("create_mode") + expect(description).toContain("Example: Requesting instructions to create an MCP Server") + expect(description).toContain("create_mcp_server") + }) +}) diff --git a/src/core/prompts/tools/fetch-instructions.ts b/src/core/prompts/tools/fetch-instructions.ts index eca231c562..dd9cbb80da 100644 --- a/src/core/prompts/tools/fetch-instructions.ts +++ b/src/core/prompts/tools/fetch-instructions.ts @@ -1,14 +1,33 @@ -export function getFetchInstructionsDescription(): string { - return `## fetch_instructions -Description: Request to fetch instructions to perform a task -Parameters: -- task: (required) The task to get instructions for. This can take the following values: - create_mcp_server - create_mode +/** + * Generates the fetch_instructions tool description. + * @param enableMcpServerCreation - Whether to include MCP server creation task. + * Defaults to true when undefined. + */ +export function getFetchInstructionsDescription(enableMcpServerCreation?: boolean): string { + const tasks = + enableMcpServerCreation !== false + ? ` create_mcp_server + create_mode` + : ` create_mode` -Example: Requesting instructions to create an MCP Server + const example = + enableMcpServerCreation !== false + ? `Example: Requesting instructions to create an MCP Server create_mcp_server ` + : `Example: Requesting instructions to create a Mode + + +create_mode +` + + return `## fetch_instructions +Description: Request to fetch instructions to perform a task +Parameters: +- task: (required) The task to get instructions for. This can take the following values: +${tasks} + +${example}` } diff --git a/src/core/prompts/tools/index.ts b/src/core/prompts/tools/index.ts index 9f4af7f312..0c88bd94b1 100644 --- a/src/core/prompts/tools/index.ts +++ b/src/core/prompts/tools/index.ts @@ -29,7 +29,7 @@ import { CodeIndexManager } from "../../../services/code-index/manager" const toolDescriptionMap: Record string | undefined> = { execute_command: (args) => getExecuteCommandDescription(args), read_file: (args) => getReadFileDescription(args), - fetch_instructions: () => getFetchInstructionsDescription(), + fetch_instructions: (args) => getFetchInstructionsDescription(args.settings?.enableMcpServerCreation), write_to_file: (args) => getWriteToFileDescription(args), search_files: (args) => getSearchFilesDescription(args), list_files: (args) => getListFilesDescription(args), @@ -61,6 +61,7 @@ export function getToolDescriptionsForMode( experiments?: Record, partialReadsEnabled?: boolean, settings?: Record, + enableMcpServerCreation?: boolean, ): string { const config = getModeConfig(mode, customModes) const args: ToolArgs = { @@ -70,7 +71,10 @@ export function getToolDescriptionsForMode( browserViewportSize, mcpHub, partialReadsEnabled, - settings, + settings: { + ...settings, + enableMcpServerCreation, + }, experiments, } From d90bab71ff985a100530ff96435e4ca799533d2a Mon Sep 17 00:00:00 2001 From: NaccOll Date: Tue, 5 Aug 2025 10:39:37 +0800 Subject: [PATCH 066/253] feat: code indexing support multiple folder similar with task history (#6204) * feat: Implement code indexing support multi-folder workspaces similar to task history * fix: add missing mock for onDidChangeActiveTextEditor in tests --- src/activate/registerCommands.ts | 2 +- .../__tests__/custom-system-prompt.spec.ts | 18 +++++ src/core/prompts/system.ts | 2 +- src/core/webview/ClineProvider.ts | 81 +++++++++++++++---- .../webview/__tests__/ClineProvider.spec.ts | 1 + .../ClineProvider.sticky-mode.spec.ts | 1 + src/core/webview/webviewMessageHandler.ts | 40 ++++++--- src/extension.ts | 30 ++++--- .../code-index/__tests__/manager.spec.ts | 3 + src/services/code-index/manager.ts | 33 +++++--- src/shared/ExtensionMessage.ts | 1 + .../src/components/chat/CodeIndexPopover.tsx | 32 +++++--- .../components/chat/IndexingStatusBadge.tsx | 8 +- 13 files changed, 189 insertions(+), 63 deletions(-) diff --git a/src/activate/registerCommands.ts b/src/activate/registerCommands.ts index bd925b0e90..2f8212ffa0 100644 --- a/src/activate/registerCommands.ts +++ b/src/activate/registerCommands.ts @@ -237,7 +237,7 @@ export const openClineInNewTab = async ({ context, outputChannel }: Omit editor.viewColumn || 0)) // Check if there are any visible text editors, otherwise open a new group diff --git a/src/core/prompts/__tests__/custom-system-prompt.spec.ts b/src/core/prompts/__tests__/custom-system-prompt.spec.ts index acf34ac459..b2ae067a3a 100644 --- a/src/core/prompts/__tests__/custom-system-prompt.spec.ts +++ b/src/core/prompts/__tests__/custom-system-prompt.spec.ts @@ -1,4 +1,22 @@ // Mocks must come first, before imports +vi.mock("vscode", () => ({ + env: { + language: "en", + }, + workspace: { + workspaceFolders: [{ uri: { fsPath: "/test/path" } }], + getWorkspaceFolder: vi.fn().mockReturnValue({ uri: { fsPath: "/test/path" } }), + }, + window: { + activeTextEditor: undefined, + }, + EventEmitter: vi.fn().mockImplementation(() => ({ + event: vi.fn(), + fire: vi.fn(), + dispose: vi.fn(), + })), +})) + vi.mock("fs/promises", () => { const mockReadFile = vi.fn() const mockMkdir = vi.fn().mockResolvedValue(undefined) diff --git a/src/core/prompts/system.ts b/src/core/prompts/system.ts index 227e79679d..4ed1185da7 100644 --- a/src/core/prompts/system.ts +++ b/src/core/prompts/system.ts @@ -85,7 +85,7 @@ async function generatePrompt( : Promise.resolve(""), ]) - const codeIndexManager = CodeIndexManager.getInstance(context) + const codeIndexManager = CodeIndexManager.getInstance(context, cwd) const basePrompt = `${roleDefinition} diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index 384de58be7..c4f146bd34 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -104,6 +104,7 @@ export class ClineProvider private view?: vscode.WebviewView | vscode.WebviewPanel private clineStack: Task[] = [] private codeIndexStatusSubscription?: vscode.Disposable + private currentWorkspaceManager?: CodeIndexManager private _workspaceTracker?: WorkspaceTracker // workSpaceTracker read-only for access outside this class public get workspaceTracker(): WorkspaceTracker | undefined { return this._workspaceTracker @@ -125,7 +126,6 @@ export class ClineProvider private readonly outputChannel: vscode.OutputChannel, private readonly renderContext: "sidebar" | "editor" = "sidebar", public readonly contextProxy: ContextProxy, - public readonly codeIndexManager?: CodeIndexManager, mdmService?: MdmService, ) { super() @@ -133,7 +133,6 @@ export class ClineProvider this.log("ClineProvider instantiated") ClineProvider.activeInstances.add(this) - this.codeIndexManager = codeIndexManager this.mdmService = mdmService this.updateGlobalState("codebaseIndexModels", EMBEDDING_MODEL_PROFILES) @@ -602,16 +601,15 @@ export class ClineProvider // and executes code based on the message that is received this.setWebviewMessageListener(webviewView.webview) - // Subscribe to code index status updates if the manager exists - if (this.codeIndexManager) { - this.codeIndexStatusSubscription = this.codeIndexManager.onProgressUpdate((update: IndexProgressUpdate) => { - this.postMessageToWebview({ - type: "indexingStatusUpdate", - values: update, - }) - }) - this.webviewDisposables.push(this.codeIndexStatusSubscription) - } + // Initialize code index status subscription for the current workspace + this.updateCodeIndexStatusSubscription() + + // Listen for active editor changes to update code index status for the current workspace + const activeEditorSubscription = vscode.window.onDidChangeActiveTextEditor(() => { + // Update subscription when workspace might have changed + this.updateCodeIndexStatusSubscription() + }) + this.webviewDisposables.push(activeEditorSubscription) // Logs show up in bottom panel > Debug Console //console.log("registering listener") @@ -647,8 +645,8 @@ export class ClineProvider } else { this.log("Clearing webview resources for sidebar view") this.clearWebviewResources() - this.codeIndexStatusSubscription?.dispose() - this.codeIndexStatusSubscription = undefined + // Reset current workspace manager reference when view is disposed + this.currentWorkspaceManager = undefined } }, null, @@ -2223,6 +2221,61 @@ export class ClineProvider ...gitInfo, } } + + /** + * Gets the CodeIndexManager for the current active workspace + * @returns CodeIndexManager instance for the current workspace or the default one + */ + public getCurrentWorkspaceCodeIndexManager(): CodeIndexManager | undefined { + return CodeIndexManager.getInstance(this.context) + } + + /** + * Updates the code index status subscription to listen to the current workspace manager + */ + private updateCodeIndexStatusSubscription(): void { + // Get the current workspace manager + const currentManager = this.getCurrentWorkspaceCodeIndexManager() + + // If the manager hasn't changed, no need to update subscription + if (currentManager === this.currentWorkspaceManager) { + return + } + + // Dispose the old subscription if it exists + if (this.codeIndexStatusSubscription) { + this.codeIndexStatusSubscription.dispose() + this.codeIndexStatusSubscription = undefined + } + + // Update the current workspace manager reference + this.currentWorkspaceManager = currentManager + + // Subscribe to the new manager's progress updates if it exists + if (currentManager) { + this.codeIndexStatusSubscription = currentManager.onProgressUpdate((update: IndexProgressUpdate) => { + // Only send updates if this manager is still the current one + if (currentManager === this.getCurrentWorkspaceCodeIndexManager()) { + // Get the full status from the manager to ensure we have all fields correctly formatted + const fullStatus = currentManager.getCurrentStatus() + this.postMessageToWebview({ + type: "indexingStatusUpdate", + values: fullStatus, + }) + } + }) + + if (this.view) { + this.webviewDisposables.push(this.codeIndexStatusSubscription) + } + + // Send initial status for the current workspace + this.postMessageToWebview({ + type: "indexingStatusUpdate", + values: currentManager.getCurrentStatus(), + }) + } + } } class OrganizationAllowListViolationError extends Error { diff --git a/src/core/webview/__tests__/ClineProvider.spec.ts b/src/core/webview/__tests__/ClineProvider.spec.ts index 66c1db55a8..eeae44451d 100644 --- a/src/core/webview/__tests__/ClineProvider.spec.ts +++ b/src/core/webview/__tests__/ClineProvider.spec.ts @@ -147,6 +147,7 @@ vi.mock("vscode", () => ({ showInformationMessage: vi.fn(), showWarningMessage: vi.fn(), showErrorMessage: vi.fn(), + onDidChangeActiveTextEditor: vi.fn(() => ({ dispose: vi.fn() })), }, workspace: { getConfiguration: vi.fn().mockReturnValue({ diff --git a/src/core/webview/__tests__/ClineProvider.sticky-mode.spec.ts b/src/core/webview/__tests__/ClineProvider.sticky-mode.spec.ts index e7eff427cf..e55e0910ab 100644 --- a/src/core/webview/__tests__/ClineProvider.sticky-mode.spec.ts +++ b/src/core/webview/__tests__/ClineProvider.sticky-mode.spec.ts @@ -27,6 +27,7 @@ vi.mock("vscode", () => ({ showInformationMessage: vi.fn(), showWarningMessage: vi.fn(), showErrorMessage: vi.fn(), + onDidChangeActiveTextEditor: vi.fn(() => ({ dispose: vi.fn() })), }, workspace: { getConfiguration: vi.fn().mockReturnValue({ diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts index 743e3b0c13..97ef0ddc3c 100644 --- a/src/core/webview/webviewMessageHandler.ts +++ b/src/core/webview/webviewMessageHandler.ts @@ -29,6 +29,7 @@ import { checkExistKey } from "../../shared/checkExistApiConfig" import { experimentDefault } from "../../shared/experiments" import { Terminal } from "../../integrations/terminal/Terminal" import { openFile } from "../../integrations/misc/open-file" +import { CodeIndexManager } from "../../services/code-index/manager" import { openImage, saveImage } from "../../integrations/misc/image-handler" import { selectImages } from "../../integrations/misc/process-images" import { getTheme } from "../../integrations/theme/getTheme" @@ -2062,13 +2063,14 @@ export const webviewMessageHandler = async ( // Update webview state await provider.postStateToWebview() - // Then handle validation and initialization - if (provider.codeIndexManager) { + // Then handle validation and initialization for the current workspace + const currentCodeIndexManager = provider.getCurrentWorkspaceCodeIndexManager() + if (currentCodeIndexManager) { // If embedder provider changed, perform proactive validation if (embedderProviderChanged) { try { // Force handleSettingsChange which will trigger validation - await provider.codeIndexManager.handleSettingsChange() + await currentCodeIndexManager.handleSettingsChange() } catch (error) { // Validation failed - the error state is already set by handleSettingsChange provider.log( @@ -2077,7 +2079,7 @@ export const webviewMessageHandler = async ( // Send validation error to webview await provider.postMessageToWebview({ type: "indexingStatusUpdate", - values: provider.codeIndexManager.getCurrentStatus(), + values: currentCodeIndexManager.getCurrentStatus(), }) // Exit early - don't try to start indexing with invalid configuration break @@ -2085,7 +2087,7 @@ export const webviewMessageHandler = async ( } else { // No provider change, just handle settings normally try { - await provider.codeIndexManager.handleSettingsChange() + await currentCodeIndexManager.handleSettingsChange() } catch (error) { // Log but don't fail - settings are saved provider.log( @@ -2098,10 +2100,10 @@ export const webviewMessageHandler = async ( await new Promise((resolve) => setTimeout(resolve, 200)) // Auto-start indexing if now enabled and configured - if (provider.codeIndexManager.isFeatureEnabled && provider.codeIndexManager.isFeatureConfigured) { - if (!provider.codeIndexManager.isInitialized) { + if (currentCodeIndexManager.isFeatureEnabled && currentCodeIndexManager.isFeatureConfigured) { + if (!currentCodeIndexManager.isInitialized) { try { - await provider.codeIndexManager.initialize(provider.contextProxy) + await currentCodeIndexManager.initialize(provider.contextProxy) provider.log(`Code index manager initialized after settings save`) } catch (error) { provider.log( @@ -2110,7 +2112,7 @@ export const webviewMessageHandler = async ( // Send error status to webview await provider.postMessageToWebview({ type: "indexingStatusUpdate", - values: provider.codeIndexManager.getCurrentStatus(), + values: currentCodeIndexManager.getCurrentStatus(), }) } } @@ -2141,7 +2143,7 @@ export const webviewMessageHandler = async ( } case "requestIndexingStatus": { - const manager = provider.codeIndexManager + const manager = provider.getCurrentWorkspaceCodeIndexManager() if (!manager) { // No workspace open - send error status provider.postMessageToWebview({ @@ -2152,11 +2154,23 @@ export const webviewMessageHandler = async ( processedItems: 0, totalItems: 0, currentItemUnit: "items", + workerspacePath: undefined, }, }) return } - const status = manager.getCurrentStatus() + + const status = manager + ? manager.getCurrentStatus() + : { + systemStatus: "Standby", + message: "No workspace folder open", + processedItems: 0, + totalItems: 0, + currentItemUnit: "items", + workspacePath: undefined, + } + provider.postMessageToWebview({ type: "indexingStatusUpdate", values: status, @@ -2187,7 +2201,7 @@ export const webviewMessageHandler = async ( } case "startIndexing": { try { - const manager = provider.codeIndexManager + const manager = provider.getCurrentWorkspaceCodeIndexManager() if (!manager) { // No workspace open - send error status provider.postMessageToWebview({ @@ -2217,7 +2231,7 @@ export const webviewMessageHandler = async ( } case "clearIndexData": { try { - const manager = provider.codeIndexManager + const manager = provider.getCurrentWorkspaceCodeIndexManager() if (!manager) { provider.log("Cannot clear index data: No workspace folder open") provider.postMessageToWebview({ diff --git a/src/extension.ts b/src/extension.ts index ea6ab4e1b4..15df88d4d9 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -93,14 +93,24 @@ export async function activate(context: vscode.ExtensionContext) { } const contextProxy = await ContextProxy.getInstance(context) - const codeIndexManager = CodeIndexManager.getInstance(context) - try { - await codeIndexManager?.initialize(contextProxy) - } catch (error) { - outputChannel.appendLine( - `[CodeIndexManager] Error during background CodeIndexManager configuration/indexing: ${error.message || error}`, - ) + // Initialize code index managers for all workspace folders + const codeIndexManagers: CodeIndexManager[] = [] + if (vscode.workspace.workspaceFolders) { + for (const folder of vscode.workspace.workspaceFolders) { + const manager = CodeIndexManager.getInstance(context, folder.uri.fsPath) + if (manager) { + codeIndexManagers.push(manager) + try { + await manager.initialize(contextProxy) + } catch (error) { + outputChannel.appendLine( + `[CodeIndexManager] Error during background CodeIndexManager configuration/indexing for ${folder.uri.fsPath}: ${error.message || error}`, + ) + } + context.subscriptions.push(manager) + } + } } // Initialize Roo Code Cloud service. @@ -126,13 +136,9 @@ export async function activate(context: vscode.ExtensionContext) { // Add to subscriptions for proper cleanup on deactivate. context.subscriptions.push(cloudService) - const provider = new ClineProvider(context, outputChannel, "sidebar", contextProxy, codeIndexManager, mdmService) + const provider = new ClineProvider(context, outputChannel, "sidebar", contextProxy, mdmService) TelemetryService.instance.setProvider(provider) - if (codeIndexManager) { - context.subscriptions.push(codeIndexManager) - } - context.subscriptions.push( vscode.window.registerWebviewViewProvider(ClineProvider.sideBarId, provider, { webviewOptions: { retainContextWhenHidden: true }, diff --git a/src/services/code-index/__tests__/manager.spec.ts b/src/services/code-index/__tests__/manager.spec.ts index 8c64c2fdc6..3995825f70 100644 --- a/src/services/code-index/__tests__/manager.spec.ts +++ b/src/services/code-index/__tests__/manager.spec.ts @@ -4,6 +4,9 @@ import type { MockedClass } from "vitest" // Mock vscode module vi.mock("vscode", () => ({ + window: { + activeTextEditor: null, + }, workspace: { workspaceFolders: [ { diff --git a/src/services/code-index/manager.ts b/src/services/code-index/manager.ts index 18e0752c34..027734d213 100644 --- a/src/services/code-index/manager.ts +++ b/src/services/code-index/manager.ts @@ -28,17 +28,24 @@ export class CodeIndexManager { private _searchService: CodeIndexSearchService | undefined private _cacheManager: CacheManager | undefined - public static getInstance(context: vscode.ExtensionContext): CodeIndexManager | undefined { - // Use first workspace folder consistently - const workspaceFolders = vscode.workspace.workspaceFolders - if (!workspaceFolders || workspaceFolders.length === 0) { - return undefined - } + public static getInstance(context: vscode.ExtensionContext, workspacePath?: string): CodeIndexManager | undefined { + // If workspacePath is not provided, try to get it from the active editor or first workspace folder + if (!workspacePath) { + const activeEditor = vscode.window.activeTextEditor + if (activeEditor) { + const workspaceFolder = vscode.workspace.getWorkspaceFolder(activeEditor.document.uri) + workspacePath = workspaceFolder?.uri.fsPath + } - // Always use the first workspace folder for consistency across all indexing operations. - // This ensures that the same workspace context is used throughout the indexing pipeline, - // preventing path resolution errors in multi-workspace scenarios. - const workspacePath = workspaceFolders[0].uri.fsPath + if (!workspacePath) { + const workspaceFolders = vscode.workspace.workspaceFolders + if (!workspaceFolders || workspaceFolders.length === 0) { + return undefined + } + // Use the first workspace folder as fallback + workspacePath = workspaceFolders[0].uri.fsPath + } + } if (!CodeIndexManager.instances.has(workspacePath)) { CodeIndexManager.instances.set(workspacePath, new CodeIndexManager(workspacePath, context)) @@ -205,7 +212,11 @@ export class CodeIndexManager { // --- Private Helpers --- public getCurrentStatus() { - return this._stateManager.getCurrentStatus() + const status = this._stateManager.getCurrentStatus() + return { + ...status, + workspacePath: this.workspacePath, + } } public async searchIndex(query: string, directoryPrefix?: string): Promise { diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts index 2313d7d177..f9ac305e07 100644 --- a/src/shared/ExtensionMessage.ts +++ b/src/shared/ExtensionMessage.ts @@ -41,6 +41,7 @@ export interface IndexingStatus { processedItems: number totalItems: number currentItemUnit?: string + workspacePath?: string } export interface IndexingStatusUpdateMessage { diff --git a/webview-ui/src/components/chat/CodeIndexPopover.tsx b/webview-ui/src/components/chat/CodeIndexPopover.tsx index c85aaf6ea5..4a90a60f3d 100644 --- a/webview-ui/src/components/chat/CodeIndexPopover.tsx +++ b/webview-ui/src/components/chat/CodeIndexPopover.tsx @@ -147,7 +147,7 @@ export const CodeIndexPopover: React.FC = ({ }) => { const SECRET_PLACEHOLDER = "••••••••••••••••" const { t } = useAppTranslation() - const { codebaseIndexConfig, codebaseIndexModels } = useExtensionState() + const { codebaseIndexConfig, codebaseIndexModels, cwd } = useExtensionState() const [open, setOpen] = useState(false) const [isAdvancedSettingsOpen, setIsAdvancedSettingsOpen] = useState(false) const [isSetupSettingsOpen, setIsSetupSettingsOpen] = useState(false) @@ -229,6 +229,18 @@ export const CodeIndexPopover: React.FC = ({ vscode.postMessage({ type: "requestIndexingStatus" }) vscode.postMessage({ type: "requestCodeIndexSecretStatus" }) } + const handleMessage = (event: MessageEvent) => { + if (event.data.type === "workspaceUpdated") { + // When workspace changes, request updated indexing status + if (open) { + vscode.postMessage({ type: "requestIndexingStatus" }) + vscode.postMessage({ type: "requestCodeIndexSecretStatus" }) + } + } + } + + window.addEventListener("message", handleMessage) + return () => window.removeEventListener("message", handleMessage) }, [open]) // Use a ref to capture current settings for the save handler @@ -239,13 +251,15 @@ export const CodeIndexPopover: React.FC = ({ useEffect(() => { const handleMessage = (event: MessageEvent) => { if (event.data.type === "indexingStatusUpdate") { - setIndexingStatus({ - systemStatus: event.data.values.systemStatus, - message: event.data.values.message || "", - processedItems: event.data.values.processedItems, - totalItems: event.data.values.totalItems, - currentItemUnit: event.data.values.currentItemUnit || "items", - }) + if (!event.data.values.workspacePath || event.data.values.workspacePath === cwd) { + setIndexingStatus({ + systemStatus: event.data.values.systemStatus, + message: event.data.values.message || "", + processedItems: event.data.values.processedItems, + totalItems: event.data.values.totalItems, + currentItemUnit: event.data.values.currentItemUnit || "items", + }) + } } else if (event.data.type === "codeIndexSettingsSaved") { if (event.data.success) { setSaveStatus("saved") @@ -273,7 +287,7 @@ export const CodeIndexPopover: React.FC = ({ window.addEventListener("message", handleMessage) return () => window.removeEventListener("message", handleMessage) - }, [t]) + }, [t, cwd]) // Listen for secret status useEffect(() => { diff --git a/webview-ui/src/components/chat/IndexingStatusBadge.tsx b/webview-ui/src/components/chat/IndexingStatusBadge.tsx index ff5a0171b5..2462780b1d 100644 --- a/webview-ui/src/components/chat/IndexingStatusBadge.tsx +++ b/webview-ui/src/components/chat/IndexingStatusBadge.tsx @@ -4,6 +4,7 @@ import { cn } from "@src/lib/utils" import { vscode } from "@src/utils/vscode" import { useAppTranslation } from "@/i18n/TranslationContext" import { useTooltip } from "@/hooks/useTooltip" +import { useExtensionState } from "@src/context/ExtensionStateContext" import { CodeIndexPopover } from "./CodeIndexPopover" import type { IndexingStatus, IndexingStatusUpdateMessage } from "@roo/ExtensionMessage" @@ -13,6 +14,7 @@ interface IndexingStatusBadgeProps { export const IndexingStatusBadge: React.FC = ({ className }) => { const { t } = useAppTranslation() + const { cwd } = useExtensionState() const { showTooltip, handleMouseEnter, handleMouseLeave, cleanup } = useTooltip({ delay: 300 }) const [isHovered, setIsHovered] = useState(false) @@ -31,7 +33,9 @@ export const IndexingStatusBadge: React.FC = ({ classN const handleMessage = (event: MessageEvent) => { if (event.data.type === "indexingStatusUpdate") { const status = event.data.values - setIndexingStatus(status) + if (!status.workspacePath || status.workspacePath === cwd) { + setIndexingStatus(status) + } } } @@ -41,7 +45,7 @@ export const IndexingStatusBadge: React.FC = ({ classN window.removeEventListener("message", handleMessage) cleanup() } - }, [cleanup]) + }, [cleanup, cwd]) // Calculate progress percentage with memoization const progressPercentage = useMemo( From ea79dfeb6642c7929d691cb1b901baa73a20bad7 Mon Sep 17 00:00:00 2001 From: Bruno Bergher Date: Tue, 5 Aug 2025 14:26:25 +0100 Subject: [PATCH 067/253] Redesigned Task Header (#6561) * Reorganizes the task header for cleanliness and in preparation for Cloud link * More task ehader visual tweaks * Translations for new task header * Fixes TaskHeader color * Removes stray string * Fixes tests * Iterates on visual details * More visual tweaks * Missing localization call * Fixes tests --------- Co-authored-by: Bruno Bergher --- .../__tests__/ContextWindowProgress.spec.tsx | 18 +- webview-ui/src/components/chat/ChatView.tsx | 3 - .../components/chat/ContextWindowProgress.tsx | 2 +- .../src/components/chat/ShareButton.tsx | 33 +- .../src/components/chat/TaskActions.tsx | 6 +- webview-ui/src/components/chat/TaskHeader.tsx | 313 +++++++++++------- .../chat/__tests__/TaskActions.spec.tsx | 104 +++--- .../chat/__tests__/TaskHeader.spec.tsx | 19 +- .../src/components/common/Thumbnails.tsx | 1 + webview-ui/src/i18n/locales/ca/chat.json | 9 +- webview-ui/src/i18n/locales/de/chat.json | 9 +- webview-ui/src/i18n/locales/en/chat.json | 9 +- webview-ui/src/i18n/locales/es/chat.json | 9 +- webview-ui/src/i18n/locales/fr/chat.json | 9 +- webview-ui/src/i18n/locales/hi/chat.json | 9 +- webview-ui/src/i18n/locales/id/chat.json | 9 +- webview-ui/src/i18n/locales/it/chat.json | 9 +- webview-ui/src/i18n/locales/ja/chat.json | 9 +- webview-ui/src/i18n/locales/ko/chat.json | 9 +- webview-ui/src/i18n/locales/nl/chat.json | 9 +- webview-ui/src/i18n/locales/pl/chat.json | 9 +- webview-ui/src/i18n/locales/pt-BR/chat.json | 9 +- webview-ui/src/i18n/locales/ru/chat.json | 9 +- webview-ui/src/i18n/locales/tr/chat.json | 9 +- webview-ui/src/i18n/locales/vi/chat.json | 9 +- webview-ui/src/i18n/locales/zh-CN/chat.json | 9 +- webview-ui/src/i18n/locales/zh-TW/chat.json | 5 +- 27 files changed, 384 insertions(+), 273 deletions(-) diff --git a/webview-ui/src/__tests__/ContextWindowProgress.spec.tsx b/webview-ui/src/__tests__/ContextWindowProgress.spec.tsx index 0e5d0d6193..3c30e15bc6 100644 --- a/webview-ui/src/__tests__/ContextWindowProgress.spec.tsx +++ b/webview-ui/src/__tests__/ContextWindowProgress.spec.tsx @@ -1,6 +1,6 @@ // npm run test ContextWindowProgress.spec.tsx -import { render, screen } from "@/utils/test-utils" +import { render, screen, fireEvent } from "@/utils/test-utils" import { QueryClient, QueryClientProvider } from "@tanstack/react-query" import TaskHeader from "@src/components/chat/TaskHeader" @@ -70,6 +70,10 @@ describe("ContextWindowProgress", () => { it("renders correctly with valid inputs", () => { renderComponent({ contextTokens: 1000, contextWindow: 4000 }) + // First expand the TaskHeader to access ContextWindowProgress + const taskHeader = screen.getByText("Test task") + fireEvent.click(taskHeader) + // Check for basic elements // The context-window-label is not part of the ContextWindowProgress component // but rather part of the parent TaskHeader component in expanded state @@ -83,6 +87,10 @@ describe("ContextWindowProgress", () => { it("handles zero context window gracefully", () => { renderComponent({ contextTokens: 0, contextWindow: 0 }) + // First expand the TaskHeader to access ContextWindowProgress + const taskHeader = screen.getByText("Test task") + fireEvent.click(taskHeader) + // In the current implementation, the component is still displayed with zero values // rather than being hidden completely // The context-window-label is not part of the ContextWindowProgress component @@ -93,6 +101,10 @@ describe("ContextWindowProgress", () => { it("handles edge cases with negative values", () => { renderComponent({ contextTokens: -100, contextWindow: 4000 }) + // First expand the TaskHeader to access ContextWindowProgress + const taskHeader = screen.getByText("Test task") + fireEvent.click(taskHeader) + // Should show 0 instead of -100 expect(screen.getByTestId("context-tokens-count")).toHaveTextContent("0") // The actual context window might be different than what we pass in @@ -102,6 +114,10 @@ describe("ContextWindowProgress", () => { it("calculates percentages correctly", () => { renderComponent({ contextTokens: 1000, contextWindow: 4000 }) + // First expand the TaskHeader to access ContextWindowProgress + const taskHeader = screen.getByText("Test task") + fireEvent.click(taskHeader) + // Verify that the token count and window size are displayed correctly const tokenCount = screen.getByTestId("context-tokens-count") const windowSize = screen.getByTestId("context-window-size") diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx index 1fe93eb470..2aa71b9a01 100644 --- a/webview-ui/src/components/chat/ChatView.tsx +++ b/webview-ui/src/components/chat/ChatView.tsx @@ -805,8 +805,6 @@ const ChatViewComponent: React.ForwardRefRenderFunction startNewTask(), [startNewTask]) - const { info: model } = useSelectedModel(apiConfiguration) const selectImages = useCallback(() => vscode.postMessage({ type: "selectImages" }), []) @@ -1765,7 +1763,6 @@ const ChatViewComponent: React.ForwardRefRenderFunction diff --git a/webview-ui/src/components/chat/ContextWindowProgress.tsx b/webview-ui/src/components/chat/ContextWindowProgress.tsx index 1ae80bb3db..6ddc23882a 100644 --- a/webview-ui/src/components/chat/ContextWindowProgress.tsx +++ b/webview-ui/src/components/chat/ContextWindowProgress.tsx @@ -55,7 +55,7 @@ export const ContextWindowProgress = ({ contextWindow, contextTokens, maxTokens return ( <> -
    +
    {formatLargeNumber(safeContextTokens)}
    diff --git a/webview-ui/src/components/chat/ShareButton.tsx b/webview-ui/src/components/chat/ShareButton.tsx index 48bb32ccff..04cb1e2b38 100644 --- a/webview-ui/src/components/chat/ShareButton.tsx +++ b/webview-ui/src/components/chat/ShareButton.tsx @@ -1,5 +1,6 @@ import { useState, useEffect, useRef } from "react" import { useTranslation } from "react-i18next" +import { SquareArrowOutUpRightIcon } from "lucide-react" import type { HistoryItem, ShareVisibility } from "@roo-code/types" import { TelemetryEventName } from "@roo-code/types" @@ -26,9 +27,10 @@ import { interface ShareButtonProps { item?: HistoryItem disabled?: boolean + showLabel?: boolean } -export const ShareButton = ({ item, disabled = false }: ShareButtonProps) => { +export const ShareButton = ({ item, disabled = false, showLabel = false }: ShareButtonProps) => { const [shareDropdownOpen, setShareDropdownOpen] = useState(false) const [connectModalOpen, setConnectModalOpen] = useState(false) const [shareSuccess, setShareSuccess] = useState<{ visibility: ShareVisibility; url: string } | null>(null) @@ -155,14 +157,21 @@ export const ShareButton = ({ item, disabled = false }: ShareButtonProps) => { + {shareSuccess ? (
    @@ -217,11 +226,17 @@ export const ShareButton = ({ item, disabled = false }: ShareButtonProps) => { )} diff --git a/webview-ui/src/components/chat/TaskActions.tsx b/webview-ui/src/components/chat/TaskActions.tsx index 603b6be3e0..1b192219ad 100644 --- a/webview-ui/src/components/chat/TaskActions.tsx +++ b/webview-ui/src/components/chat/TaskActions.tsx @@ -1,5 +1,4 @@ import { useState } from "react" -import prettyBytes from "pretty-bytes" import { useTranslation } from "react-i18next" import type { HistoryItem } from "@roo-code/types" @@ -22,8 +21,7 @@ export const TaskActions = ({ item, buttonsDisabled }: TaskActionsProps) => { const { copyWithFeedback, showCopyFeedback } = useCopyToClipboard() return ( -
    - +
    { } }} /> - {prettyBytes(item.size)}
    {deleteTaskId && ( { )} )} +
    ) } diff --git a/webview-ui/src/components/chat/TaskHeader.tsx b/webview-ui/src/components/chat/TaskHeader.tsx index 1896df486b..41826bc048 100644 --- a/webview-ui/src/components/chat/TaskHeader.tsx +++ b/webview-ui/src/components/chat/TaskHeader.tsx @@ -1,8 +1,7 @@ import { memo, useRef, useState } from "react" -import { useWindowSize } from "react-use" import { useTranslation } from "react-i18next" -import { VSCodeBadge } from "@vscode/webview-ui-toolkit/react" -import { CloudUpload, CloudDownload, FoldVertical } from "lucide-react" +import { FoldVertical, ChevronUp, ChevronDown } from "lucide-react" +import prettyBytes from "pretty-bytes" import type { ClineMessage } from "@roo-code/types" @@ -10,14 +9,13 @@ import { getModelMaxOutputTokens } from "@roo/api" import { formatLargeNumber } from "@src/utils/format" import { cn } from "@src/lib/utils" -import { Button, StandardTooltip } from "@src/components/ui" +import { StandardTooltip } from "@src/components/ui" import { useExtensionState } from "@src/context/ExtensionStateContext" import { useSelectedModel } from "@/components/ui/hooks/useSelectedModel" import Thumbnails from "../common/Thumbnails" import { TaskActions } from "./TaskActions" -import { ShareButton } from "./ShareButton" import { ContextWindowProgress } from "./ContextWindowProgress" import { Mention } from "./Mention" import { TodoListDisplay } from "./TodoListDisplay" @@ -32,7 +30,6 @@ export interface TaskHeaderProps { contextTokens: number buttonsDisabled: boolean handleCondenseContext: (taskId: string) => void - onClose: () => void todos?: any[] } @@ -46,7 +43,6 @@ const TaskHeader = ({ contextTokens, buttonsDisabled, handleCondenseContext, - onClose, todos, }: TaskHeaderProps) => { const { t } = useTranslation() @@ -58,8 +54,6 @@ const TaskHeader = ({ const textRef = useRef(null) const contextWindow = model?.contextWindow || 1 - const { width: windowWidth } = useWindowSize() - const condenseButton = ( + +
    - - -
    - {/* Collapsed state: Track context and cost if we have any */} {!isTaskExpanded && contextWindow > 0 && ( -
    - e.stopPropagation()}> + +
    + {t("chat:tokenProgress.tokensUsed", { + used: formatLargeNumber(contextTokens || 0), + total: formatLargeNumber(contextWindow), + })} +
    + {(() => { + const maxTokens = model + ? getModelMaxOutputTokens({ modelId, model, settings: apiConfiguration }) + : 0 + const reservedForOutput = maxTokens || 0 + const availableSpace = contextWindow - (contextTokens || 0) - reservedForOutput + + return ( + <> + {reservedForOutput > 0 && ( +
    + {t("chat:tokenProgress.reservedForResponse", { + amount: formatLargeNumber(reservedForOutput), + })} +
    + )} + {availableSpace > 0 && ( +
    + {t("chat:tokenProgress.availableSpace", { + amount: formatLargeNumber(availableSpace), + })} +
    + )} + + ) + })()} +
    } - /> - {condenseButton} - - {!!totalCost && ${totalCost.toFixed(2)}} + side="top" + sideOffset={8}> + + {formatLargeNumber(contextTokens || 0)} / {formatLargeNumber(contextWindow)} + + + {!!totalCost && ${totalCost.toFixed(2)}}
    )} {/* Expanded state: Show task text and images */} @@ -130,10 +173,10 @@ const TaskHeader = ({ <>
    + className="text-vscode-font-size overflow-y-auto break-words break-anywhere relative">
    {task.images && task.images.length > 0 && } -
    - {isTaskExpanded && contextWindow > 0 && ( -
    -
    - - {t("chat:task.contextWindow")} - -
    - - {condenseButton} -
    - )} -
    -
    - {t("chat:task.tokens")} - {typeof tokensIn === "number" && tokensIn > 0 && ( - - - {formatLargeNumber(tokensIn)} - +
    + + + {contextWindow > 0 && ( + + + + )} - {typeof tokensOut === "number" && tokensOut > 0 && ( - - - {formatLargeNumber(tokensOut)} - - )} - - {!totalCost && } - - {((typeof cacheReads === "number" && cacheReads > 0) || - (typeof cacheWrites === "number" && cacheWrites > 0)) && ( -
    - {t("chat:task.cache")} - {typeof cacheWrites === "number" && cacheWrites > 0 && ( - - - {formatLargeNumber(cacheWrites)} - - )} - {typeof cacheReads === "number" && cacheReads > 0 && ( - - - {formatLargeNumber(cacheReads)} - - )} -
    - )} +     + + + - {!!totalCost && ( -
    -
    - {t("chat:task.apiCost")} - ${totalCost?.toFixed(2)} -
    - -
    - )} + {((typeof cacheReads === "number" && cacheReads > 0) || + (typeof cacheWrites === "number" && cacheWrites > 0)) && ( +     + + + + )} + + {!!totalCost && ( + + + + + )} + + {/* Cache size display */} + {((typeof cacheReads === "number" && cacheReads > 0) || + (typeof cacheWrites === "number" && cacheWrites > 0)) && ( + + + + + )} + + {/* Size display */} + {!!currentTaskItem?.size && currentTaskItem.size > 0 && ( + + + + + )} + +
    + {t("chat:task.contextWindow")} + +
    + + {condenseButton} +
    +
    + {t("chat:task.tokens")} + +
    + {typeof tokensIn === "number" && tokensIn > 0 && ( + ↑ {formatLargeNumber(tokensIn)} + )} + {typeof tokensOut === "number" && tokensOut > 0 && ( + ↓ {formatLargeNumber(tokensOut)} + )} +
    +
    + {t("chat:task.cache")} + +
    + {typeof cacheWrites === "number" && cacheWrites > 0 && ( + ↑ {formatLargeNumber(cacheWrites)} + )} + {typeof cacheReads === "number" && cacheReads > 0 && ( + ↓ {formatLargeNumber(cacheReads)} + )} +
    +
    + {t("chat:task.apiCost")} + + ${totalCost?.toFixed(2)} +
    + {t("chat:task.cache")} + + {prettyBytes(((cacheReads || 0) + (cacheWrites || 0)) * 4)} +
    + {t("chat:task.size")} + {prettyBytes(currentTaskItem.size)}
    +
    + + {/* Footer with task management buttons */} +
    e.stopPropagation()}> +
    )} diff --git a/webview-ui/src/components/chat/__tests__/TaskActions.spec.tsx b/webview-ui/src/components/chat/__tests__/TaskActions.spec.tsx index 68c564f823..4c1138944d 100644 --- a/webview-ui/src/components/chat/__tests__/TaskActions.spec.tsx +++ b/webview-ui/src/components/chat/__tests__/TaskActions.spec.tsx @@ -89,19 +89,17 @@ describe("TaskActions", () => { it("renders share button when item has id", () => { render() - // Find button by its icon class - const buttons = screen.getAllByRole("button") - const shareButton = buttons.find((btn) => btn.querySelector(".codicon-link")) + // ShareButton now uses data-testid for reliable testing + const shareButton = screen.getByTestId("share-button") expect(shareButton).toBeInTheDocument() }) it("does not render share button when item has no id", () => { render() - // Find button by its icon class - const buttons = screen.queryAllByRole("button") - const shareButton = buttons.find((btn) => btn.querySelector(".codicon-link")) - expect(shareButton).not.toBeDefined() + // ShareButton returns null when no item ID + const shareButton = screen.queryByTestId("share-button") + expect(shareButton).toBeNull() }) it("renders share button even when not authenticated", () => { @@ -112,9 +110,8 @@ describe("TaskActions", () => { render() - // Find button by its icon class - const buttons = screen.getAllByRole("button") - const shareButton = buttons.find((btn) => btn.querySelector(".codicon-link")) + // ShareButton should still render when not authenticated + const shareButton = screen.getByTestId("share-button") expect(shareButton).toBeInTheDocument() }) }) @@ -123,11 +120,9 @@ describe("TaskActions", () => { it("shows organization and public share options when authenticated and sharing enabled", () => { render() - // Find button by its icon class - const buttons = screen.getAllByRole("button") - const shareButton = buttons.find((btn) => btn.querySelector(".codicon-link")) - expect(shareButton).toBeDefined() - fireEvent.click(shareButton!) + // Find share button by its test ID and click it + const shareButton = screen.getByTestId("share-button") + fireEvent.click(shareButton) expect(screen.getByText("Share with Organization")).toBeInTheDocument() expect(screen.getByText("Share Publicly")).toBeInTheDocument() @@ -136,11 +131,9 @@ describe("TaskActions", () => { it("sends shareCurrentTask message when organization option is selected", () => { render() - // Find button by its icon class - const buttons = screen.getAllByRole("button") - const shareButton = buttons.find((btn) => btn.querySelector(".codicon-link")) - expect(shareButton).toBeDefined() - fireEvent.click(shareButton!) + // Find share button by its test ID and click it + const shareButton = screen.getByTestId("share-button") + fireEvent.click(shareButton) const orgOption = screen.getByText("Share with Organization") fireEvent.click(orgOption) @@ -154,11 +147,9 @@ describe("TaskActions", () => { it("sends shareCurrentTask message when public option is selected", () => { render() - // Find button by its icon class - const buttons = screen.getAllByRole("button") - const shareButton = buttons.find((btn) => btn.querySelector(".codicon-link")) - expect(shareButton).toBeDefined() - fireEvent.click(shareButton!) + // Find share button by its test ID and click it + const shareButton = screen.getByTestId("share-button") + fireEvent.click(shareButton) const publicOption = screen.getByText("Share Publicly") fireEvent.click(publicOption) @@ -180,11 +171,9 @@ describe("TaskActions", () => { render() - // Find button by its icon class - const buttons = screen.getAllByRole("button") - const shareButton = buttons.find((btn) => btn.querySelector(".codicon-link")) - expect(shareButton).toBeDefined() - fireEvent.click(shareButton!) + // Find share button by its test ID and click it + const shareButton = screen.getByTestId("share-button") + fireEvent.click(shareButton) expect(screen.queryByText("Share with Organization")).not.toBeInTheDocument() expect(screen.getByText("Share Publicly")).toBeInTheDocument() @@ -202,11 +191,9 @@ describe("TaskActions", () => { it("shows connect to cloud option when not authenticated", () => { render() - // Find button by its icon class - const buttons = screen.getAllByRole("button") - const shareButton = buttons.find((btn) => btn.querySelector(".codicon-link")) - expect(shareButton).toBeDefined() - fireEvent.click(shareButton!) + // Find share button by its test ID and click it + const shareButton = screen.getByTestId("share-button") + fireEvent.click(shareButton) expect(screen.getByText("Connect to Roo Code Cloud")).toBeInTheDocument() expect(screen.getByText("Sign in to Roo Code Cloud to share tasks")).toBeInTheDocument() @@ -216,11 +203,9 @@ describe("TaskActions", () => { it("does not show organization and public options when not authenticated", () => { render() - // Find button by its icon class - const buttons = screen.getAllByRole("button") - const shareButton = buttons.find((btn) => btn.querySelector(".codicon-link")) - expect(shareButton).toBeDefined() - fireEvent.click(shareButton!) + // Find share button by its test ID and click it + const shareButton = screen.getByTestId("share-button") + fireEvent.click(shareButton) expect(screen.queryByText("Share with Organization")).not.toBeInTheDocument() expect(screen.queryByText("Share Publicly")).not.toBeInTheDocument() @@ -229,11 +214,9 @@ describe("TaskActions", () => { it("sends rooCloudSignIn message when connect to cloud is selected", () => { render() - // Find button by its icon class - const buttons = screen.getAllByRole("button") - const shareButton = buttons.find((btn) => btn.querySelector(".codicon-link")) - expect(shareButton).toBeDefined() - fireEvent.click(shareButton!) + // Find share button by its test ID and click it + const shareButton = screen.getByTestId("share-button") + fireEvent.click(shareButton) const connectOption = screen.getByText("Connect") fireEvent.click(connectOption) @@ -253,9 +236,8 @@ describe("TaskActions", () => { render() - // Find button by its icon class - const buttons = screen.getAllByRole("button") - const shareButton = buttons.find((btn) => btn.querySelector(".codicon-link")) + // Find share button by its test ID + const shareButton = screen.getByTestId("share-button") expect(shareButton).toBeInTheDocument() expect(shareButton).toBeDisabled() @@ -303,10 +285,8 @@ describe("TaskActions", () => { const { rerender } = render() // Click share button to open connect modal - const buttons = screen.getAllByRole("button") - const shareButton = buttons.find((btn) => btn.querySelector(".codicon-link")) - expect(shareButton).toBeDefined() - fireEvent.click(shareButton!) + const shareButton = screen.getByTestId("share-button") + fireEvent.click(shareButton) // Click connect button to initiate authentication const connectButton = screen.getByText("Connect") @@ -353,12 +333,11 @@ describe("TaskActions", () => { }) }) - it("renders delete button and file size when item has size", () => { + it("renders delete button when item has size", () => { render() const deleteButton = screen.getByLabelText("Delete Task (Shift + Click to skip confirmation)") expect(deleteButton).toBeInTheDocument() - expect(screen.getByText("1024 B")).toBeInTheDocument() }) it("does not render delete button when item has no size", () => { @@ -374,11 +353,10 @@ describe("TaskActions", () => { it("keeps share, export, and copy buttons enabled but disables delete button when buttonsDisabled is true", () => { render() - // Find buttons by their labels/icons - const buttons = screen.getAllByRole("button") - const shareButton = buttons.find((btn) => btn.querySelector(".codicon-link")) + // Find buttons by their labels/test IDs + const shareButton = screen.getByTestId("share-button") const exportButton = screen.getByLabelText("Export task history") - const copyButton = buttons.find((btn) => btn.querySelector(".codicon-copy")) + const copyButton = screen.getByLabelText("history:copyPrompt") const deleteButton = screen.getByLabelText("Delete Task (Shift + Click to skip confirmation)") // Share, export, and copy buttons should be enabled regardless of buttonsDisabled @@ -393,10 +371,9 @@ describe("TaskActions", () => { // Test with buttonsDisabled = false const { rerender } = render() - let buttons = screen.getAllByRole("button") - let shareButton = buttons.find((btn) => btn.querySelector(".codicon-link")) + let shareButton = screen.getByTestId("share-button") let exportButton = screen.getByLabelText("Export task history") - let copyButton = buttons.find((btn) => btn.querySelector(".codicon-copy")) + let copyButton = screen.getByLabelText("history:copyPrompt") let deleteButton = screen.getByLabelText("Delete Task (Shift + Click to skip confirmation)") expect(shareButton).not.toBeDisabled() @@ -407,10 +384,9 @@ describe("TaskActions", () => { // Test with buttonsDisabled = true rerender() - buttons = screen.getAllByRole("button") - shareButton = buttons.find((btn) => btn.querySelector(".codicon-link")) + shareButton = screen.getByTestId("share-button") exportButton = screen.getByLabelText("Export task history") - copyButton = buttons.find((btn) => btn.querySelector(".codicon-copy")) + copyButton = screen.getByLabelText("history:copyPrompt") deleteButton = screen.getByLabelText("Delete Task (Shift + Click to skip confirmation)") // Share, export, and copy remain enabled diff --git a/webview-ui/src/components/chat/__tests__/TaskHeader.spec.tsx b/webview-ui/src/components/chat/__tests__/TaskHeader.spec.tsx index c04f7e45e5..d89305348e 100644 --- a/webview-ui/src/components/chat/__tests__/TaskHeader.spec.tsx +++ b/webview-ui/src/components/chat/__tests__/TaskHeader.spec.tsx @@ -53,7 +53,6 @@ describe("TaskHeader", () => { contextTokens: 200, buttonsDisabled: false, handleCondenseContext: vi.fn(), - onClose: vi.fn(), } const queryClient = new QueryClient() @@ -91,9 +90,13 @@ describe("TaskHeader", () => { expect(screen.queryByText(/\$/)).not.toBeInTheDocument() }) - it("should render the condense context button", () => { + it("should render the condense context button when expanded", () => { renderTaskHeader() - // Find the button that contains the FoldVertical icon + // First click to expand the task header + const taskHeader = screen.getByText("Test task") + fireEvent.click(taskHeader) + + // Now find the condense button in the expanded state const buttons = screen.getAllByRole("button") const condenseButton = buttons.find((button) => button.querySelector("svg.lucide-fold-vertical")) expect(condenseButton).toBeDefined() @@ -103,6 +106,11 @@ describe("TaskHeader", () => { it("should call handleCondenseContext when condense context button is clicked", () => { const handleCondenseContext = vi.fn() renderTaskHeader({ handleCondenseContext }) + + // First click to expand the task header + const taskHeader = screen.getByText("Test task") + fireEvent.click(taskHeader) + // Find the button that contains the FoldVertical icon const buttons = screen.getAllByRole("button") const condenseButton = buttons.find((button) => button.querySelector("svg.lucide-fold-vertical")) @@ -114,6 +122,11 @@ describe("TaskHeader", () => { it("should disable the condense context button when buttonsDisabled is true", () => { const handleCondenseContext = vi.fn() renderTaskHeader({ buttonsDisabled: true, handleCondenseContext }) + + // First click to expand the task header + const taskHeader = screen.getByText("Test task") + fireEvent.click(taskHeader) + // Find the button that contains the FoldVertical icon const buttons = screen.getAllByRole("button") const condenseButton = buttons.find((button) => button.querySelector("svg.lucide-fold-vertical")) diff --git a/webview-ui/src/components/common/Thumbnails.tsx b/webview-ui/src/components/common/Thumbnails.tsx index acdf5f4295..d0db36d561 100644 --- a/webview-ui/src/components/common/Thumbnails.tsx +++ b/webview-ui/src/components/common/Thumbnails.tsx @@ -39,6 +39,7 @@ const Thumbnails = ({ images, style, setImages, onHeightChange }: ThumbnailsProp return (
    Date: Tue, 5 Aug 2025 10:45:45 -0700 Subject: [PATCH 068/253] Revert "Extension bridge (#6677)" (#6729) --- pnpm-lock.yaml | 28 ++--- src/core/task/Task.ts | 29 +---- src/core/webview/ClineProvider.ts | 115 +----------------- src/core/webview/webviewMessageHandler.ts | 5 - src/extension.ts | 64 +++++----- src/package.json | 2 +- src/shared/ExtensionMessage.ts | 1 - src/shared/WebviewMessage.ts | 1 - src/utils/remoteControl.ts | 11 -- .../src/components/account/AccountView.tsx | 73 +++-------- .../account/__tests__/AccountView.spec.tsx | 87 ++----------- .../src/context/ExtensionStateContext.tsx | 5 - webview-ui/src/i18n/locales/ca/account.json | 3 - webview-ui/src/i18n/locales/de/account.json | 3 - webview-ui/src/i18n/locales/en/account.json | 14 +-- webview-ui/src/i18n/locales/es/account.json | 3 - webview-ui/src/i18n/locales/fr/account.json | 3 - webview-ui/src/i18n/locales/hi/account.json | 3 - webview-ui/src/i18n/locales/id/account.json | 3 - webview-ui/src/i18n/locales/it/account.json | 3 - webview-ui/src/i18n/locales/ja/account.json | 3 - webview-ui/src/i18n/locales/ko/account.json | 3 - webview-ui/src/i18n/locales/nl/account.json | 3 - webview-ui/src/i18n/locales/pl/account.json | 3 - .../src/i18n/locales/pt-BR/account.json | 3 - webview-ui/src/i18n/locales/ru/account.json | 3 - webview-ui/src/i18n/locales/tr/account.json | 3 - webview-ui/src/i18n/locales/vi/account.json | 3 - .../src/i18n/locales/zh-CN/account.json | 3 - .../src/i18n/locales/zh-TW/account.json | 3 - 30 files changed, 85 insertions(+), 401 deletions(-) delete mode 100644 src/utils/remoteControl.ts diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0d952b6aeb..b2847df1a1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -563,8 +563,8 @@ importers: specifier: ^1.14.0 version: 1.14.0(typescript@5.8.3) '@roo-code/cloud': - specifier: ^0.5.0 - version: 0.5.0 + specifier: ^0.4.0 + version: 0.4.0 '@roo-code/ipc': specifier: workspace:^ version: link:../packages/ipc @@ -3065,11 +3065,11 @@ packages: cpu: [x64] os: [win32] - '@roo-code/cloud@0.5.0': - resolution: {integrity: sha512-4u6Ce2Rmr5a9nxhjGUMRRWUWhZc63EmF/UJ/+Az5/1JARMOp0kHN5Pwqz2QAgfD137+TFSBKQORpiN0GXrdt2w==} + '@roo-code/cloud@0.4.0': + resolution: {integrity: sha512-1a27RG2YjQFfsU5UlfbQnpj/K/6gYBcysp2FXaX9+VaaTh5ZzReQeHJ9uREnyE059zoFpVuNywwNxGadzyotWw==} - '@roo-code/types@1.44.0': - resolution: {integrity: sha512-3xbW4pYaCgWuHF5qOsiXpIcd281dlFTe1zboUGgcUUsB414Hu3pQI86PdgJxVGtZgxtaca0eHTQ2Sqjqq8nPlA==} + '@roo-code/types@1.42.0': + resolution: {integrity: sha512-AITVSV6WFd17jE8lQXFy7PkHam8M+mMkT7o9ipGZZ3cV7SbrnmL/Hg/HjkA9lkdJYbcC5dEK94py8KVBQn8Umw==} '@sec-ant/readable-stream@0.4.1': resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==} @@ -6267,8 +6267,8 @@ packages: resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==} engines: {node: '>=12'} - ioredis@5.6.1: - resolution: {integrity: sha512-UxC0Yv1Y4WRJiGQxQkP0hfdL0/5/6YvdfOOClRgJ0qppSarkhneSa6UvkMkms0AkdGimSH3Ikqm+6mkMmX7vGA==} + ioredis@5.7.0: + resolution: {integrity: sha512-NUcA93i1lukyXU+riqEyPtSEkyFq8tX90uL659J+qpCZ3rEdViB/APC58oAhIh3+bJln2hzdlZbBZsGNrlsR8g==} engines: {node: '>=12.22.0'} ip-address@9.0.5: @@ -12191,18 +12191,16 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.40.2': optional: true - '@roo-code/cloud@0.5.0': + '@roo-code/cloud@0.4.0': dependencies: - '@roo-code/types': 1.44.0 - ioredis: 5.6.1 + '@roo-code/types': 1.42.0 + ioredis: 5.7.0 p-wait-for: 5.0.2 zod: 3.25.76 transitivePeerDependencies: - supports-color - '@roo-code/types@1.44.0': - dependencies: - zod: 3.25.76 + '@roo-code/types@1.42.0': {} '@sec-ant/readable-stream@0.4.1': {} @@ -15965,7 +15963,7 @@ snapshots: internmap@2.0.3: {} - ioredis@5.6.1: + ioredis@5.7.0: dependencies: '@ioredis/commands': 1.3.0 cluster-key-slot: 1.1.2 diff --git a/src/core/task/Task.ts b/src/core/task/Task.ts index e0c332d16f..3cb6abe7f7 100644 --- a/src/core/task/Task.ts +++ b/src/core/task/Task.ts @@ -32,7 +32,7 @@ import { isBlockingAsk, } from "@roo-code/types" import { TelemetryService } from "@roo-code/telemetry" -import { CloudService, TaskBridgeService } from "@roo-code/cloud" +import { CloudService } from "@roo-code/cloud" // api import { ApiHandler, ApiHandlerCreateMessageMetadata, buildApiHandler } from "../../api" @@ -118,7 +118,6 @@ export type TaskOptions = { parentTask?: Task taskNumber?: number onCreated?: (task: Task) => void - enableTaskBridge?: boolean } export class Task extends EventEmitter implements TaskLike { @@ -238,9 +237,6 @@ export class Task extends EventEmitter implements TaskLike { checkpointService?: RepoPerTaskCheckpointService checkpointServiceInitializing = false - // Task Bridge - taskBridgeService?: TaskBridgeService - // Streaming isWaitingForFirstChunk = false isStreaming = false @@ -272,7 +268,6 @@ export class Task extends EventEmitter implements TaskLike { parentTask, taskNumber = -1, onCreated, - enableTaskBridge = false, }: TaskOptions) { super() @@ -350,11 +345,6 @@ export class Task extends EventEmitter implements TaskLike { this.toolRepetitionDetector = new ToolRepetitionDetector(this.consecutiveMistakeLimit) - // Initialize TaskBridgeService only if enabled - if (enableTaskBridge) { - this.taskBridgeService = TaskBridgeService.getInstance() - } - onCreated?.(this) if (startTask) { @@ -941,11 +931,6 @@ export class Task extends EventEmitter implements TaskLike { // Start / Abort / Resume private async startTask(task?: string, images?: string[]): Promise { - if (this.taskBridgeService) { - await this.taskBridgeService.initialize() - await this.taskBridgeService.subscribeToTask(this) - } - // `conversationHistory` (for API) and `clineMessages` (for webview) // need to be in sync. // If the extension process were killed, then on restart the @@ -997,11 +982,6 @@ export class Task extends EventEmitter implements TaskLike { } private async resumeTaskFromHistory() { - if (this.taskBridgeService) { - await this.taskBridgeService.initialize() - await this.taskBridgeService.subscribeToTask(this) - } - const modifiedClineMessages = await this.getSavedClineMessages() // Remove any resume messages that may have been added before @@ -1247,13 +1227,6 @@ export class Task extends EventEmitter implements TaskLike { this.pauseInterval = undefined } - // Unsubscribe from TaskBridge service. - if (this.taskBridgeService) { - this.taskBridgeService - .unsubscribeFromTask(this.taskId) - .catch((error) => console.error("Error unsubscribing from task bridge:", error)) - } - // Release any terminals associated with this task. try { // Release any terminals associated with this task. diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index c4f146bd34..274060a19b 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -17,6 +17,7 @@ import { type ProviderSettings, type RooCodeSettings, type ProviderSettingsEntry, + type ProviderSettingsWithId, type TelemetryProperties, type TelemetryPropertiesProvider, type CodeActionId, @@ -65,7 +66,6 @@ import { fileExistsAtPath } from "../../utils/fs" import { setTtsEnabled, setTtsSpeed } from "../../utils/tts" import { getWorkspaceGitInfo } from "../../utils/git" import { getWorkspacePath } from "../../utils/path" -import { isRemoteControlEnabled } from "../../utils/remoteControl" import { setPanel } from "../../activate/registerCommands" @@ -112,8 +112,6 @@ export class ClineProvider protected mcpHub?: McpHub // Change from private to protected private marketplaceManager: MarketplaceManager private mdmService?: MdmService - private taskCreationCallback: (task: Task) => void - private taskEventListeners: WeakMap void>> = new WeakMap() public isViewLaunched = false public settingsImportedAt?: number @@ -163,40 +161,6 @@ export class ClineProvider this.marketplaceManager = new MarketplaceManager(this.context, this.customModesManager) - this.taskCreationCallback = (instance: Task) => { - this.emit(RooCodeEventName.TaskCreated, instance) - - // Create named listener functions so we can remove them later. - const onTaskStarted = () => this.emit(RooCodeEventName.TaskStarted, instance.taskId) - const onTaskCompleted = (taskId: string, tokenUsage: any, toolUsage: any) => - this.emit(RooCodeEventName.TaskCompleted, taskId, tokenUsage, toolUsage) - const onTaskAborted = () => this.emit(RooCodeEventName.TaskAborted, instance.taskId) - const onTaskFocused = () => this.emit(RooCodeEventName.TaskFocused, instance.taskId) - const onTaskUnfocused = () => this.emit(RooCodeEventName.TaskUnfocused, instance.taskId) - const onTaskActive = (taskId: string) => this.emit(RooCodeEventName.TaskActive, taskId) - const onTaskIdle = (taskId: string) => this.emit(RooCodeEventName.TaskIdle, taskId) - - // Attach the listeners. - instance.on(RooCodeEventName.TaskStarted, onTaskStarted) - instance.on(RooCodeEventName.TaskCompleted, onTaskCompleted) - instance.on(RooCodeEventName.TaskAborted, onTaskAborted) - instance.on(RooCodeEventName.TaskFocused, onTaskFocused) - instance.on(RooCodeEventName.TaskUnfocused, onTaskUnfocused) - instance.on(RooCodeEventName.TaskActive, onTaskActive) - instance.on(RooCodeEventName.TaskIdle, onTaskIdle) - - // Store the cleanup functions for later removal. - this.taskEventListeners.set(instance, [ - () => instance.off(RooCodeEventName.TaskStarted, onTaskStarted), - () => instance.off(RooCodeEventName.TaskCompleted, onTaskCompleted), - () => instance.off(RooCodeEventName.TaskAborted, onTaskAborted), - () => instance.off(RooCodeEventName.TaskFocused, onTaskFocused), - () => instance.off(RooCodeEventName.TaskUnfocused, onTaskUnfocused), - () => instance.off(RooCodeEventName.TaskActive, onTaskActive), - () => instance.off(RooCodeEventName.TaskIdle, onTaskIdle), - ]) - } - // Initialize Roo Code Cloud profile sync. this.initializeCloudProfileSync().catch((error) => { this.log(`Failed to initialize cloud profile sync: ${error}`) @@ -332,14 +296,6 @@ export class ClineProvider task.emit(RooCodeEventName.TaskUnfocused) - // Remove event listeners before clearing the reference. - const cleanupFunctions = this.taskEventListeners.get(task) - - if (cleanupFunctions) { - cleanupFunctions.forEach((cleanup) => cleanup()) - this.taskEventListeners.delete(task) - } - // Make sure no reference kept, once promises end it will be // garbage collected. task = undefined @@ -696,17 +652,12 @@ export class ClineProvider enableCheckpoints, fuzzyMatchThreshold, experiments, - cloudUserInfo, - remoteControlEnabled, } = await this.getState() if (!ProfileValidator.isProfileAllowed(apiConfiguration, organizationAllowList)) { throw new OrganizationAllowListViolationError(t("common:errors.violated_organization_allowlist")) } - // Determine if TaskBridge should be enabled - const enableTaskBridge = isRemoteControlEnabled(cloudUserInfo, remoteControlEnabled) - const task = new Task({ provider: this, apiConfiguration, @@ -720,8 +671,7 @@ export class ClineProvider rootTask: this.clineStack.length > 0 ? this.clineStack[0] : undefined, parentTask, taskNumber: this.clineStack.length + 1, - onCreated: this.taskCreationCallback, - enableTaskBridge, + onCreated: (instance) => this.emit(RooCodeEventName.TaskCreated, instance), ...options, }) @@ -786,13 +736,8 @@ export class ClineProvider enableCheckpoints, fuzzyMatchThreshold, experiments, - cloudUserInfo, - remoteControlEnabled, } = await this.getState() - // Determine if TaskBridge should be enabled - const enableTaskBridge = isRemoteControlEnabled(cloudUserInfo, remoteControlEnabled) - const task = new Task({ provider: this, apiConfiguration, @@ -805,8 +750,7 @@ export class ClineProvider rootTask: historyItem.rootTask, parentTask: historyItem.parentTask, taskNumber: historyItem.number, - onCreated: this.taskCreationCallback, - enableTaskBridge, + onCreated: (instance) => this.emit(RooCodeEventName.TaskCreated, instance), }) await this.addClineToStack(task) @@ -1685,7 +1629,6 @@ export class ClineProvider includeDiagnosticMessages, maxDiagnosticMessages, includeTaskHistoryInEnhance, - remoteControlEnabled, } = await this.getState() const telemetryKey = process.env.POSTHOG_API_KEY @@ -1813,7 +1756,6 @@ export class ClineProvider includeDiagnosticMessages: includeDiagnosticMessages ?? true, maxDiagnosticMessages: maxDiagnosticMessages ?? 50, includeTaskHistoryInEnhance: includeTaskHistoryInEnhance ?? false, - remoteControlEnabled: remoteControlEnabled ?? false, } } @@ -2001,8 +1943,6 @@ export class ClineProvider maxDiagnosticMessages: stateValues.maxDiagnosticMessages ?? 50, // Add includeTaskHistoryInEnhance setting includeTaskHistoryInEnhance: stateValues.includeTaskHistoryInEnhance ?? false, - // Add remoteControlEnabled setting - remoteControlEnabled: stateValues.remoteControlEnabled ?? false, } } @@ -2115,55 +2055,6 @@ export class ClineProvider return true } - /** - * Handle remote control enabled/disabled state changes - * Manages ExtensionBridgeService and TaskBridgeService lifecycle - */ - public async handleRemoteControlToggle(enabled: boolean): Promise { - const { - CloudService: CloudServiceImport, - ExtensionBridgeService, - TaskBridgeService, - } = await import("@roo-code/cloud") - const userInfo = CloudServiceImport.instance.getUserInfo() - - // Handle ExtensionBridgeService using static method - await ExtensionBridgeService.handleRemoteControlState(userInfo, enabled, this, (message: string) => - this.log(message), - ) - - if (isRemoteControlEnabled(userInfo, enabled)) { - // Set up TaskBridgeService for the currently active task if one exists - const currentTask = this.getCurrentCline() - if (currentTask && !currentTask.taskBridgeService) { - try { - currentTask.taskBridgeService = TaskBridgeService.getInstance() - await currentTask.taskBridgeService.subscribeToTask(currentTask) - this.log(`[TaskBridgeService] Subscribed current task ${currentTask.taskId} to TaskBridge`) - } catch (error) { - const message = `[TaskBridgeService#subscribeToTask] ${error instanceof Error ? error.message : String(error)}` - this.log(message) - console.error(message) - } - } - } else { - // Disconnect TaskBridgeService for all tasks in the stack - for (const task of this.clineStack) { - if (task.taskBridgeService) { - try { - await task.taskBridgeService.unsubscribeFromTask(task.taskId) - task.taskBridgeService = undefined - this.log(`[TaskBridgeService] Unsubscribed task ${task.taskId} from TaskBridge`) - } catch (error) { - const message = `[TaskBridgeService#unsubscribeFromTask] for task ${task.taskId}: ${error instanceof Error ? error.message : String(error)}` - this.log(message) - console.error(message) - } - } - } - } - } - /** * Returns properties to be included in every telemetry event * This method is called by the telemetry service to get context information diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts index 97ef0ddc3c..3419cb8565 100644 --- a/src/core/webview/webviewMessageHandler.ts +++ b/src/core/webview/webviewMessageHandler.ts @@ -907,11 +907,6 @@ export const webviewMessageHandler = async ( await updateGlobalState("enableMcpServerCreation", message.bool ?? true) await provider.postStateToWebview() break - case "remoteControlEnabled": - await updateGlobalState("remoteControlEnabled", message.bool ?? false) - await provider.handleRemoteControlToggle(message.bool ?? false) - await provider.postStateToWebview() - break case "refreshAllMcpServers": { const mcpHub = provider.getMcpHub() if (mcpHub) { diff --git a/src/extension.ts b/src/extension.ts index 15df88d4d9..f3b8f55911 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -12,7 +12,7 @@ try { console.warn("Failed to load environment variables:", e) } -import { CloudService, ExtensionBridgeService } from "@roo-code/cloud" +import { CloudService } from "@roo-code/cloud" import { TelemetryService, PostHogTelemetryClient } from "@roo-code/telemetry" import "./utils/path" // Necessary to have access to String.prototype.toPosix. @@ -29,7 +29,6 @@ import { CodeIndexManager } from "./services/code-index/manager" import { MdmService } from "./services/mdm/MdmService" import { migrateSettings } from "./utils/migrateSettings" import { autoImportSettings } from "./utils/autoImportSettings" -import { isRemoteControlEnabled } from "./utils/remoteControl" import { API } from "./extension/api" import { @@ -72,13 +71,37 @@ export async function activate(context: vscode.ExtensionContext) { console.warn("Failed to register PostHogTelemetryClient:", error) } - // Create logger for cloud services. + // Create logger for cloud services const cloudLogger = createDualLogger(createOutputChannelLogger(outputChannel)) + // Initialize Roo Code Cloud service. + const cloudService = await CloudService.createInstance(context, cloudLogger) + + try { + if (cloudService.telemetryClient) { + TelemetryService.instance.register(cloudService.telemetryClient) + } + } catch (error) { + outputChannel.appendLine( + `[CloudService] Failed to register TelemetryClient: ${error instanceof Error ? error.message : String(error)}`, + ) + } + + const postStateListener = () => { + ClineProvider.getVisibleInstance()?.postStateToWebview() + } + + cloudService.on("auth-state-changed", postStateListener) + cloudService.on("user-info", postStateListener) + cloudService.on("settings-updated", postStateListener) + + // Add to subscriptions for proper cleanup on deactivate + context.subscriptions.push(cloudService) + // Initialize MDM service const mdmService = await MdmService.createInstance(cloudLogger) - // Initialize i18n for internationalization support. + // Initialize i18n for internationalization support initializeI18n(context.globalState.get("language") ?? formatLanguage(vscode.env.language)) // Initialize terminal shell execution handlers. @@ -113,29 +136,6 @@ export async function activate(context: vscode.ExtensionContext) { } } - // Initialize Roo Code Cloud service. - const cloudService = await CloudService.createInstance(context, cloudLogger) - - const postStateListener = () => ClineProvider.getVisibleInstance()?.postStateToWebview() - - cloudService.on("auth-state-changed", postStateListener) - cloudService.on("settings-updated", postStateListener) - - cloudService.on("user-info", ({ userInfo }) => { - postStateListener() - - // Check if remote control is enabled in user settings - const remoteControlEnabled = contextProxy.getValue("remoteControlEnabled") - - // Handle ExtensionBridgeService state using static method - ExtensionBridgeService.handleRemoteControlState(userInfo, remoteControlEnabled, provider, (message: string) => - outputChannel.appendLine(message), - ) - }) - - // Add to subscriptions for proper cleanup on deactivate. - context.subscriptions.push(cloudService) - const provider = new ClineProvider(context, outputChannel, "sidebar", contextProxy, mdmService) TelemetryService.instance.setProvider(provider) @@ -145,7 +145,7 @@ export async function activate(context: vscode.ExtensionContext) { }), ) - // Auto-import configuration if specified in settings. + // Auto-import configuration if specified in settings try { await autoImportSettings(outputChannel, { providerSettingsManager: provider.providerSettingsManager, @@ -238,14 +238,6 @@ export async function activate(context: vscode.ExtensionContext) { // This method is called when your extension is deactivated. export async function deactivate() { outputChannel.appendLine(`${Package.name} extension deactivated`) - - // Cleanup Extension Bridge service. - const extensionBridgeService = ExtensionBridgeService.getInstance() - - if (extensionBridgeService) { - await extensionBridgeService.disconnect() - } - await McpServerManager.cleanup(extensionContext) TelemetryService.instance.shutdown() TerminalRegistry.cleanup() diff --git a/src/package.json b/src/package.json index d35f6f34dd..aa2110dfd5 100644 --- a/src/package.json +++ b/src/package.json @@ -420,7 +420,7 @@ "@mistralai/mistralai": "^1.3.6", "@modelcontextprotocol/sdk": "^1.9.0", "@qdrant/js-client-rest": "^1.14.0", - "@roo-code/cloud": "^0.5.0", + "@roo-code/cloud": "^0.4.0", "@roo-code/ipc": "workspace:^", "@roo-code/telemetry": "workspace:^", "@roo-code/types": "workspace:^", diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts index f9ac305e07..3ddd69945c 100644 --- a/src/shared/ExtensionMessage.ts +++ b/src/shared/ExtensionMessage.ts @@ -271,7 +271,6 @@ export type ExtensionState = Pick< | "profileThresholds" | "includeDiagnosticMessages" | "maxDiagnosticMessages" - | "remoteControlEnabled" > & { version: string clineMessages: ClineMessage[] diff --git a/src/shared/WebviewMessage.ts b/src/shared/WebviewMessage.ts index 2d94896bf5..cb8759d851 100644 --- a/src/shared/WebviewMessage.ts +++ b/src/shared/WebviewMessage.ts @@ -130,7 +130,6 @@ export interface WebviewMessage { | "terminalCompressProgressBar" | "mcpEnabled" | "enableMcpServerCreation" - | "remoteControlEnabled" | "searchCommits" | "alwaysApproveResubmit" | "requestDelaySeconds" diff --git a/src/utils/remoteControl.ts b/src/utils/remoteControl.ts deleted file mode 100644 index f003b522d1..0000000000 --- a/src/utils/remoteControl.ts +++ /dev/null @@ -1,11 +0,0 @@ -import type { CloudUserInfo } from "@roo-code/types" - -/** - * Determines if remote control features should be enabled - * @param cloudUserInfo - User information from cloud service - * @param remoteControlEnabled - User's remote control setting - * @returns true if remote control should be enabled - */ -export function isRemoteControlEnabled(cloudUserInfo?: CloudUserInfo | null, remoteControlEnabled?: boolean): boolean { - return !!(cloudUserInfo?.id && cloudUserInfo.extensionBridgeEnabled && remoteControlEnabled) -} diff --git a/webview-ui/src/components/account/AccountView.tsx b/webview-ui/src/components/account/AccountView.tsx index e36818cc3a..e3d1a293a7 100644 --- a/webview-ui/src/components/account/AccountView.tsx +++ b/webview-ui/src/components/account/AccountView.tsx @@ -5,12 +5,8 @@ import type { CloudUserInfo } from "@roo-code/types" import { TelemetryEventName } from "@roo-code/types" import { useAppTranslation } from "@src/i18n/TranslationContext" -import { useExtensionState } from "@src/context/ExtensionStateContext" import { vscode } from "@src/utils/vscode" import { telemetryClient } from "@src/utils/TelemetryClient" -import { ToggleSwitch } from "@/components/ui/toggle-switch" - -import { History, PiggyBank, Router, SquareArrowOutUpRightIcon } from "lucide-react" type AccountViewProps = { userInfo: CloudUserInfo | null @@ -21,7 +17,6 @@ type AccountViewProps = { export const AccountView = ({ userInfo, isAuthenticated, cloudApiUrl, onDone }: AccountViewProps) => { const { t } = useAppTranslation() - const { remoteControlEnabled, setRemoteControlEnabled } = useExtensionState() const wasAuthenticatedRef = useRef(false) const rooLogoUri = (window as any).IMAGES_BASE_URI + "/roo-logo.svg" @@ -56,17 +51,11 @@ export const AccountView = ({ userInfo, isAuthenticated, cloudApiUrl, onDone }: vscode.postMessage({ type: "openExternal", url: cloudUrl }) } - const handleRemoteControlToggle = () => { - const newValue = !remoteControlEnabled - setRemoteControlEnabled(newValue) - vscode.postMessage({ type: "remoteControlEnabled", bool: newValue }) - } - return ( -
    +

    {t("account:title")}

    - + {t("settings:common.done")}
    @@ -88,13 +77,13 @@ export const AccountView = ({ userInfo, isAuthenticated, cloudApiUrl, onDone }: )}
    {userInfo.name && ( -

    {userInfo.name}

    +

    {userInfo.name}

    )} {userInfo?.email && ( -

    {userInfo?.email}

    +

    {userInfo?.email}

    )} {userInfo?.organizationName && ( -
    +
    {userInfo.organizationImageUrl && ( )} - - {/* Remote Control Toggle - only show if user has extension bridge enabled */} - {userInfo?.extensionBridgeEnabled && ( -
    -
    - - {t("account:remoteControl")} -
    -
    - {t("account:remoteControlDescription")} -
    -
    -
    - )} -
    {t("account:visitCloudWebsite")} @@ -157,31 +125,30 @@ export const AccountView = ({ userInfo, isAuthenticated, cloudApiUrl, onDone }:
    -

    +

    {t("account:cloudBenefitsTitle")}

    -
      -
    • - - {t("account:cloudBenefitWalkaway")} -
      • -
    • - - {t("account:cloudBenefitSharing")} -
      • -
    • - +

      + {t("account:cloudBenefitsSubtitle")} +

      +
        +
      • + • {t("account:cloudBenefitHistory")}
        • -
      • - +
      • + • + {t("account:cloudBenefitSharing")} +
        • +
      • + • {t("account:cloudBenefitMetrics")}
    -
    - +
    + {t("account:connect")}
    diff --git a/webview-ui/src/components/account/__tests__/AccountView.spec.tsx b/webview-ui/src/components/account/__tests__/AccountView.spec.tsx index 2af759d615..d6fd3013e6 100644 --- a/webview-ui/src/components/account/__tests__/AccountView.spec.tsx +++ b/webview-ui/src/components/account/__tests__/AccountView.spec.tsx @@ -11,17 +11,11 @@ vi.mock("@src/i18n/TranslationContext", () => ({ "settings:common.done": "Done", "account:signIn": "Connect to Roo Code Cloud", "account:cloudBenefitsTitle": "Connect to Roo Code Cloud", - "account:cloudBenefitWalkaway": "Follow and control tasks from anywhere with Roomote Control", - "account:cloudBenefitSharing": "Share tasks with others", - "account:cloudBenefitHistory": "Access your task history", - "account:cloudBenefitMetrics": "Get a holistic view of your token consumption", + "account:cloudBenefitsSubtitle": "Sync your prompts and telemetry to enable:", + "account:cloudBenefitHistory": "Online task history", + "account:cloudBenefitSharing": "Sharing and collaboration features", + "account:cloudBenefitMetrics": "Task, token, and cost-based usage metrics", "account:logOut": "Log out", - "account:connect": "Connect Now", - "account:visitCloudWebsite": "Visit Roo Code Cloud", - "account:remoteControl": "Roomote Control", - "account:remoteControlDescription": - "Enable following and interacting with tasks in this workspace with Roo Code Cloud", - "account:profilePicture": "Profile picture", } return translations[key] || key }, @@ -42,14 +36,6 @@ vi.mock("@src/utils/TelemetryClient", () => ({ }, })) -// Mock the extension state context -vi.mock("@src/context/ExtensionStateContext", () => ({ - useExtensionState: () => ({ - remoteControlEnabled: false, - setRemoteControlEnabled: vi.fn(), - }), -})) - // Mock window global for images Object.defineProperty(window, "IMAGES_BASE_URI", { value: "/images", @@ -69,13 +55,13 @@ describe("AccountView", () => { // Check that the benefits section is displayed expect(screen.getByRole("heading", { name: "Connect to Roo Code Cloud" })).toBeInTheDocument() - expect(screen.getByText("Follow and control tasks from anywhere with Roomote Control")).toBeInTheDocument() - expect(screen.getByText("Share tasks with others")).toBeInTheDocument() - expect(screen.getByText("Access your task history")).toBeInTheDocument() - expect(screen.getByText("Get a holistic view of your token consumption")).toBeInTheDocument() + expect(screen.getByText("Sync your prompts and telemetry to enable:")).toBeInTheDocument() + expect(screen.getByText("Online task history")).toBeInTheDocument() + expect(screen.getByText("Sharing and collaboration features")).toBeInTheDocument() + expect(screen.getByText("Task, token, and cost-based usage metrics")).toBeInTheDocument() // Check that the connect button is also present - expect(screen.getByText("Connect Now")).toBeInTheDocument() + expect(screen.getByText("account:connect")).toBeInTheDocument() }) it("should not display benefits when user is authenticated", () => { @@ -94,60 +80,13 @@ describe("AccountView", () => { ) // Check that the benefits section is NOT displayed - expect( - screen.queryByText("Follow and control tasks from anywhere with Roomote Control"), - ).not.toBeInTheDocument() - expect(screen.queryByText("Share tasks with others")).not.toBeInTheDocument() - expect(screen.queryByText("Access your task history")).not.toBeInTheDocument() - expect(screen.queryByText("Get a holistic view of your token consumption")).not.toBeInTheDocument() + expect(screen.queryByText("Sync your prompts and telemetry to enable:")).not.toBeInTheDocument() + expect(screen.queryByText("Online task history")).not.toBeInTheDocument() + expect(screen.queryByText("Sharing and collaboration features")).not.toBeInTheDocument() + expect(screen.queryByText("Task, token, and cost-based usage metrics")).not.toBeInTheDocument() // Check that user info is displayed instead expect(screen.getByText("Test User")).toBeInTheDocument() expect(screen.getByText("test@example.com")).toBeInTheDocument() }) - - it("should display remote control toggle when user has extension bridge enabled", () => { - const mockUserInfo = { - name: "Test User", - email: "test@example.com", - extensionBridgeEnabled: true, - } - - render( - {}} - />, - ) - - // Check that the remote control toggle is displayed - expect(screen.getByTestId("remote-control-toggle")).toBeInTheDocument() - expect(screen.getByText("Roomote Control")).toBeInTheDocument() - expect( - screen.getByText("Enable following and interacting with tasks in this workspace with Roo Code Cloud"), - ).toBeInTheDocument() - }) - - it("should not display remote control toggle when user does not have extension bridge enabled", () => { - const mockUserInfo = { - name: "Test User", - email: "test@example.com", - extensionBridgeEnabled: false, - } - - render( - {}} - />, - ) - - // Check that the remote control toggle is NOT displayed - expect(screen.queryByTestId("remote-control-toggle")).not.toBeInTheDocument() - expect(screen.queryByText("Roomote Control")).not.toBeInTheDocument() - }) }) diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx index 12f13bdf55..da7ab63358 100644 --- a/webview-ui/src/context/ExtensionStateContext.tsx +++ b/webview-ui/src/context/ExtensionStateContext.tsx @@ -97,8 +97,6 @@ export interface ExtensionStateContextType extends ExtensionState { setMcpEnabled: (value: boolean) => void enableMcpServerCreation: boolean setEnableMcpServerCreation: (value: boolean) => void - remoteControlEnabled: boolean - setRemoteControlEnabled: (value: boolean) => void alwaysApproveResubmit?: boolean setAlwaysApproveResubmit: (value: boolean) => void requestDelaySeconds: number @@ -197,7 +195,6 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode terminalShellIntegrationTimeout: 4000, mcpEnabled: true, enableMcpServerCreation: false, - remoteControlEnabled: false, alwaysApproveResubmit: false, requestDelaySeconds: 5, currentApiConfigName: "default", @@ -411,7 +408,6 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode profileThresholds: state.profileThresholds ?? {}, alwaysAllowFollowupQuestions, followupAutoApproveTimeoutMs, - remoteControlEnabled: state.remoteControlEnabled ?? false, setExperimentEnabled: (id, enabled) => setState((prevState) => ({ ...prevState, experiments: { ...prevState.experiments, [id]: enabled } })), setApiConfiguration, @@ -458,7 +454,6 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode setMcpEnabled: (value) => setState((prevState) => ({ ...prevState, mcpEnabled: value })), setEnableMcpServerCreation: (value) => setState((prevState) => ({ ...prevState, enableMcpServerCreation: value })), - setRemoteControlEnabled: (value) => setState((prevState) => ({ ...prevState, remoteControlEnabled: value })), setAlwaysApproveResubmit: (value) => setState((prevState) => ({ ...prevState, alwaysApproveResubmit: value })), setRequestDelaySeconds: (value) => setState((prevState) => ({ ...prevState, requestDelaySeconds: value })), setCurrentApiConfigName: (value) => setState((prevState) => ({ ...prevState, currentApiConfigName: value })), diff --git a/webview-ui/src/i18n/locales/ca/account.json b/webview-ui/src/i18n/locales/ca/account.json index 2804cc8dfa..a94a978b87 100644 --- a/webview-ui/src/i18n/locales/ca/account.json +++ b/webview-ui/src/i18n/locales/ca/account.json @@ -10,8 +10,5 @@ "cloudBenefitHistory": "Historial de tasques en línia", "cloudBenefitSharing": "Funcions de compartició i col·laboració", "cloudBenefitMetrics": "Mètriques d'ús basades en tasques, tokens i costos", - "cloudBenefitWalkaway": "Segueix i controla tasques des de qualsevol lloc amb Roomote Control", - "remoteControl": "Roomote Control", - "remoteControlDescription": "Permet seguir i interactuar amb tasques en aquest espai de treball amb Roo Code Cloud", "visitCloudWebsite": "Visita Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/de/account.json b/webview-ui/src/i18n/locales/de/account.json index 6edaf58fff..bd4d71eada 100644 --- a/webview-ui/src/i18n/locales/de/account.json +++ b/webview-ui/src/i18n/locales/de/account.json @@ -10,8 +10,5 @@ "cloudBenefitHistory": "Online-Aufgabenverlauf", "cloudBenefitSharing": "Freigabe- und Kollaborationsfunktionen", "cloudBenefitMetrics": "Aufgaben-, Token- und kostenbasierte Nutzungsmetriken", - "cloudBenefitWalkaway": "Verfolge und steuere Aufgaben von überall mit Roomote Control", - "remoteControl": "Roomote Control", - "remoteControlDescription": "Ermöglicht das Verfolgen und Interagieren mit Aufgaben in diesem Arbeitsbereich mit Roo Code Cloud", "visitCloudWebsite": "Roo Code Cloud besuchen" } diff --git a/webview-ui/src/i18n/locales/en/account.json b/webview-ui/src/i18n/locales/en/account.json index a73acef432..f900abb297 100644 --- a/webview-ui/src/i18n/locales/en/account.json +++ b/webview-ui/src/i18n/locales/en/account.json @@ -4,13 +4,11 @@ "logOut": "Log out", "testApiAuthentication": "Test API Authentication", "signIn": "Connect to Roo Code Cloud", - "connect": "Connect Now", + "connect": "Connect", "cloudBenefitsTitle": "Connect to Roo Code Cloud", - "cloudBenefitWalkaway": "Follow and control tasks from anywhere with Roomote Control", - "cloudBenefitSharing": "Share tasks with others", - "cloudBenefitHistory": "Access your task history", - "cloudBenefitMetrics": "Get a holistic view of your token consumption", - "visitCloudWebsite": "Visit Roo Code Cloud", - "remoteControl": "Roomote Control", - "remoteControlDescription": "Enable following and interacting with tasks in this workspace with Roo Code Cloud" + "cloudBenefitsSubtitle": "Sync your prompts and telemetry to enable:", + "cloudBenefitHistory": "Online task history", + "cloudBenefitSharing": "Sharing and collaboration features", + "cloudBenefitMetrics": "Task, token, and cost-based usage metrics", + "visitCloudWebsite": "Visit Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/es/account.json b/webview-ui/src/i18n/locales/es/account.json index c8398ae25a..2bda10e82f 100644 --- a/webview-ui/src/i18n/locales/es/account.json +++ b/webview-ui/src/i18n/locales/es/account.json @@ -10,8 +10,5 @@ "cloudBenefitHistory": "Historial de tareas en línea", "cloudBenefitSharing": "Funciones de compartir y colaboración", "cloudBenefitMetrics": "Métricas de uso basadas en tareas, tokens y costos", - "cloudBenefitWalkaway": "Sigue y controla tareas desde cualquier lugar con Roomote Control", - "remoteControl": "Roomote Control", - "remoteControlDescription": "Permite seguir e interactuar con tareas en este espacio de trabajo con Roo Code Cloud", "visitCloudWebsite": "Visitar Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/fr/account.json b/webview-ui/src/i18n/locales/fr/account.json index e50d11af15..1af4483c5c 100644 --- a/webview-ui/src/i18n/locales/fr/account.json +++ b/webview-ui/src/i18n/locales/fr/account.json @@ -10,8 +10,5 @@ "cloudBenefitHistory": "Historique des tâches en ligne", "cloudBenefitSharing": "Fonctionnalités de partage et collaboration", "cloudBenefitMetrics": "Métriques d'utilisation basées sur les tâches, tokens et coûts", - "cloudBenefitWalkaway": "Suivez et contrôlez les tâches depuis n'importe où avec Roomote Control", - "remoteControl": "Roomote Control", - "remoteControlDescription": "Permet de suivre et d'interagir avec les tâches dans cet espace de travail avec Roo Code Cloud", "visitCloudWebsite": "Visiter Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/hi/account.json b/webview-ui/src/i18n/locales/hi/account.json index 485bc00633..be6ea00d88 100644 --- a/webview-ui/src/i18n/locales/hi/account.json +++ b/webview-ui/src/i18n/locales/hi/account.json @@ -10,8 +10,5 @@ "cloudBenefitHistory": "ऑनलाइन कार्य इतिहास", "cloudBenefitSharing": "साझाकरण और सहयोग सुविधाएं", "cloudBenefitMetrics": "कार्य, token और लागत आधारित उपयोग मेट्रिक्स", - "cloudBenefitWalkaway": "Roomote Control के साथ कहीं से भी कार्यों को फॉलो और नियंत्रित करें", - "remoteControl": "Roomote Control", - "remoteControlDescription": "Roo Code Cloud के साथ इस वर्कस्पेस में कार्यों को फॉलो और इंटरैक्ट करने की सुविधा दें", "visitCloudWebsite": "Roo Code Cloud पर जाएं" } diff --git a/webview-ui/src/i18n/locales/id/account.json b/webview-ui/src/i18n/locales/id/account.json index a3b6f4b97e..57f3fec0df 100644 --- a/webview-ui/src/i18n/locales/id/account.json +++ b/webview-ui/src/i18n/locales/id/account.json @@ -10,8 +10,5 @@ "cloudBenefitHistory": "Riwayat tugas online", "cloudBenefitSharing": "Fitur berbagi dan kolaborasi", "cloudBenefitMetrics": "Metrik penggunaan berdasarkan tugas, token, dan biaya", - "cloudBenefitWalkaway": "Ikuti dan kontrol tugas dari mana saja dengan Roomote Control", - "remoteControl": "Roomote Control", - "remoteControlDescription": "Memungkinkan mengikuti dan berinteraksi dengan tugas di workspace ini dengan Roo Code Cloud", "visitCloudWebsite": "Kunjungi Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/it/account.json b/webview-ui/src/i18n/locales/it/account.json index 7ffb569407..fda13f563c 100644 --- a/webview-ui/src/i18n/locales/it/account.json +++ b/webview-ui/src/i18n/locales/it/account.json @@ -10,8 +10,5 @@ "cloudBenefitHistory": "Cronologia attività online", "cloudBenefitSharing": "Funzionalità di condivisione e collaborazione", "cloudBenefitMetrics": "Metriche di utilizzo basate su attività, token e costi", - "cloudBenefitWalkaway": "Segui e controlla le attività da qualsiasi luogo con Roomote Control", - "remoteControl": "Roomote Control", - "remoteControlDescription": "Abilita il monitoraggio e l'interazione con le attività in questo workspace con Roo Code Cloud", "visitCloudWebsite": "Visita Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/ja/account.json b/webview-ui/src/i18n/locales/ja/account.json index 331d613f9b..b41eaf7895 100644 --- a/webview-ui/src/i18n/locales/ja/account.json +++ b/webview-ui/src/i18n/locales/ja/account.json @@ -10,8 +10,5 @@ "cloudBenefitHistory": "オンラインタスク履歴", "cloudBenefitSharing": "共有とコラボレーション機能", "cloudBenefitMetrics": "タスク、Token、コストベースの使用メトリクス", - "cloudBenefitWalkaway": "Roomote Controlでどこからでもタスクをフォローし制御", - "remoteControl": "Roomote Control", - "remoteControlDescription": "Roo Code Cloudでこのワークスペースのタスクをフォローし操作することを有効にする", "visitCloudWebsite": "Roo Code Cloudを訪問" } diff --git a/webview-ui/src/i18n/locales/ko/account.json b/webview-ui/src/i18n/locales/ko/account.json index 98b09b6e3d..6ad06d43fa 100644 --- a/webview-ui/src/i18n/locales/ko/account.json +++ b/webview-ui/src/i18n/locales/ko/account.json @@ -10,8 +10,5 @@ "cloudBenefitHistory": "온라인 작업 기록", "cloudBenefitSharing": "공유 및 협업 기능", "cloudBenefitMetrics": "작업, 토큰, 비용 기반 사용 메트릭", - "cloudBenefitWalkaway": "Roomote Control로 어디서나 작업을 팔로우하고 제어하세요", - "remoteControl": "Roomote Control", - "remoteControlDescription": "Roo Code Cloud로 이 워크스페이스의 작업을 팔로우하고 상호작용할 수 있게 합니다", "visitCloudWebsite": "Roo Code Cloud 방문" } diff --git a/webview-ui/src/i18n/locales/nl/account.json b/webview-ui/src/i18n/locales/nl/account.json index 94d08b4409..15ceb1865b 100644 --- a/webview-ui/src/i18n/locales/nl/account.json +++ b/webview-ui/src/i18n/locales/nl/account.json @@ -10,8 +10,5 @@ "cloudBenefitHistory": "Online taakgeschiedenis", "cloudBenefitSharing": "Deel- en samenwerkingsfuncties", "cloudBenefitMetrics": "Taak-, token- en kostengebaseerde gebruiksstatistieken", - "cloudBenefitWalkaway": "Volg en beheer taken van overal met Roomote Control", - "remoteControl": "Roomote Control", - "remoteControlDescription": "Schakel het volgen en interacteren met taken in deze workspace in met Roo Code Cloud", "visitCloudWebsite": "Bezoek Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/pl/account.json b/webview-ui/src/i18n/locales/pl/account.json index b25f29b1bb..fdb0e4d894 100644 --- a/webview-ui/src/i18n/locales/pl/account.json +++ b/webview-ui/src/i18n/locales/pl/account.json @@ -10,8 +10,5 @@ "cloudBenefitHistory": "Historia zadań online", "cloudBenefitSharing": "Funkcje udostępniania i współpracy", "cloudBenefitMetrics": "Metryki użycia oparte na zadaniach, tokenach i kosztach", - "cloudBenefitWalkaway": "Śledź i kontroluj zadania z dowolnego miejsca za pomocą Roomote Control", - "remoteControl": "Roomote Control", - "remoteControlDescription": "Umożliwia śledzenie i interakcję z zadaniami w tym obszarze roboczym za pomocą Roo Code Cloud", "visitCloudWebsite": "Odwiedź Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/pt-BR/account.json b/webview-ui/src/i18n/locales/pt-BR/account.json index 5b4f457b99..5492ca7520 100644 --- a/webview-ui/src/i18n/locales/pt-BR/account.json +++ b/webview-ui/src/i18n/locales/pt-BR/account.json @@ -10,8 +10,5 @@ "cloudBenefitHistory": "Histórico de tarefas online", "cloudBenefitSharing": "Recursos de compartilhamento e colaboração", "cloudBenefitMetrics": "Métricas de uso baseadas em tarefas, tokens e custos", - "cloudBenefitWalkaway": "Acompanhe e controle tarefas de qualquer lugar com Roomote Control", - "remoteControl": "Roomote Control", - "remoteControlDescription": "Permite acompanhar e interagir com tarefas neste workspace com Roo Code Cloud", "visitCloudWebsite": "Visitar Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/ru/account.json b/webview-ui/src/i18n/locales/ru/account.json index 4f4a2de167..1c8dcf5289 100644 --- a/webview-ui/src/i18n/locales/ru/account.json +++ b/webview-ui/src/i18n/locales/ru/account.json @@ -10,8 +10,5 @@ "cloudBenefitHistory": "Онлайн-история задач", "cloudBenefitSharing": "Функции обмена и совместной работы", "cloudBenefitMetrics": "Метрики использования на основе задач, токенов и затрат", - "cloudBenefitWalkaway": "Отслеживайте и управляйте задачами откуда угодно с Roomote Control", - "remoteControl": "Roomote Control", - "remoteControlDescription": "Позволяет отслеживать и взаимодействовать с задачами в этом рабочем пространстве с Roo Code Cloud", "visitCloudWebsite": "Посетить Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/tr/account.json b/webview-ui/src/i18n/locales/tr/account.json index 03131e3fb5..a344ce940f 100644 --- a/webview-ui/src/i18n/locales/tr/account.json +++ b/webview-ui/src/i18n/locales/tr/account.json @@ -10,8 +10,5 @@ "cloudBenefitHistory": "Çevrimiçi görev geçmişi", "cloudBenefitSharing": "Paylaşım ve işbirliği özellikleri", "cloudBenefitMetrics": "Görev, token ve maliyet tabanlı kullanım metrikleri", - "cloudBenefitWalkaway": "Roomote Control ile görevleri her yerden takip et ve kontrol et", - "remoteControl": "Roomote Control", - "remoteControlDescription": "Bu çalışma alanındaki görevleri Roo Code Cloud ile takip etme ve etkileşim kurma imkanı sağlar", "visitCloudWebsite": "Roo Code Cloud'u ziyaret et" } diff --git a/webview-ui/src/i18n/locales/vi/account.json b/webview-ui/src/i18n/locales/vi/account.json index 3224160ba3..0e826b75ad 100644 --- a/webview-ui/src/i18n/locales/vi/account.json +++ b/webview-ui/src/i18n/locales/vi/account.json @@ -10,8 +10,5 @@ "cloudBenefitHistory": "Lịch sử tác vụ trực tuyến", "cloudBenefitSharing": "Tính năng chia sẻ và cộng tác", "cloudBenefitMetrics": "Số liệu sử dụng dựa trên tác vụ, token và chi phí", - "cloudBenefitWalkaway": "Theo dõi và điều khiển tác vụ từ bất kỳ đâu với Roomote Control", - "remoteControl": "Roomote Control", - "remoteControlDescription": "Cho phép theo dõi và tương tác với các tác vụ trong workspace này với Roo Code Cloud", "visitCloudWebsite": "Truy cập Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/zh-CN/account.json b/webview-ui/src/i18n/locales/zh-CN/account.json index 9e097472a0..65a4c1d221 100644 --- a/webview-ui/src/i18n/locales/zh-CN/account.json +++ b/webview-ui/src/i18n/locales/zh-CN/account.json @@ -10,8 +10,5 @@ "cloudBenefitHistory": "在线任务历史", "cloudBenefitSharing": "共享和协作功能", "cloudBenefitMetrics": "基于任务、Token 和成本的使用指标", - "cloudBenefitWalkaway": "使用 Roomote Control 随时随地跟踪和控制任务", - "remoteControl": "Roomote Control", - "remoteControlDescription": "允许通过 Roo Code Cloud 跟踪和操作此工作区中的任务", "visitCloudWebsite": "访问 Roo Code Cloud" } diff --git a/webview-ui/src/i18n/locales/zh-TW/account.json b/webview-ui/src/i18n/locales/zh-TW/account.json index edd25dcf18..dca8d3231c 100644 --- a/webview-ui/src/i18n/locales/zh-TW/account.json +++ b/webview-ui/src/i18n/locales/zh-TW/account.json @@ -10,8 +10,5 @@ "cloudBenefitHistory": "線上工作歷史", "cloudBenefitSharing": "分享和協作功能", "cloudBenefitMetrics": "基於工作、Token 和成本的使用指標", - "cloudBenefitWalkaway": "使用 Roomote Control 隨時隨地追蹤和控制工作", - "remoteControl": "Roomote Control", - "remoteControlDescription": "允許透過 Roo Code Cloud 追蹤和操作此工作區中的工作", "visitCloudWebsite": "造訪 Roo Code Cloud" } From 477b85de03b5f325864561d323b27e48a871dee2 Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 10:55:03 -0700 Subject: [PATCH 069/253] feat: add support for Claude Opus 4.1 (claude-opus-4-1-20250805) (#6728) Co-authored-by: Roo Code Co-authored-by: Daniel Riccio --- .changeset/add-opus-4-1-model.md | 11 +++++++++++ packages/types/src/providers/anthropic.ts | 12 ++++++++++++ packages/types/src/providers/bedrock.ts | 15 +++++++++++++++ packages/types/src/providers/claude-code.ts | 8 ++++++++ packages/types/src/providers/lite-llm.ts | 5 +++++ packages/types/src/providers/openrouter.ts | 3 +++ packages/types/src/providers/vertex.ts | 12 ++++++++++++ src/api/providers/anthropic.ts | 2 ++ .../fetchers/__tests__/openrouter.spec.ts | 13 ++++++++++++- src/api/providers/fetchers/openrouter.ts | 5 +++++ 10 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 .changeset/add-opus-4-1-model.md diff --git a/.changeset/add-opus-4-1-model.md b/.changeset/add-opus-4-1-model.md new file mode 100644 index 0000000000..9b0e840e5b --- /dev/null +++ b/.changeset/add-opus-4-1-model.md @@ -0,0 +1,11 @@ +--- +"@roo-code/types": patch +"roo-code": patch +--- + +Add support for Claude Opus 4.1 (claude-opus-4-1-20250805) + +- Added claude-opus-4-1-20250805 to anthropicModels with 8192 max tokens and reasoning budget support +- Added support across all providers: Anthropic, Claude Code, Bedrock, Vertex AI, OpenRouter, and LiteLLM +- Updated anthropic.ts provider to handle prompt caching for the new model +- Pricing: $15/M input tokens, $75/M output tokens, $18.75/M cache writes, $1.5/M cache reads diff --git a/packages/types/src/providers/anthropic.ts b/packages/types/src/providers/anthropic.ts index d0f1629ee9..0c3323cffe 100644 --- a/packages/types/src/providers/anthropic.ts +++ b/packages/types/src/providers/anthropic.ts @@ -18,6 +18,18 @@ export const anthropicModels = { cacheReadsPrice: 0.3, // $0.30 per million tokens supportsReasoningBudget: true, }, + "claude-opus-4-1-20250805": { + maxTokens: 8192, + contextWindow: 200_000, + supportsImages: true, + supportsComputerUse: true, + supportsPromptCache: true, + inputPrice: 15.0, // $15 per million input tokens + outputPrice: 75.0, // $75 per million output tokens + cacheWritesPrice: 18.75, // $18.75 per million tokens + cacheReadsPrice: 1.5, // $1.50 per million tokens + supportsReasoningBudget: true, + }, "claude-opus-4-20250514": { maxTokens: 32_000, // Overridden to 8k if `enableReasoningEffort` is false. contextWindow: 200_000, diff --git a/packages/types/src/providers/bedrock.ts b/packages/types/src/providers/bedrock.ts index 9c1f349334..3d3aa8b984 100644 --- a/packages/types/src/providers/bedrock.ts +++ b/packages/types/src/providers/bedrock.ts @@ -82,6 +82,21 @@ export const bedrockModels = { maxCachePoints: 4, cachableFields: ["system", "messages", "tools"], }, + "anthropic.claude-opus-4-1-20250805-v1:0": { + maxTokens: 8192, + contextWindow: 200_000, + supportsImages: true, + supportsComputerUse: true, + supportsPromptCache: true, + supportsReasoningBudget: true, + inputPrice: 15.0, + outputPrice: 75.0, + cacheWritesPrice: 18.75, + cacheReadsPrice: 1.5, + minTokensPerCachePoint: 1024, + maxCachePoints: 4, + cachableFields: ["system", "messages", "tools"], + }, "anthropic.claude-opus-4-20250514-v1:0": { maxTokens: 8192, contextWindow: 200_000, diff --git a/packages/types/src/providers/claude-code.ts b/packages/types/src/providers/claude-code.ts index 6f72baf008..d9b658319a 100644 --- a/packages/types/src/providers/claude-code.ts +++ b/packages/types/src/providers/claude-code.ts @@ -48,6 +48,14 @@ export const claudeCodeModels = { supportsReasoningBudget: false, requiredReasoningBudget: false, }, + "claude-opus-4-1-20250805": { + ...anthropicModels["claude-opus-4-1-20250805"], + supportsImages: false, + supportsPromptCache: true, // Claude Code does report cache tokens + supportsReasoningEffort: false, + supportsReasoningBudget: false, + requiredReasoningBudget: false, + }, "claude-opus-4-20250514": { ...anthropicModels["claude-opus-4-20250514"], supportsImages: false, diff --git a/packages/types/src/providers/lite-llm.ts b/packages/types/src/providers/lite-llm.ts index 303aa2b298..fdfef95bc6 100644 --- a/packages/types/src/providers/lite-llm.ts +++ b/packages/types/src/providers/lite-llm.ts @@ -17,6 +17,7 @@ export const litellmDefaultModelInfo: ModelInfo = { export const LITELLM_COMPUTER_USE_MODELS = new Set([ "claude-3-5-sonnet-latest", + "claude-opus-4-1-20250805", "claude-opus-4-20250514", "claude-sonnet-4-20250514", "claude-3-7-sonnet-latest", @@ -26,22 +27,26 @@ export const LITELLM_COMPUTER_USE_MODELS = new Set([ "vertex_ai/claude-3-5-sonnet-v2", "vertex_ai/claude-3-5-sonnet-v2@20241022", "vertex_ai/claude-3-7-sonnet@20250219", + "vertex_ai/claude-opus-4-1@20250805", "vertex_ai/claude-opus-4@20250514", "vertex_ai/claude-sonnet-4@20250514", "openrouter/anthropic/claude-3.5-sonnet", "openrouter/anthropic/claude-3.5-sonnet:beta", "openrouter/anthropic/claude-3.7-sonnet", "openrouter/anthropic/claude-3.7-sonnet:beta", + "anthropic.claude-opus-4-1-20250805-v1:0", "anthropic.claude-opus-4-20250514-v1:0", "anthropic.claude-sonnet-4-20250514-v1:0", "anthropic.claude-3-7-sonnet-20250219-v1:0", "anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-5-sonnet-20241022-v2:0", "us.anthropic.claude-3-7-sonnet-20250219-v1:0", + "us.anthropic.claude-opus-4-1-20250805-v1:0", "us.anthropic.claude-opus-4-20250514-v1:0", "us.anthropic.claude-sonnet-4-20250514-v1:0", "eu.anthropic.claude-3-5-sonnet-20241022-v2:0", "eu.anthropic.claude-3-7-sonnet-20250219-v1:0", + "eu.anthropic.claude-opus-4-1-20250805-v1:0", "eu.anthropic.claude-opus-4-20250514-v1:0", "eu.anthropic.claude-sonnet-4-20250514-v1:0", "snowflake/claude-3-5-sonnet", diff --git a/packages/types/src/providers/openrouter.ts b/packages/types/src/providers/openrouter.ts index bbdbc7e732..51d096130b 100644 --- a/packages/types/src/providers/openrouter.ts +++ b/packages/types/src/providers/openrouter.ts @@ -39,6 +39,7 @@ export const OPEN_ROUTER_PROMPT_CACHING_MODELS = new Set([ "anthropic/claude-3.7-sonnet:thinking", "anthropic/claude-sonnet-4", "anthropic/claude-opus-4", + "anthropic/claude-opus-4.1", "google/gemini-2.5-flash-preview", "google/gemini-2.5-flash-preview:thinking", "google/gemini-2.5-flash-preview-05-20", @@ -59,6 +60,7 @@ export const OPEN_ROUTER_COMPUTER_USE_MODELS = new Set([ "anthropic/claude-3.7-sonnet:thinking", "anthropic/claude-sonnet-4", "anthropic/claude-opus-4", + "anthropic/claude-opus-4.1", ]) // When we first launched these models we didn't have support for @@ -77,6 +79,7 @@ export const OPEN_ROUTER_REQUIRED_REASONING_BUDGET_MODELS = new Set([ export const OPEN_ROUTER_REASONING_BUDGET_MODELS = new Set([ "anthropic/claude-3.7-sonnet:beta", "anthropic/claude-opus-4", + "anthropic/claude-opus-4.1", "anthropic/claude-sonnet-4", "google/gemini-2.5-pro-preview", "google/gemini-2.5-pro", diff --git a/packages/types/src/providers/vertex.ts b/packages/types/src/providers/vertex.ts index a48ebacdfb..ee8a56ae2c 100644 --- a/packages/types/src/providers/vertex.ts +++ b/packages/types/src/providers/vertex.ts @@ -175,6 +175,18 @@ export const vertexModels = { cacheReadsPrice: 0.3, supportsReasoningBudget: true, }, + "claude-opus-4-1@20250805": { + maxTokens: 8192, + contextWindow: 200_000, + supportsImages: true, + supportsComputerUse: true, + supportsPromptCache: true, + inputPrice: 15.0, + outputPrice: 75.0, + cacheWritesPrice: 18.75, + cacheReadsPrice: 1.5, + supportsReasoningBudget: true, + }, "claude-opus-4@20250514": { maxTokens: 8192, contextWindow: 200_000, diff --git a/src/api/providers/anthropic.ts b/src/api/providers/anthropic.ts index 52dec1ae55..f456586762 100644 --- a/src/api/providers/anthropic.ts +++ b/src/api/providers/anthropic.ts @@ -47,6 +47,7 @@ export class AnthropicHandler extends BaseProvider implements SingleCompletionHa switch (modelId) { case "claude-sonnet-4-20250514": + case "claude-opus-4-1-20250805": case "claude-opus-4-20250514": case "claude-3-7-sonnet-20250219": case "claude-3-5-sonnet-20241022": @@ -105,6 +106,7 @@ export class AnthropicHandler extends BaseProvider implements SingleCompletionHa // Then check for models that support prompt caching switch (modelId) { case "claude-sonnet-4-20250514": + case "claude-opus-4-1-20250805": case "claude-opus-4-20250514": case "claude-3-7-sonnet-20250219": case "claude-3-5-sonnet-20241022": diff --git a/src/api/providers/fetchers/__tests__/openrouter.spec.ts b/src/api/providers/fetchers/__tests__/openrouter.spec.ts index 5b620395c0..44892d2024 100644 --- a/src/api/providers/fetchers/__tests__/openrouter.spec.ts +++ b/src/api/providers/fetchers/__tests__/openrouter.spec.ts @@ -32,6 +32,7 @@ describe("OpenRouter API", () => { "google/gemini-2.5-pro-preview", // Excluded due to lag issue (#4487) "google/gemini-2.5-flash", // OpenRouter doesn't report this as supporting prompt caching "google/gemini-2.5-flash-lite-preview-06-17", // OpenRouter doesn't report this as supporting prompt caching + "anthropic/claude-opus-4.1", // Not yet available in OpenRouter API ]) const ourCachingModels = Array.from(OPEN_ROUTER_PROMPT_CACHING_MODELS).filter( @@ -48,12 +49,20 @@ describe("OpenRouter API", () => { expect(ourCachingModels.sort()).toEqual(expectedCachingModels) + const excludedComputerUseModels = new Set([ + "anthropic/claude-opus-4.1", // Not yet available in OpenRouter API + ]) + + const expectedComputerUseModels = Array.from(OPEN_ROUTER_COMPUTER_USE_MODELS) + .filter((id) => !excludedComputerUseModels.has(id)) + .sort() + expect( Object.entries(models) .filter(([_, model]) => model.supportsComputerUse) .map(([id, _]) => id) .sort(), - ).toEqual(Array.from(OPEN_ROUTER_COMPUTER_USE_MODELS).sort()) + ).toEqual(expectedComputerUseModels) expect( Object.entries(models) @@ -67,6 +76,7 @@ describe("OpenRouter API", () => { "anthropic/claude-3.7-sonnet:beta", "anthropic/claude-3.7-sonnet:thinking", "anthropic/claude-opus-4", + // "anthropic/claude-opus-4.1", // Not yet available in OpenRouter API "anthropic/claude-sonnet-4", "arliai/qwq-32b-arliai-rpr-v1:free", "cognitivecomputations/dolphin3.0-r1-mistral-24b:free", @@ -122,6 +132,7 @@ describe("OpenRouter API", () => { "google/gemini-2.5-flash", "google/gemini-2.5-flash-lite-preview-06-17", "google/gemini-2.5-pro", + "anthropic/claude-opus-4.1", // Not yet available in OpenRouter API ]) const expectedReasoningBudgetModels = Array.from(OPEN_ROUTER_REASONING_BUDGET_MODELS) diff --git a/src/api/providers/fetchers/openrouter.ts b/src/api/providers/fetchers/openrouter.ts index bb3b97e7aa..be8fb26f7a 100644 --- a/src/api/providers/fetchers/openrouter.ts +++ b/src/api/providers/fetchers/openrouter.ts @@ -232,6 +232,11 @@ export const parseOpenRouterModel = ({ modelInfo.maxTokens = anthropicModels["claude-3-7-sonnet-20250219:thinking"].maxTokens } + // Set claude-opus-4.1 model to use the correct configuration + if (id === "anthropic/claude-opus-4.1") { + modelInfo.maxTokens = anthropicModels["claude-opus-4-1-20250805"].maxTokens + } + // Set horizon-alpha model to 32k max tokens if (id === "openrouter/horizon-alpha") { modelInfo.maxTokens = 32768 From 24584f54ececa7eb5e96ca5c8a46485258da56de Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 11:05:55 -0700 Subject: [PATCH 070/253] feat: clean up task list in HistoryPreview and History components (#6687) Co-authored-by: Roo Code Co-authored-by: Bruno Bergher Co-authored-by: Bruno Bergher Co-authored-by: Matt Rubens --- .../components/common/VersionIndicator.tsx | 2 +- .../src/components/history/DeleteButton.tsx | 2 +- .../src/components/history/HistoryView.tsx | 6 +- .../src/components/history/TaskItem.tsx | 30 +-- .../src/components/history/TaskItemFooter.tsx | 52 ++--- .../src/components/history/TaskItemHeader.tsx | 37 ---- .../history/__tests__/HistoryPreview.spec.tsx | 2 + .../history/__tests__/TaskItem.spec.tsx | 36 ++-- .../history/__tests__/TaskItemFooter.spec.tsx | 62 +++--- .../history/__tests__/TaskItemHeader.spec.tsx | 35 ---- webview-ui/src/i18n/locales/ca/common.json | 16 ++ webview-ui/src/i18n/locales/de/common.json | 16 ++ webview-ui/src/i18n/locales/en/common.json | 16 ++ webview-ui/src/i18n/locales/es/common.json | 16 ++ webview-ui/src/i18n/locales/fr/common.json | 16 ++ webview-ui/src/i18n/locales/hi/common.json | 16 ++ webview-ui/src/i18n/locales/id/common.json | 16 ++ webview-ui/src/i18n/locales/it/common.json | 16 ++ webview-ui/src/i18n/locales/ja/common.json | 16 ++ webview-ui/src/i18n/locales/ko/common.json | 16 ++ webview-ui/src/i18n/locales/nl/common.json | 16 ++ webview-ui/src/i18n/locales/pl/common.json | 16 ++ webview-ui/src/i18n/locales/pt-BR/common.json | 16 ++ webview-ui/src/i18n/locales/ru/common.json | 16 ++ webview-ui/src/i18n/locales/tr/common.json | 16 ++ webview-ui/src/i18n/locales/vi/common.json | 16 ++ webview-ui/src/i18n/locales/zh-CN/common.json | 16 ++ webview-ui/src/i18n/locales/zh-TW/common.json | 16 ++ webview-ui/src/utils/__tests__/format.spec.ts | 183 ++++++++++++++---- webview-ui/src/utils/format.ts | 52 ++++- 30 files changed, 567 insertions(+), 220 deletions(-) delete mode 100644 webview-ui/src/components/history/TaskItemHeader.tsx delete mode 100644 webview-ui/src/components/history/__tests__/TaskItemHeader.spec.tsx diff --git a/webview-ui/src/components/common/VersionIndicator.tsx b/webview-ui/src/components/common/VersionIndicator.tsx index b0c517fdaf..1776a2d39a 100644 --- a/webview-ui/src/components/common/VersionIndicator.tsx +++ b/webview-ui/src/components/common/VersionIndicator.tsx @@ -13,7 +13,7 @@ const VersionIndicator: React.FC = ({ onClick, className return ( diff --git a/webview-ui/src/components/history/DeleteButton.tsx b/webview-ui/src/components/history/DeleteButton.tsx index 3e99027546..bd91803627 100644 --- a/webview-ui/src/components/history/DeleteButton.tsx +++ b/webview-ui/src/components/history/DeleteButton.tsx @@ -31,7 +31,7 @@ export const DeleteButton = ({ itemId, onDelete }: DeleteButtonProps) => { size="icon" data-testid="delete-task-button" onClick={handleDeleteClick} - className="group-hover:opacity-100 opacity-50 transition-opacity"> + className="opacity-70"> diff --git a/webview-ui/src/components/history/HistoryView.tsx b/webview-ui/src/components/history/HistoryView.tsx index 2f156d0418..e7b574c490 100644 --- a/webview-ui/src/components/history/HistoryView.tsx +++ b/webview-ui/src/components/history/HistoryView.tsx @@ -222,7 +222,7 @@ const HistoryView = ({ onDone }: HistoryViewProps) => {
    - + { isSelected={selectedTaskIds.includes(item.id)} onToggleSelection={toggleTaskSelection} onDelete={setDeleteTaskId} - className="m-2 mr-0" + className="m-2" /> )} /> @@ -251,7 +251,7 @@ const HistoryView = ({ onDone }: HistoryViewProps) => { {/* Fixed action bar at bottom - only shown in selection mode with selected items */} {isSelectionMode && selectedTaskIds.length > 0 && ( -
    +
    {t("history:selectedItems", { selected: selectedTaskIds.length, total: tasks.length })}
    diff --git a/webview-ui/src/components/history/TaskItem.tsx b/webview-ui/src/components/history/TaskItem.tsx index 5338819dd3..d661d99930 100644 --- a/webview-ui/src/components/history/TaskItem.tsx +++ b/webview-ui/src/components/history/TaskItem.tsx @@ -5,7 +5,6 @@ import { vscode } from "@/utils/vscode" import { cn } from "@/lib/utils" import { Checkbox } from "@/components/ui/checkbox" -import TaskItemHeader from "./TaskItemHeader" import TaskItemFooter from "./TaskItemFooter" interface DisplayHistoryItem extends HistoryItem { @@ -48,11 +47,11 @@ const TaskItem = ({ key={item.id} data-testid={`task-item-${item.id}`} className={cn( - "cursor-pointer group bg-vscode-editor-background rounded relative overflow-hidden hover:border-vscode-toolbar-hoverBackground/60", + "cursor-pointer group bg-vscode-editor-background rounded relative overflow-hidden border border-transparent hover:bg-vscode-list-hoverBackground transition-colors", className, )} onClick={handleClick}> -
    +
    {/* Selection checkbox - only in full variant */} {!isCompact && isSelectionMode && (
    - {/* Header with metadata */} - - - {/* Task content */}
    {item.highlight ? undefined : item.task}
    + - {/* Task Item Footer */} - - - {/* Workspace info */} {showWorkspace && item.workspace && (
    diff --git a/webview-ui/src/components/history/TaskItemFooter.tsx b/webview-ui/src/components/history/TaskItemFooter.tsx index 424cf1eadb..135d24d2c0 100644 --- a/webview-ui/src/components/history/TaskItemFooter.tsx +++ b/webview-ui/src/components/history/TaskItemFooter.tsx @@ -1,59 +1,41 @@ import React from "react" import type { HistoryItem } from "@roo-code/types" -import { Coins, FileIcon } from "lucide-react" -import prettyBytes from "pretty-bytes" -import { formatLargeNumber } from "@/utils/format" +import { formatTimeAgo } from "@/utils/format" import { CopyButton } from "./CopyButton" import { ExportButton } from "./ExportButton" +import { DeleteButton } from "./DeleteButton" +import { StandardTooltip } from "../ui/standard-tooltip" export interface TaskItemFooterProps { item: HistoryItem variant: "compact" | "full" isSelectionMode?: boolean + onDelete?: (taskId: string) => void } -const TaskItemFooter: React.FC = ({ item, variant, isSelectionMode = false }) => { +const TaskItemFooter: React.FC = ({ item, variant, isSelectionMode = false, onDelete }) => { return ( -
    -
    - {!!(item.cacheReads || item.cacheWrites) && ( - - - {formatLargeNumber(item.cacheWrites || 0)} - - {formatLargeNumber(item.cacheReads || 0)} - - )} - - {/* Full Tokens */} - {!!(item.tokensIn || item.tokensOut) && ( - - ↑ {formatLargeNumber(item.tokensIn || 0)} - ↓ {formatLargeNumber(item.tokensOut || 0)} - - )} - - {/* Full Cost */} +
    +
    + {/* Datetime with time-ago format */} + + {formatTimeAgo(item.ts)} + + · + {/* Cost */} {!!item.totalCost && ( - - - {"$" + item.totalCost.toFixed(2)} - - )} - - {!!item.size && ( - - - {prettyBytes(item.size)} + + {"$" + item.totalCost.toFixed(2)} )}
    {/* Action Buttons for non-compact view */} {!isSelectionMode && ( -
    +
    {variant === "full" && } + {onDelete && }
    )}
    diff --git a/webview-ui/src/components/history/TaskItemHeader.tsx b/webview-ui/src/components/history/TaskItemHeader.tsx deleted file mode 100644 index bdddb090c8..0000000000 --- a/webview-ui/src/components/history/TaskItemHeader.tsx +++ /dev/null @@ -1,37 +0,0 @@ -import React from "react" -import type { HistoryItem } from "@roo-code/types" -import { formatDate } from "@/utils/format" -import { DeleteButton } from "./DeleteButton" -import { cn } from "@/lib/utils" - -export interface TaskItemHeaderProps { - item: HistoryItem - isSelectionMode: boolean - onDelete?: (taskId: string) => void -} - -const TaskItemHeader: React.FC = ({ item, isSelectionMode, onDelete }) => { - return ( -
    -
    - - {formatDate(item.ts)} - -
    - - {/* Action Buttons */} - {!isSelectionMode && ( -
    - {onDelete && } -
    - )} -
    - ) -} - -export default TaskItemHeader diff --git a/webview-ui/src/components/history/__tests__/HistoryPreview.spec.tsx b/webview-ui/src/components/history/__tests__/HistoryPreview.spec.tsx index 7951574963..20e7fcbdf3 100644 --- a/webview-ui/src/components/history/__tests__/HistoryPreview.spec.tsx +++ b/webview-ui/src/components/history/__tests__/HistoryPreview.spec.tsx @@ -148,6 +148,8 @@ describe("HistoryPreview", () => { expect(screen.getByTestId("task-item-task-2")).toBeInTheDocument() expect(screen.getByTestId("task-item-task-3")).toBeInTheDocument() expect(screen.queryByTestId("task-item-task-4")).not.toBeInTheDocument() + expect(screen.queryByTestId("task-item-task-5")).not.toBeInTheDocument() + expect(screen.queryByTestId("task-item-task-6")).not.toBeInTheDocument() }) it("renders only 1 task when there is only 1 task", () => { diff --git a/webview-ui/src/components/history/__tests__/TaskItem.spec.tsx b/webview-ui/src/components/history/__tests__/TaskItem.spec.tsx index 9d4a939a1e..6995d5840c 100644 --- a/webview-ui/src/components/history/__tests__/TaskItem.spec.tsx +++ b/webview-ui/src/components/history/__tests__/TaskItem.spec.tsx @@ -9,6 +9,12 @@ vi.mock("@src/i18n/TranslationContext", () => ({ }), })) +vi.mock("@/utils/format", () => ({ + formatTimeAgo: vi.fn(() => "2 hours ago"), + formatDate: vi.fn(() => "January 15 at 2:30 PM"), + formatLargeNumber: vi.fn((num: number) => num.toString()), +})) + const mockTask = { id: "1", number: 1, @@ -74,16 +80,10 @@ describe("TaskItem", () => { expect(screen.getByTestId("export")).toBeInTheDocument() }) - it("displays cache information when present", () => { - const mockTaskWithCache = { - ...mockTask, - cacheReads: 10, - cacheWrites: 5, - } - + it("displays time ago information", () => { render( { />, ) - // Should display cache information in the footer - expect(screen.getByTestId("cache-compact")).toBeInTheDocument() - expect(screen.getByText("5")).toBeInTheDocument() // cache writes - expect(screen.getByText("10")).toBeInTheDocument() // cache reads + // Should display time ago format + expect(screen.getByText(/ago/)).toBeInTheDocument() }) - it("does not display cache information when not present", () => { - const mockTaskWithoutCache = { - ...mockTask, - cacheReads: 0, - cacheWrites: 0, - } - + it("applies hover effect class", () => { render( { />, ) - // Cache section should not be present - expect(screen.queryByTestId("cache-compact")).not.toBeInTheDocument() + const taskItem = screen.getByTestId("task-item-1") + expect(taskItem).toHaveClass("hover:bg-vscode-list-hoverBackground") }) }) diff --git a/webview-ui/src/components/history/__tests__/TaskItemFooter.spec.tsx b/webview-ui/src/components/history/__tests__/TaskItemFooter.spec.tsx index 661cecf122..5c568bb65b 100644 --- a/webview-ui/src/components/history/__tests__/TaskItemFooter.spec.tsx +++ b/webview-ui/src/components/history/__tests__/TaskItemFooter.spec.tsx @@ -8,6 +8,12 @@ vi.mock("@src/i18n/TranslationContext", () => ({ }), })) +vi.mock("@/utils/format", () => ({ + formatTimeAgo: vi.fn(() => "2 hours ago"), + formatDate: vi.fn(() => "January 15 at 2:30 PM"), + formatLargeNumber: vi.fn((num: number) => num.toString()), +})) + const mockItem = { id: "1", number: 1, @@ -20,12 +26,11 @@ const mockItem = { } describe("TaskItemFooter", () => { - it("renders token information", () => { + it("renders time ago information", () => { render() - // Check for token counts using testids since the text is split across elements - expect(screen.getByTestId("tokens-in-footer-compact")).toBeInTheDocument() - expect(screen.getByTestId("tokens-out-footer-compact")).toBeInTheDocument() + // Should show time ago format + expect(screen.getByText(/ago/)).toBeInTheDocument() }) it("renders cost information", () => { @@ -43,31 +48,38 @@ describe("TaskItemFooter", () => { expect(screen.getByTestId("export")).toBeInTheDocument() }) - it("renders cache information when present", () => { - const mockItemWithCache = { - ...mockItem, - cacheReads: 5, - cacheWrites: 3, - } + it("hides export button in compact variant", () => { + render() - render() - - // Check for cache display using testid - expect(screen.getByTestId("cache-compact")).toBeInTheDocument() - expect(screen.getByText("3")).toBeInTheDocument() // cache writes - expect(screen.getByText("5")).toBeInTheDocument() // cache reads + // Should show copy button but not export button + expect(screen.getByTestId("copy-prompt-button")).toBeInTheDocument() + expect(screen.queryByTestId("export")).not.toBeInTheDocument() }) - it("does not render cache information when not present", () => { - const mockItemWithoutCache = { - ...mockItem, - cacheReads: 0, - cacheWrites: 0, - } + it("hides action buttons in selection mode", () => { + render() - render() + // Should not show any action buttons + expect(screen.queryByTestId("copy-prompt-button")).not.toBeInTheDocument() + expect(screen.queryByTestId("export")).not.toBeInTheDocument() + expect(screen.queryByTestId("delete-task-button")).not.toBeInTheDocument() + }) - // Cache section should not be present - expect(screen.queryByTestId("cache-compact")).not.toBeInTheDocument() + it("shows delete button when not in selection mode and onDelete is provided", () => { + render() + + expect(screen.getByTestId("delete-task-button")).toBeInTheDocument() + }) + + it("does not show delete button in selection mode", () => { + render() + + expect(screen.queryByTestId("delete-task-button")).not.toBeInTheDocument() + }) + + it("does not show delete button when onDelete is not provided", () => { + render() + + expect(screen.queryByTestId("delete-task-button")).not.toBeInTheDocument() }) }) diff --git a/webview-ui/src/components/history/__tests__/TaskItemHeader.spec.tsx b/webview-ui/src/components/history/__tests__/TaskItemHeader.spec.tsx deleted file mode 100644 index 090bf2521f..0000000000 --- a/webview-ui/src/components/history/__tests__/TaskItemHeader.spec.tsx +++ /dev/null @@ -1,35 +0,0 @@ -import { render, screen } from "@/utils/test-utils" - -import TaskItemHeader from "../TaskItemHeader" - -vi.mock("@src/i18n/TranslationContext", () => ({ - useAppTranslation: () => ({ - t: (key: string) => key, - }), -})) - -const mockItem = { - id: "1", - number: 1, - task: "Test task", - ts: Date.now(), - tokensIn: 100, - tokensOut: 50, - totalCost: 0.002, - workspace: "/test/workspace", -} - -describe("TaskItemHeader", () => { - it("renders date information", () => { - render() - - // TaskItemHeader shows the formatted date, not the task text - expect(screen.getByText(/\w+ \d{1,2}, \d{1,2}:\d{2} \w{2}/)).toBeInTheDocument() // Date format like "JUNE 14, 10:15 AM" - }) - - it("shows delete button when not in selection mode", () => { - render() - - expect(screen.getByRole("button")).toBeInTheDocument() - }) -}) diff --git a/webview-ui/src/i18n/locales/ca/common.json b/webview-ui/src/i18n/locales/ca/common.json index 13ad7a2ca7..2351c99d01 100644 --- a/webview-ui/src/i18n/locales/ca/common.json +++ b/webview-ui/src/i18n/locales/ca/common.json @@ -67,5 +67,21 @@ "editMessage": "Editar missatge", "editWarning": "Editar aquest missatge eliminarà tots els missatges posteriors de la conversa. Vols continuar?", "proceed": "Continuar" + }, + "time_ago": { + "just_now": "ara mateix", + "seconds_ago": "fa {{count}} segons", + "minute_ago": "fa un minut", + "minutes_ago": "fa {{count}} minuts", + "hour_ago": "fa una hora", + "hours_ago": "fa {{count}} hores", + "day_ago": "fa un dia", + "days_ago": "fa {{count}} dies", + "week_ago": "fa una setmana", + "weeks_ago": "fa {{count}} setmanes", + "month_ago": "fa un mes", + "months_ago": "fa {{count}} mesos", + "year_ago": "fa un any", + "years_ago": "fa {{count}} anys" } } diff --git a/webview-ui/src/i18n/locales/de/common.json b/webview-ui/src/i18n/locales/de/common.json index c873e25d12..0fec0ba964 100644 --- a/webview-ui/src/i18n/locales/de/common.json +++ b/webview-ui/src/i18n/locales/de/common.json @@ -67,5 +67,21 @@ "editMessage": "Nachricht bearbeiten", "editWarning": "Das Bearbeiten dieser Nachricht wird alle nachfolgenden Nachrichten in der Unterhaltung löschen. Möchtest du fortfahren?", "proceed": "Fortfahren" + }, + "time_ago": { + "just_now": "gerade eben", + "seconds_ago": "vor {{count}} Sekunden", + "minute_ago": "vor einer Minute", + "minutes_ago": "vor {{count}} Minuten", + "hour_ago": "vor einer Stunde", + "hours_ago": "vor {{count}} Stunden", + "day_ago": "vor einem Tag", + "days_ago": "vor {{count}} Tagen", + "week_ago": "vor einer Woche", + "weeks_ago": "vor {{count}} Wochen", + "month_ago": "vor einem Monat", + "months_ago": "vor {{count}} Monaten", + "year_ago": "vor einem Jahr", + "years_ago": "vor {{count}} Jahren" } } diff --git a/webview-ui/src/i18n/locales/en/common.json b/webview-ui/src/i18n/locales/en/common.json index af0dfcdf80..b4bc816a2b 100644 --- a/webview-ui/src/i18n/locales/en/common.json +++ b/webview-ui/src/i18n/locales/en/common.json @@ -67,5 +67,21 @@ "editMessage": "Edit Message", "editWarning": "Editing this message will delete all subsequent messages in the conversation. Do you want to proceed?", "proceed": "Proceed" + }, + "time_ago": { + "just_now": "just now", + "seconds_ago": "{{count}} seconds ago", + "minute_ago": "a minute ago", + "minutes_ago": "{{count}} minutes ago", + "hour_ago": "an hour ago", + "hours_ago": "{{count}} hours ago", + "day_ago": "a day ago", + "days_ago": "{{count}} days ago", + "week_ago": "a week ago", + "weeks_ago": "{{count}} weeks ago", + "month_ago": "a month ago", + "months_ago": "{{count}} months ago", + "year_ago": "a year ago", + "years_ago": "{{count}} years ago" } } diff --git a/webview-ui/src/i18n/locales/es/common.json b/webview-ui/src/i18n/locales/es/common.json index ee0a924d43..a733673470 100644 --- a/webview-ui/src/i18n/locales/es/common.json +++ b/webview-ui/src/i18n/locales/es/common.json @@ -67,5 +67,21 @@ "editMessage": "Editar mensaje", "editWarning": "Editar este mensaje eliminará todos los mensajes posteriores en la conversación. ¿Deseas continuar?", "proceed": "Continuar" + }, + "time_ago": { + "just_now": "ahora mismo", + "seconds_ago": "hace {{count}} segundos", + "minute_ago": "hace un minuto", + "minutes_ago": "hace {{count}} minutos", + "hour_ago": "hace una hora", + "hours_ago": "hace {{count}} horas", + "day_ago": "hace un día", + "days_ago": "hace {{count}} días", + "week_ago": "hace una semana", + "weeks_ago": "hace {{count}} semanas", + "month_ago": "hace un mes", + "months_ago": "hace {{count}} meses", + "year_ago": "hace un año", + "years_ago": "hace {{count}} años" } } diff --git a/webview-ui/src/i18n/locales/fr/common.json b/webview-ui/src/i18n/locales/fr/common.json index 40c12e2afb..4c4ad83bc4 100644 --- a/webview-ui/src/i18n/locales/fr/common.json +++ b/webview-ui/src/i18n/locales/fr/common.json @@ -67,5 +67,21 @@ "editMessage": "Modifier le message", "editWarning": "Modifier ce message supprimera tous les messages suivants dans la conversation. Voulez-vous continuer ?", "proceed": "Continuer" + }, + "time_ago": { + "just_now": "à l'instant", + "seconds_ago": "il y a {{count}} secondes", + "minute_ago": "il y a une minute", + "minutes_ago": "il y a {{count}} minutes", + "hour_ago": "il y a une heure", + "hours_ago": "il y a {{count}} heures", + "day_ago": "il y a un jour", + "days_ago": "il y a {{count}} jours", + "week_ago": "il y a une semaine", + "weeks_ago": "il y a {{count}} semaines", + "month_ago": "il y a un mois", + "months_ago": "il y a {{count}} mois", + "year_ago": "il y a un an", + "years_ago": "il y a {{count}} ans" } } diff --git a/webview-ui/src/i18n/locales/hi/common.json b/webview-ui/src/i18n/locales/hi/common.json index 227e25637e..7e809bd0a7 100644 --- a/webview-ui/src/i18n/locales/hi/common.json +++ b/webview-ui/src/i18n/locales/hi/common.json @@ -67,5 +67,21 @@ "editMessage": "संदेश संपादित करें", "editWarning": "इस संदेश को संपादित करने से बातचीत के सभी बाद के संदेश हट जाएंगे। क्या आप जारी रखना चाहते हैं?", "proceed": "जारी रखें" + }, + "time_ago": { + "just_now": "अभी", + "seconds_ago": "{{count}} सेकंड पहले", + "minute_ago": "एक मिनट पहले", + "minutes_ago": "{{count}} मिनट पहले", + "hour_ago": "एक घंटे पहले", + "hours_ago": "{{count}} घंटे पहले", + "day_ago": "एक दिन पहले", + "days_ago": "{{count}} दिन पहले", + "week_ago": "एक सप्ताह पहले", + "weeks_ago": "{{count}} सप्ताह पहले", + "month_ago": "एक महीने पहले", + "months_ago": "{{count}} महीने पहले", + "year_ago": "एक साल पहले", + "years_ago": "{{count}} साल पहले" } } diff --git a/webview-ui/src/i18n/locales/id/common.json b/webview-ui/src/i18n/locales/id/common.json index 3a3a3f5a78..86818bb084 100644 --- a/webview-ui/src/i18n/locales/id/common.json +++ b/webview-ui/src/i18n/locales/id/common.json @@ -67,5 +67,21 @@ "editMessage": "Edit Pesan", "editWarning": "Mengedit pesan ini akan menghapus semua pesan selanjutnya dalam percakapan. Apakah kamu ingin melanjutkan?", "proceed": "Lanjutkan" + }, + "time_ago": { + "just_now": "baru saja", + "seconds_ago": "{{count}} detik yang lalu", + "minute_ago": "satu menit yang lalu", + "minutes_ago": "{{count}} menit yang lalu", + "hour_ago": "satu jam yang lalu", + "hours_ago": "{{count}} jam yang lalu", + "day_ago": "satu hari yang lalu", + "days_ago": "{{count}} hari yang lalu", + "week_ago": "satu minggu yang lalu", + "weeks_ago": "{{count}} minggu yang lalu", + "month_ago": "satu bulan yang lalu", + "months_ago": "{{count}} bulan yang lalu", + "year_ago": "satu tahun yang lalu", + "years_ago": "{{count}} tahun yang lalu" } } diff --git a/webview-ui/src/i18n/locales/it/common.json b/webview-ui/src/i18n/locales/it/common.json index 20886d126b..94f637ac3d 100644 --- a/webview-ui/src/i18n/locales/it/common.json +++ b/webview-ui/src/i18n/locales/it/common.json @@ -67,5 +67,21 @@ "editMessage": "Modifica Messaggio", "editWarning": "Modificando questo messaggio verranno eliminati tutti i messaggi successivi nella conversazione. Vuoi procedere?", "proceed": "Procedi" + }, + "time_ago": { + "just_now": "proprio ora", + "seconds_ago": "{{count}} secondi fa", + "minute_ago": "un minuto fa", + "minutes_ago": "{{count}} minuti fa", + "hour_ago": "un'ora fa", + "hours_ago": "{{count}} ore fa", + "day_ago": "un giorno fa", + "days_ago": "{{count}} giorni fa", + "week_ago": "una settimana fa", + "weeks_ago": "{{count}} settimane fa", + "month_ago": "un mese fa", + "months_ago": "{{count}} mesi fa", + "year_ago": "un anno fa", + "years_ago": "{{count}} anni fa" } } diff --git a/webview-ui/src/i18n/locales/ja/common.json b/webview-ui/src/i18n/locales/ja/common.json index a7390de32a..a3f6a90a22 100644 --- a/webview-ui/src/i18n/locales/ja/common.json +++ b/webview-ui/src/i18n/locales/ja/common.json @@ -67,5 +67,21 @@ "editMessage": "メッセージを編集", "editWarning": "このメッセージを編集すると、会話内の後続のメッセージもすべて削除されます。続行しますか？", "proceed": "続行" + }, + "time_ago": { + "just_now": "たった今", + "seconds_ago": "{{count}}秒前", + "minute_ago": "1分前", + "minutes_ago": "{{count}}分前", + "hour_ago": "1時間前", + "hours_ago": "{{count}}時間前", + "day_ago": "1日前", + "days_ago": "{{count}}日前", + "week_ago": "1週間前", + "weeks_ago": "{{count}}週間前", + "month_ago": "1ヶ月前", + "months_ago": "{{count}}ヶ月前", + "year_ago": "1年前", + "years_ago": "{{count}}年前" } } diff --git a/webview-ui/src/i18n/locales/ko/common.json b/webview-ui/src/i18n/locales/ko/common.json index 2164c65624..83d56930df 100644 --- a/webview-ui/src/i18n/locales/ko/common.json +++ b/webview-ui/src/i18n/locales/ko/common.json @@ -67,5 +67,21 @@ "editMessage": "메시지 편집", "editWarning": "이 메시지를 편집하면 대화의 모든 후속 메시지가 삭제됩니다. 계속하시겠습니까?", "proceed": "계속" + }, + "time_ago": { + "just_now": "방금", + "seconds_ago": "{{count}}초 전", + "minute_ago": "1분 전", + "minutes_ago": "{{count}}분 전", + "hour_ago": "1시간 전", + "hours_ago": "{{count}}시간 전", + "day_ago": "1일 전", + "days_ago": "{{count}}일 전", + "week_ago": "1주일 전", + "weeks_ago": "{{count}}주일 전", + "month_ago": "1개월 전", + "months_ago": "{{count}}개월 전", + "year_ago": "1년 전", + "years_ago": "{{count}}년 전" } } diff --git a/webview-ui/src/i18n/locales/nl/common.json b/webview-ui/src/i18n/locales/nl/common.json index 4b72bccb9c..d81570c705 100644 --- a/webview-ui/src/i18n/locales/nl/common.json +++ b/webview-ui/src/i18n/locales/nl/common.json @@ -67,5 +67,21 @@ "editMessage": "Bericht Bewerken", "editWarning": "Het bewerken van dit bericht zal alle volgende berichten in het gesprek verwijderen. Wil je doorgaan?", "proceed": "Doorgaan" + }, + "time_ago": { + "just_now": "zojuist", + "seconds_ago": "{{count}} seconden geleden", + "minute_ago": "een minuut geleden", + "minutes_ago": "{{count}} minuten geleden", + "hour_ago": "een uur geleden", + "hours_ago": "{{count}} uur geleden", + "day_ago": "een dag geleden", + "days_ago": "{{count}} dagen geleden", + "week_ago": "een week geleden", + "weeks_ago": "{{count}} weken geleden", + "month_ago": "een maand geleden", + "months_ago": "{{count}} maanden geleden", + "year_ago": "een jaar geleden", + "years_ago": "{{count}} jaar geleden" } } diff --git a/webview-ui/src/i18n/locales/pl/common.json b/webview-ui/src/i18n/locales/pl/common.json index 6ec9e6661a..77679ef7c5 100644 --- a/webview-ui/src/i18n/locales/pl/common.json +++ b/webview-ui/src/i18n/locales/pl/common.json @@ -67,5 +67,21 @@ "editMessage": "Edytuj Wiadomość", "editWarning": "Edycja tej wiadomości spowoduje usunięcie wszystkich kolejnych wiadomości w rozmowie. Czy chcesz kontynuować?", "proceed": "Kontynuuj" + }, + "time_ago": { + "just_now": "przed chwilą", + "seconds_ago": "{{count}} sekund temu", + "minute_ago": "minutę temu", + "minutes_ago": "{{count}} minut temu", + "hour_ago": "godzinę temu", + "hours_ago": "{{count}} godzin temu", + "day_ago": "dzień temu", + "days_ago": "{{count}} dni temu", + "week_ago": "tydzień temu", + "weeks_ago": "{{count}} tygodni temu", + "month_ago": "miesiąc temu", + "months_ago": "{{count}} miesięcy temu", + "year_ago": "rok temu", + "years_ago": "{{count}} lat temu" } } diff --git a/webview-ui/src/i18n/locales/pt-BR/common.json b/webview-ui/src/i18n/locales/pt-BR/common.json index 964ba893f2..3fb4273d89 100644 --- a/webview-ui/src/i18n/locales/pt-BR/common.json +++ b/webview-ui/src/i18n/locales/pt-BR/common.json @@ -67,5 +67,21 @@ "editMessage": "Editar Mensagem", "editWarning": "Editar esta mensagem irá excluir todas as mensagens subsequentes na conversa. Deseja prosseguir?", "proceed": "Prosseguir" + }, + "time_ago": { + "just_now": "agora mesmo", + "seconds_ago": "há {{count}} segundos", + "minute_ago": "há um minuto", + "minutes_ago": "há {{count}} minutos", + "hour_ago": "há uma hora", + "hours_ago": "há {{count}} horas", + "day_ago": "há um dia", + "days_ago": "há {{count}} dias", + "week_ago": "há uma semana", + "weeks_ago": "há {{count}} semanas", + "month_ago": "há um mês", + "months_ago": "há {{count}} meses", + "year_ago": "há um ano", + "years_ago": "há {{count}} anos" } } diff --git a/webview-ui/src/i18n/locales/ru/common.json b/webview-ui/src/i18n/locales/ru/common.json index 772b797bba..f43c2e9e8b 100644 --- a/webview-ui/src/i18n/locales/ru/common.json +++ b/webview-ui/src/i18n/locales/ru/common.json @@ -67,5 +67,21 @@ "editMessage": "Редактировать Сообщение", "editWarning": "Редактирование этого сообщения приведет к удалению всех последующих сообщений в разговоре. Хотите продолжить?", "proceed": "Продолжить" + }, + "time_ago": { + "just_now": "только что", + "seconds_ago": "{{count}} секунд назад", + "minute_ago": "минуту назад", + "minutes_ago": "{{count}} минут назад", + "hour_ago": "час назад", + "hours_ago": "{{count}} часов назад", + "day_ago": "день назад", + "days_ago": "{{count}} дней назад", + "week_ago": "неделю назад", + "weeks_ago": "{{count}} недель назад", + "month_ago": "месяц назад", + "months_ago": "{{count}} месяцев назад", + "year_ago": "год назад", + "years_ago": "{{count}} лет назад" } } diff --git a/webview-ui/src/i18n/locales/tr/common.json b/webview-ui/src/i18n/locales/tr/common.json index 7bbb6f3d84..2f3a7c957c 100644 --- a/webview-ui/src/i18n/locales/tr/common.json +++ b/webview-ui/src/i18n/locales/tr/common.json @@ -67,5 +67,21 @@ "editMessage": "Mesajı Düzenle", "editWarning": "Bu mesajı düzenlemek, konuşmadaki sonraki tüm mesajları da silecektir. Devam etmek istiyor musun?", "proceed": "Devam Et" + }, + "time_ago": { + "just_now": "şimdi", + "seconds_ago": "{{count}} saniye önce", + "minute_ago": "bir dakika önce", + "minutes_ago": "{{count}} dakika önce", + "hour_ago": "bir saat önce", + "hours_ago": "{{count}} saat önce", + "day_ago": "bir gün önce", + "days_ago": "{{count}} gün önce", + "week_ago": "bir hafta önce", + "weeks_ago": "{{count}} hafta önce", + "month_ago": "bir ay önce", + "months_ago": "{{count}} ay önce", + "year_ago": "bir yıl önce", + "years_ago": "{{count}} yıl önce" } } diff --git a/webview-ui/src/i18n/locales/vi/common.json b/webview-ui/src/i18n/locales/vi/common.json index 2d36482495..92aa029b01 100644 --- a/webview-ui/src/i18n/locales/vi/common.json +++ b/webview-ui/src/i18n/locales/vi/common.json @@ -67,5 +67,21 @@ "editMessage": "Chỉnh Sửa Tin Nhắn", "editWarning": "Chỉnh sửa tin nhắn này sẽ xóa tất cả các tin nhắn tiếp theo trong cuộc trò chuyện. Bạn có muốn tiếp tục không?", "proceed": "Tiếp Tục" + }, + "time_ago": { + "just_now": "vừa xong", + "seconds_ago": "{{count}} giây trước", + "minute_ago": "một phút trước", + "minutes_ago": "{{count}} phút trước", + "hour_ago": "một giờ trước", + "hours_ago": "{{count}} giờ trước", + "day_ago": "một ngày trước", + "days_ago": "{{count}} ngày trước", + "week_ago": "một tuần trước", + "weeks_ago": "{{count}} tuần trước", + "month_ago": "một tháng trước", + "months_ago": "{{count}} tháng trước", + "year_ago": "một năm trước", + "years_ago": "{{count}} năm trước" } } diff --git a/webview-ui/src/i18n/locales/zh-CN/common.json b/webview-ui/src/i18n/locales/zh-CN/common.json index de6d1cd7fe..6ff0132370 100644 --- a/webview-ui/src/i18n/locales/zh-CN/common.json +++ b/webview-ui/src/i18n/locales/zh-CN/common.json @@ -67,5 +67,21 @@ "editMessage": "编辑消息", "editWarning": "编辑此消息将删除对话中的所有后续消息。是否继续？", "proceed": "继续" + }, + "time_ago": { + "just_now": "刚刚", + "seconds_ago": "{{count}}秒前", + "minute_ago": "1分钟前", + "minutes_ago": "{{count}}分钟前", + "hour_ago": "1小时前", + "hours_ago": "{{count}}小时前", + "day_ago": "1天前", + "days_ago": "{{count}}天前", + "week_ago": "1周前", + "weeks_ago": "{{count}}周前", + "month_ago": "1个月前", + "months_ago": "{{count}}个月前", + "year_ago": "1年前", + "years_ago": "{{count}}年前" } } diff --git a/webview-ui/src/i18n/locales/zh-TW/common.json b/webview-ui/src/i18n/locales/zh-TW/common.json index a3949a2a9d..3a3310797b 100644 --- a/webview-ui/src/i18n/locales/zh-TW/common.json +++ b/webview-ui/src/i18n/locales/zh-TW/common.json @@ -67,5 +67,21 @@ "editMessage": "編輯訊息", "editWarning": "編輯此訊息將刪除對話中的所有後續訊息。是否繼續？", "proceed": "繼續" + }, + "time_ago": { + "just_now": "剛剛", + "seconds_ago": "{{count}}秒前", + "minute_ago": "1分鐘前", + "minutes_ago": "{{count}}分鐘前", + "hour_ago": "1小時前", + "hours_ago": "{{count}}小時前", + "day_ago": "1天前", + "days_ago": "{{count}}天前", + "week_ago": "1週前", + "weeks_ago": "{{count}}週前", + "month_ago": "1個月前", + "months_ago": "{{count}}個月前", + "year_ago": "1年前", + "years_ago": "{{count}}年前" } } diff --git a/webview-ui/src/utils/__tests__/format.spec.ts b/webview-ui/src/utils/__tests__/format.spec.ts index 4ebd357b6d..4d642f3f44 100644 --- a/webview-ui/src/utils/__tests__/format.spec.ts +++ b/webview-ui/src/utils/__tests__/format.spec.ts @@ -1,51 +1,154 @@ -// npx vitest src/utils/__tests__/format.spec.ts +import { describe, it, expect, vi, beforeEach, afterEach } from "vitest" +import { formatLargeNumber, formatDate, formatTimeAgo } from "../format" -import { formatDate } from "../format" +// Mock i18next +vi.mock("i18next", () => ({ + default: { + t: vi.fn((key: string, options?: any) => { + // Mock translations for testing + const translations: Record = { + "common:number_format.billion_suffix": "b", + "common:number_format.million_suffix": "m", + "common:number_format.thousand_suffix": "k", + "common:time_ago.just_now": "just now", + "common:time_ago.seconds_ago": "{{count}} seconds ago", + "common:time_ago.minute_ago": "a minute ago", + "common:time_ago.minutes_ago": "{{count}} minutes ago", + "common:time_ago.hour_ago": "an hour ago", + "common:time_ago.hours_ago": "{{count}} hours ago", + "common:time_ago.day_ago": "a day ago", + "common:time_ago.days_ago": "{{count}} days ago", + "common:time_ago.week_ago": "a week ago", + "common:time_ago.weeks_ago": "{{count}} weeks ago", + "common:time_ago.month_ago": "a month ago", + "common:time_ago.months_ago": "{{count}} months ago", + "common:time_ago.year_ago": "a year ago", + "common:time_ago.years_ago": "{{count}} years ago", + } -describe("formatDate", () => { - it("formats a timestamp correctly", () => { - // January 15, 2023, 10:30 AM - const timestamp = new Date(2023, 0, 15, 10, 30).getTime() - const result = formatDate(timestamp) + let result = translations[key] || key + if (options?.count !== undefined) { + result = result.replace("{{count}}", options.count.toString()) + } + return result + }), + language: "en", + }, +})) - expect(result).toBe("JANUARY 15, 10:30 AM") +describe("formatLargeNumber", () => { + it("should format billions", () => { + expect(formatLargeNumber(1500000000)).toBe("1.5b") + expect(formatLargeNumber(2000000000)).toBe("2.0b") }) - it("handles different months correctly", () => { - // February 28, 2023, 3:45 PM - const timestamp1 = new Date(2023, 1, 28, 15, 45).getTime() - expect(formatDate(timestamp1)).toBe("FEBRUARY 28, 3:45 PM") - - // December 31, 2023, 11:59 PM - const timestamp2 = new Date(2023, 11, 31, 23, 59).getTime() - expect(formatDate(timestamp2)).toBe("DECEMBER 31, 11:59 PM") + it("should format millions", () => { + expect(formatLargeNumber(1500000)).toBe("1.5m") + expect(formatLargeNumber(2000000)).toBe("2.0m") }) - it("handles AM/PM correctly", () => { - // Morning time - 7:05 AM - const morningTimestamp = new Date(2023, 5, 15, 7, 5).getTime() - expect(formatDate(morningTimestamp)).toBe("JUNE 15, 7:05 AM") - - // Noon - 12:00 PM - const noonTimestamp = new Date(2023, 5, 15, 12, 0).getTime() - expect(formatDate(noonTimestamp)).toBe("JUNE 15, 12:00 PM") - - // Evening time - 8:15 PM - const eveningTimestamp = new Date(2023, 5, 15, 20, 15).getTime() - expect(formatDate(eveningTimestamp)).toBe("JUNE 15, 8:15 PM") + it("should format thousands", () => { + expect(formatLargeNumber(1500)).toBe("1.5k") + expect(formatLargeNumber(2000)).toBe("2.0k") }) - it("handles single-digit minutes with leading zeros", () => { - // 9:05 AM - const timestamp = new Date(2023, 3, 10, 9, 5).getTime() - expect(formatDate(timestamp)).toBe("APRIL 10, 9:05 AM") - }) - - it("converts the result to uppercase", () => { - const timestamp = new Date(2023, 8, 21, 16, 45).getTime() - const result = formatDate(timestamp) - - expect(result).toBe(result.toUpperCase()) - expect(result).toBe("SEPTEMBER 21, 4:45 PM") + it("should return string for small numbers", () => { + expect(formatLargeNumber(999)).toBe("999") + expect(formatLargeNumber(100)).toBe("100") + }) +}) + +describe("formatDate", () => { + it("should format date in English", () => { + const timestamp = new Date("2024-01-15T14:30:00").getTime() + const result = formatDate(timestamp) + // The exact format depends on the locale, but it should contain the date components + expect(result).toMatch(/january|jan/i) + expect(result).toMatch(/15/) + }) +}) + +describe("formatTimeAgo", () => { + let originalDateNow: () => number + + beforeEach(() => { + // Mock Date.now to have a consistent "now" time + originalDateNow = Date.now + Date.now = vi.fn(() => new Date("2024-01-15T12:00:00").getTime()) + }) + + afterEach(() => { + // Restore original Date.now + Date.now = originalDateNow + }) + + it('should return "just now" for very recent times', () => { + const timestamp = new Date("2024-01-15T11:59:35").getTime() // 25 seconds ago + expect(formatTimeAgo(timestamp)).toBe("just now") + }) + + it("should format seconds ago", () => { + const timestamp = new Date("2024-01-15T11:59:15").getTime() // 45 seconds ago + expect(formatTimeAgo(timestamp)).toBe("45 seconds ago") + }) + + it("should format a minute ago", () => { + const timestamp = new Date("2024-01-15T11:59:00").getTime() // 1 minute ago + expect(formatTimeAgo(timestamp)).toBe("a minute ago") + }) + + it("should format minutes ago", () => { + const timestamp = new Date("2024-01-15T11:45:00").getTime() // 15 minutes ago + expect(formatTimeAgo(timestamp)).toBe("15 minutes ago") + }) + + it("should format an hour ago", () => { + const timestamp = new Date("2024-01-15T11:00:00").getTime() // 1 hour ago + expect(formatTimeAgo(timestamp)).toBe("an hour ago") + }) + + it("should format hours ago", () => { + const timestamp = new Date("2024-01-15T09:00:00").getTime() // 3 hours ago + expect(formatTimeAgo(timestamp)).toBe("3 hours ago") + }) + + it("should format a day ago", () => { + const timestamp = new Date("2024-01-14T12:00:00").getTime() // 1 day ago + expect(formatTimeAgo(timestamp)).toBe("a day ago") + }) + + it("should format days ago", () => { + const timestamp = new Date("2024-01-12T12:00:00").getTime() // 3 days ago + expect(formatTimeAgo(timestamp)).toBe("3 days ago") + }) + + it("should format a week ago", () => { + const timestamp = new Date("2024-01-08T12:00:00").getTime() // 7 days ago + expect(formatTimeAgo(timestamp)).toBe("a week ago") + }) + + it("should format weeks ago", () => { + const timestamp = new Date("2024-01-01T12:00:00").getTime() // 14 days ago + expect(formatTimeAgo(timestamp)).toBe("2 weeks ago") + }) + + it("should format a month ago", () => { + const timestamp = new Date("2023-12-15T12:00:00").getTime() // ~1 month ago + expect(formatTimeAgo(timestamp)).toBe("a month ago") + }) + + it("should format months ago", () => { + const timestamp = new Date("2023-10-15T12:00:00").getTime() // ~3 months ago + expect(formatTimeAgo(timestamp)).toBe("3 months ago") + }) + + it("should format a year ago", () => { + const timestamp = new Date("2023-01-15T12:00:00").getTime() // 1 year ago + expect(formatTimeAgo(timestamp)).toBe("a year ago") + }) + + it("should format years ago", () => { + const timestamp = new Date("2021-01-15T12:00:00").getTime() // 3 years ago + expect(formatTimeAgo(timestamp)).toBe("3 years ago") }) }) diff --git a/webview-ui/src/utils/format.ts b/webview-ui/src/utils/format.ts index 7f8d5d266c..29c7a2c966 100644 --- a/webview-ui/src/utils/format.ts +++ b/webview-ui/src/utils/format.ts @@ -17,19 +17,59 @@ export const formatDate = (timestamp: number) => { const date = new Date(timestamp) const locale = i18next.language || "en" - // Get date format style from translations or use default transformations - const dateStr = date.toLocaleString(locale, { + return date.toLocaleString(locale, { month: "long", day: "numeric", hour: "numeric", minute: "2-digit", hour12: true, }) +} - // Apply transformations based on locale or use default - if (locale === "en") { - return dateStr.replace(", ", " ").replace(" at", ",").toUpperCase() +export const formatTimeAgo = (timestamp: number) => { + const now = Date.now() + const diff = now - timestamp + const seconds = Math.floor(diff / 1000) + const minutes = Math.floor(seconds / 60) + const hours = Math.floor(minutes / 60) + const days = Math.floor(hours / 24) + const weeks = Math.floor(days / 7) + const months = Math.floor(days / 30) + const years = Math.floor(days / 365) + + if (years > 0) { + return years === 1 + ? i18next.t("common:time_ago.year_ago") + : i18next.t("common:time_ago.years_ago", { count: years }) + } + if (months > 0) { + return months === 1 + ? i18next.t("common:time_ago.month_ago") + : i18next.t("common:time_ago.months_ago", { count: months }) + } + if (weeks > 0) { + return weeks === 1 + ? i18next.t("common:time_ago.week_ago") + : i18next.t("common:time_ago.weeks_ago", { count: weeks }) + } + if (days > 0) { + return days === 1 + ? i18next.t("common:time_ago.day_ago") + : i18next.t("common:time_ago.days_ago", { count: days }) + } + if (hours > 0) { + return hours === 1 + ? i18next.t("common:time_ago.hour_ago") + : i18next.t("common:time_ago.hours_ago", { count: hours }) + } + if (minutes > 0) { + return minutes === 1 + ? i18next.t("common:time_ago.minute_ago") + : i18next.t("common:time_ago.minutes_ago", { count: minutes }) + } + if (seconds > 30) { + return i18next.t("common:time_ago.seconds_ago", { count: seconds }) } - return dateStr.toUpperCase() + return i18next.t("common:time_ago.just_now") } From 6331f5769b2f8619892c9b9b33f7028e28521495 Mon Sep 17 00:00:00 2001 From: Daniel <57051444+daniel-lxs@users.noreply.github.com> Date: Tue, 5 Aug 2025 13:10:23 -0500 Subject: [PATCH 071/253] feat: add GPT-OSS 120b and 20b models to Groq provider (#6732) --- packages/types/src/providers/groq.ts | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/packages/types/src/providers/groq.ts b/packages/types/src/providers/groq.ts index 2eac1f954a..cab0c69900 100644 --- a/packages/types/src/providers/groq.ts +++ b/packages/types/src/providers/groq.ts @@ -11,6 +11,8 @@ export type GroqModelId = | "qwen/qwen3-32b" | "deepseek-r1-distill-llama-70b" | "moonshotai/kimi-k2-instruct" + | "openai/gpt-oss-120b" + | "openai/gpt-oss-20b" export const groqDefaultModelId: GroqModelId = "llama-3.3-70b-versatile" // Defaulting to Llama3 70B Versatile @@ -97,4 +99,24 @@ export const groqModels = { outputPrice: 3.0, description: "Moonshot AI Kimi K2 Instruct 1T model, 128K context.", }, + "openai/gpt-oss-120b": { + maxTokens: 32766, + contextWindow: 131072, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.15, + outputPrice: 0.75, + description: + "GPT-OSS 120B is OpenAI's flagship open source model, built on a Mixture-of-Experts (MoE) architecture with 20 billion parameters and 128 experts.", + }, + "openai/gpt-oss-20b": { + maxTokens: 32768, + contextWindow: 131072, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.1, + outputPrice: 0.5, + description: + "GPT-OSS 20B is OpenAI's flagship open source model, built on a Mixture-of-Experts (MoE) architecture with 20 billion parameters and 32 experts.", + }, } as const satisfies Record From f0d2a54aad3bb5fd28788fdd051eb1a9b0b7638a Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Tue, 5 Aug 2025 11:12:13 -0700 Subject: [PATCH 072/253] v3.25.7 (#6730) --- .changeset/3.25.7.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .changeset/3.25.7.md diff --git a/.changeset/3.25.7.md b/.changeset/3.25.7.md new file mode 100644 index 0000000000..64a6c07d1b --- /dev/null +++ b/.changeset/3.25.7.md @@ -0,0 +1,19 @@ +--- +"roo-cline": patch +--- + +- Add support for Claude Opus 4.1 +- Add Fireworks AI provider (#6653 by @ershang-fireworks, PR by @ershang-fireworks) +- Add Z AI provider (thanks @jues!) +- Add Groq support for GPT-OSS +- Add code indexing support for multiple folders similar to task history (#6197 by @NaccOll, PR by @NaccOll) +- Make mode selection dropdowns responsive (#6423 by @AyazKaan, PR by @AyazKaan) +- Redesigned task header and task history (thanks @brunobergher!) +- Fix checkpoints timing and ensure checkpoints work properly (#4827 by @mrubens, PR by @NaccOll) +- Fix empty mode names from being saved (#5766 by @kfxmvp, PR by @app/roomote) +- Fix MCP server creation when setting is disabled (#6607 by @characharm, PR by @app/roomote) +- Update highlight layer style and align to textarea (#6647 by @NaccOll, PR by @NaccOll) +- Fix UI for approving chained commands +- Use assistantMessageParser class instead of parseAssistantMessage (#5340 by @qdaxb, PR by @qdaxb) +- Conditionally include reminder section based on todo list config (thanks @NaccOll!) +- Task and TaskProvider event emitter cleanup with new events (thanks @cte!) From f4b7c895e37cf090ca6bc14d8099e07a526e514d Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Tue, 5 Aug 2025 11:23:02 -0700 Subject: [PATCH 073/253] Changesets config tweak (#6733) --- .changeset/config.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.changeset/config.json b/.changeset/config.json index e2acc37662..46178f79f0 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -7,5 +7,12 @@ "access": "restricted", "baseBranch": "main", "updateInternalDependencies": "patch", - "ignore": [] + "ignore": [ + "@roo-code/types", + "@roo-code/web-evals", + "@roo-code/web-roo-code", + "@roo-code/evals", + "@roo-code/ipc", + "@roo-code/telemetry" + ] } From 98e0a2d5c60de56ca5156ca4987ce06021935296 Mon Sep 17 00:00:00 2001 From: Daniel <57051444+daniel-lxs@users.noreply.github.com> Date: Tue, 5 Aug 2025 13:25:02 -0500 Subject: [PATCH 074/253] feat: add OpenAI GPT OSS model to Cerebras providers (#6734) --- packages/types/src/providers/cerebras.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/types/src/providers/cerebras.ts b/packages/types/src/providers/cerebras.ts index 2bec81562b..4765302a4e 100644 --- a/packages/types/src/providers/cerebras.ts +++ b/packages/types/src/providers/cerebras.ts @@ -63,4 +63,14 @@ export const cerebrasModels = { description: "SOTA performance with ~1500 tokens/s", supportsReasoningEffort: true, }, + "gpt-oss-120b": { + maxTokens: 8000, + contextWindow: 64000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0, + outputPrice: 0, + description: + "OpenAI GPT OSS model with ~2800 tokens/s\n\n• 64K context window\n• Excels at efficient reasoning across science, math, and coding", + }, } as const satisfies Record From e5f117ded67650f6f6a497ad80ce111cc212f15e Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Tue, 5 Aug 2025 11:42:22 -0700 Subject: [PATCH 075/253] Revert "Changesets config tweak (#6733)" (#6735) --- .changeset/config.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.changeset/config.json b/.changeset/config.json index 46178f79f0..e2acc37662 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -7,12 +7,5 @@ "access": "restricted", "baseBranch": "main", "updateInternalDependencies": "patch", - "ignore": [ - "@roo-code/types", - "@roo-code/web-evals", - "@roo-code/web-roo-code", - "@roo-code/evals", - "@roo-code/ipc", - "@roo-code/telemetry" - ] + "ignore": [] } From beacbd73a9c5b3cfe3712674b8784dda6826b3fc Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Tue, 5 Aug 2025 11:47:33 -0700 Subject: [PATCH 076/253] Delete bad changeset (#6736) --- .changeset/add-opus-4-1-model.md | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 .changeset/add-opus-4-1-model.md diff --git a/.changeset/add-opus-4-1-model.md b/.changeset/add-opus-4-1-model.md deleted file mode 100644 index 9b0e840e5b..0000000000 --- a/.changeset/add-opus-4-1-model.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -"@roo-code/types": patch -"roo-code": patch ---- - -Add support for Claude Opus 4.1 (claude-opus-4-1-20250805) - -- Added claude-opus-4-1-20250805 to anthropicModels with 8192 max tokens and reasoning budget support -- Added support across all providers: Anthropic, Claude Code, Bedrock, Vertex AI, OpenRouter, and LiteLLM -- Updated anthropic.ts provider to handle prompt caching for the new model -- Pricing: $15/M input tokens, $75/M output tokens, $18.75/M cache writes, $1.5/M cache reads From 1805b75b43f5afe3c5c5aeea910899219812616b Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Tue, 5 Aug 2025 11:56:16 -0700 Subject: [PATCH 077/253] Stop making types private (#6737) --- packages/types/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/types/package.json b/packages/types/package.json index 35d0560276..feda97f289 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@roo-code/types", - "private": true, + "version": "0.0.0", "type": "module", "main": "./dist/index.cjs", "exports": { From 31df9bd20c5591cedaa7930e1ef4c467529f73ff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 12:06:47 -0700 Subject: [PATCH 078/253] Changeset version bump (#6738) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens --- .changeset/3.25.7.md | 19 ------------------- CHANGELOG.md | 18 ++++++++++++++++++ src/package.json | 2 +- 3 files changed, 19 insertions(+), 20 deletions(-) delete mode 100644 .changeset/3.25.7.md diff --git a/.changeset/3.25.7.md b/.changeset/3.25.7.md deleted file mode 100644 index 64a6c07d1b..0000000000 --- a/.changeset/3.25.7.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -"roo-cline": patch ---- - -- Add support for Claude Opus 4.1 -- Add Fireworks AI provider (#6653 by @ershang-fireworks, PR by @ershang-fireworks) -- Add Z AI provider (thanks @jues!) -- Add Groq support for GPT-OSS -- Add code indexing support for multiple folders similar to task history (#6197 by @NaccOll, PR by @NaccOll) -- Make mode selection dropdowns responsive (#6423 by @AyazKaan, PR by @AyazKaan) -- Redesigned task header and task history (thanks @brunobergher!) -- Fix checkpoints timing and ensure checkpoints work properly (#4827 by @mrubens, PR by @NaccOll) -- Fix empty mode names from being saved (#5766 by @kfxmvp, PR by @app/roomote) -- Fix MCP server creation when setting is disabled (#6607 by @characharm, PR by @app/roomote) -- Update highlight layer style and align to textarea (#6647 by @NaccOll, PR by @NaccOll) -- Fix UI for approving chained commands -- Use assistantMessageParser class instead of parseAssistantMessage (#5340 by @qdaxb, PR by @qdaxb) -- Conditionally include reminder section based on todo list config (thanks @NaccOll!) -- Task and TaskProvider event emitter cleanup with new events (thanks @cte!) diff --git a/CHANGELOG.md b/CHANGELOG.md index 312f5f290e..43ad9a9ed1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # Roo Code Changelog +## [3.25.7] - 2025-08-05 + +- Add support for Claude Opus 4.1 +- Add Fireworks AI provider (#6653 by @ershang-fireworks, PR by @ershang-fireworks) +- Add Z AI provider (thanks @jues!) +- Add Groq support for GPT-OSS +- Add code indexing support for multiple folders similar to task history (#6197 by @NaccOll, PR by @NaccOll) +- Make mode selection dropdowns responsive (#6423 by @AyazKaan, PR by @AyazKaan) +- Redesigned task header and task history (thanks @brunobergher!) +- Fix checkpoints timing and ensure checkpoints work properly (#4827 by @mrubens, PR by @NaccOll) +- Fix empty mode names from being saved (#5766 by @kfxmvp, PR by @app/roomote) +- Fix MCP server creation when setting is disabled (#6607 by @characharm, PR by @app/roomote) +- Update highlight layer style and align to textarea (#6647 by @NaccOll, PR by @NaccOll) +- Fix UI for approving chained commands +- Use assistantMessageParser class instead of parseAssistantMessage (#5340 by @qdaxb, PR by @qdaxb) +- Conditionally include reminder section based on todo list config (thanks @NaccOll!) +- Task and TaskProvider event emitter cleanup with new events (thanks @cte!) + ## [3.25.6] - 2025-08-01 - Set horizon-beta model max tokens to 32k for OpenRouter (requested by @hannesrudolph, PR by @app/roomote) diff --git a/src/package.json b/src/package.json index aa2110dfd5..13013de7ae 100644 --- a/src/package.json +++ b/src/package.json @@ -3,7 +3,7 @@ "displayName": "%extension.displayName%", "description": "%extension.description%", "publisher": "RooVeterinaryInc", - "version": "3.25.6", + "version": "3.25.7", "icon": "assets/icons/icon.png", "galleryBanner": { "color": "#617A91", From 2e77ce16848796822b2db61954fee6d1932a475a Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Tue, 5 Aug 2025 12:08:23 -0700 Subject: [PATCH 079/253] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43ad9a9ed1..c72d2f5f63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Add Fireworks AI provider (#6653 by @ershang-fireworks, PR by @ershang-fireworks) - Add Z AI provider (thanks @jues!) - Add Groq support for GPT-OSS +- Add Cerebras support for GPT-OSS - Add code indexing support for multiple folders similar to task history (#6197 by @NaccOll, PR by @NaccOll) - Make mode selection dropdowns responsive (#6423 by @AyazKaan, PR by @AyazKaan) - Redesigned task header and task history (thanks @brunobergher!) From 6892427e342031a28981761140068a730b3d61ad Mon Sep 17 00:00:00 2001 From: xyOz Date: Tue, 5 Aug 2025 22:08:52 +0100 Subject: [PATCH 080/253] Fix: Resolve Memory Leak in ChatView Virtual Scrolling Implementation (#6697) Co-authored-by: Daniel Riccio --- webview-ui/src/components/chat/ChatView.tsx | 141 +++++++++++++------- 1 file changed, 93 insertions(+), 48 deletions(-) diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx index 2aa71b9a01..e73ac67701 100644 --- a/webview-ui/src/components/chat/ChatView.tsx +++ b/webview-ui/src/components/chat/ChatView.tsx @@ -1,4 +1,4 @@ -import { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from "react" +import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from "react" import { useDeepCompareEffect, useEvent, useMount } from "react-use" import debounce from "debounce" import { Virtuoso, type VirtuosoHandle } from "react-virtuoso" @@ -181,8 +181,8 @@ const ChatViewComponent: React.ForwardRefRenderFunction>( new LRUCache({ - max: 250, - ttl: 1000 * 60 * 15, // 15 minutes TTL for long-running tasks + max: 100, + ttl: 1000 * 60 * 5, }), ) const autoApproveTimeoutRef = useRef(null) @@ -458,7 +458,12 @@ const ChatViewComponent: React.ForwardRefRenderFunction () => everVisibleMessagesTsRef.current.clear(), []) + useEffect(() => { + const cache = everVisibleMessagesTsRef.current + return () => { + cache.clear() + } + }, []) useEffect(() => { const prev = prevExpandedRowsRef.current @@ -502,7 +507,10 @@ const ChatViewComponent: React.ForwardRefRenderFunction message.say === "api_req_started") + const lastApiReqStarted = findLast( + modifiedMessages, + (message: ClineMessage) => message.say === "api_req_started", + ) if ( lastApiReqStarted && @@ -522,7 +530,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction { - const lastFollowUpMessage = messagesRef.current.findLast((msg) => msg.ask === "followup") + const lastFollowUpMessage = messagesRef.current.findLast((msg: ClineMessage) => msg.ask === "followup") if (lastFollowUpMessage) { setCurrentFollowUpTs(lastFollowUpMessage.ts) } @@ -564,7 +572,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction [...prev, { id: messageId, text, images }]) + setMessageQueue((prev: QueuedMessage[]) => [...prev, { id: messageId, text, images }]) setInputValue("") setSelectedImages([]) return @@ -660,7 +668,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction [...current, nextMessage]) + setMessageQueue((current: QueuedMessage[]) => [...current, nextMessage]) } else { console.error(`Message ${nextMessage.id} failed after ${MAX_RETRY_ATTEMPTS} attempts, discarding`) retryCountRef.current.delete(nextMessage.id) @@ -832,7 +840,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction + setSelectedImages((prevImages: string[]) => appendImages(prevImages, message.images, MAX_IMAGES_PER_MESSAGE), ) } @@ -888,21 +896,13 @@ const ChatViewComponent: React.ForwardRefRenderFunction textAreaRef.current?.focus()) - useDebounceEffect( - () => { - if (!isHidden && !sendingDisabled && !enableButtons) { - textAreaRef.current?.focus() - } - }, - 50, - [isHidden, sendingDisabled, enableButtons], - ) - const visibleMessages = useMemo(() => { - const newVisibleMessages = modifiedMessages.filter((message) => { + const currentMessageCount = modifiedMessages.length + const startIndex = Math.max(0, currentMessageCount - 500) + const recentMessages = modifiedMessages.slice(startIndex) + + const newVisibleMessages = recentMessages.filter((message: ClineMessage) => { if (everVisibleMessagesTsRef.current.has(message.ts)) { - // If it was ever visible, and it's not one of the types that should always be hidden once processed, keep it. - // This helps prevent flickering for messages like 'api_req_retry_delayed' if they are no longer the absolute last. const alwaysHiddenOnceProcessedAsk: ClineAsk[] = [ "api_req_failed", "resume_task", @@ -916,14 +916,12 @@ const ChatViewComponent: React.ForwardRefRenderFunction everVisibleMessagesTsRef.current.set(msg.ts, true)) + const viewportStart = Math.max(0, newVisibleMessages.length - 100) + newVisibleMessages + .slice(viewportStart) + .forEach((msg: ClineMessage) => everVisibleMessagesTsRef.current.set(msg.ts, true)) return newVisibleMessages }, [modifiedMessages]) + useEffect(() => { + const cleanupInterval = setInterval(() => { + const cache = everVisibleMessagesTsRef.current + const currentMessageIds = new Set(modifiedMessages.map((m: ClineMessage) => m.ts)) + const viewportMessages = visibleMessages.slice(Math.max(0, visibleMessages.length - 100)) + const viewportMessageIds = new Set(viewportMessages.map((m: ClineMessage) => m.ts)) + + cache.forEach((_value: boolean, key: number) => { + if (!currentMessageIds.has(key) && !viewportMessageIds.has(key)) { + cache.delete(key) + } + }) + }, 60000) + + return () => clearInterval(cleanupInterval) + }, [modifiedMessages, visibleMessages]) + + useDebounceEffect( + () => { + if (!isHidden && !sendingDisabled && !enableButtons) { + textAreaRef.current?.focus() + } + }, + 50, + [isHidden, sendingDisabled, enableButtons], + ) + const isReadOnlyToolAction = useCallback((message: ClineMessage | undefined) => { if (message?.type === "ask") { if (!message.text) { @@ -1238,7 +1264,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction { + visibleMessages.forEach((message: ClineMessage) => { if (message.ask === "browser_action_launch") { // Complete existing browser session if any. endBrowserSession() @@ -1308,10 +1334,23 @@ const ChatViewComponent: React.ForwardRefRenderFunction - debounce(() => virtuosoRef.current?.scrollTo({ top: Number.MAX_SAFE_INTEGER, behavior: "smooth" }), 10, { - immediate: true, - }), - [], + debounce( + () => { + const lastIndex = groupedMessages.length - 1 + if (lastIndex >= 0) { + virtuosoRef.current?.scrollToIndex({ + index: lastIndex, + behavior: "smooth", + align: "end", + }) + } + }, + 10, + { + immediate: true, + }, + ), + [groupedMessages.length], ) useEffect(() => { @@ -1323,15 +1362,22 @@ const ChatViewComponent: React.ForwardRefRenderFunction { - virtuosoRef.current?.scrollTo({ - top: Number.MAX_SAFE_INTEGER, - behavior: "auto", // Instant causes crash. - }) - }, []) + const lastIndex = groupedMessages.length - 1 + if (lastIndex >= 0) { + virtuosoRef.current?.scrollToIndex({ + index: lastIndex, + behavior: "auto", // Instant causes crash. + align: "end", + }) + } + }, [groupedMessages.length]) const handleSetExpandedRow = useCallback( (ts: number, expand?: boolean) => { - setExpandedRows((prev) => ({ ...prev, [ts]: expand === undefined ? !prev[ts] : expand })) + setExpandedRows((prev: Record) => ({ + ...prev, + [ts]: expand === undefined ? !prev[ts] : expand, + })) }, [setExpandedRows], // setExpandedRows is stable ) @@ -1360,7 +1406,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction { - let timer: NodeJS.Timeout | undefined + let timer: ReturnType | undefined if (!disableAutoScrollRef.current) { timer = setTimeout(() => scrollToBottomSmooth(), 50) } @@ -1446,7 +1492,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction { + setInputValue((currentValue: string) => { return currentValue !== "" ? `${currentValue} \n${suggestion.answer}` : suggestion.answer }) } else { @@ -1480,7 +1526,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction expandedRows[messageTs] ?? false} onToggleExpand={(messageTs: number) => { - setExpandedRows((prev) => ({ + setExpandedRows((prev: Record) => ({ ...prev, [messageTs]: !prev[messageTs], })) @@ -1839,20 +1885,19 @@ const ChatViewComponent: React.ForwardRefRenderFunction { + atBottomStateChange={(isAtBottom: boolean) => { setIsAtBottom(isAtBottom) if (isAtBottom) { disableAutoScrollRef.current = false } setShowScrollToBottom(disableAutoScrollRef.current && !isAtBottom) }} - atBottomThreshold={10} // anything lower causes issues with followOutput + atBottomThreshold={10} initialTopMostItemIndex={groupedMessages.length - 1} />
    From 4f4328d97cd9c8a1d2295221822f540ae0893595 Mon Sep 17 00:00:00 2001 From: Nitesh <84944042+niteshbalusu11@users.noreply.github.com> Date: Tue, 5 Aug 2025 17:19:23 -0400 Subject: [PATCH 081/253] Add swift files to fallback list (#6724) --- src/services/code-index/processors/__tests__/parser.vb.spec.ts | 1 + src/services/code-index/shared/supported-extensions.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/services/code-index/processors/__tests__/parser.vb.spec.ts b/src/services/code-index/processors/__tests__/parser.vb.spec.ts index 3448ed6737..3b17e0d67f 100644 --- a/src/services/code-index/processors/__tests__/parser.vb.spec.ts +++ b/src/services/code-index/processors/__tests__/parser.vb.spec.ts @@ -243,6 +243,7 @@ describe("Fallback Extensions Configuration", () => { // Extensions that should use fallback expect(shouldUseFallbackChunking(".vb")).toBe(true) expect(shouldUseFallbackChunking(".scala")).toBe(true) + expect(shouldUseFallbackChunking(".swift")).toBe(true) // Extensions that should not use fallback (have working parsers) expect(shouldUseFallbackChunking(".js")).toBe(false) diff --git a/src/services/code-index/shared/supported-extensions.ts b/src/services/code-index/shared/supported-extensions.ts index 16afddf828..80dd7102ff 100644 --- a/src/services/code-index/shared/supported-extensions.ts +++ b/src/services/code-index/shared/supported-extensions.ts @@ -21,6 +21,7 @@ export const scannerExtensions = allExtensions export const fallbackExtensions = [ ".vb", // Visual Basic .NET - no dedicated WASM parser ".scala", // Scala - uses fallback chunking instead of Lua query workaround + ".swift", // Swift - uses fallback chunking due to parser instability ] /** From 7b6c6a819655faa7d9699155d231f00fda30b041 Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 14:21:58 -0700 Subject: [PATCH 082/253] fix: improve handling of net::ERR_ABORTED errors in URL fetching (#6635) Co-authored-by: Roo Code Co-authored-by: Daniel Riccio --- src/core/mentions/index.ts | 3 ++ src/i18n/locales/ca/common.json | 1 + src/i18n/locales/de/common.json | 1 + src/i18n/locales/en/common.json | 1 + src/i18n/locales/es/common.json | 1 + src/i18n/locales/fr/common.json | 1 + src/i18n/locales/hi/common.json | 1 + src/i18n/locales/id/common.json | 1 + src/i18n/locales/it/common.json | 1 + src/i18n/locales/ja/common.json | 1 + src/i18n/locales/ko/common.json | 1 + src/i18n/locales/nl/common.json | 1 + src/i18n/locales/pl/common.json | 1 + src/i18n/locales/pt-BR/common.json | 1 + src/i18n/locales/ru/common.json | 1 + src/i18n/locales/tr/common.json | 1 + src/i18n/locales/vi/common.json | 1 + src/i18n/locales/zh-CN/common.json | 1 + src/i18n/locales/zh-TW/common.json | 1 + .../__tests__/UrlContentFetcher.spec.ts | 30 +++++++++++++++++++ 20 files changed, 51 insertions(+) diff --git a/src/core/mentions/index.ts b/src/core/mentions/index.ts index ed3060859b..a57dfcb6d4 100644 --- a/src/core/mentions/index.ts +++ b/src/core/mentions/index.ts @@ -35,6 +35,9 @@ function getUrlErrorMessage(error: unknown): string { if (errorMessage.includes("net::ERR_INTERNET_DISCONNECTED")) { return t("common:errors.no_internet") } + if (errorMessage.includes("net::ERR_ABORTED")) { + return t("common:errors.url_request_aborted") + } if (errorMessage.includes("403") || errorMessage.includes("Forbidden")) { return t("common:errors.url_forbidden") } diff --git a/src/i18n/locales/ca/common.json b/src/i18n/locales/ca/common.json index ad2af15efa..d4fddfebf3 100644 --- a/src/i18n/locales/ca/common.json +++ b/src/i18n/locales/ca/common.json @@ -65,6 +65,7 @@ "no_internet": "No hi ha connexió a internet. Comprova la teva connexió de xarxa i torna-ho a provar.", "url_forbidden": "L'accés a aquest lloc web està prohibit. El lloc pot bloquejar l'accés automatitzat o requerir autenticació.", "url_page_not_found": "No s'ha trobat la pàgina. Comprova si la URL és correcta.", + "url_request_aborted": "La sol·licitud per obtenir la URL s'ha cancel·lat. Això pot passar si el lloc bloqueja l'accés automatitzat, requereix autenticació o si hi ha un problema de xarxa. Torna-ho a provar o comprova si la URL és accessible en un navegador normal.", "url_fetch_failed": "Error en obtenir el contingut de la URL: {{error}}", "url_fetch_error_with_url": "Error en obtenir contingut per {{url}}: {{error}}", "command_timeout": "L'execució de la comanda ha superat el temps d'espera de {{seconds}} segons", diff --git a/src/i18n/locales/de/common.json b/src/i18n/locales/de/common.json index 1dd8bd89e6..af69ed7cfe 100644 --- a/src/i18n/locales/de/common.json +++ b/src/i18n/locales/de/common.json @@ -61,6 +61,7 @@ "no_internet": "Keine Internetverbindung. Bitte prüfe deine Netzwerkverbindung und versuche es erneut.", "url_forbidden": "Zugriff auf diese Website ist verboten. Die Seite könnte automatisierten Zugriff blockieren oder eine Authentifizierung erfordern.", "url_page_not_found": "Die Seite wurde nicht gefunden. Bitte prüfe, ob die URL korrekt ist.", + "url_request_aborted": "Die Anfrage zum Abrufen der URL wurde abgebrochen. Dies kann passieren, wenn die Seite automatisierten Zugriff blockiert, eine Authentifizierung erfordert oder wenn es ein Netzwerkproblem gibt. Bitte versuche es erneut oder prüfe, ob die URL in einem normalen Browser zugänglich ist.", "url_fetch_failed": "Fehler beim Abrufen des URL-Inhalts: {{error}}", "url_fetch_error_with_url": "Fehler beim Abrufen des Inhalts für {{url}}: {{error}}", "command_timeout": "Zeitüberschreitung bei der Befehlsausführung nach {{seconds}} Sekunden", diff --git a/src/i18n/locales/en/common.json b/src/i18n/locales/en/common.json index c8deee5cf4..05d039a495 100644 --- a/src/i18n/locales/en/common.json +++ b/src/i18n/locales/en/common.json @@ -61,6 +61,7 @@ "no_internet": "No internet connection. Please check your network connection and try again.", "url_forbidden": "Access to this website is forbidden. The site may block automated access or require authentication.", "url_page_not_found": "The page was not found. Please check if the URL is correct.", + "url_request_aborted": "The request to fetch the URL was aborted. This may happen if the site blocks automated access, requires authentication, or if there's a network issue. Please try again or check if the URL is accessible in a regular browser.", "url_fetch_failed": "Failed to fetch URL content: {{error}}", "url_fetch_error_with_url": "Error fetching content for {{url}}: {{error}}", "command_timeout": "Command execution timed out after {{seconds}} seconds", diff --git a/src/i18n/locales/es/common.json b/src/i18n/locales/es/common.json index 47acd8e26a..28e2fc3812 100644 --- a/src/i18n/locales/es/common.json +++ b/src/i18n/locales/es/common.json @@ -61,6 +61,7 @@ "no_internet": "Sin conexión a internet. Por favor verifica tu conexión de red e inténtalo de nuevo.", "url_forbidden": "El acceso a este sitio web está prohibido. El sitio puede bloquear el acceso automatizado o requerir autenticación.", "url_page_not_found": "La página no fue encontrada. Por favor verifica si la URL es correcta.", + "url_request_aborted": "La solicitud para obtener la URL fue cancelada. Esto puede ocurrir si el sitio bloquea el acceso automatizado, requiere autenticación o si hay un problema de red. Por favor intenta de nuevo o verifica si la URL es accesible en un navegador normal.", "url_fetch_failed": "Error al obtener el contenido de la URL: {{error}}", "url_fetch_error_with_url": "Error al obtener contenido para {{url}}: {{error}}", "command_timeout": "La ejecución del comando superó el tiempo de espera de {{seconds}} segundos", diff --git a/src/i18n/locales/fr/common.json b/src/i18n/locales/fr/common.json index 0103c8694e..c3264e7ba3 100644 --- a/src/i18n/locales/fr/common.json +++ b/src/i18n/locales/fr/common.json @@ -61,6 +61,7 @@ "no_internet": "Pas de connexion internet. Vérifie ta connexion réseau et réessaie.", "url_forbidden": "L'accès à ce site web est interdit. Le site peut bloquer l'accès automatisé ou nécessiter une authentification.", "url_page_not_found": "La page n'a pas été trouvée. Vérifie si l'URL est correcte.", + "url_request_aborted": "La demande de récupération de l'URL a été interrompue. Cela peut se produire si le site bloque l'accès automatisé, nécessite une authentification ou s'il y a un problème de réseau. Réessaie ou vérifie si l'URL est accessible dans un navigateur normal.", "url_fetch_failed": "Échec de récupération du contenu de l'URL : {{error}}", "url_fetch_error_with_url": "Erreur lors de la récupération du contenu pour {{url}} : {{error}}", "command_timeout": "L'exécution de la commande a expiré après {{seconds}} secondes", diff --git a/src/i18n/locales/hi/common.json b/src/i18n/locales/hi/common.json index c18bf8fa7b..c68d002e1d 100644 --- a/src/i18n/locales/hi/common.json +++ b/src/i18n/locales/hi/common.json @@ -61,6 +61,7 @@ "no_internet": "इंटरनेट कनेक्शन नहीं है। कृपया अपना नेटवर्क कनेक्शन जांचें और फिर से कोशिश करें।", "url_forbidden": "इस वेबसाइट तक पहुंच प्रतिबंधित है। साइट स्वचालित पहुंच को ब्लॉक कर सकती है या प्रमाणीकरण की आवश्यकता हो सकती है।", "url_page_not_found": "पेज नहीं मिला। कृपया जांचें कि URL सही है।", + "url_request_aborted": "URL प्राप्त करने का अनुरोध रद्द कर दिया गया। यह तब हो सकता है जब साइट स्वचालित पहुंच को ब्लॉक करती है, प्रमाणीकरण की आवश्यकता होती है या नेटवर्क समस्या है। कृपया फिर से प्रयास करें या जांचें कि URL सामान्य ब्राउज़र में सुलभ है या नहीं।", "url_fetch_failed": "URL सामग्री प्राप्त करने में त्रुटि: {{error}}", "url_fetch_error_with_url": "{{url}} के लिए सामग्री प्राप्त करने में त्रुटि: {{error}}", "command_timeout": "कमांड निष्पादन {{seconds}} सेकंड के बाद समय समाप्त हो गया", diff --git a/src/i18n/locales/id/common.json b/src/i18n/locales/id/common.json index eb36b9e898..4045b7e8bb 100644 --- a/src/i18n/locales/id/common.json +++ b/src/i18n/locales/id/common.json @@ -61,6 +61,7 @@ "no_internet": "Tidak ada koneksi internet. Silakan periksa koneksi jaringan kamu dan coba lagi.", "url_forbidden": "Akses ke situs web ini dilarang. Situs mungkin memblokir akses otomatis atau memerlukan autentikasi.", "url_page_not_found": "Halaman tidak ditemukan. Silakan periksa apakah URL sudah benar.", + "url_request_aborted": "Permintaan untuk mengambil URL dibatalkan. Ini bisa terjadi jika situs memblokir akses otomatis, memerlukan autentikasi, atau ada masalah jaringan. Silakan coba lagi atau periksa apakah URL dapat diakses di browser biasa.", "url_fetch_failed": "Gagal mengambil konten URL: {{error}}", "url_fetch_error_with_url": "Error mengambil konten untuk {{url}}: {{error}}", "command_timeout": "Eksekusi perintah waktu habis setelah {{seconds}} detik", diff --git a/src/i18n/locales/it/common.json b/src/i18n/locales/it/common.json index 9d0b36f03d..a059c48a9b 100644 --- a/src/i18n/locales/it/common.json +++ b/src/i18n/locales/it/common.json @@ -61,6 +61,7 @@ "no_internet": "Nessuna connessione internet. Verifica la tua connessione di rete e riprova.", "url_forbidden": "L'accesso a questo sito web è vietato. Il sito potrebbe bloccare l'accesso automatizzato o richiedere autenticazione.", "url_page_not_found": "La pagina non è stata trovata. Verifica se l'URL è corretto.", + "url_request_aborted": "La richiesta per recuperare l'URL è stata interrotta. Questo può accadere se il sito blocca l'accesso automatizzato, richiede autenticazione o se c'è un problema di rete. Riprova o verifica se l'URL è accessibile in un browser normale.", "url_fetch_failed": "Errore nel recupero del contenuto URL: {{error}}", "url_fetch_error_with_url": "Errore nel recupero del contenuto per {{url}}: {{error}}", "command_timeout": "Esecuzione del comando scaduta dopo {{seconds}} secondi", diff --git a/src/i18n/locales/ja/common.json b/src/i18n/locales/ja/common.json index 6451ed3533..f9eceb5979 100644 --- a/src/i18n/locales/ja/common.json +++ b/src/i18n/locales/ja/common.json @@ -61,6 +61,7 @@ "no_internet": "インターネット接続がありません。ネットワーク接続を確認してもう一度試してください。", "url_forbidden": "このウェブサイトへのアクセスが禁止されています。サイトが自動アクセスをブロックしているか、認証が必要な可能性があります。", "url_page_not_found": "ページが見つかりませんでした。URLが正しいか確認してください。", + "url_request_aborted": "URLの取得リクエストが中断されました。これは、サイトが自動アクセスをブロックしている、認証が必要、またはネットワークの問題がある場合に発生する可能性があります。もう一度試すか、通常のブラウザでURLにアクセスできるか確認してください。", "url_fetch_failed": "URLコンテンツの取得に失敗しました：{{error}}", "url_fetch_error_with_url": "{{url}} のコンテンツ取得エラー：{{error}}", "command_timeout": "コマンドの実行が{{seconds}}秒後にタイムアウトしました", diff --git a/src/i18n/locales/ko/common.json b/src/i18n/locales/ko/common.json index fc97d75dc5..4292677e30 100644 --- a/src/i18n/locales/ko/common.json +++ b/src/i18n/locales/ko/common.json @@ -61,6 +61,7 @@ "no_internet": "인터넷 연결이 없습니다. 네트워크 연결을 확인하고 다시 시도해 주세요.", "url_forbidden": "이 웹사이트에 대한 접근이 금지되었습니다. 사이트가 자동 접근을 차단하거나 인증이 필요할 수 있습니다.", "url_page_not_found": "페이지를 찾을 수 없습니다. URL이 올바른지 확인해 주세요.", + "url_request_aborted": "URL을 가져오는 요청이 중단되었습니다. 사이트가 자동 접근을 차단하거나, 인증이 필요하거나, 네트워크 문제가 있을 때 발생할 수 있습니다. 다시 시도하거나 일반 브라우저에서 URL에 접근할 수 있는지 확인해 주세요.", "url_fetch_failed": "URL 콘텐츠 가져오기 실패: {{error}}", "url_fetch_error_with_url": "{{url}} 콘텐츠 가져오기 오류: {{error}}", "command_timeout": "명령 실행 시간이 {{seconds}}초 후 초과되었습니다", diff --git a/src/i18n/locales/nl/common.json b/src/i18n/locales/nl/common.json index f722093b37..2133e7003b 100644 --- a/src/i18n/locales/nl/common.json +++ b/src/i18n/locales/nl/common.json @@ -61,6 +61,7 @@ "no_internet": "Geen internetverbinding. Controleer je netwerkverbinding en probeer opnieuw.", "url_forbidden": "Toegang tot deze website is verboden. De site kan geautomatiseerde toegang blokkeren of authenticatie vereisen.", "url_page_not_found": "De pagina werd niet gevonden. Controleer of de URL correct is.", + "url_request_aborted": "Het verzoek om de URL op te halen is afgebroken. Dit kan gebeuren als de site geautomatiseerde toegang blokkeert, authenticatie vereist of als er een netwerkprobleem is. Probeer het opnieuw of controleer of de URL toegankelijk is in een normale browser.", "url_fetch_failed": "Fout bij ophalen van URL-inhoud: {{error}}", "url_fetch_error_with_url": "Fout bij ophalen van inhoud voor {{url}}: {{error}}", "command_timeout": "Time-out bij uitvoeren van commando na {{seconds}} seconden", diff --git a/src/i18n/locales/pl/common.json b/src/i18n/locales/pl/common.json index 8dea06033f..1c63702911 100644 --- a/src/i18n/locales/pl/common.json +++ b/src/i18n/locales/pl/common.json @@ -61,6 +61,7 @@ "no_internet": "Brak połączenia z internetem. Sprawdź połączenie sieciowe i spróbuj ponownie.", "url_forbidden": "Dostęp do tej strony internetowej jest zabroniony. Strona może blokować automatyczny dostęp lub wymagać uwierzytelnienia.", "url_page_not_found": "Strona nie została znaleziona. Sprawdź, czy URL jest poprawny.", + "url_request_aborted": "Żądanie pobrania URL zostało przerwane. Może to się zdarzyć, jeśli strona blokuje automatyczny dostęp, wymaga uwierzytelnienia lub występuje problem z siecią. Spróbuj ponownie lub sprawdź, czy URL jest dostępny w normalnej przeglądarce.", "url_fetch_failed": "Błąd pobierania zawartości URL: {{error}}", "url_fetch_error_with_url": "Błąd pobierania zawartości dla {{url}}: {{error}}", "command_timeout": "Przekroczono limit czasu wykonania polecenia po {{seconds}} sekundach", diff --git a/src/i18n/locales/pt-BR/common.json b/src/i18n/locales/pt-BR/common.json index b0af270d4c..6aeb5f6ee7 100644 --- a/src/i18n/locales/pt-BR/common.json +++ b/src/i18n/locales/pt-BR/common.json @@ -65,6 +65,7 @@ "no_internet": "Sem conexão com a internet. Verifique sua conexão de rede e tente novamente.", "url_forbidden": "O acesso a este site está proibido. O site pode bloquear acesso automatizado ou exigir autenticação.", "url_page_not_found": "A página não foi encontrada. Verifique se a URL está correta.", + "url_request_aborted": "A solicitação para buscar a URL foi cancelada. Isso pode acontecer se o site bloqueia acesso automatizado, requer autenticação ou se há um problema de rede. Tente novamente ou verifique se a URL é acessível em um navegador normal.", "url_fetch_failed": "Falha ao buscar conteúdo da URL: {{error}}", "url_fetch_error_with_url": "Erro ao buscar conteúdo para {{url}}: {{error}}", "command_timeout": "A execução do comando excedeu o tempo limite após {{seconds}} segundos", diff --git a/src/i18n/locales/ru/common.json b/src/i18n/locales/ru/common.json index 716d42febc..0d7b800d8b 100644 --- a/src/i18n/locales/ru/common.json +++ b/src/i18n/locales/ru/common.json @@ -61,6 +61,7 @@ "no_internet": "Нет подключения к интернету. Проверь сетевое подключение и попробуй снова.", "url_forbidden": "Доступ к этому веб-сайту запрещен. Сайт может блокировать автоматический доступ или требовать аутентификацию.", "url_page_not_found": "Страница не найдена. Проверь правильность URL.", + "url_request_aborted": "Запрос на получение URL был прерван. Это может произойти, если сайт блокирует автоматический доступ, требует аутентификацию или есть проблемы с сетью. Попробуй снова или проверь, доступен ли URL в обычном браузере.", "url_fetch_failed": "Ошибка получения содержимого URL: {{error}}", "url_fetch_error_with_url": "Ошибка получения содержимого для {{url}}: {{error}}", "command_timeout": "Время выполнения команды истекло через {{seconds}} секунд", diff --git a/src/i18n/locales/tr/common.json b/src/i18n/locales/tr/common.json index 18324d723f..49d0fba113 100644 --- a/src/i18n/locales/tr/common.json +++ b/src/i18n/locales/tr/common.json @@ -61,6 +61,7 @@ "no_internet": "İnternet bağlantısı yok. Ağ bağlantını kontrol et ve tekrar dene.", "url_forbidden": "Bu web sitesine erişim yasak. Site otomatik erişimi engelliyor veya kimlik doğrulama gerektiriyor olabilir.", "url_page_not_found": "Sayfa bulunamadı. URL'nin doğru olup olmadığını kontrol et.", + "url_request_aborted": "URL'yi getirme isteği iptal edildi. Bu, sitenin otomatik erişimi engellemesi, kimlik doğrulama gerektirmesi veya bir ağ sorunu olması durumunda gerçekleşebilir. Tekrar dene veya URL'nin normal bir tarayıcıda erişilebilir olup olmadığını kontrol et.", "url_fetch_failed": "URL içeriği getirme hatası: {{error}}", "url_fetch_error_with_url": "{{url}} için içerik getirme hatası: {{error}}", "command_timeout": "Komut çalıştırma {{seconds}} saniye sonra zaman aşımına uğradı", diff --git a/src/i18n/locales/vi/common.json b/src/i18n/locales/vi/common.json index 772371555e..3f8947e620 100644 --- a/src/i18n/locales/vi/common.json +++ b/src/i18n/locales/vi/common.json @@ -61,6 +61,7 @@ "no_internet": "Không có kết nối internet. Vui lòng kiểm tra kết nối mạng và thử lại.", "url_forbidden": "Truy cập vào trang web này bị cấm. Trang có thể chặn truy cập tự động hoặc yêu cầu xác thực.", "url_page_not_found": "Không tìm thấy trang. Vui lòng kiểm tra URL có đúng không.", + "url_request_aborted": "Yêu cầu lấy URL đã bị hủy. Điều này có thể xảy ra nếu trang web chặn truy cập tự động, yêu cầu xác thực hoặc có vấn đề về mạng. Vui lòng thử lại hoặc kiểm tra xem URL có thể truy cập được trong trình duyệt thông thường không.", "url_fetch_failed": "Lỗi lấy nội dung URL: {{error}}", "url_fetch_error_with_url": "Lỗi lấy nội dung cho {{url}}: {{error}}", "command_timeout": "Thực thi lệnh đã hết thời gian chờ sau {{seconds}} giây", diff --git a/src/i18n/locales/zh-CN/common.json b/src/i18n/locales/zh-CN/common.json index c06ce9d9fd..808d534572 100644 --- a/src/i18n/locales/zh-CN/common.json +++ b/src/i18n/locales/zh-CN/common.json @@ -66,6 +66,7 @@ "no_internet": "无网络连接。请检查网络连接并重试。", "url_forbidden": "访问此网站被禁止。该网站可能阻止自动访问或需要身份验证。", "url_page_not_found": "页面未找到。请检查 URL 是否正确。", + "url_request_aborted": "获取 URL 的请求被中止。如果网站阻止自动访问、需要身份验证或存在网络问题，就可能发生这种情况。请重试或检查 URL 是否可以在普通浏览器中访问。", "url_fetch_failed": "获取 URL 内容失败：{{error}}", "url_fetch_error_with_url": "获取 {{url}} 内容时出错：{{error}}", "command_timeout": "命令执行超时，{{seconds}} 秒后", diff --git a/src/i18n/locales/zh-TW/common.json b/src/i18n/locales/zh-TW/common.json index f443ef9777..81e098fbcf 100644 --- a/src/i18n/locales/zh-TW/common.json +++ b/src/i18n/locales/zh-TW/common.json @@ -61,6 +61,7 @@ "no_internet": "無網路連線。請檢查網路連線並重試。", "url_forbidden": "存取此網站被禁止。該網站可能封鎖自動存取或需要身分驗證。", "url_page_not_found": "找不到頁面。請檢查 URL 是否正確。", + "url_request_aborted": "取得 URL 的請求被中止。如果網站封鎖自動存取、需要身分驗證或存在網路問題，就可能發生這種情況。請重試或檢查 URL 是否可以在一般瀏覽器中存取。", "url_fetch_failed": "取得 URL 內容失敗：{{error}}", "url_fetch_error_with_url": "取得 {{url}} 內容時發生錯誤：{{error}}", "command_timeout": "命令執行超時，{{seconds}} 秒後", diff --git a/src/services/browser/__tests__/UrlContentFetcher.spec.ts b/src/services/browser/__tests__/UrlContentFetcher.spec.ts index 917b27c5f2..132d73a409 100644 --- a/src/services/browser/__tests__/UrlContentFetcher.spec.ts +++ b/src/services/browser/__tests__/UrlContentFetcher.spec.ts @@ -273,6 +273,36 @@ describe("UrlContentFetcher", () => { await expect(urlContentFetcher.urlToMarkdown("https://example.com")).rejects.toThrow("Simple string error") expect(mockPage.goto).toHaveBeenCalledTimes(1) }) + + it("should retry net::ERR_ABORTED like other network errors", async () => { + const abortedError = new Error("net::ERR_ABORTED at https://example.com") + mockPage.goto.mockRejectedValueOnce(abortedError).mockResolvedValueOnce(undefined) + + const result = await urlContentFetcher.urlToMarkdown("https://example.com") + + expect(mockPage.goto).toHaveBeenCalledTimes(2) + expect(mockPage.goto).toHaveBeenNthCalledWith(1, "https://example.com", { + timeout: 30000, + waitUntil: ["domcontentloaded", "networkidle2"], + }) + expect(mockPage.goto).toHaveBeenNthCalledWith(2, "https://example.com", { + timeout: 20000, + waitUntil: ["domcontentloaded"], + }) + expect(result).toBe("# Test content") + }) + + it("should throw error when ERR_ABORTED retry also fails", async () => { + const abortedError = new Error("net::ERR_ABORTED at https://example.com") + const retryError = new Error("net::ERR_CONNECTION_REFUSED") + mockPage.goto.mockRejectedValueOnce(abortedError).mockRejectedValueOnce(retryError) + + await expect(urlContentFetcher.urlToMarkdown("https://example.com")).rejects.toThrow( + "net::ERR_CONNECTION_REFUSED", + ) + + expect(mockPage.goto).toHaveBeenCalledTimes(2) + }) }) describe("closeBrowser", () => { From 1237eb825b8da49803450cabec3d397132ee9dca Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 14:22:29 -0700 Subject: [PATCH 083/253] fix: trim whitespace from OpenAI base URL to fix model detection (#6560) Co-authored-by: Roo Code --- src/api/providers/__tests__/openai.spec.ts | 150 ++++++++++++++++++++- src/api/providers/openai.ts | 7 +- 2 files changed, 154 insertions(+), 3 deletions(-) diff --git a/src/api/providers/__tests__/openai.spec.ts b/src/api/providers/__tests__/openai.spec.ts index b4b5f29204..0d42c082a9 100644 --- a/src/api/providers/__tests__/openai.spec.ts +++ b/src/api/providers/__tests__/openai.spec.ts @@ -1,11 +1,12 @@ // npx vitest run api/providers/__tests__/openai.spec.ts -import { OpenAiHandler } from "../openai" +import { OpenAiHandler, getOpenAiModels } from "../openai" import { ApiHandlerOptions } from "../../../shared/api" import { Anthropic } from "@anthropic-ai/sdk" import OpenAI from "openai" import { openAiModelInfoSaneDefaults } from "@roo-code/types" import { Package } from "../../../shared/package" +import axios from "axios" const mockCreate = vitest.fn() @@ -68,6 +69,13 @@ vitest.mock("openai", () => { } }) +// Mock axios for getOpenAiModels tests +vitest.mock("axios", () => ({ + default: { + get: vitest.fn(), + }, +})) + describe("OpenAiHandler", () => { let handler: OpenAiHandler let mockOptions: ApiHandlerOptions @@ -776,3 +784,143 @@ describe("OpenAiHandler", () => { }) }) }) + +describe("getOpenAiModels", () => { + beforeEach(() => { + vi.mocked(axios.get).mockClear() + }) + + it("should return empty array when baseUrl is not provided", async () => { + const result = await getOpenAiModels(undefined, "test-key") + expect(result).toEqual([]) + expect(axios.get).not.toHaveBeenCalled() + }) + + it("should return empty array when baseUrl is empty string", async () => { + const result = await getOpenAiModels("", "test-key") + expect(result).toEqual([]) + expect(axios.get).not.toHaveBeenCalled() + }) + + it("should trim whitespace from baseUrl", async () => { + const mockResponse = { + data: { + data: [{ id: "gpt-4" }, { id: "gpt-3.5-turbo" }], + }, + } + vi.mocked(axios.get).mockResolvedValueOnce(mockResponse) + + const result = await getOpenAiModels(" https://api.openai.com/v1 ", "test-key") + + expect(axios.get).toHaveBeenCalledWith("https://api.openai.com/v1/models", expect.any(Object)) + expect(result).toEqual(["gpt-4", "gpt-3.5-turbo"]) + }) + + it("should handle baseUrl with trailing spaces", async () => { + const mockResponse = { + data: { + data: [{ id: "model-1" }, { id: "model-2" }], + }, + } + vi.mocked(axios.get).mockResolvedValueOnce(mockResponse) + + const result = await getOpenAiModels("https://api.example.com/v1 ", "test-key") + + expect(axios.get).toHaveBeenCalledWith("https://api.example.com/v1/models", expect.any(Object)) + expect(result).toEqual(["model-1", "model-2"]) + }) + + it("should handle baseUrl with leading spaces", async () => { + const mockResponse = { + data: { + data: [{ id: "model-1" }], + }, + } + vi.mocked(axios.get).mockResolvedValueOnce(mockResponse) + + const result = await getOpenAiModels(" https://api.example.com/v1", "test-key") + + expect(axios.get).toHaveBeenCalledWith("https://api.example.com/v1/models", expect.any(Object)) + expect(result).toEqual(["model-1"]) + }) + + it("should return empty array for invalid URL after trimming", async () => { + const result = await getOpenAiModels(" not-a-valid-url ", "test-key") + expect(result).toEqual([]) + expect(axios.get).not.toHaveBeenCalled() + }) + + it("should include authorization header when apiKey is provided", async () => { + const mockResponse = { + data: { + data: [{ id: "model-1" }], + }, + } + vi.mocked(axios.get).mockResolvedValueOnce(mockResponse) + + await getOpenAiModels("https://api.example.com/v1", "test-api-key") + + expect(axios.get).toHaveBeenCalledWith( + "https://api.example.com/v1/models", + expect.objectContaining({ + headers: expect.objectContaining({ + Authorization: "Bearer test-api-key", + }), + }), + ) + }) + + it("should include custom headers when provided", async () => { + const mockResponse = { + data: { + data: [{ id: "model-1" }], + }, + } + vi.mocked(axios.get).mockResolvedValueOnce(mockResponse) + + const customHeaders = { + "X-Custom-Header": "custom-value", + } + + await getOpenAiModels("https://api.example.com/v1", "test-key", customHeaders) + + expect(axios.get).toHaveBeenCalledWith( + "https://api.example.com/v1/models", + expect.objectContaining({ + headers: expect.objectContaining({ + "X-Custom-Header": "custom-value", + Authorization: "Bearer test-key", + }), + }), + ) + }) + + it("should handle API errors gracefully", async () => { + vi.mocked(axios.get).mockRejectedValueOnce(new Error("Network error")) + + const result = await getOpenAiModels("https://api.example.com/v1", "test-key") + + expect(result).toEqual([]) + }) + + it("should handle malformed response data", async () => { + vi.mocked(axios.get).mockResolvedValueOnce({ data: null }) + + const result = await getOpenAiModels("https://api.example.com/v1", "test-key") + + expect(result).toEqual([]) + }) + + it("should deduplicate model IDs", async () => { + const mockResponse = { + data: { + data: [{ id: "gpt-4" }, { id: "gpt-4" }, { id: "gpt-3.5-turbo" }, { id: "gpt-4" }], + }, + } + vi.mocked(axios.get).mockResolvedValueOnce(mockResponse) + + const result = await getOpenAiModels("https://api.example.com/v1", "test-key") + + expect(result).toEqual(["gpt-4", "gpt-3.5-turbo"]) + }) +}) diff --git a/src/api/providers/openai.ts b/src/api/providers/openai.ts index f5e4e4c985..85abcf1a69 100644 --- a/src/api/providers/openai.ts +++ b/src/api/providers/openai.ts @@ -416,7 +416,10 @@ export async function getOpenAiModels(baseUrl?: string, apiKey?: string, openAiH return [] } - if (!URL.canParse(baseUrl)) { + // Trim whitespace from baseUrl to handle cases where users accidentally include spaces + const trimmedBaseUrl = baseUrl.trim() + + if (!URL.canParse(trimmedBaseUrl)) { return [] } @@ -434,7 +437,7 @@ export async function getOpenAiModels(baseUrl?: string, apiKey?: string, openAiH config["headers"] = headers } - const response = await axios.get(`${baseUrl}/models`, config) + const response = await axios.get(`${trimmedBaseUrl}/models`, config) const modelsArray = response.data?.data?.map((model: any) => model.id) || [] return [...new Set(modelsArray)] } catch (error) { From 263e317ebdac7c4c05f3be6dd82362e2137cdaee Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 15:43:20 -0700 Subject: [PATCH 084/253] feat: reduce Gemini 2.5 Pro minimum thinking budget to 128 (#6588) Co-authored-by: Roo Code --- .../transform/__tests__/model-params.spec.ts | 51 +++++++++++++ src/api/transform/model-params.ts | 19 +++-- src/shared/api.ts | 1 + .../components/settings/ThinkingBudget.tsx | 16 ++++- .../__tests__/ThinkingBudget.spec.tsx | 72 ++++++++++++++++++- 5 files changed, 150 insertions(+), 9 deletions(-) diff --git a/src/api/transform/__tests__/model-params.spec.ts b/src/api/transform/__tests__/model-params.spec.ts index c29d17559e..44930aa5b8 100644 --- a/src/api/transform/__tests__/model-params.spec.ts +++ b/src/api/transform/__tests__/model-params.spec.ts @@ -331,6 +331,57 @@ describe("getModelParams", () => { }) }) + it("should clamp Gemini 2.5 Pro thinking budget to at least 128 tokens", () => { + const model: ModelInfo = { + ...baseModel, + requiredReasoningBudget: true, + } + + expect( + getModelParams({ + modelId: "gemini-2.5-pro", + format: "gemini" as const, + settings: { modelMaxTokens: 2000, modelMaxThinkingTokens: 50 }, + model, + }), + ).toEqual({ + format: "gemini", + maxTokens: 2000, + temperature: 1.0, + reasoningEffort: undefined, + reasoningBudget: 128, // Minimum is 128 for Gemini 2.5 Pro + reasoning: { + thinkingBudget: 128, + includeThoughts: true, + }, + }) + }) + + it("should use 128 as default thinking budget for Gemini 2.5 Pro", () => { + const model: ModelInfo = { + ...baseModel, + requiredReasoningBudget: true, + } + + expect( + getModelParams({ + modelId: "google/gemini-2.5-pro", + format: "openrouter" as const, + settings: { modelMaxTokens: 4000 }, + model, + }), + ).toEqual({ + format: "openrouter", + maxTokens: 4000, + temperature: 1.0, + reasoningEffort: undefined, + reasoningBudget: 128, // Default is 128 for Gemini 2.5 Pro + reasoning: { + max_tokens: 128, + }, + }) + }) + it("should clamp thinking budget to at most 80% of max tokens", () => { const model: ModelInfo = { ...baseModel, diff --git a/src/api/transform/model-params.ts b/src/api/transform/model-params.ts index 6ed975ac5a..9ad4261b76 100644 --- a/src/api/transform/model-params.ts +++ b/src/api/transform/model-params.ts @@ -3,6 +3,7 @@ import { type ModelInfo, type ProviderSettings, ANTHROPIC_DEFAULT_MAX_TOKENS } f import { DEFAULT_HYBRID_REASONING_MODEL_MAX_TOKENS, DEFAULT_HYBRID_REASONING_MODEL_THINKING_TOKENS, + GEMINI_25_PRO_MIN_THINKING_TOKENS, shouldUseReasoningBudget, shouldUseReasoningEffort, getModelMaxOutputTokens, @@ -90,8 +91,15 @@ export function getModelParams({ let reasoningEffort: ModelParams["reasoningEffort"] = undefined if (shouldUseReasoningBudget({ model, settings })) { + // Check if this is a Gemini 2.5 Pro model + const isGemini25Pro = modelId.includes("gemini-2.5-pro") + // If `customMaxThinkingTokens` is not specified use the default. - reasoningBudget = customMaxThinkingTokens ?? DEFAULT_HYBRID_REASONING_MODEL_THINKING_TOKENS + // For Gemini 2.5 Pro, default to 128 instead of 8192 + const defaultThinkingTokens = isGemini25Pro + ? GEMINI_25_PRO_MIN_THINKING_TOKENS + : DEFAULT_HYBRID_REASONING_MODEL_THINKING_TOKENS + reasoningBudget = customMaxThinkingTokens ?? defaultThinkingTokens // Reasoning cannot exceed 80% of the `maxTokens` value. // maxTokens should always be defined for reasoning budget models, but add a guard just in case @@ -99,9 +107,12 @@ export function getModelParams({ reasoningBudget = Math.floor(maxTokens * 0.8) } - // Reasoning cannot be less than 1024 tokens. - if (reasoningBudget < 1024) { - reasoningBudget = 1024 + // Reasoning cannot be less than minimum tokens. + // For Gemini 2.5 Pro models, the minimum is 128 tokens + // For other models, the minimum is 1024 tokens + const minThinkingTokens = isGemini25Pro ? GEMINI_25_PRO_MIN_THINKING_TOKENS : 1024 + if (reasoningBudget < minThinkingTokens) { + reasoningBudget = minThinkingTokens } // Let's assume that "Hybrid" reasoning models require a temperature of diff --git a/src/shared/api.ts b/src/shared/api.ts index 8cbfc72133..44227ad7e4 100644 --- a/src/shared/api.ts +++ b/src/shared/api.ts @@ -51,6 +51,7 @@ export const shouldUseReasoningEffort = ({ export const DEFAULT_HYBRID_REASONING_MODEL_MAX_TOKENS = 16_384 export const DEFAULT_HYBRID_REASONING_MODEL_THINKING_TOKENS = 8_192 +export const GEMINI_25_PRO_MIN_THINKING_TOKENS = 128 // Max Tokens diff --git a/webview-ui/src/components/settings/ThinkingBudget.tsx b/webview-ui/src/components/settings/ThinkingBudget.tsx index 0adb62f2a0..a49ec79efc 100644 --- a/webview-ui/src/components/settings/ThinkingBudget.tsx +++ b/webview-ui/src/components/settings/ThinkingBudget.tsx @@ -3,10 +3,15 @@ import { Checkbox } from "vscrui" import { type ProviderSettings, type ModelInfo, type ReasoningEffort, reasoningEfforts } from "@roo-code/types" -import { DEFAULT_HYBRID_REASONING_MODEL_MAX_TOKENS, DEFAULT_HYBRID_REASONING_MODEL_THINKING_TOKENS } from "@roo/api" +import { + DEFAULT_HYBRID_REASONING_MODEL_MAX_TOKENS, + DEFAULT_HYBRID_REASONING_MODEL_THINKING_TOKENS, + GEMINI_25_PRO_MIN_THINKING_TOKENS, +} from "@roo/api" import { useAppTranslation } from "@src/i18n/TranslationContext" import { Slider, Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@src/components/ui" +import { useSelectedModel } from "@src/components/ui/hooks/useSelectedModel" interface ThinkingBudgetProps { apiConfiguration: ProviderSettings @@ -16,6 +21,11 @@ interface ThinkingBudgetProps { export const ThinkingBudget = ({ apiConfiguration, setApiConfigurationField, modelInfo }: ThinkingBudgetProps) => { const { t } = useAppTranslation() + const { id: selectedModelId } = useSelectedModel(apiConfiguration) + + // Check if this is a Gemini 2.5 Pro model + const isGemini25Pro = selectedModelId && selectedModelId.includes("gemini-2.5-pro") + const minThinkingTokens = isGemini25Pro ? GEMINI_25_PRO_MIN_THINKING_TOKENS : 1024 const isReasoningBudgetSupported = !!modelInfo && modelInfo.supportsReasoningBudget const isReasoningBudgetRequired = !!modelInfo && modelInfo.requiredReasoningBudget @@ -81,9 +91,9 @@ export const ThinkingBudget = ({ apiConfiguration, setApiConfigurationField, mod
    {t("settings:thinkingBudget.maxThinkingTokens")}
    setApiConfigurationField("modelMaxThinkingTokens", value)} /> diff --git a/webview-ui/src/components/settings/__tests__/ThinkingBudget.spec.tsx b/webview-ui/src/components/settings/__tests__/ThinkingBudget.spec.tsx index 5ca51b4528..fa7493edc6 100644 --- a/webview-ui/src/components/settings/__tests__/ThinkingBudget.spec.tsx +++ b/webview-ui/src/components/settings/__tests__/ThinkingBudget.spec.tsx @@ -7,18 +7,38 @@ import type { ModelInfo } from "@roo-code/types" import { ThinkingBudget } from "../ThinkingBudget" vi.mock("@/components/ui", () => ({ - Slider: ({ value, onValueChange, min, max }: any) => ( + Slider: ({ value, onValueChange, min, max, step }: any) => ( onValueChange([parseInt(e.target.value)])} /> ), })) +vi.mock("@/components/ui/hooks/useSelectedModel", () => ({ + useSelectedModel: (apiConfiguration: any) => { + // Return the model ID based on apiConfiguration for testing + // For Gemini tests, check if apiProvider is gemini and use apiModelId + if (apiConfiguration?.apiProvider === "gemini") { + return { + id: apiConfiguration?.apiModelId || "gemini-2.0-flash-exp", + provider: "gemini", + info: undefined, + } + } + return { + id: apiConfiguration?.apiModelId || "claude-3-5-sonnet-20241022", + provider: apiConfiguration?.apiProvider || "anthropic", + info: undefined, + } + }, +})) + describe("ThinkingBudget", () => { const mockModelInfo: ModelInfo = { supportsReasoningBudget: true, @@ -103,13 +123,61 @@ describe("ThinkingBudget", () => { expect(sliders[1]).toHaveValue("8000") // 80% of 10000 }) - it("should use min thinking tokens of 1024", () => { + it("should use min thinking tokens of 1024 for non-Gemini models", () => { render() const sliders = screen.getAllByTestId("slider") expect(sliders[1].getAttribute("min")).toBe("1024") }) + it("should use min thinking tokens of 128 for Gemini 2.5 Pro models", () => { + render( + , + ) + + const sliders = screen.getAllByTestId("slider") + expect(sliders[1].getAttribute("min")).toBe("128") + }) + + it("should use step of 128 for Gemini 2.5 Pro models", () => { + render( + , + ) + + const sliders = screen.getAllByTestId("slider") + expect(sliders[1].getAttribute("step")).toBe("128") + }) + + it("should use step of 1024 for non-Gemini models", () => { + render( + , + ) + + const sliders = screen.getAllByTestId("slider") + expect(sliders[1].getAttribute("step")).toBe("1024") + }) + it("should update max tokens when slider changes", () => { const setApiConfigurationField = vi.fn() From 7a865e26c4865cc4ad87fde4995a997c35a03bf5 Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 16:55:30 -0700 Subject: [PATCH 085/253] fix: prevent disabled MCP servers from starting processes and show correct status (#6084) Co-authored-by: Roo Code Co-authored-by: hannesrudolph Co-authored-by: Daniel Riccio --- src/core/webview/webviewMessageHandler.ts | 7 + src/services/mcp/McpHub.ts | 225 ++++- src/services/mcp/__tests__/McpHub.spec.ts | 1026 +++++++++++++++++++-- webview-ui/src/components/mcp/McpView.tsx | 352 +++---- 4 files changed, 1378 insertions(+), 232 deletions(-) diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts index 3419cb8565..0cb9440d3f 100644 --- a/src/core/webview/webviewMessageHandler.ts +++ b/src/core/webview/webviewMessageHandler.ts @@ -901,6 +901,13 @@ export const webviewMessageHandler = async ( case "mcpEnabled": const mcpEnabled = message.bool ?? true await updateGlobalState("mcpEnabled", mcpEnabled) + + // Delegate MCP enable/disable logic to McpHub + const mcpHubInstance = provider.getMcpHub() + if (mcpHubInstance) { + await mcpHubInstance.handleMcpEnabledChange(mcpEnabled) + } + await provider.postStateToWebview() break case "enableMcpServerCreation": diff --git a/src/services/mcp/McpHub.ts b/src/services/mcp/McpHub.ts index 10a74712ef..6d512b3f28 100644 --- a/src/services/mcp/McpHub.ts +++ b/src/services/mcp/McpHub.ts @@ -33,12 +33,29 @@ import { fileExistsAtPath } from "../../utils/fs" import { arePathsEqual } from "../../utils/path" import { injectVariables } from "../../utils/config" -export type McpConnection = { +// Discriminated union for connection states +export type ConnectedMcpConnection = { + type: "connected" server: McpServer client: Client transport: StdioClientTransport | SSEClientTransport | StreamableHTTPClientTransport } +export type DisconnectedMcpConnection = { + type: "disconnected" + server: McpServer + client: null + transport: null +} + +export type McpConnection = ConnectedMcpConnection | DisconnectedMcpConnection + +// Enum for disable reasons +export enum DisableReason { + MCP_DISABLED = "mcpDisabled", + SERVER_DISABLED = "serverDisabled", +} + // Base configuration schema for common settings const BaseConfigSchema = z.object({ disabled: z.boolean().optional(), @@ -497,6 +514,7 @@ export class McpHub { const result = McpSettingsSchema.safeParse(config) if (result.success) { + // Pass all servers including disabled ones - they'll be handled in updateServerConnections await this.updateServerConnections(result.data.mcpServers || {}, source, false) } else { const errorMessages = result.error.errors @@ -552,6 +570,49 @@ export class McpHub { await this.initializeMcpServers("project") } + /** + * Creates a placeholder connection for disabled servers or when MCP is globally disabled + * @param name The server name + * @param config The server configuration + * @param source The source of the server (global or project) + * @param reason The reason for creating a placeholder (mcpDisabled or serverDisabled) + * @returns A placeholder DisconnectedMcpConnection object + */ + private createPlaceholderConnection( + name: string, + config: z.infer, + source: "global" | "project", + reason: DisableReason, + ): DisconnectedMcpConnection { + return { + type: "disconnected", + server: { + name, + config: JSON.stringify(config), + status: "disconnected", + disabled: reason === DisableReason.SERVER_DISABLED ? true : config.disabled, + source, + projectPath: source === "project" ? vscode.workspace.workspaceFolders?.[0]?.uri.fsPath : undefined, + errorHistory: [], + }, + client: null, + transport: null, + } + } + + /** + * Checks if MCP is globally enabled + * @returns Promise indicating if MCP is enabled + */ + private async isMcpEnabled(): Promise { + const provider = this.providerRef.deref() + if (!provider) { + return true // Default to enabled if provider is not available + } + const state = await provider.getState() + return state.mcpEnabled ?? true + } + private async connectToServer( name: string, config: z.infer, @@ -560,6 +621,26 @@ export class McpHub { // Remove existing connection if it exists with the same source await this.deleteConnection(name, source) + // Check if MCP is globally enabled + const mcpEnabled = await this.isMcpEnabled() + if (!mcpEnabled) { + // Still create a connection object to track the server, but don't actually connect + const connection = this.createPlaceholderConnection(name, config, source, DisableReason.MCP_DISABLED) + this.connections.push(connection) + return + } + + // Skip connecting to disabled servers + if (config.disabled) { + // Still create a connection object to track the server, but don't actually connect + const connection = this.createPlaceholderConnection(name, config, source, DisableReason.SERVER_DISABLED) + this.connections.push(connection) + return + } + + // Set up file watchers for enabled servers + this.setupFileWatcher(name, config, source) + try { const client = new Client( { @@ -733,7 +814,9 @@ export class McpHub { transport.start = async () => {} } - const connection: McpConnection = { + // Create a connected connection + const connection: ConnectedMcpConnection = { + type: "connected", server: { name, config: JSON.stringify(configInjected), @@ -826,8 +909,8 @@ export class McpHub { // Use the helper method to find the connection const connection = this.findConnection(serverName, source) - if (!connection) { - throw new Error(`Server ${serverName} not found`) + if (!connection || connection.type !== "connected") { + return [] } const response = await connection.client.request({ method: "tools/list" }, ListToolsResultSchema) @@ -881,7 +964,7 @@ export class McpHub { private async fetchResourcesList(serverName: string, source?: "global" | "project"): Promise { try { const connection = this.findConnection(serverName, source) - if (!connection) { + if (!connection || connection.type !== "connected") { return [] } const response = await connection.client.request({ method: "resources/list" }, ListResourcesResultSchema) @@ -898,7 +981,7 @@ export class McpHub { ): Promise { try { const connection = this.findConnection(serverName, source) - if (!connection) { + if (!connection || connection.type !== "connected") { return [] } const response = await connection.client.request( @@ -913,6 +996,9 @@ export class McpHub { } async deleteConnection(name: string, source?: "global" | "project"): Promise { + // Clean up file watchers for this server + this.removeFileWatchersForServer(name) + // If source is provided, only delete connections from that source const connections = source ? this.connections.filter((conn) => conn.server.name === name && conn.server.source === source) @@ -920,8 +1006,10 @@ export class McpHub { for (const connection of connections) { try { - await connection.transport.close() - await connection.client.close() + if (connection.type === "connected") { + await connection.transport.close() + await connection.client.close() + } } catch (error) { console.error(`Failed to close transport for ${name}:`, error) } @@ -975,7 +1063,10 @@ export class McpHub { if (!currentConnection) { // New server try { - this.setupFileWatcher(name, validatedConfig, source) + // Only setup file watcher for enabled servers + if (!validatedConfig.disabled) { + this.setupFileWatcher(name, validatedConfig, source) + } await this.connectToServer(name, validatedConfig, source) } catch (error) { this.showErrorMessage(`Failed to connect to new MCP server ${name}`, error) @@ -983,7 +1074,10 @@ export class McpHub { } else if (!deepEqual(JSON.parse(currentConnection.server.config), config)) { // Existing server with changed config try { - this.setupFileWatcher(name, validatedConfig, source) + // Only setup file watcher for enabled servers + if (!validatedConfig.disabled) { + this.setupFileWatcher(name, validatedConfig, source) + } await this.deleteConnection(name, source) await this.connectToServer(name, validatedConfig, source) } catch (error) { @@ -1066,10 +1160,21 @@ export class McpHub { this.fileWatchers.clear() } + private removeFileWatchersForServer(serverName: string) { + const watchers = this.fileWatchers.get(serverName) + if (watchers) { + watchers.forEach((watcher) => watcher.close()) + this.fileWatchers.delete(serverName) + } + } + async restartConnection(serverName: string, source?: "global" | "project"): Promise { this.isConnecting = true - const provider = this.providerRef.deref() - if (!provider) { + + // Check if MCP is globally enabled + const mcpEnabled = await this.isMcpEnabled() + if (!mcpEnabled) { + this.isConnecting = false return } @@ -1111,6 +1216,23 @@ export class McpHub { return } + // Check if MCP is globally enabled + const mcpEnabled = await this.isMcpEnabled() + if (!mcpEnabled) { + // Clear all existing connections + const existingConnections = [...this.connections] + for (const conn of existingConnections) { + await this.deleteConnection(conn.server.name, conn.server.source) + } + + // Still initialize servers to track them, but they won't connect + await this.initializeMcpServers("global") + await this.initializeMcpServers("project") + + await this.notifyWebviewOfServerChanges() + return + } + this.isConnecting = true vscode.window.showInformationMessage(t("mcp:info.refreshing_all")) @@ -1257,8 +1379,21 @@ export class McpHub { try { connection.server.disabled = disabled - // Only refresh capabilities if connected - if (connection.server.status === "connected") { + // If disabling a connected server, disconnect it + if (disabled && connection.server.status === "connected") { + // Clean up file watchers when disabling + this.removeFileWatchersForServer(serverName) + await this.deleteConnection(serverName, serverSource) + // Re-add as a disabled connection + await this.connectToServer(serverName, JSON.parse(connection.server.config), serverSource) + } else if (!disabled && connection.server.status === "disconnected") { + // If enabling a disabled server, connect it + const config = JSON.parse(connection.server.config) + await this.deleteConnection(serverName, serverSource) + // When re-enabling, file watchers will be set up in connectToServer + await this.connectToServer(serverName, config, serverSource) + } else if (connection.server.status === "connected") { + // Only refresh capabilities if connected connection.server.tools = await this.fetchToolsList(serverName, serverSource) connection.server.resources = await this.fetchResourcesList(serverName, serverSource) connection.server.resourceTemplates = await this.fetchResourceTemplatesList( @@ -1439,7 +1574,7 @@ export class McpHub { async readResource(serverName: string, uri: string, source?: "global" | "project"): Promise { const connection = this.findConnection(serverName, source) - if (!connection) { + if (!connection || connection.type !== "connected") { throw new Error(`No connection found for server: ${serverName}${source ? ` with source ${source}` : ""}`) } if (connection.server.disabled) { @@ -1463,7 +1598,7 @@ export class McpHub { source?: "global" | "project", ): Promise { const connection = this.findConnection(serverName, source) - if (!connection) { + if (!connection || connection.type !== "connected") { throw new Error( `No connection found for server: ${serverName}${source ? ` with source ${source}` : ""}. Please make sure to use MCP servers available under 'Connected MCP Servers'.`, ) @@ -1609,6 +1744,64 @@ export class McpHub { } } + /** + * Handles enabling/disabling MCP globally + * @param enabled Whether MCP should be enabled or disabled + * @returns Promise + */ + async handleMcpEnabledChange(enabled: boolean): Promise { + if (!enabled) { + // If MCP is being disabled, disconnect all servers with error handling + const existingConnections = [...this.connections] + const disconnectionErrors: Array<{ serverName: string; error: string }> = [] + + for (const conn of existingConnections) { + try { + await this.deleteConnection(conn.server.name, conn.server.source) + } catch (error) { + const errorMessage = error instanceof Error ? error.message : String(error) + disconnectionErrors.push({ + serverName: conn.server.name, + error: errorMessage, + }) + console.error(`Failed to disconnect MCP server ${conn.server.name}: ${errorMessage}`) + } + } + + // If there were errors, notify the user + if (disconnectionErrors.length > 0) { + const errorSummary = disconnectionErrors.map((e) => `${e.serverName}: ${e.error}`).join("\n") + vscode.window.showWarningMessage( + t("mcp:errors.disconnect_servers_partial", { + count: disconnectionErrors.length, + errors: errorSummary, + }) || + `Failed to disconnect ${disconnectionErrors.length} MCP server(s). Check the output for details.`, + ) + } + + // Re-initialize servers to track them in disconnected state + try { + await this.refreshAllConnections() + } catch (error) { + console.error(`Failed to refresh MCP connections after disabling: ${error}`) + vscode.window.showErrorMessage( + t("mcp:errors.refresh_after_disable") || "Failed to refresh MCP connections after disabling", + ) + } + } else { + // If MCP is being enabled, reconnect all servers + try { + await this.refreshAllConnections() + } catch (error) { + console.error(`Failed to refresh MCP connections after enabling: ${error}`) + vscode.window.showErrorMessage( + t("mcp:errors.refresh_after_enable") || "Failed to refresh MCP connections after enabling", + ) + } + } + } + async dispose(): Promise { // Prevent multiple disposals if (this.isDisposed) { diff --git a/src/services/mcp/__tests__/McpHub.spec.ts b/src/services/mcp/__tests__/McpHub.spec.ts index 7dc7f00c04..ebce2d5b2a 100644 --- a/src/services/mcp/__tests__/McpHub.spec.ts +++ b/src/services/mcp/__tests__/McpHub.spec.ts @@ -1,7 +1,7 @@ -import type { McpHub as McpHubType, McpConnection } from "../McpHub" +import type { McpHub as McpHubType, McpConnection, ConnectedMcpConnection, DisconnectedMcpConnection } from "../McpHub" import type { ClineProvider } from "../../../core/webview/ClineProvider" import type { ExtensionContext, Uri } from "vscode" -import { ServerConfigSchema, McpHub } from "../McpHub" +import { ServerConfigSchema, McpHub, DisableReason } from "../McpHub" import fs from "fs/promises" import { vi, Mock } from "vitest" @@ -33,11 +33,15 @@ vi.mock("fs/promises", () => ({ mkdir: vi.fn().mockResolvedValue(undefined), })) +// Import safeWriteJson to use in mocks +import { safeWriteJson } from "../../../utils/safeWriteJson" + // Mock safeWriteJson vi.mock("../../../utils/safeWriteJson", () => ({ safeWriteJson: vi.fn(async (filePath, data) => { // Instead of trying to write to the file system, just call fs.writeFile mock // This avoids the complex file locking and temp file operations + const fs = await import("fs/promises") return fs.writeFile(filePath, JSON.stringify(data), "utf8") }), })) @@ -79,6 +83,16 @@ vi.mock("@modelcontextprotocol/sdk/client/index.js", () => ({ Client: vi.fn(), })) +// Mock chokidar +vi.mock("chokidar", () => ({ + default: { + watch: vi.fn().mockReturnValue({ + on: vi.fn().mockReturnThis(), + close: vi.fn(), + }), + }, +})) + describe("McpHub", () => { let mcpHub: McpHubType let mockProvider: Partial @@ -108,6 +122,7 @@ describe("McpHub", () => { ensureSettingsDirectoryExists: vi.fn().mockResolvedValue("/mock/settings/path"), ensureMcpServersDirectoryExists: vi.fn().mockResolvedValue("/mock/settings/path"), postMessageToWebview: vi.fn(), + getState: vi.fn().mockResolvedValue({ mcpEnabled: true }), context: { subscriptions: [], workspaceState: {} as any, @@ -167,6 +182,587 @@ describe("McpHub", () => { } }) + describe("Discriminated union type handling", () => { + it("should create connected connections with proper type", async () => { + // Mock StdioClientTransport + const stdioModule = await import("@modelcontextprotocol/sdk/client/stdio.js") + const StdioClientTransport = stdioModule.StdioClientTransport as ReturnType + + const mockTransport = { + start: vi.fn().mockResolvedValue(undefined), + close: vi.fn().mockResolvedValue(undefined), + stderr: { + on: vi.fn(), + }, + onerror: null, + onclose: null, + } + + StdioClientTransport.mockImplementation(() => mockTransport) + + // Mock Client + const clientModule = await import("@modelcontextprotocol/sdk/client/index.js") + const Client = clientModule.Client as ReturnType + + const mockClient = { + connect: vi.fn().mockResolvedValue(undefined), + close: vi.fn().mockResolvedValue(undefined), + getInstructions: vi.fn().mockReturnValue("test instructions"), + request: vi.fn().mockResolvedValue({ tools: [], resources: [], resourceTemplates: [] }), + } + + Client.mockImplementation(() => mockClient) + + // Mock the config file read + vi.mocked(fs.readFile).mockResolvedValue( + JSON.stringify({ + mcpServers: { + "union-test-server": { + command: "node", + args: ["test.js"], + }, + }, + }), + ) + + // Create McpHub and let it initialize + const mcpHub = new McpHub(mockProvider as ClineProvider) + await new Promise((resolve) => setTimeout(resolve, 100)) + + // Find the connection + const connection = mcpHub.connections.find((conn) => conn.server.name === "union-test-server") + expect(connection).toBeDefined() + + // Type guard check - connected connections should have client and transport + if (connection && connection.type === "connected") { + expect(connection.client).toBeDefined() + expect(connection.transport).toBeDefined() + expect(connection.server.status).toBe("connected") + } else { + throw new Error("Connection should be of type 'connected'") + } + }) + + it("should create disconnected connections for disabled servers", async () => { + // Mock the config file read with a disabled server + vi.mocked(fs.readFile).mockResolvedValue( + JSON.stringify({ + mcpServers: { + "disabled-union-server": { + command: "node", + args: ["test.js"], + disabled: true, + }, + }, + }), + ) + + // Create McpHub and let it initialize + const mcpHub = new McpHub(mockProvider as ClineProvider) + await new Promise((resolve) => setTimeout(resolve, 100)) + + // Find the connection + const connection = mcpHub.connections.find((conn) => conn.server.name === "disabled-union-server") + expect(connection).toBeDefined() + + // Type guard check - disconnected connections should have null client and transport + if (connection && connection.type === "disconnected") { + expect(connection.client).toBeNull() + expect(connection.transport).toBeNull() + expect(connection.server.status).toBe("disconnected") + expect(connection.server.disabled).toBe(true) + } else { + throw new Error("Connection should be of type 'disconnected'") + } + }) + + it("should handle type narrowing correctly in callTool", async () => { + // Mock fs.readFile to return empty config so no servers are initialized + vi.mocked(fs.readFile).mockResolvedValue( + JSON.stringify({ + mcpServers: {}, + }), + ) + + // Create a mock McpHub instance + const mcpHub = new McpHub(mockProvider as ClineProvider) + + // Wait for initialization + await new Promise((resolve) => setTimeout(resolve, 100)) + + // Clear any connections that might have been created + mcpHub.connections = [] + + // Directly set up a connected connection + const connectedConnection: ConnectedMcpConnection = { + type: "connected", + server: { + name: "test-server", + config: JSON.stringify({ command: "node", args: ["test.js"] }), + status: "connected", + source: "global", + errorHistory: [], + } as any, + client: { + request: vi.fn().mockResolvedValue({ result: "success" }), + } as any, + transport: {} as any, + } + + // Add the connected connection + mcpHub.connections = [connectedConnection] + + // Call tool should work with connected server + const result = await mcpHub.callTool("test-server", "test-tool", {}) + expect(result).toEqual({ result: "success" }) + expect(connectedConnection.client.request).toHaveBeenCalled() + + // Now test with a disconnected connection + const disconnectedConnection: DisconnectedMcpConnection = { + type: "disconnected", + server: { + name: "disabled-server", + config: JSON.stringify({ command: "node", args: ["test.js"], disabled: true }), + status: "disconnected", + disabled: true, + source: "global", + errorHistory: [], + } as any, + client: null, + transport: null, + } + + // Replace connections with disconnected one + mcpHub.connections = [disconnectedConnection] + + // Call tool should fail with disconnected server + await expect(mcpHub.callTool("disabled-server", "test-tool", {})).rejects.toThrow( + "No connection found for server: disabled-server", + ) + }) + }) + + describe("File watcher cleanup", () => { + it("should clean up file watchers when server is disabled", async () => { + // Get the mocked chokidar + const chokidar = (await import("chokidar")).default + const mockWatcher = { + on: vi.fn().mockReturnThis(), + close: vi.fn(), + } + vi.mocked(chokidar.watch).mockReturnValue(mockWatcher as any) + + // Mock StdioClientTransport + const stdioModule = await import("@modelcontextprotocol/sdk/client/stdio.js") + const StdioClientTransport = stdioModule.StdioClientTransport as ReturnType + + const mockTransport = { + start: vi.fn().mockResolvedValue(undefined), + close: vi.fn().mockResolvedValue(undefined), + stderr: { + on: vi.fn(), + }, + onerror: null, + onclose: null, + } + + StdioClientTransport.mockImplementation(() => mockTransport) + + // Mock Client + const clientModule = await import("@modelcontextprotocol/sdk/client/index.js") + const Client = clientModule.Client as ReturnType + + const mockClient = { + connect: vi.fn().mockResolvedValue(undefined), + close: vi.fn().mockResolvedValue(undefined), + getInstructions: vi.fn().mockReturnValue("test instructions"), + request: vi.fn().mockResolvedValue({ tools: [], resources: [], resourceTemplates: [] }), + } + + Client.mockImplementation(() => mockClient) + + // Create server with watchPaths + vi.mocked(fs.readFile).mockResolvedValue( + JSON.stringify({ + mcpServers: { + "watcher-test-server": { + command: "node", + args: ["test.js"], + watchPaths: ["/path/to/watch"], + }, + }, + }), + ) + + const mcpHub = new McpHub(mockProvider as ClineProvider) + await new Promise((resolve) => setTimeout(resolve, 100)) + + // Verify watcher was created + expect(chokidar.watch).toHaveBeenCalledWith(["/path/to/watch"], expect.any(Object)) + + // Now disable the server + await mcpHub.toggleServerDisabled("watcher-test-server", true) + + // Verify watcher was closed + expect(mockWatcher.close).toHaveBeenCalled() + }) + + it("should clean up all file watchers when server is deleted", async () => { + // Get the mocked chokidar + const chokidar = (await import("chokidar")).default + const mockWatcher1 = { + on: vi.fn().mockReturnThis(), + close: vi.fn(), + } + const mockWatcher2 = { + on: vi.fn().mockReturnThis(), + close: vi.fn(), + } + + // Return different watchers for different paths + let watcherIndex = 0 + vi.mocked(chokidar.watch).mockImplementation(() => { + return (watcherIndex++ === 0 ? mockWatcher1 : mockWatcher2) as any + }) + + // Mock StdioClientTransport + const stdioModule = await import("@modelcontextprotocol/sdk/client/stdio.js") + const StdioClientTransport = stdioModule.StdioClientTransport as ReturnType + + const mockTransport = { + start: vi.fn().mockResolvedValue(undefined), + close: vi.fn().mockResolvedValue(undefined), + stderr: { + on: vi.fn(), + }, + onerror: null, + onclose: null, + } + + StdioClientTransport.mockImplementation(() => mockTransport) + + // Mock Client + const clientModule = await import("@modelcontextprotocol/sdk/client/index.js") + const Client = clientModule.Client as ReturnType + + const mockClient = { + connect: vi.fn().mockResolvedValue(undefined), + close: vi.fn().mockResolvedValue(undefined), + getInstructions: vi.fn().mockReturnValue("test instructions"), + request: vi.fn().mockResolvedValue({ tools: [], resources: [], resourceTemplates: [] }), + } + + Client.mockImplementation(() => mockClient) + + // Create server with multiple watchPaths + vi.mocked(fs.readFile).mockResolvedValue( + JSON.stringify({ + mcpServers: { + "multi-watcher-server": { + command: "node", + args: ["test.js", "build/index.js"], // This will create a watcher for build/index.js + watchPaths: ["/path/to/watch1", "/path/to/watch2"], + }, + }, + }), + ) + + const mcpHub = new McpHub(mockProvider as ClineProvider) + await new Promise((resolve) => setTimeout(resolve, 100)) + + // Verify watchers were created + expect(chokidar.watch).toHaveBeenCalled() + + // Delete the connection (this should clean up all watchers) + await mcpHub.deleteConnection("multi-watcher-server") + + // Verify all watchers were closed + expect(mockWatcher1.close).toHaveBeenCalled() + expect(mockWatcher2.close).toHaveBeenCalled() + }) + + it("should not create file watchers for disabled servers on initialization", async () => { + // Get the mocked chokidar + const chokidar = (await import("chokidar")).default + + // Create disabled server with watchPaths + vi.mocked(fs.readFile).mockResolvedValue( + JSON.stringify({ + mcpServers: { + "disabled-watcher-server": { + command: "node", + args: ["test.js"], + watchPaths: ["/path/to/watch"], + disabled: true, + }, + }, + }), + ) + + vi.mocked(chokidar.watch).mockClear() + + const mcpHub = new McpHub(mockProvider as ClineProvider) + await new Promise((resolve) => setTimeout(resolve, 100)) + + // Verify no watcher was created for disabled server + expect(chokidar.watch).not.toHaveBeenCalled() + }) + }) + + describe("DisableReason enum usage", () => { + it("should use MCP_DISABLED reason when MCP is globally disabled", async () => { + // Mock provider with mcpEnabled: false + mockProvider.getState = vi.fn().mockResolvedValue({ mcpEnabled: false }) + + vi.mocked(fs.readFile).mockResolvedValue( + JSON.stringify({ + mcpServers: { + "mcp-disabled-server": { + command: "node", + args: ["test.js"], + }, + }, + }), + ) + + const mcpHub = new McpHub(mockProvider as ClineProvider) + await new Promise((resolve) => setTimeout(resolve, 100)) + + // Find the connection + const connection = mcpHub.connections.find((conn) => conn.server.name === "mcp-disabled-server") + expect(connection).toBeDefined() + expect(connection?.type).toBe("disconnected") + expect(connection?.server.status).toBe("disconnected") + + // The server should not be marked as disabled individually + expect(connection?.server.disabled).toBeUndefined() + }) + + it("should use SERVER_DISABLED reason when server is individually disabled", async () => { + vi.mocked(fs.readFile).mockResolvedValue( + JSON.stringify({ + mcpServers: { + "server-disabled-server": { + command: "node", + args: ["test.js"], + disabled: true, + }, + }, + }), + ) + + const mcpHub = new McpHub(mockProvider as ClineProvider) + await new Promise((resolve) => setTimeout(resolve, 100)) + + // Find the connection + const connection = mcpHub.connections.find((conn) => conn.server.name === "server-disabled-server") + expect(connection).toBeDefined() + expect(connection?.type).toBe("disconnected") + expect(connection?.server.status).toBe("disconnected") + expect(connection?.server.disabled).toBe(true) + }) + + it("should handle both disable reasons correctly", async () => { + // First test with MCP globally disabled + mockProvider.getState = vi.fn().mockResolvedValue({ mcpEnabled: false }) + + vi.mocked(fs.readFile).mockResolvedValue( + JSON.stringify({ + mcpServers: { + "both-reasons-server": { + command: "node", + args: ["test.js"], + disabled: true, // Server is also individually disabled + }, + }, + }), + ) + + const mcpHub = new McpHub(mockProvider as ClineProvider) + await new Promise((resolve) => setTimeout(resolve, 100)) + + // Find the connection + const connection = mcpHub.connections.find((conn) => conn.server.name === "both-reasons-server") + expect(connection).toBeDefined() + expect(connection?.type).toBe("disconnected") + + // When MCP is globally disabled, it takes precedence + // The server's individual disabled state should be preserved + expect(connection?.server.disabled).toBe(true) + }) + }) + + describe("Null safety improvements", () => { + it("should handle null client safely in disconnected connections", async () => { + // Mock fs.readFile to return a disabled server config + vi.mocked(fs.readFile).mockResolvedValue( + JSON.stringify({ + mcpServers: { + "null-safety-server": { + command: "node", + args: ["test.js"], + disabled: true, + }, + }, + }), + ) + + const mcpHub = new McpHub(mockProvider as ClineProvider) + + // Wait for initialization + await new Promise((resolve) => setTimeout(resolve, 100)) + + // The server should be created as a disconnected connection with null client/transport + const connection = mcpHub.connections.find((conn) => conn.server.name === "null-safety-server") + expect(connection).toBeDefined() + expect(connection?.type).toBe("disconnected") + + // Type guard to ensure it's a disconnected connection + if (connection?.type === "disconnected") { + expect(connection.client).toBeNull() + expect(connection.transport).toBeNull() + } + + // Try to call tool on disconnected server + await expect(mcpHub.callTool("null-safety-server", "test-tool", {})).rejects.toThrow( + "No connection found for server: null-safety-server", + ) + + // Try to read resource on disconnected server + await expect(mcpHub.readResource("null-safety-server", "test-uri")).rejects.toThrow( + "No connection found for server: null-safety-server", + ) + }) + + it("should handle connection type checks safely", async () => { + // Mock StdioClientTransport + const stdioModule = await import("@modelcontextprotocol/sdk/client/stdio.js") + const StdioClientTransport = stdioModule.StdioClientTransport as ReturnType + + const mockTransport = { + start: vi.fn().mockResolvedValue(undefined), + close: vi.fn().mockResolvedValue(undefined), + stderr: { + on: vi.fn(), + }, + onerror: null, + onclose: null, + } + + StdioClientTransport.mockImplementation(() => mockTransport) + + // Mock Client + const clientModule = await import("@modelcontextprotocol/sdk/client/index.js") + const Client = clientModule.Client as ReturnType + + const mockClient = { + connect: vi.fn().mockResolvedValue(undefined), + close: vi.fn().mockResolvedValue(undefined), + getInstructions: vi.fn().mockReturnValue("test instructions"), + request: vi.fn().mockResolvedValue({ tools: [], resources: [], resourceTemplates: [] }), + } + + Client.mockImplementation(() => mockClient) + + vi.mocked(fs.readFile).mockResolvedValue( + JSON.stringify({ + mcpServers: { + "type-check-server": { + command: "node", + args: ["test.js"], + }, + }, + }), + ) + + const mcpHub = new McpHub(mockProvider as ClineProvider) + await new Promise((resolve) => setTimeout(resolve, 100)) + + // Get the connection + const connection = mcpHub.connections.find((conn) => conn.server.name === "type-check-server") + expect(connection).toBeDefined() + + // Safe type checking + if (connection?.type === "connected") { + expect(connection.client).toBeDefined() + expect(connection.transport).toBeDefined() + } else if (connection?.type === "disconnected") { + expect(connection.client).toBeNull() + expect(connection.transport).toBeNull() + } + }) + + it("should handle missing connections safely", async () => { + const mcpHub = new McpHub(mockProvider as ClineProvider) + await new Promise((resolve) => setTimeout(resolve, 100)) + + // Try operations on non-existent server + await expect(mcpHub.callTool("non-existent-server", "test-tool", {})).rejects.toThrow( + "No connection found for server: non-existent-server", + ) + + await expect(mcpHub.readResource("non-existent-server", "test-uri")).rejects.toThrow( + "No connection found for server: non-existent-server", + ) + }) + + it("should handle connection deletion safely", async () => { + // Mock StdioClientTransport + const stdioModule = await import("@modelcontextprotocol/sdk/client/stdio.js") + const StdioClientTransport = stdioModule.StdioClientTransport as ReturnType + + const mockTransport = { + start: vi.fn().mockResolvedValue(undefined), + close: vi.fn().mockResolvedValue(undefined), + stderr: { + on: vi.fn(), + }, + onerror: null, + onclose: null, + } + + StdioClientTransport.mockImplementation(() => mockTransport) + + // Mock Client + const clientModule = await import("@modelcontextprotocol/sdk/client/index.js") + const Client = clientModule.Client as ReturnType + + const mockClient = { + connect: vi.fn().mockResolvedValue(undefined), + close: vi.fn().mockResolvedValue(undefined), + getInstructions: vi.fn().mockReturnValue("test instructions"), + request: vi.fn().mockResolvedValue({ tools: [], resources: [], resourceTemplates: [] }), + } + + Client.mockImplementation(() => mockClient) + + vi.mocked(fs.readFile).mockResolvedValue( + JSON.stringify({ + mcpServers: { + "delete-safety-server": { + command: "node", + args: ["test.js"], + }, + }, + }), + ) + + const mcpHub = new McpHub(mockProvider as ClineProvider) + await new Promise((resolve) => setTimeout(resolve, 100)) + + // Delete the connection + await mcpHub.deleteConnection("delete-safety-server") + + // Verify connection is removed + const connection = mcpHub.connections.find((conn) => conn.server.name === "delete-safety-server") + expect(connection).toBeUndefined() + + // Verify transport and client were closed + expect(mockTransport.close).toHaveBeenCalled() + expect(mockClient.close).toHaveBeenCalled() + }) + }) + describe("toggleToolAlwaysAllow", () => { it("should add tool to always allow list when enabling", async () => { const mockConfig = { @@ -184,7 +780,8 @@ describe("McpHub", () => { vi.mocked(fs.readFile).mockResolvedValueOnce(JSON.stringify(mockConfig)) // Set up mock connection without alwaysAllow - const mockConnection: McpConnection = { + const mockConnection: ConnectedMcpConnection = { + type: "connected", server: { name: "test-server", type: "stdio", @@ -232,7 +829,8 @@ describe("McpHub", () => { vi.mocked(fs.readFile).mockResolvedValueOnce(JSON.stringify(mockConfig)) // Set up mock connection - const mockConnection: McpConnection = { + const mockConnection: ConnectedMcpConnection = { + type: "connected", server: { name: "test-server", type: "stdio", @@ -280,7 +878,8 @@ describe("McpHub", () => { vi.mocked(fs.readFile).mockResolvedValueOnce(JSON.stringify(mockConfig)) // Set up mock connection - const mockConnection: McpConnection = { + const mockConnection: ConnectedMcpConnection = { + type: "connected", server: { name: "test-server", type: "stdio", @@ -325,7 +924,8 @@ describe("McpHub", () => { } // Set up mock connection - const mockConnection: McpConnection = { + const mockConnection: ConnectedMcpConnection = { + type: "connected", server: { name: "test-server", config: "test-server-config", @@ -372,7 +972,8 @@ describe("McpHub", () => { } // Set up mock connection - const mockConnection: McpConnection = { + const mockConnection: ConnectedMcpConnection = { + type: "connected", server: { name: "test-server", config: "test-server-config", @@ -418,7 +1019,8 @@ describe("McpHub", () => { } // Set up mock connection - const mockConnection: McpConnection = { + const mockConnection: ConnectedMcpConnection = { + type: "connected", server: { name: "test-server", config: "test-server-config", @@ -468,7 +1070,8 @@ describe("McpHub", () => { vi.mocked(fs.readFile).mockResolvedValueOnce(JSON.stringify(mockConfig)) // Set up mock connection - const mockConnection: McpConnection = { + const mockConnection: ConnectedMcpConnection = { + type: "connected", server: { name: "test-server", type: "stdio", @@ -500,6 +1103,7 @@ describe("McpHub", () => { it("should filter out disabled servers from getServers", () => { const mockConnections: McpConnection[] = [ { + type: "connected", server: { name: "enabled-server", config: "{}", @@ -508,17 +1112,18 @@ describe("McpHub", () => { }, client: {} as any, transport: {} as any, - }, + } as ConnectedMcpConnection, { + type: "disconnected", server: { name: "disabled-server", config: "{}", - status: "connected", + status: "disconnected", disabled: true, }, - client: {} as any, - transport: {} as any, - }, + client: null, + transport: null, + } as DisconnectedMcpConnection, ] mcpHub.connections = mockConnections @@ -529,44 +1134,64 @@ describe("McpHub", () => { }) it("should prevent calling tools on disabled servers", async () => { - const mockConnection: McpConnection = { - server: { - name: "disabled-server", - config: "{}", - status: "connected", - disabled: true, - }, - client: { - request: vi.fn().mockResolvedValue({ result: "success" }), - } as any, - transport: {} as any, - } + // Mock fs.readFile to return a disabled server config + vi.mocked(fs.readFile).mockResolvedValue( + JSON.stringify({ + mcpServers: { + "disabled-server": { + command: "node", + args: ["test.js"], + disabled: true, + }, + }, + }), + ) - mcpHub.connections = [mockConnection] + const mcpHub = new McpHub(mockProvider as ClineProvider) + // Wait for initialization + await new Promise((resolve) => setTimeout(resolve, 100)) + + // The server should be created as a disconnected connection + const connection = mcpHub.connections.find((conn) => conn.server.name === "disabled-server") + expect(connection).toBeDefined() + expect(connection?.type).toBe("disconnected") + expect(connection?.server.disabled).toBe(true) + + // Try to call tool on disabled server await expect(mcpHub.callTool("disabled-server", "some-tool", {})).rejects.toThrow( - 'Server "disabled-server" is disabled and cannot be used', + "No connection found for server: disabled-server", ) }) it("should prevent reading resources from disabled servers", async () => { - const mockConnection: McpConnection = { - server: { - name: "disabled-server", - config: "{}", - status: "connected", - disabled: true, - }, - client: { - request: vi.fn(), - } as any, - transport: {} as any, - } + // Mock fs.readFile to return a disabled server config + vi.mocked(fs.readFile).mockResolvedValue( + JSON.stringify({ + mcpServers: { + "disabled-server": { + command: "node", + args: ["test.js"], + disabled: true, + }, + }, + }), + ) - mcpHub.connections = [mockConnection] + const mcpHub = new McpHub(mockProvider as ClineProvider) + // Wait for initialization + await new Promise((resolve) => setTimeout(resolve, 100)) + + // The server should be created as a disconnected connection + const connection = mcpHub.connections.find((conn) => conn.server.name === "disabled-server") + expect(connection).toBeDefined() + expect(connection?.type).toBe("disconnected") + expect(connection?.server.disabled).toBe(true) + + // Try to read resource from disabled server await expect(mcpHub.readResource("disabled-server", "some/uri")).rejects.toThrow( - 'Server "disabled-server" is disabled', + "No connection found for server: disabled-server", ) }) }) @@ -574,7 +1199,8 @@ describe("McpHub", () => { describe("callTool", () => { it("should execute tool successfully", async () => { // Mock the connection with a minimal client implementation - const mockConnection: McpConnection = { + const mockConnection: ConnectedMcpConnection = { + type: "connected", server: { name: "test-server", config: JSON.stringify({}), @@ -595,7 +1221,7 @@ describe("McpHub", () => { await mcpHub.callTool("test-server", "some-tool", {}) // Verify the request was made with correct parameters - expect(mockConnection.client.request).toHaveBeenCalledWith( + expect(mockConnection.client!.request).toHaveBeenCalledWith( { method: "tools/call", params: { @@ -637,7 +1263,8 @@ describe("McpHub", () => { }) it("should use default timeout of 60 seconds if not specified", async () => { - const mockConnection: McpConnection = { + const mockConnection: ConnectedMcpConnection = { + type: "connected", server: { name: "test-server", config: JSON.stringify({ type: "stdio", command: "test" }), // No timeout specified @@ -652,7 +1279,7 @@ describe("McpHub", () => { mcpHub.connections = [mockConnection] await mcpHub.callTool("test-server", "test-tool") - expect(mockConnection.client.request).toHaveBeenCalledWith( + expect(mockConnection.client!.request).toHaveBeenCalledWith( expect.anything(), expect.anything(), expect.objectContaining({ timeout: 60000 }), // 60 seconds in milliseconds @@ -660,7 +1287,8 @@ describe("McpHub", () => { }) it("should apply configured timeout to tool calls", async () => { - const mockConnection: McpConnection = { + const mockConnection: ConnectedMcpConnection = { + type: "connected", server: { name: "test-server", config: JSON.stringify({ type: "stdio", command: "test", timeout: 120 }), // 2 minutes @@ -675,7 +1303,7 @@ describe("McpHub", () => { mcpHub.connections = [mockConnection] await mcpHub.callTool("test-server", "test-tool") - expect(mockConnection.client.request).toHaveBeenCalledWith( + expect(mockConnection.client!.request).toHaveBeenCalledWith( expect.anything(), expect.anything(), expect.objectContaining({ timeout: 120000 }), // 120 seconds in milliseconds @@ -700,7 +1328,8 @@ describe("McpHub", () => { vi.mocked(fs.readFile).mockResolvedValueOnce(JSON.stringify(mockConfig)) // Set up mock connection - const mockConnection: McpConnection = { + const mockConnection: ConnectedMcpConnection = { + type: "connected", server: { name: "test-server", type: "stdio", @@ -745,7 +1374,8 @@ describe("McpHub", () => { vi.mocked(fs.readFile).mockResolvedValueOnce(JSON.stringify(mockConfig)) // Set up mock connection before updating - const mockConnectionInitial: McpConnection = { + const mockConnectionInitial: ConnectedMcpConnection = { + type: "connected", server: { name: "test-server", type: "stdio", @@ -768,7 +1398,8 @@ describe("McpHub", () => { expect(fs.writeFile).toHaveBeenCalled() // Setup connection with invalid timeout - const mockConnectionInvalid: McpConnection = { + const mockConnectionInvalid: ConnectedMcpConnection = { + type: "connected", server: { name: "test-server", config: JSON.stringify({ @@ -791,7 +1422,7 @@ describe("McpHub", () => { await mcpHub.callTool("test-server", "test-tool") // Verify default timeout was used - expect(mockConnectionInvalid.client.request).toHaveBeenCalledWith( + expect(mockConnectionInvalid.client!.request).toHaveBeenCalledWith( expect.anything(), expect.anything(), expect.objectContaining({ timeout: 60000 }), // Default 60 seconds @@ -813,7 +1444,8 @@ describe("McpHub", () => { vi.mocked(fs.readFile).mockResolvedValueOnce(JSON.stringify(mockConfig)) // Set up mock connection - const mockConnection: McpConnection = { + const mockConnection: ConnectedMcpConnection = { + type: "connected", server: { name: "test-server", type: "stdio", @@ -852,7 +1484,8 @@ describe("McpHub", () => { vi.mocked(fs.readFile).mockResolvedValueOnce(JSON.stringify(mockConfig)) // Set up mock connection - const mockConnection: McpConnection = { + const mockConnection: ConnectedMcpConnection = { + type: "connected", server: { name: "test-server", type: "stdio", @@ -877,6 +1510,291 @@ describe("McpHub", () => { }) }) + describe("MCP global enable/disable", () => { + beforeEach(() => { + // Clear all mocks before each test + vi.clearAllMocks() + }) + + it("should disconnect all servers when MCP is toggled from enabled to disabled", async () => { + // Mock StdioClientTransport + const stdioModule = await import("@modelcontextprotocol/sdk/client/stdio.js") + const StdioClientTransport = stdioModule.StdioClientTransport as ReturnType + + const mockTransport = { + start: vi.fn().mockResolvedValue(undefined), + close: vi.fn().mockResolvedValue(undefined), + stderr: { + on: vi.fn(), + }, + onerror: null, + onclose: null, + } + + StdioClientTransport.mockImplementation(() => mockTransport) + + // Mock Client + const clientModule = await import("@modelcontextprotocol/sdk/client/index.js") + const Client = clientModule.Client as ReturnType + + const mockClient = { + connect: vi.fn().mockResolvedValue(undefined), + close: vi.fn().mockResolvedValue(undefined), + getInstructions: vi.fn().mockReturnValue("test instructions"), + request: vi.fn().mockResolvedValue({ tools: [], resources: [], resourceTemplates: [] }), + } + + Client.mockImplementation(() => mockClient) + + // Start with MCP enabled + mockProvider.getState = vi.fn().mockResolvedValue({ mcpEnabled: true }) + + // Mock the config file read + vi.mocked(fs.readFile).mockResolvedValue( + JSON.stringify({ + mcpServers: { + "toggle-test-server": { + command: "node", + args: ["test.js"], + }, + }, + }), + ) + + // Create McpHub and let it initialize with MCP enabled + const mcpHub = new McpHub(mockProvider as ClineProvider) + await new Promise((resolve) => setTimeout(resolve, 100)) + + // Verify server is connected + const connectedServer = mcpHub.connections.find((conn) => conn.server.name === "toggle-test-server") + expect(connectedServer).toBeDefined() + expect(connectedServer!.server.status).toBe("connected") + expect(connectedServer!.client).toBeDefined() + expect(connectedServer!.transport).toBeDefined() + + // Now simulate toggling MCP to disabled + mockProvider.getState = vi.fn().mockResolvedValue({ mcpEnabled: false }) + + // Manually trigger what would happen when MCP is disabled + // (normally this would be triggered by the webview message handler) + const existingConnections = [...mcpHub.connections] + for (const conn of existingConnections) { + await mcpHub.deleteConnection(conn.server.name, conn.server.source) + } + await mcpHub.refreshAllConnections() + + // Verify server is now tracked but disconnected + const disconnectedServer = mcpHub.connections.find((conn) => conn.server.name === "toggle-test-server") + expect(disconnectedServer).toBeDefined() + expect(disconnectedServer!.server.status).toBe("disconnected") + expect(disconnectedServer!.client).toBeNull() + expect(disconnectedServer!.transport).toBeNull() + + // Verify close was called on the original client and transport + expect(mockClient.close).toHaveBeenCalled() + expect(mockTransport.close).toHaveBeenCalled() + }) + + it("should not connect to servers when MCP is globally disabled", async () => { + // Mock provider with mcpEnabled: false + const disabledMockProvider = { + ensureSettingsDirectoryExists: vi.fn().mockResolvedValue("/mock/settings/path"), + ensureMcpServersDirectoryExists: vi.fn().mockResolvedValue("/mock/settings/path"), + postMessageToWebview: vi.fn(), + getState: vi.fn().mockResolvedValue({ mcpEnabled: false }), + context: mockProvider.context, + } + + // Mock the config file read with a different server name to avoid conflicts + vi.mocked(fs.readFile).mockResolvedValue( + JSON.stringify({ + mcpServers: { + "disabled-test-server": { + command: "node", + args: ["test.js"], + }, + }, + }), + ) + + // Create a new McpHub instance with disabled MCP + const mcpHub = new McpHub(disabledMockProvider as unknown as ClineProvider) + + // Wait for initialization + await new Promise((resolve) => setTimeout(resolve, 100)) + + // Find the disabled-test-server + const disabledServer = mcpHub.connections.find((conn) => conn.server.name === "disabled-test-server") + + // Verify that the server is tracked but not connected + expect(disabledServer).toBeDefined() + expect(disabledServer!.server.status).toBe("disconnected") + expect(disabledServer!.client).toBeNull() + expect(disabledServer!.transport).toBeNull() + }) + + it("should connect to servers when MCP is globally enabled", async () => { + // Clear all mocks + vi.clearAllMocks() + + // Mock StdioClientTransport + const stdioModule = await import("@modelcontextprotocol/sdk/client/stdio.js") + const StdioClientTransport = stdioModule.StdioClientTransport as ReturnType + + const mockTransport = { + start: vi.fn().mockResolvedValue(undefined), + close: vi.fn().mockResolvedValue(undefined), + stderr: { + on: vi.fn(), + }, + onerror: null, + onclose: null, + } + + StdioClientTransport.mockImplementation(() => mockTransport) + + // Mock Client + const clientModule = await import("@modelcontextprotocol/sdk/client/index.js") + const Client = clientModule.Client as ReturnType + + Client.mockImplementation(() => ({ + connect: vi.fn().mockResolvedValue(undefined), + close: vi.fn().mockResolvedValue(undefined), + getInstructions: vi.fn().mockReturnValue("test instructions"), + request: vi.fn().mockResolvedValue({ tools: [], resources: [], resourceTemplates: [] }), + })) + + // Mock provider with mcpEnabled: true + const enabledMockProvider = { + ensureSettingsDirectoryExists: vi.fn().mockResolvedValue("/mock/settings/path"), + ensureMcpServersDirectoryExists: vi.fn().mockResolvedValue("/mock/settings/path"), + postMessageToWebview: vi.fn(), + getState: vi.fn().mockResolvedValue({ mcpEnabled: true }), + context: mockProvider.context, + } + + // Mock the config file read with a different server name + vi.mocked(fs.readFile).mockResolvedValue( + JSON.stringify({ + mcpServers: { + "enabled-test-server": { + command: "node", + args: ["test.js"], + }, + }, + }), + ) + + // Create a new McpHub instance with enabled MCP + const mcpHub = new McpHub(enabledMockProvider as unknown as ClineProvider) + + // Wait for initialization + await new Promise((resolve) => setTimeout(resolve, 100)) + + // Find the enabled-test-server + const enabledServer = mcpHub.connections.find((conn) => conn.server.name === "enabled-test-server") + + // Verify that the server is connected + expect(enabledServer).toBeDefined() + expect(enabledServer!.server.status).toBe("connected") + expect(enabledServer!.client).toBeDefined() + expect(enabledServer!.transport).toBeDefined() + + // Verify StdioClientTransport was called + expect(StdioClientTransport).toHaveBeenCalled() + }) + + it("should handle refreshAllConnections when MCP is disabled", async () => { + // Mock provider with mcpEnabled: false + const disabledMockProvider = { + ensureSettingsDirectoryExists: vi.fn().mockResolvedValue("/mock/settings/path"), + ensureMcpServersDirectoryExists: vi.fn().mockResolvedValue("/mock/settings/path"), + postMessageToWebview: vi.fn(), + getState: vi.fn().mockResolvedValue({ mcpEnabled: false }), + context: mockProvider.context, + } + + // Mock the config file read + vi.mocked(fs.readFile).mockResolvedValue( + JSON.stringify({ + mcpServers: { + "refresh-test-server": { + command: "node", + args: ["test.js"], + }, + }, + }), + ) + + // Create McpHub with disabled MCP + const mcpHub = new McpHub(disabledMockProvider as unknown as ClineProvider) + await new Promise((resolve) => setTimeout(resolve, 100)) + + // Clear previous calls + vi.clearAllMocks() + + // Call refreshAllConnections + await mcpHub.refreshAllConnections() + + // Verify that servers are tracked but not connected + const server = mcpHub.connections.find((conn) => conn.server.name === "refresh-test-server") + expect(server).toBeDefined() + expect(server!.server.status).toBe("disconnected") + expect(server!.client).toBeNull() + expect(server!.transport).toBeNull() + + // Verify postMessageToWebview was called to update the UI + expect(disabledMockProvider.postMessageToWebview).toHaveBeenCalledWith( + expect.objectContaining({ + type: "mcpServers", + }), + ) + }) + + it("should skip restarting connection when MCP is disabled", async () => { + // Mock provider with mcpEnabled: false + const disabledMockProvider = { + ensureSettingsDirectoryExists: vi.fn().mockResolvedValue("/mock/settings/path"), + ensureMcpServersDirectoryExists: vi.fn().mockResolvedValue("/mock/settings/path"), + postMessageToWebview: vi.fn(), + getState: vi.fn().mockResolvedValue({ mcpEnabled: false }), + context: mockProvider.context, + } + + // Mock the config file read + vi.mocked(fs.readFile).mockResolvedValue( + JSON.stringify({ + mcpServers: { + "restart-test-server": { + command: "node", + args: ["test.js"], + }, + }, + }), + ) + + // Create McpHub with disabled MCP + const mcpHub = new McpHub(disabledMockProvider as unknown as ClineProvider) + await new Promise((resolve) => setTimeout(resolve, 100)) + + // Set isConnecting to false to ensure it's properly reset + mcpHub.isConnecting = false + + // Try to restart a connection + await mcpHub.restartConnection("restart-test-server") + + // Verify that isConnecting was reset to false + expect(mcpHub.isConnecting).toBe(false) + + // Verify that the server remains disconnected + const server = mcpHub.connections.find((conn) => conn.server.name === "restart-test-server") + expect(server).toBeDefined() + expect(server!.server.status).toBe("disconnected") + expect(server!.client).toBeNull() + expect(server!.transport).toBeNull() + }) + }) + describe("Windows command wrapping", () => { let StdioClientTransport: ReturnType let Client: ReturnType diff --git a/webview-ui/src/components/mcp/McpView.tsx b/webview-ui/src/components/mcp/McpView.tsx index 0873bde195..21ad1c2652 100644 --- a/webview-ui/src/components/mcp/McpView.tsx +++ b/webview-ui/src/components/mcp/McpView.tsx @@ -206,6 +206,9 @@ const ServerRow = ({ server, alwaysAllowMcp }: { server: McpServer; alwaysAllowM return configTimeout ?? 60 // Default 1 minute (60 seconds) }) + // Computed property to check if server is expandable + const isExpandable = server.status === "connected" && !server.disabled + const timeoutOptions = [ { value: 15, label: t("mcp:networkTimeout.options.15seconds") }, { value: 30, label: t("mcp:networkTimeout.options.30seconds") }, @@ -218,6 +221,11 @@ const ServerRow = ({ server, alwaysAllowMcp }: { server: McpServer; alwaysAllowM ] const getStatusColor = () => { + // Disabled servers should always show grey regardless of connection status + if (server.disabled) { + return "var(--vscode-descriptionForeground)" + } + switch (server.status) { case "connected": return "var(--vscode-testing-iconPassed)" @@ -229,7 +237,8 @@ const ServerRow = ({ server, alwaysAllowMcp }: { server: McpServer; alwaysAllowM } const handleRowClick = () => { - if (server.status === "connected") { + // Only allow expansion for connected and enabled servers + if (isExpandable) { setIsExpanded(!isExpanded) } } @@ -270,12 +279,12 @@ const ServerRow = ({ server, alwaysAllowMcp }: { server: McpServer; alwaysAllowM alignItems: "center", padding: "8px", background: "var(--vscode-textCodeBlock-background)", - cursor: server.status === "connected" ? "pointer" : "default", - borderRadius: isExpanded || server.status === "connected" ? "4px" : "4px 4px 0 0", + cursor: isExpandable ? "pointer" : "default", + borderRadius: isExpanded || isExpandable ? "4px" : "4px 4px 0 0", opacity: server.disabled ? 0.6 : 1, }} onClick={handleRowClick}> - {server.status === "connected" && ( + {isExpandable && (
    - {server.status === "connected" ? ( - isExpanded && ( -
    - - - {t("mcp:tabs.tools")} ({server.tools?.length || 0}) - - - {t("mcp:tabs.resources")} ( - {[...(server.resourceTemplates || []), ...(server.resources || [])].length || 0}) - - {server.instructions && ( - {t("mcp:instructions")} - )} - - {t("mcp:tabs.errors")} ({server.errorHistory?.length || 0}) - - - - {server.tools && server.tools.length > 0 ? ( -
    - {server.tools.map((tool) => ( - - ))} -
    - ) : ( -
    - {t("mcp:emptyState.noTools")} -
    + {isExpandable + ? isExpanded && ( +
    + + + {t("mcp:tabs.tools")} ({server.tools?.length || 0}) + + + {t("mcp:tabs.resources")} ( + {[...(server.resourceTemplates || []), ...(server.resources || [])].length || 0}) + + {server.instructions && ( + {t("mcp:instructions")} )} - + + {t("mcp:tabs.errors")} ({server.errorHistory?.length || 0}) + - - {(server.resources && server.resources.length > 0) || - (server.resourceTemplates && server.resourceTemplates.length > 0) ? ( -
    - {[...(server.resourceTemplates || []), ...(server.resources || [])].map( - (item) => ( - + {server.tools && server.tools.length > 0 ? ( +
    + {server.tools.map((tool) => ( + - ), - )} -
    - ) : ( -
    - {t("mcp:emptyState.noResources")} -
    - )} - - - {server.instructions && ( - -
    -
    - {server.instructions} -
    -
    -     - )} - - - {server.errorHistory && server.errorHistory.length > 0 ? ( -
    - {[...server.errorHistory] - .sort((a, b) => b.timestamp - a.timestamp) - .map((error, index) => ( - ))} -
    - ) : ( -
    - {t("mcp:emptyState.noErrors")} -
    - )} -     - +
    + ) : ( +
    + {t("mcp:emptyState.noTools")} +
    + )} +     - {/* Network Timeout */} -
    + + {(server.resources && server.resources.length > 0) || + (server.resourceTemplates && server.resourceTemplates.length > 0) ? ( +
    + {[...(server.resourceTemplates || []), ...(server.resources || [])].map( + (item) => ( + + ), + )} +
    + ) : ( +
    + {t("mcp:emptyState.noResources")} +
    + )} +     + + {server.instructions && ( + +
    +
    + {server.instructions} +
    +
    +     + )} + + + {server.errorHistory && server.errorHistory.length > 0 ? ( +
    + {[...server.errorHistory] + .sort((a, b) => b.timestamp - a.timestamp) + .map((error, index) => ( + + ))} +
    + ) : ( +
    + {t("mcp:emptyState.noErrors")} +
    + )} +     + + + {/* Network Timeout */} +
    +
    + {t("mcp:networkTimeout.label")} + +
    + + {t("mcp:networkTimeout.description")} + +
    +
    + ) + : // Only show error UI for non-disabled servers + !server.disabled && ( +
    - {t("mcp:networkTimeout.label")} -
    - - {t("mcp:networkTimeout.description")} - + + {server.status === "connecting" + ? t("mcp:serverStatus.retrying") + : t("mcp:serverStatus.retryConnection")} +
    -
    - ) - ) : ( -
    -
    - {server.error && - server.error.split("\n").map((item, index) => ( - - {index > 0 &&
    } - {item} -     - ))} -
    - - {server.status === "connecting" - ? t("mcp:serverStatus.retrying") - : t("mcp:serverStatus.retryConnection")} - -
    - )} + )} {/* Delete Confirmation Dialog */} From 142cdb5cb1b6b01cb0a8a6aa911e238dc76be247 Mon Sep 17 00:00:00 2001 From: Chris Estreich Date: Tue, 5 Aug 2025 16:13:11 -1000 Subject: [PATCH 086/253] Revert "Use @roo-code/cloud from npm" (#6742) Revert "Use @roo-code/cloud from npm (#6611)" This reverts commit a1439c1f9684bddaa6204938aef61fade7aa361f. --- packages/cloud/eslint.config.mjs | 4 + packages/cloud/package.json | 25 + packages/cloud/src/CloudAPI.ts | 122 ++ packages/cloud/src/CloudService.ts | 288 +++++ packages/cloud/src/CloudSettingsService.ts | 152 +++ packages/cloud/src/CloudShareService.ts | 43 + packages/cloud/src/RefreshTimer.ts | 154 +++ packages/cloud/src/SettingsService.ts | 23 + packages/cloud/src/StaticSettingsService.ts | 41 + packages/cloud/src/TelemetryClient.ts | 169 +++ packages/cloud/src/__mocks__/vscode.ts | 57 + .../CloudService.integration.test.ts | 146 +++ .../cloud/src/__tests__/CloudService.test.ts | 604 +++++++++ .../__tests__/CloudSettingsService.test.ts | 476 +++++++ .../src/__tests__/CloudShareService.test.ts | 310 +++++ .../cloud/src/__tests__/RefreshTimer.test.ts | 210 ++++ .../__tests__/StaticSettingsService.test.ts | 102 ++ .../src/__tests__/TelemetryClient.test.ts | 738 +++++++++++ .../auth/StaticTokenAuthService.spec.ts | 174 +++ .../src/__tests__/auth/WebAuthService.spec.ts | 1113 +++++++++++++++++ packages/cloud/src/auth/AuthService.ts | 36 + .../cloud/src/auth/StaticTokenAuthService.ts | 71 ++ packages/cloud/src/auth/WebAuthService.ts | 646 ++++++++++ packages/cloud/src/auth/index.ts | 3 + packages/cloud/src/config.ts | 5 + packages/cloud/src/errors.ts | 42 + packages/cloud/src/index.ts | 4 + packages/cloud/src/types.ts | 4 + packages/cloud/src/utils.ts | 10 + packages/cloud/tsconfig.json | 5 + packages/cloud/vitest.config.ts | 14 + pnpm-lock.yaml | 217 ++-- src/extension.ts | 13 - src/package.json | 2 +- 34 files changed, 5874 insertions(+), 149 deletions(-) create mode 100644 packages/cloud/eslint.config.mjs create mode 100644 packages/cloud/package.json create mode 100644 packages/cloud/src/CloudAPI.ts create mode 100644 packages/cloud/src/CloudService.ts create mode 100644 packages/cloud/src/CloudSettingsService.ts create mode 100644 packages/cloud/src/CloudShareService.ts create mode 100644 packages/cloud/src/RefreshTimer.ts create mode 100644 packages/cloud/src/SettingsService.ts create mode 100644 packages/cloud/src/StaticSettingsService.ts create mode 100644 packages/cloud/src/TelemetryClient.ts create mode 100644 packages/cloud/src/__mocks__/vscode.ts create mode 100644 packages/cloud/src/__tests__/CloudService.integration.test.ts create mode 100644 packages/cloud/src/__tests__/CloudService.test.ts create mode 100644 packages/cloud/src/__tests__/CloudSettingsService.test.ts create mode 100644 packages/cloud/src/__tests__/CloudShareService.test.ts create mode 100644 packages/cloud/src/__tests__/RefreshTimer.test.ts create mode 100644 packages/cloud/src/__tests__/StaticSettingsService.test.ts create mode 100644 packages/cloud/src/__tests__/TelemetryClient.test.ts create mode 100644 packages/cloud/src/__tests__/auth/StaticTokenAuthService.spec.ts create mode 100644 packages/cloud/src/__tests__/auth/WebAuthService.spec.ts create mode 100644 packages/cloud/src/auth/AuthService.ts create mode 100644 packages/cloud/src/auth/StaticTokenAuthService.ts create mode 100644 packages/cloud/src/auth/WebAuthService.ts create mode 100644 packages/cloud/src/auth/index.ts create mode 100644 packages/cloud/src/config.ts create mode 100644 packages/cloud/src/errors.ts create mode 100644 packages/cloud/src/index.ts create mode 100644 packages/cloud/src/types.ts create mode 100644 packages/cloud/src/utils.ts create mode 100644 packages/cloud/tsconfig.json create mode 100644 packages/cloud/vitest.config.ts diff --git a/packages/cloud/eslint.config.mjs b/packages/cloud/eslint.config.mjs new file mode 100644 index 0000000000..694bf73664 --- /dev/null +++ b/packages/cloud/eslint.config.mjs @@ -0,0 +1,4 @@ +import { config } from "@roo-code/config-eslint/base" + +/** @type {import("eslint").Linter.Config} */ +export default [...config] diff --git a/packages/cloud/package.json b/packages/cloud/package.json new file mode 100644 index 0000000000..d67b5ae7eb --- /dev/null +++ b/packages/cloud/package.json @@ -0,0 +1,25 @@ +{ + "name": "@roo-code/cloud", + "description": "Roo Code Cloud VSCode integration.", + "version": "0.0.0", + "type": "module", + "exports": "./src/index.ts", + "scripts": { + "lint": "eslint src --ext=ts --max-warnings=0", + "check-types": "tsc --noEmit", + "test": "vitest run", + "clean": "rimraf dist .turbo" + }, + "dependencies": { + "@roo-code/telemetry": "workspace:^", + "@roo-code/types": "workspace:^", + "zod": "^3.25.61" + }, + "devDependencies": { + "@roo-code/config-eslint": "workspace:^", + "@roo-code/config-typescript": "workspace:^", + "@types/node": "20.x", + "@types/vscode": "^1.84.0", + "vitest": "^3.2.3" + } +} diff --git a/packages/cloud/src/CloudAPI.ts b/packages/cloud/src/CloudAPI.ts new file mode 100644 index 0000000000..52c3c2521d --- /dev/null +++ b/packages/cloud/src/CloudAPI.ts @@ -0,0 +1,122 @@ +import { type ShareVisibility, type ShareResponse, shareResponseSchema } from "@roo-code/types" + +import { getRooCodeApiUrl } from "./config" +import type { AuthService } from "./auth" +import { getUserAgent } from "./utils" +import { AuthenticationError, CloudAPIError, NetworkError, TaskNotFoundError } from "./errors" + +interface CloudAPIRequestOptions extends Omit { + timeout?: number + headers?: Record +} + +export class CloudAPI { + private authService: AuthService + private log: (...args: unknown[]) => void + private baseUrl: string + + constructor(authService: AuthService, log?: (...args: unknown[]) => void) { + this.authService = authService + this.log = log || console.log + this.baseUrl = getRooCodeApiUrl() + } + + private async request( + endpoint: string, + options: CloudAPIRequestOptions & { + parseResponse?: (data: unknown) => T + } = {}, + ): Promise { + const { timeout = 10000, parseResponse, headers = {}, ...fetchOptions } = options + + const sessionToken = this.authService.getSessionToken() + + if (!sessionToken) { + throw new AuthenticationError() + } + + const url = `${this.baseUrl}${endpoint}` + + const requestHeaders = { + "Content-Type": "application/json", + Authorization: `Bearer ${sessionToken}`, + "User-Agent": getUserAgent(), + ...headers, + } + + try { + const response = await fetch(url, { + ...fetchOptions, + headers: requestHeaders, + signal: AbortSignal.timeout(timeout), + }) + + if (!response.ok) { + await this.handleErrorResponse(response, endpoint) + } + + const data = await response.json() + + if (parseResponse) { + return parseResponse(data) + } + + return data as T + } catch (error) { + if (error instanceof TypeError && error.message.includes("fetch")) { + throw new NetworkError(`Network error while calling ${endpoint}`) + } + + if (error instanceof CloudAPIError) { + throw error + } + + if (error instanceof Error && error.name === "AbortError") { + throw new CloudAPIError(`Request to ${endpoint} timed out`, undefined, undefined) + } + + throw new CloudAPIError( + `Unexpected error while calling ${endpoint}: ${error instanceof Error ? error.message : String(error)}`, + ) + } + } + + private async handleErrorResponse(response: Response, endpoint: string): Promise { + let responseBody: unknown + + try { + responseBody = await response.json() + } catch { + responseBody = await response.text() + } + + switch (response.status) { + case 401: + throw new AuthenticationError() + case 404: + if (endpoint.includes("/share")) { + throw new TaskNotFoundError() + } + throw new CloudAPIError(`Resource not found: ${endpoint}`, 404, responseBody) + default: + throw new CloudAPIError( + `HTTP ${response.status}: ${response.statusText}`, + response.status, + responseBody, + ) + } + } + + async shareTask(taskId: string, visibility: ShareVisibility = "organization"): Promise { + this.log(`[CloudAPI] Sharing task ${taskId} with visibility: ${visibility}`) + + const response = await this.request("/api/extension/share", { + method: "POST", + body: JSON.stringify({ taskId, visibility }), + parseResponse: (data) => shareResponseSchema.parse(data), + }) + + this.log("[CloudAPI] Share response:", response) + return response + } +} diff --git a/packages/cloud/src/CloudService.ts b/packages/cloud/src/CloudService.ts new file mode 100644 index 0000000000..7777d6b220 --- /dev/null +++ b/packages/cloud/src/CloudService.ts @@ -0,0 +1,288 @@ +import * as vscode from "vscode" +import EventEmitter from "events" + +import type { + CloudUserInfo, + TelemetryEvent, + OrganizationAllowList, + OrganizationSettings, + ClineMessage, + ShareVisibility, +} from "@roo-code/types" +import { TelemetryService } from "@roo-code/telemetry" + +import { CloudServiceEvents } from "./types" +import { TaskNotFoundError } from "./errors" +import type { AuthService } from "./auth" +import { WebAuthService, StaticTokenAuthService } from "./auth" +import type { SettingsService } from "./SettingsService" +import { CloudSettingsService } from "./CloudSettingsService" +import { StaticSettingsService } from "./StaticSettingsService" +import { TelemetryClient } from "./TelemetryClient" +import { CloudShareService } from "./CloudShareService" +import { CloudAPI } from "./CloudAPI" + +type AuthStateChangedPayload = CloudServiceEvents["auth-state-changed"][0] +type AuthUserInfoPayload = CloudServiceEvents["user-info"][0] +type SettingsPayload = CloudServiceEvents["settings-updated"][0] + +export class CloudService extends EventEmitter implements vscode.Disposable { + private static _instance: CloudService | null = null + + private context: vscode.ExtensionContext + private authStateListener: (data: AuthStateChangedPayload) => void + private authUserInfoListener: (data: AuthUserInfoPayload) => void + private authService: AuthService | null = null + private settingsListener: (data: SettingsPayload) => void + private settingsService: SettingsService | null = null + private telemetryClient: TelemetryClient | null = null + private shareService: CloudShareService | null = null + private cloudAPI: CloudAPI | null = null + private isInitialized = false + private log: (...args: unknown[]) => void + + private constructor(context: vscode.ExtensionContext, log?: (...args: unknown[]) => void) { + super() + + this.context = context + this.log = log || console.log + this.authStateListener = (data: AuthStateChangedPayload) => { + this.emit("auth-state-changed", data) + } + this.authUserInfoListener = (data: AuthUserInfoPayload) => { + this.emit("user-info", data) + } + this.settingsListener = (data: SettingsPayload) => { + this.emit("settings-updated", data) + } + } + + public async initialize(): Promise { + if (this.isInitialized) { + return + } + + try { + const cloudToken = process.env.ROO_CODE_CLOUD_TOKEN + + if (cloudToken && cloudToken.length > 0) { + this.authService = new StaticTokenAuthService(this.context, cloudToken, this.log) + } else { + this.authService = new WebAuthService(this.context, this.log) + } + + await this.authService.initialize() + + this.authService.on("auth-state-changed", this.authStateListener) + this.authService.on("user-info", this.authUserInfoListener) + + // Check for static settings environment variable. + const staticOrgSettings = process.env.ROO_CODE_CLOUD_ORG_SETTINGS + + if (staticOrgSettings && staticOrgSettings.length > 0) { + this.settingsService = new StaticSettingsService(staticOrgSettings, this.log) + } else { + const cloudSettingsService = new CloudSettingsService(this.context, this.authService, this.log) + cloudSettingsService.initialize() + + cloudSettingsService.on("settings-updated", this.settingsListener) + + this.settingsService = cloudSettingsService + } + + this.cloudAPI = new CloudAPI(this.authService, this.log) + this.telemetryClient = new TelemetryClient(this.authService, this.settingsService) + this.shareService = new CloudShareService(this.cloudAPI, this.settingsService, this.log) + + try { + TelemetryService.instance.register(this.telemetryClient) + } catch (error) { + this.log("[CloudService] Failed to register TelemetryClient:", error) + } + + this.isInitialized = true + } catch (error) { + this.log("[CloudService] Failed to initialize:", error) + throw new Error(`Failed to initialize CloudService: ${error}`) + } + } + + // AuthService + + public async login(): Promise { + this.ensureInitialized() + return this.authService!.login() + } + + public async logout(): Promise { + this.ensureInitialized() + return this.authService!.logout() + } + + public isAuthenticated(): boolean { + this.ensureInitialized() + return this.authService!.isAuthenticated() + } + + public hasActiveSession(): boolean { + this.ensureInitialized() + return this.authService!.hasActiveSession() + } + + public hasOrIsAcquiringActiveSession(): boolean { + this.ensureInitialized() + return this.authService!.hasOrIsAcquiringActiveSession() + } + + public getUserInfo(): CloudUserInfo | null { + this.ensureInitialized() + return this.authService!.getUserInfo() + } + + public getOrganizationId(): string | null { + this.ensureInitialized() + const userInfo = this.authService!.getUserInfo() + return userInfo?.organizationId || null + } + + public getOrganizationName(): string | null { + this.ensureInitialized() + const userInfo = this.authService!.getUserInfo() + return userInfo?.organizationName || null + } + + public getOrganizationRole(): string | null { + this.ensureInitialized() + const userInfo = this.authService!.getUserInfo() + return userInfo?.organizationRole || null + } + + public hasStoredOrganizationId(): boolean { + this.ensureInitialized() + return this.authService!.getStoredOrganizationId() !== null + } + + public getStoredOrganizationId(): string | null { + this.ensureInitialized() + return this.authService!.getStoredOrganizationId() + } + + public getAuthState(): string { + this.ensureInitialized() + return this.authService!.getState() + } + + public async handleAuthCallback( + code: string | null, + state: string | null, + organizationId?: string | null, + ): Promise { + this.ensureInitialized() + return this.authService!.handleCallback(code, state, organizationId) + } + + // SettingsService + + public getAllowList(): OrganizationAllowList { + this.ensureInitialized() + return this.settingsService!.getAllowList() + } + + public getOrganizationSettings(): OrganizationSettings | undefined { + this.ensureInitialized() + return this.settingsService!.getSettings() + } + + // TelemetryClient + + public captureEvent(event: TelemetryEvent): void { + this.ensureInitialized() + this.telemetryClient!.capture(event) + } + + // ShareService + + public async shareTask( + taskId: string, + visibility: ShareVisibility = "organization", + clineMessages?: ClineMessage[], + ) { + this.ensureInitialized() + + try { + return await this.shareService!.shareTask(taskId, visibility) + } catch (error) { + if (error instanceof TaskNotFoundError && clineMessages) { + // Backfill messages and retry. + await this.telemetryClient!.backfillMessages(clineMessages, taskId) + return await this.shareService!.shareTask(taskId, visibility) + } + throw error + } + } + + public async canShareTask(): Promise { + this.ensureInitialized() + return this.shareService!.canShareTask() + } + + // Lifecycle + + public dispose(): void { + if (this.authService) { + this.authService.off("auth-state-changed", this.authStateListener) + this.authService.off("user-info", this.authUserInfoListener) + } + + if (this.settingsService) { + if (this.settingsService instanceof CloudSettingsService) { + this.settingsService.off("settings-updated", this.settingsListener) + } + this.settingsService.dispose() + } + + this.isInitialized = false + } + + private ensureInitialized(): void { + if (!this.isInitialized) { + throw new Error("CloudService not initialized.") + } + } + + static get instance(): CloudService { + if (!this._instance) { + throw new Error("CloudService not initialized") + } + + return this._instance + } + + static async createInstance( + context: vscode.ExtensionContext, + log?: (...args: unknown[]) => void, + ): Promise { + if (this._instance) { + throw new Error("CloudService instance already created") + } + + this._instance = new CloudService(context, log) + await this._instance.initialize() + return this._instance + } + + static hasInstance(): boolean { + return this._instance !== null && this._instance.isInitialized + } + + static resetInstance(): void { + if (this._instance) { + this._instance.dispose() + this._instance = null + } + } + + static isEnabled(): boolean { + return !!this._instance?.isAuthenticated() + } +} diff --git a/packages/cloud/src/CloudSettingsService.ts b/packages/cloud/src/CloudSettingsService.ts new file mode 100644 index 0000000000..c842d800fc --- /dev/null +++ b/packages/cloud/src/CloudSettingsService.ts @@ -0,0 +1,152 @@ +import * as vscode from "vscode" +import EventEmitter from "events" + +import { + ORGANIZATION_ALLOW_ALL, + OrganizationAllowList, + OrganizationSettings, + organizationSettingsSchema, +} from "@roo-code/types" + +import { getRooCodeApiUrl } from "./config" +import type { AuthService, AuthState } from "./auth" +import { RefreshTimer } from "./RefreshTimer" +import type { SettingsService } from "./SettingsService" + +const ORGANIZATION_SETTINGS_CACHE_KEY = "organization-settings" + +export interface SettingsServiceEvents { + "settings-updated": [ + data: { + settings: OrganizationSettings + previousSettings: OrganizationSettings | undefined + }, + ] +} + +export class CloudSettingsService extends EventEmitter implements SettingsService { + private context: vscode.ExtensionContext + private authService: AuthService + private settings: OrganizationSettings | undefined = undefined + private timer: RefreshTimer + private log: (...args: unknown[]) => void + + constructor(context: vscode.ExtensionContext, authService: AuthService, log?: (...args: unknown[]) => void) { + super() + + this.context = context + this.authService = authService + this.log = log || console.log + + this.timer = new RefreshTimer({ + callback: async () => { + return await this.fetchSettings() + }, + successInterval: 30000, + initialBackoffMs: 1000, + maxBackoffMs: 30000, + }) + } + + public initialize(): void { + this.loadCachedSettings() + + // Clear cached settings if we have missed a log out. + if (this.authService.getState() == "logged-out" && this.settings) { + this.removeSettings() + } + + this.authService.on("auth-state-changed", (data: { state: AuthState; previousState: AuthState }) => { + if (data.state === "active-session") { + this.timer.start() + } else if (data.previousState === "active-session") { + this.timer.stop() + + if (data.state === "logged-out") { + this.removeSettings() + } + } + }) + + if (this.authService.hasActiveSession()) { + this.timer.start() + } + } + + private async fetchSettings(): Promise { + const token = this.authService.getSessionToken() + + if (!token) { + return false + } + + try { + const response = await fetch(`${getRooCodeApiUrl()}/api/organization-settings`, { + headers: { + Authorization: `Bearer ${token}`, + }, + }) + + if (!response.ok) { + this.log( + "[cloud-settings] Failed to fetch organization settings:", + response.status, + response.statusText, + ) + return false + } + + const data = await response.json() + const result = organizationSettingsSchema.safeParse(data) + + if (!result.success) { + this.log("[cloud-settings] Invalid organization settings format:", result.error) + return false + } + + const newSettings = result.data + + if (!this.settings || this.settings.version !== newSettings.version) { + const previousSettings = this.settings + this.settings = newSettings + await this.cacheSettings() + + this.emit("settings-updated", { + settings: this.settings, + previousSettings, + }) + } + + return true + } catch (error) { + this.log("[cloud-settings] Error fetching organization settings:", error) + return false + } + } + + private async cacheSettings(): Promise { + await this.context.globalState.update(ORGANIZATION_SETTINGS_CACHE_KEY, this.settings) + } + + private loadCachedSettings(): void { + this.settings = this.context.globalState.get(ORGANIZATION_SETTINGS_CACHE_KEY) + } + + public getAllowList(): OrganizationAllowList { + return this.settings?.allowList || ORGANIZATION_ALLOW_ALL + } + + public getSettings(): OrganizationSettings | undefined { + return this.settings + } + + private async removeSettings(): Promise { + this.settings = undefined + await this.cacheSettings() + } + + public dispose(): void { + this.removeAllListeners() + this.timer.stop() + } +} diff --git a/packages/cloud/src/CloudShareService.ts b/packages/cloud/src/CloudShareService.ts new file mode 100644 index 0000000000..91e0f6aa3f --- /dev/null +++ b/packages/cloud/src/CloudShareService.ts @@ -0,0 +1,43 @@ +import * as vscode from "vscode" + +import type { ShareResponse, ShareVisibility } from "@roo-code/types" + +import type { CloudAPI } from "./CloudAPI" +import type { SettingsService } from "./SettingsService" + +export class CloudShareService { + private cloudAPI: CloudAPI + private settingsService: SettingsService + private log: (...args: unknown[]) => void + + constructor(cloudAPI: CloudAPI, settingsService: SettingsService, log?: (...args: unknown[]) => void) { + this.cloudAPI = cloudAPI + this.settingsService = settingsService + this.log = log || console.log + } + + async shareTask(taskId: string, visibility: ShareVisibility = "organization"): Promise { + try { + const response = await this.cloudAPI.shareTask(taskId, visibility) + + if (response.success && response.shareUrl) { + // Copy to clipboard. + await vscode.env.clipboard.writeText(response.shareUrl) + } + + return response + } catch (error) { + this.log("[ShareService] Error sharing task:", error) + throw error + } + } + + async canShareTask(): Promise { + try { + return !!this.settingsService.getSettings()?.cloudSettings?.enableTaskSharing + } catch (error) { + this.log("[ShareService] Error checking if task can be shared:", error) + return false + } + } +} diff --git a/packages/cloud/src/RefreshTimer.ts b/packages/cloud/src/RefreshTimer.ts new file mode 100644 index 0000000000..e7294222d7 --- /dev/null +++ b/packages/cloud/src/RefreshTimer.ts @@ -0,0 +1,154 @@ +/** + * RefreshTimer - A utility for executing a callback with configurable retry behavior + * + * This timer executes a callback function and schedules the next execution based on the result: + * - If the callback succeeds (returns true), it schedules the next attempt after a fixed interval + * - If the callback fails (returns false), it uses exponential backoff up to a maximum interval + */ + +/** + * Configuration options for the RefreshTimer + */ +export interface RefreshTimerOptions { + /** + * The callback function to execute + * Should return a Promise that resolves to a boolean indicating success (true) or failure (false) + */ + callback: () => Promise + + /** + * Time in milliseconds to wait before next attempt after success + * @default 50000 (50 seconds) + */ + successInterval?: number + + /** + * Initial backoff time in milliseconds for the first failure + * @default 1000 (1 second) + */ + initialBackoffMs?: number + + /** + * Maximum backoff time in milliseconds + * @default 300000 (5 minutes) + */ + maxBackoffMs?: number +} + +/** + * A timer utility that executes a callback with configurable retry behavior + */ +export class RefreshTimer { + private callback: () => Promise + private successInterval: number + private initialBackoffMs: number + private maxBackoffMs: number + private currentBackoffMs: number + private attemptCount: number + private timerId: NodeJS.Timeout | null + private isRunning: boolean + + /** + * Creates a new RefreshTimer + * + * @param options Configuration options for the timer + */ + constructor(options: RefreshTimerOptions) { + this.callback = options.callback + this.successInterval = options.successInterval ?? 50000 // 50 seconds + this.initialBackoffMs = options.initialBackoffMs ?? 1000 // 1 second + this.maxBackoffMs = options.maxBackoffMs ?? 300000 // 5 minutes + this.currentBackoffMs = this.initialBackoffMs + this.attemptCount = 0 + this.timerId = null + this.isRunning = false + } + + /** + * Starts the timer and executes the callback immediately + */ + public start(): void { + if (this.isRunning) { + return + } + + this.isRunning = true + + // Execute the callback immediately + this.executeCallback() + } + + /** + * Stops the timer and cancels any pending execution + */ + public stop(): void { + if (!this.isRunning) { + return + } + + if (this.timerId) { + clearTimeout(this.timerId) + this.timerId = null + } + + this.isRunning = false + } + + /** + * Resets the backoff state and attempt count + * Does not affect whether the timer is running + */ + public reset(): void { + this.currentBackoffMs = this.initialBackoffMs + this.attemptCount = 0 + } + + /** + * Schedules the next attempt based on the success/failure of the current attempt + * + * @param wasSuccessful Whether the current attempt was successful + */ + private scheduleNextAttempt(wasSuccessful: boolean): void { + if (!this.isRunning) { + return + } + + if (wasSuccessful) { + // Reset backoff on success + this.currentBackoffMs = this.initialBackoffMs + this.attemptCount = 0 + + this.timerId = setTimeout(() => this.executeCallback(), this.successInterval) + } else { + // Increment attempt count + this.attemptCount++ + + // Calculate backoff time with exponential increase + // Formula: initialBackoff * 2^(attemptCount - 1) + this.currentBackoffMs = Math.min( + this.initialBackoffMs * Math.pow(2, this.attemptCount - 1), + this.maxBackoffMs, + ) + + this.timerId = setTimeout(() => this.executeCallback(), this.currentBackoffMs) + } + } + + /** + * Executes the callback and handles the result + */ + private async executeCallback(): Promise { + if (!this.isRunning) { + return + } + + try { + const result = await this.callback() + + this.scheduleNextAttempt(result) + } catch (_error) { + // Treat errors as failed attempts + this.scheduleNextAttempt(false) + } + } +} diff --git a/packages/cloud/src/SettingsService.ts b/packages/cloud/src/SettingsService.ts new file mode 100644 index 0000000000..c1027dc25c --- /dev/null +++ b/packages/cloud/src/SettingsService.ts @@ -0,0 +1,23 @@ +import type { OrganizationAllowList, OrganizationSettings } from "@roo-code/types" + +/** + * Interface for settings services that provide organization settings + */ +export interface SettingsService { + /** + * Get the organization allow list + * @returns The organization allow list or default if none available + */ + getAllowList(): OrganizationAllowList + + /** + * Get the current organization settings + * @returns The organization settings or undefined if none available + */ + getSettings(): OrganizationSettings | undefined + + /** + * Dispose of the settings service and clean up resources + */ + dispose(): void +} diff --git a/packages/cloud/src/StaticSettingsService.ts b/packages/cloud/src/StaticSettingsService.ts new file mode 100644 index 0000000000..97e6cf7ea8 --- /dev/null +++ b/packages/cloud/src/StaticSettingsService.ts @@ -0,0 +1,41 @@ +import { + ORGANIZATION_ALLOW_ALL, + OrganizationAllowList, + OrganizationSettings, + organizationSettingsSchema, +} from "@roo-code/types" + +import type { SettingsService } from "./SettingsService" + +export class StaticSettingsService implements SettingsService { + private settings: OrganizationSettings + private log: (...args: unknown[]) => void + + constructor(envValue: string, log?: (...args: unknown[]) => void) { + this.log = log || console.log + this.settings = this.parseEnvironmentSettings(envValue) + } + + private parseEnvironmentSettings(envValue: string): OrganizationSettings { + try { + const decodedValue = Buffer.from(envValue, "base64").toString("utf-8") + const parsedJson = JSON.parse(decodedValue) + return organizationSettingsSchema.parse(parsedJson) + } catch (error) { + this.log(`[StaticSettingsService] failed to parse static settings: ${error.message}`, error) + throw new Error("Failed to parse static settings", { cause: error }) + } + } + + public getAllowList(): OrganizationAllowList { + return this.settings?.allowList || ORGANIZATION_ALLOW_ALL + } + + public getSettings(): OrganizationSettings | undefined { + return this.settings + } + + public dispose(): void { + // No resources to clean up for static settings. + } +} diff --git a/packages/cloud/src/TelemetryClient.ts b/packages/cloud/src/TelemetryClient.ts new file mode 100644 index 0000000000..727da03432 --- /dev/null +++ b/packages/cloud/src/TelemetryClient.ts @@ -0,0 +1,169 @@ +import { + TelemetryEventName, + type TelemetryEvent, + rooCodeTelemetryEventSchema, + type ClineMessage, +} from "@roo-code/types" +import { BaseTelemetryClient } from "@roo-code/telemetry" + +import { getRooCodeApiUrl } from "./config" +import type { AuthService } from "./auth" +import type { SettingsService } from "./SettingsService" + +export class TelemetryClient extends BaseTelemetryClient { + constructor( + private authService: AuthService, + private settingsService: SettingsService, + debug = false, + ) { + super( + { + type: "exclude", + events: [TelemetryEventName.TASK_CONVERSATION_MESSAGE], + }, + debug, + ) + } + + private async fetch(path: string, options: RequestInit) { + if (!this.authService.isAuthenticated()) { + return + } + + const token = this.authService.getSessionToken() + + if (!token) { + console.error(`[TelemetryClient#fetch] Unauthorized: No session token available.`) + return + } + + const response = await fetch(`${getRooCodeApiUrl()}/api/${path}`, { + ...options, + headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json" }, + }) + + if (!response.ok) { + console.error( + `[TelemetryClient#fetch] ${options.method} ${path} -> ${response.status} ${response.statusText}`, + ) + } + } + + public override async capture(event: TelemetryEvent) { + if (!this.isTelemetryEnabled() || !this.isEventCapturable(event.event)) { + if (this.debug) { + console.info(`[TelemetryClient#capture] Skipping event: ${event.event}`) + } + + return + } + + const payload = { + type: event.event, + properties: await this.getEventProperties(event), + } + + if (this.debug) { + console.info(`[TelemetryClient#capture] ${JSON.stringify(payload)}`) + } + + const result = rooCodeTelemetryEventSchema.safeParse(payload) + + if (!result.success) { + console.error( + `[TelemetryClient#capture] Invalid telemetry event: ${result.error.message} - ${JSON.stringify(payload)}`, + ) + + return + } + + try { + await this.fetch(`events`, { method: "POST", body: JSON.stringify(result.data) }) + } catch (error) { + console.error(`[TelemetryClient#capture] Error sending telemetry event: ${error}`) + } + } + + public async backfillMessages(messages: ClineMessage[], taskId: string): Promise { + if (!this.authService.isAuthenticated()) { + if (this.debug) { + console.info(`[TelemetryClient#backfillMessages] Skipping: Not authenticated`) + } + return + } + + const token = this.authService.getSessionToken() + + if (!token) { + console.error(`[TelemetryClient#backfillMessages] Unauthorized: No session token available.`) + return + } + + try { + const mergedProperties = await this.getEventProperties({ + event: TelemetryEventName.TASK_MESSAGE, + properties: { taskId }, + }) + + const formData = new FormData() + formData.append("taskId", taskId) + formData.append("properties", JSON.stringify(mergedProperties)) + + formData.append( + "file", + new File([JSON.stringify(messages)], "task.json", { + type: "application/json", + }), + ) + + if (this.debug) { + console.info( + `[TelemetryClient#backfillMessages] Uploading ${messages.length} messages for task ${taskId}`, + ) + } + + // Custom fetch for multipart - don't set Content-Type header (let browser set it) + const response = await fetch(`${getRooCodeApiUrl()}/api/events/backfill`, { + method: "POST", + headers: { + Authorization: `Bearer ${token}`, + // Note: No Content-Type header - browser will set multipart/form-data with boundary + }, + body: formData, + }) + + if (!response.ok) { + console.error( + `[TelemetryClient#backfillMessages] POST events/backfill -> ${response.status} ${response.statusText}`, + ) + } else if (this.debug) { + console.info(`[TelemetryClient#backfillMessages] Successfully uploaded messages for task ${taskId}`) + } + } catch (error) { + console.error(`[TelemetryClient#backfillMessages] Error uploading messages: ${error}`) + } + } + + public override updateTelemetryState(_didUserOptIn: boolean) {} + + public override isTelemetryEnabled(): boolean { + return true + } + + protected override isEventCapturable(eventName: TelemetryEventName): boolean { + // Ensure that this event type is supported by the telemetry client + if (!super.isEventCapturable(eventName)) { + return false + } + + // Only record message telemetry if a cloud account is present and explicitly configured to record messages + if (eventName === TelemetryEventName.TASK_MESSAGE) { + return this.settingsService.getSettings()?.cloudSettings?.recordTaskMessages || false + } + + // Other telemetry types are capturable at this point + return true + } + + public override async shutdown() {} +} diff --git a/packages/cloud/src/__mocks__/vscode.ts b/packages/cloud/src/__mocks__/vscode.ts new file mode 100644 index 0000000000..ac9082375e --- /dev/null +++ b/packages/cloud/src/__mocks__/vscode.ts @@ -0,0 +1,57 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ + +export const window = { + showInformationMessage: vi.fn(), + showErrorMessage: vi.fn(), +} + +export const env = { + openExternal: vi.fn(), +} + +export const Uri = { + parse: vi.fn((uri: string) => ({ toString: () => uri })), +} + +export interface ExtensionContext { + secrets: { + get: (key: string) => Promise + store: (key: string, value: string) => Promise + delete: (key: string) => Promise + onDidChange: (listener: (e: { key: string }) => void) => { dispose: () => void } + } + globalState: { + get: (key: string) => T | undefined + update: (key: string, value: any) => Promise + } + subscriptions: any[] + extension?: { + packageJSON?: { + version?: string + publisher?: string + name?: string + } + } +} + +// Mock implementation for tests +export const mockExtensionContext: ExtensionContext = { + secrets: { + get: vi.fn().mockResolvedValue(undefined), + store: vi.fn().mockResolvedValue(undefined), + delete: vi.fn().mockResolvedValue(undefined), + onDidChange: vi.fn().mockReturnValue({ dispose: vi.fn() }), + }, + globalState: { + get: vi.fn().mockReturnValue(undefined), + update: vi.fn().mockResolvedValue(undefined), + }, + subscriptions: [], + extension: { + packageJSON: { + version: "1.0.0", + publisher: "RooVeterinaryInc", + name: "roo-cline", + }, + }, +} diff --git a/packages/cloud/src/__tests__/CloudService.integration.test.ts b/packages/cloud/src/__tests__/CloudService.integration.test.ts new file mode 100644 index 0000000000..f3cef27718 --- /dev/null +++ b/packages/cloud/src/__tests__/CloudService.integration.test.ts @@ -0,0 +1,146 @@ +// npx vitest run src/__tests__/CloudService.integration.test.ts + +import * as vscode from "vscode" +import { CloudService } from "../CloudService" +import { StaticSettingsService } from "../StaticSettingsService" +import { CloudSettingsService } from "../CloudSettingsService" + +vi.mock("vscode", () => ({ + ExtensionContext: vi.fn(), + window: { + showInformationMessage: vi.fn(), + showErrorMessage: vi.fn(), + }, + env: { + openExternal: vi.fn(), + }, + Uri: { + parse: vi.fn(), + }, +})) + +describe("CloudService Integration - Settings Service Selection", () => { + let mockContext: vscode.ExtensionContext + + beforeEach(() => { + CloudService.resetInstance() + + mockContext = { + subscriptions: [], + workspaceState: { + get: vi.fn(), + update: vi.fn(), + keys: vi.fn().mockReturnValue([]), + }, + secrets: { + get: vi.fn(), + store: vi.fn(), + delete: vi.fn(), + onDidChange: vi.fn().mockReturnValue({ dispose: vi.fn() }), + }, + globalState: { + get: vi.fn(), + update: vi.fn(), + setKeysForSync: vi.fn(), + keys: vi.fn().mockReturnValue([]), + }, + extensionUri: { scheme: "file", path: "/mock/path" }, + extensionPath: "/mock/path", + extensionMode: 1, + asAbsolutePath: vi.fn((relativePath: string) => `/mock/path/${relativePath}`), + storageUri: { scheme: "file", path: "/mock/storage" }, + extension: { + packageJSON: { + version: "1.0.0", + }, + }, + } as unknown as vscode.ExtensionContext + }) + + afterEach(() => { + CloudService.resetInstance() + delete process.env.ROO_CODE_CLOUD_ORG_SETTINGS + delete process.env.ROO_CODE_CLOUD_TOKEN + }) + + it("should use CloudSettingsService when no environment variable is set", async () => { + // Ensure no environment variables are set + delete process.env.ROO_CODE_CLOUD_ORG_SETTINGS + delete process.env.ROO_CODE_CLOUD_TOKEN + + const cloudService = await CloudService.createInstance(mockContext) + + // Access the private settingsService to check its type + const settingsService = (cloudService as unknown as { settingsService: unknown }).settingsService + expect(settingsService).toBeInstanceOf(CloudSettingsService) + }) + + it("should use StaticSettingsService when ROO_CODE_CLOUD_ORG_SETTINGS is set", async () => { + const validSettings = { + version: 1, + cloudSettings: { + recordTaskMessages: true, + enableTaskSharing: true, + taskShareExpirationDays: 30, + }, + defaultSettings: { + enableCheckpoints: true, + }, + allowList: { + allowAll: true, + providers: {}, + }, + } + + // Set the environment variable + process.env.ROO_CODE_CLOUD_ORG_SETTINGS = Buffer.from(JSON.stringify(validSettings)).toString("base64") + + const cloudService = await CloudService.createInstance(mockContext) + + // Access the private settingsService to check its type + const settingsService = (cloudService as unknown as { settingsService: unknown }).settingsService + expect(settingsService).toBeInstanceOf(StaticSettingsService) + + // Verify the settings are correctly loaded + expect(cloudService.getAllowList()).toEqual(validSettings.allowList) + }) + + it("should throw error when ROO_CODE_CLOUD_ORG_SETTINGS contains invalid data", async () => { + // Set invalid environment variable + process.env.ROO_CODE_CLOUD_ORG_SETTINGS = "invalid-base64-data" + + await expect(CloudService.createInstance(mockContext)).rejects.toThrow("Failed to initialize CloudService") + }) + + it("should prioritize static token auth when both environment variables are set", async () => { + const validSettings = { + version: 1, + cloudSettings: { + recordTaskMessages: true, + enableTaskSharing: true, + taskShareExpirationDays: 30, + }, + defaultSettings: { + enableCheckpoints: true, + }, + allowList: { + allowAll: true, + providers: {}, + }, + } + + // Set both environment variables + process.env.ROO_CODE_CLOUD_TOKEN = "test-token" + process.env.ROO_CODE_CLOUD_ORG_SETTINGS = Buffer.from(JSON.stringify(validSettings)).toString("base64") + + const cloudService = await CloudService.createInstance(mockContext) + + // Should use StaticSettingsService for settings + const settingsService = (cloudService as unknown as { settingsService: unknown }).settingsService + expect(settingsService).toBeInstanceOf(StaticSettingsService) + + // Should use StaticTokenAuthService for auth (from the existing logic) + expect(cloudService.isAuthenticated()).toBe(true) + expect(cloudService.hasActiveSession()).toBe(true) + }) +}) diff --git a/packages/cloud/src/__tests__/CloudService.test.ts b/packages/cloud/src/__tests__/CloudService.test.ts new file mode 100644 index 0000000000..607b21de34 --- /dev/null +++ b/packages/cloud/src/__tests__/CloudService.test.ts @@ -0,0 +1,604 @@ +// npx vitest run src/__tests__/CloudService.test.ts + +import * as vscode from "vscode" + +import type { ClineMessage } from "@roo-code/types" +import { TelemetryService } from "@roo-code/telemetry" + +import { CloudService } from "../CloudService" +import { WebAuthService } from "../auth/WebAuthService" +import { CloudSettingsService } from "../CloudSettingsService" +import { CloudShareService } from "../CloudShareService" +import { TelemetryClient } from "../TelemetryClient" +import { TaskNotFoundError } from "../errors" + +vi.mock("vscode", () => ({ + ExtensionContext: vi.fn(), + window: { + showInformationMessage: vi.fn(), + showErrorMessage: vi.fn(), + }, + env: { + openExternal: vi.fn(), + }, + Uri: { + parse: vi.fn(), + }, +})) + +vi.mock("@roo-code/telemetry") + +vi.mock("../auth/WebAuthService") + +vi.mock("../CloudSettingsService") + +vi.mock("../CloudShareService") + +vi.mock("../TelemetryClient") + +describe("CloudService", () => { + let mockContext: vscode.ExtensionContext + let mockAuthService: { + initialize: ReturnType + login: ReturnType + logout: ReturnType + isAuthenticated: ReturnType + hasActiveSession: ReturnType + hasOrIsAcquiringActiveSession: ReturnType + getUserInfo: ReturnType + getState: ReturnType + getSessionToken: ReturnType + handleCallback: ReturnType + getStoredOrganizationId: ReturnType + on: ReturnType + off: ReturnType + once: ReturnType + emit: ReturnType + } + let mockSettingsService: { + initialize: ReturnType + getSettings: ReturnType + getAllowList: ReturnType + dispose: ReturnType + on: ReturnType + off: ReturnType + } + let mockShareService: { + shareTask: ReturnType + canShareTask: ReturnType + } + let mockTelemetryClient: { + backfillMessages: ReturnType + } + let mockTelemetryService: { + hasInstance: ReturnType + instance: { + register: ReturnType + } + } + + beforeEach(() => { + CloudService.resetInstance() + + mockContext = { + subscriptions: [], + workspaceState: { + get: vi.fn(), + update: vi.fn(), + keys: vi.fn().mockReturnValue([]), + }, + secrets: { + get: vi.fn(), + store: vi.fn(), + delete: vi.fn(), + onDidChange: vi.fn().mockReturnValue({ dispose: vi.fn() }), + }, + globalState: { + get: vi.fn(), + update: vi.fn(), + setKeysForSync: vi.fn(), + keys: vi.fn().mockReturnValue([]), + }, + extensionUri: { scheme: "file", path: "/mock/path" }, + extensionPath: "/mock/path", + extensionMode: 1, + asAbsolutePath: vi.fn((relativePath: string) => `/mock/path/${relativePath}`), + storageUri: { scheme: "file", path: "/mock/storage" }, + extension: { + packageJSON: { + version: "1.0.0", + }, + }, + } as unknown as vscode.ExtensionContext + + mockAuthService = { + initialize: vi.fn().mockResolvedValue(undefined), + login: vi.fn(), + logout: vi.fn(), + isAuthenticated: vi.fn().mockReturnValue(false), + hasActiveSession: vi.fn().mockReturnValue(false), + hasOrIsAcquiringActiveSession: vi.fn().mockReturnValue(false), + getUserInfo: vi.fn(), + getState: vi.fn().mockReturnValue("logged-out"), + getSessionToken: vi.fn(), + handleCallback: vi.fn(), + getStoredOrganizationId: vi.fn().mockReturnValue(null), + on: vi.fn(), + off: vi.fn(), + once: vi.fn(), + emit: vi.fn(), + } + + mockSettingsService = { + initialize: vi.fn(), + getSettings: vi.fn(), + getAllowList: vi.fn(), + dispose: vi.fn(), + on: vi.fn(), + off: vi.fn(), + } + + mockShareService = { + shareTask: vi.fn(), + canShareTask: vi.fn().mockResolvedValue(true), + } + + mockTelemetryClient = { + backfillMessages: vi.fn().mockResolvedValue(undefined), + } + + mockTelemetryService = { + hasInstance: vi.fn().mockReturnValue(true), + instance: { + register: vi.fn(), + }, + } + + vi.mocked(WebAuthService).mockImplementation(() => mockAuthService as unknown as WebAuthService) + vi.mocked(CloudSettingsService).mockImplementation(() => mockSettingsService as unknown as CloudSettingsService) + vi.mocked(CloudShareService).mockImplementation(() => mockShareService as unknown as CloudShareService) + vi.mocked(TelemetryClient).mockImplementation(() => mockTelemetryClient as unknown as TelemetryClient) + + vi.mocked(TelemetryService.hasInstance).mockReturnValue(true) + Object.defineProperty(TelemetryService, "instance", { + get: () => mockTelemetryService.instance, + configurable: true, + }) + }) + + afterEach(() => { + vi.clearAllMocks() + CloudService.resetInstance() + }) + + describe("createInstance", () => { + it("should create and initialize CloudService instance", async () => { + const mockLog = vi.fn() + + const cloudService = await CloudService.createInstance(mockContext, mockLog) + + expect(cloudService).toBeInstanceOf(CloudService) + expect(WebAuthService).toHaveBeenCalledWith(mockContext, expect.any(Function)) + expect(CloudSettingsService).toHaveBeenCalledWith(mockContext, mockAuthService, expect.any(Function)) + }) + + it("should set up event listeners for CloudSettingsService", async () => { + const mockLog = vi.fn() + + await CloudService.createInstance(mockContext, mockLog) + + expect(mockSettingsService.on).toHaveBeenCalledWith("settings-updated", expect.any(Function)) + }) + + it("should throw error if instance already exists", async () => { + await CloudService.createInstance(mockContext) + + await expect(CloudService.createInstance(mockContext)).rejects.toThrow( + "CloudService instance already created", + ) + }) + }) + + describe("authentication methods", () => { + let cloudService: CloudService + + beforeEach(async () => { + cloudService = await CloudService.createInstance(mockContext) + }) + + it("should delegate login to AuthService", async () => { + await cloudService.login() + expect(mockAuthService.login).toHaveBeenCalled() + }) + + it("should delegate logout to AuthService", async () => { + await cloudService.logout() + expect(mockAuthService.logout).toHaveBeenCalled() + }) + + it("should delegate isAuthenticated to AuthService", () => { + const result = cloudService.isAuthenticated() + expect(mockAuthService.isAuthenticated).toHaveBeenCalled() + expect(result).toBe(false) + }) + + it("should delegate hasActiveSession to AuthService", () => { + const result = cloudService.hasActiveSession() + expect(mockAuthService.hasActiveSession).toHaveBeenCalled() + expect(result).toBe(false) + }) + + it("should delegate getUserInfo to AuthService", async () => { + await cloudService.getUserInfo() + expect(mockAuthService.getUserInfo).toHaveBeenCalled() + }) + + it("should return organization ID from user info", () => { + const mockUserInfo = { + name: "Test User", + email: "test@example.com", + organizationId: "org_123", + organizationName: "Test Org", + organizationRole: "admin", + } + mockAuthService.getUserInfo.mockReturnValue(mockUserInfo) + + const result = cloudService.getOrganizationId() + expect(mockAuthService.getUserInfo).toHaveBeenCalled() + expect(result).toBe("org_123") + }) + + it("should return null when no organization ID available", () => { + mockAuthService.getUserInfo.mockReturnValue(null) + + const result = cloudService.getOrganizationId() + expect(result).toBe(null) + }) + + it("should return organization name from user info", () => { + const mockUserInfo = { + name: "Test User", + email: "test@example.com", + organizationId: "org_123", + organizationName: "Test Org", + organizationRole: "admin", + } + mockAuthService.getUserInfo.mockReturnValue(mockUserInfo) + + const result = cloudService.getOrganizationName() + expect(mockAuthService.getUserInfo).toHaveBeenCalled() + expect(result).toBe("Test Org") + }) + + it("should return null when no organization name available", () => { + mockAuthService.getUserInfo.mockReturnValue(null) + + const result = cloudService.getOrganizationName() + expect(result).toBe(null) + }) + + it("should return organization role from user info", () => { + const mockUserInfo = { + name: "Test User", + email: "test@example.com", + organizationId: "org_123", + organizationName: "Test Org", + organizationRole: "admin", + } + mockAuthService.getUserInfo.mockReturnValue(mockUserInfo) + + const result = cloudService.getOrganizationRole() + expect(mockAuthService.getUserInfo).toHaveBeenCalled() + expect(result).toBe("admin") + }) + + it("should return null when no organization role available", () => { + mockAuthService.getUserInfo.mockReturnValue(null) + + const result = cloudService.getOrganizationRole() + expect(result).toBe(null) + }) + + it("should delegate getAuthState to AuthService", () => { + const result = cloudService.getAuthState() + expect(mockAuthService.getState).toHaveBeenCalled() + expect(result).toBe("logged-out") + }) + + it("should delegate handleAuthCallback to AuthService", async () => { + await cloudService.handleAuthCallback("code", "state") + expect(mockAuthService.handleCallback).toHaveBeenCalledWith("code", "state", undefined) + }) + + it("should delegate handleAuthCallback with organizationId to AuthService", async () => { + await cloudService.handleAuthCallback("code", "state", "org_123") + expect(mockAuthService.handleCallback).toHaveBeenCalledWith("code", "state", "org_123") + }) + + it("should return stored organization ID from AuthService", () => { + mockAuthService.getStoredOrganizationId.mockReturnValue("org_456") + + const result = cloudService.getStoredOrganizationId() + expect(mockAuthService.getStoredOrganizationId).toHaveBeenCalled() + expect(result).toBe("org_456") + }) + + it("should return null when no stored organization ID available", () => { + mockAuthService.getStoredOrganizationId.mockReturnValue(null) + + const result = cloudService.getStoredOrganizationId() + expect(result).toBe(null) + }) + + it("should return true when stored organization ID exists", () => { + mockAuthService.getStoredOrganizationId.mockReturnValue("org_789") + + const result = cloudService.hasStoredOrganizationId() + expect(result).toBe(true) + }) + + it("should return false when no stored organization ID exists", () => { + mockAuthService.getStoredOrganizationId.mockReturnValue(null) + + const result = cloudService.hasStoredOrganizationId() + expect(result).toBe(false) + }) + }) + + describe("organization settings methods", () => { + let cloudService: CloudService + + beforeEach(async () => { + cloudService = await CloudService.createInstance(mockContext) + }) + + it("should delegate getAllowList to SettingsService", () => { + cloudService.getAllowList() + expect(mockSettingsService.getAllowList).toHaveBeenCalled() + }) + }) + + describe("error handling", () => { + it("should throw error when accessing methods before initialization", () => { + expect(() => CloudService.instance.login()).toThrow("CloudService not initialized") + }) + + it("should throw error when accessing instance before creation", () => { + expect(() => CloudService.instance).toThrow("CloudService not initialized") + }) + }) + + describe("hasInstance", () => { + it("should return false when no instance exists", () => { + expect(CloudService.hasInstance()).toBe(false) + }) + + it("should return true when instance exists and is initialized", async () => { + await CloudService.createInstance(mockContext) + expect(CloudService.hasInstance()).toBe(true) + }) + }) + + describe("dispose", () => { + it("should dispose of all services and clean up", async () => { + const cloudService = await CloudService.createInstance(mockContext) + cloudService.dispose() + + expect(mockSettingsService.dispose).toHaveBeenCalled() + }) + + it("should remove event listeners from CloudSettingsService", async () => { + // Create a mock that will pass the instanceof check + const mockCloudSettingsService = Object.create(CloudSettingsService.prototype) + Object.assign(mockCloudSettingsService, { + initialize: vi.fn(), + getSettings: vi.fn(), + getAllowList: vi.fn(), + dispose: vi.fn(), + on: vi.fn(), + off: vi.fn(), + }) + + // Override the mock to return our properly typed instance + vi.mocked(CloudSettingsService).mockImplementation(() => mockCloudSettingsService) + + const cloudService = await CloudService.createInstance(mockContext) + + // Verify the listener was added + expect(mockCloudSettingsService.on).toHaveBeenCalledWith("settings-updated", expect.any(Function)) + + // Get the listener function that was registered + const registeredListener = mockCloudSettingsService.on.mock.calls.find( + (call: unknown[]) => call[0] === "settings-updated", + )?.[1] + + cloudService.dispose() + + // Verify the listener was removed with the same function + expect(mockCloudSettingsService.off).toHaveBeenCalledWith("settings-updated", registeredListener) + }) + + it("should handle disposal when using StaticSettingsService", async () => { + // Reset the instance first + CloudService.resetInstance() + + // Mock a StaticSettingsService (which doesn't extend CloudSettingsService) + const mockStaticSettingsService = { + initialize: vi.fn(), + getSettings: vi.fn(), + getAllowList: vi.fn(), + dispose: vi.fn(), + on: vi.fn(), // Add on method to avoid initialization error + off: vi.fn(), // Add off method for disposal + } + + // Override the mock to return a service that won't pass instanceof check + vi.mocked(CloudSettingsService).mockImplementation( + () => mockStaticSettingsService as unknown as CloudSettingsService, + ) + + // This should not throw even though the service doesn't pass instanceof check + const _cloudService = await CloudService.createInstance(mockContext) + + // Should not throw when disposing + expect(() => _cloudService.dispose()).not.toThrow() + + // Should still call dispose on the settings service + expect(mockStaticSettingsService.dispose).toHaveBeenCalled() + // Should NOT call off method since it's not a CloudSettingsService instance + expect(mockStaticSettingsService.off).not.toHaveBeenCalled() + }) + }) + + describe("settings event handling", () => { + let _cloudService: CloudService + + beforeEach(async () => { + _cloudService = await CloudService.createInstance(mockContext) + }) + + it("should emit settings-updated event when settings are updated", async () => { + const settingsListener = vi.fn() + _cloudService.on("settings-updated", settingsListener) + + // Get the settings listener that was registered with the settings service + const serviceSettingsListener = mockSettingsService.on.mock.calls.find( + (call) => call[0] === "settings-updated", + )?.[1] + + expect(serviceSettingsListener).toBeDefined() + + // Simulate settings update event + const settingsData = { + settings: { + version: 2, + defaultSettings: {}, + allowList: { allowAll: true, providers: {} }, + }, + previousSettings: { + version: 1, + defaultSettings: {}, + allowList: { allowAll: true, providers: {} }, + }, + } + serviceSettingsListener(settingsData) + + expect(settingsListener).toHaveBeenCalledWith(settingsData) + }) + }) + + describe("shareTask with ClineMessage retry logic", () => { + let cloudService: CloudService + + beforeEach(async () => { + // Reset mocks for shareTask tests + vi.clearAllMocks() + + // Reset authentication state for shareTask tests + mockAuthService.isAuthenticated.mockReturnValue(true) + mockAuthService.hasActiveSession.mockReturnValue(true) + mockAuthService.hasOrIsAcquiringActiveSession.mockReturnValue(true) + mockAuthService.getState.mockReturnValue("active") + + cloudService = await CloudService.createInstance(mockContext) + }) + + it("should call shareTask without retry when successful", async () => { + const taskId = "test-task-id" + const visibility = "organization" + const clineMessages: ClineMessage[] = [ + { + ts: Date.now(), + type: "say", + say: "text", + text: "Hello world", + }, + ] + + const expectedResult = { success: true, shareUrl: "https://example.com/share/123" } + mockShareService.shareTask.mockResolvedValue(expectedResult) + + const result = await cloudService.shareTask(taskId, visibility, clineMessages) + + expect(mockShareService.shareTask).toHaveBeenCalledTimes(1) + expect(mockShareService.shareTask).toHaveBeenCalledWith(taskId, visibility) + expect(mockTelemetryClient.backfillMessages).not.toHaveBeenCalled() + expect(result).toEqual(expectedResult) + }) + + it("should retry with backfill when TaskNotFoundError occurs", async () => { + const taskId = "test-task-id" + const visibility = "organization" + const clineMessages: ClineMessage[] = [ + { + ts: Date.now(), + type: "say", + say: "text", + text: "Hello world", + }, + ] + + const expectedResult = { success: true, shareUrl: "https://example.com/share/123" } + + // First call throws TaskNotFoundError, second call succeeds + mockShareService.shareTask + .mockRejectedValueOnce(new TaskNotFoundError(taskId)) + .mockResolvedValueOnce(expectedResult) + + const result = await cloudService.shareTask(taskId, visibility, clineMessages) + + expect(mockShareService.shareTask).toHaveBeenCalledTimes(2) + expect(mockShareService.shareTask).toHaveBeenNthCalledWith(1, taskId, visibility) + expect(mockShareService.shareTask).toHaveBeenNthCalledWith(2, taskId, visibility) + expect(mockTelemetryClient.backfillMessages).toHaveBeenCalledTimes(1) + expect(mockTelemetryClient.backfillMessages).toHaveBeenCalledWith(clineMessages, taskId) + expect(result).toEqual(expectedResult) + }) + + it("should not retry when TaskNotFoundError occurs but no clineMessages provided", async () => { + const taskId = "test-task-id" + const visibility = "organization" + + const taskNotFoundError = new TaskNotFoundError(taskId) + mockShareService.shareTask.mockRejectedValue(taskNotFoundError) + + await expect(cloudService.shareTask(taskId, visibility)).rejects.toThrow(TaskNotFoundError) + + expect(mockShareService.shareTask).toHaveBeenCalledTimes(1) + expect(mockTelemetryClient.backfillMessages).not.toHaveBeenCalled() + }) + + it("should not retry when non-TaskNotFoundError occurs", async () => { + const taskId = "test-task-id" + const visibility = "organization" + const clineMessages: ClineMessage[] = [ + { + ts: Date.now(), + type: "say", + say: "text", + text: "Hello world", + }, + ] + + const genericError = new Error("Some other error") + mockShareService.shareTask.mockRejectedValue(genericError) + + await expect(cloudService.shareTask(taskId, visibility, clineMessages)).rejects.toThrow(genericError) + + expect(mockShareService.shareTask).toHaveBeenCalledTimes(1) + expect(mockTelemetryClient.backfillMessages).not.toHaveBeenCalled() + }) + + it("should work with default parameters", async () => { + const taskId = "test-task-id" + const expectedResult = { success: true, shareUrl: "https://example.com/share/123" } + mockShareService.shareTask.mockResolvedValue(expectedResult) + + const result = await cloudService.shareTask(taskId) + + expect(mockShareService.shareTask).toHaveBeenCalledTimes(1) + expect(mockShareService.shareTask).toHaveBeenCalledWith(taskId, "organization") + expect(result).toEqual(expectedResult) + }) + }) +}) diff --git a/packages/cloud/src/__tests__/CloudSettingsService.test.ts b/packages/cloud/src/__tests__/CloudSettingsService.test.ts new file mode 100644 index 0000000000..4a85383ba4 --- /dev/null +++ b/packages/cloud/src/__tests__/CloudSettingsService.test.ts @@ -0,0 +1,476 @@ +import * as vscode from "vscode" +import { CloudSettingsService } from "../CloudSettingsService" +import { RefreshTimer } from "../RefreshTimer" +import type { AuthService } from "../auth" +import type { OrganizationSettings } from "@roo-code/types" + +// Mock dependencies +vi.mock("../RefreshTimer") +vi.mock("../config", () => ({ + getRooCodeApiUrl: vi.fn().mockReturnValue("https://app.roocode.com"), +})) + +// Mock fetch globally +global.fetch = vi.fn() + +describe("CloudSettingsService", () => { + let mockContext: vscode.ExtensionContext + let mockAuthService: { + getState: ReturnType + getSessionToken: ReturnType + hasActiveSession: ReturnType + on: ReturnType + } + let mockRefreshTimer: { + start: ReturnType + stop: ReturnType + } + let cloudSettingsService: CloudSettingsService + let mockLog: ReturnType + + const mockSettings: OrganizationSettings = { + version: 1, + defaultSettings: {}, + allowList: { + allowAll: true, + providers: {}, + }, + } + + beforeEach(() => { + vi.clearAllMocks() + + mockContext = { + globalState: { + get: vi.fn(), + update: vi.fn().mockResolvedValue(undefined), + }, + } as unknown as vscode.ExtensionContext + + mockAuthService = { + getState: vi.fn().mockReturnValue("logged-out"), + getSessionToken: vi.fn(), + hasActiveSession: vi.fn().mockReturnValue(false), + on: vi.fn(), + } + + mockRefreshTimer = { + start: vi.fn(), + stop: vi.fn(), + } + + mockLog = vi.fn() + + // Mock RefreshTimer constructor + vi.mocked(RefreshTimer).mockImplementation(() => mockRefreshTimer as unknown as RefreshTimer) + + cloudSettingsService = new CloudSettingsService(mockContext, mockAuthService as unknown as AuthService, mockLog) + }) + + afterEach(() => { + cloudSettingsService.dispose() + }) + + describe("constructor", () => { + it("should create CloudSettingsService with proper dependencies", () => { + expect(cloudSettingsService).toBeInstanceOf(CloudSettingsService) + expect(RefreshTimer).toHaveBeenCalledWith({ + callback: expect.any(Function), + successInterval: 30000, + initialBackoffMs: 1000, + maxBackoffMs: 30000, + }) + }) + + it("should use console.log as default logger when none provided", () => { + const service = new CloudSettingsService(mockContext, mockAuthService as unknown as AuthService) + expect(service).toBeInstanceOf(CloudSettingsService) + }) + }) + + describe("initialize", () => { + it("should load cached settings on initialization", () => { + const cachedSettings = { + version: 1, + defaultSettings: {}, + allowList: { allowAll: true, providers: {} }, + } + + // Create a fresh mock context for this test + const testContext = { + globalState: { + get: vi.fn().mockReturnValue(cachedSettings), + update: vi.fn().mockResolvedValue(undefined), + }, + } as unknown as vscode.ExtensionContext + + // Mock auth service to not be logged out + const testAuthService = { + getState: vi.fn().mockReturnValue("active"), + getSessionToken: vi.fn(), + hasActiveSession: vi.fn().mockReturnValue(false), + on: vi.fn(), + } + + // Create a new instance to test initialization + const testService = new CloudSettingsService( + testContext, + testAuthService as unknown as AuthService, + mockLog, + ) + testService.initialize() + + expect(testContext.globalState.get).toHaveBeenCalledWith("organization-settings") + expect(testService.getSettings()).toEqual(cachedSettings) + + testService.dispose() + }) + + it("should clear cached settings if user is logged out", async () => { + const cachedSettings = { + version: 1, + defaultSettings: {}, + allowList: { allowAll: true, providers: {} }, + } + mockContext.globalState.get = vi.fn().mockReturnValue(cachedSettings) + mockAuthService.getState.mockReturnValue("logged-out") + + cloudSettingsService.initialize() + + expect(mockContext.globalState.update).toHaveBeenCalledWith("organization-settings", undefined) + }) + + it("should set up auth service event listeners", () => { + cloudSettingsService.initialize() + + expect(mockAuthService.on).toHaveBeenCalledWith("auth-state-changed", expect.any(Function)) + }) + + it("should start timer if user has active session", () => { + mockAuthService.hasActiveSession.mockReturnValue(true) + + cloudSettingsService.initialize() + + expect(mockRefreshTimer.start).toHaveBeenCalled() + }) + + it("should not start timer if user has no active session", () => { + mockAuthService.hasActiveSession.mockReturnValue(false) + + cloudSettingsService.initialize() + + expect(mockRefreshTimer.start).not.toHaveBeenCalled() + }) + }) + + describe("event emission", () => { + beforeEach(() => { + cloudSettingsService.initialize() + }) + + it("should emit 'settings-updated' event when settings change", async () => { + const eventSpy = vi.fn() + cloudSettingsService.on("settings-updated", eventSpy) + + mockAuthService.getSessionToken.mockReturnValue("valid-token") + vi.mocked(fetch).mockResolvedValue({ + ok: true, + json: vi.fn().mockResolvedValue(mockSettings), + } as unknown as Response) + + // Get the callback function passed to RefreshTimer + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + await timerCallback() + + expect(eventSpy).toHaveBeenCalledWith({ + settings: mockSettings, + previousSettings: undefined, + }) + }) + + it("should emit event with previous settings when updating existing settings", async () => { + const eventSpy = vi.fn() + + const previousSettings = { + version: 1, + defaultSettings: {}, + allowList: { allowAll: true, providers: {} }, + } + const newSettings = { + version: 2, + defaultSettings: {}, + allowList: { allowAll: true, providers: {} }, + } + + // Create a fresh mock context for this test + const testContext = { + globalState: { + get: vi.fn().mockReturnValue(previousSettings), + update: vi.fn().mockResolvedValue(undefined), + }, + } as unknown as vscode.ExtensionContext + + // Mock auth service to not be logged out + const testAuthService = { + getState: vi.fn().mockReturnValue("active"), + getSessionToken: vi.fn().mockReturnValue("valid-token"), + hasActiveSession: vi.fn().mockReturnValue(false), + on: vi.fn(), + } + + // Create a new service instance with cached settings + const testService = new CloudSettingsService( + testContext, + testAuthService as unknown as AuthService, + mockLog, + ) + testService.on("settings-updated", eventSpy) + testService.initialize() + + vi.mocked(fetch).mockResolvedValue({ + ok: true, + json: vi.fn().mockResolvedValue(newSettings), + } as unknown as Response) + + // Get the callback function passed to RefreshTimer for this instance + const timerCallback = + vi.mocked(RefreshTimer).mock.calls[vi.mocked(RefreshTimer).mock.calls.length - 1][0].callback + await timerCallback() + + expect(eventSpy).toHaveBeenCalledWith({ + settings: newSettings, + previousSettings, + }) + + testService.dispose() + }) + + it("should not emit event when settings version is unchanged", async () => { + const eventSpy = vi.fn() + + // Create a fresh mock context for this test + const testContext = { + globalState: { + get: vi.fn().mockReturnValue(mockSettings), + update: vi.fn().mockResolvedValue(undefined), + }, + } as unknown as vscode.ExtensionContext + + // Mock auth service to not be logged out + const testAuthService = { + getState: vi.fn().mockReturnValue("active"), + getSessionToken: vi.fn().mockReturnValue("valid-token"), + hasActiveSession: vi.fn().mockReturnValue(false), + on: vi.fn(), + } + + // Create a new service instance with cached settings + const testService = new CloudSettingsService( + testContext, + testAuthService as unknown as AuthService, + mockLog, + ) + testService.on("settings-updated", eventSpy) + testService.initialize() + + vi.mocked(fetch).mockResolvedValue({ + ok: true, + json: vi.fn().mockResolvedValue(mockSettings), // Same version + } as unknown as Response) + + // Get the callback function passed to RefreshTimer for this instance + const timerCallback = + vi.mocked(RefreshTimer).mock.calls[vi.mocked(RefreshTimer).mock.calls.length - 1][0].callback + await timerCallback() + + expect(eventSpy).not.toHaveBeenCalled() + + testService.dispose() + }) + + it("should not emit event when fetch fails", async () => { + const eventSpy = vi.fn() + cloudSettingsService.on("settings-updated", eventSpy) + + mockAuthService.getSessionToken.mockReturnValue("valid-token") + vi.mocked(fetch).mockResolvedValue({ + ok: false, + status: 500, + statusText: "Internal Server Error", + } as unknown as Response) + + // Get the callback function passed to RefreshTimer + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + await timerCallback() + + expect(eventSpy).not.toHaveBeenCalled() + }) + + it("should not emit event when no auth token available", async () => { + const eventSpy = vi.fn() + cloudSettingsService.on("settings-updated", eventSpy) + + mockAuthService.getSessionToken.mockReturnValue(null) + + // Get the callback function passed to RefreshTimer + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + await timerCallback() + + expect(eventSpy).not.toHaveBeenCalled() + expect(fetch).not.toHaveBeenCalled() + }) + }) + + describe("fetchSettings", () => { + beforeEach(() => { + cloudSettingsService.initialize() + }) + + it("should fetch and cache settings successfully", async () => { + mockAuthService.getSessionToken.mockReturnValue("valid-token") + vi.mocked(fetch).mockResolvedValue({ + ok: true, + json: vi.fn().mockResolvedValue(mockSettings), + } as unknown as Response) + + // Get the callback function passed to RefreshTimer + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + const result = await timerCallback() + + expect(result).toBe(true) + expect(fetch).toHaveBeenCalledWith("https://app.roocode.com/api/organization-settings", { + headers: { + Authorization: "Bearer valid-token", + }, + }) + expect(mockContext.globalState.update).toHaveBeenCalledWith("organization-settings", mockSettings) + }) + + it("should handle fetch errors gracefully", async () => { + mockAuthService.getSessionToken.mockReturnValue("valid-token") + vi.mocked(fetch).mockRejectedValue(new Error("Network error")) + + // Get the callback function passed to RefreshTimer + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + const result = await timerCallback() + + expect(result).toBe(false) + expect(mockLog).toHaveBeenCalledWith( + "[cloud-settings] Error fetching organization settings:", + expect.any(Error), + ) + }) + + it("should handle invalid response format", async () => { + mockAuthService.getSessionToken.mockReturnValue("valid-token") + vi.mocked(fetch).mockResolvedValue({ + ok: true, + json: vi.fn().mockResolvedValue({ invalid: "data" }), + } as unknown as Response) + + // Get the callback function passed to RefreshTimer + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + const result = await timerCallback() + + expect(result).toBe(false) + expect(mockLog).toHaveBeenCalledWith( + "[cloud-settings] Invalid organization settings format:", + expect.any(Object), + ) + }) + }) + + describe("getAllowList", () => { + it("should return settings allowList when available", () => { + mockContext.globalState.get = vi.fn().mockReturnValue(mockSettings) + cloudSettingsService.initialize() + + const allowList = cloudSettingsService.getAllowList() + expect(allowList).toEqual(mockSettings.allowList) + }) + + it("should return default allow all when no settings available", () => { + const allowList = cloudSettingsService.getAllowList() + expect(allowList).toEqual({ allowAll: true, providers: {} }) + }) + }) + + describe("getSettings", () => { + it("should return current settings", () => { + // Create a fresh mock context for this test + const testContext = { + globalState: { + get: vi.fn().mockReturnValue(mockSettings), + update: vi.fn().mockResolvedValue(undefined), + }, + } as unknown as vscode.ExtensionContext + + // Mock auth service to not be logged out + const testAuthService = { + getState: vi.fn().mockReturnValue("active"), + getSessionToken: vi.fn(), + hasActiveSession: vi.fn().mockReturnValue(false), + on: vi.fn(), + } + + const testService = new CloudSettingsService( + testContext, + testAuthService as unknown as AuthService, + mockLog, + ) + testService.initialize() + + const settings = testService.getSettings() + expect(settings).toEqual(mockSettings) + + testService.dispose() + }) + + it("should return undefined when no settings available", () => { + const settings = cloudSettingsService.getSettings() + expect(settings).toBeUndefined() + }) + }) + + describe("dispose", () => { + it("should remove all listeners and stop timer", () => { + const removeAllListenersSpy = vi.spyOn(cloudSettingsService, "removeAllListeners") + + cloudSettingsService.dispose() + + expect(removeAllListenersSpy).toHaveBeenCalled() + expect(mockRefreshTimer.stop).toHaveBeenCalled() + }) + }) + + describe("auth service event handlers", () => { + it("should start timer when auth-state-changed event is triggered with active-session", () => { + cloudSettingsService.initialize() + + // Get the auth-state-changed handler + const authStateChangedHandler = mockAuthService.on.mock.calls.find( + (call) => call[0] === "auth-state-changed", + )?.[1] + expect(authStateChangedHandler).toBeDefined() + + // Simulate active-session state change + authStateChangedHandler({ state: "active-session", previousState: "attempting-session" }) + expect(mockRefreshTimer.start).toHaveBeenCalled() + }) + + it("should stop timer and remove settings when auth-state-changed event is triggered with logged-out", async () => { + cloudSettingsService.initialize() + + // Get the auth-state-changed handler + const authStateChangedHandler = mockAuthService.on.mock.calls.find( + (call) => call[0] === "auth-state-changed", + )?.[1] + expect(authStateChangedHandler).toBeDefined() + + // Simulate logged-out state change from active-session + await authStateChangedHandler({ state: "logged-out", previousState: "active-session" }) + expect(mockRefreshTimer.stop).toHaveBeenCalled() + expect(mockContext.globalState.update).toHaveBeenCalledWith("organization-settings", undefined) + }) + }) +}) diff --git a/packages/cloud/src/__tests__/CloudShareService.test.ts b/packages/cloud/src/__tests__/CloudShareService.test.ts new file mode 100644 index 0000000000..6fae1fbb9f --- /dev/null +++ b/packages/cloud/src/__tests__/CloudShareService.test.ts @@ -0,0 +1,310 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ + +import type { MockedFunction } from "vitest" +import * as vscode from "vscode" + +import { CloudAPI } from "../CloudAPI" +import { CloudShareService } from "../CloudShareService" +import type { SettingsService } from "../SettingsService" +import type { AuthService } from "../auth" +import { CloudAPIError, TaskNotFoundError } from "../errors" + +// Mock fetch +const mockFetch = vi.fn() +global.fetch = mockFetch as any + +// Mock vscode +vi.mock("vscode", () => ({ + window: { + showInformationMessage: vi.fn(), + showErrorMessage: vi.fn(), + showQuickPick: vi.fn(), + }, + env: { + clipboard: { + writeText: vi.fn(), + }, + openExternal: vi.fn(), + }, + Uri: { + parse: vi.fn(), + }, + extensions: { + getExtension: vi.fn(() => ({ + packageJSON: { version: "1.0.0" }, + })), + }, +})) + +// Mock config +vi.mock("../Config", () => ({ + getRooCodeApiUrl: () => "https://app.roocode.com", +})) + +// Mock utils +vi.mock("../utils", () => ({ + getUserAgent: () => "Roo-Code 1.0.0", +})) + +describe("CloudShareService", () => { + let shareService: CloudShareService + let mockAuthService: AuthService + let mockSettingsService: SettingsService + let mockCloudAPI: CloudAPI + let mockLog: MockedFunction<(...args: unknown[]) => void> + + beforeEach(() => { + vi.clearAllMocks() + mockFetch.mockClear() + + mockLog = vi.fn() + mockAuthService = { + hasActiveSession: vi.fn(), + getSessionToken: vi.fn(), + isAuthenticated: vi.fn(), + } as any + + mockSettingsService = { + getSettings: vi.fn(), + } as any + + mockCloudAPI = new CloudAPI(mockAuthService, mockLog) + shareService = new CloudShareService(mockCloudAPI, mockSettingsService, mockLog) + }) + + describe("shareTask", () => { + it("should share task with organization visibility and copy to clipboard", async () => { + const mockResponseData = { + success: true, + shareUrl: "https://app.roocode.com/share/abc123", + } + + ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") + mockFetch.mockResolvedValue({ + ok: true, + json: vi.fn().mockResolvedValue(mockResponseData), + }) + + const result = await shareService.shareTask("task-123", "organization") + + expect(result.success).toBe(true) + expect(result.shareUrl).toBe("https://app.roocode.com/share/abc123") + expect(mockFetch).toHaveBeenCalledWith("https://app.roocode.com/api/extension/share", { + method: "POST", + headers: { + "Content-Type": "application/json", + Authorization: "Bearer session-token", + "User-Agent": "Roo-Code 1.0.0", + }, + body: JSON.stringify({ taskId: "task-123", visibility: "organization" }), + signal: expect.any(AbortSignal), + }) + expect(vscode.env.clipboard.writeText).toHaveBeenCalledWith("https://app.roocode.com/share/abc123") + }) + + it("should share task with public visibility", async () => { + const mockResponseData = { + success: true, + shareUrl: "https://app.roocode.com/share/abc123", + } + + ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") + mockFetch.mockResolvedValue({ + ok: true, + json: vi.fn().mockResolvedValue(mockResponseData), + }) + + const result = await shareService.shareTask("task-123", "public") + + expect(result.success).toBe(true) + expect(mockFetch).toHaveBeenCalledWith("https://app.roocode.com/api/extension/share", { + method: "POST", + headers: { + "Content-Type": "application/json", + Authorization: "Bearer session-token", + "User-Agent": "Roo-Code 1.0.0", + }, + body: JSON.stringify({ taskId: "task-123", visibility: "public" }), + signal: expect.any(AbortSignal), + }) + }) + + it("should default to organization visibility when not specified", async () => { + const mockResponseData = { + success: true, + shareUrl: "https://app.roocode.com/share/abc123", + } + + ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") + mockFetch.mockResolvedValue({ + ok: true, + json: vi.fn().mockResolvedValue(mockResponseData), + }) + + const result = await shareService.shareTask("task-123") + + expect(result.success).toBe(true) + expect(mockFetch).toHaveBeenCalledWith("https://app.roocode.com/api/extension/share", { + method: "POST", + headers: { + "Content-Type": "application/json", + Authorization: "Bearer session-token", + "User-Agent": "Roo-Code 1.0.0", + }, + body: JSON.stringify({ taskId: "task-123", visibility: "organization" }), + signal: expect.any(AbortSignal), + }) + }) + + it("should handle API error response", async () => { + const mockResponseData = { + success: false, + error: "Task not found", + } + + ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") + mockFetch.mockResolvedValue({ + ok: true, + json: vi.fn().mockResolvedValue(mockResponseData), + }) + + const result = await shareService.shareTask("task-123", "organization") + + expect(result.success).toBe(false) + expect(result.error).toBe("Task not found") + }) + + it("should handle authentication errors", async () => { + ;(mockAuthService.getSessionToken as any).mockReturnValue(null) + + await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow("Authentication required") + }) + + it("should handle unexpected errors", async () => { + ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") + mockFetch.mockRejectedValue(new Error("Network error")) + + await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow("Network error") + }) + + it("should throw TaskNotFoundError for 404 responses", async () => { + ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") + mockFetch.mockResolvedValue({ + ok: false, + status: 404, + statusText: "Not Found", + json: vi.fn().mockRejectedValue(new Error("Invalid JSON")), + text: vi.fn().mockResolvedValue("Not Found"), + }) + + await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow(TaskNotFoundError) + await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow("Task not found") + }) + + it("should throw generic Error for non-404 HTTP errors", async () => { + ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") + mockFetch.mockResolvedValue({ + ok: false, + status: 500, + statusText: "Internal Server Error", + json: vi.fn().mockRejectedValue(new Error("Invalid JSON")), + text: vi.fn().mockResolvedValue("Internal Server Error"), + }) + + await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow(CloudAPIError) + await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow( + "HTTP 500: Internal Server Error", + ) + }) + + it("should create TaskNotFoundError with correct properties", async () => { + ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") + mockFetch.mockResolvedValue({ + ok: false, + status: 404, + statusText: "Not Found", + json: vi.fn().mockRejectedValue(new Error("Invalid JSON")), + text: vi.fn().mockResolvedValue("Not Found"), + }) + + try { + await shareService.shareTask("task-123", "organization") + expect.fail("Expected TaskNotFoundError to be thrown") + } catch (error) { + expect(error).toBeInstanceOf(TaskNotFoundError) + expect(error).toBeInstanceOf(Error) + expect((error as TaskNotFoundError).message).toBe("Task not found") + } + }) + }) + + describe("canShareTask", () => { + it("should return true when authenticated and sharing is enabled", async () => { + ;(mockAuthService.isAuthenticated as any).mockReturnValue(true) + ;(mockSettingsService.getSettings as any).mockReturnValue({ + cloudSettings: { + enableTaskSharing: true, + }, + }) + + const result = await shareService.canShareTask() + + expect(result).toBe(true) + }) + + it("should return false when authenticated but sharing is disabled", async () => { + ;(mockAuthService.isAuthenticated as any).mockReturnValue(true) + ;(mockSettingsService.getSettings as any).mockReturnValue({ + cloudSettings: { + enableTaskSharing: false, + }, + }) + + const result = await shareService.canShareTask() + + expect(result).toBe(false) + }) + + it("should return false when authenticated and sharing setting is undefined (default)", async () => { + ;(mockAuthService.isAuthenticated as any).mockReturnValue(true) + ;(mockSettingsService.getSettings as any).mockReturnValue({ + cloudSettings: {}, + }) + + const result = await shareService.canShareTask() + + expect(result).toBe(false) + }) + + it("should return false when authenticated and no settings available (default)", async () => { + ;(mockAuthService.isAuthenticated as any).mockReturnValue(true) + ;(mockSettingsService.getSettings as any).mockReturnValue(undefined) + + const result = await shareService.canShareTask() + + expect(result).toBe(false) + }) + + it("should return false when settings service returns undefined", async () => { + ;(mockSettingsService.getSettings as any).mockReturnValue(undefined) + + const result = await shareService.canShareTask() + + expect(result).toBe(false) + }) + + it("should handle errors gracefully", async () => { + ;(mockSettingsService.getSettings as any).mockImplementation(() => { + throw new Error("Settings error") + }) + + const result = await shareService.canShareTask() + + expect(result).toBe(false) + expect(mockLog).toHaveBeenCalledWith( + "[ShareService] Error checking if task can be shared:", + expect.any(Error), + ) + }) + }) +}) diff --git a/packages/cloud/src/__tests__/RefreshTimer.test.ts b/packages/cloud/src/__tests__/RefreshTimer.test.ts new file mode 100644 index 0000000000..2f87488568 --- /dev/null +++ b/packages/cloud/src/__tests__/RefreshTimer.test.ts @@ -0,0 +1,210 @@ +// npx vitest run src/__tests__/RefreshTimer.test.ts + +import type { Mock } from "vitest" + +import { RefreshTimer } from "../RefreshTimer" + +vi.useFakeTimers() + +describe("RefreshTimer", () => { + let mockCallback: Mock + let refreshTimer: RefreshTimer + + beforeEach(() => { + mockCallback = vi.fn() + mockCallback.mockResolvedValue(true) + }) + + afterEach(() => { + if (refreshTimer) { + refreshTimer.stop() + } + + vi.clearAllTimers() + vi.clearAllMocks() + }) + + it("should execute callback immediately when started", () => { + refreshTimer = new RefreshTimer({ + callback: mockCallback, + }) + + refreshTimer.start() + + expect(mockCallback).toHaveBeenCalledTimes(1) + }) + + it("should schedule next attempt after success interval when callback succeeds", async () => { + mockCallback.mockResolvedValue(true) + + refreshTimer = new RefreshTimer({ + callback: mockCallback, + successInterval: 50000, // 50 seconds + }) + + refreshTimer.start() + + // Fast-forward to execute the first callback + await Promise.resolve() + + expect(mockCallback).toHaveBeenCalledTimes(1) + + // Fast-forward 50 seconds + vi.advanceTimersByTime(50000) + + // Callback should be called again + expect(mockCallback).toHaveBeenCalledTimes(2) + }) + + it("should use exponential backoff when callback fails", async () => { + mockCallback.mockResolvedValue(false) + + refreshTimer = new RefreshTimer({ + callback: mockCallback, + initialBackoffMs: 1000, // 1 second + }) + + refreshTimer.start() + + // Fast-forward to execute the first callback + await Promise.resolve() + + expect(mockCallback).toHaveBeenCalledTimes(1) + + // Fast-forward 1 second + vi.advanceTimersByTime(1000) + + // Callback should be called again + expect(mockCallback).toHaveBeenCalledTimes(2) + + // Fast-forward to execute the second callback + await Promise.resolve() + + // Fast-forward 2 seconds + vi.advanceTimersByTime(2000) + + // Callback should be called again + expect(mockCallback).toHaveBeenCalledTimes(3) + + // Fast-forward to execute the third callback + await Promise.resolve() + }) + + it("should not exceed maximum backoff interval", async () => { + mockCallback.mockResolvedValue(false) + + refreshTimer = new RefreshTimer({ + callback: mockCallback, + initialBackoffMs: 1000, // 1 second + maxBackoffMs: 5000, // 5 seconds + }) + + refreshTimer.start() + + // Fast-forward through multiple failures to reach max backoff + await Promise.resolve() // First attempt + vi.advanceTimersByTime(1000) + + await Promise.resolve() // Second attempt (backoff = 2000ms) + vi.advanceTimersByTime(2000) + + await Promise.resolve() // Third attempt (backoff = 4000ms) + vi.advanceTimersByTime(4000) + + await Promise.resolve() // Fourth attempt (backoff would be 8000ms but max is 5000ms) + + // Should be capped at maxBackoffMs (no way to verify without logger) + }) + + it("should reset backoff after a successful attempt", async () => { + // First call fails, second succeeds, third fails + mockCallback.mockResolvedValueOnce(false).mockResolvedValueOnce(true).mockResolvedValueOnce(false) + + refreshTimer = new RefreshTimer({ + callback: mockCallback, + initialBackoffMs: 1000, + successInterval: 5000, + }) + + refreshTimer.start() + + // First attempt (fails) + await Promise.resolve() + + // Fast-forward 1 second + vi.advanceTimersByTime(1000) + + // Second attempt (succeeds) + await Promise.resolve() + + // Fast-forward 5 seconds + vi.advanceTimersByTime(5000) + + // Third attempt (fails) + await Promise.resolve() + + // Backoff should be reset to initial value (no way to verify without logger) + }) + + it("should handle errors in callback as failures", async () => { + mockCallback.mockRejectedValue(new Error("Test error")) + + refreshTimer = new RefreshTimer({ + callback: mockCallback, + initialBackoffMs: 1000, + }) + + refreshTimer.start() + + // Fast-forward to execute the callback + await Promise.resolve() + + // Error should be treated as a failure (no way to verify without logger) + }) + + it("should stop the timer and cancel pending executions", () => { + refreshTimer = new RefreshTimer({ + callback: mockCallback, + }) + + refreshTimer.start() + + // Stop the timer + refreshTimer.stop() + + // Fast-forward a long time + vi.advanceTimersByTime(1000000) + + // Callback should only have been called once (the initial call) + expect(mockCallback).toHaveBeenCalledTimes(1) + }) + + it("should reset the backoff state", async () => { + mockCallback.mockResolvedValue(false) + + refreshTimer = new RefreshTimer({ + callback: mockCallback, + initialBackoffMs: 1000, + }) + + refreshTimer.start() + + // Fast-forward through a few failures + await Promise.resolve() + vi.advanceTimersByTime(1000) + + await Promise.resolve() + vi.advanceTimersByTime(2000) + + // Reset the timer + refreshTimer.reset() + + // Stop and restart to trigger a new execution + refreshTimer.stop() + refreshTimer.start() + + await Promise.resolve() + + // Backoff should be back to initial value (no way to verify without logger) + }) +}) diff --git a/packages/cloud/src/__tests__/StaticSettingsService.test.ts b/packages/cloud/src/__tests__/StaticSettingsService.test.ts new file mode 100644 index 0000000000..26c0ada9cd --- /dev/null +++ b/packages/cloud/src/__tests__/StaticSettingsService.test.ts @@ -0,0 +1,102 @@ +// npx vitest run src/__tests__/StaticSettingsService.test.ts + +import { StaticSettingsService } from "../StaticSettingsService" + +describe("StaticSettingsService", () => { + const validSettings = { + version: 1, + cloudSettings: { + recordTaskMessages: true, + enableTaskSharing: true, + taskShareExpirationDays: 30, + }, + defaultSettings: { + enableCheckpoints: true, + maxOpenTabsContext: 10, + }, + allowList: { + allowAll: false, + providers: { + anthropic: { + allowAll: true, + }, + }, + }, + } + + const validBase64 = Buffer.from(JSON.stringify(validSettings)).toString("base64") + + describe("constructor", () => { + it("should parse valid base64 encoded JSON settings", () => { + const service = new StaticSettingsService(validBase64) + expect(service.getSettings()).toEqual(validSettings) + }) + + it("should throw error for invalid base64", () => { + expect(() => new StaticSettingsService("invalid-base64!@#")).toThrow("Failed to parse static settings") + }) + + it("should throw error for invalid JSON", () => { + const invalidJson = Buffer.from("{ invalid json }").toString("base64") + expect(() => new StaticSettingsService(invalidJson)).toThrow("Failed to parse static settings") + }) + + it("should throw error for invalid schema", () => { + const invalidSettings = { invalid: "schema" } + const invalidBase64 = Buffer.from(JSON.stringify(invalidSettings)).toString("base64") + expect(() => new StaticSettingsService(invalidBase64)).toThrow("Failed to parse static settings") + }) + }) + + describe("getAllowList", () => { + it("should return the allow list from settings", () => { + const service = new StaticSettingsService(validBase64) + expect(service.getAllowList()).toEqual(validSettings.allowList) + }) + }) + + describe("getSettings", () => { + it("should return the parsed settings", () => { + const service = new StaticSettingsService(validBase64) + expect(service.getSettings()).toEqual(validSettings) + }) + }) + + describe("dispose", () => { + it("should be a no-op for static settings", () => { + const service = new StaticSettingsService(validBase64) + expect(() => service.dispose()).not.toThrow() + }) + }) + + describe("logging", () => { + it("should use provided logger for errors", () => { + const mockLog = vi.fn() + expect(() => new StaticSettingsService("invalid-base64!@#", mockLog)).toThrow() + + expect(mockLog).toHaveBeenCalledWith( + expect.stringContaining("[StaticSettingsService] failed to parse static settings:"), + expect.any(Error), + ) + }) + + it("should use console.log as default logger for errors", () => { + const consoleSpy = vi.spyOn(console, "log").mockImplementation(() => {}) + expect(() => new StaticSettingsService("invalid-base64!@#")).toThrow() + + expect(consoleSpy).toHaveBeenCalledWith( + expect.stringContaining("[StaticSettingsService] failed to parse static settings:"), + expect.any(Error), + ) + + consoleSpy.mockRestore() + }) + + it("should not log anything for successful parsing", () => { + const mockLog = vi.fn() + new StaticSettingsService(validBase64, mockLog) + + expect(mockLog).not.toHaveBeenCalled() + }) + }) +}) diff --git a/packages/cloud/src/__tests__/TelemetryClient.test.ts b/packages/cloud/src/__tests__/TelemetryClient.test.ts new file mode 100644 index 0000000000..e4c62b1e4e --- /dev/null +++ b/packages/cloud/src/__tests__/TelemetryClient.test.ts @@ -0,0 +1,738 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ + +// npx vitest run src/__tests__/TelemetryClient.test.ts + +import { type TelemetryPropertiesProvider, TelemetryEventName } from "@roo-code/types" + +import { TelemetryClient } from "../TelemetryClient" + +const mockFetch = vi.fn() +global.fetch = mockFetch as any + +describe("TelemetryClient", () => { + const getPrivateProperty = (instance: any, propertyName: string): T => { + return instance[propertyName] + } + + let mockAuthService: any + let mockSettingsService: any + + beforeEach(() => { + vi.clearAllMocks() + + // Create a mock AuthService instead of using the singleton + mockAuthService = { + getSessionToken: vi.fn().mockReturnValue("mock-token"), + getState: vi.fn().mockReturnValue("active-session"), + isAuthenticated: vi.fn().mockReturnValue(true), + hasActiveSession: vi.fn().mockReturnValue(true), + } + + // Create a mock SettingsService + mockSettingsService = { + getSettings: vi.fn().mockReturnValue({ + cloudSettings: { + recordTaskMessages: true, + }, + }), + } + + mockFetch.mockResolvedValue({ + ok: true, + json: vi.fn().mockResolvedValue({}), + }) + + vi.spyOn(console, "info").mockImplementation(() => {}) + vi.spyOn(console, "error").mockImplementation(() => {}) + }) + + afterEach(() => { + vi.restoreAllMocks() + }) + + describe("isEventCapturable", () => { + it("should return true for events not in exclude list", () => { + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( + client, + "isEventCapturable", + ).bind(client) + + expect(isEventCapturable(TelemetryEventName.TASK_CREATED)).toBe(true) + expect(isEventCapturable(TelemetryEventName.LLM_COMPLETION)).toBe(true) + expect(isEventCapturable(TelemetryEventName.MODE_SWITCH)).toBe(true) + expect(isEventCapturable(TelemetryEventName.TOOL_USED)).toBe(true) + }) + + it("should return false for events in exclude list", () => { + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( + client, + "isEventCapturable", + ).bind(client) + + expect(isEventCapturable(TelemetryEventName.TASK_CONVERSATION_MESSAGE)).toBe(false) + }) + + it("should return true for TASK_MESSAGE events when recordTaskMessages is true", () => { + mockSettingsService.getSettings.mockReturnValue({ + cloudSettings: { + recordTaskMessages: true, + }, + }) + + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( + client, + "isEventCapturable", + ).bind(client) + + expect(isEventCapturable(TelemetryEventName.TASK_MESSAGE)).toBe(true) + }) + + it("should return false for TASK_MESSAGE events when recordTaskMessages is false", () => { + mockSettingsService.getSettings.mockReturnValue({ + cloudSettings: { + recordTaskMessages: false, + }, + }) + + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( + client, + "isEventCapturable", + ).bind(client) + + expect(isEventCapturable(TelemetryEventName.TASK_MESSAGE)).toBe(false) + }) + + it("should return false for TASK_MESSAGE events when recordTaskMessages is undefined", () => { + mockSettingsService.getSettings.mockReturnValue({ + cloudSettings: {}, + }) + + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( + client, + "isEventCapturable", + ).bind(client) + + expect(isEventCapturable(TelemetryEventName.TASK_MESSAGE)).toBe(false) + }) + + it("should return false for TASK_MESSAGE events when cloudSettings is undefined", () => { + mockSettingsService.getSettings.mockReturnValue({}) + + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( + client, + "isEventCapturable", + ).bind(client) + + expect(isEventCapturable(TelemetryEventName.TASK_MESSAGE)).toBe(false) + }) + + it("should return false for TASK_MESSAGE events when getSettings returns undefined", () => { + mockSettingsService.getSettings.mockReturnValue(undefined) + + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( + client, + "isEventCapturable", + ).bind(client) + + expect(isEventCapturable(TelemetryEventName.TASK_MESSAGE)).toBe(false) + }) + }) + + describe("getEventProperties", () => { + it("should merge provider properties with event properties", async () => { + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + const mockProvider: TelemetryPropertiesProvider = { + getTelemetryProperties: vi.fn().mockResolvedValue({ + appVersion: "1.0.0", + vscodeVersion: "1.60.0", + platform: "darwin", + editorName: "vscode", + language: "en", + mode: "code", + }), + } + + client.setProvider(mockProvider) + + const getEventProperties = getPrivateProperty< + (event: { event: TelemetryEventName; properties?: Record }) => Promise> + >(client, "getEventProperties").bind(client) + + const result = await getEventProperties({ + event: TelemetryEventName.TASK_CREATED, + properties: { + customProp: "value", + mode: "override", // This should override the provider's mode. + }, + }) + + expect(result).toEqual({ + appVersion: "1.0.0", + vscodeVersion: "1.60.0", + platform: "darwin", + editorName: "vscode", + language: "en", + mode: "override", // Event property takes precedence. + customProp: "value", + }) + + expect(mockProvider.getTelemetryProperties).toHaveBeenCalledTimes(1) + }) + + it("should handle errors from provider gracefully", async () => { + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + const mockProvider: TelemetryPropertiesProvider = { + getTelemetryProperties: vi.fn().mockRejectedValue(new Error("Provider error")), + } + + const consoleErrorSpy = vi.spyOn(console, "error") + + client.setProvider(mockProvider) + + const getEventProperties = getPrivateProperty< + (event: { event: TelemetryEventName; properties?: Record }) => Promise> + >(client, "getEventProperties").bind(client) + + const result = await getEventProperties({ + event: TelemetryEventName.TASK_CREATED, + properties: { customProp: "value" }, + }) + + expect(result).toEqual({ customProp: "value" }) + expect(consoleErrorSpy).toHaveBeenCalledWith( + expect.stringContaining("Error getting telemetry properties: Provider error"), + ) + }) + + it("should return event properties when no provider is set", async () => { + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + const getEventProperties = getPrivateProperty< + (event: { event: TelemetryEventName; properties?: Record }) => Promise> + >(client, "getEventProperties").bind(client) + + const result = await getEventProperties({ + event: TelemetryEventName.TASK_CREATED, + properties: { customProp: "value" }, + }) + + expect(result).toEqual({ customProp: "value" }) + }) + }) + + describe("capture", () => { + it("should not capture events that are not capturable", async () => { + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + await client.capture({ + event: TelemetryEventName.TASK_CONVERSATION_MESSAGE, // In exclude list. + properties: { test: "value" }, + }) + + expect(mockFetch).not.toHaveBeenCalled() + }) + + it("should not capture TASK_MESSAGE events when recordTaskMessages is false", async () => { + mockSettingsService.getSettings.mockReturnValue({ + cloudSettings: { + recordTaskMessages: false, + }, + }) + + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + await client.capture({ + event: TelemetryEventName.TASK_MESSAGE, + properties: { + taskId: "test-task-id", + message: { + ts: 1, + type: "say", + say: "text", + text: "test message", + }, + }, + }) + + expect(mockFetch).not.toHaveBeenCalled() + }) + + it("should not capture TASK_MESSAGE events when recordTaskMessages is undefined", async () => { + mockSettingsService.getSettings.mockReturnValue({ + cloudSettings: {}, + }) + + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + await client.capture({ + event: TelemetryEventName.TASK_MESSAGE, + properties: { + taskId: "test-task-id", + message: { + ts: 1, + type: "say", + say: "text", + text: "test message", + }, + }, + }) + + expect(mockFetch).not.toHaveBeenCalled() + }) + + it("should not send request when schema validation fails", async () => { + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + await client.capture({ + event: TelemetryEventName.TASK_CREATED, + properties: { test: "value" }, + }) + + expect(mockFetch).not.toHaveBeenCalled() + expect(console.error).toHaveBeenCalledWith(expect.stringContaining("Invalid telemetry event")) + }) + + it("should send request when event is capturable and validation passes", async () => { + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + const providerProperties = { + appName: "roo-code", + appVersion: "1.0.0", + vscodeVersion: "1.60.0", + platform: "darwin", + editorName: "vscode", + language: "en", + mode: "code", + } + + const eventProperties = { + taskId: "test-task-id", + } + + const mockValidatedData = { + type: TelemetryEventName.TASK_CREATED, + properties: { + ...providerProperties, + taskId: "test-task-id", + }, + } + + const mockProvider: TelemetryPropertiesProvider = { + getTelemetryProperties: vi.fn().mockResolvedValue(providerProperties), + } + + client.setProvider(mockProvider) + + await client.capture({ + event: TelemetryEventName.TASK_CREATED, + properties: eventProperties, + }) + + expect(mockFetch).toHaveBeenCalledWith( + "https://app.roocode.com/api/events", + expect.objectContaining({ + method: "POST", + body: JSON.stringify(mockValidatedData), + }), + ) + }) + + it("should attempt to capture TASK_MESSAGE events when recordTaskMessages is true", async () => { + mockSettingsService.getSettings.mockReturnValue({ + cloudSettings: { + recordTaskMessages: true, + }, + }) + + const eventProperties = { + appName: "roo-code", + appVersion: "1.0.0", + vscodeVersion: "1.60.0", + platform: "darwin", + editorName: "vscode", + language: "en", + mode: "code", + taskId: "test-task-id", + message: { + ts: 1, + type: "say", + say: "text", + text: "test message", + }, + } + + const mockValidatedData = { + type: TelemetryEventName.TASK_MESSAGE, + properties: eventProperties, + } + + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + await client.capture({ + event: TelemetryEventName.TASK_MESSAGE, + properties: eventProperties, + }) + + expect(mockFetch).toHaveBeenCalledWith( + "https://app.roocode.com/api/events", + expect.objectContaining({ + method: "POST", + body: JSON.stringify(mockValidatedData), + }), + ) + }) + + it("should handle fetch errors gracefully", async () => { + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + mockFetch.mockRejectedValue(new Error("Network error")) + + await expect( + client.capture({ + event: TelemetryEventName.TASK_CREATED, + properties: { test: "value" }, + }), + ).resolves.not.toThrow() + }) + }) + + describe("telemetry state methods", () => { + it("should always return true for isTelemetryEnabled", () => { + const client = new TelemetryClient(mockAuthService, mockSettingsService) + expect(client.isTelemetryEnabled()).toBe(true) + }) + + it("should have empty implementations for updateTelemetryState and shutdown", async () => { + const client = new TelemetryClient(mockAuthService, mockSettingsService) + client.updateTelemetryState(true) + await client.shutdown() + }) + }) + + describe("backfillMessages", () => { + it("should not send request when not authenticated", async () => { + mockAuthService.isAuthenticated.mockReturnValue(false) + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + const messages = [ + { + ts: 1, + type: "say" as const, + say: "text" as const, + text: "test message", + }, + ] + + await client.backfillMessages(messages, "test-task-id") + + expect(mockFetch).not.toHaveBeenCalled() + }) + + it("should not send request when no session token available", async () => { + mockAuthService.getSessionToken.mockReturnValue(null) + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + const messages = [ + { + ts: 1, + type: "say" as const, + say: "text" as const, + text: "test message", + }, + ] + + await client.backfillMessages(messages, "test-task-id") + + expect(mockFetch).not.toHaveBeenCalled() + expect(console.error).toHaveBeenCalledWith( + "[TelemetryClient#backfillMessages] Unauthorized: No session token available.", + ) + }) + + it("should send FormData request with correct structure when authenticated", async () => { + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + const providerProperties = { + appName: "roo-code", + appVersion: "1.0.0", + vscodeVersion: "1.60.0", + platform: "darwin", + editorName: "vscode", + language: "en", + mode: "code", + } + + const mockProvider: TelemetryPropertiesProvider = { + getTelemetryProperties: vi.fn().mockResolvedValue(providerProperties), + } + + client.setProvider(mockProvider) + + const messages = [ + { + ts: 1, + type: "say" as const, + say: "text" as const, + text: "test message 1", + }, + { + ts: 2, + type: "ask" as const, + ask: "followup" as const, + text: "test question", + }, + ] + + await client.backfillMessages(messages, "test-task-id") + + expect(mockFetch).toHaveBeenCalledWith( + "https://app.roocode.com/api/events/backfill", + expect.objectContaining({ + method: "POST", + headers: { + Authorization: "Bearer mock-token", + }, + body: expect.any(FormData), + }), + ) + + // Verify FormData contents + const call = mockFetch.mock.calls[0] + const formData = call[1].body as FormData + + expect(formData.get("taskId")).toBe("test-task-id") + + // Parse and compare properties as objects since JSON.stringify order can vary + const propertiesJson = formData.get("properties") as string + const parsedProperties = JSON.parse(propertiesJson) + expect(parsedProperties).toEqual({ + taskId: "test-task-id", + ...providerProperties, + }) + // The messages are stored as a File object under the "file" key + const fileField = formData.get("file") as File + expect(fileField).toBeInstanceOf(File) + expect(fileField.name).toBe("task.json") + expect(fileField.type).toBe("application/json") + + // Read the file content to verify the messages + const fileContent = await fileField.text() + expect(fileContent).toBe(JSON.stringify(messages)) + }) + + it("should handle provider errors gracefully", async () => { + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + const mockProvider: TelemetryPropertiesProvider = { + getTelemetryProperties: vi.fn().mockRejectedValue(new Error("Provider error")), + } + + client.setProvider(mockProvider) + + const messages = [ + { + ts: 1, + type: "say" as const, + say: "text" as const, + text: "test message", + }, + ] + + await client.backfillMessages(messages, "test-task-id") + + expect(mockFetch).toHaveBeenCalledWith( + "https://app.roocode.com/api/events/backfill", + expect.objectContaining({ + method: "POST", + headers: { + Authorization: "Bearer mock-token", + }, + body: expect.any(FormData), + }), + ) + + // Verify FormData contents - should still work with just taskId + const call = mockFetch.mock.calls[0] + const formData = call[1].body as FormData + + expect(formData.get("taskId")).toBe("test-task-id") + expect(formData.get("properties")).toBe( + JSON.stringify({ + taskId: "test-task-id", + }), + ) + // The messages are stored as a File object under the "file" key + const fileField = formData.get("file") as File + expect(fileField).toBeInstanceOf(File) + expect(fileField.name).toBe("task.json") + expect(fileField.type).toBe("application/json") + + // Read the file content to verify the messages + const fileContent = await fileField.text() + expect(fileContent).toBe(JSON.stringify(messages)) + }) + + it("should work without provider set", async () => { + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + const messages = [ + { + ts: 1, + type: "say" as const, + say: "text" as const, + text: "test message", + }, + ] + + await client.backfillMessages(messages, "test-task-id") + + expect(mockFetch).toHaveBeenCalledWith( + "https://app.roocode.com/api/events/backfill", + expect.objectContaining({ + method: "POST", + headers: { + Authorization: "Bearer mock-token", + }, + body: expect.any(FormData), + }), + ) + + // Verify FormData contents - should work with just taskId + const call = mockFetch.mock.calls[0] + const formData = call[1].body as FormData + + expect(formData.get("taskId")).toBe("test-task-id") + expect(formData.get("properties")).toBe( + JSON.stringify({ + taskId: "test-task-id", + }), + ) + // The messages are stored as a File object under the "file" key + const fileField = formData.get("file") as File + expect(fileField).toBeInstanceOf(File) + expect(fileField.name).toBe("task.json") + expect(fileField.type).toBe("application/json") + + // Read the file content to verify the messages + const fileContent = await fileField.text() + expect(fileContent).toBe(JSON.stringify(messages)) + }) + + it("should handle fetch errors gracefully", async () => { + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + mockFetch.mockRejectedValue(new Error("Network error")) + + const messages = [ + { + ts: 1, + type: "say" as const, + say: "text" as const, + text: "test message", + }, + ] + + await expect(client.backfillMessages(messages, "test-task-id")).resolves.not.toThrow() + + expect(console.error).toHaveBeenCalledWith( + expect.stringContaining( + "[TelemetryClient#backfillMessages] Error uploading messages: Error: Network error", + ), + ) + }) + + it("should handle HTTP error responses", async () => { + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + mockFetch.mockResolvedValue({ + ok: false, + status: 404, + statusText: "Not Found", + }) + + const messages = [ + { + ts: 1, + type: "say" as const, + say: "text" as const, + text: "test message", + }, + ] + + await client.backfillMessages(messages, "test-task-id") + + expect(console.error).toHaveBeenCalledWith( + "[TelemetryClient#backfillMessages] POST events/backfill -> 404 Not Found", + ) + }) + + it("should log debug information when debug is enabled", async () => { + const client = new TelemetryClient(mockAuthService, mockSettingsService, true) + + const messages = [ + { + ts: 1, + type: "say" as const, + say: "text" as const, + text: "test message", + }, + ] + + await client.backfillMessages(messages, "test-task-id") + + expect(console.info).toHaveBeenCalledWith( + "[TelemetryClient#backfillMessages] Uploading 1 messages for task test-task-id", + ) + expect(console.info).toHaveBeenCalledWith( + "[TelemetryClient#backfillMessages] Successfully uploaded messages for task test-task-id", + ) + }) + + it("should handle empty messages array", async () => { + const client = new TelemetryClient(mockAuthService, mockSettingsService) + + await client.backfillMessages([], "test-task-id") + + expect(mockFetch).toHaveBeenCalledWith( + "https://app.roocode.com/api/events/backfill", + expect.objectContaining({ + method: "POST", + headers: { + Authorization: "Bearer mock-token", + }, + body: expect.any(FormData), + }), + ) + + // Verify FormData contents + const call = mockFetch.mock.calls[0] + const formData = call[1].body as FormData + + // The messages are stored as a File object under the "file" key + const fileField = formData.get("file") as File + expect(fileField).toBeInstanceOf(File) + expect(fileField.name).toBe("task.json") + expect(fileField.type).toBe("application/json") + + // Read the file content to verify the empty messages array + const fileContent = await fileField.text() + expect(fileContent).toBe("[]") + }) + }) +}) diff --git a/packages/cloud/src/__tests__/auth/StaticTokenAuthService.spec.ts b/packages/cloud/src/__tests__/auth/StaticTokenAuthService.spec.ts new file mode 100644 index 0000000000..f1ab7f9abc --- /dev/null +++ b/packages/cloud/src/__tests__/auth/StaticTokenAuthService.spec.ts @@ -0,0 +1,174 @@ +import { describe, it, expect, beforeEach, vi } from "vitest" +import * as vscode from "vscode" + +import { StaticTokenAuthService } from "../../auth/StaticTokenAuthService" + +// Mock vscode +vi.mock("vscode", () => ({ + window: { + showInformationMessage: vi.fn(), + }, + env: { + openExternal: vi.fn(), + uriScheme: "vscode", + }, + Uri: { + parse: vi.fn(), + }, +})) + +describe("StaticTokenAuthService", () => { + let authService: StaticTokenAuthService + let mockContext: vscode.ExtensionContext + let mockLog: (...args: unknown[]) => void + const testToken = "test-static-token" + + beforeEach(() => { + mockLog = vi.fn() + + // Create a minimal mock that satisfies the constructor requirements + const mockContextPartial = { + extension: { + packageJSON: { + publisher: "TestPublisher", + name: "test-extension", + }, + }, + globalState: { + get: vi.fn(), + update: vi.fn(), + }, + secrets: { + get: vi.fn(), + store: vi.fn(), + delete: vi.fn(), + onDidChange: vi.fn(), + }, + subscriptions: [], + } + + // Use type assertion for test mocking + mockContext = mockContextPartial as unknown as vscode.ExtensionContext + + authService = new StaticTokenAuthService(mockContext, testToken, mockLog) + }) + + afterEach(() => { + vi.clearAllMocks() + }) + + describe("constructor", () => { + it("should create instance and log static token mode", () => { + expect(authService).toBeInstanceOf(StaticTokenAuthService) + expect(mockLog).toHaveBeenCalledWith("[auth] Using static token authentication mode") + }) + + it("should use console.log as default logger", () => { + const serviceWithoutLog = new StaticTokenAuthService( + mockContext as unknown as vscode.ExtensionContext, + testToken, + ) + // Can't directly test console.log usage, but constructor should not throw + expect(serviceWithoutLog).toBeInstanceOf(StaticTokenAuthService) + }) + }) + + describe("initialize", () => { + it("should start in active-session state", async () => { + await authService.initialize() + expect(authService.getState()).toBe("active-session") + }) + + it("should emit auth-state-changed event on initialize", async () => { + const spy = vi.fn() + authService.on("auth-state-changed", spy) + + await authService.initialize() + + expect(spy).toHaveBeenCalledWith({ state: "active-session", previousState: "initializing" }) + }) + + it("should log successful initialization", async () => { + await authService.initialize() + expect(mockLog).toHaveBeenCalledWith("[auth] Static token auth service initialized in active-session state") + }) + }) + + describe("getSessionToken", () => { + it("should return the provided token", () => { + expect(authService.getSessionToken()).toBe(testToken) + }) + + it("should return different token when constructed with different token", () => { + const differentToken = "different-token" + const differentService = new StaticTokenAuthService(mockContext, differentToken, mockLog) + expect(differentService.getSessionToken()).toBe(differentToken) + }) + }) + + describe("getUserInfo", () => { + it("should return empty object", () => { + expect(authService.getUserInfo()).toEqual({}) + }) + }) + + describe("getStoredOrganizationId", () => { + it("should return null", () => { + expect(authService.getStoredOrganizationId()).toBeNull() + }) + }) + + describe("authentication state methods", () => { + it("should always return true for isAuthenticated", () => { + expect(authService.isAuthenticated()).toBe(true) + }) + + it("should always return true for hasActiveSession", () => { + expect(authService.hasActiveSession()).toBe(true) + }) + + it("should always return true for hasOrIsAcquiringActiveSession", () => { + expect(authService.hasOrIsAcquiringActiveSession()).toBe(true) + }) + + it("should return active-session for getState", () => { + expect(authService.getState()).toBe("active-session") + }) + }) + + describe("disabled authentication methods", () => { + const expectedErrorMessage = "Authentication methods are disabled in StaticTokenAuthService" + + it("should throw error for login", async () => { + await expect(authService.login()).rejects.toThrow(expectedErrorMessage) + }) + + it("should throw error for logout", async () => { + await expect(authService.logout()).rejects.toThrow(expectedErrorMessage) + }) + + it("should throw error for handleCallback", async () => { + await expect(authService.handleCallback("code", "state")).rejects.toThrow(expectedErrorMessage) + }) + + it("should throw error for handleCallback with organization", async () => { + await expect(authService.handleCallback("code", "state", "org_123")).rejects.toThrow(expectedErrorMessage) + }) + }) + + describe("event emission", () => { + it("should be able to register and emit events", async () => { + const authStateChangedSpy = vi.fn() + const userInfoSpy = vi.fn() + + authService.on("auth-state-changed", authStateChangedSpy) + authService.on("user-info", userInfoSpy) + + await authService.initialize() + + expect(authStateChangedSpy).toHaveBeenCalledWith({ state: "active-session", previousState: "initializing" }) + // user-info event is not emitted in static token mode + expect(userInfoSpy).not.toHaveBeenCalled() + }) + }) +}) diff --git a/packages/cloud/src/__tests__/auth/WebAuthService.spec.ts b/packages/cloud/src/__tests__/auth/WebAuthService.spec.ts new file mode 100644 index 0000000000..82fd964b7f --- /dev/null +++ b/packages/cloud/src/__tests__/auth/WebAuthService.spec.ts @@ -0,0 +1,1113 @@ +// npx vitest run src/__tests__/auth/WebAuthService.spec.ts + +import { type Mock } from "vitest" +import crypto from "crypto" +import * as vscode from "vscode" + +import { WebAuthService } from "../../auth/WebAuthService" +import { RefreshTimer } from "../../RefreshTimer" +import { getClerkBaseUrl, getRooCodeApiUrl } from "../../config" +import { getUserAgent } from "../../utils" + +// Mock external dependencies +vi.mock("../../RefreshTimer") +vi.mock("../../config") +vi.mock("../../utils") +vi.mock("crypto") + +// Mock fetch globally +const mockFetch = vi.fn() +global.fetch = mockFetch + +// Mock vscode module +vi.mock("vscode", () => ({ + window: { + showInformationMessage: vi.fn(), + showErrorMessage: vi.fn(), + }, + env: { + openExternal: vi.fn(), + uriScheme: "vscode", + }, + Uri: { + parse: vi.fn((uri: string) => ({ toString: () => uri })), + }, +})) + +describe("WebAuthService", () => { + let authService: WebAuthService + let mockTimer: { + start: Mock + stop: Mock + reset: Mock + } + let mockLog: Mock + let mockContext: { + subscriptions: { push: Mock } + secrets: { + get: Mock + store: Mock + delete: Mock + onDidChange: Mock + } + globalState: { + get: Mock + update: Mock + } + extension: { + packageJSON: { + version: string + publisher: string + name: string + } + } + } + + beforeEach(() => { + // Reset all mocks + vi.clearAllMocks() + + // Setup mock context with proper subscriptions array + mockContext = { + subscriptions: { + push: vi.fn(), + }, + secrets: { + get: vi.fn().mockResolvedValue(undefined), + store: vi.fn().mockResolvedValue(undefined), + delete: vi.fn().mockResolvedValue(undefined), + onDidChange: vi.fn().mockReturnValue({ dispose: vi.fn() }), + }, + globalState: { + get: vi.fn().mockReturnValue(undefined), + update: vi.fn().mockResolvedValue(undefined), + }, + extension: { + packageJSON: { + version: "1.0.0", + publisher: "RooVeterinaryInc", + name: "roo-cline", + }, + }, + } + + // Setup timer mock + mockTimer = { + start: vi.fn(), + stop: vi.fn(), + reset: vi.fn(), + } + const MockedRefreshTimer = vi.mocked(RefreshTimer) + MockedRefreshTimer.mockImplementation(() => mockTimer as unknown as RefreshTimer) + + // Setup config mocks - use production URL by default to maintain existing test behavior + vi.mocked(getClerkBaseUrl).mockReturnValue("https://clerk.roocode.com") + vi.mocked(getRooCodeApiUrl).mockReturnValue("https://api.test.com") + + // Setup utils mock + vi.mocked(getUserAgent).mockReturnValue("Roo-Code 1.0.0") + + // Setup crypto mock + vi.mocked(crypto.randomBytes).mockReturnValue(Buffer.from("test-random-bytes") as never) + + // Setup log mock + mockLog = vi.fn() + + authService = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) + }) + + afterEach(() => { + vi.clearAllMocks() + }) + + describe("constructor", () => { + it("should initialize with correct default values", () => { + expect(authService.getState()).toBe("initializing") + expect(authService.isAuthenticated()).toBe(false) + expect(authService.hasActiveSession()).toBe(false) + expect(authService.getSessionToken()).toBeUndefined() + expect(authService.getUserInfo()).toBeNull() + }) + + it("should create RefreshTimer with correct configuration", () => { + expect(RefreshTimer).toHaveBeenCalledWith({ + callback: expect.any(Function), + successInterval: 50_000, + initialBackoffMs: 1_000, + maxBackoffMs: 300_000, + }) + }) + + it("should use console.log as default logger", () => { + const serviceWithoutLog = new WebAuthService(mockContext as unknown as vscode.ExtensionContext) + // Can't directly test console.log usage, but constructor should not throw + expect(serviceWithoutLog).toBeInstanceOf(WebAuthService) + }) + }) + + describe("initialize", () => { + it("should handle credentials change and setup event listener", async () => { + await authService.initialize() + + expect(mockContext.subscriptions.push).toHaveBeenCalled() + expect(mockContext.secrets.onDidChange).toHaveBeenCalled() + }) + + it("should not initialize twice", async () => { + await authService.initialize() + const firstCallCount = vi.mocked(mockContext.secrets.onDidChange).mock.calls.length + + await authService.initialize() + expect(mockContext.secrets.onDidChange).toHaveBeenCalledTimes(firstCallCount) + expect(mockLog).toHaveBeenCalledWith("[auth] initialize() called after already initialized") + }) + + it("should transition to logged-out when no credentials exist", async () => { + mockContext.secrets.get.mockResolvedValue(undefined) + + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) + + await authService.initialize() + + expect(authService.getState()).toBe("logged-out") + expect(authStateChangedSpy).toHaveBeenCalledWith({ state: "logged-out", previousState: "initializing" }) + }) + + it("should transition to attempting-session when valid credentials exist", async () => { + const credentials = { clientToken: "test-token", sessionId: "test-session" } + mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) + + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) + + await authService.initialize() + + expect(authService.getState()).toBe("attempting-session") + expect(authStateChangedSpy).toHaveBeenCalledWith({ + state: "attempting-session", + previousState: "initializing", + }) + expect(mockTimer.start).toHaveBeenCalled() + }) + + it("should handle invalid credentials gracefully", async () => { + mockContext.secrets.get.mockResolvedValue("invalid-json") + + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) + + await authService.initialize() + + expect(authService.getState()).toBe("logged-out") + expect(mockLog).toHaveBeenCalledWith("[auth] Failed to parse stored credentials:", expect.any(Error)) + }) + + it("should handle credentials change events", async () => { + let onDidChangeCallback: (e: { key: string }) => void + + mockContext.secrets.onDidChange.mockImplementation((callback: (e: { key: string }) => void) => { + onDidChangeCallback = callback + return { dispose: vi.fn() } + }) + + await authService.initialize() + + // Simulate credentials change event + const newCredentials = { clientToken: "new-token", sessionId: "new-session" } + mockContext.secrets.get.mockResolvedValue(JSON.stringify(newCredentials)) + + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) + + onDidChangeCallback!({ key: "clerk-auth-credentials" }) + await new Promise((resolve) => setTimeout(resolve, 0)) // Wait for async handling + + expect(authStateChangedSpy).toHaveBeenCalled() + }) + }) + + describe("login", () => { + beforeEach(async () => { + await authService.initialize() + }) + + it("should generate state and open external URL", async () => { + const mockOpenExternal = vi.fn() + const vscode = await import("vscode") + vi.mocked(vscode.env.openExternal).mockImplementation(mockOpenExternal) + + await authService.login() + + expect(crypto.randomBytes).toHaveBeenCalledWith(16) + expect(mockContext.globalState.update).toHaveBeenCalledWith( + "clerk-auth-state", + "746573742d72616e646f6d2d6279746573", + ) + expect(mockOpenExternal).toHaveBeenCalledWith( + expect.objectContaining({ + toString: expect.any(Function), + }), + ) + }) + + it("should use package.json values for redirect URI", async () => { + const mockOpenExternal = vi.fn() + const vscode = await import("vscode") + vi.mocked(vscode.env.openExternal).mockImplementation(mockOpenExternal) + + await authService.login() + + const expectedUrl = + "https://api.test.com/extension/sign-in?state=746573742d72616e646f6d2d6279746573&auth_redirect=vscode%3A%2F%2FRooVeterinaryInc.roo-cline" + expect(mockOpenExternal).toHaveBeenCalledWith( + expect.objectContaining({ + toString: expect.any(Function), + }), + ) + + // Verify the actual URL + const calledUri = mockOpenExternal.mock.calls[0][0] + expect(calledUri.toString()).toBe(expectedUrl) + }) + + it("should handle errors during login", async () => { + vi.mocked(crypto.randomBytes).mockImplementation(() => { + throw new Error("Crypto error") + }) + + await expect(authService.login()).rejects.toThrow("Failed to initiate Roo Code Cloud authentication") + expect(mockLog).toHaveBeenCalledWith("[auth] Error initiating Roo Code Cloud auth: Error: Crypto error") + }) + }) + + describe("handleCallback", () => { + beforeEach(async () => { + await authService.initialize() + }) + + it("should handle invalid parameters", async () => { + const vscode = await import("vscode") + const mockShowInfo = vi.fn() + vi.mocked(vscode.window.showInformationMessage).mockImplementation(mockShowInfo) + + await authService.handleCallback(null, "state") + expect(mockShowInfo).toHaveBeenCalledWith("Invalid Roo Code Cloud sign in url") + + await authService.handleCallback("code", null) + expect(mockShowInfo).toHaveBeenCalledWith("Invalid Roo Code Cloud sign in url") + }) + + it("should validate state parameter", async () => { + mockContext.globalState.get.mockReturnValue("stored-state") + + await expect(authService.handleCallback("code", "different-state")).rejects.toThrow( + "Failed to handle Roo Code Cloud callback", + ) + expect(mockLog).toHaveBeenCalledWith("[auth] State mismatch in callback") + }) + + it("should successfully handle valid callback", async () => { + const storedState = "valid-state" + mockContext.globalState.get.mockReturnValue(storedState) + + // Mock successful Clerk sign-in response + const mockResponse = { + ok: true, + json: () => + Promise.resolve({ + response: { created_session_id: "session-123" }, + }), + headers: { + get: (header: string) => (header === "authorization" ? "Bearer token-123" : null), + }, + } + mockFetch.mockResolvedValue(mockResponse) + + const vscode = await import("vscode") + const mockShowInfo = vi.fn() + vi.mocked(vscode.window.showInformationMessage).mockImplementation(mockShowInfo) + + await authService.handleCallback("auth-code", storedState) + + expect(mockContext.secrets.store).toHaveBeenCalledWith( + "clerk-auth-credentials", + JSON.stringify({ clientToken: "Bearer token-123", sessionId: "session-123", organizationId: null }), + ) + expect(mockShowInfo).toHaveBeenCalledWith("Successfully authenticated with Roo Code Cloud") + }) + + it("should handle Clerk API errors", async () => { + const storedState = "valid-state" + mockContext.globalState.get.mockReturnValue(storedState) + + mockFetch.mockResolvedValue({ + ok: false, + status: 400, + statusText: "Bad Request", + }) + + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) + + await expect(authService.handleCallback("auth-code", storedState)).rejects.toThrow( + "Failed to handle Roo Code Cloud callback", + ) + expect(authStateChangedSpy).toHaveBeenCalled() + }) + }) + + describe("logout", () => { + beforeEach(async () => { + await authService.initialize() + }) + + it("should clear credentials and call Clerk logout", async () => { + // Set up credentials first by simulating a login state + const credentials = { clientToken: "test-token", sessionId: "test-session" } + + // Manually set the credentials in the service + authService["credentials"] = credentials + + // Mock successful logout response + mockFetch.mockResolvedValue({ ok: true }) + + const vscode = await import("vscode") + const mockShowInfo = vi.fn() + vi.mocked(vscode.window.showInformationMessage).mockImplementation(mockShowInfo) + + await authService.logout() + + expect(mockContext.secrets.delete).toHaveBeenCalledWith("clerk-auth-credentials") + expect(mockContext.globalState.update).toHaveBeenCalledWith("clerk-auth-state", undefined) + expect(mockFetch).toHaveBeenCalledWith( + "https://clerk.roocode.com/v1/client/sessions/test-session/remove", + expect.objectContaining({ + method: "POST", + headers: expect.objectContaining({ + Authorization: "Bearer test-token", + }), + }), + ) + expect(mockShowInfo).toHaveBeenCalledWith("Logged out from Roo Code Cloud") + }) + + it("should handle logout without credentials", async () => { + const vscode = await import("vscode") + const mockShowInfo = vi.fn() + vi.mocked(vscode.window.showInformationMessage).mockImplementation(mockShowInfo) + + await authService.logout() + + expect(mockContext.secrets.delete).toHaveBeenCalled() + expect(mockFetch).not.toHaveBeenCalled() + expect(mockShowInfo).toHaveBeenCalledWith("Logged out from Roo Code Cloud") + }) + + it("should handle Clerk logout errors gracefully", async () => { + // Set up credentials first by simulating a login state + const credentials = { clientToken: "test-token", sessionId: "test-session" } + + // Manually set the credentials in the service + authService["credentials"] = credentials + + // Mock failed logout response + mockFetch.mockRejectedValue(new Error("Network error")) + + const vscode = await import("vscode") + const mockShowInfo = vi.fn() + vi.mocked(vscode.window.showInformationMessage).mockImplementation(mockShowInfo) + + await authService.logout() + + expect(mockLog).toHaveBeenCalledWith("[auth] Error calling clerkLogout:", expect.any(Error)) + expect(mockShowInfo).toHaveBeenCalledWith("Logged out from Roo Code Cloud") + }) + }) + + describe("state management", () => { + it("should return correct state", () => { + expect(authService.getState()).toBe("initializing") + }) + + it("should return correct authentication status", async () => { + await authService.initialize() + expect(authService.isAuthenticated()).toBe(false) + + // Create a new service instance with credentials + const credentials = { clientToken: "test-token", sessionId: "test-session" } + mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) + + const authenticatedService = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) + await authenticatedService.initialize() + + expect(authenticatedService.isAuthenticated()).toBe(true) + expect(authenticatedService.hasActiveSession()).toBe(false) + }) + + it("should return session token only for active sessions", () => { + expect(authService.getSessionToken()).toBeUndefined() + + // Manually set state to active-session for testing + // This would normally happen through refreshSession + authService["state"] = "active-session" + authService["sessionToken"] = "test-jwt" + + expect(authService.getSessionToken()).toBe("test-jwt") + }) + + it("should return correct values for new methods", async () => { + await authService.initialize() + expect(authService.hasOrIsAcquiringActiveSession()).toBe(false) + + // Create a new service instance with credentials (attempting-session) + const credentials = { clientToken: "test-token", sessionId: "test-session" } + mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) + + const attemptingService = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) + await attemptingService.initialize() + + expect(attemptingService.hasOrIsAcquiringActiveSession()).toBe(true) + expect(attemptingService.hasActiveSession()).toBe(false) + + // Manually set state to active-session for testing + attemptingService["state"] = "active-session" + expect(attemptingService.hasOrIsAcquiringActiveSession()).toBe(true) + expect(attemptingService.hasActiveSession()).toBe(true) + }) + }) + + describe("session refresh", () => { + beforeEach(async () => { + // Set up with credentials + const credentials = { clientToken: "test-token", sessionId: "test-session" } + mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) + await authService.initialize() + }) + + it("should refresh session successfully", async () => { + // Mock successful token creation and user info fetch + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: () => Promise.resolve({ jwt: "new-jwt-token" }), + }) + .mockResolvedValueOnce({ + ok: true, + json: () => + Promise.resolve({ + response: { + first_name: "John", + last_name: "Doe", + image_url: "https://example.com/avatar.jpg", + primary_email_address_id: "email-1", + email_addresses: [{ id: "email-1", email_address: "john@example.com" }], + }, + }), + }) + + const authStateChangedSpy = vi.fn() + const userInfoSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) + authService.on("user-info", userInfoSpy) + + // Trigger refresh by calling the timer callback + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + await timerCallback() + + // Wait for async operations to complete + await new Promise((resolve) => setTimeout(resolve, 0)) + + expect(authService.getState()).toBe("active-session") + expect(authService.hasActiveSession()).toBe(true) + expect(authService.getSessionToken()).toBe("new-jwt-token") + expect(authStateChangedSpy).toHaveBeenCalledWith({ + state: "active-session", + previousState: "attempting-session", + }) + expect(userInfoSpy).toHaveBeenCalledWith({ + userInfo: { + name: "John Doe", + email: "john@example.com", + picture: "https://example.com/avatar.jpg", + }, + }) + }) + + it("should handle invalid client token error", async () => { + // Mock 401 response (invalid token) + mockFetch.mockResolvedValue({ + ok: false, + status: 401, + statusText: "Unauthorized", + }) + + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + + await expect(timerCallback()).rejects.toThrow() + expect(mockContext.secrets.delete).toHaveBeenCalledWith("clerk-auth-credentials") + expect(mockLog).toHaveBeenCalledWith("[auth] Invalid/Expired client token: clearing credentials") + }) + + it("should handle network errors during refresh", async () => { + mockFetch.mockRejectedValue(new Error("Network error")) + + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + + await expect(timerCallback()).rejects.toThrow("Network error") + expect(mockLog).toHaveBeenCalledWith("[auth] Failed to refresh session", expect.any(Error)) + }) + + it("should transition to inactive-session on first attempt failure", async () => { + // Mock failed token creation response + mockFetch.mockResolvedValue({ + ok: false, + status: 500, + statusText: "Internal Server Error", + }) + + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) + + // Verify we start in attempting-session state + expect(authService.getState()).toBe("attempting-session") + expect(authService["isFirstRefreshAttempt"]).toBe(true) + + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + + await expect(timerCallback()).rejects.toThrow() + + // Should transition to inactive-session after first failure + expect(authService.getState()).toBe("inactive-session") + expect(authService["isFirstRefreshAttempt"]).toBe(false) + expect(authStateChangedSpy).toHaveBeenCalledWith({ + state: "inactive-session", + previousState: "attempting-session", + }) + }) + + it("should not transition to inactive-session on subsequent failures", async () => { + // First, transition to inactive-session by failing the first attempt + mockFetch.mockResolvedValue({ + ok: false, + status: 500, + statusText: "Internal Server Error", + }) + + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + await expect(timerCallback()).rejects.toThrow() + + // Verify we're now in inactive-session + expect(authService.getState()).toBe("inactive-session") + expect(authService["isFirstRefreshAttempt"]).toBe(false) + + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) + + // Subsequent failure should not trigger another transition + await expect(timerCallback()).rejects.toThrow() + + expect(authService.getState()).toBe("inactive-session") + expect(authStateChangedSpy).not.toHaveBeenCalled() + }) + + it("should clear credentials on 401 during first refresh attempt (bug fix)", async () => { + // Mock 401 response during first refresh attempt + mockFetch.mockResolvedValue({ + ok: false, + status: 401, + statusText: "Unauthorized", + }) + + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) + + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + await expect(timerCallback()).rejects.toThrow() + + // Should clear credentials (not just transition to inactive-session) + expect(mockContext.secrets.delete).toHaveBeenCalledWith("clerk-auth-credentials") + expect(mockLog).toHaveBeenCalledWith("[auth] Invalid/Expired client token: clearing credentials") + + // Simulate credentials cleared event + mockContext.secrets.get.mockResolvedValue(undefined) + await authService["handleCredentialsChange"]() + + expect(authService.getState()).toBe("logged-out") + expect(authStateChangedSpy).toHaveBeenCalledWith({ + state: "logged-out", + previousState: "attempting-session", + }) + }) + }) + + describe("user info", () => { + it("should return null initially", () => { + expect(authService.getUserInfo()).toBeNull() + }) + + it("should parse user info correctly for personal accounts", async () => { + // Set up with credentials for personal account (no organizationId) + const credentials = { clientToken: "test-token", sessionId: "test-session", organizationId: null } + mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) + await authService.initialize() + + // Clear previous mock calls + mockFetch.mockClear() + + // Mock successful responses + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: () => Promise.resolve({ jwt: "jwt-token" }), + }) + .mockResolvedValueOnce({ + ok: true, + json: () => + Promise.resolve({ + response: { + first_name: "Jane", + last_name: "Smith", + image_url: "https://example.com/jane.jpg", + primary_email_address_id: "email-2", + email_addresses: [ + { id: "email-1", email_address: "jane.old@example.com" }, + { id: "email-2", email_address: "jane@example.com" }, + ], + }, + }), + }) + + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + await timerCallback() + + // Wait for async operations to complete + await new Promise((resolve) => setTimeout(resolve, 0)) + + const userInfo = authService.getUserInfo() + expect(userInfo).toEqual({ + name: "Jane Smith", + email: "jane@example.com", + picture: "https://example.com/jane.jpg", + }) + }) + + it("should parse user info correctly for organization accounts", async () => { + // Set up with credentials for organization account + const credentials = { clientToken: "test-token", sessionId: "test-session", organizationId: "org_1" } + mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) + await authService.initialize() + + // Clear previous mock calls + mockFetch.mockClear() + + // Mock successful responses + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: () => Promise.resolve({ jwt: "jwt-token" }), + }) + .mockResolvedValueOnce({ + ok: true, + json: () => + Promise.resolve({ + response: { + first_name: "Jane", + last_name: "Smith", + image_url: "https://example.com/jane.jpg", + primary_email_address_id: "email-2", + email_addresses: [ + { id: "email-1", email_address: "jane.old@example.com" }, + { id: "email-2", email_address: "jane@example.com" }, + ], + }, + }), + }) + .mockResolvedValueOnce({ + ok: true, + json: () => + Promise.resolve({ + response: [ + { + id: "org_member_id_1", + role: "member", + organization: { + id: "org_1", + name: "Org 1", + }, + }, + ], + }), + }) + + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + await timerCallback() + + // Wait for async operations to complete + await new Promise((resolve) => setTimeout(resolve, 0)) + + const userInfo = authService.getUserInfo() + expect(userInfo).toEqual({ + name: "Jane Smith", + email: "jane@example.com", + picture: "https://example.com/jane.jpg", + organizationId: "org_1", + organizationName: "Org 1", + organizationRole: "member", + }) + }) + + it("should handle missing user info fields", async () => { + // Set up with credentials for personal account (no organizationId) + const credentials = { clientToken: "test-token", sessionId: "test-session", organizationId: null } + mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) + await authService.initialize() + + // Clear previous mock calls + mockFetch.mockClear() + + // Mock responses with minimal data + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: () => Promise.resolve({ jwt: "jwt-token" }), + }) + .mockResolvedValueOnce({ + ok: true, + json: () => + Promise.resolve({ + response: { + first_name: "John", + last_name: "Doe", + // Missing other fields + }, + }), + }) + + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + await timerCallback() + + // Wait for async operations to complete + await new Promise((resolve) => setTimeout(resolve, 0)) + + const userInfo = authService.getUserInfo() + expect(userInfo).toEqual({ + name: "John Doe", + email: undefined, + picture: undefined, + }) + }) + }) + + describe("event emissions", () => { + it("should emit auth-state-changed event for logged-out", async () => { + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) + + await authService.initialize() + + expect(authStateChangedSpy).toHaveBeenCalledWith({ state: "logged-out", previousState: "initializing" }) + }) + + it("should emit auth-state-changed event for attempting-session", async () => { + const credentials = { clientToken: "test-token", sessionId: "test-session" } + mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) + + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) + + await authService.initialize() + + expect(authStateChangedSpy).toHaveBeenCalledWith({ + state: "attempting-session", + previousState: "initializing", + }) + }) + + it("should emit auth-state-changed event for active-session", async () => { + // Set up with credentials + const credentials = { clientToken: "test-token", sessionId: "test-session" } + mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) + await authService.initialize() + + // Clear previous mock calls + mockFetch.mockClear() + + // Mock both the token creation and user info fetch + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: () => Promise.resolve({ jwt: "jwt-token" }), + }) + .mockResolvedValueOnce({ + ok: true, + json: () => + Promise.resolve({ + response: { + first_name: "Test", + last_name: "User", + }, + }), + }) + + const authStateChangedSpy = vi.fn() + authService.on("auth-state-changed", authStateChangedSpy) + + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + await timerCallback() + + // Wait for async operations to complete + await new Promise((resolve) => setTimeout(resolve, 0)) + + expect(authStateChangedSpy).toHaveBeenCalledWith({ + state: "active-session", + previousState: "attempting-session", + }) + }) + + it("should emit user-info event", async () => { + // Set up with credentials + const credentials = { clientToken: "test-token", sessionId: "test-session" } + mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) + await authService.initialize() + + // Clear previous mock calls + mockFetch.mockClear() + + mockFetch + .mockResolvedValueOnce({ + ok: true, + json: () => Promise.resolve({ jwt: "jwt-token" }), + }) + .mockResolvedValueOnce({ + ok: true, + json: () => + Promise.resolve({ + response: { + first_name: "Test", + last_name: "User", + }, + }), + }) + + const userInfoSpy = vi.fn() + authService.on("user-info", userInfoSpy) + + const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback + await timerCallback() + + // Wait for async operations to complete + await new Promise((resolve) => setTimeout(resolve, 0)) + + expect(userInfoSpy).toHaveBeenCalledWith({ + userInfo: { + name: "Test User", + email: undefined, + picture: undefined, + }, + }) + }) + }) + + describe("error handling", () => { + it("should handle credentials change errors", async () => { + mockContext.secrets.get.mockRejectedValue(new Error("Storage error")) + + await authService.initialize() + + expect(mockLog).toHaveBeenCalledWith("[auth] Error handling credentials change:", expect.any(Error)) + }) + + it("should handle malformed JSON in credentials", async () => { + mockContext.secrets.get.mockResolvedValue("invalid-json{") + + await authService.initialize() + + expect(authService.getState()).toBe("logged-out") + expect(mockLog).toHaveBeenCalledWith("[auth] Failed to parse stored credentials:", expect.any(Error)) + }) + + it("should handle invalid credentials schema", async () => { + mockContext.secrets.get.mockResolvedValue(JSON.stringify({ invalid: "data" })) + + await authService.initialize() + + expect(authService.getState()).toBe("logged-out") + expect(mockLog).toHaveBeenCalledWith("[auth] Invalid credentials format:", expect.any(Array)) + }) + + it("should handle missing authorization header in sign-in response", async () => { + const storedState = "valid-state" + mockContext.globalState.get.mockReturnValue(storedState) + + mockFetch.mockResolvedValue({ + ok: true, + json: () => + Promise.resolve({ + response: { created_session_id: "session-123" }, + }), + headers: { + get: () => null, // No authorization header + }, + }) + + await expect(authService.handleCallback("auth-code", storedState)).rejects.toThrow( + "Failed to handle Roo Code Cloud callback", + ) + }) + }) + + describe("timer integration", () => { + it("should stop timer on logged-out transition", async () => { + await authService.initialize() + + expect(mockTimer.stop).toHaveBeenCalled() + }) + + it("should start timer on attempting-session transition", async () => { + const credentials = { clientToken: "test-token", sessionId: "test-session" } + mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) + + await authService.initialize() + + expect(mockTimer.start).toHaveBeenCalled() + }) + }) + + describe("auth credentials key scoping", () => { + it("should use default key when getClerkBaseUrl returns production URL", async () => { + // Mock getClerkBaseUrl to return production URL + vi.mocked(getClerkBaseUrl).mockReturnValue("https://clerk.roocode.com") + + const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) + const credentials = { clientToken: "test-token", sessionId: "test-session" } + + await service.initialize() + await service["storeCredentials"](credentials) + + expect(mockContext.secrets.store).toHaveBeenCalledWith( + "clerk-auth-credentials", + JSON.stringify(credentials), + ) + }) + + it("should use scoped key when getClerkBaseUrl returns custom URL", async () => { + const customUrl = "https://custom.clerk.com" + // Mock getClerkBaseUrl to return custom URL + vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) + + const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) + const credentials = { clientToken: "test-token", sessionId: "test-session" } + + await service.initialize() + await service["storeCredentials"](credentials) + + expect(mockContext.secrets.store).toHaveBeenCalledWith( + `clerk-auth-credentials-${customUrl}`, + JSON.stringify(credentials), + ) + }) + + it("should load credentials using scoped key", async () => { + const customUrl = "https://custom.clerk.com" + vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) + + const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) + const credentials = { clientToken: "test-token", sessionId: "test-session" } + mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) + + await service.initialize() + const loadedCredentials = await service["loadCredentials"]() + + expect(mockContext.secrets.get).toHaveBeenCalledWith(`clerk-auth-credentials-${customUrl}`) + expect(loadedCredentials).toEqual(credentials) + }) + + it("should clear credentials using scoped key", async () => { + const customUrl = "https://custom.clerk.com" + vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) + + const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) + + await service.initialize() + await service["clearCredentials"]() + + expect(mockContext.secrets.delete).toHaveBeenCalledWith(`clerk-auth-credentials-${customUrl}`) + }) + + it("should listen for changes on scoped key", async () => { + const customUrl = "https://custom.clerk.com" + vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) + + let onDidChangeCallback: (e: { key: string }) => void + + mockContext.secrets.onDidChange.mockImplementation((callback: (e: { key: string }) => void) => { + onDidChangeCallback = callback + return { dispose: vi.fn() } + }) + + const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) + await service.initialize() + + // Simulate credentials change event with scoped key + const newCredentials = { clientToken: "new-token", sessionId: "new-session" } + mockContext.secrets.get.mockResolvedValue(JSON.stringify(newCredentials)) + + const authStateChangedSpy = vi.fn() + service.on("auth-state-changed", authStateChangedSpy) + + onDidChangeCallback!({ key: `clerk-auth-credentials-${customUrl}` }) + await new Promise((resolve) => setTimeout(resolve, 0)) // Wait for async handling + + expect(authStateChangedSpy).toHaveBeenCalled() + }) + + it("should not respond to changes on different scoped keys", async () => { + const customUrl = "https://custom.clerk.com" + vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) + + let onDidChangeCallback: (e: { key: string }) => void + + mockContext.secrets.onDidChange.mockImplementation((callback: (e: { key: string }) => void) => { + onDidChangeCallback = callback + return { dispose: vi.fn() } + }) + + const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) + await service.initialize() + + const authStateChangedSpy = vi.fn() + service.on("auth-state-changed", authStateChangedSpy) + + // Simulate credentials change event with different scoped key + onDidChangeCallback!({ key: "clerk-auth-credentials-https://other.clerk.com" }) + await new Promise((resolve) => setTimeout(resolve, 0)) // Wait for async handling + + expect(authStateChangedSpy).not.toHaveBeenCalled() + }) + + it("should not respond to changes on default key when using scoped key", async () => { + const customUrl = "https://custom.clerk.com" + vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) + + let onDidChangeCallback: (e: { key: string }) => void + + mockContext.secrets.onDidChange.mockImplementation((callback: (e: { key: string }) => void) => { + onDidChangeCallback = callback + return { dispose: vi.fn() } + }) + + const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) + await service.initialize() + + const authStateChangedSpy = vi.fn() + service.on("auth-state-changed", authStateChangedSpy) + + // Simulate credentials change event with default key + onDidChangeCallback!({ key: "clerk-auth-credentials" }) + await new Promise((resolve) => setTimeout(resolve, 0)) // Wait for async handling + + expect(authStateChangedSpy).not.toHaveBeenCalled() + }) + }) +}) diff --git a/packages/cloud/src/auth/AuthService.ts b/packages/cloud/src/auth/AuthService.ts new file mode 100644 index 0000000000..a49ad0104d --- /dev/null +++ b/packages/cloud/src/auth/AuthService.ts @@ -0,0 +1,36 @@ +import EventEmitter from "events" + +import type { CloudUserInfo } from "@roo-code/types" + +export interface AuthServiceEvents { + "auth-state-changed": [ + data: { + state: AuthState + previousState: AuthState + }, + ] + "user-info": [data: { userInfo: CloudUserInfo }] +} + +export type AuthState = "initializing" | "logged-out" | "active-session" | "attempting-session" | "inactive-session" + +export interface AuthService extends EventEmitter { + // Lifecycle + initialize(): Promise + + // Authentication methods + login(): Promise + logout(): Promise + handleCallback(code: string | null, state: string | null, organizationId?: string | null): Promise + + // State methods + getState(): AuthState + isAuthenticated(): boolean + hasActiveSession(): boolean + hasOrIsAcquiringActiveSession(): boolean + + // Token and user info + getSessionToken(): string | undefined + getUserInfo(): CloudUserInfo | null + getStoredOrganizationId(): string | null +} diff --git a/packages/cloud/src/auth/StaticTokenAuthService.ts b/packages/cloud/src/auth/StaticTokenAuthService.ts new file mode 100644 index 0000000000..04821006d5 --- /dev/null +++ b/packages/cloud/src/auth/StaticTokenAuthService.ts @@ -0,0 +1,71 @@ +import EventEmitter from "events" + +import * as vscode from "vscode" + +import type { CloudUserInfo } from "@roo-code/types" + +import type { AuthService, AuthServiceEvents, AuthState } from "./AuthService" + +export class StaticTokenAuthService extends EventEmitter implements AuthService { + private state: AuthState = "active-session" + private token: string + private log: (...args: unknown[]) => void + + constructor(context: vscode.ExtensionContext, token: string, log?: (...args: unknown[]) => void) { + super() + this.token = token + this.log = log || console.log + this.log("[auth] Using static token authentication mode") + } + + public async initialize(): Promise { + const previousState: AuthState = "initializing" + this.state = "active-session" + this.emit("auth-state-changed", { state: this.state, previousState }) + this.log("[auth] Static token auth service initialized in active-session state") + } + + public async login(): Promise { + throw new Error("Authentication methods are disabled in StaticTokenAuthService") + } + + public async logout(): Promise { + throw new Error("Authentication methods are disabled in StaticTokenAuthService") + } + + public async handleCallback( + _code: string | null, + _state: string | null, + _organizationId?: string | null, + ): Promise { + throw new Error("Authentication methods are disabled in StaticTokenAuthService") + } + + public getState(): AuthState { + return this.state + } + + public getSessionToken(): string | undefined { + return this.token + } + + public isAuthenticated(): boolean { + return true + } + + public hasActiveSession(): boolean { + return true + } + + public hasOrIsAcquiringActiveSession(): boolean { + return true + } + + public getUserInfo(): CloudUserInfo | null { + return {} + } + + public getStoredOrganizationId(): string | null { + return null + } +} diff --git a/packages/cloud/src/auth/WebAuthService.ts b/packages/cloud/src/auth/WebAuthService.ts new file mode 100644 index 0000000000..b94957950b --- /dev/null +++ b/packages/cloud/src/auth/WebAuthService.ts @@ -0,0 +1,646 @@ +import crypto from "crypto" +import EventEmitter from "events" + +import * as vscode from "vscode" +import { z } from "zod" + +import type { CloudUserInfo, CloudOrganizationMembership } from "@roo-code/types" + +import { getClerkBaseUrl, getRooCodeApiUrl, PRODUCTION_CLERK_BASE_URL } from "../config" +import { getUserAgent } from "../utils" +import { InvalidClientTokenError } from "../errors" +import { RefreshTimer } from "../RefreshTimer" + +import type { AuthService, AuthServiceEvents, AuthState } from "./AuthService" + +const AUTH_STATE_KEY = "clerk-auth-state" + +/** + * AuthCredentials + */ + +const authCredentialsSchema = z.object({ + clientToken: z.string().min(1, "Client token cannot be empty"), + sessionId: z.string().min(1, "Session ID cannot be empty"), + organizationId: z.string().nullable().optional(), +}) + +type AuthCredentials = z.infer + +/** + * Clerk Schemas + */ + +const clerkSignInResponseSchema = z.object({ + response: z.object({ + created_session_id: z.string(), + }), +}) + +const clerkCreateSessionTokenResponseSchema = z.object({ + jwt: z.string(), +}) + +const clerkMeResponseSchema = z.object({ + response: z.object({ + id: z.string().optional(), + first_name: z.string().nullish(), + last_name: z.string().nullish(), + image_url: z.string().optional(), + primary_email_address_id: z.string().optional(), + email_addresses: z + .array( + z.object({ + id: z.string(), + email_address: z.string(), + }), + ) + .optional(), + }), +}) + +const clerkOrganizationMembershipsSchema = z.object({ + response: z.array( + z.object({ + id: z.string(), + role: z.string(), + permissions: z.array(z.string()).optional(), + created_at: z.number().optional(), + updated_at: z.number().optional(), + organization: z.object({ + id: z.string(), + name: z.string(), + slug: z.string().optional(), + image_url: z.string().optional(), + has_image: z.boolean().optional(), + created_at: z.number().optional(), + updated_at: z.number().optional(), + }), + }), + ), +}) + +export class WebAuthService extends EventEmitter implements AuthService { + private context: vscode.ExtensionContext + private timer: RefreshTimer + private state: AuthState = "initializing" + private log: (...args: unknown[]) => void + private readonly authCredentialsKey: string + + private credentials: AuthCredentials | null = null + private sessionToken: string | null = null + private userInfo: CloudUserInfo | null = null + private isFirstRefreshAttempt: boolean = false + + constructor(context: vscode.ExtensionContext, log?: (...args: unknown[]) => void) { + super() + + this.context = context + this.log = log || console.log + + // Calculate auth credentials key based on Clerk base URL. + const clerkBaseUrl = getClerkBaseUrl() + + if (clerkBaseUrl !== PRODUCTION_CLERK_BASE_URL) { + this.authCredentialsKey = `clerk-auth-credentials-${clerkBaseUrl}` + } else { + this.authCredentialsKey = "clerk-auth-credentials" + } + + this.timer = new RefreshTimer({ + callback: async () => { + await this.refreshSession() + return true + }, + successInterval: 50_000, + initialBackoffMs: 1_000, + maxBackoffMs: 300_000, + }) + } + + private changeState(newState: AuthState): void { + const previousState = this.state + this.state = newState + this.emit("auth-state-changed", { state: newState, previousState }) + } + + private async handleCredentialsChange(): Promise { + try { + const credentials = await this.loadCredentials() + + if (credentials) { + if ( + this.credentials === null || + this.credentials.clientToken !== credentials.clientToken || + this.credentials.sessionId !== credentials.sessionId + ) { + this.transitionToAttemptingSession(credentials) + } + } else { + if (this.state !== "logged-out") { + this.transitionToLoggedOut() + } + } + } catch (error) { + this.log("[auth] Error handling credentials change:", error) + } + } + + private transitionToLoggedOut(): void { + this.timer.stop() + + this.credentials = null + this.sessionToken = null + this.userInfo = null + + this.changeState("logged-out") + + this.log("[auth] Transitioned to logged-out state") + } + + private transitionToAttemptingSession(credentials: AuthCredentials): void { + this.credentials = credentials + + this.sessionToken = null + this.userInfo = null + this.isFirstRefreshAttempt = true + + this.changeState("attempting-session") + + this.timer.start() + + this.log("[auth] Transitioned to attempting-session state") + } + + private transitionToInactiveSession(): void { + this.sessionToken = null + this.userInfo = null + + this.changeState("inactive-session") + + this.log("[auth] Transitioned to inactive-session state") + } + + /** + * Initialize the auth state + * + * This method loads tokens from storage and determines the current auth state. + * It also starts the refresh timer if we have an active session. + */ + public async initialize(): Promise { + if (this.state !== "initializing") { + this.log("[auth] initialize() called after already initialized") + return + } + + await this.handleCredentialsChange() + + this.context.subscriptions.push( + this.context.secrets.onDidChange((e) => { + if (e.key === this.authCredentialsKey) { + this.handleCredentialsChange() + } + }), + ) + } + + private async storeCredentials(credentials: AuthCredentials): Promise { + await this.context.secrets.store(this.authCredentialsKey, JSON.stringify(credentials)) + } + + private async loadCredentials(): Promise { + const credentialsJson = await this.context.secrets.get(this.authCredentialsKey) + if (!credentialsJson) return null + + try { + const parsedJson = JSON.parse(credentialsJson) + const credentials = authCredentialsSchema.parse(parsedJson) + + // Migration: If no organizationId but we have userInfo, add it + if (credentials.organizationId === undefined && this.userInfo?.organizationId) { + credentials.organizationId = this.userInfo.organizationId + await this.storeCredentials(credentials) + this.log("[auth] Migrated credentials with organizationId") + } + + return credentials + } catch (error) { + if (error instanceof z.ZodError) { + this.log("[auth] Invalid credentials format:", error.errors) + } else { + this.log("[auth] Failed to parse stored credentials:", error) + } + return null + } + } + + private async clearCredentials(): Promise { + await this.context.secrets.delete(this.authCredentialsKey) + } + + /** + * Start the login process + * + * This method initiates the authentication flow by generating a state parameter + * and opening the browser to the authorization URL. + */ + public async login(): Promise { + try { + // Generate a cryptographically random state parameter. + const state = crypto.randomBytes(16).toString("hex") + await this.context.globalState.update(AUTH_STATE_KEY, state) + const packageJSON = this.context.extension?.packageJSON + const publisher = packageJSON?.publisher ?? "RooVeterinaryInc" + const name = packageJSON?.name ?? "roo-cline" + const params = new URLSearchParams({ + state, + auth_redirect: `${vscode.env.uriScheme}://${publisher}.${name}`, + }) + const url = `${getRooCodeApiUrl()}/extension/sign-in?${params.toString()}` + await vscode.env.openExternal(vscode.Uri.parse(url)) + } catch (error) { + this.log(`[auth] Error initiating Roo Code Cloud auth: ${error}`) + throw new Error(`Failed to initiate Roo Code Cloud authentication: ${error}`) + } + } + + /** + * Handle the callback from Roo Code Cloud + * + * This method is called when the user is redirected back to the extension + * after authenticating with Roo Code Cloud. + * + * @param code The authorization code from the callback + * @param state The state parameter from the callback + * @param organizationId The organization ID from the callback (null for personal accounts) + */ + public async handleCallback( + code: string | null, + state: string | null, + organizationId?: string | null, + ): Promise { + if (!code || !state) { + vscode.window.showInformationMessage("Invalid Roo Code Cloud sign in url") + return + } + + try { + // Validate state parameter to prevent CSRF attacks. + const storedState = this.context.globalState.get(AUTH_STATE_KEY) + + if (state !== storedState) { + this.log("[auth] State mismatch in callback") + throw new Error("Invalid state parameter. Authentication request may have been tampered with.") + } + + const credentials = await this.clerkSignIn(code) + + // Set organizationId (null for personal accounts) + credentials.organizationId = organizationId || null + + await this.storeCredentials(credentials) + + vscode.window.showInformationMessage("Successfully authenticated with Roo Code Cloud") + this.log("[auth] Successfully authenticated with Roo Code Cloud") + } catch (error) { + this.log(`[auth] Error handling Roo Code Cloud callback: ${error}`) + this.changeState("logged-out") + throw new Error(`Failed to handle Roo Code Cloud callback: ${error}`) + } + } + + /** + * Log out + * + * This method removes all stored tokens and stops the refresh timer. + */ + public async logout(): Promise { + const oldCredentials = this.credentials + + try { + // Clear credentials from storage - onDidChange will handle state transitions + await this.clearCredentials() + await this.context.globalState.update(AUTH_STATE_KEY, undefined) + + if (oldCredentials) { + try { + await this.clerkLogout(oldCredentials) + } catch (error) { + this.log("[auth] Error calling clerkLogout:", error) + } + } + + vscode.window.showInformationMessage("Logged out from Roo Code Cloud") + this.log("[auth] Logged out from Roo Code Cloud") + } catch (error) { + this.log(`[auth] Error logging out from Roo Code Cloud: ${error}`) + throw new Error(`Failed to log out from Roo Code Cloud: ${error}`) + } + } + + public getState(): AuthState { + return this.state + } + + public getSessionToken(): string | undefined { + if (this.state === "active-session" && this.sessionToken) { + return this.sessionToken + } + + return + } + + /** + * Check if the user is authenticated + * + * @returns True if the user is authenticated (has an active, attempting, or inactive session) + */ + public isAuthenticated(): boolean { + return ( + this.state === "active-session" || this.state === "attempting-session" || this.state === "inactive-session" + ) + } + + public hasActiveSession(): boolean { + return this.state === "active-session" + } + + /** + * Check if the user has an active session or is currently attempting to acquire one + * + * @returns True if the user has an active session or is attempting to get one + */ + public hasOrIsAcquiringActiveSession(): boolean { + return this.state === "active-session" || this.state === "attempting-session" + } + + /** + * Refresh the session + * + * This method refreshes the session token using the client token. + */ + private async refreshSession(): Promise { + if (!this.credentials) { + this.log("[auth] Cannot refresh session: missing credentials") + return + } + + try { + const previousState = this.state + this.sessionToken = await this.clerkCreateSessionToken() + + if (previousState !== "active-session") { + this.changeState("active-session") + this.log("[auth] Transitioned to active-session state") + this.fetchUserInfo() + } else { + this.state = "active-session" + } + } catch (error) { + if (error instanceof InvalidClientTokenError) { + this.log("[auth] Invalid/Expired client token: clearing credentials") + this.clearCredentials() + } else if (this.isFirstRefreshAttempt && this.state === "attempting-session") { + this.isFirstRefreshAttempt = false + this.transitionToInactiveSession() + } + this.log("[auth] Failed to refresh session", error) + throw error + } + } + + private async fetchUserInfo(): Promise { + if (!this.credentials) { + return + } + + this.userInfo = await this.clerkMe() + this.emit("user-info", { userInfo: this.userInfo }) + } + + /** + * Extract user information from the ID token + * + * @returns User information from ID token claims or null if no ID token available + */ + public getUserInfo(): CloudUserInfo | null { + return this.userInfo + } + + /** + * Get the stored organization ID from credentials + * + * @returns The stored organization ID, null for personal accounts or if no credentials exist + */ + public getStoredOrganizationId(): string | null { + return this.credentials?.organizationId || null + } + + private async clerkSignIn(ticket: string): Promise { + const formData = new URLSearchParams() + formData.append("strategy", "ticket") + formData.append("ticket", ticket) + + const response = await fetch(`${getClerkBaseUrl()}/v1/client/sign_ins`, { + method: "POST", + headers: { + "Content-Type": "application/x-www-form-urlencoded", + "User-Agent": this.userAgent(), + }, + body: formData.toString(), + signal: AbortSignal.timeout(10000), + }) + + if (!response.ok) { + throw new Error(`HTTP ${response.status}: ${response.statusText}`) + } + + const { + response: { created_session_id: sessionId }, + } = clerkSignInResponseSchema.parse(await response.json()) + + // 3. Extract the client token from the Authorization header. + const clientToken = response.headers.get("authorization") + + if (!clientToken) { + throw new Error("No authorization header found in the response") + } + + return authCredentialsSchema.parse({ clientToken, sessionId }) + } + + private async clerkCreateSessionToken(): Promise { + const formData = new URLSearchParams() + formData.append("_is_native", "1") + + // Handle 3 cases for organization_id: + // 1. Have an org id: organization_id=THE_ORG_ID + // 2. Have a personal account: organization_id= (empty string) + // 3. Don't know if you have an org id (old style credentials): don't send organization_id param at all + const organizationId = this.getStoredOrganizationId() + if (this.credentials?.organizationId !== undefined) { + // We have organization context info (either org id or personal account) + formData.append("organization_id", organizationId || "") + } + // If organizationId is undefined, don't send the param at all (old credentials) + + const response = await fetch(`${getClerkBaseUrl()}/v1/client/sessions/${this.credentials!.sessionId}/tokens`, { + method: "POST", + headers: { + "Content-Type": "application/x-www-form-urlencoded", + Authorization: `Bearer ${this.credentials!.clientToken}`, + "User-Agent": this.userAgent(), + }, + body: formData.toString(), + signal: AbortSignal.timeout(10000), + }) + + if (response.status === 401 || response.status === 404) { + throw new InvalidClientTokenError() + } else if (!response.ok) { + throw new Error(`HTTP ${response.status}: ${response.statusText}`) + } + + const data = clerkCreateSessionTokenResponseSchema.parse(await response.json()) + + return data.jwt + } + + private async clerkMe(): Promise { + const response = await fetch(`${getClerkBaseUrl()}/v1/me`, { + headers: { + Authorization: `Bearer ${this.credentials!.clientToken}`, + "User-Agent": this.userAgent(), + }, + signal: AbortSignal.timeout(10000), + }) + + if (!response.ok) { + throw new Error(`HTTP ${response.status}: ${response.statusText}`) + } + + const payload = await response.json() + const { response: userData } = clerkMeResponseSchema.parse(payload) + + const userInfo: CloudUserInfo = { + id: userData.id, + picture: userData.image_url, + } + + const names = [userData.first_name, userData.last_name].filter((name) => !!name) + userInfo.name = names.length > 0 ? names.join(" ") : undefined + const primaryEmailAddressId = userData.primary_email_address_id + const emailAddresses = userData.email_addresses + + if (primaryEmailAddressId && emailAddresses) { + userInfo.email = emailAddresses.find( + (email: { id: string }) => primaryEmailAddressId === email.id, + )?.email_address + } + + // Fetch organization info if user is in organization context + try { + const storedOrgId = this.getStoredOrganizationId() + + if (this.credentials?.organizationId !== undefined) { + // We have organization context info + if (storedOrgId !== null) { + // User is in organization context - fetch user's memberships and filter + const orgMemberships = await this.clerkGetOrganizationMemberships() + const userMembership = this.findOrganizationMembership(orgMemberships, storedOrgId) + + if (userMembership) { + this.setUserOrganizationInfo(userInfo, userMembership) + + this.log("[auth] User in organization context:", { + id: userMembership.organization.id, + name: userMembership.organization.name, + role: userMembership.role, + }) + } else { + this.log("[auth] Warning: User not found in stored organization:", storedOrgId) + } + } else { + this.log("[auth] User in personal account context - not setting organization info") + } + } else { + // Old credentials without organization context - fetch organization info to determine context + const orgMemberships = await this.clerkGetOrganizationMemberships() + const primaryOrgMembership = this.findPrimaryOrganizationMembership(orgMemberships) + + if (primaryOrgMembership) { + this.setUserOrganizationInfo(userInfo, primaryOrgMembership) + + this.log("[auth] Legacy credentials: Found organization membership:", { + id: primaryOrgMembership.organization.id, + name: primaryOrgMembership.organization.name, + role: primaryOrgMembership.role, + }) + } else { + this.log("[auth] Legacy credentials: No organization memberships found") + } + } + } catch (error) { + this.log("[auth] Failed to fetch organization info:", error) + // Don't throw - organization info is optional + } + + return userInfo + } + + private findOrganizationMembership( + memberships: CloudOrganizationMembership[], + organizationId: string, + ): CloudOrganizationMembership | undefined { + return memberships?.find((membership) => membership.organization.id === organizationId) + } + + private findPrimaryOrganizationMembership( + memberships: CloudOrganizationMembership[], + ): CloudOrganizationMembership | undefined { + return memberships && memberships.length > 0 ? memberships[0] : undefined + } + + private setUserOrganizationInfo(userInfo: CloudUserInfo, membership: CloudOrganizationMembership): void { + userInfo.organizationId = membership.organization.id + userInfo.organizationName = membership.organization.name + userInfo.organizationRole = membership.role + userInfo.organizationImageUrl = membership.organization.image_url + } + + private async clerkGetOrganizationMemberships(): Promise { + const response = await fetch(`${getClerkBaseUrl()}/v1/me/organization_memberships`, { + headers: { + Authorization: `Bearer ${this.credentials!.clientToken}`, + "User-Agent": this.userAgent(), + }, + signal: AbortSignal.timeout(10000), + }) + + return clerkOrganizationMembershipsSchema.parse(await response.json()).response + } + + private async clerkLogout(credentials: AuthCredentials): Promise { + const formData = new URLSearchParams() + formData.append("_is_native", "1") + + const response = await fetch(`${getClerkBaseUrl()}/v1/client/sessions/${credentials.sessionId}/remove`, { + method: "POST", + headers: { + "Content-Type": "application/x-www-form-urlencoded", + Authorization: `Bearer ${credentials.clientToken}`, + "User-Agent": this.userAgent(), + }, + body: formData.toString(), + signal: AbortSignal.timeout(10000), + }) + + if (!response.ok) { + throw new Error(`HTTP ${response.status}: ${response.statusText}`) + } + } + + private userAgent(): string { + return getUserAgent(this.context) + } +} diff --git a/packages/cloud/src/auth/index.ts b/packages/cloud/src/auth/index.ts new file mode 100644 index 0000000000..b04a805295 --- /dev/null +++ b/packages/cloud/src/auth/index.ts @@ -0,0 +1,3 @@ +export type { AuthService, AuthServiceEvents, AuthState } from "./AuthService" +export { WebAuthService } from "./WebAuthService" +export { StaticTokenAuthService } from "./StaticTokenAuthService" diff --git a/packages/cloud/src/config.ts b/packages/cloud/src/config.ts new file mode 100644 index 0000000000..e682d718ce --- /dev/null +++ b/packages/cloud/src/config.ts @@ -0,0 +1,5 @@ +export const PRODUCTION_CLERK_BASE_URL = "https://clerk.roocode.com" +export const PRODUCTION_ROO_CODE_API_URL = "https://app.roocode.com" + +export const getClerkBaseUrl = () => process.env.CLERK_BASE_URL || PRODUCTION_CLERK_BASE_URL +export const getRooCodeApiUrl = () => process.env.ROO_CODE_API_URL || PRODUCTION_ROO_CODE_API_URL diff --git a/packages/cloud/src/errors.ts b/packages/cloud/src/errors.ts new file mode 100644 index 0000000000..7400f26b39 --- /dev/null +++ b/packages/cloud/src/errors.ts @@ -0,0 +1,42 @@ +export class CloudAPIError extends Error { + constructor( + message: string, + public statusCode?: number, + public responseBody?: unknown, + ) { + super(message) + this.name = "CloudAPIError" + Object.setPrototypeOf(this, CloudAPIError.prototype) + } +} + +export class TaskNotFoundError extends CloudAPIError { + constructor(taskId?: string) { + super(taskId ? `Task '${taskId}' not found` : "Task not found", 404) + this.name = "TaskNotFoundError" + Object.setPrototypeOf(this, TaskNotFoundError.prototype) + } +} + +export class AuthenticationError extends CloudAPIError { + constructor(message = "Authentication required") { + super(message, 401) + this.name = "AuthenticationError" + Object.setPrototypeOf(this, AuthenticationError.prototype) + } +} + +export class NetworkError extends CloudAPIError { + constructor(message = "Network error occurred") { + super(message) + this.name = "NetworkError" + Object.setPrototypeOf(this, NetworkError.prototype) + } +} + +export class InvalidClientTokenError extends Error { + constructor() { + super("Invalid/Expired client token") + Object.setPrototypeOf(this, InvalidClientTokenError.prototype) + } +} diff --git a/packages/cloud/src/index.ts b/packages/cloud/src/index.ts new file mode 100644 index 0000000000..55f7d908dd --- /dev/null +++ b/packages/cloud/src/index.ts @@ -0,0 +1,4 @@ +export * from "./config" + +export * from "./CloudAPI" +export * from "./CloudService" diff --git a/packages/cloud/src/types.ts b/packages/cloud/src/types.ts new file mode 100644 index 0000000000..78275b32e2 --- /dev/null +++ b/packages/cloud/src/types.ts @@ -0,0 +1,4 @@ +import { AuthServiceEvents } from "./auth" +import { SettingsServiceEvents } from "./CloudSettingsService" + +export type CloudServiceEvents = AuthServiceEvents & SettingsServiceEvents diff --git a/packages/cloud/src/utils.ts b/packages/cloud/src/utils.ts new file mode 100644 index 0000000000..cf87aa5e28 --- /dev/null +++ b/packages/cloud/src/utils.ts @@ -0,0 +1,10 @@ +import * as vscode from "vscode" + +/** + * Get the User-Agent string for API requests + * @param context Optional extension context for more accurate version detection + * @returns User-Agent string in format "Roo-Code {version}" + */ +export function getUserAgent(context?: vscode.ExtensionContext): string { + return `Roo-Code ${context?.extension?.packageJSON?.version || "unknown"}` +} diff --git a/packages/cloud/tsconfig.json b/packages/cloud/tsconfig.json new file mode 100644 index 0000000000..f599e2220d --- /dev/null +++ b/packages/cloud/tsconfig.json @@ -0,0 +1,5 @@ +{ + "extends": "@roo-code/config-typescript/vscode-library.json", + "include": ["src"], + "exclude": ["node_modules"] +} diff --git a/packages/cloud/vitest.config.ts b/packages/cloud/vitest.config.ts new file mode 100644 index 0000000000..569f167543 --- /dev/null +++ b/packages/cloud/vitest.config.ts @@ -0,0 +1,14 @@ +import { defineConfig } from "vitest/config" + +export default defineConfig({ + test: { + globals: true, + environment: "node", + watch: false, + }, + resolve: { + alias: { + vscode: new URL("./src/__mocks__/vscode.ts", import.meta.url).pathname, + }, + }, +}) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b2847df1a1..3e7bb79b64 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -353,6 +353,34 @@ importers: specifier: ^3.2.3 version: 3.2.4(@types/debug@4.1.12)(@types/node@20.17.57)(@vitest/ui@3.2.4)(jiti@2.4.2)(jsdom@26.1.0)(lightningcss@1.30.1)(tsx@4.19.4)(yaml@2.8.0) + packages/cloud: + dependencies: + '@roo-code/telemetry': + specifier: workspace:^ + version: link:../telemetry + '@roo-code/types': + specifier: workspace:^ + version: link:../types + zod: + specifier: ^3.25.61 + version: 3.25.61 + devDependencies: + '@roo-code/config-eslint': + specifier: workspace:^ + version: link:../config-eslint + '@roo-code/config-typescript': + specifier: workspace:^ + version: link:../config-typescript + '@types/node': + specifier: 20.x + version: 20.17.57 + '@types/vscode': + specifier: ^1.84.0 + version: 1.100.0 + vitest: + specifier: ^3.2.3 + version: 3.2.4(@types/debug@4.1.12)(@types/node@20.17.57)(@vitest/ui@3.2.4)(jiti@2.4.2)(jsdom@26.1.0)(lightningcss@1.30.1)(tsx@4.19.4)(yaml@2.8.0) + packages/config-eslint: devDependencies: '@eslint/js': @@ -563,8 +591,8 @@ importers: specifier: ^1.14.0 version: 1.14.0(typescript@5.8.3) '@roo-code/cloud': - specifier: ^0.4.0 - version: 0.4.0 + specifier: workspace:^ + version: link:../packages/cloud '@roo-code/ipc': specifier: workspace:^ version: link:../packages/ipc @@ -657,7 +685,7 @@ importers: version: 12.0.0 openai: specifier: ^5.0.0 - version: 5.5.1(ws@8.18.3)(zod@3.25.61) + version: 5.5.1(ws@8.18.2)(zod@3.25.61) os-name: specifier: ^6.0.0 version: 6.1.0 @@ -1419,10 +1447,6 @@ packages: resolution: {integrity: sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==} engines: {node: '>=6.9.0'} - '@babel/runtime@7.28.2': - resolution: {integrity: sha512-KHp2IflsnGywDjBWDkR9iEqiWSpc8GIi0lgTT3mOElT0PP1tG26P4tmFI2YvAdzgq9RGyoHZQEIEdZy6Ec5xCA==} - engines: {node: '>=6.9.0'} - '@babel/template@7.27.2': resolution: {integrity: sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==} engines: {node: '>=6.9.0'} @@ -1933,9 +1957,6 @@ packages: cpu: [x64] os: [win32] - '@ioredis/commands@1.3.0': - resolution: {integrity: sha512-M/T6Zewn7sDaBQEqIZ8Rb+i9y8qfGmq+5SDFSf9sA2lUZTmdDLVdOiQaeDp+Q4wElZ9HG1GAX5KhDaidp6LQsQ==} - '@isaacs/cliui@8.0.2': resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} engines: {node: '>=12'} @@ -1987,16 +2008,16 @@ packages: '@libsql/client@0.15.8': resolution: {integrity: sha512-TskygwF+ToZeWhPPT0WennyGrP3tmkKraaKopT2YwUjqD6DWDRm6SG5iy0VqnaO+HC9FNBCDX0oQPODU3gqqPQ==} - '@libsql/core@0.15.10': - resolution: {integrity: sha512-fAMD+GnGQNdZ9zxeNC8AiExpKnou/97GJWkiDDZbTRHj3c9dvF1y4jsRQ0WE72m/CqTdbMGyU98yL0SJ9hQVeg==} + '@libsql/core@0.15.9': + resolution: {integrity: sha512-4OVdeAmuaCUq5hYT8NNn0nxlO9AcA/eTjXfUZ+QK8MT3Dz7Z76m73x7KxjU6I64WyXX98dauVH2b9XM+d84npw==} - '@libsql/darwin-arm64@0.5.17': - resolution: {integrity: sha512-WTYG2skZsUnZmfZ2v7WFj7s3/5s2PfrYBZOWBKOnxHA8g4XCDc/4bFDaqob9Q2e88+GC7cWeJ8VNkVBFpD2Xxg==} + '@libsql/darwin-arm64@0.5.13': + resolution: {integrity: sha512-ASz/EAMLDLx3oq9PVvZ4zBXXHbz2TxtxUwX2xpTRFR4V4uSHAN07+jpLu3aK5HUBLuv58z7+GjaL5w/cyjR28Q==} cpu: [arm64] os: [darwin] - '@libsql/darwin-x64@0.5.17': - resolution: {integrity: sha512-ab0RlTR4KYrxgjNrZhAhY/10GibKoq6G0W4oi0kdm+eYiAv/Ip8GDMpSaZdAcoKA4T+iKR/ehczKHnMEB8MFxA==} + '@libsql/darwin-x64@0.5.13': + resolution: {integrity: sha512-kzglniv1difkq8opusSXM7u9H0WoEPeKxw0ixIfcGfvlCVMJ+t9UNtXmyNHW68ljdllje6a4C6c94iPmIYafYA==} cpu: [x64] os: [darwin] @@ -2010,38 +2031,38 @@ packages: '@libsql/isomorphic-ws@0.1.5': resolution: {integrity: sha512-DtLWIH29onUYR00i0GlQ3UdcTRC6EP4u9w/h9LxpUZJWRMARk6dQwZ6Jkd+QdwVpuAOrdxt18v0K2uIYR3fwFg==} - '@libsql/linux-arm-gnueabihf@0.5.17': - resolution: {integrity: sha512-PcASh4k47RqC+kMWAbLUKf1y6Do0q8vnUGi0yhKY4ghJcimMExViBimjbjYRSa+WIb/zh3QxNoXOhQAXx3tiuw==} + '@libsql/linux-arm-gnueabihf@0.5.13': + resolution: {integrity: sha512-UEW+VZN2r0mFkfztKOS7cqfS8IemuekbjUXbXCwULHtusww2QNCXvM5KU9eJCNE419SZCb0qaEWYytcfka8qeA==} cpu: [arm] os: [linux] - '@libsql/linux-arm-musleabihf@0.5.17': - resolution: {integrity: sha512-vxOkSLG9Wspit+SNle84nuIzMtr2G2qaxFzW7BhsZBjlZ8+kErf9RXcT2YJQdJYxmBYRbsOrc91gg0jLEQVCqg==} + '@libsql/linux-arm-musleabihf@0.5.13': + resolution: {integrity: sha512-NMDgLqryYBv4Sr3WoO/m++XDjR5KLlw9r/JK4Ym6A1XBv2bxQQNhH0Lxx3bjLW8qqhBD4+0xfms4d2cOlexPyA==} cpu: [arm] os: [linux] - '@libsql/linux-arm64-gnu@0.5.17': - resolution: {integrity: sha512-L8jnaN01TxjBJlDuDTX2W2BKzBkAOhcnKfCOf3xzvvygblxnDOK0whkYwIXeTfwtd/rr4jN/d6dZD/bcHiDxEQ==} + '@libsql/linux-arm64-gnu@0.5.13': + resolution: {integrity: sha512-/wCxVdrwl1ee6D6LEjwl+w4SxuLm5UL9Kb1LD5n0bBGs0q+49ChdPPh7tp175iRgkcrTgl23emymvt1yj3KxVQ==} cpu: [arm64] os: [linux] - '@libsql/linux-arm64-musl@0.5.17': - resolution: {integrity: sha512-HfFD7TzQtmmTwyQsuiHhWZdMRtdNpKJ1p4tbMMTMRECk+971NFHrj69D64cc2ClVTAmn7fA9XibKPil7WN/Q7w==} + '@libsql/linux-arm64-musl@0.5.13': + resolution: {integrity: sha512-xnVAbZIanUgX57XqeI5sNaDnVilp0Di5syCLSEo+bRyBobe/1IAeehNZpyVbCy91U2N6rH1C/mZU7jicVI9x+A==} cpu: [arm64] os: [linux] - '@libsql/linux-x64-gnu@0.5.17': - resolution: {integrity: sha512-5l3XxWqUPVFrtX0xnZaXwqsXs0BFbP4w6ahRFTPSdXU50YBfUOajFznJRB6bJTMsCvraDSD0IkHhjSNfrE1CuQ==} + '@libsql/linux-x64-gnu@0.5.13': + resolution: {integrity: sha512-/mfMRxcQAI9f8t7tU3QZyh25lXgXKzgin9B9TOSnchD73PWtsVhlyfA6qOCfjQl5kr4sHscdXD5Yb3KIoUgrpQ==} cpu: [x64] os: [linux] - '@libsql/linux-x64-musl@0.5.17': - resolution: {integrity: sha512-FvSpWlwc+dIeYIFYlsSv+UdQ/NiZWr+SstwVji+QZ//8NnvzwWQU9cgP+Vpps6Qiq4jyYQm9chJhTYOVT9Y3BA==} + '@libsql/linux-x64-musl@0.5.13': + resolution: {integrity: sha512-rdefPTpQCVwUjIQYbDLMv3qpd5MdrT0IeD0UZPGqhT9AWU8nJSQoj2lfyIDAWEz7PPOVCY4jHuEn7FS2sw9kRA==} cpu: [x64] os: [linux] - '@libsql/win32-x64-msvc@0.5.17': - resolution: {integrity: sha512-f5bGH8+3A5sn6Lrqg8FsQ09a1pYXPnKGXGTFiAYlfQXVst1tUTxDTugnuWcJYKXyzDe/T7ccxyIZXeSmPOhq8A==} + '@libsql/win32-x64-msvc@0.5.13': + resolution: {integrity: sha512-aNcmDrD1Ws+dNZIv9ECbxBQumqB9MlSVEykwfXJpqv/593nABb8Ttg5nAGUPtnADyaGDTrGvPPP81d/KsKho4Q==} cpu: [x64] os: [win32] @@ -3065,12 +3086,6 @@ packages: cpu: [x64] os: [win32] - '@roo-code/cloud@0.4.0': - resolution: {integrity: sha512-1a27RG2YjQFfsU5UlfbQnpj/K/6gYBcysp2FXaX9+VaaTh5ZzReQeHJ9uREnyE059zoFpVuNywwNxGadzyotWw==} - - '@roo-code/types@1.42.0': - resolution: {integrity: sha512-AITVSV6WFd17jE8lQXFy7PkHam8M+mMkT7o9ipGZZ3cV7SbrnmL/Hg/HjkA9lkdJYbcC5dEK94py8KVBQn8Umw==} - '@sec-ant/readable-stream@0.4.1': resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==} @@ -3871,8 +3886,8 @@ packages: '@types/node@20.19.1': resolution: {integrity: sha512-jJD50LtlD2dodAEO653i3YF04NWak6jN3ky+Ri3Em3mGR39/glWiboM/IePaRbgwSfqM1TpGXfAg8ohn/4dTgA==} - '@types/node@20.19.9': - resolution: {integrity: sha512-cuVNgarYWZqxRJDQHEB58GEONhOK79QVR/qYx4S7kcUObQvUwvFnYxJuuHUKm2aieN9X3yZB4LZsuYNU1Qphsw==} + '@types/node@20.19.4': + resolution: {integrity: sha512-OP+We5WV8Xnbuvw0zC2m4qfB/BJvjyCwtNjhHdJxV1639SGSKrLmJkc3fMnp2Qy8nJyHp8RO6umxELN/dS1/EA==} '@types/node@22.15.29': resolution: {integrity: sha512-LNdjOkUDlU1RZb8e1kOIUpN1qQUlzGkEtbVNo53vbrwDg5om6oduhm4SiUaPW5ASTXhAiP0jInWG8Qx9fVlOeQ==} @@ -5090,10 +5105,6 @@ packages: resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} engines: {node: '>=0.4.0'} - denque@2.1.0: - resolution: {integrity: sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==} - engines: {node: '>=0.10'} - depd@2.0.0: resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==} engines: {node: '>= 0.8'} @@ -6267,10 +6278,6 @@ packages: resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==} engines: {node: '>=12'} - ioredis@5.7.0: - resolution: {integrity: sha512-NUcA93i1lukyXU+riqEyPtSEkyFq8tX90uL659J+qpCZ3rEdViB/APC58oAhIh3+bJln2hzdlZbBZsGNrlsR8g==} - engines: {node: '>=12.22.0'} - ip-address@9.0.5: resolution: {integrity: sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==} engines: {node: '>= 12'} @@ -6738,8 +6745,8 @@ packages: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} - libsql@0.5.17: - resolution: {integrity: sha512-RRlj5XQI9+Wq+/5UY8EnugSWfRmHEw4hn3DKlPrkUgZONsge1PwTtHcpStP6MSNi8ohcbsRgEHJaymA33a8cBw==} + libsql@0.5.13: + resolution: {integrity: sha512-5Bwoa/CqzgkTwySgqHA5TsaUDRrdLIbdM4egdPcaAnqO3aC+qAgS6BwdzuZwARA5digXwiskogZ8H7Yy4XfdOg==} cpu: [x64, arm64, wasm32, arm] os: [darwin, linux, win32] @@ -6939,9 +6946,6 @@ packages: lodash.includes@4.3.0: resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==} - lodash.isarguments@3.1.0: - resolution: {integrity: sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==} - lodash.isboolean@3.0.3: resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==} @@ -8265,14 +8269,6 @@ packages: resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==} engines: {node: '>=8'} - redis-errors@1.2.0: - resolution: {integrity: sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==} - engines: {node: '>=4'} - - redis-parser@3.0.0: - resolution: {integrity: sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==} - engines: {node: '>=4'} - redis@5.5.5: resolution: {integrity: sha512-x7vpciikEY7nptGzQrE5I+/pvwFZJDadPk/uEoyGSg/pZ2m/CX2n5EhSgUh+S5T7Gz3uKM6YzWcXEu3ioAsdFQ==} engines: {node: '>= 18'} @@ -8686,9 +8682,6 @@ packages: stacktrace-js@2.0.2: resolution: {integrity: sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg==} - standard-as-callback@2.1.0: - resolution: {integrity: sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==} - statuses@2.0.1: resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} engines: {node: '>= 0.8'} @@ -9788,9 +9781,6 @@ packages: zod@3.25.61: resolution: {integrity: sha512-fzfJgUw78LTNnHujj9re1Ov/JJQkRZZGDMcYqSx7Hp4rPOkKywaFHq0S6GoHeXs0wGNE/sIOutkXgnwzrVOGCQ==} - zod@3.25.76: - resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==} - zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} @@ -10545,8 +10535,6 @@ snapshots: '@babel/runtime@7.27.6': {} - '@babel/runtime@7.28.2': {} - '@babel/template@7.27.2': dependencies: '@babel/code-frame': 7.27.1 @@ -11088,8 +11076,6 @@ snapshots: '@img/sharp-win32-x64@0.33.5': optional: true - '@ioredis/commands@1.3.0': {} - '@isaacs/cliui@8.0.2': dependencies: string-width: 5.1.2 @@ -11149,25 +11135,25 @@ snapshots: '@libsql/client@0.15.8': dependencies: - '@libsql/core': 0.15.10 + '@libsql/core': 0.15.9 '@libsql/hrana-client': 0.7.0 js-base64: 3.7.7 - libsql: 0.5.17 + libsql: 0.5.13 promise-limit: 2.7.0 transitivePeerDependencies: - bufferutil - utf-8-validate optional: true - '@libsql/core@0.15.10': + '@libsql/core@0.15.9': dependencies: js-base64: 3.7.7 optional: true - '@libsql/darwin-arm64@0.5.17': + '@libsql/darwin-arm64@0.5.13': optional: true - '@libsql/darwin-x64@0.5.17': + '@libsql/darwin-x64@0.5.13': optional: true '@libsql/hrana-client@0.7.0': @@ -11193,25 +11179,25 @@ snapshots: - utf-8-validate optional: true - '@libsql/linux-arm-gnueabihf@0.5.17': + '@libsql/linux-arm-gnueabihf@0.5.13': optional: true - '@libsql/linux-arm-musleabihf@0.5.17': + '@libsql/linux-arm-musleabihf@0.5.13': optional: true - '@libsql/linux-arm64-gnu@0.5.17': + '@libsql/linux-arm64-gnu@0.5.13': optional: true - '@libsql/linux-arm64-musl@0.5.17': + '@libsql/linux-arm64-musl@0.5.13': optional: true - '@libsql/linux-x64-gnu@0.5.17': + '@libsql/linux-x64-gnu@0.5.13': optional: true - '@libsql/linux-x64-musl@0.5.17': + '@libsql/linux-x64-musl@0.5.13': optional: true - '@libsql/win32-x64-msvc@0.5.17': + '@libsql/win32-x64-msvc@0.5.13': optional: true '@lmstudio/lms-isomorphic@0.4.5': @@ -12191,17 +12177,6 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.40.2': optional: true - '@roo-code/cloud@0.4.0': - dependencies: - '@roo-code/types': 1.42.0 - ioredis: 5.7.0 - p-wait-for: 5.0.2 - zod: 3.25.76 - transitivePeerDependencies: - - supports-color - - '@roo-code/types@1.42.0': {} - '@sec-ant/readable-stream@0.4.1': {} '@sevinf/maybe@0.5.0': {} @@ -12901,7 +12876,7 @@ snapshots: '@testing-library/dom@10.4.0': dependencies: '@babel/code-frame': 7.27.1 - '@babel/runtime': 7.28.2 + '@babel/runtime': 7.27.6 '@types/aria-query': 5.0.4 aria-query: 5.3.0 chalk: 4.1.2 @@ -13189,7 +13164,7 @@ snapshots: dependencies: undici-types: 6.21.0 - '@types/node@20.19.9': + '@types/node@20.19.4': dependencies: undici-types: 6.21.0 optional: true @@ -13257,7 +13232,7 @@ snapshots: '@types/ws@8.18.1': dependencies: - '@types/node': 20.19.9 + '@types/node': 20.19.4 optional: true '@types/yargs-parser@21.0.3': {} @@ -14582,8 +14557,6 @@ snapshots: delayed-stream@1.0.0: {} - denque@2.1.0: {} - depd@2.0.0: {} dequal@2.0.3: {} @@ -15963,20 +15936,6 @@ snapshots: internmap@2.0.3: {} - ioredis@5.7.0: - dependencies: - '@ioredis/commands': 1.3.0 - cluster-key-slot: 1.1.2 - debug: 4.4.1(supports-color@8.1.1) - denque: 2.1.0 - lodash.defaults: 4.2.0 - lodash.isarguments: 3.1.0 - redis-errors: 1.2.0 - redis-parser: 3.0.0 - standard-as-callback: 2.1.0 - transitivePeerDependencies: - - supports-color - ip-address@9.0.5: dependencies: jsbn: 1.1.0 @@ -16467,20 +16426,20 @@ snapshots: prelude-ls: 1.2.1 type-check: 0.4.0 - libsql@0.5.17: + libsql@0.5.13: dependencies: '@neon-rs/load': 0.0.4 detect-libc: 2.0.2 optionalDependencies: - '@libsql/darwin-arm64': 0.5.17 - '@libsql/darwin-x64': 0.5.17 - '@libsql/linux-arm-gnueabihf': 0.5.17 - '@libsql/linux-arm-musleabihf': 0.5.17 - '@libsql/linux-arm64-gnu': 0.5.17 - '@libsql/linux-arm64-musl': 0.5.17 - '@libsql/linux-x64-gnu': 0.5.17 - '@libsql/linux-x64-musl': 0.5.17 - '@libsql/win32-x64-msvc': 0.5.17 + '@libsql/darwin-arm64': 0.5.13 + '@libsql/darwin-x64': 0.5.13 + '@libsql/linux-arm-gnueabihf': 0.5.13 + '@libsql/linux-arm-musleabihf': 0.5.13 + '@libsql/linux-arm64-gnu': 0.5.13 + '@libsql/linux-arm64-musl': 0.5.13 + '@libsql/linux-x64-gnu': 0.5.13 + '@libsql/linux-x64-musl': 0.5.13 + '@libsql/win32-x64-msvc': 0.5.13 optional: true lie@3.3.0: @@ -16645,8 +16604,6 @@ snapshots: lodash.includes@4.3.0: {} - lodash.isarguments@3.1.0: {} - lodash.isboolean@3.0.3: {} lodash.isequal@4.5.0: {} @@ -17563,9 +17520,9 @@ snapshots: is-inside-container: 1.0.0 is-wsl: 3.1.0 - openai@5.5.1(ws@8.18.3)(zod@3.25.61): + openai@5.5.1(ws@8.18.2)(zod@3.25.61): optionalDependencies: - ws: 8.18.3 + ws: 8.18.2 zod: 3.25.61 option@0.2.4: {} @@ -18315,12 +18272,6 @@ snapshots: indent-string: 4.0.0 strip-indent: 3.0.0 - redis-errors@1.2.0: {} - - redis-parser@3.0.0: - dependencies: - redis-errors: 1.2.0 - redis@5.5.5: dependencies: '@redis/bloom': 5.5.5(@redis/client@5.5.5) @@ -18874,8 +18825,6 @@ snapshots: stack-generator: 2.0.10 stacktrace-gps: 3.1.2 - standard-as-callback@2.1.0: {} - statuses@2.0.1: {} std-env@3.9.0: {} @@ -20193,6 +20142,4 @@ snapshots: zod@3.25.61: {} - zod@3.25.76: {} - zwitch@2.0.4: {} diff --git a/src/extension.ts b/src/extension.ts index f3b8f55911..1a7b6c5aca 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -76,25 +76,12 @@ export async function activate(context: vscode.ExtensionContext) { // Initialize Roo Code Cloud service. const cloudService = await CloudService.createInstance(context, cloudLogger) - - try { - if (cloudService.telemetryClient) { - TelemetryService.instance.register(cloudService.telemetryClient) - } - } catch (error) { - outputChannel.appendLine( - `[CloudService] Failed to register TelemetryClient: ${error instanceof Error ? error.message : String(error)}`, - ) - } - const postStateListener = () => { ClineProvider.getVisibleInstance()?.postStateToWebview() } - cloudService.on("auth-state-changed", postStateListener) cloudService.on("user-info", postStateListener) cloudService.on("settings-updated", postStateListener) - // Add to subscriptions for proper cleanup on deactivate context.subscriptions.push(cloudService) diff --git a/src/package.json b/src/package.json index 13013de7ae..dab031404d 100644 --- a/src/package.json +++ b/src/package.json @@ -420,7 +420,7 @@ "@mistralai/mistralai": "^1.3.6", "@modelcontextprotocol/sdk": "^1.9.0", "@qdrant/js-client-rest": "^1.14.0", - "@roo-code/cloud": "^0.4.0", + "@roo-code/cloud": "workspace:^", "@roo-code/ipc": "workspace:^", "@roo-code/telemetry": "workspace:^", "@roo-code/types": "workspace:^", From 34fb5b7c37ba766def90ee782f97a3e98047a7ba Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Wed, 6 Aug 2025 06:26:34 -0700 Subject: [PATCH 087/253] fix: recover from error state when Qdrant becomes available (#6661) * fix: recover from error state when Qdrant becomes available - Add recoverFromError method to CodeIndexManager to clear error state and reset internal services - Update startIndexing handler to check for error state and recover before initialization - Add comprehensive tests for error recovery functionality Fixes #6660 * fix: address PR review comments for code indexing error recovery - Add race condition protection for multiple rapid clicks on Start Indexing button - Add error handling for setSystemState in recoverFromError method - Enhance JSDoc documentation for recoverFromError method - Add test cases for recoverFromError idempotency and error handling * refactor: move error recovery logic into startIndexing method - Moved error recovery from webviewMessageHandler into CodeIndexManager.startIndexing() - This ensures error recovery happens whenever indexing is started, not just from UI - Added race condition prevention flag within CodeIndexManager - Simplified webviewMessageHandler by removing error state checking - The startIndexing method now automatically recovers from error state before proceeding * fix: remove await from startIndexing calls and update JSDoc - startIndexing should never be awaited as it's a long-running background process - Added JSDoc warning to never await this method - Updated webviewMessageHandler to not await startIndexing calls * fix: use platform-agnostic paths in code-index manager tests for Windows compatibility --------- Co-authored-by: Roo Code Co-authored-by: Daniel Riccio --- src/core/webview/webviewMessageHandler.ts | 8 + .../code-index/__tests__/manager.spec.ts | 257 ++++++++++++++++-- src/services/code-index/manager.ts | 59 +++- 3 files changed, 300 insertions(+), 24 deletions(-) diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts index 0cb9440d3f..f5dc6a467f 100644 --- a/src/core/webview/webviewMessageHandler.ts +++ b/src/core/webview/webviewMessageHandler.ts @@ -2224,7 +2224,15 @@ export const webviewMessageHandler = async ( await manager.initialize(provider.contextProxy) } + // startIndexing now handles error recovery internally manager.startIndexing() + + // If startIndexing recovered from error, we need to reinitialize + if (!manager.isInitialized) { + await manager.initialize(provider.contextProxy) + // Try starting again after initialization + manager.startIndexing() + } } } catch (error) { provider.log(`Error starting indexing: ${error instanceof Error ? error.message : String(error)}`) diff --git a/src/services/code-index/__tests__/manager.spec.ts b/src/services/code-index/__tests__/manager.spec.ts index 3995825f70..49f725f69b 100644 --- a/src/services/code-index/__tests__/manager.spec.ts +++ b/src/services/code-index/__tests__/manager.spec.ts @@ -1,27 +1,36 @@ import { CodeIndexManager } from "../manager" import { CodeIndexServiceFactory } from "../service-factory" import type { MockedClass } from "vitest" +import * as path from "path" // Mock vscode module -vi.mock("vscode", () => ({ - window: { - activeTextEditor: null, - }, - workspace: { - workspaceFolders: [ - { - uri: { fsPath: "/test/workspace" }, - name: "test", - index: 0, - }, - ], - }, -})) +vi.mock("vscode", () => { + const testPath = require("path") + const testWorkspacePath = testPath.join(testPath.sep, "test", "workspace") + return { + window: { + activeTextEditor: null, + }, + workspace: { + workspaceFolders: [ + { + uri: { fsPath: testWorkspacePath }, + name: "test", + index: 0, + }, + ], + }, + } +}) // Mock only the essential dependencies -vi.mock("../../../utils/path", () => ({ - getWorkspacePath: vi.fn(() => "/test/workspace"), -})) +vi.mock("../../../utils/path", () => { + const testPath = require("path") + const testWorkspacePath = testPath.join(testPath.sep, "test", "workspace") + return { + getWorkspacePath: vi.fn(() => testWorkspacePath), + } +}) vi.mock("../state-manager", () => ({ CodeIndexStateManager: vi.fn().mockImplementation(() => ({ @@ -48,6 +57,13 @@ describe("CodeIndexManager - handleSettingsChange regression", () => { let mockContext: any let manager: CodeIndexManager + // Define test paths for use in tests + const testWorkspacePath = path.join(path.sep, "test", "workspace") + const testExtensionPath = path.join(path.sep, "test", "extension") + const testStoragePath = path.join(path.sep, "test", "storage") + const testGlobalStoragePath = path.join(path.sep, "test", "global-storage") + const testLogPath = path.join(path.sep, "test", "log") + beforeEach(() => { // Clear all instances before each test CodeIndexManager.disposeAll() @@ -57,14 +73,14 @@ describe("CodeIndexManager - handleSettingsChange regression", () => { workspaceState: {} as any, globalState: {} as any, extensionUri: {} as any, - extensionPath: "/test/extension", + extensionPath: testExtensionPath, asAbsolutePath: vi.fn(), storageUri: {} as any, - storagePath: "/test/storage", + storagePath: testStoragePath, globalStorageUri: {} as any, - globalStoragePath: "/test/global-storage", + globalStoragePath: testGlobalStoragePath, logUri: {} as any, - logPath: "/test/log", + logPath: testLogPath, extensionMode: 3, // vscode.ExtensionMode.Test secrets: {} as any, environmentVariableCollection: {} as any, @@ -118,7 +134,7 @@ describe("CodeIndexManager - handleSettingsChange regression", () => { // Mock service factory to handle _recreateServices call const mockServiceFactoryInstance = { configManager: mockConfigManager, - workspacePath: "/test/workspace", + workspacePath: testWorkspacePath, cacheManager: mockCacheManager, createEmbedder: vi.fn().mockReturnValue({ embedderInfo: { name: "openai" } }), createVectorStore: vi.fn().mockReturnValue({}), @@ -192,7 +208,7 @@ describe("CodeIndexManager - handleSettingsChange regression", () => { // Mock service factory to handle _recreateServices call const mockServiceFactoryInstance = { configManager: mockConfigManager, - workspacePath: "/test/workspace", + workspacePath: testWorkspacePath, cacheManager: mockCacheManager, createEmbedder: vi.fn().mockReturnValue({ embedderInfo: { name: "openai" } }), createVectorStore: vi.fn().mockReturnValue({}), @@ -370,4 +386,199 @@ describe("CodeIndexManager - handleSettingsChange regression", () => { expect(mockServiceFactoryInstance.validateEmbedder).not.toHaveBeenCalled() }) }) + + describe("recoverFromError", () => { + let mockConfigManager: any + let mockCacheManager: any + let mockStateManager: any + + beforeEach(() => { + // Mock config manager + mockConfigManager = { + loadConfiguration: vi.fn().mockResolvedValue({ requiresRestart: false }), + isFeatureConfigured: true, + isFeatureEnabled: true, + getConfig: vi.fn().mockReturnValue({ + isConfigured: true, + embedderProvider: "openai", + modelId: "text-embedding-3-small", + openAiOptions: { openAiNativeApiKey: "test-key" }, + qdrantUrl: "http://localhost:6333", + qdrantApiKey: "test-key", + searchMinScore: 0.4, + }), + } + ;(manager as any)._configManager = mockConfigManager + + // Mock cache manager + mockCacheManager = { + initialize: vi.fn(), + clearCacheFile: vi.fn(), + } + ;(manager as any)._cacheManager = mockCacheManager + + // Mock state manager + mockStateManager = (manager as any)._stateManager + mockStateManager.setSystemState = vi.fn() + mockStateManager.getCurrentStatus = vi.fn().mockReturnValue({ + systemStatus: "Error", + message: "Failed during initial scan: fetch failed", + processedItems: 0, + totalItems: 0, + currentItemUnit: "items", + }) + + // Mock orchestrator and search service to simulate initialized state + ;(manager as any)._orchestrator = { stopWatcher: vi.fn(), state: "Error" } + ;(manager as any)._searchService = {} + ;(manager as any)._serviceFactory = {} + }) + + it("should clear error state when recoverFromError is called", async () => { + // Act + await manager.recoverFromError() + + // Assert + expect(mockStateManager.setSystemState).toHaveBeenCalledWith("Standby", "") + }) + + it("should reset internal service instances", async () => { + // Verify initial state + expect((manager as any)._configManager).toBeDefined() + expect((manager as any)._serviceFactory).toBeDefined() + expect((manager as any)._orchestrator).toBeDefined() + expect((manager as any)._searchService).toBeDefined() + + // Act + await manager.recoverFromError() + + // Assert - all service instances should be undefined + expect((manager as any)._configManager).toBeUndefined() + expect((manager as any)._serviceFactory).toBeUndefined() + expect((manager as any)._orchestrator).toBeUndefined() + expect((manager as any)._searchService).toBeUndefined() + }) + + it("should make manager report as not initialized after recovery", async () => { + // Verify initial state + expect(manager.isInitialized).toBe(true) + + // Act + await manager.recoverFromError() + + // Assert + expect(manager.isInitialized).toBe(false) + }) + + it("should allow re-initialization after recovery", async () => { + // Setup mock for re-initialization + const mockServiceFactoryInstance = { + createServices: vi.fn().mockReturnValue({ + embedder: { embedderInfo: { name: "openai" } }, + vectorStore: {}, + scanner: {}, + fileWatcher: { + onDidStartBatchProcessing: vi.fn(), + onBatchProgressUpdate: vi.fn(), + watch: vi.fn(), + stopWatcher: vi.fn(), + dispose: vi.fn(), + }, + }), + validateEmbedder: vi.fn().mockResolvedValue({ valid: true }), + } + MockedCodeIndexServiceFactory.mockImplementation(() => mockServiceFactoryInstance as any) + + // Act - recover from error + await manager.recoverFromError() + + // Verify manager is not initialized + expect(manager.isInitialized).toBe(false) + + // Mock context proxy for initialization + const mockContextProxy = { + getValue: vi.fn(), + setValue: vi.fn(), + storeSecret: vi.fn(), + getSecret: vi.fn(), + refreshSecrets: vi.fn().mockResolvedValue(undefined), + getGlobalState: vi.fn().mockReturnValue({ + codebaseIndexEnabled: true, + codebaseIndexQdrantUrl: "http://localhost:6333", + codebaseIndexEmbedderProvider: "openai", + codebaseIndexEmbedderModelId: "text-embedding-3-small", + codebaseIndexEmbedderModelDimension: 1536, + codebaseIndexSearchMaxResults: 10, + codebaseIndexSearchMinScore: 0.4, + }), + } + + // Re-initialize + await manager.initialize(mockContextProxy as any) + + // Assert - manager should be initialized again + expect(manager.isInitialized).toBe(true) + expect(mockServiceFactoryInstance.createServices).toHaveBeenCalled() + expect(mockServiceFactoryInstance.validateEmbedder).toHaveBeenCalled() + }) + + it("should be safe to call when not in error state (idempotent)", async () => { + // Setup manager in non-error state + mockStateManager.getCurrentStatus.mockReturnValue({ + systemStatus: "Standby", + message: "", + processedItems: 0, + totalItems: 0, + currentItemUnit: "items", + }) + + // Verify initial state is not error + const initialStatus = manager.getCurrentStatus() + expect(initialStatus.systemStatus).not.toBe("Error") + + // Act - call recoverFromError when not in error state + await expect(manager.recoverFromError()).resolves.not.toThrow() + + // Assert - should still clear state and service instances + expect(mockStateManager.setSystemState).toHaveBeenCalledWith("Standby", "") + expect((manager as any)._configManager).toBeUndefined() + expect((manager as any)._serviceFactory).toBeUndefined() + expect((manager as any)._orchestrator).toBeUndefined() + expect((manager as any)._searchService).toBeUndefined() + }) + + it("should continue recovery even if setSystemState throws", async () => { + // Setup state manager to throw on setSystemState + mockStateManager.setSystemState.mockImplementation(() => { + throw new Error("State update failed") + }) + + // Setup manager with service instances + ;(manager as any)._configManager = mockConfigManager + ;(manager as any)._serviceFactory = {} + ;(manager as any)._orchestrator = { stopWatcher: vi.fn() } + ;(manager as any)._searchService = {} + + // Spy on console.error + const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {}) + + // Act - should not throw despite setSystemState error + await expect(manager.recoverFromError()).resolves.not.toThrow() + + // Assert - error should be logged + expect(consoleErrorSpy).toHaveBeenCalledWith( + "Failed to clear error state during recovery:", + expect.any(Error), + ) + + // Assert - service instances should still be cleared + expect((manager as any)._configManager).toBeUndefined() + expect((manager as any)._serviceFactory).toBeUndefined() + expect((manager as any)._orchestrator).toBeUndefined() + expect((manager as any)._searchService).toBeUndefined() + + // Cleanup + consoleErrorSpy.mockRestore() + }) + }) }) diff --git a/src/services/code-index/manager.ts b/src/services/code-index/manager.ts index 027734d213..1257b747c6 100644 --- a/src/services/code-index/manager.ts +++ b/src/services/code-index/manager.ts @@ -28,6 +28,9 @@ export class CodeIndexManager { private _searchService: CodeIndexSearchService | undefined private _cacheManager: CacheManager | undefined + // Flag to prevent race conditions during error recovery + private _isRecoveringFromError = false + public static getInstance(context: vscode.ExtensionContext, workspacePath?: string): CodeIndexManager | undefined { // If workspacePath is not provided, try to get it from the active editor or first workspace folder if (!workspacePath) { @@ -164,12 +167,26 @@ export class CodeIndexManager { /** * Initiates the indexing process (initial scan and starts watcher). + * Automatically recovers from error state if needed before starting. + * + * @important This method should NEVER be awaited as it starts a long-running background process. + * The indexing will continue asynchronously and progress will be reported through events. */ - public async startIndexing(): Promise { if (!this.isFeatureEnabled) { return } + + // Check if we're in error state and recover if needed + const currentStatus = this.getCurrentStatus() + if (currentStatus.systemStatus === "Error") { + await this.recoverFromError() + + // After recovery, we need to reinitialize since recoverFromError clears all services + // This will be handled by the caller (webviewMessageHandler) checking isInitialized + return + } + this.assertInitialized() await this._orchestrator!.startIndexing() } @@ -186,6 +203,46 @@ export class CodeIndexManager { } } + /** + * Recovers from error state by clearing the error and resetting internal state. + * This allows the manager to be re-initialized after a recoverable error. + * + * This method clears all service instances (configManager, serviceFactory, orchestrator, searchService) + * to force a complete re-initialization on the next operation. This ensures a clean slate + * after recovering from errors such as network failures or configuration issues. + * + * @remarks + * - Safe to call even when not in error state (idempotent) + * - Does not restart indexing automatically - call initialize() after recovery + * - Service instances will be recreated on next initialize() call + * - Prevents race conditions from multiple concurrent recovery attempts + */ + public async recoverFromError(): Promise { + // Prevent race conditions from multiple rapid recovery attempts + if (this._isRecoveringFromError) { + return + } + + this._isRecoveringFromError = true + try { + // Clear error state + this._stateManager.setSystemState("Standby", "") + } catch (error) { + // Log error but continue with recovery - clearing service instances is more important + console.error("Failed to clear error state during recovery:", error) + } finally { + // Force re-initialization by clearing service instances + // This ensures a clean slate even if state update failed + this._configManager = undefined + this._serviceFactory = undefined + this._orchestrator = undefined + this._searchService = undefined + + // Reset the flag after recovery is complete + this._isRecoveringFromError = false + } + } + /** * Cleans up the manager instance. */ From 2b647ed9a178704e47abc5c93b15660a8095771f Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Wed, 6 Aug 2025 06:28:28 -0700 Subject: [PATCH 088/253] fix: handle current directory path "." correctly in codebase_search tool (#6517) * fix: handle current directory path "." correctly in codebase_search tool - Fix path filtering logic in QdrantVectorStore.search() to properly handle current directory representations - When directoryPrefix is ".", "./", "", or similar, set filter to undefined to search entire workspace - Add comprehensive tests covering various current directory path formats including cross-platform support - Resolves issue where codebase_search with path="." returned no results Fixes #6514 * fix: normalize directory prefix handling in Qdrant vector store * fix: normalize paths starting with './' and fix OS-dependency issue - Use forward slash for splitting after toPosix() conversion - Remove leading './' from paths like './src' to normalize them to 'src' - Update test expectations to match correct behavior * refactor: use path.posix.normalize instead of custom toPosix method - Replaced directoryPrefix.toPosix() with path.posix.normalize() - Added proper handling of backslashes before normalization - Updated test mock to include posix.normalize method - All tests passing (381 tests in code-index service) * refactor: address review comments - improve path normalization - Keep check for './' after normalization as path.posix.normalize('./') returns './' - Use actual Node.js path.posix implementation in tests instead of custom mock - Apply path.posix.normalize to cleanedPrefix for consistency All 381 code-index tests pass * fix: apply path.posix.normalize when cleaning prefix to avoid redundant normalization Addresses review comment from @mrubens to normalize the path at line 385 instead of normalizing twice * fix: correct current directory detection logic The issue was that the condition checked for an empty string after normalization, but path.posix.normalize('') actually returns '.', not ''. This caused the current directory check to fail when an empty string was passed. Removed the redundant empty string check since normalize('') returns '.' which is already handled by the first condition. --------- Co-authored-by: Roo Code Co-authored-by: Daniel Riccio Co-authored-by: hannesrudolph --- .../__tests__/qdrant-client.spec.ts | 212 +++++++++++++++++- .../code-index/vector-store/qdrant-client.ts | 27 ++- 2 files changed, 228 insertions(+), 11 deletions(-) diff --git a/src/services/code-index/vector-store/__tests__/qdrant-client.spec.ts b/src/services/code-index/vector-store/__tests__/qdrant-client.spec.ts index e539c2edde..822832d17c 100644 --- a/src/services/code-index/vector-store/__tests__/qdrant-client.spec.ts +++ b/src/services/code-index/vector-store/__tests__/qdrant-client.spec.ts @@ -21,10 +21,14 @@ vitest.mock("../../../../i18n", () => ({ return key // Just return the key for other cases }, })) -vitest.mock("path", () => ({ - ...vitest.importActual("path"), - sep: "/", -})) +vitest.mock("path", async () => { + const actual = await vitest.importActual("path") + return { + ...actual, + sep: "/", + posix: actual.posix, + } +}) const mockQdrantClientInstance = { getCollection: vitest.fn(), @@ -1526,5 +1530,205 @@ describe("QdrantVectorStore", () => { expect(callArgs.limit).toBe(DEFAULT_MAX_SEARCH_RESULTS) expect(callArgs.score_threshold).toBe(DEFAULT_SEARCH_MIN_SCORE) }) + + describe("current directory path handling", () => { + it("should not apply filter when directoryPrefix is '.'", async () => { + const queryVector = [0.1, 0.2, 0.3] + const directoryPrefix = "." + const mockQdrantResults = { + points: [ + { + id: "test-id-1", + score: 0.85, + payload: { + filePath: "src/test.ts", + codeChunk: "test code", + startLine: 1, + endLine: 5, + pathSegments: { "0": "src", "1": "test.ts" }, + }, + }, + ], + } + + mockQdrantClientInstance.query.mockResolvedValue(mockQdrantResults) + + const results = await vectorStore.search(queryVector, directoryPrefix) + + expect(mockQdrantClientInstance.query).toHaveBeenCalledWith(expectedCollectionName, { + query: queryVector, + filter: undefined, // Should be undefined for current directory + score_threshold: DEFAULT_SEARCH_MIN_SCORE, + limit: DEFAULT_MAX_SEARCH_RESULTS, + params: { + hnsw_ef: 128, + exact: false, + }, + with_payload: { + include: ["filePath", "codeChunk", "startLine", "endLine", "pathSegments"], + }, + }) + + expect(results).toEqual(mockQdrantResults.points) + }) + + it("should not apply filter when directoryPrefix is './'", async () => { + const queryVector = [0.1, 0.2, 0.3] + const directoryPrefix = "./" + const mockQdrantResults = { points: [] } + + mockQdrantClientInstance.query.mockResolvedValue(mockQdrantResults) + + await vectorStore.search(queryVector, directoryPrefix) + + expect(mockQdrantClientInstance.query).toHaveBeenCalledWith(expectedCollectionName, { + query: queryVector, + filter: undefined, // Should be undefined for current directory + score_threshold: DEFAULT_SEARCH_MIN_SCORE, + limit: DEFAULT_MAX_SEARCH_RESULTS, + params: { + hnsw_ef: 128, + exact: false, + }, + with_payload: { + include: ["filePath", "codeChunk", "startLine", "endLine", "pathSegments"], + }, + }) + }) + + it("should not apply filter when directoryPrefix is empty string", async () => { + const queryVector = [0.1, 0.2, 0.3] + const directoryPrefix = "" + const mockQdrantResults = { points: [] } + + mockQdrantClientInstance.query.mockResolvedValue(mockQdrantResults) + + await vectorStore.search(queryVector, directoryPrefix) + + expect(mockQdrantClientInstance.query).toHaveBeenCalledWith(expectedCollectionName, { + query: queryVector, + filter: undefined, // Should be undefined for empty string + score_threshold: DEFAULT_SEARCH_MIN_SCORE, + limit: DEFAULT_MAX_SEARCH_RESULTS, + params: { + hnsw_ef: 128, + exact: false, + }, + with_payload: { + include: ["filePath", "codeChunk", "startLine", "endLine", "pathSegments"], + }, + }) + }) + + it("should not apply filter when directoryPrefix is '.\\' (Windows style)", async () => { + const queryVector = [0.1, 0.2, 0.3] + const directoryPrefix = ".\\" + const mockQdrantResults = { points: [] } + + mockQdrantClientInstance.query.mockResolvedValue(mockQdrantResults) + + await vectorStore.search(queryVector, directoryPrefix) + + expect(mockQdrantClientInstance.query).toHaveBeenCalledWith(expectedCollectionName, { + query: queryVector, + filter: undefined, // Should be undefined for Windows current directory + score_threshold: DEFAULT_SEARCH_MIN_SCORE, + limit: DEFAULT_MAX_SEARCH_RESULTS, + params: { + hnsw_ef: 128, + exact: false, + }, + with_payload: { + include: ["filePath", "codeChunk", "startLine", "endLine", "pathSegments"], + }, + }) + }) + + it("should not apply filter when directoryPrefix has trailing slashes", async () => { + const queryVector = [0.1, 0.2, 0.3] + const directoryPrefix = ".///" + const mockQdrantResults = { points: [] } + + mockQdrantClientInstance.query.mockResolvedValue(mockQdrantResults) + + await vectorStore.search(queryVector, directoryPrefix) + + expect(mockQdrantClientInstance.query).toHaveBeenCalledWith(expectedCollectionName, { + query: queryVector, + filter: undefined, // Should be undefined after normalizing trailing slashes + score_threshold: DEFAULT_SEARCH_MIN_SCORE, + limit: DEFAULT_MAX_SEARCH_RESULTS, + params: { + hnsw_ef: 128, + exact: false, + }, + with_payload: { + include: ["filePath", "codeChunk", "startLine", "endLine", "pathSegments"], + }, + }) + }) + + it("should still apply filter for relative paths like './src'", async () => { + const queryVector = [0.1, 0.2, 0.3] + const directoryPrefix = "./src" + const mockQdrantResults = { points: [] } + + mockQdrantClientInstance.query.mockResolvedValue(mockQdrantResults) + + await vectorStore.search(queryVector, directoryPrefix) + + expect(mockQdrantClientInstance.query).toHaveBeenCalledWith(expectedCollectionName, { + query: queryVector, + filter: { + must: [ + { + key: "pathSegments.0", + match: { value: "src" }, + }, + ], + }, // Should normalize "./src" to "src" + score_threshold: DEFAULT_SEARCH_MIN_SCORE, + limit: DEFAULT_MAX_SEARCH_RESULTS, + params: { + hnsw_ef: 128, + exact: false, + }, + with_payload: { + include: ["filePath", "codeChunk", "startLine", "endLine", "pathSegments"], + }, + }) + }) + + it("should still apply filter for regular directory paths", async () => { + const queryVector = [0.1, 0.2, 0.3] + const directoryPrefix = "src" + const mockQdrantResults = { points: [] } + + mockQdrantClientInstance.query.mockResolvedValue(mockQdrantResults) + + await vectorStore.search(queryVector, directoryPrefix) + + expect(mockQdrantClientInstance.query).toHaveBeenCalledWith(expectedCollectionName, { + query: queryVector, + filter: { + must: [ + { + key: "pathSegments.0", + match: { value: "src" }, + }, + ], + }, // Should still create filter for regular paths + score_threshold: DEFAULT_SEARCH_MIN_SCORE, + limit: DEFAULT_MAX_SEARCH_RESULTS, + params: { + hnsw_ef: 128, + exact: false, + }, + with_payload: { + include: ["filePath", "codeChunk", "startLine", "endLine", "pathSegments"], + }, + }) + }) + }) }) }) diff --git a/src/services/code-index/vector-store/qdrant-client.ts b/src/services/code-index/vector-store/qdrant-client.ts index 0218e37295..50f39666c4 100644 --- a/src/services/code-index/vector-store/qdrant-client.ts +++ b/src/services/code-index/vector-store/qdrant-client.ts @@ -375,13 +375,26 @@ export class QdrantVectorStore implements IVectorStore { let filter = undefined if (directoryPrefix) { - const segments = directoryPrefix.split(path.sep).filter(Boolean) - - filter = { - must: segments.map((segment, index) => ({ - key: `pathSegments.${index}`, - match: { value: segment }, - })), + // Check if the path represents current directory + const normalizedPrefix = path.posix.normalize(directoryPrefix.replace(/\\/g, "/")) + // Note: path.posix.normalize("") returns ".", and normalize("./") returns "./" + if (normalizedPrefix === "." || normalizedPrefix === "./") { + // Don't create a filter - search entire workspace + filter = undefined + } else { + // Remove leading "./" from paths like "./src" to normalize them + const cleanedPrefix = path.posix.normalize( + normalizedPrefix.startsWith("./") ? normalizedPrefix.slice(2) : normalizedPrefix, + ) + const segments = cleanedPrefix.split("/").filter(Boolean) + if (segments.length > 0) { + filter = { + must: segments.map((segment, index) => ({ + key: `pathSegments.${index}`, + match: { value: segment }, + })), + } + } } } From c52fdc43971288b31dc12c28114fccc71793a8ba Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Wed, 6 Aug 2025 13:51:10 -0700 Subject: [PATCH 089/253] Clamp default model max tokens to 20% of context window (#6761) --- .../providers/__tests__/openrouter.spec.ts | 8 ++- .../transform/__tests__/model-params.spec.ts | 11 +-- src/shared/__tests__/api.spec.ts | 69 ++++++++++++++++++- src/shared/api.ts | 6 +- 4 files changed, 80 insertions(+), 14 deletions(-) diff --git a/src/api/providers/__tests__/openrouter.spec.ts b/src/api/providers/__tests__/openrouter.spec.ts index ea850c47be..ae36fc1399 100644 --- a/src/api/providers/__tests__/openrouter.spec.ts +++ b/src/api/providers/__tests__/openrouter.spec.ts @@ -98,9 +98,11 @@ describe("OpenRouterHandler", () => { }) const result = await handler.fetchModel() - expect(result.maxTokens).toBe(128000) // Use actual implementation value - expect(result.reasoningBudget).toBeUndefined() // Use actual implementation value - expect(result.temperature).toBe(0) // Use actual implementation value + // With the new clamping logic, 128000 tokens (64% of 200000 context window) + // gets clamped to 20% of context window: 200000 * 0.2 = 40000 + expect(result.maxTokens).toBe(40000) + expect(result.reasoningBudget).toBeUndefined() + expect(result.temperature).toBe(0) }) it("does not honor custom maxTokens for non-thinking models", async () => { diff --git a/src/api/transform/__tests__/model-params.spec.ts b/src/api/transform/__tests__/model-params.spec.ts index 44930aa5b8..b5a02f534e 100644 --- a/src/api/transform/__tests__/model-params.spec.ts +++ b/src/api/transform/__tests__/model-params.spec.ts @@ -293,12 +293,12 @@ describe("getModelParams", () => { it("should not honor customMaxThinkingTokens for non-reasoning budget models", () => { const model: ModelInfo = { ...baseModel, - maxTokens: 4000, + maxTokens: 3000, // 3000 is 18.75% of 16000 context window, within 20% threshold } expect(getModelParams({ ...anthropicParams, settings: { modelMaxThinkingTokens: 1500 }, model })).toEqual({ format: anthropicParams.format, - maxTokens: 4000, + maxTokens: 3000, // Uses model.maxTokens since it's within 20% threshold temperature: 0, // Using default temperature. reasoningEffort: undefined, reasoningBudget: undefined, // Should remain undefined despite customMaxThinkingTokens being set. @@ -565,7 +565,7 @@ describe("getModelParams", () => { it("should use reasoningEffort if supportsReasoningEffort is false but reasoningEffort is set", () => { const model: ModelInfo = { ...baseModel, - maxTokens: 8000, + maxTokens: 3000, // Changed to 3000 (18.75% of 16000), which is within 20% threshold supportsReasoningEffort: false, reasoningEffort: "medium", } @@ -576,7 +576,7 @@ describe("getModelParams", () => { model, }) - expect(result.maxTokens).toBe(8000) + expect(result.maxTokens).toBe(3000) // Now uses model.maxTokens since it's within 20% threshold expect(result.reasoningEffort).toBe("medium") }) }) @@ -595,7 +595,8 @@ describe("getModelParams", () => { model, }) - // Should discard model's maxTokens and use default + // For hybrid models (supportsReasoningBudget) in Anthropic contexts, + // should discard model's maxTokens and use ANTHROPIC_DEFAULT_MAX_TOKENS expect(result.maxTokens).toBe(ANTHROPIC_DEFAULT_MAX_TOKENS) expect(result.reasoningBudget).toBeUndefined() }) diff --git a/src/shared/__tests__/api.spec.ts b/src/shared/__tests__/api.spec.ts index 08d4bdf3bb..80c3db1b7d 100644 --- a/src/shared/__tests__/api.spec.ts +++ b/src/shared/__tests__/api.spec.ts @@ -25,11 +25,13 @@ describe("getModelMaxOutputTokens", () => { expect(result).toBe(16384) }) - test("should return model maxTokens when not using claude-code provider", () => { + test("should return model maxTokens when not using claude-code provider and maxTokens is within 20% of context window", () => { const settings: ProviderSettings = { apiProvider: "anthropic", } + // mockModel has maxTokens: 8192 and contextWindow: 200000 + // 8192 is 4.096% of 200000, which is <= 20%, so it should use model.maxTokens const result = getModelMaxOutputTokens({ modelId: "claude-3-5-sonnet-20241022", model: mockModel, @@ -115,7 +117,7 @@ describe("getModelMaxOutputTokens", () => { contextWindow: 1_048_576, supportsPromptCache: false, supportsReasoningBudget: true, - maxTokens: 65_535, + maxTokens: 65_535, // 65_535 is ~6.25% of 1_048_576, which is <= 20% } const settings: ProviderSettings = { @@ -124,7 +126,68 @@ describe("getModelMaxOutputTokens", () => { } const result = getModelMaxOutputTokens({ modelId: geminiModelId, model, settings }) - expect(result).toBe(65_535) // Should use model.maxTokens, not ANTHROPIC_DEFAULT_MAX_TOKENS + expect(result).toBe(65_535) // Should use model.maxTokens since it's within 20% threshold + }) + + test("should clamp maxTokens to 20% of context window when maxTokens exceeds threshold", () => { + const model: ModelInfo = { + contextWindow: 100_000, + supportsPromptCache: false, + maxTokens: 50_000, // 50% of context window, exceeds 20% threshold + } + + const settings: ProviderSettings = { + apiProvider: "openai", + } + + const result = getModelMaxOutputTokens({ + modelId: "gpt-4", + model, + settings, + format: "openai", + }) + // Should clamp to 20% of context window: 100_000 * 0.2 = 20_000 + expect(result).toBe(20_000) + }) + + test("should clamp maxTokens to 20% of context window for Anthropic models when maxTokens exceeds threshold", () => { + const model: ModelInfo = { + contextWindow: 100_000, + supportsPromptCache: true, + maxTokens: 50_000, // 50% of context window, exceeds 20% threshold + } + + const settings: ProviderSettings = { + apiProvider: "anthropic", + } + + const result = getModelMaxOutputTokens({ + modelId: "claude-3-5-sonnet-20241022", + model, + settings, + }) + // Should clamp to 20% of context window: 100_000 * 0.2 = 20_000 + expect(result).toBe(20_000) + }) + + test("should use model.maxTokens when exactly at 20% threshold", () => { + const model: ModelInfo = { + contextWindow: 100_000, + supportsPromptCache: false, + maxTokens: 20_000, // Exactly 20% of context window + } + + const settings: ProviderSettings = { + apiProvider: "openai", + } + + const result = getModelMaxOutputTokens({ + modelId: "gpt-4", + model, + settings, + format: "openai", + }) + expect(result).toBe(20_000) // Should use model.maxTokens since it's exactly at 20% }) test("should return modelMaxTokens from settings when reasoning budget is required", () => { diff --git a/src/shared/api.ts b/src/shared/api.ts index 44227ad7e4..4cd2459f70 100644 --- a/src/shared/api.ts +++ b/src/shared/api.ts @@ -90,9 +90,9 @@ export const getModelMaxOutputTokens = ({ return ANTHROPIC_DEFAULT_MAX_TOKENS } - // If model has explicit maxTokens and it's not the full context window, use it - if (model.maxTokens && model.maxTokens !== model.contextWindow) { - return model.maxTokens + // If model has explicit maxTokens, clamp it to 20% of the context window + if (model.maxTokens) { + return Math.min(model.maxTokens, model.contextWindow * 0.2) } // For non-Anthropic formats without explicit maxTokens, return undefined From c99ccf0bb0018348ec93d44e92d43f5016dc1339 Mon Sep 17 00:00:00 2001 From: Daniel <57051444+daniel-lxs@users.noreply.github.com> Date: Wed, 6 Aug 2025 19:24:18 -0500 Subject: [PATCH 090/253] fix: Replace scrollToIndex with scrollTo to fix scroll jitter (#6780) --- webview-ui/src/components/chat/ChatView.tsx | 35 ++++++--------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx index e73ac67701..9b8c96dea1 100644 --- a/webview-ui/src/components/chat/ChatView.tsx +++ b/webview-ui/src/components/chat/ChatView.tsx @@ -1334,23 +1334,10 @@ const ChatViewComponent: React.ForwardRefRenderFunction - debounce( - () => { - const lastIndex = groupedMessages.length - 1 - if (lastIndex >= 0) { - virtuosoRef.current?.scrollToIndex({ - index: lastIndex, - behavior: "smooth", - align: "end", - }) - } - }, - 10, - { - immediate: true, - }, - ), - [groupedMessages.length], + debounce(() => virtuosoRef.current?.scrollTo({ top: Number.MAX_SAFE_INTEGER, behavior: "smooth" }), 10, { + immediate: true, + }), + [], ) useEffect(() => { @@ -1362,15 +1349,11 @@ const ChatViewComponent: React.ForwardRefRenderFunction { - const lastIndex = groupedMessages.length - 1 - if (lastIndex >= 0) { - virtuosoRef.current?.scrollToIndex({ - index: lastIndex, - behavior: "auto", // Instant causes crash. - align: "end", - }) - } - }, [groupedMessages.length]) + virtuosoRef.current?.scrollTo({ + top: Number.MAX_SAFE_INTEGER, + behavior: "auto", // Instant causes crash. + }) + }, []) const handleSetExpandedRow = useCallback( (ts: number, expand?: boolean) => { From 8d05bc179b23445629139fe1654ac008013337da Mon Sep 17 00:00:00 2001 From: Hannes Rudolph Date: Wed, 6 Aug 2025 18:37:51 -0600 Subject: [PATCH 091/253] fix: prevent unnecessary MCP server refresh on settings save (#6772) (#6779) --- .../__tests__/webviewMessageHandler.spec.ts | 148 ++++++++++++++++++ src/core/webview/webviewMessageHandler.ts | 15 +- 2 files changed, 159 insertions(+), 4 deletions(-) diff --git a/src/core/webview/__tests__/webviewMessageHandler.spec.ts b/src/core/webview/__tests__/webviewMessageHandler.spec.ts index 9a1683e464..8e61f3f0d9 100644 --- a/src/core/webview/__tests__/webviewMessageHandler.spec.ts +++ b/src/core/webview/__tests__/webviewMessageHandler.spec.ts @@ -35,6 +35,7 @@ const mockClineProvider = { getCurrentCline: vi.fn(), getTaskWithId: vi.fn(), initClineWithHistoryItem: vi.fn(), + getMcpHub: vi.fn(), } as unknown as ClineProvider import { t } from "../../../i18n" @@ -576,3 +577,150 @@ describe("webviewMessageHandler - message dialog preferences", () => { }) }) }) + +describe("webviewMessageHandler - mcpEnabled", () => { + let mockMcpHub: any + + beforeEach(() => { + vi.clearAllMocks() + + // Create a mock McpHub instance + mockMcpHub = { + handleMcpEnabledChange: vi.fn().mockResolvedValue(undefined), + } + + // Mock the getMcpHub method to return our mock McpHub + mockClineProvider.getMcpHub = vi.fn().mockReturnValue(mockMcpHub) + + // Reset the contextProxy getValue mock + vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(undefined) + }) + + it("should not refresh MCP servers when value does not change (true to true)", async () => { + // Setup: mcpEnabled is already true + vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(true) + + // Act: Send mcpEnabled message with same value + await webviewMessageHandler(mockClineProvider, { + type: "mcpEnabled", + bool: true, + }) + + // Assert: handleMcpEnabledChange should not be called + expect(mockMcpHub.handleMcpEnabledChange).not.toHaveBeenCalled() + expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("mcpEnabled", true) + expect(mockClineProvider.postStateToWebview).toHaveBeenCalled() + }) + + it("should not refresh MCP servers when value does not change (false to false)", async () => { + // Setup: mcpEnabled is already false + vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(false) + + // Act: Send mcpEnabled message with same value + await webviewMessageHandler(mockClineProvider, { + type: "mcpEnabled", + bool: false, + }) + + // Assert: handleMcpEnabledChange should not be called + expect(mockMcpHub.handleMcpEnabledChange).not.toHaveBeenCalled() + expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("mcpEnabled", false) + expect(mockClineProvider.postStateToWebview).toHaveBeenCalled() + }) + + it("should refresh MCP servers when value changes from true to false", async () => { + // Setup: mcpEnabled is true + vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(true) + + // Act: Send mcpEnabled message with false + await webviewMessageHandler(mockClineProvider, { + type: "mcpEnabled", + bool: false, + }) + + // Assert: handleMcpEnabledChange should be called + expect(mockMcpHub.handleMcpEnabledChange).toHaveBeenCalledWith(false) + expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("mcpEnabled", false) + expect(mockClineProvider.postStateToWebview).toHaveBeenCalled() + }) + + it("should refresh MCP servers when value changes from false to true", async () => { + // Setup: mcpEnabled is false + vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(false) + + // Act: Send mcpEnabled message with true + await webviewMessageHandler(mockClineProvider, { + type: "mcpEnabled", + bool: true, + }) + + // Assert: handleMcpEnabledChange should be called + expect(mockMcpHub.handleMcpEnabledChange).toHaveBeenCalledWith(true) + expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("mcpEnabled", true) + expect(mockClineProvider.postStateToWebview).toHaveBeenCalled() + }) + + it("should handle undefined values with defaults correctly", async () => { + // Setup: mcpEnabled is undefined (defaults to true) + vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(undefined) + + // Act: Send mcpEnabled message with undefined (defaults to true) + await webviewMessageHandler(mockClineProvider, { + type: "mcpEnabled", + bool: undefined, + }) + + // Assert: Should use default value (true) and not trigger refresh since both are true + expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("mcpEnabled", true) + expect(mockMcpHub.handleMcpEnabledChange).not.toHaveBeenCalled() + expect(mockClineProvider.postStateToWebview).toHaveBeenCalled() + }) + + it("should handle when mcpEnabled changes from undefined to false", async () => { + // Setup: mcpEnabled is undefined (defaults to true) + vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(undefined) + + // Act: Send mcpEnabled message with false + await webviewMessageHandler(mockClineProvider, { + type: "mcpEnabled", + bool: false, + }) + + // Assert: Should trigger refresh since undefined defaults to true and we're changing to false + expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("mcpEnabled", false) + expect(mockMcpHub.handleMcpEnabledChange).toHaveBeenCalledWith(false) + expect(mockClineProvider.postStateToWebview).toHaveBeenCalled() + }) + + it("should not call handleMcpEnabledChange when McpHub is not available", async () => { + // Setup: No McpHub instance available + mockClineProvider.getMcpHub = vi.fn().mockReturnValue(null) + vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(true) + + // Act: Send mcpEnabled message with false + await webviewMessageHandler(mockClineProvider, { + type: "mcpEnabled", + bool: false, + }) + + // Assert: State should be updated but handleMcpEnabledChange should not be called + expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("mcpEnabled", false) + expect(mockClineProvider.postStateToWebview).toHaveBeenCalled() + // No error should be thrown + }) + + it("should always update state even when value doesn't change", async () => { + // Setup: mcpEnabled is true + vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(true) + + // Act: Send mcpEnabled message with same value + await webviewMessageHandler(mockClineProvider, { + type: "mcpEnabled", + bool: true, + }) + + // Assert: State should still be updated to ensure consistency + expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("mcpEnabled", true) + expect(mockClineProvider.postStateToWebview).toHaveBeenCalled() + }) +}) diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts index f5dc6a467f..e2c6d6a475 100644 --- a/src/core/webview/webviewMessageHandler.ts +++ b/src/core/webview/webviewMessageHandler.ts @@ -900,12 +900,19 @@ export const webviewMessageHandler = async ( } case "mcpEnabled": const mcpEnabled = message.bool ?? true + const currentMcpEnabled = getGlobalState("mcpEnabled") ?? true + + // Always update the state to ensure consistency await updateGlobalState("mcpEnabled", mcpEnabled) - // Delegate MCP enable/disable logic to McpHub - const mcpHubInstance = provider.getMcpHub() - if (mcpHubInstance) { - await mcpHubInstance.handleMcpEnabledChange(mcpEnabled) + // Only refresh MCP connections if the value actually changed + // This prevents expensive MCP server refresh operations when saving unrelated settings + if (currentMcpEnabled !== mcpEnabled) { + // Delegate MCP enable/disable logic to McpHub + const mcpHubInstance = provider.getMcpHub() + if (mcpHubInstance) { + await mcpHubInstance.handleMcpEnabledChange(mcpEnabled) + } } await provider.postStateToWebview() From ba13c5e5bf759d966bb7d8192ae34a5b20854992 Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Wed, 6 Aug 2025 20:56:25 -0700 Subject: [PATCH 092/253] Release v3.25.8 (#6789) --- .changeset/v3.25.8.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .changeset/v3.25.8.md diff --git a/.changeset/v3.25.8.md b/.changeset/v3.25.8.md new file mode 100644 index 0000000000..649fdb2c38 --- /dev/null +++ b/.changeset/v3.25.8.md @@ -0,0 +1,14 @@ +--- +"roo-cline": patch +--- + +- Fix: Prevent disabled MCP servers from starting processes and show correct status (#6036 by @hannesrudolph, PR by @app/roomote) +- Fix: Handle current directory path "." correctly in codebase_search tool (#6514 by @hannesrudolph, PR by @app/roomote) +- Fix: Trim whitespace from OpenAI base URL to fix model detection (#6559 by @vauhochzett, PR by @app/roomote) +- Feat: Reduce Gemini 2.5 Pro minimum thinking budget to 128 (thanks @app/roomote!) +- Fix: Improve handling of net::ERR_ABORTED errors in URL fetching (#6632 by @QuinsZouls, PR by @app/roomote) +- Fix: Recover from error state when Qdrant becomes available (#6660 by @hannesrudolph, PR by @app/roomote) +- Fix: Resolve memory leak in ChatView virtual scrolling implementation (thanks @xyOz-dev!) +- Add: Swift files to fallback list (#5857 by @niteshbalusu11, #6555 by @sealad886, PR by @niteshbalusu11) +- Feat: Clamp default model max tokens to 20% of context window (thanks @mrubens!) +- Fix: Prevent unnecessary MCP server refresh on settings save (#6772 by @hannesrudolph, PR by @hannesrudolph) From a198b6aebc5abb9bd7d2dc747e5e11957c490660 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Aug 2025 21:00:33 -0700 Subject: [PATCH 093/253] Changeset version bump (#6790) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens --- .changeset/v3.25.8.md | 14 -------------- CHANGELOG.md | 12 ++++++++++++ src/package.json | 2 +- 3 files changed, 13 insertions(+), 15 deletions(-) delete mode 100644 .changeset/v3.25.8.md diff --git a/.changeset/v3.25.8.md b/.changeset/v3.25.8.md deleted file mode 100644 index 649fdb2c38..0000000000 --- a/.changeset/v3.25.8.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -"roo-cline": patch ---- - -- Fix: Prevent disabled MCP servers from starting processes and show correct status (#6036 by @hannesrudolph, PR by @app/roomote) -- Fix: Handle current directory path "." correctly in codebase_search tool (#6514 by @hannesrudolph, PR by @app/roomote) -- Fix: Trim whitespace from OpenAI base URL to fix model detection (#6559 by @vauhochzett, PR by @app/roomote) -- Feat: Reduce Gemini 2.5 Pro minimum thinking budget to 128 (thanks @app/roomote!) -- Fix: Improve handling of net::ERR_ABORTED errors in URL fetching (#6632 by @QuinsZouls, PR by @app/roomote) -- Fix: Recover from error state when Qdrant becomes available (#6660 by @hannesrudolph, PR by @app/roomote) -- Fix: Resolve memory leak in ChatView virtual scrolling implementation (thanks @xyOz-dev!) -- Add: Swift files to fallback list (#5857 by @niteshbalusu11, #6555 by @sealad886, PR by @niteshbalusu11) -- Feat: Clamp default model max tokens to 20% of context window (thanks @mrubens!) -- Fix: Prevent unnecessary MCP server refresh on settings save (#6772 by @hannesrudolph, PR by @hannesrudolph) diff --git a/CHANGELOG.md b/CHANGELOG.md index c72d2f5f63..372c98261b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Roo Code Changelog +## [3.25.8] - 2025-08-06 + +- Fix: Prevent disabled MCP servers from starting processes and show correct status (#6036 by @hannesrudolph, PR by @app/roomote) +- Fix: Handle current directory path "." correctly in codebase_search tool (#6514 by @hannesrudolph, PR by @app/roomote) +- Fix: Trim whitespace from OpenAI base URL to fix model detection (#6559 by @vauhochzett, PR by @app/roomote) +- Feat: Reduce Gemini 2.5 Pro minimum thinking budget to 128 (thanks @app/roomote!) +- Fix: Improve handling of net::ERR_ABORTED errors in URL fetching (#6632 by @QuinsZouls, PR by @app/roomote) +- Fix: Recover from error state when Qdrant becomes available (#6660 by @hannesrudolph, PR by @app/roomote) +- Fix: Resolve memory leak in ChatView virtual scrolling implementation (thanks @xyOz-dev!) +- Add: Swift files to fallback list (#5857 by @niteshbalusu11, #6555 by @sealad886, PR by @niteshbalusu11) +- Feat: Clamp default model max tokens to 20% of context window (thanks @mrubens!) + ## [3.25.7] - 2025-08-05 - Add support for Claude Opus 4.1 diff --git a/src/package.json b/src/package.json index dab031404d..2731b8ea19 100644 --- a/src/package.json +++ b/src/package.json @@ -3,7 +3,7 @@ "displayName": "%extension.displayName%", "description": "%extension.description%", "publisher": "RooVeterinaryInc", - "version": "3.25.7", + "version": "3.25.8", "icon": "assets/icons/icon.png", "galleryBanner": { "color": "#617A91", From 37330b020982dac9b74086f62c3ffa718992d013 Mon Sep 17 00:00:00 2001 From: Chris Estreich Date: Wed, 6 Aug 2025 20:51:41 -1000 Subject: [PATCH 094/253] Bring back "Use @roo-code/cloud from npm" (#6795) --- .dockerignore | 1 - packages/cloud/eslint.config.mjs | 4 - packages/cloud/package.json | 25 - packages/cloud/src/CloudAPI.ts | 122 -- packages/cloud/src/CloudService.ts | 288 ----- packages/cloud/src/CloudSettingsService.ts | 152 --- packages/cloud/src/CloudShareService.ts | 43 - packages/cloud/src/RefreshTimer.ts | 154 --- packages/cloud/src/SettingsService.ts | 23 - packages/cloud/src/StaticSettingsService.ts | 41 - packages/cloud/src/TelemetryClient.ts | 169 --- packages/cloud/src/__mocks__/vscode.ts | 57 - .../CloudService.integration.test.ts | 146 --- .../cloud/src/__tests__/CloudService.test.ts | 604 --------- .../__tests__/CloudSettingsService.test.ts | 476 ------- .../src/__tests__/CloudShareService.test.ts | 310 ----- .../cloud/src/__tests__/RefreshTimer.test.ts | 210 ---- .../__tests__/StaticSettingsService.test.ts | 102 -- .../src/__tests__/TelemetryClient.test.ts | 738 ----------- .../auth/StaticTokenAuthService.spec.ts | 174 --- .../src/__tests__/auth/WebAuthService.spec.ts | 1113 ----------------- packages/cloud/src/auth/AuthService.ts | 36 - .../cloud/src/auth/StaticTokenAuthService.ts | 71 -- packages/cloud/src/auth/WebAuthService.ts | 646 ---------- packages/cloud/src/auth/index.ts | 3 - packages/cloud/src/config.ts | 5 - packages/cloud/src/errors.ts | 42 - packages/cloud/src/index.ts | 4 - packages/cloud/src/types.ts | 4 - packages/cloud/src/utils.ts | 10 - packages/cloud/tsconfig.json | 5 - packages/cloud/vitest.config.ts | 14 - packages/evals/Dockerfile.runner | 2 - pnpm-lock.yaml | 219 ++-- src/extension.ts | 14 +- src/package.json | 2 +- 36 files changed, 151 insertions(+), 5878 deletions(-) delete mode 100644 packages/cloud/eslint.config.mjs delete mode 100644 packages/cloud/package.json delete mode 100644 packages/cloud/src/CloudAPI.ts delete mode 100644 packages/cloud/src/CloudService.ts delete mode 100644 packages/cloud/src/CloudSettingsService.ts delete mode 100644 packages/cloud/src/CloudShareService.ts delete mode 100644 packages/cloud/src/RefreshTimer.ts delete mode 100644 packages/cloud/src/SettingsService.ts delete mode 100644 packages/cloud/src/StaticSettingsService.ts delete mode 100644 packages/cloud/src/TelemetryClient.ts delete mode 100644 packages/cloud/src/__mocks__/vscode.ts delete mode 100644 packages/cloud/src/__tests__/CloudService.integration.test.ts delete mode 100644 packages/cloud/src/__tests__/CloudService.test.ts delete mode 100644 packages/cloud/src/__tests__/CloudSettingsService.test.ts delete mode 100644 packages/cloud/src/__tests__/CloudShareService.test.ts delete mode 100644 packages/cloud/src/__tests__/RefreshTimer.test.ts delete mode 100644 packages/cloud/src/__tests__/StaticSettingsService.test.ts delete mode 100644 packages/cloud/src/__tests__/TelemetryClient.test.ts delete mode 100644 packages/cloud/src/__tests__/auth/StaticTokenAuthService.spec.ts delete mode 100644 packages/cloud/src/__tests__/auth/WebAuthService.spec.ts delete mode 100644 packages/cloud/src/auth/AuthService.ts delete mode 100644 packages/cloud/src/auth/StaticTokenAuthService.ts delete mode 100644 packages/cloud/src/auth/WebAuthService.ts delete mode 100644 packages/cloud/src/auth/index.ts delete mode 100644 packages/cloud/src/config.ts delete mode 100644 packages/cloud/src/errors.ts delete mode 100644 packages/cloud/src/index.ts delete mode 100644 packages/cloud/src/types.ts delete mode 100644 packages/cloud/src/utils.ts delete mode 100644 packages/cloud/tsconfig.json delete mode 100644 packages/cloud/vitest.config.ts diff --git a/.dockerignore b/.dockerignore index 514136ac91..6359978833 100644 --- a/.dockerignore +++ b/.dockerignore @@ -80,7 +80,6 @@ src/node_modules !webview-ui/ !packages/evals/.docker/entrypoints/runner.sh !packages/build/ -!packages/cloud/ !packages/config-eslint/ !packages/config-typescript/ !packages/evals/ diff --git a/packages/cloud/eslint.config.mjs b/packages/cloud/eslint.config.mjs deleted file mode 100644 index 694bf73664..0000000000 --- a/packages/cloud/eslint.config.mjs +++ /dev/null @@ -1,4 +0,0 @@ -import { config } from "@roo-code/config-eslint/base" - -/** @type {import("eslint").Linter.Config} */ -export default [...config] diff --git a/packages/cloud/package.json b/packages/cloud/package.json deleted file mode 100644 index d67b5ae7eb..0000000000 --- a/packages/cloud/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "@roo-code/cloud", - "description": "Roo Code Cloud VSCode integration.", - "version": "0.0.0", - "type": "module", - "exports": "./src/index.ts", - "scripts": { - "lint": "eslint src --ext=ts --max-warnings=0", - "check-types": "tsc --noEmit", - "test": "vitest run", - "clean": "rimraf dist .turbo" - }, - "dependencies": { - "@roo-code/telemetry": "workspace:^", - "@roo-code/types": "workspace:^", - "zod": "^3.25.61" - }, - "devDependencies": { - "@roo-code/config-eslint": "workspace:^", - "@roo-code/config-typescript": "workspace:^", - "@types/node": "20.x", - "@types/vscode": "^1.84.0", - "vitest": "^3.2.3" - } -} diff --git a/packages/cloud/src/CloudAPI.ts b/packages/cloud/src/CloudAPI.ts deleted file mode 100644 index 52c3c2521d..0000000000 --- a/packages/cloud/src/CloudAPI.ts +++ /dev/null @@ -1,122 +0,0 @@ -import { type ShareVisibility, type ShareResponse, shareResponseSchema } from "@roo-code/types" - -import { getRooCodeApiUrl } from "./config" -import type { AuthService } from "./auth" -import { getUserAgent } from "./utils" -import { AuthenticationError, CloudAPIError, NetworkError, TaskNotFoundError } from "./errors" - -interface CloudAPIRequestOptions extends Omit { - timeout?: number - headers?: Record -} - -export class CloudAPI { - private authService: AuthService - private log: (...args: unknown[]) => void - private baseUrl: string - - constructor(authService: AuthService, log?: (...args: unknown[]) => void) { - this.authService = authService - this.log = log || console.log - this.baseUrl = getRooCodeApiUrl() - } - - private async request( - endpoint: string, - options: CloudAPIRequestOptions & { - parseResponse?: (data: unknown) => T - } = {}, - ): Promise { - const { timeout = 10000, parseResponse, headers = {}, ...fetchOptions } = options - - const sessionToken = this.authService.getSessionToken() - - if (!sessionToken) { - throw new AuthenticationError() - } - - const url = `${this.baseUrl}${endpoint}` - - const requestHeaders = { - "Content-Type": "application/json", - Authorization: `Bearer ${sessionToken}`, - "User-Agent": getUserAgent(), - ...headers, - } - - try { - const response = await fetch(url, { - ...fetchOptions, - headers: requestHeaders, - signal: AbortSignal.timeout(timeout), - }) - - if (!response.ok) { - await this.handleErrorResponse(response, endpoint) - } - - const data = await response.json() - - if (parseResponse) { - return parseResponse(data) - } - - return data as T - } catch (error) { - if (error instanceof TypeError && error.message.includes("fetch")) { - throw new NetworkError(`Network error while calling ${endpoint}`) - } - - if (error instanceof CloudAPIError) { - throw error - } - - if (error instanceof Error && error.name === "AbortError") { - throw new CloudAPIError(`Request to ${endpoint} timed out`, undefined, undefined) - } - - throw new CloudAPIError( - `Unexpected error while calling ${endpoint}: ${error instanceof Error ? error.message : String(error)}`, - ) - } - } - - private async handleErrorResponse(response: Response, endpoint: string): Promise { - let responseBody: unknown - - try { - responseBody = await response.json() - } catch { - responseBody = await response.text() - } - - switch (response.status) { - case 401: - throw new AuthenticationError() - case 404: - if (endpoint.includes("/share")) { - throw new TaskNotFoundError() - } - throw new CloudAPIError(`Resource not found: ${endpoint}`, 404, responseBody) - default: - throw new CloudAPIError( - `HTTP ${response.status}: ${response.statusText}`, - response.status, - responseBody, - ) - } - } - - async shareTask(taskId: string, visibility: ShareVisibility = "organization"): Promise { - this.log(`[CloudAPI] Sharing task ${taskId} with visibility: ${visibility}`) - - const response = await this.request("/api/extension/share", { - method: "POST", - body: JSON.stringify({ taskId, visibility }), - parseResponse: (data) => shareResponseSchema.parse(data), - }) - - this.log("[CloudAPI] Share response:", response) - return response - } -} diff --git a/packages/cloud/src/CloudService.ts b/packages/cloud/src/CloudService.ts deleted file mode 100644 index 7777d6b220..0000000000 --- a/packages/cloud/src/CloudService.ts +++ /dev/null @@ -1,288 +0,0 @@ -import * as vscode from "vscode" -import EventEmitter from "events" - -import type { - CloudUserInfo, - TelemetryEvent, - OrganizationAllowList, - OrganizationSettings, - ClineMessage, - ShareVisibility, -} from "@roo-code/types" -import { TelemetryService } from "@roo-code/telemetry" - -import { CloudServiceEvents } from "./types" -import { TaskNotFoundError } from "./errors" -import type { AuthService } from "./auth" -import { WebAuthService, StaticTokenAuthService } from "./auth" -import type { SettingsService } from "./SettingsService" -import { CloudSettingsService } from "./CloudSettingsService" -import { StaticSettingsService } from "./StaticSettingsService" -import { TelemetryClient } from "./TelemetryClient" -import { CloudShareService } from "./CloudShareService" -import { CloudAPI } from "./CloudAPI" - -type AuthStateChangedPayload = CloudServiceEvents["auth-state-changed"][0] -type AuthUserInfoPayload = CloudServiceEvents["user-info"][0] -type SettingsPayload = CloudServiceEvents["settings-updated"][0] - -export class CloudService extends EventEmitter implements vscode.Disposable { - private static _instance: CloudService | null = null - - private context: vscode.ExtensionContext - private authStateListener: (data: AuthStateChangedPayload) => void - private authUserInfoListener: (data: AuthUserInfoPayload) => void - private authService: AuthService | null = null - private settingsListener: (data: SettingsPayload) => void - private settingsService: SettingsService | null = null - private telemetryClient: TelemetryClient | null = null - private shareService: CloudShareService | null = null - private cloudAPI: CloudAPI | null = null - private isInitialized = false - private log: (...args: unknown[]) => void - - private constructor(context: vscode.ExtensionContext, log?: (...args: unknown[]) => void) { - super() - - this.context = context - this.log = log || console.log - this.authStateListener = (data: AuthStateChangedPayload) => { - this.emit("auth-state-changed", data) - } - this.authUserInfoListener = (data: AuthUserInfoPayload) => { - this.emit("user-info", data) - } - this.settingsListener = (data: SettingsPayload) => { - this.emit("settings-updated", data) - } - } - - public async initialize(): Promise { - if (this.isInitialized) { - return - } - - try { - const cloudToken = process.env.ROO_CODE_CLOUD_TOKEN - - if (cloudToken && cloudToken.length > 0) { - this.authService = new StaticTokenAuthService(this.context, cloudToken, this.log) - } else { - this.authService = new WebAuthService(this.context, this.log) - } - - await this.authService.initialize() - - this.authService.on("auth-state-changed", this.authStateListener) - this.authService.on("user-info", this.authUserInfoListener) - - // Check for static settings environment variable. - const staticOrgSettings = process.env.ROO_CODE_CLOUD_ORG_SETTINGS - - if (staticOrgSettings && staticOrgSettings.length > 0) { - this.settingsService = new StaticSettingsService(staticOrgSettings, this.log) - } else { - const cloudSettingsService = new CloudSettingsService(this.context, this.authService, this.log) - cloudSettingsService.initialize() - - cloudSettingsService.on("settings-updated", this.settingsListener) - - this.settingsService = cloudSettingsService - } - - this.cloudAPI = new CloudAPI(this.authService, this.log) - this.telemetryClient = new TelemetryClient(this.authService, this.settingsService) - this.shareService = new CloudShareService(this.cloudAPI, this.settingsService, this.log) - - try { - TelemetryService.instance.register(this.telemetryClient) - } catch (error) { - this.log("[CloudService] Failed to register TelemetryClient:", error) - } - - this.isInitialized = true - } catch (error) { - this.log("[CloudService] Failed to initialize:", error) - throw new Error(`Failed to initialize CloudService: ${error}`) - } - } - - // AuthService - - public async login(): Promise { - this.ensureInitialized() - return this.authService!.login() - } - - public async logout(): Promise { - this.ensureInitialized() - return this.authService!.logout() - } - - public isAuthenticated(): boolean { - this.ensureInitialized() - return this.authService!.isAuthenticated() - } - - public hasActiveSession(): boolean { - this.ensureInitialized() - return this.authService!.hasActiveSession() - } - - public hasOrIsAcquiringActiveSession(): boolean { - this.ensureInitialized() - return this.authService!.hasOrIsAcquiringActiveSession() - } - - public getUserInfo(): CloudUserInfo | null { - this.ensureInitialized() - return this.authService!.getUserInfo() - } - - public getOrganizationId(): string | null { - this.ensureInitialized() - const userInfo = this.authService!.getUserInfo() - return userInfo?.organizationId || null - } - - public getOrganizationName(): string | null { - this.ensureInitialized() - const userInfo = this.authService!.getUserInfo() - return userInfo?.organizationName || null - } - - public getOrganizationRole(): string | null { - this.ensureInitialized() - const userInfo = this.authService!.getUserInfo() - return userInfo?.organizationRole || null - } - - public hasStoredOrganizationId(): boolean { - this.ensureInitialized() - return this.authService!.getStoredOrganizationId() !== null - } - - public getStoredOrganizationId(): string | null { - this.ensureInitialized() - return this.authService!.getStoredOrganizationId() - } - - public getAuthState(): string { - this.ensureInitialized() - return this.authService!.getState() - } - - public async handleAuthCallback( - code: string | null, - state: string | null, - organizationId?: string | null, - ): Promise { - this.ensureInitialized() - return this.authService!.handleCallback(code, state, organizationId) - } - - // SettingsService - - public getAllowList(): OrganizationAllowList { - this.ensureInitialized() - return this.settingsService!.getAllowList() - } - - public getOrganizationSettings(): OrganizationSettings | undefined { - this.ensureInitialized() - return this.settingsService!.getSettings() - } - - // TelemetryClient - - public captureEvent(event: TelemetryEvent): void { - this.ensureInitialized() - this.telemetryClient!.capture(event) - } - - // ShareService - - public async shareTask( - taskId: string, - visibility: ShareVisibility = "organization", - clineMessages?: ClineMessage[], - ) { - this.ensureInitialized() - - try { - return await this.shareService!.shareTask(taskId, visibility) - } catch (error) { - if (error instanceof TaskNotFoundError && clineMessages) { - // Backfill messages and retry. - await this.telemetryClient!.backfillMessages(clineMessages, taskId) - return await this.shareService!.shareTask(taskId, visibility) - } - throw error - } - } - - public async canShareTask(): Promise { - this.ensureInitialized() - return this.shareService!.canShareTask() - } - - // Lifecycle - - public dispose(): void { - if (this.authService) { - this.authService.off("auth-state-changed", this.authStateListener) - this.authService.off("user-info", this.authUserInfoListener) - } - - if (this.settingsService) { - if (this.settingsService instanceof CloudSettingsService) { - this.settingsService.off("settings-updated", this.settingsListener) - } - this.settingsService.dispose() - } - - this.isInitialized = false - } - - private ensureInitialized(): void { - if (!this.isInitialized) { - throw new Error("CloudService not initialized.") - } - } - - static get instance(): CloudService { - if (!this._instance) { - throw new Error("CloudService not initialized") - } - - return this._instance - } - - static async createInstance( - context: vscode.ExtensionContext, - log?: (...args: unknown[]) => void, - ): Promise { - if (this._instance) { - throw new Error("CloudService instance already created") - } - - this._instance = new CloudService(context, log) - await this._instance.initialize() - return this._instance - } - - static hasInstance(): boolean { - return this._instance !== null && this._instance.isInitialized - } - - static resetInstance(): void { - if (this._instance) { - this._instance.dispose() - this._instance = null - } - } - - static isEnabled(): boolean { - return !!this._instance?.isAuthenticated() - } -} diff --git a/packages/cloud/src/CloudSettingsService.ts b/packages/cloud/src/CloudSettingsService.ts deleted file mode 100644 index c842d800fc..0000000000 --- a/packages/cloud/src/CloudSettingsService.ts +++ /dev/null @@ -1,152 +0,0 @@ -import * as vscode from "vscode" -import EventEmitter from "events" - -import { - ORGANIZATION_ALLOW_ALL, - OrganizationAllowList, - OrganizationSettings, - organizationSettingsSchema, -} from "@roo-code/types" - -import { getRooCodeApiUrl } from "./config" -import type { AuthService, AuthState } from "./auth" -import { RefreshTimer } from "./RefreshTimer" -import type { SettingsService } from "./SettingsService" - -const ORGANIZATION_SETTINGS_CACHE_KEY = "organization-settings" - -export interface SettingsServiceEvents { - "settings-updated": [ - data: { - settings: OrganizationSettings - previousSettings: OrganizationSettings | undefined - }, - ] -} - -export class CloudSettingsService extends EventEmitter implements SettingsService { - private context: vscode.ExtensionContext - private authService: AuthService - private settings: OrganizationSettings | undefined = undefined - private timer: RefreshTimer - private log: (...args: unknown[]) => void - - constructor(context: vscode.ExtensionContext, authService: AuthService, log?: (...args: unknown[]) => void) { - super() - - this.context = context - this.authService = authService - this.log = log || console.log - - this.timer = new RefreshTimer({ - callback: async () => { - return await this.fetchSettings() - }, - successInterval: 30000, - initialBackoffMs: 1000, - maxBackoffMs: 30000, - }) - } - - public initialize(): void { - this.loadCachedSettings() - - // Clear cached settings if we have missed a log out. - if (this.authService.getState() == "logged-out" && this.settings) { - this.removeSettings() - } - - this.authService.on("auth-state-changed", (data: { state: AuthState; previousState: AuthState }) => { - if (data.state === "active-session") { - this.timer.start() - } else if (data.previousState === "active-session") { - this.timer.stop() - - if (data.state === "logged-out") { - this.removeSettings() - } - } - }) - - if (this.authService.hasActiveSession()) { - this.timer.start() - } - } - - private async fetchSettings(): Promise { - const token = this.authService.getSessionToken() - - if (!token) { - return false - } - - try { - const response = await fetch(`${getRooCodeApiUrl()}/api/organization-settings`, { - headers: { - Authorization: `Bearer ${token}`, - }, - }) - - if (!response.ok) { - this.log( - "[cloud-settings] Failed to fetch organization settings:", - response.status, - response.statusText, - ) - return false - } - - const data = await response.json() - const result = organizationSettingsSchema.safeParse(data) - - if (!result.success) { - this.log("[cloud-settings] Invalid organization settings format:", result.error) - return false - } - - const newSettings = result.data - - if (!this.settings || this.settings.version !== newSettings.version) { - const previousSettings = this.settings - this.settings = newSettings - await this.cacheSettings() - - this.emit("settings-updated", { - settings: this.settings, - previousSettings, - }) - } - - return true - } catch (error) { - this.log("[cloud-settings] Error fetching organization settings:", error) - return false - } - } - - private async cacheSettings(): Promise { - await this.context.globalState.update(ORGANIZATION_SETTINGS_CACHE_KEY, this.settings) - } - - private loadCachedSettings(): void { - this.settings = this.context.globalState.get(ORGANIZATION_SETTINGS_CACHE_KEY) - } - - public getAllowList(): OrganizationAllowList { - return this.settings?.allowList || ORGANIZATION_ALLOW_ALL - } - - public getSettings(): OrganizationSettings | undefined { - return this.settings - } - - private async removeSettings(): Promise { - this.settings = undefined - await this.cacheSettings() - } - - public dispose(): void { - this.removeAllListeners() - this.timer.stop() - } -} diff --git a/packages/cloud/src/CloudShareService.ts b/packages/cloud/src/CloudShareService.ts deleted file mode 100644 index 91e0f6aa3f..0000000000 --- a/packages/cloud/src/CloudShareService.ts +++ /dev/null @@ -1,43 +0,0 @@ -import * as vscode from "vscode" - -import type { ShareResponse, ShareVisibility } from "@roo-code/types" - -import type { CloudAPI } from "./CloudAPI" -import type { SettingsService } from "./SettingsService" - -export class CloudShareService { - private cloudAPI: CloudAPI - private settingsService: SettingsService - private log: (...args: unknown[]) => void - - constructor(cloudAPI: CloudAPI, settingsService: SettingsService, log?: (...args: unknown[]) => void) { - this.cloudAPI = cloudAPI - this.settingsService = settingsService - this.log = log || console.log - } - - async shareTask(taskId: string, visibility: ShareVisibility = "organization"): Promise { - try { - const response = await this.cloudAPI.shareTask(taskId, visibility) - - if (response.success && response.shareUrl) { - // Copy to clipboard. - await vscode.env.clipboard.writeText(response.shareUrl) - } - - return response - } catch (error) { - this.log("[ShareService] Error sharing task:", error) - throw error - } - } - - async canShareTask(): Promise { - try { - return !!this.settingsService.getSettings()?.cloudSettings?.enableTaskSharing - } catch (error) { - this.log("[ShareService] Error checking if task can be shared:", error) - return false - } - } -} diff --git a/packages/cloud/src/RefreshTimer.ts b/packages/cloud/src/RefreshTimer.ts deleted file mode 100644 index e7294222d7..0000000000 --- a/packages/cloud/src/RefreshTimer.ts +++ /dev/null @@ -1,154 +0,0 @@ -/** - * RefreshTimer - A utility for executing a callback with configurable retry behavior - * - * This timer executes a callback function and schedules the next execution based on the result: - * - If the callback succeeds (returns true), it schedules the next attempt after a fixed interval - * - If the callback fails (returns false), it uses exponential backoff up to a maximum interval - */ - -/** - * Configuration options for the RefreshTimer - */ -export interface RefreshTimerOptions { - /** - * The callback function to execute - * Should return a Promise that resolves to a boolean indicating success (true) or failure (false) - */ - callback: () => Promise - - /** - * Time in milliseconds to wait before next attempt after success - * @default 50000 (50 seconds) - */ - successInterval?: number - - /** - * Initial backoff time in milliseconds for the first failure - * @default 1000 (1 second) - */ - initialBackoffMs?: number - - /** - * Maximum backoff time in milliseconds - * @default 300000 (5 minutes) - */ - maxBackoffMs?: number -} - -/** - * A timer utility that executes a callback with configurable retry behavior - */ -export class RefreshTimer { - private callback: () => Promise - private successInterval: number - private initialBackoffMs: number - private maxBackoffMs: number - private currentBackoffMs: number - private attemptCount: number - private timerId: NodeJS.Timeout | null - private isRunning: boolean - - /** - * Creates a new RefreshTimer - * - * @param options Configuration options for the timer - */ - constructor(options: RefreshTimerOptions) { - this.callback = options.callback - this.successInterval = options.successInterval ?? 50000 // 50 seconds - this.initialBackoffMs = options.initialBackoffMs ?? 1000 // 1 second - this.maxBackoffMs = options.maxBackoffMs ?? 300000 // 5 minutes - this.currentBackoffMs = this.initialBackoffMs - this.attemptCount = 0 - this.timerId = null - this.isRunning = false - } - - /** - * Starts the timer and executes the callback immediately - */ - public start(): void { - if (this.isRunning) { - return - } - - this.isRunning = true - - // Execute the callback immediately - this.executeCallback() - } - - /** - * Stops the timer and cancels any pending execution - */ - public stop(): void { - if (!this.isRunning) { - return - } - - if (this.timerId) { - clearTimeout(this.timerId) - this.timerId = null - } - - this.isRunning = false - } - - /** - * Resets the backoff state and attempt count - * Does not affect whether the timer is running - */ - public reset(): void { - this.currentBackoffMs = this.initialBackoffMs - this.attemptCount = 0 - } - - /** - * Schedules the next attempt based on the success/failure of the current attempt - * - * @param wasSuccessful Whether the current attempt was successful - */ - private scheduleNextAttempt(wasSuccessful: boolean): void { - if (!this.isRunning) { - return - } - - if (wasSuccessful) { - // Reset backoff on success - this.currentBackoffMs = this.initialBackoffMs - this.attemptCount = 0 - - this.timerId = setTimeout(() => this.executeCallback(), this.successInterval) - } else { - // Increment attempt count - this.attemptCount++ - - // Calculate backoff time with exponential increase - // Formula: initialBackoff * 2^(attemptCount - 1) - this.currentBackoffMs = Math.min( - this.initialBackoffMs * Math.pow(2, this.attemptCount - 1), - this.maxBackoffMs, - ) - - this.timerId = setTimeout(() => this.executeCallback(), this.currentBackoffMs) - } - } - - /** - * Executes the callback and handles the result - */ - private async executeCallback(): Promise { - if (!this.isRunning) { - return - } - - try { - const result = await this.callback() - - this.scheduleNextAttempt(result) - } catch (_error) { - // Treat errors as failed attempts - this.scheduleNextAttempt(false) - } - } -} diff --git a/packages/cloud/src/SettingsService.ts b/packages/cloud/src/SettingsService.ts deleted file mode 100644 index c1027dc25c..0000000000 --- a/packages/cloud/src/SettingsService.ts +++ /dev/null @@ -1,23 +0,0 @@ -import type { OrganizationAllowList, OrganizationSettings } from "@roo-code/types" - -/** - * Interface for settings services that provide organization settings - */ -export interface SettingsService { - /** - * Get the organization allow list - * @returns The organization allow list or default if none available - */ - getAllowList(): OrganizationAllowList - - /** - * Get the current organization settings - * @returns The organization settings or undefined if none available - */ - getSettings(): OrganizationSettings | undefined - - /** - * Dispose of the settings service and clean up resources - */ - dispose(): void -} diff --git a/packages/cloud/src/StaticSettingsService.ts b/packages/cloud/src/StaticSettingsService.ts deleted file mode 100644 index 97e6cf7ea8..0000000000 --- a/packages/cloud/src/StaticSettingsService.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { - ORGANIZATION_ALLOW_ALL, - OrganizationAllowList, - OrganizationSettings, - organizationSettingsSchema, -} from "@roo-code/types" - -import type { SettingsService } from "./SettingsService" - -export class StaticSettingsService implements SettingsService { - private settings: OrganizationSettings - private log: (...args: unknown[]) => void - - constructor(envValue: string, log?: (...args: unknown[]) => void) { - this.log = log || console.log - this.settings = this.parseEnvironmentSettings(envValue) - } - - private parseEnvironmentSettings(envValue: string): OrganizationSettings { - try { - const decodedValue = Buffer.from(envValue, "base64").toString("utf-8") - const parsedJson = JSON.parse(decodedValue) - return organizationSettingsSchema.parse(parsedJson) - } catch (error) { - this.log(`[StaticSettingsService] failed to parse static settings: ${error.message}`, error) - throw new Error("Failed to parse static settings", { cause: error }) - } - } - - public getAllowList(): OrganizationAllowList { - return this.settings?.allowList || ORGANIZATION_ALLOW_ALL - } - - public getSettings(): OrganizationSettings | undefined { - return this.settings - } - - public dispose(): void { - // No resources to clean up for static settings. - } -} diff --git a/packages/cloud/src/TelemetryClient.ts b/packages/cloud/src/TelemetryClient.ts deleted file mode 100644 index 727da03432..0000000000 --- a/packages/cloud/src/TelemetryClient.ts +++ /dev/null @@ -1,169 +0,0 @@ -import { - TelemetryEventName, - type TelemetryEvent, - rooCodeTelemetryEventSchema, - type ClineMessage, -} from "@roo-code/types" -import { BaseTelemetryClient } from "@roo-code/telemetry" - -import { getRooCodeApiUrl } from "./config" -import type { AuthService } from "./auth" -import type { SettingsService } from "./SettingsService" - -export class TelemetryClient extends BaseTelemetryClient { - constructor( - private authService: AuthService, - private settingsService: SettingsService, - debug = false, - ) { - super( - { - type: "exclude", - events: [TelemetryEventName.TASK_CONVERSATION_MESSAGE], - }, - debug, - ) - } - - private async fetch(path: string, options: RequestInit) { - if (!this.authService.isAuthenticated()) { - return - } - - const token = this.authService.getSessionToken() - - if (!token) { - console.error(`[TelemetryClient#fetch] Unauthorized: No session token available.`) - return - } - - const response = await fetch(`${getRooCodeApiUrl()}/api/${path}`, { - ...options, - headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json" }, - }) - - if (!response.ok) { - console.error( - `[TelemetryClient#fetch] ${options.method} ${path} -> ${response.status} ${response.statusText}`, - ) - } - } - - public override async capture(event: TelemetryEvent) { - if (!this.isTelemetryEnabled() || !this.isEventCapturable(event.event)) { - if (this.debug) { - console.info(`[TelemetryClient#capture] Skipping event: ${event.event}`) - } - - return - } - - const payload = { - type: event.event, - properties: await this.getEventProperties(event), - } - - if (this.debug) { - console.info(`[TelemetryClient#capture] ${JSON.stringify(payload)}`) - } - - const result = rooCodeTelemetryEventSchema.safeParse(payload) - - if (!result.success) { - console.error( - `[TelemetryClient#capture] Invalid telemetry event: ${result.error.message} - ${JSON.stringify(payload)}`, - ) - - return - } - - try { - await this.fetch(`events`, { method: "POST", body: JSON.stringify(result.data) }) - } catch (error) { - console.error(`[TelemetryClient#capture] Error sending telemetry event: ${error}`) - } - } - - public async backfillMessages(messages: ClineMessage[], taskId: string): Promise { - if (!this.authService.isAuthenticated()) { - if (this.debug) { - console.info(`[TelemetryClient#backfillMessages] Skipping: Not authenticated`) - } - return - } - - const token = this.authService.getSessionToken() - - if (!token) { - console.error(`[TelemetryClient#backfillMessages] Unauthorized: No session token available.`) - return - } - - try { - const mergedProperties = await this.getEventProperties({ - event: TelemetryEventName.TASK_MESSAGE, - properties: { taskId }, - }) - - const formData = new FormData() - formData.append("taskId", taskId) - formData.append("properties", JSON.stringify(mergedProperties)) - - formData.append( - "file", - new File([JSON.stringify(messages)], "task.json", { - type: "application/json", - }), - ) - - if (this.debug) { - console.info( - `[TelemetryClient#backfillMessages] Uploading ${messages.length} messages for task ${taskId}`, - ) - } - - // Custom fetch for multipart - don't set Content-Type header (let browser set it) - const response = await fetch(`${getRooCodeApiUrl()}/api/events/backfill`, { - method: "POST", - headers: { - Authorization: `Bearer ${token}`, - // Note: No Content-Type header - browser will set multipart/form-data with boundary - }, - body: formData, - }) - - if (!response.ok) { - console.error( - `[TelemetryClient#backfillMessages] POST events/backfill -> ${response.status} ${response.statusText}`, - ) - } else if (this.debug) { - console.info(`[TelemetryClient#backfillMessages] Successfully uploaded messages for task ${taskId}`) - } - } catch (error) { - console.error(`[TelemetryClient#backfillMessages] Error uploading messages: ${error}`) - } - } - - public override updateTelemetryState(_didUserOptIn: boolean) {} - - public override isTelemetryEnabled(): boolean { - return true - } - - protected override isEventCapturable(eventName: TelemetryEventName): boolean { - // Ensure that this event type is supported by the telemetry client - if (!super.isEventCapturable(eventName)) { - return false - } - - // Only record message telemetry if a cloud account is present and explicitly configured to record messages - if (eventName === TelemetryEventName.TASK_MESSAGE) { - return this.settingsService.getSettings()?.cloudSettings?.recordTaskMessages || false - } - - // Other telemetry types are capturable at this point - return true - } - - public override async shutdown() {} -} diff --git a/packages/cloud/src/__mocks__/vscode.ts b/packages/cloud/src/__mocks__/vscode.ts deleted file mode 100644 index ac9082375e..0000000000 --- a/packages/cloud/src/__mocks__/vscode.ts +++ /dev/null @@ -1,57 +0,0 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ - -export const window = { - showInformationMessage: vi.fn(), - showErrorMessage: vi.fn(), -} - -export const env = { - openExternal: vi.fn(), -} - -export const Uri = { - parse: vi.fn((uri: string) => ({ toString: () => uri })), -} - -export interface ExtensionContext { - secrets: { - get: (key: string) => Promise - store: (key: string, value: string) => Promise - delete: (key: string) => Promise - onDidChange: (listener: (e: { key: string }) => void) => { dispose: () => void } - } - globalState: { - get: (key: string) => T | undefined - update: (key: string, value: any) => Promise - } - subscriptions: any[] - extension?: { - packageJSON?: { - version?: string - publisher?: string - name?: string - } - } -} - -// Mock implementation for tests -export const mockExtensionContext: ExtensionContext = { - secrets: { - get: vi.fn().mockResolvedValue(undefined), - store: vi.fn().mockResolvedValue(undefined), - delete: vi.fn().mockResolvedValue(undefined), - onDidChange: vi.fn().mockReturnValue({ dispose: vi.fn() }), - }, - globalState: { - get: vi.fn().mockReturnValue(undefined), - update: vi.fn().mockResolvedValue(undefined), - }, - subscriptions: [], - extension: { - packageJSON: { - version: "1.0.0", - publisher: "RooVeterinaryInc", - name: "roo-cline", - }, - }, -} diff --git a/packages/cloud/src/__tests__/CloudService.integration.test.ts b/packages/cloud/src/__tests__/CloudService.integration.test.ts deleted file mode 100644 index f3cef27718..0000000000 --- a/packages/cloud/src/__tests__/CloudService.integration.test.ts +++ /dev/null @@ -1,146 +0,0 @@ -// npx vitest run src/__tests__/CloudService.integration.test.ts - -import * as vscode from "vscode" -import { CloudService } from "../CloudService" -import { StaticSettingsService } from "../StaticSettingsService" -import { CloudSettingsService } from "../CloudSettingsService" - -vi.mock("vscode", () => ({ - ExtensionContext: vi.fn(), - window: { - showInformationMessage: vi.fn(), - showErrorMessage: vi.fn(), - }, - env: { - openExternal: vi.fn(), - }, - Uri: { - parse: vi.fn(), - }, -})) - -describe("CloudService Integration - Settings Service Selection", () => { - let mockContext: vscode.ExtensionContext - - beforeEach(() => { - CloudService.resetInstance() - - mockContext = { - subscriptions: [], - workspaceState: { - get: vi.fn(), - update: vi.fn(), - keys: vi.fn().mockReturnValue([]), - }, - secrets: { - get: vi.fn(), - store: vi.fn(), - delete: vi.fn(), - onDidChange: vi.fn().mockReturnValue({ dispose: vi.fn() }), - }, - globalState: { - get: vi.fn(), - update: vi.fn(), - setKeysForSync: vi.fn(), - keys: vi.fn().mockReturnValue([]), - }, - extensionUri: { scheme: "file", path: "/mock/path" }, - extensionPath: "/mock/path", - extensionMode: 1, - asAbsolutePath: vi.fn((relativePath: string) => `/mock/path/${relativePath}`), - storageUri: { scheme: "file", path: "/mock/storage" }, - extension: { - packageJSON: { - version: "1.0.0", - }, - }, - } as unknown as vscode.ExtensionContext - }) - - afterEach(() => { - CloudService.resetInstance() - delete process.env.ROO_CODE_CLOUD_ORG_SETTINGS - delete process.env.ROO_CODE_CLOUD_TOKEN - }) - - it("should use CloudSettingsService when no environment variable is set", async () => { - // Ensure no environment variables are set - delete process.env.ROO_CODE_CLOUD_ORG_SETTINGS - delete process.env.ROO_CODE_CLOUD_TOKEN - - const cloudService = await CloudService.createInstance(mockContext) - - // Access the private settingsService to check its type - const settingsService = (cloudService as unknown as { settingsService: unknown }).settingsService - expect(settingsService).toBeInstanceOf(CloudSettingsService) - }) - - it("should use StaticSettingsService when ROO_CODE_CLOUD_ORG_SETTINGS is set", async () => { - const validSettings = { - version: 1, - cloudSettings: { - recordTaskMessages: true, - enableTaskSharing: true, - taskShareExpirationDays: 30, - }, - defaultSettings: { - enableCheckpoints: true, - }, - allowList: { - allowAll: true, - providers: {}, - }, - } - - // Set the environment variable - process.env.ROO_CODE_CLOUD_ORG_SETTINGS = Buffer.from(JSON.stringify(validSettings)).toString("base64") - - const cloudService = await CloudService.createInstance(mockContext) - - // Access the private settingsService to check its type - const settingsService = (cloudService as unknown as { settingsService: unknown }).settingsService - expect(settingsService).toBeInstanceOf(StaticSettingsService) - - // Verify the settings are correctly loaded - expect(cloudService.getAllowList()).toEqual(validSettings.allowList) - }) - - it("should throw error when ROO_CODE_CLOUD_ORG_SETTINGS contains invalid data", async () => { - // Set invalid environment variable - process.env.ROO_CODE_CLOUD_ORG_SETTINGS = "invalid-base64-data" - - await expect(CloudService.createInstance(mockContext)).rejects.toThrow("Failed to initialize CloudService") - }) - - it("should prioritize static token auth when both environment variables are set", async () => { - const validSettings = { - version: 1, - cloudSettings: { - recordTaskMessages: true, - enableTaskSharing: true, - taskShareExpirationDays: 30, - }, - defaultSettings: { - enableCheckpoints: true, - }, - allowList: { - allowAll: true, - providers: {}, - }, - } - - // Set both environment variables - process.env.ROO_CODE_CLOUD_TOKEN = "test-token" - process.env.ROO_CODE_CLOUD_ORG_SETTINGS = Buffer.from(JSON.stringify(validSettings)).toString("base64") - - const cloudService = await CloudService.createInstance(mockContext) - - // Should use StaticSettingsService for settings - const settingsService = (cloudService as unknown as { settingsService: unknown }).settingsService - expect(settingsService).toBeInstanceOf(StaticSettingsService) - - // Should use StaticTokenAuthService for auth (from the existing logic) - expect(cloudService.isAuthenticated()).toBe(true) - expect(cloudService.hasActiveSession()).toBe(true) - }) -}) diff --git a/packages/cloud/src/__tests__/CloudService.test.ts b/packages/cloud/src/__tests__/CloudService.test.ts deleted file mode 100644 index 607b21de34..0000000000 --- a/packages/cloud/src/__tests__/CloudService.test.ts +++ /dev/null @@ -1,604 +0,0 @@ -// npx vitest run src/__tests__/CloudService.test.ts - -import * as vscode from "vscode" - -import type { ClineMessage } from "@roo-code/types" -import { TelemetryService } from "@roo-code/telemetry" - -import { CloudService } from "../CloudService" -import { WebAuthService } from "../auth/WebAuthService" -import { CloudSettingsService } from "../CloudSettingsService" -import { CloudShareService } from "../CloudShareService" -import { TelemetryClient } from "../TelemetryClient" -import { TaskNotFoundError } from "../errors" - -vi.mock("vscode", () => ({ - ExtensionContext: vi.fn(), - window: { - showInformationMessage: vi.fn(), - showErrorMessage: vi.fn(), - }, - env: { - openExternal: vi.fn(), - }, - Uri: { - parse: vi.fn(), - }, -})) - -vi.mock("@roo-code/telemetry") - -vi.mock("../auth/WebAuthService") - -vi.mock("../CloudSettingsService") - -vi.mock("../CloudShareService") - -vi.mock("../TelemetryClient") - -describe("CloudService", () => { - let mockContext: vscode.ExtensionContext - let mockAuthService: { - initialize: ReturnType - login: ReturnType - logout: ReturnType - isAuthenticated: ReturnType - hasActiveSession: ReturnType - hasOrIsAcquiringActiveSession: ReturnType - getUserInfo: ReturnType - getState: ReturnType - getSessionToken: ReturnType - handleCallback: ReturnType - getStoredOrganizationId: ReturnType - on: ReturnType - off: ReturnType - once: ReturnType - emit: ReturnType - } - let mockSettingsService: { - initialize: ReturnType - getSettings: ReturnType - getAllowList: ReturnType - dispose: ReturnType - on: ReturnType - off: ReturnType - } - let mockShareService: { - shareTask: ReturnType - canShareTask: ReturnType - } - let mockTelemetryClient: { - backfillMessages: ReturnType - } - let mockTelemetryService: { - hasInstance: ReturnType - instance: { - register: ReturnType - } - } - - beforeEach(() => { - CloudService.resetInstance() - - mockContext = { - subscriptions: [], - workspaceState: { - get: vi.fn(), - update: vi.fn(), - keys: vi.fn().mockReturnValue([]), - }, - secrets: { - get: vi.fn(), - store: vi.fn(), - delete: vi.fn(), - onDidChange: vi.fn().mockReturnValue({ dispose: vi.fn() }), - }, - globalState: { - get: vi.fn(), - update: vi.fn(), - setKeysForSync: vi.fn(), - keys: vi.fn().mockReturnValue([]), - }, - extensionUri: { scheme: "file", path: "/mock/path" }, - extensionPath: "/mock/path", - extensionMode: 1, - asAbsolutePath: vi.fn((relativePath: string) => `/mock/path/${relativePath}`), - storageUri: { scheme: "file", path: "/mock/storage" }, - extension: { - packageJSON: { - version: "1.0.0", - }, - }, - } as unknown as vscode.ExtensionContext - - mockAuthService = { - initialize: vi.fn().mockResolvedValue(undefined), - login: vi.fn(), - logout: vi.fn(), - isAuthenticated: vi.fn().mockReturnValue(false), - hasActiveSession: vi.fn().mockReturnValue(false), - hasOrIsAcquiringActiveSession: vi.fn().mockReturnValue(false), - getUserInfo: vi.fn(), - getState: vi.fn().mockReturnValue("logged-out"), - getSessionToken: vi.fn(), - handleCallback: vi.fn(), - getStoredOrganizationId: vi.fn().mockReturnValue(null), - on: vi.fn(), - off: vi.fn(), - once: vi.fn(), - emit: vi.fn(), - } - - mockSettingsService = { - initialize: vi.fn(), - getSettings: vi.fn(), - getAllowList: vi.fn(), - dispose: vi.fn(), - on: vi.fn(), - off: vi.fn(), - } - - mockShareService = { - shareTask: vi.fn(), - canShareTask: vi.fn().mockResolvedValue(true), - } - - mockTelemetryClient = { - backfillMessages: vi.fn().mockResolvedValue(undefined), - } - - mockTelemetryService = { - hasInstance: vi.fn().mockReturnValue(true), - instance: { - register: vi.fn(), - }, - } - - vi.mocked(WebAuthService).mockImplementation(() => mockAuthService as unknown as WebAuthService) - vi.mocked(CloudSettingsService).mockImplementation(() => mockSettingsService as unknown as CloudSettingsService) - vi.mocked(CloudShareService).mockImplementation(() => mockShareService as unknown as CloudShareService) - vi.mocked(TelemetryClient).mockImplementation(() => mockTelemetryClient as unknown as TelemetryClient) - - vi.mocked(TelemetryService.hasInstance).mockReturnValue(true) - Object.defineProperty(TelemetryService, "instance", { - get: () => mockTelemetryService.instance, - configurable: true, - }) - }) - - afterEach(() => { - vi.clearAllMocks() - CloudService.resetInstance() - }) - - describe("createInstance", () => { - it("should create and initialize CloudService instance", async () => { - const mockLog = vi.fn() - - const cloudService = await CloudService.createInstance(mockContext, mockLog) - - expect(cloudService).toBeInstanceOf(CloudService) - expect(WebAuthService).toHaveBeenCalledWith(mockContext, expect.any(Function)) - expect(CloudSettingsService).toHaveBeenCalledWith(mockContext, mockAuthService, expect.any(Function)) - }) - - it("should set up event listeners for CloudSettingsService", async () => { - const mockLog = vi.fn() - - await CloudService.createInstance(mockContext, mockLog) - - expect(mockSettingsService.on).toHaveBeenCalledWith("settings-updated", expect.any(Function)) - }) - - it("should throw error if instance already exists", async () => { - await CloudService.createInstance(mockContext) - - await expect(CloudService.createInstance(mockContext)).rejects.toThrow( - "CloudService instance already created", - ) - }) - }) - - describe("authentication methods", () => { - let cloudService: CloudService - - beforeEach(async () => { - cloudService = await CloudService.createInstance(mockContext) - }) - - it("should delegate login to AuthService", async () => { - await cloudService.login() - expect(mockAuthService.login).toHaveBeenCalled() - }) - - it("should delegate logout to AuthService", async () => { - await cloudService.logout() - expect(mockAuthService.logout).toHaveBeenCalled() - }) - - it("should delegate isAuthenticated to AuthService", () => { - const result = cloudService.isAuthenticated() - expect(mockAuthService.isAuthenticated).toHaveBeenCalled() - expect(result).toBe(false) - }) - - it("should delegate hasActiveSession to AuthService", () => { - const result = cloudService.hasActiveSession() - expect(mockAuthService.hasActiveSession).toHaveBeenCalled() - expect(result).toBe(false) - }) - - it("should delegate getUserInfo to AuthService", async () => { - await cloudService.getUserInfo() - expect(mockAuthService.getUserInfo).toHaveBeenCalled() - }) - - it("should return organization ID from user info", () => { - const mockUserInfo = { - name: "Test User", - email: "test@example.com", - organizationId: "org_123", - organizationName: "Test Org", - organizationRole: "admin", - } - mockAuthService.getUserInfo.mockReturnValue(mockUserInfo) - - const result = cloudService.getOrganizationId() - expect(mockAuthService.getUserInfo).toHaveBeenCalled() - expect(result).toBe("org_123") - }) - - it("should return null when no organization ID available", () => { - mockAuthService.getUserInfo.mockReturnValue(null) - - const result = cloudService.getOrganizationId() - expect(result).toBe(null) - }) - - it("should return organization name from user info", () => { - const mockUserInfo = { - name: "Test User", - email: "test@example.com", - organizationId: "org_123", - organizationName: "Test Org", - organizationRole: "admin", - } - mockAuthService.getUserInfo.mockReturnValue(mockUserInfo) - - const result = cloudService.getOrganizationName() - expect(mockAuthService.getUserInfo).toHaveBeenCalled() - expect(result).toBe("Test Org") - }) - - it("should return null when no organization name available", () => { - mockAuthService.getUserInfo.mockReturnValue(null) - - const result = cloudService.getOrganizationName() - expect(result).toBe(null) - }) - - it("should return organization role from user info", () => { - const mockUserInfo = { - name: "Test User", - email: "test@example.com", - organizationId: "org_123", - organizationName: "Test Org", - organizationRole: "admin", - } - mockAuthService.getUserInfo.mockReturnValue(mockUserInfo) - - const result = cloudService.getOrganizationRole() - expect(mockAuthService.getUserInfo).toHaveBeenCalled() - expect(result).toBe("admin") - }) - - it("should return null when no organization role available", () => { - mockAuthService.getUserInfo.mockReturnValue(null) - - const result = cloudService.getOrganizationRole() - expect(result).toBe(null) - }) - - it("should delegate getAuthState to AuthService", () => { - const result = cloudService.getAuthState() - expect(mockAuthService.getState).toHaveBeenCalled() - expect(result).toBe("logged-out") - }) - - it("should delegate handleAuthCallback to AuthService", async () => { - await cloudService.handleAuthCallback("code", "state") - expect(mockAuthService.handleCallback).toHaveBeenCalledWith("code", "state", undefined) - }) - - it("should delegate handleAuthCallback with organizationId to AuthService", async () => { - await cloudService.handleAuthCallback("code", "state", "org_123") - expect(mockAuthService.handleCallback).toHaveBeenCalledWith("code", "state", "org_123") - }) - - it("should return stored organization ID from AuthService", () => { - mockAuthService.getStoredOrganizationId.mockReturnValue("org_456") - - const result = cloudService.getStoredOrganizationId() - expect(mockAuthService.getStoredOrganizationId).toHaveBeenCalled() - expect(result).toBe("org_456") - }) - - it("should return null when no stored organization ID available", () => { - mockAuthService.getStoredOrganizationId.mockReturnValue(null) - - const result = cloudService.getStoredOrganizationId() - expect(result).toBe(null) - }) - - it("should return true when stored organization ID exists", () => { - mockAuthService.getStoredOrganizationId.mockReturnValue("org_789") - - const result = cloudService.hasStoredOrganizationId() - expect(result).toBe(true) - }) - - it("should return false when no stored organization ID exists", () => { - mockAuthService.getStoredOrganizationId.mockReturnValue(null) - - const result = cloudService.hasStoredOrganizationId() - expect(result).toBe(false) - }) - }) - - describe("organization settings methods", () => { - let cloudService: CloudService - - beforeEach(async () => { - cloudService = await CloudService.createInstance(mockContext) - }) - - it("should delegate getAllowList to SettingsService", () => { - cloudService.getAllowList() - expect(mockSettingsService.getAllowList).toHaveBeenCalled() - }) - }) - - describe("error handling", () => { - it("should throw error when accessing methods before initialization", () => { - expect(() => CloudService.instance.login()).toThrow("CloudService not initialized") - }) - - it("should throw error when accessing instance before creation", () => { - expect(() => CloudService.instance).toThrow("CloudService not initialized") - }) - }) - - describe("hasInstance", () => { - it("should return false when no instance exists", () => { - expect(CloudService.hasInstance()).toBe(false) - }) - - it("should return true when instance exists and is initialized", async () => { - await CloudService.createInstance(mockContext) - expect(CloudService.hasInstance()).toBe(true) - }) - }) - - describe("dispose", () => { - it("should dispose of all services and clean up", async () => { - const cloudService = await CloudService.createInstance(mockContext) - cloudService.dispose() - - expect(mockSettingsService.dispose).toHaveBeenCalled() - }) - - it("should remove event listeners from CloudSettingsService", async () => { - // Create a mock that will pass the instanceof check - const mockCloudSettingsService = Object.create(CloudSettingsService.prototype) - Object.assign(mockCloudSettingsService, { - initialize: vi.fn(), - getSettings: vi.fn(), - getAllowList: vi.fn(), - dispose: vi.fn(), - on: vi.fn(), - off: vi.fn(), - }) - - // Override the mock to return our properly typed instance - vi.mocked(CloudSettingsService).mockImplementation(() => mockCloudSettingsService) - - const cloudService = await CloudService.createInstance(mockContext) - - // Verify the listener was added - expect(mockCloudSettingsService.on).toHaveBeenCalledWith("settings-updated", expect.any(Function)) - - // Get the listener function that was registered - const registeredListener = mockCloudSettingsService.on.mock.calls.find( - (call: unknown[]) => call[0] === "settings-updated", - )?.[1] - - cloudService.dispose() - - // Verify the listener was removed with the same function - expect(mockCloudSettingsService.off).toHaveBeenCalledWith("settings-updated", registeredListener) - }) - - it("should handle disposal when using StaticSettingsService", async () => { - // Reset the instance first - CloudService.resetInstance() - - // Mock a StaticSettingsService (which doesn't extend CloudSettingsService) - const mockStaticSettingsService = { - initialize: vi.fn(), - getSettings: vi.fn(), - getAllowList: vi.fn(), - dispose: vi.fn(), - on: vi.fn(), // Add on method to avoid initialization error - off: vi.fn(), // Add off method for disposal - } - - // Override the mock to return a service that won't pass instanceof check - vi.mocked(CloudSettingsService).mockImplementation( - () => mockStaticSettingsService as unknown as CloudSettingsService, - ) - - // This should not throw even though the service doesn't pass instanceof check - const _cloudService = await CloudService.createInstance(mockContext) - - // Should not throw when disposing - expect(() => _cloudService.dispose()).not.toThrow() - - // Should still call dispose on the settings service - expect(mockStaticSettingsService.dispose).toHaveBeenCalled() - // Should NOT call off method since it's not a CloudSettingsService instance - expect(mockStaticSettingsService.off).not.toHaveBeenCalled() - }) - }) - - describe("settings event handling", () => { - let _cloudService: CloudService - - beforeEach(async () => { - _cloudService = await CloudService.createInstance(mockContext) - }) - - it("should emit settings-updated event when settings are updated", async () => { - const settingsListener = vi.fn() - _cloudService.on("settings-updated", settingsListener) - - // Get the settings listener that was registered with the settings service - const serviceSettingsListener = mockSettingsService.on.mock.calls.find( - (call) => call[0] === "settings-updated", - )?.[1] - - expect(serviceSettingsListener).toBeDefined() - - // Simulate settings update event - const settingsData = { - settings: { - version: 2, - defaultSettings: {}, - allowList: { allowAll: true, providers: {} }, - }, - previousSettings: { - version: 1, - defaultSettings: {}, - allowList: { allowAll: true, providers: {} }, - }, - } - serviceSettingsListener(settingsData) - - expect(settingsListener).toHaveBeenCalledWith(settingsData) - }) - }) - - describe("shareTask with ClineMessage retry logic", () => { - let cloudService: CloudService - - beforeEach(async () => { - // Reset mocks for shareTask tests - vi.clearAllMocks() - - // Reset authentication state for shareTask tests - mockAuthService.isAuthenticated.mockReturnValue(true) - mockAuthService.hasActiveSession.mockReturnValue(true) - mockAuthService.hasOrIsAcquiringActiveSession.mockReturnValue(true) - mockAuthService.getState.mockReturnValue("active") - - cloudService = await CloudService.createInstance(mockContext) - }) - - it("should call shareTask without retry when successful", async () => { - const taskId = "test-task-id" - const visibility = "organization" - const clineMessages: ClineMessage[] = [ - { - ts: Date.now(), - type: "say", - say: "text", - text: "Hello world", - }, - ] - - const expectedResult = { success: true, shareUrl: "https://example.com/share/123" } - mockShareService.shareTask.mockResolvedValue(expectedResult) - - const result = await cloudService.shareTask(taskId, visibility, clineMessages) - - expect(mockShareService.shareTask).toHaveBeenCalledTimes(1) - expect(mockShareService.shareTask).toHaveBeenCalledWith(taskId, visibility) - expect(mockTelemetryClient.backfillMessages).not.toHaveBeenCalled() - expect(result).toEqual(expectedResult) - }) - - it("should retry with backfill when TaskNotFoundError occurs", async () => { - const taskId = "test-task-id" - const visibility = "organization" - const clineMessages: ClineMessage[] = [ - { - ts: Date.now(), - type: "say", - say: "text", - text: "Hello world", - }, - ] - - const expectedResult = { success: true, shareUrl: "https://example.com/share/123" } - - // First call throws TaskNotFoundError, second call succeeds - mockShareService.shareTask - .mockRejectedValueOnce(new TaskNotFoundError(taskId)) - .mockResolvedValueOnce(expectedResult) - - const result = await cloudService.shareTask(taskId, visibility, clineMessages) - - expect(mockShareService.shareTask).toHaveBeenCalledTimes(2) - expect(mockShareService.shareTask).toHaveBeenNthCalledWith(1, taskId, visibility) - expect(mockShareService.shareTask).toHaveBeenNthCalledWith(2, taskId, visibility) - expect(mockTelemetryClient.backfillMessages).toHaveBeenCalledTimes(1) - expect(mockTelemetryClient.backfillMessages).toHaveBeenCalledWith(clineMessages, taskId) - expect(result).toEqual(expectedResult) - }) - - it("should not retry when TaskNotFoundError occurs but no clineMessages provided", async () => { - const taskId = "test-task-id" - const visibility = "organization" - - const taskNotFoundError = new TaskNotFoundError(taskId) - mockShareService.shareTask.mockRejectedValue(taskNotFoundError) - - await expect(cloudService.shareTask(taskId, visibility)).rejects.toThrow(TaskNotFoundError) - - expect(mockShareService.shareTask).toHaveBeenCalledTimes(1) - expect(mockTelemetryClient.backfillMessages).not.toHaveBeenCalled() - }) - - it("should not retry when non-TaskNotFoundError occurs", async () => { - const taskId = "test-task-id" - const visibility = "organization" - const clineMessages: ClineMessage[] = [ - { - ts: Date.now(), - type: "say", - say: "text", - text: "Hello world", - }, - ] - - const genericError = new Error("Some other error") - mockShareService.shareTask.mockRejectedValue(genericError) - - await expect(cloudService.shareTask(taskId, visibility, clineMessages)).rejects.toThrow(genericError) - - expect(mockShareService.shareTask).toHaveBeenCalledTimes(1) - expect(mockTelemetryClient.backfillMessages).not.toHaveBeenCalled() - }) - - it("should work with default parameters", async () => { - const taskId = "test-task-id" - const expectedResult = { success: true, shareUrl: "https://example.com/share/123" } - mockShareService.shareTask.mockResolvedValue(expectedResult) - - const result = await cloudService.shareTask(taskId) - - expect(mockShareService.shareTask).toHaveBeenCalledTimes(1) - expect(mockShareService.shareTask).toHaveBeenCalledWith(taskId, "organization") - expect(result).toEqual(expectedResult) - }) - }) -}) diff --git a/packages/cloud/src/__tests__/CloudSettingsService.test.ts b/packages/cloud/src/__tests__/CloudSettingsService.test.ts deleted file mode 100644 index 4a85383ba4..0000000000 --- a/packages/cloud/src/__tests__/CloudSettingsService.test.ts +++ /dev/null @@ -1,476 +0,0 @@ -import * as vscode from "vscode" -import { CloudSettingsService } from "../CloudSettingsService" -import { RefreshTimer } from "../RefreshTimer" -import type { AuthService } from "../auth" -import type { OrganizationSettings } from "@roo-code/types" - -// Mock dependencies -vi.mock("../RefreshTimer") -vi.mock("../config", () => ({ - getRooCodeApiUrl: vi.fn().mockReturnValue("https://app.roocode.com"), -})) - -// Mock fetch globally -global.fetch = vi.fn() - -describe("CloudSettingsService", () => { - let mockContext: vscode.ExtensionContext - let mockAuthService: { - getState: ReturnType - getSessionToken: ReturnType - hasActiveSession: ReturnType - on: ReturnType - } - let mockRefreshTimer: { - start: ReturnType - stop: ReturnType - } - let cloudSettingsService: CloudSettingsService - let mockLog: ReturnType - - const mockSettings: OrganizationSettings = { - version: 1, - defaultSettings: {}, - allowList: { - allowAll: true, - providers: {}, - }, - } - - beforeEach(() => { - vi.clearAllMocks() - - mockContext = { - globalState: { - get: vi.fn(), - update: vi.fn().mockResolvedValue(undefined), - }, - } as unknown as vscode.ExtensionContext - - mockAuthService = { - getState: vi.fn().mockReturnValue("logged-out"), - getSessionToken: vi.fn(), - hasActiveSession: vi.fn().mockReturnValue(false), - on: vi.fn(), - } - - mockRefreshTimer = { - start: vi.fn(), - stop: vi.fn(), - } - - mockLog = vi.fn() - - // Mock RefreshTimer constructor - vi.mocked(RefreshTimer).mockImplementation(() => mockRefreshTimer as unknown as RefreshTimer) - - cloudSettingsService = new CloudSettingsService(mockContext, mockAuthService as unknown as AuthService, mockLog) - }) - - afterEach(() => { - cloudSettingsService.dispose() - }) - - describe("constructor", () => { - it("should create CloudSettingsService with proper dependencies", () => { - expect(cloudSettingsService).toBeInstanceOf(CloudSettingsService) - expect(RefreshTimer).toHaveBeenCalledWith({ - callback: expect.any(Function), - successInterval: 30000, - initialBackoffMs: 1000, - maxBackoffMs: 30000, - }) - }) - - it("should use console.log as default logger when none provided", () => { - const service = new CloudSettingsService(mockContext, mockAuthService as unknown as AuthService) - expect(service).toBeInstanceOf(CloudSettingsService) - }) - }) - - describe("initialize", () => { - it("should load cached settings on initialization", () => { - const cachedSettings = { - version: 1, - defaultSettings: {}, - allowList: { allowAll: true, providers: {} }, - } - - // Create a fresh mock context for this test - const testContext = { - globalState: { - get: vi.fn().mockReturnValue(cachedSettings), - update: vi.fn().mockResolvedValue(undefined), - }, - } as unknown as vscode.ExtensionContext - - // Mock auth service to not be logged out - const testAuthService = { - getState: vi.fn().mockReturnValue("active"), - getSessionToken: vi.fn(), - hasActiveSession: vi.fn().mockReturnValue(false), - on: vi.fn(), - } - - // Create a new instance to test initialization - const testService = new CloudSettingsService( - testContext, - testAuthService as unknown as AuthService, - mockLog, - ) - testService.initialize() - - expect(testContext.globalState.get).toHaveBeenCalledWith("organization-settings") - expect(testService.getSettings()).toEqual(cachedSettings) - - testService.dispose() - }) - - it("should clear cached settings if user is logged out", async () => { - const cachedSettings = { - version: 1, - defaultSettings: {}, - allowList: { allowAll: true, providers: {} }, - } - mockContext.globalState.get = vi.fn().mockReturnValue(cachedSettings) - mockAuthService.getState.mockReturnValue("logged-out") - - cloudSettingsService.initialize() - - expect(mockContext.globalState.update).toHaveBeenCalledWith("organization-settings", undefined) - }) - - it("should set up auth service event listeners", () => { - cloudSettingsService.initialize() - - expect(mockAuthService.on).toHaveBeenCalledWith("auth-state-changed", expect.any(Function)) - }) - - it("should start timer if user has active session", () => { - mockAuthService.hasActiveSession.mockReturnValue(true) - - cloudSettingsService.initialize() - - expect(mockRefreshTimer.start).toHaveBeenCalled() - }) - - it("should not start timer if user has no active session", () => { - mockAuthService.hasActiveSession.mockReturnValue(false) - - cloudSettingsService.initialize() - - expect(mockRefreshTimer.start).not.toHaveBeenCalled() - }) - }) - - describe("event emission", () => { - beforeEach(() => { - cloudSettingsService.initialize() - }) - - it("should emit 'settings-updated' event when settings change", async () => { - const eventSpy = vi.fn() - cloudSettingsService.on("settings-updated", eventSpy) - - mockAuthService.getSessionToken.mockReturnValue("valid-token") - vi.mocked(fetch).mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue(mockSettings), - } as unknown as Response) - - // Get the callback function passed to RefreshTimer - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await timerCallback() - - expect(eventSpy).toHaveBeenCalledWith({ - settings: mockSettings, - previousSettings: undefined, - }) - }) - - it("should emit event with previous settings when updating existing settings", async () => { - const eventSpy = vi.fn() - - const previousSettings = { - version: 1, - defaultSettings: {}, - allowList: { allowAll: true, providers: {} }, - } - const newSettings = { - version: 2, - defaultSettings: {}, - allowList: { allowAll: true, providers: {} }, - } - - // Create a fresh mock context for this test - const testContext = { - globalState: { - get: vi.fn().mockReturnValue(previousSettings), - update: vi.fn().mockResolvedValue(undefined), - }, - } as unknown as vscode.ExtensionContext - - // Mock auth service to not be logged out - const testAuthService = { - getState: vi.fn().mockReturnValue("active"), - getSessionToken: vi.fn().mockReturnValue("valid-token"), - hasActiveSession: vi.fn().mockReturnValue(false), - on: vi.fn(), - } - - // Create a new service instance with cached settings - const testService = new CloudSettingsService( - testContext, - testAuthService as unknown as AuthService, - mockLog, - ) - testService.on("settings-updated", eventSpy) - testService.initialize() - - vi.mocked(fetch).mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue(newSettings), - } as unknown as Response) - - // Get the callback function passed to RefreshTimer for this instance - const timerCallback = - vi.mocked(RefreshTimer).mock.calls[vi.mocked(RefreshTimer).mock.calls.length - 1][0].callback - await timerCallback() - - expect(eventSpy).toHaveBeenCalledWith({ - settings: newSettings, - previousSettings, - }) - - testService.dispose() - }) - - it("should not emit event when settings version is unchanged", async () => { - const eventSpy = vi.fn() - - // Create a fresh mock context for this test - const testContext = { - globalState: { - get: vi.fn().mockReturnValue(mockSettings), - update: vi.fn().mockResolvedValue(undefined), - }, - } as unknown as vscode.ExtensionContext - - // Mock auth service to not be logged out - const testAuthService = { - getState: vi.fn().mockReturnValue("active"), - getSessionToken: vi.fn().mockReturnValue("valid-token"), - hasActiveSession: vi.fn().mockReturnValue(false), - on: vi.fn(), - } - - // Create a new service instance with cached settings - const testService = new CloudSettingsService( - testContext, - testAuthService as unknown as AuthService, - mockLog, - ) - testService.on("settings-updated", eventSpy) - testService.initialize() - - vi.mocked(fetch).mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue(mockSettings), // Same version - } as unknown as Response) - - // Get the callback function passed to RefreshTimer for this instance - const timerCallback = - vi.mocked(RefreshTimer).mock.calls[vi.mocked(RefreshTimer).mock.calls.length - 1][0].callback - await timerCallback() - - expect(eventSpy).not.toHaveBeenCalled() - - testService.dispose() - }) - - it("should not emit event when fetch fails", async () => { - const eventSpy = vi.fn() - cloudSettingsService.on("settings-updated", eventSpy) - - mockAuthService.getSessionToken.mockReturnValue("valid-token") - vi.mocked(fetch).mockResolvedValue({ - ok: false, - status: 500, - statusText: "Internal Server Error", - } as unknown as Response) - - // Get the callback function passed to RefreshTimer - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await timerCallback() - - expect(eventSpy).not.toHaveBeenCalled() - }) - - it("should not emit event when no auth token available", async () => { - const eventSpy = vi.fn() - cloudSettingsService.on("settings-updated", eventSpy) - - mockAuthService.getSessionToken.mockReturnValue(null) - - // Get the callback function passed to RefreshTimer - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await timerCallback() - - expect(eventSpy).not.toHaveBeenCalled() - expect(fetch).not.toHaveBeenCalled() - }) - }) - - describe("fetchSettings", () => { - beforeEach(() => { - cloudSettingsService.initialize() - }) - - it("should fetch and cache settings successfully", async () => { - mockAuthService.getSessionToken.mockReturnValue("valid-token") - vi.mocked(fetch).mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue(mockSettings), - } as unknown as Response) - - // Get the callback function passed to RefreshTimer - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - const result = await timerCallback() - - expect(result).toBe(true) - expect(fetch).toHaveBeenCalledWith("https://app.roocode.com/api/organization-settings", { - headers: { - Authorization: "Bearer valid-token", - }, - }) - expect(mockContext.globalState.update).toHaveBeenCalledWith("organization-settings", mockSettings) - }) - - it("should handle fetch errors gracefully", async () => { - mockAuthService.getSessionToken.mockReturnValue("valid-token") - vi.mocked(fetch).mockRejectedValue(new Error("Network error")) - - // Get the callback function passed to RefreshTimer - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - const result = await timerCallback() - - expect(result).toBe(false) - expect(mockLog).toHaveBeenCalledWith( - "[cloud-settings] Error fetching organization settings:", - expect.any(Error), - ) - }) - - it("should handle invalid response format", async () => { - mockAuthService.getSessionToken.mockReturnValue("valid-token") - vi.mocked(fetch).mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue({ invalid: "data" }), - } as unknown as Response) - - // Get the callback function passed to RefreshTimer - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - const result = await timerCallback() - - expect(result).toBe(false) - expect(mockLog).toHaveBeenCalledWith( - "[cloud-settings] Invalid organization settings format:", - expect.any(Object), - ) - }) - }) - - describe("getAllowList", () => { - it("should return settings allowList when available", () => { - mockContext.globalState.get = vi.fn().mockReturnValue(mockSettings) - cloudSettingsService.initialize() - - const allowList = cloudSettingsService.getAllowList() - expect(allowList).toEqual(mockSettings.allowList) - }) - - it("should return default allow all when no settings available", () => { - const allowList = cloudSettingsService.getAllowList() - expect(allowList).toEqual({ allowAll: true, providers: {} }) - }) - }) - - describe("getSettings", () => { - it("should return current settings", () => { - // Create a fresh mock context for this test - const testContext = { - globalState: { - get: vi.fn().mockReturnValue(mockSettings), - update: vi.fn().mockResolvedValue(undefined), - }, - } as unknown as vscode.ExtensionContext - - // Mock auth service to not be logged out - const testAuthService = { - getState: vi.fn().mockReturnValue("active"), - getSessionToken: vi.fn(), - hasActiveSession: vi.fn().mockReturnValue(false), - on: vi.fn(), - } - - const testService = new CloudSettingsService( - testContext, - testAuthService as unknown as AuthService, - mockLog, - ) - testService.initialize() - - const settings = testService.getSettings() - expect(settings).toEqual(mockSettings) - - testService.dispose() - }) - - it("should return undefined when no settings available", () => { - const settings = cloudSettingsService.getSettings() - expect(settings).toBeUndefined() - }) - }) - - describe("dispose", () => { - it("should remove all listeners and stop timer", () => { - const removeAllListenersSpy = vi.spyOn(cloudSettingsService, "removeAllListeners") - - cloudSettingsService.dispose() - - expect(removeAllListenersSpy).toHaveBeenCalled() - expect(mockRefreshTimer.stop).toHaveBeenCalled() - }) - }) - - describe("auth service event handlers", () => { - it("should start timer when auth-state-changed event is triggered with active-session", () => { - cloudSettingsService.initialize() - - // Get the auth-state-changed handler - const authStateChangedHandler = mockAuthService.on.mock.calls.find( - (call) => call[0] === "auth-state-changed", - )?.[1] - expect(authStateChangedHandler).toBeDefined() - - // Simulate active-session state change - authStateChangedHandler({ state: "active-session", previousState: "attempting-session" }) - expect(mockRefreshTimer.start).toHaveBeenCalled() - }) - - it("should stop timer and remove settings when auth-state-changed event is triggered with logged-out", async () => { - cloudSettingsService.initialize() - - // Get the auth-state-changed handler - const authStateChangedHandler = mockAuthService.on.mock.calls.find( - (call) => call[0] === "auth-state-changed", - )?.[1] - expect(authStateChangedHandler).toBeDefined() - - // Simulate logged-out state change from active-session - await authStateChangedHandler({ state: "logged-out", previousState: "active-session" }) - expect(mockRefreshTimer.stop).toHaveBeenCalled() - expect(mockContext.globalState.update).toHaveBeenCalledWith("organization-settings", undefined) - }) - }) -}) diff --git a/packages/cloud/src/__tests__/CloudShareService.test.ts b/packages/cloud/src/__tests__/CloudShareService.test.ts deleted file mode 100644 index 6fae1fbb9f..0000000000 --- a/packages/cloud/src/__tests__/CloudShareService.test.ts +++ /dev/null @@ -1,310 +0,0 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ - -import type { MockedFunction } from "vitest" -import * as vscode from "vscode" - -import { CloudAPI } from "../CloudAPI" -import { CloudShareService } from "../CloudShareService" -import type { SettingsService } from "../SettingsService" -import type { AuthService } from "../auth" -import { CloudAPIError, TaskNotFoundError } from "../errors" - -// Mock fetch -const mockFetch = vi.fn() -global.fetch = mockFetch as any - -// Mock vscode -vi.mock("vscode", () => ({ - window: { - showInformationMessage: vi.fn(), - showErrorMessage: vi.fn(), - showQuickPick: vi.fn(), - }, - env: { - clipboard: { - writeText: vi.fn(), - }, - openExternal: vi.fn(), - }, - Uri: { - parse: vi.fn(), - }, - extensions: { - getExtension: vi.fn(() => ({ - packageJSON: { version: "1.0.0" }, - })), - }, -})) - -// Mock config -vi.mock("../Config", () => ({ - getRooCodeApiUrl: () => "https://app.roocode.com", -})) - -// Mock utils -vi.mock("../utils", () => ({ - getUserAgent: () => "Roo-Code 1.0.0", -})) - -describe("CloudShareService", () => { - let shareService: CloudShareService - let mockAuthService: AuthService - let mockSettingsService: SettingsService - let mockCloudAPI: CloudAPI - let mockLog: MockedFunction<(...args: unknown[]) => void> - - beforeEach(() => { - vi.clearAllMocks() - mockFetch.mockClear() - - mockLog = vi.fn() - mockAuthService = { - hasActiveSession: vi.fn(), - getSessionToken: vi.fn(), - isAuthenticated: vi.fn(), - } as any - - mockSettingsService = { - getSettings: vi.fn(), - } as any - - mockCloudAPI = new CloudAPI(mockAuthService, mockLog) - shareService = new CloudShareService(mockCloudAPI, mockSettingsService, mockLog) - }) - - describe("shareTask", () => { - it("should share task with organization visibility and copy to clipboard", async () => { - const mockResponseData = { - success: true, - shareUrl: "https://app.roocode.com/share/abc123", - } - - ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") - mockFetch.mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue(mockResponseData), - }) - - const result = await shareService.shareTask("task-123", "organization") - - expect(result.success).toBe(true) - expect(result.shareUrl).toBe("https://app.roocode.com/share/abc123") - expect(mockFetch).toHaveBeenCalledWith("https://app.roocode.com/api/extension/share", { - method: "POST", - headers: { - "Content-Type": "application/json", - Authorization: "Bearer session-token", - "User-Agent": "Roo-Code 1.0.0", - }, - body: JSON.stringify({ taskId: "task-123", visibility: "organization" }), - signal: expect.any(AbortSignal), - }) - expect(vscode.env.clipboard.writeText).toHaveBeenCalledWith("https://app.roocode.com/share/abc123") - }) - - it("should share task with public visibility", async () => { - const mockResponseData = { - success: true, - shareUrl: "https://app.roocode.com/share/abc123", - } - - ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") - mockFetch.mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue(mockResponseData), - }) - - const result = await shareService.shareTask("task-123", "public") - - expect(result.success).toBe(true) - expect(mockFetch).toHaveBeenCalledWith("https://app.roocode.com/api/extension/share", { - method: "POST", - headers: { - "Content-Type": "application/json", - Authorization: "Bearer session-token", - "User-Agent": "Roo-Code 1.0.0", - }, - body: JSON.stringify({ taskId: "task-123", visibility: "public" }), - signal: expect.any(AbortSignal), - }) - }) - - it("should default to organization visibility when not specified", async () => { - const mockResponseData = { - success: true, - shareUrl: "https://app.roocode.com/share/abc123", - } - - ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") - mockFetch.mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue(mockResponseData), - }) - - const result = await shareService.shareTask("task-123") - - expect(result.success).toBe(true) - expect(mockFetch).toHaveBeenCalledWith("https://app.roocode.com/api/extension/share", { - method: "POST", - headers: { - "Content-Type": "application/json", - Authorization: "Bearer session-token", - "User-Agent": "Roo-Code 1.0.0", - }, - body: JSON.stringify({ taskId: "task-123", visibility: "organization" }), - signal: expect.any(AbortSignal), - }) - }) - - it("should handle API error response", async () => { - const mockResponseData = { - success: false, - error: "Task not found", - } - - ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") - mockFetch.mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue(mockResponseData), - }) - - const result = await shareService.shareTask("task-123", "organization") - - expect(result.success).toBe(false) - expect(result.error).toBe("Task not found") - }) - - it("should handle authentication errors", async () => { - ;(mockAuthService.getSessionToken as any).mockReturnValue(null) - - await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow("Authentication required") - }) - - it("should handle unexpected errors", async () => { - ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") - mockFetch.mockRejectedValue(new Error("Network error")) - - await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow("Network error") - }) - - it("should throw TaskNotFoundError for 404 responses", async () => { - ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") - mockFetch.mockResolvedValue({ - ok: false, - status: 404, - statusText: "Not Found", - json: vi.fn().mockRejectedValue(new Error("Invalid JSON")), - text: vi.fn().mockResolvedValue("Not Found"), - }) - - await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow(TaskNotFoundError) - await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow("Task not found") - }) - - it("should throw generic Error for non-404 HTTP errors", async () => { - ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") - mockFetch.mockResolvedValue({ - ok: false, - status: 500, - statusText: "Internal Server Error", - json: vi.fn().mockRejectedValue(new Error("Invalid JSON")), - text: vi.fn().mockResolvedValue("Internal Server Error"), - }) - - await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow(CloudAPIError) - await expect(shareService.shareTask("task-123", "organization")).rejects.toThrow( - "HTTP 500: Internal Server Error", - ) - }) - - it("should create TaskNotFoundError with correct properties", async () => { - ;(mockAuthService.getSessionToken as any).mockReturnValue("session-token") - mockFetch.mockResolvedValue({ - ok: false, - status: 404, - statusText: "Not Found", - json: vi.fn().mockRejectedValue(new Error("Invalid JSON")), - text: vi.fn().mockResolvedValue("Not Found"), - }) - - try { - await shareService.shareTask("task-123", "organization") - expect.fail("Expected TaskNotFoundError to be thrown") - } catch (error) { - expect(error).toBeInstanceOf(TaskNotFoundError) - expect(error).toBeInstanceOf(Error) - expect((error as TaskNotFoundError).message).toBe("Task not found") - } - }) - }) - - describe("canShareTask", () => { - it("should return true when authenticated and sharing is enabled", async () => { - ;(mockAuthService.isAuthenticated as any).mockReturnValue(true) - ;(mockSettingsService.getSettings as any).mockReturnValue({ - cloudSettings: { - enableTaskSharing: true, - }, - }) - - const result = await shareService.canShareTask() - - expect(result).toBe(true) - }) - - it("should return false when authenticated but sharing is disabled", async () => { - ;(mockAuthService.isAuthenticated as any).mockReturnValue(true) - ;(mockSettingsService.getSettings as any).mockReturnValue({ - cloudSettings: { - enableTaskSharing: false, - }, - }) - - const result = await shareService.canShareTask() - - expect(result).toBe(false) - }) - - it("should return false when authenticated and sharing setting is undefined (default)", async () => { - ;(mockAuthService.isAuthenticated as any).mockReturnValue(true) - ;(mockSettingsService.getSettings as any).mockReturnValue({ - cloudSettings: {}, - }) - - const result = await shareService.canShareTask() - - expect(result).toBe(false) - }) - - it("should return false when authenticated and no settings available (default)", async () => { - ;(mockAuthService.isAuthenticated as any).mockReturnValue(true) - ;(mockSettingsService.getSettings as any).mockReturnValue(undefined) - - const result = await shareService.canShareTask() - - expect(result).toBe(false) - }) - - it("should return false when settings service returns undefined", async () => { - ;(mockSettingsService.getSettings as any).mockReturnValue(undefined) - - const result = await shareService.canShareTask() - - expect(result).toBe(false) - }) - - it("should handle errors gracefully", async () => { - ;(mockSettingsService.getSettings as any).mockImplementation(() => { - throw new Error("Settings error") - }) - - const result = await shareService.canShareTask() - - expect(result).toBe(false) - expect(mockLog).toHaveBeenCalledWith( - "[ShareService] Error checking if task can be shared:", - expect.any(Error), - ) - }) - }) -}) diff --git a/packages/cloud/src/__tests__/RefreshTimer.test.ts b/packages/cloud/src/__tests__/RefreshTimer.test.ts deleted file mode 100644 index 2f87488568..0000000000 --- a/packages/cloud/src/__tests__/RefreshTimer.test.ts +++ /dev/null @@ -1,210 +0,0 @@ -// npx vitest run src/__tests__/RefreshTimer.test.ts - -import type { Mock } from "vitest" - -import { RefreshTimer } from "../RefreshTimer" - -vi.useFakeTimers() - -describe("RefreshTimer", () => { - let mockCallback: Mock - let refreshTimer: RefreshTimer - - beforeEach(() => { - mockCallback = vi.fn() - mockCallback.mockResolvedValue(true) - }) - - afterEach(() => { - if (refreshTimer) { - refreshTimer.stop() - } - - vi.clearAllTimers() - vi.clearAllMocks() - }) - - it("should execute callback immediately when started", () => { - refreshTimer = new RefreshTimer({ - callback: mockCallback, - }) - - refreshTimer.start() - - expect(mockCallback).toHaveBeenCalledTimes(1) - }) - - it("should schedule next attempt after success interval when callback succeeds", async () => { - mockCallback.mockResolvedValue(true) - - refreshTimer = new RefreshTimer({ - callback: mockCallback, - successInterval: 50000, // 50 seconds - }) - - refreshTimer.start() - - // Fast-forward to execute the first callback - await Promise.resolve() - - expect(mockCallback).toHaveBeenCalledTimes(1) - - // Fast-forward 50 seconds - vi.advanceTimersByTime(50000) - - // Callback should be called again - expect(mockCallback).toHaveBeenCalledTimes(2) - }) - - it("should use exponential backoff when callback fails", async () => { - mockCallback.mockResolvedValue(false) - - refreshTimer = new RefreshTimer({ - callback: mockCallback, - initialBackoffMs: 1000, // 1 second - }) - - refreshTimer.start() - - // Fast-forward to execute the first callback - await Promise.resolve() - - expect(mockCallback).toHaveBeenCalledTimes(1) - - // Fast-forward 1 second - vi.advanceTimersByTime(1000) - - // Callback should be called again - expect(mockCallback).toHaveBeenCalledTimes(2) - - // Fast-forward to execute the second callback - await Promise.resolve() - - // Fast-forward 2 seconds - vi.advanceTimersByTime(2000) - - // Callback should be called again - expect(mockCallback).toHaveBeenCalledTimes(3) - - // Fast-forward to execute the third callback - await Promise.resolve() - }) - - it("should not exceed maximum backoff interval", async () => { - mockCallback.mockResolvedValue(false) - - refreshTimer = new RefreshTimer({ - callback: mockCallback, - initialBackoffMs: 1000, // 1 second - maxBackoffMs: 5000, // 5 seconds - }) - - refreshTimer.start() - - // Fast-forward through multiple failures to reach max backoff - await Promise.resolve() // First attempt - vi.advanceTimersByTime(1000) - - await Promise.resolve() // Second attempt (backoff = 2000ms) - vi.advanceTimersByTime(2000) - - await Promise.resolve() // Third attempt (backoff = 4000ms) - vi.advanceTimersByTime(4000) - - await Promise.resolve() // Fourth attempt (backoff would be 8000ms but max is 5000ms) - - // Should be capped at maxBackoffMs (no way to verify without logger) - }) - - it("should reset backoff after a successful attempt", async () => { - // First call fails, second succeeds, third fails - mockCallback.mockResolvedValueOnce(false).mockResolvedValueOnce(true).mockResolvedValueOnce(false) - - refreshTimer = new RefreshTimer({ - callback: mockCallback, - initialBackoffMs: 1000, - successInterval: 5000, - }) - - refreshTimer.start() - - // First attempt (fails) - await Promise.resolve() - - // Fast-forward 1 second - vi.advanceTimersByTime(1000) - - // Second attempt (succeeds) - await Promise.resolve() - - // Fast-forward 5 seconds - vi.advanceTimersByTime(5000) - - // Third attempt (fails) - await Promise.resolve() - - // Backoff should be reset to initial value (no way to verify without logger) - }) - - it("should handle errors in callback as failures", async () => { - mockCallback.mockRejectedValue(new Error("Test error")) - - refreshTimer = new RefreshTimer({ - callback: mockCallback, - initialBackoffMs: 1000, - }) - - refreshTimer.start() - - // Fast-forward to execute the callback - await Promise.resolve() - - // Error should be treated as a failure (no way to verify without logger) - }) - - it("should stop the timer and cancel pending executions", () => { - refreshTimer = new RefreshTimer({ - callback: mockCallback, - }) - - refreshTimer.start() - - // Stop the timer - refreshTimer.stop() - - // Fast-forward a long time - vi.advanceTimersByTime(1000000) - - // Callback should only have been called once (the initial call) - expect(mockCallback).toHaveBeenCalledTimes(1) - }) - - it("should reset the backoff state", async () => { - mockCallback.mockResolvedValue(false) - - refreshTimer = new RefreshTimer({ - callback: mockCallback, - initialBackoffMs: 1000, - }) - - refreshTimer.start() - - // Fast-forward through a few failures - await Promise.resolve() - vi.advanceTimersByTime(1000) - - await Promise.resolve() - vi.advanceTimersByTime(2000) - - // Reset the timer - refreshTimer.reset() - - // Stop and restart to trigger a new execution - refreshTimer.stop() - refreshTimer.start() - - await Promise.resolve() - - // Backoff should be back to initial value (no way to verify without logger) - }) -}) diff --git a/packages/cloud/src/__tests__/StaticSettingsService.test.ts b/packages/cloud/src/__tests__/StaticSettingsService.test.ts deleted file mode 100644 index 26c0ada9cd..0000000000 --- a/packages/cloud/src/__tests__/StaticSettingsService.test.ts +++ /dev/null @@ -1,102 +0,0 @@ -// npx vitest run src/__tests__/StaticSettingsService.test.ts - -import { StaticSettingsService } from "../StaticSettingsService" - -describe("StaticSettingsService", () => { - const validSettings = { - version: 1, - cloudSettings: { - recordTaskMessages: true, - enableTaskSharing: true, - taskShareExpirationDays: 30, - }, - defaultSettings: { - enableCheckpoints: true, - maxOpenTabsContext: 10, - }, - allowList: { - allowAll: false, - providers: { - anthropic: { - allowAll: true, - }, - }, - }, - } - - const validBase64 = Buffer.from(JSON.stringify(validSettings)).toString("base64") - - describe("constructor", () => { - it("should parse valid base64 encoded JSON settings", () => { - const service = new StaticSettingsService(validBase64) - expect(service.getSettings()).toEqual(validSettings) - }) - - it("should throw error for invalid base64", () => { - expect(() => new StaticSettingsService("invalid-base64!@#")).toThrow("Failed to parse static settings") - }) - - it("should throw error for invalid JSON", () => { - const invalidJson = Buffer.from("{ invalid json }").toString("base64") - expect(() => new StaticSettingsService(invalidJson)).toThrow("Failed to parse static settings") - }) - - it("should throw error for invalid schema", () => { - const invalidSettings = { invalid: "schema" } - const invalidBase64 = Buffer.from(JSON.stringify(invalidSettings)).toString("base64") - expect(() => new StaticSettingsService(invalidBase64)).toThrow("Failed to parse static settings") - }) - }) - - describe("getAllowList", () => { - it("should return the allow list from settings", () => { - const service = new StaticSettingsService(validBase64) - expect(service.getAllowList()).toEqual(validSettings.allowList) - }) - }) - - describe("getSettings", () => { - it("should return the parsed settings", () => { - const service = new StaticSettingsService(validBase64) - expect(service.getSettings()).toEqual(validSettings) - }) - }) - - describe("dispose", () => { - it("should be a no-op for static settings", () => { - const service = new StaticSettingsService(validBase64) - expect(() => service.dispose()).not.toThrow() - }) - }) - - describe("logging", () => { - it("should use provided logger for errors", () => { - const mockLog = vi.fn() - expect(() => new StaticSettingsService("invalid-base64!@#", mockLog)).toThrow() - - expect(mockLog).toHaveBeenCalledWith( - expect.stringContaining("[StaticSettingsService] failed to parse static settings:"), - expect.any(Error), - ) - }) - - it("should use console.log as default logger for errors", () => { - const consoleSpy = vi.spyOn(console, "log").mockImplementation(() => {}) - expect(() => new StaticSettingsService("invalid-base64!@#")).toThrow() - - expect(consoleSpy).toHaveBeenCalledWith( - expect.stringContaining("[StaticSettingsService] failed to parse static settings:"), - expect.any(Error), - ) - - consoleSpy.mockRestore() - }) - - it("should not log anything for successful parsing", () => { - const mockLog = vi.fn() - new StaticSettingsService(validBase64, mockLog) - - expect(mockLog).not.toHaveBeenCalled() - }) - }) -}) diff --git a/packages/cloud/src/__tests__/TelemetryClient.test.ts b/packages/cloud/src/__tests__/TelemetryClient.test.ts deleted file mode 100644 index e4c62b1e4e..0000000000 --- a/packages/cloud/src/__tests__/TelemetryClient.test.ts +++ /dev/null @@ -1,738 +0,0 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ - -// npx vitest run src/__tests__/TelemetryClient.test.ts - -import { type TelemetryPropertiesProvider, TelemetryEventName } from "@roo-code/types" - -import { TelemetryClient } from "../TelemetryClient" - -const mockFetch = vi.fn() -global.fetch = mockFetch as any - -describe("TelemetryClient", () => { - const getPrivateProperty = (instance: any, propertyName: string): T => { - return instance[propertyName] - } - - let mockAuthService: any - let mockSettingsService: any - - beforeEach(() => { - vi.clearAllMocks() - - // Create a mock AuthService instead of using the singleton - mockAuthService = { - getSessionToken: vi.fn().mockReturnValue("mock-token"), - getState: vi.fn().mockReturnValue("active-session"), - isAuthenticated: vi.fn().mockReturnValue(true), - hasActiveSession: vi.fn().mockReturnValue(true), - } - - // Create a mock SettingsService - mockSettingsService = { - getSettings: vi.fn().mockReturnValue({ - cloudSettings: { - recordTaskMessages: true, - }, - }), - } - - mockFetch.mockResolvedValue({ - ok: true, - json: vi.fn().mockResolvedValue({}), - }) - - vi.spyOn(console, "info").mockImplementation(() => {}) - vi.spyOn(console, "error").mockImplementation(() => {}) - }) - - afterEach(() => { - vi.restoreAllMocks() - }) - - describe("isEventCapturable", () => { - it("should return true for events not in exclude list", () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( - client, - "isEventCapturable", - ).bind(client) - - expect(isEventCapturable(TelemetryEventName.TASK_CREATED)).toBe(true) - expect(isEventCapturable(TelemetryEventName.LLM_COMPLETION)).toBe(true) - expect(isEventCapturable(TelemetryEventName.MODE_SWITCH)).toBe(true) - expect(isEventCapturable(TelemetryEventName.TOOL_USED)).toBe(true) - }) - - it("should return false for events in exclude list", () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( - client, - "isEventCapturable", - ).bind(client) - - expect(isEventCapturable(TelemetryEventName.TASK_CONVERSATION_MESSAGE)).toBe(false) - }) - - it("should return true for TASK_MESSAGE events when recordTaskMessages is true", () => { - mockSettingsService.getSettings.mockReturnValue({ - cloudSettings: { - recordTaskMessages: true, - }, - }) - - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( - client, - "isEventCapturable", - ).bind(client) - - expect(isEventCapturable(TelemetryEventName.TASK_MESSAGE)).toBe(true) - }) - - it("should return false for TASK_MESSAGE events when recordTaskMessages is false", () => { - mockSettingsService.getSettings.mockReturnValue({ - cloudSettings: { - recordTaskMessages: false, - }, - }) - - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( - client, - "isEventCapturable", - ).bind(client) - - expect(isEventCapturable(TelemetryEventName.TASK_MESSAGE)).toBe(false) - }) - - it("should return false for TASK_MESSAGE events when recordTaskMessages is undefined", () => { - mockSettingsService.getSettings.mockReturnValue({ - cloudSettings: {}, - }) - - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( - client, - "isEventCapturable", - ).bind(client) - - expect(isEventCapturable(TelemetryEventName.TASK_MESSAGE)).toBe(false) - }) - - it("should return false for TASK_MESSAGE events when cloudSettings is undefined", () => { - mockSettingsService.getSettings.mockReturnValue({}) - - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( - client, - "isEventCapturable", - ).bind(client) - - expect(isEventCapturable(TelemetryEventName.TASK_MESSAGE)).toBe(false) - }) - - it("should return false for TASK_MESSAGE events when getSettings returns undefined", () => { - mockSettingsService.getSettings.mockReturnValue(undefined) - - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const isEventCapturable = getPrivateProperty<(eventName: TelemetryEventName) => boolean>( - client, - "isEventCapturable", - ).bind(client) - - expect(isEventCapturable(TelemetryEventName.TASK_MESSAGE)).toBe(false) - }) - }) - - describe("getEventProperties", () => { - it("should merge provider properties with event properties", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const mockProvider: TelemetryPropertiesProvider = { - getTelemetryProperties: vi.fn().mockResolvedValue({ - appVersion: "1.0.0", - vscodeVersion: "1.60.0", - platform: "darwin", - editorName: "vscode", - language: "en", - mode: "code", - }), - } - - client.setProvider(mockProvider) - - const getEventProperties = getPrivateProperty< - (event: { event: TelemetryEventName; properties?: Record }) => Promise> - >(client, "getEventProperties").bind(client) - - const result = await getEventProperties({ - event: TelemetryEventName.TASK_CREATED, - properties: { - customProp: "value", - mode: "override", // This should override the provider's mode. - }, - }) - - expect(result).toEqual({ - appVersion: "1.0.0", - vscodeVersion: "1.60.0", - platform: "darwin", - editorName: "vscode", - language: "en", - mode: "override", // Event property takes precedence. - customProp: "value", - }) - - expect(mockProvider.getTelemetryProperties).toHaveBeenCalledTimes(1) - }) - - it("should handle errors from provider gracefully", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const mockProvider: TelemetryPropertiesProvider = { - getTelemetryProperties: vi.fn().mockRejectedValue(new Error("Provider error")), - } - - const consoleErrorSpy = vi.spyOn(console, "error") - - client.setProvider(mockProvider) - - const getEventProperties = getPrivateProperty< - (event: { event: TelemetryEventName; properties?: Record }) => Promise> - >(client, "getEventProperties").bind(client) - - const result = await getEventProperties({ - event: TelemetryEventName.TASK_CREATED, - properties: { customProp: "value" }, - }) - - expect(result).toEqual({ customProp: "value" }) - expect(consoleErrorSpy).toHaveBeenCalledWith( - expect.stringContaining("Error getting telemetry properties: Provider error"), - ) - }) - - it("should return event properties when no provider is set", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const getEventProperties = getPrivateProperty< - (event: { event: TelemetryEventName; properties?: Record }) => Promise> - >(client, "getEventProperties").bind(client) - - const result = await getEventProperties({ - event: TelemetryEventName.TASK_CREATED, - properties: { customProp: "value" }, - }) - - expect(result).toEqual({ customProp: "value" }) - }) - }) - - describe("capture", () => { - it("should not capture events that are not capturable", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - await client.capture({ - event: TelemetryEventName.TASK_CONVERSATION_MESSAGE, // In exclude list. - properties: { test: "value" }, - }) - - expect(mockFetch).not.toHaveBeenCalled() - }) - - it("should not capture TASK_MESSAGE events when recordTaskMessages is false", async () => { - mockSettingsService.getSettings.mockReturnValue({ - cloudSettings: { - recordTaskMessages: false, - }, - }) - - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - await client.capture({ - event: TelemetryEventName.TASK_MESSAGE, - properties: { - taskId: "test-task-id", - message: { - ts: 1, - type: "say", - say: "text", - text: "test message", - }, - }, - }) - - expect(mockFetch).not.toHaveBeenCalled() - }) - - it("should not capture TASK_MESSAGE events when recordTaskMessages is undefined", async () => { - mockSettingsService.getSettings.mockReturnValue({ - cloudSettings: {}, - }) - - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - await client.capture({ - event: TelemetryEventName.TASK_MESSAGE, - properties: { - taskId: "test-task-id", - message: { - ts: 1, - type: "say", - say: "text", - text: "test message", - }, - }, - }) - - expect(mockFetch).not.toHaveBeenCalled() - }) - - it("should not send request when schema validation fails", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - await client.capture({ - event: TelemetryEventName.TASK_CREATED, - properties: { test: "value" }, - }) - - expect(mockFetch).not.toHaveBeenCalled() - expect(console.error).toHaveBeenCalledWith(expect.stringContaining("Invalid telemetry event")) - }) - - it("should send request when event is capturable and validation passes", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const providerProperties = { - appName: "roo-code", - appVersion: "1.0.0", - vscodeVersion: "1.60.0", - platform: "darwin", - editorName: "vscode", - language: "en", - mode: "code", - } - - const eventProperties = { - taskId: "test-task-id", - } - - const mockValidatedData = { - type: TelemetryEventName.TASK_CREATED, - properties: { - ...providerProperties, - taskId: "test-task-id", - }, - } - - const mockProvider: TelemetryPropertiesProvider = { - getTelemetryProperties: vi.fn().mockResolvedValue(providerProperties), - } - - client.setProvider(mockProvider) - - await client.capture({ - event: TelemetryEventName.TASK_CREATED, - properties: eventProperties, - }) - - expect(mockFetch).toHaveBeenCalledWith( - "https://app.roocode.com/api/events", - expect.objectContaining({ - method: "POST", - body: JSON.stringify(mockValidatedData), - }), - ) - }) - - it("should attempt to capture TASK_MESSAGE events when recordTaskMessages is true", async () => { - mockSettingsService.getSettings.mockReturnValue({ - cloudSettings: { - recordTaskMessages: true, - }, - }) - - const eventProperties = { - appName: "roo-code", - appVersion: "1.0.0", - vscodeVersion: "1.60.0", - platform: "darwin", - editorName: "vscode", - language: "en", - mode: "code", - taskId: "test-task-id", - message: { - ts: 1, - type: "say", - say: "text", - text: "test message", - }, - } - - const mockValidatedData = { - type: TelemetryEventName.TASK_MESSAGE, - properties: eventProperties, - } - - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - await client.capture({ - event: TelemetryEventName.TASK_MESSAGE, - properties: eventProperties, - }) - - expect(mockFetch).toHaveBeenCalledWith( - "https://app.roocode.com/api/events", - expect.objectContaining({ - method: "POST", - body: JSON.stringify(mockValidatedData), - }), - ) - }) - - it("should handle fetch errors gracefully", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - mockFetch.mockRejectedValue(new Error("Network error")) - - await expect( - client.capture({ - event: TelemetryEventName.TASK_CREATED, - properties: { test: "value" }, - }), - ).resolves.not.toThrow() - }) - }) - - describe("telemetry state methods", () => { - it("should always return true for isTelemetryEnabled", () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - expect(client.isTelemetryEnabled()).toBe(true) - }) - - it("should have empty implementations for updateTelemetryState and shutdown", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - client.updateTelemetryState(true) - await client.shutdown() - }) - }) - - describe("backfillMessages", () => { - it("should not send request when not authenticated", async () => { - mockAuthService.isAuthenticated.mockReturnValue(false) - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const messages = [ - { - ts: 1, - type: "say" as const, - say: "text" as const, - text: "test message", - }, - ] - - await client.backfillMessages(messages, "test-task-id") - - expect(mockFetch).not.toHaveBeenCalled() - }) - - it("should not send request when no session token available", async () => { - mockAuthService.getSessionToken.mockReturnValue(null) - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const messages = [ - { - ts: 1, - type: "say" as const, - say: "text" as const, - text: "test message", - }, - ] - - await client.backfillMessages(messages, "test-task-id") - - expect(mockFetch).not.toHaveBeenCalled() - expect(console.error).toHaveBeenCalledWith( - "[TelemetryClient#backfillMessages] Unauthorized: No session token available.", - ) - }) - - it("should send FormData request with correct structure when authenticated", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const providerProperties = { - appName: "roo-code", - appVersion: "1.0.0", - vscodeVersion: "1.60.0", - platform: "darwin", - editorName: "vscode", - language: "en", - mode: "code", - } - - const mockProvider: TelemetryPropertiesProvider = { - getTelemetryProperties: vi.fn().mockResolvedValue(providerProperties), - } - - client.setProvider(mockProvider) - - const messages = [ - { - ts: 1, - type: "say" as const, - say: "text" as const, - text: "test message 1", - }, - { - ts: 2, - type: "ask" as const, - ask: "followup" as const, - text: "test question", - }, - ] - - await client.backfillMessages(messages, "test-task-id") - - expect(mockFetch).toHaveBeenCalledWith( - "https://app.roocode.com/api/events/backfill", - expect.objectContaining({ - method: "POST", - headers: { - Authorization: "Bearer mock-token", - }, - body: expect.any(FormData), - }), - ) - - // Verify FormData contents - const call = mockFetch.mock.calls[0] - const formData = call[1].body as FormData - - expect(formData.get("taskId")).toBe("test-task-id") - - // Parse and compare properties as objects since JSON.stringify order can vary - const propertiesJson = formData.get("properties") as string - const parsedProperties = JSON.parse(propertiesJson) - expect(parsedProperties).toEqual({ - taskId: "test-task-id", - ...providerProperties, - }) - // The messages are stored as a File object under the "file" key - const fileField = formData.get("file") as File - expect(fileField).toBeInstanceOf(File) - expect(fileField.name).toBe("task.json") - expect(fileField.type).toBe("application/json") - - // Read the file content to verify the messages - const fileContent = await fileField.text() - expect(fileContent).toBe(JSON.stringify(messages)) - }) - - it("should handle provider errors gracefully", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const mockProvider: TelemetryPropertiesProvider = { - getTelemetryProperties: vi.fn().mockRejectedValue(new Error("Provider error")), - } - - client.setProvider(mockProvider) - - const messages = [ - { - ts: 1, - type: "say" as const, - say: "text" as const, - text: "test message", - }, - ] - - await client.backfillMessages(messages, "test-task-id") - - expect(mockFetch).toHaveBeenCalledWith( - "https://app.roocode.com/api/events/backfill", - expect.objectContaining({ - method: "POST", - headers: { - Authorization: "Bearer mock-token", - }, - body: expect.any(FormData), - }), - ) - - // Verify FormData contents - should still work with just taskId - const call = mockFetch.mock.calls[0] - const formData = call[1].body as FormData - - expect(formData.get("taskId")).toBe("test-task-id") - expect(formData.get("properties")).toBe( - JSON.stringify({ - taskId: "test-task-id", - }), - ) - // The messages are stored as a File object under the "file" key - const fileField = formData.get("file") as File - expect(fileField).toBeInstanceOf(File) - expect(fileField.name).toBe("task.json") - expect(fileField.type).toBe("application/json") - - // Read the file content to verify the messages - const fileContent = await fileField.text() - expect(fileContent).toBe(JSON.stringify(messages)) - }) - - it("should work without provider set", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - const messages = [ - { - ts: 1, - type: "say" as const, - say: "text" as const, - text: "test message", - }, - ] - - await client.backfillMessages(messages, "test-task-id") - - expect(mockFetch).toHaveBeenCalledWith( - "https://app.roocode.com/api/events/backfill", - expect.objectContaining({ - method: "POST", - headers: { - Authorization: "Bearer mock-token", - }, - body: expect.any(FormData), - }), - ) - - // Verify FormData contents - should work with just taskId - const call = mockFetch.mock.calls[0] - const formData = call[1].body as FormData - - expect(formData.get("taskId")).toBe("test-task-id") - expect(formData.get("properties")).toBe( - JSON.stringify({ - taskId: "test-task-id", - }), - ) - // The messages are stored as a File object under the "file" key - const fileField = formData.get("file") as File - expect(fileField).toBeInstanceOf(File) - expect(fileField.name).toBe("task.json") - expect(fileField.type).toBe("application/json") - - // Read the file content to verify the messages - const fileContent = await fileField.text() - expect(fileContent).toBe(JSON.stringify(messages)) - }) - - it("should handle fetch errors gracefully", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - mockFetch.mockRejectedValue(new Error("Network error")) - - const messages = [ - { - ts: 1, - type: "say" as const, - say: "text" as const, - text: "test message", - }, - ] - - await expect(client.backfillMessages(messages, "test-task-id")).resolves.not.toThrow() - - expect(console.error).toHaveBeenCalledWith( - expect.stringContaining( - "[TelemetryClient#backfillMessages] Error uploading messages: Error: Network error", - ), - ) - }) - - it("should handle HTTP error responses", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - mockFetch.mockResolvedValue({ - ok: false, - status: 404, - statusText: "Not Found", - }) - - const messages = [ - { - ts: 1, - type: "say" as const, - say: "text" as const, - text: "test message", - }, - ] - - await client.backfillMessages(messages, "test-task-id") - - expect(console.error).toHaveBeenCalledWith( - "[TelemetryClient#backfillMessages] POST events/backfill -> 404 Not Found", - ) - }) - - it("should log debug information when debug is enabled", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService, true) - - const messages = [ - { - ts: 1, - type: "say" as const, - say: "text" as const, - text: "test message", - }, - ] - - await client.backfillMessages(messages, "test-task-id") - - expect(console.info).toHaveBeenCalledWith( - "[TelemetryClient#backfillMessages] Uploading 1 messages for task test-task-id", - ) - expect(console.info).toHaveBeenCalledWith( - "[TelemetryClient#backfillMessages] Successfully uploaded messages for task test-task-id", - ) - }) - - it("should handle empty messages array", async () => { - const client = new TelemetryClient(mockAuthService, mockSettingsService) - - await client.backfillMessages([], "test-task-id") - - expect(mockFetch).toHaveBeenCalledWith( - "https://app.roocode.com/api/events/backfill", - expect.objectContaining({ - method: "POST", - headers: { - Authorization: "Bearer mock-token", - }, - body: expect.any(FormData), - }), - ) - - // Verify FormData contents - const call = mockFetch.mock.calls[0] - const formData = call[1].body as FormData - - // The messages are stored as a File object under the "file" key - const fileField = formData.get("file") as File - expect(fileField).toBeInstanceOf(File) - expect(fileField.name).toBe("task.json") - expect(fileField.type).toBe("application/json") - - // Read the file content to verify the empty messages array - const fileContent = await fileField.text() - expect(fileContent).toBe("[]") - }) - }) -}) diff --git a/packages/cloud/src/__tests__/auth/StaticTokenAuthService.spec.ts b/packages/cloud/src/__tests__/auth/StaticTokenAuthService.spec.ts deleted file mode 100644 index f1ab7f9abc..0000000000 --- a/packages/cloud/src/__tests__/auth/StaticTokenAuthService.spec.ts +++ /dev/null @@ -1,174 +0,0 @@ -import { describe, it, expect, beforeEach, vi } from "vitest" -import * as vscode from "vscode" - -import { StaticTokenAuthService } from "../../auth/StaticTokenAuthService" - -// Mock vscode -vi.mock("vscode", () => ({ - window: { - showInformationMessage: vi.fn(), - }, - env: { - openExternal: vi.fn(), - uriScheme: "vscode", - }, - Uri: { - parse: vi.fn(), - }, -})) - -describe("StaticTokenAuthService", () => { - let authService: StaticTokenAuthService - let mockContext: vscode.ExtensionContext - let mockLog: (...args: unknown[]) => void - const testToken = "test-static-token" - - beforeEach(() => { - mockLog = vi.fn() - - // Create a minimal mock that satisfies the constructor requirements - const mockContextPartial = { - extension: { - packageJSON: { - publisher: "TestPublisher", - name: "test-extension", - }, - }, - globalState: { - get: vi.fn(), - update: vi.fn(), - }, - secrets: { - get: vi.fn(), - store: vi.fn(), - delete: vi.fn(), - onDidChange: vi.fn(), - }, - subscriptions: [], - } - - // Use type assertion for test mocking - mockContext = mockContextPartial as unknown as vscode.ExtensionContext - - authService = new StaticTokenAuthService(mockContext, testToken, mockLog) - }) - - afterEach(() => { - vi.clearAllMocks() - }) - - describe("constructor", () => { - it("should create instance and log static token mode", () => { - expect(authService).toBeInstanceOf(StaticTokenAuthService) - expect(mockLog).toHaveBeenCalledWith("[auth] Using static token authentication mode") - }) - - it("should use console.log as default logger", () => { - const serviceWithoutLog = new StaticTokenAuthService( - mockContext as unknown as vscode.ExtensionContext, - testToken, - ) - // Can't directly test console.log usage, but constructor should not throw - expect(serviceWithoutLog).toBeInstanceOf(StaticTokenAuthService) - }) - }) - - describe("initialize", () => { - it("should start in active-session state", async () => { - await authService.initialize() - expect(authService.getState()).toBe("active-session") - }) - - it("should emit auth-state-changed event on initialize", async () => { - const spy = vi.fn() - authService.on("auth-state-changed", spy) - - await authService.initialize() - - expect(spy).toHaveBeenCalledWith({ state: "active-session", previousState: "initializing" }) - }) - - it("should log successful initialization", async () => { - await authService.initialize() - expect(mockLog).toHaveBeenCalledWith("[auth] Static token auth service initialized in active-session state") - }) - }) - - describe("getSessionToken", () => { - it("should return the provided token", () => { - expect(authService.getSessionToken()).toBe(testToken) - }) - - it("should return different token when constructed with different token", () => { - const differentToken = "different-token" - const differentService = new StaticTokenAuthService(mockContext, differentToken, mockLog) - expect(differentService.getSessionToken()).toBe(differentToken) - }) - }) - - describe("getUserInfo", () => { - it("should return empty object", () => { - expect(authService.getUserInfo()).toEqual({}) - }) - }) - - describe("getStoredOrganizationId", () => { - it("should return null", () => { - expect(authService.getStoredOrganizationId()).toBeNull() - }) - }) - - describe("authentication state methods", () => { - it("should always return true for isAuthenticated", () => { - expect(authService.isAuthenticated()).toBe(true) - }) - - it("should always return true for hasActiveSession", () => { - expect(authService.hasActiveSession()).toBe(true) - }) - - it("should always return true for hasOrIsAcquiringActiveSession", () => { - expect(authService.hasOrIsAcquiringActiveSession()).toBe(true) - }) - - it("should return active-session for getState", () => { - expect(authService.getState()).toBe("active-session") - }) - }) - - describe("disabled authentication methods", () => { - const expectedErrorMessage = "Authentication methods are disabled in StaticTokenAuthService" - - it("should throw error for login", async () => { - await expect(authService.login()).rejects.toThrow(expectedErrorMessage) - }) - - it("should throw error for logout", async () => { - await expect(authService.logout()).rejects.toThrow(expectedErrorMessage) - }) - - it("should throw error for handleCallback", async () => { - await expect(authService.handleCallback("code", "state")).rejects.toThrow(expectedErrorMessage) - }) - - it("should throw error for handleCallback with organization", async () => { - await expect(authService.handleCallback("code", "state", "org_123")).rejects.toThrow(expectedErrorMessage) - }) - }) - - describe("event emission", () => { - it("should be able to register and emit events", async () => { - const authStateChangedSpy = vi.fn() - const userInfoSpy = vi.fn() - - authService.on("auth-state-changed", authStateChangedSpy) - authService.on("user-info", userInfoSpy) - - await authService.initialize() - - expect(authStateChangedSpy).toHaveBeenCalledWith({ state: "active-session", previousState: "initializing" }) - // user-info event is not emitted in static token mode - expect(userInfoSpy).not.toHaveBeenCalled() - }) - }) -}) diff --git a/packages/cloud/src/__tests__/auth/WebAuthService.spec.ts b/packages/cloud/src/__tests__/auth/WebAuthService.spec.ts deleted file mode 100644 index 82fd964b7f..0000000000 --- a/packages/cloud/src/__tests__/auth/WebAuthService.spec.ts +++ /dev/null @@ -1,1113 +0,0 @@ -// npx vitest run src/__tests__/auth/WebAuthService.spec.ts - -import { type Mock } from "vitest" -import crypto from "crypto" -import * as vscode from "vscode" - -import { WebAuthService } from "../../auth/WebAuthService" -import { RefreshTimer } from "../../RefreshTimer" -import { getClerkBaseUrl, getRooCodeApiUrl } from "../../config" -import { getUserAgent } from "../../utils" - -// Mock external dependencies -vi.mock("../../RefreshTimer") -vi.mock("../../config") -vi.mock("../../utils") -vi.mock("crypto") - -// Mock fetch globally -const mockFetch = vi.fn() -global.fetch = mockFetch - -// Mock vscode module -vi.mock("vscode", () => ({ - window: { - showInformationMessage: vi.fn(), - showErrorMessage: vi.fn(), - }, - env: { - openExternal: vi.fn(), - uriScheme: "vscode", - }, - Uri: { - parse: vi.fn((uri: string) => ({ toString: () => uri })), - }, -})) - -describe("WebAuthService", () => { - let authService: WebAuthService - let mockTimer: { - start: Mock - stop: Mock - reset: Mock - } - let mockLog: Mock - let mockContext: { - subscriptions: { push: Mock } - secrets: { - get: Mock - store: Mock - delete: Mock - onDidChange: Mock - } - globalState: { - get: Mock - update: Mock - } - extension: { - packageJSON: { - version: string - publisher: string - name: string - } - } - } - - beforeEach(() => { - // Reset all mocks - vi.clearAllMocks() - - // Setup mock context with proper subscriptions array - mockContext = { - subscriptions: { - push: vi.fn(), - }, - secrets: { - get: vi.fn().mockResolvedValue(undefined), - store: vi.fn().mockResolvedValue(undefined), - delete: vi.fn().mockResolvedValue(undefined), - onDidChange: vi.fn().mockReturnValue({ dispose: vi.fn() }), - }, - globalState: { - get: vi.fn().mockReturnValue(undefined), - update: vi.fn().mockResolvedValue(undefined), - }, - extension: { - packageJSON: { - version: "1.0.0", - publisher: "RooVeterinaryInc", - name: "roo-cline", - }, - }, - } - - // Setup timer mock - mockTimer = { - start: vi.fn(), - stop: vi.fn(), - reset: vi.fn(), - } - const MockedRefreshTimer = vi.mocked(RefreshTimer) - MockedRefreshTimer.mockImplementation(() => mockTimer as unknown as RefreshTimer) - - // Setup config mocks - use production URL by default to maintain existing test behavior - vi.mocked(getClerkBaseUrl).mockReturnValue("https://clerk.roocode.com") - vi.mocked(getRooCodeApiUrl).mockReturnValue("https://api.test.com") - - // Setup utils mock - vi.mocked(getUserAgent).mockReturnValue("Roo-Code 1.0.0") - - // Setup crypto mock - vi.mocked(crypto.randomBytes).mockReturnValue(Buffer.from("test-random-bytes") as never) - - // Setup log mock - mockLog = vi.fn() - - authService = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - }) - - afterEach(() => { - vi.clearAllMocks() - }) - - describe("constructor", () => { - it("should initialize with correct default values", () => { - expect(authService.getState()).toBe("initializing") - expect(authService.isAuthenticated()).toBe(false) - expect(authService.hasActiveSession()).toBe(false) - expect(authService.getSessionToken()).toBeUndefined() - expect(authService.getUserInfo()).toBeNull() - }) - - it("should create RefreshTimer with correct configuration", () => { - expect(RefreshTimer).toHaveBeenCalledWith({ - callback: expect.any(Function), - successInterval: 50_000, - initialBackoffMs: 1_000, - maxBackoffMs: 300_000, - }) - }) - - it("should use console.log as default logger", () => { - const serviceWithoutLog = new WebAuthService(mockContext as unknown as vscode.ExtensionContext) - // Can't directly test console.log usage, but constructor should not throw - expect(serviceWithoutLog).toBeInstanceOf(WebAuthService) - }) - }) - - describe("initialize", () => { - it("should handle credentials change and setup event listener", async () => { - await authService.initialize() - - expect(mockContext.subscriptions.push).toHaveBeenCalled() - expect(mockContext.secrets.onDidChange).toHaveBeenCalled() - }) - - it("should not initialize twice", async () => { - await authService.initialize() - const firstCallCount = vi.mocked(mockContext.secrets.onDidChange).mock.calls.length - - await authService.initialize() - expect(mockContext.secrets.onDidChange).toHaveBeenCalledTimes(firstCallCount) - expect(mockLog).toHaveBeenCalledWith("[auth] initialize() called after already initialized") - }) - - it("should transition to logged-out when no credentials exist", async () => { - mockContext.secrets.get.mockResolvedValue(undefined) - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - await authService.initialize() - - expect(authService.getState()).toBe("logged-out") - expect(authStateChangedSpy).toHaveBeenCalledWith({ state: "logged-out", previousState: "initializing" }) - }) - - it("should transition to attempting-session when valid credentials exist", async () => { - const credentials = { clientToken: "test-token", sessionId: "test-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - await authService.initialize() - - expect(authService.getState()).toBe("attempting-session") - expect(authStateChangedSpy).toHaveBeenCalledWith({ - state: "attempting-session", - previousState: "initializing", - }) - expect(mockTimer.start).toHaveBeenCalled() - }) - - it("should handle invalid credentials gracefully", async () => { - mockContext.secrets.get.mockResolvedValue("invalid-json") - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - await authService.initialize() - - expect(authService.getState()).toBe("logged-out") - expect(mockLog).toHaveBeenCalledWith("[auth] Failed to parse stored credentials:", expect.any(Error)) - }) - - it("should handle credentials change events", async () => { - let onDidChangeCallback: (e: { key: string }) => void - - mockContext.secrets.onDidChange.mockImplementation((callback: (e: { key: string }) => void) => { - onDidChangeCallback = callback - return { dispose: vi.fn() } - }) - - await authService.initialize() - - // Simulate credentials change event - const newCredentials = { clientToken: "new-token", sessionId: "new-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(newCredentials)) - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - onDidChangeCallback!({ key: "clerk-auth-credentials" }) - await new Promise((resolve) => setTimeout(resolve, 0)) // Wait for async handling - - expect(authStateChangedSpy).toHaveBeenCalled() - }) - }) - - describe("login", () => { - beforeEach(async () => { - await authService.initialize() - }) - - it("should generate state and open external URL", async () => { - const mockOpenExternal = vi.fn() - const vscode = await import("vscode") - vi.mocked(vscode.env.openExternal).mockImplementation(mockOpenExternal) - - await authService.login() - - expect(crypto.randomBytes).toHaveBeenCalledWith(16) - expect(mockContext.globalState.update).toHaveBeenCalledWith( - "clerk-auth-state", - "746573742d72616e646f6d2d6279746573", - ) - expect(mockOpenExternal).toHaveBeenCalledWith( - expect.objectContaining({ - toString: expect.any(Function), - }), - ) - }) - - it("should use package.json values for redirect URI", async () => { - const mockOpenExternal = vi.fn() - const vscode = await import("vscode") - vi.mocked(vscode.env.openExternal).mockImplementation(mockOpenExternal) - - await authService.login() - - const expectedUrl = - "https://api.test.com/extension/sign-in?state=746573742d72616e646f6d2d6279746573&auth_redirect=vscode%3A%2F%2FRooVeterinaryInc.roo-cline" - expect(mockOpenExternal).toHaveBeenCalledWith( - expect.objectContaining({ - toString: expect.any(Function), - }), - ) - - // Verify the actual URL - const calledUri = mockOpenExternal.mock.calls[0][0] - expect(calledUri.toString()).toBe(expectedUrl) - }) - - it("should handle errors during login", async () => { - vi.mocked(crypto.randomBytes).mockImplementation(() => { - throw new Error("Crypto error") - }) - - await expect(authService.login()).rejects.toThrow("Failed to initiate Roo Code Cloud authentication") - expect(mockLog).toHaveBeenCalledWith("[auth] Error initiating Roo Code Cloud auth: Error: Crypto error") - }) - }) - - describe("handleCallback", () => { - beforeEach(async () => { - await authService.initialize() - }) - - it("should handle invalid parameters", async () => { - const vscode = await import("vscode") - const mockShowInfo = vi.fn() - vi.mocked(vscode.window.showInformationMessage).mockImplementation(mockShowInfo) - - await authService.handleCallback(null, "state") - expect(mockShowInfo).toHaveBeenCalledWith("Invalid Roo Code Cloud sign in url") - - await authService.handleCallback("code", null) - expect(mockShowInfo).toHaveBeenCalledWith("Invalid Roo Code Cloud sign in url") - }) - - it("should validate state parameter", async () => { - mockContext.globalState.get.mockReturnValue("stored-state") - - await expect(authService.handleCallback("code", "different-state")).rejects.toThrow( - "Failed to handle Roo Code Cloud callback", - ) - expect(mockLog).toHaveBeenCalledWith("[auth] State mismatch in callback") - }) - - it("should successfully handle valid callback", async () => { - const storedState = "valid-state" - mockContext.globalState.get.mockReturnValue(storedState) - - // Mock successful Clerk sign-in response - const mockResponse = { - ok: true, - json: () => - Promise.resolve({ - response: { created_session_id: "session-123" }, - }), - headers: { - get: (header: string) => (header === "authorization" ? "Bearer token-123" : null), - }, - } - mockFetch.mockResolvedValue(mockResponse) - - const vscode = await import("vscode") - const mockShowInfo = vi.fn() - vi.mocked(vscode.window.showInformationMessage).mockImplementation(mockShowInfo) - - await authService.handleCallback("auth-code", storedState) - - expect(mockContext.secrets.store).toHaveBeenCalledWith( - "clerk-auth-credentials", - JSON.stringify({ clientToken: "Bearer token-123", sessionId: "session-123", organizationId: null }), - ) - expect(mockShowInfo).toHaveBeenCalledWith("Successfully authenticated with Roo Code Cloud") - }) - - it("should handle Clerk API errors", async () => { - const storedState = "valid-state" - mockContext.globalState.get.mockReturnValue(storedState) - - mockFetch.mockResolvedValue({ - ok: false, - status: 400, - statusText: "Bad Request", - }) - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - await expect(authService.handleCallback("auth-code", storedState)).rejects.toThrow( - "Failed to handle Roo Code Cloud callback", - ) - expect(authStateChangedSpy).toHaveBeenCalled() - }) - }) - - describe("logout", () => { - beforeEach(async () => { - await authService.initialize() - }) - - it("should clear credentials and call Clerk logout", async () => { - // Set up credentials first by simulating a login state - const credentials = { clientToken: "test-token", sessionId: "test-session" } - - // Manually set the credentials in the service - authService["credentials"] = credentials - - // Mock successful logout response - mockFetch.mockResolvedValue({ ok: true }) - - const vscode = await import("vscode") - const mockShowInfo = vi.fn() - vi.mocked(vscode.window.showInformationMessage).mockImplementation(mockShowInfo) - - await authService.logout() - - expect(mockContext.secrets.delete).toHaveBeenCalledWith("clerk-auth-credentials") - expect(mockContext.globalState.update).toHaveBeenCalledWith("clerk-auth-state", undefined) - expect(mockFetch).toHaveBeenCalledWith( - "https://clerk.roocode.com/v1/client/sessions/test-session/remove", - expect.objectContaining({ - method: "POST", - headers: expect.objectContaining({ - Authorization: "Bearer test-token", - }), - }), - ) - expect(mockShowInfo).toHaveBeenCalledWith("Logged out from Roo Code Cloud") - }) - - it("should handle logout without credentials", async () => { - const vscode = await import("vscode") - const mockShowInfo = vi.fn() - vi.mocked(vscode.window.showInformationMessage).mockImplementation(mockShowInfo) - - await authService.logout() - - expect(mockContext.secrets.delete).toHaveBeenCalled() - expect(mockFetch).not.toHaveBeenCalled() - expect(mockShowInfo).toHaveBeenCalledWith("Logged out from Roo Code Cloud") - }) - - it("should handle Clerk logout errors gracefully", async () => { - // Set up credentials first by simulating a login state - const credentials = { clientToken: "test-token", sessionId: "test-session" } - - // Manually set the credentials in the service - authService["credentials"] = credentials - - // Mock failed logout response - mockFetch.mockRejectedValue(new Error("Network error")) - - const vscode = await import("vscode") - const mockShowInfo = vi.fn() - vi.mocked(vscode.window.showInformationMessage).mockImplementation(mockShowInfo) - - await authService.logout() - - expect(mockLog).toHaveBeenCalledWith("[auth] Error calling clerkLogout:", expect.any(Error)) - expect(mockShowInfo).toHaveBeenCalledWith("Logged out from Roo Code Cloud") - }) - }) - - describe("state management", () => { - it("should return correct state", () => { - expect(authService.getState()).toBe("initializing") - }) - - it("should return correct authentication status", async () => { - await authService.initialize() - expect(authService.isAuthenticated()).toBe(false) - - // Create a new service instance with credentials - const credentials = { clientToken: "test-token", sessionId: "test-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - - const authenticatedService = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - await authenticatedService.initialize() - - expect(authenticatedService.isAuthenticated()).toBe(true) - expect(authenticatedService.hasActiveSession()).toBe(false) - }) - - it("should return session token only for active sessions", () => { - expect(authService.getSessionToken()).toBeUndefined() - - // Manually set state to active-session for testing - // This would normally happen through refreshSession - authService["state"] = "active-session" - authService["sessionToken"] = "test-jwt" - - expect(authService.getSessionToken()).toBe("test-jwt") - }) - - it("should return correct values for new methods", async () => { - await authService.initialize() - expect(authService.hasOrIsAcquiringActiveSession()).toBe(false) - - // Create a new service instance with credentials (attempting-session) - const credentials = { clientToken: "test-token", sessionId: "test-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - - const attemptingService = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - await attemptingService.initialize() - - expect(attemptingService.hasOrIsAcquiringActiveSession()).toBe(true) - expect(attemptingService.hasActiveSession()).toBe(false) - - // Manually set state to active-session for testing - attemptingService["state"] = "active-session" - expect(attemptingService.hasOrIsAcquiringActiveSession()).toBe(true) - expect(attemptingService.hasActiveSession()).toBe(true) - }) - }) - - describe("session refresh", () => { - beforeEach(async () => { - // Set up with credentials - const credentials = { clientToken: "test-token", sessionId: "test-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - await authService.initialize() - }) - - it("should refresh session successfully", async () => { - // Mock successful token creation and user info fetch - mockFetch - .mockResolvedValueOnce({ - ok: true, - json: () => Promise.resolve({ jwt: "new-jwt-token" }), - }) - .mockResolvedValueOnce({ - ok: true, - json: () => - Promise.resolve({ - response: { - first_name: "John", - last_name: "Doe", - image_url: "https://example.com/avatar.jpg", - primary_email_address_id: "email-1", - email_addresses: [{ id: "email-1", email_address: "john@example.com" }], - }, - }), - }) - - const authStateChangedSpy = vi.fn() - const userInfoSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - authService.on("user-info", userInfoSpy) - - // Trigger refresh by calling the timer callback - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await timerCallback() - - // Wait for async operations to complete - await new Promise((resolve) => setTimeout(resolve, 0)) - - expect(authService.getState()).toBe("active-session") - expect(authService.hasActiveSession()).toBe(true) - expect(authService.getSessionToken()).toBe("new-jwt-token") - expect(authStateChangedSpy).toHaveBeenCalledWith({ - state: "active-session", - previousState: "attempting-session", - }) - expect(userInfoSpy).toHaveBeenCalledWith({ - userInfo: { - name: "John Doe", - email: "john@example.com", - picture: "https://example.com/avatar.jpg", - }, - }) - }) - - it("should handle invalid client token error", async () => { - // Mock 401 response (invalid token) - mockFetch.mockResolvedValue({ - ok: false, - status: 401, - statusText: "Unauthorized", - }) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - - await expect(timerCallback()).rejects.toThrow() - expect(mockContext.secrets.delete).toHaveBeenCalledWith("clerk-auth-credentials") - expect(mockLog).toHaveBeenCalledWith("[auth] Invalid/Expired client token: clearing credentials") - }) - - it("should handle network errors during refresh", async () => { - mockFetch.mockRejectedValue(new Error("Network error")) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - - await expect(timerCallback()).rejects.toThrow("Network error") - expect(mockLog).toHaveBeenCalledWith("[auth] Failed to refresh session", expect.any(Error)) - }) - - it("should transition to inactive-session on first attempt failure", async () => { - // Mock failed token creation response - mockFetch.mockResolvedValue({ - ok: false, - status: 500, - statusText: "Internal Server Error", - }) - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - // Verify we start in attempting-session state - expect(authService.getState()).toBe("attempting-session") - expect(authService["isFirstRefreshAttempt"]).toBe(true) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - - await expect(timerCallback()).rejects.toThrow() - - // Should transition to inactive-session after first failure - expect(authService.getState()).toBe("inactive-session") - expect(authService["isFirstRefreshAttempt"]).toBe(false) - expect(authStateChangedSpy).toHaveBeenCalledWith({ - state: "inactive-session", - previousState: "attempting-session", - }) - }) - - it("should not transition to inactive-session on subsequent failures", async () => { - // First, transition to inactive-session by failing the first attempt - mockFetch.mockResolvedValue({ - ok: false, - status: 500, - statusText: "Internal Server Error", - }) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await expect(timerCallback()).rejects.toThrow() - - // Verify we're now in inactive-session - expect(authService.getState()).toBe("inactive-session") - expect(authService["isFirstRefreshAttempt"]).toBe(false) - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - // Subsequent failure should not trigger another transition - await expect(timerCallback()).rejects.toThrow() - - expect(authService.getState()).toBe("inactive-session") - expect(authStateChangedSpy).not.toHaveBeenCalled() - }) - - it("should clear credentials on 401 during first refresh attempt (bug fix)", async () => { - // Mock 401 response during first refresh attempt - mockFetch.mockResolvedValue({ - ok: false, - status: 401, - statusText: "Unauthorized", - }) - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await expect(timerCallback()).rejects.toThrow() - - // Should clear credentials (not just transition to inactive-session) - expect(mockContext.secrets.delete).toHaveBeenCalledWith("clerk-auth-credentials") - expect(mockLog).toHaveBeenCalledWith("[auth] Invalid/Expired client token: clearing credentials") - - // Simulate credentials cleared event - mockContext.secrets.get.mockResolvedValue(undefined) - await authService["handleCredentialsChange"]() - - expect(authService.getState()).toBe("logged-out") - expect(authStateChangedSpy).toHaveBeenCalledWith({ - state: "logged-out", - previousState: "attempting-session", - }) - }) - }) - - describe("user info", () => { - it("should return null initially", () => { - expect(authService.getUserInfo()).toBeNull() - }) - - it("should parse user info correctly for personal accounts", async () => { - // Set up with credentials for personal account (no organizationId) - const credentials = { clientToken: "test-token", sessionId: "test-session", organizationId: null } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - await authService.initialize() - - // Clear previous mock calls - mockFetch.mockClear() - - // Mock successful responses - mockFetch - .mockResolvedValueOnce({ - ok: true, - json: () => Promise.resolve({ jwt: "jwt-token" }), - }) - .mockResolvedValueOnce({ - ok: true, - json: () => - Promise.resolve({ - response: { - first_name: "Jane", - last_name: "Smith", - image_url: "https://example.com/jane.jpg", - primary_email_address_id: "email-2", - email_addresses: [ - { id: "email-1", email_address: "jane.old@example.com" }, - { id: "email-2", email_address: "jane@example.com" }, - ], - }, - }), - }) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await timerCallback() - - // Wait for async operations to complete - await new Promise((resolve) => setTimeout(resolve, 0)) - - const userInfo = authService.getUserInfo() - expect(userInfo).toEqual({ - name: "Jane Smith", - email: "jane@example.com", - picture: "https://example.com/jane.jpg", - }) - }) - - it("should parse user info correctly for organization accounts", async () => { - // Set up with credentials for organization account - const credentials = { clientToken: "test-token", sessionId: "test-session", organizationId: "org_1" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - await authService.initialize() - - // Clear previous mock calls - mockFetch.mockClear() - - // Mock successful responses - mockFetch - .mockResolvedValueOnce({ - ok: true, - json: () => Promise.resolve({ jwt: "jwt-token" }), - }) - .mockResolvedValueOnce({ - ok: true, - json: () => - Promise.resolve({ - response: { - first_name: "Jane", - last_name: "Smith", - image_url: "https://example.com/jane.jpg", - primary_email_address_id: "email-2", - email_addresses: [ - { id: "email-1", email_address: "jane.old@example.com" }, - { id: "email-2", email_address: "jane@example.com" }, - ], - }, - }), - }) - .mockResolvedValueOnce({ - ok: true, - json: () => - Promise.resolve({ - response: [ - { - id: "org_member_id_1", - role: "member", - organization: { - id: "org_1", - name: "Org 1", - }, - }, - ], - }), - }) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await timerCallback() - - // Wait for async operations to complete - await new Promise((resolve) => setTimeout(resolve, 0)) - - const userInfo = authService.getUserInfo() - expect(userInfo).toEqual({ - name: "Jane Smith", - email: "jane@example.com", - picture: "https://example.com/jane.jpg", - organizationId: "org_1", - organizationName: "Org 1", - organizationRole: "member", - }) - }) - - it("should handle missing user info fields", async () => { - // Set up with credentials for personal account (no organizationId) - const credentials = { clientToken: "test-token", sessionId: "test-session", organizationId: null } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - await authService.initialize() - - // Clear previous mock calls - mockFetch.mockClear() - - // Mock responses with minimal data - mockFetch - .mockResolvedValueOnce({ - ok: true, - json: () => Promise.resolve({ jwt: "jwt-token" }), - }) - .mockResolvedValueOnce({ - ok: true, - json: () => - Promise.resolve({ - response: { - first_name: "John", - last_name: "Doe", - // Missing other fields - }, - }), - }) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await timerCallback() - - // Wait for async operations to complete - await new Promise((resolve) => setTimeout(resolve, 0)) - - const userInfo = authService.getUserInfo() - expect(userInfo).toEqual({ - name: "John Doe", - email: undefined, - picture: undefined, - }) - }) - }) - - describe("event emissions", () => { - it("should emit auth-state-changed event for logged-out", async () => { - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - await authService.initialize() - - expect(authStateChangedSpy).toHaveBeenCalledWith({ state: "logged-out", previousState: "initializing" }) - }) - - it("should emit auth-state-changed event for attempting-session", async () => { - const credentials = { clientToken: "test-token", sessionId: "test-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - await authService.initialize() - - expect(authStateChangedSpy).toHaveBeenCalledWith({ - state: "attempting-session", - previousState: "initializing", - }) - }) - - it("should emit auth-state-changed event for active-session", async () => { - // Set up with credentials - const credentials = { clientToken: "test-token", sessionId: "test-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - await authService.initialize() - - // Clear previous mock calls - mockFetch.mockClear() - - // Mock both the token creation and user info fetch - mockFetch - .mockResolvedValueOnce({ - ok: true, - json: () => Promise.resolve({ jwt: "jwt-token" }), - }) - .mockResolvedValueOnce({ - ok: true, - json: () => - Promise.resolve({ - response: { - first_name: "Test", - last_name: "User", - }, - }), - }) - - const authStateChangedSpy = vi.fn() - authService.on("auth-state-changed", authStateChangedSpy) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await timerCallback() - - // Wait for async operations to complete - await new Promise((resolve) => setTimeout(resolve, 0)) - - expect(authStateChangedSpy).toHaveBeenCalledWith({ - state: "active-session", - previousState: "attempting-session", - }) - }) - - it("should emit user-info event", async () => { - // Set up with credentials - const credentials = { clientToken: "test-token", sessionId: "test-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - await authService.initialize() - - // Clear previous mock calls - mockFetch.mockClear() - - mockFetch - .mockResolvedValueOnce({ - ok: true, - json: () => Promise.resolve({ jwt: "jwt-token" }), - }) - .mockResolvedValueOnce({ - ok: true, - json: () => - Promise.resolve({ - response: { - first_name: "Test", - last_name: "User", - }, - }), - }) - - const userInfoSpy = vi.fn() - authService.on("user-info", userInfoSpy) - - const timerCallback = vi.mocked(RefreshTimer).mock.calls[0][0].callback - await timerCallback() - - // Wait for async operations to complete - await new Promise((resolve) => setTimeout(resolve, 0)) - - expect(userInfoSpy).toHaveBeenCalledWith({ - userInfo: { - name: "Test User", - email: undefined, - picture: undefined, - }, - }) - }) - }) - - describe("error handling", () => { - it("should handle credentials change errors", async () => { - mockContext.secrets.get.mockRejectedValue(new Error("Storage error")) - - await authService.initialize() - - expect(mockLog).toHaveBeenCalledWith("[auth] Error handling credentials change:", expect.any(Error)) - }) - - it("should handle malformed JSON in credentials", async () => { - mockContext.secrets.get.mockResolvedValue("invalid-json{") - - await authService.initialize() - - expect(authService.getState()).toBe("logged-out") - expect(mockLog).toHaveBeenCalledWith("[auth] Failed to parse stored credentials:", expect.any(Error)) - }) - - it("should handle invalid credentials schema", async () => { - mockContext.secrets.get.mockResolvedValue(JSON.stringify({ invalid: "data" })) - - await authService.initialize() - - expect(authService.getState()).toBe("logged-out") - expect(mockLog).toHaveBeenCalledWith("[auth] Invalid credentials format:", expect.any(Array)) - }) - - it("should handle missing authorization header in sign-in response", async () => { - const storedState = "valid-state" - mockContext.globalState.get.mockReturnValue(storedState) - - mockFetch.mockResolvedValue({ - ok: true, - json: () => - Promise.resolve({ - response: { created_session_id: "session-123" }, - }), - headers: { - get: () => null, // No authorization header - }, - }) - - await expect(authService.handleCallback("auth-code", storedState)).rejects.toThrow( - "Failed to handle Roo Code Cloud callback", - ) - }) - }) - - describe("timer integration", () => { - it("should stop timer on logged-out transition", async () => { - await authService.initialize() - - expect(mockTimer.stop).toHaveBeenCalled() - }) - - it("should start timer on attempting-session transition", async () => { - const credentials = { clientToken: "test-token", sessionId: "test-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - - await authService.initialize() - - expect(mockTimer.start).toHaveBeenCalled() - }) - }) - - describe("auth credentials key scoping", () => { - it("should use default key when getClerkBaseUrl returns production URL", async () => { - // Mock getClerkBaseUrl to return production URL - vi.mocked(getClerkBaseUrl).mockReturnValue("https://clerk.roocode.com") - - const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - const credentials = { clientToken: "test-token", sessionId: "test-session" } - - await service.initialize() - await service["storeCredentials"](credentials) - - expect(mockContext.secrets.store).toHaveBeenCalledWith( - "clerk-auth-credentials", - JSON.stringify(credentials), - ) - }) - - it("should use scoped key when getClerkBaseUrl returns custom URL", async () => { - const customUrl = "https://custom.clerk.com" - // Mock getClerkBaseUrl to return custom URL - vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) - - const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - const credentials = { clientToken: "test-token", sessionId: "test-session" } - - await service.initialize() - await service["storeCredentials"](credentials) - - expect(mockContext.secrets.store).toHaveBeenCalledWith( - `clerk-auth-credentials-${customUrl}`, - JSON.stringify(credentials), - ) - }) - - it("should load credentials using scoped key", async () => { - const customUrl = "https://custom.clerk.com" - vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) - - const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - const credentials = { clientToken: "test-token", sessionId: "test-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(credentials)) - - await service.initialize() - const loadedCredentials = await service["loadCredentials"]() - - expect(mockContext.secrets.get).toHaveBeenCalledWith(`clerk-auth-credentials-${customUrl}`) - expect(loadedCredentials).toEqual(credentials) - }) - - it("should clear credentials using scoped key", async () => { - const customUrl = "https://custom.clerk.com" - vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) - - const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - - await service.initialize() - await service["clearCredentials"]() - - expect(mockContext.secrets.delete).toHaveBeenCalledWith(`clerk-auth-credentials-${customUrl}`) - }) - - it("should listen for changes on scoped key", async () => { - const customUrl = "https://custom.clerk.com" - vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) - - let onDidChangeCallback: (e: { key: string }) => void - - mockContext.secrets.onDidChange.mockImplementation((callback: (e: { key: string }) => void) => { - onDidChangeCallback = callback - return { dispose: vi.fn() } - }) - - const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - await service.initialize() - - // Simulate credentials change event with scoped key - const newCredentials = { clientToken: "new-token", sessionId: "new-session" } - mockContext.secrets.get.mockResolvedValue(JSON.stringify(newCredentials)) - - const authStateChangedSpy = vi.fn() - service.on("auth-state-changed", authStateChangedSpy) - - onDidChangeCallback!({ key: `clerk-auth-credentials-${customUrl}` }) - await new Promise((resolve) => setTimeout(resolve, 0)) // Wait for async handling - - expect(authStateChangedSpy).toHaveBeenCalled() - }) - - it("should not respond to changes on different scoped keys", async () => { - const customUrl = "https://custom.clerk.com" - vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) - - let onDidChangeCallback: (e: { key: string }) => void - - mockContext.secrets.onDidChange.mockImplementation((callback: (e: { key: string }) => void) => { - onDidChangeCallback = callback - return { dispose: vi.fn() } - }) - - const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - await service.initialize() - - const authStateChangedSpy = vi.fn() - service.on("auth-state-changed", authStateChangedSpy) - - // Simulate credentials change event with different scoped key - onDidChangeCallback!({ key: "clerk-auth-credentials-https://other.clerk.com" }) - await new Promise((resolve) => setTimeout(resolve, 0)) // Wait for async handling - - expect(authStateChangedSpy).not.toHaveBeenCalled() - }) - - it("should not respond to changes on default key when using scoped key", async () => { - const customUrl = "https://custom.clerk.com" - vi.mocked(getClerkBaseUrl).mockReturnValue(customUrl) - - let onDidChangeCallback: (e: { key: string }) => void - - mockContext.secrets.onDidChange.mockImplementation((callback: (e: { key: string }) => void) => { - onDidChangeCallback = callback - return { dispose: vi.fn() } - }) - - const service = new WebAuthService(mockContext as unknown as vscode.ExtensionContext, mockLog) - await service.initialize() - - const authStateChangedSpy = vi.fn() - service.on("auth-state-changed", authStateChangedSpy) - - // Simulate credentials change event with default key - onDidChangeCallback!({ key: "clerk-auth-credentials" }) - await new Promise((resolve) => setTimeout(resolve, 0)) // Wait for async handling - - expect(authStateChangedSpy).not.toHaveBeenCalled() - }) - }) -}) diff --git a/packages/cloud/src/auth/AuthService.ts b/packages/cloud/src/auth/AuthService.ts deleted file mode 100644 index a49ad0104d..0000000000 --- a/packages/cloud/src/auth/AuthService.ts +++ /dev/null @@ -1,36 +0,0 @@ -import EventEmitter from "events" - -import type { CloudUserInfo } from "@roo-code/types" - -export interface AuthServiceEvents { - "auth-state-changed": [ - data: { - state: AuthState - previousState: AuthState - }, - ] - "user-info": [data: { userInfo: CloudUserInfo }] -} - -export type AuthState = "initializing" | "logged-out" | "active-session" | "attempting-session" | "inactive-session" - -export interface AuthService extends EventEmitter { - // Lifecycle - initialize(): Promise - - // Authentication methods - login(): Promise - logout(): Promise - handleCallback(code: string | null, state: string | null, organizationId?: string | null): Promise - - // State methods - getState(): AuthState - isAuthenticated(): boolean - hasActiveSession(): boolean - hasOrIsAcquiringActiveSession(): boolean - - // Token and user info - getSessionToken(): string | undefined - getUserInfo(): CloudUserInfo | null - getStoredOrganizationId(): string | null -} diff --git a/packages/cloud/src/auth/StaticTokenAuthService.ts b/packages/cloud/src/auth/StaticTokenAuthService.ts deleted file mode 100644 index 04821006d5..0000000000 --- a/packages/cloud/src/auth/StaticTokenAuthService.ts +++ /dev/null @@ -1,71 +0,0 @@ -import EventEmitter from "events" - -import * as vscode from "vscode" - -import type { CloudUserInfo } from "@roo-code/types" - -import type { AuthService, AuthServiceEvents, AuthState } from "./AuthService" - -export class StaticTokenAuthService extends EventEmitter implements AuthService { - private state: AuthState = "active-session" - private token: string - private log: (...args: unknown[]) => void - - constructor(context: vscode.ExtensionContext, token: string, log?: (...args: unknown[]) => void) { - super() - this.token = token - this.log = log || console.log - this.log("[auth] Using static token authentication mode") - } - - public async initialize(): Promise { - const previousState: AuthState = "initializing" - this.state = "active-session" - this.emit("auth-state-changed", { state: this.state, previousState }) - this.log("[auth] Static token auth service initialized in active-session state") - } - - public async login(): Promise { - throw new Error("Authentication methods are disabled in StaticTokenAuthService") - } - - public async logout(): Promise { - throw new Error("Authentication methods are disabled in StaticTokenAuthService") - } - - public async handleCallback( - _code: string | null, - _state: string | null, - _organizationId?: string | null, - ): Promise { - throw new Error("Authentication methods are disabled in StaticTokenAuthService") - } - - public getState(): AuthState { - return this.state - } - - public getSessionToken(): string | undefined { - return this.token - } - - public isAuthenticated(): boolean { - return true - } - - public hasActiveSession(): boolean { - return true - } - - public hasOrIsAcquiringActiveSession(): boolean { - return true - } - - public getUserInfo(): CloudUserInfo | null { - return {} - } - - public getStoredOrganizationId(): string | null { - return null - } -} diff --git a/packages/cloud/src/auth/WebAuthService.ts b/packages/cloud/src/auth/WebAuthService.ts deleted file mode 100644 index b94957950b..0000000000 --- a/packages/cloud/src/auth/WebAuthService.ts +++ /dev/null @@ -1,646 +0,0 @@ -import crypto from "crypto" -import EventEmitter from "events" - -import * as vscode from "vscode" -import { z } from "zod" - -import type { CloudUserInfo, CloudOrganizationMembership } from "@roo-code/types" - -import { getClerkBaseUrl, getRooCodeApiUrl, PRODUCTION_CLERK_BASE_URL } from "../config" -import { getUserAgent } from "../utils" -import { InvalidClientTokenError } from "../errors" -import { RefreshTimer } from "../RefreshTimer" - -import type { AuthService, AuthServiceEvents, AuthState } from "./AuthService" - -const AUTH_STATE_KEY = "clerk-auth-state" - -/** - * AuthCredentials - */ - -const authCredentialsSchema = z.object({ - clientToken: z.string().min(1, "Client token cannot be empty"), - sessionId: z.string().min(1, "Session ID cannot be empty"), - organizationId: z.string().nullable().optional(), -}) - -type AuthCredentials = z.infer - -/** - * Clerk Schemas - */ - -const clerkSignInResponseSchema = z.object({ - response: z.object({ - created_session_id: z.string(), - }), -}) - -const clerkCreateSessionTokenResponseSchema = z.object({ - jwt: z.string(), -}) - -const clerkMeResponseSchema = z.object({ - response: z.object({ - id: z.string().optional(), - first_name: z.string().nullish(), - last_name: z.string().nullish(), - image_url: z.string().optional(), - primary_email_address_id: z.string().optional(), - email_addresses: z - .array( - z.object({ - id: z.string(), - email_address: z.string(), - }), - ) - .optional(), - }), -}) - -const clerkOrganizationMembershipsSchema = z.object({ - response: z.array( - z.object({ - id: z.string(), - role: z.string(), - permissions: z.array(z.string()).optional(), - created_at: z.number().optional(), - updated_at: z.number().optional(), - organization: z.object({ - id: z.string(), - name: z.string(), - slug: z.string().optional(), - image_url: z.string().optional(), - has_image: z.boolean().optional(), - created_at: z.number().optional(), - updated_at: z.number().optional(), - }), - }), - ), -}) - -export class WebAuthService extends EventEmitter implements AuthService { - private context: vscode.ExtensionContext - private timer: RefreshTimer - private state: AuthState = "initializing" - private log: (...args: unknown[]) => void - private readonly authCredentialsKey: string - - private credentials: AuthCredentials | null = null - private sessionToken: string | null = null - private userInfo: CloudUserInfo | null = null - private isFirstRefreshAttempt: boolean = false - - constructor(context: vscode.ExtensionContext, log?: (...args: unknown[]) => void) { - super() - - this.context = context - this.log = log || console.log - - // Calculate auth credentials key based on Clerk base URL. - const clerkBaseUrl = getClerkBaseUrl() - - if (clerkBaseUrl !== PRODUCTION_CLERK_BASE_URL) { - this.authCredentialsKey = `clerk-auth-credentials-${clerkBaseUrl}` - } else { - this.authCredentialsKey = "clerk-auth-credentials" - } - - this.timer = new RefreshTimer({ - callback: async () => { - await this.refreshSession() - return true - }, - successInterval: 50_000, - initialBackoffMs: 1_000, - maxBackoffMs: 300_000, - }) - } - - private changeState(newState: AuthState): void { - const previousState = this.state - this.state = newState - this.emit("auth-state-changed", { state: newState, previousState }) - } - - private async handleCredentialsChange(): Promise { - try { - const credentials = await this.loadCredentials() - - if (credentials) { - if ( - this.credentials === null || - this.credentials.clientToken !== credentials.clientToken || - this.credentials.sessionId !== credentials.sessionId - ) { - this.transitionToAttemptingSession(credentials) - } - } else { - if (this.state !== "logged-out") { - this.transitionToLoggedOut() - } - } - } catch (error) { - this.log("[auth] Error handling credentials change:", error) - } - } - - private transitionToLoggedOut(): void { - this.timer.stop() - - this.credentials = null - this.sessionToken = null - this.userInfo = null - - this.changeState("logged-out") - - this.log("[auth] Transitioned to logged-out state") - } - - private transitionToAttemptingSession(credentials: AuthCredentials): void { - this.credentials = credentials - - this.sessionToken = null - this.userInfo = null - this.isFirstRefreshAttempt = true - - this.changeState("attempting-session") - - this.timer.start() - - this.log("[auth] Transitioned to attempting-session state") - } - - private transitionToInactiveSession(): void { - this.sessionToken = null - this.userInfo = null - - this.changeState("inactive-session") - - this.log("[auth] Transitioned to inactive-session state") - } - - /** - * Initialize the auth state - * - * This method loads tokens from storage and determines the current auth state. - * It also starts the refresh timer if we have an active session. - */ - public async initialize(): Promise { - if (this.state !== "initializing") { - this.log("[auth] initialize() called after already initialized") - return - } - - await this.handleCredentialsChange() - - this.context.subscriptions.push( - this.context.secrets.onDidChange((e) => { - if (e.key === this.authCredentialsKey) { - this.handleCredentialsChange() - } - }), - ) - } - - private async storeCredentials(credentials: AuthCredentials): Promise { - await this.context.secrets.store(this.authCredentialsKey, JSON.stringify(credentials)) - } - - private async loadCredentials(): Promise { - const credentialsJson = await this.context.secrets.get(this.authCredentialsKey) - if (!credentialsJson) return null - - try { - const parsedJson = JSON.parse(credentialsJson) - const credentials = authCredentialsSchema.parse(parsedJson) - - // Migration: If no organizationId but we have userInfo, add it - if (credentials.organizationId === undefined && this.userInfo?.organizationId) { - credentials.organizationId = this.userInfo.organizationId - await this.storeCredentials(credentials) - this.log("[auth] Migrated credentials with organizationId") - } - - return credentials - } catch (error) { - if (error instanceof z.ZodError) { - this.log("[auth] Invalid credentials format:", error.errors) - } else { - this.log("[auth] Failed to parse stored credentials:", error) - } - return null - } - } - - private async clearCredentials(): Promise { - await this.context.secrets.delete(this.authCredentialsKey) - } - - /** - * Start the login process - * - * This method initiates the authentication flow by generating a state parameter - * and opening the browser to the authorization URL. - */ - public async login(): Promise { - try { - // Generate a cryptographically random state parameter. - const state = crypto.randomBytes(16).toString("hex") - await this.context.globalState.update(AUTH_STATE_KEY, state) - const packageJSON = this.context.extension?.packageJSON - const publisher = packageJSON?.publisher ?? "RooVeterinaryInc" - const name = packageJSON?.name ?? "roo-cline" - const params = new URLSearchParams({ - state, - auth_redirect: `${vscode.env.uriScheme}://${publisher}.${name}`, - }) - const url = `${getRooCodeApiUrl()}/extension/sign-in?${params.toString()}` - await vscode.env.openExternal(vscode.Uri.parse(url)) - } catch (error) { - this.log(`[auth] Error initiating Roo Code Cloud auth: ${error}`) - throw new Error(`Failed to initiate Roo Code Cloud authentication: ${error}`) - } - } - - /** - * Handle the callback from Roo Code Cloud - * - * This method is called when the user is redirected back to the extension - * after authenticating with Roo Code Cloud. - * - * @param code The authorization code from the callback - * @param state The state parameter from the callback - * @param organizationId The organization ID from the callback (null for personal accounts) - */ - public async handleCallback( - code: string | null, - state: string | null, - organizationId?: string | null, - ): Promise { - if (!code || !state) { - vscode.window.showInformationMessage("Invalid Roo Code Cloud sign in url") - return - } - - try { - // Validate state parameter to prevent CSRF attacks. - const storedState = this.context.globalState.get(AUTH_STATE_KEY) - - if (state !== storedState) { - this.log("[auth] State mismatch in callback") - throw new Error("Invalid state parameter. Authentication request may have been tampered with.") - } - - const credentials = await this.clerkSignIn(code) - - // Set organizationId (null for personal accounts) - credentials.organizationId = organizationId || null - - await this.storeCredentials(credentials) - - vscode.window.showInformationMessage("Successfully authenticated with Roo Code Cloud") - this.log("[auth] Successfully authenticated with Roo Code Cloud") - } catch (error) { - this.log(`[auth] Error handling Roo Code Cloud callback: ${error}`) - this.changeState("logged-out") - throw new Error(`Failed to handle Roo Code Cloud callback: ${error}`) - } - } - - /** - * Log out - * - * This method removes all stored tokens and stops the refresh timer. - */ - public async logout(): Promise { - const oldCredentials = this.credentials - - try { - // Clear credentials from storage - onDidChange will handle state transitions - await this.clearCredentials() - await this.context.globalState.update(AUTH_STATE_KEY, undefined) - - if (oldCredentials) { - try { - await this.clerkLogout(oldCredentials) - } catch (error) { - this.log("[auth] Error calling clerkLogout:", error) - } - } - - vscode.window.showInformationMessage("Logged out from Roo Code Cloud") - this.log("[auth] Logged out from Roo Code Cloud") - } catch (error) { - this.log(`[auth] Error logging out from Roo Code Cloud: ${error}`) - throw new Error(`Failed to log out from Roo Code Cloud: ${error}`) - } - } - - public getState(): AuthState { - return this.state - } - - public getSessionToken(): string | undefined { - if (this.state === "active-session" && this.sessionToken) { - return this.sessionToken - } - - return - } - - /** - * Check if the user is authenticated - * - * @returns True if the user is authenticated (has an active, attempting, or inactive session) - */ - public isAuthenticated(): boolean { - return ( - this.state === "active-session" || this.state === "attempting-session" || this.state === "inactive-session" - ) - } - - public hasActiveSession(): boolean { - return this.state === "active-session" - } - - /** - * Check if the user has an active session or is currently attempting to acquire one - * - * @returns True if the user has an active session or is attempting to get one - */ - public hasOrIsAcquiringActiveSession(): boolean { - return this.state === "active-session" || this.state === "attempting-session" - } - - /** - * Refresh the session - * - * This method refreshes the session token using the client token. - */ - private async refreshSession(): Promise { - if (!this.credentials) { - this.log("[auth] Cannot refresh session: missing credentials") - return - } - - try { - const previousState = this.state - this.sessionToken = await this.clerkCreateSessionToken() - - if (previousState !== "active-session") { - this.changeState("active-session") - this.log("[auth] Transitioned to active-session state") - this.fetchUserInfo() - } else { - this.state = "active-session" - } - } catch (error) { - if (error instanceof InvalidClientTokenError) { - this.log("[auth] Invalid/Expired client token: clearing credentials") - this.clearCredentials() - } else if (this.isFirstRefreshAttempt && this.state === "attempting-session") { - this.isFirstRefreshAttempt = false - this.transitionToInactiveSession() - } - this.log("[auth] Failed to refresh session", error) - throw error - } - } - - private async fetchUserInfo(): Promise { - if (!this.credentials) { - return - } - - this.userInfo = await this.clerkMe() - this.emit("user-info", { userInfo: this.userInfo }) - } - - /** - * Extract user information from the ID token - * - * @returns User information from ID token claims or null if no ID token available - */ - public getUserInfo(): CloudUserInfo | null { - return this.userInfo - } - - /** - * Get the stored organization ID from credentials - * - * @returns The stored organization ID, null for personal accounts or if no credentials exist - */ - public getStoredOrganizationId(): string | null { - return this.credentials?.organizationId || null - } - - private async clerkSignIn(ticket: string): Promise { - const formData = new URLSearchParams() - formData.append("strategy", "ticket") - formData.append("ticket", ticket) - - const response = await fetch(`${getClerkBaseUrl()}/v1/client/sign_ins`, { - method: "POST", - headers: { - "Content-Type": "application/x-www-form-urlencoded", - "User-Agent": this.userAgent(), - }, - body: formData.toString(), - signal: AbortSignal.timeout(10000), - }) - - if (!response.ok) { - throw new Error(`HTTP ${response.status}: ${response.statusText}`) - } - - const { - response: { created_session_id: sessionId }, - } = clerkSignInResponseSchema.parse(await response.json()) - - // 3. Extract the client token from the Authorization header. - const clientToken = response.headers.get("authorization") - - if (!clientToken) { - throw new Error("No authorization header found in the response") - } - - return authCredentialsSchema.parse({ clientToken, sessionId }) - } - - private async clerkCreateSessionToken(): Promise { - const formData = new URLSearchParams() - formData.append("_is_native", "1") - - // Handle 3 cases for organization_id: - // 1. Have an org id: organization_id=THE_ORG_ID - // 2. Have a personal account: organization_id= (empty string) - // 3. Don't know if you have an org id (old style credentials): don't send organization_id param at all - const organizationId = this.getStoredOrganizationId() - if (this.credentials?.organizationId !== undefined) { - // We have organization context info (either org id or personal account) - formData.append("organization_id", organizationId || "") - } - // If organizationId is undefined, don't send the param at all (old credentials) - - const response = await fetch(`${getClerkBaseUrl()}/v1/client/sessions/${this.credentials!.sessionId}/tokens`, { - method: "POST", - headers: { - "Content-Type": "application/x-www-form-urlencoded", - Authorization: `Bearer ${this.credentials!.clientToken}`, - "User-Agent": this.userAgent(), - }, - body: formData.toString(), - signal: AbortSignal.timeout(10000), - }) - - if (response.status === 401 || response.status === 404) { - throw new InvalidClientTokenError() - } else if (!response.ok) { - throw new Error(`HTTP ${response.status}: ${response.statusText}`) - } - - const data = clerkCreateSessionTokenResponseSchema.parse(await response.json()) - - return data.jwt - } - - private async clerkMe(): Promise { - const response = await fetch(`${getClerkBaseUrl()}/v1/me`, { - headers: { - Authorization: `Bearer ${this.credentials!.clientToken}`, - "User-Agent": this.userAgent(), - }, - signal: AbortSignal.timeout(10000), - }) - - if (!response.ok) { - throw new Error(`HTTP ${response.status}: ${response.statusText}`) - } - - const payload = await response.json() - const { response: userData } = clerkMeResponseSchema.parse(payload) - - const userInfo: CloudUserInfo = { - id: userData.id, - picture: userData.image_url, - } - - const names = [userData.first_name, userData.last_name].filter((name) => !!name) - userInfo.name = names.length > 0 ? names.join(" ") : undefined - const primaryEmailAddressId = userData.primary_email_address_id - const emailAddresses = userData.email_addresses - - if (primaryEmailAddressId && emailAddresses) { - userInfo.email = emailAddresses.find( - (email: { id: string }) => primaryEmailAddressId === email.id, - )?.email_address - } - - // Fetch organization info if user is in organization context - try { - const storedOrgId = this.getStoredOrganizationId() - - if (this.credentials?.organizationId !== undefined) { - // We have organization context info - if (storedOrgId !== null) { - // User is in organization context - fetch user's memberships and filter - const orgMemberships = await this.clerkGetOrganizationMemberships() - const userMembership = this.findOrganizationMembership(orgMemberships, storedOrgId) - - if (userMembership) { - this.setUserOrganizationInfo(userInfo, userMembership) - - this.log("[auth] User in organization context:", { - id: userMembership.organization.id, - name: userMembership.organization.name, - role: userMembership.role, - }) - } else { - this.log("[auth] Warning: User not found in stored organization:", storedOrgId) - } - } else { - this.log("[auth] User in personal account context - not setting organization info") - } - } else { - // Old credentials without organization context - fetch organization info to determine context - const orgMemberships = await this.clerkGetOrganizationMemberships() - const primaryOrgMembership = this.findPrimaryOrganizationMembership(orgMemberships) - - if (primaryOrgMembership) { - this.setUserOrganizationInfo(userInfo, primaryOrgMembership) - - this.log("[auth] Legacy credentials: Found organization membership:", { - id: primaryOrgMembership.organization.id, - name: primaryOrgMembership.organization.name, - role: primaryOrgMembership.role, - }) - } else { - this.log("[auth] Legacy credentials: No organization memberships found") - } - } - } catch (error) { - this.log("[auth] Failed to fetch organization info:", error) - // Don't throw - organization info is optional - } - - return userInfo - } - - private findOrganizationMembership( - memberships: CloudOrganizationMembership[], - organizationId: string, - ): CloudOrganizationMembership | undefined { - return memberships?.find((membership) => membership.organization.id === organizationId) - } - - private findPrimaryOrganizationMembership( - memberships: CloudOrganizationMembership[], - ): CloudOrganizationMembership | undefined { - return memberships && memberships.length > 0 ? memberships[0] : undefined - } - - private setUserOrganizationInfo(userInfo: CloudUserInfo, membership: CloudOrganizationMembership): void { - userInfo.organizationId = membership.organization.id - userInfo.organizationName = membership.organization.name - userInfo.organizationRole = membership.role - userInfo.organizationImageUrl = membership.organization.image_url - } - - private async clerkGetOrganizationMemberships(): Promise { - const response = await fetch(`${getClerkBaseUrl()}/v1/me/organization_memberships`, { - headers: { - Authorization: `Bearer ${this.credentials!.clientToken}`, - "User-Agent": this.userAgent(), - }, - signal: AbortSignal.timeout(10000), - }) - - return clerkOrganizationMembershipsSchema.parse(await response.json()).response - } - - private async clerkLogout(credentials: AuthCredentials): Promise { - const formData = new URLSearchParams() - formData.append("_is_native", "1") - - const response = await fetch(`${getClerkBaseUrl()}/v1/client/sessions/${credentials.sessionId}/remove`, { - method: "POST", - headers: { - "Content-Type": "application/x-www-form-urlencoded", - Authorization: `Bearer ${credentials.clientToken}`, - "User-Agent": this.userAgent(), - }, - body: formData.toString(), - signal: AbortSignal.timeout(10000), - }) - - if (!response.ok) { - throw new Error(`HTTP ${response.status}: ${response.statusText}`) - } - } - - private userAgent(): string { - return getUserAgent(this.context) - } -} diff --git a/packages/cloud/src/auth/index.ts b/packages/cloud/src/auth/index.ts deleted file mode 100644 index b04a805295..0000000000 --- a/packages/cloud/src/auth/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export type { AuthService, AuthServiceEvents, AuthState } from "./AuthService" -export { WebAuthService } from "./WebAuthService" -export { StaticTokenAuthService } from "./StaticTokenAuthService" diff --git a/packages/cloud/src/config.ts b/packages/cloud/src/config.ts deleted file mode 100644 index e682d718ce..0000000000 --- a/packages/cloud/src/config.ts +++ /dev/null @@ -1,5 +0,0 @@ -export const PRODUCTION_CLERK_BASE_URL = "https://clerk.roocode.com" -export const PRODUCTION_ROO_CODE_API_URL = "https://app.roocode.com" - -export const getClerkBaseUrl = () => process.env.CLERK_BASE_URL || PRODUCTION_CLERK_BASE_URL -export const getRooCodeApiUrl = () => process.env.ROO_CODE_API_URL || PRODUCTION_ROO_CODE_API_URL diff --git a/packages/cloud/src/errors.ts b/packages/cloud/src/errors.ts deleted file mode 100644 index 7400f26b39..0000000000 --- a/packages/cloud/src/errors.ts +++ /dev/null @@ -1,42 +0,0 @@ -export class CloudAPIError extends Error { - constructor( - message: string, - public statusCode?: number, - public responseBody?: unknown, - ) { - super(message) - this.name = "CloudAPIError" - Object.setPrototypeOf(this, CloudAPIError.prototype) - } -} - -export class TaskNotFoundError extends CloudAPIError { - constructor(taskId?: string) { - super(taskId ? `Task '${taskId}' not found` : "Task not found", 404) - this.name = "TaskNotFoundError" - Object.setPrototypeOf(this, TaskNotFoundError.prototype) - } -} - -export class AuthenticationError extends CloudAPIError { - constructor(message = "Authentication required") { - super(message, 401) - this.name = "AuthenticationError" - Object.setPrototypeOf(this, AuthenticationError.prototype) - } -} - -export class NetworkError extends CloudAPIError { - constructor(message = "Network error occurred") { - super(message) - this.name = "NetworkError" - Object.setPrototypeOf(this, NetworkError.prototype) - } -} - -export class InvalidClientTokenError extends Error { - constructor() { - super("Invalid/Expired client token") - Object.setPrototypeOf(this, InvalidClientTokenError.prototype) - } -} diff --git a/packages/cloud/src/index.ts b/packages/cloud/src/index.ts deleted file mode 100644 index 55f7d908dd..0000000000 --- a/packages/cloud/src/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from "./config" - -export * from "./CloudAPI" -export * from "./CloudService" diff --git a/packages/cloud/src/types.ts b/packages/cloud/src/types.ts deleted file mode 100644 index 78275b32e2..0000000000 --- a/packages/cloud/src/types.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { AuthServiceEvents } from "./auth" -import { SettingsServiceEvents } from "./CloudSettingsService" - -export type CloudServiceEvents = AuthServiceEvents & SettingsServiceEvents diff --git a/packages/cloud/src/utils.ts b/packages/cloud/src/utils.ts deleted file mode 100644 index cf87aa5e28..0000000000 --- a/packages/cloud/src/utils.ts +++ /dev/null @@ -1,10 +0,0 @@ -import * as vscode from "vscode" - -/** - * Get the User-Agent string for API requests - * @param context Optional extension context for more accurate version detection - * @returns User-Agent string in format "Roo-Code {version}" - */ -export function getUserAgent(context?: vscode.ExtensionContext): string { - return `Roo-Code ${context?.extension?.packageJSON?.version || "unknown"}` -} diff --git a/packages/cloud/tsconfig.json b/packages/cloud/tsconfig.json deleted file mode 100644 index f599e2220d..0000000000 --- a/packages/cloud/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "@roo-code/config-typescript/vscode-library.json", - "include": ["src"], - "exclude": ["node_modules"] -} diff --git a/packages/cloud/vitest.config.ts b/packages/cloud/vitest.config.ts deleted file mode 100644 index 569f167543..0000000000 --- a/packages/cloud/vitest.config.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { defineConfig } from "vitest/config" - -export default defineConfig({ - test: { - globals: true, - environment: "node", - watch: false, - }, - resolve: { - alias: { - vscode: new URL("./src/__mocks__/vscode.ts", import.meta.url).pathname, - }, - }, -}) diff --git a/packages/evals/Dockerfile.runner b/packages/evals/Dockerfile.runner index b718b9cd7b..ec6dc7a8a3 100644 --- a/packages/evals/Dockerfile.runner +++ b/packages/evals/Dockerfile.runner @@ -84,7 +84,6 @@ WORKDIR /roo/repo RUN mkdir -p \ scripts \ packages/build \ - packages/cloud \ packages/config-eslint \ packages/config-typescript \ packages/evals \ @@ -99,7 +98,6 @@ COPY ./pnpm-lock.yaml ./ COPY ./pnpm-workspace.yaml ./ COPY ./scripts/bootstrap.mjs ./scripts/ COPY ./packages/build/package.json ./packages/build/ -COPY ./packages/cloud/package.json ./packages/cloud/ COPY ./packages/config-eslint/package.json ./packages/config-eslint/ COPY ./packages/config-typescript/package.json ./packages/config-typescript/ COPY ./packages/evals/package.json ./packages/evals/ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3e7bb79b64..8a0cb09263 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -353,34 +353,6 @@ importers: specifier: ^3.2.3 version: 3.2.4(@types/debug@4.1.12)(@types/node@20.17.57)(@vitest/ui@3.2.4)(jiti@2.4.2)(jsdom@26.1.0)(lightningcss@1.30.1)(tsx@4.19.4)(yaml@2.8.0) - packages/cloud: - dependencies: - '@roo-code/telemetry': - specifier: workspace:^ - version: link:../telemetry - '@roo-code/types': - specifier: workspace:^ - version: link:../types - zod: - specifier: ^3.25.61 - version: 3.25.61 - devDependencies: - '@roo-code/config-eslint': - specifier: workspace:^ - version: link:../config-eslint - '@roo-code/config-typescript': - specifier: workspace:^ - version: link:../config-typescript - '@types/node': - specifier: 20.x - version: 20.17.57 - '@types/vscode': - specifier: ^1.84.0 - version: 1.100.0 - vitest: - specifier: ^3.2.3 - version: 3.2.4(@types/debug@4.1.12)(@types/node@20.17.57)(@vitest/ui@3.2.4)(jiti@2.4.2)(jsdom@26.1.0)(lightningcss@1.30.1)(tsx@4.19.4)(yaml@2.8.0) - packages/config-eslint: devDependencies: '@eslint/js': @@ -591,8 +563,8 @@ importers: specifier: ^1.14.0 version: 1.14.0(typescript@5.8.3) '@roo-code/cloud': - specifier: workspace:^ - version: link:../packages/cloud + specifier: ^0.5.0 + version: 0.5.0 '@roo-code/ipc': specifier: workspace:^ version: link:../packages/ipc @@ -685,7 +657,7 @@ importers: version: 12.0.0 openai: specifier: ^5.0.0 - version: 5.5.1(ws@8.18.2)(zod@3.25.61) + version: 5.5.1(ws@8.18.3)(zod@3.25.61) os-name: specifier: ^6.0.0 version: 6.1.0 @@ -1447,6 +1419,10 @@ packages: resolution: {integrity: sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==} engines: {node: '>=6.9.0'} + '@babel/runtime@7.28.2': + resolution: {integrity: sha512-KHp2IflsnGywDjBWDkR9iEqiWSpc8GIi0lgTT3mOElT0PP1tG26P4tmFI2YvAdzgq9RGyoHZQEIEdZy6Ec5xCA==} + engines: {node: '>=6.9.0'} + '@babel/template@7.27.2': resolution: {integrity: sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==} engines: {node: '>=6.9.0'} @@ -1957,6 +1933,9 @@ packages: cpu: [x64] os: [win32] + '@ioredis/commands@1.3.0': + resolution: {integrity: sha512-M/T6Zewn7sDaBQEqIZ8Rb+i9y8qfGmq+5SDFSf9sA2lUZTmdDLVdOiQaeDp+Q4wElZ9HG1GAX5KhDaidp6LQsQ==} + '@isaacs/cliui@8.0.2': resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} engines: {node: '>=12'} @@ -2008,16 +1987,16 @@ packages: '@libsql/client@0.15.8': resolution: {integrity: sha512-TskygwF+ToZeWhPPT0WennyGrP3tmkKraaKopT2YwUjqD6DWDRm6SG5iy0VqnaO+HC9FNBCDX0oQPODU3gqqPQ==} - '@libsql/core@0.15.9': - resolution: {integrity: sha512-4OVdeAmuaCUq5hYT8NNn0nxlO9AcA/eTjXfUZ+QK8MT3Dz7Z76m73x7KxjU6I64WyXX98dauVH2b9XM+d84npw==} + '@libsql/core@0.15.10': + resolution: {integrity: sha512-fAMD+GnGQNdZ9zxeNC8AiExpKnou/97GJWkiDDZbTRHj3c9dvF1y4jsRQ0WE72m/CqTdbMGyU98yL0SJ9hQVeg==} - '@libsql/darwin-arm64@0.5.13': - resolution: {integrity: sha512-ASz/EAMLDLx3oq9PVvZ4zBXXHbz2TxtxUwX2xpTRFR4V4uSHAN07+jpLu3aK5HUBLuv58z7+GjaL5w/cyjR28Q==} + '@libsql/darwin-arm64@0.5.17': + resolution: {integrity: sha512-WTYG2skZsUnZmfZ2v7WFj7s3/5s2PfrYBZOWBKOnxHA8g4XCDc/4bFDaqob9Q2e88+GC7cWeJ8VNkVBFpD2Xxg==} cpu: [arm64] os: [darwin] - '@libsql/darwin-x64@0.5.13': - resolution: {integrity: sha512-kzglniv1difkq8opusSXM7u9H0WoEPeKxw0ixIfcGfvlCVMJ+t9UNtXmyNHW68ljdllje6a4C6c94iPmIYafYA==} + '@libsql/darwin-x64@0.5.17': + resolution: {integrity: sha512-ab0RlTR4KYrxgjNrZhAhY/10GibKoq6G0W4oi0kdm+eYiAv/Ip8GDMpSaZdAcoKA4T+iKR/ehczKHnMEB8MFxA==} cpu: [x64] os: [darwin] @@ -2031,38 +2010,38 @@ packages: '@libsql/isomorphic-ws@0.1.5': resolution: {integrity: sha512-DtLWIH29onUYR00i0GlQ3UdcTRC6EP4u9w/h9LxpUZJWRMARk6dQwZ6Jkd+QdwVpuAOrdxt18v0K2uIYR3fwFg==} - '@libsql/linux-arm-gnueabihf@0.5.13': - resolution: {integrity: sha512-UEW+VZN2r0mFkfztKOS7cqfS8IemuekbjUXbXCwULHtusww2QNCXvM5KU9eJCNE419SZCb0qaEWYytcfka8qeA==} + '@libsql/linux-arm-gnueabihf@0.5.17': + resolution: {integrity: sha512-PcASh4k47RqC+kMWAbLUKf1y6Do0q8vnUGi0yhKY4ghJcimMExViBimjbjYRSa+WIb/zh3QxNoXOhQAXx3tiuw==} cpu: [arm] os: [linux] - '@libsql/linux-arm-musleabihf@0.5.13': - resolution: {integrity: sha512-NMDgLqryYBv4Sr3WoO/m++XDjR5KLlw9r/JK4Ym6A1XBv2bxQQNhH0Lxx3bjLW8qqhBD4+0xfms4d2cOlexPyA==} + '@libsql/linux-arm-musleabihf@0.5.17': + resolution: {integrity: sha512-vxOkSLG9Wspit+SNle84nuIzMtr2G2qaxFzW7BhsZBjlZ8+kErf9RXcT2YJQdJYxmBYRbsOrc91gg0jLEQVCqg==} cpu: [arm] os: [linux] - '@libsql/linux-arm64-gnu@0.5.13': - resolution: {integrity: sha512-/wCxVdrwl1ee6D6LEjwl+w4SxuLm5UL9Kb1LD5n0bBGs0q+49ChdPPh7tp175iRgkcrTgl23emymvt1yj3KxVQ==} + '@libsql/linux-arm64-gnu@0.5.17': + resolution: {integrity: sha512-L8jnaN01TxjBJlDuDTX2W2BKzBkAOhcnKfCOf3xzvvygblxnDOK0whkYwIXeTfwtd/rr4jN/d6dZD/bcHiDxEQ==} cpu: [arm64] os: [linux] - '@libsql/linux-arm64-musl@0.5.13': - resolution: {integrity: sha512-xnVAbZIanUgX57XqeI5sNaDnVilp0Di5syCLSEo+bRyBobe/1IAeehNZpyVbCy91U2N6rH1C/mZU7jicVI9x+A==} + '@libsql/linux-arm64-musl@0.5.17': + resolution: {integrity: sha512-HfFD7TzQtmmTwyQsuiHhWZdMRtdNpKJ1p4tbMMTMRECk+971NFHrj69D64cc2ClVTAmn7fA9XibKPil7WN/Q7w==} cpu: [arm64] os: [linux] - '@libsql/linux-x64-gnu@0.5.13': - resolution: {integrity: sha512-/mfMRxcQAI9f8t7tU3QZyh25lXgXKzgin9B9TOSnchD73PWtsVhlyfA6qOCfjQl5kr4sHscdXD5Yb3KIoUgrpQ==} + '@libsql/linux-x64-gnu@0.5.17': + resolution: {integrity: sha512-5l3XxWqUPVFrtX0xnZaXwqsXs0BFbP4w6ahRFTPSdXU50YBfUOajFznJRB6bJTMsCvraDSD0IkHhjSNfrE1CuQ==} cpu: [x64] os: [linux] - '@libsql/linux-x64-musl@0.5.13': - resolution: {integrity: sha512-rdefPTpQCVwUjIQYbDLMv3qpd5MdrT0IeD0UZPGqhT9AWU8nJSQoj2lfyIDAWEz7PPOVCY4jHuEn7FS2sw9kRA==} + '@libsql/linux-x64-musl@0.5.17': + resolution: {integrity: sha512-FvSpWlwc+dIeYIFYlsSv+UdQ/NiZWr+SstwVji+QZ//8NnvzwWQU9cgP+Vpps6Qiq4jyYQm9chJhTYOVT9Y3BA==} cpu: [x64] os: [linux] - '@libsql/win32-x64-msvc@0.5.13': - resolution: {integrity: sha512-aNcmDrD1Ws+dNZIv9ECbxBQumqB9MlSVEykwfXJpqv/593nABb8Ttg5nAGUPtnADyaGDTrGvPPP81d/KsKho4Q==} + '@libsql/win32-x64-msvc@0.5.17': + resolution: {integrity: sha512-f5bGH8+3A5sn6Lrqg8FsQ09a1pYXPnKGXGTFiAYlfQXVst1tUTxDTugnuWcJYKXyzDe/T7ccxyIZXeSmPOhq8A==} cpu: [x64] os: [win32] @@ -3086,6 +3065,12 @@ packages: cpu: [x64] os: [win32] + '@roo-code/cloud@0.5.0': + resolution: {integrity: sha512-4u6Ce2Rmr5a9nxhjGUMRRWUWhZc63EmF/UJ/+Az5/1JARMOp0kHN5Pwqz2QAgfD137+TFSBKQORpiN0GXrdt2w==} + + '@roo-code/types@1.44.0': + resolution: {integrity: sha512-3xbW4pYaCgWuHF5qOsiXpIcd281dlFTe1zboUGgcUUsB414Hu3pQI86PdgJxVGtZgxtaca0eHTQ2Sqjqq8nPlA==} + '@sec-ant/readable-stream@0.4.1': resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==} @@ -3886,8 +3871,8 @@ packages: '@types/node@20.19.1': resolution: {integrity: sha512-jJD50LtlD2dodAEO653i3YF04NWak6jN3ky+Ri3Em3mGR39/glWiboM/IePaRbgwSfqM1TpGXfAg8ohn/4dTgA==} - '@types/node@20.19.4': - resolution: {integrity: sha512-OP+We5WV8Xnbuvw0zC2m4qfB/BJvjyCwtNjhHdJxV1639SGSKrLmJkc3fMnp2Qy8nJyHp8RO6umxELN/dS1/EA==} + '@types/node@20.19.9': + resolution: {integrity: sha512-cuVNgarYWZqxRJDQHEB58GEONhOK79QVR/qYx4S7kcUObQvUwvFnYxJuuHUKm2aieN9X3yZB4LZsuYNU1Qphsw==} '@types/node@22.15.29': resolution: {integrity: sha512-LNdjOkUDlU1RZb8e1kOIUpN1qQUlzGkEtbVNo53vbrwDg5om6oduhm4SiUaPW5ASTXhAiP0jInWG8Qx9fVlOeQ==} @@ -5105,6 +5090,10 @@ packages: resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} engines: {node: '>=0.4.0'} + denque@2.1.0: + resolution: {integrity: sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==} + engines: {node: '>=0.10'} + depd@2.0.0: resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==} engines: {node: '>= 0.8'} @@ -6278,6 +6267,10 @@ packages: resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==} engines: {node: '>=12'} + ioredis@5.7.0: + resolution: {integrity: sha512-NUcA93i1lukyXU+riqEyPtSEkyFq8tX90uL659J+qpCZ3rEdViB/APC58oAhIh3+bJln2hzdlZbBZsGNrlsR8g==} + engines: {node: '>=12.22.0'} + ip-address@9.0.5: resolution: {integrity: sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==} engines: {node: '>= 12'} @@ -6745,8 +6738,8 @@ packages: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} - libsql@0.5.13: - resolution: {integrity: sha512-5Bwoa/CqzgkTwySgqHA5TsaUDRrdLIbdM4egdPcaAnqO3aC+qAgS6BwdzuZwARA5digXwiskogZ8H7Yy4XfdOg==} + libsql@0.5.17: + resolution: {integrity: sha512-RRlj5XQI9+Wq+/5UY8EnugSWfRmHEw4hn3DKlPrkUgZONsge1PwTtHcpStP6MSNi8ohcbsRgEHJaymA33a8cBw==} cpu: [x64, arm64, wasm32, arm] os: [darwin, linux, win32] @@ -6946,6 +6939,9 @@ packages: lodash.includes@4.3.0: resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==} + lodash.isarguments@3.1.0: + resolution: {integrity: sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==} + lodash.isboolean@3.0.3: resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==} @@ -8269,6 +8265,14 @@ packages: resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==} engines: {node: '>=8'} + redis-errors@1.2.0: + resolution: {integrity: sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==} + engines: {node: '>=4'} + + redis-parser@3.0.0: + resolution: {integrity: sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==} + engines: {node: '>=4'} + redis@5.5.5: resolution: {integrity: sha512-x7vpciikEY7nptGzQrE5I+/pvwFZJDadPk/uEoyGSg/pZ2m/CX2n5EhSgUh+S5T7Gz3uKM6YzWcXEu3ioAsdFQ==} engines: {node: '>= 18'} @@ -8682,6 +8686,9 @@ packages: stacktrace-js@2.0.2: resolution: {integrity: sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg==} + standard-as-callback@2.1.0: + resolution: {integrity: sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==} + statuses@2.0.1: resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} engines: {node: '>= 0.8'} @@ -9781,6 +9788,9 @@ packages: zod@3.25.61: resolution: {integrity: sha512-fzfJgUw78LTNnHujj9re1Ov/JJQkRZZGDMcYqSx7Hp4rPOkKywaFHq0S6GoHeXs0wGNE/sIOutkXgnwzrVOGCQ==} + zod@3.25.76: + resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==} + zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} @@ -10535,6 +10545,8 @@ snapshots: '@babel/runtime@7.27.6': {} + '@babel/runtime@7.28.2': {} + '@babel/template@7.27.2': dependencies: '@babel/code-frame': 7.27.1 @@ -11076,6 +11088,8 @@ snapshots: '@img/sharp-win32-x64@0.33.5': optional: true + '@ioredis/commands@1.3.0': {} + '@isaacs/cliui@8.0.2': dependencies: string-width: 5.1.2 @@ -11135,25 +11149,25 @@ snapshots: '@libsql/client@0.15.8': dependencies: - '@libsql/core': 0.15.9 + '@libsql/core': 0.15.10 '@libsql/hrana-client': 0.7.0 js-base64: 3.7.7 - libsql: 0.5.13 + libsql: 0.5.17 promise-limit: 2.7.0 transitivePeerDependencies: - bufferutil - utf-8-validate optional: true - '@libsql/core@0.15.9': + '@libsql/core@0.15.10': dependencies: js-base64: 3.7.7 optional: true - '@libsql/darwin-arm64@0.5.13': + '@libsql/darwin-arm64@0.5.17': optional: true - '@libsql/darwin-x64@0.5.13': + '@libsql/darwin-x64@0.5.17': optional: true '@libsql/hrana-client@0.7.0': @@ -11179,25 +11193,25 @@ snapshots: - utf-8-validate optional: true - '@libsql/linux-arm-gnueabihf@0.5.13': + '@libsql/linux-arm-gnueabihf@0.5.17': optional: true - '@libsql/linux-arm-musleabihf@0.5.13': + '@libsql/linux-arm-musleabihf@0.5.17': optional: true - '@libsql/linux-arm64-gnu@0.5.13': + '@libsql/linux-arm64-gnu@0.5.17': optional: true - '@libsql/linux-arm64-musl@0.5.13': + '@libsql/linux-arm64-musl@0.5.17': optional: true - '@libsql/linux-x64-gnu@0.5.13': + '@libsql/linux-x64-gnu@0.5.17': optional: true - '@libsql/linux-x64-musl@0.5.13': + '@libsql/linux-x64-musl@0.5.17': optional: true - '@libsql/win32-x64-msvc@0.5.13': + '@libsql/win32-x64-msvc@0.5.17': optional: true '@lmstudio/lms-isomorphic@0.4.5': @@ -12177,6 +12191,19 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.40.2': optional: true + '@roo-code/cloud@0.5.0': + dependencies: + '@roo-code/types': 1.44.0 + ioredis: 5.7.0 + p-wait-for: 5.0.2 + zod: 3.25.76 + transitivePeerDependencies: + - supports-color + + '@roo-code/types@1.44.0': + dependencies: + zod: 3.25.76 + '@sec-ant/readable-stream@0.4.1': {} '@sevinf/maybe@0.5.0': {} @@ -12876,7 +12903,7 @@ snapshots: '@testing-library/dom@10.4.0': dependencies: '@babel/code-frame': 7.27.1 - '@babel/runtime': 7.27.6 + '@babel/runtime': 7.28.2 '@types/aria-query': 5.0.4 aria-query: 5.3.0 chalk: 4.1.2 @@ -13164,7 +13191,7 @@ snapshots: dependencies: undici-types: 6.21.0 - '@types/node@20.19.4': + '@types/node@20.19.9': dependencies: undici-types: 6.21.0 optional: true @@ -13232,7 +13259,7 @@ snapshots: '@types/ws@8.18.1': dependencies: - '@types/node': 20.19.4 + '@types/node': 20.19.9 optional: true '@types/yargs-parser@21.0.3': {} @@ -14557,6 +14584,8 @@ snapshots: delayed-stream@1.0.0: {} + denque@2.1.0: {} + depd@2.0.0: {} dequal@2.0.3: {} @@ -15936,6 +15965,20 @@ snapshots: internmap@2.0.3: {} + ioredis@5.7.0: + dependencies: + '@ioredis/commands': 1.3.0 + cluster-key-slot: 1.1.2 + debug: 4.4.1(supports-color@8.1.1) + denque: 2.1.0 + lodash.defaults: 4.2.0 + lodash.isarguments: 3.1.0 + redis-errors: 1.2.0 + redis-parser: 3.0.0 + standard-as-callback: 2.1.0 + transitivePeerDependencies: + - supports-color + ip-address@9.0.5: dependencies: jsbn: 1.1.0 @@ -16426,20 +16469,20 @@ snapshots: prelude-ls: 1.2.1 type-check: 0.4.0 - libsql@0.5.13: + libsql@0.5.17: dependencies: '@neon-rs/load': 0.0.4 detect-libc: 2.0.2 optionalDependencies: - '@libsql/darwin-arm64': 0.5.13 - '@libsql/darwin-x64': 0.5.13 - '@libsql/linux-arm-gnueabihf': 0.5.13 - '@libsql/linux-arm-musleabihf': 0.5.13 - '@libsql/linux-arm64-gnu': 0.5.13 - '@libsql/linux-arm64-musl': 0.5.13 - '@libsql/linux-x64-gnu': 0.5.13 - '@libsql/linux-x64-musl': 0.5.13 - '@libsql/win32-x64-msvc': 0.5.13 + '@libsql/darwin-arm64': 0.5.17 + '@libsql/darwin-x64': 0.5.17 + '@libsql/linux-arm-gnueabihf': 0.5.17 + '@libsql/linux-arm-musleabihf': 0.5.17 + '@libsql/linux-arm64-gnu': 0.5.17 + '@libsql/linux-arm64-musl': 0.5.17 + '@libsql/linux-x64-gnu': 0.5.17 + '@libsql/linux-x64-musl': 0.5.17 + '@libsql/win32-x64-msvc': 0.5.17 optional: true lie@3.3.0: @@ -16604,6 +16647,8 @@ snapshots: lodash.includes@4.3.0: {} + lodash.isarguments@3.1.0: {} + lodash.isboolean@3.0.3: {} lodash.isequal@4.5.0: {} @@ -17520,9 +17565,9 @@ snapshots: is-inside-container: 1.0.0 is-wsl: 3.1.0 - openai@5.5.1(ws@8.18.2)(zod@3.25.61): + openai@5.5.1(ws@8.18.3)(zod@3.25.61): optionalDependencies: - ws: 8.18.2 + ws: 8.18.3 zod: 3.25.61 option@0.2.4: {} @@ -18272,6 +18317,12 @@ snapshots: indent-string: 4.0.0 strip-indent: 3.0.0 + redis-errors@1.2.0: {} + + redis-parser@3.0.0: + dependencies: + redis-errors: 1.2.0 + redis@5.5.5: dependencies: '@redis/bloom': 5.5.5(@redis/client@5.5.5) @@ -18825,6 +18876,8 @@ snapshots: stack-generator: 2.0.10 stacktrace-gps: 3.1.2 + standard-as-callback@2.1.0: {} + statuses@2.0.1: {} std-env@3.9.0: {} @@ -20142,4 +20195,6 @@ snapshots: zod@3.25.61: {} + zod@3.25.76: {} + zwitch@2.0.4: {} diff --git a/src/extension.ts b/src/extension.ts index 1a7b6c5aca..1fee81a482 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -76,12 +76,25 @@ export async function activate(context: vscode.ExtensionContext) { // Initialize Roo Code Cloud service. const cloudService = await CloudService.createInstance(context, cloudLogger) + + try { + if (cloudService.telemetryClient) { + TelemetryService.instance.register(cloudService.telemetryClient) + } + } catch (error) { + outputChannel.appendLine( + `[CloudService] Failed to register TelemetryClient: ${error instanceof Error ? error.message : String(error)}`, + ) + } + const postStateListener = () => { ClineProvider.getVisibleInstance()?.postStateToWebview() } + cloudService.on("auth-state-changed", postStateListener) cloudService.on("user-info", postStateListener) cloudService.on("settings-updated", postStateListener) + // Add to subscriptions for proper cleanup on deactivate context.subscriptions.push(cloudService) @@ -200,7 +213,6 @@ export async function activate(context: vscode.ExtensionContext) { { path: context.extensionPath, name: "extension" }, { path: path.join(context.extensionPath, "../packages/types"), name: "types" }, { path: path.join(context.extensionPath, "../packages/telemetry"), name: "telemetry" }, - { path: path.join(context.extensionPath, "../packages/cloud"), name: "cloud" }, ] console.log( diff --git a/src/package.json b/src/package.json index 2731b8ea19..cbdf7776ae 100644 --- a/src/package.json +++ b/src/package.json @@ -420,7 +420,7 @@ "@mistralai/mistralai": "^1.3.6", "@modelcontextprotocol/sdk": "^1.9.0", "@qdrant/js-client-rest": "^1.14.0", - "@roo-code/cloud": "workspace:^", + "@roo-code/cloud": "^0.5.0", "@roo-code/ipc": "workspace:^", "@roo-code/telemetry": "workspace:^", "@roo-code/types": "workspace:^", From cb0a58e4a4258d45842c99b537f50ee8d0559c90 Mon Sep 17 00:00:00 2001 From: Chris Estreich Date: Thu, 7 Aug 2025 01:09:21 -1000 Subject: [PATCH 095/253] Support linking to @roo-code/cloud in Roo-Code repo (#6799) Co-authored-by: roomote[bot] <219738659+roomote[bot]@users.noreply.github.com> --- package.json | 4 +- scripts/link-packages.js | 105 +++++++++++++++++++++++++++++++++++++++ src/extension.ts | 48 ++++++++++++++---- src/tsconfig.json | 9 +++- 4 files changed, 153 insertions(+), 13 deletions(-) create mode 100755 scripts/link-packages.js diff --git a/package.json b/package.json index 5e73f0c479..c1ddc68223 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,9 @@ "changeset:version": "cp CHANGELOG.md src/CHANGELOG.md && changeset version && cp -vf src/CHANGELOG.md .", "knip": "knip --include files", "update-contributors": "node scripts/update-contributors.js", - "evals": "dotenvx run -f packages/evals/.env.development packages/evals/.env.local -- docker compose -f packages/evals/docker-compose.yml --profile server --profile runner up --build --scale runner=0" + "evals": "dotenvx run -f packages/evals/.env.development packages/evals/.env.local -- docker compose -f packages/evals/docker-compose.yml --profile server --profile runner up --build --scale runner=0", + "link-workspace-packages": "node scripts/link-packages.js", + "unlink-workspace-packages": "node scripts/link-packages.js --unlink" }, "devDependencies": { "@changesets/cli": "^2.27.10", diff --git a/scripts/link-packages.js b/scripts/link-packages.js new file mode 100755 index 0000000000..60ef3be865 --- /dev/null +++ b/scripts/link-packages.js @@ -0,0 +1,105 @@ +#!/usr/bin/env node + +const { spawn, execSync } = require("child_process") +const path = require("path") +const fs = require("fs") + +// Package configuration - Add new packages here as needed. +const config = { + packages: [ + { + name: "@roo-code/cloud", + sourcePath: "../Roo-Code-Cloud/packages/sdk", + targetPath: "src/node_modules/@roo-code/cloud", + npmPath: "npm", + watchCommand: "pnpm build:development:watch", + }, + ], +} + +const args = process.argv.slice(2) +const packageName = args.find((arg) => !arg.startsWith("--")) +const watch = !args.includes("--no-watch") +const unlink = args.includes("--unlink") + +const packages = packageName ? config.packages.filter((p) => p.name === packageName) : config.packages + +if (!packages.length) { + console.error(`Package '${packageName}' not found`) + process.exit(1) +} + +packages.forEach(unlink ? unlinkPackage : linkPackage) + +// After unlinking, restore npm packages with a single pnpm install. +if (unlink && packages.length > 0) { + const srcPath = path.resolve(__dirname, "..", "src") + console.log("\nRestoring npm packages...") + + try { + execSync("pnpm install", { cwd: srcPath, stdio: "inherit" }) + console.log("Successfully restored npm packages") + } catch (error) { + console.error(`Failed to restore packages: ${error.message}`) + console.log("You may need to run 'pnpm install' manually in the src directory") + } +} + +if (!unlink && watch) { + const watchers = packages.filter((pkg) => pkg.watchCommand).map(startWatch) + + if (watchers.length) { + process.on("SIGINT", () => { + console.log("\nStopping...") + watchers.forEach((w) => w.kill()) + process.exit(0) + }) + console.log("\nWatching for changes. Press Ctrl+C to stop.\n") + } +} + +function linkPackage(pkg) { + const sourcePath = path.resolve(__dirname, "..", pkg.sourcePath) + const targetPath = path.resolve(__dirname, "..", pkg.targetPath) + + if (!fs.existsSync(sourcePath)) { + console.error(`Source not found: ${sourcePath}`) + process.exit(1) + } + + // Install dependencies if needed. + if (!fs.existsSync(path.join(sourcePath, "node_modules"))) { + console.log(`Installing dependencies for ${pkg.name}...`) + + try { + execSync("pnpm install", { cwd: sourcePath, stdio: "inherit" }) + } catch (e) { + execSync("pnpm install --no-frozen-lockfile", { cwd: sourcePath, stdio: "inherit" }) + } + } + + // Create symlink. + fs.rmSync(targetPath, { recursive: true, force: true }) + fs.mkdirSync(path.dirname(targetPath), { recursive: true }) + const linkSource = pkg.npmPath ? path.join(sourcePath, pkg.npmPath) : sourcePath + fs.symlinkSync(linkSource, targetPath, "dir") + console.log(`Linked ${pkg.name}`) +} + +function unlinkPackage(pkg) { + const targetPath = path.resolve(__dirname, "..", pkg.targetPath) + if (fs.existsSync(targetPath)) { + fs.rmSync(targetPath, { recursive: true, force: true }) + console.log(`Unlinked ${pkg.name}`) + } +} + +function startWatch(pkg) { + console.log(`Watching ${pkg.name}...`) + const [cmd, ...args] = pkg.watchCommand.split(" ") + return spawn(cmd, args, { + cwd: path.resolve(__dirname, "..", pkg.sourcePath), + stdio: "inherit", + shell: true, + }) +} diff --git a/src/extension.ts b/src/extension.ts index 1fee81a482..2d95902295 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -207,28 +207,54 @@ export async function activate(context: vscode.ExtensionContext) { // Watch the core files and automatically reload the extension host. if (process.env.NODE_ENV === "development") { - const pattern = "**/*.ts" - const watchPaths = [ - { path: context.extensionPath, name: "extension" }, - { path: path.join(context.extensionPath, "../packages/types"), name: "types" }, - { path: path.join(context.extensionPath, "../packages/telemetry"), name: "telemetry" }, + { path: context.extensionPath, pattern: "**/*.ts" }, + { path: path.join(context.extensionPath, "../packages/types"), pattern: "**/*.ts" }, + { path: path.join(context.extensionPath, "../packages/telemetry"), pattern: "**/*.ts" }, + { path: path.join(context.extensionPath, "node_modules/@roo-code/cloud"), pattern: "**/*" }, ] console.log( - `♻️♻️♻️ Core auto-reloading is ENABLED. Watching for changes in: ${watchPaths.map(({ name }) => name).join(", ")}`, + `♻️♻️♻️ Core auto-reloading: Watching for changes in ${watchPaths.map(({ path }) => path).join(", ")}`, ) - watchPaths.forEach(({ path: watchPath, name }) => { - const watcher = vscode.workspace.createFileSystemWatcher(new vscode.RelativePattern(watchPath, pattern)) + // Create a debounced reload function to prevent excessive reloads + let reloadTimeout: NodeJS.Timeout | undefined + const DEBOUNCE_DELAY = 1_000 - watcher.onDidChange((uri) => { - console.log(`♻️ ${name} file changed: ${uri.fsPath}. Reloading host…`) + const debouncedReload = (uri: vscode.Uri) => { + if (reloadTimeout) { + clearTimeout(reloadTimeout) + } + + console.log(`♻️ ${uri.fsPath} changed; scheduling reload...`) + + reloadTimeout = setTimeout(() => { + console.log(`♻️ Reloading host after debounce delay...`) vscode.commands.executeCommand("workbench.action.reloadWindow") - }) + }, DEBOUNCE_DELAY) + } + + watchPaths.forEach(({ path: watchPath, pattern }) => { + const relPattern = new vscode.RelativePattern(vscode.Uri.file(watchPath), pattern) + const watcher = vscode.workspace.createFileSystemWatcher(relPattern, false, false, false) + + // Listen to all change types to ensure symlinked file updates trigger reloads. + watcher.onDidChange(debouncedReload) + watcher.onDidCreate(debouncedReload) + watcher.onDidDelete(debouncedReload) context.subscriptions.push(watcher) }) + + // Clean up the timeout on deactivation + context.subscriptions.push({ + dispose: () => { + if (reloadTimeout) { + clearTimeout(reloadTimeout) + } + }, + }) } return new API(outputChannel, provider, socketPath, enableLogging) diff --git a/src/tsconfig.json b/src/tsconfig.json index 6b7158c4ab..90bdb860cd 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -21,5 +21,12 @@ "useUnknownInCatchVariables": false }, "include": ["."], - "exclude": ["node_modules"] + "exclude": ["node_modules"], + "watchOptions": { + "watchFile": "useFsEvents", + "watchDirectory": "useFsEvents", + "fallbackPolling": "dynamicPriority", + "synchronousWatchDirectory": true, + "excludeDirectories": ["**/node_modules", "**/dist", "**/.turbo"] + } } From 15b0f50dd93564e20c8ab687c81fb6fba791980e Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Thu, 7 Aug 2025 09:33:25 -0400 Subject: [PATCH 096/253] feat: focus chat input when clicking plus button in extension menu (#6689) * feat: focus chat input when clicking plus button in extension menu - Added focusInput action after chatButtonClicked in plusButtonClicked handler - This ensures the text area in ChatView gets focused when users click the + button - Improves user experience by allowing immediate typing after creating new chat * fix: replace unreliable setTimeout with sequential message passing - Removed setTimeout with hardcoded 100ms delay - Now sending focusInput action immediately after chatButtonClicked - This ensures proper sequencing without arbitrary timing delays - More reliable approach that doesn't depend on timing assumptions --------- Co-authored-by: Roo Code --- src/activate/registerCommands.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/activate/registerCommands.ts b/src/activate/registerCommands.ts index 2f8212ffa0..0534f24782 100644 --- a/src/activate/registerCommands.ts +++ b/src/activate/registerCommands.ts @@ -97,6 +97,9 @@ const getCommandsMap = ({ context, outputChannel, provider }: RegisterCommandOpt await visibleProvider.removeClineFromStack() await visibleProvider.postStateToWebview() await visibleProvider.postMessageToWebview({ type: "action", action: "chatButtonClicked" }) + // Send focusInput action immediately after chatButtonClicked + // This ensures the focus happens after the view has switched + await visibleProvider.postMessageToWebview({ type: "action", action: "focusInput" }) }, mcpButtonClicked: () => { const visibleProvider = getVisibleProviderOrLog(outputChannel) From 212297755ff1d36ca7bc287f62e8cf8a2be9138c Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Thu, 7 Aug 2025 09:42:22 -0400 Subject: [PATCH 097/253] feat: add GLM-4.5 and OpenAI gpt-oss models to Fireworks provider (#6784) * feat: add GLM-4.5 and OpenAI gpt-oss models to Fireworks provider - Added GLM-4.5 (355B/32B active) and GLM-4.5-Air (106B/12B active) models from Z.ai - Added gpt-oss-20b and gpt-oss-120b models from OpenAI - All models configured with 128K context window - Added comprehensive test coverage for all new models Fixes #6753 * fix: update GLM-4.5 model IDs to use p instead of hyphen - Changed glm-4-5 to glm-4p5 - Changed glm-4-5-air to glm-4p5-air - Updated corresponding test cases --------- Co-authored-by: Roo Code --- packages/types/src/providers/fireworks.ts | 44 ++++++++++ src/api/providers/__tests__/fireworks.spec.ts | 84 +++++++++++++++++++ 2 files changed, 128 insertions(+) diff --git a/packages/types/src/providers/fireworks.ts b/packages/types/src/providers/fireworks.ts index 80858f624e..79c1d314cf 100644 --- a/packages/types/src/providers/fireworks.ts +++ b/packages/types/src/providers/fireworks.ts @@ -6,6 +6,10 @@ export type FireworksModelId = | "accounts/fireworks/models/qwen3-coder-480b-a35b-instruct" | "accounts/fireworks/models/deepseek-r1-0528" | "accounts/fireworks/models/deepseek-v3" + | "accounts/fireworks/models/glm-4p5" + | "accounts/fireworks/models/glm-4p5-air" + | "accounts/fireworks/models/gpt-oss-20b" + | "accounts/fireworks/models/gpt-oss-120b" export const fireworksDefaultModelId: FireworksModelId = "accounts/fireworks/models/kimi-k2-instruct" @@ -58,4 +62,44 @@ export const fireworksModels = { description: "A strong Mixture-of-Experts (MoE) language model with 671B total parameters with 37B activated for each token from Deepseek. Note that fine-tuning for this model is only available through contacting fireworks at https://fireworks.ai/company/contact-us.", }, + "accounts/fireworks/models/glm-4p5": { + maxTokens: 16384, + contextWindow: 128000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.55, + outputPrice: 2.19, + description: + "Z.ai GLM-4.5 with 355B total parameters and 32B active parameters. Features unified reasoning, coding, and intelligent agent capabilities.", + }, + "accounts/fireworks/models/glm-4p5-air": { + maxTokens: 16384, + contextWindow: 128000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.55, + outputPrice: 2.19, + description: + "Z.ai GLM-4.5-Air with 106B total parameters and 12B active parameters. Features unified reasoning, coding, and intelligent agent capabilities.", + }, + "accounts/fireworks/models/gpt-oss-20b": { + maxTokens: 16384, + contextWindow: 128000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.07, + outputPrice: 0.3, + description: + "OpenAI gpt-oss-20b: Compact model for local/edge deployments. Optimized for low-latency and resource-constrained environments with chain-of-thought output, adjustable reasoning, and agentic workflows.", + }, + "accounts/fireworks/models/gpt-oss-120b": { + maxTokens: 16384, + contextWindow: 128000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.15, + outputPrice: 0.6, + description: + "OpenAI gpt-oss-120b: Production-grade, general-purpose model that fits on a single H100 GPU. Features complex reasoning, configurable effort, full chain-of-thought transparency, and supports function calling, tool use, and structured outputs.", + }, } as const satisfies Record diff --git a/src/api/providers/__tests__/fireworks.spec.ts b/src/api/providers/__tests__/fireworks.spec.ts index 21a88e80ba..cfab672c08 100644 --- a/src/api/providers/__tests__/fireworks.spec.ts +++ b/src/api/providers/__tests__/fireworks.spec.ts @@ -179,6 +179,90 @@ describe("FireworksHandler", () => { ) }) + it("should return GLM-4.5 model with correct configuration", () => { + const testModelId: FireworksModelId = "accounts/fireworks/models/glm-4p5" + const handlerWithModel = new FireworksHandler({ + apiModelId: testModelId, + fireworksApiKey: "test-fireworks-api-key", + }) + const model = handlerWithModel.getModel() + expect(model.id).toBe(testModelId) + expect(model.info).toEqual( + expect.objectContaining({ + maxTokens: 16384, + contextWindow: 128000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.55, + outputPrice: 2.19, + description: expect.stringContaining("Z.ai GLM-4.5 with 355B total parameters"), + }), + ) + }) + + it("should return GLM-4.5-Air model with correct configuration", () => { + const testModelId: FireworksModelId = "accounts/fireworks/models/glm-4p5-air" + const handlerWithModel = new FireworksHandler({ + apiModelId: testModelId, + fireworksApiKey: "test-fireworks-api-key", + }) + const model = handlerWithModel.getModel() + expect(model.id).toBe(testModelId) + expect(model.info).toEqual( + expect.objectContaining({ + maxTokens: 16384, + contextWindow: 128000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.55, + outputPrice: 2.19, + description: expect.stringContaining("Z.ai GLM-4.5-Air with 106B total parameters"), + }), + ) + }) + + it("should return gpt-oss-20b model with correct configuration", () => { + const testModelId: FireworksModelId = "accounts/fireworks/models/gpt-oss-20b" + const handlerWithModel = new FireworksHandler({ + apiModelId: testModelId, + fireworksApiKey: "test-fireworks-api-key", + }) + const model = handlerWithModel.getModel() + expect(model.id).toBe(testModelId) + expect(model.info).toEqual( + expect.objectContaining({ + maxTokens: 16384, + contextWindow: 128000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.07, + outputPrice: 0.3, + description: expect.stringContaining("OpenAI gpt-oss-20b: Compact model for local/edge deployments"), + }), + ) + }) + + it("should return gpt-oss-120b model with correct configuration", () => { + const testModelId: FireworksModelId = "accounts/fireworks/models/gpt-oss-120b" + const handlerWithModel = new FireworksHandler({ + apiModelId: testModelId, + fireworksApiKey: "test-fireworks-api-key", + }) + const model = handlerWithModel.getModel() + expect(model.id).toBe(testModelId) + expect(model.info).toEqual( + expect.objectContaining({ + maxTokens: 16384, + contextWindow: 128000, + supportsImages: false, + supportsPromptCache: false, + inputPrice: 0.15, + outputPrice: 0.6, + description: expect.stringContaining("OpenAI gpt-oss-120b: Production-grade, general-purpose model"), + }), + ) + }) + it("completePrompt method should return text from Fireworks API", async () => { const expectedResponse = "This is a test response from Fireworks" mockCreate.mockResolvedValueOnce({ choices: [{ message: { content: expectedResponse } }] }) From 518c558d56375d91a3a14fedf0bf30ab32dd3972 Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Thu, 7 Aug 2025 10:11:01 -0400 Subject: [PATCH 098/253] Fix rounding of max tokens (#6808) --- src/shared/api.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/api.ts b/src/shared/api.ts index 4cd2459f70..014b903453 100644 --- a/src/shared/api.ts +++ b/src/shared/api.ts @@ -92,7 +92,7 @@ export const getModelMaxOutputTokens = ({ // If model has explicit maxTokens, clamp it to 20% of the context window if (model.maxTokens) { - return Math.min(model.maxTokens, model.contextWindow * 0.2) + return Math.min(model.maxTokens, Math.ceil(model.contextWindow * 0.2)) } // For non-Anthropic formats without explicit maxTokens, return undefined From cd8f862fc26e4c6b141c4083801f812402b68681 Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Thu, 7 Aug 2025 10:19:18 -0400 Subject: [PATCH 099/253] chore: add changeset for v3.25.9 (#6809) --- .changeset/v3.25.9.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changeset/v3.25.9.md diff --git a/.changeset/v3.25.9.md b/.changeset/v3.25.9.md new file mode 100644 index 0000000000..78346f0db3 --- /dev/null +++ b/.changeset/v3.25.9.md @@ -0,0 +1,7 @@ +--- +"roo-cline": patch +--- + +- Fix: Resolve rounding issue with max tokens (#6806 by @markp018, PR by @mrubens) +- Add support for GLM-4.5 and OpenAI gpt-oss models in Fireworks provider (#6753 by @alexfarlander, PR by @app/roomote) +- Improve UX by focusing chat input when clicking plus button in extension menu (thanks @app/roomote!) From 6b4ac52d008931e344152e31048b247d390f1ea5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Aug 2025 10:22:46 -0400 Subject: [PATCH 100/253] Changeset version bump (#6810) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens --- .changeset/v3.25.9.md | 7 ------- CHANGELOG.md | 6 ++++++ src/package.json | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 .changeset/v3.25.9.md diff --git a/.changeset/v3.25.9.md b/.changeset/v3.25.9.md deleted file mode 100644 index 78346f0db3..0000000000 --- a/.changeset/v3.25.9.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"roo-cline": patch ---- - -- Fix: Resolve rounding issue with max tokens (#6806 by @markp018, PR by @mrubens) -- Add support for GLM-4.5 and OpenAI gpt-oss models in Fireworks provider (#6753 by @alexfarlander, PR by @app/roomote) -- Improve UX by focusing chat input when clicking plus button in extension menu (thanks @app/roomote!) diff --git a/CHANGELOG.md b/CHANGELOG.md index 372c98261b..9e9b13525f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Roo Code Changelog +## [3.25.9] - 2025-08-07 + +- Fix: Resolve rounding issue with max tokens (#6806 by @markp018, PR by @mrubens) +- Add support for GLM-4.5 and OpenAI gpt-oss models in Fireworks provider (#6753 by @alexfarlander, PR by @app/roomote) +- Improve UX by focusing chat input when clicking plus button in extension menu (thanks @app/roomote!) + ## [3.25.8] - 2025-08-06 - Fix: Prevent disabled MCP servers from starting processes and show correct status (#6036 by @hannesrudolph, PR by @app/roomote) diff --git a/src/package.json b/src/package.json index cbdf7776ae..e6564912c4 100644 --- a/src/package.json +++ b/src/package.json @@ -3,7 +3,7 @@ "displayName": "%extension.displayName%", "description": "%extension.description%", "publisher": "RooVeterinaryInc", - "version": "3.25.8", + "version": "3.25.9", "icon": "assets/icons/icon.png", "galleryBanner": { "color": "#617A91", From 7ea1ae570a21735f1453c004c03d1d122255f1ac Mon Sep 17 00:00:00 2001 From: Hannes Rudolph Date: Thu, 7 Aug 2025 09:42:29 -0700 Subject: [PATCH 101/253] fix: use CDATA sections in XML examples to prevent parser errors (#4852) (#6811) --- .../strategies/multi-file-search-replace.ts | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/core/diff/strategies/multi-file-search-replace.ts b/src/core/diff/strategies/multi-file-search-replace.ts index c71d3c3807..a212cf2b8e 100644 --- a/src/core/diff/strategies/multi-file-search-replace.ts +++ b/src/core/diff/strategies/multi-file-search-replace.ts @@ -139,8 +139,7 @@ Search/Replace content: eg.file.py - -\`\`\` + >>>>>> REPLACE -\`\`\` - +]]> @@ -165,8 +163,7 @@ Search/Replace content with multi edits across multiple files: eg.file.py - -\`\`\` + >>>>>> REPLACE -\`\`\` - +]]> - -\`\`\` + >>>>>> REPLACE -\`\`\` - +]]> eg.file2.py - -\`\`\` + >>>>>> REPLACE -\`\`\` - +]]> From 72668fef8dcf52af1488347b7c98904d516a9a80 Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Thu, 7 Aug 2025 14:42:12 -0400 Subject: [PATCH 102/253] fix: add missing MCP error translation keys (#6821) * fix: add missing MCP error translation keys - Added refresh_after_disable translation key - Added refresh_after_enable translation key - Added disconnect_servers_partial translation key - Updated all 18 locale files with the missing keys - Fixes the "errors.refresh_after_disable" display issue in MCP server management * fix: remove fallback English strings from MCP error translations As requested by @mrubens, removed the || operator and fallback English strings from: - t("mcp:errors.disconnect_servers_partial") - t("mcp:errors.refresh_after_disable") - t("mcp:errors.refresh_after_enable") The translation system will now rely solely on the localized strings without fallbacks. * fix: translate MCP error messages to all locales - Translated "refresh_after_disable" error message - Translated "refresh_after_enable" error message - Translated "disconnect_servers_partial" error message with count placeholder - All 17 non-English locales now have proper translations instead of English text --------- Co-authored-by: Roo Code --- src/i18n/locales/ca/mcp.json | 5 ++++- src/i18n/locales/de/mcp.json | 5 ++++- src/i18n/locales/en/mcp.json | 5 ++++- src/i18n/locales/es/mcp.json | 5 ++++- src/i18n/locales/fr/mcp.json | 5 ++++- src/i18n/locales/hi/mcp.json | 5 ++++- src/i18n/locales/id/mcp.json | 5 ++++- src/i18n/locales/it/mcp.json | 5 ++++- src/i18n/locales/ja/mcp.json | 5 ++++- src/i18n/locales/ko/mcp.json | 5 ++++- src/i18n/locales/nl/mcp.json | 5 ++++- src/i18n/locales/pl/mcp.json | 5 ++++- src/i18n/locales/pt-BR/mcp.json | 5 ++++- src/i18n/locales/ru/mcp.json | 5 ++++- src/i18n/locales/tr/mcp.json | 5 ++++- src/i18n/locales/vi/mcp.json | 5 ++++- src/i18n/locales/zh-CN/mcp.json | 5 ++++- src/i18n/locales/zh-TW/mcp.json | 5 ++++- src/services/mcp/McpHub.ts | 11 +++-------- 19 files changed, 75 insertions(+), 26 deletions(-) diff --git a/src/i18n/locales/ca/mcp.json b/src/i18n/locales/ca/mcp.json index 5bae609960..2d5add350f 100644 --- a/src/i18n/locales/ca/mcp.json +++ b/src/i18n/locales/ca/mcp.json @@ -5,7 +5,10 @@ "invalid_settings_validation": "Format de configuració MCP no vàlid: {{errorMessages}}", "create_json": "Ha fallat la creació o obertura de .roo/mcp.json: {{error}}", "failed_update_project": "Ha fallat l'actualització dels servidors MCP del projecte", - "invalidJsonArgument": "Roo ha intentat utilitzar {{toolName}} amb un argument JSON no vàlid. Tornant a intentar..." + "invalidJsonArgument": "Roo ha intentat utilitzar {{toolName}} amb un argument JSON no vàlid. Tornant a intentar...", + "refresh_after_disable": "Ha fallat l'actualització de les connexions MCP després de desactivar", + "refresh_after_enable": "Ha fallat l'actualització de les connexions MCP després d'activar", + "disconnect_servers_partial": "Ha fallat la desconnexió de {{count}} servidor(s) MCP. Comprova la sortida per més detalls." }, "info": { "server_restarting": "Reiniciant el servidor MCP {{serverName}}...", diff --git a/src/i18n/locales/de/mcp.json b/src/i18n/locales/de/mcp.json index 66c25c088f..67bcc34cfc 100644 --- a/src/i18n/locales/de/mcp.json +++ b/src/i18n/locales/de/mcp.json @@ -5,7 +5,10 @@ "invalid_settings_validation": "Ungültiges MCP-Einstellungen-Format: {{errorMessages}}", "create_json": "Fehler beim Erstellen oder Öffnen von .roo/mcp.json: {{error}}", "failed_update_project": "Fehler beim Aktualisieren der Projekt-MCP-Server", - "invalidJsonArgument": "Roo hat versucht, {{toolName}} mit einem ungültigen JSON-Argument zu verwenden. Wiederhole..." + "invalidJsonArgument": "Roo hat versucht, {{toolName}} mit einem ungültigen JSON-Argument zu verwenden. Wiederhole...", + "refresh_after_disable": "Fehler beim Aktualisieren der MCP-Verbindungen nach dem Deaktivieren", + "refresh_after_enable": "Fehler beim Aktualisieren der MCP-Verbindungen nach dem Aktivieren", + "disconnect_servers_partial": "Fehler beim Trennen von {{count}} MCP-Server(n). Überprüfe die Ausgabe für Details." }, "info": { "server_restarting": "MCP-Server {{serverName}} wird neu gestartet...", diff --git a/src/i18n/locales/en/mcp.json b/src/i18n/locales/en/mcp.json index c34b2c9c08..d9b33b7dac 100644 --- a/src/i18n/locales/en/mcp.json +++ b/src/i18n/locales/en/mcp.json @@ -5,7 +5,10 @@ "invalid_settings_validation": "Invalid MCP settings format: {{errorMessages}}", "create_json": "Failed to create or open .roo/mcp.json: {{error}}", "failed_update_project": "Failed to update project MCP servers", - "invalidJsonArgument": "Roo tried to use {{toolName}} with an invalid JSON argument. Retrying..." + "invalidJsonArgument": "Roo tried to use {{toolName}} with an invalid JSON argument. Retrying...", + "refresh_after_disable": "Failed to refresh MCP connections after disabling", + "refresh_after_enable": "Failed to refresh MCP connections after enabling", + "disconnect_servers_partial": "Failed to disconnect {{count}} MCP server(s). Check the output for details." }, "info": { "server_restarting": "Restarting {{serverName}} MCP server...", diff --git a/src/i18n/locales/es/mcp.json b/src/i18n/locales/es/mcp.json index 78c41ed556..d28a20a08a 100644 --- a/src/i18n/locales/es/mcp.json +++ b/src/i18n/locales/es/mcp.json @@ -5,7 +5,10 @@ "invalid_settings_validation": "Formato de configuración MCP no válido: {{errorMessages}}", "create_json": "Error al crear o abrir .roo/mcp.json: {{error}}", "failed_update_project": "Error al actualizar los servidores MCP del proyecto", - "invalidJsonArgument": "Roo intentó usar {{toolName}} con un argumento JSON no válido. Reintentando..." + "invalidJsonArgument": "Roo intentó usar {{toolName}} con un argumento JSON no válido. Reintentando...", + "refresh_after_disable": "Error al actualizar las conexiones MCP después de desactivar", + "refresh_after_enable": "Error al actualizar las conexiones MCP después de activar", + "disconnect_servers_partial": "Error al desconectar {{count}} servidor(es) MCP. Revisa la salida para más detalles." }, "info": { "server_restarting": "Reiniciando el servidor MCP {{serverName}}...", diff --git a/src/i18n/locales/fr/mcp.json b/src/i18n/locales/fr/mcp.json index bbc3eda6b3..8bc1702e36 100644 --- a/src/i18n/locales/fr/mcp.json +++ b/src/i18n/locales/fr/mcp.json @@ -5,7 +5,10 @@ "invalid_settings_validation": "Format de paramètres MCP invalide : {{errorMessages}}", "create_json": "Échec de la création ou de l'ouverture de .roo/mcp.json : {{error}}", "failed_update_project": "Échec de la mise à jour des serveurs MCP du projet", - "invalidJsonArgument": "Roo a essayé d'utiliser {{toolName}} avec un argument JSON invalide. Nouvelle tentative..." + "invalidJsonArgument": "Roo a essayé d'utiliser {{toolName}} avec un argument JSON invalide. Nouvelle tentative...", + "refresh_after_disable": "Échec du rafraîchissement des connexions MCP après désactivation", + "refresh_after_enable": "Échec du rafraîchissement des connexions MCP après activation", + "disconnect_servers_partial": "Échec de la déconnexion de {{count}} serveur(s) MCP. Vérifiez la sortie pour plus de détails." }, "info": { "server_restarting": "Redémarrage du serveur MCP {{serverName}}...", diff --git a/src/i18n/locales/hi/mcp.json b/src/i18n/locales/hi/mcp.json index e7e0feae0d..b302745e16 100644 --- a/src/i18n/locales/hi/mcp.json +++ b/src/i18n/locales/hi/mcp.json @@ -5,7 +5,10 @@ "invalid_settings_validation": "अमान्य MCP सेटिंग्स फॉर्मेट: {{errorMessages}}", "create_json": ".roo/mcp.json बनाने या खोलने में विफल: {{error}}", "failed_update_project": "प्रोजेक्ट MCP सर्वर अपडेट करने में विफल", - "invalidJsonArgument": "Roo ने {{toolName}} को अमान्य JSON आर्गुमेंट के साथ उपयोग करने की कोशिश की। फिर से कोशिश कर रहा है..." + "invalidJsonArgument": "Roo ने {{toolName}} को अमान्य JSON आर्गुमेंट के साथ उपयोग करने की कोशिश की। फिर से कोशिश कर रहा है...", + "refresh_after_disable": "अक्षम करने के बाद MCP कनेक्शन रीफ्रेश करने में विफल", + "refresh_after_enable": "सक्षम करने के बाद MCP कनेक्शन रीफ्रेश करने में विफल", + "disconnect_servers_partial": "{{count}} MCP सर्वर डिस्कनेक्ट करने में विफल। विवरण के लिए आउटपुट देखें।" }, "info": { "server_restarting": "{{serverName}} MCP सर्वर पुनः प्रारंभ हो रहा है...", diff --git a/src/i18n/locales/id/mcp.json b/src/i18n/locales/id/mcp.json index 745feae9e2..ae7c3fb857 100644 --- a/src/i18n/locales/id/mcp.json +++ b/src/i18n/locales/id/mcp.json @@ -5,7 +5,10 @@ "invalid_settings_validation": "Format pengaturan MCP tidak valid: {{errorMessages}}", "create_json": "Gagal membuat atau membuka .roo/mcp.json: {{error}}", "failed_update_project": "Gagal memperbarui server MCP proyek", - "invalidJsonArgument": "Roo mencoba menggunakan {{toolName}} dengan argumen JSON yang tidak valid. Mencoba lagi..." + "invalidJsonArgument": "Roo mencoba menggunakan {{toolName}} dengan argumen JSON yang tidak valid. Mencoba lagi...", + "refresh_after_disable": "Gagal me-refresh koneksi MCP setelah menonaktifkan", + "refresh_after_enable": "Gagal me-refresh koneksi MCP setelah mengaktifkan", + "disconnect_servers_partial": "Gagal memutus koneksi {{count}} server MCP. Periksa output untuk detailnya." }, "info": { "server_restarting": "Merestart server MCP {{serverName}}...", diff --git a/src/i18n/locales/it/mcp.json b/src/i18n/locales/it/mcp.json index 1d5a0e39a7..88ef5942f0 100644 --- a/src/i18n/locales/it/mcp.json +++ b/src/i18n/locales/it/mcp.json @@ -5,7 +5,10 @@ "invalid_settings_validation": "Formato delle impostazioni MCP non valido: {{errorMessages}}", "create_json": "Impossibile creare o aprire .roo/mcp.json: {{error}}", "failed_update_project": "Errore durante l'aggiornamento dei server MCP del progetto", - "invalidJsonArgument": "Roo ha tentato di usare {{toolName}} con un argomento JSON non valido. Riprovo..." + "invalidJsonArgument": "Roo ha tentato di usare {{toolName}} con un argomento JSON non valido. Riprovo...", + "refresh_after_disable": "Impossibile aggiornare le connessioni MCP dopo la disattivazione", + "refresh_after_enable": "Impossibile aggiornare le connessioni MCP dopo l'attivazione", + "disconnect_servers_partial": "Impossibile disconnettere {{count}} server MCP. Controlla l'output per i dettagli." }, "info": { "server_restarting": "Riavvio del server MCP {{serverName}}...", diff --git a/src/i18n/locales/ja/mcp.json b/src/i18n/locales/ja/mcp.json index c300ff861a..44f389ac6a 100644 --- a/src/i18n/locales/ja/mcp.json +++ b/src/i18n/locales/ja/mcp.json @@ -5,7 +5,10 @@ "invalid_settings_validation": "MCP設定フォーマットが無効です：{{errorMessages}}", "create_json": ".roo/mcp.jsonの作成または開くことに失敗しました：{{error}}", "failed_update_project": "プロジェクトMCPサーバーの更新に失敗しました", - "invalidJsonArgument": "Rooが無効なJSON引数で{{toolName}}を使用しようとしました。再試行中..." + "invalidJsonArgument": "Rooが無効なJSON引数で{{toolName}}を使用しようとしました。再試行中...", + "refresh_after_disable": "無効化後にMCP接続の更新に失敗しました", + "refresh_after_enable": "有効化後にMCP接続の更新に失敗しました", + "disconnect_servers_partial": "{{count}}個のMCPサーバーの切断に失敗しました。詳細は出力を確認してください。" }, "info": { "server_restarting": "MCPサーバー{{serverName}}を再起動中...", diff --git a/src/i18n/locales/ko/mcp.json b/src/i18n/locales/ko/mcp.json index f5d8d7d03b..68d2662371 100644 --- a/src/i18n/locales/ko/mcp.json +++ b/src/i18n/locales/ko/mcp.json @@ -5,7 +5,10 @@ "invalid_settings_validation": "잘못된 MCP 설정 형식: {{errorMessages}}", "create_json": ".roo/mcp.json 생성 또는 열기 실패: {{error}}", "failed_update_project": "프로젝트 MCP 서버 업데이트에 실패했습니다", - "invalidJsonArgument": "Roo가 유효하지 않은 JSON 인자로 {{toolName}}을(를) 사용하려고 했습니다. 다시 시도 중..." + "invalidJsonArgument": "Roo가 유효하지 않은 JSON 인자로 {{toolName}}을(를) 사용하려고 했습니다. 다시 시도 중...", + "refresh_after_disable": "비활성화 후 MCP 연결 새로 고침 실패", + "refresh_after_enable": "활성화 후 MCP 연결 새로 고침 실패", + "disconnect_servers_partial": "{{count}}개의 MCP 서버 연결 해제 실패. 자세한 내용은 출력을 확인하세요." }, "info": { "server_restarting": "{{serverName}} MCP 서버를 재시작하는 중...", diff --git a/src/i18n/locales/nl/mcp.json b/src/i18n/locales/nl/mcp.json index 441ec2a9e5..76f06825a5 100644 --- a/src/i18n/locales/nl/mcp.json +++ b/src/i18n/locales/nl/mcp.json @@ -5,7 +5,10 @@ "invalid_settings_validation": "Ongeldig MCP-instellingenformaat: {{errorMessages}}", "create_json": "Aanmaken of openen van .roo/mcp.json mislukt: {{error}}", "failed_update_project": "Bijwerken van project MCP-servers mislukt", - "invalidJsonArgument": "Roo probeerde {{toolName}} te gebruiken met een ongeldig JSON-argument. Opnieuw proberen..." + "invalidJsonArgument": "Roo probeerde {{toolName}} te gebruiken met een ongeldig JSON-argument. Opnieuw proberen...", + "refresh_after_disable": "Vernieuwen van MCP-verbindingen na uitschakelen mislukt", + "refresh_after_enable": "Vernieuwen van MCP-verbindingen na inschakelen mislukt", + "disconnect_servers_partial": "Loskoppelen van {{count}} MCP-server(s) mislukt. Controleer de uitvoer voor details." }, "info": { "server_restarting": "{{serverName}} MCP-server wordt opnieuw gestart...", diff --git a/src/i18n/locales/pl/mcp.json b/src/i18n/locales/pl/mcp.json index e6d49104b1..fcf4bd7ce4 100644 --- a/src/i18n/locales/pl/mcp.json +++ b/src/i18n/locales/pl/mcp.json @@ -5,7 +5,10 @@ "invalid_settings_validation": "Nieprawidłowy format ustawień MCP: {{errorMessages}}", "create_json": "Nie udało się utworzyć lub otworzyć .roo/mcp.json: {{error}}", "failed_update_project": "Nie udało się zaktualizować serwerów MCP projektu", - "invalidJsonArgument": "Roo próbował użyć {{toolName}} z nieprawidłowym argumentem JSON. Ponawianie..." + "invalidJsonArgument": "Roo próbował użyć {{toolName}} z nieprawidłowym argumentem JSON. Ponawianie...", + "refresh_after_disable": "Nie udało się odświeżyć połączeń MCP po wyłączeniu", + "refresh_after_enable": "Nie udało się odświeżyć połączeń MCP po włączeniu", + "disconnect_servers_partial": "Nie udało się odłączyć {{count}} serwera(ów) MCP. Sprawdź dane wyjściowe, aby uzyskać szczegóły." }, "info": { "server_restarting": "Ponowne uruchamianie serwera MCP {{serverName}}...", diff --git a/src/i18n/locales/pt-BR/mcp.json b/src/i18n/locales/pt-BR/mcp.json index 4d1050e9db..19358c016b 100644 --- a/src/i18n/locales/pt-BR/mcp.json +++ b/src/i18n/locales/pt-BR/mcp.json @@ -5,7 +5,10 @@ "invalid_settings_validation": "Formato de configurações MCP inválido: {{errorMessages}}", "create_json": "Falha ao criar ou abrir .roo/mcp.json: {{error}}", "failed_update_project": "Falha ao atualizar os servidores MCP do projeto", - "invalidJsonArgument": "Roo tentou usar {{toolName}} com um argumento JSON inválido. Tentando novamente..." + "invalidJsonArgument": "Roo tentou usar {{toolName}} com um argumento JSON inválido. Tentando novamente...", + "refresh_after_disable": "Falha ao atualizar as conexões MCP após desativar", + "refresh_after_enable": "Falha ao atualizar as conexões MCP após ativar", + "disconnect_servers_partial": "Falha ao desconectar {{count}} servidor(es) MCP. Verifique a saída para detalhes." }, "info": { "server_restarting": "Reiniciando o servidor MCP {{serverName}}...", diff --git a/src/i18n/locales/ru/mcp.json b/src/i18n/locales/ru/mcp.json index fcbf6501f4..597579a766 100644 --- a/src/i18n/locales/ru/mcp.json +++ b/src/i18n/locales/ru/mcp.json @@ -5,7 +5,10 @@ "invalid_settings_validation": "Неверный формат настроек MCP: {{errorMessages}}", "create_json": "Не удалось создать или открыть .roo/mcp.json: {{error}}", "failed_update_project": "Не удалось обновить серверы проекта MCP", - "invalidJsonArgument": "Roo попытался использовать {{toolName}} с недопустимым JSON-аргументом. Повторная попытка..." + "invalidJsonArgument": "Roo попытался использовать {{toolName}} с недопустимым JSON-аргументом. Повторная попытка...", + "refresh_after_disable": "Не удалось обновить соединения MCP после отключения", + "refresh_after_enable": "Не удалось обновить соединения MCP после включения", + "disconnect_servers_partial": "Не удалось отключить {{count}} MCP сервер(ов). Проверьте вывод для получения подробностей." }, "info": { "server_restarting": "Перезапуск сервера MCP {{serverName}}...", diff --git a/src/i18n/locales/tr/mcp.json b/src/i18n/locales/tr/mcp.json index bb5461e540..0779923088 100644 --- a/src/i18n/locales/tr/mcp.json +++ b/src/i18n/locales/tr/mcp.json @@ -5,7 +5,10 @@ "invalid_settings_validation": "Geçersiz MCP ayarları formatı: {{errorMessages}}", "create_json": ".roo/mcp.json oluşturulamadı veya açılamadı: {{error}}", "failed_update_project": "Proje MCP sunucuları güncellenemedi", - "invalidJsonArgument": "Roo, {{toolName}} aracını geçersiz bir JSON argümanıyla kullanmaya çalıştı. Tekrar deneniyor..." + "invalidJsonArgument": "Roo, {{toolName}} aracını geçersiz bir JSON argümanıyla kullanmaya çalıştı. Tekrar deneniyor...", + "refresh_after_disable": "Devre dışı bıraktıktan sonra MCP bağlantıları yenilenemedi", + "refresh_after_enable": "Etkinleştirdikten sonra MCP bağlantıları yenilenemedi", + "disconnect_servers_partial": "{{count}} MCP sunucusu bağlantısı kesilemedi. Ayrıntılar için çıktıyı kontrol edin." }, "info": { "server_restarting": "{{serverName}} MCP sunucusu yeniden başlatılıyor...", diff --git a/src/i18n/locales/vi/mcp.json b/src/i18n/locales/vi/mcp.json index d0728ae0cb..f32c05a267 100644 --- a/src/i18n/locales/vi/mcp.json +++ b/src/i18n/locales/vi/mcp.json @@ -5,7 +5,10 @@ "invalid_settings_validation": "Định dạng cài đặt MCP không hợp lệ: {{errorMessages}}", "create_json": "Không thể tạo hoặc mở .roo/mcp.json: {{error}}", "failed_update_project": "Không thể cập nhật máy chủ MCP của dự án", - "invalidJsonArgument": "Roo đã cố gắng sử dụng {{toolName}} với tham số JSON không hợp lệ. Đang thử lại..." + "invalidJsonArgument": "Roo đã cố gắng sử dụng {{toolName}} với tham số JSON không hợp lệ. Đang thử lại...", + "refresh_after_disable": "Không thể làm mới kết nối MCP sau khi vô hiệu hóa", + "refresh_after_enable": "Không thể làm mới kết nối MCP sau khi kích hoạt", + "disconnect_servers_partial": "Không thể ngắt kết nối {{count}} máy chủ MCP. Kiểm tra đầu ra để biết chi tiết." }, "info": { "server_restarting": "Đang khởi động lại máy chủ MCP {{serverName}}...", diff --git a/src/i18n/locales/zh-CN/mcp.json b/src/i18n/locales/zh-CN/mcp.json index bb4abe6daf..52086e3d26 100644 --- a/src/i18n/locales/zh-CN/mcp.json +++ b/src/i18n/locales/zh-CN/mcp.json @@ -5,7 +5,10 @@ "invalid_settings_validation": "MCP设置格式无效：{{errorMessages}}", "create_json": "创建或打开 .roo/mcp.json 失败：{{error}}", "failed_update_project": "更新项目MCP服务器失败", - "invalidJsonArgument": "Roo 尝试使用无效的 JSON 参数调用 {{toolName}}。正在重试..." + "invalidJsonArgument": "Roo 尝试使用无效的 JSON 参数调用 {{toolName}}。正在重试...", + "refresh_after_disable": "禁用后刷新 MCP 连接失败", + "refresh_after_enable": "启用后刷新 MCP 连接失败", + "disconnect_servers_partial": "断开 {{count}} 个 MCP 服务器失败。请查看输出了解详情。" }, "info": { "server_restarting": "正在重启{{serverName}}MCP服务器...", diff --git a/src/i18n/locales/zh-TW/mcp.json b/src/i18n/locales/zh-TW/mcp.json index 759ac93671..8d5885f3ef 100644 --- a/src/i18n/locales/zh-TW/mcp.json +++ b/src/i18n/locales/zh-TW/mcp.json @@ -5,7 +5,10 @@ "invalid_settings_validation": "MCP 設定格式無效：{{errorMessages}}", "create_json": "建立或開啟 .roo/mcp.json 失敗：{{error}}", "failed_update_project": "更新專案 MCP 伺服器失敗", - "invalidJsonArgument": "Roo 嘗試使用無效的 JSON 參數呼叫 {{toolName}}。正在重試..." + "invalidJsonArgument": "Roo 嘗試使用無效的 JSON 參數呼叫 {{toolName}}。正在重試...", + "refresh_after_disable": "停用後重新整理 MCP 連線失敗", + "refresh_after_enable": "啟用後重新整理 MCP 連線失敗", + "disconnect_servers_partial": "斷開 {{count}} 個 MCP 伺服器失敗。請查看輸出了解詳情。" }, "info": { "server_restarting": "正在重啟{{serverName}}MCP 伺服器...", diff --git a/src/services/mcp/McpHub.ts b/src/services/mcp/McpHub.ts index 6d512b3f28..646236b5d5 100644 --- a/src/services/mcp/McpHub.ts +++ b/src/services/mcp/McpHub.ts @@ -1775,8 +1775,7 @@ export class McpHub { t("mcp:errors.disconnect_servers_partial", { count: disconnectionErrors.length, errors: errorSummary, - }) || - `Failed to disconnect ${disconnectionErrors.length} MCP server(s). Check the output for details.`, + }), ) } @@ -1785,9 +1784,7 @@ export class McpHub { await this.refreshAllConnections() } catch (error) { console.error(`Failed to refresh MCP connections after disabling: ${error}`) - vscode.window.showErrorMessage( - t("mcp:errors.refresh_after_disable") || "Failed to refresh MCP connections after disabling", - ) + vscode.window.showErrorMessage(t("mcp:errors.refresh_after_disable")) } } else { // If MCP is being enabled, reconnect all servers @@ -1795,9 +1792,7 @@ export class McpHub { await this.refreshAllConnections() } catch (error) { console.error(`Failed to refresh MCP connections after enabling: ${error}`) - vscode.window.showErrorMessage( - t("mcp:errors.refresh_after_enable") || "Failed to refresh MCP connections after enabling", - ) + vscode.window.showErrorMessage(t("mcp:errors.refresh_after_enable")) } } } From dc57552adebb9b7973140f94d00cf1cc459c64e2 Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Thu, 7 Aug 2025 16:57:12 -0400 Subject: [PATCH 103/253] feat: add GPT-5 model support (#6819) * feat: add GPT-5 model support - Added GPT-5 models (gpt-5-2025-08-07, gpt-5-mini-2025-08-07, gpt-5-nano-2025-08-07) - Added nectarine-alpha-new-reasoning-effort-2025-07-25 experimental model - Set gpt-5-2025-08-07 as default OpenAI Native model - Implemented GPT-5 specific handling with streaming and reasoning effort support * fix: remove hardcoded temperature from GPT-5 handler - Updated handleGPT5Message to use configurable temperature - Now uses this.options.modelTemperature ?? OPENAI_NATIVE_DEFAULT_TEMPERATURE - Maintains consistency with other model handlers * feat: add reasoning effort support for all OpenAI models * fix: update test to expect new default model gpt-5-2025-08-07 * feat: increase GPT-5 models context window to 400,000 - Updated context window from 256,000 to 400,000 for gpt-5-2025-08-07 - Updated context window from 256,000 to 400,000 for gpt-5-mini-2025-08-07 - Updated context window from 256,000 to 400,000 for gpt-5-nano-2025-08-07 - Updated context window from 256,000 to 400,000 for nectarine-alpha-new-reasoning-effort-2025-07-25 As requested by @daniel-lxs in PR #6819 * revert: remove GPT-5 models, keep only nectarine experimental model - Removed gpt-5-2025-08-07, gpt-5-mini-2025-08-07, gpt-5-nano-2025-08-07 - Kept nectarine-alpha-new-reasoning-effort-2025-07-25 experimental model - Reverted default model back to gpt-4o - Updated tests and changeset accordingly * feat: add GPT-5 models with updated context windows - Added gpt-5-2025-08-07, gpt-5-mini-2025-08-07, gpt-5-nano-2025-08-07 models - All GPT-5 models configured with 400,000 context window - Updated nectarine model context window to 256,000 - All models configured with reasoning effort support - Set gpt-5-2025-08-07 as default OpenAI Native model - Added GPT-5 model handling in openai-native.ts - Updated tests to reflect new default model * fix: restore reasoning effort support for o1 series models - Added supportsReasoningEffort: true to o1, o1-preview, and o1-mini models - This restores the ability to use reasoning effort parameters with these models - The existing code in openai-native.ts already handles reasoning effort correctly * Revert "fix: restore reasoning effort support for o1 series models" This reverts commit 7251237ae8714400769965b2d552824b695dfdae. * fix: restore reasoning effort support for o3 and o4 models - Added supportsReasoningEffort: true to o3, o3-high, o3-low models - Added supportsReasoningEffort: true to o4-mini, o4-mini-high, o4-mini-low models - Added supportsReasoningEffort: true to o3-mini, o3-mini-high, o3-mini-low models - These models have both supportsReasoningEffort and reasoningEffort properties * Revert "fix: restore reasoning effort support for o3 and o4 models" This reverts commit a75a2b8a6953d569e680246eebe7e673972097e4. * fix: restore reasoning effort support for o3 and o4 models - Added supportsReasoningEffort: true to o3, o3-high, o3-low models - Added supportsReasoningEffort: true to o4-mini, o4-mini-high, o4-mini-low models - Added supportsReasoningEffort: true to o3-mini, o3-mini-high, o3-mini-low models * fix: adjust reasoning effort support for o3/o4 models - Keep supportsReasoningEffort only for base o3, o4-mini, and o3-mini models - Remove supportsReasoningEffort from -high and -low variants - Position supportsReasoningEffort right before reasoningEffort property * fix: remove nectarine experimental model - Removed nectarine-alpha-new-reasoning-effort-2025-07-25 from openai.ts - Removed nectarine handling from openai-native.ts (renamed to handleGpt5Message) - Removed associated changeset file - Keep GPT-5 models with developer role handling * feat: implement full GPT-5 support with verbosity and minimal reasoning - Add all three GPT-5 models with accurate pricing (.25/0 for gpt-5, /bin/sh.25/ for mini, /bin/sh.05//bin/sh.40 for nano) - Implement verbosity control (low/medium/high) that passes through to API - Add minimal reasoning effort support for fastest response times - GPT-5 models use developer role instead of system role - Set gpt-5-2025-08-07 as default OpenAI Native model - Add Responses API infrastructure for future migration - Update tests to verify all GPT-5 features - All 27 tests passing Note: UI controls for verbosity still need to be added in a follow-up PR * feat: add verbosity setting for GPT-5 models - Add VerbosityLevel type definition to model types - Add verbosity field to ProviderSettings schema - Create Verbosity UI component for settings - Add verbosity labels to all localization files - Integrate verbosity handling in model parameters transformation - Update OpenAI native handler to support verbosity for GPT-5 - Add comprehensive tests for verbosity setting - Update existing GPT-5 tests to use verbosity from settings * Delete .roorules --------- Co-authored-by: Roo Code Co-authored-by: hannesrudolph Co-authored-by: Daniel Riccio Co-authored-by: Daniel <57051444+daniel-lxs@users.noreply.github.com> --- packages/types/src/model.ts | 10 + packages/types/src/provider-settings.ts | 5 +- packages/types/src/providers/openai.ts | 35 ++- .../providers/__tests__/openai-native.spec.ts | 156 ++++++++++- src/api/providers/openai-native.ts | 262 +++++++++++++++++- .../transform/__tests__/model-params.spec.ts | 97 +++++++ src/api/transform/model-params.ts | 12 +- .../src/components/settings/ApiOptions.tsx | 7 + .../src/components/settings/Verbosity.tsx | 43 +++ webview-ui/src/i18n/locales/ca/settings.json | 7 + webview-ui/src/i18n/locales/de/settings.json | 7 + webview-ui/src/i18n/locales/en/settings.json | 7 + webview-ui/src/i18n/locales/es/settings.json | 7 + webview-ui/src/i18n/locales/fr/settings.json | 7 + webview-ui/src/i18n/locales/hi/settings.json | 7 + webview-ui/src/i18n/locales/id/settings.json | 7 + webview-ui/src/i18n/locales/it/settings.json | 7 + webview-ui/src/i18n/locales/ja/settings.json | 7 + webview-ui/src/i18n/locales/ko/settings.json | 7 + webview-ui/src/i18n/locales/nl/settings.json | 7 + webview-ui/src/i18n/locales/pl/settings.json | 7 + .../src/i18n/locales/pt-BR/settings.json | 7 + webview-ui/src/i18n/locales/ru/settings.json | 7 + webview-ui/src/i18n/locales/tr/settings.json | 7 + webview-ui/src/i18n/locales/vi/settings.json | 7 + .../src/i18n/locales/zh-CN/settings.json | 7 + .../src/i18n/locales/zh-TW/settings.json | 7 + 27 files changed, 741 insertions(+), 12 deletions(-) create mode 100644 webview-ui/src/components/settings/Verbosity.tsx diff --git a/packages/types/src/model.ts b/packages/types/src/model.ts index 3bd66782cf..a09790578b 100644 --- a/packages/types/src/model.ts +++ b/packages/types/src/model.ts @@ -10,6 +10,16 @@ export const reasoningEffortsSchema = z.enum(reasoningEfforts) export type ReasoningEffort = z.infer +/** + * Verbosity + */ + +export const verbosityLevels = ["low", "medium", "high"] as const + +export const verbosityLevelsSchema = z.enum(verbosityLevels) + +export type VerbosityLevel = z.infer + /** * ModelParameter */ diff --git a/packages/types/src/provider-settings.ts b/packages/types/src/provider-settings.ts index dc51188df9..f0c90101fc 100644 --- a/packages/types/src/provider-settings.ts +++ b/packages/types/src/provider-settings.ts @@ -1,6 +1,6 @@ import { z } from "zod" -import { reasoningEffortsSchema, modelInfoSchema } from "./model.js" +import { reasoningEffortsSchema, verbosityLevelsSchema, modelInfoSchema } from "./model.js" import { codebaseIndexProviderSchema } from "./codebase-index.js" /** @@ -79,6 +79,9 @@ const baseProviderSettingsSchema = z.object({ reasoningEffort: reasoningEffortsSchema.optional(), modelMaxTokens: z.number().optional(), modelMaxThinkingTokens: z.number().optional(), + + // Model verbosity. + verbosity: verbosityLevelsSchema.optional(), }) // Several of the providers share common model config properties. diff --git a/packages/types/src/providers/openai.ts b/packages/types/src/providers/openai.ts index 0afdd46feb..b319be2a5f 100644 --- a/packages/types/src/providers/openai.ts +++ b/packages/types/src/providers/openai.ts @@ -3,9 +3,42 @@ import type { ModelInfo } from "../model.js" // https://openai.com/api/pricing/ export type OpenAiNativeModelId = keyof typeof openAiNativeModels -export const openAiNativeDefaultModelId: OpenAiNativeModelId = "gpt-4.1" +export const openAiNativeDefaultModelId: OpenAiNativeModelId = "gpt-5-2025-08-07" export const openAiNativeModels = { + "gpt-5-2025-08-07": { + maxTokens: 128000, + contextWindow: 400000, + supportsImages: true, + supportsPromptCache: true, + supportsReasoningEffort: true, + inputPrice: 1.25, + outputPrice: 10.0, + cacheReadsPrice: 0.13, + description: "GPT-5: The best model for coding and agentic tasks across domains", + }, + "gpt-5-mini-2025-08-07": { + maxTokens: 128000, + contextWindow: 400000, + supportsImages: true, + supportsPromptCache: true, + supportsReasoningEffort: true, + inputPrice: 0.25, + outputPrice: 2.0, + cacheReadsPrice: 0.03, + description: "GPT-5 Mini: A faster, more cost-efficient version of GPT-5 for well-defined tasks", + }, + "gpt-5-nano-2025-08-07": { + maxTokens: 128000, + contextWindow: 400000, + supportsImages: true, + supportsPromptCache: true, + supportsReasoningEffort: true, + inputPrice: 0.05, + outputPrice: 0.4, + cacheReadsPrice: 0.01, + description: "GPT-5 Nano: Fastest, most cost-efficient version of GPT-5", + }, "gpt-4.1": { maxTokens: 32_768, contextWindow: 1_047_576, diff --git a/src/api/providers/__tests__/openai-native.spec.ts b/src/api/providers/__tests__/openai-native.spec.ts index 64080b4cac..fdd71ba3f6 100644 --- a/src/api/providers/__tests__/openai-native.spec.ts +++ b/src/api/providers/__tests__/openai-native.spec.ts @@ -455,8 +455,162 @@ describe("OpenAiNativeHandler", () => { openAiNativeApiKey: "test-api-key", }) const modelInfo = handlerWithoutModel.getModel() - expect(modelInfo.id).toBe("gpt-4.1") // Default model + expect(modelInfo.id).toBe("gpt-5-2025-08-07") // Default model expect(modelInfo.info).toBeDefined() }) }) + + describe("GPT-5 models", () => { + it("should handle GPT-5 model with developer role", async () => { + handler = new OpenAiNativeHandler({ + ...mockOptions, + apiModelId: "gpt-5-2025-08-07", + }) + + const stream = handler.createMessage(systemPrompt, messages) + const chunks: any[] = [] + for await (const chunk of stream) { + chunks.push(chunk) + } + + // Verify developer role is used for GPT-5 with default parameters + expect(mockCreate).toHaveBeenCalledWith( + expect.objectContaining({ + model: "gpt-5-2025-08-07", + messages: [{ role: "developer", content: expect.stringContaining(systemPrompt) }], + stream: true, + stream_options: { include_usage: true }, + reasoning_effort: "minimal", // Default for GPT-5 + verbosity: "medium", // Default verbosity + }), + ) + }) + + it("should handle GPT-5-mini model", async () => { + handler = new OpenAiNativeHandler({ + ...mockOptions, + apiModelId: "gpt-5-mini-2025-08-07", + }) + + const stream = handler.createMessage(systemPrompt, messages) + const chunks: any[] = [] + for await (const chunk of stream) { + chunks.push(chunk) + } + + expect(mockCreate).toHaveBeenCalledWith( + expect.objectContaining({ + model: "gpt-5-mini-2025-08-07", + messages: [{ role: "developer", content: expect.stringContaining(systemPrompt) }], + stream: true, + stream_options: { include_usage: true }, + reasoning_effort: "minimal", // Default for GPT-5 + verbosity: "medium", // Default verbosity + }), + ) + }) + + it("should handle GPT-5-nano model", async () => { + handler = new OpenAiNativeHandler({ + ...mockOptions, + apiModelId: "gpt-5-nano-2025-08-07", + }) + + const stream = handler.createMessage(systemPrompt, messages) + const chunks: any[] = [] + for await (const chunk of stream) { + chunks.push(chunk) + } + + expect(mockCreate).toHaveBeenCalledWith( + expect.objectContaining({ + model: "gpt-5-nano-2025-08-07", + messages: [{ role: "developer", content: expect.stringContaining(systemPrompt) }], + stream: true, + stream_options: { include_usage: true }, + reasoning_effort: "minimal", // Default for GPT-5 + verbosity: "medium", // Default verbosity + }), + ) + }) + + it("should support verbosity control for GPT-5", async () => { + handler = new OpenAiNativeHandler({ + ...mockOptions, + apiModelId: "gpt-5-2025-08-07", + verbosity: "low", // Set verbosity through options + }) + + // Create a message to verify verbosity is passed + const stream = handler.createMessage(systemPrompt, messages) + const chunks: any[] = [] + for await (const chunk of stream) { + chunks.push(chunk) + } + + // Verify that verbosity is passed in the request + expect(mockCreate).toHaveBeenCalledWith( + expect.objectContaining({ + model: "gpt-5-2025-08-07", + messages: expect.any(Array), + stream: true, + stream_options: { include_usage: true }, + verbosity: "low", + }), + ) + }) + + it("should support minimal reasoning effort for GPT-5", async () => { + handler = new OpenAiNativeHandler({ + ...mockOptions, + apiModelId: "gpt-5-2025-08-07", + reasoningEffort: "low", + }) + + const stream = handler.createMessage(systemPrompt, messages) + const chunks: any[] = [] + for await (const chunk of stream) { + chunks.push(chunk) + } + + // With low reasoning effort, the model should pass it through + expect(mockCreate).toHaveBeenCalledWith( + expect.objectContaining({ + model: "gpt-5-2025-08-07", + messages: expect.any(Array), + stream: true, + stream_options: { include_usage: true }, + reasoning_effort: "low", + verbosity: "medium", // Default verbosity + }), + ) + }) + + it("should support both verbosity and reasoning effort together for GPT-5", async () => { + handler = new OpenAiNativeHandler({ + ...mockOptions, + apiModelId: "gpt-5-2025-08-07", + verbosity: "high", // Set verbosity through options + reasoningEffort: "low", // Set reasoning effort + }) + + const stream = handler.createMessage(systemPrompt, messages) + const chunks: any[] = [] + for await (const chunk of stream) { + chunks.push(chunk) + } + + // Verify both parameters are passed + expect(mockCreate).toHaveBeenCalledWith( + expect.objectContaining({ + model: "gpt-5-2025-08-07", + messages: expect.any(Array), + stream: true, + stream_options: { include_usage: true }, + reasoning_effort: "low", + verbosity: "high", + }), + ) + }) + }) }) diff --git a/src/api/providers/openai-native.ts b/src/api/providers/openai-native.ts index 3f14e65cc6..5e498bee45 100644 --- a/src/api/providers/openai-native.ts +++ b/src/api/providers/openai-native.ts @@ -7,6 +7,8 @@ import { OpenAiNativeModelId, openAiNativeModels, OPENAI_NATIVE_DEFAULT_TEMPERATURE, + type ReasoningEffort, + type VerbosityLevel, } from "@roo-code/types" import type { ApiHandlerOptions } from "../../shared/api" @@ -22,6 +24,32 @@ import type { SingleCompletionHandler, ApiHandlerCreateMessageMetadata } from ". export type OpenAiNativeModel = ReturnType +// GPT-5 specific types for Responses API +type ReasoningEffortWithMinimal = ReasoningEffort | "minimal" + +interface GPT5ResponsesAPIParams { + model: string + input: string + reasoning?: { + effort: ReasoningEffortWithMinimal + } + text?: { + verbosity: VerbosityLevel + } +} + +interface GPT5ResponseChunk { + type: "text" | "reasoning" | "usage" + text?: string + reasoning?: string + usage?: { + input_tokens: number + output_tokens: number + reasoning_tokens?: number + total_tokens: number + } +} + export class OpenAiNativeHandler extends BaseProvider implements SingleCompletionHandler { protected options: ApiHandlerOptions private client: OpenAI @@ -53,6 +81,8 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio yield* this.handleReasonerMessage(model, id, systemPrompt, messages) } else if (model.id.startsWith("o1")) { yield* this.handleO1FamilyMessage(model, systemPrompt, messages) + } else if (this.isGpt5Model(model.id)) { + yield* this.handleGpt5Message(model, systemPrompt, messages) } else { yield* this.handleDefaultModelMessage(model, systemPrompt, messages) } @@ -66,6 +96,8 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio // o1 supports developer prompt with formatting // o1-preview and o1-mini only support user messages const isOriginalO1 = model.id === "o1" + const { reasoning } = this.getModel() + const response = await this.client.chat.completions.create({ model: model.id, messages: [ @@ -77,6 +109,7 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio ], stream: true, stream_options: { include_usage: true }, + ...(reasoning && reasoning), }) yield* this.handleStreamResponse(response, model) @@ -112,15 +145,214 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio systemPrompt: string, messages: Anthropic.Messages.MessageParam[], ): ApiStream { - const stream = await this.client.chat.completions.create({ + const { reasoning, verbosity } = this.getModel() + + // Prepare the request parameters + const params: any = { model: model.id, temperature: this.options.modelTemperature ?? OPENAI_NATIVE_DEFAULT_TEMPERATURE, messages: [{ role: "system", content: systemPrompt }, ...convertToOpenAiMessages(messages)], stream: true, stream_options: { include_usage: true }, - }) + ...(reasoning && reasoning), + } - yield* this.handleStreamResponse(stream, model) + // Add verbosity if supported (for future GPT-5 models) + if (verbosity && model.id.startsWith("gpt-5")) { + params.verbosity = verbosity + } + + const stream = await this.client.chat.completions.create(params) + + if (typeof (stream as any)[Symbol.asyncIterator] !== "function") { + throw new Error( + "OpenAI SDK did not return an AsyncIterable for streaming response. Please check SDK version and usage.", + ) + } + + yield* this.handleStreamResponse( + stream as unknown as AsyncIterable, + model, + ) + } + + private async *handleGpt5Message( + model: OpenAiNativeModel, + systemPrompt: string, + messages: Anthropic.Messages.MessageParam[], + ): ApiStream { + // GPT-5 uses the Responses API, not Chat Completions + // We need to format the input as a single string combining system prompt and messages + const formattedInput = this.formatInputForResponsesAPI(systemPrompt, messages) + + // Get reasoning effort, supporting the new "minimal" option for GPT-5 + const reasoningEffort = this.getGpt5ReasoningEffort(model) + + // Get verbosity from model settings, default to "medium" if not specified + const verbosity = model.verbosity || "medium" + + // Prepare the request parameters for Responses API + const params: GPT5ResponsesAPIParams = { + model: model.id, + input: formattedInput, + ...(reasoningEffort && { + reasoning: { + effort: reasoningEffort, + }, + }), + text: { + verbosity: verbosity, + }, + } + + // Since the OpenAI SDK doesn't yet support the Responses API, + // we'll make a direct HTTP request + const response = await this.makeGpt5ResponsesAPIRequest(params, model) + + yield* this.handleGpt5StreamResponse(response, model) + } + + private formatInputForResponsesAPI(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): string { + // Format the conversation for the Responses API's single input field + let formattedInput = `System: ${systemPrompt}\n\n` + + for (const message of messages) { + const role = message.role === "user" ? "User" : "Assistant" + const content = + typeof message.content === "string" + ? message.content + : message.content.map((c) => (c.type === "text" ? c.text : "[image]")).join(" ") + formattedInput += `${role}: ${content}\n\n` + } + + return formattedInput.trim() + } + + private getGpt5ReasoningEffort(model: OpenAiNativeModel): ReasoningEffortWithMinimal | undefined { + const { reasoning } = model + + // Check if reasoning effort is configured + if (reasoning && "reasoning_effort" in reasoning) { + const effort = reasoning.reasoning_effort + // Support the new "minimal" effort level for GPT-5 + if (effort === "low" || effort === "medium" || effort === "high") { + return effort + } + } + + // Default to "minimal" for GPT-5 models when not specified + // This provides fastest time-to-first-token as per documentation + return "minimal" + } + + private async makeGpt5ResponsesAPIRequest( + params: GPT5ResponsesAPIParams, + model: OpenAiNativeModel, + ): Promise> { + // The OpenAI SDK doesn't have direct support for the Responses API yet, + // but we can access it through the underlying client request method if available. + // For now, we'll use the Chat Completions API with GPT-5 specific formatting + // to maintain compatibility while the Responses API SDK support is being added. + + // Convert Responses API params to Chat Completions format + // GPT-5 models use "developer" role for system messages + const messages: OpenAI.Chat.ChatCompletionMessageParam[] = [{ role: "developer", content: params.input }] + + // Build the request parameters + const requestParams: any = { + model: params.model, + messages, + stream: true, + stream_options: { include_usage: true }, + } + + // Add reasoning effort if specified (supporting "minimal" for GPT-5) + if (params.reasoning?.effort) { + if (params.reasoning.effort === "minimal") { + // For minimal effort, we pass "minimal" as the reasoning_effort + requestParams.reasoning_effort = "minimal" + } else { + requestParams.reasoning_effort = params.reasoning.effort + } + } + + // Add verbosity control for GPT-5 models + // According to the docs, Chat Completions API also supports verbosity parameter + if (params.text?.verbosity) { + requestParams.verbosity = params.text.verbosity + } + + const stream = (await this.client.chat.completions.create( + requestParams, + )) as unknown as AsyncIterable + + // Convert the stream to GPT-5 response format + return this.convertChatStreamToGpt5Format(stream) + } + + private async *convertChatStreamToGpt5Format( + stream: AsyncIterable, + ): AsyncIterable { + for await (const chunk of stream) { + const delta = chunk.choices[0]?.delta + + if (delta?.content) { + yield { + type: "text", + text: delta.content, + } + } + + if (chunk.usage) { + yield { + type: "usage", + usage: { + input_tokens: chunk.usage.prompt_tokens || 0, + output_tokens: chunk.usage.completion_tokens || 0, + total_tokens: chunk.usage.total_tokens || 0, + }, + } + } + } + } + + private async *handleGpt5StreamResponse( + stream: AsyncIterable, + model: OpenAiNativeModel, + ): ApiStream { + for await (const chunk of stream) { + if (chunk.type === "text" && chunk.text) { + yield { + type: "text", + text: chunk.text, + } + } else if (chunk.type === "usage" && chunk.usage) { + const inputTokens = chunk.usage.input_tokens + const outputTokens = chunk.usage.output_tokens + const cacheReadTokens = 0 + const cacheWriteTokens = 0 + const totalCost = calculateApiCostOpenAI( + model.info, + inputTokens, + outputTokens, + cacheWriteTokens, + cacheReadTokens, + ) + + yield { + type: "usage", + inputTokens, + outputTokens, + cacheWriteTokens, + cacheReadTokens, + totalCost, + } + } + } + } + + private isGpt5Model(modelId: string): boolean { + return modelId.startsWith("gpt-5") } private async *handleStreamResponse( @@ -177,23 +409,39 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio defaultTemperature: OPENAI_NATIVE_DEFAULT_TEMPERATURE, }) + // For GPT-5 models, ensure we support minimal reasoning effort + if (this.isGpt5Model(id) && params.reasoning) { + // Allow "minimal" effort for GPT-5 models + const effort = this.options.reasoningEffort + if (effort === "low" || effort === "medium" || effort === "high") { + params.reasoning.reasoning_effort = effort + } + } + // The o3 models are named like "o3-mini-[reasoning-effort]", which are // not valid model ids, so we need to strip the suffix. - return { id: id.startsWith("o3-mini") ? "o3-mini" : id, info, ...params } + return { id: id.startsWith("o3-mini") ? "o3-mini" : id, info, ...params, verbosity: params.verbosity } } async completePrompt(prompt: string): Promise { try { - const { id, temperature, reasoning } = this.getModel() + const { id, temperature, reasoning, verbosity } = this.getModel() - const params: OpenAI.Chat.Completions.ChatCompletionCreateParamsNonStreaming = { + const params: OpenAI.Chat.Completions.ChatCompletionCreateParamsNonStreaming & { + verbosity?: VerbosityLevel + } = { model: id, messages: [{ role: "user", content: prompt }], temperature, ...(reasoning && reasoning), } - const response = await this.client.chat.completions.create(params) + // Add verbosity for GPT-5 models + if (this.isGpt5Model(id) && verbosity) { + params.verbosity = verbosity + } + + const response = await this.client.chat.completions.create(params as any) return response.choices[0]?.message.content || "" } catch (error) { if (error instanceof Error) { diff --git a/src/api/transform/__tests__/model-params.spec.ts b/src/api/transform/__tests__/model-params.spec.ts index b5a02f534e..bd75e7eafb 100644 --- a/src/api/transform/__tests__/model-params.spec.ts +++ b/src/api/transform/__tests__/model-params.spec.ts @@ -788,4 +788,101 @@ describe("getModelParams", () => { expect(result.reasoning).toBeUndefined() }) }) + + describe("Verbosity settings", () => { + it("should include verbosity when specified in settings", () => { + const model: ModelInfo = { + ...baseModel, + } + + const result = getModelParams({ + ...openaiParams, + settings: { verbosity: "low" }, + model, + }) + + expect(result.verbosity).toBe("low") + }) + + it("should handle medium verbosity", () => { + const model: ModelInfo = { + ...baseModel, + } + + const result = getModelParams({ + ...openaiParams, + settings: { verbosity: "medium" }, + model, + }) + + expect(result.verbosity).toBe("medium") + }) + + it("should handle high verbosity", () => { + const model: ModelInfo = { + ...baseModel, + } + + const result = getModelParams({ + ...openaiParams, + settings: { verbosity: "high" }, + model, + }) + + expect(result.verbosity).toBe("high") + }) + + it("should return undefined verbosity when not specified", () => { + const model: ModelInfo = { + ...baseModel, + } + + const result = getModelParams({ + ...openaiParams, + settings: {}, + model, + }) + + expect(result.verbosity).toBeUndefined() + }) + + it("should include verbosity alongside reasoning settings", () => { + const model: ModelInfo = { + ...baseModel, + supportsReasoningEffort: true, + } + + const result = getModelParams({ + ...openaiParams, + settings: { + reasoningEffort: "high", + verbosity: "low", + }, + model, + }) + + expect(result.reasoningEffort).toBe("high") + expect(result.verbosity).toBe("low") + expect(result.reasoning).toEqual({ reasoning_effort: "high" }) + }) + + it("should include verbosity with reasoning budget models", () => { + const model: ModelInfo = { + ...baseModel, + supportsReasoningBudget: true, + } + + const result = getModelParams({ + ...anthropicParams, + settings: { + enableReasoningEffort: true, + verbosity: "high", + }, + model, + }) + + expect(result.verbosity).toBe("high") + expect(result.reasoningBudget).toBe(8192) // Default thinking tokens + }) + }) }) diff --git a/src/api/transform/model-params.ts b/src/api/transform/model-params.ts index 9ad4261b76..cc30aa5605 100644 --- a/src/api/transform/model-params.ts +++ b/src/api/transform/model-params.ts @@ -1,4 +1,9 @@ -import { type ModelInfo, type ProviderSettings, ANTHROPIC_DEFAULT_MAX_TOKENS } from "@roo-code/types" +import { + type ModelInfo, + type ProviderSettings, + type VerbosityLevel, + ANTHROPIC_DEFAULT_MAX_TOKENS, +} from "@roo-code/types" import { DEFAULT_HYBRID_REASONING_MODEL_MAX_TOKENS, @@ -35,6 +40,7 @@ type BaseModelParams = { temperature: number | undefined reasoningEffort: "low" | "medium" | "high" | undefined reasoningBudget: number | undefined + verbosity: VerbosityLevel | undefined } type AnthropicModelParams = { @@ -76,6 +82,7 @@ export function getModelParams({ modelMaxThinkingTokens: customMaxThinkingTokens, modelTemperature: customTemperature, reasoningEffort: customReasoningEffort, + verbosity: customVerbosity, } = settings // Use the centralized logic for computing maxTokens @@ -89,6 +96,7 @@ export function getModelParams({ let temperature = customTemperature ?? defaultTemperature let reasoningBudget: ModelParams["reasoningBudget"] = undefined let reasoningEffort: ModelParams["reasoningEffort"] = undefined + let verbosity: VerbosityLevel | undefined = customVerbosity if (shouldUseReasoningBudget({ model, settings })) { // Check if this is a Gemini 2.5 Pro model @@ -123,7 +131,7 @@ export function getModelParams({ reasoningEffort = customReasoningEffort ?? model.reasoningEffort } - const params: BaseModelParams = { maxTokens, temperature, reasoningEffort, reasoningBudget } + const params: BaseModelParams = { maxTokens, temperature, reasoningEffort, reasoningBudget, verbosity } if (format === "anthropic") { return { diff --git a/webview-ui/src/components/settings/ApiOptions.tsx b/webview-ui/src/components/settings/ApiOptions.tsx index 204abe9c0f..74ba885d25 100644 --- a/webview-ui/src/components/settings/ApiOptions.tsx +++ b/webview-ui/src/components/settings/ApiOptions.tsx @@ -91,6 +91,7 @@ import { inputEventTransform, noTransform } from "./transforms" import { ModelInfoView } from "./ModelInfoView" import { ApiErrorMessage } from "./ApiErrorMessage" import { ThinkingBudget } from "./ThinkingBudget" +import { Verbosity } from "./Verbosity" import { DiffSettingsControl } from "./DiffSettingsControl" import { TodoListSettingsControl } from "./TodoListSettingsControl" import { TemperatureControl } from "./TemperatureControl" @@ -616,6 +617,12 @@ const ApiOptions = ({ modelInfo={selectedModelInfo} /> + + {!fromWelcomeView && ( diff --git a/webview-ui/src/components/settings/Verbosity.tsx b/webview-ui/src/components/settings/Verbosity.tsx new file mode 100644 index 0000000000..ee612d66cf --- /dev/null +++ b/webview-ui/src/components/settings/Verbosity.tsx @@ -0,0 +1,43 @@ +import { type ProviderSettings, type ModelInfo, type VerbosityLevel, verbosityLevels } from "@roo-code/types" + +import { useAppTranslation } from "@src/i18n/TranslationContext" +import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@src/components/ui" + +interface VerbosityProps { + apiConfiguration: ProviderSettings + setApiConfigurationField: (field: K, value: ProviderSettings[K]) => void + modelInfo?: ModelInfo +} + +export const Verbosity = ({ apiConfiguration, setApiConfigurationField, modelInfo }: VerbosityProps) => { + const { t } = useAppTranslation() + + // For now, we'll show verbosity for all models, but this can be restricted later + // based on model capabilities (e.g., only for GPT-5 models) + if (!modelInfo) { + return null + } + + return ( +
    +
    + +
    + +
    {t("settings:providers.verbosity.description")}
    +
    + ) +} diff --git a/webview-ui/src/i18n/locales/ca/settings.json b/webview-ui/src/i18n/locales/ca/settings.json index e3f2713ffe..3a534fb031 100644 --- a/webview-ui/src/i18n/locales/ca/settings.json +++ b/webview-ui/src/i18n/locales/ca/settings.json @@ -433,6 +433,13 @@ "medium": "Mitjà", "low": "Baix" }, + "verbosity": { + "label": "Verbositat de la sortida", + "high": "Alta", + "medium": "Mitjana", + "low": "Baixa", + "description": "Controla el nivell de detall de les respostes del model. La verbositat baixa produeix respostes concises, mentre que la verbositat alta proporciona explicacions exhaustives." + }, "setReasoningLevel": "Activa l'esforç de raonament", "claudeCode": { "pathLabel": "Ruta del Codi Claude", diff --git a/webview-ui/src/i18n/locales/de/settings.json b/webview-ui/src/i18n/locales/de/settings.json index a4a62b8391..d13050cc7a 100644 --- a/webview-ui/src/i18n/locales/de/settings.json +++ b/webview-ui/src/i18n/locales/de/settings.json @@ -433,6 +433,13 @@ "medium": "Mittel", "low": "Niedrig" }, + "verbosity": { + "label": "Ausgabe-Ausführlichkeit", + "high": "Hoch", + "medium": "Mittel", + "low": "Niedrig", + "description": "Steuert, wie detailliert die Antworten des Modells sind. Niedrige Ausführlichkeit erzeugt knappe Antworten, während hohe Ausführlichkeit gründliche Erklärungen liefert." + }, "setReasoningLevel": "Denkaufwand aktivieren", "claudeCode": { "pathLabel": "Claude-Code-Pfad", diff --git a/webview-ui/src/i18n/locales/en/settings.json b/webview-ui/src/i18n/locales/en/settings.json index 6e0f137504..224ad4fdd7 100644 --- a/webview-ui/src/i18n/locales/en/settings.json +++ b/webview-ui/src/i18n/locales/en/settings.json @@ -432,6 +432,13 @@ "medium": "Medium", "low": "Low" }, + "verbosity": { + "label": "Output Verbosity", + "high": "High", + "medium": "Medium", + "low": "Low", + "description": "Controls how detailed the model's responses are. Low verbosity produces concise answers, while high verbosity provides thorough explanations." + }, "setReasoningLevel": "Enable Reasoning Effort", "claudeCode": { "pathLabel": "Claude Code Path", diff --git a/webview-ui/src/i18n/locales/es/settings.json b/webview-ui/src/i18n/locales/es/settings.json index e2db1463af..79ac8c5510 100644 --- a/webview-ui/src/i18n/locales/es/settings.json +++ b/webview-ui/src/i18n/locales/es/settings.json @@ -433,6 +433,13 @@ "medium": "Medio", "low": "Bajo" }, + "verbosity": { + "label": "Verbosidad de la salida", + "high": "Alta", + "medium": "Media", + "low": "Baja", + "description": "Controla qué tan detalladas son las respuestas del modelo. La verbosidad baja produce respuestas concisas, mientras que la verbosidad alta proporciona explicaciones exhaustivas." + }, "setReasoningLevel": "Habilitar esfuerzo de razonamiento", "claudeCode": { "pathLabel": "Ruta de Claude Code", diff --git a/webview-ui/src/i18n/locales/fr/settings.json b/webview-ui/src/i18n/locales/fr/settings.json index 26018a344b..8a8738ed9b 100644 --- a/webview-ui/src/i18n/locales/fr/settings.json +++ b/webview-ui/src/i18n/locales/fr/settings.json @@ -433,6 +433,13 @@ "medium": "Moyen", "low": "Faible" }, + "verbosity": { + "label": "Verbosité de la sortie", + "high": "Élevée", + "medium": "Moyenne", + "low": "Faible", + "description": "Contrôle le niveau de détail des réponses du modèle. Une faible verbosité produit des réponses concises, tandis qu'une verbosité élevée fournit des explications approfondies." + }, "setReasoningLevel": "Activer l'effort de raisonnement", "claudeCode": { "pathLabel": "Chemin du code Claude", diff --git a/webview-ui/src/i18n/locales/hi/settings.json b/webview-ui/src/i18n/locales/hi/settings.json index 7c8b280427..18c5061a13 100644 --- a/webview-ui/src/i18n/locales/hi/settings.json +++ b/webview-ui/src/i18n/locales/hi/settings.json @@ -433,6 +433,13 @@ "medium": "मध्यम", "low": "निम्न" }, + "verbosity": { + "label": "आउटपुट वर्बोसिटी", + "high": "उच्च", + "medium": "मध्यम", + "low": "कम", + "description": "मॉडल की प्रतिक्रियाएं कितनी विस्तृत हैं, इसे नियंत्रित करता है। कम वर्बोसिटी संक्षिप्त उत्तर देती है, जबकि उच्च वर्बोसिटी विस्तृत स्पष्टीकरण प्रदान करती है।" + }, "setReasoningLevel": "तर्क प्रयास सक्षम करें", "claudeCode": { "pathLabel": "क्लाउड कोड पथ", diff --git a/webview-ui/src/i18n/locales/id/settings.json b/webview-ui/src/i18n/locales/id/settings.json index b4f9b113b3..3a4800f4f2 100644 --- a/webview-ui/src/i18n/locales/id/settings.json +++ b/webview-ui/src/i18n/locales/id/settings.json @@ -437,6 +437,13 @@ "medium": "Sedang", "low": "Rendah" }, + "verbosity": { + "label": "Verbositas Output", + "high": "Tinggi", + "medium": "Sedang", + "low": "Rendah", + "description": "Mengontrol seberapa detail respons model. Verbositas rendah menghasilkan jawaban singkat, sedangkan verbositas tinggi memberikan penjelasan menyeluruh." + }, "setReasoningLevel": "Aktifkan Upaya Reasoning", "claudeCode": { "pathLabel": "Jalur Kode Claude", diff --git a/webview-ui/src/i18n/locales/it/settings.json b/webview-ui/src/i18n/locales/it/settings.json index 82d7b2d041..e116bf2ae3 100644 --- a/webview-ui/src/i18n/locales/it/settings.json +++ b/webview-ui/src/i18n/locales/it/settings.json @@ -433,6 +433,13 @@ "medium": "Medio", "low": "Basso" }, + "verbosity": { + "label": "Verbosity dell'output", + "high": "Alta", + "medium": "Media", + "low": "Bassa", + "description": "Controlla il livello di dettaglio delle risposte del modello. Una verbosity bassa produce risposte concise, mentre una verbosity alta fornisce spiegazioni approfondite." + }, "setReasoningLevel": "Abilita sforzo di ragionamento", "claudeCode": { "pathLabel": "Percorso Claude Code", diff --git a/webview-ui/src/i18n/locales/ja/settings.json b/webview-ui/src/i18n/locales/ja/settings.json index dfa62ab32b..407d31e457 100644 --- a/webview-ui/src/i18n/locales/ja/settings.json +++ b/webview-ui/src/i18n/locales/ja/settings.json @@ -433,6 +433,13 @@ "medium": "中", "low": "低" }, + "verbosity": { + "label": "出力の冗長性", + "high": "高", + "medium": "中", + "low": "低", + "description": "モデルの応答の詳細度を制御します。冗長性が低いと簡潔な回答が生成され、高いと詳細な説明が提供されます。" + }, "setReasoningLevel": "推論労力を有効にする", "claudeCode": { "pathLabel": "クロードコードパス", diff --git a/webview-ui/src/i18n/locales/ko/settings.json b/webview-ui/src/i18n/locales/ko/settings.json index 219a5de54a..3cdb2e8b4f 100644 --- a/webview-ui/src/i18n/locales/ko/settings.json +++ b/webview-ui/src/i18n/locales/ko/settings.json @@ -433,6 +433,13 @@ "medium": "중간", "low": "낮음" }, + "verbosity": { + "label": "출력 상세도", + "high": "높음", + "medium": "중간", + "low": "낮음", + "description": "모델 응답의 상세도를 제어합니다. 낮은 상세도는 간결한 답변을 생성하고, 높은 상세도는 상세한 설명을 제공합니다." + }, "setReasoningLevel": "추론 노력 활성화", "claudeCode": { "pathLabel": "클로드 코드 경로", diff --git a/webview-ui/src/i18n/locales/nl/settings.json b/webview-ui/src/i18n/locales/nl/settings.json index 735339bb66..2061474d17 100644 --- a/webview-ui/src/i18n/locales/nl/settings.json +++ b/webview-ui/src/i18n/locales/nl/settings.json @@ -433,6 +433,13 @@ "medium": "Middel", "low": "Laag" }, + "verbosity": { + "label": "Uitvoerbaarheid", + "high": "Hoog", + "medium": "Gemiddeld", + "low": "Laag", + "description": "Bepaalt hoe gedetailleerd de reacties van het model zijn. Lage uitvoerbaarheid levert beknopte antwoorden op, terwijl hoge uitvoerbaarheid uitgebreide uitleg geeft." + }, "setReasoningLevel": "Redeneervermogen inschakelen", "claudeCode": { "pathLabel": "Claude Code Pad", diff --git a/webview-ui/src/i18n/locales/pl/settings.json b/webview-ui/src/i18n/locales/pl/settings.json index e25eee34cf..b081005400 100644 --- a/webview-ui/src/i18n/locales/pl/settings.json +++ b/webview-ui/src/i18n/locales/pl/settings.json @@ -433,6 +433,13 @@ "medium": "Średni", "low": "Niski" }, + "verbosity": { + "label": "Szczegółowość danych wyjściowych", + "high": "Wysoka", + "medium": "Średnia", + "low": "Niska", + "description": "Kontroluje, jak szczegółowe są odpowiedzi modelu. Niska szczegółowość generuje zwięzłe odpowiedzi, podczas gdy wysoka szczegółowość dostarcza dokładnych wyjaśnień." + }, "setReasoningLevel": "Włącz wysiłek rozumowania", "claudeCode": { "pathLabel": "Ścieżka Claude Code", diff --git a/webview-ui/src/i18n/locales/pt-BR/settings.json b/webview-ui/src/i18n/locales/pt-BR/settings.json index e7243aa6f6..a71340391d 100644 --- a/webview-ui/src/i18n/locales/pt-BR/settings.json +++ b/webview-ui/src/i18n/locales/pt-BR/settings.json @@ -433,6 +433,13 @@ "medium": "Médio", "low": "Baixo" }, + "verbosity": { + "label": "Verbosidade da saída", + "high": "Alta", + "medium": "Média", + "low": "Baixa", + "description": "Controla o quão detalhadas são as respostas do modelo. A verbosidade baixa produz respostas concisas, enquanto a verbosidade alta fornisce explicações detalhadas." + }, "setReasoningLevel": "Habilitar esforço de raciocínio", "claudeCode": { "pathLabel": "Caminho do Claude Code", diff --git a/webview-ui/src/i18n/locales/ru/settings.json b/webview-ui/src/i18n/locales/ru/settings.json index 38e986ab88..00e9b79074 100644 --- a/webview-ui/src/i18n/locales/ru/settings.json +++ b/webview-ui/src/i18n/locales/ru/settings.json @@ -433,6 +433,13 @@ "medium": "Средние", "low": "Низкие" }, + "verbosity": { + "label": "Подробность вывода", + "high": "Высокая", + "medium": "Средняя", + "low": "Низкая", + "description": "Контролирует, насколько подробны ответы модели. Низкая подробность дает краткие ответы, а высокая — подробные объяснения." + }, "setReasoningLevel": "Включить усилие рассуждения", "claudeCode": { "pathLabel": "Путь к Claude Code", diff --git a/webview-ui/src/i18n/locales/tr/settings.json b/webview-ui/src/i18n/locales/tr/settings.json index b4b9fd13e4..e79db2a3b2 100644 --- a/webview-ui/src/i18n/locales/tr/settings.json +++ b/webview-ui/src/i18n/locales/tr/settings.json @@ -433,6 +433,13 @@ "medium": "Orta", "low": "Düşük" }, + "verbosity": { + "label": "Çıktı Ayrıntı Düzeyi", + "high": "Yüksek", + "medium": "Orta", + "low": "Düşük", + "description": "Modelin yanıtlarının ne kadar ayrıntılı olduğunu kontrol eder. Düşük ayrıntı düzeyi kısa yanıtlar üretirken, yüksek ayrıntı düzeyi kapsamlı açıklamalar sunar." + }, "setReasoningLevel": "Akıl Yürütme Çabasını Etkinleştir", "claudeCode": { "pathLabel": "Claude Code Yolu", diff --git a/webview-ui/src/i18n/locales/vi/settings.json b/webview-ui/src/i18n/locales/vi/settings.json index cdae509d5e..10de98d4da 100644 --- a/webview-ui/src/i18n/locales/vi/settings.json +++ b/webview-ui/src/i18n/locales/vi/settings.json @@ -433,6 +433,13 @@ "medium": "Trung bình", "low": "Thấp" }, + "verbosity": { + "label": "Mức độ chi tiết đầu ra", + "high": "Cao", + "medium": "Trung bình", + "low": "Thấp", + "description": "Kiểm soát mức độ chi tiết của các câu trả lời của mô hình. Mức độ chi tiết thấp tạo ra các câu trả lời ngắn gọn, trong khi mức độ chi tiết cao cung cấp giải thích kỹ lưỡng." + }, "setReasoningLevel": "Kích hoạt nỗ lực suy luận", "claudeCode": { "pathLabel": "Đường dẫn Claude Code", diff --git a/webview-ui/src/i18n/locales/zh-CN/settings.json b/webview-ui/src/i18n/locales/zh-CN/settings.json index aca901cc3e..a6971d288f 100644 --- a/webview-ui/src/i18n/locales/zh-CN/settings.json +++ b/webview-ui/src/i18n/locales/zh-CN/settings.json @@ -433,6 +433,13 @@ "medium": "中", "low": "低" }, + "verbosity": { + "label": "输出详细程度", + "high": "高", + "medium": "中", + "low": "低", + "description": "控制模型响应的详细程度。低详细度产生简洁的回答，而高详细度提供详尽的解释。" + }, "setReasoningLevel": "启用推理工作量", "claudeCode": { "pathLabel": "Claude Code 路径", diff --git a/webview-ui/src/i18n/locales/zh-TW/settings.json b/webview-ui/src/i18n/locales/zh-TW/settings.json index db3fc3c2cd..bec2ffd5e9 100644 --- a/webview-ui/src/i18n/locales/zh-TW/settings.json +++ b/webview-ui/src/i18n/locales/zh-TW/settings.json @@ -433,6 +433,13 @@ "medium": "中", "low": "低" }, + "verbosity": { + "label": "輸出詳細程度", + "high": "高", + "medium": "中", + "low": "低", + "description": "控制模型回應的詳細程度。低詳細度產生簡潔的回答，而高詳細度提供詳盡的解釋。" + }, "setReasoningLevel": "啟用推理工作量", "claudeCode": { "pathLabel": "Claude Code 路徑", From d0b1fbf049825e461eb595f76b55a010a2827916 Mon Sep 17 00:00:00 2001 From: Matt Rubens Date: Thu, 7 Aug 2025 17:39:09 -0400 Subject: [PATCH 104/253] chore: add changeset for v3.25.10 (#6825) --- .changeset/v3.25.10.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changeset/v3.25.10.md diff --git a/.changeset/v3.25.10.md b/.changeset/v3.25.10.md new file mode 100644 index 0000000000..8495e84ec8 --- /dev/null +++ b/.changeset/v3.25.10.md @@ -0,0 +1,7 @@ +--- +"roo-cline": patch +--- + +- Add support for GPT-5 model (thanks @app/roomote!) +- Fix: Use CDATA sections in XML examples to prevent parser errors (#4852 by @hannesrudolph, PR by @hannesrudolph) +- Fix: Add missing MCP error translation keys (thanks @app/roomote!) From 5f6891322aa88c89e1dd46b697ad31b10ae002a1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Aug 2025 17:41:07 -0400 Subject: [PATCH 105/253] Update contributors list (#6636) Co-authored-by: mrubens <2600+mrubens@users.noreply.github.com> --- README.md | 80 ++++++++++++++++++++--------------------- locales/ca/README.md | 80 ++++++++++++++++++++--------------------- locales/de/README.md | 80 ++++++++++++++++++++--------------------- locales/es/README.md | 80 ++++++++++++++++++++--------------------- locales/fr/README.md | 80 ++++++++++++++++++++--------------------- locales/hi/README.md | 80 ++++++++++++++++++++--------------------- locales/id/README.md | 80 ++++++++++++++++++++--------------------- locales/it/README.md | 80 ++++++++++++++++++++--------------------- locales/ja/README.md | 80 ++++++++++++++++++++--------------------- locales/ko/README.md | 80 ++++++++++++++++++++--------------------- locales/nl/README.md | 80 ++++++++++++++++++++--------------------- locales/pl/README.md | 80 ++++++++++++++++++++--------------------- locales/pt-BR/README.md | 80 ++++++++++++++++++++--------------------- locales/ru/README.md | 80 ++++++++++++++++++++--------------------- locales/tr/README.md | 80 ++++++++++++++++++++--------------------- locales/vi/README.md | 80 ++++++++++++++++++++--------------------- locales/zh-CN/README.md | 80 ++++++++++++++++++++--------------------- locales/zh-TW/README.md | 80 ++++++++++++++++++++--------------------- 18 files changed, 720 insertions(+), 720 deletions(-) diff --git a/README.md b/README.md index 08f8f81806..1b5e8fe2ec 100644 --- a/README.md +++ b/README.md @@ -208,46 +208,46 @@ Thanks to all our contributors who have helped make Roo Code better! -| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | -| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | -| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | -| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | -| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | -| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | -| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | -| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | -| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | -| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | -| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | -| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | -| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | -| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | -| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | -| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | -| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | -| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | -| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | -| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | -| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | -| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | -| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | -| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | -| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | -| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | -| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | -| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | -| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | -| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | -| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | -| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | -| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | -| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | -| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | -| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | -| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | -| DeXtroTip
    DeXtroTip     | | | | | | +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | MuriloFP
    MuriloFP     | ColemanRoo
    ColemanRoo     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | d-oit
    d-oit     | elianiva
    elianiva     | qdaxb
    qdaxb     | xyOz-dev
    xyOz-dev     | punkpeye
    punkpeye     | +| wkordalski
    wkordalski     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | NaccOll
    NaccOll     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | +| afshawnlotfi
    afshawnlotfi     | dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | +| emshvac
    emshvac     | brunobergher
    brunobergher     | Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | +| dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | +| p12tic
    p12tic     | gtaylor
    gtaylor     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | +| taisukeoe
    taisukeoe     | avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | +| teddyOOXX
    teddyOOXX     | thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | +| franekp
    franekp     | yt3trees
    yt3trees     | seedlord
    seedlord     | bramburn
    bramburn     | anton-otee
    anton-otee     | benzntech
    benzntech     | +| axkirillov
    axkirillov     | olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | +| jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | SplittyDev
    SplittyDev     | +| mdp
    mdp     | napter
    napter     | philfung
    philfung     | axmo
    axmo     | bannzai
    bannzai     | bbenshalom
    bbenshalom     | +| chris-garrett
    chris-garrett     | dairui1
    dairui1     | dqroid
    dqroid     | ershang-fireworks
    ershang-fireworks     | janaki-sasidhar
    janaki-sasidhar     | forestyoo
    forestyoo     | +| hatsu38
    hatsu38     | hongzio
    hongzio     | im47cn
    im47cn     | shoopapa
    shoopapa     | asychin
    asychin     | amittell
    amittell     | +| Yoshino-Yukitaro
    Yoshino-Yukitaro     | Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | +| HahaBill
    HahaBill     | tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | +| AlexandruSmirnov
    AlexandruSmirnov     | nevermorec
    nevermorec     | PretzelVector
    PretzelVector     | zetaloop
    zetaloop     | cdlliuy
    cdlliuy     | user202729
    user202729     | +| takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | shaybc
    shaybc     | +| sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | +| philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | +| mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | lhish
    lhish     | kohii
    kohii     | +| kinandan
    kinandan     | jwcraig
    jwcraig     | jues
    jues     | DeXtroTip
    DeXtroTip     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | +| celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | +| Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | +| benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | +| alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | +| adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | adambrand
    adambrand     | samsilveira
    samsilveira     | 01Rian
    01Rian     | +| RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | pwilkin
    pwilkin     | Sarke
    Sarke     | +| PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | niteshbalusu11
    niteshbalusu11     | Naam
    Naam     | kvokka
    kvokka     | ecmasx
    ecmasx     | +| mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | +| shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | ksze
    ksze     | AyazKaan
    AyazKaan     | +| Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | | diff --git a/locales/ca/README.md b/locales/ca/README.md index cd38392ab9..a2ba29f1f0 100644 --- a/locales/ca/README.md +++ b/locales/ca/README.md @@ -182,46 +182,46 @@ Gràcies a tots els nostres col·laboradors que han ajudat a millorar Roo Code! -| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | -| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | -| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | -| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | -| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | -| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | -| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | -| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | -| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | -| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | -| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | -| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | -| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | -| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | -| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | -| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | -| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | -| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | -| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | -| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | -| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | -| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | -| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | -| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | -| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | -| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | -| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | -| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | -| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | -| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | -| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | -| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | -| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | -| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | -| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | -| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | -| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | -| DeXtroTip
    DeXtroTip     | | | | | | +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | MuriloFP
    MuriloFP     | ColemanRoo
    ColemanRoo     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | d-oit
    d-oit     | elianiva
    elianiva     | qdaxb
    qdaxb     | xyOz-dev
    xyOz-dev     | punkpeye
    punkpeye     | +| wkordalski
    wkordalski     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | NaccOll
    NaccOll     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | +| afshawnlotfi
    afshawnlotfi     | dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | +| emshvac
    emshvac     | brunobergher
    brunobergher     | Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | +| dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | +| p12tic
    p12tic     | gtaylor
    gtaylor     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | +| taisukeoe
    taisukeoe     | avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | +| teddyOOXX
    teddyOOXX     | thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | +| franekp
    franekp     | yt3trees
    yt3trees     | seedlord
    seedlord     | bramburn
    bramburn     | anton-otee
    anton-otee     | benzntech
    benzntech     | +| axkirillov
    axkirillov     | olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | +| jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | SplittyDev
    SplittyDev     | +| mdp
    mdp     | napter
    napter     | philfung
    philfung     | axmo
    axmo     | bannzai
    bannzai     | bbenshalom
    bbenshalom     | +| chris-garrett
    chris-garrett     | dairui1
    dairui1     | dqroid
    dqroid     | ershang-fireworks
    ershang-fireworks     | janaki-sasidhar
    janaki-sasidhar     | forestyoo
    forestyoo     | +| hatsu38
    hatsu38     | hongzio
    hongzio     | im47cn
    im47cn     | shoopapa
    shoopapa     | asychin
    asychin     | amittell
    amittell     | +| Yoshino-Yukitaro
    Yoshino-Yukitaro     | Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | +| HahaBill
    HahaBill     | tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | +| AlexandruSmirnov
    AlexandruSmirnov     | nevermorec
    nevermorec     | PretzelVector
    PretzelVector     | zetaloop
    zetaloop     | cdlliuy
    cdlliuy     | user202729
    user202729     | +| takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | shaybc
    shaybc     | +| sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | +| philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | +| mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | lhish
    lhish     | kohii
    kohii     | +| kinandan
    kinandan     | jwcraig
    jwcraig     | jues
    jues     | DeXtroTip
    DeXtroTip     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | +| celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | +| Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | +| benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | +| alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | +| adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | adambrand
    adambrand     | samsilveira
    samsilveira     | 01Rian
    01Rian     | +| RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | pwilkin
    pwilkin     | Sarke
    Sarke     | +| PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | niteshbalusu11
    niteshbalusu11     | Naam
    Naam     | kvokka
    kvokka     | ecmasx
    ecmasx     | +| mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | +| shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | ksze
    ksze     | AyazKaan
    AyazKaan     | +| Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | | diff --git a/locales/de/README.md b/locales/de/README.md index e25e161e8a..296f5d45da 100644 --- a/locales/de/README.md +++ b/locales/de/README.md @@ -182,46 +182,46 @@ Danke an alle unsere Mitwirkenden, die geholfen haben, Roo Code zu verbessern! -| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | -| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | -| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | -| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | -| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | -| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | -| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | -| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | -| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | -| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | -| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | -| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | -| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | -| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | -| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | -| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | -| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | -| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | -| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | -| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | -| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | -| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | -| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | -| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | -| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | -| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | -| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | -| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | -| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | -| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | -| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | -| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | -| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | -| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | -| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | -| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | -| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | -| DeXtroTip
    DeXtroTip     | | | | | | +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | MuriloFP
    MuriloFP     | ColemanRoo
    ColemanRoo     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | d-oit
    d-oit     | elianiva
    elianiva     | qdaxb
    qdaxb     | xyOz-dev
    xyOz-dev     | punkpeye
    punkpeye     | +| wkordalski
    wkordalski     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | NaccOll
    NaccOll     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | +| afshawnlotfi
    afshawnlotfi     | dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | +| emshvac
    emshvac     | brunobergher
    brunobergher     | Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | +| dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | +| p12tic
    p12tic     | gtaylor
    gtaylor     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | +| taisukeoe
    taisukeoe     | avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | +| teddyOOXX
    teddyOOXX     | thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | +| franekp
    franekp     | yt3trees
    yt3trees     | seedlord
    seedlord     | bramburn
    bramburn     | anton-otee
    anton-otee     | benzntech
    benzntech     | +| axkirillov
    axkirillov     | olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | +| jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | SplittyDev
    SplittyDev     | +| mdp
    mdp     | napter
    napter     | philfung
    philfung     | axmo
    axmo     | bannzai
    bannzai     | bbenshalom
    bbenshalom     | +| chris-garrett
    chris-garrett     | dairui1
    dairui1     | dqroid
    dqroid     | ershang-fireworks
    ershang-fireworks     | janaki-sasidhar
    janaki-sasidhar     | forestyoo
    forestyoo     | +| hatsu38
    hatsu38     | hongzio
    hongzio     | im47cn
    im47cn     | shoopapa
    shoopapa     | asychin
    asychin     | amittell
    amittell     | +| Yoshino-Yukitaro
    Yoshino-Yukitaro     | Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | +| HahaBill
    HahaBill     | tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | +| AlexandruSmirnov
    AlexandruSmirnov     | nevermorec
    nevermorec     | PretzelVector
    PretzelVector     | zetaloop
    zetaloop     | cdlliuy
    cdlliuy     | user202729
    user202729     | +| takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | shaybc
    shaybc     | +| sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | +| philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | +| mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | lhish
    lhish     | kohii
    kohii     | +| kinandan
    kinandan     | jwcraig
    jwcraig     | jues
    jues     | DeXtroTip
    DeXtroTip     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | +| celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | +| Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | +| benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | +| alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | +| adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | adambrand
    adambrand     | samsilveira
    samsilveira     | 01Rian
    01Rian     | +| RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | pwilkin
    pwilkin     | Sarke
    Sarke     | +| PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | niteshbalusu11
    niteshbalusu11     | Naam
    Naam     | kvokka
    kvokka     | ecmasx
    ecmasx     | +| mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | +| shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | ksze
    ksze     | AyazKaan
    AyazKaan     | +| Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | | diff --git a/locales/es/README.md b/locales/es/README.md index 46b2c71aa2..55e337ce2b 100644 --- a/locales/es/README.md +++ b/locales/es/README.md @@ -182,46 +182,46 @@ Usamos [changesets](https://github.com/changesets/changesets) para versionar y p -| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | -| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | -| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | -| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | -| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | -| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | -| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | -| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | -| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | -| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | -| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | -| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | -| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | -| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | -| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | -| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | -| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | -| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | -| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | -| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | -| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | -| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | -| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | -| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | -| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | -| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | -| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | -| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | -| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | -| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | -| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | -| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | -| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | -| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | -| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | -| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | -| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | -| DeXtroTip
    DeXtroTip     | | | | | | +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | MuriloFP
    MuriloFP     | ColemanRoo
    ColemanRoo     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | d-oit
    d-oit     | elianiva
    elianiva     | qdaxb
    qdaxb     | xyOz-dev
    xyOz-dev     | punkpeye
    punkpeye     | +| wkordalski
    wkordalski     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | NaccOll
    NaccOll     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | +| afshawnlotfi
    afshawnlotfi     | dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | +| emshvac
    emshvac     | brunobergher
    brunobergher     | Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | +| dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | +| p12tic
    p12tic     | gtaylor
    gtaylor     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | +| taisukeoe
    taisukeoe     | avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | +| teddyOOXX
    teddyOOXX     | thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | +| franekp
    franekp     | yt3trees
    yt3trees     | seedlord
    seedlord     | bramburn
    bramburn     | anton-otee
    anton-otee     | benzntech
    benzntech     | +| axkirillov
    axkirillov     | olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | +| jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | SplittyDev
    SplittyDev     | +| mdp
    mdp     | napter
    napter     | philfung
    philfung     | axmo
    axmo     | bannzai
    bannzai     | bbenshalom
    bbenshalom     | +| chris-garrett
    chris-garrett     | dairui1
    dairui1     | dqroid
    dqroid     | ershang-fireworks
    ershang-fireworks     | janaki-sasidhar
    janaki-sasidhar     | forestyoo
    forestyoo     | +| hatsu38
    hatsu38     | hongzio
    hongzio     | im47cn
    im47cn     | shoopapa
    shoopapa     | asychin
    asychin     | amittell
    amittell     | +| Yoshino-Yukitaro
    Yoshino-Yukitaro     | Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | +| HahaBill
    HahaBill     | tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | +| AlexandruSmirnov
    AlexandruSmirnov     | nevermorec
    nevermorec     | PretzelVector
    PretzelVector     | zetaloop
    zetaloop     | cdlliuy
    cdlliuy     | user202729
    user202729     | +| takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | shaybc
    shaybc     | +| sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | +| philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | +| mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | lhish
    lhish     | kohii
    kohii     | +| kinandan
    kinandan     | jwcraig
    jwcraig     | jues
    jues     | DeXtroTip
    DeXtroTip     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | +| celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | +| Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | +| benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | +| alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | +| adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | adambrand
    adambrand     | samsilveira
    samsilveira     | 01Rian
    01Rian     | +| RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | pwilkin
    pwilkin     | Sarke
    Sarke     | +| PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | niteshbalusu11
    niteshbalusu11     | Naam
    Naam     | kvokka
    kvokka     | ecmasx
    ecmasx     | +| mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | +| shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | ksze
    ksze     | AyazKaan
    AyazKaan     | +| Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | | diff --git a/locales/fr/README.md b/locales/fr/README.md index 322553da92..a21af64235 100644 --- a/locales/fr/README.md +++ b/locales/fr/README.md @@ -182,46 +182,46 @@ Merci à tous nos contributeurs qui ont aidé à améliorer Roo Code ! -| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | -| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | -| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | -| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | -| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | -| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | -| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | -| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | -| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | -| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | -| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | -| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | -| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | -| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | -| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | -| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | -| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | -| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | -| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | -| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | -| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | -| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | -| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | -| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | -| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | -| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | -| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | -| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | -| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | -| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | -| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | -| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | -| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | -| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | -| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | -| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | -| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | -| DeXtroTip
    DeXtroTip     | | | | | | +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | MuriloFP
    MuriloFP     | ColemanRoo
    ColemanRoo     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | d-oit
    d-oit     | elianiva
    elianiva     | qdaxb
    qdaxb     | xyOz-dev
    xyOz-dev     | punkpeye
    punkpeye     | +| wkordalski
    wkordalski     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | NaccOll
    NaccOll     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | +| afshawnlotfi
    afshawnlotfi     | dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | +| emshvac
    emshvac     | brunobergher
    brunobergher     | Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | +| dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | +| p12tic
    p12tic     | gtaylor
    gtaylor     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | +| taisukeoe
    taisukeoe     | avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | +| teddyOOXX
    teddyOOXX     | thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | +| franekp
    franekp     | yt3trees
    yt3trees     | seedlord
    seedlord     | bramburn
    bramburn     | anton-otee
    anton-otee     | benzntech
    benzntech     | +| axkirillov
    axkirillov     | olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | +| jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | SplittyDev
    SplittyDev     | +| mdp
    mdp     | napter
    napter     | philfung
    philfung     | axmo
    axmo     | bannzai
    bannzai     | bbenshalom
    bbenshalom     | +| chris-garrett
    chris-garrett     | dairui1
    dairui1     | dqroid
    dqroid     | ershang-fireworks
    ershang-fireworks     | janaki-sasidhar
    janaki-sasidhar     | forestyoo
    forestyoo     | +| hatsu38
    hatsu38     | hongzio
    hongzio     | im47cn
    im47cn     | shoopapa
    shoopapa     | asychin
    asychin     | amittell
    amittell     | +| Yoshino-Yukitaro
    Yoshino-Yukitaro     | Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | +| HahaBill
    HahaBill     | tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | +| AlexandruSmirnov
    AlexandruSmirnov     | nevermorec
    nevermorec     | PretzelVector
    PretzelVector     | zetaloop
    zetaloop     | cdlliuy
    cdlliuy     | user202729
    user202729     | +| takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | shaybc
    shaybc     | +| sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | +| philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | +| mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | lhish
    lhish     | kohii
    kohii     | +| kinandan
    kinandan     | jwcraig
    jwcraig     | jues
    jues     | DeXtroTip
    DeXtroTip     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | +| celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | +| Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | +| benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | +| alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | +| adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | adambrand
    adambrand     | samsilveira
    samsilveira     | 01Rian
    01Rian     | +| RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | pwilkin
    pwilkin     | Sarke
    Sarke     | +| PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | niteshbalusu11
    niteshbalusu11     | Naam
    Naam     | kvokka
    kvokka     | ecmasx
    ecmasx     | +| mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | +| shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | ksze
    ksze     | AyazKaan
    AyazKaan     | +| Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | | diff --git a/locales/hi/README.md b/locales/hi/README.md index 79412b5160..dcbb8dfff5 100644 --- a/locales/hi/README.md +++ b/locales/hi/README.md @@ -182,46 +182,46 @@ Roo Code को बेहतर बनाने में मदद करने -| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | -| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | -| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | -| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | -| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | -| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | -| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | -| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | -| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | -| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | -| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | -| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | -| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | -| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | -| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | -| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | -| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | -| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | -| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | -| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | -| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | -| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | -| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | -| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | -| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | -| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | -| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | -| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | -| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | -| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | -| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | -| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | -| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | -| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | -| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | -| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | -| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | -| DeXtroTip
    DeXtroTip     | | | | | | +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | MuriloFP
    MuriloFP     | ColemanRoo
    ColemanRoo     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | d-oit
    d-oit     | elianiva
    elianiva     | qdaxb
    qdaxb     | xyOz-dev
    xyOz-dev     | punkpeye
    punkpeye     | +| wkordalski
    wkordalski     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | NaccOll
    NaccOll     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | +| afshawnlotfi
    afshawnlotfi     | dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | +| emshvac
    emshvac     | brunobergher
    brunobergher     | Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | +| dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | +| p12tic
    p12tic     | gtaylor
    gtaylor     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | +| taisukeoe
    taisukeoe     | avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | +| teddyOOXX
    teddyOOXX     | thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | +| franekp
    franekp     | yt3trees
    yt3trees     | seedlord
    seedlord     | bramburn
    bramburn     | anton-otee
    anton-otee     | benzntech
    benzntech     | +| axkirillov
    axkirillov     | olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | +| jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | SplittyDev
    SplittyDev     | +| mdp
    mdp     | napter
    napter     | philfung
    philfung     | axmo
    axmo     | bannzai
    bannzai     | bbenshalom
    bbenshalom     | +| chris-garrett
    chris-garrett     | dairui1
    dairui1     | dqroid
    dqroid     | ershang-fireworks
    ershang-fireworks     | janaki-sasidhar
    janaki-sasidhar     | forestyoo
    forestyoo     | +| hatsu38
    hatsu38     | hongzio
    hongzio     | im47cn
    im47cn     | shoopapa
    shoopapa     | asychin
    asychin     | amittell
    amittell     | +| Yoshino-Yukitaro
    Yoshino-Yukitaro     | Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | +| HahaBill
    HahaBill     | tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | +| AlexandruSmirnov
    AlexandruSmirnov     | nevermorec
    nevermorec     | PretzelVector
    PretzelVector     | zetaloop
    zetaloop     | cdlliuy
    cdlliuy     | user202729
    user202729     | +| takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | shaybc
    shaybc     | +| sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | +| philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | +| mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | lhish
    lhish     | kohii
    kohii     | +| kinandan
    kinandan     | jwcraig
    jwcraig     | jues
    jues     | DeXtroTip
    DeXtroTip     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | +| celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | +| Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | +| benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | +| alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | +| adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | adambrand
    adambrand     | samsilveira
    samsilveira     | 01Rian
    01Rian     | +| RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | pwilkin
    pwilkin     | Sarke
    Sarke     | +| PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | niteshbalusu11
    niteshbalusu11     | Naam
    Naam     | kvokka
    kvokka     | ecmasx
    ecmasx     | +| mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | +| shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | ksze
    ksze     | AyazKaan
    AyazKaan     | +| Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | | diff --git a/locales/id/README.md b/locales/id/README.md index 23a241e8e8..fae6572e7b 100644 --- a/locales/id/README.md +++ b/locales/id/README.md @@ -176,46 +176,46 @@ Terima kasih kepada semua kontributor kami yang telah membantu membuat Roo Code -| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | -| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | -| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | -| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | -| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | -| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | -| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | -| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | -| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | -| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | -| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | -| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | -| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | -| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | -| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | -| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | -| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | -| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | -| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | -| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | -| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | -| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | -| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | -| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | -| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | -| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | -| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | -| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | -| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | -| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | -| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | -| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | -| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | -| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | -| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | -| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | -| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | -| DeXtroTip
    DeXtroTip     | | | | | | +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | MuriloFP
    MuriloFP     | ColemanRoo
    ColemanRoo     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | d-oit
    d-oit     | elianiva
    elianiva     | qdaxb
    qdaxb     | xyOz-dev
    xyOz-dev     | punkpeye
    punkpeye     | +| wkordalski
    wkordalski     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | NaccOll
    NaccOll     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | +| afshawnlotfi
    afshawnlotfi     | dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | +| emshvac
    emshvac     | brunobergher
    brunobergher     | Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | +| dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | +| p12tic
    p12tic     | gtaylor
    gtaylor     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | +| taisukeoe
    taisukeoe     | avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | +| teddyOOXX
    teddyOOXX     | thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | +| franekp
    franekp     | yt3trees
    yt3trees     | seedlord
    seedlord     | bramburn
    bramburn     | anton-otee
    anton-otee     | benzntech
    benzntech     | +| axkirillov
    axkirillov     | olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | +| jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | SplittyDev
    SplittyDev     | +| mdp
    mdp     | napter
    napter     | philfung
    philfung     | axmo
    axmo     | bannzai
    bannzai     | bbenshalom
    bbenshalom     | +| chris-garrett
    chris-garrett     | dairui1
    dairui1     | dqroid
    dqroid     | ershang-fireworks
    ershang-fireworks     | janaki-sasidhar
    janaki-sasidhar     | forestyoo
    forestyoo     | +| hatsu38
    hatsu38     | hongzio
    hongzio     | im47cn
    im47cn     | shoopapa
    shoopapa     | asychin
    asychin     | amittell
    amittell     | +| Yoshino-Yukitaro
    Yoshino-Yukitaro     | Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | +| HahaBill
    HahaBill     | tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | +| AlexandruSmirnov
    AlexandruSmirnov     | nevermorec
    nevermorec     | PretzelVector
    PretzelVector     | zetaloop
    zetaloop     | cdlliuy
    cdlliuy     | user202729
    user202729     | +| takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | shaybc
    shaybc     | +| sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | +| philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | +| mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | lhish
    lhish     | kohii
    kohii     | +| kinandan
    kinandan     | jwcraig
    jwcraig     | jues
    jues     | DeXtroTip
    DeXtroTip     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | +| celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | +| Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | +| benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | +| alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | +| adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | adambrand
    adambrand     | samsilveira
    samsilveira     | 01Rian
    01Rian     | +| RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | pwilkin
    pwilkin     | Sarke
    Sarke     | +| PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | niteshbalusu11
    niteshbalusu11     | Naam
    Naam     | kvokka
    kvokka     | ecmasx
    ecmasx     | +| mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | +| shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | ksze
    ksze     | AyazKaan
    AyazKaan     | +| Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | | diff --git a/locales/it/README.md b/locales/it/README.md index 248b23bc13..a9237c46dc 100644 --- a/locales/it/README.md +++ b/locales/it/README.md @@ -182,46 +182,46 @@ Grazie a tutti i nostri contributori che hanno aiutato a migliorare Roo Code! -| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | -| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | -| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | -| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | -| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | -| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | -| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | -| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | -| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | -| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | -| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | -| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | -| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | -| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | -| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | -| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | -| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | -| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | -| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | -| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | -| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | -| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | -| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | -| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | -| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | -| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | -| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | -| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | -| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | -| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | -| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | -| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | -| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | -| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | -| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | -| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | -| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | -| DeXtroTip
    DeXtroTip     | | | | | | +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | MuriloFP
    MuriloFP     | ColemanRoo
    ColemanRoo     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | d-oit
    d-oit     | elianiva
    elianiva     | qdaxb
    qdaxb     | xyOz-dev
    xyOz-dev     | punkpeye
    punkpeye     | +| wkordalski
    wkordalski     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | NaccOll
    NaccOll     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | +| afshawnlotfi
    afshawnlotfi     | dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | +| emshvac
    emshvac     | brunobergher
    brunobergher     | Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | +| dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | +| p12tic
    p12tic     | gtaylor
    gtaylor     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | +| taisukeoe
    taisukeoe     | avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | +| teddyOOXX
    teddyOOXX     | thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | +| franekp
    franekp     | yt3trees
    yt3trees     | seedlord
    seedlord     | bramburn
    bramburn     | anton-otee
    anton-otee     | benzntech
    benzntech     | +| axkirillov
    axkirillov     | olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | +| jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | SplittyDev
    SplittyDev     | +| mdp
    mdp     | napter
    napter     | philfung
    philfung     | axmo
    axmo     | bannzai
    bannzai     | bbenshalom
    bbenshalom     | +| chris-garrett
    chris-garrett     | dairui1
    dairui1     | dqroid
    dqroid     | ershang-fireworks
    ershang-fireworks     | janaki-sasidhar
    janaki-sasidhar     | forestyoo
    forestyoo     | +| hatsu38
    hatsu38     | hongzio
    hongzio     | im47cn
    im47cn     | shoopapa
    shoopapa     | asychin
    asychin     | amittell
    amittell     | +| Yoshino-Yukitaro
    Yoshino-Yukitaro     | Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | +| HahaBill
    HahaBill     | tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | +| AlexandruSmirnov
    AlexandruSmirnov     | nevermorec
    nevermorec     | PretzelVector
    PretzelVector     | zetaloop
    zetaloop     | cdlliuy
    cdlliuy     | user202729
    user202729     | +| takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | shaybc
    shaybc     | +| sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | +| philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | +| mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | lhish
    lhish     | kohii
    kohii     | +| kinandan
    kinandan     | jwcraig
    jwcraig     | jues
    jues     | DeXtroTip
    DeXtroTip     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | +| celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | +| Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | +| benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | +| alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | +| adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | adambrand
    adambrand     | samsilveira
    samsilveira     | 01Rian
    01Rian     | +| RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | pwilkin
    pwilkin     | Sarke
    Sarke     | +| PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | niteshbalusu11
    niteshbalusu11     | Naam
    Naam     | kvokka
    kvokka     | ecmasx
    ecmasx     | +| mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | +| shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | ksze
    ksze     | AyazKaan
    AyazKaan     | +| Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | | diff --git a/locales/ja/README.md b/locales/ja/README.md index a176f59a06..3650f18571 100644 --- a/locales/ja/README.md +++ b/locales/ja/README.md @@ -182,46 +182,46 @@ Roo Codeの改善に貢献してくれたすべての貢献者に感謝します -| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | -| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | -| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | -| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | -| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | -| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | -| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | -| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | -| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | -| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | -| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | -| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | -| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | -| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | -| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | -| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | -| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | -| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | -| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | -| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | -| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | -| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | -| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | -| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | -| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | -| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | -| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | -| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | -| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | -| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | -| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | -| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | -| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | -| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | -| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | -| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | -| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | -| DeXtroTip
    DeXtroTip     | | | | | | +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | MuriloFP
    MuriloFP     | ColemanRoo
    ColemanRoo     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | d-oit
    d-oit     | elianiva
    elianiva     | qdaxb
    qdaxb     | xyOz-dev
    xyOz-dev     | punkpeye
    punkpeye     | +| wkordalski
    wkordalski     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | NaccOll
    NaccOll     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | +| afshawnlotfi
    afshawnlotfi     | dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | +| emshvac
    emshvac     | brunobergher
    brunobergher     | Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | +| dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | +| p12tic
    p12tic     | gtaylor
    gtaylor     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | +| taisukeoe
    taisukeoe     | avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | +| teddyOOXX
    teddyOOXX     | thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | +| franekp
    franekp     | yt3trees
    yt3trees     | seedlord
    seedlord     | bramburn
    bramburn     | anton-otee
    anton-otee     | benzntech
    benzntech     | +| axkirillov
    axkirillov     | olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | +| jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | SplittyDev
    SplittyDev     | +| mdp
    mdp     | napter
    napter     | philfung
    philfung     | axmo
    axmo     | bannzai
    bannzai     | bbenshalom
    bbenshalom     | +| chris-garrett
    chris-garrett     | dairui1
    dairui1     | dqroid
    dqroid     | ershang-fireworks
    ershang-fireworks     | janaki-sasidhar
    janaki-sasidhar     | forestyoo
    forestyoo     | +| hatsu38
    hatsu38     | hongzio
    hongzio     | im47cn
    im47cn     | shoopapa
    shoopapa     | asychin
    asychin     | amittell
    amittell     | +| Yoshino-Yukitaro
    Yoshino-Yukitaro     | Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | +| HahaBill
    HahaBill     | tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | +| AlexandruSmirnov
    AlexandruSmirnov     | nevermorec
    nevermorec     | PretzelVector
    PretzelVector     | zetaloop
    zetaloop     | cdlliuy
    cdlliuy     | user202729
    user202729     | +| takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | shaybc
    shaybc     | +| sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | +| philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | +| mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | lhish
    lhish     | kohii
    kohii     | +| kinandan
    kinandan     | jwcraig
    jwcraig     | jues
    jues     | DeXtroTip
    DeXtroTip     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | +| celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | +| Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | +| benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | +| alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | +| adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | adambrand
    adambrand     | samsilveira
    samsilveira     | 01Rian
    01Rian     | +| RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | pwilkin
    pwilkin     | Sarke
    Sarke     | +| PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | niteshbalusu11
    niteshbalusu11     | Naam
    Naam     | kvokka
    kvokka     | ecmasx
    ecmasx     | +| mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | +| shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | ksze
    ksze     | AyazKaan
    AyazKaan     | +| Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | | diff --git a/locales/ko/README.md b/locales/ko/README.md index 3533175c2c..d5f26d1f4e 100644 --- a/locales/ko/README.md +++ b/locales/ko/README.md @@ -182,46 +182,46 @@ Roo Code를 더 좋게 만드는 데 도움을 준 모든 기여자에게 감사 -| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | -| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | -| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | -| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | -| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | -| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | -| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | -| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | -| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | -| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | -| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | -| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | -| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | -| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | -| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | -| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | -| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | -| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | -| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | -| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | -| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | -| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | -| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | -| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | -| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | -| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | -| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | -| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | -| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | -| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | -| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | -| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | -| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | -| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | -| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | -| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | -| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | -| DeXtroTip
    DeXtroTip     | | | | | | +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | MuriloFP
    MuriloFP     | ColemanRoo
    ColemanRoo     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | d-oit
    d-oit     | elianiva
    elianiva     | qdaxb
    qdaxb     | xyOz-dev
    xyOz-dev     | punkpeye
    punkpeye     | +| wkordalski
    wkordalski     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | NaccOll
    NaccOll     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | +| afshawnlotfi
    afshawnlotfi     | dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | +| emshvac
    emshvac     | brunobergher
    brunobergher     | Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | +| dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | +| p12tic
    p12tic     | gtaylor
    gtaylor     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | +| taisukeoe
    taisukeoe     | avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | +| teddyOOXX
    teddyOOXX     | thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | +| franekp
    franekp     | yt3trees
    yt3trees     | seedlord
    seedlord     | bramburn
    bramburn     | anton-otee
    anton-otee     | benzntech
    benzntech     | +| axkirillov
    axkirillov     | olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | +| jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | SplittyDev
    SplittyDev     | +| mdp
    mdp     | napter
    napter     | philfung
    philfung     | axmo
    axmo     | bannzai
    bannzai     | bbenshalom
    bbenshalom     | +| chris-garrett
    chris-garrett     | dairui1
    dairui1     | dqroid
    dqroid     | ershang-fireworks
    ershang-fireworks     | janaki-sasidhar
    janaki-sasidhar     | forestyoo
    forestyoo     | +| hatsu38
    hatsu38     | hongzio
    hongzio     | im47cn
    im47cn     | shoopapa
    shoopapa     | asychin
    asychin     | amittell
    amittell     | +| Yoshino-Yukitaro
    Yoshino-Yukitaro     | Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | +| HahaBill
    HahaBill     | tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | +| AlexandruSmirnov
    AlexandruSmirnov     | nevermorec
    nevermorec     | PretzelVector
    PretzelVector     | zetaloop
    zetaloop     | cdlliuy
    cdlliuy     | user202729
    user202729     | +| takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | shaybc
    shaybc     | +| sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | +| philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | +| mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | lhish
    lhish     | kohii
    kohii     | +| kinandan
    kinandan     | jwcraig
    jwcraig     | jues
    jues     | DeXtroTip
    DeXtroTip     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | +| celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | +| Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | +| benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | +| alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | +| adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | adambrand
    adambrand     | samsilveira
    samsilveira     | 01Rian
    01Rian     | +| RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | pwilkin
    pwilkin     | Sarke
    Sarke     | +| PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | niteshbalusu11
    niteshbalusu11     | Naam
    Naam     | kvokka
    kvokka     | ecmasx
    ecmasx     | +| mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | +| shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | ksze
    ksze     | AyazKaan
    AyazKaan     | +| Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | | diff --git a/locales/nl/README.md b/locales/nl/README.md index 224d793fae..a167b102fb 100644 --- a/locales/nl/README.md +++ b/locales/nl/README.md @@ -182,46 +182,46 @@ Dank aan alle bijdragers die Roo Code beter hebben gemaakt! -| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | -| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | -| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | -| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | -| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | -| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | -| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | -| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | -| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | -| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | -| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | -| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | -| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | -| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | -| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | -| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | -| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | -| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | -| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | -| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | -| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | -| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | -| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | -| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | -| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | -| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | -| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | -| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | -| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | -| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | -| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | -| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | -| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | -| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | -| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | -| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | -| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | -| DeXtroTip
    DeXtroTip     | | | | | | +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | MuriloFP
    MuriloFP     | ColemanRoo
    ColemanRoo     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | d-oit
    d-oit     | elianiva
    elianiva     | qdaxb
    qdaxb     | xyOz-dev
    xyOz-dev     | punkpeye
    punkpeye     | +| wkordalski
    wkordalski     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | NaccOll
    NaccOll     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | +| afshawnlotfi
    afshawnlotfi     | dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | +| emshvac
    emshvac     | brunobergher
    brunobergher     | Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | +| dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | +| p12tic
    p12tic     | gtaylor
    gtaylor     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | +| taisukeoe
    taisukeoe     | avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | +| teddyOOXX
    teddyOOXX     | thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | +| franekp
    franekp     | yt3trees
    yt3trees     | seedlord
    seedlord     | bramburn
    bramburn     | anton-otee
    anton-otee     | benzntech
    benzntech     | +| axkirillov
    axkirillov     | olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | +| jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | SplittyDev
    SplittyDev     | +| mdp
    mdp     | napter
    napter     | philfung
    philfung     | axmo
    axmo     | bannzai
    bannzai     | bbenshalom
    bbenshalom     | +| chris-garrett
    chris-garrett     | dairui1
    dairui1     | dqroid
    dqroid     | ershang-fireworks
    ershang-fireworks     | janaki-sasidhar
    janaki-sasidhar     | forestyoo
    forestyoo     | +| hatsu38
    hatsu38     | hongzio
    hongzio     | im47cn
    im47cn     | shoopapa
    shoopapa     | asychin
    asychin     | amittell
    amittell     | +| Yoshino-Yukitaro
    Yoshino-Yukitaro     | Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | +| HahaBill
    HahaBill     | tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | +| AlexandruSmirnov
    AlexandruSmirnov     | nevermorec
    nevermorec     | PretzelVector
    PretzelVector     | zetaloop
    zetaloop     | cdlliuy
    cdlliuy     | user202729
    user202729     | +| takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | shaybc
    shaybc     | +| sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | +| philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | +| mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | lhish
    lhish     | kohii
    kohii     | +| kinandan
    kinandan     | jwcraig
    jwcraig     | jues
    jues     | DeXtroTip
    DeXtroTip     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | +| celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | +| Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | +| benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | +| alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | +| adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | adambrand
    adambrand     | samsilveira
    samsilveira     | 01Rian
    01Rian     | +| RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | pwilkin
    pwilkin     | Sarke
    Sarke     | +| PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | niteshbalusu11
    niteshbalusu11     | Naam
    Naam     | kvokka
    kvokka     | ecmasx
    ecmasx     | +| mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | +| shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | ksze
    ksze     | AyazKaan
    AyazKaan     | +| Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | | diff --git a/locales/pl/README.md b/locales/pl/README.md index 6b406f2fb3..f4e67900d6 100644 --- a/locales/pl/README.md +++ b/locales/pl/README.md @@ -182,46 +182,46 @@ Dziękujemy wszystkim naszym współtwórcom, którzy pomogli ulepszyć Roo Code -| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | -| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | -| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | -| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | -| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | -| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | -| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | -| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | -| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | -| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | -| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | -| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | -| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | -| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | -| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | -| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | -| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | -| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | -| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | -| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | -| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | -| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | -| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | -| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | -| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | -| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | -| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | -| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | -| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | -| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | -| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | -| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | -| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | -| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | -| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | -| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | -| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | -| DeXtroTip
    DeXtroTip     | | | | | | +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | MuriloFP
    MuriloFP     | ColemanRoo
    ColemanRoo     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | d-oit
    d-oit     | elianiva
    elianiva     | qdaxb
    qdaxb     | xyOz-dev
    xyOz-dev     | punkpeye
    punkpeye     | +| wkordalski
    wkordalski     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | NaccOll
    NaccOll     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | +| afshawnlotfi
    afshawnlotfi     | dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | +| emshvac
    emshvac     | brunobergher
    brunobergher     | Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | +| dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | +| p12tic
    p12tic     | gtaylor
    gtaylor     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | +| taisukeoe
    taisukeoe     | avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | +| teddyOOXX
    teddyOOXX     | thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | +| franekp
    franekp     | yt3trees
    yt3trees     | seedlord
    seedlord     | bramburn
    bramburn     | anton-otee
    anton-otee     | benzntech
    benzntech     | +| axkirillov
    axkirillov     | olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | +| jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | SplittyDev
    SplittyDev     | +| mdp
    mdp     | napter
    napter     | philfung
    philfung     | axmo
    axmo     | bannzai
    bannzai     | bbenshalom
    bbenshalom     | +| chris-garrett
    chris-garrett     | dairui1
    dairui1     | dqroid
    dqroid     | ershang-fireworks
    ershang-fireworks     | janaki-sasidhar
    janaki-sasidhar     | forestyoo
    forestyoo     | +| hatsu38
    hatsu38     | hongzio
    hongzio     | im47cn
    im47cn     | shoopapa
    shoopapa     | asychin
    asychin     | amittell
    amittell     | +| Yoshino-Yukitaro
    Yoshino-Yukitaro     | Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | +| HahaBill
    HahaBill     | tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | +| AlexandruSmirnov
    AlexandruSmirnov     | nevermorec
    nevermorec     | PretzelVector
    PretzelVector     | zetaloop
    zetaloop     | cdlliuy
    cdlliuy     | user202729
    user202729     | +| takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | shaybc
    shaybc     | +| sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | +| philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | +| mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | lhish
    lhish     | kohii
    kohii     | +| kinandan
    kinandan     | jwcraig
    jwcraig     | jues
    jues     | DeXtroTip
    DeXtroTip     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | +| celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | +| Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | +| benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | +| alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | +| adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | adambrand
    adambrand     | samsilveira
    samsilveira     | 01Rian
    01Rian     | +| RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | pwilkin
    pwilkin     | Sarke
    Sarke     | +| PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | niteshbalusu11
    niteshbalusu11     | Naam
    Naam     | kvokka
    kvokka     | ecmasx
    ecmasx     | +| mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | +| shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | ksze
    ksze     | AyazKaan
    AyazKaan     | +| Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | | diff --git a/locales/pt-BR/README.md b/locales/pt-BR/README.md index a1e1adc9c2..3b2042fcc1 100644 --- a/locales/pt-BR/README.md +++ b/locales/pt-BR/README.md @@ -182,46 +182,46 @@ Obrigado a todos os nossos contribuidores que ajudaram a tornar o Roo Code melho -| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | -| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | -| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | -| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | -| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | -| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | -| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | -| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | -| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | -| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | -| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | -| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | -| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | -| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | -| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | -| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | -| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | -| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | -| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | -| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | -| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | -| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | -| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | -| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | -| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | -| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | -| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | -| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | -| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | -| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | -| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | -| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | -| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | -| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | -| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | -| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | -| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | -| DeXtroTip
    DeXtroTip     | | | | | | +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | MuriloFP
    MuriloFP     | ColemanRoo
    ColemanRoo     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | d-oit
    d-oit     | elianiva
    elianiva     | qdaxb
    qdaxb     | xyOz-dev
    xyOz-dev     | punkpeye
    punkpeye     | +| wkordalski
    wkordalski     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | NaccOll
    NaccOll     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | +| afshawnlotfi
    afshawnlotfi     | dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | +| emshvac
    emshvac     | brunobergher
    brunobergher     | Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | +| dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | +| p12tic
    p12tic     | gtaylor
    gtaylor     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | +| taisukeoe
    taisukeoe     | avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | +| teddyOOXX
    teddyOOXX     | thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | +| franekp
    franekp     | yt3trees
    yt3trees     | seedlord
    seedlord     | bramburn
    bramburn     | anton-otee
    anton-otee     | benzntech
    benzntech     | +| axkirillov
    axkirillov     | olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | +| jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | SplittyDev
    SplittyDev     | +| mdp
    mdp     | napter
    napter     | philfung
    philfung     | axmo
    axmo     | bannzai
    bannzai     | bbenshalom
    bbenshalom     | +| chris-garrett
    chris-garrett     | dairui1
    dairui1     | dqroid
    dqroid     | ershang-fireworks
    ershang-fireworks     | janaki-sasidhar
    janaki-sasidhar     | forestyoo
    forestyoo     | +| hatsu38
    hatsu38     | hongzio
    hongzio     | im47cn
    im47cn     | shoopapa
    shoopapa     | asychin
    asychin     | amittell
    amittell     | +| Yoshino-Yukitaro
    Yoshino-Yukitaro     | Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | +| HahaBill
    HahaBill     | tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | +| AlexandruSmirnov
    AlexandruSmirnov     | nevermorec
    nevermorec     | PretzelVector
    PretzelVector     | zetaloop
    zetaloop     | cdlliuy
    cdlliuy     | user202729
    user202729     | +| takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | shaybc
    shaybc     | +| sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | +| philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | +| mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | lhish
    lhish     | kohii
    kohii     | +| kinandan
    kinandan     | jwcraig
    jwcraig     | jues
    jues     | DeXtroTip
    DeXtroTip     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | +| celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | +| Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | +| benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | +| alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | +| adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | adambrand
    adambrand     | samsilveira
    samsilveira     | 01Rian
    01Rian     | +| RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | pwilkin
    pwilkin     | Sarke
    Sarke     | +| PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | niteshbalusu11
    niteshbalusu11     | Naam
    Naam     | kvokka
    kvokka     | ecmasx
    ecmasx     | +| mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | +| shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | ksze
    ksze     | AyazKaan
    AyazKaan     | +| Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | | diff --git a/locales/ru/README.md b/locales/ru/README.md index 11b34b0def..cfa3a843ef 100644 --- a/locales/ru/README.md +++ b/locales/ru/README.md @@ -182,46 +182,46 @@ code --install-extension bin/roo-cline-.vsix -| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | -| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | -| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | -| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | -| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | -| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | -| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | -| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | -| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | -| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | -| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | -| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | -| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | -| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | -| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | -| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | -| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | -| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | -| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | -| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | -| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | -| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | -| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | -| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | -| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | -| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | -| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | -| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | -| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | -| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | -| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | -| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | -| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | -| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | -| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | -| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | -| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | -| DeXtroTip
    DeXtroTip     | | | | | | +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | MuriloFP
    MuriloFP     | ColemanRoo
    ColemanRoo     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | d-oit
    d-oit     | elianiva
    elianiva     | qdaxb
    qdaxb     | xyOz-dev
    xyOz-dev     | punkpeye
    punkpeye     | +| wkordalski
    wkordalski     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | NaccOll
    NaccOll     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | +| afshawnlotfi
    afshawnlotfi     | dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | +| emshvac
    emshvac     | brunobergher
    brunobergher     | Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | +| dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | +| p12tic
    p12tic     | gtaylor
    gtaylor     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | +| taisukeoe
    taisukeoe     | avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | +| teddyOOXX
    teddyOOXX     | thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | +| franekp
    franekp     | yt3trees
    yt3trees     | seedlord
    seedlord     | bramburn
    bramburn     | anton-otee
    anton-otee     | benzntech
    benzntech     | +| axkirillov
    axkirillov     | olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | +| jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | SplittyDev
    SplittyDev     | +| mdp
    mdp     | napter
    napter     | philfung
    philfung     | axmo
    axmo     | bannzai
    bannzai     | bbenshalom
    bbenshalom     | +| chris-garrett
    chris-garrett     | dairui1
    dairui1     | dqroid
    dqroid     | ershang-fireworks
    ershang-fireworks     | janaki-sasidhar
    janaki-sasidhar     | forestyoo
    forestyoo     | +| hatsu38
    hatsu38     | hongzio
    hongzio     | im47cn
    im47cn     | shoopapa
    shoopapa     | asychin
    asychin     | amittell
    amittell     | +| Yoshino-Yukitaro
    Yoshino-Yukitaro     | Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | +| HahaBill
    HahaBill     | tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | +| AlexandruSmirnov
    AlexandruSmirnov     | nevermorec
    nevermorec     | PretzelVector
    PretzelVector     | zetaloop
    zetaloop     | cdlliuy
    cdlliuy     | user202729
    user202729     | +| takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | shaybc
    shaybc     | +| sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | +| philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | +| mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | lhish
    lhish     | kohii
    kohii     | +| kinandan
    kinandan     | jwcraig
    jwcraig     | jues
    jues     | DeXtroTip
    DeXtroTip     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | +| celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | +| Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | +| benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | +| alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | +| adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | adambrand
    adambrand     | samsilveira
    samsilveira     | 01Rian
    01Rian     | +| RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | pwilkin
    pwilkin     | Sarke
    Sarke     | +| PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | niteshbalusu11
    niteshbalusu11     | Naam
    Naam     | kvokka
    kvokka     | ecmasx
    ecmasx     | +| mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | +| shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | ksze
    ksze     | AyazKaan
    AyazKaan     | +| Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | | diff --git a/locales/tr/README.md b/locales/tr/README.md index e8de93840a..ed099e92c7 100644 --- a/locales/tr/README.md +++ b/locales/tr/README.md @@ -182,46 +182,46 @@ Roo Code'u daha iyi hale getirmeye yardımcı olan tüm katkıda bulunanlara te -| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | -| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | -| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | -| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | -| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | -| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | -| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | -| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | -| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | -| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | -| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | -| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | -| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | -| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | -| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | -| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | -| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | -| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | -| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | -| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | -| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | -| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | -| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | -| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | -| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | -| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | -| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | -| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | -| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | -| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | -| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | -| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | -| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | -| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | -| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | -| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | -| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | -| DeXtroTip
    DeXtroTip     | | | | | | +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | MuriloFP
    MuriloFP     | ColemanRoo
    ColemanRoo     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | d-oit
    d-oit     | elianiva
    elianiva     | qdaxb
    qdaxb     | xyOz-dev
    xyOz-dev     | punkpeye
    punkpeye     | +| wkordalski
    wkordalski     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | NaccOll
    NaccOll     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | +| afshawnlotfi
    afshawnlotfi     | dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | +| emshvac
    emshvac     | brunobergher
    brunobergher     | Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | +| dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | +| p12tic
    p12tic     | gtaylor
    gtaylor     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | +| taisukeoe
    taisukeoe     | avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | +| teddyOOXX
    teddyOOXX     | thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | +| franekp
    franekp     | yt3trees
    yt3trees     | seedlord
    seedlord     | bramburn
    bramburn     | anton-otee
    anton-otee     | benzntech
    benzntech     | +| axkirillov
    axkirillov     | olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | +| jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | SplittyDev
    SplittyDev     | +| mdp
    mdp     | napter
    napter     | philfung
    philfung     | axmo
    axmo     | bannzai
    bannzai     | bbenshalom
    bbenshalom     | +| chris-garrett
    chris-garrett     | dairui1
    dairui1     | dqroid
    dqroid     | ershang-fireworks
    ershang-fireworks     | janaki-sasidhar
    janaki-sasidhar     | forestyoo
    forestyoo     | +| hatsu38
    hatsu38     | hongzio
    hongzio     | im47cn
    im47cn     | shoopapa
    shoopapa     | asychin
    asychin     | amittell
    amittell     | +| Yoshino-Yukitaro
    Yoshino-Yukitaro     | Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | +| HahaBill
    HahaBill     | tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | +| AlexandruSmirnov
    AlexandruSmirnov     | nevermorec
    nevermorec     | PretzelVector
    PretzelVector     | zetaloop
    zetaloop     | cdlliuy
    cdlliuy     | user202729
    user202729     | +| takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | shaybc
    shaybc     | +| sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | +| philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | +| mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | lhish
    lhish     | kohii
    kohii     | +| kinandan
    kinandan     | jwcraig
    jwcraig     | jues
    jues     | DeXtroTip
    DeXtroTip     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | +| celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | +| Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | +| benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | +| alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | +| adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | adambrand
    adambrand     | samsilveira
    samsilveira     | 01Rian
    01Rian     | +| RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | pwilkin
    pwilkin     | Sarke
    Sarke     | +| PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | niteshbalusu11
    niteshbalusu11     | Naam
    Naam     | kvokka
    kvokka     | ecmasx
    ecmasx     | +| mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | +| shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | ksze
    ksze     | AyazKaan
    AyazKaan     | +| Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | | diff --git a/locales/vi/README.md b/locales/vi/README.md index e638ad9ed9..0c37d84ce8 100644 --- a/locales/vi/README.md +++ b/locales/vi/README.md @@ -182,46 +182,46 @@ Cảm ơn tất cả những người đóng góp đã giúp cải thiện Roo C -| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | -| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | -| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | -| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | -| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | -| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | -| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | -| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | -| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | -| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | -| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | -| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | -| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | -| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | -| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | -| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | -| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | -| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | -| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | -| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | -| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | -| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | -| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | -| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | -| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | -| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | -| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | -| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | -| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | -| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | -| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | -| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | -| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | -| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | -| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | -| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | -| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | -| DeXtroTip
    DeXtroTip     | | | | | | +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | MuriloFP
    MuriloFP     | ColemanRoo
    ColemanRoo     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | d-oit
    d-oit     | elianiva
    elianiva     | qdaxb
    qdaxb     | xyOz-dev
    xyOz-dev     | punkpeye
    punkpeye     | +| wkordalski
    wkordalski     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | NaccOll
    NaccOll     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | +| afshawnlotfi
    afshawnlotfi     | dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | +| emshvac
    emshvac     | brunobergher
    brunobergher     | Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | +| dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | +| p12tic
    p12tic     | gtaylor
    gtaylor     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | +| taisukeoe
    taisukeoe     | avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | +| teddyOOXX
    teddyOOXX     | thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | +| franekp
    franekp     | yt3trees
    yt3trees     | seedlord
    seedlord     | bramburn
    bramburn     | anton-otee
    anton-otee     | benzntech
    benzntech     | +| axkirillov
    axkirillov     | olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | +| jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | SplittyDev
    SplittyDev     | +| mdp
    mdp     | napter
    napter     | philfung
    philfung     | axmo
    axmo     | bannzai
    bannzai     | bbenshalom
    bbenshalom     | +| chris-garrett
    chris-garrett     | dairui1
    dairui1     | dqroid
    dqroid     | ershang-fireworks
    ershang-fireworks     | janaki-sasidhar
    janaki-sasidhar     | forestyoo
    forestyoo     | +| hatsu38
    hatsu38     | hongzio
    hongzio     | im47cn
    im47cn     | shoopapa
    shoopapa     | asychin
    asychin     | amittell
    amittell     | +| Yoshino-Yukitaro
    Yoshino-Yukitaro     | Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | +| HahaBill
    HahaBill     | tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | +| AlexandruSmirnov
    AlexandruSmirnov     | nevermorec
    nevermorec     | PretzelVector
    PretzelVector     | zetaloop
    zetaloop     | cdlliuy
    cdlliuy     | user202729
    user202729     | +| takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | shaybc
    shaybc     | +| sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | +| philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | +| mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | lhish
    lhish     | kohii
    kohii     | +| kinandan
    kinandan     | jwcraig
    jwcraig     | jues
    jues     | DeXtroTip
    DeXtroTip     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | +| celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | +| Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | +| benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | +| alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | +| adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | adambrand
    adambrand     | samsilveira
    samsilveira     | 01Rian
    01Rian     | +| RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | pwilkin
    pwilkin     | Sarke
    Sarke     | +| PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | niteshbalusu11
    niteshbalusu11     | Naam
    Naam     | kvokka
    kvokka     | ecmasx
    ecmasx     | +| mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | +| shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | ksze
    ksze     | AyazKaan
    AyazKaan     | +| Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | | diff --git a/locales/zh-CN/README.md b/locales/zh-CN/README.md index c357522763..d308eb0304 100644 --- a/locales/zh-CN/README.md +++ b/locales/zh-CN/README.md @@ -182,46 +182,46 @@ code --install-extension bin/roo-cline-.vsix -| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | -| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | -| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | -| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | -| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | -| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | -| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | -| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | -| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | -| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | -| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | -| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | -| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | -| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | -| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | -| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | -| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | -| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | -| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | -| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | -| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | -| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | -| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | -| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | -| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | -| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | -| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | -| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | -| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | -| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | -| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | -| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | -| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | -| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | -| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | -| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | -| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | -| DeXtroTip
    DeXtroTip     | | | | | | +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | MuriloFP
    MuriloFP     | ColemanRoo
    ColemanRoo     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | d-oit
    d-oit     | elianiva
    elianiva     | qdaxb
    qdaxb     | xyOz-dev
    xyOz-dev     | punkpeye
    punkpeye     | +| wkordalski
    wkordalski     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | NaccOll
    NaccOll     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | +| afshawnlotfi
    afshawnlotfi     | dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | +| emshvac
    emshvac     | brunobergher
    brunobergher     | Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | +| dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | +| p12tic
    p12tic     | gtaylor
    gtaylor     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | +| taisukeoe
    taisukeoe     | avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | +| teddyOOXX
    teddyOOXX     | thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | +| franekp
    franekp     | yt3trees
    yt3trees     | seedlord
    seedlord     | bramburn
    bramburn     | anton-otee
    anton-otee     | benzntech
    benzntech     | +| axkirillov
    axkirillov     | olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | +| jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | SplittyDev
    SplittyDev     | +| mdp
    mdp     | napter
    napter     | philfung
    philfung     | axmo
    axmo     | bannzai
    bannzai     | bbenshalom
    bbenshalom     | +| chris-garrett
    chris-garrett     | dairui1
    dairui1     | dqroid
    dqroid     | ershang-fireworks
    ershang-fireworks     | janaki-sasidhar
    janaki-sasidhar     | forestyoo
    forestyoo     | +| hatsu38
    hatsu38     | hongzio
    hongzio     | im47cn
    im47cn     | shoopapa
    shoopapa     | asychin
    asychin     | amittell
    amittell     | +| Yoshino-Yukitaro
    Yoshino-Yukitaro     | Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | +| HahaBill
    HahaBill     | tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | +| AlexandruSmirnov
    AlexandruSmirnov     | nevermorec
    nevermorec     | PretzelVector
    PretzelVector     | zetaloop
    zetaloop     | cdlliuy
    cdlliuy     | user202729
    user202729     | +| takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | shaybc
    shaybc     | +| sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | +| philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | +| mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | lhish
    lhish     | kohii
    kohii     | +| kinandan
    kinandan     | jwcraig
    jwcraig     | jues
    jues     | DeXtroTip
    DeXtroTip     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | +| celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | +| Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | +| benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | +| alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | +| adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | adambrand
    adambrand     | samsilveira
    samsilveira     | 01Rian
    01Rian     | +| RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | pwilkin
    pwilkin     | Sarke
    Sarke     | +| PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | niteshbalusu11
    niteshbalusu11     | Naam
    Naam     | kvokka
    kvokka     | ecmasx
    ecmasx     | +| mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | +| shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | ksze
    ksze     | AyazKaan
    AyazKaan     | +| Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | | diff --git a/locales/zh-TW/README.md b/locales/zh-TW/README.md index 8e9cd5a0cc..9767d316ed 100644 --- a/locales/zh-TW/README.md +++ b/locales/zh-TW/README.md @@ -183,46 +183,46 @@ code --install-extension bin/roo-cline-.vsix -| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | -| :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | ColemanRoo
    ColemanRoo     | MuriloFP
    MuriloFP     | canrobins13
    canrobins13     | stea9499
    stea9499     | -| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | -| NyxJae
    NyxJae     | elianiva
    elianiva     | d-oit
    d-oit     | punkpeye
    punkpeye     | wkordalski
    wkordalski     | qdaxb
    qdaxb     | -| xyOz-dev
    xyOz-dev     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | -| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | -| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | -| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | -| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | afshawnlotfi
    afshawnlotfi     | -| dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | emshvac
    emshvac     | -| Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | -| upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | p12tic
    p12tic     | gtaylor
    gtaylor     | -| brunobergher
    brunobergher     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | taisukeoe
    taisukeoe     | -| avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | teddyOOXX
    teddyOOXX     | -| thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | franekp
    franekp     | -| yt3trees
    yt3trees     | seedlord
    seedlord     | axkirillov
    axkirillov     | anton-otee
    anton-otee     | benzntech
    benzntech     | bramburn
    bramburn     | -| olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | philfung
    philfung     | -| napter
    napter     | mdp
    mdp     | SplittyDev
    SplittyDev     | jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | -| KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | cdlliuy
    cdlliuy     | im47cn
    im47cn     | hongzio
    hongzio     | hatsu38
    hatsu38     | -| forestyoo
    forestyoo     | janaki-sasidhar
    janaki-sasidhar     | dqroid
    dqroid     | dairui1
    dairui1     | chris-garrett
    chris-garrett     | bbenshalom
    bbenshalom     | -| bannzai
    bannzai     | axmo
    axmo     | asychin
    asychin     | amittell
    amittell     | nevermorec
    nevermorec     | Yoshino-Yukitaro
    Yoshino-Yukitaro     | -| Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | HahaBill
    HahaBill     | -| tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | AlexandruSmirnov
    AlexandruSmirnov     | -| user202729
    user202729     | takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | -| shaybc
    shaybc     | sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | zetaloop
    zetaloop     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | -| qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | -| mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | -| lhish
    lhish     | kohii
    kohii     | PretzelVector
    PretzelVector     | kinandan
    kinandan     | jwcraig
    jwcraig     | shoopapa
    shoopapa     | -| samsilveira
    samsilveira     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | -| EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | -| chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | -| AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | -| alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | -| adambrand
    adambrand     | 01Rian
    01Rian     | RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | -| pwilkin
    pwilkin     | Sarke
    Sarke     | PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | Naam
    Naam     | NaccOll
    NaccOll     | -| kvokka
    kvokka     | ecmasx
    ecmasx     | mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | -| monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | -| ksze
    ksze     | Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | -| DeXtroTip
    DeXtroTip     | | | | | | +| mrubens
    mrubens     | saoudrizwan
    saoudrizwan     | cte
    cte     | daniel-lxs
    daniel-lxs     | samhvw8
    samhvw8     | hannesrudolph
    hannesrudolph     | +| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| KJ7LNW
    KJ7LNW     | a8trejo
    a8trejo     | MuriloFP
    MuriloFP     | ColemanRoo
    ColemanRoo     | canrobins13
    canrobins13     | stea9499
    stea9499     | +| joemanley201
    joemanley201     | jr
    jr     | System233
    System233     | nissa-seru
    nissa-seru     | jquanton
    jquanton     | roomote-agent
    roomote-agent     | +| NyxJae
    NyxJae     | d-oit
    d-oit     | elianiva
    elianiva     | qdaxb
    qdaxb     | xyOz-dev
    xyOz-dev     | punkpeye
    punkpeye     | +| wkordalski
    wkordalski     | chrarnoldus
    chrarnoldus     | SannidhyaSah
    SannidhyaSah     | sachasayan
    sachasayan     | Smartsheet-JB-Brown
    Smartsheet-JB-Brown     | monotykamary
    monotykamary     | +| cannuri
    cannuri     | feifei325
    feifei325     | zhangtony239
    zhangtony239     | shariqriazz
    shariqriazz     | vigneshsubbiah16
    vigneshsubbiah16     | pugazhendhi-m
    pugazhendhi-m     | +| lloydchang
    lloydchang     | liwilliam2021
    liwilliam2021     | dtrugman
    dtrugman     | hassoncs
    hassoncs     | Szpadel
    Szpadel     | lupuletic
    lupuletic     | +| kiwina
    kiwina     | Premshay
    Premshay     | psv2522
    psv2522     | olweraltuve
    olweraltuve     | diarmidmackenzie
    diarmidmackenzie     | ChuKhaLi
    ChuKhaLi     | +| PeterDaveHello
    PeterDaveHello     | aheizi
    aheizi     | NaccOll
    NaccOll     | nbihan-mediware
    nbihan-mediware     | noritaka1166
    noritaka1166     | RaySinner
    RaySinner     | +| afshawnlotfi
    afshawnlotfi     | dleffel
    dleffel     | StevenTCramer
    StevenTCramer     | Ruakij
    Ruakij     | pdecat
    pdecat     | kyle-apex
    kyle-apex     | +| emshvac
    emshvac     | brunobergher
    brunobergher     | Lunchb0ne
    Lunchb0ne     | SmartManoj
    SmartManoj     | vagadiya
    vagadiya     | slytechnical
    slytechnical     | +| dlab-anton
    dlab-anton     | arthurauffray
    arthurauffray     | upamune
    upamune     | NamesMT
    NamesMT     | taylorwilsdon
    taylorwilsdon     | sammcj
    sammcj     | +| p12tic
    p12tic     | gtaylor
    gtaylor     | aitoroses
    aitoroses     | ross
    ross     | mr-ryan-james
    mr-ryan-james     | heyseth
    heyseth     | +| taisukeoe
    taisukeoe     | avtc
    avtc     | eonghk
    eonghk     | GOODBOY008
    GOODBOY008     | kcwhite
    kcwhite     | ronyblum
    ronyblum     | +| teddyOOXX
    teddyOOXX     | thill2323
    thill2323     | vincentsong
    vincentsong     | yongjer
    yongjer     | zeozeozeo
    zeozeozeo     | ashktn
    ashktn     | +| franekp
    franekp     | yt3trees
    yt3trees     | seedlord
    seedlord     | bramburn
    bramburn     | anton-otee
    anton-otee     | benzntech
    benzntech     | +| axkirillov
    axkirillov     | olearycrew
    olearycrew     | catrielmuller
    catrielmuller     | devxpain
    devxpain     | snoyiatk
    snoyiatk     | GitlyHallows
    GitlyHallows     | +| jcbdev
    jcbdev     | Chenjiayuan195
    Chenjiayuan195     | julionav
    julionav     | KanTakahiro
    KanTakahiro     | kevint-cerebras
    kevint-cerebras     | SplittyDev
    SplittyDev     | +| mdp
    mdp     | napter
    napter     | philfung
    philfung     | axmo
    axmo     | bannzai
    bannzai     | bbenshalom
    bbenshalom     | +| chris-garrett
    chris-garrett     | dairui1
    dairui1     | dqroid
    dqroid     | ershang-fireworks
    ershang-fireworks     | janaki-sasidhar
    janaki-sasidhar     | forestyoo
    forestyoo     | +| hatsu38
    hatsu38     | hongzio
    hongzio     | im47cn
    im47cn     | shoopapa
    shoopapa     | asychin
    asychin     | amittell
    amittell     | +| Yoshino-Yukitaro
    Yoshino-Yukitaro     | Yikai-Liao
    Yikai-Liao     | zxdvd
    zxdvd     | s97712
    s97712     | vladstudio
    vladstudio     | vivekfyi
    vivekfyi     | +| HahaBill
    HahaBill     | tmsjngx0
    tmsjngx0     | TGlide
    TGlide     | Githubguy132010
    Githubguy132010     | tgfjt
    tgfjt     | maekawataiki
    maekawataiki     | +| AlexandruSmirnov
    AlexandruSmirnov     | nevermorec
    nevermorec     | PretzelVector
    PretzelVector     | zetaloop
    zetaloop     | cdlliuy
    cdlliuy     | user202729
    user202729     | +| takakoutso
    takakoutso     | student20880
    student20880     | shubhamgupta731
    shubhamgupta731     | shohei-ihaya
    shohei-ihaya     | shivamd1810
    shivamd1810     | shaybc
    shaybc     | +| sensei-woo
    sensei-woo     | samir-nimbly
    samir-nimbly     | robertheadley
    robertheadley     | refactorthis
    refactorthis     | qingyuan1109
    qingyuan1109     | pokutuna
    pokutuna     | +| philipnext
    philipnext     | village-way
    village-way     | oprstchn
    oprstchn     | nobu007
    nobu007     | mosleyit
    mosleyit     | moqimoqidea
    moqimoqidea     | +| mlopezr
    mlopezr     | mecab
    mecab     | olup
    olup     | lightrabbit
    lightrabbit     | lhish
    lhish     | kohii
    kohii     | +| kinandan
    kinandan     | jwcraig
    jwcraig     | jues
    jues     | DeXtroTip
    DeXtroTip     | pfitz
    pfitz     | ExactDoug
    ExactDoug     | +| celestial-vault
    celestial-vault     | linegel
    linegel     | edwin-truthsearch-io
    edwin-truthsearch-io     | EamonNerbonne
    EamonNerbonne     | dbasclpy
    dbasclpy     | dflatline
    dflatline     | +| Deon588
    Deon588     | dleen
    dleen     | CW-B-W
    CW-B-W     | chadgauth
    chadgauth     | thecolorblue
    thecolorblue     | bogdan0083
    bogdan0083     | +| benashby
    benashby     | Atlogit
    Atlogit     | atlasgong
    atlasgong     | AntiMoron
    AntiMoron     | andrewshu2000
    andrewshu2000     | andreastempsch
    andreastempsch     | +| alasano
    alasano     | QuinsZouls
    QuinsZouls     | HadesArchitect
    HadesArchitect     | alarno
    alarno     | nexon33
    nexon33     | adilhafeez
    adilhafeez     | +| adamwlarson
    adamwlarson     | adamhill
    adamhill     | AMHesch
    AMHesch     | adambrand
    adambrand     | samsilveira
    samsilveira     | 01Rian
    01Rian     | +| RSO
    RSO     | RandalSchwartz
    RandalSchwartz     | SECKainersdorfer
    SECKainersdorfer     | R-omk
    R-omk     | pwilkin
    pwilkin     | Sarke
    Sarke     | +| PaperBoardOfficial
    PaperBoardOfficial     | OlegOAndreev
    OlegOAndreev     | niteshbalusu11
    niteshbalusu11     | Naam
    Naam     | kvokka
    kvokka     | ecmasx
    ecmasx     | +| mollux
    mollux     | marvijo-code
    marvijo-code     | markijbema
    markijbema     | mamertofabian
    mamertofabian     | monkeyDluffy6017
    monkeyDluffy6017     | libertyteeth
    libertyteeth     | +| shtse8
    shtse8     | Rexarrior
    Rexarrior     | kevinvandijk
    kevinvandijk     | KevinZhao
    KevinZhao     | ksze
    ksze     | AyazKaan
    AyazKaan     | +| Juice10
    Juice10     | snova-jorgep
    snova-jorgep     | Fovty
    Fovty     | Jdo300
    Jdo300     | hesara
    hesara     | | From ad0e33e2d913e94e889a02a19bf2db0cb0db0962 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Aug 2025 17:43:14 -0400 Subject: [PATCH 106/253] Changeset version bump (#6826) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens --- .changeset/v3.25.10.md | 7 ------- CHANGELOG.md | 6 ++++++ src/package.json | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 .changeset/v3.25.10.md diff --git a/.changeset/v3.25.10.md b/.changeset/v3.25.10.md deleted file mode 100644 index 8495e84ec8..0000000000 --- a/.changeset/v3.25.10.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"roo-cline": patch ---- - -- Add support for GPT-5 model (thanks @app/roomote!) -- Fix: Use CDATA sections in XML examples to prevent parser errors (#4852 by @hannesrudolph, PR by @hannesrudolph) -- Fix: Add missing MCP error translation keys (thanks @app/roomote!) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e9b13525f..777d1eab0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Roo Code Changelog +## [3.25.10] - 2025-08-07 + +- Add support for GPT-5 (thanks Cline and @app/roomote!) +- Fix: Use CDATA sections in XML examples to prevent parser errors (#4852 by @hannesrudolph, PR by @hannesrudolph) +- Fix: Add missing MCP error translation keys (thanks @app/roomote!) + ## [3.25.9] - 2025-08-07 - Fix: Resolve rounding issue with max tokens (#6806 by @markp018, PR by @mrubens) diff --git a/src/package.json b/src/package.json index e6564912c4..499cd403ce 100644 --- a/src/package.json +++ b/src/package.json @@ -3,7 +3,7 @@ "displayName": "%extension.displayName%", "description": "%extension.description%", "publisher": "RooVeterinaryInc", - "version": "3.25.9", + "version": "3.25.10", "icon": "assets/icons/icon.png", "galleryBanner": { "color": "#617A91", From 75b861c845ade8bfcc68cab6789961d21e955837 Mon Sep 17 00:00:00 2001 From: Hannes Rudolph Date: Sat, 9 Aug 2025 11:28:05 -0700 Subject: [PATCH 107/253] fix(mcp): Revert changes causing startup issues and remove refresh notifications (#6878) * Revert "fix: prevent unnecessary MCP server refresh on settings save (#6772) (#6779)" This reverts commit 8d05bc179b23445629139fe1654ac008013337da. * fix(mcp): Revert changes causing startup issues and temporarily disable notifications - Reverted PR #6779 which prevented unnecessary MCP server refreshes but caused startup failures - Temporarily disabled MCP notification popups as a stopgap solution - Added TODO comments explaining the temporary nature of disabled notifications - This allows MCP servers to function properly while a more robust solution is developed * test(mcp): restore mcpEnabled toggle coverage to verify delegation to McpHub * refactor(mcp): remove info notifications during refresh; rely on UI indicator --- .../__tests__/webviewMessageHandler.spec.ts | 124 ++---------------- src/core/webview/webviewMessageHandler.ts | 15 +-- src/services/mcp/McpHub.ts | 14 -- 3 files changed, 18 insertions(+), 135 deletions(-) diff --git a/src/core/webview/__tests__/webviewMessageHandler.spec.ts b/src/core/webview/__tests__/webviewMessageHandler.spec.ts index 8e61f3f0d9..7ba7128bb9 100644 --- a/src/core/webview/__tests__/webviewMessageHandler.spec.ts +++ b/src/core/webview/__tests__/webviewMessageHandler.spec.ts @@ -35,7 +35,6 @@ const mockClineProvider = { getCurrentCline: vi.fn(), getTaskWithId: vi.fn(), initClineWithHistoryItem: vi.fn(), - getMcpHub: vi.fn(), } as unknown as ClineProvider import { t } from "../../../i18n" @@ -589,138 +588,43 @@ describe("webviewMessageHandler - mcpEnabled", () => { handleMcpEnabledChange: vi.fn().mockResolvedValue(undefined), } - // Mock the getMcpHub method to return our mock McpHub - mockClineProvider.getMcpHub = vi.fn().mockReturnValue(mockMcpHub) - - // Reset the contextProxy getValue mock - vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(undefined) + // Ensure provider exposes getMcpHub and returns our mock + ;(mockClineProvider as any).getMcpHub = vi.fn().mockReturnValue(mockMcpHub) }) - it("should not refresh MCP servers when value does not change (true to true)", async () => { - // Setup: mcpEnabled is already true - vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(true) - - // Act: Send mcpEnabled message with same value + it("delegates enable=true to McpHub and posts updated state", async () => { await webviewMessageHandler(mockClineProvider, { type: "mcpEnabled", bool: true, }) - // Assert: handleMcpEnabledChange should not be called - expect(mockMcpHub.handleMcpEnabledChange).not.toHaveBeenCalled() - expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("mcpEnabled", true) - expect(mockClineProvider.postStateToWebview).toHaveBeenCalled() - }) - - it("should not refresh MCP servers when value does not change (false to false)", async () => { - // Setup: mcpEnabled is already false - vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(false) - - // Act: Send mcpEnabled message with same value - await webviewMessageHandler(mockClineProvider, { - type: "mcpEnabled", - bool: false, - }) - - // Assert: handleMcpEnabledChange should not be called - expect(mockMcpHub.handleMcpEnabledChange).not.toHaveBeenCalled() - expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("mcpEnabled", false) - expect(mockClineProvider.postStateToWebview).toHaveBeenCalled() - }) - - it("should refresh MCP servers when value changes from true to false", async () => { - // Setup: mcpEnabled is true - vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(true) - - // Act: Send mcpEnabled message with false - await webviewMessageHandler(mockClineProvider, { - type: "mcpEnabled", - bool: false, - }) - - // Assert: handleMcpEnabledChange should be called - expect(mockMcpHub.handleMcpEnabledChange).toHaveBeenCalledWith(false) - expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("mcpEnabled", false) - expect(mockClineProvider.postStateToWebview).toHaveBeenCalled() - }) - - it("should refresh MCP servers when value changes from false to true", async () => { - // Setup: mcpEnabled is false - vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(false) - - // Act: Send mcpEnabled message with true - await webviewMessageHandler(mockClineProvider, { - type: "mcpEnabled", - bool: true, - }) - - // Assert: handleMcpEnabledChange should be called + expect((mockClineProvider as any).getMcpHub).toHaveBeenCalledTimes(1) + expect(mockMcpHub.handleMcpEnabledChange).toHaveBeenCalledTimes(1) expect(mockMcpHub.handleMcpEnabledChange).toHaveBeenCalledWith(true) - expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("mcpEnabled", true) - expect(mockClineProvider.postStateToWebview).toHaveBeenCalled() + expect(mockClineProvider.postStateToWebview).toHaveBeenCalledTimes(1) }) - it("should handle undefined values with defaults correctly", async () => { - // Setup: mcpEnabled is undefined (defaults to true) - vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(undefined) - - // Act: Send mcpEnabled message with undefined (defaults to true) - await webviewMessageHandler(mockClineProvider, { - type: "mcpEnabled", - bool: undefined, - }) - - // Assert: Should use default value (true) and not trigger refresh since both are true - expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("mcpEnabled", true) - expect(mockMcpHub.handleMcpEnabledChange).not.toHaveBeenCalled() - expect(mockClineProvider.postStateToWebview).toHaveBeenCalled() - }) - - it("should handle when mcpEnabled changes from undefined to false", async () => { - // Setup: mcpEnabled is undefined (defaults to true) - vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(undefined) - - // Act: Send mcpEnabled message with false + it("delegates enable=false to McpHub and posts updated state", async () => { await webviewMessageHandler(mockClineProvider, { type: "mcpEnabled", bool: false, }) - // Assert: Should trigger refresh since undefined defaults to true and we're changing to false - expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("mcpEnabled", false) + expect((mockClineProvider as any).getMcpHub).toHaveBeenCalledTimes(1) + expect(mockMcpHub.handleMcpEnabledChange).toHaveBeenCalledTimes(1) expect(mockMcpHub.handleMcpEnabledChange).toHaveBeenCalledWith(false) - expect(mockClineProvider.postStateToWebview).toHaveBeenCalled() + expect(mockClineProvider.postStateToWebview).toHaveBeenCalledTimes(1) }) - it("should not call handleMcpEnabledChange when McpHub is not available", async () => { - // Setup: No McpHub instance available - mockClineProvider.getMcpHub = vi.fn().mockReturnValue(null) - vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(true) + it("handles missing McpHub instance gracefully and still posts state", async () => { + ;(mockClineProvider as any).getMcpHub = vi.fn().mockReturnValue(undefined) - // Act: Send mcpEnabled message with false - await webviewMessageHandler(mockClineProvider, { - type: "mcpEnabled", - bool: false, - }) - - // Assert: State should be updated but handleMcpEnabledChange should not be called - expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("mcpEnabled", false) - expect(mockClineProvider.postStateToWebview).toHaveBeenCalled() - // No error should be thrown - }) - - it("should always update state even when value doesn't change", async () => { - // Setup: mcpEnabled is true - vi.mocked(mockClineProvider.contextProxy.getValue).mockReturnValue(true) - - // Act: Send mcpEnabled message with same value await webviewMessageHandler(mockClineProvider, { type: "mcpEnabled", bool: true, }) - // Assert: State should still be updated to ensure consistency - expect(mockClineProvider.contextProxy.setValue).toHaveBeenCalledWith("mcpEnabled", true) - expect(mockClineProvider.postStateToWebview).toHaveBeenCalled() + expect((mockClineProvider as any).getMcpHub).toHaveBeenCalledTimes(1) + expect(mockClineProvider.postStateToWebview).toHaveBeenCalledTimes(1) }) }) diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts index e2c6d6a475..f5dc6a467f 100644 --- a/src/core/webview/webviewMessageHandler.ts +++ b/src/core/webview/webviewMessageHandler.ts @@ -900,19 +900,12 @@ export const webviewMessageHandler = async ( } case "mcpEnabled": const mcpEnabled = message.bool ?? true - const currentMcpEnabled = getGlobalState("mcpEnabled") ?? true - - // Always update the state to ensure consistency await updateGlobalState("mcpEnabled", mcpEnabled) - // Only refresh MCP connections if the value actually changed - // This prevents expensive MCP server refresh operations when saving unrelated settings - if (currentMcpEnabled !== mcpEnabled) { - // Delegate MCP enable/disable logic to McpHub - const mcpHubInstance = provider.getMcpHub() - if (mcpHubInstance) { - await mcpHubInstance.handleMcpEnabledChange(mcpEnabled) - } + // Delegate MCP enable/disable logic to McpHub + const mcpHubInstance = provider.getMcpHub() + if (mcpHubInstance) { + await mcpHubInstance.handleMcpEnabledChange(mcpEnabled) } await provider.postStateToWebview() diff --git a/src/services/mcp/McpHub.ts b/src/services/mcp/McpHub.ts index 646236b5d5..271c6e1fb3 100644 --- a/src/services/mcp/McpHub.ts +++ b/src/services/mcp/McpHub.ts @@ -1212,7 +1212,6 @@ export class McpHub { public async refreshAllConnections(): Promise { if (this.isConnecting) { - vscode.window.showInformationMessage(t("mcp:info.already_refreshing")) return } @@ -1234,7 +1233,6 @@ export class McpHub { } this.isConnecting = true - vscode.window.showInformationMessage(t("mcp:info.refreshing_all")) try { const globalPath = await this.getMcpSettingsFilePath() @@ -1244,11 +1242,6 @@ export class McpHub { const globalConfig = JSON.parse(globalContent) globalServers = globalConfig.mcpServers || {} const globalServerNames = Object.keys(globalServers) - vscode.window.showInformationMessage( - t("mcp:info.global_servers_active", { - mcpServers: `${globalServerNames.join(", ") || "none"}`, - }), - ) } catch (error) { console.log("Error reading global MCP config:", error) } @@ -1261,11 +1254,6 @@ export class McpHub { const projectConfig = JSON.parse(projectContent) projectServers = projectConfig.mcpServers || {} const projectServerNames = Object.keys(projectServers) - vscode.window.showInformationMessage( - t("mcp:info.project_servers_active", { - mcpServers: `${projectServerNames.join(", ") || "none"}`, - }), - ) } catch (error) { console.log("Error reading project MCP config:", error) } @@ -1285,8 +1273,6 @@ export class McpHub { await delay(100) await this.notifyWebviewOfServerChanges() - - vscode.window.showInformationMessage(t("mcp:info.all_refreshed")) } catch (error) { this.showErrorMessage("Failed to refresh MCP servers", error) } finally { From cdc31f7c2693eb5a12e66cd08be4a2cb95bfdf63 Mon Sep 17 00:00:00 2001 From: John Richmond <5629+jr@users.noreply.github.com> Date: Sat, 9 Aug 2025 11:29:18 -0700 Subject: [PATCH 108/253] Bedrock: workaround LiteLLM passthrough issues (#6778) Explicitly setting requestTimeout seems to be required for it to be possible to use the Bedrock provider with LiteLLM Bedrock passthrough. --- src/api/providers/bedrock.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/api/providers/bedrock.ts b/src/api/providers/bedrock.ts index 76e502e6c7..706b801d0c 100644 --- a/src/api/providers/bedrock.ts +++ b/src/api/providers/bedrock.ts @@ -226,6 +226,11 @@ export class AwsBedrockHandler extends BaseProvider implements SingleCompletionH // Use API key/token-based authentication if enabled and API key is set clientConfig.token = { token: this.options.awsApiKey } clientConfig.authSchemePreference = ["httpBearerAuth"] // Otherwise there's no end of credential problems. + clientConfig.requestHandler = { + // This should be the default anyway, but without setting something + // this provider fails to work with LiteLLM passthrough. + requestTimeout: 0, + } } else if (this.options.awsUseProfile && this.options.awsProfile) { // Use profile-based credentials if enabled and profile is set clientConfig.credentials = fromIni({ From cda67a86f507dbf4fcf84110b8dbdcead93195f9 Mon Sep 17 00:00:00 2001 From: Hannes Rudolph Date: Sat, 9 Aug 2025 11:52:06 -0700 Subject: [PATCH 109/253] GPT5 OpenAI Fix (#6864) * fix: add explicit max_output_tokens for GPT-5 Responses API - Added max_output_tokens parameter to GPT-5 request body using model.maxTokens - This prevents GPT-5 from defaulting to very large token limits (e.g., 120k) - Updated tests to expect max_output_tokens in GPT-5 request bodies - Fixed test for handling unhandled stream events by properly mocking SDK fallback * fix: add missing translations for reasoningEffort.minimal in Indonesian and Dutch locales * fix: correct GPT-5 response ID persistence and usage - Renamed metadata field from 'previous_response_id' to 'response_id' for clarity - Fixed logic to correctly use the response_id from the previous message as previous_response_id for the next request - This resolves the 'Previous response with id not found' errors that occurred after multiple turns in the same session * feat: add robust error handling for GPT-5 previous_response_id failures - Automatically retry without previous_response_id when it's not found (400 error) - Clear stored lastResponseId to prevent reusing stale IDs - Handle errors in both SDK and SSE fallback paths - Log warnings when retrying to help with debugging * fix: handle GPT-5 response ID race condition with nano model - Add promise-based synchronization for response ID persistence - Wait for pending response ID from previous request before using it - Resolve promise when response ID is received or cleared - Add 100ms timeout to avoid blocking too long on ID resolution - Properly clean up resolver on errors to prevent memory leaks This fixes the race condition where fast nano model responses could cause the next request to be initiated before the response ID was fully persisted. * fix: address PR review comments for GPT-5 implementation - Extract usage normalization helper to reduce duplication - Suppress conversation continuity for first message (but respect explicit metadata) - Deduplicate response ID resolver logic - Remove dead enableGpt5ReasoningSummary option references - DRY up GPT-5 event/usage handling with normalizeGpt5Usage helper - Centralize default GPT-5 reasoning effort using model info - Fix Indonesian locale minimal string misplacement - Add clarifying comments for Developer prefix usage - Add TODO for future verbosity UI capability gating - Fix failing test in reasoning.spec.ts * fix(openai-native): address Roomote inline feedback\n\n- Delegate standard GPT-5 SSE event types to shared processor to reduce duplication\n- Add JSDoc for response ID accessors\n- Standardize key error messages for GPT-5 Responses API fallback\n- Extract persistGpt5Metadata() in Task to simplify metadata writes\n- Add malformed JSON SSE parsing test\n * fix(openai-native,gpt5): correct usage cost calc (use calculateApiCostOpenAI incl. cache); enforce 'skip once' continuity via suppressPreviousResponseId; dedupe responseId resolver on SSE 400; feat: gate reasoning.summary by enableGpt5ReasoningSummary; centralize default reasoning effort; types/ui: add ModelInfo.supportsVerbosity and gate Verbosity UI by capability; refactor: avoid duplicate usage emission in SSE done/completed * fix(gpt5): default enableGpt5ReasoningSummary=true to preserve tests and expected behavior * fix(gpt5): canonicalize GPT-5 metadata key to previous_response_id and align enableGpt5ReasoningSummary default docs * fix(openai-native): remove review artifact comments and guard GPT-5 in completePrompt --- packages/types/src/message.ts | 11 + packages/types/src/model.ts | 2 + packages/types/src/provider-settings.ts | 7 +- packages/types/src/providers/openai.ts | 8 + src/api/index.ts | 7 + .../providers/__tests__/openai-native.spec.ts | 1003 +++++++++++++- src/api/providers/openai-native.ts | 1199 ++++++++++++++--- src/api/providers/openai.ts | 4 +- src/api/providers/requesty.ts | 2 +- src/api/transform/model-params.ts | 6 +- src/api/transform/reasoning.ts | 23 +- src/core/task/Task.ts | 87 +- src/shared/api.ts | 11 +- .../src/components/settings/ApiOptions.tsx | 19 +- .../components/settings/ThinkingBudget.tsx | 48 +- webview-ui/src/i18n/locales/ca/settings.json | 1 + webview-ui/src/i18n/locales/de/settings.json | 1 + webview-ui/src/i18n/locales/en/settings.json | 5 +- webview-ui/src/i18n/locales/es/settings.json | 1 + webview-ui/src/i18n/locales/fr/settings.json | 1 + webview-ui/src/i18n/locales/hi/settings.json | 1 + webview-ui/src/i18n/locales/id/settings.json | 1 + webview-ui/src/i18n/locales/it/settings.json | 1 + webview-ui/src/i18n/locales/ja/settings.json | 1 + webview-ui/src/i18n/locales/ko/settings.json | 1 + webview-ui/src/i18n/locales/nl/settings.json | 1 + webview-ui/src/i18n/locales/pl/settings.json | 1 + .../src/i18n/locales/pt-BR/settings.json | 1 + webview-ui/src/i18n/locales/ru/settings.json | 1 + webview-ui/src/i18n/locales/tr/settings.json | 1 + webview-ui/src/i18n/locales/vi/settings.json | 1 + .../src/i18n/locales/zh-CN/settings.json | 1 + .../src/i18n/locales/zh-TW/settings.json | 1 + 33 files changed, 2195 insertions(+), 264 deletions(-) diff --git a/packages/types/src/message.ts b/packages/types/src/message.ts index 21baf3f203..7197ab29a1 100644 --- a/packages/types/src/message.ts +++ b/packages/types/src/message.ts @@ -176,6 +176,17 @@ export const clineMessageSchema = z.object({ contextCondense: contextCondenseSchema.optional(), isProtected: z.boolean().optional(), apiProtocol: z.union([z.literal("openai"), z.literal("anthropic")]).optional(), + metadata: z + .object({ + gpt5: z + .object({ + previous_response_id: z.string().optional(), + instructions: z.string().optional(), + reasoning_summary: z.string().optional(), + }) + .optional(), + }) + .optional(), }) export type ClineMessage = z.infer diff --git a/packages/types/src/model.ts b/packages/types/src/model.ts index a09790578b..90b61ad879 100644 --- a/packages/types/src/model.ts +++ b/packages/types/src/model.ts @@ -44,6 +44,8 @@ export const modelInfoSchema = z.object({ supportsImages: z.boolean().optional(), supportsComputerUse: z.boolean().optional(), supportsPromptCache: z.boolean(), + // Capability flag to indicate whether the model supports an output verbosity parameter + supportsVerbosity: z.boolean().optional(), supportsReasoningBudget: z.boolean().optional(), requiredReasoningBudget: z.boolean().optional(), supportsReasoningEffort: z.boolean().optional(), diff --git a/packages/types/src/provider-settings.ts b/packages/types/src/provider-settings.ts index f0c90101fc..aebfd4dbe5 100644 --- a/packages/types/src/provider-settings.ts +++ b/packages/types/src/provider-settings.ts @@ -3,6 +3,11 @@ import { z } from "zod" import { reasoningEffortsSchema, verbosityLevelsSchema, modelInfoSchema } from "./model.js" import { codebaseIndexProviderSchema } from "./codebase-index.js" +// Extended schema that includes "minimal" for GPT-5 models +export const extendedReasoningEffortsSchema = z.union([reasoningEffortsSchema, z.literal("minimal")]) + +export type ReasoningEffortWithMinimal = z.infer + /** * ProviderName */ @@ -76,7 +81,7 @@ const baseProviderSettingsSchema = z.object({ // Model reasoning. enableReasoningEffort: z.boolean().optional(), - reasoningEffort: reasoningEffortsSchema.optional(), + reasoningEffort: extendedReasoningEffortsSchema.optional(), modelMaxTokens: z.number().optional(), modelMaxThinkingTokens: z.number().optional(), diff --git a/packages/types/src/providers/openai.ts b/packages/types/src/providers/openai.ts index b319be2a5f..02fadb412d 100644 --- a/packages/types/src/providers/openai.ts +++ b/packages/types/src/providers/openai.ts @@ -12,10 +12,13 @@ export const openAiNativeModels = { supportsImages: true, supportsPromptCache: true, supportsReasoningEffort: true, + reasoningEffort: "medium", inputPrice: 1.25, outputPrice: 10.0, cacheReadsPrice: 0.13, description: "GPT-5: The best model for coding and agentic tasks across domains", + // supportsVerbosity is a new capability; ensure ModelInfo includes it + supportsVerbosity: true, }, "gpt-5-mini-2025-08-07": { maxTokens: 128000, @@ -23,10 +26,12 @@ export const openAiNativeModels = { supportsImages: true, supportsPromptCache: true, supportsReasoningEffort: true, + reasoningEffort: "medium", inputPrice: 0.25, outputPrice: 2.0, cacheReadsPrice: 0.03, description: "GPT-5 Mini: A faster, more cost-efficient version of GPT-5 for well-defined tasks", + supportsVerbosity: true, }, "gpt-5-nano-2025-08-07": { maxTokens: 128000, @@ -34,10 +39,12 @@ export const openAiNativeModels = { supportsImages: true, supportsPromptCache: true, supportsReasoningEffort: true, + reasoningEffort: "medium", inputPrice: 0.05, outputPrice: 0.4, cacheReadsPrice: 0.01, description: "GPT-5 Nano: Fastest, most cost-efficient version of GPT-5", + supportsVerbosity: true, }, "gpt-4.1": { maxTokens: 32_768, @@ -229,5 +236,6 @@ export const openAiModelInfoSaneDefaults: ModelInfo = { export const azureOpenAiDefaultApiVersion = "2024-08-01-preview" export const OPENAI_NATIVE_DEFAULT_TEMPERATURE = 0 +export const GPT5_DEFAULT_TEMPERATURE = 1.0 export const OPENAI_AZURE_AI_INFERENCE_PATH = "/models/chat/completions" diff --git a/src/api/index.ts b/src/api/index.ts index 57b06f7bbd..5e705a80d2 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -44,6 +44,13 @@ export interface SingleCompletionHandler { export interface ApiHandlerCreateMessageMetadata { mode?: string taskId: string + previousResponseId?: string + /** + * When true, the provider must NOT fall back to internal continuity state + * (e.g., lastResponseId) if previousResponseId is absent. + * Used to enforce "skip once" after a condense operation. + */ + suppressPreviousResponseId?: boolean } export interface ApiHandler { diff --git a/src/api/providers/__tests__/openai-native.spec.ts b/src/api/providers/__tests__/openai-native.spec.ts index fdd71ba3f6..23f19e3d48 100644 --- a/src/api/providers/__tests__/openai-native.spec.ts +++ b/src/api/providers/__tests__/openai-native.spec.ts @@ -160,8 +160,12 @@ describe("OpenAiNativeHandler", () => { expect(results.length).toBe(1) expect(results[0].type).toBe("usage") // Use type assertion to avoid TypeScript errors - expect((results[0] as any).inputTokens).toBe(0) - expect((results[0] as any).outputTokens).toBe(0) + const usageResult = results[0] as any + expect(usageResult.inputTokens).toBe(0) + expect(usageResult.outputTokens).toBe(0) + // When no cache tokens are present, they should be undefined + expect(usageResult.cacheWriteTokens).toBeUndefined() + expect(usageResult.cacheReadTokens).toBeUndefined() // Verify developer role is used for system prompt with o1 model expect(mockCreate).toHaveBeenCalledWith({ @@ -286,6 +290,111 @@ describe("OpenAiNativeHandler", () => { expect((results[1] as any).outputTokens).toBe(5) expect((results[1] as any).totalCost).toBeCloseTo(0.00006, 6) }) + + it("should handle cache tokens in streaming response", async () => { + const mockStream = [ + { choices: [{ delta: { content: "Hello" } }], usage: null }, + { choices: [{ delta: { content: " cached" } }], usage: null }, + { + choices: [{ delta: { content: " response" } }], + usage: { + prompt_tokens: 100, + completion_tokens: 10, + prompt_tokens_details: { + cached_tokens: 80, + audio_tokens: 0, + }, + completion_tokens_details: { + reasoning_tokens: 0, + audio_tokens: 0, + accepted_prediction_tokens: 0, + rejected_prediction_tokens: 0, + }, + }, + }, + ] + + mockCreate.mockResolvedValueOnce( + (async function* () { + for (const chunk of mockStream) { + yield chunk + } + })(), + ) + + const generator = handler.createMessage(systemPrompt, messages) + const results = [] + for await (const result of generator) { + results.push(result) + } + + // Verify text responses + expect(results.length).toBe(4) + expect(results[0]).toMatchObject({ type: "text", text: "Hello" }) + expect(results[1]).toMatchObject({ type: "text", text: " cached" }) + expect(results[2]).toMatchObject({ type: "text", text: " response" }) + + // Check usage data includes cache tokens + expect(results[3].type).toBe("usage") + const usageChunk = results[3] as any + expect(usageChunk.inputTokens).toBe(100) // Total input tokens (includes cached) + expect(usageChunk.outputTokens).toBe(10) + expect(usageChunk.cacheReadTokens).toBe(80) // Cached tokens from prompt_tokens_details + expect(usageChunk.cacheWriteTokens).toBeUndefined() // No cache write tokens in standard response + + // Verify cost calculation takes cache into account + // GPT-4.1 pricing: input $2/1M, output $8/1M, cache read $0.5/1M + // OpenAI's prompt_tokens includes cached tokens, so we need to calculate: + // - Non-cached input tokens: 100 - 80 = 20 + // - Cost for non-cached input: (20 / 1_000_000) * 2.0 + // - Cost for cached input: (80 / 1_000_000) * 0.5 + // - Cost for output: (10 / 1_000_000) * 8.0 + const nonCachedInputTokens = 100 - 80 + const expectedNonCachedInputCost = (nonCachedInputTokens / 1_000_000) * 2.0 + const expectedCacheReadCost = (80 / 1_000_000) * 0.5 + const expectedOutputCost = (10 / 1_000_000) * 8.0 + const expectedTotalCost = expectedNonCachedInputCost + expectedCacheReadCost + expectedOutputCost + expect(usageChunk.totalCost).toBeCloseTo(expectedTotalCost, 10) + }) + + it("should handle cache write tokens if present", async () => { + const mockStream = [ + { choices: [{ delta: { content: "Test" } }], usage: null }, + { + choices: [{ delta: {} }], + usage: { + prompt_tokens: 150, + completion_tokens: 5, + prompt_tokens_details: { + cached_tokens: 50, + }, + cache_creation_input_tokens: 30, // Cache write tokens + }, + }, + ] + + mockCreate.mockResolvedValueOnce( + (async function* () { + for (const chunk of mockStream) { + yield chunk + } + })(), + ) + + const generator = handler.createMessage(systemPrompt, messages) + const results = [] + for await (const result of generator) { + results.push(result) + } + + // Check usage data includes both cache read and write tokens + const usageChunk = results.find((r) => r.type === "usage") as any + expect(usageChunk).toBeDefined() + expect(usageChunk.inputTokens).toBe(150) + expect(usageChunk.outputTokens).toBe(5) + expect(usageChunk.cacheReadTokens).toBe(50) + expect(usageChunk.cacheWriteTokens).toBe(30) + }) }) describe("completePrompt", () => { @@ -461,7 +570,40 @@ describe("OpenAiNativeHandler", () => { }) describe("GPT-5 models", () => { - it("should handle GPT-5 model with developer role", async () => { + it("should handle GPT-5 model with Responses API", async () => { + // Mock fetch for Responses API + const mockFetch = vitest.fn().mockResolvedValue({ + ok: true, + body: new ReadableStream({ + start(controller) { + // Simulate actual GPT-5 Responses API SSE stream format + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.created","response":{"id":"test","status":"in_progress"}}\n\n', + ), + ) + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.output_item.added","item":{"type":"text","text":"Hello"}}\n\n', + ), + ) + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.output_item.added","item":{"type":"text","text":" world"}}\n\n', + ), + ) + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.done","response":{"usage":{"prompt_tokens":10,"completion_tokens":2}}}\n\n', + ), + ) + controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n")) + controller.close() + }, + }), + }) + global.fetch = mockFetch as any + handler = new OpenAiNativeHandler({ ...mockOptions, apiModelId: "gpt-5-2025-08-07", @@ -473,20 +615,56 @@ describe("OpenAiNativeHandler", () => { chunks.push(chunk) } - // Verify developer role is used for GPT-5 with default parameters - expect(mockCreate).toHaveBeenCalledWith( + // Verify Responses API is called with correct parameters + expect(mockFetch).toHaveBeenCalledWith( + "https://api.openai.com/v1/responses", expect.objectContaining({ - model: "gpt-5-2025-08-07", - messages: [{ role: "developer", content: expect.stringContaining(systemPrompt) }], - stream: true, - stream_options: { include_usage: true }, - reasoning_effort: "minimal", // Default for GPT-5 - verbosity: "medium", // Default verbosity + method: "POST", + headers: expect.objectContaining({ + "Content-Type": "application/json", + Authorization: "Bearer test-api-key", + Accept: "text/event-stream", + }), + body: expect.any(String), }), ) + const body1 = (mockFetch.mock.calls[0][1] as any).body as string + expect(body1).toContain('"model":"gpt-5-2025-08-07"') + expect(body1).toContain('"input":"Developer: You are a helpful assistant.\\n\\nUser: Hello!"') + expect(body1).toContain('"effort":"medium"') + expect(body1).toContain('"summary":"auto"') + expect(body1).toContain('"verbosity":"medium"') + expect(body1).toContain('"temperature":1') + expect(body1).toContain('"max_output_tokens"') + + // Verify the streamed content + const textChunks = chunks.filter((c) => c.type === "text") + expect(textChunks).toHaveLength(2) + expect(textChunks[0].text).toBe("Hello") + expect(textChunks[1].text).toBe(" world") + + // Clean up + delete (global as any).fetch }) - it("should handle GPT-5-mini model", async () => { + it("should handle GPT-5-mini model with Responses API", async () => { + // Mock fetch for Responses API + const mockFetch = vitest.fn().mockResolvedValue({ + ok: true, + body: new ReadableStream({ + start(controller) { + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.output_item.added","item":{"type":"text","text":"Response"}}\n\n', + ), + ) + controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n")) + controller.close() + }, + }), + }) + global.fetch = mockFetch as any + handler = new OpenAiNativeHandler({ ...mockOptions, apiModelId: "gpt-5-mini-2025-08-07", @@ -498,19 +676,36 @@ describe("OpenAiNativeHandler", () => { chunks.push(chunk) } - expect(mockCreate).toHaveBeenCalledWith( + // Verify correct model and default parameters + expect(mockFetch).toHaveBeenCalledWith( + "https://api.openai.com/v1/responses", expect.objectContaining({ - model: "gpt-5-mini-2025-08-07", - messages: [{ role: "developer", content: expect.stringContaining(systemPrompt) }], - stream: true, - stream_options: { include_usage: true }, - reasoning_effort: "minimal", // Default for GPT-5 - verbosity: "medium", // Default verbosity + body: expect.stringContaining('"model":"gpt-5-mini-2025-08-07"'), }), ) + + // Clean up + delete (global as any).fetch }) - it("should handle GPT-5-nano model", async () => { + it("should handle GPT-5-nano model with Responses API", async () => { + // Mock fetch for Responses API + const mockFetch = vitest.fn().mockResolvedValue({ + ok: true, + body: new ReadableStream({ + start(controller) { + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.output_item.added","item":{"type":"text","text":"Nano response"}}\n\n', + ), + ) + controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n")) + controller.close() + }, + }), + }) + global.fetch = mockFetch as any + handler = new OpenAiNativeHandler({ ...mockOptions, apiModelId: "gpt-5-nano-2025-08-07", @@ -522,19 +717,36 @@ describe("OpenAiNativeHandler", () => { chunks.push(chunk) } - expect(mockCreate).toHaveBeenCalledWith( + // Verify correct model + expect(mockFetch).toHaveBeenCalledWith( + "https://api.openai.com/v1/responses", expect.objectContaining({ - model: "gpt-5-nano-2025-08-07", - messages: [{ role: "developer", content: expect.stringContaining(systemPrompt) }], - stream: true, - stream_options: { include_usage: true }, - reasoning_effort: "minimal", // Default for GPT-5 - verbosity: "medium", // Default verbosity + body: expect.stringContaining('"model":"gpt-5-nano-2025-08-07"'), }), ) + + // Clean up + delete (global as any).fetch }) it("should support verbosity control for GPT-5", async () => { + // Mock fetch for Responses API + const mockFetch = vitest.fn().mockResolvedValue({ + ok: true, + body: new ReadableStream({ + start(controller) { + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.output_item.added","item":{"type":"text","text":"Low verbosity"}}\n\n', + ), + ) + controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n")) + controller.close() + }, + }), + }) + global.fetch = mockFetch as any + handler = new OpenAiNativeHandler({ ...mockOptions, apiModelId: "gpt-5-2025-08-07", @@ -549,18 +761,77 @@ describe("OpenAiNativeHandler", () => { } // Verify that verbosity is passed in the request - expect(mockCreate).toHaveBeenCalledWith( + expect(mockFetch).toHaveBeenCalledWith( + "https://api.openai.com/v1/responses", expect.objectContaining({ - model: "gpt-5-2025-08-07", - messages: expect.any(Array), - stream: true, - stream_options: { include_usage: true }, - verbosity: "low", + body: expect.stringContaining('"verbosity":"low"'), }), ) + + // Clean up + delete (global as any).fetch }) it("should support minimal reasoning effort for GPT-5", async () => { + // Mock fetch for Responses API + const mockFetch = vitest.fn().mockResolvedValue({ + ok: true, + body: new ReadableStream({ + start(controller) { + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.output_item.added","item":{"type":"text","text":"Minimal effort"}}\n\n', + ), + ) + controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n")) + controller.close() + }, + }), + }) + global.fetch = mockFetch as any + + handler = new OpenAiNativeHandler({ + ...mockOptions, + apiModelId: "gpt-5-2025-08-07", + reasoningEffort: "minimal" as any, // GPT-5 supports minimal + }) + + const stream = handler.createMessage(systemPrompt, messages) + const chunks: any[] = [] + for await (const chunk of stream) { + chunks.push(chunk) + } + + // With minimal reasoning effort, the model should pass it through + expect(mockFetch).toHaveBeenCalledWith( + "https://api.openai.com/v1/responses", + expect.objectContaining({ + body: expect.stringContaining('"effort":"minimal"'), + }), + ) + + // Clean up + delete (global as any).fetch + }) + + it("should support low reasoning effort for GPT-5", async () => { + // Mock fetch for Responses API + const mockFetch = vitest.fn().mockResolvedValue({ + ok: true, + body: new ReadableStream({ + start(controller) { + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.output_item.added","item":{"type":"text","text":"Low effort response"}}\n\n', + ), + ) + controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n")) + controller.close() + }, + }), + }) + global.fetch = mockFetch as any + handler = new OpenAiNativeHandler({ ...mockOptions, apiModelId: "gpt-5-2025-08-07", @@ -573,25 +844,48 @@ describe("OpenAiNativeHandler", () => { chunks.push(chunk) } - // With low reasoning effort, the model should pass it through - expect(mockCreate).toHaveBeenCalledWith( + // Should use Responses API with low reasoning effort + expect(mockFetch).toHaveBeenCalledWith( + "https://api.openai.com/v1/responses", expect.objectContaining({ - model: "gpt-5-2025-08-07", - messages: expect.any(Array), - stream: true, - stream_options: { include_usage: true }, - reasoning_effort: "low", - verbosity: "medium", // Default verbosity + body: expect.any(String), }), ) + const body2 = (mockFetch.mock.calls[0][1] as any).body as string + expect(body2).toContain('"model":"gpt-5-2025-08-07"') + expect(body2).toContain('"effort":"low"') + expect(body2).toContain('"summary":"auto"') + expect(body2).toContain('"verbosity":"medium"') + expect(body2).toContain('"temperature":1') + expect(body2).toContain('"max_output_tokens"') + + // Clean up + delete (global as any).fetch }) it("should support both verbosity and reasoning effort together for GPT-5", async () => { + // Mock fetch for Responses API + const mockFetch = vitest.fn().mockResolvedValue({ + ok: true, + body: new ReadableStream({ + start(controller) { + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.output_item.added","item":{"type":"text","text":"High verbosity minimal effort"}}\n\n', + ), + ) + controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n")) + controller.close() + }, + }), + }) + global.fetch = mockFetch as any + handler = new OpenAiNativeHandler({ ...mockOptions, apiModelId: "gpt-5-2025-08-07", - verbosity: "high", // Set verbosity through options - reasoningEffort: "low", // Set reasoning effort + verbosity: "high", + reasoningEffort: "minimal" as any, }) const stream = handler.createMessage(systemPrompt, messages) @@ -600,17 +894,624 @@ describe("OpenAiNativeHandler", () => { chunks.push(chunk) } - // Verify both parameters are passed - expect(mockCreate).toHaveBeenCalledWith( + // Should use Responses API with both parameters + expect(mockFetch).toHaveBeenCalledWith( + "https://api.openai.com/v1/responses", expect.objectContaining({ - model: "gpt-5-2025-08-07", - messages: expect.any(Array), - stream: true, - stream_options: { include_usage: true }, - reasoning_effort: "low", - verbosity: "high", + body: expect.any(String), }), ) + const body3 = (mockFetch.mock.calls[0][1] as any).body as string + expect(body3).toContain('"model":"gpt-5-2025-08-07"') + expect(body3).toContain('"effort":"minimal"') + expect(body3).toContain('"summary":"auto"') + expect(body3).toContain('"verbosity":"high"') + expect(body3).toContain('"temperature":1') + expect(body3).toContain('"max_output_tokens"') + + // Clean up + delete (global as any).fetch + }) + + it("should handle actual GPT-5 Responses API format", async () => { + // Mock fetch with actual response format from GPT-5 + const mockFetch = vitest.fn().mockResolvedValue({ + ok: true, + body: new ReadableStream({ + start(controller) { + // Test actual GPT-5 response format + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.created","response":{"id":"test","status":"in_progress"}}\n\n', + ), + ) + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.in_progress","response":{"status":"in_progress"}}\n\n', + ), + ) + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.output_item.added","item":{"type":"text","text":"First text"}}\n\n', + ), + ) + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.output_item.added","item":{"type":"text","text":" Second text"}}\n\n', + ), + ) + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.output_item.added","item":{"type":"reasoning","text":"Some reasoning"}}\n\n', + ), + ) + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.done","response":{"usage":{"prompt_tokens":100,"completion_tokens":20}}}\n\n', + ), + ) + controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n")) + controller.close() + }, + }), + }) + global.fetch = mockFetch as any + + handler = new OpenAiNativeHandler({ + ...mockOptions, + apiModelId: "gpt-5-2025-08-07", + }) + + const stream = handler.createMessage(systemPrompt, messages) + const chunks: any[] = [] + for await (const chunk of stream) { + chunks.push(chunk) + } + + // Should handle the actual format correctly + const textChunks = chunks.filter((c) => c.type === "text") + const reasoningChunks = chunks.filter((c) => c.type === "reasoning") + + expect(textChunks).toHaveLength(2) + expect(textChunks[0].text).toBe("First text") + expect(textChunks[1].text).toBe(" Second text") + + expect(reasoningChunks).toHaveLength(1) + expect(reasoningChunks[0].text).toBe("Some reasoning") + + // Should also have usage information with cost + const usageChunks = chunks.filter((c) => c.type === "usage") + expect(usageChunks).toHaveLength(1) + expect(usageChunks[0]).toMatchObject({ + type: "usage", + inputTokens: 100, + outputTokens: 20, + totalCost: expect.any(Number), + }) + + // Verify cost calculation (GPT-5 pricing: input $1.25/M, output $10/M) + const expectedInputCost = (100 / 1_000_000) * 1.25 + const expectedOutputCost = (20 / 1_000_000) * 10.0 + const expectedTotalCost = expectedInputCost + expectedOutputCost + expect(usageChunks[0].totalCost).toBeCloseTo(expectedTotalCost, 10) + + // Clean up + delete (global as any).fetch + }) + + it("should handle Responses API with no content gracefully", async () => { + // Mock fetch with empty response + const mockFetch = vitest.fn().mockResolvedValue({ + ok: true, + body: new ReadableStream({ + start(controller) { + controller.enqueue(new TextEncoder().encode('data: {"someField":"value"}\n\n')) + controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n")) + controller.close() + }, + }), + }) + global.fetch = mockFetch as any + + handler = new OpenAiNativeHandler({ + ...mockOptions, + apiModelId: "gpt-5-2025-08-07", + }) + + const stream = handler.createMessage(systemPrompt, messages) + const chunks: any[] = [] + + // Should not throw, just warn + for await (const chunk of stream) { + chunks.push(chunk) + } + + // Should have no content chunks when stream is empty + const contentChunks = chunks.filter((c) => c.type === "text" || c.type === "reasoning") + + expect(contentChunks).toHaveLength(0) + + // Clean up + delete (global as any).fetch + }) + + it("should support previous_response_id for conversation continuity", async () => { + // Mock fetch for Responses API + const mockFetch = vitest.fn().mockResolvedValue({ + ok: true, + body: new ReadableStream({ + start(controller) { + // Include response ID in the response + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.created","response":{"id":"resp_123","status":"in_progress"}}\n\n', + ), + ) + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.output_item.added","item":{"type":"text","text":"Response with ID"}}\n\n', + ), + ) + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.done","response":{"id":"resp_123","usage":{"prompt_tokens":10,"completion_tokens":3}}}\n\n', + ), + ) + controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n")) + controller.close() + }, + }), + }) + global.fetch = mockFetch as any + + handler = new OpenAiNativeHandler({ + ...mockOptions, + apiModelId: "gpt-5-2025-08-07", + }) + + // First request - should not have previous_response_id + const stream1 = handler.createMessage(systemPrompt, messages) + const chunks1: any[] = [] + for await (const chunk of stream1) { + chunks1.push(chunk) + } + + // Verify first request doesn't include previous_response_id + let firstCallBody = JSON.parse(mockFetch.mock.calls[0][1].body) + expect(firstCallBody.previous_response_id).toBeUndefined() + + // Second request with metadata - should include previous_response_id + const stream2 = handler.createMessage(systemPrompt, messages, { + taskId: "test-task", + previousResponseId: "resp_456", + }) + const chunks2: any[] = [] + for await (const chunk of stream2) { + chunks2.push(chunk) + } + + // Verify second request includes the provided previous_response_id + let secondCallBody = JSON.parse(mockFetch.mock.calls[1][1].body) + expect(secondCallBody.previous_response_id).toBe("resp_456") + + // Clean up + delete (global as any).fetch + }) + + it("should handle unhandled stream events gracefully", async () => { + // Mock fetch for the fallback SSE path (which is what gets used when SDK fails) + const mockFetch = vitest.fn().mockResolvedValue({ + ok: true, + body: new ReadableStream({ + start(controller) { + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.output_item.added","item":{"type":"text","text":"Hello"}}\n\n', + ), + ) + // This event is not handled, so it should be ignored + controller.enqueue( + new TextEncoder().encode('data: {"type":"response.audio.delta","delta":"..."}\n\n'), + ) + controller.enqueue(new TextEncoder().encode('data: {"type":"response.done","response":{}}\n\n')) + controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n")) + controller.close() + }, + }), + }) + global.fetch = mockFetch as any + + // Also mock the SDK to throw an error so it falls back to fetch + const mockClient = { + responses: { + create: vitest.fn().mockRejectedValue(new Error("SDK not available")), + }, + } + + handler = new OpenAiNativeHandler({ + ...mockOptions, + apiModelId: "gpt-5-2025-08-07", + }) + + // Replace the client with our mock + ;(handler as any).client = mockClient + + const stream = handler.createMessage(systemPrompt, messages) + const chunks: any[] = [] + const errors: any[] = [] + + try { + for await (const chunk of stream) { + chunks.push(chunk) + } + } catch (error) { + errors.push(error) + } + + // Log for debugging + if (chunks.length === 0 && errors.length === 0) { + console.log("No chunks and no errors received") + } + if (errors.length > 0) { + console.log("Errors:", errors) + } + + expect(errors.length).toBe(0) + const textChunks = chunks.filter((c) => c.type === "text") + expect(textChunks.length).toBeGreaterThan(0) + expect(textChunks[0].text).toBe("Hello") + + delete (global as any).fetch + }) + + it("should use stored response ID when metadata doesn't provide one", async () => { + // Mock fetch for Responses API + const mockFetch = vitest + .fn() + .mockResolvedValueOnce({ + ok: true, + body: new ReadableStream({ + start(controller) { + // First response with ID + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.done","response":{"id":"resp_789","output":[{"type":"text","content":[{"type":"text","text":"First"}]}],"usage":{"prompt_tokens":10,"completion_tokens":1}}}\n\n', + ), + ) + controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n")) + controller.close() + }, + }), + }) + .mockResolvedValueOnce({ + ok: true, + body: new ReadableStream({ + start(controller) { + // Second response + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.output_item.added","item":{"type":"text","text":"Second"}}\n\n', + ), + ) + controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n")) + controller.close() + }, + }), + }) + global.fetch = mockFetch as any + + handler = new OpenAiNativeHandler({ + ...mockOptions, + apiModelId: "gpt-5-2025-08-07", + }) + + // First request - establishes response ID + const stream1 = handler.createMessage(systemPrompt, messages) + for await (const chunk of stream1) { + // consume stream + } + + // Second request without metadata - should use stored response ID + const stream2 = handler.createMessage(systemPrompt, messages, { taskId: "test-task" }) + for await (const chunk of stream2) { + // consume stream + } + + // Verify second request uses the stored response ID from first request + let secondCallBody = JSON.parse(mockFetch.mock.calls[1][1].body) + expect(secondCallBody.previous_response_id).toBe("resp_789") + + // Clean up + delete (global as any).fetch + }) + + it("should only send latest message when using previous_response_id", async () => { + // Mock fetch for Responses API + const mockFetch = vitest + .fn() + .mockResolvedValueOnce({ + ok: true, + body: new ReadableStream({ + start(controller) { + // First response with ID + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.done","response":{"id":"resp_001","output":[{"type":"text","content":[{"type":"text","text":"First"}]}],"usage":{"prompt_tokens":50,"completion_tokens":1}}}\n\n', + ), + ) + controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n")) + controller.close() + }, + }), + }) + .mockResolvedValueOnce({ + ok: true, + body: new ReadableStream({ + start(controller) { + // Second response + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.output_item.added","item":{"type":"text","text":"Second"}}\n\n', + ), + ) + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.done","response":{"id":"resp_002","usage":{"prompt_tokens":10,"completion_tokens":1}}}\n\n', + ), + ) + controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n")) + controller.close() + }, + }), + }) + global.fetch = mockFetch as any + + handler = new OpenAiNativeHandler({ + ...mockOptions, + apiModelId: "gpt-5-2025-08-07", + }) + + // First request with full conversation + const firstMessages: Anthropic.Messages.MessageParam[] = [ + { role: "user", content: "Hello" }, + { role: "assistant", content: "Hi there!" }, + { role: "user", content: "How are you?" }, + ] + + const stream1 = handler.createMessage(systemPrompt, firstMessages) + for await (const chunk of stream1) { + // consume stream + } + + // Verify first request sends full conversation + let firstCallBody = JSON.parse(mockFetch.mock.calls[0][1].body) + expect(firstCallBody.input).toContain("Hello") + expect(firstCallBody.input).toContain("Hi there!") + expect(firstCallBody.input).toContain("How are you?") + expect(firstCallBody.previous_response_id).toBeUndefined() + + // Second request with previous_response_id - should only send latest message + const secondMessages: Anthropic.Messages.MessageParam[] = [ + { role: "user", content: "Hello" }, + { role: "assistant", content: "Hi there!" }, + { role: "user", content: "How are you?" }, + { role: "assistant", content: "I'm doing well!" }, + { role: "user", content: "What's the weather?" }, // Latest message + ] + + const stream2 = handler.createMessage(systemPrompt, secondMessages, { + taskId: "test-task", + previousResponseId: "resp_001", + }) + for await (const chunk of stream2) { + // consume stream + } + + // Verify second request only sends the latest user message + let secondCallBody = JSON.parse(mockFetch.mock.calls[1][1].body) + expect(secondCallBody.input).toBe("User: What's the weather?") + expect(secondCallBody.input).not.toContain("Hello") + expect(secondCallBody.input).not.toContain("Hi there!") + expect(secondCallBody.input).not.toContain("How are you?") + expect(secondCallBody.previous_response_id).toBe("resp_001") + + // Clean up + delete (global as any).fetch + }) + + it("should correctly prepare GPT-5 input with conversation continuity", () => { + const gpt5Handler = new OpenAiNativeHandler({ + ...mockOptions, + apiModelId: "gpt-5-2025-08-07", + }) + + // @ts-expect-error - private method + const { formattedInput, previousResponseId } = gpt5Handler.prepareGpt5Input(systemPrompt, messages, { + taskId: "task1", + previousResponseId: "resp_123", + }) + + expect(previousResponseId).toBe("resp_123") + expect(formattedInput).toBe("User: Hello!") + }) + + it("should provide helpful error messages for different error codes", async () => { + const testCases = [ + { status: 400, expectedMessage: "Invalid request to GPT-5 API" }, + { status: 401, expectedMessage: "Authentication failed" }, + { status: 403, expectedMessage: "Access denied" }, + { status: 404, expectedMessage: "GPT-5 API endpoint not found" }, + { status: 429, expectedMessage: "Rate limit exceeded" }, + { status: 500, expectedMessage: "OpenAI service error" }, + ] + + for (const { status, expectedMessage } of testCases) { + // Mock fetch with error response + const mockFetch = vitest.fn().mockResolvedValue({ + ok: false, + status, + statusText: "Error", + text: async () => JSON.stringify({ error: { message: "Test error" } }), + }) + global.fetch = mockFetch as any + + handler = new OpenAiNativeHandler({ + ...mockOptions, + apiModelId: "gpt-5-2025-08-07", + }) + + const stream = handler.createMessage(systemPrompt, messages) + + await expect(async () => { + for await (const chunk of stream) { + // Should throw before yielding anything + } + }).rejects.toThrow(expectedMessage) + } + + // Clean up + delete (global as any).fetch }) }) }) + +// Added tests for GPT-5 streaming event coverage per PR_review_gpt5_final.md + +describe("GPT-5 streaming event coverage (additional)", () => { + it("should handle reasoning delta events for GPT-5", async () => { + const mockFetch = vitest.fn().mockResolvedValue({ + ok: true, + body: new ReadableStream({ + start(controller) { + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.reasoning.delta","delta":"Thinking about the problem..."}\n\n', + ), + ) + controller.enqueue( + new TextEncoder().encode('data: {"type":"response.text.delta","delta":"The answer is..."}\n\n'), + ) + controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n")) + controller.close() + }, + }), + }) + // @ts-ignore + global.fetch = mockFetch + + const handler = new OpenAiNativeHandler({ + apiModelId: "gpt-5-2025-08-07", + openAiNativeApiKey: "test-api-key", + }) + + const systemPrompt = "You are a helpful assistant." + const messages: Anthropic.Messages.MessageParam[] = [{ role: "user", content: "Hello!" }] + const stream = handler.createMessage(systemPrompt, messages) + + const chunks: any[] = [] + for await (const chunk of stream) { + chunks.push(chunk) + } + + const reasoningChunks = chunks.filter((c) => c.type === "reasoning") + const textChunks = chunks.filter((c) => c.type === "text") + + expect(reasoningChunks).toHaveLength(1) + expect(reasoningChunks[0].text).toBe("Thinking about the problem...") + expect(textChunks).toHaveLength(1) + expect(textChunks[0].text).toBe("The answer is...") + + // @ts-ignore + delete global.fetch + }) + + it("should handle refusal delta events for GPT-5 and prefix output", async () => { + const mockFetch = vitest.fn().mockResolvedValue({ + ok: true, + body: new ReadableStream({ + start(controller) { + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.refusal.delta","delta":"I cannot comply with this request."}\n\n', + ), + ) + controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n")) + controller.close() + }, + }), + }) + // @ts-ignore + global.fetch = mockFetch + + const handler = new OpenAiNativeHandler({ + apiModelId: "gpt-5-2025-08-07", + openAiNativeApiKey: "test-api-key", + }) + + const systemPrompt = "You are a helpful assistant." + const messages: Anthropic.Messages.MessageParam[] = [{ role: "user", content: "Do something disallowed" }] + const stream = handler.createMessage(systemPrompt, messages) + + const chunks: any[] = [] + for await (const chunk of stream) { + chunks.push(chunk) + } + + const textChunks = chunks.filter((c) => c.type === "text") + expect(textChunks).toHaveLength(1) + expect(textChunks[0].text).toBe("[Refusal] I cannot comply with this request.") + + // @ts-ignore + delete global.fetch + }) + + it("should ignore malformed JSON lines in SSE stream", async () => { + const mockFetch = vitest.fn().mockResolvedValue({ + ok: true, + body: new ReadableStream({ + start(controller) { + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.output_item.added","item":{"type":"text","text":"Before"}}\n\n', + ), + ) + // Malformed JSON line + controller.enqueue( + new TextEncoder().encode('data: {"type":"response.text.delta","delta":"Bad"\n\n'), + ) + // Valid line after malformed + controller.enqueue( + new TextEncoder().encode( + 'data: {"type":"response.output_item.added","item":{"type":"text","text":"After"}}\n\n', + ), + ) + controller.enqueue(new TextEncoder().encode("data: [DONE]\n\n")) + controller.close() + }, + }), + }) + // @ts-ignore + global.fetch = mockFetch + + const handler = new OpenAiNativeHandler({ + apiModelId: "gpt-5-2025-08-07", + openAiNativeApiKey: "test-api-key", + }) + + const systemPrompt = "You are a helpful assistant." + const messages: Anthropic.Messages.MessageParam[] = [{ role: "user", content: "Hello!" }] + const stream = handler.createMessage(systemPrompt, messages) + + const chunks: any[] = [] + for await (const chunk of stream) { + chunks.push(chunk) + } + + // It should not throw and still capture the valid texts around the malformed line + const textChunks = chunks.filter((c) => c.type === "text") + expect(textChunks.map((c: any) => c.text)).toEqual(["Before", "After"]) + + // @ts-ignore + delete global.fetch + }) +}) diff --git a/src/api/providers/openai-native.ts b/src/api/providers/openai-native.ts index 5e498bee45..8df70d31f1 100644 --- a/src/api/providers/openai-native.ts +++ b/src/api/providers/openai-native.ts @@ -7,8 +7,10 @@ import { OpenAiNativeModelId, openAiNativeModels, OPENAI_NATIVE_DEFAULT_TEMPERATURE, + GPT5_DEFAULT_TEMPERATURE, type ReasoningEffort, type VerbosityLevel, + type ReasoningEffortWithMinimal, } from "@roo-code/types" import type { ApiHandlerOptions } from "../../shared/api" @@ -16,7 +18,7 @@ import type { ApiHandlerOptions } from "../../shared/api" import { calculateApiCostOpenAI } from "../../shared/cost" import { convertToOpenAiMessages } from "../transform/openai-format" -import { ApiStream } from "../transform/stream" +import { ApiStream, ApiStreamUsageChunk } from "../transform/stream" import { getModelParams } from "../transform/model-params" import { BaseProvider } from "./base-provider" @@ -24,43 +26,77 @@ import type { SingleCompletionHandler, ApiHandlerCreateMessageMetadata } from ". export type OpenAiNativeModel = ReturnType -// GPT-5 specific types for Responses API -type ReasoningEffortWithMinimal = ReasoningEffort | "minimal" - -interface GPT5ResponsesAPIParams { - model: string - input: string - reasoning?: { - effort: ReasoningEffortWithMinimal - } - text?: { - verbosity: VerbosityLevel - } -} - -interface GPT5ResponseChunk { - type: "text" | "reasoning" | "usage" - text?: string - reasoning?: string - usage?: { - input_tokens: number - output_tokens: number - reasoning_tokens?: number - total_tokens: number - } -} +// GPT-5 specific types export class OpenAiNativeHandler extends BaseProvider implements SingleCompletionHandler { protected options: ApiHandlerOptions private client: OpenAI + private lastResponseId: string | undefined + private responseIdPromise: Promise | undefined + private responseIdResolver: ((value: string | undefined) => void) | undefined + + // Event types handled by the shared GPT-5 event processor to avoid duplication + private readonly gpt5CoreHandledTypes = new Set([ + "response.text.delta", + "response.output_text.delta", + "response.reasoning.delta", + "response.reasoning_text.delta", + "response.reasoning_summary.delta", + "response.reasoning_summary_text.delta", + "response.refusal.delta", + "response.output_item.added", + "response.done", + "response.completed", + ]) constructor(options: ApiHandlerOptions) { super() this.options = options + // Default to including reasoning.summary: "auto" for GPT‑5 unless explicitly disabled + if (this.options.enableGpt5ReasoningSummary === undefined) { + this.options.enableGpt5ReasoningSummary = true + } const apiKey = this.options.openAiNativeApiKey ?? "not-provided" this.client = new OpenAI({ baseURL: this.options.openAiNativeBaseUrl, apiKey }) } + private normalizeGpt5Usage(usage: any, model: OpenAiNativeModel): ApiStreamUsageChunk | undefined { + if (!usage) return undefined + + const totalInputTokens = usage.input_tokens ?? usage.prompt_tokens ?? 0 + const totalOutputTokens = usage.output_tokens ?? usage.completion_tokens ?? 0 + const cacheWriteTokens = usage.cache_creation_input_tokens ?? usage.cache_write_tokens ?? 0 + const cacheReadTokens = usage.cache_read_input_tokens ?? usage.cache_read_tokens ?? usage.cached_tokens ?? 0 + + const totalCost = calculateApiCostOpenAI( + model.info, + totalInputTokens, + totalOutputTokens, + cacheWriteTokens || 0, + cacheReadTokens || 0, + ) + + return { + type: "usage", + inputTokens: totalInputTokens, + outputTokens: totalOutputTokens, + cacheWriteTokens, + cacheReadTokens, + totalCost, + } + } + + private resolveResponseId(responseId: string | undefined): void { + if (responseId) { + this.lastResponseId = responseId + } + // Resolve the promise so the next request can use this ID + if (this.responseIdResolver) { + this.responseIdResolver(responseId) + this.responseIdResolver = undefined + } + } + override async *createMessage( systemPrompt: string, messages: Anthropic.Messages.MessageParam[], @@ -82,7 +118,7 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio } else if (model.id.startsWith("o1")) { yield* this.handleO1FamilyMessage(model, systemPrompt, messages) } else if (this.isGpt5Model(model.id)) { - yield* this.handleGpt5Message(model, systemPrompt, messages) + yield* this.handleGpt5Message(model, systemPrompt, messages, metadata) } else { yield* this.handleDefaultModelMessage(model, systemPrompt, messages) } @@ -157,8 +193,8 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio ...(reasoning && reasoning), } - // Add verbosity if supported (for future GPT-5 models) - if (verbosity && model.id.startsWith("gpt-5")) { + // Add verbosity if supported + if (verbosity) { params.verbosity = verbosity } @@ -180,175 +216,915 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio model: OpenAiNativeModel, systemPrompt: string, messages: Anthropic.Messages.MessageParam[], + metadata?: ApiHandlerCreateMessageMetadata, ): ApiStream { - // GPT-5 uses the Responses API, not Chat Completions - // We need to format the input as a single string combining system prompt and messages - const formattedInput = this.formatInputForResponsesAPI(systemPrompt, messages) + // Prefer the official SDK Responses API with streaming; fall back to fetch-based SSE if needed. + const { verbosity } = this.getModel() - // Get reasoning effort, supporting the new "minimal" option for GPT-5 + // Resolve reasoning effort (supports "minimal" for GPT‑5) const reasoningEffort = this.getGpt5ReasoningEffort(model) - // Get verbosity from model settings, default to "medium" if not specified - const verbosity = model.verbosity || "medium" + // Wait for any pending response ID from a previous request to be available + // This handles the race condition with fast nano model responses + let effectivePreviousResponseId = metadata?.previousResponseId - // Prepare the request parameters for Responses API - const params: GPT5ResponsesAPIParams = { + // Only allow fallback to pending/last response id when not explicitly suppressed + if (!metadata?.suppressPreviousResponseId) { + // If we have a pending response ID promise, wait for it to resolve + if (!effectivePreviousResponseId && this.responseIdPromise) { + try { + const resolvedId = await Promise.race([ + this.responseIdPromise, + // Timeout after 100ms to avoid blocking too long + new Promise((resolve) => setTimeout(() => resolve(undefined), 100)), + ]) + if (resolvedId) { + effectivePreviousResponseId = resolvedId + } + } catch { + // Non-fatal if promise fails + } + } + + // Fall back to the last known response ID if still not available + if (!effectivePreviousResponseId) { + effectivePreviousResponseId = this.lastResponseId + } + } + + // Format input and capture continuity id + const { formattedInput, previousResponseId } = this.prepareGpt5Input(systemPrompt, messages, metadata) + const requestPreviousResponseId = effectivePreviousResponseId ?? previousResponseId + + // Create a new promise for this request's response ID + this.responseIdPromise = new Promise((resolve) => { + this.responseIdResolver = resolve + }) + + // Build a request body (also used for fallback) + // Ensure we explicitly pass max_output_tokens for GPT‑5 based on Roo's reserved model response calculation + // so requests do not default to very large limits (e.g., 120k). + interface Gpt5RequestBody { + model: string + input: string + stream: boolean + reasoning?: { effort: ReasoningEffortWithMinimal; summary?: "auto" } + text?: { verbosity: VerbosityLevel } + temperature?: number + max_output_tokens?: number + previous_response_id?: string + } + + const requestBody: Gpt5RequestBody = { model: model.id, input: formattedInput, + stream: true, ...(reasoningEffort && { reasoning: { effort: reasoningEffort, + ...(this.options.enableGpt5ReasoningSummary ? { summary: "auto" as const } : {}), }, }), - text: { - verbosity: verbosity, - }, + text: { verbosity: (verbosity || "medium") as VerbosityLevel }, + temperature: this.options.modelTemperature ?? GPT5_DEFAULT_TEMPERATURE, + // Explicitly include the calculated max output tokens for GPT‑5. + // Use the per-request reserved output computed by Roo (params.maxTokens from getModelParams). + ...(model.maxTokens ? { max_output_tokens: model.maxTokens } : {}), + ...(requestPreviousResponseId && { previous_response_id: requestPreviousResponseId }), } - // Since the OpenAI SDK doesn't yet support the Responses API, - // we'll make a direct HTTP request - const response = await this.makeGpt5ResponsesAPIRequest(params, model) + try { + // Use the official SDK + const stream = (await (this.client as any).responses.create(requestBody)) as AsyncIterable - yield* this.handleGpt5StreamResponse(response, model) + if (typeof (stream as any)[Symbol.asyncIterator] !== "function") { + throw new Error( + "OpenAI SDK did not return an AsyncIterable for Responses API streaming. Falling back to SSE.", + ) + } + + for await (const event of stream) { + for await (const outChunk of this.processGpt5Event(event, model)) { + yield outChunk + } + } + } catch (sdkErr: any) { + // Check if this is a 400 error about previous_response_id not found + const errorMessage = sdkErr?.message || sdkErr?.error?.message || "" + const is400Error = sdkErr?.status === 400 || sdkErr?.response?.status === 400 + const isPreviousResponseError = + errorMessage.includes("Previous response") || errorMessage.includes("not found") + + if (is400Error && requestBody.previous_response_id && isPreviousResponseError) { + // Log the error and retry without the previous_response_id + console.warn( + `[GPT-5] Previous response ID not found (${requestBody.previous_response_id}), retrying without it`, + ) + + // Remove the problematic previous_response_id and retry + const retryRequestBody = { ...requestBody } + delete retryRequestBody.previous_response_id + + // Clear the stored lastResponseId to prevent using it again + this.lastResponseId = undefined + + try { + // Retry with the SDK + const retryStream = (await (this.client as any).responses.create( + retryRequestBody, + )) as AsyncIterable + + if (typeof (retryStream as any)[Symbol.asyncIterator] !== "function") { + // If SDK fails, fall back to SSE + yield* this.makeGpt5ResponsesAPIRequest(retryRequestBody, model, metadata) + return + } + + for await (const event of retryStream) { + for await (const outChunk of this.processGpt5Event(event, model)) { + yield outChunk + } + } + return + } catch (retryErr) { + // If retry also fails, fall back to SSE + yield* this.makeGpt5ResponsesAPIRequest(retryRequestBody, model, metadata) + return + } + } + + // For other errors, fallback to manual SSE via fetch + yield* this.makeGpt5ResponsesAPIRequest(requestBody, model, metadata) + } } private formatInputForResponsesAPI(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): string { - // Format the conversation for the Responses API's single input field - let formattedInput = `System: ${systemPrompt}\n\n` + // Format the conversation for the Responses API input field + // Use Developer role format for GPT-5 (aligning with o1/o3 Developer role usage per GPT-5 Responses guidance) + // This ensures consistent instruction handling across reasoning models + let formattedInput = `Developer: ${systemPrompt}\n\n` for (const message of messages) { const role = message.role === "user" ? "User" : "Assistant" - const content = - typeof message.content === "string" - ? message.content - : message.content.map((c) => (c.type === "text" ? c.text : "[image]")).join(" ") - formattedInput += `${role}: ${content}\n\n` + + // Handle text content + if (typeof message.content === "string") { + formattedInput += `${role}: ${message.content}\n\n` + } else if (Array.isArray(message.content)) { + // Handle content blocks + const textContent = message.content + .filter((block) => block.type === "text") + .map((block) => (block as any).text) + .join("\n") + if (textContent) { + formattedInput += `${role}: ${textContent}\n\n` + } + } } return formattedInput.trim() } + private formatSingleMessageForResponsesAPI(message: Anthropic.Messages.MessageParam): string { + // Format a single message for the Responses API when using previous_response_id + const role = message.role === "user" ? "User" : "Assistant" + + // Handle text content + if (typeof message.content === "string") { + return `${role}: ${message.content}` + } else if (Array.isArray(message.content)) { + // Handle content blocks + const textContent = message.content + .filter((block) => block.type === "text") + .map((block) => (block as any).text) + .join("\n") + if (textContent) { + return `${role}: ${textContent}` + } + } + + return "" + } + + private async *makeGpt5ResponsesAPIRequest( + requestBody: any, + model: OpenAiNativeModel, + metadata?: ApiHandlerCreateMessageMetadata, + ): ApiStream { + const apiKey = this.options.openAiNativeApiKey ?? "not-provided" + const baseUrl = this.options.openAiNativeBaseUrl || "https://api.openai.com" + const url = `${baseUrl}/v1/responses` + + try { + const response = await fetch(url, { + method: "POST", + headers: { + "Content-Type": "application/json", + Authorization: `Bearer ${apiKey}`, + Accept: "text/event-stream", + }, + body: JSON.stringify(requestBody), + }) + + if (!response.ok) { + const errorText = await response.text() + + let errorMessage = `GPT-5 API request failed (${response.status})` + let errorDetails = "" + + // Try to parse error as JSON for better error messages + try { + const errorJson = JSON.parse(errorText) + if (errorJson.error?.message) { + errorDetails = errorJson.error.message + } else if (errorJson.message) { + errorDetails = errorJson.message + } else { + errorDetails = errorText + } + } catch { + // If not JSON, use the raw text + errorDetails = errorText + } + + // Check if this is a 400 error about previous_response_id not found + const isPreviousResponseError = + errorDetails.includes("Previous response") || errorDetails.includes("not found") + + if (response.status === 400 && requestBody.previous_response_id && isPreviousResponseError) { + // Log the error and retry without the previous_response_id + console.warn( + `[GPT-5 SSE] Previous response ID not found (${requestBody.previous_response_id}), retrying without it`, + ) + + // Remove the problematic previous_response_id and retry + const retryRequestBody = { ...requestBody } + delete retryRequestBody.previous_response_id + + // Clear the stored lastResponseId to prevent using it again + this.lastResponseId = undefined + // Resolve the promise once to unblock any waiting requests + this.resolveResponseId(undefined) + + // Retry the request without the previous_response_id + const retryResponse = await fetch(url, { + method: "POST", + headers: { + "Content-Type": "application/json", + Authorization: `Bearer ${apiKey}`, + Accept: "text/event-stream", + }, + body: JSON.stringify(retryRequestBody), + }) + + if (!retryResponse.ok) { + // If retry also fails, throw the original error + throw new Error(`GPT-5 API retry failed (${retryResponse.status})`) + } + + if (!retryResponse.body) { + throw new Error("GPT-5 Responses API error: No response body from retry request") + } + + // Handle the successful retry response + yield* this.handleGpt5StreamResponse(retryResponse.body, model) + return + } + + // Provide user-friendly error messages based on status code + switch (response.status) { + case 400: + errorMessage = "Invalid request to GPT-5 API. Please check your input parameters." + break + case 401: + errorMessage = "Authentication failed. Please check your OpenAI API key." + break + case 403: + errorMessage = "Access denied. Your API key may not have access to GPT-5 models." + break + case 404: + errorMessage = + "GPT-5 API endpoint not found. The model may not be available yet or requires a different configuration." + break + case 429: + errorMessage = "Rate limit exceeded. Please try again later." + break + case 500: + case 502: + case 503: + errorMessage = "OpenAI service error. Please try again later." + break + default: + errorMessage = `GPT-5 API error (${response.status})` + } + + // Append details if available + if (errorDetails) { + errorMessage += ` - ${errorDetails}` + } + + throw new Error(errorMessage) + } + + if (!response.body) { + throw new Error("GPT-5 Responses API error: No response body") + } + + // Handle streaming response + yield* this.handleGpt5StreamResponse(response.body, model) + } catch (error) { + if (error instanceof Error) { + // Re-throw with the original error message if it's already formatted + if (error.message.includes("GPT-5")) { + throw error + } + // Otherwise, wrap it with context + throw new Error(`Failed to connect to GPT-5 API: ${error.message}`) + } + // Handle non-Error objects + throw new Error(`Unexpected error connecting to GPT-5 API`) + } + } + + /** + * Prepares the input and conversation continuity parameters for a GPT-5 API call. + * + * - If a `previousResponseId` is available (either from metadata or the handler's state), + * it formats only the most recent user message for the input and returns the response ID + * to maintain conversation context. + * - Otherwise, it formats the entire conversation history (system prompt + messages) for the input. + * + * @returns An object containing the formatted input string and the previous response ID (if used). + */ + private prepareGpt5Input( + systemPrompt: string, + messages: Anthropic.Messages.MessageParam[], + metadata?: ApiHandlerCreateMessageMetadata, + ): { formattedInput: string; previousResponseId?: string } { + // Respect explicit suppression signal for continuity (e.g. immediately after condense) + const isFirstMessage = messages.length === 1 && messages[0].role === "user" + const allowFallback = !metadata?.suppressPreviousResponseId + + const previousResponseId = + metadata?.previousResponseId ?? (allowFallback && !isFirstMessage ? this.lastResponseId : undefined) + + if (previousResponseId) { + const lastUserMessage = [...messages].reverse().find((msg) => msg.role === "user") + const formattedInput = lastUserMessage ? this.formatSingleMessageForResponsesAPI(lastUserMessage) : "" + return { formattedInput, previousResponseId } + } else { + const formattedInput = this.formatInputForResponsesAPI(systemPrompt, messages) + return { formattedInput } + } + } + + /** + * Handles the streaming response from the GPT-5 Responses API. + * + * This function iterates through the Server-Sent Events (SSE) stream, parses each event, + * and yields structured data chunks (`ApiStream`). It handles a wide variety of event types, + * including text deltas, reasoning, usage data, and various status/tool events. + * + * The following event types are intentionally ignored as they are not currently consumed + * by the client application: + * - Audio events (`response.audio.*`) + * - Most tool call events (e.g., `response.function_call_arguments.*`, `response.mcp_call.*`, etc.) + * as the client does not yet support rendering these tool interactions. + * - Status events (`response.created`, `response.in_progress`, etc.) as they are informational + * and do not affect the final output. + */ + private async *handleGpt5StreamResponse(body: ReadableStream, model: OpenAiNativeModel): ApiStream { + const reader = body.getReader() + const decoder = new TextDecoder() + let buffer = "" + let hasContent = false + let totalInputTokens = 0 + let totalOutputTokens = 0 + + try { + while (true) { + const { done, value } = await reader.read() + if (done) break + + buffer += decoder.decode(value, { stream: true }) + const lines = buffer.split("\n") + buffer = lines.pop() || "" + + for (const line of lines) { + if (line.startsWith("data: ")) { + const data = line.slice(6).trim() + if (data === "[DONE]") { + continue + } + + try { + const parsed = JSON.parse(data) + + // Store response ID for conversation continuity + if (parsed.response?.id) { + this.resolveResponseId(parsed.response.id) + } + + // Delegate standard event types to the shared processor to avoid duplication + if (parsed?.type && this.gpt5CoreHandledTypes.has(parsed.type)) { + for await (const outChunk of this.processGpt5Event(parsed, model)) { + // Track whether we've emitted any content so fallback handling can decide appropriately + if (outChunk.type === "text" || outChunk.type === "reasoning") { + hasContent = true + } + yield outChunk + } + continue + } + + // Check if this is a complete response (non-streaming format) + if (parsed.response && parsed.response.output && Array.isArray(parsed.response.output)) { + // Handle complete response in the initial event + for (const outputItem of parsed.response.output) { + if (outputItem.type === "text" && outputItem.content) { + for (const content of outputItem.content) { + if (content.type === "text" && content.text) { + hasContent = true + yield { + type: "text", + text: content.text, + } + } + } + } + // Additionally handle reasoning summaries if present (non-streaming summary output) + if (outputItem.type === "reasoning" && Array.isArray(outputItem.summary)) { + for (const summary of outputItem.summary) { + if (summary?.type === "summary_text" && typeof summary.text === "string") { + hasContent = true + yield { + type: "reasoning", + text: summary.text, + } + } + } + } + } + // Check for usage in the complete response + if (parsed.response.usage) { + const usageData = this.normalizeGpt5Usage(parsed.response.usage, model) + if (usageData) { + yield usageData + } + } + } + // Handle streaming delta events for text content + else if ( + parsed.type === "response.text.delta" || + parsed.type === "response.output_text.delta" + ) { + // Primary streaming event for text deltas + if (parsed.delta) { + hasContent = true + yield { + type: "text", + text: parsed.delta, + } + } + } else if ( + parsed.type === "response.text.done" || + parsed.type === "response.output_text.done" + ) { + // Text streaming completed - final text already streamed via deltas + } + // Handle reasoning delta events + else if ( + parsed.type === "response.reasoning.delta" || + parsed.type === "response.reasoning_text.delta" + ) { + // Streaming reasoning content + if (parsed.delta) { + hasContent = true + yield { + type: "reasoning", + text: parsed.delta, + } + } + } else if ( + parsed.type === "response.reasoning.done" || + parsed.type === "response.reasoning_text.done" + ) { + // Reasoning streaming completed + } + // Handle reasoning summary events + else if ( + parsed.type === "response.reasoning_summary.delta" || + parsed.type === "response.reasoning_summary_text.delta" + ) { + // Streaming reasoning summary + if (parsed.delta) { + hasContent = true + yield { + type: "reasoning", + text: parsed.delta, + } + } + } else if ( + parsed.type === "response.reasoning_summary.done" || + parsed.type === "response.reasoning_summary_text.done" + ) { + // Reasoning summary completed + } + // Handle refusal delta events + else if (parsed.type === "response.refusal.delta") { + // Model is refusing to answer + if (parsed.delta) { + hasContent = true + yield { + type: "text", + text: `[Refusal] ${parsed.delta}`, + } + } + } else if (parsed.type === "response.refusal.done") { + // Refusal completed + } + // Handle audio delta events (for multimodal responses) + else if (parsed.type === "response.audio.delta") { + // Audio streaming - we'll skip for now as we focus on text + // Could be handled in future for voice responses + } else if (parsed.type === "response.audio.done") { + // Audio completed + } + // Handle audio transcript delta events + else if (parsed.type === "response.audio_transcript.delta") { + // Audio transcript streaming + if (parsed.delta) { + hasContent = true + yield { + type: "text", + text: parsed.delta, + } + } + } else if (parsed.type === "response.audio_transcript.done") { + // Audio transcript completed + } + // Handle content part events (for structured content) + else if (parsed.type === "response.content_part.added") { + // New content part added - could be text, image, etc. + if (parsed.part?.type === "text" && parsed.part.text) { + hasContent = true + yield { + type: "text", + text: parsed.part.text, + } + } + } else if (parsed.type === "response.content_part.done") { + // Content part completed + } + // Handle output item events (alternative format) + else if (parsed.type === "response.output_item.added") { + // This is where the actual content comes through in some test cases + if (parsed.item) { + if (parsed.item.type === "text" && parsed.item.text) { + hasContent = true + yield { type: "text", text: parsed.item.text } + } else if (parsed.item.type === "reasoning" && parsed.item.text) { + hasContent = true + yield { type: "reasoning", text: parsed.item.text } + } else if (parsed.item.type === "message" && parsed.item.content) { + // Handle message type items + for (const content of parsed.item.content) { + if (content.type === "text" && content.text) { + hasContent = true + yield { type: "text", text: content.text } + } + } + } + } + } else if (parsed.type === "response.output_item.done") { + // Output item completed + } + // Handle function/tool call events + else if (parsed.type === "response.function_call_arguments.delta") { + // Function call arguments streaming + // We could yield this as a special type if needed for tool usage + } else if (parsed.type === "response.function_call_arguments.done") { + // Function call completed + } + // Handle MCP (Model Context Protocol) tool events + else if (parsed.type === "response.mcp_call_arguments.delta") { + // MCP tool call arguments streaming + } else if (parsed.type === "response.mcp_call_arguments.done") { + // MCP tool call completed + } else if (parsed.type === "response.mcp_call.in_progress") { + // MCP tool call in progress + } else if ( + parsed.type === "response.mcp_call.completed" || + parsed.type === "response.mcp_call.failed" + ) { + // MCP tool call status events + } else if (parsed.type === "response.mcp_list_tools.in_progress") { + // MCP list tools in progress + } else if ( + parsed.type === "response.mcp_list_tools.completed" || + parsed.type === "response.mcp_list_tools.failed" + ) { + // MCP list tools status events + } + // Handle web search events + else if (parsed.type === "response.web_search_call.searching") { + // Web search in progress + } else if (parsed.type === "response.web_search_call.in_progress") { + // Processing web search results + } else if (parsed.type === "response.web_search_call.completed") { + // Web search completed + } + // Handle code interpreter events + else if (parsed.type === "response.code_interpreter_call_code.delta") { + // Code interpreter code streaming + if (parsed.delta) { + // Could yield as a special code type if needed + } + } else if (parsed.type === "response.code_interpreter_call_code.done") { + // Code interpreter code completed + } else if (parsed.type === "response.code_interpreter_call.interpreting") { + // Code interpreter running + } else if (parsed.type === "response.code_interpreter_call.in_progress") { + // Code execution in progress + } else if (parsed.type === "response.code_interpreter_call.completed") { + // Code interpreter completed + } + // Handle file search events + else if (parsed.type === "response.file_search_call.searching") { + // File search in progress + } else if (parsed.type === "response.file_search_call.in_progress") { + // Processing file search results + } else if (parsed.type === "response.file_search_call.completed") { + // File search completed + } + // Handle image generation events + else if (parsed.type === "response.image_gen_call.generating") { + // Image generation in progress + } else if (parsed.type === "response.image_gen_call.in_progress") { + // Processing image generation + } else if (parsed.type === "response.image_gen_call.partial_image") { + // Image partially generated + } else if (parsed.type === "response.image_gen_call.completed") { + // Image generation completed + } + // Handle computer use events + else if ( + parsed.type === "response.computer_tool_call.output_item" || + parsed.type === "response.computer_tool_call.output_screenshot" + ) { + // Computer use tool events + } + // Handle annotation events + else if ( + parsed.type === "response.output_text_annotation.added" || + parsed.type === "response.text_annotation.added" + ) { + // Text annotation events - could be citations, references, etc. + } + // Handle error events + else if (parsed.type === "response.error" || parsed.type === "error") { + // Error event from the API + if (parsed.error || parsed.message) { + throw new Error( + `GPT-5 API error: ${parsed.error?.message || parsed.message || "Unknown error"}`, + ) + } + } + // Handle incomplete event + else if (parsed.type === "response.incomplete") { + // Response was incomplete - might need to handle specially + } + // Handle queued event + else if (parsed.type === "response.queued") { + // Response is queued + } + // Handle in_progress event + else if (parsed.type === "response.in_progress") { + // Response is being processed + } + // Handle failed event + else if (parsed.type === "response.failed") { + // Response failed + if (parsed.error || parsed.message) { + throw new Error( + `GPT-5 response failed: ${parsed.error?.message || parsed.message || "Unknown failure"}`, + ) + } + } else if (parsed.type === "response.completed" || parsed.type === "response.done") { + // Store response ID for conversation continuity + if (parsed.response?.id) { + this.resolveResponseId(parsed.response.id) + } + + // Check if the done event contains the complete output (as a fallback) + if ( + !hasContent && + parsed.response && + parsed.response.output && + Array.isArray(parsed.response.output) + ) { + for (const outputItem of parsed.response.output) { + if (outputItem.type === "message" && outputItem.content) { + for (const content of outputItem.content) { + if (content.type === "output_text" && content.text) { + hasContent = true + yield { + type: "text", + text: content.text, + } + } + } + } + // Also surface reasoning summaries if present in the final output + if (outputItem.type === "reasoning" && Array.isArray(outputItem.summary)) { + for (const summary of outputItem.summary) { + if ( + summary?.type === "summary_text" && + typeof summary.text === "string" + ) { + hasContent = true + yield { + type: "reasoning", + text: summary.text, + } + } + } + } + } + } + + // Usage for done/completed is already handled by processGpt5Event in SDK path. + // For SSE path, usage often arrives separately; avoid double-emitting here. + } + // These are structural or status events, we can just log them at a lower level or ignore. + else if ( + parsed.type === "response.created" || + parsed.type === "response.in_progress" || + parsed.type === "response.output_item.done" || + parsed.type === "response.content_part.added" || + parsed.type === "response.content_part.done" + ) { + // Status events - no action needed + } + // Fallback for older formats or unexpected responses + else if (parsed.choices?.[0]?.delta?.content) { + hasContent = true + yield { + type: "text", + text: parsed.choices[0].delta.content, + } + } + // Additional fallback: some events place text under 'item.text' even if type isn't matched above + else if ( + parsed.item && + typeof parsed.item.text === "string" && + parsed.item.text.length > 0 + ) { + hasContent = true + yield { + type: "text", + text: parsed.item.text, + } + } else if (parsed.usage) { + // Handle usage if it arrives in a separate, non-completed event + const usageData = this.normalizeGpt5Usage(parsed.usage, model) + if (usageData) { + yield usageData + } + } + } catch (e) { + // Silently ignore parsing errors for non-critical SSE data + } + } + // Also try to parse non-SSE formatted lines + else if (line.trim() && !line.startsWith(":")) { + try { + const parsed = JSON.parse(line) + + // Try to extract content from various possible locations + if (parsed.content || parsed.text || parsed.message) { + hasContent = true + yield { + type: "text", + text: parsed.content || parsed.text || parsed.message, + } + } + } catch { + // Not JSON, might be plain text - ignore + } + } + } + } + + // If we didn't get any content, don't throw - the API might have returned an empty response + // This can happen in certain edge cases and shouldn't break the flow + } catch (error) { + if (error instanceof Error) { + throw new Error(`Error processing GPT-5 response stream: ${error.message}`) + } + throw new Error("Unexpected error processing GPT-5 response stream") + } finally { + reader.releaseLock() + } + } + + /** + * Shared processor for GPT‑5 Responses API events. + * Used by both the official SDK streaming path and (optionally) by the SSE fallback. + */ + private async *processGpt5Event(event: any, model: OpenAiNativeModel): ApiStream { + // Persist response id for conversation continuity when available + if (event?.response?.id) { + this.resolveResponseId(event.response.id) + } + + // Handle known streaming text deltas + if (event?.type === "response.text.delta" || event?.type === "response.output_text.delta") { + if (event?.delta) { + yield { type: "text", text: event.delta } + } + return + } + + // Handle reasoning deltas (including summary variants) + if ( + event?.type === "response.reasoning.delta" || + event?.type === "response.reasoning_text.delta" || + event?.type === "response.reasoning_summary.delta" || + event?.type === "response.reasoning_summary_text.delta" + ) { + if (event?.delta) { + yield { type: "reasoning", text: event.delta } + } + return + } + + // Handle refusal deltas + if (event?.type === "response.refusal.delta") { + if (event?.delta) { + yield { type: "text", text: `[Refusal] ${event.delta}` } + } + return + } + + // Handle output item additions (SDK or Responses API alternative format) + if (event?.type === "response.output_item.added") { + const item = event?.item + if (item) { + if (item.type === "text" && item.text) { + yield { type: "text", text: item.text } + } else if (item.type === "reasoning" && item.text) { + yield { type: "reasoning", text: item.text } + } else if (item.type === "message" && Array.isArray(item.content)) { + for (const content of item.content) { + // Some implementations send 'text'; others send 'output_text' + if ((content?.type === "text" || content?.type === "output_text") && content?.text) { + yield { type: "text", text: content.text } + } + } + } + } + return + } + + // Completion events that may carry usage + if (event?.type === "response.done" || event?.type === "response.completed") { + const usage = event?.response?.usage || event?.usage || undefined + const usageData = this.normalizeGpt5Usage(usage, model) + if (usageData) { + yield usageData + } + return + } + + // Fallbacks for older formats or unexpected objects + if (event?.choices?.[0]?.delta?.content) { + yield { type: "text", text: event.choices[0].delta.content } + return + } + + if (event?.usage) { + const usageData = this.normalizeGpt5Usage(event.usage, model) + if (usageData) { + yield usageData + } + } + } + private getGpt5ReasoningEffort(model: OpenAiNativeModel): ReasoningEffortWithMinimal | undefined { - const { reasoning } = model + const { reasoning, info } = model // Check if reasoning effort is configured if (reasoning && "reasoning_effort" in reasoning) { - const effort = reasoning.reasoning_effort - // Support the new "minimal" effort level for GPT-5 - if (effort === "low" || effort === "medium" || effort === "high") { - return effort + const effort = reasoning.reasoning_effort as string + // Support all effort levels including "minimal" for GPT-5 + if (effort === "minimal" || effort === "low" || effort === "medium" || effort === "high") { + return effort as ReasoningEffortWithMinimal } } - // Default to "minimal" for GPT-5 models when not specified - // This provides fastest time-to-first-token as per documentation - return "minimal" - } - - private async makeGpt5ResponsesAPIRequest( - params: GPT5ResponsesAPIParams, - model: OpenAiNativeModel, - ): Promise> { - // The OpenAI SDK doesn't have direct support for the Responses API yet, - // but we can access it through the underlying client request method if available. - // For now, we'll use the Chat Completions API with GPT-5 specific formatting - // to maintain compatibility while the Responses API SDK support is being added. - - // Convert Responses API params to Chat Completions format - // GPT-5 models use "developer" role for system messages - const messages: OpenAI.Chat.ChatCompletionMessageParam[] = [{ role: "developer", content: params.input }] - - // Build the request parameters - const requestParams: any = { - model: params.model, - messages, - stream: true, - stream_options: { include_usage: true }, - } - - // Add reasoning effort if specified (supporting "minimal" for GPT-5) - if (params.reasoning?.effort) { - if (params.reasoning.effort === "minimal") { - // For minimal effort, we pass "minimal" as the reasoning_effort - requestParams.reasoning_effort = "minimal" - } else { - requestParams.reasoning_effort = params.reasoning.effort - } - } - - // Add verbosity control for GPT-5 models - // According to the docs, Chat Completions API also supports verbosity parameter - if (params.text?.verbosity) { - requestParams.verbosity = params.text.verbosity - } - - const stream = (await this.client.chat.completions.create( - requestParams, - )) as unknown as AsyncIterable - - // Convert the stream to GPT-5 response format - return this.convertChatStreamToGpt5Format(stream) - } - - private async *convertChatStreamToGpt5Format( - stream: AsyncIterable, - ): AsyncIterable { - for await (const chunk of stream) { - const delta = chunk.choices[0]?.delta - - if (delta?.content) { - yield { - type: "text", - text: delta.content, - } - } - - if (chunk.usage) { - yield { - type: "usage", - usage: { - input_tokens: chunk.usage.prompt_tokens || 0, - output_tokens: chunk.usage.completion_tokens || 0, - total_tokens: chunk.usage.total_tokens || 0, - }, - } - } - } - } - - private async *handleGpt5StreamResponse( - stream: AsyncIterable, - model: OpenAiNativeModel, - ): ApiStream { - for await (const chunk of stream) { - if (chunk.type === "text" && chunk.text) { - yield { - type: "text", - text: chunk.text, - } - } else if (chunk.type === "usage" && chunk.usage) { - const inputTokens = chunk.usage.input_tokens - const outputTokens = chunk.usage.output_tokens - const cacheReadTokens = 0 - const cacheWriteTokens = 0 - const totalCost = calculateApiCostOpenAI( - model.info, - inputTokens, - outputTokens, - cacheWriteTokens, - cacheReadTokens, - ) - - yield { - type: "usage", - inputTokens, - outputTokens, - cacheWriteTokens, - cacheReadTokens, - totalCost, - } - } - } + // Centralize default: use the model's default from types if available; otherwise undefined + return info.reasoningEffort as ReasoningEffortWithMinimal | undefined } private isGpt5Model(modelId: string): boolean { @@ -376,16 +1152,28 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio } private async *yieldUsage(info: ModelInfo, usage: OpenAI.Completions.CompletionUsage | undefined): ApiStream { - const inputTokens = usage?.prompt_tokens || 0 // sum of cache hits and misses + const inputTokens = usage?.prompt_tokens || 0 const outputTokens = usage?.completion_tokens || 0 - const cacheReadTokens = usage?.prompt_tokens_details?.cached_tokens || 0 - const cacheWriteTokens = 0 - const totalCost = calculateApiCostOpenAI(info, inputTokens, outputTokens, cacheWriteTokens, cacheReadTokens) - const nonCachedInputTokens = Math.max(0, inputTokens - cacheReadTokens - cacheWriteTokens) + + // Extract cache tokens from prompt_tokens_details + // According to OpenAI API, cached_tokens represents tokens read from cache + const cacheReadTokens = usage?.prompt_tokens_details?.cached_tokens || undefined + + // Cache write tokens are not typically reported in the standard streaming response + // They would be in cache_creation_input_tokens if available + const cacheWriteTokens = (usage as any)?.cache_creation_input_tokens || undefined + + const totalCost = calculateApiCostOpenAI( + info, + inputTokens, + outputTokens, + cacheWriteTokens || 0, + cacheReadTokens || 0, + ) yield { type: "usage", - inputTokens: nonCachedInputTokens, + inputTokens: inputTokens, outputTokens: outputTokens, cacheWriteTokens: cacheWriteTokens, cacheReadTokens: cacheReadTokens, @@ -406,15 +1194,17 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio modelId: id, model: info, settings: this.options, - defaultTemperature: OPENAI_NATIVE_DEFAULT_TEMPERATURE, + defaultTemperature: this.isGpt5Model(id) ? GPT5_DEFAULT_TEMPERATURE : OPENAI_NATIVE_DEFAULT_TEMPERATURE, }) // For GPT-5 models, ensure we support minimal reasoning effort - if (this.isGpt5Model(id) && params.reasoning) { - // Allow "minimal" effort for GPT-5 models - const effort = this.options.reasoningEffort - if (effort === "low" || effort === "medium" || effort === "high") { - params.reasoning.reasoning_effort = effort + if (this.isGpt5Model(id)) { + const effort = + (this.options.reasoningEffort as ReasoningEffortWithMinimal | undefined) ?? + (info.reasoningEffort as ReasoningEffortWithMinimal | undefined) + + if (effort) { + ;(params.reasoning as any) = { reasoning_effort: effort } } } @@ -423,25 +1213,62 @@ export class OpenAiNativeHandler extends BaseProvider implements SingleCompletio return { id: id.startsWith("o3-mini") ? "o3-mini" : id, info, ...params, verbosity: params.verbosity } } + /** + * Gets the last GPT-5 response ID captured from the Responses API stream. + * Used for maintaining conversation continuity across requests. + * @returns The response ID, or undefined if not available yet + */ + getLastResponseId(): string | undefined { + return this.lastResponseId + } + + /** + * Sets the last GPT-5 response ID for conversation continuity. + * Typically only used in tests or special flows. + * @param responseId The GPT-5 response ID to store + */ + setResponseId(responseId: string): void { + this.lastResponseId = responseId + } + async completePrompt(prompt: string): Promise { try { const { id, temperature, reasoning, verbosity } = this.getModel() + const isGpt5 = this.isGpt5Model(id) - const params: OpenAI.Chat.Completions.ChatCompletionCreateParamsNonStreaming & { - verbosity?: VerbosityLevel - } = { + if (isGpt5) { + // GPT-5 uses the Responses API, not Chat Completions. Avoid undefined behavior here. + throw new Error( + "completePrompt is not supported for GPT-5 models. Use createMessage (Responses API) instead.", + ) + } + + const params: any = { model: id, messages: [{ role: "user", content: prompt }], - temperature, - ...(reasoning && reasoning), } - // Add verbosity for GPT-5 models - if (this.isGpt5Model(id) && verbosity) { - params.verbosity = verbosity + // Add temperature if supported + if (temperature !== undefined) { + params.temperature = temperature } - const response = await this.client.chat.completions.create(params as any) + // For GPT-5 models, add reasoning_effort and verbosity as top-level parameters + if (isGpt5) { + if (reasoning && "reasoning_effort" in reasoning) { + params.reasoning_effort = reasoning.reasoning_effort + } + if (verbosity) { + params.verbosity = verbosity + } + } else { + // For non-GPT-5 models, add reasoning as is + if (reasoning) { + Object.assign(params, reasoning) + } + } + + const response = await this.client.chat.completions.create(params) return response.choices[0]?.message.content || "" } catch (error) { if (error instanceof Error) { diff --git a/src/api/providers/openai.ts b/src/api/providers/openai.ts index 85abcf1a69..eed719cf0f 100644 --- a/src/api/providers/openai.ts +++ b/src/api/providers/openai.ts @@ -305,7 +305,7 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl ], stream: true, ...(isGrokXAI ? {} : { stream_options: { include_usage: true } }), - reasoning_effort: modelInfo.reasoningEffort, + reasoning_effort: modelInfo.reasoningEffort as "low" | "medium" | "high" | undefined, temperature: undefined, } @@ -330,7 +330,7 @@ export class OpenAiHandler extends BaseProvider implements SingleCompletionHandl }, ...convertToOpenAiMessages(messages), ], - reasoning_effort: modelInfo.reasoningEffort, + reasoning_effort: modelInfo.reasoningEffort as "low" | "medium" | "high" | undefined, temperature: undefined, } diff --git a/src/api/providers/requesty.ts b/src/api/providers/requesty.ts index 8af0b9aa42..d2e55fc8f0 100644 --- a/src/api/providers/requesty.ts +++ b/src/api/providers/requesty.ts @@ -116,7 +116,7 @@ export class RequestyHandler extends BaseProvider implements SingleCompletionHan model, max_tokens, temperature, - ...(reasoning_effort && { reasoning_effort }), + ...(reasoning_effort && reasoning_effort !== "minimal" && { reasoning_effort }), ...(thinking && { thinking }), stream: true, stream_options: { include_usage: true }, diff --git a/src/api/transform/model-params.ts b/src/api/transform/model-params.ts index cc30aa5605..933697c0a5 100644 --- a/src/api/transform/model-params.ts +++ b/src/api/transform/model-params.ts @@ -2,6 +2,7 @@ import { type ModelInfo, type ProviderSettings, type VerbosityLevel, + type ReasoningEffortWithMinimal, ANTHROPIC_DEFAULT_MAX_TOKENS, } from "@roo-code/types" @@ -38,7 +39,7 @@ type GetModelParamsOptions = { type BaseModelParams = { maxTokens: number | undefined temperature: number | undefined - reasoningEffort: "low" | "medium" | "high" | undefined + reasoningEffort: ReasoningEffortWithMinimal | undefined reasoningBudget: number | undefined verbosity: VerbosityLevel | undefined } @@ -128,7 +129,8 @@ export function getModelParams({ temperature = 1.0 } else if (shouldUseReasoningEffort({ model, settings })) { // "Traditional" reasoning models use the `reasoningEffort` parameter. - reasoningEffort = customReasoningEffort ?? model.reasoningEffort + const effort = customReasoningEffort ?? model.reasoningEffort + reasoningEffort = effort as ReasoningEffortWithMinimal } const params: BaseModelParams = { maxTokens, temperature, reasoningEffort, reasoningBudget, verbosity } diff --git a/src/api/transform/reasoning.ts b/src/api/transform/reasoning.ts index a173c59b19..46ef029ea3 100644 --- a/src/api/transform/reasoning.ts +++ b/src/api/transform/reasoning.ts @@ -2,7 +2,7 @@ import { BetaThinkingConfigParam } from "@anthropic-ai/sdk/resources/beta" import OpenAI from "openai" import type { GenerateContentConfig } from "@google/genai" -import type { ModelInfo, ProviderSettings } from "@roo-code/types" +import type { ModelInfo, ProviderSettings, ReasoningEffortWithMinimal } from "@roo-code/types" import { shouldUseReasoningBudget, shouldUseReasoningEffort } from "../../shared/api" @@ -23,7 +23,7 @@ export type GeminiReasoningParams = GenerateContentConfig["thinkingConfig"] export type GetModelReasoningOptions = { model: ModelInfo reasoningBudget: number | undefined - reasoningEffort: ReasoningEffort | undefined + reasoningEffort: ReasoningEffortWithMinimal | undefined settings: ProviderSettings } @@ -36,7 +36,9 @@ export const getOpenRouterReasoning = ({ shouldUseReasoningBudget({ model, settings }) ? { max_tokens: reasoningBudget } : shouldUseReasoningEffort({ model, settings }) - ? { effort: reasoningEffort } + ? reasoningEffort !== "minimal" + ? { effort: reasoningEffort } + : undefined : undefined export const getAnthropicReasoning = ({ @@ -50,8 +52,19 @@ export const getOpenAiReasoning = ({ model, reasoningEffort, settings, -}: GetModelReasoningOptions): OpenAiReasoningParams | undefined => - shouldUseReasoningEffort({ model, settings }) ? { reasoning_effort: reasoningEffort } : undefined +}: GetModelReasoningOptions): OpenAiReasoningParams | undefined => { + if (!shouldUseReasoningEffort({ model, settings })) { + return undefined + } + + // If model has reasoning effort capability, return object even if effort is undefined + // This preserves the reasoning_effort field in the API call + if (reasoningEffort === "minimal") { + return undefined + } + + return { reasoning_effort: reasoningEffort } +} export const getGeminiReasoning = ({ model, diff --git a/src/core/task/Task.ts b/src/core/task/Task.ts index 3cb6abe7f7..1dd615f0eb 100644 --- a/src/core/task/Task.ts +++ b/src/core/task/Task.ts @@ -252,6 +252,8 @@ export class Task extends EventEmitter implements TaskLike { didCompleteReadingStream = false assistantMessageParser?: AssistantMessageParser isAssistantMessageParserEnabled = false + private lastUsedInstructions?: string + private skipPrevResponseIdOnce: boolean = false constructor({ provider, @@ -824,6 +826,7 @@ export class Task extends EventEmitter implements TaskLike { progressStatus?: ToolProgressStatus, options: { isNonInteractive?: boolean + metadata?: Record } = {}, contextCondense?: ContextCondense, ): Promise { @@ -861,6 +864,7 @@ export class Task extends EventEmitter implements TaskLike { images, partial, contextCondense, + metadata: options.metadata, }) } } else { @@ -876,6 +880,9 @@ export class Task extends EventEmitter implements TaskLike { lastMessage.images = images lastMessage.partial = false lastMessage.progressStatus = progressStatus + if (options.metadata) { + ;(lastMessage as any).metadata = options.metadata + } // Instead of streaming partialMessage events, we do a save // and post like normal to persist to disk. @@ -891,7 +898,15 @@ export class Task extends EventEmitter implements TaskLike { this.lastMessageTs = sayTs } - await this.addToClineMessages({ ts: sayTs, type: "say", say: type, text, images, contextCondense }) + await this.addToClineMessages({ + ts: sayTs, + type: "say", + say: type, + text, + images, + contextCondense, + metadata: options.metadata, + }) } } } else { @@ -1736,6 +1751,8 @@ export class Task extends EventEmitter implements TaskLike { presentAssistantMessage(this) } + await this.persistGpt5Metadata(reasoningMessage) + updateApiReqMsg() await this.saveClineMessages() await this.providerRef.deref()?.postStateToWebview() @@ -1954,6 +1971,7 @@ export class Task extends EventEmitter implements TaskLike { Task.lastGlobalApiRequestTime = Date.now() const systemPrompt = await this.getSystemPrompt() + this.lastUsedInstructions = systemPrompt const { contextTokens } = this.getTokenUsage() if (contextTokens) { @@ -1992,6 +2010,10 @@ export class Task extends EventEmitter implements TaskLike { if (truncateResult.error) { await this.say("condense_context_error", truncateResult.error) } else if (truncateResult.summary) { + // A condense operation occurred; for the next GPT‑5 API call we should NOT + // send previous_response_id so the request reflects the fresh condensed context. + this.skipPrevResponseIdOnce = true + const { summary, cost, prevContextTokens, newContextTokens = 0 } = truncateResult const contextCondense: ContextCondense = { summary, cost, newContextTokens, prevContextTokens } await this.say( @@ -2008,7 +2030,7 @@ export class Task extends EventEmitter implements TaskLike { } const messagesSinceLastSummary = getMessagesSinceLastSummary(this.apiConversationHistory) - const cleanConversationHistory = maybeRemoveImageBlocks(messagesSinceLastSummary, this.api).map( + let cleanConversationHistory = maybeRemoveImageBlocks(messagesSinceLastSummary, this.api).map( ({ role, content }) => ({ role, content }), ) @@ -2024,9 +2046,41 @@ export class Task extends EventEmitter implements TaskLike { throw new Error("Auto-approval limit reached and user did not approve continuation") } + // Determine GPT‑5 previous_response_id from last persisted assistant turn (if available), + // unless a condense just occurred (skip once after condense). + let previousResponseId: string | undefined = undefined + try { + const modelId = this.api.getModel().id + if (modelId && modelId.startsWith("gpt-5") && !this.skipPrevResponseIdOnce) { + // Find the last assistant message that has a previous_response_id stored + const idx = findLastIndex( + this.clineMessages, + (m) => + m.type === "say" && + (m as any).say === "text" && + (m as any).metadata?.gpt5?.previous_response_id, + ) + if (idx !== -1) { + // Use the previous_response_id from the last assistant message for this request + previousResponseId = ((this.clineMessages[idx] as any).metadata.gpt5.previous_response_id || + undefined) as string | undefined + } + } + } catch { + // non-fatal + } + const metadata: ApiHandlerCreateMessageMetadata = { mode: mode, taskId: this.taskId, + ...(previousResponseId ? { previousResponseId } : {}), + // If a condense just occurred, explicitly suppress continuity fallback for the next call + ...(this.skipPrevResponseIdOnce ? { suppressPreviousResponseId: true } : {}), + } + + // Reset skip flag after applying (it only affects the immediate next call) + if (this.skipPrevResponseIdOnce) { + this.skipPrevResponseIdOnce = false } const stream = this.api.createMessage(systemPrompt, cleanConversationHistory, metadata) @@ -2172,6 +2226,35 @@ export class Task extends EventEmitter implements TaskLike { } } + /** + * Persist GPT-5 per-turn metadata (previous_response_id, instructions, reasoning_summary) + * onto the last complete assistant say("text") message. + */ + private async persistGpt5Metadata(reasoningMessage?: string): Promise { + try { + const modelId = this.api.getModel().id + if (!modelId || !modelId.startsWith("gpt-5")) return + + const lastResponseId: string | undefined = (this.api as any)?.getLastResponseId?.() + const idx = findLastIndex( + this.clineMessages, + (m) => m.type === "say" && (m as any).say === "text" && m.partial !== true, + ) + if (idx !== -1) { + const msg = this.clineMessages[idx] as any + msg.metadata = msg.metadata ?? {} + msg.metadata.gpt5 = { + ...(msg.metadata.gpt5 ?? {}), + previous_response_id: lastResponseId, + instructions: this.lastUsedInstructions, + reasoning_summary: (reasoningMessage ?? "").trim() || undefined, + } + } + } catch { + // Non-fatal error in metadata persistence + } + } + // Getters public get cwd() { diff --git a/src/shared/api.ts b/src/shared/api.ts index 014b903453..e9b57af3c1 100644 --- a/src/shared/api.ts +++ b/src/shared/api.ts @@ -6,8 +6,15 @@ import { } from "@roo-code/types" // ApiHandlerOptions - -export type ApiHandlerOptions = Omit +// Extend ProviderSettings (minus apiProvider) with handler-specific toggles. +export type ApiHandlerOptions = Omit & { + /** + * When true and using GPT‑5 Responses API, include reasoning.summary: "auto" + * so the API returns reasoning summaries (we already parse and surface them). + * Defaults to true; set to false to disable summaries. + */ + enableGpt5ReasoningSummary?: boolean +} // RouterName diff --git a/webview-ui/src/components/settings/ApiOptions.tsx b/webview-ui/src/components/settings/ApiOptions.tsx index 74ba885d25..70a58f03bf 100644 --- a/webview-ui/src/components/settings/ApiOptions.tsx +++ b/webview-ui/src/components/settings/ApiOptions.tsx @@ -576,6 +576,12 @@ const ApiOptions = ({ if (value !== "custom-arn" && selectedProvider === "bedrock") { setApiConfigurationField("awsCustomArn", "") } + + // Clear reasoning effort when switching models to allow the new model's default to take effect + // This is especially important for GPT-5 models which default to "medium" + if (selectedProvider === "openai-native") { + setApiConfigurationField("reasoningEffort", undefined) + } }}> @@ -617,11 +623,14 @@ const ApiOptions = ({ modelInfo={selectedModelInfo} /> - + {/* Gate Verbosity UI by capability flag */} + {selectedModelInfo?.supportsVerbosity && ( + + )} {!fromWelcomeView && ( diff --git a/webview-ui/src/components/settings/ThinkingBudget.tsx b/webview-ui/src/components/settings/ThinkingBudget.tsx index a49ec79efc..a3e2d428b4 100644 --- a/webview-ui/src/components/settings/ThinkingBudget.tsx +++ b/webview-ui/src/components/settings/ThinkingBudget.tsx @@ -1,7 +1,12 @@ import { useEffect } from "react" import { Checkbox } from "vscrui" -import { type ProviderSettings, type ModelInfo, type ReasoningEffort, reasoningEfforts } from "@roo-code/types" +import { + type ProviderSettings, + type ModelInfo, + type ReasoningEffortWithMinimal, + reasoningEfforts, +} from "@roo-code/types" import { DEFAULT_HYBRID_REASONING_MODEL_MAX_TOKENS, @@ -27,10 +32,35 @@ export const ThinkingBudget = ({ apiConfiguration, setApiConfigurationField, mod const isGemini25Pro = selectedModelId && selectedModelId.includes("gemini-2.5-pro") const minThinkingTokens = isGemini25Pro ? GEMINI_25_PRO_MIN_THINKING_TOKENS : 1024 + // Check if this is a GPT-5 model to show "minimal" option + // Only show minimal for OpenAI Native provider GPT-5 models + const isOpenAiNativeProvider = apiConfiguration.apiProvider === "openai-native" + const isGpt5Model = isOpenAiNativeProvider && selectedModelId && selectedModelId.startsWith("gpt-5") + // Add "minimal" option for GPT-5 models + // Spread to convert readonly tuple into a mutable array, then expose as readonly for safety + const baseEfforts = [...reasoningEfforts] as ReasoningEffortWithMinimal[] + const availableReasoningEfforts: ReadonlyArray = isGpt5Model + ? (["minimal", ...baseEfforts] as ReasoningEffortWithMinimal[]) + : baseEfforts + + // Default reasoning effort - use model's default if available + // GPT-5 models have "medium" as their default in the model configuration + const modelDefaultReasoningEffort = modelInfo?.reasoningEffort as ReasoningEffortWithMinimal | undefined + const defaultReasoningEffort: ReasoningEffortWithMinimal = modelDefaultReasoningEffort || "medium" + const currentReasoningEffort: ReasoningEffortWithMinimal = + (apiConfiguration.reasoningEffort as ReasoningEffortWithMinimal | undefined) || defaultReasoningEffort + const isReasoningBudgetSupported = !!modelInfo && modelInfo.supportsReasoningBudget const isReasoningBudgetRequired = !!modelInfo && modelInfo.requiredReasoningBudget const isReasoningEffortSupported = !!modelInfo && modelInfo.supportsReasoningEffort + // Set default reasoning effort when model supports it and no value is set + useEffect(() => { + if (isReasoningEffortSupported && !apiConfiguration.reasoningEffort && defaultReasoningEffort) { + setApiConfigurationField("reasoningEffort", defaultReasoningEffort) + } + }, [isReasoningEffortSupported, apiConfiguration.reasoningEffort, defaultReasoningEffort, setApiConfigurationField]) + const enableReasoningEffort = apiConfiguration.enableReasoningEffort const customMaxOutputTokens = apiConfiguration.modelMaxTokens || DEFAULT_HYBRID_REASONING_MODEL_MAX_TOKENS const customMaxThinkingTokens = @@ -109,13 +139,21 @@ export const ThinkingBudget = ({ apiConfiguration, setApiConfigurationField, mod
    + manager.transition({ + type: "UPDATE_FILTERS", + payload: { filters: { installed: value } }, + }) + }> + + + + + {t("marketplace:filters.installed.all")} + {t("marketplace:filters.installed.installed")} + + {t("marketplace:filters.installed.notInstalled")} + + + + {allTags.length > 0 && ( +
    + setIsTagPopoverOpen(open)}> + + + + e.stopPropagation()}> + +
    + + {tagSearch && ( + + )} +
    + + + {t("marketplace:filters.tags.noResults")} + + + {filteredTags.map((tag: string) => ( + { + const isSelected = state.filters.tags.includes(tag) + manager.transition({ + type: "UPDATE_FILTERS", + payload: { + filters: { + tags: isSelected + ? state.filters.tags.filter( + (t) => t !== tag, + ) + : [...state.filters.tags, tag], + }, }, - }, - }) - }} - data-selected={state.filters.tags.includes(tag)} - className="grid grid-cols-[1rem_1fr] gap-2 cursor-pointer text-sm capitalize" - onMouseDown={(e) => { - e.stopPropagation() - e.preventDefault() - }}> - {state.filters.tags.includes(tag) ? ( - - ) : ( - - )} - {tag} - - ))} - - -     -     -     - {state.filters.tags.length > 0 && ( -
    - - {t("marketplace:filters.tags.selected")} -
    - )} + }) + }} + data-selected={state.filters.tags.includes(tag)} + className="grid grid-cols-[1rem_1fr] gap-2 cursor-pointer text-sm capitalize" + onMouseDown={(e) => { + e.stopPropagation() + e.preventDefault() + }}> + {state.filters.tags.includes(tag) ? ( + + ) : ( + + )} + {tag} + + ))} + + + + + +
    + )} +
    + {state.filters.tags.length > 0 && ( +
    +
    + + {t("marketplace:filters.tags.selected")} +
    +
    )}
    @@ -187,7 +208,7 @@ export function MarketplaceListView({ stateManager, allTags, filteredTags, filte onClick={() => manager.transition({ type: "UPDATE_FILTERS", - payload: { filters: { search: "", type: "", tags: [] } }, + payload: { filters: { search: "", type: "", tags: [], installed: "all" } }, }) } className="mt-4 bg-vscode-button-secondaryBackground text-vscode-button-secondaryForeground hover:bg-vscode-button-secondaryHoverBackground transition-colors"> diff --git a/webview-ui/src/components/marketplace/MarketplaceViewStateManager.ts b/webview-ui/src/components/marketplace/MarketplaceViewStateManager.ts index 104f3e7cad..995e982164 100644 --- a/webview-ui/src/components/marketplace/MarketplaceViewStateManager.ts +++ b/webview-ui/src/components/marketplace/MarketplaceViewStateManager.ts @@ -14,6 +14,7 @@ import { MarketplaceItem } from "@roo-code/types" import { vscode } from "../../utils/vscode" import { WebviewMessage } from "../../../../src/shared/WebviewMessage" +import type { MarketplaceInstalledMetadata } from "../../../../src/shared/ExtensionMessage" export interface ViewState { allItems: MarketplaceItem[] @@ -26,7 +27,9 @@ export interface ViewState { type: string search: string tags: string[] + installed: "all" | "installed" | "not_installed" // Filter by installation status } + installedMetadata?: MarketplaceInstalledMetadata // Store installed metadata for filtering } type TransitionPayloads = { @@ -65,6 +68,7 @@ export class MarketplaceViewStateManager { type: "", search: "", tags: [], + installed: "all", }, } } @@ -189,8 +193,11 @@ export class MarketplaceViewStateManager { let newDisplayItems: MarketplaceItem[] let newDisplayOrganizationMcps: MarketplaceItem[] if (this.isFilterActive()) { - newDisplayItems = this.filterItems([...items]) - newDisplayOrganizationMcps = this.filterItems([...this.state.organizationMcps]) + newDisplayItems = this.filterItems([...items], this.state.installedMetadata) + newDisplayOrganizationMcps = this.filterItems( + [...this.state.organizationMcps], + this.state.installedMetadata, + ) } else { // No filters active - show all items newDisplayItems = [...items] @@ -251,6 +258,7 @@ export class MarketplaceViewStateManager { type: filters.type !== undefined ? filters.type : this.state.filters.type, search: filters.search !== undefined ? filters.search : this.state.filters.search, tags: filters.tags !== undefined ? filters.tags : this.state.filters.tags, + installed: filters.installed !== undefined ? filters.installed : this.state.filters.installed, } // Update filters first @@ -260,8 +268,11 @@ export class MarketplaceViewStateManager { } // Apply filters to displayItems and displayOrganizationMcps with the updated filters - const newDisplayItems = this.filterItems(this.state.allItems) - const newDisplayOrganizationMcps = this.filterItems(this.state.organizationMcps) + const newDisplayItems = this.filterItems(this.state.allItems, this.state.installedMetadata) + const newDisplayOrganizationMcps = this.filterItems( + this.state.organizationMcps, + this.state.installedMetadata, + ) // Update state with filtered items this.state = { @@ -284,39 +295,54 @@ export class MarketplaceViewStateManager { } public isFilterActive(): boolean { - return !!(this.state.filters.type || this.state.filters.search || this.state.filters.tags.length > 0) + return !!( + this.state.filters.type || + this.state.filters.search || + this.state.filters.tags.length > 0 || + this.state.filters.installed !== "all" + ) } - public filterItems(items: MarketplaceItem[]): MarketplaceItem[] { - const { type, search, tags } = this.state.filters + public filterItems(items: MarketplaceItem[], installedMetadata?: MarketplaceInstalledMetadata): MarketplaceItem[] { + const { type, search, tags, installed } = this.state.filters + const searchLower = search?.toLowerCase() - return items - .map((item) => { - // Create a copy of the item to modify - const itemCopy = { ...item } + return items.filter((item) => { + // Check type match + if (type && item.type !== type) { + return false + } - // Check specific match conditions for the main item - const typeMatch = !type || item.type === type - const nameMatch = search ? item.name.toLowerCase().includes(search.toLowerCase()) : false - const descriptionMatch = search - ? (item.description || "").toLowerCase().includes(search.toLowerCase()) - : false - const tagMatch = tags.length > 0 ? item.tags?.some((tag) => tags.includes(tag)) : false - - // Determine if the main item matches all filters - const mainItemMatches = - typeMatch && (!search || nameMatch || descriptionMatch) && (!tags.length || tagMatch) - - const hasMatchingSubcomponents = false - - // Return the item if it matches or has matching subcomponents - if (mainItemMatches || Boolean(hasMatchingSubcomponents)) { - return itemCopy + // Check search match + if (searchLower) { + const nameMatch = item.name.toLowerCase().includes(searchLower) + const descriptionMatch = (item.description || "").toLowerCase().includes(searchLower) + if (!nameMatch && !descriptionMatch) { + return false } + } - return null - }) - .filter((item): item is MarketplaceItem => item !== null) + // Check tag match + if (tags.length > 0 && !item.tags?.some((tag) => tags.includes(tag))) { + return false + } + + // Check installed status if filter is active + if (installed !== "all" && installedMetadata) { + const isInstalledGlobally = !!installedMetadata?.global?.[item.id] + const isInstalledInProject = !!installedMetadata?.project?.[item.id] + const isInstalled = isInstalledGlobally || isInstalledInProject + + if (installed === "installed" && !isInstalled) { + return false + } + if (installed === "not_installed" && isInstalled) { + return false + } + } + + return true + }) } public async handleMessage(message: any): Promise { @@ -343,20 +369,29 @@ export class MarketplaceViewStateManager { // Handle state updates for marketplace items // The state.marketplaceItems come from ClineProvider, see the file src/core/webview/ClineProvider.ts const marketplaceItems = message.state.marketplaceItems + const marketplaceInstalledMetadata = message.state.marketplaceInstalledMetadata if (marketplaceItems !== undefined) { // Always use the marketplace items from the extension when they're provided // This ensures fresh data is always displayed const items = [...marketplaceItems] + // Update installed metadata if provided + if (marketplaceInstalledMetadata !== undefined) { + this.state.installedMetadata = marketplaceInstalledMetadata + } + // Calculate display items based on current filters // If no filters are active, show all items // If filters are active, apply filtering let newDisplayItems: MarketplaceItem[] let newDisplayOrganizationMcps: MarketplaceItem[] if (this.isFilterActive()) { - newDisplayItems = this.filterItems(items) - newDisplayOrganizationMcps = this.filterItems(this.state.organizationMcps) + newDisplayItems = this.filterItems(items, this.state.installedMetadata) + newDisplayOrganizationMcps = this.filterItems( + this.state.organizationMcps, + this.state.installedMetadata, + ) } else { // No filters active - show all items newDisplayItems = items @@ -370,6 +405,7 @@ export class MarketplaceViewStateManager { allItems: items, displayItems: newDisplayItems, displayOrganizationMcps: newDisplayOrganizationMcps, + installedMetadata: marketplaceInstalledMetadata || this.state.installedMetadata, } // Notification is handled below after all state parts are processed } @@ -411,14 +447,25 @@ export class MarketplaceViewStateManager { if (message.type === "marketplaceData") { const marketplaceItems = message.marketplaceItems const organizationMcps = message.organizationMcps || [] + const marketplaceInstalledMetadata = message.marketplaceInstalledMetadata if (marketplaceItems !== undefined) { // Always use the marketplace items from the extension when they're provided // This ensures fresh data is always displayed const items = [...marketplaceItems] const orgMcps = [...organizationMcps] - const newDisplayItems = this.isFilterActive() ? this.filterItems(items) : items - const newDisplayOrganizationMcps = this.isFilterActive() ? this.filterItems(orgMcps) : orgMcps + + // Update installed metadata if provided + if (marketplaceInstalledMetadata !== undefined) { + this.state.installedMetadata = marketplaceInstalledMetadata + } + + const newDisplayItems = this.isFilterActive() + ? this.filterItems(items, this.state.installedMetadata) + : items + const newDisplayOrganizationMcps = this.isFilterActive() + ? this.filterItems(orgMcps, this.state.installedMetadata) + : orgMcps // Update state in a single operation this.state = { @@ -428,6 +475,7 @@ export class MarketplaceViewStateManager { organizationMcps: orgMcps, displayItems: newDisplayItems, displayOrganizationMcps: newDisplayOrganizationMcps, + installedMetadata: marketplaceInstalledMetadata || this.state.installedMetadata, } } diff --git a/webview-ui/src/components/marketplace/__tests__/MarketplaceListView.spec.tsx b/webview-ui/src/components/marketplace/__tests__/MarketplaceListView.spec.tsx index d22c381410..02f94001d1 100644 --- a/webview-ui/src/components/marketplace/__tests__/MarketplaceListView.spec.tsx +++ b/webview-ui/src/components/marketplace/__tests__/MarketplaceListView.spec.tsx @@ -27,6 +27,7 @@ const mockState: ViewState = { type: "", search: "", tags: [], + installed: "all", }, } diff --git a/webview-ui/src/components/marketplace/__tests__/MarketplaceViewStateManager.spec.ts b/webview-ui/src/components/marketplace/__tests__/MarketplaceViewStateManager.spec.ts index 089226ccc3..a6ffc59518 100644 --- a/webview-ui/src/components/marketplace/__tests__/MarketplaceViewStateManager.spec.ts +++ b/webview-ui/src/components/marketplace/__tests__/MarketplaceViewStateManager.spec.ts @@ -64,6 +64,7 @@ describe("MarketplaceViewStateManager", () => { type: "", search: "", tags: [], + installed: "all", }) }) diff --git a/webview-ui/src/components/marketplace/components/__tests__/MarketplaceItemCard.spec.tsx b/webview-ui/src/components/marketplace/components/__tests__/MarketplaceItemCard.spec.tsx index 1f1ed9030b..4fdc685192 100644 --- a/webview-ui/src/components/marketplace/components/__tests__/MarketplaceItemCard.spec.tsx +++ b/webview-ui/src/components/marketplace/components/__tests__/MarketplaceItemCard.spec.tsx @@ -78,6 +78,7 @@ describe("MarketplaceItemCard", () => { type: "", search: "", tags: [], + installed: "all" as "all" | "installed" | "not_installed", }, setFilters: vi.fn(), installed: { @@ -158,7 +159,12 @@ describe("MarketplaceItemCard", () => { renderWithProviders( Date: Thu, 21 Aug 2025 04:20:49 -0500 Subject: [PATCH 210/253] feat: add OpenAI context window error handling (#6967) * feat: add OpenAI context window error handling - Add comprehensive context window error detection for OpenAI, OpenRouter, Anthropic, and Cerebras - Implement automatic retry with aggressive context truncation (25% reduction) - Use proper profile settings for condensing operations - Add robust error handling with try-catch blocks Based on PR #5479 from cline/cline repository * fix: address PR review comments - Improved type safety by using Record instead of direct any casts - Enhanced Anthropic error detection with message pattern matching - Added comprehensive unit tests for context-error-handling module - Added named constant FORCED_CONTEXT_REDUCTION_PERCENT - Added MAX_CONTEXT_WINDOW_RETRIES limit to prevent infinite loops - Added logging for context window exceeded errors - Extracted getCurrentProfileId helper method to reduce duplication - All tests passing (3438 tests) * fix: address PR review comments for context window error handling - Improve Anthropic error detection with more specific patterns and error codes - Add comprehensive unit tests for context-error-handling module - Add logging for context window errors with detailed information - Fix comment for FORCED_CONTEXT_REDUCTION_PERCENT constant - Fix TypeScript error for untyped error parameter - Maintain existing getCurrentProfileId helper method --------- Co-authored-by: Roo Code --- .../__tests__/context-error-handling.test.ts | 329 ++++++++++++++++++ .../context-error-handling.ts | 114 ++++++ src/core/task/Task.ts | 90 ++++- 3 files changed, 529 insertions(+), 4 deletions(-) create mode 100644 src/core/context/context-management/__tests__/context-error-handling.test.ts create mode 100644 src/core/context/context-management/context-error-handling.ts diff --git a/src/core/context/context-management/__tests__/context-error-handling.test.ts b/src/core/context/context-management/__tests__/context-error-handling.test.ts new file mode 100644 index 0000000000..5d2321f0aa --- /dev/null +++ b/src/core/context/context-management/__tests__/context-error-handling.test.ts @@ -0,0 +1,329 @@ +import { describe, it, expect, vi } from "vitest" +import { APIError } from "openai" +import { checkContextWindowExceededError } from "../context-error-handling" + +describe("checkContextWindowExceededError", () => { + describe("OpenAI errors", () => { + it("should detect OpenAI context window error with APIError instance", () => { + const error = Object.create(APIError.prototype) + Object.assign(error, { + status: 400, + code: "400", + message: "This model's maximum context length is 4096 tokens", + error: { + message: "This model's maximum context length is 4096 tokens", + type: "invalid_request_error", + param: null, + code: "context_length_exceeded", + }, + }) + + expect(checkContextWindowExceededError(error)).toBe(true) + }) + + it("should detect OpenAI LengthFinishReasonError", () => { + const error = { + name: "LengthFinishReasonError", + message: "The response was cut off due to length", + } + + expect(checkContextWindowExceededError(error)).toBe(true) + }) + + it("should not detect non-context OpenAI errors", () => { + const error = Object.create(APIError.prototype) + Object.assign(error, { + status: 400, + code: "400", + message: "Invalid API key", + error: { + message: "Invalid API key", + type: "invalid_request_error", + param: null, + code: "invalid_api_key", + }, + }) + + expect(checkContextWindowExceededError(error)).toBe(false) + }) + }) + + describe("OpenRouter errors", () => { + it("should detect OpenRouter context window error with status 400", () => { + const error = { + status: 400, + message: "Request exceeds maximum context length of 8192 tokens", + } + + expect(checkContextWindowExceededError(error)).toBe(true) + }) + + it("should detect OpenRouter error with nested error structure", () => { + const error = { + error: { + status: 400, + message: "Input tokens exceed model limit", + }, + } + + expect(checkContextWindowExceededError(error)).toBe(true) + }) + + it("should detect OpenRouter error with response status", () => { + const error = { + response: { + status: 400, + }, + message: "Too many tokens in the request", + } + + expect(checkContextWindowExceededError(error)).toBe(true) + }) + + it("should detect various context error patterns", () => { + const patterns = [ + "context length exceeded", + "maximum context window", + "input tokens exceed limit", + "too many tokens", + ] + + patterns.forEach((pattern) => { + const error = { + status: 400, + message: pattern, + } + expect(checkContextWindowExceededError(error)).toBe(true) + }) + }) + + it("should not detect non-context 400 errors", () => { + const error = { + status: 400, + message: "Invalid request format", + } + + expect(checkContextWindowExceededError(error)).toBe(false) + }) + + it("should not detect errors with different status codes", () => { + const error = { + status: 500, + message: "context length exceeded", + } + + expect(checkContextWindowExceededError(error)).toBe(false) + }) + }) + + describe("Anthropic errors", () => { + it("should detect Anthropic context window error", () => { + const error = { + error: { + error: { + type: "invalid_request_error", + message: "prompt is too long: 150000 tokens > 100000 maximum", + }, + }, + } + + expect(checkContextWindowExceededError(error)).toBe(true) + }) + + it("should detect Anthropic error with context_length_exceeded code", () => { + const error = { + error: { + error: { + type: "invalid_request_error", + code: "context_length_exceeded", + message: "The request exceeds the maximum context window", + }, + }, + } + + expect(checkContextWindowExceededError(error)).toBe(true) + }) + + it("should detect various Anthropic context error patterns", () => { + const patterns = [ + "prompt is too long", + "maximum 200000 tokens", + "context is too long", + "exceeds the context window", + "token limit exceeded", + ] + + patterns.forEach((pattern) => { + const error = { + error: { + error: { + type: "invalid_request_error", + message: pattern, + }, + }, + } + expect(checkContextWindowExceededError(error)).toBe(true) + }) + }) + + it("should not detect non-context Anthropic errors", () => { + const error = { + error: { + error: { + type: "invalid_request_error", + message: "Invalid model specified", + }, + }, + } + + expect(checkContextWindowExceededError(error)).toBe(false) + }) + + it("should not detect errors with different error types", () => { + const error = { + error: { + error: { + type: "authentication_error", + message: "prompt is too long", + }, + }, + } + + expect(checkContextWindowExceededError(error)).toBe(false) + }) + }) + + describe("Cerebras errors", () => { + it("should detect Cerebras context window error", () => { + const error = { + status: 400, + message: "Please reduce the length of the messages or completion", + } + + expect(checkContextWindowExceededError(error)).toBe(true) + }) + + it("should detect Cerebras error with nested structure", () => { + const error = { + error: { + status: 400, + message: "Please reduce the length of the messages or completion", + }, + } + + expect(checkContextWindowExceededError(error)).toBe(true) + }) + + it("should not detect non-context Cerebras errors", () => { + const error = { + status: 400, + message: "Invalid request parameters", + } + + expect(checkContextWindowExceededError(error)).toBe(false) + }) + }) + + describe("Edge cases", () => { + it("should handle null input", () => { + expect(checkContextWindowExceededError(null)).toBe(false) + }) + + it("should handle undefined input", () => { + expect(checkContextWindowExceededError(undefined)).toBe(false) + }) + + it("should handle empty object", () => { + expect(checkContextWindowExceededError({})).toBe(false) + }) + + it("should handle string input", () => { + expect(checkContextWindowExceededError("error")).toBe(false) + }) + + it("should handle number input", () => { + expect(checkContextWindowExceededError(123)).toBe(false) + }) + + it("should handle array input", () => { + expect(checkContextWindowExceededError([])).toBe(false) + }) + + it("should handle errors with circular references", () => { + const error: any = { status: 400, message: "context length exceeded" } + error.self = error // Create circular reference + + expect(checkContextWindowExceededError(error)).toBe(true) + }) + + it("should handle errors with deeply nested undefined values", () => { + const error = { + error: { + error: { + type: undefined, + message: undefined, + }, + }, + } + + expect(checkContextWindowExceededError(error)).toBe(false) + }) + + it("should handle errors that throw during property access", () => { + const error = { + get status() { + throw new Error("Property access error") + }, + message: "context length exceeded", + } + + expect(checkContextWindowExceededError(error)).toBe(false) + }) + + it("should handle mixed provider error structures", () => { + // Error that could match multiple providers + const error = { + status: 400, + code: "400", + message: "context length exceeded", + error: { + error: { + type: "invalid_request_error", + message: "prompt is too long", + }, + }, + } + + expect(checkContextWindowExceededError(error)).toBe(true) + }) + }) + + describe("Multiple provider detection", () => { + it("should detect error if any provider check returns true", () => { + // This error should be detected by OpenRouter check + const error1 = { + status: 400, + message: "context window exceeded", + } + expect(checkContextWindowExceededError(error1)).toBe(true) + + // This error should be detected by Anthropic check + const error2 = { + error: { + error: { + type: "invalid_request_error", + message: "prompt is too long", + }, + }, + } + expect(checkContextWindowExceededError(error2)).toBe(true) + + // This error should be detected by Cerebras check + const error3 = { + status: 400, + message: "Please reduce the length of the messages or completion", + } + expect(checkContextWindowExceededError(error3)).toBe(true) + }) + }) +}) diff --git a/src/core/context/context-management/context-error-handling.ts b/src/core/context/context-management/context-error-handling.ts new file mode 100644 index 0000000000..006d7b1607 --- /dev/null +++ b/src/core/context/context-management/context-error-handling.ts @@ -0,0 +1,114 @@ +import { APIError } from "openai" + +export function checkContextWindowExceededError(error: unknown): boolean { + return ( + checkIsOpenAIContextWindowError(error) || + checkIsOpenRouterContextWindowError(error) || + checkIsAnthropicContextWindowError(error) || + checkIsCerebrasContextWindowError(error) + ) +} + +function checkIsOpenRouterContextWindowError(error: unknown): boolean { + try { + if (!error || typeof error !== "object") { + return false + } + + // Use Record for proper type narrowing + const err = error as Record + const status = err.status ?? err.code ?? err.error?.status ?? err.response?.status + const message: string = String(err.message || err.error?.message || "") + + // Known OpenAI/OpenRouter-style signal (code 400 and message includes "context length") + const CONTEXT_ERROR_PATTERNS = [ + /\bcontext\s*(?:length|window)\b/i, + /\bmaximum\s*context\b/i, + /\b(?:input\s*)?tokens?\s*exceed/i, + /\btoo\s*many\s*tokens?\b/i, + ] as const + + return String(status) === "400" && CONTEXT_ERROR_PATTERNS.some((pattern) => pattern.test(message)) + } catch { + return false + } +} + +// Docs: https://platform.openai.com/docs/guides/error-codes/api-errors +function checkIsOpenAIContextWindowError(error: unknown): boolean { + try { + // Check for LengthFinishReasonError + if (error && typeof error === "object" && "name" in error && error.name === "LengthFinishReasonError") { + return true + } + + const KNOWN_CONTEXT_ERROR_SUBSTRINGS = ["token", "context length"] as const + + return ( + Boolean(error) && + error instanceof APIError && + error.code?.toString() === "400" && + KNOWN_CONTEXT_ERROR_SUBSTRINGS.some((substring) => error.message.includes(substring)) + ) + } catch { + return false + } +} + +function checkIsAnthropicContextWindowError(response: unknown): boolean { + try { + // Type guard to safely access properties + if (!response || typeof response !== "object") { + return false + } + + // Use type assertions with proper checks + const res = response as Record + + // Check for Anthropic-specific error structure with more specific validation + if (res.error?.error?.type === "invalid_request_error") { + const message: string = String(res.error?.error?.message || "") + + // More specific patterns for context window errors + const contextWindowPatterns = [ + /prompt is too long/i, + /maximum.*tokens/i, + /context.*too.*long/i, + /exceeds.*context/i, + /token.*limit/i, + /context_length_exceeded/i, + /max_tokens_to_sample/i, + ] + + // Additional check for Anthropic-specific error codes + const errorCode = res.error?.error?.code + if (errorCode === "context_length_exceeded" || errorCode === "invalid_request_error") { + return contextWindowPatterns.some((pattern) => pattern.test(message)) + } + + return contextWindowPatterns.some((pattern) => pattern.test(message)) + } + + return false + } catch { + return false + } +} + +function checkIsCerebrasContextWindowError(response: unknown): boolean { + try { + // Type guard to safely access properties + if (!response || typeof response !== "object") { + return false + } + + // Use type assertions with proper checks + const res = response as Record + const status = res.status ?? res.code ?? res.error?.status ?? res.response?.status + const message: string = String(res.message || res.error?.message || "") + + return String(status) === "400" && message.includes("Please reduce the length of the messages or completion") + } catch { + return false + } +} diff --git a/src/core/task/Task.ts b/src/core/task/Task.ts index 34f3218236..3c3afeaadf 100644 --- a/src/core/task/Task.ts +++ b/src/core/task/Task.ts @@ -88,6 +88,7 @@ import { MultiSearchReplaceDiffStrategy } from "../diff/strategies/multi-search- import { MultiFileSearchReplaceDiffStrategy } from "../diff/strategies/multi-file-search-replace" import { readApiMessages, saveApiMessages, readTaskMessages, saveTaskMessages, taskMetadata } from "../task-persistence" import { getEnvironmentDetails } from "../environment/getEnvironmentDetails" +import { checkContextWindowExceededError } from "../context/context-management/context-error-handling" import { type CheckpointDiffOptions, type CheckpointRestoreOptions, @@ -105,6 +106,8 @@ import { AutoApprovalHandler } from "./AutoApprovalHandler" const MAX_EXPONENTIAL_BACKOFF_SECONDS = 600 // 10 minutes const DEFAULT_USAGE_COLLECTION_TIMEOUT_MS = 5000 // 5 seconds +const FORCED_CONTEXT_REDUCTION_PERCENT = 75 // Keep 75% of context (remove 25%) on context window errors +const MAX_CONTEXT_WINDOW_RETRIES = 3 // Maximum retries for context window errors export type TaskOptions = { provider: ClineProvider @@ -1387,7 +1390,7 @@ export class Task extends EventEmitter implements TaskLike { if (this.bridgeService) { this.bridgeService .unsubscribeFromTask(this.taskId) - .catch((error) => console.error("Error unsubscribing from task bridge:", error)) + .catch((error: unknown) => console.error("Error unsubscribing from task bridge:", error)) this.bridgeService = null } @@ -2232,6 +2235,71 @@ export class Task extends EventEmitter implements TaskLike { })() } + private getCurrentProfileId(state: any): string { + return ( + state?.listApiConfigMeta?.find((profile: any) => profile.name === state?.currentApiConfigName)?.id ?? + "default" + ) + } + + private async handleContextWindowExceededError(): Promise { + const state = await this.providerRef.deref()?.getState() + const { profileThresholds = {} } = state ?? {} + + const { contextTokens } = this.getTokenUsage() + const modelInfo = this.api.getModel().info + const maxTokens = getModelMaxOutputTokens({ + modelId: this.api.getModel().id, + model: modelInfo, + settings: this.apiConfiguration, + }) + const contextWindow = modelInfo.contextWindow + + // Get the current profile ID using the helper method + const currentProfileId = this.getCurrentProfileId(state) + + // Log the context window error for debugging + console.warn( + `[Task#${this.taskId}] Context window exceeded for model ${this.api.getModel().id}. ` + + `Current tokens: ${contextTokens}, Context window: ${contextWindow}. ` + + `Forcing truncation to ${FORCED_CONTEXT_REDUCTION_PERCENT}% of current context.`, + ) + + // Force aggressive truncation by keeping only 75% of the conversation history + const truncateResult = await truncateConversationIfNeeded({ + messages: this.apiConversationHistory, + totalTokens: contextTokens || 0, + maxTokens, + contextWindow, + apiHandler: this.api, + autoCondenseContext: true, + autoCondenseContextPercent: FORCED_CONTEXT_REDUCTION_PERCENT, + systemPrompt: await this.getSystemPrompt(), + taskId: this.taskId, + profileThresholds, + currentProfileId, + }) + + if (truncateResult.messages !== this.apiConversationHistory) { + await this.overwriteApiConversationHistory(truncateResult.messages) + } + + if (truncateResult.summary) { + const { summary, cost, prevContextTokens, newContextTokens = 0 } = truncateResult + const contextCondense: ContextCondense = { summary, cost, newContextTokens, prevContextTokens } + await this.say( + "condense_context", + undefined /* text */, + undefined /* images */, + false /* partial */, + undefined /* checkpoint */, + undefined /* progressStatus */, + { isNonInteractive: true } /* options */, + contextCondense, + ) + } + } + public async *attemptApiRequest(retryAttempt: number = 0): ApiStream { const state = await this.providerRef.deref()?.getState() @@ -2310,9 +2378,8 @@ export class Task extends EventEmitter implements TaskLike { const contextWindow = modelInfo.contextWindow - const currentProfileId = - state?.listApiConfigMeta.find((profile) => profile.name === state?.currentApiConfigName)?.id ?? - "default" + // Get the current profile ID using the helper method + const currentProfileId = this.getCurrentProfileId(state) const truncateResult = await truncateConversationIfNeeded({ messages: this.apiConversationHistory, @@ -2419,6 +2486,21 @@ export class Task extends EventEmitter implements TaskLike { this.isWaitingForFirstChunk = false } catch (error) { this.isWaitingForFirstChunk = false + const isContextWindowExceededError = checkContextWindowExceededError(error) + + // If it's a context window error and we haven't exceeded max retries for this error type + if (isContextWindowExceededError && retryAttempt < MAX_CONTEXT_WINDOW_RETRIES) { + console.warn( + `[Task#${this.taskId}] Context window exceeded for model ${this.api.getModel().id}. ` + + `Retry attempt ${retryAttempt + 1}/${MAX_CONTEXT_WINDOW_RETRIES}. ` + + `Attempting automatic truncation...`, + ) + await this.handleContextWindowExceededError() + // Retry the request after handling the context window error + yield* this.attemptApiRequest(retryAttempt + 1) + return + } + // note that this api_req_failed ask is unique in that we only present this option if the api hasn't streamed any content yet (ie it fails on the first chunk due), as it would allow them to hit a retry button. However if the api failed mid-stream, it could be in any arbitrary state where some tools may have executed, so that error is handled differently and requires cancelling the task entirely. if (autoApprovalEnabled && alwaysApproveResubmit) { let errorMsg From b2fdb9ac5758293fcc06af31dc2ee1555c9171d8 Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Thu, 21 Aug 2025 02:21:41 -0700 Subject: [PATCH 211/253] fix: handle null/undefined token values in ContextCondenseRow to prevent UI crash (#6916) * fix: handle null/undefined token values in ContextCondenseRow to prevent UI crash - Added null/undefined checks for prevContextTokens, newContextTokens, and cost - Default to 0 when values are null or undefined - Added comprehensive test coverage for edge cases - Fixes #6914 * Delete webview-ui/src/components/chat/__tests__/ContextCondenseRow.spec.tsx --------- Co-authored-by: Roo Code Co-authored-by: Daniel <57051444+daniel-lxs@users.noreply.github.com> --- webview-ui/src/components/chat/ContextCondenseRow.tsx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/webview-ui/src/components/chat/ContextCondenseRow.tsx b/webview-ui/src/components/chat/ContextCondenseRow.tsx index 9664b03e00..c2fdba802d 100644 --- a/webview-ui/src/components/chat/ContextCondenseRow.tsx +++ b/webview-ui/src/components/chat/ContextCondenseRow.tsx @@ -11,6 +11,11 @@ export const ContextCondenseRow = ({ cost, prevContextTokens, newContextTokens, const { t } = useTranslation() const [isExpanded, setIsExpanded] = useState(false) + // Handle null/undefined token values to prevent crashes + const prevTokens = prevContextTokens ?? 0 + const newTokens = newContextTokens ?? 0 + const displayCost = cost ?? 0 + return (
    {t("chat:contextCondense.title")} - {prevContextTokens.toLocaleString()} → {newContextTokens.toLocaleString()} {t("tokens")} + {prevTokens.toLocaleString()} → {newTokens.toLocaleString()} {t("tokens")} - 0 ? "opacity-100" : "opacity-0"}>${cost.toFixed(2)} + 0 ? "opacity-100" : "opacity-0"}> + ${displayCost.toFixed(2)} +
    From 4fdbcb5d78abfbb077872b3696ac5263ff7e5997 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Aug 2025 02:28:00 -0700 Subject: [PATCH 212/253] fix(deps): update dependency tmp to v0.2.4 [security] (#6762) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- pnpm-lock.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6b05ddb264..be701e50e7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -750,7 +750,7 @@ importers: version: 1.0.21 tmp: specifier: ^0.2.3 - version: 0.2.3 + version: 0.2.4 tree-sitter-wasms: specifier: ^0.1.12 version: 0.1.12 @@ -9110,6 +9110,10 @@ packages: resolution: {integrity: sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==} engines: {node: '>=14.14'} + tmp@0.2.4: + resolution: {integrity: sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==} + engines: {node: '>=14.14'} + to-regex-range@5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} @@ -15292,7 +15296,7 @@ snapshots: jszip: 3.10.1 readable-stream: 3.6.2 saxes: 5.0.1 - tmp: 0.2.3 + tmp: 0.2.4 unzipper: 0.10.14 uuid: 8.3.2 @@ -19437,6 +19441,8 @@ snapshots: tmp@0.2.3: {} + tmp@0.2.4: {} + to-regex-range@5.0.1: dependencies: is-number: 7.0.0 From 6fd261d3b63cf05c95434903e35c34d49fbe4d81 Mon Sep 17 00:00:00 2001 From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com> Date: Thu, 21 Aug 2025 02:56:55 -0700 Subject: [PATCH 213/253] feat: mark non-English package.nls.*.json files as linguist-generated (#7271) Co-authored-by: Roo Code --- .gitattributes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitattributes b/.gitattributes index 284eab4f98..e9e36432cd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,6 +6,11 @@ src/assets/docs/demo.gif filter=lfs diff=lfs merge=lfs -text *.snap linguist-generated=true # Non-English translation files - mark as linguist-generated to exclude from GitHub language statistics +# Package NLS files - mark non-English ones as generated +src/package.nls.*.json linguist-generated=true +# Exclude the base English file from being marked as generated +src/package.nls.json linguist-generated=false + # Root locales directory (contains only non-English translations) locales/** linguist-generated=true From 4216618c7283df035df535e8979b104e1fc75510 Mon Sep 17 00:00:00 2001 From: Daniel <57051444+daniel-lxs@users.noreply.github.com> Date: Thu, 21 Aug 2025 13:12:04 -0500 Subject: [PATCH 214/253] feat: add MDM authentication notification when navigation is blocked (#7291) - Show VSCode warning when users under MDM policy try to leave AccountView without auth - Add showMdmAuthRequiredNotification message type to WebviewMessage interface - Implement handler in webviewMessageHandler to display localized warning - Add 'Your organization requires authentication' translation in all 17 languages - Fix translation key path to use common:mdm.info.organization_requires_auth --- src/core/webview/ClineProvider.ts | 9 ++++++--- src/core/webview/webviewMessageHandler.ts | 5 +++++ src/i18n/locales/ca/common.json | 3 +++ src/i18n/locales/de/common.json | 3 +++ src/i18n/locales/en/common.json | 3 +++ src/i18n/locales/es/common.json | 3 +++ src/i18n/locales/fr/common.json | 3 +++ src/i18n/locales/hi/common.json | 3 +++ src/i18n/locales/id/common.json | 3 +++ src/i18n/locales/it/common.json | 3 +++ src/i18n/locales/ja/common.json | 3 +++ src/i18n/locales/ko/common.json | 3 +++ src/i18n/locales/nl/common.json | 3 +++ src/i18n/locales/pl/common.json | 3 +++ src/i18n/locales/pt-BR/common.json | 3 +++ src/i18n/locales/ru/common.json | 3 +++ src/i18n/locales/tr/common.json | 3 +++ src/i18n/locales/vi/common.json | 3 +++ src/i18n/locales/zh-CN/common.json | 3 +++ src/i18n/locales/zh-TW/common.json | 3 +++ src/shared/WebviewMessage.ts | 1 + webview-ui/src/App.tsx | 5 ++++- 22 files changed, 70 insertions(+), 4 deletions(-) diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index 9c28120f17..77dfa42a3b 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -1553,7 +1553,8 @@ export class ClineProvider this.postMessageToWebview({ type: "state", state }) // Check MDM compliance and send user to account tab if not compliant - if (!this.checkMdmCompliance()) { + // Only redirect if there's an actual MDM policy requiring authentication + if (this.mdmService?.requiresCloudAuth() && !this.checkMdmCompliance()) { await this.postMessageToWebview({ type: "action", action: "accountButtonClicked" }) } } @@ -1872,7 +1873,9 @@ export class ClineProvider codebaseIndexSearchMaxResults: codebaseIndexConfig?.codebaseIndexSearchMaxResults, codebaseIndexSearchMinScore: codebaseIndexConfig?.codebaseIndexSearchMinScore, }, - mdmCompliant: this.checkMdmCompliance(), + // Only set mdmCompliant if there's an actual MDM policy + // undefined means no MDM policy, true means compliant, false means non-compliant + mdmCompliant: this.mdmService?.requiresCloudAuth() ? this.checkMdmCompliance() : undefined, profileThresholds: profileThresholds ?? {}, cloudApiUrl: getRooCodeApiUrl(), hasOpenedModeSelector: this.getGlobalState("hasOpenedModeSelector") ?? false, @@ -2172,7 +2175,7 @@ export class ClineProvider /** * Check if the current state is compliant with MDM policy - * @returns true if compliant, false if blocked + * @returns true if compliant or no MDM policy exists, false if MDM policy exists and user is non-compliant */ public checkMdmCompliance(): boolean { if (!this.mdmService) { diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts index 4dd0fee75e..5e4971ecaf 100644 --- a/src/core/webview/webviewMessageHandler.ts +++ b/src/core/webview/webviewMessageHandler.ts @@ -2618,5 +2618,10 @@ export const webviewMessageHandler = async ( } break } + case "showMdmAuthRequiredNotification": { + // Show notification that organization requires authentication + vscode.window.showWarningMessage(t("common:mdm.info.organization_requires_auth")) + break + } } } diff --git a/src/i18n/locales/ca/common.json b/src/i18n/locales/ca/common.json index 6235593f7e..74b265f513 100644 --- a/src/i18n/locales/ca/common.json +++ b/src/i18n/locales/ca/common.json @@ -191,6 +191,9 @@ "cloud_auth_required": "La teva organització requereix autenticació de Roo Code Cloud. Si us plau, inicia sessió per continuar.", "organization_mismatch": "Has d'estar autenticat amb el compte de Roo Code Cloud de la teva organització.", "verification_failed": "No s'ha pogut verificar l'autenticació de l'organització." + }, + "info": { + "organization_requires_auth": "La teva organització requereix autenticació." } }, "prompts": { diff --git a/src/i18n/locales/de/common.json b/src/i18n/locales/de/common.json index 6819b27d73..856e4e1dce 100644 --- a/src/i18n/locales/de/common.json +++ b/src/i18n/locales/de/common.json @@ -191,6 +191,9 @@ "cloud_auth_required": "Deine Organisation erfordert eine Roo Code Cloud-Authentifizierung. Bitte melde dich an, um fortzufahren.", "organization_mismatch": "Du musst mit dem Roo Code Cloud-Konto deiner Organisation authentifiziert sein.", "verification_failed": "Die Organisationsauthentifizierung konnte nicht verifiziert werden." + }, + "info": { + "organization_requires_auth": "Deine Organisation erfordert eine Authentifizierung." } }, "prompts": { diff --git a/src/i18n/locales/en/common.json b/src/i18n/locales/en/common.json index 696ecb44d4..e413bc0890 100644 --- a/src/i18n/locales/en/common.json +++ b/src/i18n/locales/en/common.json @@ -180,6 +180,9 @@ "cloud_auth_required": "Your organization requires Roo Code Cloud authentication. Please sign in to continue.", "organization_mismatch": "You must be authenticated with your organization's Roo Code Cloud account.", "verification_failed": "Unable to verify organization authentication." + }, + "info": { + "organization_requires_auth": "Your organization requires authentication." } }, "prompts": { diff --git a/src/i18n/locales/es/common.json b/src/i18n/locales/es/common.json index c1b399b84f..7b2b9a4347 100644 --- a/src/i18n/locales/es/common.json +++ b/src/i18n/locales/es/common.json @@ -191,6 +191,9 @@ "cloud_auth_required": "Tu organización requiere autenticación de Roo Code Cloud. Por favor, inicia sesión para continuar.", "organization_mismatch": "Debes estar autenticado con la cuenta de Roo Code Cloud de tu organización.", "verification_failed": "No se pudo verificar la autenticación de la organización." + }, + "info": { + "organization_requires_auth": "Tu organización requiere autenticación." } }, "prompts": { diff --git a/src/i18n/locales/fr/common.json b/src/i18n/locales/fr/common.json index 682e12e224..e9282a0b97 100644 --- a/src/i18n/locales/fr/common.json +++ b/src/i18n/locales/fr/common.json @@ -191,6 +191,9 @@ "cloud_auth_required": "Votre organisation nécessite une authentification Roo Code Cloud. Veuillez vous connecter pour continuer.", "organization_mismatch": "Vous devez être authentifié avec le compte Roo Code Cloud de votre organisation.", "verification_failed": "Impossible de vérifier l'authentification de l'organisation." + }, + "info": { + "organization_requires_auth": "Votre organisation nécessite une authentification." } }, "prompts": { diff --git a/src/i18n/locales/hi/common.json b/src/i18n/locales/hi/common.json index 05e0a622cc..3f5ab60413 100644 --- a/src/i18n/locales/hi/common.json +++ b/src/i18n/locales/hi/common.json @@ -191,6 +191,9 @@ "cloud_auth_required": "आपके संगठन को Roo Code Cloud प्रमाणीकरण की आवश्यकता है। कृपया जारी रखने के लिए साइन इन करें।", "organization_mismatch": "आपको अपने संगठन के Roo Code Cloud खाते से प्रमाणित होना होगा।", "verification_failed": "संगठन प्रमाणीकरण सत्यापित करने में असमर्थ।" + }, + "info": { + "organization_requires_auth": "आपके संगठन को प्रमाणीकरण की आवश्यकता है।" } }, "prompts": { diff --git a/src/i18n/locales/id/common.json b/src/i18n/locales/id/common.json index 1595b795cf..3c43056503 100644 --- a/src/i18n/locales/id/common.json +++ b/src/i18n/locales/id/common.json @@ -191,6 +191,9 @@ "cloud_auth_required": "Organisasi kamu memerlukan autentikasi Roo Code Cloud. Silakan masuk untuk melanjutkan.", "organization_mismatch": "Kamu harus diautentikasi dengan akun Roo Code Cloud organisasi kamu.", "verification_failed": "Tidak dapat memverifikasi autentikasi organisasi." + }, + "info": { + "organization_requires_auth": "Organisasi kamu memerlukan autentikasi." } }, "prompts": { diff --git a/src/i18n/locales/it/common.json b/src/i18n/locales/it/common.json index 73f4d47788..c19114baf1 100644 --- a/src/i18n/locales/it/common.json +++ b/src/i18n/locales/it/common.json @@ -191,6 +191,9 @@ "cloud_auth_required": "La tua organizzazione richiede l'autenticazione Roo Code Cloud. Accedi per continuare.", "organization_mismatch": "Devi essere autenticato con l'account Roo Code Cloud della tua organizzazione.", "verification_failed": "Impossibile verificare l'autenticazione dell'organizzazione." + }, + "info": { + "organization_requires_auth": "La tua organizzazione richiede l'autenticazione." } }, "prompts": { diff --git a/src/i18n/locales/ja/common.json b/src/i18n/locales/ja/common.json index cb55c7bf0b..d595484fa1 100644 --- a/src/i18n/locales/ja/common.json +++ b/src/i18n/locales/ja/common.json @@ -191,6 +191,9 @@ "cloud_auth_required": "あなたの組織では Roo Code Cloud 認証が必要です。続行するにはサインインしてください。", "organization_mismatch": "組織の Roo Code Cloud アカウントで認証する必要があります。", "verification_failed": "組織認証の確認ができませんでした。" + }, + "info": { + "organization_requires_auth": "あなたの組織では認証が必要です。" } }, "prompts": { diff --git a/src/i18n/locales/ko/common.json b/src/i18n/locales/ko/common.json index 9bb61b6563..3209952c6d 100644 --- a/src/i18n/locales/ko/common.json +++ b/src/i18n/locales/ko/common.json @@ -191,6 +191,9 @@ "cloud_auth_required": "조직에서 Roo Code Cloud 인증이 필요합니다. 계속하려면 로그인하세요.", "organization_mismatch": "조직의 Roo Code Cloud 계정으로 인증해야 합니다.", "verification_failed": "조직 인증을 확인할 수 없습니다." + }, + "info": { + "organization_requires_auth": "조직에서 인증이 필요합니다." } }, "prompts": { diff --git a/src/i18n/locales/nl/common.json b/src/i18n/locales/nl/common.json index fb2fcec9f9..c0c6ba35e9 100644 --- a/src/i18n/locales/nl/common.json +++ b/src/i18n/locales/nl/common.json @@ -191,6 +191,9 @@ "cloud_auth_required": "Je organisatie vereist Roo Code Cloud-authenticatie. Log in om door te gaan.", "organization_mismatch": "Je moet geauthenticeerd zijn met het Roo Code Cloud-account van je organisatie.", "verification_failed": "Kan organisatie-authenticatie niet verifiëren." + }, + "info": { + "organization_requires_auth": "Je organisatie vereist authenticatie." } }, "prompts": { diff --git a/src/i18n/locales/pl/common.json b/src/i18n/locales/pl/common.json index 2a6fee3e23..475ba069ee 100644 --- a/src/i18n/locales/pl/common.json +++ b/src/i18n/locales/pl/common.json @@ -191,6 +191,9 @@ "cloud_auth_required": "Twoja organizacja wymaga uwierzytelnienia Roo Code Cloud. Zaloguj się, aby kontynuować.", "organization_mismatch": "Musisz być uwierzytelniony kontem Roo Code Cloud swojej organizacji.", "verification_failed": "Nie można zweryfikować uwierzytelnienia organizacji." + }, + "info": { + "organization_requires_auth": "Twoja organizacja wymaga uwierzytelnienia." } }, "prompts": { diff --git a/src/i18n/locales/pt-BR/common.json b/src/i18n/locales/pt-BR/common.json index 83d960ad2d..55a41fcf1b 100644 --- a/src/i18n/locales/pt-BR/common.json +++ b/src/i18n/locales/pt-BR/common.json @@ -191,6 +191,9 @@ "cloud_auth_required": "Sua organização requer autenticação do Roo Code Cloud. Faça login para continuar.", "organization_mismatch": "Você deve estar autenticado com a conta Roo Code Cloud da sua organização.", "verification_failed": "Não foi possível verificar a autenticação da organização." + }, + "info": { + "organization_requires_auth": "Sua organização requer autenticação." } }, "prompts": { diff --git a/src/i18n/locales/ru/common.json b/src/i18n/locales/ru/common.json index 9c37cfe3ed..505998daa2 100644 --- a/src/i18n/locales/ru/common.json +++ b/src/i18n/locales/ru/common.json @@ -191,6 +191,9 @@ "cloud_auth_required": "Ваша организация требует аутентификации Roo Code Cloud. Войдите в систему, чтобы продолжить.", "organization_mismatch": "Вы должны быть аутентифицированы с учетной записью Roo Code Cloud вашей организации.", "verification_failed": "Не удается проверить аутентификацию организации." + }, + "info": { + "organization_requires_auth": "Ваша организация требует аутентификации." } }, "prompts": { diff --git a/src/i18n/locales/tr/common.json b/src/i18n/locales/tr/common.json index d99008755e..9b8af8d94c 100644 --- a/src/i18n/locales/tr/common.json +++ b/src/i18n/locales/tr/common.json @@ -191,6 +191,9 @@ "cloud_auth_required": "Kuruluşunuz Roo Code Cloud kimlik doğrulaması gerektiriyor. Devam etmek için giriş yapın.", "organization_mismatch": "Kuruluşunuzun Roo Code Cloud hesabıyla kimlik doğrulaması yapmalısınız.", "verification_failed": "Kuruluş kimlik doğrulaması doğrulanamıyor." + }, + "info": { + "organization_requires_auth": "Kuruluşunuz kimlik doğrulaması gerektiriyor." } }, "prompts": { diff --git a/src/i18n/locales/vi/common.json b/src/i18n/locales/vi/common.json index d29525cc03..4877f297ad 100644 --- a/src/i18n/locales/vi/common.json +++ b/src/i18n/locales/vi/common.json @@ -191,6 +191,9 @@ "cloud_auth_required": "Tổ chức của bạn yêu cầu xác thực Roo Code Cloud. Vui lòng đăng nhập để tiếp tục.", "organization_mismatch": "Bạn phải được xác thực bằng tài khoản Roo Code Cloud của tổ chức.", "verification_failed": "Không thể xác minh xác thực tổ chức." + }, + "info": { + "organization_requires_auth": "Tổ chức của bạn yêu cầu xác thực." } }, "prompts": { diff --git a/src/i18n/locales/zh-CN/common.json b/src/i18n/locales/zh-CN/common.json index fc0386c95d..5bac0d2847 100644 --- a/src/i18n/locales/zh-CN/common.json +++ b/src/i18n/locales/zh-CN/common.json @@ -196,6 +196,9 @@ "cloud_auth_required": "您的组织需要 Roo Code Cloud 身份验证。请登录以继续。", "organization_mismatch": "您必须使用组织的 Roo Code Cloud 账户进行身份验证。", "verification_failed": "无法验证组织身份验证。" + }, + "info": { + "organization_requires_auth": "您的组织需要身份验证。" } }, "prompts": { diff --git a/src/i18n/locales/zh-TW/common.json b/src/i18n/locales/zh-TW/common.json index 753463b9f5..0f82f48d13 100644 --- a/src/i18n/locales/zh-TW/common.json +++ b/src/i18n/locales/zh-TW/common.json @@ -191,6 +191,9 @@ "cloud_auth_required": "您的組織需要 Roo Code Cloud 身份驗證。請登入以繼續。", "organization_mismatch": "您必須使用組織的 Roo Code Cloud 帳戶進行身份驗證。", "verification_failed": "無法驗證組織身份驗證。" + }, + "info": { + "organization_requires_auth": "您的組織需要身份驗證。" } }, "prompts": { diff --git a/src/shared/WebviewMessage.ts b/src/shared/WebviewMessage.ts index d59ccd556c..d8b873e40a 100644 --- a/src/shared/WebviewMessage.ts +++ b/src/shared/WebviewMessage.ts @@ -211,6 +211,7 @@ export interface WebviewMessage { | "deleteCommand" | "createCommand" | "insertTextIntoTextarea" + | "showMdmAuthRequiredNotification" text?: string editedMessageContent?: string tab?: "settings" | "history" | "mcp" | "modes" | "chat" | "marketplace" | "account" diff --git a/webview-ui/src/App.tsx b/webview-ui/src/App.tsx index 3782242707..f24e4556a1 100644 --- a/webview-ui/src/App.tsx +++ b/webview-ui/src/App.tsx @@ -105,8 +105,11 @@ const App = () => { const switchTab = useCallback( (newTab: Tab) => { - // Check MDM compliance before allowing tab switching + // Only check MDM compliance if mdmCompliant is explicitly false (meaning there's an MDM policy and user is non-compliant) + // If mdmCompliant is undefined or true, allow tab switching if (mdmCompliant === false && newTab !== "account") { + // Notify the user that authentication is required by their organization + vscode.postMessage({ type: "showMdmAuthRequiredNotification" }) return } From ef340806c7b24807145b802a82974d2270f01733 Mon Sep 17 00:00:00 2001 From: Chris Estreich Date: Thu, 21 Aug 2025 12:36:33 -0700 Subject: [PATCH 215/253] Evals web app fixes / tweaks (#7299) --- apps/web-evals/.env | 2 +- apps/web-evals/scripts/check-services.sh | 4 +-- apps/web-evals/src/app/runs/new/new-run.tsx | 35 +++---------------- .../src/app/runs/new/settings-diff.tsx | 6 ++-- 4 files changed, 11 insertions(+), 36 deletions(-) diff --git a/apps/web-evals/.env b/apps/web-evals/.env index 7970806bec..1bb6dd6dac 100644 --- a/apps/web-evals/.env +++ b/apps/web-evals/.env @@ -1 +1 @@ -DATABASE_URL=postgres://postgres:password@localhost:5432/evals_development +DATABASE_URL=postgres://postgres:password@localhost:5433/evals_development diff --git a/apps/web-evals/scripts/check-services.sh b/apps/web-evals/scripts/check-services.sh index 104a472208..d72ffd54e8 100755 --- a/apps/web-evals/scripts/check-services.sh +++ b/apps/web-evals/scripts/check-services.sh @@ -5,13 +5,13 @@ if ! docker info &> /dev/null; then exit 1 fi -if ! nc -z localhost 5432 2>/dev/null; then +if ! nc -z postgres 5433 2>/dev/null; then echo "❌ PostgreSQL is not running on port 5432" echo "💡 Start it with: pnpm --filter @roo-code/evals db:up" exit 1 fi -if ! nc -z localhost 6379 2>/dev/null; then +if ! nc -z redis 6380 2>/dev/null; then echo "❌ Redis is not running on port 6379" echo "💡 Start it with: pnpm --filter @roo-code/evals redis:up" exit 1 diff --git a/apps/web-evals/src/app/runs/new/new-run.tsx b/apps/web-evals/src/app/runs/new/new-run.tsx index f8633611b6..41d35f3c4c 100644 --- a/apps/web-evals/src/app/runs/new/new-run.tsx +++ b/apps/web-evals/src/app/runs/new/new-run.tsx @@ -8,7 +8,7 @@ import { useForm, FormProvider } from "react-hook-form" import { zodResolver } from "@hookform/resolvers/zod" import fuzzysort from "fuzzysort" import { toast } from "sonner" -import { X, Rocket, Check, ChevronsUpDown, SlidersHorizontal, Book, CircleCheck } from "lucide-react" +import { X, Rocket, Check, ChevronsUpDown, SlidersHorizontal, CircleCheck } from "lucide-react" import { globalSettingsSchema, providerSettingsSchema, EVALS_SETTINGS, getModelId } from "@roo-code/types" @@ -49,11 +49,8 @@ import { PopoverContent, PopoverTrigger, ScrollArea, + ScrollBar, Slider, - Dialog, - DialogContent, - DialogTitle, - DialogFooter, } from "@/components/ui" import { SettingsDiff } from "./settings-diff" @@ -93,10 +90,6 @@ export function NewRun() { const [model, suite, settings] = watch(["model", "suite", "settings", "concurrency"]) - const [systemPromptDialogOpen, setSystemPromptDialogOpen] = useState(false) - const [systemPrompt, setSystemPrompt] = useState("") - const systemPromptRef = useRef(null) - const onSubmit = useCallback( async (values: CreateRun) => { try { @@ -104,13 +97,13 @@ export function NewRun() { values.settings = { ...(values.settings || {}), openRouterModelId: model } } - const { id } = await createRun({ ...values, systemPrompt }) + const { id } = await createRun(values) router.push(`/runs/${id}`) } catch (e) { toast.error(e instanceof Error ? e.message : "An unknown error occurred.") } }, - [mode, model, router, systemPrompt], + [mode, model, router], ) const onFilterModels = useCallback( @@ -269,29 +262,11 @@ export function NewRun() {
    + )} - - - - - - Override System Prompt -