Skip to content

Commit 080b61b

Browse files
authored
Merge branch 'RooCodeInc:main' into main
2 parents 00a0b63 + d116dbf commit 080b61b

File tree

70 files changed

+1166
-486
lines changed

Some content is hidden

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

70 files changed

+1166
-486
lines changed

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
demo.gif filter=lfs diff=lfs merge=lfs -text
22
assets/docs/demo.gif filter=lfs diff=lfs merge=lfs -text
33
src/assets/docs/demo.gif filter=lfs diff=lfs merge=lfs -text
4+
5+
# Test snapshot files - mark as linguist-generated to exclude from GitHub language statistics
6+
*.snap linguist-generated=true

src/core/config/__tests__/importExport.spec.ts

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ describe("importExport", () => {
628628
codebaseIndexEmbedderBaseUrl: "http://localhost:11434", // Wrong URL from Ollama
629629
// OpenAI Compatible settings are now stored directly in codebaseIndexConfig
630630
codebaseIndexOpenAiCompatibleBaseUrl: "https://custom-openai-api.example.com/v1",
631-
codebaseIndexOpenAiCompatibleModelDimension: 1536,
631+
codebaseIndexEmbedderModelDimension: 1536,
632632
},
633633
}
634634

@@ -673,7 +673,7 @@ describe("importExport", () => {
673673
codebaseIndexEmbedderBaseUrl: "",
674674
// OpenAI Compatible settings are now stored directly in codebaseIndexConfig
675675
codebaseIndexOpenAiCompatibleBaseUrl: "https://api.example.com/v1",
676-
codebaseIndexOpenAiCompatibleModelDimension: 768,
676+
codebaseIndexEmbedderModelDimension: 768,
677677
},
678678
}
679679

