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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/types/src/codebase-index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const codebaseIndexConfigSchema = z.object({
codebaseIndexEnabled: z.boolean().optional(),
codebaseIndexQdrantUrl: z.string().optional(),
codebaseIndexEmbedderProvider: z
.enum(["openai", "ollama", "openai-compatible", "gemini", "mistral", "vercel-ai-gateway", "openrouter", "roo"])
.enum(["openai", "ollama", "openai-compatible", "gemini", "mistral", "vercel-ai-gateway", "openrouter"])
.optional(),
codebaseIndexEmbedderBaseUrl: z.string().optional(),
codebaseIndexEmbedderModelId: z.string().optional(),
Expand Down Expand Up @@ -52,7 +52,6 @@ export const codebaseIndexModelsSchema = z.object({
mistral: z.record(z.string(), z.object({ dimension: z.number() })).optional(),
"vercel-ai-gateway": z.record(z.string(), z.object({ dimension: z.number() })).optional(),
openrouter: z.record(z.string(), z.object({ dimension: z.number() })).optional(),
roo: z.record(z.string(), z.object({ dimension: z.number() })).optional(),
})

export type CodebaseIndexModels = z.infer<typeof codebaseIndexModelsSchema>
Expand Down
3 changes: 1 addition & 2 deletions src/i18n/locales/ca/embeddings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/i18n/locales/de/embeddings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/i18n/locales/en/embeddings.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@
"invalidModel": "Invalid model. Please check your model configuration.",
"invalidResponse": "Invalid response from embedder service. Please check your configuration.",
"apiKeyRequired": "API key is required for this embedder",
"baseUrlRequired": "Base URL is required for this embedder",
"rooAuthenticationRequired": "Roo Code Cloud authentication required. Please sign in to use the Roo embeddings provider."
"baseUrlRequired": "Base URL is required for this embedder"
},
"serviceFactory": {
"openAiConfigMissing": "OpenAI configuration missing for embedder creation",
Expand Down
3 changes: 1 addition & 2 deletions src/i18n/locales/es/embeddings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/i18n/locales/fr/embeddings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/i18n/locales/hi/embeddings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/i18n/locales/id/embeddings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/i18n/locales/it/embeddings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/i18n/locales/ja/embeddings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/i18n/locales/ko/embeddings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/i18n/locales/nl/embeddings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/i18n/locales/pl/embeddings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/i18n/locales/pt-BR/embeddings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/i18n/locales/ru/embeddings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/i18n/locales/tr/embeddings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/i18n/locales/vi/embeddings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/i18n/locales/zh-CN/embeddings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/i18n/locales/zh-TW/embeddings.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 12 additions & 52 deletions src/services/code-index/__tests__/config-manager.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,6 @@ vi.mock("../../../core/config/ContextProxy")
// Mock embeddingModels module
vi.mock("../../../shared/embeddingModels")

// Mock CloudService
vi.mock("@roo-code/cloud", () => ({
CloudService: {
hasInstance: vi.fn(() => false),
instance: {
authService: {
getSessionToken: vi.fn(() => undefined),
},
},
},
}))

import { CloudService } from "@roo-code/cloud"
const mockedCloudService = vi.mocked(CloudService)

// Import mocked functions
import { getDefaultModelId, getModelDimension, getModelScoreThreshold } from "../../../shared/embeddingModels"

Expand Down Expand Up @@ -69,7 +54,7 @@ describe("CodeIndexConfigManager", () => {
it("should initialize with ContextProxy", () => {
expect(configManager).toBeDefined()
expect(configManager.isFeatureEnabled).toBe(true)
expect(configManager.currentEmbedderProvider).toBe("roo")
expect(configManager.currentEmbedderProvider).toBe("openai")
})
})

Expand Down Expand Up @@ -113,41 +98,17 @@ describe("CodeIndexConfigManager", () => {

const result = await configManager.loadConfiguration()

// Roo is the default provider but requires authentication to be configured
// Since there's no session token in the test environment, isConfigured is false
expect(result.currentConfig.isConfigured).toBe(false)
expect(result.currentConfig.embedderProvider).toBe("roo")
expect(result.currentConfig.modelId).toBeUndefined()
expect(result.currentConfig.openAiOptions).toEqual({ openAiNativeApiKey: "" })
expect(result.currentConfig.ollamaOptions).toEqual({ ollamaBaseUrl: "" })
expect(result.currentConfig.qdrantUrl).toBe("http://localhost:6333")
expect(result.currentConfig.qdrantApiKey).toBe("")
expect(result.currentConfig.searchMinScore).toBe(0.4)
expect(result.requiresRestart).toBe(false)
})

it("should return isConfigured=true for Roo provider when authenticated", async () => {
// Mock CloudService to return an authenticated session
mockedCloudService.hasInstance.mockReturnValue(true)
;(mockedCloudService.instance.authService?.getSessionToken as ReturnType<typeof vi.fn>).mockReturnValue(
"valid-session-token",
)

mockContextProxy.getGlobalState.mockReturnValue({
codebaseIndexEnabled: true,
codebaseIndexQdrantUrl: "http://localhost:6333",
codebaseIndexEmbedderProvider: "roo",
expect(result.currentConfig).toEqual({
isConfigured: false,
embedderProvider: "openai",
modelId: undefined,
openAiOptions: { openAiNativeApiKey: "" },
ollamaOptions: { ollamaBaseUrl: "" },
qdrantUrl: "http://localhost:6333",
qdrantApiKey: "",
searchMinScore: 0.4,
})
mockContextProxy.getSecret.mockReturnValue(undefined)

configManager = new CodeIndexConfigManager(mockContextProxy)
const result = await configManager.loadConfiguration()

expect(result.currentConfig.isConfigured).toBe(true)
expect(result.currentConfig.embedderProvider).toBe("roo")

// Reset the mock
mockedCloudService.hasInstance.mockReturnValue(false)
expect(result.requiresRestart).toBe(false)
})

it("should load configuration from globalState and secrets", async () => {
Expand Down Expand Up @@ -1663,7 +1624,6 @@ describe("CodeIndexConfigManager", () => {

expect(config).toHaveProperty("isConfigured")
expect(config).toHaveProperty("embedderProvider")
// Provider is "openai" as set in the mock, not "roo"
expect(config.embedderProvider).toBe("openai")
})
})
Expand Down Expand Up @@ -1819,7 +1779,7 @@ describe("CodeIndexConfigManager", () => {
configManager = new CodeIndexConfigManager(mockContextProxy)
await configManager.loadConfiguration()

// Should use default model ID for the configured provider (openai)
// Should use default model ID
expect(configManager.currentModelDimension).toBe(1536)
expect(mockedGetDefaultModelId).toHaveBeenCalledWith("openai")
expect(mockedGetModelDimension).toHaveBeenCalledWith("openai", "text-embedding-3-small")
Expand Down
Loading
Loading