This repository was archived by the owner on Oct 31, 2025. It is now read-only.
Merge main 2025 07 22#65
Merged
Merged
Conversation
…d-tool-calling watsonx tool support
…b_actions/slackapi/slack-github-action-2.1.1 chore(deps): bump slackapi/slack-github-action from 2.1.0 to 2.1.1
…omplete Qwen3 support for autocomplete function
…ry-sidebar [QoL] Add Collapse Button to Sidebar History Panel (continuedev#6222)
- Import Telemetry from util/posthog.js in ConfigHandler - Track start and end time of reloadConfig method using performance.now() - Send "config_reload" telemetry event with duration, reason, totalConfigLoads, and configLoadInterrupted - Helps track config loading performance bottlenecks and understand reload patterns 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
…allin/pruning-updates
…pdates Context limit and pruning updates
…n-button-ui Tomasz/compaction button UI
…uth-docs docs: accessKeyId and secretAccessKey bedrock auth options
…e-docs docs: plan mode doumentation
docs: fix misformatted yaml code
Jazzcort
force-pushed
the
merge-main-2025-07-22
branch
6 times, most recently
from
2689047 to
2850186
Compare
Patches that need to be added back:
1. Add our patch at AssistantSelect.tsx to AssistantAndOrgListbox.tsx
2. core/promptFiles/v2/getPromptFiles.ts was moved to core/promptFiles/getPromptFiles.ts.
Need to add our patch back as well.
3. Used exact extensions/vscode/src/autocomplete/completionProvider.ts from upstream.
Need to add our patch for autocomplete back.
4. Need to remove Plan Mode from the mode options.
Jazzcort
force-pushed
the
merge-main-2025-07-22
branch
from
2850186 to
f457e9f
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
19 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Patches that need to be added back:
Need to add our patch back as well.
Need to add our patch for autocomplete back.
Checklist