Skip to content

Commit 2775a75

Browse files
committed
Resolve merge conflicts: migrate deduplicateReadFileHistory to Task class
- Remove deleted Cline.ts file - Add deduplicateReadFileHistory method to Task class in src/core/task/Task.ts - Call deduplication in attemptApiRequest before making API requests - Preserves original functionality: removes older read_file results for same file - Optimizes context length and token usage by preventing duplicate file content
2 parents 2e517ee + 38d8edf commit 2775a75

File tree

1,901 files changed

+285648
-96837
lines changed

Some content is hidden

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

1,901 files changed

+285648
-96837
lines changed

.changeset/changelog-config.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// Half-works to simplify the format but needs 'overwrite_changeset_changelog.py' in GHA to finish formatting
2-
31
const getReleaseLine = async (changeset) => {
42
const [firstLine] = changeset.summary
53
.split("\n")

.changeset/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
33
"changelog": "./changelog-config.js",
44
"commit": false,
5-
"fixed": [],
5+
"fixed": [["roo-cline"]],
66
"linked": [],
77
"access": "restricted",
88
"baseBranch": "main",

.clinerules

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

.dockerignore

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
# git
2+
.git
3+
4+
# build artifacts
5+
bin/
6+
dist/
7+
**/dist/
8+
out/
9+
**/out/
10+
src/webview-ui/
11+
12+
# dependencies
13+
node_modules/
14+
**/node_modules/
15+
16+
# testing
17+
coverage/
18+
**/.vscode-test/
19+
**/mock/
20+
21+
# devtools
22+
knip.json
23+
.husky/
24+
25+
# monorepo
26+
.turbo/
27+
**/.turbo/
28+
29+
# next.js
30+
**/.next/
31+
.vercel
32+
33+
# Ignore common development files
34+
node_modules
35+
.git
36+
.gitignore
37+
.dockerignore
38+
.env*
39+
.vscode
40+
.idea
41+
42+
# Ignore build artifacts
43+
dist
44+
build
45+
*.log
46+
*.tmp
47+
.cache
48+
coverage
49+
50+
# Ignore OS files
51+
.DS_Store
52+
Thumbs.db
53+
54+
# Ignore test files
55+
__tests__
56+
*.test.js
57+
*.spec.js
58+
*.test.ts
59+
*.spec.ts
60+
61+
# Ignore development config files
62+
.eslintrc*
63+
.prettierrc*
64+
65+
# Ignore most directories except what we need for the build
66+
apps/
67+
evals/
68+
webview-ui/node_modules
69+
src/node_modules
70+
71+
# Keep essential files for the build
72+
!README.md
73+
!CHANGELOG.md
74+
!package.json
75+
!pnpm-lock.yaml
76+
!pnpm-workspace.yaml
77+
!scripts/bootstrap.mjs
78+
!apps/web-evals/
79+
!src/
80+
!webview-ui/
81+
!packages/evals/.docker/entrypoints/runner.sh
82+
!packages/build/
83+
!packages/cloud/
84+
!packages/config-eslint/
85+
!packages/config-typescript/
86+
!packages/evals/
87+
!packages/ipc/
88+
!packages/telemetry/
89+
!packages/types/
90+
!locales/

.env.sample

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
POSTHOG_API_KEY=key-goes-here
2+
3+
# Roo Code Cloud / Local Development
4+
CLERK_BASE_URL=https://epic-chamois-85.clerk.accounts.dev
5+
ROO_CODE_API_URL=http://localhost:3000

.eslintrc.json

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

.git-blame-ignore-revs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# Ran Prettier on all files - https://github.com/RooVetGit/Roo-Code/pull/404
1+
# Ran Prettier on all files - https://github.com/RooCodeInc/Roo-Code/pull/404
22
60a0a824b96a0b326af4d8871b6903f4ddcfe114
33
579bdd9dbf6d2d569e5e7adb5ff6292b1e42ea34

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
demo.gif filter=lfs diff=lfs merge=lfs -text
22
assets/docs/demo.gif filter=lfs diff=lfs merge=lfs -text
3+
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

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# These owners will be the default owners for everything in the repo
2-
* @mrubens @cte
2+
* @mrubens @cte @jr
Lines changed: 95 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,98 @@
11
name: Bug Report
2-
description: File a bug report
2+
description: Clearly report a bug with detailed repro steps
33
labels: ["bug"]
44
body:
5-
- type: input
6-
id: version
7-
attributes:
8-
label: Which version of the app are you using?
9-
description: Please specify the app version you're using (e.g. v3.3.1)
10-
validations:
11-
required: true
12-
- type: dropdown
13-
id: provider
14-
attributes:
15-
label: Which API Provider are you using?
16-
multiple: false
17-
options:
18-
- OpenRouter
19-
- Anthropic
20-
- Google Gemini
21-
- DeepSeek
22-
- OpenAI
23-
- OpenAI Compatible
24-
- GCP Vertex AI
25-
- AWS Bedrock
26-
- Glama
27-
- VS Code LM API
28-
- LM Studio
29-
- Ollama
30-
validations:
31-
required: true
32-
- type: input
33-
id: model
34-
attributes:
35-
label: Which Model are you using?
36-
description: Please specify the model you're using (e.g. Claude 3.7 Sonnet)
37-
validations:
38-
required: true
39-
- type: textarea
40-
id: what-happened
41-
attributes:
42-
label: What happened?
43-
description: Also tell us, what did you expect to happen?
44-
placeholder: Tell us what you see!
45-
validations:
46-
required: true
47-
- type: textarea
48-
id: steps
49-
attributes:
50-
label: Steps to reproduce
51-
description: How do you trigger this bug? Please walk us through it step by step.
52-
value: |
53-
1.
54-
2.
55-
3.
56-
validations:
57-
required: true
58-
- type: textarea
59-
id: logs
60-
attributes:
61-
label: Relevant API REQUEST output
62-
description: Please copy and paste any relevant output. This will be automatically formatted into code, so no need for backticks.
63-
render: shell
64-
- type: textarea
65-
id: additional-context
66-
attributes:
67-
label: Additional context
68-
description: Add any other context about the problem here, such as screenshots or related issues.
5+
- type: markdown
6+
attributes:
7+
value: |
8+
**Thanks for your report!** Please check existing issues first:
9+
👉 https://github.com/RooCodeInc/Roo-Code/issues
10+
11+
- type: input
12+
id: version
13+
attributes:
14+
label: App Version
15+
description: What version of Roo Code are you using? (e.g., v3.3.1)
16+
validations:
17+
required: true
18+
19+
- type: dropdown
20+
id: provider
21+
attributes:
22+
label: API Provider
23+
options:
24+
- Anthropic
25+
- AWS Bedrock
26+
- Chutes AI
27+
- DeepSeek
28+
- Glama
29+
- Google Gemini
30+
- Google Vertex AI
31+
- Groq
32+
- Human Relay Provider
33+
- LiteLLM
34+
- LM Studio
35+
- Mistral AI
36+
- Ollama
37+
- OpenAI
38+
- OpenAI Compatible
39+
- OpenRouter
40+
- Requesty
41+
- Unbound
42+
- VS Code Language Model API
43+
- xAI (Grok)
44+
- Not Applicable / Other
45+
validations:
46+
required: true
47+
48+
- type: input
49+
id: model
50+
attributes:
51+
label: Model Used
52+
description: Exact model name (e.g., Claude 3.7 Sonnet). Use N/A if irrelevant.
53+
validations:
54+
required: true
55+
56+
- type: textarea
57+
id: roo-code-tasks
58+
attributes:
59+
label: Roo Code Task Links (Optional)
60+
description: |
61+
If you have any publicly shared task links that demonstrate the issue, please paste them here.
62+
This helps maintainers understand the context.
63+
Example: https://app.roocode.com/share/task-id
64+
placeholder: Paste your Roo Code share links here, one per line
65+
66+
- type: textarea
67+
id: steps
68+
attributes:
69+
label: 🔁 Steps to Reproduce
70+
description: |
71+
Help us see what you saw. Give clear, numbered steps:
72+
73+
1. Setup (OS, extension version, settings)
74+
2. Exact actions (clicks, input, files, commands)
75+
3. What happened after each step
76+
77+
Think like you're writing a recipe. Without this, we can't reproduce the issue.
78+
validations:
79+
required: true
80+
81+
- type: textarea
82+
id: what-happened
83+
attributes:
84+
label: 💥 Outcome Summary
85+
description: |
86+
Recap what went wrong in one or two lines.
87+
88+
Example: "Expected code to run, but got an empty response and no error."
89+
placeholder: Expected ___, but got ___.
90+
validations:
91+
required: true
92+
93+
- type: textarea
94+
id: logs
95+
attributes:
96+
label: 📄 Relevant Logs or Errors (Optional)
97+
description: Paste API logs, terminal output, or errors here. Use triple backticks (```) for code formatting.
98+
render: shell

0 commit comments

Comments
 (0)