Branches (1385)

allow-overlapping-projects-in-sidebar

04bd612 workspace: Don't overwrite existing workspaces just because it is a superset

Ben Brandt created

fix-markdown-wrapping

538ac07 Add tests

Click to expand commit body
Co-authored-by: Antonio Scandurra <me@as-cii.com>
Co-authored-by: Anthony Eid <hello@anthonyeid.me>

Tom Houlé , Antonio Scandurra , and Anthony Eid created

editor-camelhump-alt-arrows

0810bc1 Delete references to deleted paragraph

Click to expand commit body
Co-authored-by: Antonio Scandurra <me@as-cii.com>

Tom Houlé and Antonio Scandurra created

bedrock-thinking-toggle-integration

03a3ece Remove unnecessary starts_with checks

Click to expand commit body
Co-authored-by: Marshall Bowers <git@maxdeviant.com>

Bennet Bo Fenner and Marshall Bowers created

accesskit

45faba7 Merge branch 'accesskit' of https://github.com/zed-industries/zed into accesskit

cameron created

v0.227.x

40af9dc open_ai: Fix tool output for /responses endpoint (#51789) (cherry-pick to stable) (#51792)

Click to expand commit body
Cherry-pick of #51789 to stable

----
We were sending the raw tool debug output as JSON to the model rather
than whatever the tool intended as content for the model.
Which meant we were sending unneeded information to the model, which
matters in the edit tool case.

Release Notes:

- N/A

Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>

zed-zippy[bot] and Ben Brandt created

branch-name-in-sidebar

221b3a6 Always show branch name in sidebar

Richard Feldman created

example-docs

510d5a0 Update docs/src/ai/parallel-agents.md

Click to expand commit body
Co-authored-by: Eric Holk <eric@zed.dev>

Mikayla Maki and Eric Holk created

fix-issue-51697-fc3d24335f26989c

395798e workspace: Fix pinned count when restoring panes with failed items

Click to expand commit body
When deserializing panes, some items may fail to load and become `None`.
The pinned count should only include successfully loaded items, not
the original count which may exceed the number of actual items.

Kunall Banerjee created

AI-84/worktree-agent-dropdown-reset

08646f1 Also preserve ACP config options (model, permissions) across worktree creation

Richard Feldman created

icon-tooltip

e01d798 Remove icon_label

Click to expand commit body
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>

Eric Holk and Max Brunsfeld created

ep-multi-regions-2

9c737d2 ep: Add new prompt format and fix token budget rounding

Click to expand commit body
Add V0316SeedMultiRegions, a variant of V0306 that:
1. Doesn't have an explicit NO_EDITS token
2. Doesn't use git conflict markers
3. Writes all intermediate markers
   (<|marker_3|>...<|marker_4_|>...<|marker_5|>)

This makes it simpler and hopefully more speculative decoding friendly.

[WIP] The agent found a bug that has to be validated:

The new format exposed an existing bug in prompt budget tracking:
estimate_tokens (floor division by 3) was applied independently to each
component, and the accumulated rounding errors could cause the assembled
prompt to exceed max_tokens. V0316's marker tags made the cursor section
just large enough to push the total over the 4096-token limit.

Fix the budget tracking in format_edit_history_within_budget,
format_related_files_within_budget, and assemble_fim_prompt to use
byte-level accounting internally, eliminating the rounding accumulation.
The same fix is applied to the non-seed-coder budget path in
format_prompt_with_budget_for_format.

Oleksiy Syvokon created

audio-research-deadlocks

0083110 wip: try to prevent deadlocks in livekit on reconnect

Click to expand commit body
Co-authored-by: Jakub Konka <kubkon@jakubkonka.com>

Piotr Osiewicz and Jakub Konka created

gpui-components-and-views

b0facda Fix tests: render log frame grouping tests + blink test update

Click to expand commit body
- All 6 render_log tests pass as plain #[test] (pure data logic)
- Fixed example_tests to use ExampleInputState (matching new API)
- Fixed blink test for focus-driven blink (test via typing, not init)
- Fixed test command in doc comment
- All 12 tests pass with: cargo test --example view_example -p gpui --features test-support

Mikayla Maki created

fix-issue-51478-aa9447b5f2f59757

e03feb3 Update JSX component highlighting to use semantic tag scope

Click to expand commit body
Changes JSX component identifiers from generic `@type` to the more
specific `@tag.component` scope in both JavaScript and TypeScript
syntax highlighting. This allows themes to style React/JSX components
distinctly from regular types.

The only thing to be aware of is the **visual change for JSX/TSX
users**: components that were previously teal (via `@type`) will now
inherit whatever their theme's `tag` color is. For themes like Ayu,
Gruvbox, and One (perhaps other built-in themes too?) that define `tag`
with a color, components will pick that up. For themes that leave `tag`
unstyled (including the fallback theme), components will lose their teal
color. That’s a deliberate trade-off with these changes.

Kunall Banerjee created