Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Feat: Format TOML arrays as multiline for readability
Maximilian Roos712f009bd25d
diff --git a/src/config/user.rs b/src/config/user.rsindex 5a4ee7dc4..f8f6896b9 100644--- a/src/config/user.rs+++ b/src/config/user.rs@@ -444,6 +444,20 @@ impl WorktrunkConfig {}}+ /// Format a string array as multiline TOML for readability+ ///+ /// TODO: toml_edit doesn't provide a built-in multiline array format option.+ /// Consider replacing with a dependency if one emerges that handles this automatically.+ fn format_multiline_array<'a>(items: impl Iterator<Item = &'a String>) -> toml_edit::Array {+ let mut array: toml_edit::Array = items.collect();+ for item in array.iter_mut() {+ item.decor_mut().set_prefix("\n ");+ }+ array.set_trailing("\n");+ array.set_trailing_comma(true);+ array+ }+/// Save the current configuration to a specific file path////// Use this in tests to save to a temporary location instead of the user's config.@@ -487,17 +501,41 @@ impl WorktrunkConfig {if !projects.contains_key(project_id) {projects[project_id] = toml_edit::Item::Table(toml_edit::Table::new());}- let commands: toml_edit::Array =- project_config.approved_commands.iter().collect();+ let commands =+ Self::format_multiline_array(project_config.approved_commands.iter());projects[project_id]["approved-commands"] = toml_edit::value(commands);}}doc.to_string()} else {- // No existing file, create from scratch- toml::to_string_pretty(self)- .map_err(|e| ConfigError::Message(format!("Failed to serialize config: {}", e)))?+ // No existing file, create from scratch using toml_edit for consistent formatting+ let mut doc = toml_edit::DocumentMut::new();+ doc["worktree-path"] = toml_edit::value(&self.worktree_path);++ // commit-generation section+ doc["commit-generation"] = toml_edit::Item::Table(toml_edit::Table::new());+ let commit_args: toml_edit::Array = self.commit_generation.args.iter().collect();+ doc["commit-generation"]["args"] = toml_edit::value(commit_args);+ if let Some(ref cmd) = self.commit_generation.command {+ doc["commit-generation"]["command"] = toml_edit::value(cmd);+ }++ // projects section with multiline arrays+ if !self.projects.is_empty() {+ let mut projects_table = toml_edit::Table::new();+ projects_table.set_implicit(true); // Don't emit [projects] header+ for (project_id, project_config) in &self.projects {+ let mut table = toml_edit::Table::new();+ let commands =+ Self::format_multiline_array(project_config.approved_commands.iter());+ table["approved-commands"] = toml_edit::value(commands);+ projects_table[project_id] = toml_edit::Item::Table(table);+ }+ doc["projects"] = toml_edit::Item::Table(projects_table);+ }++ doc.to_string()};std::fs::write(config_path, toml_string)diff --git a/tests/integration_tests/approval_save.rs b/tests/integration_tests/approval_save.rsindex 0e5304a0e..f78d9a01e 100644--- a/tests/integration_tests/approval_save.rs+++ b/tests/integration_tests/approval_save.rs@@ -39,7 +39,9 @@ fn test_approval_saves_to_disk() {args = [][projects."github.com/test/repo"]- approved-commands = ["test command"]+ approved-commands = [+ "test command",+ ]"#);// Verify approval is in memory@@ -93,7 +95,9 @@ fn test_duplicate_approvals_not_saved_twice() {args = [][projects."github.com/test/repo"]- approved-commands = ["test"]+ approved-commands = [+ "test",+ ]"#);}@@ -143,10 +147,15 @@ fn test_multiple_project_approvals() {args = [][projects."github.com/user1/repo1"]- approved-commands = ["npm install", "npm test"]+ approved-commands = [+ "npm install",+ "npm test",+ ][projects."github.com/user2/repo2"]- approved-commands = ["cargo build"]+ approved-commands = [+ "cargo build",+ ]"#);}@@ -225,8 +234,6 @@ fn test_force_flag_does_not_save_approval() {[commit-generation]args = []-- [projects]"#);}@@ -263,7 +270,9 @@ fn test_force_flag_saves_to_new_config_file() {args = [][projects."github.com/test/nested"]- approved-commands = ["test command"]+ approved-commands = [+ "test command",+ ]"#);}