From fe62a99bf58f90a687dc1c8c78f5e2ca3376a7c0 Mon Sep 17 00:00:00 2001 From: yenru0 Date: Tue, 29 Sep 2026 09:24:34 +0900 Subject: [PATCH] gwen: Purge remaining Zed branding from user-facing surfaces Sweep every user-visible product string to Gwen: app menus (Quit, Hide, Gwen Repository), feedback links (repo/issues now point at github.com/kk376/zed, email to yenru@yrkaierx.com), move-to-Applications and update dialogs, provider and settings copy, CLI help, installer and desktop/flatpak/snap/plist metadata. Rename user-facing settings values with back-compat aliases: base_keymap "Gwen" (accepts "Zed"), fonts ".GwenMono"/".GwenSans" (accept ".ZedMono"/".ZedSans"), icon theme "Gwen (Default)". Fix F10 app-menu keymap arguments to "Gwen" and align the Windows installer AppMutex with release_channel::app_identifier(). Internal identifiers, wire protocol names, upstream service URLs and legal attribution are intentionally kept. --- assets/keymaps/default-linux.json | 2 +- assets/keymaps/default-macos.json | 6 +- assets/keymaps/default-windows.json | 2 +- assets/keymaps/initial.json | 4 +- assets/keymaps/linux/atom.json | 2 +- assets/keymaps/linux/cursor.json | 4 +- assets/keymaps/linux/emacs.json | 12 +- assets/keymaps/linux/vscode.json | 4 +- assets/keymaps/macos/atom.json | 2 +- assets/keymaps/macos/cursor.json | 4 +- assets/keymaps/macos/emacs.json | 12 +- assets/keymaps/macos/vscode.json | 2 +- assets/keymaps/vim.json | 10 +- assets/settings/default.json | 128 +++++++++--------- .../default_semantic_token_rules.json | 2 +- assets/settings/initial_user_settings.json | 6 +- .../initial_worktree_setup_tasks.json | 2 +- crates/agent/src/templates.rs | 2 +- .../templates/experimental_system_prompt.hbs | 2 +- crates/agent/src/templates/system_prompt.hbs | 2 +- crates/agent/src/tool_permissions.rs | 2 +- crates/agent/src/tools/create_thread_tool.rs | 2 +- crates/agent/src/tools/terminal_tool.rs | 2 +- crates/agent_servers/src/acp.rs | 2 +- crates/agent_settings/src/agent_profile.rs | 2 +- .../configure_context_server_modal.rs | 2 +- crates/agent_ui/src/agent_panel.rs | 2 +- crates/agent_ui/src/agent_ui.rs | 4 +- crates/agent_ui/src/completion_provider.rs | 4 +- .../src/conversation_view/elicitation.rs | 4 +- .../src/conversation_view/thread_view.rs | 14 +- crates/agent_ui/src/draft_prompt_store.rs | 2 +- crates/agent_ui/src/thread_import.rs | 2 +- .../agent_ui/src/thread_worktree_archive.rs | 8 +- crates/agent_ui/src/ui/end_trial_upsell.rs | 2 +- crates/ai_onboarding/src/plan_definitions.rs | 6 +- crates/cli/src/cli.rs | 4 +- crates/cli/src/main.rs | 38 +++--- .../incoming_call_notification.rs | 2 +- crates/copilot_ui/src/sign_in.rs | 4 +- crates/edit_prediction/src/edit_prediction.rs | 2 +- .../src/zed_edit_prediction_delegate.rs | 2 +- crates/edit_prediction/src/zeta.rs | 2 +- .../src/edit_prediction_button.rs | 2 +- crates/editor/src/editor.rs | 6 +- crates/editor/src/test.rs | 2 +- crates/extension/src/extension_manifest.rs | 2 +- crates/extension_cli/src/main.rs | 4 +- crates/feedback/src/feedback.rs | 10 +- crates/gpui/examples/text.rs | 4 +- crates/gpui/src/text_system.rs | 26 ++-- crates/gpui/src/text_system/line.rs | 2 +- crates/gpui/src/text_system/line_wrapper.rs | 4 +- crates/keymap_editor/src/keymap_editor.rs | 2 +- crates/language/src/language_settings.rs | 16 +-- crates/language_model_core/src/provider.rs | 2 +- crates/language_models/src/provider.rs | 2 +- .../language_models/src/provider/anthropic.rs | 2 +- .../src/provider/api_compatible.rs | 4 +- .../language_models/src/provider/bedrock.rs | 6 +- crates/language_models/src/provider/cloud.rs | 36 ++--- .../language_models/src/provider/llama_cpp.rs | 4 +- .../language_models/src/provider/lmstudio.rs | 2 +- .../language_models/src/provider/mistral.rs | 2 +- crates/language_models/src/provider/ollama.rs | 2 +- .../src/provider/openai_subscribed.rs | 2 +- .../language_models/src/provider/opencode.rs | 6 +- .../src/provider/vercel_ai_gateway.rs | 2 +- .../src/provider/x_ai_subscribed.rs | 2 +- crates/markdown/examples/markdown.rs | 6 +- crates/markdown/examples/markdown_as_child.rs | 6 +- crates/markdown/src/mermaid.rs | 7 +- crates/onboarding/src/basics_page.rs | 16 +-- crates/project/src/project.rs | 2 +- crates/project/src/project_settings.rs | 14 +- crates/recent_projects/src/recent_projects.rs | 2 +- crates/sandbox/src/windows_wsl.rs | 8 +- crates/settings/src/base_keymap_setting.rs | 19 +-- crates/settings_content/src/agent.rs | 10 +- crates/settings_content/src/extension.rs | 2 +- crates/settings_content/src/language.rs | 34 ++--- crates/settings_content/src/language_model.rs | 8 +- crates/settings_content/src/merge_from.rs | 2 +- crates/settings_content/src/project.rs | 18 +-- .../settings_content/src/settings_content.rs | 45 +++--- crates/settings_content/src/terminal.rs | 2 +- crates/settings_content/src/theme.rs | 2 +- crates/settings_content/src/title_bar.rs | 4 +- crates/settings_content/src/workspace.rs | 22 +-- crates/settings_ui/src/page_data.rs | 38 +++--- .../pages/edit_prediction_provider_setup.rs | 4 +- .../src/pages/llm_providers_page.rs | 8 +- .../settings_ui/src/pages/sandbox_settings.rs | 2 +- crates/settings_ui/src/pages/skill_creator.rs | 2 +- .../src/pages/tool_permissions_setup.rs | 2 +- crates/settings_ui/src/settings_ui.rs | 4 +- crates/sidebar/src/sidebar_tests.rs | 2 +- crates/theme/src/fallback_themes.rs | 4 +- crates/theme/src/icon_theme.rs | 2 +- crates/title_bar/src/application_menu.rs | 4 +- crates/title_bar/src/title_bar.rs | 4 +- .../src/components/ai/agent_setup_button.rs | 2 +- .../src/windows_resources.rs | 6 +- crates/workspace/src/notifications.rs | 6 +- crates/workspace/src/pane_group.rs | 4 +- crates/workspace/src/welcome.rs | 2 +- crates/workspace/src/workspace.rs | 16 +-- .../resources/flatpak/manifest-template.json | 2 +- .../zed/resources/flatpak/zed.metainfo.xml.in | 18 +-- crates/zed/resources/gwen.desktop.in | 2 +- crates/zed/resources/info/DocumentTypes.plist | 2 +- crates/zed/resources/info/Permissions.plist | 24 ++-- crates/zed/resources/snap/snapcraft.yaml.in | 12 +- crates/zed/resources/windows/gwen.iss | 6 +- crates/zed/src/main.rs | 18 +-- crates/zed/src/reliability/hang_detection.rs | 4 +- crates/zed/src/watcher_debug.rs | 2 +- crates/zed/src/zed.rs | 4 +- crates/zed/src/zed/app_menus.rs | 8 +- crates/zed/src/zed/move_to_applications.rs | 6 +- crates/zed_actions/src/lib.rs | 12 +- script/bundle-freebsd | 2 +- script/bundle-windows.ps1 | 66 ++++----- 123 files changed, 508 insertions(+), 499 deletions(-) diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json index c58ae13bcc..c92a257dfd 100644 --- a/assets/keymaps/default-linux.json +++ b/assets/keymaps/default-linux.json @@ -665,7 +665,7 @@ "shift-new": "workspace::NewWindow", "ctrl-shift-n": "workspace::NewWindow", "ctrl-`": "terminal_panel::Toggle", - "f10": ["app_menu::OpenApplicationMenu", "Zed"], + "f10": ["app_menu::OpenApplicationMenu", "Gwen"], "alt-1": ["workspace::ActivatePane", 0], "alt-2": ["workspace::ActivatePane", 1], "alt-3": ["workspace::ActivatePane", 2], diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json index ab4cd92ef1..6083631125 100644 --- a/assets/keymaps/default-macos.json +++ b/assets/keymaps/default-macos.json @@ -592,7 +592,7 @@ "cmd-f2": "editor::SelectAllMatches", // Select all occurrences of current word "cmd-k cmd-d": ["editor::SelectNext", { "replace_newest": true }], // editor.action.moveSelectionToNextFindMatch / find_under_expand_skip // macOS binds `ctrl-cmd-d` to Show Dictionary which breaks these two binds - // To use `ctrl-cmd-d` or `ctrl-k ctrl-cmd-d` in Zed you must execute this command and then restart: + // To use `ctrl-cmd-d` or `ctrl-k ctrl-cmd-d` in Gwen you must execute this command and then restart: // defaults write com.apple.symbolichotkeys AppleSymbolicHotKeys -dict-add 70 'enabled' "ctrl-cmd-d": ["editor::SelectPrevious", { "replace_newest": false }], // editor.action.addSelectionToPreviousFindMatch "cmd-k ctrl-cmd-d": ["editor::SelectPrevious", { "replace_newest": true }], // editor.action.moveSelectionToPreviousFindMatch @@ -629,7 +629,7 @@ "cmd-k cmd-9": "editor::FoldAtLevel_9", "cmd-k cmd-0": "editor::FoldAll", "cmd-k cmd-j": "editor::UnfoldAll", - // Using `ctrl-space` / `ctrl-shift-space` in Zed requires disabling the macOS global shortcut. + // Using `ctrl-space` / `ctrl-shift-space` in Gwen requires disabling the macOS global shortcut. // System Preferences->Keyboard->Keyboard Shortcuts->Input Sources->Select the previous input source (uncheck) "ctrl-space": "editor::ShowCompletions", "ctrl-shift-space": "editor::ShowWordCompletions", @@ -1396,7 +1396,7 @@ "cmd-home": "terminal::ScrollToTop", "shift-end": "terminal::ScrollToBottom", "cmd-end": "terminal::ScrollToBottom", - // Using `ctrl-shift-space` in Zed requires disabling the macOS global shortcut. + // Using `ctrl-shift-space` in Gwen requires disabling the macOS global shortcut. // System Preferences->Keyboard->Keyboard Shortcuts->Input Sources->Select the previous input source (uncheck) "ctrl-shift-space": "terminal::ToggleViMode", "ctrl-alt-up": "pane::SplitUp", diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json index d64b301609..02e74126e6 100644 --- a/assets/keymaps/default-windows.json +++ b/assets/keymaps/default-windows.json @@ -658,7 +658,7 @@ "ctrl-n": "workspace::NewFile", "ctrl-shift-n": "workspace::NewWindow", "ctrl-`": "terminal_panel::Toggle", - "f10": ["app_menu::OpenApplicationMenu", "Zed"], + "f10": ["app_menu::OpenApplicationMenu", "Gwen"], "alt-1": ["workspace::ActivatePane", 0], "alt-2": ["workspace::ActivatePane", 1], "alt-3": ["workspace::ActivatePane", 2], diff --git a/assets/keymaps/initial.json b/assets/keymaps/initial.json index 3a8d7f382a..20d356137a 100644 --- a/assets/keymaps/initial.json +++ b/assets/keymaps/initial.json @@ -1,6 +1,6 @@ -// Zed keymap +// Gwen keymap // -// For information on binding keys, see the Zed +// For information on binding keys, see the // documentation: https://zed.dev/docs/key-bindings // // To see the default key bindings run `zed: open default keymap` diff --git a/assets/keymaps/linux/atom.json b/assets/keymaps/linux/atom.json index a15d4877aa..269d9234a1 100644 --- a/assets/keymaps/linux/atom.json +++ b/assets/keymaps/linux/atom.json @@ -1,4 +1,4 @@ -// Default Keymap (Atom) for Zed on Linux +// Default Keymap (Atom) for Gwen on Linux [ { "bindings": { diff --git a/assets/keymaps/linux/cursor.json b/assets/keymaps/linux/cursor.json index 81d8dbec9c..9193178605 100644 --- a/assets/keymaps/linux/cursor.json +++ b/assets/keymaps/linux/cursor.json @@ -48,11 +48,11 @@ "ctrl-r": "agent::NewThread", "ctrl-shift-v": "editor::Paste", // "escape": "agent::ToggleFocus" - ///// Enable when Zed supports multiple thread tabs + ///// Enable when Gwen supports multiple thread tabs // "ctrl-t": // new thread tab // "ctrl-[": // next thread tab // "ctrl-]": // next thread tab - ///// Enable if Zed adds support for keyboard navigation of thread elements + ///// Enable if Gwen adds support for keyboard navigation of thread elements // "tab": // cycle to next message // "shift-tab": // cycle to previous message }, diff --git a/assets/keymaps/linux/emacs.json b/assets/keymaps/linux/emacs.json index 3a7af84ede..d49374d6a9 100755 --- a/assets/keymaps/linux/emacs.json +++ b/assets/keymaps/linux/emacs.json @@ -10,7 +10,7 @@ }, { // Workaround to avoid falling back to default bindings. - // Unbind so Zed ignores these keys and lets emacs handle them. + // Unbind so Gwen ignores these keys and lets emacs handle them. // NOTE: must be declared before the `Editor` override. // NOTE: in macos the 'ctrl-x' 'ctrl-p' and 'ctrl-n' rebindings are not needed, since they default to 'cmd'. "context": "Editor", @@ -153,7 +153,7 @@ "alt-x": "command_palette::Toggle", // execute-extended-command "ctrl-x b": "tab_switcher::Toggle", // switch-to-buffer "ctrl-x ctrl-b": "tab_switcher::Toggle", // list-buffers - // "ctrl-x ctrl-c": "workspace::CloseWindow" // in case you only want to exit the current Zed instance + // "ctrl-x ctrl-c": "workspace::CloseWindow" // in case you only want to exit the current Gwen instance "ctrl-x ctrl-c": "zed::Quit", // save-buffers-kill-terminal "ctrl-x 5 0": "workspace::CloseWindow", // delete-frame "ctrl-x 5 2": "workspace::NewWindow", // make-frame-command @@ -171,15 +171,15 @@ }, }, { - // Workaround to enable using native emacs from the Zed terminal. - // Unbind so Zed ignores these keys and lets emacs handle them. + // Workaround to enable using native emacs from the Gwen terminal. + // Unbind so Gwen ignores these keys and lets emacs handle them. // NOTE: // "terminal::SendKeystroke" only works for a single key stroke (e.g. ctrl-x), // so override with null for compound sequences (e.g. ctrl-x ctrl-c). "context": "Terminal", "bindings": { - // If you want to perfect your emacs-in-zed setup, also consider the following. - // You may need to enable "option_as_meta" from the Zed settings for "alt-x" to work. + // If you want to perfect your emacs-in-gwen setup, also consider the following. + // You may need to enable "option_as_meta" from the Gwen settings for "alt-x" to work. // "alt-x": ["terminal::SendKeystroke", "alt-x"], // "ctrl-x": ["terminal::SendKeystroke", "ctrl-x"], // "ctrl-n": ["terminal::SendKeystroke", "ctrl-n"], diff --git a/assets/keymaps/linux/vscode.json b/assets/keymaps/linux/vscode.json index 74e648d3aa..6a3a67fae0 100644 --- a/assets/keymaps/linux/vscode.json +++ b/assets/keymaps/linux/vscode.json @@ -1,13 +1,13 @@ [ // VS Code for Linux (and Windows). See: https://code.visualstudio.com/docs/reference/default-keybindings // - // Zed's default keymap is close to VS Code's, so this overlay only contains + // Gwen's default keymap is close to VS Code's, so this overlay only contains // the bindings where the two diverge. { "context": "Editor", "use_key_equivalents": true, "bindings": { - "shift-alt-f": "editor::Format", // Format Document (Windows-style; Linux `ctrl-shift-i` is a Zed default already) + "shift-alt-f": "editor::Format", // Format Document (Windows-style; Linux `ctrl-shift-i` is a Gwen default already) "ctrl-k ctrl-f": "editor::FormatSelections", // Format Selection "shift-alt-i": "editor::SplitSelectionIntoLines", // Insert cursor at end of each line selected "alt-z": "editor::ToggleSoftWrap", // Toggle Word Wrap diff --git a/assets/keymaps/macos/atom.json b/assets/keymaps/macos/atom.json index d39571de2d..97e3a1cab8 100644 --- a/assets/keymaps/macos/atom.json +++ b/assets/keymaps/macos/atom.json @@ -1,4 +1,4 @@ -// Default Keymap (Atom) for Zed on macOS +// Default Keymap (Atom) for Gwen on macOS [ { "bindings": { diff --git a/assets/keymaps/macos/cursor.json b/assets/keymaps/macos/cursor.json index f8764d5cb7..803277dfe6 100644 --- a/assets/keymaps/macos/cursor.json +++ b/assets/keymaps/macos/cursor.json @@ -49,11 +49,11 @@ "cmd-r": "agent::NewThread", "cmd-shift-v": "editor::Paste", // "escape": "agent::ToggleFocus" - ///// Enable when Zed supports multiple thread tabs + ///// Enable when Gwen supports multiple thread tabs // "cmd-t": // new thread tab // "cmd-[": // next thread tab // "cmd-]": // next thread tab - ///// Enable if Zed adds support for keyboard navigation of thread elements + ///// Enable if Gwen adds support for keyboard navigation of thread elements // "tab": // cycle to next message // "shift-tab": // cycle to previous message }, diff --git a/assets/keymaps/macos/emacs.json b/assets/keymaps/macos/emacs.json index 3ab09a4981..47cf83ce06 100755 --- a/assets/keymaps/macos/emacs.json +++ b/assets/keymaps/macos/emacs.json @@ -11,7 +11,7 @@ }, { // Workaround to avoid falling back to default bindings. - // Unbind so Zed ignores these keys and lets emacs handle them. + // Unbind so Gwen ignores these keys and lets emacs handle them. // NOTE: must be declared before the `Editor` override. "context": "Editor", "bindings": { @@ -147,7 +147,7 @@ "alt-x": "command_palette::Toggle", // execute-extended-command "ctrl-x b": "tab_switcher::Toggle", // switch-to-buffer "ctrl-x ctrl-b": "tab_switcher::Toggle", // list-buffers - // "ctrl-x ctrl-c": "workspace::CloseWindow" // in case you only want to exit the current Zed instance + // "ctrl-x ctrl-c": "workspace::CloseWindow" // in case you only want to exit the current Gwen instance "ctrl-x ctrl-c": "zed::Quit", // save-buffers-kill-terminal "ctrl-x 5 0": "workspace::CloseWindow", // delete-frame "ctrl-x 5 2": "workspace::NewWindow", // make-frame-command @@ -165,15 +165,15 @@ }, }, { - // Workaround to enable using native emacs from the Zed terminal. - // Unbind so Zed ignores these keys and lets emacs handle them. + // Workaround to enable using native emacs from the Gwen terminal. + // Unbind so Gwen ignores these keys and lets emacs handle them. // NOTE: // "terminal::SendKeystroke" only works for a single key stroke (e.g. ctrl-x), // so override with null for compound sequences (e.g. ctrl-x ctrl-c). "context": "Terminal", "bindings": { - // If you want to perfect your emacs-in-zed setup, also consider the following. - // You may need to enable "option_as_meta" from the Zed settings for "alt-x" to work. + // If you want to perfect your emacs-in-gwen setup, also consider the following. + // You may need to enable "option_as_meta" from the Gwen settings for "alt-x" to work. // "alt-x": ["terminal::SendKeystroke", "alt-x"], // "ctrl-x": ["terminal::SendKeystroke", "ctrl-x"], // "ctrl-n": ["terminal::SendKeystroke", "ctrl-n"], diff --git a/assets/keymaps/macos/vscode.json b/assets/keymaps/macos/vscode.json index 5798bdce41..d1faef9050 100644 --- a/assets/keymaps/macos/vscode.json +++ b/assets/keymaps/macos/vscode.json @@ -1,7 +1,7 @@ [ // VS Code for macOS. See: https://code.visualstudio.com/docs/reference/default-keybindings // - // Zed's default keymap is close to VS Code's, so this overlay only contains + // Gwen's default keymap is close to VS Code's, so this overlay only contains // the bindings where the two diverge. { "context": "Editor", diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json index f2d7b26261..3e518f25f4 100644 --- a/assets/keymaps/vim.json +++ b/assets/keymaps/vim.json @@ -535,11 +535,11 @@ "shift-h": "pane::ActivatePreviousItem", // not a helix default "g w": "vim::HelixJumpToWord", "g .": "vim::HelixGotoLastModification", - "g o": "editor::ToggleSelectedDiffHunks", // Zed specific - "g shift-o": "git::ToggleStaged", // Zed specific - "g shift-r": "git::Restore", // Zed specific - "g u": "git::StageAndNext", // Zed specific - "g shift-u": "git::UnstageAndNext", // Zed specific + "g o": "editor::ToggleSelectedDiffHunks", // Gwen specific + "g shift-o": "git::ToggleStaged", // Gwen specific + "g shift-r": "git::Restore", // Gwen specific + "g u": "git::StageAndNext", // Gwen specific + "g shift-u": "git::UnstageAndNext", // Gwen specific // Window mode "space w v": "pane::SplitRight", diff --git a/assets/settings/default.json b/assets/settings/default.json index 3fdc5ede4a..471c77e9c7 100644 --- a/assets/settings/default.json +++ b/assets/settings/default.json @@ -1,6 +1,6 @@ { "$schema": "zed://schemas/settings", - // The name of the Zed theme to use for the UI. + // The name of the Gwen theme to use for the UI. // // `mode` is one of: // - "system": Use the theme that corresponds to the system's appearance @@ -11,11 +11,11 @@ "light": "Gwen Light", "dark": "Gwen Dark", }, - "icon_theme": "Zed (Default)", + "icon_theme": "Gwen (Default)", // The name of a base set of key bindings to use. // This setting can take the following values: // - // 1. "Zed" + // 1. "Gwen" // 2. "VSCode" // 3. "Atom" // 4. "JetBrains" @@ -24,11 +24,11 @@ // 7. "Emacs" // 8. "Cursor" // 9. "None" - "base_keymap": "Zed", + "base_keymap": "Gwen", // The name of a font to use for rendering text in the editor - // ".ZedMono" currently aliases to Lilex + // ".GwenMono" currently aliases to Lilex // but this may change in the future. - "buffer_font_family": ".ZedMono", + "buffer_font_family": ".GwenMono", // Set the buffer text's font fallbacks, this will be merged with // the platform's default fallbacks. "buffer_font_fallbacks": null, @@ -54,9 +54,9 @@ "buffer_line_height": "comfortable", // The name of a font to use for rendering text in the UI // You can set this to ".SystemUIFont" to use the system font - // ".ZedSans" currently aliases to "IBM Plex Sans", but this may + // ".GwenSans" currently aliases to "IBM Plex Sans", but this may // change in the future - "ui_font_family": ".ZedSans", + "ui_font_family": ".GwenSans", // Set the UI's font fallbacks, this will be merged with the platform's // default font fallbacks. "ui_font_fallbacks": null, @@ -153,9 +153,9 @@ // after the mouse moves away from the hover target. // Only applies when `hover_popover_sticky` is enabled. "hover_popover_hiding_delay": 300, - // Whether to confirm before quitting Zed. + // Whether to confirm before quitting Gwen. "confirm_quit": false, - // Whether to restore last closed project when fresh Zed instance is opened + // Whether to restore last closed project when fresh Gwen instance is opened // May take 3 values: // 1. All workspaces open during last session // "restore_on_startup": "last_session" @@ -168,7 +168,7 @@ // an explicit `-e` (existing window) or `-n` (new window) flag. // // May take 2 values: - // 1. Open directories as a new workspace in the current Zed window's sidebar + // 1. Open directories as a new workspace in the current Gwen window's sidebar // "cli_default_open_behavior": "existing_window" // 2. Open paths in a new window, unless they are subpaths of an existing project // "cli_default_open_behavior": "new_window" @@ -176,7 +176,7 @@ // The default behavior when opening projects from the UI. // // May take 2 values: - // 1. Open projects as a new workspace in the current Zed window's sidebar + // 1. Open projects as a new workspace in the current Gwen window's sidebar // "default_open_behavior": "existing_window" // 2. Open projects in a new window // "default_open_behavior": "new_window" @@ -258,28 +258,28 @@ // // Default: " — " "window_title_separator": " — ", - // On Linux, what draws Zed's window decorations (titlebar). + // On Linux, what draws Gwen's window decorations (titlebar). // This setting has no effect on other platforms: - // 1. Zed draws its own window decorations. + // 1. Gwen draws its own window decorations. // "client" // 2. The window manager or compositor draws the window decorations. // Not supported by GNOME Wayland. // "server" // - // This requires restarting Zed for changes to take effect. + // This requires restarting Gwen for changes to take effect. // // Default: "client" "window_decorations": "client", - // Whether to optimize Zed's interface for assistive technology such as screen + // Whether to optimize Gwen's interface for assistive technology such as screen // readers. "accessible_mode": false, // Whether to use the system provided dialogs for Open and Save As. - // When set to false, Zed will use the built-in keyboard-first pickers. + // When set to false, Gwen will use the built-in keyboard-first pickers. "use_system_path_prompts": true, // Whether to use the system provided dialogs for prompts, such as confirmation // prompts. - // When set to false, Zed will use its built-in prompts. Note that on Linux, - // this option is ignored and Zed will always use the built-in prompts. + // When set to false, Gwen will use its built-in prompts. Note that on Linux, + // this option is ignored and Gwen will always use the built-in prompts. "use_system_prompts": true, // Whether the cursor blinks in the editor. "cursor_blink": true, @@ -501,11 +501,11 @@ "use_on_type_format": true, // Whether to automatically add matching closing characters when typing // opening parenthesis, bracket, brace, single or double quote characters. - // For example, when you type '(', Zed will add a closing ) at the correct position. + // For example, when you type '(', Gwen will add a closing ) at the correct position. "use_autoclose": true, // Whether to automatically surround selected text when typing opening parenthesis, // bracket, brace, single or double quote characters. - // For example, when you select text and type '(', Zed will surround the text with (). + // For example, when you select text and type '(', Gwen will surround the text with (). "use_auto_surround": true, // Controls automatic indentation behavior when typing. // - "syntax_aware": Adjusts indentation based on syntax context (default) @@ -576,7 +576,7 @@ "space": "•", "tab": "→", }, - // Settings related to calls in Zed + // Settings related to calls in Gwen "calls": { // Join calls with the microphone live by default "mute_on_join": false, @@ -1233,7 +1233,7 @@ // The "default" setting applies when no tool-specific rules match. // For external agents that define their own permission modes, // "deny" and "confirm" still take precedence — the external agent's - // permission system is only used when Zed would allow the action. + // permission system is only used when Gwen would allow the action. // // Per-tool regex patterns ("tools" below) match against tool input text // (commands, paths, URLs, etc.). For `copy_path` and `move_path`, @@ -1376,7 +1376,7 @@ // // Default: true "expand_terminal_card": true, - // Command to automatically run when Zed creates a Terminal Thread shell in the agent panel. + // Command to automatically run when Gwen creates a Terminal Thread shell in the agent panel. // The command is sent to the shell as if typed, so it is interpreted by your // configured shell (including on Windows and remote/WSL projects). // Set to "" to disable. @@ -1451,7 +1451,7 @@ // // 1. Never automatically save: // "autosave": "off", - // 2. Save when changing focus away from the Zed window: + // 2. Save when changing focus away from the Gwen window: // "autosave": "on_window_change", // 3. Save when changing focus away from a specific buffer: // "autosave": "on_focus_change", @@ -1579,11 +1579,11 @@ // Default: true "skip_focus_for_active_in_search": true, // Whether to use gitignored files when searching. - // Only the file Zed had indexed will be used, not necessary all the gitignored files. + // Only the file Gwen had indexed will be used, not necessary all the gitignored files. // // Can accept 3 values: // * "all": Use all gitignored files - // * "indexed": Use only the files Zed had indexed + // * "indexed": Use only the files Gwen had indexed // * "smart": Be smart and search for ignored when called from a gitignored worktree "include_ignored": "smart", // Whether to include text channels in file finder results. @@ -1630,7 +1630,7 @@ "format_on_save": "off", // How to perform a buffer format. This setting can take multiple values: // - // 1. Default. Format files using Zed's Prettier integration (if applicable), + // 1. Default. Format files using Gwen's Prettier integration (if applicable), // or falling back to formatting via language server: // "formatter": "auto" // 2. Format code using the current language server: @@ -1644,7 +1644,7 @@ // "arguments": ["--stdin-filepath", "{buffer_path}"] // } // } - // 5. Format code using Zed's Prettier integration: + // 5. Format code using Gwen's Prettier integration: // "formatter": "prettier" // 6. Format code using a code action // "formatter": {"code_action": "source.fixAll.eslint"} @@ -1685,21 +1685,21 @@ // // Default: true "word_diff_enabled": true, - // Control what info is collected by Zed. + // Control what info is collected by Gwen. "telemetry": { // Send debug info like crash reports. "diagnostics": true, - // Send anonymized usage data like what languages you're using Zed with. + // Send anonymized usage data like what languages you're using Gwen with. "metrics": true, // Allow sending requests to Anthropic models that cannot be offered with // Zero Data Retention "anthropic_retention": false, }, - // Whether to disable all AI features in Zed. + // Whether to disable all AI features in Gwen. // // Default: false "disable_ai": false, - // Automatically update Zed. This setting may be ignored on Linux if + // Automatically update Gwen. This setting may be ignored on Linux if // installed through a package manager. "auto_update": true, // How to render LSP `textDocument/documentColor` colors in the editor. @@ -1727,7 +1727,7 @@ // // Default: true "include_warnings": true, - // Settings for using LSP pull diagnostics mechanism in Zed. + // Settings for using LSP pull diagnostics mechanism in Gwen. "lsp_pull_diagnostics": { // Whether to pull for diagnostics or not. "enabled": true, @@ -1754,7 +1754,7 @@ "max_severity": null, }, }, - // Files or globs of files that will be excluded by Zed entirely. They will be skipped during file + // Files or globs of files that will be excluded by Gwen entirely. They will be skipped during file // scans, file searches, and not be displayed in the project file tree. Takes precedence over `file_scan_inclusions`. "file_scan_exclusions": [ "**/.git", @@ -1769,9 +1769,9 @@ "**/.classpath", "**/.settings", ], - // Files or globs of files that will be included by Zed, even when ignored by git. This is useful + // Files or globs of files that will be included by Gwen, even when ignored by git. This is useful // for files that are not tracked by git, but are still important to your project. Note that globs - // that are overly broad can slow down Zed's file scanning. `file_scan_exclusions` takes + // that are overly broad can slow down Gwen's file scanning. `file_scan_exclusions` takes // precedence over these inclusions. "file_scan_inclusions": [".env*"], // Maximum directory depth to eagerly index outside of git repositories; @@ -1899,7 +1899,7 @@ "provider": "zed", // Disable edit predictions for files matching these glob patterns. // - // Use `"..."` to add patterns without repeating Zed's defaults. In project + // Use `"..."` to add patterns without repeating Gwen's defaults. In project // settings, it extends the user or parent configuration value. Omit // `"..."` to replace the inherited list. // @@ -1973,7 +1973,7 @@ "mercury": { "prediction_debounce": 0, }, - // Controls whether Zed may collect training data when using Zed's Edit Predictions. + // Controls whether Gwen may collect training data when using Gwen's Edit Predictions. // Data is only captured when the project is detected as open source. // Possible values: // - "default": use the preference previously set via the status-bar toggle, @@ -2180,7 +2180,7 @@ // "font_size": 15, // Set the terminal's font family. If this option is not included, // the terminal will default to matching the buffer's font family. - // "font_family": ".ZedMono", + // "font_family": ".GwenMono", // Set the terminal's font fallbacks. If this option is not included, // the terminal will default to matching the buffer's font fallbacks. // This will be merged with the platform's default font fallbacks @@ -2275,13 +2275,13 @@ "tasks": { "variables": {}, "enabled": true, - // Use LSP tasks over Zed language extension ones. + // Use LSP tasks over Gwen language extension ones. // If no LSP tasks are returned due to error/timeout or regular execution, - // Zed language extension tasks will be used instead. + // Gwen language extension tasks will be used instead. // - // Other Zed tasks will still be shown: - // * Zed task from either of the task config file - // * Zed task from history (e.g. one-off task was spawned before) + // Other Gwen tasks will still be shown: + // * Gwen task from either of the task config file + // * Gwen task from history (e.g. one-off task was spawned before) // // Default: true "prefer_lsp": true, @@ -2311,20 +2311,20 @@ // Settings for which version of Node.js and NPM to use when installing // language servers and Copilot. // - // Note: changing this setting currently requires restarting Zed. + // Note: changing this setting currently requires restarting Gwen. "node": { - // By default, Zed will look for `node` and `npm` on your `$PATH`, and use the + // By default, Gwen will look for `node` and `npm` on your `$PATH`, and use the // existing executables if their version is recent enough. Set this to `true` - // to prevent this, and force Zed to always download and install its own + // to prevent this, and force Gwen to always download and install its own // version of Node. "ignore_system_version": false, // You can also specify alternative paths to Node and NPM. If you specify - // `path`, but not `npm_path`, Zed will assume that `npm` is located at + // `path`, but not `npm_path`, Gwen will assume that `npm` is located at // `${path}/../npm`. "path": null, "npm_path": null, }, - // The extensions that Zed should automatically install on startup. + // The extensions that Gwen should automatically install on startup. // // If you don't want any of these extensions, add this field to your settings // and change the value to `false`. @@ -2374,7 +2374,7 @@ // When LSP servers give an `InsertReplaceEdit` completion, they provides two ranges: `insert` and `replace`. Usually, `insert` // contains the word prefix before your cursor and `replace` contains the whole word. // - // Effectively, this setting just changes whether Zed will use the received range for `insert` or `replace`, so the results may + // Effectively, this setting just changes whether Gwen will use the received range for `insert` or `replace`, so the results may // differ depending on the underlying LSP server. // // Possible values: @@ -2695,7 +2695,7 @@ // Default: false "trust_all_worktrees": false, }, - // Zed's Prettier integration settings. + // Gwen's Prettier integration settings. // Allows to enable/disable formatting with Prettier // and configure default Prettier, used when no project-level Prettier installation is found. "prettier": { @@ -2723,7 +2723,7 @@ // "rust-analyzer": { // // A special flag for rust-analyzer integration, to use server-provided tasks // enable_lsp_tasks": true, - // // These initialization options are merged into Zed's defaults + // // These initialization options are merged into Gwen's defaults // "initialization_options": { // "check": { // "command": "clippy" // rust-analyzer.check.command (default: "check") @@ -2850,13 +2850,13 @@ // The server to connect to. If the environment variable // ZED_SERVER_URL is set, it will override this setting. "server_url": "https://zed.dev", - // Settings overrides to use when using Zed Preview. - // Mostly useful for developers who are managing multiple instances of Zed. + // Settings overrides to use when using Gwen Preview. + // Mostly useful for developers who are managing multiple instances of Gwen. "preview": { // "theme": "Andromeda" }, - // Settings overrides to use when using Zed Nightly. - // Mostly useful for developers who are managing multiple instances of Zed. + // Settings overrides to use when using Gwen Nightly. + // Mostly useful for developers who are managing multiple instances of Gwen. "nightly": { // "theme": "Andromeda" "instrumentation": { @@ -2865,13 +2865,13 @@ }, }, }, - // Settings overrides to use when using Zed Stable. - // Mostly useful for developers who are managing multiple instances of Zed. + // Settings overrides to use when using Gwen Stable. + // Mostly useful for developers who are managing multiple instances of Gwen. "stable": { // "theme": "Andromeda" }, - // Settings overrides to use when using Zed Dev. - // Mostly useful for developers who are managing multiple instances of Zed. + // Settings overrides to use when using Gwen Dev. + // Mostly useful for developers who are managing multiple instances of Gwen. "dev": { // "theme": "Andromeda" "instrumentation": { @@ -2904,7 +2904,7 @@ // Supported URI scheme: `http`, `https`, `socks4`, `socks4a`, `socks5`, // `socks5h`. `http` will be used when no scheme is specified. // - // By default no proxy will be used, or Zed will try get proxy settings from + // By default no proxy will be used, or Gwen will try get proxy settings from // environment variables. If certain hosts should not be proxied, // set the `no_proxy` environment variable and provide a comma-separated list. // @@ -2922,7 +2922,7 @@ "command_aliases": {}, // ssh_connections is an array of ssh connections. // You can configure these from `project: Open Remote` in the command palette. - // Zed's ssh support will pull configuration from your ~/.ssh too. + // Gwen's ssh support will pull configuration from your ~/.ssh too. // Examples: // [ // { @@ -2968,7 +2968,7 @@ // Each profile has an optional `base` ("user" or "default") and a `settings` // object. When `base` is "user" (the default), the profile applies on top of // your user settings. When `base` is "default", user settings are ignored and - // the profile applies on top of Zed's defaults. + // the profile applies on top of Gwen's defaults. // // Examples: // "profiles": { diff --git a/assets/settings/default_semantic_token_rules.json b/assets/settings/default_semantic_token_rules.json index 354fb431eb..f5ec0ab3dc 100644 --- a/assets/settings/default_semantic_token_rules.json +++ b/assets/settings/default_semantic_token_rules.json @@ -1,4 +1,4 @@ -// Default semantic token rules for Zed (read-only). +// Default semantic token rules for Gwen (read-only). // // These rules map LSP semantic token types to syntax theme styles. // To customize, add rules to "semantic_token_rules" in your settings.json. diff --git a/assets/settings/initial_user_settings.json b/assets/settings/initial_user_settings.json index 0294ab5824..6078268d63 100644 --- a/assets/settings/initial_user_settings.json +++ b/assets/settings/initial_user_settings.json @@ -1,9 +1,9 @@ -// Zed settings +// Gwen settings // -// For information on how to configure Zed, see the Zed +// For information on how to configure Gwen, see the // documentation: https://zed.dev/docs/configuring-zed // -// To see all of Zed's default settings without changing your +// To see all of Gwen's default settings without changing your // custom settings, run `zed: open default settings` from the // command palette (cmd-shift-p / ctrl-shift-p) { diff --git a/assets/settings/initial_worktree_setup_tasks.json b/assets/settings/initial_worktree_setup_tasks.json index 5a3c5a4507..fb1ae4ea65 100644 --- a/assets/settings/initial_worktree_setup_tasks.json +++ b/assets/settings/initial_worktree_setup_tasks.json @@ -1,7 +1,7 @@ // Worktree setup tasks, stored in this project's tasks.json. // See https://zed.dev/docs/tasks#hooks for the full Tasks Hooks documentation. // -// Tasks with the `create_worktree` hook run automatically right after Zed +// Tasks with the `create_worktree` hook run automatically right after Gwen // creates a new git worktree. Use them to get a fresh worktree ready to work // in — for example, installing dependencies or copying files that git doesn't // track (like `.env`) from the original repository. diff --git a/crates/agent/src/templates.rs b/crates/agent/src/templates.rs index d5799ecb19..6dbda0ca57 100644 --- a/crates/agent/src/templates.rs +++ b/crates/agent/src/templates.rs @@ -111,7 +111,7 @@ mod tests { }; let templates = Templates::new(); let rendered = template.render(&templates).unwrap(); - assert!(rendered.contains("You are the Zed coding agent")); + assert!(rendered.contains("You are the Gwen coding agent")); assert!(rendered.contains("Today's Date: 2026-01-01")); assert!(rendered.contains("## Fixing Diagnostics")); assert!(rendered.contains("test-model")); diff --git a/crates/agent/src/templates/experimental_system_prompt.hbs b/crates/agent/src/templates/experimental_system_prompt.hbs index 7a348cca06..919e1d0555 100644 --- a/crates/agent/src/templates/experimental_system_prompt.hbs +++ b/crates/agent/src/templates/experimental_system_prompt.hbs @@ -1,4 +1,4 @@ -You are the Zed coding agent running inside the Zed editor. You help users complete software engineering tasks by understanding their codebase, making careful changes, and explaining your work clearly. Use your broad knowledge of programming languages, frameworks, design patterns, and engineering best practices to solve problems pragmatically. +You are the Gwen coding agent running inside the Gwen editor. You help users complete software engineering tasks by understanding their codebase, making careful changes, and explaining your work clearly. Use your broad knowledge of programming languages, frameworks, design patterns, and engineering best practices to solve problems pragmatically. ## Communication diff --git a/crates/agent/src/templates/system_prompt.hbs b/crates/agent/src/templates/system_prompt.hbs index b0341793dd..d224349951 100644 --- a/crates/agent/src/templates/system_prompt.hbs +++ b/crates/agent/src/templates/system_prompt.hbs @@ -1,4 +1,4 @@ -You are the Zed coding agent running inside the Zed editor. You help users complete software engineering tasks by understanding their codebase, making careful changes, and explaining your work clearly. Use your broad knowledge of programming languages, frameworks, design patterns, and engineering best practices to solve problems pragmatically. +You are the Gwen coding agent running inside the Gwen editor. You help users complete software engineering tasks by understanding their codebase, making careful changes, and explaining your work clearly. Use your broad knowledge of programming languages, frameworks, design patterns, and engineering best practices to solve problems pragmatically. ## Communication diff --git a/crates/agent/src/tool_permissions.rs b/crates/agent/src/tool_permissions.rs index bbb680d39e..ab06cd603b 100644 --- a/crates/agent/src/tool_permissions.rs +++ b/crates/agent/src/tool_permissions.rs @@ -317,7 +317,7 @@ impl ToolPermissionDecision { // hidden sub-commands that bypass the allow patterns. return ToolPermissionDecision::Deny(format!( "The {} shell does not support \"always allow\" patterns for the terminal \ - tool because Zed cannot parse its command chaining syntax. Please remove \ + tool because Gwen cannot parse its command chaining syntax. Please remove \ the always_allow patterns from your tool_permissions settings, or switch \ to a POSIX-conforming shell.", shell_kind diff --git a/crates/agent/src/tools/create_thread_tool.rs b/crates/agent/src/tools/create_thread_tool.rs index 6d7dfdb99b..73688318f2 100644 --- a/crates/agent/src/tools/create_thread_tool.rs +++ b/crates/agent/src/tools/create_thread_tool.rs @@ -74,7 +74,7 @@ pub struct CreateThreadToolInput { pub agent: Option, /// Optional model override as `provider/model-id` (e.g., - /// `anthropic/claude-haiku-4-latest`). Only meaningful for Zed's native + /// `anthropic/claude-haiku-4-latest`). Only meaningful for Gwen's native /// agent. Omit to use the user's configured default. #[serde(default, skip_serializing_if = "Option::is_none")] pub model: Option, diff --git a/crates/agent/src/tools/terminal_tool.rs b/crates/agent/src/tools/terminal_tool.rs index a674dd5031..5f55a3ae70 100644 --- a/crates/agent/src/tools/terminal_tool.rs +++ b/crates/agent/src/tools/terminal_tool.rs @@ -597,7 +597,7 @@ async fn run_terminal_tool( #[cfg(target_os = "windows")] let write_paths: Vec = { let Some(release) = wsl_zed_release.clone() else { - return Err("Could not select a Linux Zed release for WSL sandboxing".to_string()); + return Err("Could not select a Linux Gwen release for WSL sandboxing".to_string()); }; let mut resolved_paths = Vec::with_capacity(write_paths.len()); for requested in write_paths { diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs index c4d8a0fd6b..a01c74efd9 100644 --- a/crates/agent_servers/src/acp.rs +++ b/crates/agent_servers/src/acp.rs @@ -2781,7 +2781,7 @@ mod tests { url_elicitation_id.clone(), "https://auth.example.com/device", ), - "Authorize Zed in your browser", + "Authorize Gwen in your browser", ), acp::CompleteElicitationNotification::new(url_elicitation_id), cx, diff --git a/crates/agent_settings/src/agent_profile.rs b/crates/agent_settings/src/agent_profile.rs index 1283dbf1ea..9f9373a0bd 100644 --- a/crates/agent_settings/src/agent_profile.rs +++ b/crates/agent_settings/src/agent_profile.rs @@ -99,7 +99,7 @@ impl AgentProfile { } } -/// A profile for the Zed Agent that controls its behavior. +/// A profile for the Gwen Agent that controls its behavior. #[derive(Debug, Clone)] pub struct AgentProfileSettings { /// The name of the profile. diff --git a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs index 1ae1ab1f36..2eae1a4cc7 100644 --- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs +++ b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs @@ -1225,7 +1225,7 @@ fn wait_for_context_server( Err(Arc::from("Context server store was dropped")) } futures::future::Either::Right(_) => Err(Arc::from(format!( - "Timed out waiting for context server `{}` to start. Check the Zed log for details.", + "Timed out waiting for context server `{}` to start. Check the Gwen log for details.", context_server_id_for_timeout ))), } diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs index 4efc64b652..a46a38487c 100644 --- a/crates/agent_ui/src/agent_panel.rs +++ b/crates/agent_ui/src/agent_panel.rs @@ -5910,7 +5910,7 @@ impl AgentPanel { Some(ContextMenu::build(window, cx, |menu, _window, cx| { menu.context(focus_handle.clone()) .item( - ContextMenuEntry::new("Zed Agent") + ContextMenuEntry::new("Gwen Agent") .when( !showing_terminal && is_agent_selected(Agent::NativeAgent), |this| this.action(Box::new(NewThread)), diff --git a/crates/agent_ui/src/agent_ui.rs b/crates/agent_ui/src/agent_ui.rs index c9e823bd26..07ca394be7 100644 --- a/crates/agent_ui/src/agent_ui.rs +++ b/crates/agent_ui/src/agent_ui.rs @@ -322,7 +322,7 @@ actions!( ScrollOutputToNextMessage, /// Toggles in-thread search over the current agent thread's contents. ToggleSearch, - /// Import agent threads from other Zed release channels (e.g. Preview, Nightly). + /// Import agent threads from other Gwen release channels (e.g. Preview, Nightly). ImportThreadsFromOtherChannels, /// Starts a new terminal thread. NewTerminalThread, @@ -464,7 +464,7 @@ impl Agent { pub fn label(&self) -> SharedString { match self { - Self::NativeAgent => "Zed Agent".into(), + Self::NativeAgent => "Gwen Agent".into(), Self::Custom { id, .. } => id.0.clone(), #[cfg(any(test, feature = "test-support"))] Self::Stub => "Stub Agent".into(), diff --git a/crates/agent_ui/src/completion_provider.rs b/crates/agent_ui/src/completion_provider.rs index 6b6196c438..b121a6cf34 100644 --- a/crates/agent_ui/src/completion_provider.rs +++ b/crates/agent_ui/src/completion_provider.rs @@ -219,10 +219,10 @@ impl PromptLocalCommand { pub fn description(&self) -> &'static str { match self { Self::ThumbsUp => { - "Rate this response as helpful. Sends the current conversation to the Zed team." + "Rate this response as helpful. Sends the current conversation to the Gwen team." } Self::ThumbsDown => { - "Rate this response as not helpful. Sends the current conversation to the Zed team." + "Rate this response as not helpful. Sends the current conversation to the Gwen team." } } } diff --git a/crates/agent_ui/src/conversation_view/elicitation.rs b/crates/agent_ui/src/conversation_view/elicitation.rs index 872eafbb4e..22390545a6 100644 --- a/crates/agent_ui/src/conversation_view/elicitation.rs +++ b/crates/agent_ui/src/conversation_view/elicitation.rs @@ -1254,7 +1254,7 @@ fn render_form_preview( ) -> AnyElement { let request = acp::CreateElicitationRequest::new( acp::ElicitationFormMode::new(preview_request_scope(entry_ix), preview_form_schema()), - "Choose how Zed should connect to this account.", + "Choose how Gwen should connect to this account.", ); let mut form_state = matches!(status, ElicitationStatus::Pending { .. }).then(|| { let acp::ElicitationMode::Form(mode) = &request.mode else { @@ -1287,7 +1287,7 @@ fn render_url_preview( acp::ElicitationId::new(format!("preview-url-{entry_ix}")), preview_url(), ), - "Authorize Zed in your browser to finish signing in.", + "Authorize Gwen in your browser to finish signing in.", ); render_preview_card(entry_ix, request, status, None, cx) diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs index dea51ba96c..03ba8c0437 100644 --- a/crates/agent_ui/src/conversation_view/thread_view.rs +++ b/crates/agent_ui/src/conversation_view/thread_view.rs @@ -1867,7 +1867,7 @@ impl ThreadView { ThreadError::ZedPaymentRequired => ( "payment_required", None, - "You reached your free usage limit. Upgrade to Zed Pro for more prompts." + "You reached your free usage limit. Upgrade to Gwen Pro for more prompts." .into(), ), ThreadError::Refusal => { @@ -6868,7 +6868,7 @@ impl ThreadView { (self.is_subagent() && self.is_thread_feedback_enabled(cx)).then(|| { let feedback = self.thread_feedback.feedback; let tooltip_meta = - "Rating the thread sends all of your current conversation to the Zed team."; + "Rating the thread sends all of your current conversation to the Gwen team."; h_flex() .child( @@ -11116,7 +11116,7 @@ impl ThreadView { ThreadError::RateLimitExceeded { provider } => self.render_error_callout( "Rate Limit Reached", format!( - "{provider}'s rate limit was reached. Zed will retry automatically. \ + "{provider}'s rate limit was reached. Gwen will retry automatically. \ You can also wait a moment and try again." ) .into(), @@ -11127,7 +11127,7 @@ impl ThreadView { ThreadError::ServerOverloaded { provider } => self.render_error_callout( "Provider Unavailable", format!( - "{provider}'s servers are temporarily unavailable. Zed will retry \ + "{provider}'s servers are temporarily unavailable. Gwen will retry \ automatically. If the problem persists, check the provider's status page." ) .into(), @@ -11147,7 +11147,7 @@ impl ThreadView { ThreadError::StreamError { provider } => self.render_error_callout( "Connection Interrupted", format!( - "The connection to {provider}'s API was interrupted. Zed will retry \ + "The connection to {provider}'s API was interrupted. Gwen will retry \ automatically. If the problem persists, check your network connection." ) .into(), @@ -11196,7 +11196,7 @@ impl ThreadView { "API Error", format!( "{provider}'s API returned an unexpected error. \ - If the problem persists, try switching models or restarting Zed." + If the problem persists, try switching models or restarting Gwen." ) .into(), true, @@ -11247,7 +11247,7 @@ impl ThreadView { fn render_zed_payment_required_error(&self, cx: &mut Context) -> Callout { const ERROR_MESSAGE: &str = - "You reached your free usage limit. Upgrade to Zed Pro for more prompts."; + "You reached your free usage limit. Upgrade to Gwen Pro for more prompts."; Callout::new() .severity(Severity::Error) diff --git a/crates/agent_ui/src/draft_prompt_store.rs b/crates/agent_ui/src/draft_prompt_store.rs index ad053af534..a3fd897af8 100644 --- a/crates/agent_ui/src/draft_prompt_store.rs +++ b/crates/agent_ui/src/draft_prompt_store.rs @@ -172,7 +172,7 @@ pub fn empty_draft_placeholder_label( cx: &App, ) -> SharedString { let agent_name = if agent_id.as_ref() == ZED_AGENT_ID.as_ref() { - SharedString::from(ZED_AGENT_ID.to_string()) + crate::Agent::NativeAgent.label() } else { workspace .map(|ws| ws.read(cx).project().read(cx).agent_server_store().clone()) diff --git a/crates/agent_ui/src/thread_import.rs b/crates/agent_ui/src/thread_import.rs index ca601cc592..338eebaf66 100644 --- a/crates/agent_ui/src/thread_import.rs +++ b/crates/agent_ui/src/thread_import.rs @@ -572,7 +572,7 @@ impl Render for ThreadImportModal { ModalHeader::new() .headline("Import External Agent Threads") .description( - "Import threads from agents like Claude Agent, Codex, and more, whether started in Zed or another client. \ + "Import threads from agents like Claude Agent, Codex, and more, whether started in Gwen or another client. \ Choose which agents to include, and their threads will appear in your thread history." ) .show_dismiss_button(true), diff --git a/crates/agent_ui/src/thread_worktree_archive.rs b/crates/agent_ui/src/thread_worktree_archive.rs index a01895ae9b..0da076a325 100644 --- a/crates/agent_ui/src/thread_worktree_archive.rs +++ b/crates/agent_ui/src/thread_worktree_archive.rs @@ -275,7 +275,7 @@ async fn verify_created_by_zed(root: &RootPlan, cx: &mut AsyncApp) -> Result<()> .map_err(|_| anyhow!("worktree creation time check was canceled"))? .with_context(|| { format!( - "refusing to delete worktree at {}: failed to verify that Zed created it", + "refusing to delete worktree at {}: failed to verify that Gwen created it", root.root_path.display() ) })?; @@ -294,8 +294,8 @@ async fn verify_created_by_zed(root: &RootPlan, cx: &mut AsyncApp) -> Result<()> .await .log_err(); Err(anyhow!( - "refusing to delete worktree at {}: it is not the worktree Zed created \ - (it was likely removed and recreated outside Zed)", + "refusing to delete worktree at {}: it is not the worktree Gwen created \ + (it was likely removed and recreated outside Gwen)", root.root_path.display() )) } @@ -1620,7 +1620,7 @@ mod tests { .await .expect_err("remove_root should refuse to delete a recreated worktree"); assert!( - error.to_string().contains("not the worktree Zed created"), + error.to_string().contains("not the worktree Gwen created"), "unexpected error: {error:#}" ); diff --git a/crates/agent_ui/src/ui/end_trial_upsell.rs b/crates/agent_ui/src/ui/end_trial_upsell.rs index 2438a000e5..79dbcbd9b6 100644 --- a/crates/agent_ui/src/ui/end_trial_upsell.rs +++ b/crates/agent_ui/src/ui/end_trial_upsell.rs @@ -33,7 +33,7 @@ impl RenderOnce for EndTrialUpsell { ) .child(PlanDefinitions.pro_plan()) .child( - Button::new("cta-button", "Upgrade to Zed Pro") + Button::new("cta-button", "Upgrade to Gwen Pro") .full_width() .style(ButtonStyle::Tinted(ui::TintColor::Accent)) .on_click(move |_, _window, cx| { diff --git a/crates/ai_onboarding/src/plan_definitions.rs b/crates/ai_onboarding/src/plan_definitions.rs index 58c47a582b..a69863bb24 100644 --- a/crates/ai_onboarding/src/plan_definitions.rs +++ b/crates/ai_onboarding/src/plan_definitions.rs @@ -34,7 +34,7 @@ impl PlanDefinitions { pub fn pro_plan(&self) -> impl IntoElement { List::new() - .child(ListBulletItem::new("$5 of tokens in Zed agent")) + .child(ListBulletItem::new("$5 of tokens in Gwen agent")) .child(ListBulletItem::new("Usage-based billing beyond $5")) .child(ListBulletItem::new("Unlimited edit predictions")) } @@ -48,13 +48,13 @@ impl PlanDefinitions { pub fn vip_plan(&self) -> impl IntoElement { List::new() .child(ListBulletItem::new("Unlimited edit predictions")) - .child(ListBulletItem::new("Tokens in the Zed agent")) + .child(ListBulletItem::new("Tokens in the Gwen agent")) } pub fn student_plan(&self) -> impl IntoElement { List::new() .child(ListBulletItem::new("Unlimited edit predictions")) - .child(ListBulletItem::new("$10 of tokens in Zed agent")) + .child(ListBulletItem::new("$10 of tokens in Gwen agent")) .child(ListBulletItem::new( "Optional credit packs for additional usage", )) diff --git a/crates/cli/src/cli.rs b/crates/cli/src/cli.rs index d7ad0b347e..01c5be21be 100644 --- a/crates/cli/src/cli.rs +++ b/crates/cli/src/cli.rs @@ -27,7 +27,7 @@ pub enum OpenBehavior { /// Match broadly including subdirectories, and fall back to any existing /// window if no worktree matched. Corresponds to `zed -a`. Add, - /// Open directories as a new workspace in the current Zed window's sidebar. + /// Open directories as a new workspace in the current Gwen window's sidebar. /// Reuse existing windows for files in open worktrees. /// Corresponds to `zed -e`. ExistingWindow, @@ -46,7 +46,7 @@ pub enum OpenBehavior { #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] #[serde(rename_all = "snake_case")] pub enum CliBehaviorSetting { - /// Open directories as a new workspace in the current Zed window's sidebar. + /// Open directories as a new workspace in the current Gwen window's sidebar. ExistingWindow, /// Open paths in a new window unless they are subpaths of an existing project. NewWindow, diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index 941222825a..2cccf8d51e 100644 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -87,15 +87,15 @@ struct Args { classic: bool, /// Sets a custom directory for all user data (e.g., database, extensions, logs). /// This overrides the default platform-specific data directory location: - #[cfg_attr(target_os = "macos", doc = "`~/Library/Application Support/Zed`.")] - #[cfg_attr(target_os = "windows", doc = "`%LOCALAPPDATA%\\Zed`.")] + #[cfg_attr(target_os = "macos", doc = "`~/Library/Application Support/Gwen`.")] + #[cfg_attr(target_os = "windows", doc = "`%LOCALAPPDATA%\\Gwen`.")] #[cfg_attr( not(any(target_os = "windows", target_os = "macos")), - doc = "`$XDG_DATA_HOME/zed`." + doc = "`$XDG_DATA_HOME/gwen`." )] #[arg(long, value_name = "DIR", value_hint = clap::ValueHint::DirPath)] user_data_dir: Option, - /// The paths to open in Zed (space-separated). + /// The paths to open in Gwen (space-separated). /// /// Use `path:line:column` syntax to open a file at the given line and column. #[arg(trailing_var_arg = true, value_hint = clap::ValueHint::AnyPath)] @@ -103,13 +103,13 @@ struct Args { /// Print Gwen's version and the app path. #[arg(short, long)] version: bool, - /// Run zed in the foreground (useful for debugging) + /// Run gwen in the foreground (useful for debugging) #[arg(long)] foreground: bool, - /// Custom path to Zed.app or the zed binary + /// Custom path to Gwen.app or the gwen binary #[arg(long)] zed: Option, - /// Run zed in dev-server mode + /// Run gwen in dev-server mode #[arg(long)] dev_server_token: Option, /// The username and WSL distribution to use when opening paths. If not specified, @@ -138,7 +138,7 @@ struct Args { /// When directories are provided, recurses into them and shows all changed files in a single multi-diff view. #[arg(long, action = clap::ArgAction::Append, num_args = 2, value_names = ["OLD_PATH", "NEW_PATH"], value_hint = clap::ValueHint::AnyPath)] diff: Vec, - /// Generate shell completions for Zed + /// Generate shell completions for Gwen #[arg(long, value_names = ["SHELL"])] completions: Option, /// Uninstall Gwen from user system @@ -150,7 +150,7 @@ struct Args { uninstall: bool, /// Used for SSH/Git password authentication, to remove the need for netcat as a dependency, - /// by having Zed act like netcat communicating over a Unix socket. + /// by having Gwen act like netcat communicating over a Unix socket. #[arg(long, hide = true)] askpass: Option, } @@ -582,7 +582,7 @@ fn run() -> Result<()> { } let (server, server_name) = - IpcOneShotServer::::new().context("Handshake before Zed spawn")?; + IpcOneShotServer::::new().context("Handshake before Gwen spawn")?; let url = format!("zed-cli://{server_name}"); let open_behavior = if args.new { @@ -709,7 +709,7 @@ fn run() -> Result<()> { let exit_status = exit_status.clone(); let user_data_dir_for_thread = user_data_dir.clone(); move || { - let (_, handshake) = server.accept().context("Handshake after Zed spawn")?; + let (_, handshake) = server.accept().context("Handshake after Gwen spawn")?; let (tx, rx) = (handshake.requests, handshake.responses); #[cfg(target_os = "windows")] @@ -851,16 +851,16 @@ fn prompt_open_behavior() -> Option { let blue = console::Style::new().blue(); let items = [ format!( - "Add to existing Zed window ({})", - blue.apply_to("zed --existing") + "Add to existing Gwen window ({})", + blue.apply_to("gwen --existing") ), - format!("Open a new window ({})", blue.apply_to("zed --classic")), + format!("Open a new window ({})", blue.apply_to("gwen --classic")), ]; let prompt = format!( "Configure default behavior for {}\n{}", - blue.apply_to("zed "), - console::style("You can change this later in Zed settings"), + blue.apply_to("gwen "), + console::style("You can change this later in Gwen settings"), ); let selection = dialoguer::Select::new() @@ -1267,9 +1267,9 @@ mod windows { let cli = std::env::current_exe()?; let dir = cli.parent().context("no parent path for cli")?; - // ../Zed.exe is the standard, lib/zed is for MSYS2, ./zed.exe is for the target + // ../Gwen.exe is the standard, lib/zed is for MSYS2, ./gwen.exe is for the target // directory in development builds. - let possible_locations = ["../Zed.exe", "../lib/zed/zed-editor.exe", "./zed.exe"]; + let possible_locations = ["../Gwen.exe", "../lib/zed/zed-editor.exe", "./gwen.exe"]; possible_locations .iter() .find_map(|p| dir.join(p).canonicalize().ok().filter(|path| path != &cli)) @@ -1386,7 +1386,7 @@ mod mac_os { kCFStringEncodingUTF8, ptr::null(), )); - // equivalent to: open zed-cli:... -a /Applications/Zed\ Preview.app + // equivalent to: open zed-cli:... -a /Applications/Gwen\ Preview.app let urls_to_open = CFArray::from_copyable(&[url_to_open.as_concrete_TypeRef()]); LSOpenFromURLSpec( diff --git a/crates/collab_ui/src/notifications/incoming_call_notification.rs b/crates/collab_ui/src/notifications/incoming_call_notification.rs index 34e0b7716f..31ad8296ed 100644 --- a/crates/collab_ui/src/notifications/incoming_call_notification.rs +++ b/crates/collab_ui/src/notifications/incoming_call_notification.rs @@ -126,7 +126,7 @@ impl Render for IncomingCallNotification { }), ) .child(Label::new(format!( - "{} is sharing a project in Zed", + "{} is sharing a project in Gwen", self.state.call.calling_user.username ))), ) diff --git a/crates/copilot_ui/src/sign_in.rs b/crates/copilot_ui/src/sign_in.rs index 397835fafe..bb239ce57c 100644 --- a/crates/copilot_ui/src/sign_in.rs +++ b/crates/copilot_ui/src/sign_in.rs @@ -70,7 +70,7 @@ fn open_copilot_code_verification_window(copilot: &Entity, window: &Win is_resizable: false, is_movable: true, titlebar: Some(gpui::TitlebarOptions { - title: Some("Use GitHub Copilot in Zed".into()), + title: Some("Use GitHub Copilot in Gwen".into()), appears_transparent: true, ..Default::default() }), @@ -996,7 +996,7 @@ impl ConfigurationView { } fn render_for_chat(&self) -> impl IntoElement { - let start_label = "To use Zed's agent with GitHub Copilot Chat, you need to be logged in to GitHub. Note that your GitHub account must have an active Copilot Chat subscription."; + let start_label = "To use Gwen's agent with GitHub Copilot Chat, you need to be logged in to GitHub. Note that your GitHub account must have an active Copilot Chat subscription."; let no_status_label = "Copilot Chat requires an active GitHub Copilot subscription. Please ensure Copilot Chat is configured and try again, or use a different LLM provider."; let (label, button) = if let Some(msg) = self.loading_message() { diff --git a/crates/edit_prediction/src/edit_prediction.rs b/crates/edit_prediction/src/edit_prediction.rs index 650bc9173a..de38e58600 100644 --- a/crates/edit_prediction/src/edit_prediction.rs +++ b/crates/edit_prediction/src/edit_prediction.rs @@ -3476,7 +3476,7 @@ fn merge_anchor_ranges( #[derive(Error, Debug)] #[error( - "You must update to Zed version {minimum_version} or higher to continue using edit predictions." + "You must update to Gwen version {minimum_version} or higher to continue using edit predictions." )] pub struct ZedUpdateRequiredError { minimum_version: Version, diff --git a/crates/edit_prediction/src/zed_edit_prediction_delegate.rs b/crates/edit_prediction/src/zed_edit_prediction_delegate.rs index 9984a8255b..4d777f3549 100644 --- a/crates/edit_prediction/src/zed_edit_prediction_delegate.rs +++ b/crates/edit_prediction/src/zed_edit_prediction_delegate.rs @@ -53,7 +53,7 @@ impl EditPredictionDelegate for ZedEditPredictionDelegate { } fn display_name() -> &'static str { - "Zed's Edit Predictions" + "Gwen's Edit Predictions" } fn show_predictions_in_menu() -> bool { diff --git a/crates/edit_prediction/src/zeta.rs b/crates/edit_prediction/src/zeta.rs index 78dcd9eb60..b43dc7b972 100644 --- a/crates/edit_prediction/src/zeta.rs +++ b/crates/edit_prediction/src/zeta.rs @@ -672,7 +672,7 @@ fn handle_api_response( ErrorSeverity::Critical } fn primary_action(&self) -> ErrorAction { - ErrorAction::link("Update Zed", "https://zed.dev/releases") + ErrorAction::link("Update Gwen", "https://zed.dev/releases") } } diff --git a/crates/edit_prediction_ui/src/edit_prediction_button.rs b/crates/edit_prediction_ui/src/edit_prediction_button.rs index 6a5cc13b8c..ec16397b90 100644 --- a/crates/edit_prediction_ui/src/edit_prediction_button.rs +++ b/crates/edit_prediction_ui/src/edit_prediction_button.rs @@ -1248,7 +1248,7 @@ impl EditPredictionButton { }, |_window, cx| cx.open_url(&zed_urls::account_url(cx)), ) - .entry("Upgrade to Zed Pro or contact us.", None, |_window, cx| { + .entry("Upgrade to Gwen Pro or contact us.", None, |_window, cx| { telemetry::event!( "Edit Prediction Menu Action", action = "upsell_clicked", diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs index 2ad7d780c0..fd75c3f05e 100644 --- a/crates/editor/src/editor.rs +++ b/crates/editor/src/editor.rs @@ -2977,7 +2977,7 @@ impl Editor { cx, |e, _, _| match e.error_code() { ErrorCode::RemoteUpgradeRequired => Some(format!( - "The remote instance of Zed does not support this yet. It must be upgraded to {}", + "The remote instance of Gwen does not support this yet. It must be upgraded to {}", e.error_tag("required").unwrap_or("the latest version") )), _ => None, @@ -3063,7 +3063,7 @@ impl Editor { .detach_and_prompt_err("Failed to create buffer", window, cx, |e, _, _| { match e.error_code() { ErrorCode::RemoteUpgradeRequired => Some(format!( - "The remote instance of Zed does not support this yet. It must be upgraded to {}", + "The remote instance of Gwen does not support this yet. It must be upgraded to {}", e.error_tag("required").unwrap_or("the latest version") )), _ => None, @@ -8966,7 +8966,7 @@ impl Editor { cx: &mut Context, ) -> Entity { const MINIMAP_FONT_WEIGHT: gpui::FontWeight = gpui::FontWeight::BLACK; - const MINIMAP_FONT_FAMILY: SharedString = SharedString::new_static(".ZedMono"); + const MINIMAP_FONT_FAMILY: SharedString = SharedString::new_static(".GwenMono"); let mut minimap = Editor::new_internal( EditorMode::Minimap { diff --git a/crates/editor/src/test.rs b/crates/editor/src/test.rs index cda783fbfb..208ef820dd 100644 --- a/crates/editor/src/test.rs +++ b/crates/editor/src/test.rs @@ -51,7 +51,7 @@ pub fn marked_display_snapshot( let (unmarked_text, markers) = marked_text_offsets(text); let font = Font { - family: ".ZedMono".into(), + family: ".GwenMono".into(), features: FontFeatures::default(), fallbacks: None, weight: FontWeight::default(), diff --git a/crates/extension/src/extension_manifest.rs b/crates/extension/src/extension_manifest.rs index 5ec589d718..b7d2015283 100644 --- a/crates/extension/src/extension_manifest.rs +++ b/crates/extension/src/extension_manifest.rs @@ -254,7 +254,7 @@ pub struct AgentServerManifestEntry { /// ``` /// /// For Node.js-based agents, you can use "node" as the cmd to automatically - /// use Zed's managed Node.js runtime instead of relying on the user's PATH: + /// use Gwen's managed Node.js runtime instead of relying on the user's PATH: /// ```toml /// [agent_servers.nodeagent.targets.darwin-aarch64] /// archive = "https://example.com/nodeagent.zip" diff --git a/crates/extension_cli/src/main.rs b/crates/extension_cli/src/main.rs index d9c823e370..fd0ea1bb84 100644 --- a/crates/extension_cli/src/main.rs +++ b/crates/extension_cli/src/main.rs @@ -95,7 +95,7 @@ async fn main() -> Result<()> { log::info!("compiling extension"); let user_agent = format!( - "Zed Extension CLI/{} ({}; {})", + "Gwen Extension CLI/{} ({}; {})", env!("CARGO_PKG_VERSION"), std::env::consts::OS, std::env::consts::ARCH @@ -599,7 +599,7 @@ fn test_languages( let query_source = fs::read_to_string(&file_path)?; let _query = Query::new(grammar, &query_source)?; } else if file_name.ends_with(".scm") { - bail!("query {file_name} is not supported by Zed and should be removed") + bail!("query {file_name} is not supported by Gwen and should be removed") } else if !context.is_known_resource(&file_path) { bail!( "'{file_name}' is not a supported file in a language directory and should be removed" diff --git a/crates/feedback/src/feedback.rs b/crates/feedback/src/feedback.rs index 16c91ce769..251021fcee 100644 --- a/crates/feedback/src/feedback.rs +++ b/crates/feedback/src/feedback.rs @@ -9,21 +9,21 @@ use zed_actions::feedback::{EmailZed, FileBugReport, RequestFeature}; actions!( zed, [ - /// Opens the Zed repository on GitHub. + /// Opens the Gwen repository on GitHub. OpenZedRepo, /// Copies installed extensions to the clipboard for bug reports. CopyInstalledExtensionsIntoClipboard ] ); -const ZED_REPO_URL: &str = "https://github.com/zed-industries/zed"; +const ZED_REPO_URL: &str = "https://github.com/kk376/zed"; -const REQUEST_FEATURE_URL: &str = "https://github.com/zed-industries/zed/discussions/new/choose"; +const REQUEST_FEATURE_URL: &str = "https://github.com/kk376/zed/discussions/new/choose"; fn file_bug_report_url(specs: &SystemSpecs) -> String { format!( concat!( - "https://github.com/zed-industries/zed/issues/new", + "https://github.com/kk376/zed/issues/new", "?", "template=10_bug_report.yml", "&", @@ -35,7 +35,7 @@ fn file_bug_report_url(specs: &SystemSpecs) -> String { fn email_zed_url(specs: &SystemSpecs) -> String { format!( - concat!("mailto:hi@zed.dev", "?", "body={}"), + concat!("mailto:yenru@yrkaierx.com", "?", "body={}"), email_body(specs) ) } diff --git a/crates/gpui/examples/text.rs b/crates/gpui/examples/text.rs index 7fa2a15760..a53a690426 100644 --- a/crates/gpui/examples/text.rs +++ b/crates/gpui/examples/text.rs @@ -270,7 +270,7 @@ impl TextExample { } const FONT_FAMILIES: [&str; 5] = [ - ".ZedMono", + ".GwenMono", ".SystemUIFont", "Menlo", "Monaco", @@ -405,7 +405,7 @@ fn run_example() { |_window, cx| { cx.new(|_cx| TextExample { next_id: 0, - font_family: ".ZedMono".into(), + font_family: ".GwenMono".into(), }) }, ) diff --git a/crates/gpui/src/text_system.rs b/crates/gpui/src/text_system.rs index cf6bb10293..5c2e61ba7a 100644 --- a/crates/gpui/src/text_system.rs +++ b/crates/gpui/src/text_system.rs @@ -254,8 +254,8 @@ impl TextSystem { font_runs_pool: Mutex::default(), fallback_font_stack: smallvec![ // TODO: Remove this when Linux have implemented setting fallbacks. - font(".ZedMono"), - font(".ZedSans"), + font(".GwenMono"), + font(".GwenSans"), font("Helvetica"), font("Segoe UI"), // Windows font("Ubuntu"), // Gnome (Ubuntu) @@ -1418,13 +1418,14 @@ impl FontMetrics { /// Maps well-known virtual font names to their concrete equivalents. #[allow(unused)] pub fn font_name_with_fallbacks<'a>(name: &'a str, system: &'a str) -> &'a str { - // Note: the "Zed Plex" fonts were deprecated as we are not allowed to use "Plex" - // in a derived font name. They are essentially indistinguishable from IBM Plex/Lilex, - // and so retained here for backward compatibility. + // Note: ".ZedSans"/".ZedMono" are the legacy virtual font names, and the + // "Zed Plex" fonts were deprecated as we are not allowed to use "Plex" + // in a derived font name. They are essentially indistinguishable from + // IBM Plex/Lilex, and so retained here for backward compatibility. match name { ".SystemUIFont" => system, - ".ZedSans" | "Zed Plex Sans" => "IBM Plex Sans", - ".ZedMono" | "Zed Plex Mono" => "Lilex", + ".GwenSans" | ".ZedSans" | "Zed Plex Sans" => "IBM Plex Sans", + ".GwenMono" | ".ZedMono" | "Zed Plex Mono" => "Lilex", _ => name, } } @@ -1435,13 +1436,14 @@ pub fn font_name_with_fallbacks_shared<'a>( name: &'a SharedString, system: &'a SharedString, ) -> &'a SharedString { - // Note: the "Zed Plex" fonts were deprecated as we are not allowed to use "Plex" - // in a derived font name. They are essentially indistinguishable from IBM Plex/Lilex, - // and so retained here for backward compatibility. + // Note: ".ZedSans"/".ZedMono" are the legacy virtual font names, and the + // "Zed Plex" fonts were deprecated as we are not allowed to use "Plex" + // in a derived font name. They are essentially indistinguishable from + // IBM Plex/Lilex, and so retained here for backward compatibility. match name.as_str() { ".SystemUIFont" => system, - ".ZedSans" | "Zed Plex Sans" => const { &SharedString::new_static("IBM Plex Sans") }, - ".ZedMono" | "Zed Plex Mono" => const { &SharedString::new_static("Lilex") }, + ".GwenSans" | ".ZedSans" | "Zed Plex Sans" => const { &SharedString::new_static("IBM Plex Sans") }, + ".GwenMono" | ".ZedMono" | "Zed Plex Mono" => const { &SharedString::new_static("Lilex") }, _ => name, } } diff --git a/crates/gpui/src/text_system/line.rs b/crates/gpui/src/text_system/line.rs index 780d1a6422..45861063d3 100644 --- a/crates/gpui/src/text_system/line.rs +++ b/crates/gpui/src/text_system/line.rs @@ -1575,7 +1575,7 @@ mod tests { px(16.), &[TextRun { len: text.len(), - font: font(".ZedMono"), + font: font(".GwenMono"), color: black(), ..TextRun::default() }], diff --git a/crates/gpui/src/text_system/line_wrapper.rs b/crates/gpui/src/text_system/line_wrapper.rs index 678e9e0f18..81d1c170d8 100644 --- a/crates/gpui/src/text_system/line_wrapper.rs +++ b/crates/gpui/src/text_system/line_wrapper.rs @@ -694,7 +694,7 @@ mod tests { fn build_wrapper() -> LineWrapper { let dispatcher = TestDispatcher::new(0); let cx = TestAppContext::build(dispatcher, None); - let id = cx.text_system().resolve_font(&font(".ZedMono")); + let id = cx.text_system().resolve_font(&font(".GwenMono")); LineWrapper::new(id, px(16.), cx.text_system().clone()) } @@ -1267,7 +1267,7 @@ mod tests { fn test_multiline_truncation_fits_within_wrapped_lines() { let mut wrapper = build_wrapper(); - // With .ZedMono at 16px, each char is 9.6px wide. + // With .GwenMono at 16px, each char is 9.6px wide. // wrap_width = 72px fits ~7 chars per line. // // "aa bbbbbb cccccc dddddd eeee ffff" with wrap_width=72px wraps as: diff --git a/crates/keymap_editor/src/keymap_editor.rs b/crates/keymap_editor/src/keymap_editor.rs index bc27d0b13b..29e2a4df1f 100644 --- a/crates/keymap_editor/src/keymap_editor.rs +++ b/crates/keymap_editor/src/keymap_editor.rs @@ -3603,7 +3603,7 @@ async fn load_keybind_context_language( language.unwrap_or_else(|| { Arc::new(Language::new( LanguageConfig { - name: "Zed Keybind Context".into(), + name: "Gwen Keybind Context".into(), ..Default::default() }, Some(tree_sitter_rust::LANGUAGE.into()), diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs index 3cd3eac021..ed2222185e 100644 --- a/crates/language/src/language_settings.rs +++ b/crates/language/src/language_settings.rs @@ -90,7 +90,7 @@ pub struct LanguageSettings { pub line_ending: LineEndingSetting, /// How to perform a buffer format. pub formatter: settings::FormatterList, - /// Zed's Prettier integration settings. + /// Gwen's Prettier integration settings. pub prettier: PrettierSettings, /// Whether to automatically close JSX tags. pub jsx_tag_auto_close: bool, @@ -256,13 +256,13 @@ pub struct LanguageTaskSettings { /// Extra task variables to set for a particular language. pub variables: HashMap, pub enabled: bool, - /// Use LSP tasks over Zed language extension ones. + /// Use LSP tasks over Gwen language extension ones. /// If no LSP tasks are returned due to error/timeout or regular execution, - /// Zed language extension tasks will be used instead. + /// Gwen language extension tasks will be used instead. /// - /// Other Zed tasks will still be shown: - /// * Zed task from either of the task config file - /// * Zed task from history (e.g. one-off task was spawned before) + /// Other Gwen tasks will still be shown: + /// * Gwen task from either of the task config file + /// * Gwen task from history (e.g. one-off task was spawned before) pub prefer_lsp: bool, } @@ -499,7 +499,7 @@ pub struct EditPredictionSettings { pub provider: settings::EditPredictionProvider, /// Disable edit predictions for files matching these glob patterns. /// - /// Use `"..."` to add patterns without repeating Zed's defaults. In project + /// Use `"..."` to add patterns without repeating Gwen's defaults. In project /// settings, it extends the user or parent configuration value. Omit /// `"..."` to replace the inherited list. /// @@ -530,7 +530,7 @@ pub struct EditPredictionSettings { pub ollama: Option, /// Settings specific to using custom OpenAI-compatible servers for edit prediction. pub open_ai_compatible_api: Option, - /// Settings specific to Zed's Edit Predictions provider. + /// Settings specific to Gwen's Edit Predictions provider. pub zed: ZedEditPredictionSettings, /// Settings specific to the Mercury Edit Predictions provider. pub mercury: MercuryEditPredictionSettings, diff --git a/crates/language_model_core/src/provider.rs b/crates/language_model_core/src/provider.rs index 317a0ab280..bd0a95cba8 100644 --- a/crates/language_model_core/src/provider.rs +++ b/crates/language_model_core/src/provider.rs @@ -18,7 +18,7 @@ pub const X_AI_PROVIDER_NAME: LanguageModelProviderName = LanguageModelProviderN pub const ZED_CLOUD_PROVIDER_ID: LanguageModelProviderId = LanguageModelProviderId::new("zed.dev"); pub const ZED_CLOUD_PROVIDER_NAME: LanguageModelProviderName = - LanguageModelProviderName::new("Zed"); + LanguageModelProviderName::new("Gwen"); pub fn provider_name_for_id(provider_id: &LanguageModelProviderId) -> LanguageModelProviderName { if provider_id == &OPEN_AI_PROVIDER_ID { diff --git a/crates/language_models/src/provider.rs b/crates/language_models/src/provider.rs index 0e520c3691..09436fd710 100644 --- a/crates/language_models/src/provider.rs +++ b/crates/language_models/src/provider.rs @@ -43,7 +43,7 @@ pub(crate) fn resolve_custom_headers( .any(|reserved| reserved.eq_ignore_ascii_case(name)) { log::warn!( - "ignoring custom {provider_name} header `{name}`: managed by Zed and cannot be overridden" + "ignoring custom {provider_name} header `{name}`: managed by Gwen and cannot be overridden" ); return None; } diff --git a/crates/language_models/src/provider/anthropic.rs b/crates/language_models/src/provider/anthropic.rs index e8d380b00f..d542e28afc 100644 --- a/crates/language_models/src/provider/anthropic.rs +++ b/crates/language_models/src/provider/anthropic.rs @@ -29,7 +29,7 @@ const PROVIDER_NAME: LanguageModelProviderName = ANTHROPIC_PROVIDER_NAME; #[derive(Default, Clone, Debug, PartialEq)] pub struct AnthropicSettings { pub api_url: String, - /// Extend Zed's list of Anthropic models. + /// Extend Gwen's list of Anthropic models. pub available_models: Vec, /// User-configured headers added to every Anthropic request. pub custom_headers: CustomHeaders, diff --git a/crates/language_models/src/provider/api_compatible.rs b/crates/language_models/src/provider/api_compatible.rs index f8b4e731c8..14d482b7b3 100644 --- a/crates/language_models/src/provider/api_compatible.rs +++ b/crates/language_models/src/provider/api_compatible.rs @@ -211,7 +211,7 @@ impl Render for ApiCompatibleProviderConfigura v_flex() .on_action(cx.listener(Self::save_api_key)) .child(Label::new(format!( - "To use Zed's agent with an {provider_name}-compatible provider, you need to add an API key." + "To use Gwen's agent with an {provider_name}-compatible provider, you need to add an API key." ))) .child( div() @@ -220,7 +220,7 @@ impl Render for ApiCompatibleProviderConfigura ) .child( Label::new(format!( - "You can also set the {env_var_name} environment variable and restart Zed.", + "You can also set the {env_var_name} environment variable and restart Gwen.", )) .size(LabelSize::Small) .color(Color::Muted), diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rs index 092dcd1ae1..5970b8bc58 100644 --- a/crates/language_models/src/provider/bedrock.rs +++ b/crates/language_models/src/provider/bedrock.rs @@ -707,7 +707,7 @@ impl LanguageModelProvider for BedrockLanguageModelProvider { .into() }) .description(InlineDescription::Text( - "To use Zed's agent with Bedrock, set a custom authentication strategy in your settings or use static credentials. Mantle-only models (e.g. GPT-5.5, GPT-5.4, Grok 4.3) additionally require IAM permissions for the `bedrock-mantle` endpoint.".into(), + "To use Gwen's agent with Bedrock, set a custom authentication strategy in your settings or use static credentials. Mantle-only models (e.g. GPT-5.5, GPT-5.4, Grok 4.3) additionally require IAM permissions for the `bedrock-mantle` endpoint.".into(), )), )) } @@ -2777,7 +2777,7 @@ impl Render for ConfigurationView { .child(Headline::new("Amazon Bedrock").size(HeadlineSize::Small)) .child( Label::new( - "To use Zed's agent with Bedrock, you can set a custom authentication strategy through your settings file or use static credentials.", + "To use Gwen's agent with Bedrock, you can set a custom authentication strategy through your settings file or use static credentials.", ) .color(Color::Muted), ) @@ -2885,7 +2885,7 @@ impl ConfigurationView { ) .child( Label::new(format!( - "You can also set the {}, {} and {} environment variables (or {} for Bedrock API Key authentication) and restart Zed.", + "You can also set the {}, {} and {} environment variables (or {} for Bedrock API Key authentication) and restart Gwen.", ZED_BEDROCK_ACCESS_KEY_ID_VAR.name, ZED_BEDROCK_SECRET_ACCESS_KEY_VAR.name, ZED_BEDROCK_REGION_VAR.name, diff --git a/crates/language_models/src/provider/cloud.rs b/crates/language_models/src/provider/cloud.rs index a577d8b43a..78afd0842c 100644 --- a/crates/language_models/src/provider/cloud.rs +++ b/crates/language_models/src/provider/cloud.rs @@ -405,21 +405,21 @@ impl LanguageModelProvider for CloudLanguageModelProvider { } fn authentication_error_message(&self) -> SharedString { - "Failed to sign in with your Zed account (401).".into() + "Failed to sign in with your Gwen account (401).".into() } fn missing_credentials_error_message(&self) -> SharedString { - "You are not signed in to your Zed account. \ + "You are not signed in to your Gwen account. \ Sign in to continue." .into() } fn fast_mode_confirmation(&self, _cx: &App) -> Option { Some(FastModeConfirmation { - title: "Enable Fast Mode for Zed?".into(), + title: "Enable Fast Mode for Gwen?".into(), message: "Fast mode routes requests through the upstream provider's fast mode or priority tier. The \ upstream provider's premium per-token pricing applies and is passed through to \ - your Zed billing." + your Gwen billing." .into(), }) } @@ -461,34 +461,34 @@ fn zed_ai_description( eligible_for_trial: bool, ) -> &'static str { if !is_connected { - return "Sign in to have access to Zed's complete agentic experience with hosted models."; + return "Sign in to have access to Gwen's complete agentic experience with hosted models."; } match plan { Some(Plan::ZedPro) => { - "You have access to Zed's hosted models through your Pro subscription." + "You have access to Gwen's hosted models through your Pro subscription." } Some(Plan::ZedProTrial) => { "Your Pro trial includes $5 of GPT Luna and unlimited edit predictions for 14 days from trial start." } Some(Plan::ZedStudent) => { - "You have access to Zed's hosted models through your Student subscription." + "You have access to Gwen's hosted models through your Student subscription." } Some(Plan::ZedBusiness) => { if is_zed_model_provider_enabled { - "You have access to Zed's hosted models through your organization." + "You have access to Gwen's hosted models through your organization." } else { - "Zed's hosted models are disabled by your organization's configuration." + "Gwen's hosted models are disabled by your organization's configuration." } } Some(Plan::ZedVip) => { - "You have access to Zed's hosted models through your VIP subscription." + "You have access to Gwen's hosted models through your VIP subscription." } Some(Plan::ZedFree) | None => { if eligible_for_trial { "Start a free trial with $5 of GPT Luna and unlimited edit predictions for 14 days from trial start." } else { - "Subscribe for access to Zed's hosted models." + "Subscribe for access to Gwen's hosted models." } } } @@ -542,7 +542,7 @@ impl RenderOnce for ZedAiConfiguration { .gap_2() .when(!self.compact, |this| this.child(Label::new(description))) .child( - Button::new("sign_in", "Sign In to use Zed AI") + Button::new("sign_in", "Sign In to use Gwen AI") .start_icon( Icon::new(IconName::Github) .size(IconSize::Small) @@ -960,9 +960,9 @@ impl Component for ZedAiConfiguration { } fn description() -> &'static str { - "The configuration surface for Zed's hosted AI models, \ + "The configuration surface for Gwen's hosted AI models, \ showing the user's connection status, current plan, trial eligibility, \ - and entry points for enabling the Zed model provider." + and entry points for enabling the Gwen model provider." } fn preview(_window: &mut Window, _cx: &mut App) -> AnyElement { @@ -1036,7 +1036,7 @@ impl Component for ZedAiConfiguration { }), ), single_example( - "Zed Pro Trial Plan", + "Gwen Pro Trial Plan", configuration(PreviewConfiguration { plan: Some(Plan::ZedProTrial), is_connected: true, @@ -1045,7 +1045,7 @@ impl Component for ZedAiConfiguration { }), ), single_example( - "Zed Pro Plan", + "Gwen Pro Plan", configuration(PreviewConfiguration { plan: Some(Plan::ZedPro), is_connected: true, @@ -1054,7 +1054,7 @@ impl Component for ZedAiConfiguration { }), ), single_example( - "Business Plan - Zed models enabled", + "Business Plan - Gwen models enabled", configuration(PreviewConfiguration { plan: Some(Plan::ZedBusiness), is_connected: true, @@ -1063,7 +1063,7 @@ impl Component for ZedAiConfiguration { }), ), single_example( - "Business Plan - Zed models disabled", + "Business Plan - Gwen models disabled", configuration(PreviewConfiguration { plan: Some(Plan::ZedBusiness), is_connected: true, diff --git a/crates/language_models/src/provider/llama_cpp.rs b/crates/language_models/src/provider/llama_cpp.rs index c21494ffc4..b1bee16ddf 100644 --- a/crates/language_models/src/provider/llama_cpp.rs +++ b/crates/language_models/src/provider/llama_cpp.rs @@ -1234,7 +1234,7 @@ impl ConfigurationView { ) .child( ListBulletItem::new( - "Click 'Connect' below to start using llama.cpp in Zed", + "Click 'Connect' below to start using llama.cpp in Gwen", ) .label_color(Color::Muted), ), @@ -1278,7 +1278,7 @@ impl ConfigurationView { .mb_2() .child( Label::new(format!( - "You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed." + "You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Gwen." )) .size(LabelSize::Small) .color(Color::Muted), diff --git a/crates/language_models/src/provider/lmstudio.rs b/crates/language_models/src/provider/lmstudio.rs index 310932cfc4..eba28da784 100644 --- a/crates/language_models/src/provider/lmstudio.rs +++ b/crates/language_models/src/provider/lmstudio.rs @@ -770,7 +770,7 @@ impl ConfigurationView { .mb_2() .child( Label::new(format!( - "You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed." + "You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Gwen." )) .size(LabelSize::Small) .color(Color::Muted), diff --git a/crates/language_models/src/provider/mistral.rs b/crates/language_models/src/provider/mistral.rs index 78841f097c..10f1b78f9c 100644 --- a/crates/language_models/src/provider/mistral.rs +++ b/crates/language_models/src/provider/mistral.rs @@ -414,7 +414,7 @@ pub fn into_mistral( text_parts.push(text.to_string()); } LanguageModelToolResultContent::Image(_) => { - text_parts.push("[Tool responded with an image, but Zed doesn't support these in Mistral models yet]".to_string()); + text_parts.push("[Tool responded with an image, but Gwen doesn't support these in Mistral models yet]".to_string()); } } } diff --git a/crates/language_models/src/provider/ollama.rs b/crates/language_models/src/provider/ollama.rs index 5372a9c1a7..b2f89c781d 100644 --- a/crates/language_models/src/provider/ollama.rs +++ b/crates/language_models/src/provider/ollama.rs @@ -887,7 +887,7 @@ impl ConfigurationView { .child(Label::new("ollama run gpt-oss:20b").inline_code(cx)), ) .child( - ListBulletItem::new("Click 'Connect' below to start using Ollama in Zed") + ListBulletItem::new("Click 'Connect' below to start using Ollama in Gwen") .label_color(Color::Muted), ), ) diff --git a/crates/language_models/src/provider/openai_subscribed.rs b/crates/language_models/src/provider/openai_subscribed.rs index bac7831a6d..e0d65b9bdb 100644 --- a/crates/language_models/src/provider/openai_subscribed.rs +++ b/crates/language_models/src/provider/openai_subscribed.rs @@ -13,7 +13,7 @@ use std::sync::Arc; use ui::{ConfiguredApiCard, prelude::*}; const SUBSCRIPTION_DESCRIPTION: &str = - "Sign in with your ChatGPT Plus or Pro subscription to use OpenAI models in Zed's agent."; + "Sign in with your ChatGPT Plus or Pro subscription to use OpenAI models in Gwen's agent."; pub struct OpenAiSubscribedProvider { state: Entity, diff --git a/crates/language_models/src/provider/opencode.rs b/crates/language_models/src/provider/opencode.rs index 94b0244101..088ae49ab1 100644 --- a/crates/language_models/src/provider/opencode.rs +++ b/crates/language_models/src/provider/opencode.rs @@ -302,7 +302,7 @@ impl LanguageModelProvider for OpenCodeLanguageModelProvider { .into() }) .description(InlineDescription::Text( - "To use OpenCode models in Zed, you need an API key.".into(), + "To use OpenCode models in Gwen, you need an API key.".into(), )), )) } @@ -907,7 +907,7 @@ impl Render for ConfigurationView { let api_key_section = v_flex() .on_action(cx.listener(Self::save_api_key)) .child(Label::new( - "To use OpenCode models in Zed, you need an API key:", + "To use OpenCode models in Gwen, you need an API key:", ).color(Color::Muted)) .child( List::new() @@ -928,7 +928,7 @@ impl Render for ConfigurationView { .child(api_key_control) .child( Label::new(format!( - "You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Zed." + "You can also set the {API_KEY_ENV_VAR_NAME} environment variable and restart Gwen." )) .size(LabelSize::Small) .color(Color::Muted).mt_1p5(), diff --git a/crates/language_models/src/provider/vercel_ai_gateway.rs b/crates/language_models/src/provider/vercel_ai_gateway.rs index b22c7d3b4a..57d4ef736c 100644 --- a/crates/language_models/src/provider/vercel_ai_gateway.rs +++ b/crates/language_models/src/provider/vercel_ai_gateway.rs @@ -360,7 +360,7 @@ fn clean_error_message(message: &str) -> String { let lower = message.to_lowercase(); if lower.contains("vercel_oidc_token") && lower.contains("oidc token") { - return "Authentication failed for Vercel AI Gateway. Use a Vercel AI Gateway key (vck_...).\nCreate or manage keys in Vercel AI Gateway console.\nIf this persists, regenerate the key and update it in Vercel AI Gateway provider settings in Zed.".to_string(); + return "Authentication failed for Vercel AI Gateway. Use a Vercel AI Gateway key (vck_...).\nCreate or manage keys in Vercel AI Gateway console.\nIf this persists, regenerate the key and update it in Vercel AI Gateway provider settings in Gwen.".to_string(); } if lower.contains("invalid api key") || lower.contains("invalid_api_key") { diff --git a/crates/language_models/src/provider/x_ai_subscribed.rs b/crates/language_models/src/provider/x_ai_subscribed.rs index 5d60000d2c..19aeb1e500 100644 --- a/crates/language_models/src/provider/x_ai_subscribed.rs +++ b/crates/language_models/src/provider/x_ai_subscribed.rs @@ -13,7 +13,7 @@ use ui::{ConfiguredApiCard, prelude::*}; use x_ai_subscribed::{PROVIDER_ID, PROVIDER_NAME, State, SuperGrokModel, create_language_model}; const SUBSCRIPTION_DESCRIPTION: &str = - "Sign in with your SuperGrok subscription to use Grok models in Zed's agent."; + "Sign in with your SuperGrok subscription to use Grok models in Gwen's agent."; pub struct XAiSubscribedProvider { state: Entity, diff --git a/crates/markdown/examples/markdown.rs b/crates/markdown/examples/markdown.rs index 26c45377c7..e4d5787547 100644 --- a/crates/markdown/examples/markdown.rs +++ b/crates/markdown/examples/markdown.rs @@ -74,16 +74,16 @@ impl Render for MarkdownExample { fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { let markdown_style = MarkdownStyle { base_text_style: gpui::TextStyle { - font_family: ".ZedSans".into(), + font_family: ".GwenSans".into(), color: cx.theme().colors().terminal_ansi_black, ..Default::default() }, code_block: StyleRefinement::default() - .font_family(".ZedMono") + .font_family(".GwenMono") .m(rems(1.)) .bg(rgb(0xAAAAAAA)), inline_code: gpui::TextStyleRefinement { - font_family: Some(".ZedMono".into()), + font_family: Some(".GwenMono".into()), color: Some(cx.theme().colors().editor_foreground), background_color: Some(cx.theme().colors().editor_background), ..Default::default() diff --git a/crates/markdown/examples/markdown_as_child.rs b/crates/markdown/examples/markdown_as_child.rs index 38a4d2795f..9093f3c95b 100644 --- a/crates/markdown/examples/markdown_as_child.rs +++ b/crates/markdown/examples/markdown_as_child.rs @@ -49,13 +49,13 @@ impl Render for HelloWorld { fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { let markdown_style = MarkdownStyle { base_text_style: gpui::TextStyle { - font_family: "Zed Mono".into(), + font_family: "Gwen Mono".into(), color: cx.theme().colors().text, ..Default::default() }, code_block: StyleRefinement { text: gpui::TextStyleRefinement { - font_family: Some("Zed Mono".into()), + font_family: Some("Gwen Mono".into()), background_color: Some(cx.theme().colors().editor_background), ..Default::default() }, @@ -68,7 +68,7 @@ impl Render for HelloWorld { ..Default::default() }, inline_code: gpui::TextStyleRefinement { - font_family: Some("Zed Mono".into()), + font_family: Some("Gwen Mono".into()), background_color: Some(cx.theme().colors().editor_background), ..Default::default() }, diff --git a/crates/markdown/src/mermaid.rs b/crates/markdown/src/mermaid.rs index 0d4bc76108..9964407e1e 100644 --- a/crates/markdown/src/mermaid.rs +++ b/crates/markdown/src/mermaid.rs @@ -1095,7 +1095,11 @@ mod tests { } #[test] - fn test_mermaid_font_family_resolves_zed_virtual_fonts() { + fn test_mermaid_font_family_resolves_virtual_fonts() { + assert_eq!( + super::mermaid_font_family(".GwenSans"), + "IBM Plex Sans, sans-serif" + ); assert_eq!( super::mermaid_font_family(".ZedSans"), "IBM Plex Sans, sans-serif" @@ -1104,6 +1108,7 @@ mod tests { super::mermaid_font_family("Zed Plex Sans"), "IBM Plex Sans, sans-serif" ); + assert_eq!(super::mermaid_font_family(".GwenMono"), "Lilex, sans-serif"); assert_eq!(super::mermaid_font_family(".ZedMono"), "Lilex, sans-serif"); assert_eq!( super::mermaid_font_family(".SystemUIFont"), diff --git a/crates/onboarding/src/basics_page.rs b/crates/onboarding/src/basics_page.rs index 44fa91c41b..b7a009e4cc 100644 --- a/crates/onboarding/src/basics_page.rs +++ b/crates/onboarding/src/basics_page.rs @@ -344,7 +344,7 @@ fn render_telemetry_section(tab_index: &mut isize, cx: &App) -> impl IntoElement SwitchField::new( "onboarding-telemetry-metrics", None::<&str>, - Some("Help improve Zed by sending anonymous usage data".into()), + Some("Help improve Gwen by sending anonymous usage data".into()), if TelemetrySettings::get_global(cx).metrics { ui::ToggleState::Selected } else { @@ -384,7 +384,7 @@ fn render_telemetry_section(tab_index: &mut isize, cx: &App) -> impl IntoElement "onboarding-telemetry-crash-reports", None::<&str>, Some( - "Help fix Zed by sending crash reports so we can fix critical issues fast" + "Help fix Gwen by sending crash reports so we can fix critical issues fast" .into(), ), if TelemetrySettings::get_global(cx).diagnostics { @@ -425,7 +425,7 @@ fn render_telemetry_section(tab_index: &mut isize, cx: &App) -> impl IntoElement fn render_base_keymap_section(tab_index: &mut isize, cx: &mut App) -> impl IntoElement { let base_keymap = match BaseKeymap::get_global(cx) { - BaseKeymap::Zed => Some(0), + BaseKeymap::Gwen => Some(0), BaseKeymap::VSCode => Some(1), BaseKeymap::JetBrains => Some(2), BaseKeymap::SublimeText => Some(3), @@ -440,8 +440,8 @@ fn render_base_keymap_section(tab_index: &mut isize, cx: &mut App) -> impl IntoE ToggleButtonGroup::two_rows( "base_keymap_selection", [ - ToggleButtonWithIcon::new("Zed", IconName::AiZed, |_, _, cx| { - write_keymap_base(BaseKeymap::Zed, cx); + ToggleButtonWithIcon::new("Gwen", IconName::AiZed, |_, _, cx| { + write_keymap_base(BaseKeymap::Gwen, cx); }), ToggleButtonWithIcon::new("VS Code", IconName::EditorVsCode, |_, _, cx| { write_keymap_base(BaseKeymap::VSCode, cx); @@ -533,12 +533,12 @@ fn render_worktree_auto_trust_switch(tab_index: &mut isize, cx: &mut App) -> imp ui::ToggleState::Unselected }; - let tooltip_description = "Zed can only allow services like language servers, project settings, and MCP servers to run after you mark a new project as trusted."; + let tooltip_description = "Gwen can only allow services like language servers, project settings, and MCP servers to run after you mark a new project as trusted."; SwitchField::new( "onboarding-auto-trust-worktrees", Some("Trust All Projects By Default"), - Some("Automatically mark all new projects as trusted to unlock all Zed's features".into()), + Some("Automatically mark all new projects as trusted to unlock all Gwen's features".into()), toggle_state, { let fs = ::global(cx); @@ -744,7 +744,7 @@ fn render_zed_agent_button(user_store: &Entity, cx: &mut App) -> impl .size(IconSize::XSmall) .color(Color::Muted), ) - .name("Zed Agent") + .name("Gwen Agent") .state(state_element) .disabled(is_trial || is_pro) .map(|this| { diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs index 2bdff41b16..6f1066510a 100644 --- a/crates/project/src/project.rs +++ b/crates/project/src/project.rs @@ -1144,7 +1144,7 @@ pub enum PulledDiagnostics { }, } -/// Whether to disable all AI features in Zed. +/// Whether to disable all AI features in Gwen. /// /// Default: false #[derive(Copy, Clone, Debug, RegisterSetting)] diff --git a/crates/project/src/project_settings.rs b/crates/project/src/project_settings.rs index 078711c864..d1064fa0dd 100644 --- a/crates/project/src/project_settings.rs +++ b/crates/project/src/project_settings.rs @@ -102,9 +102,9 @@ pub struct SessionSettings { pub struct NodeBinarySettings { /// The path to the Node binary. pub path: Option, - /// The path to the npm binary Zed should use (defaults to `.path/../npm`). + /// The path to the npm binary Gwen should use (defaults to `.path/../npm`). pub npm_path: Option, - /// If enabled, Zed will download its own copy of Node. + /// If enabled, Gwen will download its own copy of Node. pub ignore_system_version: bool, } @@ -624,7 +624,7 @@ pub struct DiagnosticsSettings { /// Whether or not to include warning diagnostics. pub include_warnings: bool, - /// Settings for using LSP pull diagnostics mechanism in Zed. + /// Settings for using LSP pull diagnostics mechanism in Gwen. pub lsp_pull_diagnostics: LspPullDiagnosticsSettings, /// Settings for showing inline diagnostics. @@ -1273,12 +1273,12 @@ impl SettingsObserver { let zed_tasks = TaskTemplates::try_from(vscode_tasks) .with_context(|| { format!( - "converting VSCode tasks into Zed ones, file {abs_path:?}" + "converting VSCode tasks into Gwen ones, file {abs_path:?}" ) })?; serde_json::to_string(&zed_tasks).with_context(|| { format!( - "serializing Zed tasks into JSON, file {abs_path:?}" + "serializing Gwen tasks into JSON, file {abs_path:?}" ) }) } else if abs_path.ends_with(local_vscode_launch_file_relative_path().as_std_path()) { @@ -1290,12 +1290,12 @@ impl SettingsObserver { let zed_tasks = DebugTaskFile::try_from(vscode_tasks) .with_context(|| { format!( - "converting VSCode debug tasks into Zed ones, file {abs_path:?}" + "converting VSCode debug tasks into Gwen ones, file {abs_path:?}" ) })?; serde_json::to_string(&zed_tasks).with_context(|| { format!( - "serializing Zed tasks into JSON, file {abs_path:?}" + "serializing Gwen tasks into JSON, file {abs_path:?}" ) }) } else { diff --git a/crates/recent_projects/src/recent_projects.rs b/crates/recent_projects/src/recent_projects.rs index 5578ae9382..aa94db27d4 100644 --- a/crates/recent_projects/src/recent_projects.rs +++ b/crates/recent_projects/src/recent_projects.rs @@ -353,7 +353,7 @@ pub fn init(cx: &mut App) { let message = indoc::indoc! { r#" Invalid path specified when trying to open a folder inside WSL. - Please note that Zed currently does not support opening network share folders inside wsl. + Please note that Gwen currently does not support opening network share folders inside wsl. "#}; let _ = cx.prompt(gpui::PromptLevel::Critical, "Invalid path", Some(&message), &["OK"]).await; diff --git a/crates/sandbox/src/windows_wsl.rs b/crates/sandbox/src/windows_wsl.rs index 21158d4f17..1de823e484 100644 --- a/crates/sandbox/src/windows_wsl.rs +++ b/crates/sandbox/src/windows_wsl.rs @@ -747,9 +747,9 @@ fn probe_script() -> String { /// /// Successful results are cached per distro for the life of the process — /// like `linux_bubblewrap::is_available`, the answers can't realistically -/// change while Zed runs. Failures are deliberately *not* cached so a user +/// change while Gwen runs. Failures are deliberately *not* cached so a user /// who installs `bwrap` (or lifts a user-namespace restriction) after seeing -/// the error can retry the command without restarting Zed. +/// the error can retry the command without restarting Gwen. async fn probe_environment(wsl_exe: &Path, distro: Option<&str>) -> Result { static CACHE: OnceLock, EnvironmentProbe>>> = OnceLock::new(); let cache = CACHE.get_or_init(|| Mutex::new(HashMap::new())); @@ -846,7 +846,7 @@ fn parse_probe_output(stdout: &str) -> Result { }) } -/// Ensure a Linux `zed` of the given release `channel`/`version` is available +/// Ensure a Linux `gwen` of the given release `channel`/`version` is available /// inside WSL and return its absolute in-WSL path, to be `--exec`'d as the /// `--wsl-sandbox-helper`. Runs [`HELPER_PROVISION_SCRIPT`] (which downloads the /// matching release tarball into an off-`PATH` location on first use). @@ -854,7 +854,7 @@ fn parse_probe_output(stdout: &str) -> Result { /// Successful resolutions are cached per `(distro, channel, version)` for the /// life of the process — once provisioned, the path won't change. Failures are /// not cached, so a user who installs `curl` (or fixes networking) after an -/// error can retry without restarting Zed. +/// error can retry without restarting Gwen. async fn ensure_wsl_zed_helper( wsl_exe: &Path, distro: Option<&str>, diff --git a/crates/settings/src/base_keymap_setting.rs b/crates/settings/src/base_keymap_setting.rs index 28fc665de5..8779a76a52 100644 --- a/crates/settings/src/base_keymap_setting.rs +++ b/crates/settings/src/base_keymap_setting.rs @@ -7,13 +7,14 @@ use settings::{RegisterSetting, Settings}; /// Base key bindings scheme. Base keymaps can be overridden with user keymaps. /// -/// Default: Zed +/// Default: Gwen #[derive( Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq, Default, RegisterSetting, )] pub enum BaseKeymap { #[default] - Zed, + #[serde(alias = "Zed")] + Gwen, VSCode, JetBrains, SublimeText, @@ -27,7 +28,7 @@ pub enum BaseKeymap { impl From for BaseKeymap { fn from(value: BaseKeymapContent) -> Self { match value { - BaseKeymapContent::Zed => Self::Zed, + BaseKeymapContent::Gwen => Self::Gwen, BaseKeymapContent::VSCode => Self::VSCode, BaseKeymapContent::JetBrains => Self::JetBrains, BaseKeymapContent::SublimeText => Self::SublimeText, @@ -42,7 +43,7 @@ impl From for BaseKeymap { impl Into for BaseKeymap { fn into(self) -> BaseKeymapContent { match self { - BaseKeymap::Zed => BaseKeymapContent::Zed, + BaseKeymap::Gwen => BaseKeymapContent::Gwen, BaseKeymap::VSCode => BaseKeymapContent::VSCode, BaseKeymap::JetBrains => BaseKeymapContent::JetBrains, BaseKeymap::SublimeText => BaseKeymapContent::SublimeText, @@ -58,7 +59,7 @@ impl Into for BaseKeymap { impl Display for BaseKeymap { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { match self { - BaseKeymap::Zed => write!(f, "Zed"), + BaseKeymap::Gwen => write!(f, "Gwen"), BaseKeymap::VSCode => write!(f, "VS Code"), BaseKeymap::JetBrains => write!(f, "JetBrains"), BaseKeymap::SublimeText => write!(f, "Sublime Text"), @@ -74,7 +75,7 @@ impl Display for BaseKeymap { impl BaseKeymap { #[cfg(target_os = "macos")] pub const OPTIONS: [(&'static str, Self); 8] = [ - ("Zed (Default)", Self::Zed), + ("Gwen (Default)", Self::Gwen), ("VS Code", Self::VSCode), ("Atom", Self::Atom), ("JetBrains", Self::JetBrains), @@ -86,7 +87,7 @@ impl BaseKeymap { #[cfg(not(target_os = "macos"))] pub const OPTIONS: [(&'static str, Self); 7] = [ - ("Zed (Default)", Self::Zed), + ("Gwen (Default)", Self::Gwen), ("VS Code", Self::VSCode), ("Atom", Self::Atom), ("JetBrains", Self::JetBrains), @@ -105,7 +106,7 @@ impl BaseKeymap { BaseKeymap::Emacs => Some("keymaps/macos/emacs.json"), BaseKeymap::Cursor => Some("keymaps/macos/cursor.json"), BaseKeymap::VSCode => Some("keymaps/macos/vscode.json"), - BaseKeymap::Zed => None, + BaseKeymap::Gwen => None, BaseKeymap::None => None, } @@ -118,7 +119,7 @@ impl BaseKeymap { BaseKeymap::Cursor => Some("keymaps/linux/cursor.json"), BaseKeymap::TextMate => None, BaseKeymap::VSCode => Some("keymaps/linux/vscode.json"), - BaseKeymap::Zed => None, + BaseKeymap::Gwen => None, BaseKeymap::None => None, } } diff --git a/crates/settings_content/src/agent.rs b/crates/settings_content/src/agent.rs index d8c755e48c..63922dd1cf 100644 --- a/crates/settings_content/src/agent.rs +++ b/crates/settings_content/src/agent.rs @@ -353,7 +353,7 @@ pub struct AgentSettingsContent { /// /// Default: true pub expand_terminal_card: Option, - /// Command to automatically run when Zed creates a Terminal Thread shell in the agent panel. + /// Command to automatically run when Gwen creates a Terminal Thread shell in the agent panel. /// The command is sent to the shell as if typed, so it is interpreted by your /// configured shell (including on Windows and remote/WSL projects). /// An empty string disables this behavior. @@ -392,7 +392,7 @@ pub struct AgentSettingsContent { /// The global `default` applies when no tool-specific rules match. /// For external agent servers (e.g. Claude Agent) that define their own /// permission modes, "deny" and "confirm" still take precedence — the - /// external agent's permission system is only used when Zed would allow + /// external agent's permission system is only used when Gwen would allow /// the action. Per-tool regex patterns (`always_allow`, `always_deny`, /// `always_confirm`) match against the tool's text input (command, path, /// URL, etc.). @@ -860,7 +860,7 @@ pub enum CustomAgentServerSettings { /// path string (`"/tmp/x"`, a legacy/hand-authored entry with no resolved /// target) or an object (`{ "requested": "/tmp/x", "resolved": "/tmp/real" }`). /// Serializes back as a bare string when `resolved` is `None` and as an object -/// otherwise, so hand-authored bare strings round-trip and Zed-written grants +/// otherwise, so hand-authored bare strings round-trip and Gwen-written grants /// are objects. #[derive(Clone, Debug, Default, PartialEq, MergeFrom)] pub struct GrantedWritePathContent { @@ -993,9 +993,9 @@ pub struct SandboxPermissionsContent { /// Directory subtrees that sandboxed terminal commands may always write /// to without prompting. Each entry is either a bare path string or an - /// object `{requested, resolved}`; Zed writes objects (the canonical, + /// object `{requested, resolved}`; Gwen writes objects (the canonical, /// symlink-resolved target established at approval time), while - /// hand-authored entries may be bare path strings. Paths written by Zed + /// hand-authored entries may be bare path strings. Paths written by Gwen /// are absolute. /// Default: [] pub write_paths: Option>, diff --git a/crates/settings_content/src/extension.rs b/crates/settings_content/src/extension.rs index 2fefd4ef38..8bb4b9482f 100644 --- a/crates/settings_content/src/extension.rs +++ b/crates/settings_content/src/extension.rs @@ -8,7 +8,7 @@ use settings_macros::{MergeFrom, with_fallible_options}; #[with_fallible_options] #[derive(Debug, PartialEq, Clone, Default, Serialize, Deserialize, JsonSchema, MergeFrom)] pub struct ExtensionSettingsContent { - /// The extensions that should be automatically installed by Zed. + /// The extensions that should be automatically installed by Gwen. /// /// This is used to make functionality provided by extensions (e.g., language support) /// available out-of-the-box. diff --git a/crates/settings_content/src/language.rs b/crates/settings_content/src/language.rs index 75ea59f83d..c172d5165a 100644 --- a/crates/settings_content/src/language.rs +++ b/crates/settings_content/src/language.rs @@ -116,7 +116,7 @@ impl EditPredictionProvider { pub fn display_name(&self) -> Option<&'static str> { match self { - EditPredictionProvider::Zed => Some("Zed AI"), + EditPredictionProvider::Zed => Some("Gwen AI"), EditPredictionProvider::Copilot => Some("GitHub Copilot"), EditPredictionProvider::Codestral => Some("Codestral"), EditPredictionProvider::Mercury => Some("Mercury"), @@ -135,7 +135,7 @@ pub struct EditPredictionSettingsContent { pub provider: Option, /// Disable edit predictions for files matching these glob patterns. /// - /// Use `"..."` to add patterns without repeating Zed's defaults. In project + /// Use `"..."` to add patterns without repeating Gwen's defaults. In project /// settings, it extends the user or parent configuration value. Omit /// `"..."` to replace the inherited list. /// @@ -167,11 +167,11 @@ pub struct EditPredictionSettingsContent { pub ollama: Option, /// Settings specific to using custom OpenAI-compatible servers for edit prediction. pub open_ai_compatible_api: Option, - /// Settings specific to Zed's Edit Predictions provider. + /// Settings specific to Gwen's Edit Predictions provider. pub zed: Option, /// Settings specific to the Mercury Edit Predictions provider. pub mercury: Option, - /// Controls whether Zed may collect training data when using Zed's Edit Predictions. + /// Controls whether Gwen may collect training data when using Gwen's Edit Predictions. /// Data is only ever captured for files in projects that are detected as open source. /// /// - `"default"`: use the preference previously set via the status-bar toggle, @@ -286,7 +286,7 @@ pub struct CodestralSettingsContent { pub prediction_debounce: Option, } -/// Settings specific to Zed's Edit Predictions provider. +/// Settings specific to Gwen's Edit Predictions provider. #[with_fallible_options] #[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, MergeFrom, PartialEq)] pub struct ZedEditPredictionSettingsContent { @@ -359,7 +359,7 @@ pub struct OllamaEditPredictionSettingsContent { pub prediction_debounce: Option, } -/// Controls whether Zed collects training data when using Zed's Edit Predictions. +/// Controls whether Gwen collects training data when using Gwen's Edit Predictions. #[derive( Copy, Clone, @@ -380,7 +380,7 @@ pub enum EditPredictionDataCollectionChoice { /// if no preference has been stored. #[default] Default, - /// Allow Zed to collect training data from open-source projects. + /// Allow Gwen to collect training data from open-source projects. Yes, /// Never allow training data collection. No, @@ -597,7 +597,7 @@ pub struct LanguageSettingsContent { /// /// Default: auto pub formatter: Option, - /// Zed's Prettier integration settings. + /// Gwen's Prettier integration settings. /// Allows to enable/disable formatting with Prettier /// and configure default Prettier, used when no project-level Prettier installation is found. /// @@ -709,12 +709,12 @@ pub struct LanguageSettingsContent { /// Inlay hint related settings. pub inlay_hints: Option, /// Whether to automatically type closing characters for you. For example, - /// when you type '(', Zed will automatically add a closing ')' at the correct position. + /// when you type '(', Gwen will automatically add a closing ')' at the correct position. /// /// Default: true pub use_autoclose: Option, /// Whether to automatically surround text with characters for you. For example, - /// when you select text and type '(', Zed will automatically surround text with (). + /// when you select text and type '(', Gwen will automatically surround text with (). /// /// Default: true pub use_auto_surround: Option, @@ -1141,13 +1141,13 @@ impl AsRef<[Formatter]> for FormatterList { #[derive(Clone, Default, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema, MergeFrom)] #[serde(rename_all = "snake_case")] pub enum Formatter { - /// Format files using Zed's Prettier integration (if applicable), + /// Format files using Gwen's Prettier integration (if applicable), /// or falling back to formatting via language server. #[default] Auto, /// Do not format code. None, - /// Format code using Zed's Prettier integration. + /// Format code using Gwen's Prettier integration. Prettier, /// Format code using an external command. External { @@ -1260,13 +1260,13 @@ pub struct LanguageTaskSettingsContent { /// Extra task variables to set for a particular language. pub variables: Option>, pub enabled: Option, - /// Use LSP tasks over Zed language extension ones. + /// Use LSP tasks over Gwen language extension ones. /// If no LSP tasks are returned due to error/timeout or regular execution, - /// Zed language extension tasks will be used instead. + /// Gwen language extension tasks will be used instead. /// - /// Other Zed tasks will still be shown: - /// * Zed task from either of the task config file - /// * Zed task from history (e.g. one-off task was spawned before) + /// Other Gwen tasks will still be shown: + /// * Gwen task from either of the task config file + /// * Gwen task from history (e.g. one-off task was spawned before) pub prefer_lsp: Option, } diff --git a/crates/settings_content/src/language_model.rs b/crates/settings_content/src/language_model.rs index 94d49f90ec..ae5f2a78ce 100644 --- a/crates/settings_content/src/language_model.rs +++ b/crates/settings_content/src/language_model.rs @@ -51,7 +51,7 @@ pub struct AnthropicCompatibleSettingsContent { pub struct AnthropicCompatibleAvailableModel { /// The model's name in the provider's API. e.g. claude-3-5-sonnet-latest pub name: String, - /// The model's name in Zed's UI, such as in the model selector dropdown menu in the assistant panel. + /// The model's name in Gwen's UI, such as in the model selector dropdown menu in the assistant panel. pub display_name: Option, /// The model's context window size. pub max_tokens: u64, @@ -93,7 +93,7 @@ impl Default for AnthropicCompatibleModelCapabilities { pub struct AnthropicAvailableModel { /// The model's name in the Anthropic API. e.g. claude-3-5-sonnet-latest, claude-3-opus-20240229, etc pub name: String, - /// The model's name in Zed's UI, such as in the model selector dropdown menu in the agent panel. + /// The model's name in Gwen's UI, such as in the model selector dropdown menu in the agent panel. pub display_name: Option, /// The model's context window size. pub max_tokens: u64, @@ -199,7 +199,7 @@ pub struct OllamaSettingsContent { pub struct OllamaAvailableModel { /// The model name in the Ollama API (e.g. "llama3.2:latest") pub name: String, - /// The model's name in Zed's UI, such as in the model selector dropdown menu in the agent panel. + /// The model's name in Gwen's UI, such as in the model selector dropdown menu in the agent panel. pub display_name: Option, /// The Context Length parameter to the model (aka num_ctx or n_ctx) pub max_tokens: u64, @@ -323,7 +323,7 @@ pub struct LlamaCppSettingsContent { pub struct LlamaCppAvailableModel { /// The model id reported by the llama.cpp server (its `--alias` or the model file path). pub name: String, - /// The model's name in Zed's UI, such as in the model selector dropdown menu in the agent panel. + /// The model's name in Gwen's UI, such as in the model selector dropdown menu in the agent panel. pub display_name: Option, /// The Context Length parameter to the model (aka n_ctx). pub max_tokens: u64, diff --git a/crates/settings_content/src/merge_from.rs b/crates/settings_content/src/merge_from.rs index 82e3ee9a24..9d8135add2 100644 --- a/crates/settings_content/src/merge_from.rs +++ b/crates/settings_content/src/merge_from.rs @@ -1,6 +1,6 @@ /// Trait for recursively merging settings structures. /// -/// When Zed starts it loads settings from `default.json` to initialize +/// When Gwen starts it loads settings from `default.json` to initialize /// everything. These may be further refined by loading the user's settings, /// and any settings profiles; and then further refined by loading any /// local project settings. diff --git a/crates/settings_content/src/project.rs b/crates/settings_content/src/project.rs index 49bd242d5f..3468b17e77 100644 --- a/crates/settings_content/src/project.rs +++ b/crates/settings_content/src/project.rs @@ -81,7 +81,7 @@ pub struct ProjectSettingsContent { /// The list of custom Git hosting providers. pub git_hosting_providers: Option>, - /// Whether to disable all AI features in Zed. + /// Whether to disable all AI features in Gwen. /// /// Default: false pub disable_ai: Option, @@ -151,7 +151,7 @@ pub struct WorktreeSettingsContent { /// } /// ``` /// - /// Use `"..."` to add patterns without repeating Zed's defaults. In project + /// Use `"..."` to add patterns without repeating Gwen's defaults. In project /// settings, it extends the user or parent configuration value. Omit /// `"..."` to replace the inherited list. /// @@ -177,7 +177,7 @@ pub struct WorktreeSettingsContent { /// } /// ``` /// - /// Use `"..."` to add patterns without repeating Zed's defaults. In project + /// Use `"..."` to add patterns without repeating Gwen's defaults. In project /// settings, it extends the user or parent configuration value. Omit /// `"..."` to replace the inherited list. /// @@ -224,7 +224,7 @@ pub struct WorktreeSettingsContent { /// } /// ``` /// - /// Use `"..."` to add patterns without repeating Zed's defaults. In project + /// Use `"..."` to add patterns without repeating Gwen's defaults. In project /// settings, it extends the user or parent configuration value. Omit /// `"..."` to replace the inherited list. /// @@ -253,7 +253,7 @@ pub struct WorktreeSettingsContent { /// } /// ``` /// - /// Use `"..."` to add patterns without repeating Zed's defaults. In project + /// Use `"..."` to add patterns without repeating Gwen's defaults. In project /// settings, it extends the user or parent configuration value. Omit /// `"..."` to replace the inherited list. /// @@ -286,7 +286,7 @@ pub struct LspSettings { /// Consult the documentation for the specific language server to see which settings are supported. pub settings: Option, /// If the server supports sending tasks over LSP extensions, - /// this setting can be used to enable or disable them in Zed. + /// this setting can be used to enable or disable them in Gwen. /// Default: true #[serde(default = "default_true")] pub enable_lsp_tasks: bool, @@ -904,7 +904,7 @@ pub struct DiagnosticsSettingsContent { /// Default: true pub include_warnings: Option, - /// Settings for using LSP pull diagnostics mechanism in Zed. + /// Settings for using LSP pull diagnostics mechanism in Gwen. pub lsp_pull_diagnostics: Option, /// Settings for showing inline diagnostics. @@ -961,9 +961,9 @@ pub struct InlineDiagnosticsSettingsContent { pub struct NodeBinarySettings { /// The path to the Node binary. pub path: Option, - /// The path to the npm binary Zed should use (defaults to `.path/../npm`). + /// The path to the npm binary Gwen should use (defaults to `.path/../npm`). pub npm_path: Option, - /// If enabled, Zed will download its own copy of Node. + /// If enabled, Gwen will download its own copy of Node. pub ignore_system_version: Option, } diff --git a/crates/settings_content/src/settings_content.rs b/crates/settings_content/src/settings_content.rs index 300b5794d4..489bd944cd 100644 --- a/crates/settings_content/src/settings_content.rs +++ b/crates/settings_content/src/settings_content.rs @@ -211,7 +211,7 @@ pub struct SettingsContent { pub agent: Option, pub agent_servers: Option, - /// Configuration of audio in Zed. + /// Configuration of audio in Gwen. pub audio: Option, /// Configuration of the background image displayed behind the workspace UI. @@ -222,8 +222,8 @@ pub struct SettingsContent { /// Default: true pub auto_update: Option, - /// This base keymap settings adjusts the default keybindings in Zed to be similar - /// to other common code editors. By default, Zed's keymap closely follows VSCode's + /// This base keymap settings adjusts the default keybindings in Gwen to be similar + /// to other common code editors. By default, Gwen's keymap closely follows VSCode's /// keymap, with minor adjustments, this corresponds to the "VSCode" setting. /// /// Default: VSCode @@ -296,16 +296,16 @@ pub struct SettingsContent { /// The URL used as the key for credential storage. /// /// When set, credentials are stored under this URL instead of `server_url`. - /// This allows running multiple Zed instances side by side without them + /// This allows running multiple Gwen instances side by side without them /// overwriting each other's keychain entries. pub credentials_url: Option, /// Configuration for session-related features pub session: Option, - /// Control what info is collected by Zed. + /// Control what info is collected by Gwen. pub telemetry: Option, - /// Configuration of the terminal in Zed. + /// Configuration of the terminal in Gwen. pub terminal: Option, pub title_bar: Option, @@ -321,7 +321,7 @@ pub struct SettingsContent { /// Settings for the which-key popup. pub which_key: Option, - /// Settings related to Vim mode in Zed. + /// Settings related to Vim mode in Gwen. pub vim: Option, /// Number of lines to search for modelines at the beginning and end of files. @@ -340,7 +340,7 @@ pub struct SettingsContent { } /// Configuration for developer-oriented instrumentation tools that collect -/// diagnostic data about a running Zed instance. +/// diagnostic data about a running Gwen instance. #[with_fallible_options] #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, JsonSchema, MergeFrom)] pub struct InstrumentationSettingsContent { @@ -479,7 +479,7 @@ pub enum ProfileBase { /// Apply profile settings on top of the user's current settings. #[default] User, - /// Apply profile settings on top of Zed's default settings, ignoring user customizations. + /// Apply profile settings on top of Gwen's default settings, ignoring user customizations. Default, } @@ -490,7 +490,7 @@ pub struct SettingsProfile { /// What base settings to start from before applying this profile's overrides. /// /// - `user`: Apply on top of user's settings (default) - /// - `default`: Apply on top of Zed's default settings, ignoring user customizations + /// - `default`: Apply on top of Gwen's default settings, ignoring user customizations #[serde(default)] pub base: ProfileBase, @@ -521,7 +521,7 @@ pub struct ExtensionsSettingsContent { /// Base key bindings scheme. Base keymaps can be overridden with user keymaps. /// -/// Default: Zed +/// Default: Gwen #[derive( Copy, Clone, @@ -537,7 +537,8 @@ pub struct ExtensionsSettingsContent { )] pub enum BaseKeymapContent { #[default] - Zed, + #[serde(alias = "Zed")] + Gwen, VSCode, JetBrains, SublimeText, @@ -550,7 +551,7 @@ pub enum BaseKeymapContent { impl strum::VariantNames for BaseKeymapContent { const VARIANTS: &'static [&'static str] = &[ - "Zed", + "Gwen", "VSCode", "JetBrains", "Sublime Text", @@ -562,7 +563,7 @@ impl strum::VariantNames for BaseKeymapContent { ]; } -/// Configuration of audio in Zed. +/// Configuration of audio in Gwen. #[with_fallible_options] #[derive(Clone, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug)] pub struct AudioSettingsContent { @@ -606,7 +607,7 @@ impl From> for AudioOutputDeviceName { } } -/// Control what info is collected by Zed. +/// Control what info is collected by Gwen. #[with_fallible_options] #[derive(Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema, Debug, MergeFrom)] pub struct TelemetrySettingsContent { @@ -614,7 +615,7 @@ pub struct TelemetrySettingsContent { /// /// Default: true pub diagnostics: Option, - /// Send anonymized usage data like what languages you're using Zed with. + /// Send anonymized usage data like what languages you're using Gwen with. /// /// Default: true pub metrics: Option, @@ -642,7 +643,7 @@ pub struct DebuggerSettingsContent { /// /// Default: line pub stepping_granularity: Option, - /// Whether the breakpoints should be reused across Zed sessions. + /// Whether the breakpoints should be reused across Gwen sessions. /// /// Default: true pub save_breakpoints: Option, @@ -654,7 +655,7 @@ pub struct DebuggerSettingsContent { /// /// Default: 2000ms pub timeout: Option, - /// Whether to log messages between active debug adapters and Zed + /// Whether to log messages between active debug adapters and Gwen /// /// Default: true pub log_dap_communications: Option, @@ -715,7 +716,7 @@ pub enum DockPosition { Right, } -/// Configuration of voice calls in Zed. +/// Configuration of voice calls in Gwen. #[with_fallible_options] #[derive(Clone, PartialEq, Default, Serialize, Deserialize, JsonSchema, MergeFrom, Debug)] pub struct CallSettingsContent { @@ -957,7 +958,7 @@ pub struct FileFinderSettingsContent { /// Default: true pub skip_focus_for_active_in_search: Option, /// Whether to use gitignored files when searching. - /// Only the file Zed had indexed will be used, not necessary all the gitignored files. + /// Only the file Gwen had indexed will be used, not necessary all the gitignored files. /// /// Default: Smart pub include_ignored: Option, @@ -985,7 +986,7 @@ pub struct FileFinderSettingsContent { pub enum IncludeIgnoredContent { /// Use all gitignored files All, - /// Use only the files Zed had indexed + /// Use only the files Gwen had indexed Indexed, /// Be smart and search for ignored when called from a gitignored worktree #[default] @@ -1367,7 +1368,7 @@ pub struct RemoteSettingsContent { pub use_podman: Option, /// Whether to build dev container images with BuildKit. /// - /// When unset, Zed auto-detects BuildKit by probing for the `buildx` CLI + /// When unset, Gwen auto-detects BuildKit by probing for the `buildx` CLI /// plugin. Set to `false` to force the classic Docker builder, which is /// required for Docker-compatible engines that lack an integrated BuildKit /// (e.g. Apple Container via a Docker-API bridge), where BuildKit builds diff --git a/crates/settings_content/src/terminal.rs b/crates/settings_content/src/terminal.rs index e9bf73ac56..b014e5801d 100644 --- a/crates/settings_content/src/terminal.rs +++ b/crates/settings_content/src/terminal.rs @@ -63,7 +63,7 @@ pub struct ProjectTerminalSettingsContent { /// } /// ``` /// - /// Use `"..."` to add regexes without repeating Zed's defaults. In project + /// Use `"..."` to add regexes without repeating Gwen's defaults. In project /// settings, it extends the user or parent configuration value. Omit /// `"..."` to replace the inherited list. Set `[]` to clear it. Omitting this /// setting keeps the inherited list. diff --git a/crates/settings_content/src/theme.rs b/crates/settings_content/src/theme.rs index 7bd31449a8..2b5a85cf78 100644 --- a/crates/settings_content/src/theme.rs +++ b/crates/settings_content/src/theme.rs @@ -214,7 +214,7 @@ pub struct ThemeSettingsContent { /// The font size for user messages in the agent panel. pub agent_buffer_font_size: Option, pub git_commit_buffer_font_size: Option, - /// The name of the Zed theme to use. + /// The name of the Gwen theme to use. pub theme: Option, /// The name of the icon theme to use. pub icon_theme: Option, diff --git a/crates/settings_content/src/title_bar.rs b/crates/settings_content/src/title_bar.rs index 74f406e8ab..356bd44237 100644 --- a/crates/settings_content/src/title_bar.rs +++ b/crates/settings_content/src/title_bar.rs @@ -25,7 +25,7 @@ pub enum WindowButtonLayoutContent { /// Follow the system/desktop configuration. #[default] PlatformDefault, - /// Use Zed's built-in standard layout, regardless of system config. + /// Use Gwen's built-in standard layout, regardless of system config. Standard, /// A raw GNOME-style layout string. Custom(String), @@ -122,7 +122,7 @@ pub struct TitleBarSettingsContent { /// The layout of window control buttons in the title bar (Linux only). /// /// This can be set to "platform_default" to follow the system configuration, or - /// "standard" to use Zed's built-in layout. For custom layouts, use a + /// "standard" to use Gwen's built-in layout. For custom layouts, use a /// GNOME-style layout string like "close:minimize,maximize". /// /// Default: "platform_default" diff --git a/crates/settings_content/src/workspace.rs b/crates/settings_content/src/workspace.rs index dbcb6fc414..d8400a1d87 100644 --- a/crates/settings_content/src/workspace.rs +++ b/crates/settings_content/src/workspace.rs @@ -45,7 +45,7 @@ pub struct WorkspaceSettingsContent { /// /// Default: off pub autosave: Option, - /// Controls previous session restoration in freshly launched Zed instance. + /// Controls previous session restoration in freshly launched Gwen instance. /// Values: empty_tab, last_workspace, last_session, launchpad /// Default: last_session pub restore_on_startup: Option, @@ -81,19 +81,19 @@ pub struct WorkspaceSettingsContent { /// /// Default: auto ("on" on macOS, "off" otherwise) pub when_closing_with_no_tabs: Option, - /// Whether to optimize Zed's interface for assistive technology such as + /// Whether to optimize Gwen's interface for assistive technology such as /// screen readers. /// /// Default: false pub accessible_mode: Option, /// Whether to use the system provided dialogs for Open and Save As. - /// When set to false, Zed will use the built-in keyboard-first pickers. + /// When set to false, Gwen will use the built-in keyboard-first pickers. /// /// Default: true pub use_system_path_prompts: Option, /// Whether to use the system provided prompts. - /// When set to false, Zed will use the built-in prompts. - /// Note that this setting has no effect on Linux, where Zed will always + /// When set to false, Gwen will use the built-in prompts. + /// Note that this setting has no effect on Linux, where Gwen will always /// use the built-in prompts. /// /// Default: true @@ -165,7 +165,7 @@ pub struct WorkspaceSettingsContent { /// /// Default: ` — ` pub window_title_separator: Option, - /// Controls whether Zed or the window manager or compositor draws window decorations on Linux. + /// Controls whether Gwen or the window manager or compositor draws window decorations on Linux. /// /// Default: client pub window_decorations: Option, @@ -394,7 +394,7 @@ pub enum FullscreenMode { Simple, } -/// Configures what draws Zed's window decorations on Linux. +/// Configures what draws Gwen's window decorations on Linux. /// This setting has no effect on other platforms. #[derive( Copy, @@ -411,7 +411,7 @@ pub enum FullscreenMode { )] #[serde(rename_all = "snake_case")] pub enum WindowDecorations { - /// Zed draws its own window decorations/titlebar (client-side decoration). + /// Gwen draws its own window decorations/titlebar (client-side decoration). #[default] Client, /// The window manager or compositor draws the server-side window @@ -469,7 +469,7 @@ impl CloseWindowWhenNoItems { )] #[serde(rename_all = "snake_case")] pub enum CliDefaultOpenBehavior { - /// Open directories as a new workspace in the current Zed window's sidebar. + /// Open directories as a new workspace in the current Gwen window's sidebar. #[default] #[strum(serialize = "Add to Existing Window")] ExistingWindow, @@ -494,7 +494,7 @@ pub enum CliDefaultOpenBehavior { )] #[serde(rename_all = "snake_case")] pub enum DefaultOpenBehavior { - /// Open projects in the current Zed window. + /// Open projects in the current Gwen window. #[default] #[strum(serialize = "Add to Existing Window")] ExistingWindow, @@ -524,7 +524,7 @@ pub enum RestoreOnStartupBehavior { EmptyTab, /// Restore the workspace that was closed last. LastWorkspace, - /// Restore all workspaces that were open when quitting Zed. + /// Restore all workspaces that were open when quitting Gwen. #[default] LastSession, /// Show the launchpad with recent projects (no tabs). diff --git a/crates/settings_ui/src/page_data.rs b/crates/settings_ui/src/page_data.rs index a60922edc6..ffd426b2ea 100644 --- a/crates/settings_ui/src/page_data.rs +++ b/crates/settings_ui/src/page_data.rs @@ -141,7 +141,7 @@ fn general_page(cx: &App) -> SettingsPage { SettingsPageItem::SectionHeader("General Settings"), SettingsPageItem::SettingItem(SettingItem { title: "Accessible Mode", - description: "Optimize Zed's interface for assistive technology such as screen readers. When enabled, otherwise-collapsed controls stay expanded and keyboard-reachable.", + description: "Optimize Gwen's interface for assistive technology such as screen readers. When enabled, otherwise-collapsed controls stay expanded and keyboard-reachable.", field: Box::new(SettingField { organization_override: None, json_path: Some("accessible_mode"), @@ -327,7 +327,7 @@ fn general_page(cx: &App) -> SettingsPage { SettingsPageItem::SectionHeader("Security"), SettingsPageItem::SettingItem(SettingItem { title: "Trust All Projects By Default", - description: "When opening Zed, avoid Restricted Mode by auto-trusting all projects, enabling use of all features without having to give permission to each new project.", + description: "When opening Gwen, avoid Restricted Mode by auto-trusting all projects, enabling use of all features without having to give permission to each new project.", field: Box::new(SettingField { organization_override: None, json_path: Some("session.trust_all_projects"), @@ -377,7 +377,7 @@ fn general_page(cx: &App) -> SettingsPage { }), SettingsPageItem::SettingItem(SettingItem { title: "Restore On Startup", - description: "What to restore from the previous session when opening Zed.", + description: "What to restore from the previous session when opening Gwen.", field: Box::new(SettingField { organization_override: None, json_path: Some("restore_on_startup"), @@ -398,7 +398,7 @@ fn general_page(cx: &App) -> SettingsPage { SettingsPageItem::SettingItem(SettingItem { files: USER, title: "Preview Channel", - description: "Which settings should be activated only in Preview build of Zed.", + description: "Which settings should be activated only in Preview build of Gwen.", field: Box::new( SettingField { organization_override: None, @@ -455,7 +455,7 @@ fn general_page(cx: &App) -> SettingsPage { }), SettingsPageItem::SettingItem(SettingItem { title: "Telemetry Metrics", - description: "Send anonymized usage data like what languages you're using Zed with.", + description: "Send anonymized usage data like what languages you're using Gwen with.", field: Box::new(SettingField { organization_override: None, json_path: Some("telemetry.metrics"), @@ -719,7 +719,7 @@ fn appearance_page() -> SettingsPage { discriminant: SettingItem { files: USER, title: "Icon Theme", - description: "The custom set of icons Zed will associate with files and directories.", + description: "The custom set of icons Gwen will associate with files and directories.", field: Box::new(SettingField { organization_override: None, json_path: Some("icon_theme$"), @@ -4021,7 +4021,7 @@ fn search_and_files_page() -> SettingsPage { SettingsPageItem::SectionHeader("File Scan"), SettingsPageItem::SettingItem(SettingItem { title: "File Scan Exclusions", - description: "Files or globs of files that will be excluded by Zed entirely. They will be skipped during file scans, file searches, and not be displayed in the project file tree. Takes precedence over \"File Scan Inclusions\"", + description: "Files or globs of files that will be excluded by Gwen entirely. They will be skipped during file scans, file searches, and not be displayed in the project file tree. Takes precedence over \"File Scan Inclusions\"", field: Box::new( SettingField { organization_override: None, @@ -4044,7 +4044,7 @@ fn search_and_files_page() -> SettingsPage { }), SettingsPageItem::SettingItem(SettingItem { title: "File Scan Inclusions", - description: "Files or globs of files that will be included by Zed, even when ignored by git. This is useful for files that are not tracked by git, but are still important to your project. Note that globs that are overly broad can slow down Zed's file scanning. \"File Scan Exclusions\" takes precedence over these inclusions", + description: "Files or globs of files that will be included by Gwen, even when ignored by git. This is useful for files that are not tracked by git, but are still important to your project. Note that globs that are overly broad can slow down Gwen's file scanning. \"File Scan Exclusions\" takes precedence over these inclusions", field: Box::new( SettingField { organization_override: None, @@ -5259,7 +5259,7 @@ fn window_and_layout_page() -> SettingsPage { }), SettingsPageItem::SettingItem(SettingItem { title: "Window Decorations", - description: "(Linux only) whether Zed or your compositor should draw window decorations.", + description: "(Linux only) whether Gwen or your compositor should draw window decorations.", field: Box::new(SettingField { organization_override: None, json_path: Some("window_decorations"), @@ -7093,7 +7093,7 @@ fn debugger_page() -> SettingsPage { }), SettingsPageItem::SettingItem(SettingItem { title: "Save Breakpoints", - description: "Whether breakpoints should be reused across Zed sessions.", + description: "Whether breakpoints should be reused across Gwen sessions.", field: Box::new(SettingField { organization_override: None, json_path: Some("debugger.save_breakpoints"), @@ -7130,7 +7130,7 @@ fn debugger_page() -> SettingsPage { }), SettingsPageItem::SettingItem(SettingItem { title: "Log DAP Communications", - description: "Whether to log messages between active debug adapters and Zed.", + description: "Whether to log messages between active debug adapters and Gwen.", field: Box::new(SettingField { organization_override: None, json_path: Some("debugger.log_dap_communications"), @@ -8070,7 +8070,7 @@ fn version_control_page() -> SettingsPage { discriminant: SettingItem { files: USER, title: "Disable Git Integration", - description: "Disable all Git integration features in Zed.", + description: "Disable all Git integration features in Gwen.", field: Box::new(SettingField:: { organization_override: None, json_path: Some("git.disable_git"), @@ -8683,7 +8683,7 @@ fn ai_page(cx: &App) -> SettingsPage { SettingsPageItem::SectionHeader("General"), SettingsPageItem::SettingItem(SettingItem { title: "Disable AI", - description: "Whether to disable all AI features in Zed.", + description: "Whether to disable all AI features in Gwen.", field: Box::new(SettingField { organization_override: None, json_path: Some("disable_ai"), @@ -9047,7 +9047,7 @@ fn ai_page(cx: &App) -> SettingsPage { }), SettingsPageItem::SettingItem(SettingItem { title: "Terminal Thread Init Command", - description: "Command to automatically run when Zed creates a Terminal Thread shell in the agent panel. Runs in your configured shell.", + description: "Command to automatically run when Gwen creates a Terminal Thread shell in the agent panel. Runs in your configured shell.", field: Box::new(SettingField { organization_override: None, json_path: Some("agent.terminal_init_command"), @@ -9896,7 +9896,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { SettingsPageItem::SectionHeader("Autoclose"), SettingsPageItem::SettingItem(SettingItem { title: "Use Autoclose", - description: "Whether to automatically type closing characters for you. For example, when you type '(', Zed will automatically add a closing ')' at the correct position.", + description: "Whether to automatically type closing characters for you. For example, when you type '(', Gwen will automatically add a closing ')' at the correct position.", field: Box::new(SettingField { organization_override: None, json_path: Some("languages.$(language).use_autoclose"), @@ -9916,7 +9916,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { }), SettingsPageItem::SettingItem(SettingItem { title: "Use Auto Surround", - description: "Whether to automatically surround text with characters for you. For example, when you select text and type '(', Zed will automatically surround text with ().", + description: "Whether to automatically surround text with characters for you. For example, when you select text and type '(', Gwen will automatically surround text with ().", field: Box::new(SettingField { organization_override: None, json_path: Some("languages.$(language).use_auto_surround"), @@ -10464,7 +10464,7 @@ fn language_settings_data() -> Box<[SettingsPageItem]> { }), SettingsPageItem::SettingItem(SettingItem { title: "Prefer LSP", - description: "Use LSP tasks over Zed language extension tasks.", + description: "Use LSP tasks over Gwen language extension tasks.", field: Box::new(SettingField { organization_override: None, json_path: Some("languages.$(language).tasks.prefer_lsp"), @@ -11223,7 +11223,7 @@ fn edit_prediction_language_settings_section() -> [SettingsPageItem; 5] { title: "Configure Providers".into(), r#type: Default::default(), json_path: Some("edit_predictions.providers"), - description: Some("Set up different edit prediction providers in complement to Zed's built-in Zeta model.".into()), + description: Some("Set up different edit prediction providers in complement to Gwen's built-in Zeta model.".into()), search_aliases: &[], in_json: false, files: USER, @@ -11231,7 +11231,7 @@ fn edit_prediction_language_settings_section() -> [SettingsPageItem; 5] { }), SettingsPageItem::SettingItem(SettingItem { title: "Data Collection", - description: "Controls whether Zed may collect training data when using Zed's Edit Predictions. Data is only collected for files in projects detected as open source. The default value uses the preference previously set via the status-bar toggle, or false if no preference has been stored.", + description: "Controls whether Gwen may collect training data when using Gwen's Edit Predictions. Data is only collected for files in projects detected as open source. The default value uses the preference previously set via the status-bar toggle, or false if no preference has been stored.", field: Box::new(SettingField { organization_override: Some(|org_settings| { const DATA_COLLECTION_DISABLED: EditPredictionDataCollectionChoice = EditPredictionDataCollectionChoice::No; diff --git a/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs b/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs index 5cc7715330..d3cd15a0dd 100644 --- a/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs +++ b/crates/settings_ui/src/pages/edit_prediction_provider_setup.rs @@ -320,7 +320,7 @@ fn render_api_key_provider( .when_some(env_var_name, |this, env_var_name| { this.child({ let label = format!( - "Or set the {} env var and restart Zed.", + "Or set the {} env var and restart Gwen.", env_var_name.as_ref() ); Label::new(label).size(LabelSize::Small).color(Color::Muted) @@ -925,7 +925,7 @@ fn render_zed_provider( .pt_8() .gap_1p5() .child( - SettingsSectionHeader::new("Zed Predictions") + SettingsSectionHeader::new("Gwen Predictions") .icon(IconName::ZedPredict) .no_padding(true), ) diff --git a/crates/settings_ui/src/pages/llm_providers_page.rs b/crates/settings_ui/src/pages/llm_providers_page.rs index 2717d1cd59..705dd1f6bf 100644 --- a/crates/settings_ui/src/pages/llm_providers_page.rs +++ b/crates/settings_ui/src/pages/llm_providers_page.rs @@ -296,7 +296,7 @@ fn render_api_key_providers_item( ) .child( Label::new(format!( - "Or set the {env_var_name} env var and restart Zed for it to take effect." + "Or set the {env_var_name} env var and restart Gwen for it to take effect." )) .size(LabelSize::XSmall) .color(Color::Muted), @@ -1342,10 +1342,10 @@ mod tests { .w_full() .debug_selector(|| "provider-row".into()) .child(render_inline_body( - "Zed".into(), + "Gwen".into(), Some("Subscribed to Business".into()), Some(InlineDescription::Text( - "You have access to Zed's hosted models through your organization." + "You have access to Gwen's hosted models through your organization." .into(), )), cloud::test_support::young_account_configuration(), @@ -1378,7 +1378,7 @@ mod tests { .expect("provider description should be rendered"); let configuration_bounds = visual_context .debug_bounds("zed-ai-configuration") - .expect("Zed AI configuration should be rendered"); + .expect("Gwen AI configuration should be rendered"); assert!( configuration_bounds.right() <= provider_row_bounds.right(), diff --git a/crates/settings_ui/src/pages/sandbox_settings.rs b/crates/settings_ui/src/pages/sandbox_settings.rs index 964345e768..6a70de1e33 100644 --- a/crates/settings_ui/src/pages/sandbox_settings.rs +++ b/crates/settings_ui/src/pages/sandbox_settings.rs @@ -63,7 +63,7 @@ pub(crate) fn render_sandbox_settings_page( "sandbox-enabled", Some("Enable Sandbox"), Some( - "Wrap agent-run terminal commands in an OS-level sandbox. When off, commands run with Zed's own permissions." + "Wrap agent-run terminal commands in an OS-level sandbox. When off, commands run with Gwen's own permissions." .into(), ), sandbox_enabled, diff --git a/crates/settings_ui/src/pages/skill_creator.rs b/crates/settings_ui/src/pages/skill_creator.rs index de998e0da0..8ec6245ff0 100644 --- a/crates/settings_ui/src/pages/skill_creator.rs +++ b/crates/settings_ui/src/pages/skill_creator.rs @@ -710,7 +710,7 @@ impl SkillCreatorPage { .child(match &self.url_import_status { UrlImportStatus::Idle => Label::new( "Paste a GitHub .md URL to fetch it and fill out the form. \ - For private files, Zed retries using GITHUB_TOKEN, if set.", + For private files, Gwen retries using GITHUB_TOKEN, if set.", ) .size(LabelSize::Small) .color(Color::Muted) diff --git a/crates/settings_ui/src/pages/tool_permissions_setup.rs b/crates/settings_ui/src/pages/tool_permissions_setup.rs index d01dd1701d..233b6ef373 100644 --- a/crates/settings_ui/src/pages/tool_permissions_setup.rs +++ b/crates/settings_ui/src/pages/tool_permissions_setup.rs @@ -16,7 +16,7 @@ use crate::{SettingsWindow, components::SettingsInputField}; const HARDCODED_RULES_DESCRIPTION: &str = "`rm -rf` commands are always blocked when run on `$HOME`, `~`, `.`, `..`, or `/`"; -const SETTINGS_DISCLAIMER: &str = "Note: custom tool permissions only apply to the Zed native agent and don’t extend to external agents connected through the Agent Client Protocol (ACP)."; +const SETTINGS_DISCLAIMER: &str = "Note: custom tool permissions only apply to the Gwen native agent and don’t extend to external agents connected through the Agent Client Protocol (ACP)."; /// Tools that support permission rules const TOOLS: &[ToolInfo] = &[ diff --git a/crates/settings_ui/src/settings_ui.rs b/crates/settings_ui/src/settings_ui.rs index 78a83488f9..6ecc5e08d7 100644 --- a/crates/settings_ui/src/settings_ui.rs +++ b/crates/settings_ui/src/settings_ui.rs @@ -893,7 +893,7 @@ fn open_settings_editor_with( cx.open_window( WindowOptions { titlebar: Some(TitlebarOptions { - title: Some("Zed — Settings".into()), + title: Some("Gwen — Settings".into()), appears_transparent: true, traffic_light_position: Some(point(px(12.0), px(12.0))), }), @@ -1716,7 +1716,7 @@ fn all_language_names(cx: &App) -> Vec { .languages .language_names() .into_iter() - .filter(|name| name.as_ref() != "Zed Keybind Context") + .filter(|name| name.as_ref() != "Gwen Keybind Context") .map(Into::into) .collect() } diff --git a/crates/sidebar/src/sidebar_tests.rs b/crates/sidebar/src/sidebar_tests.rs index 941e1a3f2d..c87207c2f3 100644 --- a/crates/sidebar/src/sidebar_tests.rs +++ b/crates/sidebar/src/sidebar_tests.rs @@ -2217,7 +2217,7 @@ async fn test_closing_last_agent_panel_terminal_restores_empty_header(cx: &mut T // placeholder row, so the header reports having threads. assert_eq!( visible_entries_as_strings(&sidebar, cx), - vec!["v [my-project]", " New Zed Agent Thread"] + vec!["v [my-project]", " New Gwen Agent Thread"] ); assert_project_header_has_threads(&sidebar, "my-project", true, cx); diff --git a/crates/theme/src/fallback_themes.rs b/crates/theme/src/fallback_themes.rs index c22a3e13ef..018b7c8fae 100644 --- a/crates/theme/src/fallback_themes.rs +++ b/crates/theme/src/fallback_themes.rs @@ -8,14 +8,14 @@ use crate::{ ThemeFamily, ThemeStyles, default_color_scales, }; -/// The default theme family for Zed. +/// The default theme family for Gwen. /// /// This is used to construct the default theme fallback values, as well as to /// have a theme available at compile time for tests. pub fn zed_default_themes() -> ThemeFamily { ThemeFamily { id: "zed-default".to_string(), - name: "Zed Default".into(), + name: "Gwen Default".into(), author: "".into(), themes: vec![zed_default_dark()], scales: default_color_scales(), diff --git a/crates/theme/src/icon_theme.rs b/crates/theme/src/icon_theme.rs index ef315bb5f7..6609b89fef 100644 --- a/crates/theme/src/icon_theme.rs +++ b/crates/theme/src/icon_theme.rs @@ -421,7 +421,7 @@ fn icon_keys_by_association( } /// The name of the default icon theme. -pub const DEFAULT_ICON_THEME_NAME: &str = "Zed (Default)"; +pub const DEFAULT_ICON_THEME_NAME: &str = "Gwen (Default)"; static DEFAULT_ICON_THEME: LazyLock> = LazyLock::new(|| { Arc::new(IconTheme { diff --git a/crates/title_bar/src/application_menu.rs b/crates/title_bar/src/application_menu.rs index 8ab7590b5b..6e00ba191e 100644 --- a/crates/title_bar/src/application_menu.rs +++ b/crates/title_bar/src/application_menu.rs @@ -517,7 +517,7 @@ mod tests { cx.update(|cx| { cx.set_menus(vec![ - Menu::new("Zed").items([MenuItem::action( + Menu::new("Gwen").items([MenuItem::action( "Settings", OpenApplicationMenu(String::new()), )]), @@ -529,7 +529,7 @@ mod tests { let zed_handle = cx.update(|window, cx| { let zed_handle = app_menu.read_with(cx, |app_menu, _| { - menu_entry(&app_menu.entries, "Zed").handle.clone() + menu_entry(&app_menu.entries, "Gwen").handle.clone() }); zed_handle.show(window, cx); zed_handle diff --git a/crates/title_bar/src/title_bar.rs b/crates/title_bar/src/title_bar.rs index 6d10325b80..bda7be2392 100644 --- a/crates/title_bar/src/title_bar.rs +++ b/crates/title_bar/src/title_bar.rs @@ -1167,13 +1167,13 @@ impl TitleBar { client::Status::UpgradeRequired => { let auto_updater = auto_update::AutoUpdater::get(cx); let label = match auto_updater.map(|auto_update| auto_update.read(cx).status()) { - Some(AutoUpdateStatus::Updated { .. }) => "Please restart Zed to Collaborate", + Some(AutoUpdateStatus::Updated { .. }) => "Please restart Gwen to Collaborate", Some(AutoUpdateStatus::Installing { .. }) | Some(AutoUpdateStatus::Downloading { .. }) | Some(AutoUpdateStatus::Checking) => "Updating...", Some(AutoUpdateStatus::Idle) | Some(AutoUpdateStatus::Errored { .. }) - | None => "Please update Zed to Collaborate", + | None => "Please update Gwen to Collaborate", }; Some( diff --git a/crates/ui/src/components/ai/agent_setup_button.rs b/crates/ui/src/components/ai/agent_setup_button.rs index c30add743b..bb6aa675b7 100644 --- a/crates/ui/src/components/ai/agent_setup_button.rs +++ b/crates/ui/src/components/ai/agent_setup_button.rs @@ -68,7 +68,7 @@ impl Component for AgentSetupButton { "Default", AgentSetupButton::new("preview") .icon(Icon::new(IconName::ZedAgent)) - .name("Zed Agent") + .name("Gwen Agent") .into_any_element(), ) .into_any_element() diff --git a/crates/windows_resources/src/windows_resources.rs b/crates/windows_resources/src/windows_resources.rs index 8181c2a752..4899becdaf 100644 --- a/crates/windows_resources/src/windows_resources.rs +++ b/crates/windows_resources/src/windows_resources.rs @@ -44,9 +44,9 @@ const MANIFEST_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/resources/mani pub fn compile(manifest: bool) -> Result<(), Box> { let channel = option_env!("RELEASE_CHANNEL").unwrap_or("dev"); let (icon_filename, product_name) = match channel { - "stable" => ("app-icon.ico", "Zed"), - "preview" => ("app-icon-preview.ico", "Zed Preview"), - "nightly" => ("app-icon-nightly.ico", "Zed Nightly"), + "stable" => ("app-icon.ico", "Gwen"), + "preview" => ("app-icon-preview.ico", "Gwen Preview"), + "nightly" => ("app-icon-nightly.ico", "Gwen Nightly"), _ => ("app-icon-gwen.ico", "Gwen"), }; let icon = std::path::PathBuf::from(ICON_DIR).join(icon_filename); diff --git a/crates/workspace/src/notifications.rs b/crates/workspace/src/notifications.rs index 175648d14a..095e5e9a81 100644 --- a/crates/workspace/src/notifications.rs +++ b/crates/workspace/src/notifications.rs @@ -1313,7 +1313,7 @@ pub mod simple_message_notification { "Linux desktop portal initialization failed.".into() } fn secondary_message(&self) -> Option { - Some("Zed needs an xdg-desktop-portal implementation to open files.".into()) + Some("Gwen needs an xdg-desktop-portal implementation to open files.".into()) } fn severity(&self) -> ErrorSeverity { ErrorSeverity::Critical @@ -1331,13 +1331,13 @@ pub mod simple_message_notification { struct UpdateRequiredError; impl WorkspaceError for UpdateRequiredError { fn primary_message(&self) -> SharedString { - "An update is required to continue using Zed AI.".into() + "An update is required to continue using Gwen AI.".into() } fn severity(&self) -> ErrorSeverity { ErrorSeverity::Critical } fn primary_action(&self) -> ErrorAction { - ErrorAction::link("Update Zed", "https://zed.dev/releases") + ErrorAction::link("Update Gwen", "https://zed.dev/releases") } fn secondary_action(&self) -> Option { Some(ErrorAction::dismiss()) diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs index 672190aff6..1320d32744 100644 --- a/crates/workspace/src/pane_group.rs +++ b/crates/workspace/src/pane_group.rs @@ -421,11 +421,11 @@ impl PaneLeaderDecorator for PaneRenderContext<'_> { } } ParticipantLocation::UnsharedProject => Some(Label::new(format!( - "{} is viewing an unshared Zed project", + "{} is viewing an unshared Gwen project", leader.user.username ))), ParticipantLocation::External => Some(Label::new(format!( - "{} is viewing a window outside of Zed", + "{} is viewing a window outside of Gwen", leader.user.username ))), }; diff --git a/crates/workspace/src/welcome.rs b/crates/workspace/src/welcome.rs index 55bfd6c8aa..06365958c7 100644 --- a/crates/workspace/src/welcome.rs +++ b/crates/workspace/src/welcome.rs @@ -32,7 +32,7 @@ pub struct OpenRecentProject { actions!( zed, [ - /// Show the Zed welcome screen + /// Show the Gwen welcome screen ShowWelcome ] ); diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs index 02fff7e32f..111768aaef 100644 --- a/crates/workspace/src/workspace.rs +++ b/crates/workspace/src/workspace.rs @@ -10447,9 +10447,9 @@ pub struct OpenChannelNotesById { actions!( zed, [ - /// Opens the Zed log file. + /// Opens the Gwen log file. OpenLog, - /// Reveals the Zed log file in the system file manager. + /// Reveals the Gwen log file in the system file manager. RevealLogInFileManager ] ); @@ -12460,7 +12460,7 @@ mod tests { file_stem: Some("main".to_string()), remote_name: Some("nickname".to_string()), remote_host: Some("example.com".to_string()), - app_name: "Zed", + app_name: "Gwen", branch: Some("main".to_string()), }; @@ -12516,7 +12516,7 @@ mod tests { file_stem: Some("main".to_string()), remote_name: None, remote_host: None, - app_name: "Zed", + app_name: "Gwen", branch: None, }; @@ -12538,14 +12538,14 @@ mod tests { fn test_render_window_title_format_renders_new_variables() { let context = WindowTitleContext { project_name: "project".to_string(), - app_name: "Zed", + app_name: "Gwen", branch: Some("feature/foo".to_string()), ..Default::default() }; assert_eq!( render_window_title_format("${projectName}${separator}${appName}", " — ", &context), - "project — Zed" + "project — Gwen" ); assert_eq!( render_window_title_format("${projectName}${separator}${branch}", " — ", &context), @@ -12947,7 +12947,7 @@ mod tests { }); }); cx.executor().run_until_parked(); - assert_eq!(cx.window_title().as_deref(), Some("Zed — root1, root2")); + assert_eq!(cx.window_title().as_deref(), Some("Gwen — root1, root2")); let item = cx.new(|cx| { TestItem::new(cx).with_project_items(&[TestProjectItem::new_in_worktree( @@ -12964,7 +12964,7 @@ mod tests { let expected_file_path = path!("/root1/src/one.txt"); assert_eq!( cx.window_title().as_deref(), - Some(format!("Zed — root1, root2 — one — {expected_file_path}").as_str()) + Some(format!("Gwen — root1, root2 — one — {expected_file_path}").as_str()) ); } diff --git a/crates/zed/resources/flatpak/manifest-template.json b/crates/zed/resources/flatpak/manifest-template.json index 0a14a1c2b0..84ea427dd6 100644 --- a/crates/zed/resources/flatpak/manifest-template.json +++ b/crates/zed/resources/flatpak/manifest-template.json @@ -38,7 +38,7 @@ }, "build-commands": [ "install -Dm644 $ICON_FILE.png /app/share/icons/hicolor/512x512/apps/$APP_ID.png", - "envsubst < zed.desktop.in > zed.desktop && install -Dm755 zed.desktop /app/share/applications/$APP_ID.desktop", + "envsubst < gwen.desktop.in > gwen.desktop && install -Dm755 gwen.desktop /app/share/applications/$APP_ID.desktop", "envsubst < flatpak/zed.metainfo.xml.in > zed.metainfo.xml && install -Dm644 zed.metainfo.xml /app/share/metainfo/$APP_ID.metainfo.xml", "sed -i -e '/@release_info@/{r flatpak/release-info/$CHANNEL' -e 'd}' /app/share/metainfo/$APP_ID.metainfo.xml", "install -Dm755 bin/zed /app/bin/zed", diff --git a/crates/zed/resources/flatpak/zed.metainfo.xml.in b/crates/zed/resources/flatpak/zed.metainfo.xml.in index ec31f4c285..5c07f9b37c 100644 --- a/crates/zed/resources/flatpak/zed.metainfo.xml.in +++ b/crates/zed/resources/flatpak/zed.metainfo.xml.in @@ -11,7 +11,7 @@

