Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
refactor: simplify save_to using toml_edit::ser::to_document (#825)
Maximilian Roos92a002b5b82e
diff --git a/Cargo.lock b/Cargo.lockindex fd58989c4..4b88f8587 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -2435,6 +2435,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "8c740b185920170a6d9191122cafef7010bd6270a3824594bff6784c04d7f09e"dependencies = ["indexmap",+ "serde_core",+ "serde_spanned","toml_datetime","toml_parser","toml_writer",diff --git a/Cargo.toml b/Cargo.tomlindex 680d47495..8c90e4a47 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -91,7 +91,7 @@ strum = { version = "0.27", features = ["derive"] }synoptic = "2"terminal_size = "0.4"toml = { version = "0.9", features = ["preserve_order"] }-toml_edit = "0.24"+toml_edit = { version = "0.24", features = ["serde"] }# All three crates must use the same version series to avoid native library conflicts# These are optional dependencies controlled by the "syntax-highlighting" feature.# To build without C compilation requirements, use: cargo install worktrunk --no-default-featuresdiff --git a/src/commands/process.rs b/src/commands/process.rsindex e9aaaf318..b4b559d60 100644--- a/src/commands/process.rs+++ b/src/commands/process.rs@@ -535,14 +535,27 @@ mod tests {fn test_hook_log_hook_suffix() {use worktrunk::git::HookType;+ // Suffix includes sanitized name with hash for collision avoidancelet log = HookLog::hook(HookSource::User, HookType::PostStart, "server");- assert_eq!(log.suffix(), "user-post-start-server");+ let suffix = log.suffix();+ assert!(+ suffix.starts_with("user-post-start-server-"),+ "Expected pattern: {suffix}"+ );let log = HookLog::hook(HookSource::Project, HookType::PostCreate, "build");- assert_eq!(log.suffix(), "project-post-create-build");+ let suffix = log.suffix();+ assert!(+ suffix.starts_with("project-post-create-build-"),+ "Expected pattern: {suffix}"+ );let log = HookLog::hook(HookSource::User, HookType::PreRemove, "cleanup");- assert_eq!(log.suffix(), "user-pre-remove-cleanup");+ let suffix = log.suffix();+ assert!(+ suffix.starts_with("user-pre-remove-cleanup-"),+ "Expected pattern: {suffix}"+ );}#[test]@@ -555,24 +568,59 @@ mod tests {fn test_hook_log_filename() {use worktrunk::git::HookType;+ // Filenames now include hash suffixes for collision avoidancelet log = HookLog::hook(HookSource::User, HookType::PostStart, "server");- assert_eq!(log.filename("main"), "main-user-post-start-server.log");- assert_eq!(- log.filename("feature/auth"),- "feature-auth-user-post-start-server.log"+ let filename = log.filename("main");+ assert!(+ filename.starts_with("main-"),+ "Expected main- prefix: {filename}"+ );+ assert!(+ filename.contains("-user-post-start-"),+ "Expected -user-post-start-: {filename}"+ );+ assert!(+ filename.ends_with(".log"),+ "Expected .log suffix: {filename}"+ );++ let filename = log.filename("feature/auth");+ assert!(+ filename.starts_with("feature-"),+ "Expected feature- prefix (slash sanitized): {filename}"+ );+ assert!(+ filename.contains("-user-post-start-"),+ "Expected -user-post-start-: {filename}");let log = HookLog::internal(InternalOp::Remove);- assert_eq!(log.filename("main"), "main-remove.log");+ let filename = log.filename("main");+ assert!(+ filename.starts_with("main-"),+ "Expected main- prefix: {filename}"+ );+ assert!(+ filename.ends_with("-remove.log"),+ "Expected -remove.log suffix: {filename}"+ );}#[test]fn test_hook_log_parse_hook() {let log = HookLog::parse("user:post-start:server").unwrap();- assert_eq!(log.suffix(), "user-post-start-server");+ let suffix = log.suffix();+ assert!(+ suffix.starts_with("user-post-start-server-"),+ "Expected pattern: {suffix}"+ );let log = HookLog::parse("project:post-create:build").unwrap();- assert_eq!(log.suffix(), "project-post-create-build");+ let suffix = log.suffix();+ assert!(+ suffix.starts_with("project-post-create-build-"),+ "Expected pattern: {suffix}"+ );}#[test]diff --git a/src/config/user.rs b/src/config/user.rsindex 6a6baac9d..c793418b7 100644--- a/src/config/user.rs+++ b/src/config/user.rs@@ -999,24 +999,22 @@ impl UserConfig {}}- /// Serialize a nested config section into a table.+ /// Recursively convert inline tables to standard tables for readability.///- /// If the config is Some, serializes it as a nested table. If None, does nothing.- /// Used when creating a new file from scratch.- fn serialize_nested_config<T: Serialize>(- table: &mut toml_edit::Table,- section_name: &str,- config: Option<&T>,- ) {- if let Some(cfg) = config- && let Ok(toml_value) = toml::to_string(cfg)- && let Ok(parsed) = toml_value.parse::<toml_edit::DocumentMut>()- {- let mut nested = toml_edit::Table::new();- for (k, v) in parsed.iter() {- nested[k] = v.clone();+ /// When using `toml_edit::ser::to_document()`, nested structs are serialized as inline tables+ /// (e.g., `commit = { generation = { command = "..." } }`). This converts them to standard+ /// multi-line tables for better human readability.+ fn expand_inline_tables(table: &mut toml_edit::Table) {+ let keys: Vec<_> = table.iter().map(|(k, _)| k.to_string()).collect();+ for key in keys {+ let item = table.get_mut(&key).unwrap();+ if let Some(inline) = item.as_inline_table() {+ let mut new_table = inline.clone().into_table();+ Self::expand_inline_tables(&mut new_table);+ *item = toml_edit::Item::Table(new_table);+ } else if let Some(t) = item.as_table_mut() {+ Self::expand_inline_tables(t);}- table[section_name] = toml_edit::Item::Table(nested);}}@@ -1113,78 +1111,28 @@ impl UserConfig {doc.to_string()} else {- // No existing file, create from scratch using toml_edit for consistent formatting- let mut doc = toml_edit::DocumentMut::new();-- // Only write worktree-path if explicitly set (not the default)- if let Some(ref path) = self.worktree_path {- doc["worktree-path"] = toml_edit::value(path);- }-- // skip-shell-integration-prompt (only if true)- if self.skip_shell_integration_prompt {- doc["skip-shell-integration-prompt"] = toml_edit::value(true);- }-- // commit.generation section (new format)- if let Some(ref commit) = self.commit- && let Some(ref generation) = commit.generation- && (generation.command.is_some() || generation.template.is_some())- {- doc["commit"] = toml_edit::Item::Table(toml_edit::Table::new());- doc["commit"]["generation"] = toml_edit::Item::Table(toml_edit::Table::new());- if let Some(ref cmd) = generation.command {- doc["commit"]["generation"]["command"] = toml_edit::value(cmd);- }- }- // Also serialize deprecated commit_generation if present (for backward compat)- if let Some(ref generation) = self.commit_generation- && generation.command.is_some()- {- doc["commit-generation"] = toml_edit::Item::Table(toml_edit::Table::new());- if let Some(ref cmd) = 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();-- // worktree-path (only if set)- if let Some(ref path) = project_config.worktree_path {- table["worktree-path"] = toml_edit::value(path);+ // No existing file: serialize struct directly, then post-process formatting+ let mut doc = toml_edit::ser::to_document(&self)+ .map_err(|e| ConfigError::Message(format!("Serialization error: {e}")))?;++ // Convert inline tables to standard tables for readability+ Self::expand_inline_tables(doc.as_table_mut());++ // Post-process: format approved-commands as multiline arrays for readability+ if let Some(projects) = doc.get_mut("projects").and_then(|p| p.as_table_mut()) {+ projects.set_implicit(true); // Don't emit [projects] header+ for (_, project) in projects.iter_mut() {+ if let Some(arr) = project+ .get_mut("approved-commands")+ .and_then(|a| a.as_array_mut())+ {+ for item in arr.iter_mut() {+ item.decor_mut().set_prefix("\n ");+ }+ arr.set_trailing("\n");+ arr.set_trailing_comma(true);}-- // approved-commands- let commands =- Self::format_multiline_array(project_config.approved_commands.iter());- table["approved-commands"] = toml_edit::value(commands);-- // Per-project nested config sections- Self::serialize_nested_config(- &mut table,- "commit-generation",- project_config.commit_generation.as_ref(),- );- Self::serialize_nested_config(&mut table, "list", project_config.list.as_ref());- Self::serialize_nested_config(- &mut table,- "commit",- project_config.commit.as_ref(),- );- Self::serialize_nested_config(- &mut table,- "merge",- project_config.merge.as_ref(),- );-- projects_table[project_id] = toml_edit::Item::Table(table);}- doc["projects"] = toml_edit::Item::Table(projects_table);}doc.to_string()diff --git a/tests/integration_tests/bare_repository.rs b/tests/integration_tests/bare_repository.rsindex 8fbcdea92..58bfc94a9 100644--- a/tests/integration_tests/bare_repository.rs+++ b/tests/integration_tests/bare_repository.rs@@ -420,19 +420,20 @@ fn test_bare_repo_background_logs_location() {let log_dir = test.bare_repo_path().join("wt-logs");wait_for_file_count(&log_dir, "log", 1);- // Verify the log file matches expected pattern (feature-*-remove-*.log)+ // Verify the log file matches expected pattern (feature-*-remove.log)+ // Format: {branch_with_hash}-{op}.log (internal ops don't have hash on suffix)let log_files: Vec<_> = std::fs::read_dir(&log_dir).unwrap().filter_map(|e| e.ok()).filter(|e| {let name = e.file_name().to_string_lossy().to_string();- name.starts_with("feature-") && name.contains("-remove-") && name.ends_with(".log")+ name.starts_with("feature-") && name.ends_with("-remove.log")}).collect();assert_eq!(log_files.len(),1,- "Expected exactly one feature-*-remove-*.log file, found: {:?}",+ "Expected exactly one feature-*-remove.log file, found: {:?}",log_files);diff --git a/tests/integration_tests/config_state.rs b/tests/integration_tests/config_state.rsindex e0740ef2b..cfc661ac4 100644--- a/tests/integration_tests/config_state.rs+++ b/tests/integration_tests/config_state.rs@@ -2,6 +2,24 @@ use crate::common::{TEST_EPOCH, TestRepo, repo, wt_command};use insta::assert_snapshot;use rstest::rstest;use std::process::Command;+use worktrunk::path::sanitize_for_filename;++/// Generate a hook log filename matching the format from `commands::process::HookLog`.+///+/// Format: `{branch}-{source}-{hook_type}-{name}.log` where branch and name are sanitized.+fn hook_log_filename(branch: &str, source: &str, hook_type: &str, name: &str) -> String {+ let safe_branch = sanitize_for_filename(branch);+ let safe_name = sanitize_for_filename(name);+ format!("{safe_branch}-{source}-{hook_type}-{safe_name}.log")+}++/// Generate an internal operation log filename.+///+/// Format: `{branch}-{op}.log` where branch is sanitized.+fn internal_log_filename(branch: &str, op: &str) -> String {+ let safe_branch = sanitize_for_filename(branch);+ format!("{safe_branch}-{op}.log")+}/// Settings for `wt config state get` snapshots (normalizes log paths)fn state_get_settings() -> insta::Settings {@@ -1124,7 +1142,8 @@ fn test_state_logs_get_hook_returns_path(repo: TestRepo) {let git_dir = repo.root_path().join(".git");let log_dir = git_dir.join("wt-logs");std::fs::create_dir_all(&log_dir).unwrap();- let log_file = log_dir.join("main-user-post-start-server.log");+ let filename = hook_log_filename("main", "user", "post-start", "server");+ let log_file = log_dir.join(&filename);std::fs::write(&log_file, "server output here").unwrap();// Use explicit format: source:hook-type:name@@ -1135,7 +1154,7 @@ fn test_state_logs_get_hook_returns_path(repo: TestRepo) {// The path should be printed to stdout for pipinglet stdout = String::from_utf8_lossy(&output.stdout);assert!(- stdout.contains("main-user-post-start-server.log"),+ stdout.contains(&filename),"Expected log path in stdout: {}",stdout);@@ -1147,7 +1166,8 @@ fn test_state_logs_get_hook_project_source(repo: TestRepo) {let git_dir = repo.root_path().join(".git");let log_dir = git_dir.join("wt-logs");std::fs::create_dir_all(&log_dir).unwrap();- let log_file = log_dir.join("main-project-post-start-build.log");+ let filename = hook_log_filename("main", "project", "post-start", "build");+ let log_file = log_dir.join(&filename);std::fs::write(&log_file, "build output here").unwrap();// Use explicit format: source:hook-type:name@@ -1157,7 +1177,7 @@ fn test_state_logs_get_hook_project_source(repo: TestRepo) {assert!(output.status.success());let stdout = String::from_utf8_lossy(&output.stdout);assert!(- stdout.contains("main-project-post-start-build.log"),+ stdout.contains(&filename),"Expected log path in stdout: {}",stdout);@@ -1169,7 +1189,8 @@ fn test_state_logs_get_hook_internal_op(repo: TestRepo) {let git_dir = repo.root_path().join(".git");let log_dir = git_dir.join("wt-logs");std::fs::create_dir_all(&log_dir).unwrap();- let log_file = log_dir.join("main-remove.log");+ let filename = internal_log_filename("main", "remove");+ let log_file = log_dir.join(&filename);std::fs::write(&log_file, "remove output").unwrap();let output = wt_state_cmd(&repo, "logs", "get", &["--hook=internal:remove"])@@ -1178,7 +1199,7 @@ fn test_state_logs_get_hook_internal_op(repo: TestRepo) {assert!(output.status.success());let stdout = String::from_utf8_lossy(&output.stdout);assert!(- stdout.contains("main-remove.log"),+ stdout.contains(&filename),"Expected log path in stdout: {}",stdout);@@ -1190,11 +1211,8 @@ fn test_state_logs_get_hook_not_found(repo: TestRepo) {let git_dir = repo.root_path().join(".git");let log_dir = git_dir.join("wt-logs");std::fs::create_dir_all(&log_dir).unwrap();- std::fs::write(- log_dir.join("main-user-post-start-other.log"),- "other output",- )- .unwrap();+ let other_filename = hook_log_filename("main", "user", "post-start", "other");+ std::fs::write(log_dir.join(&other_filename), "other output").unwrap();// Use explicit format: source:hook-type:namelet output = wt_state_cmd(&repo, "logs", "get", &["--hook=user:post-start:server"])@@ -1208,8 +1226,10 @@ fn test_state_logs_get_hook_not_found(repo: TestRepo) {"Expected spec echo in error: {}",stderr);+ // The expected filename now includes hash suffixes+ let expected_filename = hook_log_filename("main", "user", "post-start", "server");assert!(- stderr.contains("Expected: main-user-post-start-server.log"),+ stderr.contains(&format!("Expected: {expected_filename}")),"Expected filename in error: {}",stderr);@@ -1242,11 +1262,8 @@ fn test_state_logs_get_hook_no_logs_for_branch(repo: TestRepo) {let git_dir = repo.root_path().join(".git");let log_dir = git_dir.join("wt-logs");std::fs::create_dir_all(&log_dir).unwrap();- std::fs::write(- log_dir.join("other-branch-user-post-start-server.log"),- "other output",- )- .unwrap();+ let other_branch_filename = hook_log_filename("other-branch", "user", "post-start", "server");+ std::fs::write(log_dir.join(&other_branch_filename), "other output").unwrap();// Use explicit format: source:hook-type:namelet output = wt_state_cmd(&repo, "logs", "get", &["--hook=user:post-start:server"])@@ -1272,11 +1289,8 @@ fn test_state_logs_get_hook_with_branch_flag(repo: TestRepo) {let git_dir = repo.root_path().join(".git");let log_dir = git_dir.join("wt-logs");std::fs::create_dir_all(&log_dir).unwrap();- std::fs::write(- log_dir.join("feature-user-post-start-dev.log"),- "dev output",- )- .unwrap();+ let filename = hook_log_filename("feature", "user", "post-start", "dev");+ std::fs::write(log_dir.join(&filename), "dev output").unwrap();// Use explicit format: source:hook-type:namelet output = wt_state_cmd(@@ -1290,7 +1304,7 @@ fn test_state_logs_get_hook_with_branch_flag(repo: TestRepo) {assert!(output.status.success());let stdout = String::from_utf8_lossy(&output.stdout);assert!(- stdout.contains("feature-user-post-start-dev.log"),+ stdout.contains(&filename),"Expected log path in stdout: {}",stdout);diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snapindex 32082c434..4a71cb3e2 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap@@ -24,7 +24,7 @@ info:SHELL: ""TERM: alacrittyUSERPROFILE: "[TEST_HOME]"- WORKTRUNK_COMMIT_GENERATION__COMMAND: "cat >/dev/null && echo 'fix: update files'"+ WORKTRUNK_COMMIT__GENERATION__COMMAND: "cat >/dev/null && echo 'fix: update files'"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"WT_TEST_DELAYED_STREAM_MS: "-1"diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snapindex e926473cf..6ca544bfc 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap@@ -24,7 +24,7 @@ info:SHELL: ""TERM: alacrittyUSERPROFILE: "[TEST_HOME]"- WORKTRUNK_COMMIT_GENERATION__COMMAND: "cat >/dev/null && echo 'fix: commit changes'"+ WORKTRUNK_COMMIT__GENERATION__COMMAND: "cat >/dev/null && echo 'fix: commit changes'"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"WT_TEST_DELAYED_STREAM_MS: "-1"diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_with_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_with_both_flags.snapindex 363429556..82baa0fc0 100644--- a/tests/snapshots/integration__integration_tests__merge__step_commit_with_both_flags.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_with_both_flags.snap@@ -26,7 +26,7 @@ info:SHELL: ""TERM: alacrittyUSERPROFILE: "[TEST_HOME]"- WORKTRUNK_COMMIT_GENERATION__COMMAND: "cat >/dev/null && echo 'fix: update file'"+ WORKTRUNK_COMMIT__GENERATION__COMMAND: "cat >/dev/null && echo 'fix: update file'"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"WT_TEST_DELAYED_STREAM_MS: "-1"diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_with_no_verify_flag.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_with_no_verify_flag.snapindex ac3eff206..4bf997053 100644--- a/tests/snapshots/integration__integration_tests__merge__step_commit_with_no_verify_flag.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_with_no_verify_flag.snap@@ -25,7 +25,7 @@ info:SHELL: ""TERM: alacrittyUSERPROFILE: "[TEST_HOME]"- WORKTRUNK_COMMIT_GENERATION__COMMAND: "cat >/dev/null && echo 'feat: add file'"+ WORKTRUNK_COMMIT__GENERATION__COMMAND: "cat >/dev/null && echo 'feat: add file'"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"WT_TEST_DELAYED_STREAM_MS: "-1"diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_with_stage_tracked_flag.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_with_stage_tracked_flag.snapindex 1f1340fa1..ccf54317e 100644--- a/tests/snapshots/integration__integration_tests__merge__step_commit_with_stage_tracked_flag.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_with_stage_tracked_flag.snap@@ -25,7 +25,7 @@ info:SHELL: ""TERM: alacrittyUSERPROFILE: "[TEST_HOME]"- WORKTRUNK_COMMIT_GENERATION__COMMAND: "cat >/dev/null && echo 'fix: update tracked file'"+ WORKTRUNK_COMMIT__GENERATION__COMMAND: "cat >/dev/null && echo 'fix: update tracked file'"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"WT_TEST_DELAYED_STREAM_MS: "-1"diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_with_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_with_both_flags.snapindex a76c0b265..9dc62afdb 100644--- a/tests/snapshots/integration__integration_tests__merge__step_squash_with_both_flags.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_with_both_flags.snap@@ -26,7 +26,7 @@ info:SHELL: ""TERM: alacrittyUSERPROFILE: "[TEST_HOME]"- WORKTRUNK_COMMIT_GENERATION__COMMAND: "cat >/dev/null && echo 'squash: combined commits'"+ WORKTRUNK_COMMIT__GENERATION__COMMAND: "cat >/dev/null && echo 'squash: combined commits'"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"WT_TEST_DELAYED_STREAM_MS: "-1"diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_with_no_verify_flag.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_with_no_verify_flag.snapindex e4ad3f756..3ef9d0cc2 100644--- a/tests/snapshots/integration__integration_tests__merge__step_squash_with_no_verify_flag.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_with_no_verify_flag.snap@@ -25,7 +25,7 @@ info:SHELL: ""TERM: alacrittyUSERPROFILE: "[TEST_HOME]"- WORKTRUNK_COMMIT_GENERATION__COMMAND: "cat >/dev/null && echo 'squash: combined commits'"+ WORKTRUNK_COMMIT__GENERATION__COMMAND: "cat >/dev/null && echo 'squash: combined commits'"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"WT_TEST_DELAYED_STREAM_MS: "-1"diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_with_stage_tracked_flag.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_with_stage_tracked_flag.snapindex ac08f7049..ac05e5416 100644--- a/tests/snapshots/integration__integration_tests__merge__step_squash_with_stage_tracked_flag.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_with_stage_tracked_flag.snap@@ -25,7 +25,7 @@ info:SHELL: ""TERM: alacrittyUSERPROFILE: "[TEST_HOME]"- WORKTRUNK_COMMIT_GENERATION__COMMAND: "cat >/dev/null && echo 'squash: combined commits'"+ WORKTRUNK_COMMIT__GENERATION__COMMAND: "cat >/dev/null && echo 'squash: combined commits'"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"WT_TEST_DELAYED_STREAM_MS: "-1"