Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,6 @@ embed-resource = "3.0"

# Note that we support channel-specific enables for these features
[features]
ai_resume_button = []
autoupdate = []
figma_detection = []
bundled_skills = []
Expand Down Expand Up @@ -544,7 +543,6 @@ default = [
"interactive_conversation_management_view",
"shared_block_title_generation",
"tab_close_button_on_left",
"ai_resume_button",
"code_find_replace",
"ai_context_menu_code",
"agent_decides_command_execution",
Expand Down
1 change: 0 additions & 1 deletion app/src/ai/blocklist/block/view_impl/output.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2056,7 +2056,6 @@ fn render_stopped_output(props: Props, app: &AppContext) -> Box<dyn Element> {
if props
.model
.is_latest_exchange_in_terminal_pane(props.terminal_view_id, app)
&& FeatureFlag::AIResumeButton.is_enabled()
{
let ui_builder = appearance.ui_builder().clone();

Expand Down
2 changes: 0 additions & 2 deletions app/src/features.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,6 @@ fn enabled_features() -> HashSet<FeatureFlag> {
FeatureFlag::AIContextMenuEnabled,
#[cfg(feature = "at_menu_outside_of_ai_mode")]
FeatureFlag::AtMenuOutsideOfAIMode,
#[cfg(feature = "ai_resume_button")]
FeatureFlag::AIResumeButton,
#[cfg(feature = "figma_detection")]
FeatureFlag::FigmaDetection,
#[cfg(feature = "agent_decides_command_execution")]
Expand Down
16 changes: 7 additions & 9 deletions app/src/terminal/view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28025,15 +28025,13 @@ impl View for TerminalView {
};
// Set CanResumeConversation flag if the latest exchange (across all tasks,
// including subtasks) was manually cancelled or finished with an error.
if FeatureFlag::AIResumeButton.is_enabled() {
let latest_exchange = active_conversation.and_then(|c| c.latest_exchange());
let was_manually_cancelled = latest_exchange
.and_then(|e| e.output_status.cancel_reason())
.is_some_and(|reason| reason.is_manually_cancelled());
let has_error = active_conversation.is_some_and(|c| c.status().is_error());
if was_manually_cancelled || has_error {
context.set.insert(init::CAN_RESUME_CONVERSATION_KEY);
}
let latest_exchange = active_conversation.and_then(|c| c.latest_exchange());
let was_manually_cancelled = latest_exchange
.and_then(|e| e.output_status.cancel_reason())
.is_some_and(|reason| reason.is_manually_cancelled());
let has_error = active_conversation.is_some_and(|c| c.status().is_error());
if was_manually_cancelled || has_error {
context.set.insert(init::CAN_RESUME_CONVERSATION_KEY);
}
if active_conversation
.as_ref()
Expand Down
3 changes: 0 additions & 3 deletions crates/warp_features/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,6 @@ pub enum FeatureFlag {
/// Enables the AI context menu outside of AI input mode.
AtMenuOutsideOfAIMode,

/// Enables the resume button for cancelled AI conversations.
AIResumeButton,

/// Enables the agent to decide whether to execute a command.
AgentDecidesCommandExecution,

Expand Down
Loading