Improve workspace distinction and persist active terminal blocks

.gitignore

@@ -15,6 +15,7 @@ app/src/server/graphql/schema/generated
 crates/command-signatures-v2/js/build
 crates/command-signatures-v2/js/node_modules
 .worktrees/
+/.superpowers/
 /target-check
 # For testing changes to the channel versions file
 channel_versions_test.json
@@ -79,3 +80,5 @@ official-website/
 docs/openwarp-cloud-removal-plan.md
 .omx/
 .tmp/
+.codegraph/
+.cursor/

app/src/ai/agent/api.rs

@@ -55,7 +55,11 @@ impl ServerConversationToken {
     }
 
     pub fn debug_link(&self) -> String {
-        format!("{}://debug/maa/{}", ChannelState::url_scheme(), self.as_str())
+        format!(
+            "{}://debug/maa/{}",
+            ChannelState::url_scheme(),
+            self.as_str()
+        )
     }
 
     pub fn conversation_link(&self) -> String {

app/src/ai/agent/api_tests.rs

@@ -14,9 +14,9 @@ use crate::cloud_object::model::persistence::ObjectStoreModel;
 use crate::cloud_object::model::view::ObjectStoreViewModel;
 use crate::cloud_object::update_manager::UpdateManager;
 use crate::cloud_object::{StoredObjectMetadata, StoredObjectPermissions};
-use crate::server_time::ServerTimestamp;
 use crate::notebooks::manager::NotebookManager;
 use crate::server::ids::SyncId;
+use crate::server_time::ServerTimestamp;
 use crate::settings::AISettings;
 use crate::system::SystemStats;
 use crate::workspaces::user_profiles::UserProfiles;

app/src/ai/agent/conversation_tests.rs

@@ -154,7 +154,11 @@ fn run_shell_command_tool() -> api::message::tool_call::Tool {
     })
 }
 
