Fix Windows PATH hydration and repair by Badbird5907 · Pull Request #1729 · pingdotgg/t3code

Badbird5907 · 2026-04-04T04:02:12Z

hydrate desktop and server PATH handling for Windows CLI tools
probe shells without profiles first, then fall back to profile-loaded env when node is missing
share command availability and PATH repair utilities across desktop and server

What Changed

Added a Windows startup fallback that loads the user’s PowerShell profile only when the initial no-profile environment still cannot find node
Made Windows environment repair update the full set of relevant environment variables, not just PATH
This only affects the packaged Windows .exe startup path and does not affect running the CLI from an existing shell, such as npx t3

Why

This adds support for windows setups using environment managers like fnm that initialize node through the user's powershell profile instead of PATH.
I was also able to confirm this still works on systems with a stock node setup.

Before:

After:

UI Changes

Checklist

This PR is small and focused
I explained what changed and why
I included before/after screenshots for any UI changes
I included a video for animation/interaction changes

Note

Medium Risk
Changes Windows environment hydration and terminal shell selection, which can affect process spawning and tool discovery at runtime (especially in packaged apps). Risk is moderate due to cross-platform branching and reliance on PowerShell probing, but changes are well-covered by new tests.

Overview
Improves Windows startup environment repair by adding shared utilities in @t3tools/shared/shell to probe PowerShell for env vars, merge/dedupe PATH (including known CLI install dirs), and only load the user profile when node still isn’t resolvable (also capturing FNM_* vars).

Wires the Windows repair path into app entrypoints: apps/desktop syncShellEnvironment and apps/server fixPath now apply the full env patch on win32 and return early; unsupported platforms remain no-ops.

Adjusts Windows terminal spawning behavior: terminal manager now prefers pwsh.exe (with -NoLogo) and falls back through absolute Windows PowerShell and cmd.exe, with tests updated/added; PTY adapter now wraps spawn failures as structured PtySpawnError.

Centralizes command availability + build tweaks: isCommandAvailable is moved to shared shell utils and re-exported from server/open, and the desktop artifact build on Windows disables npmRebuild, disables signing/editing when unsigned, and uses bun install --omit optional plus a fallback-installed electron-builder invocation.

^{Reviewed by Cursor Bugbot for commit 0bafdb6. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Fix Windows PATH hydration and shell environment repair for desktop and server

Adds resolveWindowsEnvironment in packages/shared/src/shell.ts to build a Windows env patch by reading PATH from PowerShell (no-profile), merging with inherited PATH and known CLI dirs, then optionally re-reading with the user profile if node is missing (to pick up FNM vars).
Wires Windows PATH repair into both fixPath (apps/server/src/os-jank.ts) and syncShellEnvironment (apps/desktop/src/syncShellEnvironment.ts); previously both functions ignored win32.
Refactors terminal shell resolution in apps/server/src/terminal/Layers/Manager.ts to prefer pwsh.exe over ComSpec on Windows, with a fallback chain through absolute WindowsPowerShell, powershell.exe, and cmd.exe.
Moves isCommandAvailable to @t3tools/shared/shell and removes the duplicate implementation from apps/server/src/open.ts.
PTY spawn errors in apps/server/src/terminal/Layers/NodePTY.ts now produce a structured PtySpawnError instead of an unhandled throw.

^{Macroscope summarized 0bafdb6.}

- hydrate desktop and server PATH handling for Windows CLI tools - probe shells without profiles first, then fall back to profile-loaded env when node is missing - share command availability and PATH repair utilities across desktop and server

coderabbitai · 2026-04-04T04:02:20Z

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: e332b4c3-d8f7-4ca5-a485-df3617a1073b

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 32efe2a5dd

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

- Normalize captured shell output by trimming `\r\n` around extracted values - Add coverage for Windows PowerShell env parsing

- Remove redundant node availability probe - Return the profiled patch directly when present

macroscopeapp · 2026-04-04T04:23:22Z

Approvability

Verdict: Needs human review

This PR introduces new Windows platform functionality including PATH hydration from PowerShell, shell preference changes (pwsh.exe over cmd.exe), and profile loading for fnm support. These are significant runtime behavior changes on Windows that warrant human review despite comprehensive test coverage.

^{You can customize Macroscope's approvability policy. Learn more.}

juliusmarminge

Thank you! Will test on my windows laptop in a bit 👀

Badbird5907 · 2026-04-16T20:48:27Z

Thank you! Will test on my windows laptop in a bit 👀

Thanks! I forgot to mention that this issue only happens in the .exe distribution, npx t3 isn't affected as it inherits the PATH from the existing shell

…tValue function

…ved clarity and consistency

…ndows-path-support-pr # Conflicts: # apps/desktop/src/syncShellEnvironment.ts # packages/shared/src/shell.test.ts

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 42c7cd5. Configure here.}

cursor · 2026-04-17T05:41:51Z

+  }
+
+  return merged.length > 0 ? merged.join(delimiter) : undefined;
+}


