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.

Sign up for GitHub

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

Jump to bottom

Pull in updates from upstream #26

Merged
merged 188 commits into from
Mar 14, 2025
Merged

Pull in updates from upstream #26

merged 188 commits into from
Mar 14, 2025

Conversation

kevinvandijk
Copy link
Collaborator

@kevinvandijk kevinvandijk commented Mar 14, 2025 •
edited
Loading

  • All tests are passing
  • Tested locally with our adjustments
  • Made sure the KiloCode provider still works
  • Made sure Telemetry was kept out
  • Bumped version to stay in-line with Kilo Code versioning

aheizi and others added 30 commits March 9, 2025 00:15
feat: add sse mcp support
549b06f
Merge branch 'main' into feature/add_sse_mcp
bb42fb6
fix ut
b4f808d
@afshawnlotfi
Add support for remote browser connection and settings
22f5130
@cannuri
Merge pull request #1 from cannuri/update-from-upstream
58532bc 
Update from upstream
@afshawnlotfi
Add remote browser connection support and related state management
66e3b96
add sseOptions
f9a1cd0
Merge branch 'main' into feature/add_sse_mcp
0d0f7e3
@afshawnlotfi
Enhance BrowserSettings component with VSCodeTextField for remote bro…
71795d5 
…wser URL input
support custom base url for gemini in google AI studio
85b54b3
@mrubens
Merge remote-tracking branch 'origin/main' into feature/add_sse_mcp
89b8b10
Merge remote-tracking branch 'origin/feature/add_sse_mcp' into featur…
643508c 
…e/add_sse_mcp
@cannuri
Merge remote-tracking branch 'upstream/main'
4a54294
simpler way of setting up
f13d28a
@cannuri
Merge pull request #2 from cannuri/feature/update-main
42287ad 
Feature/update main
@shohei-ihaya
add gemini-2.0-pro-exp-02-05 model to vertex
f4b3c44
@cte
Follow the established pattern for command registration
5a3c207
@cte
Rename ClineAPI to RooCodeAPI and improve types
f8a592a
@cte @ellipsis-dev
Update src/exports/README.md
0a03c88 
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
@cte
Simplify npm install by automatically installing npm-run-all
7681a98
@cte
Remove benchmark
2187369
@hannesrudolph
fix: update MCP servers directory path for platform compatibility
102a996
@Smartsheet-JB-Brown
Add enhanced error handling and logging for AWS Bedrock custom ARNs
171037a
@afshawnlotfi
Refactor Docker gateway IP retrieval to use a dedicated shell command…
ce3e22e 
… execution function
@hannesrudolph @ellipsis-dev
Update src/core/webview/ClineProvider.ts
abcb7c1 
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
@cannuri
fix browser_action system prompt
a9773b7
@mrubens
Merge pull request RooVetGit#1556 from cannuri/cannuri/fix-browser-sy…
9dfdc42 
…stem-prompt

fix browser system prompt inclusion rules
@hannesrudolph @ellipsis-dev
Update ClineProvider.ts
7462906 
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
@mrubens
Merge pull request RooVetGit#1528 from afshawnlotfi/chrome-remote-web…
6cfc1cd 
…tools

Chrome remote webtools
@cte
Merge pull request RooVetGit#1545 from RooVetGit/cte/action-registrai…
00bca30 
…on-cleanup
mrubens and others added 20 commits March 13, 2025 23:21
@mrubens
Merge pull request RooVetGit#1630 from RooVetGit/contributors
954eb31 
Contributors
@mrubens
Open a PR to update contributors
d9ffda5
@mrubens
Merge pull request RooVetGit#1632 from RooVetGit/update_contributors_pr
b9d3596 
Open a PR to update contributors
@mrubens
Better git logic for updating contributors in readme
548f25b
@mrubens @ellipsis-dev
Update .github/workflows/update-contributors.yml
b0ab8e0 
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
@mrubens
Merge pull request RooVetGit#1633 from RooVetGit/better_contributors_…
91dab5f 
…pr_logic

Better git logic for updating contributors in readme
@mrubens
Use create pull request action more
0bf07f4
@mrubens
Merge pull request RooVetGit#1634 from RooVetGit/contributors_use_cre…
afb8b05 
…ate_pull_request_more

Use create pull request action more
@mrubens
Run prettier before checking for contributor changes
68cbce8
@mrubens
Merge pull request RooVetGit#1635 from RooVetGit/contributors_prettier
b893eea 
Run prettier before checking for contributor changes
@mrubens
Only set width on contributor images
b3f51bf
@mrubens
Merge pull request RooVetGit#1636 from RooVetGit/format_contributor_i…
26acb17 
…mages

Only set width on contributor images
@mrubens
Update update-contributors.js
363dbc5
@mrubens
Merge pull request RooVetGit#1637 from RooVetGit/mrubens-patch-4
d1f69fd 
Update update-contributors.js
@mrubens
Disable husky when updating contributors
9bfd0c9
@mrubens
Merge pull request RooVetGit#1638 from RooVetGit/disable_husky_in_upd…
262046d 
…ate_contributors

Disable husky when updating contributors
@mrubens
Update update-contributors.yml
dc4efd6
@mrubens
Merge pull request RooVetGit#1639 from RooVetGit/mrubens-patch-4
00af340 
Update update-contributors.yml
@mrubens @github-actions
docs: update contributors list [skip ci]
6969ac6
@mrubens
Merge pull request RooVetGit#1640 from RooVetGit/update-contributors-…
99f64ca 
…1741927321

Update contributors list
@kevinvandijk kevinvandijk requested a review from janpaul123 March 14, 2025 11:13
@kevinvandijk kevinvandijk force-pushed the update-from-upstream branch from 74375f4 to 444587b Compare March 14, 2025 12:09
@kevinvandijk kevinvandijk changed the title Pull in updates from roocode upstream Pull in updates from upstream Mar 14, 2025
@kevinvandijk kevinvandijk force-pushed the update-from-upstream branch 2 times, most recently from bfe6657 to d3c240d Compare March 14, 2025 12:20
janpaul123
janpaul123 approved these changes Mar 14, 2025
View reviewed changes
Copy link
Collaborator

@janpaul123 janpaul123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hard to review, but thanks for including how you tested it.

And actually amending the merge commit, instead of piling on more commits. Love to see it.

@kevinvandijk kevinvandijk force-pushed the update-from-upstream branch from d3c240d to 612ef8b Compare March 14, 2025 13:44
@kevinvandijk kevinvandijk merged commit 4aad760 into main Mar 14, 2025
6 checks passed
@kevinvandijk kevinvandijk deleted the update-from-upstream branch March 14, 2025 14:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@janpaul123 janpaul123 janpaul123 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.