Skip to content

Gcwing/dev #89

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.

Sign up for GitHub

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

Merged
GCWing merged 4 commits into from
Mar 8, 2026
Merged

Gcwing/dev #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
246383d
fix: restore corrupted Chinese text in component library preview
G-CWing Mar 7, 2026
ef3b695
feat: refresh component library preview experience
G-CWing Mar 7, 2026
459b6e8
feat: add workspace toolbar to NavPanel and redesign WelcomePanel
G-CWing Mar 8, 2026
39e6e00
refactor: overhaul UI scenes and interactions across the app
G-CWing Mar 8, 2026
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
16 changes: 15 additions & 1 deletion src/apps/desktop/src/api/app_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,26 @@ impl AppState {
uptime_seconds: 0,
}));

let initial_workspace_path = workspace_service
.get_current_workspace()
.await
.map(|workspace| workspace.root_path);

if let Some(workspace_path) = initial_workspace_path.clone() {
miniapp_manager
.set_workspace_path(Some(workspace_path.clone()))
.await;
if let Err(e) = ai_rules_service.set_workspace(workspace_path).await {
log::warn!("Failed to restore AI rules workspace on startup: {}", e);
}
}

let app_state = Self {
ai_client,
ai_client_factory,
tool_registry,
workspace_service,
workspace_path: Arc::new(RwLock::new(None)),
workspace_path: Arc::new(RwLock::new(initial_workspace_path)),
config_service,
filesystem_service,
ai_rules_service,
Expand Down
240 changes: 165 additions & 75 deletions src/apps/desktop/src/api/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::api::dto::WorkspaceInfoDto;
use bitfun_core::infrastructure::{file_watcher, FileOperationOptions, SearchMatchType};
use log::{debug, error, info, warn};
use serde::Deserialize;
use tauri::State;
use tauri::{AppHandle, State};

#[derive(Debug, Deserialize)]
pub struct OpenWorkspaceRequest {
Expand All @@ -18,6 +18,18 @@ pub struct ScanWorkspaceInfoRequest {
pub workspace_path: String,
}

#[derive(Debug, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct CloseWorkspaceRequest {
pub workspace_id: String,
}

#[derive(Debug, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct SetActiveWorkspaceRequest {
pub workspace_id: String,
}

