sync: merge upstream v1.1.19 + fork improvements #296
Merged
Conversation
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
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
Upstream changes: - feat: add plan mode with enter/exit tools (anomalyco#8281) - feat: Add GitLab Duo Agentic Chat Provider Support (anomalyco#7333) - feat(desktop): Ask Question Tool Support (anomalyco#8232) - feat: add Undertale and Deltarune built-in themes (anomalyco#8240) - fix: Add Plugin Mocks to Provider Tests (anomalyco#8276) - fix: update User-Agent string to latest Chrome version in webfetch (anomalyco#8284) - fix(prompt-input): handle Shift+Enter before IME check - fix(state): delete key from recordsByKey on instance disposal - fix(mcp): close existing client before reassignment to prevent leaks Resolved conflicts: - bun.lock: regenerated with fork dependencies - global-sync.tsx: adopted upstream variable naming (question instead of request) - session/index.tsx: merged upstream workdir display with fork's ANSI terminal emulation - amazon-bedrock.test.ts: added all mock modules (fork + upstream) - vscode/package.json: kept fork branding, updated version Fork commits included: - refactor(tui): use SDK client for tool list dialog - chore: update lockfile with fork dependencies
shuv1337
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Upstream Changes (v1.1.19)
Conflict Resolutions
bun.lock: regenerated with fork dependencies (ghostty-opentui, vite-plugin-pwa)global-sync.tsx: adopted upstream variable naming (question instead of request)session/index.tsx: merged upstream workdir display with fork's ANSI terminal emulationamazon-bedrock.test.ts: added all mock modules (fork + upstream)vscode/package.json: kept fork branding, updated version to 1.1.19Fork Commits
refactor(tui): use SDK client for tool list dialog- Modernizes the tools dialogchore: update lockfile with fork dependencies- Syncs bun.lock