ab79dac4b3
Phase 1: Data model - groups.rs (Rust structs + load/save groups.json), groups.ts (TypeScript interfaces), groups-bridge.ts (IPC adapter), workspace.svelte.ts (replaces layout store), SQLite migrations (agent_messages, project_agent_state tables, project_id column), --group CLI argument. Phase 2: Project shell layout - GlobalTabBar, ProjectGrid, ProjectBox, ProjectHeader, CommandPalette, DocsTab, ContextTab, SettingsTab, App.svelte full rewrite (no sidebar/TilingGrid). Phase 3: ClaudeSession.svelte wrapping AgentPane per-project. Phase 4: TerminalTabs.svelte with shell/SSH/agent tab types. Phase 5: TeamAgentsPanel + AgentCard for compact subagent view. Also fixes AgentPane Svelte 5 event modifier (on:click -> onclick).
632 lines
19 KiB
Rust
632 lines
19 KiB
Rust
mod ctx;
|
|
mod event_sink;
|
|
mod groups;
|
|
mod pty;
|
|
mod remote;
|
|
mod sidecar;
|
|
mod session;
|
|
mod watcher;
|
|
|
|
use ctx::CtxDb;
|
|
use event_sink::TauriEventSink;
|
|
use groups::{GroupsFile, MdFileEntry};
|
|
use pty::{PtyManager, PtyOptions};
|
|
use remote::{RemoteManager, RemoteMachineConfig};
|
|
use session::{Session, SessionDb, LayoutState, SshSession, AgentMessageRecord, ProjectAgentState};
|
|
use sidecar::{AgentQueryOptions, SidecarConfig, SidecarManager};
|
|
use watcher::FileWatcherManager;
|
|
use std::sync::Arc;
|
|
use tauri::{Manager, State};
|
|
|
|
struct AppState {
|
|
pty_manager: Arc<PtyManager>,
|
|
sidecar_manager: Arc<SidecarManager>,
|
|
session_db: Arc<SessionDb>,
|
|
file_watcher: Arc<FileWatcherManager>,
|
|
ctx_db: Arc<CtxDb>,
|
|
remote_manager: Arc<RemoteManager>,
|
|
}
|
|
|
|
// --- PTY commands ---
|
|
|
|
#[tauri::command]
|
|
fn pty_spawn(
|
|
state: State<'_, AppState>,
|
|
options: PtyOptions,
|
|
) -> Result<String, String> {
|
|
state.pty_manager.spawn(options)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn pty_write(state: State<'_, AppState>, id: String, data: String) -> Result<(), String> {
|
|
state.pty_manager.write(&id, &data)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn pty_resize(
|
|
state: State<'_, AppState>,
|
|
id: String,
|
|
cols: u16,
|
|
rows: u16,
|
|
) -> Result<(), String> {
|
|
state.pty_manager.resize(&id, cols, rows)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn pty_kill(state: State<'_, AppState>, id: String) -> Result<(), String> {
|
|
state.pty_manager.kill(&id)
|
|
}
|
|
|
|
// --- Agent/sidecar commands ---
|
|
|
|
#[tauri::command]
|
|
fn agent_query(
|
|
state: State<'_, AppState>,
|
|
options: AgentQueryOptions,
|
|
) -> Result<(), String> {
|
|
state.sidecar_manager.query(&options)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn agent_stop(state: State<'_, AppState>, session_id: String) -> Result<(), String> {
|
|
state.sidecar_manager.stop_session(&session_id)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn agent_ready(state: State<'_, AppState>) -> bool {
|
|
state.sidecar_manager.is_ready()
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn agent_restart(state: State<'_, AppState>) -> Result<(), String> {
|
|
state.sidecar_manager.restart()
|
|
}
|
|
|
|
// --- File watcher commands ---
|
|
|
|
#[tauri::command]
|
|
fn file_watch(
|
|
app: tauri::AppHandle,
|
|
state: State<'_, AppState>,
|
|
pane_id: String,
|
|
path: String,
|
|
) -> Result<String, String> {
|
|
state.file_watcher.watch(&app, &pane_id, &path)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn file_unwatch(state: State<'_, AppState>, pane_id: String) {
|
|
state.file_watcher.unwatch(&pane_id);
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn file_read(state: State<'_, AppState>, path: String) -> Result<String, String> {
|
|
state.file_watcher.read_file(&path)
|
|
}
|
|
|
|
// --- Session persistence commands ---
|
|
|
|
#[tauri::command]
|
|
fn session_list(state: State<'_, AppState>) -> Result<Vec<Session>, String> {
|
|
state.session_db.list_sessions()
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn session_save(state: State<'_, AppState>, session: Session) -> Result<(), String> {
|
|
state.session_db.save_session(&session)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn session_delete(state: State<'_, AppState>, id: String) -> Result<(), String> {
|
|
state.session_db.delete_session(&id)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn session_update_title(state: State<'_, AppState>, id: String, title: String) -> Result<(), String> {
|
|
state.session_db.update_title(&id, &title)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn session_touch(state: State<'_, AppState>, id: String) -> Result<(), String> {
|
|
state.session_db.touch_session(&id)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn session_update_group(state: State<'_, AppState>, id: String, group_name: String) -> Result<(), String> {
|
|
state.session_db.update_group(&id, &group_name)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn layout_save(state: State<'_, AppState>, layout: LayoutState) -> Result<(), String> {
|
|
state.session_db.save_layout(&layout)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn layout_load(state: State<'_, AppState>) -> Result<LayoutState, String> {
|
|
state.session_db.load_layout()
|
|
}
|
|
|
|
// --- Settings commands ---
|
|
|
|
#[tauri::command]
|
|
fn settings_get(state: State<'_, AppState>, key: String) -> Result<Option<String>, String> {
|
|
state.session_db.get_setting(&key)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn settings_set(state: State<'_, AppState>, key: String, value: String) -> Result<(), String> {
|
|
state.session_db.set_setting(&key, &value)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn settings_list(state: State<'_, AppState>) -> Result<Vec<(String, String)>, String> {
|
|
state.session_db.get_all_settings()
|
|
}
|
|
|
|
// --- SSH session commands ---
|
|
|
|
#[tauri::command]
|
|
fn ssh_session_list(state: State<'_, AppState>) -> Result<Vec<SshSession>, String> {
|
|
state.session_db.list_ssh_sessions()
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn ssh_session_save(state: State<'_, AppState>, session: SshSession) -> Result<(), String> {
|
|
state.session_db.save_ssh_session(&session)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn ssh_session_delete(state: State<'_, AppState>, id: String) -> Result<(), String> {
|
|
state.session_db.delete_ssh_session(&id)
|
|
}
|
|
|
|
// --- ctx commands ---
|
|
|
|
#[tauri::command]
|
|
fn ctx_list_projects(state: State<'_, AppState>) -> Result<Vec<ctx::CtxProject>, String> {
|
|
state.ctx_db.list_projects()
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn ctx_get_context(state: State<'_, AppState>, project: String) -> Result<Vec<ctx::CtxEntry>, String> {
|
|
state.ctx_db.get_context(&project)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn ctx_get_shared(state: State<'_, AppState>) -> Result<Vec<ctx::CtxEntry>, String> {
|
|
state.ctx_db.get_shared()
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn ctx_get_summaries(state: State<'_, AppState>, project: String, limit: i64) -> Result<Vec<ctx::CtxSummary>, String> {
|
|
state.ctx_db.get_summaries(&project, limit)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn ctx_search(state: State<'_, AppState>, query: String) -> Result<Vec<ctx::CtxEntry>, String> {
|
|
state.ctx_db.search(&query)
|
|
}
|
|
|
|
// --- Claude profile commands (switcher-claude integration) ---
|
|
|
|
#[derive(serde::Serialize)]
|
|
struct ClaudeProfile {
|
|
name: String,
|
|
email: Option<String>,
|
|
subscription_type: Option<String>,
|
|
display_name: Option<String>,
|
|
config_dir: String,
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn claude_list_profiles() -> Vec<ClaudeProfile> {
|
|
let mut profiles = Vec::new();
|
|
|
|
// Read profiles from ~/.config/switcher/profiles/
|
|
let config_dir = dirs::config_dir().unwrap_or_default();
|
|
let profiles_dir = config_dir.join("switcher").join("profiles");
|
|
let alt_dir_root = config_dir.join("switcher-claude");
|
|
|
|
if let Ok(entries) = std::fs::read_dir(&profiles_dir) {
|
|
for entry in entries.flatten() {
|
|
if !entry.path().is_dir() { continue; }
|
|
let name = entry.file_name().to_string_lossy().to_string();
|
|
|
|
// Read profile.toml for metadata
|
|
let toml_path = entry.path().join("profile.toml");
|
|
let (email, subscription_type, display_name) = if toml_path.exists() {
|
|
let content = std::fs::read_to_string(&toml_path).unwrap_or_default();
|
|
(
|
|
extract_toml_value(&content, "email"),
|
|
extract_toml_value(&content, "subscription_type"),
|
|
extract_toml_value(&content, "display_name"),
|
|
)
|
|
} else {
|
|
(None, None, None)
|
|
};
|
|
|
|
// Alt dir for CLAUDE_CONFIG_DIR
|
|
let alt_path = alt_dir_root.join(&name);
|
|
let config_dir_str = if alt_path.exists() {
|
|
alt_path.to_string_lossy().to_string()
|
|
} else {
|
|
// Fallback to default ~/.claude
|
|
dirs::home_dir()
|
|
.unwrap_or_default()
|
|
.join(".claude")
|
|
.to_string_lossy()
|
|
.to_string()
|
|
};
|
|
|
|
profiles.push(ClaudeProfile {
|
|
name,
|
|
email,
|
|
subscription_type,
|
|
display_name,
|
|
config_dir: config_dir_str,
|
|
});
|
|
}
|
|
}
|
|
|
|
// Always include a "default" profile for ~/.claude
|
|
if profiles.is_empty() {
|
|
let home = dirs::home_dir().unwrap_or_default();
|
|
profiles.push(ClaudeProfile {
|
|
name: "default".to_string(),
|
|
email: None,
|
|
subscription_type: None,
|
|
display_name: None,
|
|
config_dir: home.join(".claude").to_string_lossy().to_string(),
|
|
});
|
|
}
|
|
|
|
profiles
|
|
}
|
|
|
|
fn extract_toml_value(content: &str, key: &str) -> Option<String> {
|
|
for line in content.lines() {
|
|
let trimmed = line.trim();
|
|
if let Some(rest) = trimmed.strip_prefix(key) {
|
|
if let Some(rest) = rest.trim().strip_prefix('=') {
|
|
let val = rest.trim().trim_matches('"');
|
|
if !val.is_empty() {
|
|
return Some(val.to_string());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
None
|
|
}
|
|
|
|
// --- Skill discovery commands ---
|
|
|
|
#[derive(serde::Serialize)]
|
|
struct ClaudeSkill {
|
|
name: String,
|
|
description: String,
|
|
source_path: String,
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn claude_list_skills() -> Vec<ClaudeSkill> {
|
|
let mut skills = Vec::new();
|
|
let home = dirs::home_dir().unwrap_or_default();
|
|
|
|
// Search for skills in ~/.claude/skills/ (same as Claude Code CLI)
|
|
let skills_dir = home.join(".claude").join("skills");
|
|
if let Ok(entries) = std::fs::read_dir(&skills_dir) {
|
|
for entry in entries.flatten() {
|
|
let path = entry.path();
|
|
// Skills can be directories with SKILL.md or standalone .md files
|
|
let (name, skill_file) = if path.is_dir() {
|
|
let skill_md = path.join("SKILL.md");
|
|
if skill_md.exists() {
|
|
(entry.file_name().to_string_lossy().to_string(), skill_md)
|
|
} else {
|
|
continue;
|
|
}
|
|
} else if path.extension().map_or(false, |e| e == "md") {
|
|
let stem = path.file_stem().unwrap_or_default().to_string_lossy().to_string();
|
|
(stem, path.clone())
|
|
} else {
|
|
continue;
|
|
};
|
|
|
|
// Extract description from first non-empty, non-heading line
|
|
let description = if let Ok(content) = std::fs::read_to_string(&skill_file) {
|
|
content.lines()
|
|
.filter(|l| !l.trim().is_empty() && !l.starts_with('#'))
|
|
.next()
|
|
.unwrap_or("")
|
|
.trim()
|
|
.chars()
|
|
.take(120)
|
|
.collect()
|
|
} else {
|
|
String::new()
|
|
};
|
|
|
|
skills.push(ClaudeSkill {
|
|
name,
|
|
description,
|
|
source_path: skill_file.to_string_lossy().to_string(),
|
|
});
|
|
}
|
|
}
|
|
|
|
skills
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn claude_read_skill(path: String) -> Result<String, String> {
|
|
std::fs::read_to_string(&path).map_err(|e| format!("Failed to read skill: {e}"))
|
|
}
|
|
|
|
// --- Group config commands (v3) ---
|
|
|
|
#[tauri::command]
|
|
fn groups_load() -> Result<GroupsFile, String> {
|
|
groups::load_groups()
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn groups_save(config: GroupsFile) -> Result<(), String> {
|
|
groups::save_groups(&config)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn discover_markdown_files(cwd: String) -> Result<Vec<MdFileEntry>, String> {
|
|
groups::discover_markdown_files(&cwd)
|
|
}
|
|
|
|
// --- Agent message persistence commands (v3) ---
|
|
|
|
#[tauri::command]
|
|
fn agent_messages_save(
|
|
state: State<'_, AppState>,
|
|
session_id: String,
|
|
project_id: String,
|
|
sdk_session_id: Option<String>,
|
|
messages: Vec<AgentMessageRecord>,
|
|
) -> Result<(), String> {
|
|
state.session_db.save_agent_messages(
|
|
&session_id,
|
|
&project_id,
|
|
sdk_session_id.as_deref(),
|
|
&messages,
|
|
)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn agent_messages_load(
|
|
state: State<'_, AppState>,
|
|
project_id: String,
|
|
) -> Result<Vec<AgentMessageRecord>, String> {
|
|
state.session_db.load_agent_messages(&project_id)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn project_agent_state_save(
|
|
state: State<'_, AppState>,
|
|
agent_state: ProjectAgentState,
|
|
) -> Result<(), String> {
|
|
state.session_db.save_project_agent_state(&agent_state)
|
|
}
|
|
|
|
#[tauri::command]
|
|
fn project_agent_state_load(
|
|
state: State<'_, AppState>,
|
|
project_id: String,
|
|
) -> Result<Option<ProjectAgentState>, String> {
|
|
state.session_db.load_project_agent_state(&project_id)
|
|
}
|
|
|
|
// --- Directory picker command ---
|
|
|
|
#[tauri::command]
|
|
fn pick_directory() -> Option<String> {
|
|
// Use native file dialog via rfd
|
|
// Fallback: return None and let frontend use a text input
|
|
None
|
|
}
|
|
|
|
// --- CLI argument commands ---
|
|
|
|
#[tauri::command]
|
|
fn cli_get_group() -> Option<String> {
|
|
let args: Vec<String> = std::env::args().collect();
|
|
let mut i = 1;
|
|
while i < args.len() {
|
|
if args[i] == "--group" {
|
|
if i + 1 < args.len() {
|
|
return Some(args[i + 1].clone());
|
|
}
|
|
} else if let Some(val) = args[i].strip_prefix("--group=") {
|
|
return Some(val.to_string());
|
|
}
|
|
i += 1;
|
|
}
|
|
None
|
|
}
|
|
|
|
// --- Remote machine commands ---
|
|
|
|
#[tauri::command]
|
|
fn remote_list(state: State<'_, AppState>) -> Vec<remote::RemoteMachineInfo> {
|
|
state.remote_manager.list_machines()
|
|
}
|
|
|
|
#[tauri::command]
|
|
async fn remote_add(state: State<'_, AppState>, config: RemoteMachineConfig) -> Result<String, String> {
|
|
Ok(state.remote_manager.add_machine(config))
|
|
}
|
|
|
|
#[tauri::command]
|
|
async fn remote_remove(state: State<'_, AppState>, machine_id: String) -> Result<(), String> {
|
|
state.remote_manager.remove_machine(&machine_id)
|
|
}
|
|
|
|
#[tauri::command]
|
|
async fn remote_connect(app: tauri::AppHandle, state: State<'_, AppState>, machine_id: String) -> Result<(), String> {
|
|
state.remote_manager.connect(&app, &machine_id).await
|
|
}
|
|
|
|
#[tauri::command]
|
|
async fn remote_disconnect(state: State<'_, AppState>, machine_id: String) -> Result<(), String> {
|
|
state.remote_manager.disconnect(&machine_id).await
|
|
}
|
|
|
|
#[tauri::command]
|
|
async fn remote_agent_query(state: State<'_, AppState>, machine_id: String, options: AgentQueryOptions) -> Result<(), String> {
|
|
state.remote_manager.agent_query(&machine_id, &options).await
|
|
}
|
|
|
|
#[tauri::command]
|
|
async fn remote_agent_stop(state: State<'_, AppState>, machine_id: String, session_id: String) -> Result<(), String> {
|
|
state.remote_manager.agent_stop(&machine_id, &session_id).await
|
|
}
|
|
|
|
#[tauri::command]
|
|
async fn remote_pty_spawn(state: State<'_, AppState>, machine_id: String, options: PtyOptions) -> Result<String, String> {
|
|
state.remote_manager.pty_spawn(&machine_id, &options).await
|
|
}
|
|
|
|
#[tauri::command]
|
|
async fn remote_pty_write(state: State<'_, AppState>, machine_id: String, id: String, data: String) -> Result<(), String> {
|
|
state.remote_manager.pty_write(&machine_id, &id, &data).await
|
|
}
|
|
|
|
#[tauri::command]
|
|
async fn remote_pty_resize(state: State<'_, AppState>, machine_id: String, id: String, cols: u16, rows: u16) -> Result<(), String> {
|
|
state.remote_manager.pty_resize(&machine_id, &id, cols, rows).await
|
|
}
|
|
|
|
#[tauri::command]
|
|
async fn remote_pty_kill(state: State<'_, AppState>, machine_id: String, id: String) -> Result<(), String> {
|
|
state.remote_manager.pty_kill(&machine_id, &id).await
|
|
}
|
|
|
|
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
|
pub fn run() {
|
|
tauri::Builder::default()
|
|
.invoke_handler(tauri::generate_handler![
|
|
pty_spawn,
|
|
pty_write,
|
|
pty_resize,
|
|
pty_kill,
|
|
agent_query,
|
|
agent_stop,
|
|
agent_ready,
|
|
agent_restart,
|
|
file_watch,
|
|
file_unwatch,
|
|
file_read,
|
|
session_list,
|
|
session_save,
|
|
session_delete,
|
|
session_update_title,
|
|
session_touch,
|
|
session_update_group,
|
|
layout_save,
|
|
layout_load,
|
|
settings_get,
|
|
settings_set,
|
|
settings_list,
|
|
ssh_session_list,
|
|
ssh_session_save,
|
|
ssh_session_delete,
|
|
ctx_list_projects,
|
|
ctx_get_context,
|
|
ctx_get_shared,
|
|
ctx_get_summaries,
|
|
ctx_search,
|
|
remote_list,
|
|
remote_add,
|
|
remote_remove,
|
|
remote_connect,
|
|
remote_disconnect,
|
|
remote_agent_query,
|
|
remote_agent_stop,
|
|
remote_pty_spawn,
|
|
remote_pty_write,
|
|
remote_pty_resize,
|
|
remote_pty_kill,
|
|
claude_list_profiles,
|
|
claude_list_skills,
|
|
claude_read_skill,
|
|
pick_directory,
|
|
groups_load,
|
|
groups_save,
|
|
discover_markdown_files,
|
|
agent_messages_save,
|
|
agent_messages_load,
|
|
project_agent_state_save,
|
|
project_agent_state_load,
|
|
cli_get_group,
|
|
])
|
|
.plugin(tauri_plugin_updater::Builder::new().build())
|
|
.setup(move |app| {
|
|
if cfg!(debug_assertions) {
|
|
app.handle().plugin(
|
|
tauri_plugin_log::Builder::default()
|
|
.level(log::LevelFilter::Info)
|
|
.build(),
|
|
)?;
|
|
}
|
|
|
|
// Create TauriEventSink for core managers
|
|
let sink: Arc<dyn bterminal_core::event::EventSink> =
|
|
Arc::new(TauriEventSink(app.handle().clone()));
|
|
|
|
// Build sidecar config from Tauri paths
|
|
let resource_dir = app
|
|
.handle()
|
|
.path()
|
|
.resource_dir()
|
|
.unwrap_or_default();
|
|
let dev_root = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
|
|
.parent()
|
|
.unwrap()
|
|
.to_path_buf();
|
|
let sidecar_config = SidecarConfig {
|
|
search_paths: vec![
|
|
resource_dir.join("sidecar"),
|
|
dev_root.join("sidecar"),
|
|
],
|
|
};
|
|
|
|
let pty_manager = Arc::new(PtyManager::new(sink.clone()));
|
|
let sidecar_manager = Arc::new(SidecarManager::new(sink, sidecar_config));
|
|
|
|
// Initialize session database
|
|
let data_dir = dirs::data_dir()
|
|
.unwrap_or_else(|| std::path::PathBuf::from("."))
|
|
.join("bterminal");
|
|
let session_db = Arc::new(
|
|
SessionDb::open(&data_dir).expect("Failed to open session database"),
|
|
);
|
|
|
|
let file_watcher = Arc::new(FileWatcherManager::new());
|
|
let ctx_db = Arc::new(CtxDb::new());
|
|
let remote_manager = Arc::new(RemoteManager::new());
|
|
|
|
// Start local sidecar
|
|
match sidecar_manager.start() {
|
|
Ok(()) => log::info!("Sidecar startup initiated"),
|
|
Err(e) => log::warn!("Sidecar startup failed (agent features unavailable): {e}"),
|
|
}
|
|
|
|
app.manage(AppState {
|
|
pty_manager,
|
|
sidecar_manager,
|
|
session_db,
|
|
file_watcher,
|
|
ctx_db,
|
|
remote_manager,
|
|
});
|
|
|
|
Ok(())
|
|
})
|
|
.run(tauri::generate_context!())
|
|
.expect("error while running tauri application");
|
|
}
|