Skip to content

Fix P1 Windows packaging (#69179) and Terminal Deadlock (#69212) - #69330

Closed
JonthanaHanh wants to merge 4 commits into
NousResearch:mainfrom
JonthanaHanh:fix/p1-windows-and-terminal-deadlock
Closed

Fix P1 Windows packaging (#69179) and Terminal Deadlock (#69212)#69330
JonthanaHanh wants to merge 4 commits into
NousResearch:mainfrom
JonthanaHanh:fix/p1-windows-and-terminal-deadlock

Conversation

@JonthanaHanh

Copy link
Copy Markdown
Contributor

This PR addresses two P1 issues identified in the repository audit:

  1. Windows Packaging Architecture Enforcement ([Bug]: This app can't run on your computer (此应用无法在你的电脑上运行) #69179):

    • Updates apps/desktop/scripts/stage-native-deps.mjs to explicitly verify that x64 binaries are staged when targeting win32-x64.
    • This prevents silent packaging of host architecture binaries during cross-compilation/packaging flows on Windows.
  2. Terminal Compound Background Command Deadlock (fix(gateway): suppress the duplicate clarify tool-progress bubble (#69175) #69212):

    • Updates tools/terminal_tool.py's _rewrite_compound_background function to wrap trailing backgrounded commands in braces: A && B & -> A && { B & }.
    • This ensures Bash doesn't fork the entire compound command into a subshell that waits for a long-running background process, which previously caused terminal tool timeouts and stalls.

Verified the regex and logic for both fixes. Proceeding to P2 remediations next.

@alt-glitch alt-glitch added invalid This doesn't seem right comp/desktop Electron desktop app (apps/desktop/*) platform/windows Native Windows-specific behavior or breakage P3 Low — cosmetic, nice to have sweeper:risk-platform-windows Sweeper risk: may break or behave differently on native Windows labels Jul 22, 2026
@egilewski

Copy link
Copy Markdown
Contributor

too large to review safely

This PR changes 10107 production lines before tests and docs. Please split it or add a focused justification if it should stay together.

Signed: GPT-5.6-terra-low in Codex

@teknium1

Copy link
Copy Markdown
Contributor

Closing — both halves of this rollup are resolved on main. The #69179 Windows packaging failure is fixed by #71119 (PE integrity gate + rollback on the rebuilt Hermes.exe) and #71218 (OS-native architecture detection); the #69212 terminal deadlock was fixed separately and that issue is closed. This branch also bundles unrelated changes across the codex adapter, compressor, and conversation loop that can't be reviewed as one unit — if any of those address a still-live bug, please open focused single-concern PRs against current main. Thanks @JonthanaHanh for the report-driven work.

@teknium1 teknium1 closed this Jul 25, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

comp/desktop Electron desktop app (apps/desktop/*) invalid This doesn't seem right P3 Low — cosmetic, nice to have platform/windows Native Windows-specific behavior or breakage sweeper:risk-platform-windows Sweeper risk: may break or behave differently on native Windows

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants