zed-industries#48388)

This regressed in zed-industries#47619 -- previously we would throw away and reopen
the diffs used to construct the branch diff pretty eagerly, and as a
result the branch diff would update itself when you committed or
switched branches. We inadvertently lost that when we switched to
retaining those diffs in the git store.

Release Notes:

- N/A

#48388)

This regressed in #47619 -- previously we would throw away and reopen
the diffs used to construct the branch diff pretty eagerly, and as a
result the branch diff would update itself when you committed or
switched branches. We inadvertently lost that when we switched to
retaining those diffs in the git store.

Release Notes:

- N/A

Key changes:
- Semantic highlighting support (zed-industries#46356) - major new editor feature
- Edit predictions via Ollama (zed-industries#48233) - local AI edit predictions
- Side-by-side diff: staging/unstaging/restoring on LHS, hunk controls, gutter highlights
- Branch diff fix when committing/changing branches (zed-industries#48388)
- Settings UI: AI tool permissions page (zed-industries#48277)
- Version bump to v0.224 (kept our v0.0.1)
- Close toasts on middle mouse click (zed-industries#48208)
- DAP settings made optional (zed-industries#43647)
- REPL quality of life improvements (zed-industries#47533)
- Mercury accept/reject tracking (zed-industries#48306)
- Toolbar menu and EP menu telemetry (zed-industries#48225, zed-industries#48229)
- lsp::Symbol now includes container_name (zed-industries#46822)
- Nushell/Elvish/Rc always_allow patterns (zed-industries#48395)
- Agent terminal security rules expanded (zed-industries#48399)

Conflict resolution:
- collab/rpc.rs, collab_ui, collab editor_tests: deleted (collab removed)
- vim (yank, replace, test): deleted (vim removed)
- util/shell.rs: deleted (extracted to Obsydian-HQ/gpui)
- GPUI (app.rs, windows/platform.rs, platform_scheduler.rs): deleted (Obsydian)
- editor/items.rs: merged imports (added ExcerptId, ExcerptRange, kept SearchWithinRange)
- lsp_store.rs: added SemanticTokensData import, removed GlobalLogStore/LanguageServerKind
- proto.rs: added SemanticTokens to entity_messages, removed JoinProject/LeaveProject
- lsp_button.rs: kept empty server UI, added is_via_ssh check from upstream
- edit_prediction_button.rs: kept TitleBarItemView import
- vscode_import.rs: added semantic_token_rules, removed helix_mode (not in our struct)
- zed/Cargo.toml: kept v0.0.1

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>