@@ -688,9 +688,7 @@ describe("importExport", () => {
688688

689689
const exportedData = (safeWriteJson as Mock).mock.calls[0][1]
690690
// Settings are now exported as-is from codebaseIndexConfig
691-
expect(
692-
exportedData.globalSettings.codebaseIndexConfig.codebaseIndexOpenAiCompatibleModelDimension,
693-
).toBe(768)
691+
expect(exportedData.globalSettings.codebaseIndexConfig.codebaseIndexEmbedderModelDimension).toBe(768)
694692
expect(exportedData.globalSettings.codebaseIndexConfig.codebaseIndexOpenAiCompatibleBaseUrl).toBe(
695693
"https://api.example.com/v1",
696694
)
@@ -731,7 +729,7 @@ describe("importExport", () => {
731729
codebaseIndexEmbedderBaseUrl: "http://localhost:11434", // Wrong URL from Ollama
732730
// OpenAI Compatible settings are now stored directly in codebaseIndexConfig
733731
codebaseIndexOpenAiCompatibleBaseUrl: "https://openai-compatible.example.com/v1",
734-
codebaseIndexOpenAiCompatibleModelDimension: 1536,
732+
codebaseIndexEmbedderModelDimension: 1536,
735733
},
736734
}
737735

@@ -749,9 +747,7 @@ describe("importExport", () => {
749747
expect(exportedData.globalSettings.codebaseIndexConfig.codebaseIndexOpenAiCompatibleBaseUrl).toBe(
750748
"https://openai-compatible.example.com/v1",
751749
)
752-
expect(
753-
exportedData.globalSettings.codebaseIndexConfig.codebaseIndexOpenAiCompatibleModelDimension,
754-
).toBe(1536)
750+
expect(exportedData.globalSettings.codebaseIndexConfig.codebaseIndexEmbedderModelDimension).toBe(1536)
755751
// The generic embedder base URL is still there
756752
expect(exportedData.globalSettings.codebaseIndexConfig.codebaseIndexEmbedderBaseUrl).toBe(
757753
"http://localhost:11434",
@@ -921,7 +917,6 @@ describe("importExport", () => {
921917
codebaseIndexEmbedderModelDimension: 1536,
922918
// OpenAI Compatible settings are now stored directly here
923919
codebaseIndexOpenAiCompatibleBaseUrl: "https://imported-url.example.com/v1",
924-
codebaseIndexOpenAiCompatibleModelDimension: 1536,
925920
},
926921
},
927922
})
@@ -956,7 +951,7 @@ describe("importExport", () => {
956951
expect.objectContaining({
957952
codebaseIndexConfig: expect.objectContaining({
958953
codebaseIndexOpenAiCompatibleBaseUrl: "https://imported-url.example.com/v1",
959-
codebaseIndexOpenAiCompatibleModelDimension: 1536,
954+
codebaseIndexEmbedderModelDimension: 1536,
960955
}),
961956
}),
962957
)
@@ -1105,7 +1100,6 @@ describe("importExport", () => {
11051100
codebaseIndexEmbedderModelDimension: testModelDimension,
11061101
// OpenAI Compatible settings are now stored directly in codebaseIndexConfig
11071102
codebaseIndexOpenAiCompatibleBaseUrl: "https://api.example.com/v1",
1108-
codebaseIndexOpenAiCompatibleModelDimension: testModelDimension,
11091103
},
11101104
}
11111105

@@ -1160,7 +1154,7 @@ describe("importExport", () => {
11601154

11611155
// Step 9: Verify that the model dimension was preserved exactly in global settings
11621156
const importedGlobalSettings = mockContextProxy.setValues.mock.calls[0][0]
1163-
expect(importedGlobalSettings.codebaseIndexConfig?.codebaseIndexOpenAiCompatibleModelDimension).toBe(
1157+
expect(importedGlobalSettings.codebaseIndexConfig?.codebaseIndexEmbedderModelDimension).toBe(
11641158
testModelDimension,
11651159
)
11661160
expect(importedGlobalSettings.codebaseIndexConfig?.codebaseIndexOpenAiCompatibleBaseUrl).toBe(
@@ -1198,7 +1192,7 @@ describe("importExport", () => {
11981192
codebaseIndexEmbedderBaseUrl: "https://api.example.com/v1",
11991193
// OpenAI Compatible settings are now stored directly in codebaseIndexConfig
12001194
codebaseIndexOpenAiCompatibleBaseUrl: "https://api.example.com/v1",
1201-
codebaseIndexOpenAiCompatibleModelDimension: testModelDimension, // 0 is a valid value
1195+
codebaseIndexEmbedderModelDimension: testModelDimension, // 0 is a valid value
12021196
},
12031197
}
12041198

@@ -1219,7 +1213,7 @@ describe("importExport", () => {
12191213

12201214
// Verify the exported data includes the model dimension even when it's 0
12211215
const exportedData = (safeWriteJson as Mock).mock.calls[0][1]
1222-
expect(exportedData.globalSettings.codebaseIndexConfig.codebaseIndexOpenAiCompatibleModelDimension).toBe(0)
1216+
expect(exportedData.globalSettings.codebaseIndexConfig.codebaseIndexEmbedderModelDimension).toBe(0)
12231217

12241218
// Test import roundtrip
12251219
const exportedFileContent = JSON.stringify(exportedData)
@@ -1247,7 +1241,7 @@ describe("importExport", () => {
12471241

12481242
// Verify that model dimension 0 was preserved in global settings
12491243
const setValuesCall = mockContextProxy.setValues.mock.calls[0][0]
1250-
expect(setValuesCall.codebaseIndexConfig?.codebaseIndexOpenAiCompatibleModelDimension).toBe(0)
1244+
expect(setValuesCall.codebaseIndexConfig?.codebaseIndexEmbedderModelDimension).toBe(0)
12511245
})
12521246

12531247
it("should handle missing model dimension gracefully", async () => {

src/core/environment/reminder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { TodoItem, TodoStatus } from "@roo-code/types"
55
*/
66
export function formatReminderSection(todoList?: TodoItem[]): string {
77
if (!todoList || todoList.length === 0) {
8-
return ""
8+
return "You have not created a todo list yet. Create one with `update_todo_list` if your task is complicated or involves multiple steps."
99
}
1010
const statusMap: Record<TodoStatus, string> = {
1111
pending: "Pending",

src/core/prompts/__tests__/__snapshots__/add-custom-instructions/architect-mode-prompt.snap

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core/prompts/__tests__/__snapshots__/add-custom-instructions/mcp-server-creation-disabled.snap

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core/prompts/__tests__/__snapshots__/add-custom-instructions/mcp-server-creation-enabled.snap

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core/prompts/__tests__/__snapshots__/add-custom-instructions/partial-reads-enabled.snap

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core/prompts/__tests__/__snapshots__/system-prompt/consistent-system-prompt.snap

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core/prompts/__tests__/__snapshots__/system-prompt/with-computer-use-support.snap

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core/prompts/__tests__/__snapshots__/system-prompt/with-diff-enabled-false.snap

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)