Skip to content

Commit b9ecd4c

Browse files
committed
Merge branch 'main' into cte/task-persistence-jsonl
2 parents de33481 + 72962b3 commit b9ecd4c

Some content is hidden

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

63 files changed

+2074
-1050
lines changed

.changeset/hip-news-run.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"roo-cline": patch
3+
---
4+
5+
Properly hide cache section of task header

.changeset/shiny-wolves-attend.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"roo-cline": patch
3+
---
4+
5+
Use formatLargeNumber on token counts in task header

.changeset/spotty-baboons-clap.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"roo-cline": patch
3+
---
4+
5+
13.3.3

.changeset/tasty-pants-applaud.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"roo-cline": patch
3+
---
4+
5+
Package material icons in vsix

.changeset/twenty-planes-prove.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"roo-cline": patch
3+
---
4+
5+
Throttle calls to calculate task folder size

.vscodeignore

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,44 @@
11
# Default
2+
.changeset/**
23
.github/**
34
.husky/**
45
.vscode/**
5-
.vscode-test/**
6-
out/**
7-
out-integration/**
8-
evals/**
9-
e2e/**
6+
coverage/**
107
node_modules/**
118
src/**
9+
scripts/**
1210
.gitignore
13-
.yarnrc
1411
esbuild.js
15-
vsc-extension-quickstart.md
12+
jest.*
1613
**/tsconfig.json
1714
**/.eslintrc.json
15+
.prettierignore
1816
**/*.map
1917
**/*.ts
20-
**/.vscode-test.*
18+
**/.gitignore
2119

2220
# Custom
23-
.nvmrc
21+
.env.sample
22+
.git-blame-ignore-revs
23+
.gitconfig
2424
.gitattributes
25-
.prettierignore
25+
.tool-versions
26+
.vite-port
27+
.nvmrc
2628
.clinerules*
2729
.roomodes
30+
.rooignore
2831
.roo/**
2932
cline_docs/**
30-
coverage/**
33+
e2e/**
34+
evals/**
3135
locales/**
32-
benchmark/**
33-
.direnv/**
36+
out/**
37+
ellipsis.yaml
38+
knip.json
3439

35-
# Ignore all webview-ui files except the build directory (https://github.com/microsoft/vscode-webview-ui-toolkit-samples/blob/main/frameworks/hello-world-react-cra/.vscodeignore)
40+
# Ignore all webview-ui files except the build directory.
41+
# https://github.com/microsoft/vscode-webview-ui-toolkit-samples/blob/main/frameworks/hello-world-react-cra/.vscodeignore
3642
webview-ui/src/**
3743
webview-ui/public/**
3844
webview-ui/scripts/**
@@ -41,17 +47,20 @@ webview-ui/README.md
4147
webview-ui/package.json
4248
webview-ui/package-lock.json
4349
webview-ui/node_modules/**
44-
**/.gitignore
4550

46-
# Fix issue where codicons don't get packaged (https://github.com/microsoft/vscode-extension-samples/issues/692)
51+
# Include codicons
4752
!node_modules/@vscode/codicons/dist/codicon.css
4853
!node_modules/@vscode/codicons/dist/codicon.ttf
4954

55+
# Include material icons
56+
!node_modules/vscode-material-icons/generated/**
57+
5058
# Include default themes JSON files used in getTheme
5159
!src/integrations/theme/default-themes/**
5260

5361
# Ignore doc assets
5462
assets/docs/**
63+
5564
# Include icons and images
5665
!assets/icons/**
5766
!assets/images/**

README.md

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

evals/apps/cli/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ const runExercise = async ({ run, task, server }: { run: Run; task: Task; server
190190
ROO_CODE_IPC_SOCKET_PATH: taskSocketPath,
191191
},
192192
shell: "/bin/bash",
193-
})`code --disable-workspace-trust -n ${workspacePath}`
193+
})`code --disable-workspace-trust -W ${workspacePath}`
194194

195195
// Give VSCode some time to spawn before connecting to its unix socket.
196196
await new Promise((resolve) => setTimeout(resolve, 3_000))

flake.lock

Lines changed: 0 additions & 27 deletions
This file was deleted.

flake.nix

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)