yovinchen/claudia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: yovinchen:74e85fb8a2a13f4530e2ec2c537df2c1a7334f70
Branches Tags
yovinchen:main yovinchen:windows
yovinchen:v1.2.1 yovinchen:v1.2.0
...
compare: yovinchen:windows
Branches Tags
yovinchen:main yovinchen:windows
yovinchen:v1.2.1 yovinchen:v1.2.0

2 Commits
74e85fb8a2 ... windows

Author SHA1 Message Date
YoVinchen
50cce7a22c 删除冗余导入，优化代码结构 2025-09-07 23:23:18 +08:00
yovinchen
027999a9e5 适配windows 2025-09-07 23:11:49 +08:00
5 changed files with 109 additions and 48 deletions
Expand all files Collapse all files

35
src-tauri/src/claude_binary.rs
View File

@@ -47,11 +47,18 @@ pub fn find_claude_binary(app_handle: &tauri::AppHandle) -> Result<String, Strin
|row| row.get::<_, String>(0), |row| row.get::<_, String>(0),
) { ) {
info!("Found stored claude path in database: {}", stored_path); info!("Found stored claude path in database: {}", stored_path);
// Check if the path still exists and works // Check if the path still exists and works
#[cfg(not(target_os = "windows"))]
let final_path = stored_path.clone();
#[cfg(not(target_os = "windows"))]
let path_buf = PathBuf::from(&stored_path);
#[cfg(target_os = "windows")]
let mut final_path = stored_path.clone(); let mut final_path = stored_path.clone();
#[cfg(target_os = "windows")]
let mut path_buf = PathBuf::from(&stored_path); let mut path_buf = PathBuf::from(&stored_path);
// On Windows, if stored path exists but is not executable (shell script), try .cmd version // On Windows, if stored path exists but is not executable (shell script), try .cmd version
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
if path_buf.exists() && !stored_path.ends_with(".cmd") && !stored_path.ends_with(".exe") { if path_buf.exists() && !stored_path.ends_with(".cmd") && !stored_path.ends_with(".exe") {
@@ -62,28 +69,28 @@ pub fn find_claude_binary(app_handle: &tauri::AppHandle) -> Result<String, Strin
let cmd_path_buf = PathBuf::from(&cmd_path); let cmd_path_buf = PathBuf::from(&cmd_path);
if cmd_path_buf.exists() { if cmd_path_buf.exists() {
if let Ok(_) = get_claude_version(&cmd_path) { if let Ok(_) = get_claude_version(&cmd_path) {
final_path = cmd_path.clone(); final_path = cmd_path;
path_buf = cmd_path_buf; path_buf = cmd_path_buf;
info!("Using .cmd version instead of shell script: {}", cmd_path); info!("Using .cmd version instead of shell script: {}", final_path);
} }
} }
} }
} }
if path_buf.exists() && path_buf.is_file() { if path_buf.exists() && path_buf.is_file() {
return Ok(final_path); return Ok(final_path);
} else { } else {
warn!("Stored claude path no longer exists: {}", stored_path); warn!("Stored claude path no longer exists: {}", stored_path);
} }
} }
// Check user preference // Check user preference
let preference = conn.query_row( let preference = conn.query_row(
"SELECT value FROM app_settings WHERE key = 'claude_installation_preference'", "SELECT value FROM app_settings WHERE key = 'claude_installation_preference'",
[], [],
|row| row.get::<_, String>(0), |row| row.get::<_, String>(0),
).unwrap_or_else(|_| "system".to_string()); ).unwrap_or_else(|_| "system".to_string());
info!("User preference for Claude installation: {}", preference); info!("User preference for Claude installation: {}", preference);
} }
} }
@@ -206,7 +213,7 @@ fn find_which_installations() -> Vec<ClaudeInstallation> {
// Process each line (Windows 'where' can return multiple paths) // Process each line (Windows 'where' can return multiple paths)
for line in output_str.lines() { for line in output_str.lines() {
let mut path = line.trim().to_string(); let mut path = line.trim().to_string();
if path.is_empty() { if path.is_empty() {
continue; continue;
} }
@@ -445,10 +452,10 @@ fn get_claude_version(path: &str) -> Result<Option<String>, String> {
/// Extract version string from command output /// Extract version string from command output
fn extract_version_from_output(stdout: &[u8]) -> Option<String> { fn extract_version_from_output(stdout: &[u8]) -> Option<String> {
let output_str = String::from_utf8_lossy(stdout); let output_str = String::from_utf8_lossy(stdout);
// Debug log the raw output // Debug log the raw output
debug!("Raw version output: {:?}", output_str); debug!("Raw version output: {:?}", output_str);
// Use regex to directly extract version pattern (e.g., "1.0.41") // Use regex to directly extract version pattern (e.g., "1.0.41")
// This pattern matches: // This pattern matches:
// - One or more digits, followed by // - One or more digits, followed by
@@ -458,7 +465,7 @@ fn extract_version_from_output(stdout: &[u8]) -> Option<String> {
// - One or more digits // - One or more digits
// - Optionally followed by pre-release/build metadata // - Optionally followed by pre-release/build metadata
let version_regex = regex::Regex::new(r"(\d+\.\d+\.\d+(?:-[a-zA-Z0-9.-]+)?(?:\+[a-zA-Z0-9.-]+)?)").ok()?; let version_regex = regex::Regex::new(r"(\d+\.\d+\.\d+(?:-[a-zA-Z0-9.-]+)?(?:\+[a-zA-Z0-9.-]+)?)").ok()?;
if let Some(captures) = version_regex.captures(&output_str) { if let Some(captures) = version_regex.captures(&output_str) {
if let Some(version_match) = captures.get(1) { if let Some(version_match) = captures.get(1) {
let version = version_match.as_str().to_string(); let version = version_match.as_str().to_string();
@@ -466,7 +473,7 @@ fn extract_version_from_output(stdout: &[u8]) -> Option<String> {
return Some(version); return Some(version);
} }
} }
debug!("No version found in output"); debug!("No version found in output");
None None
} }
@@ -546,7 +553,7 @@ fn compare_versions(a: &str, b: &str) -> Ordering {
/// This ensures commands like Claude can find Node.js and other dependencies /// This ensures commands like Claude can find Node.js and other dependencies
pub fn create_command_with_env(program: &str) -> Command { pub fn create_command_with_env(program: &str) -> Command {
let mut cmd = Command::new(program); let mut cmd = Command::new(program);
info!("Creating command for: {}", program); info!("Creating command for: {}", program);
// Inherit essential environment variables from parent process // Inherit essential environment variables from parent process
@@ -574,7 +581,7 @@ pub fn create_command_with_env(program: &str) -> Command {
cmd.env(&key, &value); cmd.env(&key, &value);
} }
} }
// Log proxy-related environment variables for debugging // Log proxy-related environment variables for debugging
info!("Command will use proxy settings:"); info!("Command will use proxy settings:");
if let Ok(http_proxy) = std::env::var("HTTP_PROXY") { if let Ok(http_proxy) = std::env::var("HTTP_PROXY") {

88
src-tauri/src/commands/terminal.rs
View File

@@ -5,7 +5,7 @@ use tauri::{AppHandle, Emitter, State};
use tokio::sync::Mutex; use tokio::sync::Mutex;
use uuid::Uuid; use uuid::Uuid;
use anyhow::Result; use anyhow::Result;
use portable_pty::{native_pty_system, CommandBuilder, PtySize}; use portable_pty::{native_pty_system, CommandBuilder, PtySize, Child, MasterPty};
use std::io::{Read, Write}; use std::io::{Read, Write};
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -19,6 +19,8 @@ pub struct TerminalSession {
/// Terminal child process wrapper /// Terminal child process wrapper
pub struct TerminalChild { pub struct TerminalChild {
writer: Arc<Mutex<Box<dyn Write + Send>>>, writer: Arc<Mutex<Box<dyn Write + Send>>>,
_master: Box<dyn MasterPty + Send>, // Keep master PTY alive
_child: Box<dyn Child + Send + Sync>, // Keep child process alive
} }
/// State for managing terminal sessions /// State for managing terminal sessions
@@ -60,36 +62,69 @@ pub async fn create_terminal_session(
// Get shell command // Get shell command
let shell = get_default_shell(); let shell = get_default_shell();
log::info!("Using shell: {}", shell);
let mut cmd = CommandBuilder::new(&shell); let mut cmd = CommandBuilder::new(&shell);
// Set as login interactive shell // Set shell-specific arguments
if shell.contains("bash") || shell.contains("zsh") { if cfg!(target_os = "windows") {
cmd.arg("-il"); // Interactive login shell if shell.contains("pwsh") {
} else if shell.contains("fish") { // PowerShell Core - stay interactive
cmd.arg("-il"); cmd.arg("-NoLogo");
cmd.arg("-NoExit");
} else if shell.contains("powershell") {
// Windows PowerShell - stay interactive
cmd.arg("-NoLogo");
cmd.arg("-NoExit");
} else {
// cmd.exe - use /K to keep session open
cmd.arg("/K");
}
} else {
// Unix shells: Set as login interactive shell
if shell.contains("bash") || shell.contains("zsh") {
cmd.arg("-il"); // Interactive login shell
} else if shell.contains("fish") {
cmd.arg("-il");
}
} }
// Set working directory // Set working directory
cmd.cwd(working_directory.clone()); cmd.cwd(working_directory.clone());
// Set environment variables // Set environment variables based on platform
cmd.env("TERM", "xterm-256color"); if cfg!(target_os = "windows") {
cmd.env("COLORTERM", "truecolor"); // Windows-specific environment
cmd.env("LANG", std::env::var("LANG").unwrap_or_else(|_| "en_US.UTF-8".to_string())); cmd.env("TERM", "xterm-256color");
cmd.env("LC_ALL", std::env::var("LC_ALL").unwrap_or_else(|_| "en_US.UTF-8".to_string())); // Keep PATH and other essential Windows environment variables
cmd.env("LC_CTYPE", std::env::var("LC_CTYPE").unwrap_or_else(|_| "en_US.UTF-8".to_string())); for (key, value) in std::env::vars() {
if !key.starts_with("TAURI_") && !key.starts_with("VITE_") {
// 继承其他环境变量 cmd.env(&key, &value);
for (key, value) in std::env::vars() { }
if !key.starts_with("TERM") && !key.starts_with("COLORTERM") && !key.starts_with("LC_") && !key.starts_with("LANG") { }
cmd.env(&key, &value); } else {
// Unix-specific environment
cmd.env("TERM", "xterm-256color");
cmd.env("COLORTERM", "truecolor");
cmd.env("LANG", std::env::var("LANG").unwrap_or_else(|_| "en_US.UTF-8".to_string()));
cmd.env("LC_ALL", std::env::var("LC_ALL").unwrap_or_else(|_| "en_US.UTF-8".to_string()));
cmd.env("LC_CTYPE", std::env::var("LC_CTYPE").unwrap_or_else(|_| "en_US.UTF-8".to_string()));
// Inherit other Unix environment variables
for (key, value) in std::env::vars() {
if !key.starts_with("TERM") && !key.starts_with("COLORTERM") &&
!key.starts_with("LC_") && !key.starts_with("LANG") &&
!key.starts_with("TAURI_") && !key.starts_with("VITE_") {
cmd.env(&key, &value);
}
} }
} }
// Spawn the shell process // Spawn the shell process
let _child = pty_pair.slave.spawn_command(cmd) let child = pty_pair.slave.spawn_command(cmd)
.map_err(|e| format!("Failed to spawn shell: {}", e))?; .map_err(|e| format!("Failed to spawn shell: {}", e))?;
log::info!("Shell process spawned successfully for session: {}", session_id);
// Get writer for stdin // Get writer for stdin
let writer = pty_pair.master.take_writer() let writer = pty_pair.master.take_writer()
.map_err(|e| format!("Failed to get PTY writer: {}", e))?; .map_err(|e| format!("Failed to get PTY writer: {}", e))?;
@@ -103,15 +138,20 @@ pub async fn create_terminal_session(
// Spawn reader thread // Spawn reader thread
std::thread::spawn(move || { std::thread::spawn(move || {
let mut buffer = [0u8; 4096]; let mut buffer = [0u8; 4096];
log::info!("PTY reader thread started for session: {}", session_id_clone);
loop { loop {
match reader.read(&mut buffer) { match reader.read(&mut buffer) {
Ok(0) => break, // EOF Ok(0) => {
log::warn!("PTY reader got EOF for session: {}", session_id_clone);
break; // EOF
}
Ok(n) => { Ok(n) => {
let data = String::from_utf8_lossy(&buffer[..n]).to_string(); let data = String::from_utf8_lossy(&buffer[..n]).to_string();
log::debug!("PTY reader got {} bytes for session {}: {:?}", n, session_id_clone, data);
let _ = app_handle_clone.emit(&format!("terminal-output:{}", session_id_clone), &data); let _ = app_handle_clone.emit(&format!("terminal-output:{}", session_id_clone), &data);
} }
Err(e) => { Err(e) => {
log::error!("Error reading PTY output: {}", e); log::error!("Error reading PTY output for session {}: {}", session_id_clone, e);
break; break;
} }
} }
@@ -119,9 +159,11 @@ pub async fn create_terminal_session(
log::debug!("PTY reader thread finished for session: {}", session_id_clone); log::debug!("PTY reader thread finished for session: {}", session_id_clone);
}); });
// Store the session with PTY writer // Store the session with PTY writer, master PTY and child process
let terminal_child = TerminalChild { let terminal_child = TerminalChild {
writer: Arc::new(Mutex::new(writer)), writer: Arc::new(Mutex::new(writer)),
_master: pty_pair.master,
_child: child,
}; };
{ {
@@ -245,13 +287,13 @@ pub async fn cleanup_terminal_sessions(
/// Get the default shell for the current platform /// Get the default shell for the current platform
fn get_default_shell() -> String { fn get_default_shell() -> String {
if cfg!(target_os = "windows") { if cfg!(target_os = "windows") {
// Try PowerShell first, fallback to cmd // Try PowerShell Core (pwsh) first, then Windows PowerShell, fallback to cmd
if std::process::Command::new("pwsh").arg("--version").output().is_ok() { if std::process::Command::new("pwsh").arg("--version").output().is_ok() {
"pwsh".to_string() "pwsh".to_string()
} else if std::process::Command::new("powershell").arg("-Version").output().is_ok() { } else if std::process::Command::new("powershell").arg("-Version").output().is_ok() {
"powershell".to_string() "powershell".to_string()
} else { } else {
"cmd".to_string() "cmd.exe".to_string()
} }
} else { } else {
// Unix-like systems: try zsh, bash, then sh // Unix-like systems: try zsh, bash, then sh

6
src-tauri/tauri.conf.json
View File

@@ -18,7 +18,7 @@
} }
], ],
"security": { "security": {
"csp": "default-src 'self'; img-src 'self' asset: https://asset.localhost blob: data:; style-src 'self' 'unsafe-inline' blob: data: asset: https://asset.localhost; style-src-elem 'self' 'unsafe-inline' blob: data: asset: https://asset.localhost; style-src-attr 'self' 'unsafe-inline'; script-src 'self' 'unsafe-eval' https://app.posthog.com https://*.posthog.com https://*.i.posthog.com https://*.assets.i.posthog.com; worker-src 'self' blob: asset: https://asset.localhost; font-src 'self' data: blob: asset: https://asset.localhost; connect-src 'self' ipc: https://ipc.localhost https://app.posthog.com https://*.posthog.com https://*.i.posthog.com", "csp": "default-src 'self'; img-src 'self' asset: https://asset.localhost blob: data:; style-src 'self' 'unsafe-inline' blob: data: asset: https://asset.localhost; style-src-elem 'self' 'unsafe-inline' blob: data: asset: https://asset.localhost; style-src-attr 'self' 'unsafe-inline'; script-src 'self' 'unsafe-eval' https://app.posthog.com https://*.posthog.com https://*.i.posthog.com https://*.assets.i.posthog.com; worker-src 'self' blob: asset: https://asset.localhost; font-src 'self' data: blob: asset: https://asset.localhost; connect-src 'self' ipc: http://ipc.localhost https://ipc.localhost https://app.posthog.com https://*.posthog.com https://*.i.posthog.com",
"assetProtocol": { "assetProtocol": {
"enable": true, "enable": true,
"scope": [ "scope": [
@@ -34,9 +34,7 @@
}, },
"bundle": { "bundle": {
"active": true, "active": true,
"targets": [ "targets": "all",
"msi"
],
"icon": [ "icon": [
"icons/32x32.png", "icons/32x32.png",
"icons/128x128.png", "icons/128x128.png",

19
src/components/ClaudeCodeSession.tsx
View File

@@ -45,7 +45,8 @@ import { SplitPane } from "@/components/ui/split-pane";
import { WebviewPreview } from "./WebviewPreview"; import { WebviewPreview } from "./WebviewPreview";
import { FileExplorerPanelEnhanced } from "./FileExplorerPanelEnhanced"; import { FileExplorerPanelEnhanced } from "./FileExplorerPanelEnhanced";
import { GitPanelEnhanced } from "./GitPanelEnhanced"; import { GitPanelEnhanced } from "./GitPanelEnhanced";
import { FileEditorEnhanced } from "./FileEditorEnhanced"; // 动态导入 FileEditorEnhanced 以减少初始包大小
const FileEditorEnhanced = React.lazy(() => import("./FileEditorEnhanced"));
import { SlashCommandsManager } from "./SlashCommandsManager"; import { SlashCommandsManager } from "./SlashCommandsManager";
import type { ClaudeStreamMessage } from "./AgentExecution"; import type { ClaudeStreamMessage } from "./AgentExecution";
import { useVirtualizer } from "@tanstack/react-virtual"; import { useVirtualizer } from "@tanstack/react-virtual";
@@ -1904,11 +1905,17 @@ export const ClaudeCodeSession: React.FC<ClaudeCodeSessionProps> = ({
<div className={cn("h-full w-full", layout.activeView === 'terminal' ? 'hidden' : 'block')}> <div className={cn("h-full w-full", layout.activeView === 'terminal' ? 'hidden' : 'block')}>
{layout.activeView === 'editor' && layout.editingFile ? ( {layout.activeView === 'editor' && layout.editingFile ? (
// 文件编辑器视图 // 文件编辑器视图
<FileEditorEnhanced <React.Suspense fallback={
filePath={layout.editingFile} <div className="flex items-center justify-center h-full">
onClose={closeFileEditor} <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-primary"></div>
className="h-full" </div>
/> }>
<FileEditorEnhanced
filePath={layout.editingFile}
onClose={closeFileEditor}
className="h-full"
/>
</React.Suspense>
) : layout.activeView === 'preview' && layout.previewUrl ? ( ) : layout.activeView === 'preview' && layout.previewUrl ? (
// 预览视图 // 预览视图
<SplitPane <SplitPane

9
vite.config.ts
View File

@@ -51,10 +51,17 @@ export default defineConfig(async () => ({
'react-vendor': ['react', 'react-dom'], 'react-vendor': ['react', 'react-dom'],
'ui-vendor': ['@radix-ui/react-dialog', '@radix-ui/react-dropdown-menu', '@radix-ui/react-select', '@radix-ui/react-tabs', '@radix-ui/react-tooltip', '@radix-ui/react-switch', '@radix-ui/react-popover'], 'ui-vendor': ['@radix-ui/react-dialog', '@radix-ui/react-dropdown-menu', '@radix-ui/react-select', '@radix-ui/react-tabs', '@radix-ui/react-tooltip', '@radix-ui/react-switch', '@radix-ui/react-popover'],
'editor-vendor': ['@uiw/react-md-editor'], 'editor-vendor': ['@uiw/react-md-editor'],
'monaco-editor': ['monaco-editor', '@monaco-editor/react'],
'syntax-vendor': ['react-syntax-highlighter'], 'syntax-vendor': ['react-syntax-highlighter'],
// Animation and motion
'framer-motion': ['framer-motion'],
// Tauri and other utilities // Tauri and other utilities
'tauri': ['@tauri-apps/api', '@tauri-apps/plugin-dialog', '@tauri-apps/plugin-shell'], 'tauri': ['@tauri-apps/api', '@tauri-apps/plugin-dialog', '@tauri-apps/plugin-shell', '@tauri-apps/plugin-fs', '@tauri-apps/plugin-clipboard-manager'],
'utils': ['date-fns', 'clsx', 'tailwind-merge'], 'utils': ['date-fns', 'clsx', 'tailwind-merge'],
// Charts and visualization
'recharts': ['recharts'],
// Virtual scrolling
'virtual': ['@tanstack/react-virtual'],
}, },
}, },
}, },