Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow the use of both Assistants when in the assistant2 feature flag #22150

Merged
merged 2 commits into from
Dec 17, 2024

Conversation

maxdeviant
Copy link
Member

This PR makes it so both Assistant panels are visible when in the assistant2 feature flag.

This way folks can continue using Assistant1 if Assistant2 isn't meeting their needs.

Right now they are shown as two different panels shown in the status bar (although using the same icon), but this is just a temporary state until we can surface the Assistant1 functionality in Assistant2 somehow.

Note that the inline assist will always use the Assistant2 panel.

Release Notes:

  • N/A

@maxdeviant maxdeviant self-assigned this Dec 17, 2024
@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Dec 17, 2024
})?;
let git_ui_enabled = git_ui_feature_flag.await || is_staff;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is_staff check was redundant with the staff-gating on the feature flag.

@maxdeviant maxdeviant merged commit 1c48689 into main Dec 17, 2024
12 checks passed
@maxdeviant maxdeviant deleted the marshall/assistant2-allow-assistant1 branch December 17, 2024 19:24
helgemahrt pushed a commit to helgemahrt/zed that referenced this pull request Dec 18, 2024
zed-industries#22150)

This PR makes it so both Assistant panels are visible when in the
`assistant2` feature flag.

This way folks can continue using Assistant1 if Assistant2 isn't meeting
their needs.

Right now they are shown as two different panels shown in the status bar
(although using the same icon), but this is just a temporary state until
we can surface the Assistant1 functionality in Assistant2 somehow.

Note that the inline assist will always use the Assistant2 panel.

Release Notes:

- N/A
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed The user has signed the Contributor License Agreement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant