forked from anomalyco/opencode
-
Notifications
You must be signed in to change notification settings - Fork 3
Merge shuvcode-dev: v1.1.25 sync + SSH paste fix + models fetch flag #308
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
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
…lity (anomalyco#8658) Co-authored-by: Mark Henderson <[email protected]> Co-authored-by: Aiden Cline <[email protected]>
Co-authored-by: Bot <[email protected]>
This reverts commit f4086ac.
…co#8678) Signed-off-by: assagman <[email protected]>
…co#7681) Co-authored-by: Aiden Cline <[email protected]>
Co-authored-by: Github Action <[email protected]>
…info as to current date
This reverts commit 88fd6a2.
Co-authored-by: Leka74 <[email protected]> Co-authored-by: Leka74 <[email protected]>
…anomalyco#8944)" This reverts commit 8fd1b92.
Upstream changes: - Edit project and session titles - Remember last opened project - Workspace expansion fixes - Server routes cleanup - OpenTUI upgrade to v0.1.74 - New carbonfox theme - SDK regeneration (@hey-api/openapi-ts 0.90.4) - Plugin cache reinstall fix Resolved conflicts: - .github/workflows/update-nix-hashes.yml: deleted (fork removed) - packages/console/app/src/component/light-rays.tsx: deleted (upstream removed) - packages/opencode/src/server/project.ts: keep ours (fork browse API) - packages/app/src/components/session/session-header.tsx: keep ours (fork layout) - packages/app/src/context/global-sync.tsx: merge (runWithOwner + changes/node) - packages/app/src/pages/layout.tsx: keep ours (fork branding, mobile) - packages/opencode/src/bun/index.ts: merge (modExists check) - packages/opencode/src/cli/cmd/tui/component/tips.tsx: keep ours (shuvcode tips) - packages/opencode/src/cli/cmd/tui/context/theme.tsx: keep ours (theme-utils refactor) - packages/opencode/src/cli/cmd/tui/routes/session/header.tsx: merge (responsive + version) - packages/sdk/js/src/v2/gen/types.gen.ts: accept upstream - sdks/vscode/package.json: keep branding, update version
Regenerated SDK types to include fork browse/create project APIs. Fixed duplicate model property in message-v2.ts merge issue. Added Project import to server.ts for CreateError handling.
…uilds
The CSS file had an extra closing brace that caused Tailwind CSS's parser
to fail during production builds with 'Missing opening {' error.
Also includes:
- Console: bump @smithy/eventstream-codec, fix WebGPU context type assertion
- SDK: regenerated client types
shuv1337
added a commit
that referenced
this pull request
Jan 17, 2026
Resolved conflict in bun.lock by regenerating lockfile. Closes #308
This was referenced Jan 17, 2026
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
Merges the shuvcode-dev branch into integration, bringing:
Changes
Features (from upstream v1.1.25)
Fixes
Refactoring
Breaking Changes
None
Testing
bun turbo typecheck)Greptile Summary
Merges
shuvcode-devbranch intointegration, bringing upstream v1.1.25 sync along with critical fixes for SSH paste handling and theOPENCODE_DISABLE_MODELS_FETCHflag.Key Changes:
OPENCODE_DISABLE_MODELS_FETCHproperly prevents models.dev data from being used (already merged into shuvcode-dev before this PR)message-part.cssthat was breaking Tailwind CSS parser during production buildslight-rayscomponent with new WebGPU-basedspotlightcomponent, updated@smithy/eventstream-codecdependencyArchitecture Impact:
The server routes refactoring is a significant architectural improvement that modularizes the monolithic
server.tsinto separate route files (session.ts,mcp.ts,file.ts,config.ts,experimental.ts,provider.ts,pty.ts,question.ts,permission.ts,global.ts,tui.ts). This improves maintainability and follows separation of concerns principles.Testing:
bun turbo typecheck)Confidence Score: 5/5
Important Files Changed
Sequence Diagram
sequenceDiagram participant Dev as Developer participant ShuvDev as shuvcode-dev Branch participant Integration as integration Branch participant Upstream as Upstream v1.1.25 participant Server as Server Routes participant UI as UI Components Note over Dev,UI: PR #308: Merge shuvcode-dev into integration Dev->>ShuvDev: Fix #305: SSH paste coalescing Note over ShuvDev: Add pasteBuffer with 100ms debounce<br/>to handle fragmented paste events Dev->>ShuvDev: Fix #307: OPENCODE_DISABLE_MODELS_FETCH Note over ShuvDev: Add early return in ModelsDev.get() Upstream->>ShuvDev: Sync v1.1.25 Note over Upstream: - Server routes modularization<br/>- Edit titles<br/>- Unified search<br/>- Carbonfox theme<br/>- MCP OAuth redirect URI<br/>- LiteLLM proxy provider ShuvDev->>ShuvDev: Refactor server.ts Server->>Server: Extract routes into modules:<br/>session, mcp, file, config,<br/>experimental, provider, pty,<br/>question, permission, global, tui ShuvDev->>ShuvDev: Replace light-rays with spotlight UI->>UI: Migrate from light-rays component<br/>to WebGPU-based spotlight ShuvDev->>ShuvDev: Fix CSS production build Note over UI: Remove extra closing brace<br/>in message-part.css ShuvDev->>Integration: Merge PR #308 Note over Integration: All changes now in integration:<br/>- v1.1.25 features<br/>- SSH paste fix<br/>- Models fetch flag fix<br/>- CSS build fix