Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull in updates from upstream #26

Merged
merged 188 commits into from
Mar 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
188 commits
Select commit Hold shift + click to select a range
549b06f
feat: add sse mcp support
Mar 8, 2025
bb42fb6
Merge branch 'main' into feature/add_sse_mcp
Mar 8, 2025
b4f808d
fix ut
Mar 8, 2025
22f5130
Add support for remote browser connection and settings
afshawnlotfi Mar 9, 2025
58532bc
Merge pull request #1 from cannuri/update-from-upstream
cannuri Mar 9, 2025
66e3b96
Add remote browser connection support and related state management
afshawnlotfi Mar 10, 2025
f9a1cd0
add sseOptions
Mar 10, 2025
0d0f7e3
Merge branch 'main' into feature/add_sse_mcp
Mar 10, 2025
71795d5
Enhance BrowserSettings component with VSCodeTextField for remote bro…
afshawnlotfi Mar 10, 2025
85b54b3
support custom base url for gemini in google AI studio
Mar 10, 2025
89b8b10
Merge remote-tracking branch 'origin/main' into feature/add_sse_mcp
mrubens Mar 10, 2025
643508c
Merge remote-tracking branch 'origin/feature/add_sse_mcp' into featur…
Mar 10, 2025
4a54294
Merge remote-tracking branch 'upstream/main'
cannuri Mar 10, 2025
f13d28a
simpler way of setting up
Mar 10, 2025
42287ad
Merge pull request #2 from cannuri/feature/update-main
cannuri Mar 10, 2025
f4b3c44
add gemini-2.0-pro-exp-02-05 model to vertex
shohei-ihaya Mar 10, 2025
5a3c207
Follow the established pattern for command registration
cte Mar 10, 2025
f8a592a
Rename ClineAPI to RooCodeAPI and improve types
cte Mar 10, 2025
0a03c88
Update src/exports/README.md
cte Mar 10, 2025
7681a98
Simplify `npm install` by automatically installing npm-run-all
cte Mar 10, 2025
2187369
Remove benchmark
cte Mar 10, 2025
102a996
fix: update MCP servers directory path for platform compatibility
hannesrudolph Mar 10, 2025
171037a
Add enhanced error handling and logging for AWS Bedrock custom ARNs
Smartsheet-JB-Brown Mar 10, 2025
ce3e22e
Refactor Docker gateway IP retrieval to use a dedicated shell command…
afshawnlotfi Mar 10, 2025
abcb7c1
Update src/core/webview/ClineProvider.ts
hannesrudolph Mar 10, 2025
a9773b7
fix browser_action system prompt
cannuri Mar 11, 2025
9dfdc42
Merge pull request #1556 from cannuri/cannuri/fix-browser-system-prompt
mrubens Mar 11, 2025
7462906
Update ClineProvider.ts
hannesrudolph Mar 11, 2025
6cfc1cd
Merge pull request #1528 from afshawnlotfi/chrome-remote-webtools
mrubens Mar 11, 2025
00bca30
Merge pull request #1545 from RooVetGit/cte/action-registraion-cleanup
cte Mar 11, 2025
d6a9e0f
Merge pull request #1552 from RooVetGit/mcp-home-dir
mrubens Mar 11, 2025
77186e8
Cleanup
mrubens Mar 11, 2025
9eab941
Merge pull request #1550 from Smartsheet-JB-Brown/jbbrown/aws_custom_…
mrubens Mar 11, 2025
f306461
Fix usage tracking for SiliconFlow etc
mrubens Mar 11, 2025
8c21f0e
refactor alert dialog styles, use vscode theme
cannuri Mar 11, 2025
13be66f
Merge pull request #1560 from cannuri/cannuri/fix-alert-dialog-theme
cte Mar 11, 2025
90a607f
Merge branch 'main' into cte/roo-code-api
cte Mar 11, 2025
ebb5a57
Merge pull request #1558 from RooVetGit/fix_open_ai_usage
mrubens Mar 11, 2025
33f232a
Merge pull request #1548 from RooVetGit/cte/npm-install-all
cte Mar 11, 2025
edb53bf
Merge pull request #1546 from RooVetGit/cte/roo-code-api
cte Mar 11, 2025
7e0a4dd
Revert "Try to prevent additional cases in which terminal commands lo…
Mar 8, 2025
384b469
Revert "Handle outputless commands"
Mar 8, 2025
75de043
Revert "Remove terminal actions"
Mar 8, 2025
13c75a1
Revert "Disable terminal actions for now"
Mar 8, 2025
070a36b
Revert "Smart truncation for terminal output"
Mar 8, 2025
60c14d8
test: add comprehensive terminal command execution testing
Mar 4, 2025
3a950bb
refactor: Rename TerminalInfo to Terminal and relocate to Terminal.ts
Mar 4, 2025
daf36f3
refactor: move interpretExitCode from TerminalManager to TerminalProcess
Mar 4, 2025
e24e5b2
refactor: move getTerminalContents to Terminal class
Mar 4, 2025
0e41241
fix: replace echo -e with printf in terminal tests
Mar 4, 2025
304fcf2
fix: improve terminal execution with shell integration status
Mar 5, 2025
59745a7
refactor: establish natural terminal hierarchy
Mar 6, 2025
2412986
test: properly handle exit codes in terminal tests
Mar 6, 2025
3157bf2
refactor: move interpretExitCode from TerminalManager to TerminalProcess
Mar 6, 2025
1973f87
fix: prevent duplicate terminal handler registration
Mar 6, 2025
bf2ce7e
refactor: move terminal functionality to Terminal class
Mar 6, 2025
bc8cfc9
fix: prevent terminal sharing between Roo tasks
Mar 6, 2025
9f5a67e
refactor: remove TerminalManager after migration
Mar 6, 2025
d25bcb1
test: suppress stderr output in TerminalProcessExec tests
Mar 6, 2025
24d8ef9
fix: emit line event when command output starts
Mar 7, 2025
25e46a2
fix: terminal output not showing after command completion
Mar 7, 2025
e27c6aa
fix: terminal process isolation between parallel Cline tasks
Mar 7, 2025
1a1432d
fix: remove forced directory changes that break shell integration
Mar 8, 2025
2319f96
test: update Terminal constructor calls
Mar 8, 2025
5c9f772
docs: document TerminalProcess stability guidelines
Mar 8, 2025
e3b682f
perf: use string instead of array for terminal output
Mar 8, 2025
5de0133
docs: fix test file path in comment
Mar 8, 2025
1601401
cleanup: remove unused stream property from Terminal
Mar 8, 2025
7dadf4c
refactor: remove redundant terminal ID from event handling
Mar 8, 2025
a867595
doc: enhance shell integration error messages
Mar 9, 2025
f2891d7
test: update no_shell_integration event test
Mar 9, 2025
8de202b
fix: prevent UI freeze when terminal stream is unavailable
Mar 9, 2025
4e0f868
fix: improve error handling when start sequence not received but stre…
Mar 9, 2025
8b8c4fd
fix: handle undefined exit codes in terminal output
Mar 9, 2025
c31a5e5
perf: optimize truncateOutput for large inputs
Mar 9, 2025
5be49e1
fix: apply terminal output line limits consistently
Mar 9, 2025
269ddf9
fix: avoid duplicate terminal output accumulation
Mar 10, 2025
131f9ad
feat: add run-length encoding for repeated lines
Mar 10, 2025
0b4fa0b
feat: compress repeated terminal output lines
Mar 10, 2025
e3adee4
fix: allow background terminals to broadcast output across tasks
Mar 10, 2025
62ffa79
fix: prevent spurious onDidEndTerminalShellExecution from breaking te…
Mar 11, 2025
701b5a7
test: align terminal tests with shell integration safeguards
Mar 11, 2025
6ce8e56
fix: Preserve parent-child relationship when cancelling subtasks
cannuri Mar 11, 2025
621fc0e
Revert "Merge pull request #1518 from RooVetGit/revert_tool_progress_…
qdaxb Mar 11, 2025
8917ab7
fix duplicate ask
qdaxb Mar 10, 2025
ff54c63
Merge pull request #1526 from qdaxb/fix_progress_status
mrubens Mar 11, 2025
7114cef
feat: openai-compatible deepseek/qwq reasoning support
lightrabbit Mar 11, 2025
8b09566
Merge branch 'main' into support-custom-baseUrl-for-google-ai-studio-…
dqroid Mar 11, 2025
a3a5592
add config for gemini custom base url
Mar 11, 2025
9d0b824
fix test error for wrong arguments after additional base url added
Mar 11, 2025
76f9181
Use baseURL in OpenRouter generation check
mrubens Mar 11, 2025
b5f6e37
Merge pull request #1543 from shohei-ihaya/vertex
mrubens Mar 11, 2025
8b76206
update MCP prompt instructions
Mar 11, 2025
29aa464
Merge remote-tracking branch 'origin/main' into feature/add_sse_mcp
Mar 11, 2025
99258e4
Merge pull request #1572 from RooVetGit/fix_openrouter_generation_check
mrubens Mar 11, 2025
f534e80
fix ut
Mar 11, 2025
5e788fc
remove rejectUnauthorized
Mar 11, 2025
3b2d6bc
Merge pull request #1564 from cannuri/cannuri/fix_subtask_cancel_resu…
mrubens Mar 11, 2025
b73bc39
Merge pull request #1365 from KJ7LNW/roo-fix-terminal-undefined-exit-…
cte Mar 11, 2025
4b6def5
ContextProxy fix - constructor should not be async
cte Mar 11, 2025
80d1fae
Update src/shared/globalState.ts
cte Mar 11, 2025
49fca10
Fix MarkdownBlock text color for Dark High Contrast theme
cannuri Mar 12, 2025
a25f1d9
fix: add PowerShell-specific command handling
Mar 12, 2025
f29a5fa
test: add workspace configuration mock for terminal tests
Mar 12, 2025
50b7326
fix: add workspace configuration mock to TerminalProcess test
Mar 12, 2025
7806829
Fix unit tests on MacOS
cte Mar 12, 2025
0d55593
Remove references to base64 from comments
cte Mar 12, 2025
30770ed
Update src/integrations/terminal/__tests__/TerminalProcessExec.test.ts
cte Mar 12, 2025
13d54ad
Merge pull request #1583 from cannuri/cannuri/fix-markdownblock-text-…
cte Mar 12, 2025
0fafe06
Merge pull request #1586 from RooVetGit/cte/fix-tests-macos
cte Mar 12, 2025
d8df9a5
Cost display updating for Bedrock custom ARNs that are prompt routers
Smartsheet-JB-Brown Mar 12, 2025
421e197
Add prompt caching to OpenAI-compatible custom model info
mrubens Mar 11, 2025
10c1e7d
Add cache control key to messages in OpenAI compatible provider
dleen Mar 12, 2025
d3d1a27
Add Deepseek R1 On-Demand to Bedrock
andreastempsch Mar 12, 2025
f9cc13c
upgrade @modelcontextprotocol/sdk to latest version
Mar 12, 2025
e45f515
Merge branch 'main' into feature/add_sse_mcp
Mar 12, 2025
505f86d
replace eventsource with reconnecting-eventsource to optimize the code.
Mar 12, 2025
ae6903b
Merge pull request #1579 from RooVetGit/cte/context-proxy-fixes
cte Mar 12, 2025
baa346d
Remove preferredLanguage and just rely on VSCode language
mrubens Mar 11, 2025
00bf914
Add i18n
mrubens Mar 11, 2025
28e7451
PR cleanup
mrubens Mar 12, 2025
6fb61a2
Merge pull request #1590 from ATempsch/add_deepseek_r1_to_bedrock
mrubens Mar 12, 2025
9b5ee27
Merge pull request #1587 from dleen/cache
mrubens Mar 12, 2025
0d81c0d
Merge pull request #1584 from RooVetGit/i18n
mrubens Mar 12, 2025
c8b3095
Merge pull request #1566 from lightrabbit/feature/openai-compatible-d…
mrubens Mar 12, 2025
4ce2664
Merge pull request #1585 from KJ7LNW/roo-fix-win32-terminal-dup-comma…
cte Mar 12, 2025
cad2741
Merge remote-tracking branch 'origin/main' into feature/add_sse_mcp
mrubens Mar 12, 2025
93611ea
Merge remote-tracking branch 'origin/main' into support-custom-baseUr…
mrubens Mar 12, 2025
5b7ed8e
Merge pull request #1495 from aheizi/feature/add_sse_mcp
mrubens Mar 12, 2025
973acf9
Add googleGeminiBaseUrl to roo-code.d.ts
mrubens Mar 12, 2025
7ece065
Indentation fix
mrubens Mar 12, 2025
705b3ba
Merge pull request #1534 from dqroid/support-custom-baseUrl-for-googl…
mrubens Mar 12, 2025
0d8c6e7
Add diffStrategy name to telemetry
mrubens Mar 12, 2025
3cd6c74
Merge pull request #1599 from RooVetGit/diff_strategy_telemetry
mrubens Mar 12, 2025
774248b
Fix more hard-coded openrouter urls
mrubens Mar 12, 2025
b63c136
Merge pull request #1603 from RooVetGit/more_open_router_base_url_fixing
mrubens Mar 12, 2025
179d97c
updated prices to match US-West-2 list price shown at https://aws.ama…
Smartsheet-JB-Brown Mar 12, 2025
acac9e9
Merge pull request #1607 from Smartsheet-JB-Brown/jbbrown/update_bedr…
mrubens Mar 12, 2025
8454c52
v3.8.5
mrubens Mar 13, 2025
d76479a
Merge pull request #1611 from RooVetGit/v3.8.5
mrubens Mar 13, 2025
2f64e75
changeset version bump
github-actions[bot] Mar 13, 2025
5ad287c
Update CHANGELOG.md
mrubens Mar 13, 2025
d34b5e0
Merge pull request #1527 from RooVetGit/changeset-release/main
mrubens Mar 13, 2025
4b23644
Add Cline events and roofactor subtasks slightly
cte Mar 13, 2025
7845f96
Merge pull request #1612 from RooVetGit/cte/task-events
cte Mar 13, 2025
c609856
Fix e2e tests
cte Mar 13, 2025
de85cc5
Merge pull request #1617 from RooVetGit/cte/fix-e2e
cte Mar 13, 2025
ef944a6
Update git config for marketplace publish
mrubens Mar 13, 2025
b449bb6
Update .github/workflows/marketplace-publish.yml
mrubens Mar 13, 2025
66c1007
Merge pull request #1619 from RooVetGit/mrubens-patch-4
mrubens Mar 13, 2025
f767524
Update src/api/providers/bedrock.ts
Smartsheet-JB-Brown Mar 13, 2025
8d30b6f
Update src/api/providers/bedrock.ts
Smartsheet-JB-Brown Mar 13, 2025
b29f94a
Revert "feat: add sse mcp support"
mrubens Mar 13, 2025
b25c7ed
Create loud-bugs-hope.md
mrubens Mar 13, 2025
9d4d82c
Merge pull request #1620 from RooVetGit/revert-1495-feature/add_sse_mcp
mrubens Mar 13, 2025
d887951
changeset version bump
github-actions[bot] Mar 13, 2025
148bca7
Updating CHANGELOG.md format
invalid-email-address Mar 13, 2025
ba3d1e7
Update CHANGELOG.md
mrubens Mar 13, 2025
6eb648b
Merge pull request #1621 from RooVetGit/changeset-release/main
mrubens Mar 13, 2025
613370a
Delete pr-description.md
Smartsheet-JB-Brown Mar 13, 2025
3ad198b
Fix 'See less' style
mrubens Mar 13, 2025
cd9fb24
Merge pull request #1622 from RooVetGit/fix_see_less
mrubens Mar 13, 2025
6c74e9b
PR review cleanup
Smartsheet-JB-Brown Mar 13, 2025
4ada518
Merge branch 'main' into jbbrown/bedrock_cost_intelligent_prompt_routing
mrubens Mar 13, 2025
fbdf758
Merge pull request #1604 from Smartsheet-JB-Brown/jbbrown/bedrock_cos…
mrubens Mar 13, 2025
1e6327b
Add script to update a Contributors section in the README
mrubens Mar 14, 2025
e068bd6
Add CI step to update contributors
mrubens Mar 14, 2025
954eb31
Merge pull request #1630 from RooVetGit/contributors
mrubens Mar 14, 2025
d9ffda5
Open a PR to update contributors
mrubens Mar 14, 2025
b9d3596
Merge pull request #1632 from RooVetGit/update_contributors_pr
mrubens Mar 14, 2025
548f25b
Better git logic for updating contributors in readme
mrubens Mar 14, 2025
b0ab8e0
Update .github/workflows/update-contributors.yml
mrubens Mar 14, 2025
91dab5f
Merge pull request #1633 from RooVetGit/better_contributors_pr_logic
mrubens Mar 14, 2025
0bf07f4
Use create pull request action more
mrubens Mar 14, 2025
afb8b05
Merge pull request #1634 from RooVetGit/contributors_use_create_pull_…
mrubens Mar 14, 2025
68cbce8
Run prettier before checking for contributor changes
mrubens Mar 14, 2025
b893eea
Merge pull request #1635 from RooVetGit/contributors_prettier
mrubens Mar 14, 2025
b3f51bf
Only set width on contributor images
mrubens Mar 14, 2025
26acb17
Merge pull request #1636 from RooVetGit/format_contributor_images
mrubens Mar 14, 2025
363dbc5
Update update-contributors.js
mrubens Mar 14, 2025
d1f69fd
Merge pull request #1637 from RooVetGit/mrubens-patch-4
mrubens Mar 14, 2025
9bfd0c9
Disable husky when updating contributors
mrubens Mar 14, 2025
262046d
Merge pull request #1638 from RooVetGit/disable_husky_in_update_contr…
mrubens Mar 14, 2025
dc4efd6
Update update-contributors.yml
mrubens Mar 14, 2025
00af340
Merge pull request #1639 from RooVetGit/mrubens-patch-4
mrubens Mar 14, 2025
6969ac6
docs: update contributors list [skip ci]
mrubens Mar 14, 2025
99f64ca
Merge pull request #1640 from RooVetGit/update-contributors-1741927321
mrubens Mar 14, 2025
612ef8b
Merge remote-tracking branch 'upstream/main' into update-from-upstream
kevinvandijk Mar 14, 2025
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
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
"no-throw-literal": "warn",
"semi": "off"
},
"ignorePatterns": ["out", "dist", "**/*.d.ts"]
"ignorePatterns": ["out", "dist", "**/*.d.ts", "!roo-code.d.ts"]
}
165 changes: 82 additions & 83 deletions .github/actions/ai-release-notes/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,95 +2,94 @@ name: AI Release Notes
description: Generate AI release notes using git and openai, outputs 'RELEASE_NOTES' and 'OPENAI_PROMPT'

