Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Replace config update --print with --output (#4021)
Maximilian Roos474f93a007dd
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex eac162b8e..778c8fd1b 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -4,6 +4,8 @@### Improved+- **Config migration output names its destination**: `wt config update --output <path>` writes the migration artifact to that file instead of applying it in place, and `--output=-` writes it to stdout. Output mode includes project config when run from a linked worktree. (Breaking: `--print` was removed.)+- **`wt switch --execute` takes a program, not a shell string**: `-x` names one program, with everything after `--` passed as literal argv. Worktrunk spawns it as a child rather than running it in your interactive shell, so shell functions and its `cd` no longer reach you. `-x sh -- -c '…'` recovers shell syntax, not functions. (Breaking: existing `-x` strings, plus `WORKTRUNK_DIRECTIVE_EXEC_FILE` and `WORKTRUNK_SHELL`.) ([#3977](https://github.com/max-sixty/worktrunk/pull/3977), closes [#2860](https://github.com/max-sixty/worktrunk/issues/2860), fixes [#3944](https://github.com/max-sixty/worktrunk/issues/3944), thanks @omgreenfield for testing the migration path)- **Worktrunk decides tracking for the branches it creates**: a new branch gets an upstream only when its name matches the remote branch it starts from, whatever `branch.autoSetupMerge` says: `--create release --base origin/release` tracks, `--create feature --base origin/release` does not. Under `autoSetupMerge = false` this previously exited 128 after creating the worktree. ([#3913](https://github.com/max-sixty/worktrunk/pull/3913), [#3950](https://github.com/max-sixty/worktrunk/pull/3950), fixes [#3937](https://github.com/max-sixty/worktrunk/issues/3937), thanks @mjakl for reporting and diagnosing)diff --git a/docs/src/content/docs/config.md b/docs/src/content/docs/config.mdindex 675a9f934..066ecfa18 100644--- a/docs/src/content/docs/config.md+++ b/docs/src/content/docs/config.md@@ -809,6 +809,80 @@ Global Options:Skip approval prompts```+## wt config update++Update deprecated config settings.++Updates deprecated settings in user and project config files+to their current equivalents, removes deprecated keys that have no equivalent+and reports each one, and adopts defaults that a future release switches —+currently `[list] json-schema = 2` — so the switch happens as a reviewed config+edit rather than at upgrade. Shows a diff and asks for confirmation.++Migrations are computed in memory on demand; nothing is written outside this+command. Set `--output <path>` to write a migrated config to that destination+instead of applying it in place. Use `-` for stdout. When both user and project+config need migration, stdout emits a labeled inspection artifact and file+output fails rather than combining the configs.++Output artifacts omit deprecated `approved-commands`; only in-place updates+move those entries to `approvals.toml`.++### Examples++Preview and apply updates:+```console+$ wt config update+```++Apply without confirmation:+```console+$ wt config update --yes+```++Write the migration artifact to a file:+```console+$ wt config update --output migrated.toml+```++Write the migration artifact to stdout:+```console+$ wt config update --output=-+```++### Command reference++```text wt-command-reference+wt config update - Update deprecated config settings++Usage: wt config update [OPTIONS]++Options:+ --output <PATH>+ Output migrated config (- for stdout)++ -h, --help+ Print help (see a summary with '-h')++Global Options:+ -C <path>+ Working directory for this command++ --config <path>+ User config file path++ --config-set <toml>+ Override config with inline TOML, e.g. --config-set list.full=true (repeatable)++ -v, --verbose...+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug+ logs and raw subprocess output written to .git/wt/logs/). Set WORKTRUNK_VERBOSE=0|1|2 to+ apply the same level everywhere — including shell completion, which no flag can reach++ -y, --yes+ Skip approval prompts+```+## wt config approvalsManage command approvals.diff --git a/docs/tests/built-site.test.mjs b/docs/tests/built-site.test.mjsindex a9caf8009..053bf60e2 100644--- a/docs/tests/built-site.test.mjs+++ b/docs/tests/built-site.test.mjs@@ -223,7 +223,7 @@ test('build preserves the public route contract', async () => {assert.ok(configToc, 'config page is missing its desktop table of contents');assert.equal([...configToc.matchAll(/<a href="#[^"]+"/g)].length,- 32,+ 33,'config table of contents should expose overview and structural section headings only',);for (const [id, title] of [diff --git a/plugins/worktrunk/skills/worktrunk/reference/config.md b/plugins/worktrunk/skills/worktrunk/reference/config.mdindex a3bf26f24..da928286a 100644--- a/plugins/worktrunk/skills/worktrunk/reference/config.md+++ b/plugins/worktrunk/skills/worktrunk/reference/config.md@@ -801,6 +801,80 @@ Global Options:Skip approval prompts```+## wt config update++Update deprecated config settings.++Updates deprecated settings in user and project config files+to their current equivalents, removes deprecated keys that have no equivalent+and reports each one, and adopts defaults that a future release switches —+currently `[list] json-schema = 2` — so the switch happens as a reviewed config+edit rather than at upgrade. Shows a diff and asks for confirmation.++Migrations are computed in memory on demand; nothing is written outside this+command. Set `--output <path>` to write a migrated config to that destination+instead of applying it in place. Use `-` for stdout. When both user and project+config need migration, stdout emits a labeled inspection artifact and file+output fails rather than combining the configs.++Output artifacts omit deprecated `approved-commands`; only in-place updates+move those entries to `approvals.toml`.++### Examples++Preview and apply updates:+```console+$ wt config update+```++Apply without confirmation:+```console+$ wt config update --yes+```++Write the migration artifact to a file:+```console+$ wt config update --output migrated.toml+```++Write the migration artifact to stdout:+```console+$ wt config update --output=-+```++### Command reference++```+wt config update - Update deprecated config settings++Usage: wt config update [OPTIONS]++Options:+ --output <PATH>+ Output migrated config (- for stdout)++ -h, --help+ Print help (see a summary with '-h')++Global Options:+ -C <path>+ Working directory for this command++ --config <path>+ User config file path++ --config-set <toml>+ Override config with inline TOML, e.g. --config-set list.full=true (repeatable)++ -v, --verbose...+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug+ logs and raw subprocess output written to .git/wt/logs/). Set WORKTRUNK_VERBOSE=0|1|2 to+ apply the same level everywhere — including shell completion, which no flag can reach++ -y, --yes+ Skip approval prompts+```+## wt config approvalsManage command approvals.diff --git a/skills/worktrunk/reference/config.md b/skills/worktrunk/reference/config.mdindex a3bf26f24..da928286a 100644--- a/skills/worktrunk/reference/config.md+++ b/skills/worktrunk/reference/config.md@@ -801,6 +801,80 @@ Global Options:Skip approval prompts```+## wt config update++Update deprecated config settings.++Updates deprecated settings in user and project config files+to their current equivalents, removes deprecated keys that have no equivalent+and reports each one, and adopts defaults that a future release switches —+currently `[list] json-schema = 2` — so the switch happens as a reviewed config+edit rather than at upgrade. Shows a diff and asks for confirmation.++Migrations are computed in memory on demand; nothing is written outside this+command. Set `--output <path>` to write a migrated config to that destination+instead of applying it in place. Use `-` for stdout. When both user and project+config need migration, stdout emits a labeled inspection artifact and file+output fails rather than combining the configs.++Output artifacts omit deprecated `approved-commands`; only in-place updates+move those entries to `approvals.toml`.++### Examples++Preview and apply updates:+```console+$ wt config update+```++Apply without confirmation:+```console+$ wt config update --yes+```++Write the migration artifact to a file:+```console+$ wt config update --output migrated.toml+```++Write the migration artifact to stdout:+```console+$ wt config update --output=-+```++### Command reference++```+wt config update - Update deprecated config settings++Usage: wt config update [OPTIONS]++Options:+ --output <PATH>+ Output migrated config (- for stdout)++ -h, --help+ Print help (see a summary with '-h')++Global Options:+ -C <path>+ Working directory for this command++ --config <path>+ User config file path++ --config-set <toml>+ Override config with inline TOML, e.g. --config-set list.full=true (repeatable)++ -v, --verbose...+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug+ logs and raw subprocess output written to .git/wt/logs/). Set WORKTRUNK_VERBOSE=0|1|2 to+ apply the same level everywhere — including shell completion, which no flag can reach++ -y, --yes+ Skip approval prompts+```+## wt config approvalsManage command approvals.diff --git a/src/cli/config.rs b/src/cli/config.rsindex 5c4a2c320..4003c29ae 100644--- a/src/cli/config.rs+++ b/src/cli/config.rs@@ -1,3 +1,5 @@+use std::path::PathBuf;+use clap::{Args, Subcommand};use super::SwitchFormat;@@ -594,7 +596,13 @@ currently `[list] json-schema = 2` — so the switch happens as a reviewed confiedit rather than at upgrade. Shows a diff and asks for confirmation.Migrations are computed in memory on demand; nothing is written outside this-command. Use `--print` to see the migrated TOML without touching any file.+command. Set `--output <path>` to write a migrated config to that destination+instead of applying it in place. Use `-` for stdout. When both user and project+config need migration, stdout emits a labeled inspection artifact and file+output fails rather than combining the configs.++Output artifacts omit deprecated `approved-commands`; only in-place updates+move those entries to `approvals.toml`.## Examples@@ -608,15 +616,20 @@ Apply without confirmation:$ wt config update --yes```-Print the migrated config to stdout (no changes written):+Write the migration artifact to a file:+```console+$ wt config update --output migrated.toml+```++Write the migration artifact to stdout:```console-$ wt config update --print+$ wt config update --output=-```"#)]Update {- /// Print the migrated config to stdout instead of writing it- #[arg(long)]- print: bool,+ /// Output migrated config (`-` for stdout)+ #[arg(long, value_name = "PATH")]+ output: Option<PathBuf>,},/// Manage command approvalsdiff --git a/src/cli/mod.rs b/src/cli/mod.rsindex f013215d8..6bd06be44 100644--- a/src/cli/mod.rs+++ b/src/cli/mod.rs@@ -2597,6 +2597,7 @@ $ wt --config-set 'projects."github.com/owner/repo".worktree-path = "/tmp/scratcHooks, aliases and `step.copy-ignored.exclude` accumulate rather than replace, so an env-set hook and a project's hook both run.<!-- subdoc: show -->+<!-- subdoc: update --><!-- subdoc: approvals --><!-- subdoc: alias --><!-- subdoc: state -->"#)]diff --git a/src/commands/config/update.rs b/src/commands/config/update.rsindex 2da0d7d8c..a2d4c7a23 100644--- a/src/commands/config/update.rs+++ b/src/commands/config/update.rs@@ -1,22 +1,24 @@//! Config update command.//!-//! Updates deprecated settings in user and project config files by-//! re-migrating in memory and overwriting the file. The previous `.new` file-//! flow was removed — nothing writes to disk outside this command.+//! Computes user- and project-config migrations in memory. The default mode+//! previews and applies them atomically; output mode writes one migration+//! artifact to the named destination instead. The previous `.new` file flow+//! was removed — nothing writes to disk outside this command.use std::fmt::Write as _;-use std::path::PathBuf;+use std::path::{Path, PathBuf};-use anyhow::Context;+use anyhow::{Context, bail};use color_print::cformat;use worktrunk::config::{ConfigFileKind, DeprecationInfo, DeprecationKind, compute_migrated_content, config_path,copy_approved_commands_to_approvals_file, format_deprecation_warnings, format_migration_diff,};-use worktrunk::git::Repository;+use worktrunk::git::{Repository, resolve_input_path};+use worktrunk::path::format_path_for_display;use worktrunk::styling::{- eprint, eprintln, format_bash_with_gutter, hint_message, info_message, print, println,- success_message, suggest_command_in_dir,+ eprint, eprintln, format_bash_with_gutter, hint_message, info_message, print, success_message,+ suggest_command_in_dir,};use crate::output::prompt::{PromptResponse, prompt_yes_no_preview};@@ -34,43 +36,24 @@ struct UpdateCandidate {}/// Handle the `wt config update` command.-pub fn handle_config_update(yes: bool, print: bool) -> anyhow::Result<()> {+pub fn handle_config_update(yes: bool, output: Option<PathBuf>) -> anyhow::Result<()> {let mut candidates = Vec::new();+ let read_only = output.is_some();if let Some(candidate) = check_user_config()? {candidates.push(candidate);}- if let Some(candidate) = check_project_config()? {+ if let Some(candidate) = check_project_config(read_only)? {candidates.push(candidate);}- if candidates.is_empty() {- if print {- // --print on a clean config is a no-op; stay quiet on stdout.- return Ok(());- }- eprintln!("{}", info_message("No deprecated settings found"));+ if let Some(output) = output {+ write_migrated_output(&output, &candidates)?;return Ok(());}- if print {- // Emit migrated content to stdout. Multiple configs → separate with a- // labeled header so the output is still parseable. `--print` is for- // piping, so stderr stays empty.- let multi = candidates.len() > 1;- for (idx, candidate) in candidates.iter().enumerate() {- if multi {- if idx > 0 {- println!();- }- println!(- "# {} ({})",- candidate.info.label(),- candidate.config_path.display()- );- }- print!("{}", candidate.migrated);- }+ if candidates.is_empty() {+ eprintln!("{}", info_message("No deprecated settings found"));return Ok(());}@@ -122,6 +105,62 @@ pub fn handle_config_update(yes: bool, print: bool) -> anyhow::Result<()> {Ok(())}+/// Write the migration artifact to a path, or to stdout when the path is `-`.+fn write_migrated_output(output: &Path, candidates: &[UpdateCandidate]) -> anyhow::Result<()> {+ let stdout = output == Path::new("-");++ if candidates.is_empty() {+ if !stdout {+ eprintln!("{}", info_message("No deprecated settings found"));+ }+ return Ok(());+ }++ if !stdout && candidates.len() > 1 {+ bail!(cformat!(+ "Cannot write <bold>user config</> and <bold>project config</> migrations to one file; use <bold>--output=-</> to inspect both or run <bold>wt config update</> to apply them in place"+ ));+ }++ let artifact = format_migrated_output(candidates);+ if stdout {+ print!("{artifact}");+ return Ok(());+ }++ let output = resolve_input_path(output);+ worktrunk::utils::write_atomically(&output, &artifact).with_context(|| {+ format!(+ "Failed to write output @ {}",+ format_path_for_display(&output)+ )+ })?;+ Ok(())+}++/// Format the migration artifact shared by file and stdout destinations.+fn format_migrated_output(candidates: &[UpdateCandidate]) -> String {+ let mut artifact = String::new();+ let multi = candidates.len() > 1;++ for (idx, candidate) in candidates.iter().enumerate() {+ if multi {+ if idx > 0 {+ artifact.push('\n');+ }+ let _ = writeln!(+ artifact,+ "# {} ({})",+ candidate.info.label(),+ candidate.config_path.display()+ );+ }+ artifact.push_str(&candidate.migrated);+ }++ artifact+}+/// Format update preview for display.////// Renders the per-pattern deprecation warnings followed by the diff. The@@ -177,7 +216,7 @@ fn check_user_config() -> anyhow::Result<Option<UpdateCandidate>> {}))}-fn check_project_config() -> anyhow::Result<Option<UpdateCandidate>> {+fn check_project_config(read_only: bool) -> anyhow::Result<Option<UpdateCandidate>> {let repo = match Repository::current() {Ok(repo) => repo,Err(_) => return Ok(None),@@ -192,6 +231,7 @@ fn check_project_config() -> anyhow::Result<Option<UpdateCandidate>> {}let is_linked = repo.current_worktree().is_linked().unwrap_or(true);+ let actionable = read_only || !is_linked;let original =std::fs::read_to_string(&config_path).context("Failed to read project config")?;@@ -199,7 +239,7 @@ fn check_project_config() -> anyhow::Result<Option<UpdateCandidate>> {let result = worktrunk::config::check_and_migrate(&config_path,&original,- !is_linked, // only actionable from main worktree+ actionable,ConfigFileKind::Project,Some(&repo),false,@@ -209,7 +249,7 @@ fn check_project_config() -> anyhow::Result<Option<UpdateCandidate>> {return Ok(None);};- if is_linked {+ if !actionable {let cmd = suggest_command_in_dir(repo.repo_path()?, "config", &["update"], &[]);eprintln!("{}", hint_message("To update project config:"));eprintln!("{}", format_bash_with_gutter(&cmd));diff --git a/src/config/deprecation.rs b/src/config/deprecation.rsindex 740c349c6..ecc3ec1ab 100644--- a/src/config/deprecation.rs+++ b/src/config/deprecation.rs@@ -26,7 +26,7 @@//! content (for serde) and a `DeprecationInfo` describing what needs fixing.//! Users materialize migrations explicitly via `wt config update` (which//! overwrites the config file and copies approved-commands to `approvals.toml`)-//! or inspect them via `wt config show` / `wt config update --print`.+//! or export them via `wt config update --output <path>` (`-` for stdout).//!//! Per-path warning dedup still applies within a process so `wt list` doesn't//! spam the same deprecation message from multiple config layers.@@ -1584,12 +1584,13 @@ pub struct CheckAndMigrateResult {////// Pure with respect to the filesystem — never rewrites config or copies/// approvals. The user materializes migrations by running `wt config update`-/// (or `wt config update --print`). Deprecation warnings still go to stderr+/// or exports the result instead of applying it in place via+/// `wt config update --output <path>`. Deprecation warnings still go to stderr/// when `emit_inline_warnings` is set.///-/// Set `warn_and_migrate` to false for project config on feature worktrees —-/// the warning is only actionable from the main worktree where the user would-/// run `wt config update`.+/// Set `warn_and_migrate` to false when project config is not actionable. A+/// linked worktree cannot update the file, but read-only output remains+/// actionable and passes true.////// `kind` names the config file being checked; it derives the warning label/// and scopes kind-specific rules (`DeprecationRule::PendingDefault`).diff --git a/src/main.rs b/src/main.rsindex d7533c54b..4ee38b0f8 100644--- a/src/main.rs+++ b/src/main.rs@@ -639,7 +639,7 @@ fn handle_config_command(action: ConfigCommand, yes: bool) -> anyhow::Result<()>ConfigCommand::Shell { action } => handle_config_shell_command(action, yes),ConfigCommand::Create { project } => handle_config_create(project),ConfigCommand::Show { full, format } => handle_config_show(full, format),- ConfigCommand::Update { print } => handle_config_update(yes, print),+ ConfigCommand::Update { output } => handle_config_update(yes, output),ConfigCommand::Approvals { action } => match action {ApprovalsCommand::List { format } => list_approvals(format),ApprovalsCommand::Add { all } => add_approvals(all, yes),diff --git a/tests/integration_tests/config_show.rs b/tests/integration_tests/config_show.rsindex a3ca8ffa0..3897c328d 100644--- a/tests/integration_tests/config_show.rs+++ b/tests/integration_tests/config_show.rs@@ -3401,40 +3401,98 @@ fn test_config_update_project_config_from_linked_worktree_shows_hint(repo: TestR);}-/// `wt config update --print` with both user- and project-config deprecations-/// emits both, separated by labeled headers on stdout.+/// Multiple migrated configs can be inspected on stdout but cannot be written+/// as one config file, which would change TOML table scope between documents.#[rstest]-fn test_config_update_print_emits_both_configs(repo: TestRepo) {+fn test_config_update_output_file_rejects_multiple_configs(repo: TestRepo) {let user_config_path = repo.test_config_path();- fs::write(- user_config_path,- r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"-"#,- )- .unwrap();- repo.write_project_config(- r#"pre-start = "ln -sf {{ main_worktree }}/node_modules"-"#,- );+ let user_original = r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"+"#;+ fs::write(user_config_path, user_original).unwrap();+ let project_original = r#"pre-start = "ln -sf {{ main_worktree }}/node_modules"+"#;+ repo.write_project_config(project_original);repo.commit("Add deprecated project config");- let output = repo+ let stdout_output = repo.wt_command()- .args(["config", "update", "--print"])+ .args(["config", "update", "--output=-"]).output().unwrap();- assert!(output.status.success());- let stdout = String::from_utf8_lossy(&output.stdout);+ assert!(stdout_output.status.success());+ assert!(stdout_output.stderr.is_empty());+ let stdout = String::from_utf8_lossy(&stdout_output.stdout);assert!(stdout.contains("# User config"));assert!(stdout.contains("# Project config"));assert!(stdout.contains("{{ repo }}"));assert!(stdout.contains("pre-start"));++ fs::write(+ repo.root_path().join("migrated.toml"),+ "important user data\n",+ )+ .unwrap();+ let mut file_command = repo.wt_command();+ file_command+ .current_dir(repo.root_path().parent().unwrap())+ .arg("-C")+ .arg(repo.root_path())+ .args(["config", "update", "--output=migrated.toml"]);+ let file_output = file_command.output().unwrap();+ assert!(!file_output.status.success());+ assert!(file_output.stdout.is_empty());+ assert_eq!(+ fs::read_to_string(repo.root_path().join("migrated.toml")).unwrap(),+ "important user data\n"+ );+ let stderr = String::from_utf8_lossy(&file_output.stderr)+ .ansi_strip()+ .into_owned();+ assert!(+ stderr.contains("Cannot write user config and project config migrations to one file"),+ "unexpected stderr: {stderr}"+ );+ assert_eq!(fs::read_to_string(user_config_path).unwrap(), user_original);+ assert_eq!(+ fs::read_to_string(repo.root_path().join(".config").join("wt.toml")).unwrap(),+ project_original+ );+}++/// File and stdout output receive the same bytes for one migrated config.+#[rstest]+fn test_config_update_output_destinations_emit_same_config(repo: TestRepo) {+ let config_path = repo.test_config_path();+ let original = r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"+"#;+ fs::write(config_path, original).unwrap();++ let stdout_output = repo+ .wt_command()+ .args(["config", "update", "--output=-"])+ .output()+ .unwrap();+ assert!(stdout_output.status.success());+ assert!(stdout_output.stderr.is_empty());++ let destination = repo.root_path().join("migrated.toml");+ fs::write(&destination, "stale\n").unwrap();+ let file_output = repo+ .wt_command()+ .args(["config", "update", "--output=migrated.toml"])+ .output()+ .unwrap();+ assert!(file_output.status.success());+ assert!(file_output.stdout.is_empty());+ assert!(file_output.stderr.is_empty());+ assert_eq!(fs::read(destination).unwrap(), stdout_output.stdout);+ assert_eq!(fs::read_to_string(config_path).unwrap(), original);}-/// `wt config update --print` on a clean config exits silently with empty+/// `wt config update --output=-` on a clean config exits silently with empty/// stdout — no "nothing to do" noise to corrupt a pipe.#[rstest]-fn test_config_update_print_on_clean_config_is_silent(repo: TestRepo) {+fn test_config_update_output_stdout_on_clean_config_is_silent(repo: TestRepo) {fs::write(repo.test_config_path(),r#"worktree-path = "../{{ repo }}.{{ branch }}"@@ -3447,7 +3505,7 @@ json-schema = 1let output = repo.wt_command()- .args(["config", "update", "--print"])+ .args(["config", "update", "--output", "-"]).output().unwrap();assert!(output.status.success());@@ -3457,10 +3515,73 @@ json-schema = 1);}-/// `wt config update --print` emits the migrated TOML to stdout without+/// File output with no migrations leaves an existing destination untouched.+#[rstest]+fn test_config_update_output_file_on_clean_config_preserves_destination(repo: TestRepo) {+ let config_path = repo.test_config_path();+ let original = r#"worktree-path = "../{{ repo }}.{{ branch }}"++[list]+json-schema = 1+"#;+ fs::write(config_path, original).unwrap();++ let destination = repo.root_path().join("migrated.toml");+ fs::write(&destination, "important user data\n").unwrap();++ let output = repo+ .wt_command()+ .args(["config", "update", "--output=migrated.toml"])+ .output()+ .unwrap();++ assert!(output.status.success());+ assert!(output.stdout.is_empty());+ assert!(+ String::from_utf8_lossy(&output.stderr).contains("No deprecated settings found"),+ "unexpected stderr: {}",+ String::from_utf8_lossy(&output.stderr)+ );+ assert_eq!(+ fs::read_to_string(destination).unwrap(),+ "important user data\n"+ );+ assert_eq!(fs::read_to_string(config_path).unwrap(), original);+}++/// File output reports the destination when its parent directory is missing.+#[rstest]+fn test_config_update_output_file_surfaces_write_failure(repo: TestRepo) {+ fs::write(+ repo.test_config_path(),+ r#"worktree-path = "../{{ main_worktree }}.{{ branch }}"+"#,+ )+ .unwrap();++ let output = repo+ .wt_command()+ .args([+ "config",+ "update",+ "--output=missing-directory/migrated.toml",+ ])+ .output()+ .unwrap();++ assert!(!output.status.success());+ let stderr = String::from_utf8_lossy(&output.stderr);+ assert!(+ stderr.contains("Failed to write output @")+ && stderr.contains("missing-directory/migrated.toml"),+ "unexpected stderr: {stderr}"+ );+}++/// `wt config update --output=-` emits the migrated TOML to stdout without/// touching the config file. Stderr stays empty so the output is pipeable.#[rstest]-fn test_config_update_print_emits_migrated_without_writing(repo: TestRepo) {+fn test_config_update_output_stdout_emits_migrated_without_writing(repo: TestRepo) {let config_path = repo.test_config_path();let original = r#"worktree-path = "../{{ main_worktree }}.{{ branch }}""#;@@ -3468,18 +3589,18 @@ fn test_config_update_print_emits_migrated_without_writing(repo: TestRepo) {let output = repo.wt_command()- .args(["config", "update", "--print"])+ .args(["config", "update", "--output=-"]).output().unwrap();assert!(output.status.success(),- "config update --print should succeed: {}",+ "config update --output=- should succeed: {}",String::from_utf8_lossy(&output.stderr));assert!(output.stderr.is_empty(),- "--print must keep stderr empty for pipe-friendliness, got: {}",+ "--output=- must keep stderr empty for pipe-friendliness, got: {}",String::from_utf8_lossy(&output.stderr));let stdout = String::from_utf8_lossy(&output.stdout);@@ -3490,11 +3611,74 @@ fn test_config_update_print_emits_migrated_without_writing(repo: TestRepo) {assert_eq!(fs::read_to_string(config_path).unwrap(),original,- "--print must not modify the config file"+ "--output=- must not modify the config file");assert!(!config_path.with_extension("toml.new").exists(),- "--print must not write a .new file"+ "--output=- must not write a .new file"+ );+}++/// Read-only output includes project config from a linked worktree without+/// changing either checkout's copy.+#[rstest]+fn test_config_update_output_stdout_from_linked_worktree(repo: TestRepo) {+ repo.write_project_config(+ r#"pre-start = "ln -sf {{ main_worktree }}/node_modules"+"#,+ );+ repo.commit("Add deprecated project config");++ let project_config_path = repo.root_path().join(".config").join("wt.toml");+ let before = fs::read_to_string(&project_config_path).unwrap();+ let feature_path = repo.root_path().parent().unwrap().join("feature-output");+ repo.run_git(&[+ "worktree",+ "add",+ feature_path.to_str().unwrap(),+ "-b",+ "feature-output",+ ]);++ let output = repo+ .wt_command()+ .args(["config", "update", "--output=-"])+ .current_dir(&feature_path)+ .output()+ .unwrap();++ assert!(output.status.success());+ assert!(output.stderr.is_empty());+ let stdout = String::from_utf8_lossy(&output.stdout);+ assert!(stdout.contains("{{ repo }}"));+ assert!(!stdout.contains("{{ main_worktree }}"));+ assert_eq!(+ fs::read_to_string(feature_path.join(".config").join("wt.toml")).unwrap(),+ before,+ "linked-worktree project config must remain unchanged"+ );+ assert_eq!(+ fs::read_to_string(project_config_path).unwrap(),+ before,+ "main-worktree project config must remain unchanged"+ );+}++/// The former output flag is no longer accepted.+#[rstest]+fn test_config_update_rejects_print(repo: TestRepo) {+ let output = repo+ .wt_command()+ .args(["config", "update", "--print"])+ .output()+ .unwrap();+ assert!(!output.status.success());+ let stderr = String::from_utf8_lossy(&output.stderr)+ .ansi_strip()+ .into_owned();+ assert!(+ stderr.contains("unexpected argument '--print'"),+ "unexpected error: {stderr}");}diff --git a/tests/integration_tests/help.rs b/tests/integration_tests/help.rsindex 9e83248da..0a53d854a 100644--- a/tests/integration_tests/help.rs+++ b/tests/integration_tests/help.rs@@ -103,6 +103,7 @@ fn test_merge_help_describes_exact_shape_no_rebase() {#[case("help_config_shell", "config shell --help")]#[case("help_config_create", "config create --help")]#[case("help_config_show", "config show --help")]+#[case("help_config_update", "config update --help")]#[case("help_config_plugins", "config plugins --help")]#[case("help_config_plugins_codex", "config plugins codex --help")]#[case(diff --git a/tests/integration_tests/output_system_guard.rs b/tests/integration_tests/output_system_guard.rsindex 2dde96b60..86da6be60 100644--- a/tests/integration_tests/output_system_guard.rs+++ b/tests/integration_tests/output_system_guard.rs@@ -74,7 +74,7 @@ const STDOUT_ALLOWED_PATHS: &[&str] = &["commands/configure_shell.rs",// JSON output for wt switch --format=json"commands/worktree/switch.rs",- // Migrated TOML output for wt config update --print (pipeable)+ // Migrated TOML output for wt config update --output=- (pipeable)"commands/config/update.rs",// Hook listing for wt hook show (paged), and the wt hook --dry-run preview"commands/hook_commands.rs",@@ -574,7 +574,7 @@ fn test_stdout_surfaces_survive_a_closed_consumer(repo: TestRepo) {&["list", "--full"][..],&["list", "statusline"][..],&["list", "--format=json"][..],- &["config", "update", "--print"][..],+ &["config", "update", "--output=-"][..],] {let mut command = repo.wt_command();let mut child = commanddiff --git a/tests/snapshots/integration__integration_tests__help__help_config_update.snap b/tests/snapshots/integration__integration_tests__help__help_config_update.snapnew file mode 100644index 000000000..9919c3286--- /dev/null+++ b/tests/snapshots/integration__integration_tests__help__help_config_update.snap@@ -0,0 +1,102 @@+---+source: tests/integration_tests/help.rs+info:+ program: wt+ args:+ - config+ - update+ - "--help"+ env:+ CLICOLOR_FORCE: "1"+ COLUMNS: "500"+ GIT_ALLOW_PROTOCOL: file+ GIT_CONFIG_COUNT: "2"+ GIT_CONFIG_GLOBAL: /nonexistent/wt/gitconfig+ GIT_CONFIG_KEY_0: user.useConfigOnly+ GIT_CONFIG_KEY_1: rerere.enabled+ GIT_CONFIG_SYSTEM: /nonexistent/wt/gitconfig+ GIT_CONFIG_VALUE_0: "true"+ GIT_CONFIG_VALUE_1: "false"+ LANG: C+ LC_ALL: C+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"+ TERM: alacritty+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"+ WORKTRUNK_TEST_BASH_INSTALLED: "0"+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"+ WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_FISH_INSTALLED: "0"+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"+ WORKTRUNK_TEST_NUSHELL_ENV: "0"+ WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"+ WORKTRUNK_TEST_PARENT_SHELL: ""+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"+ WORKTRUNK_TEST_PROBE_TIMEOUT_MS: "60000"+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"+---+success: true+exit_code: 0+----- stdout -----+wt config update - Update deprecated config settings++Usage: [1m[36mwt config update[0m [36m[OPTIONS][0m++[1m[32mOptions:[0m+ [1m[36m--output[0m[36m [0m[36m<PATH>[0m+ Output migrated config ([1m-[0m for stdout)++ [1m[36m-h[0m, [1m[36m--help[0m+ Print help (see a summary with '-h')++[1m[32mGlobal Options:[0m+ [1m[36m-C[0m[36m [0m[36m<path>[0m+ Working directory for this command++ [1m[36m--config[0m[36m [0m[36m<path>[0m+ User config file path++ [1m[36m--config-set[0m[36m [0m[36m<toml>[0m+ Override config with inline TOML, e.g. --config-set list.full=true (repeatable)++ [1m[36m-v[0m, [1m[36m--verbose[0m[36m...[0m+ Verbose output (-v: info logs + hook/alias template variables on stderr; -vv: also debug logs and raw subprocess output written to .git/wt/logs/). Set WORKTRUNK_VERBOSE=0|1|2 to apply the same level everywhere — including shell completion, which no flag can reach++ [1m[36m-y[0m, [1m[36m--yes[0m+ Skip approval prompts++Updates deprecated settings in user and project config files+to their current equivalents, removes deprecated keys that have no equivalent+and reports each one, and adopts defaults that a future release switches —+currently [2m[list] json-schema = 2[0m — so the switch happens as a reviewed config+edit rather than at upgrade. Shows a diff and asks for confirmation.++Migrations are computed in memory on demand; nothing is written outside this+command. Set [2m--output <path>[0m to write a migrated config to that destination+instead of applying it in place. Use [2m-[0m for stdout. When both user and project+config need migration, stdout emits a labeled inspection artifact and file+output fails rather than combining the configs.++Output artifacts omit deprecated [2mapproved-commands[0m; only in-place updates+move those entries to [2mapprovals.toml[0m.++[1m[32mExamples[0m++Preview and apply updates:+[107m [0m [2m[0m[2m[34mwt[0m[2m config update[0m++Apply without confirmation:+[107m [0m [2m[0m[2m[34mwt[0m[2m config update [0m[2m[36m--yes[0m++Write the migration artifact to a file:+[107m [0m [2m[0m[2m[34mwt[0m[2m config update [0m[2m[36m--output[0m[2m migrated.toml[0m++Write the migration artifact to stdout:+[107m [0m [2m[0m[2m[34mwt[0m[2m config update [0m[2m[36m--output=-[0m++----- stderr -----