Skip to content

fix(core): harden PTY resize against native crashes#27496

Merged
scidomino merged 3 commits into
mainfrom
tomm_fix
May 28, 2026
Merged

fix(core): harden PTY resize against native crashes#27496
scidomino merged 3 commits into
mainfrom
tomm_fix

Conversation

@scidomino

Copy link
Copy Markdown
Collaborator

Summary

Harden PTY resize logic to prevent native C++ crashes (libc++abi: terminating) caused by race conditions when a process exits during a UI-triggered resize.

Details

This PR implements a "Defense in Depth" strategy to resolve intermittent crashes where node-pty triggers a libc++abi termination due to an uncaught Napi::Error (Bad File Descriptor) at the C++ level.

  1. Kernel Guard: Added a synchronous OS-level check (process.kill(pid, 0)) immediately before native resize calls in ShellExecutionService.ts. This asks the OS directly if the process is alive, closing the race condition window that our internal JS state maps cannot catch.
  2. Robust Global Handler: Updated the uncaughtException listener in packages/cli/index.ts to safely handle native errors that lack message strings, preventing secondary crashes.
  3. Consolidated Logic: Simplified resizePty to use a single map lookup and ensured it only bails if the Kernel explicitly confirms the process is gone (ESRCH), maintaining test compatibility.

Related Issues

Closes #26433
Closes #27443

How to Validate

  1. Run core unit tests: npm test -w @google/gemini-cli-core -- src/services/shellExecutionService.test.ts
  2. Manual verification: Spawn many short-lived shell tools (e.g., sleep 1) and rapidly resize the terminal window. The CLI should remain stable.

Pre-Merge Checklist

  • Updated relevant documentation and README (if needed)
  • Added/updated tests (if needed)
  • Noted breaking changes (if any)
  • Validated on required platforms/methods:
    • MacOS
      • npm run

@scidomino scidomino requested a review from a team as a code owner May 27, 2026 20:23
@gemini-code-assist

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses intermittent native C++ crashes occurring during terminal window resizing. By implementing a defensive check against the OS process state and hardening the global error handling logic, the changes prevent race conditions that previously triggered fatal terminations when a process exited during a resize event.

Highlights

  • Kernel-level Process Verification: Added a synchronous OS-level check using process.kill(pid, 0) before PTY resize operations to prevent race conditions when a process exits unexpectedly.
  • Improved Error Handling: Updated the global uncaughtException handler to more robustly identify EBADF errors, even when native errors lack descriptive message strings.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize the Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counterproductive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request improves robustness when handling terminal resize events. In packages/cli/index.ts, it safely handles potentially undefined error messages and checks for EBADF error codes. In packages/core/src/services/shellExecutionService.ts, it introduces a defensive check using process.kill(pid, 0) to verify if the process is still alive before attempting a resize. However, calling process.kill(pid, 0) on Windows is unsupported and will always throw an error, leading to high CPU usage and performance degradation during rapid resize events. It is recommended to skip this check on Windows.

Comment thread packages/core/src/services/shellExecutionService.ts Outdated
@github-actions

github-actions Bot commented May 27, 2026

Copy link
Copy Markdown

Size Change: +235 B (0%)

Total Size: 33.9 MB

Filename Size Change
./bundle/chunk-2Z7OBLQZ.js 0 B -49.2 kB (removed) 🏆
./bundle/chunk-3I3PH3VP.js 0 B -2.79 MB (removed) 🏆
./bundle/chunk-EEGTETNI.js 0 B -3.77 kB (removed) 🏆
./bundle/chunk-GX3E64W7.js 0 B -661 kB (removed) 🏆
./bundle/chunk-J5OVO4CQ.js 0 B -3.43 kB (removed) 🏆
./bundle/chunk-RIOFIXFI.js 0 B -13 kB (removed) 🏆
./bundle/chunk-XUOLCAGK.js 0 B -19.5 kB (removed) 🏆
./bundle/chunk-ZOOJAXON.js 0 B -16.4 MB (removed) 🏆
./bundle/core-CSXJOVWE.js 0 B -49.5 kB (removed) 🏆
./bundle/devtoolsService-EMH72QVL.js 0 B -28 kB (removed) 🏆
./bundle/gemini-GL2RCC2E.js 0 B -589 kB (removed) 🏆
./bundle/interactiveCli-LUAJG5QE.js 0 B -1.3 MB (removed) 🏆
./bundle/liteRtServerManager-Q6UQZ3E7.js 0 B -2.08 kB (removed) 🏆
./bundle/oauth2-provider-PM3OMPOQ.js 0 B -9.12 kB (removed) 🏆
./bundle/chunk-B3IOC4TI.js 3.43 kB +3.43 kB (new file) 🆕
./bundle/chunk-EC4PO2T5.js 49.2 kB +49.2 kB (new file) 🆕
./bundle/chunk-GIYTP4RU.js 3.77 kB +3.77 kB (new file) 🆕
./bundle/chunk-ILJVDESI.js 13 kB +13 kB (new file) 🆕
./bundle/chunk-J5YAO6AV.js 16.4 MB +16.4 MB (new file) 🆕
./bundle/chunk-KJIEMD7W.js 19.5 kB +19.5 kB (new file) 🆕
./bundle/chunk-LNXGSOCS.js 661 kB +661 kB (new file) 🆕
./bundle/chunk-QR33UJY6.js 2.79 MB +2.79 MB (new file) 🆕
./bundle/core-PINNJ52L.js 49.5 kB +49.5 kB (new file) 🆕
./bundle/devtoolsService-IJNSTY4U.js 28 kB +28 kB (new file) 🆕
./bundle/gemini-GE3ZOCSC.js 589 kB +589 kB (new file) 🆕
./bundle/interactiveCli-3HZYFYVP.js 1.3 MB +1.3 MB (new file) 🆕
./bundle/liteRtServerManager-G5MNQ32U.js 2.08 kB +2.08 kB (new file) 🆕
./bundle/oauth2-provider-NCBI6L3Y.js 9.12 kB +9.12 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size Change
./bundle/bundled/third_party/index.js 8 MB 0 B
./bundle/chunk-34MYV7JD.js 2.45 kB 0 B
./bundle/chunk-5AUYMPVF.js 858 B 0 B
./bundle/chunk-5PS3AYFU.js 1.18 kB 0 B
./bundle/chunk-6HI7VNOG.js 124 kB 0 B
./bundle/chunk-DAHVX5MI.js 206 kB 0 B
./bundle/chunk-IUUIT4SU.js 56.5 kB 0 B
./bundle/chunk-TUDYL3X4.js 40.3 kB 0 B
./bundle/cleanup-JZTFIG3P.js 0 B -902 B (removed) 🏆
./bundle/devtools-V7NE4CQA.js 696 kB 0 B
./bundle/events-XB7DADIJ.js 418 B 0 B
./bundle/examples/hooks/scripts/on-start.js 188 B 0 B
./bundle/examples/mcp-server/example.js 1.43 kB 0 B
./bundle/gemini.js 5.38 kB +55 B (+1.03%)
./bundle/getMachineId-bsd-TXG52NKR.js 1.55 kB 0 B
./bundle/getMachineId-darwin-7OE4DDZ6.js 1.55 kB 0 B
./bundle/getMachineId-linux-SHIFKOOX.js 1.34 kB 0 B
./bundle/getMachineId-unsupported-5U5DOEYY.js 1.06 kB 0 B
./bundle/getMachineId-win-6KLLGOI4.js 1.72 kB 0 B
./bundle/https-proxy-agent-AVGR4LHR.js 490 B 0 B
./bundle/multipart-parser-KPBZEGQU.js 11.7 kB 0 B
./bundle/sandbox-macos-permissive-open.sb 890 B 0 B
./bundle/sandbox-macos-permissive-proxied.sb 1.31 kB 0 B
./bundle/sandbox-macos-restrictive-open.sb 3.36 kB 0 B
./bundle/sandbox-macos-restrictive-proxied.sb 3.56 kB 0 B
./bundle/sandbox-macos-strict-open.sb 4.82 kB 0 B
./bundle/sandbox-macos-strict-proxied.sb 5.02 kB 0 B
./bundle/src-LG4OHBW7.js 233 kB 0 B
./bundle/src-QVCVGIUX.js 47 kB 0 B
./bundle/start-RKSALPEN.js 0 B -622 B (removed) 🏆
./bundle/tree-sitter-7U6MW5PS.js 274 kB 0 B
./bundle/tree-sitter-bash-34ZGLXVX.js 1.84 MB 0 B
./bundle/worker/worker-entry.js 361 kB 0 B
./bundle/cleanup-FAORZ3BZ.js 902 B +902 B (new file) 🆕
./bundle/start-UPSRYJQE.js 622 B +622 B (new file) 🆕

compressed-size-action

@gemini-cli gemini-cli Bot added priority/p1 Important and should be addressed in the near term. area/core Issues related to User Interface, OS Support, Core Functionality labels May 27, 2026
@scidomino

Copy link
Copy Markdown
Collaborator Author

We have confirmation from multiple users that this resolves the issue.

Comment thread packages/core/src/services/shellExecutionService.ts
@scidomino scidomino added this pull request to the merge queue May 28, 2026
@scidomino scidomino removed this pull request from the merge queue due to a manual request May 28, 2026
@scidomino scidomino enabled auto-merge May 28, 2026 16:05
@scidomino scidomino disabled auto-merge May 28, 2026 16:16
@scidomino scidomino merged commit bd53951 into main May 28, 2026
30 checks passed
@scidomino scidomino deleted the tomm_fix branch May 28, 2026 16:16
@scidomino

Copy link
Copy Markdown
Collaborator Author

/patch

@github-actions

Copy link
Copy Markdown

🚀 [Step 1/4] Patch workflow(s) waiting for approval!

📋 Details:

  • Channels: stable,preview
  • Commit: bd53951dc8b04dbe411ecc81972d78d52db33877
  • Workflows Created: 2

⏳ Status: The patch creation workflow has been triggered and is waiting for deployment approval. Please visit the specific workflow links below and approve the runs.

🔗 Track Progress:

@github-actions

Copy link
Copy Markdown

🚀 [Step 2/4] Patch PR Created!

📋 Patch Details:

📝 Next Steps:

  1. ⚠️ Resolve conflicts in the hotfix PR first: #27534
  2. Test your changes after resolving conflicts
  3. Once merged, the patch release will automatically trigger
  4. You'll receive updates here when the release completes

🔗 Track Progress:

@github-actions

Copy link
Copy Markdown

🚀 [Step 2/4] Patch PR Created!

📋 Patch Details:

📝 Next Steps:

  1. Review and approve the hotfix PR: #27535
  2. Once merged, the patch release will automatically trigger
  3. You'll receive updates here when the release completes

🔗 Track Progress:

@github-actions

Copy link
Copy Markdown

🚀 [Step 3/4] Patch Release Waiting for Approval!

📋 Release Details:

  • Environment: prod
  • Channel: preview → publishing to npm tag preview
  • Version: v0.45.0-preview.0
  • Hotfix PR: Merged ✅
  • Release Branch: release/v0.45.0-preview.0-pr-27496

⏳ Status: The patch release has been triggered and is waiting for deployment approval. Please visit the specific workflow run link below and approve the deployment. You'll receive another update when it completes.

🔗 Track Progress:

@github-actions

Copy link
Copy Markdown

🚀 [Step 3/4] Patch Release Waiting for Approval!

📋 Release Details:

  • Environment: prod
  • Channel: stable → publishing to npm tag latest
  • Version: v0.44.0
  • Hotfix PR: Merged ✅
  • Release Branch: release/v0.44.0-pr-27496

⏳ Status: The patch release has been triggered and is waiting for deployment approval. Please visit the specific workflow run link below and approve the deployment. You'll receive another update when it completes.

🔗 Track Progress:

@github-actions

Copy link
Copy Markdown

[Step 4/4] Patch Release Failed!

📋 Details:

  • Version: 0.44.1
  • Channel: stable
  • Error: The patch release workflow encountered an error

🔍 Next Steps:

  1. Check the workflow logs for detailed error information
  2. The maintainers have been notified via automatic issue creation
  3. You may need to retry the patch once the issue is resolved

🔗 Troubleshooting:

@github-actions

Copy link
Copy Markdown

[Step 4/4] Patch Release Complete!

📦 Release Details:

🎉 Status: Your patch has been successfully released and published to npm!

📝 What's Available:

🔗 Links:

@github-actions

Copy link
Copy Markdown

[Step 4/4] Patch Release Complete!

📦 Release Details:

  • Version: 0.44.1
  • NPM Tag: latest
  • Channel: stable
  • Dry Run: false

🎉 Status: Your patch has been successfully released and published to npm!

📝 What's Available:

🔗 Links:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/core Issues related to User Interface, OS Support, Core Functionality priority/p1 Important and should be addressed in the near term. size/m A medium sized PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ioctl(2) failed, EBADF during PTY resize on sub-agent termination (Race Condition) CLI Crash on Tool Completion (ioctl(2) failed, EBADF)

2 participants