Skip to content

fix: adapt to upstream connect() API change - #12

Merged
lukemarsden merged 1 commit into
mainfrom
fix/upstream-merge-connect-api
Feb 26, 2026
Merged

fix: adapt to upstream connect() API change#12
lukemarsden merged 1 commit into
mainfrom
fix/upstream-merge-connect-api

Conversation

@lukemarsden

Copy link
Copy Markdown

Summary

Test plan

  • cargo check -p external_websocket_sync passes (0 errors, only pre-existing warnings)

🤖 Generated with Claude Code

Upstream PR zed-industries#50093 removed the root_dir parameter from
AgentServer::connect(). Update our three call sites and clean up
unused imports that surfaced after the merge.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@lukemarsden
lukemarsden merged commit 276da28 into main Feb 26, 2026
19 checks passed
lukemarsden pushed a commit that referenced this pull request Apr 9, 2026
)

When atlas tiles are rapidly allocated and freed (e.g. watching a shared
screen in Collab), a texture can become unreferenced and be removed
while GPU uploads for it are still pending. On the next frame,
`flush_uploads` indexes into the now-empty texture slot and panics:

```
  thread 'main' panicked at crates/gpui_wgpu/src/wgpu_atlas.rs:231:40:
  texture must exist...

  #11 core::option::expect_failed
  #12 gpui_wgpu::wgpu_atlas::WgpuAtlas::before_frame
  #13 gpui_wgpu::wgpu_renderer::WgpuRenderer::draw
```

This change drains pending uploads for a texture when it becomes
unreferenced in `remove`, and skips uploads for missing textures in
`flush_uploads` as a safety net.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable


Release Notes:

- Fixed occasional crashes when viewing a screen share
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant