diff --git a/crates/app-tauri/src/commands.rs b/crates/app-tauri/src/commands.rs index 2c45b2b5..7ff722c8 100644 --- a/crates/app-tauri/src/commands.rs +++ b/crates/app-tauri/src/commands.rs @@ -879,9 +879,14 @@ pub async fn update_project_settings( .map(|value| value.map(domain::ThemeColor::new).transpose()) .transpose() .map_err(|message| ErrorDto::from(AppError::Invalid(message)))?; + let icon = request + .icon + .map(|value| value.map(domain::ProjectIconRef::try_from).transpose()) + .transpose() + .map_err(|message| ErrorDto::from(AppError::Invalid(message)))?; state .update_project_settings - .execute(&project, theme_color) + .execute(&project, theme_color, icon) .await .map(Into::into) .map_err(Into::into) diff --git a/crates/application/src/settings.rs b/crates/application/src/settings.rs index e063297a..d6af6ee6 100644 --- a/crates/application/src/settings.rs +++ b/crates/application/src/settings.rs @@ -2,7 +2,8 @@ use crate::AppError; use domain::{ - IdeaUserSettings, Project, ProjectSettings, ProjectSettingsStore, ThemeColor, UserSettingsStore, + IdeaUserSettings, Project, ProjectIconRef, ProjectSettings, ProjectSettingsStore, ThemeColor, + UserSettingsStore, }; use std::sync::Arc; @@ -64,18 +65,109 @@ impl UpdateProjectSettings { } /// Applies the supplied fields and returns the accepted project settings. /// - /// An absent outer option leaves the colour unchanged; an explicit inner - /// `None` restores the product fallback. + /// An absent outer option leaves a field unchanged; an explicit inner + /// `None` restores that field's product fallback. pub async fn execute( &self, project: &Project, theme_color: Option>, + icon: Option>, ) -> Result { let mut settings = self.store.load(&project.root).await?; + let mut changed = false; if let Some(theme_color) = theme_color { settings.theme_color = theme_color; + changed = true; + } + if let Some(icon) = icon { + settings.icon = icon; + changed = true; + } + if changed { self.store.save(&project.root, &settings).await?; } Ok(settings) } } + +#[cfg(test)] +mod tests { + use super::*; + use async_trait::async_trait; + use domain::{ProjectIconSet, ProjectPath, RemoteRef, StoreError}; + use std::sync::Mutex; + + struct MemoryProjectSettings(Mutex); + + #[async_trait] + impl ProjectSettingsStore for MemoryProjectSettings { + async fn load(&self, _root: &ProjectPath) -> Result { + Ok(self.0.lock().unwrap().clone()) + } + + async fn save( + &self, + _root: &ProjectPath, + settings: &ProjectSettings, + ) -> Result<(), StoreError> { + *self.0.lock().unwrap() = settings.clone(); + Ok(()) + } + } + + fn project() -> Project { + Project::new( + domain::ProjectId::new_random(), + "Settings", + ProjectPath::new("/settings-project").unwrap(), + RemoteRef::Local, + 0, + ) + .unwrap() + } + + #[tokio::test] + async fn project_settings_patch_updates_fields_independently_and_supports_clear() { + let store = Arc::new(MemoryProjectSettings(Mutex::new(ProjectSettings { + theme_color: Some(ThemeColor::new("#123456").unwrap()), + icon: Some(ProjectIconRef::new(ProjectIconSet::Devicon, "rust").unwrap()), + }))); + let update = UpdateProjectSettings::new(store); + let project = project(); + + let icon = ProjectIconRef::new(ProjectIconSet::Lucide, "star").unwrap(); + let after_icon = update + .execute(&project, None, Some(Some(icon.clone()))) + .await + .unwrap(); + assert_eq!( + after_icon.theme_color.as_ref().map(ThemeColor::as_str), + Some("#123456") + ); + assert_eq!(after_icon.icon, Some(icon)); + + let after_theme = update + .execute( + &project, + Some(Some(ThemeColor::new("#ABCDEF").unwrap())), + None, + ) + .await + .unwrap(); + assert_eq!( + after_theme.theme_color.as_ref().map(ThemeColor::as_str), + Some("#ABCDEF") + ); + assert_eq!( + after_theme.icon.as_ref().map(ProjectIconRef::name), + Some("star") + ); + + let cleared = update.execute(&project, None, Some(None)).await.unwrap(); + assert!(cleared.icon.is_none()); + assert_eq!( + cleared.theme_color.as_ref().map(ThemeColor::as_str), + Some("#ABCDEF") + ); + } +} diff --git a/crates/application/tests/structured_launch_d3.rs b/crates/application/tests/structured_launch_d3.rs index 6643554b..60abc8d8 100644 --- a/crates/application/tests/structured_launch_d3.rs +++ b/crates/application/tests/structured_launch_d3.rs @@ -899,6 +899,7 @@ fn launch_fixture_with_preference(interface: DefaultAgentTerminalInterface) -> L .expect("fixture owns its launcher") .with_user_settings(Arc::new(FixedUserSettings(IdeaUserSettings { default_agent_terminal_interface: Some(interface), + language: None, }))); fixture.launch = Arc::new(launch); fixture @@ -949,6 +950,7 @@ async fn changing_global_preference_does_not_replace_an_existing_terminal() { settings .save(&IdeaUserSettings { default_agent_terminal_interface: Some(DefaultAgentTerminalInterface::IdeaCli), + language: None, }) .await .unwrap(); diff --git a/crates/backend/src/dto.rs b/crates/backend/src/dto.rs index 83ad2bab..b70f1999 100644 --- a/crates/backend/src/dto.rs +++ b/crates/backend/src/dto.rs @@ -3266,12 +3266,16 @@ pub struct UserSettingsDto { /// Default interface for newly opened agent terminals. #[serde(default)] pub default_agent_terminal_interface: Option, + /// Preferred interface language. Absence preserves the product default. + #[serde(default)] + pub language: Option, } impl From for UserSettingsDto { fn from(value: domain::IdeaUserSettings) -> Self { Self { default_agent_terminal_interface: value.default_agent_terminal_interface, + language: value.language, } } } @@ -3280,10 +3284,38 @@ impl From for domain::IdeaUserSettings { fn from(value: UserSettingsDto) -> Self { Self { default_agent_terminal_interface: value.default_agent_terminal_interface, + language: value.language, } } } +/// Validated project icon wire reference. +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct ProjectIconRefDto { + /// Known icon catalogue. + pub set: domain::ProjectIconSet, + /// Stable icon name within the catalogue. + pub name: String, +} + +impl From for ProjectIconRefDto { + fn from(value: domain::ProjectIconRef) -> Self { + Self { + set: value.set(), + name: value.name().to_owned(), + } + } +} + +impl TryFrom for domain::ProjectIconRef { + type Error = String; + + fn try_from(value: ProjectIconRefDto) -> Result { + Self::new(value.set, value.name) + } +} + /// Project-owned settings wire contract. #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] @@ -3291,12 +3323,16 @@ pub struct ProjectSettingsDto { /// Optional validated project theme colour. #[serde(default)] pub theme_color: Option, + /// Optional validated project icon. + #[serde(default)] + pub icon: Option, } impl From for ProjectSettingsDto { fn from(value: domain::ProjectSettings) -> Self { Self { theme_color: value.theme_color.map(|color| color.as_str().to_owned()), + icon: value.icon.map(Into::into), } } } @@ -3308,6 +3344,8 @@ pub struct UpdateProjectSettingsRequestDto { pub project_id: String, /// Missing leaves the colour unchanged; null restores the product default. pub theme_color: Option>, + /// Missing leaves the icon unchanged; null restores the product default. + pub icon: Option>, } impl<'de> Deserialize<'de> for UpdateProjectSettingsRequestDto { @@ -3323,9 +3361,12 @@ impl<'de> Deserialize<'de> for UpdateProjectSettingsRequestDto { take_required_string(object, "projectId").map_err(serde::de::Error::custom)?; let theme_color = take_optional_value::(object, "themeColor") .map_err(serde::de::Error::custom)?; + let icon = take_optional_value::(object, "icon") + .map_err(serde::de::Error::custom)?; Ok(Self { project_id, theme_color, + icon, }) } } @@ -6257,6 +6298,52 @@ mod tests { use serde_json::json; use uuid::Uuid; + #[test] + fn settings_dtos_are_additive_and_validate_language_and_icon_contracts() { + let legacy_user: UserSettingsDto = serde_json::from_value(json!({})).unwrap(); + assert_eq!(legacy_user.language, None); + let english: UserSettingsDto = serde_json::from_value(json!({ "language": "en" })).unwrap(); + assert_eq!(english.language, Some(domain::IdeaLanguage::En)); + assert!(serde_json::from_value::(json!({ "language": "de" })).is_err()); + + let project_id = Uuid::from_u128(325).to_string(); + let absent: UpdateProjectSettingsRequestDto = serde_json::from_value(json!({ + "projectId": project_id + })) + .unwrap(); + assert!(absent.theme_color.is_none()); + assert!(absent.icon.is_none()); + + let clear: UpdateProjectSettingsRequestDto = serde_json::from_value(json!({ + "projectId": project_id, + "icon": null + })) + .unwrap(); + assert_eq!(clear.icon, Some(None)); + + let set: UpdateProjectSettingsRequestDto = serde_json::from_value(json!({ + "projectId": project_id, + "icon": { "set": "simple-icons", "name": "github" } + })) + .unwrap(); + let icon: domain::ProjectIconRef = set.icon.unwrap().unwrap().try_into().unwrap(); + assert_eq!(icon.set(), domain::ProjectIconSet::SimpleIcons); + assert_eq!(icon.name(), "github"); + + let invalid_name = ProjectIconRefDto { + set: domain::ProjectIconSet::Lucide, + name: "two words".to_owned(), + }; + assert!(domain::ProjectIconRef::try_from(invalid_name).is_err()); + assert!( + serde_json::from_value::(json!({ + "projectId": project_id, + "icon": { "set": "font-awesome", "name": "star" } + })) + .is_err() + ); + } + #[test] fn slash_command_requests_accept_optional_project_scope() { let project_id = Uuid::from_u128(321).to_string(); diff --git a/crates/domain/src/lib.rs b/crates/domain/src/lib.rs index b63f7d39..8ef8187c 100644 --- a/crates/domain/src/lib.rs +++ b/crates/domain/src/lib.rs @@ -267,7 +267,10 @@ pub use scheduled_task::{ Weekday, MIN_SCHEDULE_INTERVAL_MINUTES, }; -pub use settings::{DefaultAgentTerminalInterface, IdeaUserSettings, ProjectSettings, ThemeColor}; +pub use settings::{ + DefaultAgentTerminalInterface, IdeaLanguage, IdeaUserSettings, ProjectIconRef, ProjectIconSet, + ProjectSettings, ThemeColor, MAX_PROJECT_ICON_NAME_LEN, +}; pub use orchestrator::{ OrchestratorCommand, OrchestratorError, OrchestratorRequest, OrchestratorVisibility, diff --git a/crates/domain/src/settings.rs b/crates/domain/src/settings.rs index 96e90f51..2dbbaecb 100644 --- a/crates/domain/src/settings.rs +++ b/crates/domain/src/settings.rs @@ -12,6 +12,16 @@ pub enum DefaultAgentTerminalInterface { IdeaCli, } +/// User-selected IdeA interface language. +#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "lowercase")] +pub enum IdeaLanguage { + /// French interface. + Fr, + /// English interface. + En, +} + /// Global, machine-local IdeA preferences. #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] @@ -19,6 +29,83 @@ pub struct IdeaUserSettings { /// Default for newly launched human-facing agent terminals. #[serde(default)] pub default_agent_terminal_interface: Option, + /// Preferred interface language. Absence preserves the product default. + #[serde(default)] + pub language: Option, +} + +/// Supported icon catalogue for project visual identity. +#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "kebab-case")] +pub enum ProjectIconSet { + /// Devicon language and platform catalogue. + Devicon, + /// Simple Icons brand catalogue. + SimpleIcons, + /// Lucide general-purpose icon catalogue. + Lucide, + /// IdeA-owned built-in icons. + Idea, +} + +/// Maximum byte length of a stable project icon name. +pub const MAX_PROJECT_ICON_NAME_LEN: usize = 64; + +/// Validated reference to one icon in a known catalogue. +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +#[serde(rename_all = "camelCase", try_from = "UncheckedProjectIconRef")] +pub struct ProjectIconRef { + set: ProjectIconSet, + name: String, +} + +#[derive(Deserialize)] +#[serde(rename_all = "camelCase")] +struct UncheckedProjectIconRef { + set: ProjectIconSet, + name: String, +} + +impl ProjectIconRef { + /// Builds a validated stable icon reference. + pub fn new(set: ProjectIconSet, name: impl Into) -> Result { + let name = name.into(); + let bytes = name.as_bytes(); + let valid_name = !name.is_empty() + && name.len() <= MAX_PROJECT_ICON_NAME_LEN + && bytes.first().is_some_and(u8::is_ascii_alphanumeric) + && bytes.last().is_some_and(u8::is_ascii_alphanumeric) + && bytes + .iter() + .copied() + .all(|byte| byte.is_ascii_alphanumeric() || matches!(byte, b'-' | b'_' | b'.')); + if !valid_name { + return Err(format!( + "project icon name must be 1..={MAX_PROJECT_ICON_NAME_LEN} ASCII letters, digits, '-', '_' or '.', starting and ending with a letter or digit" + )); + } + Ok(Self { set, name }) + } + + /// Returns the owning icon catalogue. + #[must_use] + pub const fn set(&self) -> ProjectIconSet { + self.set + } + + /// Returns the stable catalogue icon name. + #[must_use] + pub fn name(&self) -> &str { + &self.name + } +} + +impl TryFrom for ProjectIconRef { + type Error = String; + + fn try_from(value: UncheckedProjectIconRef) -> Result { + Self::new(value.set, value.name) + } } /// Strict project theme colour (`#RRGGBB`). @@ -66,4 +153,7 @@ pub struct ProjectSettings { /// Optional visual theme colour; absence keeps the product fallback. #[serde(default)] pub theme_color: Option, + /// Optional validated icon used as the project's visual identity. + #[serde(default)] + pub icon: Option, } diff --git a/crates/domain/tests/settings.rs b/crates/domain/tests/settings.rs new file mode 100644 index 00000000..22938408 --- /dev/null +++ b/crates/domain/tests/settings.rs @@ -0,0 +1,93 @@ +use domain::{ + DefaultAgentTerminalInterface, IdeaLanguage, IdeaUserSettings, ProjectIconRef, ProjectIconSet, + ProjectSettings, ThemeColor, MAX_PROJECT_ICON_NAME_LEN, +}; + +#[test] +fn legacy_settings_documents_keep_additive_defaults() { + let user: IdeaUserSettings = + serde_json::from_str(r#"{"defaultAgentTerminalInterface":"ideaCli"}"#).unwrap(); + assert_eq!( + user.default_agent_terminal_interface, + Some(DefaultAgentTerminalInterface::IdeaCli) + ); + assert_eq!(user.language, None); + + let project: ProjectSettings = serde_json::from_str(r##"{"themeColor":"#123ABC"}"##).unwrap(); + assert_eq!( + project.theme_color.as_ref().map(ThemeColor::as_str), + Some("#123ABC") + ); + assert_eq!(project.icon, None); +} + +#[test] +fn language_roundtrips_as_stable_codes_and_rejects_unknown_values() { + for (language, wire) in [(IdeaLanguage::Fr, "fr"), (IdeaLanguage::En, "en")] { + let settings = IdeaUserSettings { + default_agent_terminal_interface: None, + language: Some(language), + }; + let json = serde_json::to_string(&settings).unwrap(); + assert_eq!( + serde_json::from_str::(&json).unwrap()["language"], + wire + ); + assert_eq!( + serde_json::from_str::(&json).unwrap(), + settings + ); + } + + assert!(serde_json::from_str::(r#"{"language":"de"}"#).is_err()); +} + +#[test] +fn project_icon_roundtrips_for_every_known_set() { + for (set, wire) in [ + (ProjectIconSet::Devicon, "devicon"), + (ProjectIconSet::SimpleIcons, "simple-icons"), + (ProjectIconSet::Lucide, "lucide"), + (ProjectIconSet::Idea, "idea"), + ] { + let settings = ProjectSettings { + theme_color: None, + icon: Some(ProjectIconRef::new(set, "arrow-up.circle_2").unwrap()), + }; + let value = serde_json::to_value(&settings).unwrap(); + assert_eq!(value["icon"]["set"], wire); + assert_eq!(value["icon"]["name"], "arrow-up.circle_2"); + assert_eq!( + serde_json::from_value::(value).unwrap(), + settings + ); + } +} + +#[test] +fn project_icon_rejects_unknown_sets_and_unstable_or_oversized_names() { + assert!( + serde_json::from_str::(r#"{"set":"font-awesome","name":"star"}"#).is_err() + ); + + for invalid in [ + "", + " leading", + "two words", + "étoile", + "slash/name", + ".", + "-star", + "star-", + ] { + assert!( + ProjectIconRef::new(ProjectIconSet::Lucide, invalid).is_err(), + "accepted {invalid:?}" + ); + } + assert!(ProjectIconRef::new( + ProjectIconSet::Idea, + "x".repeat(MAX_PROJECT_ICON_NAME_LEN + 1) + ) + .is_err()); +} diff --git a/crates/infrastructure/tests/settings.rs b/crates/infrastructure/tests/settings.rs index e6f5947c..c3955d17 100644 --- a/crates/infrastructure/tests/settings.rs +++ b/crates/infrastructure/tests/settings.rs @@ -2,8 +2,9 @@ use std::path::PathBuf; use std::sync::Arc; use domain::{ - DefaultAgentTerminalInterface, FileSystem, IdeaUserSettings, ProjectPath, ProjectSettings, - ProjectSettingsStore, ThemeColor, UserSettingsStore, + DefaultAgentTerminalInterface, FileSystem, IdeaLanguage, IdeaUserSettings, ProjectIconRef, + ProjectIconSet, ProjectPath, ProjectSettings, ProjectSettingsStore, ThemeColor, + UserSettingsStore, }; use infrastructure::{FsProjectSettingsStore, FsUserSettingsStore, LocalFileSystem}; use uuid::Uuid; @@ -35,6 +36,7 @@ async fn global_user_preference_persists_outside_project() { assert_eq!(store.load().await.unwrap(), IdeaUserSettings::default()); let settings = IdeaUserSettings { default_agent_terminal_interface: Some(DefaultAgentTerminalInterface::IdeaCli), + language: Some(IdeaLanguage::En), }; store.save(&settings).await.unwrap(); assert_eq!( @@ -59,12 +61,13 @@ async fn project_settings_missing_then_valid_round_trip() { assert!(!tmp.0.join(".ideai/project-settings.json").exists()); let settings = ProjectSettings { theme_color: Some(ThemeColor::new("#12AbEF").unwrap()), + icon: Some(ProjectIconRef::new(ProjectIconSet::Devicon, "cplusplus").unwrap()), }; store.save(&tmp.root(), &settings).await.unwrap(); assert_eq!(store.load(&tmp.root()).await.unwrap(), settings); assert_eq!( std::fs::read_to_string(tmp.0.join(".ideai/project-settings.json")).unwrap(), - "{\n \"themeColor\": \"#12AbEF\"\n}\n" + "{\n \"themeColor\": \"#12AbEF\",\n \"icon\": {\n \"set\": \"devicon\",\n \"name\": \"cplusplus\"\n }\n}\n" ); assert!(!tmp.0.join(".ideai/CONTEXT.md").exists()); } @@ -73,6 +76,7 @@ async fn project_settings_missing_then_valid_round_trip() { async fn project_settings_are_isolated_and_missing_defaults_are_not_persisted() { let first = TempDir::new(); let second = TempDir::new(); + let third = TempDir::new(); let store = FsProjectSettingsStore::new(fs()); store @@ -80,16 +84,32 @@ async fn project_settings_are_isolated_and_missing_defaults_are_not_persisted() &first.root(), &ProjectSettings { theme_color: Some(ThemeColor::new("#AA3366").unwrap()), + icon: Some(ProjectIconRef::new(ProjectIconSet::Devicon, "rust").unwrap()), + }, + ) + .await + .unwrap(); + store + .save( + &second.root(), + &ProjectSettings { + theme_color: None, + icon: Some(ProjectIconRef::new(ProjectIconSet::SimpleIcons, "docker").unwrap()), }, ) .await .unwrap(); + let second_settings = store.load(&second.root()).await.unwrap(); + assert_eq!(second_settings.theme_color, None); assert_eq!( - store.load(&second.root()).await.unwrap(), - ProjectSettings::default() + second_settings.icon.as_ref().map(ProjectIconRef::set), + Some(ProjectIconSet::SimpleIcons) + ); + assert_eq!( + second_settings.icon.as_ref().map(ProjectIconRef::name), + Some("docker") ); - assert!(!second.0.join(".ideai/project-settings.json").exists()); assert_eq!( store .load(&first.root()) @@ -100,6 +120,14 @@ async fn project_settings_are_isolated_and_missing_defaults_are_not_persisted() .map(ThemeColor::as_str), Some("#AA3366") ); + let first_icon = store.load(&first.root()).await.unwrap().icon.unwrap(); + assert_eq!(first_icon.set(), ProjectIconSet::Devicon); + assert_eq!(first_icon.name(), "rust"); + assert_eq!( + store.load(&third.root()).await.unwrap(), + ProjectSettings::default() + ); + assert!(!third.0.join(".ideai/project-settings.json").exists()); } #[test] diff --git a/crates/web-server/src/lib.rs b/crates/web-server/src/lib.rs index 92d95258..82caf0e7 100644 --- a/crates/web-server/src/lib.rs +++ b/crates/web-server/src/lib.rs @@ -3931,9 +3931,14 @@ async fn invoke_update_project_settings( .map(|value| value.map(domain::ThemeColor::new).transpose()) .transpose() .map_err(|message| ErrorDto::from(AppError::Invalid(message)))?; + let icon = request + .icon + .map(|value| value.map(domain::ProjectIconRef::try_from).transpose()) + .transpose() + .map_err(|message| ErrorDto::from(AppError::Invalid(message)))?; let output: ProjectSettingsDto = state .update_project_settings - .execute(&project, theme_color) + .execute(&project, theme_color, icon) .await .map_err(ErrorDto::from)? .into(); @@ -10630,16 +10635,18 @@ mod tests { .await; assert_eq!(status, StatusCode::OK); assert_eq!(initial_user["defaultAgentTerminalInterface"], Value::Null); + assert_eq!(initial_user["language"], Value::Null); let (status, saved_user) = invoke_request_for_test( Arc::clone(&state), &cookie, "update_user_settings", - json!({ "request": { "defaultAgentTerminalInterface": "ideaCli" } }), + json!({ "request": { "defaultAgentTerminalInterface": "ideaCli", "language": "en" } }), ) .await; assert_eq!(status, StatusCode::OK); assert_eq!(saved_user["defaultAgentTerminalInterface"], "ideaCli"); + assert_eq!(saved_user["language"], "en"); let (status, initial_project) = invoke_request_for_test( Arc::clone(&state), @@ -10650,16 +10657,25 @@ mod tests { .await; assert_eq!(status, StatusCode::OK); assert_eq!(initial_project["themeColor"], Value::Null); + assert_eq!(initial_project["icon"], Value::Null); let (status, saved_project) = invoke_request_for_test( Arc::clone(&state), &cookie, "update_project_settings", - json!({ "request": { "projectId": project_id, "themeColor": "#AA3366" } }), + json!({ + "request": { + "projectId": project_id, + "themeColor": "#AA3366", + "icon": { "set": "devicon", "name": "rust" } + } + }), ) .await; assert_eq!(status, StatusCode::OK); assert_eq!(saved_project["themeColor"], "#AA3366"); + assert_eq!(saved_project["icon"]["set"], "devicon"); + assert_eq!(saved_project["icon"]["name"], "rust"); let (status, unchanged_project) = invoke_request_for_test( Arc::clone(&state), @@ -10670,6 +10686,7 @@ mod tests { .await; assert_eq!(status, StatusCode::OK); assert_eq!(unchanged_project["themeColor"], "#AA3366"); + assert_eq!(unchanged_project["icon"]["name"], "rust"); let (status, reset_project) = invoke_request_for_test( Arc::clone(&state), @@ -10680,6 +10697,18 @@ mod tests { .await; assert_eq!(status, StatusCode::OK); assert_eq!(reset_project["themeColor"], Value::Null); + assert_eq!(reset_project["icon"]["name"], "rust"); + + let (status, cleared_icon) = invoke_request_for_test( + state, + &cookie, + "update_project_settings", + json!({ "request": { "projectId": project_id, "icon": null } }), + ) + .await; + assert_eq!(status, StatusCode::OK); + assert_eq!(cleared_icon["themeColor"], Value::Null); + assert_eq!(cleared_icon["icon"], Value::Null); } #[tokio::test] diff --git a/frontend/src/adapters/http/index.ts b/frontend/src/adapters/http/index.ts index e54566d7..40ffa9be 100644 --- a/frontend/src/adapters/http/index.ts +++ b/frontend/src/adapters/http/index.ts @@ -166,7 +166,7 @@ class HttpUserSettingsGateway implements UserSettingsGateway { return this.http.invoke("read_user_settings"); } - updateUserSettings(settings: UserSettings): Promise { + updateUserSettings(settings: Partial): Promise { return this.http.invoke("update_user_settings", { request: settings }); } } diff --git a/frontend/src/adapters/http/requestResponseGateways.ts b/frontend/src/adapters/http/requestResponseGateways.ts index 2e4e35f3..4fea0753 100644 --- a/frontend/src/adapters/http/requestResponseGateways.ts +++ b/frontend/src/adapters/http/requestResponseGateways.ts @@ -141,9 +141,9 @@ export class HttpProjectGateway implements ProjectGateway { readProjectSettings(projectId: string): Promise { return this.http.invoke("read_project_settings", { projectId }); } - updateProjectSettings(projectId: string, settings: ProjectSettings): Promise { + updateProjectSettings(projectId: string, settings: Partial): Promise { return this.http.invoke("update_project_settings", { - request: { projectId, themeColor: settings.themeColor }, + request: { projectId, ...settings }, }); } listProjectFiles(projectId: string, path: string): Promise { diff --git a/frontend/src/adapters/mock/index.ts b/frontend/src/adapters/mock/index.ts index d7235ae8..98016b6b 100644 --- a/frontend/src/adapters/mock/index.ts +++ b/frontend/src/adapters/mock/index.ts @@ -1466,20 +1466,26 @@ export class MockProjectGateway implements ProjectGateway { if (!this.projects.some((project) => project.id === projectId)) { throw { code: "NOT_FOUND", message: `project ${projectId} not found` }; } - return this.settings.get(projectId) ?? { themeColor: null }; + return this.settings.get(projectId) ?? { themeColor: null, icon: null }; } async updateProjectSettings( projectId: string, - settings: ProjectSettings, + settings: Partial, ): Promise { if (!this.projects.some((project) => project.id === projectId)) { throw { code: "NOT_FOUND", message: `project ${projectId} not found` }; } - if (settings.themeColor !== null && !/^#[0-9A-Fa-f]{6}$/.test(settings.themeColor)) { + if (settings.themeColor !== undefined && settings.themeColor !== null && !/^#[0-9A-Fa-f]{6}$/.test(settings.themeColor)) { throw { code: "INVALID", message: "themeColor must use #RRGGBB" }; } - const stored = { themeColor: settings.themeColor?.toUpperCase() ?? null }; + const previous = this.settings.get(projectId) ?? { themeColor: null, icon: null }; + const stored = { + themeColor: settings.themeColor === undefined + ? previous.themeColor + : settings.themeColor?.toUpperCase() ?? null, + icon: settings.icon === undefined ? (previous.icon ?? null) : settings.icon, + }; this.settings.set(projectId, stored); return stored; } @@ -5015,14 +5021,14 @@ export function createMockGateways(): Gateways { } export class MockUserSettingsGateway implements UserSettingsGateway { - private settings: UserSettings = { defaultAgentTerminalInterface: null }; + private settings: UserSettings = { defaultAgentTerminalInterface: null, language: null }; async readUserSettings(): Promise { return { ...this.settings }; } - async updateUserSettings(settings: UserSettings): Promise { - this.settings = { ...settings }; + async updateUserSettings(settings: Partial): Promise { + this.settings = { ...this.settings, ...settings }; return { ...this.settings }; } } diff --git a/frontend/src/adapters/project.test.ts b/frontend/src/adapters/project.test.ts index 4fb7ec88..6d4f12b3 100644 --- a/frontend/src/adapters/project.test.ts +++ b/frontend/src/adapters/project.test.ts @@ -63,4 +63,17 @@ describe("TauriProjectGateway invoke payloads", () => { request: { projectId: "proj-1" }, }); }); + + it("passes project icon updates through the additive settings request", async () => { + const gateway = new TauriProjectGateway(); + await gateway.updateProjectSettings("proj-1", { + icon: { set: "devicon", name: "typescript" }, + }); + expect(invoke).toHaveBeenCalledWith("update_project_settings", { + request: { + projectId: "proj-1", + icon: { set: "devicon", name: "typescript" }, + }, + }); + }); }); diff --git a/frontend/src/adapters/project.ts b/frontend/src/adapters/project.ts index e8b9ffa5..216dee9c 100644 --- a/frontend/src/adapters/project.ts +++ b/frontend/src/adapters/project.ts @@ -84,10 +84,10 @@ export class TauriProjectGateway implements ProjectGateway { updateProjectSettings( projectId: string, - settings: ProjectSettings, + settings: Partial, ): Promise { return invoke("update_project_settings", { - request: { projectId, themeColor: settings.themeColor }, + request: { projectId, ...settings }, }); } diff --git a/frontend/src/adapters/userSettings.test.ts b/frontend/src/adapters/userSettings.test.ts new file mode 100644 index 00000000..5072fcbc --- /dev/null +++ b/frontend/src/adapters/userSettings.test.ts @@ -0,0 +1,15 @@ +import { beforeEach, describe, expect, it, vi } from "vitest"; + +const invoke = vi.fn(); +vi.mock("@tauri-apps/api/core", () => ({ invoke: (...args: unknown[]) => invoke(...args) })); + +import { TauriUserSettingsGateway } from "./userSettings"; + +describe("TauriUserSettingsGateway", () => { + beforeEach(() => invoke.mockReset().mockResolvedValue({ defaultAgentTerminalInterface: null, language: "en" })); + + it("persists language without overwriting unrelated user settings", async () => { + await new TauriUserSettingsGateway().updateUserSettings({ language: "en" }); + expect(invoke).toHaveBeenCalledWith("update_user_settings", { request: { language: "en" } }); + }); +}); diff --git a/frontend/src/adapters/userSettings.ts b/frontend/src/adapters/userSettings.ts index a5bf807f..47dfadc3 100644 --- a/frontend/src/adapters/userSettings.ts +++ b/frontend/src/adapters/userSettings.ts @@ -7,7 +7,7 @@ export class TauriUserSettingsGateway implements UserSettingsGateway { return invoke("read_user_settings"); } - updateUserSettings(settings: UserSettings): Promise { + updateUserSettings(settings: Partial): Promise { return invoke("update_user_settings", { request: settings }); } } diff --git a/frontend/src/app/App.tsx b/frontend/src/app/App.tsx index 19fd7383..3bd3b872 100644 --- a/frontend/src/app/App.tsx +++ b/frontend/src/app/App.tsx @@ -13,8 +13,10 @@ import { AppExitConfirmDialog } from "@/features/appExit"; import { PluginRuntimeProvider } from "@/features/plugins"; import { Panel, Spinner, Toolbar } from "@/shared"; import { useGateways, shouldUseMock } from "./di"; +import { useI18n } from "@/i18n"; export function App() { + const { tr } = useI18n(); const { system, profile } = useGateways(); const [health, setHealth] = useState(null); const [error, setError] = useState(null); @@ -78,14 +80,14 @@ export function App() { {health ? ( <> - backend ● v{health.version} ·{" "} - {events.length} events + {tr("backend", "backend")} ● v{health.version} ·{" "} + {events.length} {tr("événements", "events")} ) : error ? ( - backend unavailable + {tr("backend indisponible", "backend unavailable")} ) : ( - checking… + {tr("vérification…", "checking…")} )} @@ -96,7 +98,7 @@ export function App() {
{error && ( -

Error: {error}

+

{tr("Erreur :", "Error:")} {error}

 )} diff --git a/frontend/src/app/ViewWindow.test.tsx b/frontend/src/app/ViewWindow.test.tsx index 71260870..23ca8df2 100644 --- a/frontend/src/app/ViewWindow.test.tsx +++ b/frontend/src/app/ViewWindow.test.tsx @@ -261,7 +261,7 @@ describe("ViewWindow (#47)", () => { await waitFor(() => expect(screen.getByText(/Ouvrez un projet/i)).toBeTruthy(), ); - expect(screen.queryByLabelText("search tickets")).toBeNull(); + expect(screen.queryByLabelText("Rechercher des tickets")).toBeNull(); }); it("mounts the view for the focused project and follows focus changes", async () => { @@ -299,7 +299,7 @@ describe("ViewWindow (#47)", () => { await waitFor(() => expect(screen.getByText("· alpha")).toBeTruthy()); await waitFor(() => - expect(screen.getByLabelText("search tickets")).toBeTruthy(), + expect(screen.getByLabelText("Rechercher des tickets")).toBeTruthy(), ); // Focus cleared (project closed) → back to the shell, view unmounts. @@ -309,7 +309,7 @@ describe("ViewWindow (#47)", () => { await waitFor(() => expect(screen.getByText(/Ouvrez un projet/i)).toBeTruthy(), ); - expect(screen.queryByLabelText("search tickets")).toBeNull(); + expect(screen.queryByLabelText("Rechercher des tickets")).toBeNull(); }); it("reads the current focus at mount (restored window with a live focus)", async () => { @@ -339,7 +339,7 @@ describe("ViewWindow (#47)", () => { await waitFor(() => expect(screen.getByText("· beta")).toBeTruthy()); await waitFor(() => - expect(screen.getByLabelText("search tickets")).toBeTruthy(), + expect(screen.getByLabelText("Rechercher des tickets")).toBeTruthy(), ); }); }); diff --git a/frontend/src/app/ViewWindow.tsx b/frontend/src/app/ViewWindow.tsx index 499a6b67..70348801 100644 --- a/frontend/src/app/ViewWindow.tsx +++ b/frontend/src/app/ViewWindow.tsx @@ -38,6 +38,7 @@ import { type PluginRuntimeContextValue, } from "@/features/plugins"; import { useGateways } from "./di"; +import { useI18n } from "@/i18n"; /** Panels that may be shown in a detached window (everything but "projects"). */ const DETACHABLE = new Set( @@ -233,6 +234,7 @@ export function PluginLayoutWindow({ plugin, runtimeValue }: PluginLayoutWindowP } function PluginLayoutWindowBody({ plugin }: PluginLayoutWindowProps) { + const { tr } = useI18n(); const { focusedProject } = useGateways(); const { registry, loading } = usePluginRuntime(); const [focus, setFocus] = useState(undefined); @@ -298,12 +300,12 @@ function PluginLayoutWindowBody({ plugin }: PluginLayoutWindowProps) { ) : (

- Ouvrez un projet dans la fenêtre principale pour afficher ce layout. + {tr("Ouvrez un projet dans la fenêtre principale pour afficher ce layout.", "Open a project in the main window to display this layout.")}

)} {loading && ( -

Chargement des plugins...

+

{tr("Chargement des plugins…", "Loading plugins…")}

)}
diff --git a/frontend/src/app/main.tsx b/frontend/src/app/main.tsx index a415314a..efc9b764 100644 --- a/frontend/src/app/main.tsx +++ b/frontend/src/app/main.tsx @@ -8,6 +8,7 @@ import { PluginLayoutWindow, ViewWindow, parseViewWindowParams } from "./ViewWin import { WebApp, WebSurfaceWindow, parseWebSurfaceWindowParams } from "@/features/web"; import { DIProvider, resolveTransport } from "./di"; import { RootErrorBoundary, installGlobalErrorLogging } from "./RootErrorBoundary"; +import { I18nProvider } from "@/i18n"; import "@/shared/styles/theme.css"; const root = document.getElementById("root"); @@ -40,6 +41,7 @@ ReactDOM.createRoot(root).render( + {isWeb && webSurfaceParams ? ( ) : isWeb ? ( @@ -51,6 +53,7 @@ ReactDOM.createRoot(root).render( ) : ( )} + , diff --git a/frontend/src/features/agents/AgentLimitBadge.test.tsx b/frontend/src/features/agents/AgentLimitBadge.test.tsx index 70bb5441..d12201d9 100644 --- a/frontend/src/features/agents/AgentLimitBadge.test.tsx +++ b/frontend/src/features/agents/AgentLimitBadge.test.tsx @@ -124,7 +124,7 @@ describe("AgentLimitBadge (render)", () => { const expected = `limité jusqu'à ${formatResetTime(at)}`; expect(screen.getByText(expected)).toBeTruthy(); // No countdown / cancel button without an armed resume. - expect(screen.queryByLabelText("cancel resume")).toBeNull(); + expect(screen.queryByLabelText("annuler la reprise")).toBeNull(); }); it("shows plain 'limité' when no reset time is known", () => { @@ -145,8 +145,8 @@ describe("AgentLimitBadge (render)", () => { expect(screen.getByText("limité")).toBeTruthy(); expect(screen.getByText(/heure inconnue/)).toBeTruthy(); // The human-net form: a resume-time input + a "schedule resume" button. - expect(screen.getByLabelText("resume time")).toBeTruthy(); - expect(screen.getByLabelText("schedule resume")).toBeTruthy(); + expect(screen.getByLabelText("heure de reprise")).toBeTruthy(); + expect(screen.getByLabelText("programmer la reprise")).toBeTruthy(); }); it("does NOT show the resume-time form when a suspected limit has a time", () => { @@ -160,7 +160,7 @@ describe("AgentLimitBadge (render)", () => { ); expect(screen.getByText(`limité jusqu'à ${formatResetTime(at)}`)).toBeTruthy(); expect(screen.queryByText(/heure inconnue/)).toBeNull(); - expect(screen.queryByLabelText("resume time")).toBeNull(); + expect(screen.queryByLabelText("heure de reprise")).toBeNull(); }); it("submitting the resume-time form arms a resume at the chosen epoch-ms", () => { @@ -172,10 +172,10 @@ describe("AgentLimitBadge (render)", () => { onSetResumeAt={onSetResumeAt} />, ); - fireEvent.change(screen.getByLabelText("resume time"), { + fireEvent.change(screen.getByLabelText("heure de reprise"), { target: { value: "23:45" }, }); - fireEvent.click(screen.getByLabelText("schedule resume")); + fireEvent.click(screen.getByLabelText("programmer la reprise")); expect(onSetResumeAt).toHaveBeenCalledTimes(1); const ms = onSetResumeAt.mock.calls[0][0] as number; const d = new Date(ms); @@ -193,7 +193,7 @@ describe("AgentLimitBadge (render)", () => { />, ); expect( - (screen.getByLabelText("schedule resume") as HTMLButtonElement).disabled, + (screen.getByLabelText("programmer la reprise") as HTMLButtonElement).disabled, ).toBe(true); expect(onSetResumeAt).not.toHaveBeenCalled(); }); @@ -209,11 +209,11 @@ describe("AgentLimitBadge (render)", () => { />, ); // Countdown label present (≈ "reprise dans 1m 30s"). - expect(screen.getByLabelText("resume countdown").textContent).toMatch( + expect(screen.getByLabelText("compte à rebours de reprise").textContent).toMatch( /reprise dans/, ); - const btn = screen.getByLabelText("cancel resume"); + const btn = screen.getByLabelText("annuler la reprise"); fireEvent.click(btn); expect(onCancelResume).toHaveBeenCalledTimes(1); }); @@ -228,7 +228,7 @@ describe("AgentLimitBadge (render)", () => { />, ); expect( - (screen.getByLabelText("cancel resume") as HTMLButtonElement).disabled, + (screen.getByLabelText("annuler la reprise") as HTMLButtonElement).disabled, ).toBe(true); }); }); diff --git a/frontend/src/features/agents/AgentLimitBadge.tsx b/frontend/src/features/agents/AgentLimitBadge.tsx index 16e9f52a..349a898d 100644 --- a/frontend/src/features/agents/AgentLimitBadge.tsx +++ b/frontend/src/features/agents/AgentLimitBadge.tsx @@ -14,6 +14,7 @@ import { useEffect, useState } from "react"; import { Button, Input, cn } from "@/shared"; +import { useI18n } from "@/i18n"; import type { AgentLimitState } from "./useAgents"; /** @@ -75,6 +76,7 @@ export function AgentLimitBadge({ onSetResumeAt, busy = false, }: AgentLimitBadgeProps) { + const { tr } = useI18n(); const { limitedUntil, resumeFireAt, suspected } = state; // Tick a local clock once per second only while a resume countdown is armed, @@ -106,17 +108,17 @@ export function AgentLimitBadge({ const limitLabel = limitedUntil !== undefined - ? `limité jusqu'à ${formatResetTime(limitedUntil)}` - : "limité"; + ? tr(`limité jusqu'à ${formatResetTime(limitedUntil)}`, `limited until ${formatResetTime(limitedUntil)}`) + : tr("limité", "limited"); return ( - heure inconnue + {tr("heure inconnue", "unknown time")} setResumeTime(e.target.value)} @@ -151,27 +153,27 @@ export function AgentLimitBadge({ type="submit" size="sm" variant="primary" - aria-label="schedule resume" + aria-label={tr("programmer la reprise", "schedule resume")} disabled={busy || resumeTime.trim() === ""} > - Programmer la reprise + {tr("Programmer la reprise", "Schedule resume")} )} {resumeFireAt !== undefined && ( - - reprise dans {formatCountdown(resumeFireAt - now)} + + {tr("reprise dans", "resuming in")} {formatCountdown(resumeFireAt - now)} )} diff --git a/frontend/src/features/agents/AgentsPanel.tsx b/frontend/src/features/agents/AgentsPanel.tsx index 8a20ef99..7cd3ecc2 100644 --- a/frontend/src/features/agents/AgentsPanel.tsx +++ b/frontend/src/features/agents/AgentsPanel.tsx @@ -17,6 +17,7 @@ import { useEffect, useState } from "react"; import { Button, Input, Panel, SmallDropdown, Spinner, cn } from "@/shared"; +import { useI18n } from "@/i18n"; import { TerminalView } from "@/features/terminals/TerminalView"; import { AnnouncementsPreview } from "@/features/announcements"; import { useDrift } from "@/features/templates/useDrift"; @@ -45,6 +46,7 @@ export interface AgentsPanelProps { } export function AgentsPanel({ projectId, projectRoot = "" }: AgentsPanelProps) { + const { tr } = useI18n(); const vm = useAgents(projectId); const drift = useDrift(projectId); const gateways = useGateways(); @@ -260,7 +262,7 @@ export function AgentsPanel({ projectId, projectRoot = "" }: AgentsPanelProps) { }; return ( - + {vm.error && (

- Name + {tr("Nom", "Name")} setNewName(e.target.value)} className="w-full" @@ -298,39 +300,38 @@ export function AgentsPanel({ projectId, projectRoot = "" }: AgentsPanelProps) { htmlFor="agent-template-select" className="text-xs font-medium text-muted" > - Template + {tr("Modèle", "Template")} ({ value: t.id, label: t.name })), ]} /> {selectedTemplate && (

- Nom initial:{" "} + {tr("Nom initial", "Initial name")}: {" "} {selectedTemplate.defaultAgentName || selectedTemplate.name}
- Modèle appliqué:{" "} + {tr("Modèle appliqué", "Applied model")}: {" "} - {templateProfileLabel(selectedTemplate, vm.profiles)} + {templateProfileLabel(selectedTemplate, vm.profiles, tr)}
{selectedTemplateMissingProfile && (

- Ce template n'a pas de modèle AI par défaut. Choisis un autre - template ou édite-le avant de créer l'agent. + {tr("Ce modèle n’a pas de profil IA par défaut. Choisissez un autre modèle ou modifiez-le avant de créer l’agent.", "This template has no default AI profile. Choose another template or edit it before creating the agent.")}

)}
@@ -344,21 +345,21 @@ export function AgentsPanel({ projectId, projectRoot = "" }: AgentsPanelProps) { htmlFor="agent-profile-select" className="text-xs font-medium text-muted" > - Profile + {tr("Profil", "Profile")} {vm.profiles.length === 0 && ( - (no profiles configured — you can still enter an id) + {tr("(aucun profil configuré — vous pouvez saisir un identifiant)", "(no profiles configured — you can still enter an id)")} )} {vm.profiles.length > 0 ? ( ({ value: p.id, label: profileLabel(p), @@ -368,8 +369,8 @@ export function AgentsPanel({ projectId, projectRoot = "" }: AgentsPanelProps) { ) : ( setNewProfileId(e.target.value)} className="min-w-32" @@ -381,19 +382,19 @@ export function AgentsPanel({ projectId, projectRoot = "" }: AgentsPanelProps) { {/* ── Agent list ── */}
{vm.agents.length === 0 ? ( -

No agents yet.

+

{tr("Aucun agent pour le moment.", "No agents yet.")}

) : (
    {vm.agents.map((a) => { @@ -438,27 +439,27 @@ export function AgentsPanel({ projectId, projectRoot = "" }: AgentsPanelProps) { {a.name} {a.isOrchestrator && ( - Writer contexte + {tr("Responsable du contexte", "Context writer")} )} {agentDrift && ( - update available + {tr("mise à jour disponible", "update available")} )} {delegationSource && ( @@ -470,36 +471,35 @@ export function AgentsPanel({ projectId, projectRoot = "" }: AgentsPanelProps) { {profileName} {live && ( - running in IdeA · {live.sessionId ?? live.nodeId} + {tr("actif dans IdeA", "running in IdeA")} · {live.sessionId ?? live.nodeId} )} {isSelected && (

    - Rôle dans le projet + {tr("Rôle dans le projet", "Role in project")}

    - Peut modifier directement le contexte partagé du projet. - Un seul agent peut avoir ce rôle. + {tr("Peut modifier directement le contexte partagé du projet. Un seul agent peut avoir ce rôle.", "Can directly edit the project’s shared context. Only one agent can have this role.")}

    )} @@ -531,7 +531,7 @@ export function AgentsPanel({ projectId, projectRoot = "" }: AgentsPanelProps) { engine abandons the conversation history → confirmation. */} {vm.profiles.length > 0 && ( { @@ -562,13 +562,13 @@ export function AgentsPanel({ projectId, projectRoot = "" }: AgentsPanelProps) { )} {isRunning || live ? ( @@ -577,41 +577,41 @@ export function AgentsPanel({ projectId, projectRoot = "" }: AgentsPanelProps) { variant="ghost" aria-label={ stopState === "stopping" - ? `Arrêt en cours… — ${a.name}` + ? tr(`Arrêt en cours… — ${a.name}`, `Stopping… — ${a.name}`) : stopState === "incomplete" - ? `Réessayer l’arrêt — ${a.name}` - : `stop ${a.name}` + ? tr(`Réessayer l’arrêt — ${a.name}`, `Retry stopping — ${a.name}`) + : tr(`Arrêter ${a.name}`, `Stop ${a.name}`) } disabled={stopState === "stopping"} onClick={() => void handleStop(a.id)} className="text-danger hover:text-danger" > {stopState === "stopping" - ? "Arrêt en cours…" + ? tr("Arrêt en cours…", "Stopping…") : stopState === "incomplete" - ? "Réessayer l’arrêt" - : "Stop"} + ? tr("Réessayer l’arrêt", "Retry stopping") + : tr("Arrêter", "Stop")} ) : ( )}
@@ -653,12 +653,12 @@ export function AgentsPanel({ projectId, projectRoot = "" }: AgentsPanelProps) {

- Context — {selectedAgent.name} + {tr("Contexte", "Context")} — {selectedAgent.name}

{selectedAgent.contextPath}