-fn tool_call_message_with_tool(id: &str, call_id: &str, tool: api::message::tool_call::Tool) -> api::Message {
+fn tool_call_message_with_tool(
+    id: &str,
+    call_id: &str,
+    tool: api::message::tool_call::Tool,
+) -> api::Message {
     api::Message {
         id: id.to_string(),
         task_id: "root-task".to_string(),
@@ -475,11 +479,7 @@ fn test_cli_subagent_serialized_block_preserves_block_id_and_metadata() {
             api::Task {
                 id: "root-task".to_string(),
                 messages: vec![
-                    tool_call_message_with_tool(
-                        "tool-call-1",
-                        "call-1",
-                        run_shell_command_tool(),
-                    ),
+                    tool_call_message_with_tool("tool-call-1", "call-1", run_shell_command_tool()),
                     tool_call_result_message_with_result(
                         "tool-result-1",
                         "call-1",

app/src/ai/agent_providers/active_ai/mod.rs

@@ -172,7 +172,10 @@ pub mod prompt_suggestions {
                 }
             }
         };
-        let system = render("prompt_suggestions_system.j2", context! { language => language });
+        let system = render(
+            "prompt_suggestions_system.j2",
+            context! { language => language },
+        );
         let user = render(
             "prompt_suggestions_user.j2",
             context! {
@@ -433,9 +436,12 @@ pub mod next_command {
             .into_iter()
             .map(|(name, content)| UserRuleCtx { name, content })
             .collect();
-        let system = render("next_command_system.j2", context! {
-            user_rules => user_rule_ctxs,
-        });
+        let system = render(
+            "next_command_system.j2",
+            context! {
+                user_rules => user_rule_ctxs,
+            },
+        );
         let user = render(
             "next_command_user.j2",
             context! {

app/src/ai/agent_sdk/driver.rs

@@ -1518,9 +1518,7 @@ impl AgentDriver {
     fn handle_terminal_driver_event(&mut self, event: &TerminalDriverEvent) {
         match event {
             TerminalDriverEvent::SlowBootstrap => {
-                eprintln!(
-                    "Warning: Terminal session is slow to bootstrap."
-                );
+                eprintln!("Warning: Terminal session is slow to bootstrap.");
             }
         }
     }

app/src/ai/agent_sdk/mod.rs

@@ -177,9 +177,7 @@ fn run_agent(
             Ok(())
         }
         AgentCommand::Profile(sub) => profiles::run(ctx, global_options, sub),
-        AgentCommand::List(_) => Err(anyhow::anyhow!(
-            "Agent skill listing is disabled in Zap"
-        )),
+        AgentCommand::List(_) => Err(anyhow::anyhow!("Agent skill listing is disabled in Zap")),
     }
 }
 

app/src/ai/agent_tips.rs

@@ -140,7 +140,6 @@ static DEFAULT_TIPS: LazyLock<Vec<AgentTip>> = LazyLock::new(|| {
             action: None,
             kind: AgentTipKind::Context,
         },
-
         AgentTip {
             description: crate::t!("agent-tip-agent-profiles"),
             link: Some("".to_string()),
@@ -411,10 +410,7 @@ pub fn get_agent_tips(ctx: &AppContext) -> Vec<AgentTip> {
     {
         tips.push(AgentTip {
             description: crate::t!("agent-tip-voice-input"),
-            link: Some(
-                ""
-                    .to_string(),
-            ),
+            link: Some("".to_string()),
             binding_name: Some("FN"),
             action: None,
             kind: AgentTipKind::General,

app/src/ai/blocklist/action_model/execute/read_skill.rs

@@ -1,14 +1,14 @@
 use super::{ActionExecution, AnyActionExecution, ExecuteActionInput, PreprocessActionInput};
 #[cfg(feature = "local_fs")]
 use crate::ai::agent::AIAgentActionResultType;
-use crate::ai::skills::{SkillManager, SkillTelemetryEvent};
 #[cfg(feature = "local_fs")]
 use crate::ai::skills::extract_skill_parent_directory;
+use crate::ai::skills::{SkillManager, SkillTelemetryEvent};
 use crate::send_telemetry_from_ctx;
 use ai::agent::action_result::AnyFileContent;
-use ai::skills::SkillReference;
 #[cfg(feature = "local_fs")]
 use ai::skills::parse_skill;
+use ai::skills::SkillReference;
 use std::path::Path;
 use warpui::{ModelContext, SingletonEntity};
 
@@ -112,21 +112,17 @@ impl ReadSkillExecutor {
                 return ActionExecution::new_async(
                     async move { parse_skill(&path) },
                     move |parsed, _app| match parsed {
-                        Ok(skill) => AIAgentActionResultType::ReadSkill(
-                            ReadSkillResult::Success {
-                                content: FileContext::new(
-                                    skill.path.to_string_lossy().into_owned(),
-                                    AnyFileContent::StringContent(skill.content.clone()),
-                                    skill.line_range.clone(),
-                                    None,
-                                ),
-                            },
-                        ),
-                        Err(err) => AIAgentActionResultType::ReadSkill(
-                            ReadSkillResult::Error(format!(
-                                "Skill not found: {skill_ref_for_async:?} ({err})"
-                            )),
-                        ),
+                        Ok(skill) => AIAgentActionResultType::ReadSkill(ReadSkillResult::Success {
+                            content: FileContext::new(
+                                skill.path.to_string_lossy().into_owned(),
+                                AnyFileContent::StringContent(skill.content.clone()),
+                                skill.line_range.clone(),
+                                None,
+                            ),
+                        }),
+                        Err(err) => AIAgentActionResultType::ReadSkill(ReadSkillResult::Error(
+                            format!("Skill not found: {skill_ref_for_async:?} ({err})"),
+                        )),
                     },
                 );
             }
@@ -160,7 +156,9 @@ impl ReadSkillExecutor {
 ///
 /// 抽出 helper 是为了让 `ActionExecution<T>` 的泛型 `T` 在 `success_execution`
 /// 和 `new_async` 两条路径里推导到相同类型(否则 Rust 会要求函数显式声明返回类型)。
-fn success_execution(skill: &ai::skills::ParsedSkill) -> ActionExecution<anyhow::Result<ai::skills::ParsedSkill>> {
+fn success_execution(
+    skill: &ai::skills::ParsedSkill,
+) -> ActionExecution<anyhow::Result<ai::skills::ParsedSkill>> {
     let content = FileContext::new(
         skill.path.to_string_lossy().into_owned(),
         AnyFileContent::StringContent(skill.content.clone()),

app/src/ai/blocklist/action_model/execute/read_skill_tests.rs

@@ -238,7 +238,9 @@ fn test_read_skill_executor_fallback_returns_error_when_file_missing() {
             on_complete,
         } = execution
         else {
-            panic!("Legal-shaped skill path should still produce Async execution before disk check");
+            panic!(
+                "Legal-shaped skill path should still produce Async execution before disk check"
+            );
         };
 
         let async_result = execute_future.await;

app/src/ai/blocklist/agent_view/zero_state_block.rs

@@ -583,7 +583,9 @@ fn render_title_and_description(props: HeaderProps, app: &AppContext) -> Vec<Box
                     sub_text_color,
                     Default::default(),
                 )
-                .with_heading_to_font_size_multipliers(appearance.heading_font_size_multipliers().clone())
+                .with_heading_to_font_size_multipliers(
+                    appearance.heading_font_size_multipliers().clone(),
+                )
                 .with_inline_code_properties(Some(main_text_color), None)
                 .finish()
             });

app/src/ai/blocklist/block/view_impl/output.rs

@@ -943,7 +943,9 @@ pub(super) fn render(props: Props, app: &AppContext) -> Box<dyn Element> {
                                 body_color,
                                 Default::default(),
                             )
-                            .with_heading_to_font_size_multipliers(appearance.heading_font_size_multipliers().clone())
+                            .with_heading_to_font_size_multipliers(
+                                appearance.heading_font_size_multipliers().clone(),
+                            )
                             .set_selectable(true);
 
                             let mut action =

app/src/ai/blocklist/inline_action/inline_action_header.rs

@@ -241,7 +241,9 @@ impl HeaderConfig {
                     text_color,
                     Default::default(),
                 )
-                .with_heading_to_font_size_multipliers(appearance.heading_font_size_multipliers().clone())
+                .with_heading_to_font_size_multipliers(
+                    appearance.heading_font_size_multipliers().clone(),
+                )
                 .set_selectable(self.is_text_selectable);
                 if !self.soft_wrap_title {
                     element = element.with_no_text_wrapping();

app/src/ai_assistant/panel.rs

@@ -69,7 +69,6 @@ const PANEL_HORIZONTAL_PADDING: f32 = 6.;
 const EDITOR_MARGIN: f32 = 16.;
 const LOGO_SIZE: f32 = 20.;
 
-
 const ZERO_STATE_HELP_TEXT: &str = "Shift + ctrl + space a block or text selection to ask Zap AI.";
 const SCRIPT_ZERO_STATE_PROMPT: &str = "Write a script to connect to an AWS EC2 instance.";
 const GIT_ZERO_STATE_PROMPT: &str = "How do I undo the most recent commits in git?";

app/src/ai_assistant/transcript.rs

@@ -9,10 +9,10 @@ use warpui::units::Pixels;
 use warpui::{
     elements::{
         Align, Border, ChildAnchor, ClippedScrollStateHandle, ClippedScrollable, ConstrainedBox,
-        Container, CornerRadius, CrossAxisAlignment, EventHandler, Fill, Flex,
+        Container, CornerRadius, CrossAxisAlignment, EventHandler, Expanded, Fill, Flex,
         FormattedTextElement, HyperlinkUrl, Icon, MainAxisAlignment, MainAxisSize,
         MouseStateHandle, ParentAnchor, ParentElement, Radius, SavePosition, ScrollbarWidth,
-        Expanded, Shrinkable, Text, Wrap,
+        Shrinkable, Text, Wrap,
     },
     keymap::Keystroke,
     platform::Cursor,
@@ -49,7 +49,6 @@ const TERMINAL_INPUT_SVG_PATH: &str = "bundled/svg/terminal-input.svg";
 const USER_ICON_SVG_PATH: &str = "bundled/svg/user.svg";
 const SAVE_WORKFLOW_ICON_PATH: &str = "bundled/svg/workflow.svg";
 
-
 const PANEL_LEFT_MARGIN: f32 = 15.;
 const DETAILS_BOTTOM_MARGIN: f32 = 12.;
 
@@ -634,7 +633,9 @@ impl Transcript {
                         theme.main_text_color(theme.surface_2()).into_solid(),
                         highlighted_hyperlink.clone(),
                     )
-                    .with_heading_to_font_size_multipliers(appearance.heading_font_size_multipliers().clone())
+                    .with_heading_to_font_size_multipliers(
+                        appearance.heading_font_size_multipliers().clone(),
+                    )
                     .with_inline_code_properties(
                         Some(theme.nonactive_ui_text_color().into()),
                         Some(inline_code_bg_color),

app/src/ai_assistant/utils.rs

@@ -18,7 +18,6 @@ use crate::{appearance::Appearance, ui_components::blended_colors};
 
 use super::{panel::AIAssistantAction, requests::Requests, transcript::CodeBlockMouseStateHandles};
 
-
 const SQUARE_ALERT_SVG_PATH: &str = "bundled/svg/alert-square.svg";
 const TRIANGLE_ALERT_SVG_PATH: &str = "bundled/svg/alert-triangle.svg";
 

app/src/app_state.rs

@@ -14,6 +14,7 @@ use crate::ai::blocklist::InputConfig;
 use crate::ai::blocklist::SerializedBlockListItem;
 use crate::code::editor_management::CodeSource;
 use crate::drive::ZapDriveObjectSettings;
+use crate::project_organization::domain::RepositoryWorkspaceId;
 use crate::root_view::quake_mode_window_id;
 use crate::server::ids::SyncId;
 use crate::settings_view::SettingsSection;
@@ -45,6 +46,8 @@ pub struct PersistedAgentManagementFilters {
 pub struct WindowSnapshot {
     pub tabs: Vec<TabSnapshot>,
     pub active_tab_index: usize,
+    pub active_repository_workspace_id: Option<RepositoryWorkspaceId>,
+    pub repository_workspace_states: Vec<RepositoryWorkspaceWindowStateSnapshot>,
     pub bounds: Option<RectF>,
     pub fullscreen_state: FullscreenState,
     pub quake_mode: bool,
@@ -64,6 +67,7 @@ pub struct WindowSnapshot {
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct TabSnapshot {
+    pub repository_workspace_id: Option<RepositoryWorkspaceId>,
     pub custom_title: Option<String>,
     pub root: PaneNodeSnapshot,
     pub default_directory_color: Option<AnsiColorIdentifier>,
@@ -72,6 +76,12 @@ pub struct TabSnapshot {
     pub right_panel: Option<RightPanelSnapshot>,
 }
 
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct RepositoryWorkspaceWindowStateSnapshot {
+    pub repository_workspace_id: RepositoryWorkspaceId,
+    pub active_tab_index: usize,
+}
+
 impl TabSnapshot {
     pub(crate) fn color(&self) -> Option<AnsiColorIdentifier> {
         self.selected_color.resolve(self.default_directory_color)
@@ -317,6 +327,7 @@ pub enum CodeReviewPaneSnapshot {
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub enum LeftPanelDisplayedTab {
+    ProjectTree,
     FileTree,
     GlobalSearch,
     ZapDrive,
@@ -329,6 +340,7 @@ pub enum LeftPanelDisplayedTab {
 impl From<ToolPanelView> for LeftPanelDisplayedTab {
     fn from(view: ToolPanelView) -> Self {
         match view {
+            ToolPanelView::ProjectTree => LeftPanelDisplayedTab::ProjectTree,
             ToolPanelView::ProjectExplorer => LeftPanelDisplayedTab::FileTree,
             ToolPanelView::GlobalSearch { .. } => LeftPanelDisplayedTab::GlobalSearch,
             ToolPanelView::ZapDrive => LeftPanelDisplayedTab::ZapDrive,

app/src/appearance.rs

@@ -23,8 +23,8 @@ use macos_app_icon::*;
 use crate::{
     settings::{
         active_theme_kind, font::heading_font_size_multipliers_from_settings, FontSettings,
-        FontSettingsChangedEvent, MonospaceFontSize, Settings, ThemeSettings, UI_FONT_SIZE_MIN,
-        UI_FONT_SIZE_MAX,
+        FontSettingsChangedEvent, MonospaceFontSize, Settings, ThemeSettings, UI_FONT_SIZE_MAX,
+        UI_FONT_SIZE_MIN,
     },
     themes::theme::{ThemeKind, WarpTheme},
     ASSETS,
@@ -485,8 +485,9 @@ fn build_appearance(ctx: &mut AppContext) -> Appearance {
     let ui_font_family = if ui_font_name.is_empty() {
         load_default_ui_font_family(ctx).expect("unable to load default ui font family")
     } else {
-        get_or_load_font_family(&ui_font_name, ctx)
-            .unwrap_or_else(|| load_default_ui_font_family(ctx).expect("unable to load default ui font family"))
+        get_or_load_font_family(&ui_font_name, ctx).unwrap_or_else(|| {
+            load_default_ui_font_family(ctx).expect("unable to load default ui font family")
+        })
     };
 
     let am_font_family_from_settings = get_or_load_font_family(&am_font_name, ctx);

app/src/autoupdate/linux.rs

@@ -147,18 +147,12 @@ mod appimage {
             if downloaded - last_reported >= REPORT_BYTES_THRESHOLD
                 || last_reported_at.elapsed() >= REPORT_TIME_THRESHOLD
             {
-                on_progress(DownloadProgress {
-                    downloaded,
-                    total,
-                });
+                on_progress(DownloadProgress { downloaded, total });
                 last_reported = downloaded;
                 last_reported_at = Instant::now();
             }
         }
-        on_progress(DownloadProgress {
-            downloaded,
-            total,
-        });
+        on_progress(DownloadProgress { downloaded, total });
 
         // openWarp:在覆盖原 AppImage 之前先对临时文件做 SHA-256 校验,
         // 防御 CDN 中间人 / 网络损坏。其他 channel 跳过(有自家流程)。
@@ -395,9 +389,7 @@ impl PackageManager {
             .output();
         let output = match output {
             Ok(o) => o,
-            Err(err) => {
-                return Err(err).context("Failed to run package manager detection script")
-            }
+            Err(err) => return Err(err).context("Failed to run package manager detection script"),
         };
 
         // exit 1 = 这个候选名没被任何 PM 识别;不是错,继续下一个候选。