Skip to content

language_models: Refactor deps and extract cloud#53270

Merged
agu-z merged 23 commits intomainfrom
untangle-language-models
Apr 7, 2026
Merged

language_models: Refactor deps and extract cloud#53270
agu-z merged 23 commits intomainfrom
untangle-language-models

Conversation

@agu-z
Copy link
Copy Markdown
Contributor

@agu-z agu-z commented Apr 6, 2026

  • language_model no longer depends on provider-specific crates such as anthropic and open_ai (inverted dependency)
  • language_model_core was extracted from language_model which contains the types for the provider-specific crates to convert to/from.
  • gpui::SharedString has been extracted into its own crate (still exposed by gpui), so language_model_core and provider API crates don't have to depend on gpui.
  • Removes some unnecessary &'static str | SharedString -> String -> SharedString conversions across the codebase.
  • Extracts the core logic of the cloud LanguageModelProvider into its own crate with simpler dependencies.

Release Notes:

  • N/A

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Apr 6, 2026
@zed-community-bot zed-community-bot bot added the staff Pull requests authored by a current member of Zed staff label Apr 6, 2026
@agu-z agu-z force-pushed the untangle-language-models branch from b7a17e0 to 45c10ae Compare April 6, 2026 20:52
@agu-z agu-z changed the title language_models: Extract cloud provider into its own crate language_models: Refactor deps and extract cloud Apr 6, 2026
@agu-z agu-z requested a review from kubkon April 7, 2026 14:01
@agu-z agu-z marked this pull request as ready for review April 7, 2026 14:01
@agu-z agu-z merged commit 98c17ca into main Apr 7, 2026
30 checks passed
@agu-z agu-z deleted the untangle-language-models branch April 7, 2026 15:28
MasoudAlali pushed a commit to MasoudAlali/zed-ide that referenced this pull request Apr 7, 2026
- `language_model` no longer depends on provider-specific crates such as
`anthropic` and `open_ai` (inverted dependency)
- `language_model_core` was extracted from `language_model` which
contains the types for the provider-specific crates to convert to/from.
- `gpui::SharedString` has been extracted into its own crate (still
exposed by `gpui`), so `language_model_core` and provider API crates
don't have to depend on `gpui`.
- Removes some unnecessary `&'static str` | `SharedString` -> `String`
-> `SharedString` conversions across the codebase.
- Extracts the core logic of the cloud `LanguageModelProvider` into its
own crate with simpler dependencies.


Release Notes:

- N/A

---------

Co-authored-by: John Tur <john-tur@outlook.com>
lukemarsden added a commit to helixml/zed that referenced this pull request Apr 9, 2026
Merge upstream zed-industries/zed main branch (7544515) into Helix fork.

Notable upstream changes:
- Agent V2 feature flag removal (zed-industries#52792)
- Sidebar/MultiWorkspace rework (zed-industries#53096, zed-industries#53032, zed-industries#53267)
- Agent panel git worktree/branch pickers (zed-industries#52979)
- Language model crate refactor (zed-industries#53270)
- Notification panel removal (zed-industries#50204)
- Subagent permission requests (zed-industries#53428)
- Worktree archival on thread archive (zed-industries#53215)
- Agent layout onboarding (zed-industries#52940)
- AuthRequired status for context servers (zed-industries#53396)

Conflict resolutions:
- crates/zed/Cargo.toml: kept external_websocket_sync feature + upstream track-project-leak
- crates/agent_ui/Cargo.toml: kept external_websocket_sync feature + upstream audio feature
- crates/agent_ui/src/agent_panel.rs: preserved all cfg-gated WebSocket blocks,
  migrated should_render_onboarding to should_render_new_user_onboarding,
  added upstream agent_layout_onboarding
- crates/agent/src/tools/context_server_registry.rs: added AuthRequired to match arm,
  preserved pending_tool_loads tracking
- crates/workspace/src/workspace.rs: added new upstream re-exports
- crates/title_bar/src/title_bar.rs: preserved Helix connection status indicator,
  dropped always-hidden onboarding banner (upstream removed it too)
- crates/recent_projects/src/dev_container_suggest.rs: kept suggest_dev_container check +
  upstream cli_auto_open
- .github/workflows, assets/keymaps, assets/settings, editor, multi_workspace: took upstream

Spec-Ref: helix-specs@e637a591b:001723_merge-latest-zed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants