Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

assistant2: Rename assistant2 actions to agent (#27877)

Browse source 
This PR renames the `assistant2` actions to `agent`.

Note that any `assistant` actions have been left as-is for now so that
there aren't any changes to users not in the feature flag.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2025-04-01 17:25:30 -04:00 • committed by GitHub
parent 1567967309
commit 8f25251faf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

48
assets/keymaps/default-linux.json
View file

@ -149,8 +149,8 @@
{ {
"context": "AssistantDiff", "context": "AssistantDiff",
"bindings": { "bindings": {
"ctrl-y": "assistant2::ToggleKeep", "ctrl-y": "agent::ToggleKeep",
"ctrl-k ctrl-r": "assistant2::Reject" "ctrl-k ctrl-r": "agent::Reject"
} }
}, },
{ {
@ -620,32 +620,32 @@
{ {
"context": "AgentPanel", "context": "AgentPanel",
"bindings": { "bindings": {
"ctrl-n": "assistant2::NewThread", "ctrl-n": "agent::NewThread",
"new": "assistant2::NewThread", "new": "agent::NewThread",
"ctrl-alt-n": "assistant2::NewPromptEditor", "ctrl-alt-n": "agent::NewPromptEditor",
"ctrl-shift-h": "assistant2::OpenHistory", "ctrl-shift-h": "agent::OpenHistory",
"ctrl-alt-c": "assistant2::OpenConfiguration", "ctrl-alt-c": "agent::OpenConfiguration",
"ctrl-i": "assistant2::ToggleProfileSelector", "ctrl-i": "agent::ToggleProfileSelector",
"ctrl-alt-/": "assistant::ToggleModelSelector", "ctrl-alt-/": "assistant::ToggleModelSelector",
"ctrl-shift-a": "assistant2::ToggleContextPicker", "ctrl-shift-a": "agent::ToggleContextPicker",
"ctrl-e": "assistant2::ChatMode", "ctrl-e": "agent::ChatMode",
"ctrl-alt-e": "assistant2::RemoveAllContext" "ctrl-alt-e": "agent::RemoveAllContext"
} }
}, },
{ {
"context": "AgentPanel && prompt_editor", "context": "AgentPanel && prompt_editor",
"use_key_equivalents": true, "use_key_equivalents": true,
"bindings": { "bindings": {
"cmd-n": "assistant2::NewPromptEditor", "cmd-n": "agent::NewPromptEditor",
"cmd-alt-t": "assistant2::NewThread" "cmd-alt-t": "agent::NewThread"
} }
}, },
{ {
"context": "MessageEditor > Editor", "context": "MessageEditor > Editor",
"bindings": { "bindings": {
"enter": "assistant2::Chat", "enter": "agent::Chat",
"ctrl-i": "assistant2::ToggleProfileSelector", "ctrl-i": "agent::ToggleProfileSelector",
"shift-ctrl-r": "assistant2::OpenAssistantDiff" "shift-ctrl-r": "agent::OpenAssistantDiff"
} }
}, },
{ {
@ -660,18 +660,18 @@
{ {
"context": "ContextStrip", "context": "ContextStrip",
"bindings": { "bindings": {
"up": "assistant2::FocusUp", "up": "agent::FocusUp",
"right": "assistant2::FocusRight", "right": "agent::FocusRight",
"left": "assistant2::FocusLeft", "left": "agent::FocusLeft",
"down": "assistant2::FocusDown", "down": "agent::FocusDown",
"backspace": "assistant2::RemoveFocusedContext", "backspace": "agent::RemoveFocusedContext",
"enter": "assistant2::AcceptSuggestedContext" "enter": "agent::AcceptSuggestedContext"
} }
}, },
{ {
"context": "ThreadHistory", "context": "ThreadHistory",
"bindings": { "bindings": {
"backspace": "assistant2::RemoveSelectedThread" "backspace": "agent::RemoveSelectedThread"
} }
}, },
{ {
@ -679,7 +679,7 @@
"bindings": { "bindings": {
"ctrl-[": "assistant::CyclePreviousInlineAssist", "ctrl-[": "assistant::CyclePreviousInlineAssist",
"ctrl-]": "assistant::CycleNextInlineAssist", "ctrl-]": "assistant::CycleNextInlineAssist",
"ctrl-alt-e": "assistant2::RemoveAllContext" "ctrl-alt-e": "agent::RemoveAllContext"
} }
}, },
{ {

48
assets/keymaps/default-macos.json
View file

@ -241,8 +241,8 @@
"context": "AssistantDiff", "context": "AssistantDiff",
"use_key_equivalents": true, "use_key_equivalents": true,
"bindings": { "bindings": {
"cmd-y": "assistant2::ToggleKeep", "cmd-y": "agent::ToggleKeep",
"cmd-alt-z": "assistant2::Reject" "cmd-alt-z": "agent::Reject"
} }
}, },
{ {
@ -280,32 +280,32 @@
"context": "AgentPanel", "context": "AgentPanel",
"use_key_equivalents": true, "use_key_equivalents": true,
"bindings": { "bindings": {
"cmd-n": "assistant2::NewThread", "cmd-n": "agent::NewThread",
"cmd-alt-n": "assistant2::NewPromptEditor", "cmd-alt-n": "agent::NewPromptEditor",
"cmd-shift-h": "assistant2::OpenHistory", "cmd-shift-h": "agent::OpenHistory",
"cmd-alt-c": "assistant2::OpenConfiguration", "cmd-alt-c": "agent::OpenConfiguration",
"cmd-i": "assistant2::ToggleProfileSelector", "cmd-i": "agent::ToggleProfileSelector",
"cmd-alt-/": "assistant::ToggleModelSelector", "cmd-alt-/": "assistant::ToggleModelSelector",
"cmd-shift-a": "assistant2::ToggleContextPicker", "cmd-shift-a": "agent::ToggleContextPicker",
"cmd-e": "assistant2::ChatMode", "cmd-e": "agent::ChatMode",
"cmd-alt-e": "assistant2::RemoveAllContext" "cmd-alt-e": "agent::RemoveAllContext"
} }
}, },
{ {
"context": "AgentPanel && prompt_editor", "context": "AgentPanel && prompt_editor",
"use_key_equivalents": true, "use_key_equivalents": true,
"bindings": { "bindings": {
"cmd-n": "assistant2::NewPromptEditor", "cmd-n": "agent::NewPromptEditor",
"cmd-alt-t": "assistant2::NewThread" "cmd-alt-t": "agent::NewThread"
} }
}, },
{ {
"context": "MessageEditor > Editor", "context": "MessageEditor > Editor",
"use_key_equivalents": true, "use_key_equivalents": true,
"bindings": { "bindings": {
"enter": "assistant2::Chat", "enter": "agent::Chat",
"cmd-i": "assistant2::ToggleProfileSelector", "cmd-i": "agent::ToggleProfileSelector",
"shift-ctrl-r": "assistant2::OpenAssistantDiff" "shift-ctrl-r": "agent::OpenAssistantDiff"
} }
}, },
{ {
@ -321,18 +321,18 @@
"context": "ContextStrip", "context": "ContextStrip",
"use_key_equivalents": true, "use_key_equivalents": true,
"bindings": { "bindings": {
"up": "assistant2::FocusUp", "up": "agent::FocusUp",
"right": "assistant2::FocusRight", "right": "agent::FocusRight",
"left": "assistant2::FocusLeft", "left": "agent::FocusLeft",
"down": "assistant2::FocusDown", "down": "agent::FocusDown",
"backspace": "assistant2::RemoveFocusedContext", "backspace": "agent::RemoveFocusedContext",
"enter": "assistant2::AcceptSuggestedContext" "enter": "agent::AcceptSuggestedContext"
} }
}, },
{ {
"context": "ThreadHistory", "context": "ThreadHistory",
"bindings": { "bindings": {
"backspace": "assistant2::RemoveSelectedThread" "backspace": "agent::RemoveSelectedThread"
} }
}, },
{ {
@ -708,9 +708,9 @@
"context": "PromptEditor", "context": "PromptEditor",
"use_key_equivalents": true, "use_key_equivalents": true,
"bindings": { "bindings": {
"cmd-shift-a": "assistant2::ToggleContextPicker", "cmd-shift-a": "agent::ToggleContextPicker",
"cmd-alt-/": "assistant::ToggleModelSelector", "cmd-alt-/": "assistant::ToggleModelSelector",
"cmd-alt-e": "assistant2::RemoveAllContext", "cmd-alt-e": "agent::RemoveAllContext",
"ctrl-[": "assistant::CyclePreviousInlineAssist", "ctrl-[": "assistant::CyclePreviousInlineAssist",
"ctrl-]": "assistant::CycleNextInlineAssist" "ctrl-]": "assistant::CycleNextInlineAssist"
} }

6
crates/assistant2/src/assistant.rs
View file

@ -43,7 +43,7 @@ pub use crate::thread_store::ThreadStore;
pub use assistant_diff::{AssistantDiff, AssistantDiffToolbar}; pub use assistant_diff::{AssistantDiff, AssistantDiffToolbar};
actions!( actions!(
assistant2, agent,
[ [
NewThread, NewThread,
NewPromptEditor, NewPromptEditor,
@ -87,9 +87,9 @@ impl ManageProfiles {
} }
} }
impl_actions!(assistant, [ManageProfiles]); impl_actions!(agent, [ManageProfiles]);
const NAMESPACE: &str = "assistant2"; const NAMESPACE: &str = "agent";
/// Initializes the `assistant2` crate. /// Initializes the `assistant2` crate.
pub fn init( pub fn init(