This repository was archived by the owner on Nov 10, 2025. It is now read-only.
Merge main into NeuroNexusIDE - Sync with upstream changes#2
Merged
clouraLabs merged 6 commits intoNeuroNexusIDEfrom Nov 6, 2025
Merged
Merge main into NeuroNexusIDE - Sync with upstream changes#2clouraLabs merged 6 commits intoNeuroNexusIDEfrom
clouraLabs merged 6 commits intoNeuroNexusIDEfrom
Conversation
This makes it possible to do login via things like `cmd: "node", args: ["my-node-file.js", "login"]` Also, that command will now use Zed's managed `node` instance. Release Notes: - ACP extensions can now run terminal login commands using relative paths
…ndustries#38518) On macOS, the Function key is reserved for system use and should not be used in application code. This commit updated keystroke matching and key event handling to ignore the Function key modifier while users are typing or pressing keybindings. For some keyboards with compact layout (like my 65% keyboard), there is no separated backtick key. Esc and it shares the same physical key. To input backtick, users may press `Fn-Esc`. However, macOS will still deliver events with Fn key modifier to applications. Cocoa framework can handle this correctly, which typically ignore the Fn directly. GPUI should also follow the same rule, otherwise, the backtick key on those keyboards won't work. Release Notes: - Fixed a bug where typing fn-\` on macOS would not insert a `.
…tries#36848) - On macOS, pasting now inserts the actual file path when the clipboard contains a file URL (public.file-url/public.url) - Terminal paste remains text-only; no temp files or data URLs are created. If only raw image bytes exist on the clipboard, paste is a no-op. - Scope: macOS only; no dependency changes. - Added a test (test_file_url_converts_to_path) that verifies URL→path conversion using a unique pasteboard. Release Notes: - Improved pasting on macOS: now inserts the actual file path when the clipboard contains a file URL (enables image paste support for Claude Code)
Closes zed-industries#36206 Disclaimer: I did use AI for help to end up with this proposed solution. 😅 ## Observed behavior of native apps on macOS (like Safari) I first did a quick research on how Safari behaves on macOS, and here's what I have found: 1. Safari seems to position new windows with an offset based on the currently active window 2. It keeps opening new windows with an offset until the new window cannot fit the display bounds horizontally, vertically or both. 3. When it cannot fit horizontally, the new window opens at x=0 (y=active window's y) 4. When it cannot fit vertically, the new window opens at y=0 (x=active window's x) 5. When it cannot fit both horizontally and vertically, the new window opens at x=0 and y=0 (top left). 6. At any moment if I activate a different Safari window, the next new window is offset off of that 7. If I resize the active window and open a new window, the new window has the same size as the active window So, I implemented the changes based on those observations. I am not sure if touching `gpui/src/window.rs` is the way to go. I am open to feedback and direction here. I am also not sure if making my changes platform (macOS) specific, is the right thing to do. I reckoned that Linux and Windows have different default behaviors, and the original issue mentioned macOS. But, likewise, I am open to take a different approach. ## Tests I haven't included tests for such change, as it seems to me a bit difficult to properly test this, other than just doing a manual integration test. But if you would want them for such a change, happy to try including them. ## Alternative approach I also did some research on macOS native APIs that we could use instead of trying to make the calculations ourselves, and I found `NSWindow.cascadeTopLeftFromPoint` which seems to be doing exactly what we want, and more. It probably takes more things into consideration and thus it is more robust. We could go down that road, and add it to `gpui/src/platform/mac/window.rs` and then use it for new window creation. Again, if that's what you would do yourselves, let me know and I can either change the implementation here, or open a new pull request and let you decide which one would you would like to pursue. ## Video showing the behavior https://github.com/user-attachments/assets/f802a864-7504-47ee-8c6b-8d9b55474899 🙇♂️ Release Notes: - Improved macOS new window stacking
Release Notes: - N/A --------- Co-authored-by: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Release Notes: - N/A When I was implementing Input, I often used `TextRun`, but `background`, `underline` and `strikethrough` were often not used. So make change to simplify it.
|
Seems you are using me but didn't get OPENAI_API_KEY seted in Variables/Secrets for this repo. you could follow readme for more information |
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.
6 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.
Summary
This PR merges the latest changes from
mainbranch intoNeuroNexusIDEto keep the branch up-to-date with upstream improvements and fixes.Changes from main branch
This brings in the following upstream commits:
64c8c19e1b- gpui: Impl Default for TextRun (gpui: Impl Default for TextRun zed-industries/zed#41084)622d626a29- Add agent-servers.md (Add agent-servers.md zed-industries/zed#41609)714481073d- Fix macOS new window stacking (Fix macOS new window stacking zed-industries/zed#38683)eccdfed32b- gpui: Convert macOS clipboard file URLs to paths for paste (gpui: Convert macOS clipboard file URLs to paths for paste zed-industries/zed#36848)2664596a34- gpui: Fix incorrect handling of Function key modifier on macOS (gpui: Fix incorrect handling of Function key modifier on macOS zed-industries/zed#38518)23f2fb6089- Run ACP login from same cwd as agent server (Run ACP login from same cwd as agent server zed-industries/zed#42038)Current NeuroNexusIDE Features (preserved)
The NeuroNexusIDE branch currently includes:
These features will be preserved after the merge.
Testing
Notes
This is a routine sync to keep NeuroNexusIDE aligned with upstream improvements while maintaining custom features.