#[derive(Debug, Deserialize)]
pub struct TestAIConfigConnectionRequest {
pub config: bitfun_core::service::config::types::AIModelConfig,
Expand Down Expand Up @@ -128,6 +140,96 @@ pub struct RevealInExplorerRequest {
pub path: String,
}

async fn clear_active_workspace_context(state: &State<'_, AppState>, app: &AppHandle) {
#[cfg(not(target_os = "macos"))]
let _ = app;

*state.workspace_path.write().await = None;
state.miniapp_manager.set_workspace_path(None).await;

if let Some(ref pool) = state.js_worker_pool {
pool.stop_all().await;
}

state.ai_rules_service.clear_workspace().await;
state.agent_registry.clear_custom_subagents();

#[cfg(target_os = "macos")]
{
let language = state
.config_service
.get_config::<String>(Some("app.language"))
.await
.unwrap_or_else(|_| "zh-CN".to_string());
let _ = crate::macos_menubar::set_macos_menubar_with_mode(
app,
&language,
crate::macos_menubar::MenubarMode::Startup,
);
}
}

async fn apply_active_workspace_context(
state: &State<'_, AppState>,
app: &AppHandle,
workspace_info: &bitfun_core::service::workspace::manager::WorkspaceInfo,
) {
#[cfg(not(target_os = "macos"))]
let _ = app;

clear_active_workspace_context(state, app).await;

*state.workspace_path.write().await = Some(workspace_info.root_path.clone());
state
.miniapp_manager
.set_workspace_path(Some(workspace_info.root_path.clone()))
.await;

if let Err(e) = bitfun_core::service::snapshot::initialize_global_snapshot_manager(
workspace_info.root_path.clone(),
None,
)
.await
{
warn!(
"Failed to initialize snapshot system: path={}, error={}",
workspace_info.root_path.display(),
e
);
}

state
.agent_registry
.load_custom_subagents(&workspace_info.root_path)
.await;

if let Err(e) = state
.ai_rules_service
.set_workspace(workspace_info.root_path.clone())
.await
{
warn!(
"Failed to set AI rules workspace: path={}, error={}",
workspace_info.root_path.display(),
e
);
}

#[cfg(target_os = "macos")]
{
let language = state
.config_service
.get_config::<String>(Some("app.language"))
.await
.unwrap_or_else(|_| "zh-CN".to_string());
let _ = crate::macos_menubar::set_macos_menubar_with_mode(
app,
&language,
crate::macos_menubar::MenubarMode::Workspace,
);
}
}

#[tauri::command]
pub async fn initialize_global_state(_state: State<'_, AppState>) -> Result<String, String> {
Ok("Global state initialized successfully".to_string())
Expand Down Expand Up @@ -454,7 +556,7 @@ pub async fn update_app_status(
#[tauri::command]
pub async fn open_workspace(
state: State<'_, AppState>,
_app: tauri::AppHandle,
app: tauri::AppHandle,
request: OpenWorkspaceRequest,
) -> Result<WorkspaceInfoDto, String> {
match state
Expand All @@ -463,55 +565,7 @@ pub async fn open_workspace(
.await
{
Ok(workspace_info) => {
*state.workspace_path.write().await = Some(workspace_info.root_path.clone());
state
.miniapp_manager
.set_workspace_path(Some(workspace_info.root_path.clone()))
.await;

if let Err(e) = bitfun_core::service::snapshot::initialize_global_snapshot_manager(
workspace_info.root_path.clone(),
None,
)
.await
{
warn!(
"Failed to initialize snapshot system: path={}, error={}",
workspace_info.root_path.display(),
e
);
}

state
.agent_registry
.load_custom_subagents(&workspace_info.root_path)
.await;

if let Err(e) = state
.ai_rules_service
.set_workspace(workspace_info.root_path.clone())
.await
{
warn!(
"Failed to set AI rules workspace: path={}, error={}",
workspace_info.root_path.display(),
e
);
}

#[cfg(target_os = "macos")]
{
let language = state
.config_service
.get_config::<String>(Some("app.language"))
.await
.unwrap_or_else(|_| "zh-CN".to_string());
let _ = crate::macos_menubar::set_macos_menubar_with_mode(
&_app,
&language,
crate::macos_menubar::MenubarMode::Workspace,
);
}
apply_active_workspace_context(&state, &app, &workspace_info).await;

info!(
"Workspace opened: name={}, path={}",
Expand All @@ -530,34 +584,22 @@ pub async fn open_workspace(
#[tauri::command]
pub async fn close_workspace(
state: State<'_, AppState>,
_app: tauri::AppHandle,
app: tauri::AppHandle,
request: CloseWorkspaceRequest,
) -> Result<(), String> {
match state.workspace_service.close_workspace("default").await {
match state
.workspace_service
.close_workspace(&request.workspace_id)
.await
{
Ok(_) => {
*state.workspace_path.write().await = None;
state.miniapp_manager.set_workspace_path(None).await;
if let Some(ref pool) = state.js_worker_pool {
pool.stop_all().await;
}
state.ai_rules_service.clear_workspace().await;

state.agent_registry.clear_custom_subagents();

#[cfg(target_os = "macos")]
{
let language = state
.config_service
.get_config::<String>(Some("app.language"))
.await
.unwrap_or_else(|_| "zh-CN".to_string());
let _ = crate::macos_menubar::set_macos_menubar_with_mode(
&_app,
&language,
crate::macos_menubar::MenubarMode::Startup,
);
if let Some(workspace_info) = state.workspace_service.get_current_workspace().await {
apply_active_workspace_context(&state, &app, &workspace_info).await;
} else {
clear_active_workspace_context(&state, &app).await;
}

info!("Workspace closed");
info!("Workspace closed: workspace_id={}", request.workspace_id);
Ok(())
}
Err(e) => {
Expand All @@ -567,6 +609,41 @@ pub async fn close_workspace(
}
}

#[tauri::command]
pub async fn set_active_workspace(
state: State<'_, AppState>,
app: tauri::AppHandle,
request: SetActiveWorkspaceRequest,
) -> Result<WorkspaceInfoDto, String> {
match state
.workspace_service
.set_active_workspace(&request.workspace_id)
.await
{
Ok(_) => {
let workspace_info = state
.workspace_service
.get_current_workspace()
.await
.ok_or_else(|| "Active workspace not found after switching".to_string())?;

apply_active_workspace_context(&state, &app, &workspace_info).await;

info!(
"Active workspace changed: workspace_id={}, path={}",
workspace_info.id,
workspace_info.root_path.display()
);

Ok(WorkspaceInfoDto::from_workspace_info(&workspace_info))
}
Err(e) => {
error!("Failed to set active workspace: {}", e);
Err(format!("Failed to set active workspace: {}", e))
}
}
}

#[tauri::command]
pub async fn get_current_workspace(
state: State<'_, AppState>,
Expand All @@ -591,6 +668,19 @@ pub async fn get_recent_workspaces(
.collect())
}

#[tauri::command]
pub async fn get_opened_workspaces(
state: State<'_, AppState>,
) -> Result<Vec<WorkspaceInfoDto>, String> {
let workspace_service = &state.workspace_service;
Ok(workspace_service
.get_opened_workspaces()
.await
.into_iter()
.map(|info| WorkspaceInfoDto::from_workspace_info(&info))
.collect())
}

#[tauri::command]
pub async fn scan_workspace_info(
state: State<'_, AppState>,
Expand Down
2 changes: 2 additions & 0 deletions src/apps/desktop/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,8 +540,10 @@ pub async fn run() {
subscribe_config_updates,
get_model_configs,
get_recent_workspaces,
get_opened_workspaces,
open_workspace,
close_workspace,
set_active_workspace,
get_current_workspace,
scan_workspace_info,
api::prompt_template_api::get_prompt_template_config,
Expand Down
Loading