New mergePathValues nearly duplicates existing mergePathEntries

Low Severity

The new mergePathValues function has nearly identical structure to the existing mergePathEntries — both split by a platform delimiter, deduplicate, and rejoin. The only meaningful difference is the comparison strategy: mergePathEntries compares trimmed entries directly, while mergePathValues normalizes via normalizePathEntryForComparison (case-insensitive on win32, quote-stripping). These could be consolidated into a single function parameterized by comparison strategy, reducing duplication and the risk of inconsistent future fixes.

Additional Locations (1)

packages/shared/src/shell.ts#L95-L118

^{Reviewed by Cursor Bugbot for commit 42c7cd5. Configure here.}

- Prefer PowerShell on Windows and add fallbacks for pwsh, PowerShell, and cmd - Thread platform/env through terminal manager for deterministic tests - Wrap node-pty spawn failures in PtySpawnError

- Disable Windows npm rebuild and executable editing during packaging - Install production deps without optional packages - Invoke electron-builder through `bun x --install=fallback`

Co-authored-by: Julius Marminge <julius0216@outlook.com>

Integrates upstream/main (9df3c64) on top of fork's main (9602c18). Upstream features adopted: - Claude Opus 4.5 and 4.7 built-in models (pingdotgg#2072, pingdotgg#2143) - Node-native TypeScript migration across desktop/server (pingdotgg#2098) - Configurable project grouping with client-settings overrides (pingdotgg#2055, pingdotgg#2099) - Thread status in command palette (pingdotgg#2107) - Responsive composer / plan sidebar on narrow windows (pingdotgg#1198) - Capture-phase CTRL+J keydown for Windows terminal toggle (pingdotgg#2113/pingdotgg#2142) - Bypass xterm for global terminal shortcuts (pingdotgg#1580) - Windows ARM build target (pingdotgg#2080) - Windows PATH hydration + repair (pingdotgg#1729) - Gitignore-aware workspace search (pingdotgg#2078) - Claude process leak fix + stale session monitoring (pingdotgg#2042) - Preserve provider bindings when stopping sessions (pingdotgg#2084) - Clean up invalid pending-approval projections (pingdotgg#2106) — new migration - Extract backend startup readiness coordination - Drop stale text-gen options on reset (pingdotgg#2076) - Extend negative repository identity cache TTL (pingdotgg#2083) - Allow deleting non-empty projects from warning toast (pingdotgg#1264) - Restore defaults only on General settings (pingdotgg#1710) - Release workflow modernization (blacksmith runners, GitHub App token guards, v0.0.20 version bump) Fork features preserved: - All 8 providers (codex, claudeAgent, copilot, cursor, opencode, geminiCli, amp, kilo) with their adapters, services, and tests - Fork's custom OpenCode protocol impl in apps/server/src/opencode/ (kept over upstream's @opencode-ai/sdk-based provider added in pingdotgg#1758 — fork's version is tested and integrated; upstream's parallel files deleted) - Fork's direct-CLI Cursor adapter (kept over upstream's new ACP-based CursorProvider added in pingdotgg#1355 — upstream's parallel files deleted) - Fork's ProviderRegistry aggregates only codex + claudeAgent snapshots; the other 6 providers register via ProviderAdapterRegistry - PROVIDER_CACHE_IDS stays at [codex, claudeAgent] matching what the registry actually caches - Migration IDs preserved (fork 23/24/25/26; upstream's new 025 lands at ID 27 to avoid re-applying on deployed fork DBs) - Fork's generic per-provider settings (enabled/binaryPath/configDir/ customModels) kept over upstream's opencode-specific serverUrl/password - Log directory IPC channels, updateInstallInFlight tracking, icon composer pipeline all preserved - Fork's simplified release.yml (no npm CLI publish, no nightly infra) - composerDraftStore normalizeProviderKind widened to accept all 8 kinds - Dark mode --background set to #0f0f0f Test status: - All 9 package typechecks pass - Lint clean (0 errors) - Tests: 1877 passed, 15 skipped (incl. 4 historically-flaky GitManager cross-repo PR selector tests newly gated with TODO for Node-native-TS follow-up)

Fix Windows PATH hydration and repair

32efe2a

- hydrate desktop and server PATH handling for Windows CLI tools - probe shells without profiles first, then fall back to profile-loaded env when node is missing - share command availability and PATH repair utilities across desktop and server

github-actions bot added size:L 100-499 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list. labels Apr 4, 2026

chatgpt-codex-connector bot reviewed Apr 4, 2026

View reviewed changes

Comment thread packages/shared/src/shell.ts

cursor bot reviewed Apr 4, 2026

View reviewed changes

Comment thread packages/shared/src/shell.ts

