Repository navigation
fix: integrate environment, startup size and proxy corrections - #382
Merged
Merged
Conversation
The default shell had no reader for `config.window.*`, so `pebrel config check` accepted a window size the GUI then ignored: every start used the built-in 116x30 canvas regardless of the user's file. Read the grid once during shell init through the same discovery and parse entry points `pebrel config check` uses, so Lua, TOML and YAML all work and precedence matches the rest of the app. It stays a grid rather than pixels: the existing sizing path multiplies it by the cell it measures in the window's own scale domain, which keeps 155x43 correct at 125% scaling. `config.window.position` is deliberately not wired here. gpui accepts placement only at window creation, in logical pixels, and exposes no app-level scale factor, while the legacy shell hands winit a physical position; passing the raw numbers through would place the window a fifth of the screen off at exactly the scaling the report uses. Refs #312
New cmd, Windows PowerShell 5, and PowerShell 7 sessions inherit http_proxy, https_proxy, and all_proxy from the network settings. A filled-in custom address no longer depends on the system-proxy switch. PowerShell 5 points WebRequest at the HTTP form of that address, and PowerShell 7 also sets Invoke-WebRequest -Proxy.
Apply the saved terminal proxy from prepare_local_pty, which both shells already call, instead of adding a line to window_context.rs.
WSLENV is merged on every platform, so the new proxy path does not need windows cfg. The measured count is 480, and the budget tightens to match.
http_proxy, https_proxy, and all_proxy keep the validated URL. PowerShell reads PEBREL_HTTP_PROXY only when that URL is HTTP, for both a custom address and an enabled system proxy. SOCKS is not rewritten to HTTP, and the startup script does not parse ssh_proxy_url.
Pasting an http:// or socks5:// address while the other protocol stays selected now keeps that scheme. The dropdown and address box follow it.
…ssue103-environment-mode-20260930
…w/pr313-20260930 # Conflicts: # nebula_app/src/gpui_shell/mod.rs
…w/pr334-20260930 # Conflicts: # scripts/platform_cfg_budget.txt
…ssue103-environment-mode-20260930
Kuddev
changed the base branch from
integrate/pr373-380-ui-20260930
to
main
September 30, 2026 01:20
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 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.
Result
Integrates reviewed PRs #375, #377 and #378, retaining their original commits and contributor ancestry from #313 and #334. Windows users can disable environment refresh to retain the launching shell's temporary PATH. GPUI startup honors configured window dimensions and the CLI-selected config file. New Windows terminals receive the selected custom proxy with its HTTP/SOCKS protocol preserved, and pasting a proxy URL updates the visible protocol selector consistently.
Fixes #103 and #330. Addresses #134. Refs #312: window positioning remains separate.
Design
The existing settings authority, configuration parser and Windows PTY preparation path remain responsible for their behavior. Startup dimensions load once; they do not re-evaluate Lua on settings saves or rendering. Proxy injection runs after environment refresh, preserving pane overrides and WSL forwarding flags. Existing sessions are unaffected.
The merge keeps both settings-fixture tests in their existing nextest serial group. A separate integration correction shares one RuntimeSettings snapshot between environment refresh and proxy injection, avoiding duplicate settings reads and inconsistent values within one terminal launch.
Evidence
Each source PR passed all selected native jobs and required checks before integration. The existing CI-native script suite passed all 18 tests after the merged filter update. Integrated architecture and formatting passed. The local commit/push hooks, configuration tests and release workspace check passed. Final integrated commit
4514152260666d727a23d92e06997966f96a78bfpassed the five native platforms and both macOS release compilations (run 36654397811). All 10 required checks passed before the tested commit was fast-forwarded into main; branch protection rules were retained.Original regressions include real GPUI switch/text-input interactions, a real PowerShell child inheriting PATH, Lua/CLI startup-size wiring, and PowerShell 5/7 loopback HTTP proxy requests including Basic authentication. Real Windows DPI/visual acceptance and live external proxy credentials were not exercised in this integration.
Required Review
Windows x64 initially passed 2687 of 2688 tests and failed the unchanged native session-identity probe at
windows/tests.rs:153. A single failed-job rerun on the same commit passed. No assertion, timeout, or test selection was relaxed; the initial failure remains unexplained. The other four native results were retained.