Skip to content

Commit 21455ac

Browse files
committed
Merge main
1 parent 04f5332 commit 21455ac

File tree

298 files changed

+12618
-6704
lines changed

Some content is hidden

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

298 files changed

+12618
-6704
lines changed

README.md

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

e2e/src/suite/subtasks.test.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,17 @@ suite("Roo Code Subtasks", () => {
1717
}
1818
})
1919

20-
await api.setConfiguration({
21-
mode: "ask",
22-
alwaysAllowModeSwitch: true,
23-
alwaysAllowSubtasks: true,
24-
autoApprovalEnabled: true,
25-
enableCheckpoints: false,
26-
})
27-
2820
const childPrompt = "You are a calculator. Respond only with numbers. What is the square root of 9?"
2921

3022
// Start a parent task that will create a subtask.
3123
const parentTaskId = await api.startNewTask({
24+
configuration: {
25+
mode: "ask",
26+
alwaysAllowModeSwitch: true,
27+
alwaysAllowSubtasks: true,
28+
autoApprovalEnabled: true,
29+
enableCheckpoints: false,
30+
},
3231
text:
3332
"You are the parent task. " +
3433
`Create a subtask by using the new_task tool with the message '${childPrompt}'.` +

esbuild.js

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -38,35 +38,21 @@ const copyWasmFiles = {
3838
path.join(distDir, "tiktoken_bg.wasm"),
3939
)
4040

41-
// tree-sitter WASM
42-
fs.copyFileSync(
43-
path.join(nodeModulesDir, "web-tree-sitter", "tree-sitter.wasm"),
44-
path.join(distDir, "tree-sitter.wasm"),
45-
)
41+
// Copy language-specific WASM files
42+
const languageWasmDir = path.join(__dirname, "node_modules", "tree-sitter-wasms", "out")
4643

47-
// language-specific tree-sitter WASMs
48-
const languageWasmDir = path.join(nodeModulesDir, "tree-sitter-wasms", "out")
49-
const languages = [
50-
"typescript",
51-
"tsx",
52-
"python",
53-
"rust",
54-
"javascript",
55-
"go",
56-
"cpp",
57-
"c",
58-
"c_sharp",
59-
"ruby",
60-
"java",
61-
"php",
62-
"swift",
63-
"kotlin",
64-
]
65-
66-
languages.forEach((lang) => {
67-
const filename = `tree-sitter-${lang}.wasm`
68-
fs.copyFileSync(path.join(languageWasmDir, filename), path.join(distDir, filename))
69-
})
44+
// Dynamically read all WASM files from the directory instead of using a hardcoded list
45+
if (fs.existsSync(languageWasmDir)) {
46+
const wasmFiles = fs.readdirSync(languageWasmDir).filter((file) => file.endsWith(".wasm"))
47+
48+
console.log(`Copying ${wasmFiles.length} tree-sitter WASM files to dist directory`)
49+
50+
wasmFiles.forEach((filename) => {
51+
fs.copyFileSync(path.join(languageWasmDir, filename), path.join(distDir, filename))
52+
})
53+
} else {
54+
console.warn(`Tree-sitter WASM directory not found: ${languageWasmDir}`)
55+
}
7056
})
7157
},
7258
}

evals/packages/types/src/roo-code.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,6 @@ export const clineAsks = [
706706
"mistake_limit_reached",
707707
"browser_action_launch",
708708
"use_mcp_server",
709-
"finishTask",
710709
] as const
711710

712711
export const clineAskSchema = z.enum(clineAsks)
@@ -716,7 +715,6 @@ export type ClineAsk = z.infer<typeof clineAskSchema>
716715
// ClineSay
717716

718717
export const clineSays = [
719-
"task",
720718
"error",
721719
"api_req_started",
722720
"api_req_finished",
@@ -729,15 +727,12 @@ export const clineSays = [
729727
"user_feedback",
730728
"user_feedback_diff",
731729
"command_output",
732-
"tool",
733730
"shell_integration_warning",
734731
"browser_action",
735732
"browser_action_result",
736-
"command",
737733
"mcp_server_request_started",
738734
"mcp_server_response",
739-
"new_task_started",
740-
"new_task",
735+
"subtask_result",
741736
"checkpoint_saved",
742737
"rooignore_error",
743738
"diff_error",

locales/ca/README.md

Lines changed: 27 additions & 25 deletions
Large diffs are not rendered by default.

locales/de/README.md

Lines changed: 27 additions & 25 deletions
Large diffs are not rendered by default.

locales/es/README.md

Lines changed: 27 additions & 25 deletions
Large diffs are not rendered by default.

locales/fr/README.md

Lines changed: 27 additions & 25 deletions
Large diffs are not rendered by default.

locales/hi/README.md

Lines changed: 27 additions & 25 deletions
Large diffs are not rendered by default.

locales/it/README.md

Lines changed: 27 additions & 25 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)