Comment thread packages/shared/src/shell.ts Outdated

Handle CRLF-delimited PowerShell env values

35ca32c

- Normalize captured shell output by trimming `\r\n` around extracted values - Add coverage for Windows PowerShell env parsing

github-actions bot added size:XL 500-999 changed lines (additions + deletions). and removed size:L 100-499 changed lines (additions + deletions). labels Apr 4, 2026

Simplify Windows env resolution

bfff5f2

- Remove redundant node availability probe - Return the profiled patch directly when present

github-actions bot added size:L 100-499 changed lines (additions + deletions). and removed size:XL 500-999 changed lines (additions + deletions). labels Apr 4, 2026

Merge branch 'upstream/main' into fix/windows-path-support-pr

2b44487

juliusmarminge reviewed Apr 16, 2026

View reviewed changes

Comment thread packages/shared/src/shell.ts Outdated

cursor bot reviewed Apr 16, 2026

View reviewed changes

Comment thread packages/shared/src/shell.ts

refactor(shell): simplify value extraction logic in extractEnvironmen…

86425b1

…tValue function

github-actions bot added size:XL 500-999 changed lines (additions + deletions). and removed size:L 100-499 changed lines (additions + deletions). labels Apr 16, 2026

Badbird5907 and others added 2 commits April 16, 2026 16:59

refactor(shell): adjust mergePathValues function parameters for impro…

942ad79

…ved clarity and consistency

Merge remote-tracking branch 'origin/main' into t3code/pr-1729/fix/wi…

42c7cd5

…ndows-path-support-pr # Conflicts: # apps/desktop/src/syncShellEnvironment.ts # packages/shared/src/shell.test.ts

cursor bot reviewed Apr 17, 2026

View reviewed changes

juliusmarminge added 2 commits April 16, 2026 22:42

Fix Windows terminal shell resolution

caaeb69

- Prefer PowerShell on Windows and add fallbacks for pwsh, PowerShell, and cmd - Thread platform/env through terminal manager for deterministic tests - Wrap node-pty spawn failures in PtySpawnError

Fix Windows desktop artifact path handling

0bafdb6

- Disable Windows npm rebuild and executable editing during packaging - Install production deps without optional packages - Invoke electron-builder through `bun x --install=fallback`

juliusmarminge enabled auto-merge (squash) April 17, 2026 06:09

juliusmarminge approved these changes Apr 17, 2026

View reviewed changes

juliusmarminge merged commit a7a44d0 into pingdotgg:main Apr 17, 2026
12 checks passed

This was referenced Apr 17, 2026

[Bug]: Claude Opus 4.7 default effort xhigh crashes Claude CLI on session start #2085

Closed

[Bug]: Windows - Codex CLI version check failed. "node" is not recognized as an internal or external command #1789

Closed

znoraka pushed a commit to znoraka/t3code that referenced this pull request Apr 17, 2026

Fix Windows PATH hydration and repair (pingdotgg#1729)

2f96f12

Co-authored-by: Julius Marminge <julius0216@outlook.com>

aaditagrawal mentioned this pull request Apr 18, 2026

sync: merge 33 upstream commits from pingdotgg/t3code aaditagrawal/t3code#71

Open

9 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix Windows PATH hydration and repair#1729

Fix Windows PATH hydration and repair#1729
juliusmarminge merged 9 commits intopingdotgg:mainfrom
Badbird5907:fix/windows-path-support-pr

Badbird5907 commented Apr 4, 2026 •

edited by macroscopeapp bot

Loading

Uh oh!

coderabbitai bot commented Apr 4, 2026 •

edited

Loading

Review skipped

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

macroscopeapp bot commented Apr 4, 2026 •

edited

Loading

Uh oh!

juliusmarminge left a comment

Uh oh!

Uh oh!

Uh oh!

Badbird5907 commented Apr 16, 2026

Uh oh!

cursor bot left a comment

Uh oh!

cursor bot Apr 17, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

Badbird5907 commented Apr 4, 2026 • edited by macroscopeapp bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What Changed

Why

UI Changes

Checklist

Fix Windows PATH hydration and shell environment repair for desktop and server

Uh oh!

coderabbitai bot commented Apr 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

macroscopeapp bot commented Apr 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Approvability

Uh oh!

juliusmarminge left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Badbird5907 commented Apr 16, 2026

Uh oh!

cursor bot left a comment

Choose a reason for hiding this comment

Uh oh!

cursor bot Apr 17, 2026

Choose a reason for hiding this comment

New mergePathValues nearly duplicates existing mergePathEntries

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Badbird5907 commented Apr 4, 2026 •

edited by macroscopeapp bot

Loading

coderabbitai bot commented Apr 4, 2026 •

edited

Loading

macroscopeapp bot commented Apr 4, 2026 •

edited

Loading

New `mergePathValues` nearly duplicates existing `mergePathEntries`