generated from nhcarrigan/template
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 minori
|
fab350b71d |
+2
-2
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "hikari-desktop",
|
||||
"version": "1.14.0",
|
||||
"version": "1.12.0",
|
||||
"description": "",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
@@ -49,7 +49,7 @@
|
||||
"@codemirror/lang-yaml": "6.1.2",
|
||||
"@codemirror/language": "6.12.2",
|
||||
"@codemirror/legacy-modes": "6.5.2",
|
||||
"@codemirror/state": "6.5.4",
|
||||
"@codemirror/state": "6.6.0",
|
||||
"@codemirror/theme-one-dark": "6.1.3",
|
||||
"@codemirror/view": "6.39.15",
|
||||
"@lezer/highlight": "1.2.3",
|
||||
|
||||
Generated
+24
-24
@@ -75,8 +75,8 @@ importers:
|
||||
specifier: 6.5.2
|
||||
version: 6.5.2
|
||||
'@codemirror/state':
|
||||
specifier: 6.5.4
|
||||
version: 6.5.4
|
||||
specifier: 6.6.0
|
||||
version: 6.6.0
|
||||
'@codemirror/theme-one-dark':
|
||||
specifier: 6.1.3
|
||||
version: 6.1.3
|
||||
@@ -322,8 +322,8 @@ packages:
|
||||
'@codemirror/search@6.6.0':
|
||||
resolution: {integrity: sha512-koFuNXcDvyyotWcgOnZGmY7LZqEOXZaaxD/j6n18TCLx2/9HieZJ5H6hs1g8FiRxBD0DNfs0nXn17g872RmYdw==}
|
||||
|
||||
'@codemirror/state@6.5.4':
|
||||
resolution: {integrity: sha512-8y7xqG/hpB53l25CIoit9/ngxdfoG+fx+V3SHBrinnhOtLvKHRyAJJuHzkWrR4YXXLX8eXBsejgAAxHUOdW1yw==}
|
||||
'@codemirror/state@6.6.0':
|
||||
resolution: {integrity: sha512-4nbvra5R5EtiCzr9BTHiTLc+MLXK2QGiAVYMyi8PkQd3SR+6ixar/Q/01Fa21TBIDOZXgeWV4WppsQolSreAPQ==}
|
||||
|
||||
'@codemirror/theme-one-dark@6.1.3':
|
||||
resolution: {integrity: sha512-NzBdIvEJmx6fjeremiGp3t/okrLPYT0d9orIc7AFun8oZcRk58aejkqhv6spnz4MLAevrKNPMQYXEWMg4s+sKA==}
|
||||
@@ -2201,14 +2201,14 @@ snapshots:
|
||||
'@codemirror/autocomplete@6.20.0':
|
||||
dependencies:
|
||||
'@codemirror/language': 6.12.2
|
||||
'@codemirror/state': 6.5.4
|
||||
'@codemirror/state': 6.6.0
|
||||
'@codemirror/view': 6.39.15
|
||||
'@lezer/common': 1.5.0
|
||||
|
||||
'@codemirror/commands@6.10.2':
|
||||
dependencies:
|
||||
'@codemirror/language': 6.12.2
|
||||
'@codemirror/state': 6.5.4
|
||||
'@codemirror/state': 6.6.0
|
||||
'@codemirror/view': 6.39.15
|
||||
'@lezer/common': 1.5.0
|
||||
|
||||
@@ -2230,7 +2230,7 @@ snapshots:
|
||||
dependencies:
|
||||
'@codemirror/autocomplete': 6.20.0
|
||||
'@codemirror/language': 6.12.2
|
||||
'@codemirror/state': 6.5.4
|
||||
'@codemirror/state': 6.6.0
|
||||
'@lezer/common': 1.5.0
|
||||
'@lezer/css': 1.3.0
|
||||
|
||||
@@ -2238,7 +2238,7 @@ snapshots:
|
||||
dependencies:
|
||||
'@codemirror/autocomplete': 6.20.0
|
||||
'@codemirror/language': 6.12.2
|
||||
'@codemirror/state': 6.5.4
|
||||
'@codemirror/state': 6.6.0
|
||||
'@lezer/common': 1.5.0
|
||||
'@lezer/go': 1.0.1
|
||||
|
||||
@@ -2248,7 +2248,7 @@ snapshots:
|
||||
'@codemirror/lang-css': 6.3.1
|
||||
'@codemirror/lang-javascript': 6.2.4
|
||||
'@codemirror/language': 6.12.2
|
||||
'@codemirror/state': 6.5.4
|
||||
'@codemirror/state': 6.6.0
|
||||
'@codemirror/view': 6.39.15
|
||||
'@lezer/common': 1.5.0
|
||||
'@lezer/css': 1.3.0
|
||||
@@ -2264,7 +2264,7 @@ snapshots:
|
||||
'@codemirror/autocomplete': 6.20.0
|
||||
'@codemirror/language': 6.12.2
|
||||
'@codemirror/lint': 6.9.3
|
||||
'@codemirror/state': 6.5.4
|
||||
'@codemirror/state': 6.6.0
|
||||
'@codemirror/view': 6.39.15
|
||||
'@lezer/common': 1.5.0
|
||||
'@lezer/javascript': 1.5.4
|
||||
@@ -2287,7 +2287,7 @@ snapshots:
|
||||
'@codemirror/autocomplete': 6.20.0
|
||||
'@codemirror/lang-html': 6.4.11
|
||||
'@codemirror/language': 6.12.2
|
||||
'@codemirror/state': 6.5.4
|
||||
'@codemirror/state': 6.6.0
|
||||
'@codemirror/view': 6.39.15
|
||||
'@lezer/common': 1.5.0
|
||||
'@lezer/markdown': 1.6.3
|
||||
@@ -2296,7 +2296,7 @@ snapshots:
|
||||
dependencies:
|
||||
'@codemirror/lang-html': 6.4.11
|
||||
'@codemirror/language': 6.12.2
|
||||
'@codemirror/state': 6.5.4
|
||||
'@codemirror/state': 6.6.0
|
||||
'@lezer/common': 1.5.0
|
||||
'@lezer/php': 1.0.5
|
||||
|
||||
@@ -2304,7 +2304,7 @@ snapshots:
|
||||
dependencies:
|
||||
'@codemirror/autocomplete': 6.20.0
|
||||
'@codemirror/language': 6.12.2
|
||||
'@codemirror/state': 6.5.4
|
||||
'@codemirror/state': 6.6.0
|
||||
'@lezer/common': 1.5.0
|
||||
'@lezer/python': 1.1.18
|
||||
|
||||
@@ -2317,7 +2317,7 @@ snapshots:
|
||||
dependencies:
|
||||
'@codemirror/lang-css': 6.3.1
|
||||
'@codemirror/language': 6.12.2
|
||||
'@codemirror/state': 6.5.4
|
||||
'@codemirror/state': 6.6.0
|
||||
'@lezer/common': 1.5.0
|
||||
'@lezer/sass': 1.1.0
|
||||
|
||||
@@ -2325,7 +2325,7 @@ snapshots:
|
||||
dependencies:
|
||||
'@codemirror/autocomplete': 6.20.0
|
||||
'@codemirror/language': 6.12.2
|
||||
'@codemirror/state': 6.5.4
|
||||
'@codemirror/state': 6.6.0
|
||||
'@lezer/common': 1.5.0
|
||||
'@lezer/highlight': 1.2.3
|
||||
'@lezer/lr': 1.4.8
|
||||
@@ -2350,7 +2350,7 @@ snapshots:
|
||||
dependencies:
|
||||
'@codemirror/autocomplete': 6.20.0
|
||||
'@codemirror/language': 6.12.2
|
||||
'@codemirror/state': 6.5.4
|
||||
'@codemirror/state': 6.6.0
|
||||
'@codemirror/view': 6.39.15
|
||||
'@lezer/common': 1.5.0
|
||||
'@lezer/xml': 1.0.6
|
||||
@@ -2359,7 +2359,7 @@ snapshots:
|
||||
dependencies:
|
||||
'@codemirror/autocomplete': 6.20.0
|
||||
'@codemirror/language': 6.12.2
|
||||
'@codemirror/state': 6.5.4
|
||||
'@codemirror/state': 6.6.0
|
||||
'@lezer/common': 1.5.0
|
||||
'@lezer/highlight': 1.2.3
|
||||
'@lezer/lr': 1.4.8
|
||||
@@ -2367,7 +2367,7 @@ snapshots:
|
||||
|
||||
'@codemirror/language@6.12.2':
|
||||
dependencies:
|
||||
'@codemirror/state': 6.5.4
|
||||
'@codemirror/state': 6.6.0
|
||||
'@codemirror/view': 6.39.15
|
||||
'@lezer/common': 1.5.0
|
||||
'@lezer/highlight': 1.2.3
|
||||
@@ -2380,30 +2380,30 @@ snapshots:
|
||||
|
||||
'@codemirror/lint@6.9.3':
|
||||
dependencies:
|
||||
'@codemirror/state': 6.5.4
|
||||
'@codemirror/state': 6.6.0
|
||||
'@codemirror/view': 6.39.15
|
||||
crelt: 1.0.6
|
||||
|
||||
'@codemirror/search@6.6.0':
|
||||
dependencies:
|
||||
'@codemirror/state': 6.5.4
|
||||
'@codemirror/state': 6.6.0
|
||||
'@codemirror/view': 6.39.15
|
||||
crelt: 1.0.6
|
||||
|
||||
'@codemirror/state@6.5.4':
|
||||
'@codemirror/state@6.6.0':
|
||||
dependencies:
|
||||
'@marijn/find-cluster-break': 1.0.2
|
||||
|
||||
'@codemirror/theme-one-dark@6.1.3':
|
||||
dependencies:
|
||||
'@codemirror/language': 6.12.2
|
||||
'@codemirror/state': 6.5.4
|
||||
'@codemirror/state': 6.6.0
|
||||
'@codemirror/view': 6.39.15
|
||||
'@lezer/highlight': 1.2.3
|
||||
|
||||
'@codemirror/view@6.39.15':
|
||||
dependencies:
|
||||
'@codemirror/state': 6.5.4
|
||||
'@codemirror/state': 6.6.0
|
||||
crelt: 1.0.6
|
||||
style-mod: 4.1.3
|
||||
w3c-keyname: 2.2.8
|
||||
@@ -3235,7 +3235,7 @@ snapshots:
|
||||
'@codemirror/language': 6.12.2
|
||||
'@codemirror/lint': 6.9.3
|
||||
'@codemirror/search': 6.6.0
|
||||
'@codemirror/state': 6.5.4
|
||||
'@codemirror/state': 6.6.0
|
||||
'@codemirror/view': 6.39.15
|
||||
|
||||
color-convert@2.0.1:
|
||||
|
||||
Generated
+1
-1
@@ -1648,7 +1648,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
|
||||
|
||||
[[package]]
|
||||
name = "hikari-desktop"
|
||||
version = "1.14.0"
|
||||
version = "1.12.0"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"dirs 5.0.1",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "hikari-desktop"
|
||||
version = "1.14.0"
|
||||
version = "1.12.0"
|
||||
description = "Hikari - Claude Code Visual Assistant"
|
||||
authors = ["Naomi Carrigan"]
|
||||
edition = "2021"
|
||||
|
||||
+3
-132
@@ -1464,7 +1464,6 @@ pub async fn close_application(app_handle: AppHandle) -> Result<(), String> {
|
||||
pub struct MemoryFileInfo {
|
||||
pub path: String,
|
||||
pub heading: Option<String>,
|
||||
pub last_modified: Option<String>, // Unix timestamp in seconds as a string
|
||||
}
|
||||
|
||||
#[derive(serde::Serialize)]
|
||||
@@ -1536,11 +1535,7 @@ async fn list_memory_files_via_wsl() -> Result<MemoryFilesResponse, String> {
|
||||
let mut files = Vec::new();
|
||||
for path in paths {
|
||||
let heading = read_wsl_file_first_heading(&path);
|
||||
files.push(MemoryFileInfo {
|
||||
path,
|
||||
heading,
|
||||
last_modified: None,
|
||||
});
|
||||
files.push(MemoryFileInfo { path, heading });
|
||||
}
|
||||
|
||||
Ok(MemoryFilesResponse { files })
|
||||
@@ -1610,23 +1605,14 @@ async fn list_memory_files_native() -> Result<MemoryFilesResponse, String> {
|
||||
// Sort files alphabetically
|
||||
memory_paths.sort();
|
||||
|
||||
// Read first heading and modification time from each file
|
||||
// Read first heading from each file
|
||||
let files = memory_paths
|
||||
.into_iter()
|
||||
.map(|path| {
|
||||
let heading = fs::read_to_string(&path)
|
||||
.ok()
|
||||
.and_then(|content| extract_first_heading(&content));
|
||||
let last_modified = fs::metadata(&path)
|
||||
.ok()
|
||||
.and_then(|m| m.modified().ok())
|
||||
.and_then(|t| t.duration_since(std::time::UNIX_EPOCH).ok())
|
||||
.map(|d| d.as_secs().to_string());
|
||||
MemoryFileInfo {
|
||||
path,
|
||||
heading,
|
||||
last_modified,
|
||||
}
|
||||
MemoryFileInfo { path, heading }
|
||||
})
|
||||
.collect();
|
||||
|
||||
@@ -2618,103 +2604,6 @@ pub async fn open_binary_file(app: AppHandle, path: String) -> Result<(), String
|
||||
}
|
||||
}
|
||||
|
||||
/// Read `~/.claude/CLAUDE.md` via WSL (for Windows).
|
||||
/// Returns an empty string if the file does not exist.
|
||||
#[cfg(target_os = "windows")]
|
||||
async fn get_global_claude_md_via_wsl() -> Result<String, String> {
|
||||
use std::process::Command;
|
||||
|
||||
let output = Command::new("wsl")
|
||||
.hide_window()
|
||||
.args(["-e", "bash", "-l", "-c", "cat ~/.claude/CLAUDE.md 2>/dev/null || true"])
|
||||
.output()
|
||||
.map_err(|e| format!("Failed to execute WSL command: {}", e))?;
|
||||
|
||||
Ok(String::from_utf8_lossy(&output.stdout).to_string())
|
||||
}
|
||||
|
||||
/// Write content to `~/.claude/CLAUDE.md` via WSL (for Windows).
|
||||
/// Creates the file (and `~/.claude/` directory) if they do not exist.
|
||||
#[cfg(target_os = "windows")]
|
||||
async fn save_global_claude_md_via_wsl(content: String) -> Result<(), String> {
|
||||
use std::io::Write;
|
||||
use std::process::{Command, Stdio};
|
||||
|
||||
let mut child = Command::new("wsl")
|
||||
.hide_window()
|
||||
.args([
|
||||
"-e",
|
||||
"bash",
|
||||
"-l",
|
||||
"-c",
|
||||
"mkdir -p ~/.claude && cat > ~/.claude/CLAUDE.md",
|
||||
])
|
||||
.stdin(Stdio::piped())
|
||||
.spawn()
|
||||
.map_err(|e| format!("Failed to execute WSL command: {}", e))?;
|
||||
|
||||
if let Some(stdin) = child.stdin.as_mut() {
|
||||
stdin
|
||||
.write_all(content.as_bytes())
|
||||
.map_err(|e| format!("Failed to write content to WSL stdin: {}", e))?;
|
||||
}
|
||||
|
||||
let status = child
|
||||
.wait()
|
||||
.map_err(|e| format!("Failed to wait for WSL command: {}", e))?;
|
||||
|
||||
if !status.success() {
|
||||
return Err("Failed to save CLAUDE.md via WSL".to_string());
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Read the contents of `~/.claude/CLAUDE.md`.
|
||||
/// Returns an empty string if the file does not exist.
|
||||
#[tauri::command]
|
||||
pub async fn get_global_claude_md() -> Result<String, String> {
|
||||
#[cfg(target_os = "windows")]
|
||||
return get_global_claude_md_via_wsl().await;
|
||||
|
||||
#[cfg(not(target_os = "windows"))]
|
||||
{
|
||||
let path = dirs::home_dir()
|
||||
.ok_or_else(|| "Could not determine home directory".to_string())?
|
||||
.join(".claude")
|
||||
.join("CLAUDE.md");
|
||||
|
||||
if !path.exists() {
|
||||
return Ok(String::new());
|
||||
}
|
||||
|
||||
std::fs::read_to_string(&path).map_err(|e| format!("Failed to read CLAUDE.md: {}", e))
|
||||
}
|
||||
}
|
||||
|
||||
/// Write content to `~/.claude/CLAUDE.md`.
|
||||
/// Creates the file (and `~/.claude/` directory) if they do not exist.
|
||||
#[tauri::command]
|
||||
pub async fn save_global_claude_md(content: String) -> Result<(), String> {
|
||||
#[cfg(target_os = "windows")]
|
||||
return save_global_claude_md_via_wsl(content).await;
|
||||
|
||||
#[cfg(not(target_os = "windows"))]
|
||||
{
|
||||
let claude_dir = dirs::home_dir()
|
||||
.ok_or_else(|| "Could not determine home directory".to_string())?
|
||||
.join(".claude");
|
||||
|
||||
if !claude_dir.exists() {
|
||||
std::fs::create_dir_all(&claude_dir)
|
||||
.map_err(|e| format!("Failed to create ~/.claude directory: {}", e))?;
|
||||
}
|
||||
|
||||
let path = claude_dir.join("CLAUDE.md");
|
||||
std::fs::write(&path, content).map_err(|e| format!("Failed to write CLAUDE.md: {}", e))
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
@@ -3464,22 +3353,4 @@ gitea: gitea-mcp -t stdio (STDIO) - âś“ Connected"#;
|
||||
let (_, args) = build_wslpath_command(path);
|
||||
assert_eq!(args[2], path);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_get_global_claude_md_path_construction() {
|
||||
// Verify that home_dir() resolves successfully on the test platform
|
||||
let home = dirs::home_dir();
|
||||
assert!(home.is_some(), "home_dir() should be available in test environment");
|
||||
let expected = home.unwrap().join(".claude").join("CLAUDE.md");
|
||||
assert!(expected.to_string_lossy().contains(".claude"));
|
||||
assert!(expected.to_string_lossy().ends_with("CLAUDE.md"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_save_global_claude_md_dir_path_construction() {
|
||||
let home = dirs::home_dir();
|
||||
assert!(home.is_some());
|
||||
let dir = home.unwrap().join(".claude");
|
||||
assert!(dir.to_string_lossy().contains(".claude"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -51,25 +51,6 @@ pub struct ClaudeStartOptions {
|
||||
|
||||
#[serde(default)]
|
||||
pub model_overrides: Option<HashMap<String, String>>,
|
||||
|
||||
#[serde(default)]
|
||||
pub session_name: Option<String>,
|
||||
|
||||
#[serde(default)]
|
||||
pub disable_skill_shell_execution: bool,
|
||||
|
||||
/// Pass `--bare` flag to suppress UI chrome, useful for scripted headless `-p` calls (v2.1.81+).
|
||||
#[serde(default)]
|
||||
pub bare_mode: bool,
|
||||
|
||||
/// Controls `showClearContextOnPlanAccept` in `--settings` (v2.1.81+).
|
||||
/// Defaults to true (matching CLI default). Set to false to suppress the dialog.
|
||||
#[serde(default = "default_show_clear_context")]
|
||||
pub show_clear_context_on_plan_accept: bool,
|
||||
|
||||
/// Sets `ANTHROPIC_CUSTOM_MODEL_OPTION` env var for custom model providers (v2.1.81+).
|
||||
#[serde(default)]
|
||||
pub custom_model_option: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
@@ -219,23 +200,6 @@ pub struct HikariConfig {
|
||||
|
||||
#[serde(default)]
|
||||
pub model_overrides: Option<HashMap<String, String>>,
|
||||
|
||||
/// Prevents skill scripts from executing shell commands (Claude Code v2.1.91+).
|
||||
/// Passes `"disableSkillShellExecution": true` via the `--settings` flag.
|
||||
#[serde(default)]
|
||||
pub disable_skill_shell_execution: bool,
|
||||
|
||||
/// Pass `--bare` flag to suppress UI chrome, useful for scripted headless `-p` calls (v2.1.81+).
|
||||
#[serde(default)]
|
||||
pub bare_mode: bool,
|
||||
|
||||
/// Controls `showClearContextOnPlanAccept` in `--settings` (v2.1.81+).
|
||||
#[serde(default = "default_show_clear_context")]
|
||||
pub show_clear_context_on_plan_accept: bool,
|
||||
|
||||
/// Sets `ANTHROPIC_CUSTOM_MODEL_OPTION` env var for custom model providers (v2.1.81+).
|
||||
#[serde(default)]
|
||||
pub custom_model_option: Option<String>,
|
||||
}
|
||||
|
||||
impl Default for HikariConfig {
|
||||
@@ -287,10 +251,6 @@ impl Default for HikariConfig {
|
||||
enable_claudeai_mcp_servers: true,
|
||||
auto_memory_directory: None,
|
||||
model_overrides: None,
|
||||
disable_skill_shell_execution: false,
|
||||
bare_mode: false,
|
||||
show_clear_context_on_plan_accept: true,
|
||||
custom_model_option: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -343,10 +303,6 @@ fn default_enable_claudeai_mcp_servers() -> bool {
|
||||
true
|
||||
}
|
||||
|
||||
fn default_show_clear_context() -> bool {
|
||||
true
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq)]
|
||||
#[serde(rename_all = "lowercase")]
|
||||
pub enum BudgetAction {
|
||||
@@ -446,10 +402,6 @@ mod tests {
|
||||
assert!(config.enable_claudeai_mcp_servers);
|
||||
assert!(config.auto_memory_directory.is_none());
|
||||
assert!(config.model_overrides.is_none());
|
||||
assert!(!config.disable_skill_shell_execution);
|
||||
assert!(!config.bare_mode);
|
||||
assert!(config.show_clear_context_on_plan_accept);
|
||||
assert!(config.custom_model_option.is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -504,10 +456,6 @@ mod tests {
|
||||
"claude-opus-4-6".to_string(),
|
||||
"arn:aws:bedrock:us-east-1::foundation-model/anthropic.claude-opus-4-6-v1".to_string(),
|
||||
)])),
|
||||
disable_skill_shell_execution: true,
|
||||
bare_mode: false,
|
||||
show_clear_context_on_plan_accept: true,
|
||||
custom_model_option: None,
|
||||
};
|
||||
|
||||
let json = serde_json::to_string(&config).unwrap();
|
||||
|
||||
@@ -224,8 +224,6 @@ pub fn run() {
|
||||
delete_all_drafts,
|
||||
scan_project,
|
||||
open_binary_file,
|
||||
get_global_claude_md,
|
||||
save_global_claude_md,
|
||||
])
|
||||
.run(tauri::generate_context!())
|
||||
.expect("error while running tauri application");
|
||||
|
||||
@@ -95,9 +95,6 @@ pub enum ClaudeMessage {
|
||||
cwd: Option<String>,
|
||||
#[serde(default)]
|
||||
tools: Option<Vec<String>>,
|
||||
/// Output style hint from Claude Code (v2.1.81+). Informational only.
|
||||
#[serde(default)]
|
||||
output_style: Option<String>,
|
||||
},
|
||||
#[serde(rename = "assistant")]
|
||||
Assistant {
|
||||
@@ -122,15 +119,6 @@ pub enum ClaudeMessage {
|
||||
permission_denials: Option<Vec<PermissionDenial>>,
|
||||
#[serde(default)]
|
||||
usage: Option<UsageInfo>,
|
||||
/// Fast mode state from Claude Code v2.1.81+. Values: "default" | "enabled" | "disabled".
|
||||
#[serde(default)]
|
||||
fast_mode_state: Option<String>,
|
||||
/// Per-model usage breakdown from Claude Code v2.1.81+.
|
||||
#[serde(default)]
|
||||
model_usage: Option<serde_json::Value>,
|
||||
/// Authoritative total cost in USD reported by Claude Code v2.1.81+.
|
||||
#[serde(default)]
|
||||
total_cost_usd: Option<f64>,
|
||||
},
|
||||
#[serde(rename = "rate_limit_event")]
|
||||
RateLimitEvent {
|
||||
@@ -292,80 +280,6 @@ pub struct UserQuestionEvent {
|
||||
pub conversation_id: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct ElicitationEvent {
|
||||
pub message: String,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub server_name: Option<String>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub request_id: Option<String>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub conversation_id: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct ElicitationResultEvent {
|
||||
pub action: String,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub request_id: Option<String>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub conversation_id: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct StopFailureEvent {
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub stop_reason: Option<String>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub error_type: Option<String>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub conversation_id: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct PostCompactEvent {
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub session_id: Option<String>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub conversation_id: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct CwdChangedEvent {
|
||||
pub cwd: String,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub conversation_id: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct FileChangedEvent {
|
||||
pub file: String,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub conversation_id: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct TaskCreatedEvent {
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub task_id: Option<String>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub description: Option<String>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub parent_tool_use_id: Option<String>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub conversation_id: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct PermissionDeniedEvent {
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub tool_name: Option<String>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub reason: Option<String>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub conversation_id: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct AgentStartEvent {
|
||||
pub tool_use_id: String,
|
||||
@@ -652,337 +566,4 @@ mod tests {
|
||||
panic!("Expected RateLimitEvent variant");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_elicitation_event_serialization() {
|
||||
let event = ElicitationEvent {
|
||||
message: "Please provide the API endpoint".to_string(),
|
||||
server_name: Some("my-server".to_string()),
|
||||
request_id: Some("req-123".to_string()),
|
||||
conversation_id: Some("conv-abc".to_string()),
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert!(serialized.contains("\"message\":\"Please provide the API endpoint\""));
|
||||
assert!(serialized.contains("\"server_name\":\"my-server\""));
|
||||
assert!(serialized.contains("\"request_id\":\"req-123\""));
|
||||
assert!(serialized.contains("\"conversation_id\":\"conv-abc\""));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_elicitation_event_omits_none_fields() {
|
||||
let event = ElicitationEvent {
|
||||
message: "Enter your token".to_string(),
|
||||
server_name: None,
|
||||
request_id: None,
|
||||
conversation_id: None,
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert!(serialized.contains("\"message\":\"Enter your token\""));
|
||||
assert!(!serialized.contains("server_name"));
|
||||
assert!(!serialized.contains("request_id"));
|
||||
assert!(!serialized.contains("conversation_id"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_elicitation_result_event_serialization() {
|
||||
let event = ElicitationResultEvent {
|
||||
action: "accept".to_string(),
|
||||
request_id: Some("req-123".to_string()),
|
||||
conversation_id: Some("conv-abc".to_string()),
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert!(serialized.contains("\"action\":\"accept\""));
|
||||
assert!(serialized.contains("\"request_id\":\"req-123\""));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_elicitation_result_event_cancel_omits_none_fields() {
|
||||
let event = ElicitationResultEvent {
|
||||
action: "cancel".to_string(),
|
||||
request_id: None,
|
||||
conversation_id: None,
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert!(serialized.contains("\"action\":\"cancel\""));
|
||||
assert!(!serialized.contains("request_id"));
|
||||
assert!(!serialized.contains("conversation_id"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_stop_failure_event_serialization() {
|
||||
let event = StopFailureEvent {
|
||||
stop_reason: Some("api_error".to_string()),
|
||||
error_type: Some("rate_limit".to_string()),
|
||||
conversation_id: Some("conv-abc".to_string()),
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert!(serialized.contains("\"stop_reason\":\"api_error\""));
|
||||
assert!(serialized.contains("\"error_type\":\"rate_limit\""));
|
||||
assert!(serialized.contains("\"conversation_id\":\"conv-abc\""));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_stop_failure_event_omits_none_fields() {
|
||||
let event = StopFailureEvent {
|
||||
stop_reason: None,
|
||||
error_type: None,
|
||||
conversation_id: None,
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert!(!serialized.contains("stop_reason"));
|
||||
assert!(!serialized.contains("error_type"));
|
||||
assert!(!serialized.contains("conversation_id"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_stop_failure_event_partial_fields() {
|
||||
let event = StopFailureEvent {
|
||||
stop_reason: Some("api_error".to_string()),
|
||||
error_type: None,
|
||||
conversation_id: None,
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert!(serialized.contains("\"stop_reason\":\"api_error\""));
|
||||
assert!(!serialized.contains("error_type"));
|
||||
assert!(!serialized.contains("conversation_id"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_post_compact_event_serialization() {
|
||||
let event = PostCompactEvent {
|
||||
session_id: Some("sess-abc".to_string()),
|
||||
conversation_id: Some("conv-123".to_string()),
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert!(serialized.contains("\"session_id\":\"sess-abc\""));
|
||||
assert!(serialized.contains("\"conversation_id\":\"conv-123\""));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_post_compact_event_omits_none_fields() {
|
||||
let event = PostCompactEvent {
|
||||
session_id: None,
|
||||
conversation_id: None,
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert!(!serialized.contains("session_id"));
|
||||
assert!(!serialized.contains("conversation_id"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_post_compact_event_partial_fields() {
|
||||
let event = PostCompactEvent {
|
||||
session_id: Some("sess-xyz".to_string()),
|
||||
conversation_id: None,
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert!(serialized.contains("\"session_id\":\"sess-xyz\""));
|
||||
assert!(!serialized.contains("conversation_id"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_cwd_changed_event_serialization() {
|
||||
let event = CwdChangedEvent {
|
||||
cwd: "/home/naomi/code/my-project".to_string(),
|
||||
conversation_id: Some("conv-abc".to_string()),
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert!(serialized.contains("\"cwd\":\"/home/naomi/code/my-project\""));
|
||||
assert!(serialized.contains("\"conversation_id\":\"conv-abc\""));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_cwd_changed_event_omits_none_fields() {
|
||||
let event = CwdChangedEvent {
|
||||
cwd: "/tmp/workspace".to_string(),
|
||||
conversation_id: None,
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert!(serialized.contains("\"cwd\":\"/tmp/workspace\""));
|
||||
assert!(!serialized.contains("conversation_id"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_file_changed_event_serialization() {
|
||||
let event = FileChangedEvent {
|
||||
file: "/home/naomi/code/my-project/src/main.rs".to_string(),
|
||||
conversation_id: Some("conv-abc".to_string()),
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert!(serialized.contains("\"file\":\"/home/naomi/code/my-project/src/main.rs\""));
|
||||
assert!(serialized.contains("\"conversation_id\":\"conv-abc\""));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_file_changed_event_omits_none_fields() {
|
||||
let event = FileChangedEvent {
|
||||
file: "/tmp/test.txt".to_string(),
|
||||
conversation_id: None,
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert!(serialized.contains("\"file\":\"/tmp/test.txt\""));
|
||||
assert!(!serialized.contains("conversation_id"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_task_created_event_serialization() {
|
||||
let event = TaskCreatedEvent {
|
||||
task_id: Some("task-abc123".to_string()),
|
||||
description: Some("Explore the codebase".to_string()),
|
||||
parent_tool_use_id: Some("toolu_xyz".to_string()),
|
||||
conversation_id: Some("conv-abc".to_string()),
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert!(serialized.contains("\"task_id\":\"task-abc123\""));
|
||||
assert!(serialized.contains("\"description\":\"Explore the codebase\""));
|
||||
assert!(serialized.contains("\"parent_tool_use_id\":\"toolu_xyz\""));
|
||||
assert!(serialized.contains("\"conversation_id\":\"conv-abc\""));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_task_created_event_omits_none_fields() {
|
||||
let event = TaskCreatedEvent {
|
||||
task_id: None,
|
||||
description: None,
|
||||
parent_tool_use_id: None,
|
||||
conversation_id: None,
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert_eq!(serialized, "{}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_task_created_event_partial_fields() {
|
||||
let event = TaskCreatedEvent {
|
||||
task_id: Some("task-001".to_string()),
|
||||
description: None,
|
||||
parent_tool_use_id: None,
|
||||
conversation_id: None,
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert!(serialized.contains("\"task_id\":\"task-001\""));
|
||||
assert!(!serialized.contains("description"));
|
||||
assert!(!serialized.contains("parent_tool_use_id"));
|
||||
assert!(!serialized.contains("conversation_id"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_permission_denied_event_serialization() {
|
||||
let event = PermissionDeniedEvent {
|
||||
tool_name: Some("Bash".to_string()),
|
||||
reason: Some("Tool not in allow list".to_string()),
|
||||
conversation_id: Some("conv-abc".to_string()),
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert!(serialized.contains("\"tool_name\":\"Bash\""));
|
||||
assert!(serialized.contains("\"reason\":\"Tool not in allow list\""));
|
||||
assert!(serialized.contains("\"conversation_id\":\"conv-abc\""));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_permission_denied_event_omits_none_fields() {
|
||||
let event = PermissionDeniedEvent {
|
||||
tool_name: None,
|
||||
reason: None,
|
||||
conversation_id: None,
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert_eq!(serialized, "{}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_permission_denied_event_partial_fields() {
|
||||
let event = PermissionDeniedEvent {
|
||||
tool_name: Some("Edit".to_string()),
|
||||
reason: None,
|
||||
conversation_id: None,
|
||||
};
|
||||
|
||||
let serialized = serde_json::to_string(&event).unwrap();
|
||||
assert!(serialized.contains("\"tool_name\":\"Edit\""));
|
||||
assert!(!serialized.contains("reason"));
|
||||
assert!(!serialized.contains("conversation_id"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_system_init_with_output_style() {
|
||||
let json = r#"{"type":"system","subtype":"init","session_id":"sess-1","output_style":"auto"}"#;
|
||||
let msg: ClaudeMessage = serde_json::from_str(json).unwrap();
|
||||
if let ClaudeMessage::System { output_style, .. } = msg {
|
||||
assert_eq!(output_style, Some("auto".to_string()));
|
||||
} else {
|
||||
panic!("Expected System variant");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_system_init_without_output_style() {
|
||||
let json = r#"{"type":"system","subtype":"init","session_id":"sess-1"}"#;
|
||||
let msg: ClaudeMessage = serde_json::from_str(json).unwrap();
|
||||
if let ClaudeMessage::System { output_style, .. } = msg {
|
||||
assert!(output_style.is_none());
|
||||
} else {
|
||||
panic!("Expected System variant");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_result_message_with_fast_mode_state() {
|
||||
let json = r#"{"type":"result","subtype":"success","fast_mode_state":"enabled"}"#;
|
||||
let msg: ClaudeMessage = serde_json::from_str(json).unwrap();
|
||||
if let ClaudeMessage::Result { fast_mode_state, .. } = msg {
|
||||
assert_eq!(fast_mode_state, Some("enabled".to_string()));
|
||||
} else {
|
||||
panic!("Expected Result variant");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_result_message_with_total_cost_usd() {
|
||||
let json = r#"{"type":"result","subtype":"success","total_cost_usd":0.05}"#;
|
||||
let msg: ClaudeMessage = serde_json::from_str(json).unwrap();
|
||||
if let ClaudeMessage::Result { total_cost_usd, .. } = msg {
|
||||
assert!((total_cost_usd.unwrap() - 0.05).abs() < f64::EPSILON);
|
||||
} else {
|
||||
panic!("Expected Result variant");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_result_message_without_new_fields() {
|
||||
let json = r#"{"type":"result","subtype":"success"}"#;
|
||||
let msg: ClaudeMessage = serde_json::from_str(json).unwrap();
|
||||
if let ClaudeMessage::Result {
|
||||
fast_mode_state,
|
||||
model_usage,
|
||||
total_cost_usd,
|
||||
..
|
||||
} = msg
|
||||
{
|
||||
assert!(fast_mode_state.is_none());
|
||||
assert!(model_usage.is_none());
|
||||
assert!(total_cost_usd.is_none());
|
||||
} else {
|
||||
panic!("Expected Result variant");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+12
-884
File diff suppressed because it is too large
Load Diff
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "https://schema.tauri.app/config/2",
|
||||
"productName": "hikari-desktop",
|
||||
"version": "1.14.0",
|
||||
"version": "1.12.0",
|
||||
"identifier": "com.naomi.hikari-desktop",
|
||||
"build": {
|
||||
"beforeDevCommand": "pnpm dev",
|
||||
|
||||
@@ -67,16 +67,10 @@ async function changeDirectory(path: string): Promise<void> {
|
||||
use_worktree: config.use_worktree ?? false,
|
||||
disable_1m_context: config.disable_1m_context ?? false,
|
||||
max_output_tokens: config.max_output_tokens ?? null,
|
||||
disable_cron: config.disable_cron ?? false,
|
||||
disable_skill_shell_execution: config.disable_skill_shell_execution ?? false,
|
||||
include_git_instructions: config.include_git_instructions ?? true,
|
||||
enable_claudeai_mcp_servers: config.enable_claudeai_mcp_servers ?? true,
|
||||
auto_memory_directory: config.auto_memory_directory || null,
|
||||
model_overrides: config.model_overrides || null,
|
||||
session_name: null,
|
||||
bare_mode: config.bare_mode ?? false,
|
||||
show_clear_context_on_plan_accept: config.show_clear_context_on_plan_accept ?? true,
|
||||
custom_model_option: config.custom_model_option || null,
|
||||
},
|
||||
});
|
||||
|
||||
@@ -154,16 +148,10 @@ async function startNewConversation(): Promise<void> {
|
||||
use_worktree: config.use_worktree ?? false,
|
||||
disable_1m_context: config.disable_1m_context ?? false,
|
||||
max_output_tokens: config.max_output_tokens ?? null,
|
||||
disable_cron: config.disable_cron ?? false,
|
||||
disable_skill_shell_execution: config.disable_skill_shell_execution ?? false,
|
||||
include_git_instructions: config.include_git_instructions ?? true,
|
||||
enable_claudeai_mcp_servers: config.enable_claudeai_mcp_servers ?? true,
|
||||
auto_memory_directory: config.auto_memory_directory || null,
|
||||
model_overrides: config.model_overrides || null,
|
||||
session_name: null,
|
||||
bare_mode: config.bare_mode ?? false,
|
||||
show_clear_context_on_plan_accept: config.show_clear_context_on_plan_accept ?? true,
|
||||
custom_model_option: config.custom_model_option || null,
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
import { onMount } from "svelte";
|
||||
|
||||
const SUPPORTED_CLI_VERSION = "2.1.104";
|
||||
const SUPPORTED_CLI_VERSION = "2.1.74";
|
||||
|
||||
let installedVersion = $state("Loading...");
|
||||
let latestNpmVersion = $state<string | null>(null);
|
||||
|
||||
@@ -63,10 +63,6 @@
|
||||
enable_claudeai_mcp_servers: true,
|
||||
auto_memory_directory: null,
|
||||
model_overrides: null,
|
||||
disable_skill_shell_execution: false,
|
||||
bare_mode: false,
|
||||
show_clear_context_on_plan_accept: true,
|
||||
custom_model_option: null,
|
||||
max_output_tokens: null,
|
||||
trusted_workspaces: [],
|
||||
background_image_path: null,
|
||||
@@ -89,9 +85,6 @@
|
||||
let customUiFontStatus: string | null = $state(null);
|
||||
let modelOverridesJson = $state("");
|
||||
let modelOverridesError: string | null = $state(null);
|
||||
let globalClaudeMd = $state("");
|
||||
let globalClaudeMdSaving = $state(false);
|
||||
let globalClaudeMdSaveStatus: string | null = $state(null);
|
||||
|
||||
interface AuthStatus {
|
||||
is_logged_in: boolean;
|
||||
@@ -129,9 +122,6 @@
|
||||
if (open && authStatus === null) {
|
||||
void refreshAuthStatus();
|
||||
}
|
||||
if (open) {
|
||||
void loadGlobalClaudeMd();
|
||||
}
|
||||
});
|
||||
|
||||
configStore.saveError.subscribe((error) => {
|
||||
@@ -207,30 +197,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
async function loadGlobalClaudeMd() {
|
||||
try {
|
||||
globalClaudeMd = await invoke<string>("get_global_claude_md");
|
||||
} catch (error) {
|
||||
console.error("Failed to load global CLAUDE.md:", error);
|
||||
}
|
||||
}
|
||||
|
||||
async function saveGlobalClaudeMd() {
|
||||
globalClaudeMdSaving = true;
|
||||
globalClaudeMdSaveStatus = null;
|
||||
try {
|
||||
await invoke("save_global_claude_md", { content: globalClaudeMd });
|
||||
globalClaudeMdSaveStatus = "Saved!";
|
||||
setTimeout(() => {
|
||||
globalClaudeMdSaveStatus = null;
|
||||
}, 2000);
|
||||
} catch (error) {
|
||||
globalClaudeMdSaveStatus = `Error: ${error}`;
|
||||
} finally {
|
||||
globalClaudeMdSaving = false;
|
||||
}
|
||||
}
|
||||
|
||||
async function handleSave() {
|
||||
isSaving = true;
|
||||
saveError = null;
|
||||
@@ -619,22 +585,6 @@
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- Disable Skill Shell Execution -->
|
||||
<div class="mb-4">
|
||||
<label class="flex items-center gap-3 cursor-pointer">
|
||||
<input
|
||||
type="checkbox"
|
||||
bind:checked={config.disable_skill_shell_execution}
|
||||
class="w-4 h-4 rounded border-[var(--border-color)] bg-[var(--bg-primary)] text-[var(--accent-primary)] focus:ring-[var(--accent-primary)]"
|
||||
/>
|
||||
<span class="text-sm text-[var(--text-primary)]">Disable skill shell execution</span>
|
||||
</label>
|
||||
<p class="text-xs text-[var(--text-tertiary)] mt-1 ml-7">
|
||||
Passes <code class="font-mono">disableSkillShellExecution: true</code> to prevent skill scripts
|
||||
from executing shell commands (requires Claude Code v2.1.91+)
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- Include Git Instructions -->
|
||||
<div class="mb-4">
|
||||
<label class="flex items-center gap-3 cursor-pointer">
|
||||
@@ -660,15 +610,13 @@
|
||||
id="max-output-tokens"
|
||||
type="number"
|
||||
min="1"
|
||||
max="128000"
|
||||
placeholder="Default (model-dependent)"
|
||||
placeholder="Default (32000)"
|
||||
bind:value={config.max_output_tokens}
|
||||
class="w-full px-3 py-2 text-sm bg-[var(--bg-primary)] border border-[var(--border-color)] rounded text-[var(--text-primary)] placeholder-[var(--text-tertiary)] focus:outline-none focus:border-[var(--accent-primary)]"
|
||||
/>
|
||||
<p class="text-xs text-[var(--text-tertiary)] mt-1">
|
||||
Sets <code class="font-mono">CLAUDE_CODE_MAX_OUTPUT_TOKENS</code>. Maximum: 128k tokens
|
||||
for Opus 4.6 and Sonnet 4.6 (64k default for Opus 4.6, 32k for other models). Increase if
|
||||
responses are being cut off.
|
||||
Sets <code class="font-mono">CLAUDE_CODE_MAX_OUTPUT_TOKENS</code> — increase if responses are
|
||||
being cut off mid-reply
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -712,59 +660,6 @@
|
||||
defaults.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- Bare Mode -->
|
||||
<div class="mb-4">
|
||||
<label class="flex items-center gap-3 cursor-pointer">
|
||||
<input
|
||||
type="checkbox"
|
||||
bind:checked={config.bare_mode}
|
||||
class="w-4 h-4 rounded border-[var(--border-color)] bg-[var(--bg-primary)] text-[var(--accent-primary)] focus:ring-[var(--accent-primary)]"
|
||||
/>
|
||||
<span class="text-sm text-[var(--text-primary)]">Bare mode</span>
|
||||
</label>
|
||||
<p class="text-xs text-[var(--text-tertiary)] mt-1 ml-7">
|
||||
Passes <code class="font-mono">--bare</code> to suppress UI chrome — useful for scripted
|
||||
headless <code class="font-mono">-p</code> calls (requires Claude Code v2.1.81+)
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- Show Clear Context on Plan Accept -->
|
||||
<div class="mb-4">
|
||||
<label class="flex items-center gap-3 cursor-pointer">
|
||||
<input
|
||||
type="checkbox"
|
||||
bind:checked={config.show_clear_context_on_plan_accept}
|
||||
class="w-4 h-4 rounded border-[var(--border-color)] bg-[var(--bg-primary)] text-[var(--accent-primary)] focus:ring-[var(--accent-primary)]"
|
||||
/>
|
||||
<span class="text-sm text-[var(--text-primary)]"
|
||||
>Show clear context prompt on plan accept</span
|
||||
>
|
||||
</label>
|
||||
<p class="text-xs text-[var(--text-tertiary)] mt-1 ml-7">
|
||||
When enabled, prompts to clear context when accepting a plan. Passes
|
||||
<code class="font-mono">showClearContextOnPlanAccept: false</code> in
|
||||
<code class="font-mono">--settings</code> when disabled (requires Claude Code v2.1.81+)
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- Custom Model Option -->
|
||||
<div class="mb-4">
|
||||
<label for="custom-model-option" class="block text-sm text-[var(--text-primary)] mb-1">
|
||||
Custom model option <span class="text-[var(--text-tertiary)]">(optional)</span>
|
||||
</label>
|
||||
<input
|
||||
id="custom-model-option"
|
||||
type="text"
|
||||
placeholder="Leave blank to use default"
|
||||
bind:value={config.custom_model_option}
|
||||
class="w-full px-3 py-2 text-sm bg-[var(--bg-primary)] border border-[var(--border-color)] rounded text-[var(--text-primary)] placeholder-[var(--text-tertiary)] focus:outline-none focus:border-[var(--accent-primary)]"
|
||||
/>
|
||||
<p class="text-xs text-[var(--text-tertiary)] mt-1">
|
||||
Sets <code class="font-mono">ANTHROPIC_CUSTOM_MODEL_OPTION</code> environment variable for custom
|
||||
model providers (requires Claude Code v2.1.81+)
|
||||
</p>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- Greeting Section -->
|
||||
@@ -805,47 +700,6 @@
|
||||
{/if}
|
||||
</section>
|
||||
|
||||
<!-- Global Instructions Section -->
|
||||
<section class="mb-6">
|
||||
<h3 class="text-sm font-medium text-[var(--accent-primary)] uppercase tracking-wider mb-3">
|
||||
Global Instructions
|
||||
</h3>
|
||||
<div class="mb-2">
|
||||
<label for="global-claude-md" class="block text-sm text-[var(--text-secondary)] mb-1">
|
||||
~/.claude/CLAUDE.md
|
||||
</label>
|
||||
<textarea
|
||||
id="global-claude-md"
|
||||
bind:value={globalClaudeMd}
|
||||
rows="12"
|
||||
placeholder="Add persistent instructions for all Claude Code sessions..."
|
||||
class="w-full px-3 py-2 bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-lg text-[var(--text-primary)] font-mono text-sm focus:outline-none focus:border-[var(--accent-primary)] resize-y"
|
||||
></textarea>
|
||||
</div>
|
||||
<div class="flex items-center gap-2">
|
||||
<button
|
||||
onclick={saveGlobalClaudeMd}
|
||||
disabled={globalClaudeMdSaving}
|
||||
class="px-3 py-1.5 text-sm bg-[var(--accent-primary)] text-white rounded hover:opacity-90 disabled:opacity-50 disabled:cursor-not-allowed"
|
||||
>
|
||||
{globalClaudeMdSaving ? "Saving..." : "Save"}
|
||||
</button>
|
||||
{#if globalClaudeMdSaveStatus}
|
||||
<span
|
||||
class="text-xs {globalClaudeMdSaveStatus.startsWith('Error')
|
||||
? 'text-red-500'
|
||||
: 'text-green-500'}"
|
||||
>
|
||||
{globalClaudeMdSaveStatus}
|
||||
</span>
|
||||
{/if}
|
||||
</div>
|
||||
<p class="text-xs text-[var(--text-tertiary)] mt-2">
|
||||
Persistent instructions applied to all Claude Code sessions. Changes take effect on the next
|
||||
session start.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<!-- MCP Servers Section -->
|
||||
<section class="mb-6">
|
||||
<h3 class="text-sm font-medium text-[var(--accent-primary)] uppercase tracking-wider mb-3">
|
||||
|
||||
@@ -1,193 +0,0 @@
|
||||
<script lang="ts">
|
||||
import { invoke } from "@tauri-apps/api/core";
|
||||
import { get } from "svelte/store";
|
||||
import { claudeStore, hasElicitationPending } from "$lib/stores/claude";
|
||||
import { characterState } from "$lib/stores/character";
|
||||
import type { ElicitationEvent } from "$lib/types/messages";
|
||||
import { updateDiscordRpc, setSkipNextGreeting } from "$lib/tauri";
|
||||
import { conversationsStore } from "$lib/stores/conversations";
|
||||
import { configStore } from "$lib/stores/config";
|
||||
|
||||
let isVisible = $state(false);
|
||||
let elicitation: ElicitationEvent | null = $state(null);
|
||||
let response = $state("");
|
||||
let grantedToolsList: string[] = $state([]);
|
||||
let workingDirectory = $state("");
|
||||
|
||||
hasElicitationPending.subscribe((pending) => {
|
||||
isVisible = pending;
|
||||
if (!pending) {
|
||||
response = "";
|
||||
}
|
||||
});
|
||||
|
||||
claudeStore.pendingElicitation.subscribe((e) => {
|
||||
elicitation = e;
|
||||
if (e) {
|
||||
characterState.setState("permission");
|
||||
}
|
||||
});
|
||||
|
||||
claudeStore.grantedTools.subscribe((tools) => {
|
||||
grantedToolsList = Array.from(tools);
|
||||
});
|
||||
|
||||
claudeStore.currentWorkingDirectory.subscribe((dir) => {
|
||||
workingDirectory = dir;
|
||||
});
|
||||
|
||||
async function handleSubmitAndReconnect() {
|
||||
if (!elicitation || !response.trim()) return;
|
||||
|
||||
const conversationId = get(claudeStore.activeConversationId);
|
||||
if (!conversationId) return;
|
||||
|
||||
const responseText = response.trim();
|
||||
const elicitationMessage = elicitation.message;
|
||||
const conversationHistory = claudeStore.getConversationHistory();
|
||||
|
||||
claudeStore.addLine("system", `MCP response submitted. Reconnecting with context...`);
|
||||
claudeStore.clearElicitation();
|
||||
|
||||
try {
|
||||
setSkipNextGreeting(true);
|
||||
|
||||
await invoke("stop_claude", { conversationId });
|
||||
|
||||
await new Promise((resolve) => setTimeout(resolve, 500));
|
||||
|
||||
const config = configStore.getConfig();
|
||||
await invoke("start_claude", {
|
||||
conversationId,
|
||||
options: {
|
||||
working_dir: workingDirectory || "/home/naomi",
|
||||
model: config.model || null,
|
||||
api_key: config.api_key || null,
|
||||
custom_instructions: config.custom_instructions || null,
|
||||
mcp_servers_json: config.mcp_servers_json || null,
|
||||
allowed_tools: grantedToolsList,
|
||||
use_worktree: config.use_worktree ?? false,
|
||||
disable_1m_context: config.disable_1m_context ?? false,
|
||||
disable_cron: config.disable_cron ?? false,
|
||||
disable_skill_shell_execution: config.disable_skill_shell_execution ?? false,
|
||||
include_git_instructions: config.include_git_instructions ?? true,
|
||||
enable_claudeai_mcp_servers: config.enable_claudeai_mcp_servers ?? true,
|
||||
auto_memory_directory: config.auto_memory_directory || null,
|
||||
model_overrides: config.model_overrides || null,
|
||||
session_name: null,
|
||||
bare_mode: config.bare_mode ?? false,
|
||||
show_clear_context_on_plan_accept: config.show_clear_context_on_plan_accept ?? true,
|
||||
custom_model_option: config.custom_model_option || null,
|
||||
},
|
||||
});
|
||||
|
||||
const activeConversation = get(conversationsStore.activeConversation);
|
||||
if (activeConversation) {
|
||||
await updateDiscordRpc(
|
||||
activeConversation.name,
|
||||
config.model || "claude",
|
||||
activeConversation.startedAt
|
||||
);
|
||||
}
|
||||
|
||||
await new Promise((resolve) => setTimeout(resolve, 1000));
|
||||
|
||||
if (conversationHistory) {
|
||||
const contextMessage = `[CONTEXT RESTORATION]
|
||||
I just responded to an MCP server elicitation request. Here's our conversation so far:
|
||||
|
||||
${conversationHistory}
|
||||
|
||||
The MCP server asked: "${elicitationMessage}"
|
||||
My response: "${responseText}"
|
||||
|
||||
Please continue where we left off, taking my response into account.`;
|
||||
|
||||
await invoke("send_prompt", {
|
||||
conversationId,
|
||||
message: contextMessage,
|
||||
});
|
||||
}
|
||||
|
||||
characterState.setTemporaryState("success", 2000);
|
||||
} catch (error) {
|
||||
console.error("Failed to reconnect:", error);
|
||||
claudeStore.addLine("error", `Reconnect failed: ${error}`);
|
||||
characterState.setTemporaryState("error", 3000);
|
||||
}
|
||||
}
|
||||
|
||||
function handleDismiss() {
|
||||
claudeStore.clearElicitation();
|
||||
claudeStore.addLine("system", "MCP elicitation dismissed");
|
||||
characterState.setTemporaryState("idle", 1000);
|
||||
}
|
||||
|
||||
function handleKeydown(event: KeyboardEvent) {
|
||||
if (!isVisible || !elicitation) return;
|
||||
|
||||
if (event.key === "Escape") {
|
||||
event.preventDefault();
|
||||
handleDismiss();
|
||||
}
|
||||
}
|
||||
|
||||
function canSubmit(): boolean {
|
||||
return response.trim().length > 0;
|
||||
}
|
||||
</script>
|
||||
|
||||
<svelte:window onkeydown={handleKeydown} />
|
||||
|
||||
{#if isVisible && elicitation}
|
||||
<div
|
||||
class="elicitation-overlay fixed inset-0 bg-black/70 flex items-center justify-center z-50 backdrop-blur-sm"
|
||||
>
|
||||
<div
|
||||
class="elicitation-modal bg-[var(--bg-primary)] border border-[var(--border-color)] rounded-xl p-6 max-w-md w-full mx-4 shadow-2xl"
|
||||
>
|
||||
<div class="flex items-center gap-3 mb-4">
|
||||
<div class="w-10 h-10 rounded-full bg-blue-500/20 flex items-center justify-center">
|
||||
<span class="text-xl">đź’¬</span>
|
||||
</div>
|
||||
<div>
|
||||
<h2 class="text-lg font-semibold text-[var(--text-primary)]">MCP Server Request</h2>
|
||||
{#if elicitation.server_name}
|
||||
<p class="text-sm text-[var(--text-secondary)]">from: {elicitation.server_name}</p>
|
||||
{:else}
|
||||
<p class="text-sm text-[var(--text-secondary)]">Input required from MCP server</p>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-4">
|
||||
<p class="text-[var(--text-primary)]">{elicitation.message}</p>
|
||||
</div>
|
||||
|
||||
<div class="mb-4">
|
||||
<textarea
|
||||
bind:value={response}
|
||||
placeholder="Type your response here..."
|
||||
class="w-full px-4 py-3 bg-[var(--bg-secondary)] border border-[var(--border-color)] rounded-lg text-[var(--text-primary)] placeholder-[var(--text-secondary)] resize-none focus:outline-none focus:border-[var(--accent-primary)]"
|
||||
rows="4"
|
||||
></textarea>
|
||||
</div>
|
||||
|
||||
<div class="flex gap-3">
|
||||
<button
|
||||
onclick={handleDismiss}
|
||||
class="flex-1 px-4 py-2 bg-gray-500/20 hover:bg-gray-500/30 text-[var(--text-secondary)] rounded-lg transition-colors font-medium"
|
||||
>
|
||||
Dismiss
|
||||
</button>
|
||||
<button
|
||||
onclick={handleSubmitAndReconnect}
|
||||
disabled={!canSubmit()}
|
||||
class="flex-1 px-4 py-2 bg-blue-500/20 hover:bg-blue-500/30 text-blue-400 rounded-lg transition-colors font-medium disabled:opacity-50 disabled:cursor-not-allowed"
|
||||
>
|
||||
Submit & Reconnect
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
@@ -402,16 +402,10 @@ User: ${formattedMessage}`;
|
||||
allowed_tools: allAllowedTools,
|
||||
use_worktree: config.use_worktree ?? false,
|
||||
disable_1m_context: config.disable_1m_context ?? false,
|
||||
disable_cron: config.disable_cron ?? false,
|
||||
disable_skill_shell_execution: config.disable_skill_shell_execution ?? false,
|
||||
include_git_instructions: config.include_git_instructions ?? true,
|
||||
enable_claudeai_mcp_servers: config.enable_claudeai_mcp_servers ?? true,
|
||||
auto_memory_directory: config.auto_memory_directory || null,
|
||||
model_overrides: config.model_overrides || null,
|
||||
session_name: null,
|
||||
bare_mode: config.bare_mode ?? false,
|
||||
show_clear_context_on_plan_accept: config.show_clear_context_on_plan_accept ?? true,
|
||||
custom_model_option: config.custom_model_option || null,
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
interface MemoryFileInfo {
|
||||
path: string;
|
||||
heading: string | null;
|
||||
last_modified?: string; // Unix timestamp in seconds as a string, optional for backwards compat
|
||||
}
|
||||
|
||||
interface MemoryFilesResponse {
|
||||
@@ -66,16 +65,6 @@
|
||||
return file.heading ?? getFileName(file.path);
|
||||
}
|
||||
|
||||
function formatLastModified(ts: string | undefined): string {
|
||||
if (!ts) return "";
|
||||
const date = new Date(Number(ts) * 1000);
|
||||
return date.toLocaleDateString(undefined, {
|
||||
year: "numeric",
|
||||
month: "short",
|
||||
day: "numeric",
|
||||
});
|
||||
}
|
||||
|
||||
async function sendMemoryCommand() {
|
||||
const conversationId = get(claudeStore.activeConversationId);
|
||||
if (!conversationId) return;
|
||||
@@ -216,12 +205,7 @@
|
||||
d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"
|
||||
/>
|
||||
</svg>
|
||||
<div class="file-info">
|
||||
<span class="file-name">{getDisplayName(file)}</span>
|
||||
{#if file.last_modified}
|
||||
<span class="file-date">{formatLastModified(file.last_modified)}</span>
|
||||
{/if}
|
||||
</div>
|
||||
</button>
|
||||
{/each}
|
||||
</div>
|
||||
@@ -432,7 +416,7 @@
|
||||
|
||||
.file-item {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
align-items: center;
|
||||
gap: 0.75rem;
|
||||
padding: 0.75rem 1rem;
|
||||
background: var(--bg-secondary);
|
||||
@@ -461,13 +445,6 @@
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.file-info {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.125rem;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.file-name {
|
||||
font-size: 0.875rem;
|
||||
font-weight: 500;
|
||||
@@ -476,15 +453,6 @@
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.file-date {
|
||||
font-size: 0.75rem;
|
||||
color: var(--text-secondary);
|
||||
}
|
||||
|
||||
.file-item.active .file-date {
|
||||
color: rgba(255, 255, 255, 0.75);
|
||||
}
|
||||
|
||||
.file-viewer {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
@@ -89,16 +89,10 @@
|
||||
allowed_tools: [...new Set([...newGrantedTools, ...config.auto_granted_tools])],
|
||||
use_worktree: config.use_worktree ?? false,
|
||||
disable_1m_context: config.disable_1m_context ?? false,
|
||||
disable_cron: config.disable_cron ?? false,
|
||||
disable_skill_shell_execution: config.disable_skill_shell_execution ?? false,
|
||||
include_git_instructions: config.include_git_instructions ?? true,
|
||||
enable_claudeai_mcp_servers: config.enable_claudeai_mcp_servers ?? true,
|
||||
auto_memory_directory: config.auto_memory_directory || null,
|
||||
model_overrides: config.model_overrides || null,
|
||||
session_name: null,
|
||||
bare_mode: config.bare_mode ?? false,
|
||||
show_clear_context_on_plan_accept: config.show_clear_context_on_plan_accept ?? true,
|
||||
custom_model_option: config.custom_model_option || null,
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
@@ -93,10 +93,6 @@
|
||||
enable_claudeai_mcp_servers: true,
|
||||
auto_memory_directory: null,
|
||||
model_overrides: null,
|
||||
disable_skill_shell_execution: false,
|
||||
bare_mode: false,
|
||||
show_clear_context_on_plan_accept: true,
|
||||
custom_model_option: null,
|
||||
});
|
||||
|
||||
let streamerModeActive = $state(false);
|
||||
@@ -164,7 +160,6 @@
|
||||
if (!conversationId) {
|
||||
throw new Error("No active conversation");
|
||||
}
|
||||
const activeConversationForName = get(conversationsStore.activeConversation);
|
||||
await invoke("start_claude", {
|
||||
conversationId,
|
||||
options: {
|
||||
@@ -178,17 +173,10 @@
|
||||
use_worktree: currentConfig.use_worktree ?? false,
|
||||
disable_1m_context: currentConfig.disable_1m_context ?? false,
|
||||
max_output_tokens: currentConfig.max_output_tokens ?? null,
|
||||
disable_cron: currentConfig.disable_cron ?? false,
|
||||
disable_skill_shell_execution: currentConfig.disable_skill_shell_execution ?? false,
|
||||
include_git_instructions: currentConfig.include_git_instructions ?? true,
|
||||
enable_claudeai_mcp_servers: currentConfig.enable_claudeai_mcp_servers ?? true,
|
||||
auto_memory_directory: currentConfig.auto_memory_directory || null,
|
||||
model_overrides: currentConfig.model_overrides || null,
|
||||
session_name: activeConversationForName?.name || null,
|
||||
bare_mode: currentConfig.bare_mode ?? false,
|
||||
show_clear_context_on_plan_accept:
|
||||
currentConfig.show_clear_context_on_plan_accept ?? true,
|
||||
custom_model_option: currentConfig.custom_model_option || null,
|
||||
},
|
||||
});
|
||||
|
||||
@@ -346,17 +334,10 @@
|
||||
use_worktree: currentConfig.use_worktree ?? false,
|
||||
disable_1m_context: currentConfig.disable_1m_context ?? false,
|
||||
max_output_tokens: currentConfig.max_output_tokens ?? null,
|
||||
disable_cron: currentConfig.disable_cron ?? false,
|
||||
disable_skill_shell_execution: currentConfig.disable_skill_shell_execution ?? false,
|
||||
include_git_instructions: currentConfig.include_git_instructions ?? true,
|
||||
enable_claudeai_mcp_servers: currentConfig.enable_claudeai_mcp_servers ?? true,
|
||||
auto_memory_directory: currentConfig.auto_memory_directory || null,
|
||||
model_overrides: currentConfig.model_overrides || null,
|
||||
session_name: null,
|
||||
bare_mode: currentConfig.bare_mode ?? false,
|
||||
show_clear_context_on_plan_accept:
|
||||
currentConfig.show_clear_context_on_plan_accept ?? true,
|
||||
custom_model_option: currentConfig.custom_model_option || null,
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
@@ -218,16 +218,10 @@
|
||||
use_worktree: cfg.use_worktree ?? false,
|
||||
disable_1m_context: cfg.disable_1m_context ?? false,
|
||||
max_output_tokens: cfg.max_output_tokens ?? null,
|
||||
disable_cron: cfg.disable_cron ?? false,
|
||||
disable_skill_shell_execution: cfg.disable_skill_shell_execution ?? false,
|
||||
include_git_instructions: cfg.include_git_instructions ?? true,
|
||||
enable_claudeai_mcp_servers: cfg.enable_claudeai_mcp_servers ?? true,
|
||||
auto_memory_directory: cfg.auto_memory_directory || null,
|
||||
model_overrides: cfg.model_overrides || null,
|
||||
session_name: null,
|
||||
bare_mode: cfg.bare_mode ?? false,
|
||||
show_clear_context_on_plan_accept: cfg.show_clear_context_on_plan_accept ?? true,
|
||||
custom_model_option: cfg.custom_model_option || null,
|
||||
},
|
||||
});
|
||||
} catch (error) {
|
||||
|
||||
@@ -108,16 +108,10 @@
|
||||
allowed_tools: grantedToolsList,
|
||||
use_worktree: config.use_worktree ?? false,
|
||||
disable_1m_context: config.disable_1m_context ?? false,
|
||||
disable_cron: config.disable_cron ?? false,
|
||||
disable_skill_shell_execution: config.disable_skill_shell_execution ?? false,
|
||||
include_git_instructions: config.include_git_instructions ?? true,
|
||||
enable_claudeai_mcp_servers: config.enable_claudeai_mcp_servers ?? true,
|
||||
auto_memory_directory: config.auto_memory_directory || null,
|
||||
model_overrides: config.model_overrides || null,
|
||||
session_name: null,
|
||||
bare_mode: config.bare_mode ?? false,
|
||||
show_clear_context_on_plan_accept: config.show_clear_context_on_plan_accept ?? true,
|
||||
custom_model_option: config.custom_model_option || null,
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
@@ -22,7 +22,6 @@ export const claudeStore = {
|
||||
terminalLines: conversationsStore.terminalLines,
|
||||
pendingPermission: conversationsStore.pendingPermission,
|
||||
pendingQuestion: conversationsStore.pendingQuestion,
|
||||
pendingElicitation: conversationsStore.pendingElicitation,
|
||||
isProcessing: conversationsStore.isProcessing,
|
||||
grantedTools: conversationsStore.grantedTools,
|
||||
pendingRetryMessage: conversationsStore.pendingRetryMessage,
|
||||
@@ -58,10 +57,6 @@ export const claudeStore = {
|
||||
clearQuestion: conversationsStore.clearQuestion,
|
||||
requestQuestionForConversation: conversationsStore.requestQuestionForConversation,
|
||||
clearQuestionForConversation: conversationsStore.clearQuestionForConversation,
|
||||
requestElicitation: conversationsStore.requestElicitation,
|
||||
clearElicitation: conversationsStore.clearElicitation,
|
||||
requestElicitationForConversation: conversationsStore.requestElicitationForConversation,
|
||||
clearElicitationForConversation: conversationsStore.clearElicitationForConversation,
|
||||
grantTool: conversationsStore.grantTool,
|
||||
revokeAllTools: conversationsStore.revokeAllTools,
|
||||
isToolGranted: conversationsStore.isToolGranted,
|
||||
@@ -131,12 +126,6 @@ export const hasQuestionPending = derived(
|
||||
($conversation) => $conversation?.pendingQuestion !== null
|
||||
);
|
||||
|
||||
export const hasElicitationPending = derived(
|
||||
claudeStore.activeConversation,
|
||||
($conversation) =>
|
||||
$conversation?.pendingElicitation !== null && $conversation?.pendingElicitation !== undefined
|
||||
);
|
||||
|
||||
// Derived store to check if Claude is currently processing (can be interrupted)
|
||||
export const isClaudeProcessing = derived(
|
||||
[claudeStore.connectionStatus, characterState],
|
||||
|
||||
@@ -225,10 +225,6 @@ describe("config store", () => {
|
||||
enable_claudeai_mcp_servers: true,
|
||||
auto_memory_directory: null,
|
||||
model_overrides: null,
|
||||
disable_skill_shell_execution: false,
|
||||
bare_mode: false,
|
||||
show_clear_context_on_plan_accept: true,
|
||||
custom_model_option: null,
|
||||
};
|
||||
|
||||
expect(config.model).toBe("claude-sonnet-4");
|
||||
@@ -293,10 +289,6 @@ describe("config store", () => {
|
||||
enable_claudeai_mcp_servers: true,
|
||||
auto_memory_directory: null,
|
||||
model_overrides: null,
|
||||
disable_skill_shell_execution: false,
|
||||
bare_mode: false,
|
||||
show_clear_context_on_plan_accept: true,
|
||||
custom_model_option: null,
|
||||
};
|
||||
|
||||
expect(config.model).toBeNull();
|
||||
@@ -916,10 +908,6 @@ describe("config store", () => {
|
||||
enable_claudeai_mcp_servers: true,
|
||||
auto_memory_directory: null,
|
||||
model_overrides: null,
|
||||
disable_skill_shell_execution: false,
|
||||
bare_mode: false,
|
||||
show_clear_context_on_plan_accept: true,
|
||||
custom_model_option: null,
|
||||
};
|
||||
|
||||
const mockInvokeImpl = vi.mocked(invoke);
|
||||
|
||||
@@ -91,14 +91,6 @@ export interface HikariConfig {
|
||||
auto_memory_directory: string | null;
|
||||
// Model overrides for provider-specific model IDs (AWS Bedrock, Google Vertex, etc.)
|
||||
model_overrides: Record<string, string> | null;
|
||||
// Prevents skill scripts from executing shell commands (Claude Code v2.1.91+)
|
||||
disable_skill_shell_execution: boolean;
|
||||
// Bare mode — suppress UI chrome for scripted headless -p calls (v2.1.81+)
|
||||
bare_mode: boolean;
|
||||
// Show clear context dialog when accepting a plan (v2.1.81+)
|
||||
show_clear_context_on_plan_accept: boolean;
|
||||
// Custom model option env var (v2.1.81+)
|
||||
custom_model_option: string | null;
|
||||
}
|
||||
|
||||
const defaultConfig: HikariConfig = {
|
||||
@@ -157,10 +149,6 @@ const defaultConfig: HikariConfig = {
|
||||
enable_claudeai_mcp_servers: true,
|
||||
auto_memory_directory: null,
|
||||
model_overrides: null,
|
||||
disable_skill_shell_execution: false,
|
||||
bare_mode: false,
|
||||
show_clear_context_on_plan_accept: true,
|
||||
custom_model_option: null,
|
||||
};
|
||||
|
||||
function createConfigStore() {
|
||||
|
||||
@@ -2,7 +2,6 @@ import { writable, derived, get } from "svelte/store";
|
||||
import type {
|
||||
TerminalLine,
|
||||
ConnectionStatus,
|
||||
ElicitationEvent,
|
||||
PermissionRequest,
|
||||
UserQuestionEvent,
|
||||
Attachment,
|
||||
@@ -33,7 +32,6 @@ export interface Conversation {
|
||||
grantedTools: Set<string>;
|
||||
pendingPermissions: PermissionRequest[];
|
||||
pendingQuestion: UserQuestionEvent | null;
|
||||
pendingElicitation: ElicitationEvent | null;
|
||||
scrollPosition: number;
|
||||
createdAt: Date;
|
||||
lastActivityAt: Date;
|
||||
@@ -159,7 +157,6 @@ function createConversationsStore() {
|
||||
grantedTools: new Set(),
|
||||
pendingPermissions: [],
|
||||
pendingQuestion: null,
|
||||
pendingElicitation: null,
|
||||
scrollPosition: -1, // -1 means "scroll to bottom" (auto-scroll)
|
||||
createdAt: new Date(),
|
||||
lastActivityAt: new Date(),
|
||||
@@ -224,10 +221,6 @@ function createConversationsStore() {
|
||||
($conv) => $conv?.pendingPermissions || []
|
||||
);
|
||||
const pendingQuestion = derived(activeConversation, ($conv) => $conv?.pendingQuestion || null);
|
||||
const pendingElicitation = derived(
|
||||
activeConversation,
|
||||
($conv) => $conv?.pendingElicitation ?? null
|
||||
);
|
||||
const scrollPosition = derived(activeConversation, ($conv) => $conv?.scrollPosition ?? -1);
|
||||
const attachments = derived(activeConversation, ($conv) => $conv?.attachments || []);
|
||||
const worktreeInfo = derived(activeConversation, ($conv) => $conv?.worktreeInfo ?? null);
|
||||
@@ -241,7 +234,6 @@ function createConversationsStore() {
|
||||
pendingPermission: { subscribe: pendingPermission.subscribe },
|
||||
pendingPermissions: { subscribe: pendingPermissions.subscribe },
|
||||
pendingQuestion: { subscribe: pendingQuestion.subscribe },
|
||||
pendingElicitation: { subscribe: pendingElicitation.subscribe },
|
||||
isProcessing: { subscribe: isProcessing.subscribe },
|
||||
grantedTools: { subscribe: grantedTools.subscribe },
|
||||
pendingRetryMessage: { subscribe: pendingRetryMessage.subscribe },
|
||||
@@ -407,52 +399,6 @@ function createConversationsStore() {
|
||||
return convs;
|
||||
});
|
||||
},
|
||||
requestElicitation: (elicitation: ElicitationEvent) => {
|
||||
const activeId = get(activeConversationId);
|
||||
if (!activeId) return;
|
||||
|
||||
conversations.update((convs) => {
|
||||
const conv = convs.get(activeId);
|
||||
if (conv) {
|
||||
conv.pendingElicitation = elicitation;
|
||||
conv.lastActivityAt = new Date();
|
||||
}
|
||||
return convs;
|
||||
});
|
||||
},
|
||||
clearElicitation: () => {
|
||||
const activeId = get(activeConversationId);
|
||||
if (!activeId) return;
|
||||
|
||||
conversations.update((convs) => {
|
||||
const conv = convs.get(activeId);
|
||||
if (conv) {
|
||||
conv.pendingElicitation = null;
|
||||
conv.lastActivityAt = new Date();
|
||||
}
|
||||
return convs;
|
||||
});
|
||||
},
|
||||
requestElicitationForConversation: (conversationId: string, elicitation: ElicitationEvent) => {
|
||||
conversations.update((convs) => {
|
||||
const conv = convs.get(conversationId);
|
||||
if (conv) {
|
||||
conv.pendingElicitation = elicitation;
|
||||
conv.lastActivityAt = new Date();
|
||||
}
|
||||
return convs;
|
||||
});
|
||||
},
|
||||
clearElicitationForConversation: (conversationId: string) => {
|
||||
conversations.update((convs) => {
|
||||
const conv = convs.get(conversationId);
|
||||
if (conv) {
|
||||
conv.pendingElicitation = null;
|
||||
conv.lastActivityAt = new Date();
|
||||
}
|
||||
return convs;
|
||||
});
|
||||
},
|
||||
setPendingRetryMessage: (message: string | null) => pendingRetryMessage.set(message),
|
||||
|
||||
// Conversation management
|
||||
|
||||
@@ -187,33 +187,6 @@ describe("toastStore", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("addError", () => {
|
||||
it("adds an error toast with the warning icon", () => {
|
||||
toastStore.addError("Something went wrong");
|
||||
const toasts = get(toastStore);
|
||||
expect(toasts).toHaveLength(1);
|
||||
const toast = toasts[0];
|
||||
expect(toast.kind).toBe("info");
|
||||
if (toast.kind === "info") {
|
||||
expect(toast.message).toBe("Something went wrong");
|
||||
expect(toast.icon).toBe("⚠️");
|
||||
expect(typeof toast.id).toBe("string");
|
||||
expect(toast.id.length).toBeGreaterThan(0);
|
||||
}
|
||||
});
|
||||
|
||||
it("auto-dismisses after 6000ms", () => {
|
||||
toastStore.addError("Rate limit reached");
|
||||
expect(get(toastStore)).toHaveLength(1);
|
||||
|
||||
vi.advanceTimersByTime(5999);
|
||||
expect(get(toastStore)).toHaveLength(1);
|
||||
|
||||
vi.advanceTimersByTime(1);
|
||||
expect(get(toastStore)).toHaveLength(0);
|
||||
});
|
||||
});
|
||||
|
||||
describe("addUpdate", () => {
|
||||
it("adds a persistent update toast with the correct fields", () => {
|
||||
toastStore.addUpdate("2.0.0", "1.9.0", "https://example.com/release");
|
||||
|
||||
@@ -68,13 +68,6 @@ function createToastStore() {
|
||||
setTimeout(() => remove(id), 4000);
|
||||
}
|
||||
|
||||
function addError(message: string) {
|
||||
const id = crypto.randomUUID();
|
||||
const toast: InfoToast = { id, kind: "info", message, icon: "⚠️" };
|
||||
update((toasts) => [...toasts, toast]);
|
||||
setTimeout(() => remove(id), 6000);
|
||||
}
|
||||
|
||||
function addAchievement(achievement: AchievementUnlockedEvent["achievement"]) {
|
||||
const id = crypto.randomUUID();
|
||||
const toast: AchievementToast = { id, kind: "achievement", achievement };
|
||||
@@ -89,7 +82,7 @@ function createToastStore() {
|
||||
// Update toasts are persistent — no auto-dismiss
|
||||
}
|
||||
|
||||
return { subscribe, addInfo, addError, addAchievement, addUpdate, remove };
|
||||
return { subscribe, addInfo, addAchievement, addUpdate, remove };
|
||||
}
|
||||
|
||||
export const toastStore = createToastStore();
|
||||
|
||||
+2
-57
@@ -8,10 +8,7 @@ import { initStatsListener, resetSessionStats } from "$lib/stores/stats";
|
||||
import { initAchievementsListener } from "$lib/stores/achievements";
|
||||
import type {
|
||||
ConnectionStatus,
|
||||
ElicitationEvent,
|
||||
PermissionPromptEvent,
|
||||
PostCompactEvent,
|
||||
StopFailureEvent,
|
||||
UserQuestionEvent,
|
||||
} from "$lib/types/messages";
|
||||
import type { CharacterState } from "$lib/types/states";
|
||||
@@ -409,8 +406,7 @@ export async function initializeTauriListeners() {
|
||||
| "rate-limit"
|
||||
| "compact-prompt"
|
||||
| "worktree"
|
||||
| "config-change"
|
||||
| "elicitation",
|
||||
| "config-change",
|
||||
content,
|
||||
tool_name || undefined,
|
||||
costData,
|
||||
@@ -429,8 +425,7 @@ export async function initializeTauriListeners() {
|
||||
| "rate-limit"
|
||||
| "compact-prompt"
|
||||
| "worktree"
|
||||
| "config-change"
|
||||
| "elicitation",
|
||||
| "config-change",
|
||||
content,
|
||||
tool_name || undefined,
|
||||
costData,
|
||||
@@ -616,56 +611,6 @@ export async function initializeTauriListeners() {
|
||||
}
|
||||
});
|
||||
unlisteners.push(questionUnlisten);
|
||||
|
||||
const elicitationUnlisten = await listen<ElicitationEvent>("claude:elicitation", (event) => {
|
||||
const elicitationEvent = event.payload;
|
||||
if (elicitationEvent.conversation_id) {
|
||||
claudeStore.requestElicitationForConversation(
|
||||
elicitationEvent.conversation_id,
|
||||
elicitationEvent
|
||||
);
|
||||
} else {
|
||||
claudeStore.requestElicitation(elicitationEvent);
|
||||
}
|
||||
});
|
||||
unlisteners.push(elicitationUnlisten);
|
||||
|
||||
const elicitationResultUnlisten = await listen<{ conversation_id?: string }>(
|
||||
"claude:elicitation-result",
|
||||
(event) => {
|
||||
const { conversation_id } = event.payload;
|
||||
if (conversation_id) {
|
||||
claudeStore.clearElicitationForConversation(conversation_id);
|
||||
} else {
|
||||
claudeStore.clearElicitation();
|
||||
}
|
||||
}
|
||||
);
|
||||
unlisteners.push(elicitationResultUnlisten);
|
||||
|
||||
const stopFailureUnlisten = await listen<StopFailureEvent>("claude:stop-failure", (event) => {
|
||||
const { stop_reason, error_type } = event.payload;
|
||||
|
||||
characterState.setTemporaryState("error", 3000);
|
||||
|
||||
let message: string;
|
||||
if (stop_reason === "rate_limit") {
|
||||
message = "Rate limit reached";
|
||||
} else if (stop_reason === "auth_failure" || stop_reason === "authentication") {
|
||||
message = "Authentication failed";
|
||||
} else {
|
||||
message = `API error: ${stop_reason ?? error_type ?? "unknown"}`;
|
||||
}
|
||||
|
||||
toastStore.addError(message);
|
||||
});
|
||||
unlisteners.push(stopFailureUnlisten);
|
||||
|
||||
const postCompactUnlisten = await listen<PostCompactEvent>("claude:post-compact", () => {
|
||||
toastStore.addInfo("Context compacted", "🗜️");
|
||||
characterState.setTemporaryState("success", 2000);
|
||||
});
|
||||
unlisteners.push(postCompactUnlisten);
|
||||
}
|
||||
|
||||
export function cleanupTauriListeners() {
|
||||
|
||||
@@ -10,8 +10,7 @@ export interface TerminalLine {
|
||||
| "rate-limit"
|
||||
| "compact-prompt"
|
||||
| "worktree"
|
||||
| "config-change"
|
||||
| "elicitation";
|
||||
| "config-change";
|
||||
content: string;
|
||||
timestamp: Date;
|
||||
toolName?: string;
|
||||
@@ -163,30 +162,6 @@ export interface UserQuestionEvent {
|
||||
conversation_id?: string;
|
||||
}
|
||||
|
||||
export interface ElicitationEvent {
|
||||
message: string;
|
||||
server_name?: string;
|
||||
request_id?: string;
|
||||
conversation_id?: string;
|
||||
}
|
||||
|
||||
export interface ElicitationResultEvent {
|
||||
action: string;
|
||||
request_id?: string;
|
||||
conversation_id?: string;
|
||||
}
|
||||
|
||||
export interface StopFailureEvent {
|
||||
stop_reason?: string;
|
||||
error_type?: string;
|
||||
conversation_id?: string;
|
||||
}
|
||||
|
||||
export interface PostCompactEvent {
|
||||
session_id?: string;
|
||||
conversation_id?: string;
|
||||
}
|
||||
|
||||
export type ConnectionStatus = "disconnected" | "connecting" | "connected" | "error";
|
||||
|
||||
export interface Attachment {
|
||||
|
||||
@@ -36,7 +36,6 @@
|
||||
import type { CharacterState } from "$lib/types/states";
|
||||
import PermissionModal from "$lib/components/PermissionModal.svelte";
|
||||
import UserQuestionModal from "$lib/components/UserQuestionModal.svelte";
|
||||
import ElicitationModal from "$lib/components/ElicitationModal.svelte";
|
||||
import ConfigSidebar from "$lib/components/ConfigSidebar.svelte";
|
||||
import AchievementsPanel from "$lib/components/AchievementsPanel.svelte";
|
||||
import ToastContainer from "$lib/components/ToastContainer.svelte";
|
||||
@@ -594,7 +593,6 @@
|
||||
|
||||
<PermissionModal />
|
||||
<UserQuestionModal />
|
||||
<ElicitationModal />
|
||||
<ConfigSidebar />
|
||||
<AchievementsPanel
|
||||
bind:isOpen={achievementPanelOpen}
|
||||
|
||||
Reference in New Issue
Block a user