inputs:
OPENAI_API_KEY:
required: true
type: string
GHA_PAT:
required: true
type: string
model_name:
required: false
type: string
default: gpt-4o-mini
repo_path:
required: false
type: string
custom_prompt:
required: false # knip:
# runs-on: ubuntu-latest
# steps:
# - name: Checkout code
# uses: actions/checkout@v4
# - name: Setup Node.js
# uses: actions/setup-node@v4
# with:
# node-version: '18'
# cache: 'npm'
# - name: Install dependencies
# run: npm run install:ci
# - name: Run knip checks
# run: npm run knip
default: ''
type: string
git_ref:
required: true
type: string
head_ref:
required: true
type: string
base_ref:
required: true
type: string
OPENAI_API_KEY:
required: true
type: string
GHA_PAT:
required: true
type: string
model_name:
required: false
type: string
default: gpt-4o-mini
repo_path:
required: false
type: string
custom_prompt:
required: false # knip:
# runs-on: ubuntu-latest
# steps:
# - name: Checkout code
# uses: actions/checkout@v4
# - name: Setup Node.js
# uses: actions/setup-node@v4
# with:
# node-version: '18'
# cache: 'npm'
# - name: Install dependencies
# run: npm run install:all
# - name: Run knip checks
# run: npm run knip
default: ""
type: string
git_ref:
required: true
type: string
head_ref:
required: true
type: string
base_ref:
required: true
type: string