- Productive coding starts with a tool that stays out of your way. Zed blends the power of an IDE with the speed of a lightweight editor for productivity you can feel under your fingertips. + Productive coding starts with a tool that stays out of your way. Gwen blends the power of an IDE with the speed of a lightweight editor for productivity you can feel under your fingertips.

Features:

    @@ -34,13 +34,13 @@ intense - https://zed.dev - https://github.com/zed-industries/zed/issues + https://github.com/kk376/zed + https://github.com/kk376/zed/issues https://zed.dev/faq https://zed.dev/docs/getting-started - https://zed.dev/community-links - https://github.com/zed-industries/zed - https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md + mailto:yenru@yrkaierx.com + https://github.com/kk376/zed + https://github.com/kk376/zed/blob/main/CONTRIBUTING.md offline-only @@ -53,11 +53,11 @@ - Zed with a large project open, showing language server and gitblame support + Gwen with a large project open, showing language server and gitblame support https://zed.dev/img/flatpak/flatpak-1.png - Zed with a file open and a channel message thread in the right sidebar + Gwen with a file open and a channel message thread in the right sidebar https://zed.dev/img/flatpak/flatpak-2.png @@ -65,7 +65,7 @@ https://zed.dev/img/flatpak/flatpak-3.png - Zed's extension list + Gwen's extension list https://zed.dev/img/flatpak/flatpak-4.png diff --git a/crates/zed/resources/gwen.desktop.in b/crates/zed/resources/gwen.desktop.in index 5898a08f60..0ba0414399 100644 --- a/crates/zed/resources/gwen.desktop.in +++ b/crates/zed/resources/gwen.desktop.in @@ -3,7 +3,7 @@ Version=1.0 Type=Application Name=$APP_NAME GenericName=Text Editor -Comment=A fast code editor based on Zed. +Comment=A fast code editor. TryExec=$APP_CLI StartupNotify=$DO_STARTUP_NOTIFY Exec=$APP_CLI $APP_ARGS diff --git a/crates/zed/resources/info/DocumentTypes.plist b/crates/zed/resources/info/DocumentTypes.plist index 0a509d9ddc..e4d126a861 100644 --- a/crates/zed/resources/info/DocumentTypes.plist +++ b/crates/zed/resources/info/DocumentTypes.plist @@ -19,7 +19,7 @@ CFBundleTypeIconFile Document CFBundleTypeName - Zed Text Document + Gwen Text Document CFBundleTypeRole Editor CFBundleTypeOSTypes diff --git a/crates/zed/resources/info/Permissions.plist b/crates/zed/resources/info/Permissions.plist index 04a89fb189..3761e0c18c 100644 --- a/crates/zed/resources/info/Permissions.plist +++ b/crates/zed/resources/info/Permissions.plist @@ -1,26 +1,26 @@ NSSystemAdministrationUsageDescription -The operation being performed by a program in Zed requires elevated permission. +The operation being performed by a program in Gwen requires elevated permission. NSAppleEventsUsageDescription -An application in Zed wants to use AppleScript. +An application in Gwen wants to use AppleScript. NSBluetoothAlwaysUsageDescription -An application in Zed wants to use Bluetooth. +An application in Gwen wants to use Bluetooth. NSCalendarsUsageDescription -An application in Zed wants to use Calendar data. +An application in Gwen wants to use Calendar data. NSCameraUsageDescription -An application in Zed wants to use the camera. +An application in Gwen wants to use the camera. NSContactsUsageDescription -An application in Zed wants to use your contacts. +An application in Gwen wants to use your contacts. NSLocationAlwaysUsageDescription -An application in Zed wants to use your location information, even in the background. +An application in Gwen wants to use your location information, even in the background. NSLocationUsageDescription -An application in Zed wants to use your location information. +An application in Gwen wants to use your location information. NSLocationWhenInUseUsageDescription -An application in Zed wants to use your location information while active. +An application in Gwen wants to use your location information while active. NSMicrophoneUsageDescription -An application in Zed wants to use your microphone. +An application in Gwen wants to use your microphone. NSSpeechRecognitionUsageDescription -An application in Zed wants to use speech recognition. +An application in Gwen wants to use speech recognition. NSRemindersUsageDescription -An application in Zed wants to use your reminders. +An application in Gwen wants to use your reminders. NSAutoFillRequiresTextContentTypeForOneTimeCodeOnMac diff --git a/crates/zed/resources/snap/snapcraft.yaml.in b/crates/zed/resources/snap/snapcraft.yaml.in index 7220b4f16b..3dffd3e8c5 100644 --- a/crates/zed/resources/snap/snapcraft.yaml.in +++ b/crates/zed/resources/snap/snapcraft.yaml.in @@ -1,18 +1,18 @@ name: zed -title: Zed +title: Gwen base: core24 version: "$RELEASE_VERSION" summary: The editor for what's next description: | - Zed is a modern open-source code editor, built from the ground up in Rust with + Gwen is a modern open-source code editor, built from the ground up in Rust with a GPU-accelerated renderer. We help you build software faster than ever before. grade: stable confinement: classic compression: lzo -website: https://zed.dev/ -source-code: https://github.com/zed-industries/zed -issues: https://github.com/zed-industries/zed/issues -contact: https://zed.dev/community-links#support-and-feedback +website: https://github.com/kk376/zed +source-code: https://github.com/kk376/zed +issues: https://github.com/kk376/zed/issues +contact: mailto:yenru@yrkaierx.com parts: zed: diff --git a/crates/zed/resources/windows/gwen.iss b/crates/zed/resources/windows/gwen.iss index b37c18d845..2a19ac44e2 100644 --- a/crates/zed/resources/windows/gwen.iss +++ b/crates/zed/resources/windows/gwen.iss @@ -3,9 +3,9 @@ AppId={#AppId} AppName={#AppName} AppVerName={#AppDisplayName} AppPublisher=yrkaierx -AppPublisherURL=https://www.zed.dev/ -AppSupportURL=https://www.zed.dev/ -AppUpdatesURL=https://www.zed.dev/ +AppPublisherURL=https://github.com/kk376/zed +AppSupportURL=https://github.com/kk376/zed +AppUpdatesURL=https://github.com/kk376/zed DefaultGroupName={#AppName} DisableProgramGroupPage=yes DisableReadyPage=yes diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs index 3567d7dd79..96f7c0c092 100644 --- a/crates/zed/src/main.rs +++ b/crates/zed/src/main.rs @@ -1708,14 +1708,14 @@ struct Args { /// Sets a custom directory for all user data (e.g., database, extensions, logs). /// /// This overrides the default platform-specific data directory location. - /// On macOS, the default is `~/Library/Application Support/Zed`. - /// On Linux/FreeBSD, the default is `$XDG_DATA_HOME/zed`. - /// On Windows, the default is `%LOCALAPPDATA%\Zed`. + /// On macOS, the default is `~/Library/Application Support/Gwen`. + /// On Linux/FreeBSD, the default is `$XDG_DATA_HOME/gwen`. + /// On Windows, the default is `%LOCALAPPDATA%\Gwen`. #[arg(long, value_name = "DIR", verbatim_doc_comment)] user_data_dir: Option, /// The username and WSL distribution to use when opening paths. If not specified, - /// Zed will attempt to open the paths directly. + /// Gwen will attempt to open the paths directly. /// /// The username is optional, and if not specified, the default user for the distribution /// will be used. @@ -1741,12 +1741,12 @@ struct Args { /// Prints system specs. /// /// Useful for submitting issues on GitHub when encountering a bug that - /// prevents Zed from starting, so you can't run `zed: copy system specs to + /// prevents Gwen from starting, so you can't run `zed: copy system specs to /// clipboard` #[arg(long)] system_specs: bool, - /// Used for recording minidumps on crashes by having Zed run a separate + /// Used for recording minidumps on crashes by having Gwen run a separate /// process communicating over a socket. #[arg(long, hide = true)] crash_handler: Option, @@ -1764,7 +1764,7 @@ struct Args { dock_action: Option, /// Used for SSH/Git password authentication, to remove the need for netcat as a dependency, - /// by having Zed act like netcat communicating over a Unix socket. + /// by having Gwen act like netcat communicating over a Unix socket. #[arg(long)] #[cfg(not(target_os = "windows"))] #[arg(hide = true)] @@ -1782,12 +1782,12 @@ struct Args { #[arg(long, hide = true)] record_etw_trace: bool, - /// The PID of the Zed process to trace for heap analysis. + /// The PID of the Gwen process to trace for heap analysis. #[cfg(target_os = "windows")] #[arg(long, hide = true)] etw_zed_pid: Option, - /// Unix socket path for IPC with the parent Zed process. + /// Unix socket path for IPC with the parent Gwen process. #[cfg(target_os = "windows")] #[arg(long, hide = true)] etw_socket: Option, diff --git a/crates/zed/src/reliability/hang_detection.rs b/crates/zed/src/reliability/hang_detection.rs index 55423269ae..c370f273df 100644 --- a/crates/zed/src/reliability/hang_detection.rs +++ b/crates/zed/src/reliability/hang_detection.rs @@ -61,7 +61,7 @@ pub(crate) fn start(client: Arc, cx: &mut App) { cx.on_action(move |_: &HangAction, _| { log::warn!( "Hanging the foreground for {hang_time:?} by blocking in an action. \ - Zed will be unresponsive for that time. This should trigger a report in the log", + Gwen will be unresponsive for that time. This should trigger a report in the log", ); thread::sleep(hang_time + Duration::from_micros(1)); log::warn!("Hang ended"); @@ -81,7 +81,7 @@ pub(crate) fn start(client: Arc, cx: &mut App) { cx.spawn(async move |_| { log::warn!( "Hanging the foreground executor for {hang_time:?} seconds to test \ - performance monitoring! Zed will be unresponsive for that time. \ + performance monitoring! Gwen will be unresponsive for that time. \ This should trigger a report in the log" ); thread::sleep(hang_time + Duration::from_micros(1)); diff --git a/crates/zed/src/watcher_debug.rs b/crates/zed/src/watcher_debug.rs index 4d432ea51d..1b88605a67 100644 --- a/crates/zed/src/watcher_debug.rs +++ b/crates/zed/src/watcher_debug.rs @@ -76,7 +76,7 @@ struct Export { exclusion_scope: &'static str, } -const EXCLUSION_SCOPE: &str = "Patterns Zed skips when scanning your open local projects. Excluded files may still produce watcher events."; +const EXCLUSION_SCOPE: &str = "Patterns Gwen skips when scanning your open local projects. Excluded files may still produce watcher events."; #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)] enum WatcherTab { diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs index 6b3c070368..a205a8f3e8 100644 --- a/crates/zed/src/zed.rs +++ b/crates/zed/src/zed.rs @@ -745,7 +745,7 @@ fn show_software_emulation_warning_if_needed( }; let message = format!( db::indoc! {r#" - Zed uses {} for rendering and requires a compatible GPU. + Gwen uses {} for rendering and requires a compatible GPU. Currently you are using a software emulated GPU ({}) which will result in awful performance. @@ -2516,7 +2516,7 @@ fn open_worktree_setup_tasks_file( // Kept harmless on purpose: tasks with the `create_worktree` hook run automatically // when a worktree is created, so the example must be safe to save unedited. const WORKTREE_SETUP_TASK_EXAMPLE: &str = r#" { - // Runs automatically after Zed creates a new git worktree. + // Runs automatically after Gwen creates a new git worktree. // $ZED_WORKTREE_ROOT is the new worktree's root directory, and // $ZED_MAIN_GIT_WORKTREE is the original repository's working directory. "label": "Set up new worktree", diff --git a/crates/zed/src/zed/app_menus.rs b/crates/zed/src/zed/app_menus.rs index c4c8bd259c..3a4d6ef3fe 100644 --- a/crates/zed/src/zed/app_menus.rs +++ b/crates/zed/src/zed/app_menus.rs @@ -103,13 +103,13 @@ pub fn app_menus(cx: &mut App) -> Vec { MenuItem::action("Install CLI", install_cli::InstallCliBinary), MenuItem::separator(), #[cfg(target_os = "macos")] - MenuItem::action("Hide Zed", super::Hide), + MenuItem::action("Hide Gwen", super::Hide), #[cfg(target_os = "macos")] MenuItem::action("Hide Others", super::HideOthers), #[cfg(target_os = "macos")] MenuItem::action("Show All", super::ShowAll), MenuItem::separator(), - MenuItem::action("Quit Zed", Quit), + MenuItem::action("Quit Gwen", Quit), ], }, Menu { @@ -322,9 +322,9 @@ pub fn app_menus(cx: &mut App) -> Vec { url: "https://zed.dev/docs".into(), }, ), - MenuItem::action("Zed Repository", feedback::OpenZedRepo), + MenuItem::action("Gwen Repository", feedback::OpenZedRepo), MenuItem::action( - "Zed Twitter", + "Gwen Twitter", super::OpenBrowser { url: "https://twitter.com/zeddotdev".into(), }, diff --git a/crates/zed/src/zed/move_to_applications.rs b/crates/zed/src/zed/move_to_applications.rs index 9c0ae774aa..5ef3b5a0c5 100644 --- a/crates/zed/src/zed/move_to_applications.rs +++ b/crates/zed/src/zed/move_to_applications.rs @@ -73,9 +73,9 @@ impl MoveToApplicationsRequest { let response = cx .prompt( PromptLevel::Info, - "Move Zed to Applications?", + "Move Gwen to Applications?", Some( - "Zed is running from a temporary location. Move it to Applications to finish installing it.", + "Gwen is running from a temporary location. Move it to Applications to finish installing it.", ), &[ PromptButton::ok("Yes"), @@ -103,7 +103,7 @@ impl MoveToApplicationsRequest { .ok(); cx.prompt( PromptLevel::Critical, - "Failed to move Zed to Applications", + "Failed to move Gwen to Applications", Some(&error.to_string()), &["OK"], ) diff --git a/crates/zed_actions/src/lib.rs b/crates/zed_actions/src/lib.rs index 149991a64d..4086f8d01a 100644 --- a/crates/zed_actions/src/lib.rs +++ b/crates/zed_actions/src/lib.rs @@ -65,15 +65,15 @@ actions!( OpenServerSettings, /// Quits the application. Quit, - /// Shows information about Zed. + /// Shows information about Gwen. About, /// Opens the documentation website. OpenDocs, /// Views open source licenses. OpenLicenses, - /// Opens the Zed status page. + /// Opens the Gwen status page. OpenStatusPage, - /// Opens the Zed merch store. + /// Opens the Gwen merch store. GetMerch, /// Opens the telemetry log. OpenTelemetryLog, @@ -321,7 +321,7 @@ pub enum NewWorktreeBranchTarget { #[action(namespace = git)] #[serde(deny_unknown_fields)] pub struct CreateWorktree { - /// When this is None, Zed will randomly generate a worktree name. + /// When this is None, Gwen will randomly generate a worktree name. pub worktree_name: Option, pub branch_target: NewWorktreeBranchTarget, } @@ -435,7 +435,7 @@ pub mod feedback { actions!( feedback, [ - /// Opens email client to send feedback to Zed support. + /// Opens email client to send feedback to Gwen support. EmailZed, /// Opens the bug report form. FileBugReport, @@ -807,7 +807,7 @@ pub mod outline { actions!( zed_predict_onboarding, [ - /// Opens the Zed Predict onboarding modal. + /// Opens the Gwen Predict onboarding modal. OpenZedPredictOnboarding ] ); diff --git a/script/bundle-freebsd b/script/bundle-freebsd index 87c9459ffb..1f2cd6d6a0 100755 --- a/script/bundle-freebsd +++ b/script/bundle-freebsd @@ -158,4 +158,4 @@ arch=$(uname -m) # tar -czvf "${target_dir}/release/$archive" -C ${temp_dir} "zed$suffix.app" gzip -f --stdout --best "${target_dir}/${remote_server_triple}/release/remote_server" \ - > "${target_dir}/zed-remote-server-freebsd-x86_64.gz" + > "${target_dir}/gwen-remote-server-freebsd-x86_64.gz" diff --git a/script/bundle-windows.ps1 b/script/bundle-windows.ps1 index 609f78d1d0..1ec4930bb7 100644 --- a/script/bundle-windows.ps1 +++ b/script/bundle-windows.ps1 @@ -114,8 +114,8 @@ function GenerateLicenses { } function BuildZedAndItsFriends { - Write-Output "Building Zed and its friends, for channel: $channel" - # Build zed.exe, cli.exe and auto_update_helper.exe + Write-Output "Building Gwen and its friends, for channel: $channel" + # Build gwen.exe, cli.exe and auto_update_helper.exe cargo --config .cargo/bundle-config.toml build --release --package zed --package cli --package auto_update_helper --target $target Copy-Item -Path ".\$CargoOutDir\gwen.exe" -Destination "$innoDir\Gwen.exe" -Force Copy-Item -Path ".\$CargoOutDir\cli.exe" -Destination "$innoDir\cli.exe" -Force @@ -218,7 +218,7 @@ function SignZedAndItsFriends { return } - $files = "$innoDir\Zed.exe,$innoDir\cli.exe,$innoDir\auto_update_helper.exe,$innoDir\zed_explorer_command_injector.dll,$innoDir\zed_explorer_command_injector.appx" + $files = "$innoDir\Gwen.exe,$innoDir\cli.exe,$innoDir\auto_update_helper.exe,$innoDir\zed_explorer_command_injector.dll,$innoDir\zed_explorer_command_injector.appx" & "$innoDir\sign.ps1" $files } @@ -286,45 +286,45 @@ function BuildInstaller { $issFilePath = "$innoDir\gwen.iss" switch ($channel) { "stable" { - $appId = "{{2DB0DA96-CA55-49BB-AF4F-64AF36A86712}" + $appId = "{{807F10E8-D90A-4349-9350-84DCA47E0E24}" $appIconName = "app-icon" - $appName = "Zed" - $appDisplayName = "Zed" - $appSetupName = "Zed-$Architecture" + $appName = "Gwen" + $appDisplayName = "Gwen" + $appSetupName = "Gwen-$Architecture" # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs - $appMutex = "Zed-Stable-Instance-Mutex" - $appExeName = "Zed" - $regValueName = "Zed" - $appUserId = "ZedIndustries.Zed" - $appShellNameShort = "Z&ed" + $appMutex = "Gwen-Editor-Stable-Instance-Mutex" + $appExeName = "Gwen" + $regValueName = "Gwen" + $appUserId = "yrkaierx.Gwen" + $appShellNameShort = "Gwen" $appAppxFullName = "ZedIndustries.Zed_1.0.0.0_neutral__japxn1gcva8rg" } "preview" { - $appId = "{{F70E4811-D0E2-4D88-AC99-D63752799F95}" + $appId = "{{2FFE7705-2B1B-4566-82F9-A4BA6371CCCA}" $appIconName = "app-icon-preview" - $appName = "Zed Preview" - $appDisplayName = "Zed Preview" - $appSetupName = "Zed-$Architecture" + $appName = "Gwen Preview" + $appDisplayName = "Gwen Preview" + $appSetupName = "Gwen-$Architecture" # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs - $appMutex = "Zed-Preview-Instance-Mutex" - $appExeName = "Zed" - $regValueName = "ZedPreview" - $appUserId = "ZedIndustries.Zed.Preview" - $appShellNameShort = "Z&ed Preview" + $appMutex = "Gwen-Editor-Preview-Instance-Mutex" + $appExeName = "Gwen" + $regValueName = "GwenPreview" + $appUserId = "yrkaierx.Gwen.Preview" + $appShellNameShort = "Gwen Preview" $appAppxFullName = "ZedIndustries.Zed.Preview_1.0.0.0_neutral__japxn1gcva8rg" } "nightly" { - $appId = "{{1BDB21D3-14E7-433C-843C-9C97382B2FE0}" + $appId = "{{196D8DA5-35EB-47E0-92BE-ABBB0929DAB3}" $appIconName = "app-icon-nightly" - $appName = "Zed Nightly" - $appDisplayName = "Zed Nightly" - $appSetupName = "Zed-$Architecture" + $appName = "Gwen Nightly" + $appDisplayName = "Gwen Nightly" + $appSetupName = "Gwen-$Architecture" # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs - $appMutex = "Zed-Nightly-Instance-Mutex" - $appExeName = "Zed" - $regValueName = "ZedNightly" - $appUserId = "ZedIndustries.Zed.Nightly" - $appShellNameShort = "Z&ed Editor Nightly" + $appMutex = "Gwen-Editor-Nightly-Instance-Mutex" + $appExeName = "Gwen" + $regValueName = "GwenNightly" + $appUserId = "yrkaierx.Gwen.Nightly" + $appShellNameShort = "Gwen Nightly" $appAppxFullName = "ZedIndustries.Zed.Nightly_1.0.0.0_neutral__japxn1gcva8rg" } "dev" { @@ -377,7 +377,7 @@ function BuildInstaller { $innoArgs = @($issFilePath) + $defs if($canCodeSign) { - # Checked by zed.iss to decide whether to sign the installer. + # Checked by gwen.iss to decide whether to sign the installer. $env:ZED_SIGN_BUNDLE = "1" $signTool = "powershell.exe -ExecutionPolicy Bypass -File $innoDir\sign.ps1 `$f" $innoArgs += "/sDefaultsign=`"$signTool`"" @@ -426,8 +426,8 @@ if($env:CI) { if ($buildSuccess) { Write-Output "Build successful" if ($Install) { - Write-Output "Installing Zed..." - Start-Process -FilePath "$env:ZED_WORKSPACE/target/ZedEditorUserSetup-x64-$env:RELEASE_VERSION.exe" + Write-Output "Installing Gwen..." + Start-Process -FilePath "$env:ZED_WORKSPACE/target/Gwen-$Architecture.exe" } exit 0 }