outputs:
RELEASE_NOTES:
description: "AI generated release notes"
value: ${{ steps.ai_release_notes.outputs.RELEASE_NOTES }}
OPENAI_PROMPT:
description: "Prompt used to generate release notes"
value: ${{ steps.ai_prompt.outputs.OPENAI_PROMPT }}
RELEASE_NOTES:
description: "AI generated release notes"
value: ${{ steps.ai_release_notes.outputs.RELEASE_NOTES }}
OPENAI_PROMPT:
description: "Prompt used to generate release notes"
value: ${{ steps.ai_prompt.outputs.OPENAI_PROMPT }}

env:
GITHUB_REF: ${{ inputs.git_ref }}
BASE_REF: ${{ inputs.base_ref }}
HEAD_REF: ${{ inputs.head_ref }}
GITHUB_REF: ${{ inputs.git_ref }}
BASE_REF: ${{ inputs.base_ref }}
HEAD_REF: ${{ inputs.head_ref }}

runs:
using: "composite"
steps:
- uses: actions/checkout@v4
with:
repository: ${{ inputs.repo_path }}
token: ${{ inputs.GHA_PAT }}
ref: ${{ env.GITHUB_REF }}
fetch-depth: 0
using: "composite"
steps:
- uses: actions/checkout@v4
with:
repository: ${{ inputs.repo_path }}
token: ${{ inputs.GHA_PAT }}
ref: ${{ env.GITHUB_REF }}
fetch-depth: 0

- name: Set Workspace
shell: bash
run: |
pip install tiktoken
pip install pytz
- name: Set Workspace
shell: bash
run: |
pip install tiktoken
pip install pytz

# Github outputs: 'OPENAI_PROMPT'
- name: Add Git Info to base prompt
id: ai_prompt
shell: bash
env:
BASE_REF: ${{ env.BASE_REF }}
HEAD_SHA: ${{ env.HEAD_SHA }}
PR_TITLE: ${{ github.event.pull_request.title }}
PR_BODY: ${{ github.event.pull_request.body }}
MODEL_NAME: ${{ inputs.model_name }}
CUSTOM_PROMPT: ${{ inputs.custom_prompt }} # Default: ''
run: python .github/scripts/release-notes-prompt.py

# Github outputs: 'RELEASE_NOTES'
- name: Generate AI release notes
id: ai_release_notes
shell: bash
env:
OPENAI_API_KEY: ${{ inputs.OPENAI_API_KEY }}
CUSTOM_PROMPT: ${{ steps.ai_prompt.outputs.OPENAI_PROMPT }}
MODEL_NAME: ${{ inputs.model_name }}
run: python .github/scripts/ai-release-notes.py
# Github outputs: 'OPENAI_PROMPT'
- name: Add Git Info to base prompt
id: ai_prompt
shell: bash
env:
BASE_REF: ${{ env.BASE_REF }}
HEAD_SHA: ${{ env.HEAD_SHA }}
PR_TITLE: ${{ github.event.pull_request.title }}
PR_BODY: ${{ github.event.pull_request.body }}
MODEL_NAME: ${{ inputs.model_name }}
CUSTOM_PROMPT: ${{ inputs.custom_prompt }} # Default: ''
run: python .github/scripts/release-notes-prompt.py

# Github outputs: 'RELEASE_NOTES'
- name: Generate AI release notes
id: ai_release_notes
shell: bash
env:
OPENAI_API_KEY: ${{ inputs.OPENAI_API_KEY }}
CUSTOM_PROMPT: ${{ steps.ai_prompt.outputs.OPENAI_PROMPT }}
MODEL_NAME: ${{ inputs.model_name }}
run: python .github/scripts/ai-release-notes.py
Loading