Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Default wt list JSON output to schema 2 (#4038)
Maximilian Roos134f9eb47156
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex dd0fdac38..b9a0abba9 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -2,6 +2,10 @@## Unreleased+### Improved++- **`wt list --format=json` now defaults to schema 2**: callers get the envelope with repository metadata and orthogonal per-item facts without configuring `[list] json-schema`. `wt list statusline --format=json` follows the same key. Set `json-schema = 1` to retain the original bare-array format. (Breaking.)+### Fixed- **Codex on Windows: the activity hooks no longer fail on every event**: each hook led with a bare `bash`, which `cmd.exe` resolves to the WSL launcher rather than Git Bash; in a sandboxed session it refuses to start, so every event raised a `Hook failed` banner. Each hook now carries a Windows-only command that runs the same `wt.sh` through a `cmd.exe` shim, which finds Git Bash by path rather than by name. ([#4008](https://github.com/max-sixty/worktrunk/pull/4008), fixes [#4007](https://github.com/max-sixty/worktrunk/issues/4007), thanks @McNultyyy for reporting and diagnosing)diff --git a/CLAUDE.md b/CLAUDE.mdindex 19a22432d..d3249296a 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -196,7 +196,7 @@ Check `Cargo.toml` before hand-rolling a utility:All config deprecation lives in one layer: pre-deserialization TOML migration in `src/config/deprecation.rs`. `migrate_content()` rewrites deprecated patterns into canonical form before serde parses; `check_and_migrate()` reuses it, and additionally detects patterns and emits per-process-deduped warnings (the user materializes migrations via `wt config update`). **Never silently drop an old config key** — that's a silent behavior change for users; migrate it.-Every deprecation is one row in the `DEPRECATION_RULES` table: a single idempotent function that rewrites the pattern AND returns the `DeprecationKind`s for what it changed — there is no separate detection function, so detection and migration share one predicate and cannot drift. Detection runs the same functions against a scratch copy of the document (progressively, so a rule sees earlier rules' rewrites); the invariant for warning rules is **a warning fires exactly when `wt config update` would change the file**, pinned by `test_warning_fires_iff_update_changes` — add new edge cases to its battery. The row variant decides when the rewrite applies: `Structural` rewrites on every load; `UpdateOnly` only via `wt config update`, for deprecated forms that still work at runtime; `Silent` rewrites on every load with no warning — its function signature has no channel for a kind, which is what scopes the invariant to `Structural` and `UpdateOnly`; `PendingDefault` adopts a default a future release switches — `wt config update` writes the upcoming value (currently `[list] json-schema = 2`), inert while the system config layer defines the key — update-pass only, scoped to the config kind that owns the key, and excluded from load warnings by `is_pending_default`: it satisfies the same iff at the surface that reads the setting, where the `wt list` JSON nag fires exactly when update would write. Table order is both the warning-emission order and the migration order. Each `DeprecationKind` carries its own display payload, so `format_deprecation_warnings()` is one match over the kinds. A config that can't be rewritten safely (a malformed value, an occupied destination key) is left untouched and unwarned — serde's type or unknown-field error is the messaging; an empty deprecated section is also left alone, with no message at all (it contributes no config). Adding a deprecation: (1) one idempotent migrate-and-report function; (2) a `DeprecationKind` variant plus its match arm in `format_deprecation_warnings()`; (3) a `DEPRECATION_RULES` row; (4) for a removed top-level section, add a `DeprecatedSection` to `DEPRECATED_SECTION_KEYS` (canonical key plus display form) so `warn_unknown_fields` defers to the deprecation messaging and suggests the correct config file. A silently-migrated rename (e.g. `pre-create` → `pre-start`) is a `Silent` row with no variant. Renaming a field within a section follows the same shape via a TOML-level rename function (see `migrate_negated_bool`); the struct never needs the old field since migration precedes serde.+Every deprecation is one row in the `DEPRECATION_RULES` table: a single idempotent function that rewrites the pattern AND returns the `DeprecationKind`s for what it changed — there is no separate detection function, so detection and migration share one predicate and cannot drift. Detection runs the same functions against a scratch copy of the document (progressively, so a rule sees earlier rules' rewrites); the invariant for warning rules is **a warning fires exactly when `wt config update` would change the file**, pinned by `test_warning_fires_iff_update_changes` — add new edge cases to its battery. The row variant decides when the rewrite applies: `Structural` rewrites on every load; `UpdateOnly` only via `wt config update`, for deprecated forms that still work at runtime; `Silent` rewrites on every load with no warning — its function signature has no channel for a kind, which is what scopes the invariant to `Structural` and `UpdateOnly`. Table order is both the warning-emission order and the migration order. Each `DeprecationKind` carries its own display payload, so `format_deprecation_warnings()` is one match over the kinds. A config that can't be rewritten safely (a malformed value, an occupied destination key) is left untouched and unwarned — serde's type or unknown-field error is the messaging; an empty deprecated section is also left alone, with no message at all (it contributes no config). Adding a deprecation: (1) one idempotent migrate-and-report function; (2) a `DeprecationKind` variant plus its match arm in `format_deprecation_warnings()`; (3) a `DEPRECATION_RULES` row; (4) for a removed top-level section, add a `DeprecatedSection` to `DEPRECATED_SECTION_KEYS` (canonical key plus display form) so `warn_unknown_fields` defers to the deprecation messaging and suggests the correct config file. A silently-migrated rename (e.g. `pre-create` → `pre-start`) is a `Silent` row with no variant. Renaming a field within a section follows the same shape via a TOML-level rename function (see `migrate_negated_bool`); the struct never needs the old field since migration precedes serde.**What an update writes must load clean.** A rule that moves a section's table wholesale (`[select]` → `[switch.picker]`) removes the keys its destination struct has no field for and reports each one (`drop_unsupported_keys`); a key removal that empties a `[projects."<id>"]`-scoped section removes the section too. Otherwise the key or the empty section ends up at a path the user never typed, `warn_unknown_fields` names that path on every command, and `wt config update` — the command the deprecation hint points at — writes it into the file rather than clearing it, so the warning outlives every fix available to the user. `test_warning_fires_iff_update_changes` pins both halves: what the update writes raises no deprecation warning and no unknown-field warning. The removal is reported and the key had no home in either config file, so this does not conflict with "never silently drop a key". A key that is merely *misplaced* (valid in the other config, such as a user-only `commit.generation.command` in project config) stays, and keeps its redirect warning; that is why `drop_unsupported_keys` gets the union of the destination's schemas across config types. Those schemas must carry no `#[serde(alias)]`, which `schema_property_names` cannot see.diff --git a/dev/config.example.toml b/dev/config.example.tomlindex b83d81791..94d6e8c09 100644--- a/dev/config.example.toml+++ b/dev/config.example.toml@@ -100,7 +100,7 @@# branches = false # Include branches without worktrees (--branches)# remotes = false # Include remote-only branches (--remotes)#-# json-schema = 2 # JSON output schema: 2 (envelope) or 1 (bare array, the current default); unset emits 1 with a warning+# json-schema = 2 # JSON output schema: 2 (envelope, default) or 1 (bare array)## columns = ["branch", "status", "ci", "path"] # Columns to show, in order — built-ins or custom headers (omit for the default set)#@@ -168,7 +168,8 @@# All standard filters work (`sanitize`, `hash_port`, `codename`, …). A row# where the template renders empty (e.g. a branch without the key) shows an# empty cell; a column that is empty for every row is dropped from the table.-# `wt list --format json` includes the rendered values under `columns`.+# `wt list --format json` includes the rendered values under+# `items[].display.columns` in schema 2, or under `columns` in schema 1.## A `Jira` column reading a key kept in git config, and a `Summary` column# showing just the first line of the git-native branch description:diff --git a/docs/src/content/docs/config.md b/docs/src/content/docs/config.mdindex 5d0413d83..5d63f8c8e 100644--- a/docs/src/content/docs/config.md+++ b/docs/src/content/docs/config.md@@ -192,7 +192,7 @@ full = false # Show CI status and LLM summaries (--full)branches = false # Include branches without worktrees (--branches)remotes = false # Include remote-only branches (--remotes)-json-schema = 2 # JSON output schema: 2 (envelope) or 1 (bare array, the current default); unset emits 1 with a warning+json-schema = 2 # JSON output schema: 2 (envelope, default) or 1 (bare array)columns = ["branch", "status", "ci", "path"] # Columns to show, in order — built-ins or custom headers (omit for the default set)@@ -265,7 +265,8 @@ namespaces:All standard filters work (`sanitize`, `hash_port`, `codename`, …). A rowwhere the template renders empty (e.g. a branch without the key) shows anempty cell; a column that is empty for every row is dropped from the table.-`wt list --format json` includes the rendered values under `columns`.+`wt list --format json` includes the rendered values under+`items[].display.columns` in schema 2, or under `columns` in schema 1.A `Jira` column reading a key kept in git config, and a `Summary` columnshowing just the first line of the git-native branch description:@@ -814,10 +815,8 @@ Global Options: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.+to their current equivalents, removes deprecated keys that have no equivalent,+and reports each one. Shows a diff and asks for confirmation.Migrations are computed in memory on demand; nothing is written outside thiscommand. Set `--output <path>` to write a migrated config to that destinationdiff --git a/docs/src/content/docs/list.md b/docs/src/content/docs/list.mdindex 95a3140ba..9501b49b2 100644--- a/docs/src/content/docs/list.md+++ b/docs/src/content/docs/list.md@@ -230,11 +230,8 @@ These appear across all columns while the table is loading:## JSON output-`--format=json` emits structured data in one of two schemas while the format-migrates: `[list] json-schema = 2` selects the envelope format below, `= 1`-the original bare-array format. Unset emits schema 1 with a warning-(`wt config update` adopts `= 2`); a future release flips the default to-schema 2 and later removes schema 1.+`--format=json` emits schema 2 by default: the envelope format below. Set+`[list] json-schema = 1` to retain the original bare-array format.### Schema 2@@ -480,10 +477,8 @@ optional there rather than required-and-null.### Schema 1-The original bare-array format — one object per row, no envelope — and the-default while `[list] json-schema` is unset. It is on its way out: `wt config-update` adopts `= 2`, a future release flips the default, and a later one-removes schema 1. Its fields all have a schema-2 home:+The original bare-array format — one object per row, no envelope — selected by+`[list] json-schema = 1`. Its fields all have a schema-2 home:| Schema 1 | Schema 2 ||----------|----------|@@ -587,7 +582,7 @@ The line carries the same cells as the worktree's row in `wt list`. A stale CI s### Output formats- `table` (default): `branch status HEAD± main↕ main…± Remote⇅ CI URL`-- `json`: the current [`wt list --format=json`](/list/#json-output) schema — a one-item array under schema 1, the envelope object under schema 2. A prompt consumer can't act on a warning printed over its own line, so this surface stays silent: an unset `[list] json-schema` resolves to schema 1 here without the deprecation notice plain `wt list --format=json` prints.+- `json`: the current [`wt list --format=json`](/list/#json-output) schema — a one-item envelope by default, or a one-item array with `[list] json-schema = 1`- `claude-code`: the `table` cells, preceded by `dir` and followed by `model context pace`A cell with nothing to show is left out rather than blanked, so most lines are shorter than that; `claude-code` also drops `branch` where `dir` already ends in `.<branch>`. A line that still overruns the terminal drops whole cells, least important first, starting with the dev server URL.diff --git a/plugins/worktrunk/skills/worktrunk/reference/config.md b/plugins/worktrunk/skills/worktrunk/reference/config.mdindex 72abed5ef..d8909ba5b 100644--- a/plugins/worktrunk/skills/worktrunk/reference/config.md+++ b/plugins/worktrunk/skills/worktrunk/reference/config.md@@ -186,7 +186,7 @@ full = false # Show CI status and LLM summaries (--full)branches = false # Include branches without worktrees (--branches)remotes = false # Include remote-only branches (--remotes)-json-schema = 2 # JSON output schema: 2 (envelope) or 1 (bare array, the current default); unset emits 1 with a warning+json-schema = 2 # JSON output schema: 2 (envelope, default) or 1 (bare array)columns = ["branch", "status", "ci", "path"] # Columns to show, in order — built-ins or custom headers (omit for the default set)@@ -257,7 +257,8 @@ namespaces:All standard filters work (`sanitize`, `hash_port`, `codename`, …). A rowwhere the template renders empty (e.g. a branch without the key) shows anempty cell; a column that is empty for every row is dropped from the table.-`wt list --format json` includes the rendered values under `columns`.+`wt list --format json` includes the rendered values under+`items[].display.columns` in schema 2, or under `columns` in schema 1.A `Jira` column reading a key kept in git config, and a `Summary` columnshowing just the first line of the git-native branch description:@@ -806,10 +807,8 @@ Global Options: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.+to their current equivalents, removes deprecated keys that have no equivalent,+and reports each one. Shows a diff and asks for confirmation.Migrations are computed in memory on demand; nothing is written outside thiscommand. Set `--output <path>` to write a migrated config to that destinationdiff --git a/plugins/worktrunk/skills/worktrunk/reference/list.md b/plugins/worktrunk/skills/worktrunk/reference/list.mdindex 15c437e74..63dd975ae 100644--- a/plugins/worktrunk/skills/worktrunk/reference/list.md+++ b/plugins/worktrunk/skills/worktrunk/reference/list.md@@ -215,11 +215,8 @@ These appear across all columns while the table is loading:## JSON output-`--format=json` emits structured data in one of two schemas while the format-migrates: `[list] json-schema = 2` selects the envelope format below, `= 1`-the original bare-array format. Unset emits schema 1 with a warning-(`wt config update` adopts `= 2`); a future release flips the default to-schema 2 and later removes schema 1.+`--format=json` emits schema 2 by default: the envelope format below. Set+`[list] json-schema = 1` to retain the original bare-array format.### Schema 2@@ -465,10 +462,8 @@ optional there rather than required-and-null.### Schema 1-The original bare-array format — one object per row, no envelope — and the-default while `[list] json-schema` is unset. It is on its way out: `wt config-update` adopts `= 2`, a future release flips the default, and a later one-removes schema 1. Its fields all have a schema-2 home:+The original bare-array format — one object per row, no envelope — selected by+`[list] json-schema = 1`. Its fields all have a schema-2 home:| Schema 1 | Schema 2 ||----------|----------|@@ -568,7 +563,7 @@ The line carries the same cells as the worktree's row in `wt list`. A stale CI s### Output formats- `table` (default): `branch status HEAD± main↕ main…± Remote⇅ CI URL`-- `json`: the current [`wt list --format=json`](https://worktrunk.dev/list/#json-output) schema — a one-item array under schema 1, the envelope object under schema 2. A prompt consumer can't act on a warning printed over its own line, so this surface stays silent: an unset `[list] json-schema` resolves to schema 1 here without the deprecation notice plain `wt list --format=json` prints.+- `json`: the current [`wt list --format=json`](https://worktrunk.dev/list/#json-output) schema — a one-item envelope by default, or a one-item array with `[list] json-schema = 1`- `claude-code`: the `table` cells, preceded by `dir` and followed by `model context pace`A cell with nothing to show is left out rather than blanked, so most lines are shorter than that; `claude-code` also drops `branch` where `dir` already ends in `.<branch>`. A line that still overruns the terminal drops whole cells, least important first, starting with the dev server URL.diff --git a/skills/worktrunk/reference/config.md b/skills/worktrunk/reference/config.mdindex 72abed5ef..d8909ba5b 100644--- a/skills/worktrunk/reference/config.md+++ b/skills/worktrunk/reference/config.md@@ -186,7 +186,7 @@ full = false # Show CI status and LLM summaries (--full)branches = false # Include branches without worktrees (--branches)remotes = false # Include remote-only branches (--remotes)-json-schema = 2 # JSON output schema: 2 (envelope) or 1 (bare array, the current default); unset emits 1 with a warning+json-schema = 2 # JSON output schema: 2 (envelope, default) or 1 (bare array)columns = ["branch", "status", "ci", "path"] # Columns to show, in order — built-ins or custom headers (omit for the default set)@@ -257,7 +257,8 @@ namespaces:All standard filters work (`sanitize`, `hash_port`, `codename`, …). A rowwhere the template renders empty (e.g. a branch without the key) shows anempty cell; a column that is empty for every row is dropped from the table.-`wt list --format json` includes the rendered values under `columns`.+`wt list --format json` includes the rendered values under+`items[].display.columns` in schema 2, or under `columns` in schema 1.A `Jira` column reading a key kept in git config, and a `Summary` columnshowing just the first line of the git-native branch description:@@ -806,10 +807,8 @@ Global Options: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.+to their current equivalents, removes deprecated keys that have no equivalent,+and reports each one. Shows a diff and asks for confirmation.Migrations are computed in memory on demand; nothing is written outside thiscommand. Set `--output <path>` to write a migrated config to that destinationdiff --git a/skills/worktrunk/reference/list.md b/skills/worktrunk/reference/list.mdindex 15c437e74..63dd975ae 100644--- a/skills/worktrunk/reference/list.md+++ b/skills/worktrunk/reference/list.md@@ -215,11 +215,8 @@ These appear across all columns while the table is loading:## JSON output-`--format=json` emits structured data in one of two schemas while the format-migrates: `[list] json-schema = 2` selects the envelope format below, `= 1`-the original bare-array format. Unset emits schema 1 with a warning-(`wt config update` adopts `= 2`); a future release flips the default to-schema 2 and later removes schema 1.+`--format=json` emits schema 2 by default: the envelope format below. Set+`[list] json-schema = 1` to retain the original bare-array format.### Schema 2@@ -465,10 +462,8 @@ optional there rather than required-and-null.### Schema 1-The original bare-array format — one object per row, no envelope — and the-default while `[list] json-schema` is unset. It is on its way out: `wt config-update` adopts `= 2`, a future release flips the default, and a later one-removes schema 1. Its fields all have a schema-2 home:+The original bare-array format — one object per row, no envelope — selected by+`[list] json-schema = 1`. Its fields all have a schema-2 home:| Schema 1 | Schema 2 ||----------|----------|@@ -568,7 +563,7 @@ The line carries the same cells as the worktree's row in `wt list`. A stale CI s### Output formats- `table` (default): `branch status HEAD± main↕ main…± Remote⇅ CI URL`-- `json`: the current [`wt list --format=json`](https://worktrunk.dev/list/#json-output) schema — a one-item array under schema 1, the envelope object under schema 2. A prompt consumer can't act on a warning printed over its own line, so this surface stays silent: an unset `[list] json-schema` resolves to schema 1 here without the deprecation notice plain `wt list --format=json` prints.+- `json`: the current [`wt list --format=json`](https://worktrunk.dev/list/#json-output) schema — a one-item envelope by default, or a one-item array with `[list] json-schema = 1`- `claude-code`: the `table` cells, preceded by `dir` and followed by `model context pace`A cell with nothing to show is left out rather than blanked, so most lines are shorter than that; `claude-code` also drops `branch` where `dir` already ends in `.<branch>`. A line that still overruns the terminal drops whole cells, least important first, starting with the dev server URL.diff --git a/src/cli/config.rs b/src/cli/config.rsindex ad90ce672..04d935eba 100644--- a/src/cli/config.rs+++ b/src/cli/config.rs@@ -595,10 +595,8 @@ This tests:/// Update deprecated config settings#[command(after_long_help = r#"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.+to their current equivalents, removes deprecated keys that have no equivalent,+and reports each one. Shows a diff and asks for confirmation.Migrations are computed in memory on demand; nothing is written outside thiscommand. Set `--output <path>` to write a migrated config to that destinationdiff --git a/src/cli/list.rs b/src/cli/list.rsindex 6c55bfd2e..cd21d0791 100644--- a/src/cli/list.rs+++ b/src/cli/list.rs@@ -12,7 +12,7 @@ pub enum ListSubcommand {## Output formats- `table` (default): `branch status HEAD± main↕ main…± Remote⇅ CI URL`-- `json`: the current [`wt list --format=json`](/list/#json-output) schema — a one-item array under schema 1, the envelope object under schema 2. A prompt consumer can't act on a warning printed over its own line, so this surface stays silent: an unset `[list] json-schema` resolves to schema 1 here without the deprecation notice plain `wt list --format=json` prints.+- `json`: the current [`wt list --format=json`](/list/#json-output) schema — a one-item envelope by default, or a one-item array with `[list] json-schema = 1`- `claude-code`: the `table` cells, preceded by `dir` and followed by `model context pace`A cell with nothing to show is left out rather than blanked, so most lines are shorter than that; `claude-code` also drops `branch` where `dir` already ends in `.<branch>`. A line that still overruns the terminal drops whole cells, least important first, starting with the dev server URL.diff --git a/src/cli/mod.rs b/src/cli/mod.rsindex 92b4f47f9..604c6f6fa 100644--- a/src/cli/mod.rs+++ b/src/cli/mod.rs@@ -996,11 +996,8 @@ These appear across all columns while the table is loading:## JSON output-`--format=json` emits structured data in one of two schemas while the format-migrates: `[list] json-schema = 2` selects the envelope format below, `= 1`-the original bare-array format. Unset emits schema 1 with a warning-(`wt config update` adopts `= 2`); a future release flips the default to-schema 2 and later removes schema 1.+`--format=json` emits schema 2 by default: the envelope format below. Set+`[list] json-schema = 1` to retain the original bare-array format.### Schema 2@@ -1246,10 +1243,8 @@ optional there rather than required-and-null.### Schema 1-The original bare-array format — one object per row, no envelope — and the-default while `[list] json-schema` is unset. It is on its way out: `wt config-update` adopts `= 2`, a future release flips the default, and a later one-removes schema 1. Its fields all have a schema-2 home:+The original bare-array format — one object per row, no envelope — selected by+`[list] json-schema = 1`. Its fields all have a schema-2 home:| Schema 1 | Schema 2 ||----------|----------|@@ -2136,7 +2131,7 @@ full = false # Show CI status and LLM summaries (--full)branches = false # Include branches without worktrees (--branches)remotes = false # Include remote-only branches (--remotes)-json-schema = 2 # JSON output schema: 2 (envelope) or 1 (bare array, the current default); unset emits 1 with a warning+json-schema = 2 # JSON output schema: 2 (envelope, default) or 1 (bare array)columns = ["branch", "status", "ci", "path"] # Columns to show, in order — built-ins or custom headers (omit for the default set)@@ -2207,7 +2202,8 @@ namespaces:All standard filters work (`sanitize`, `hash_port`, `codename`, …). A rowwhere the template renders empty (e.g. a branch without the key) shows anempty cell; a column that is empty for every row is dropped from the table.-`wt list --format json` includes the rendered values under `columns`.+`wt list --format json` includes the rendered values under+`items[].display.columns` in schema 2, or under `columns` in schema 1.A `Jira` column reading a key kept in git config, and a `Summary` columnshowing just the first line of the git-native branch description:diff --git a/src/commands/config/show.rs b/src/commands/config/show.rsindex e1a6a78a9..c2f2fe4d5 100644--- a/src/commands/config/show.rs+++ b/src/commands/config/show.rs@@ -708,11 +708,8 @@ fn render_user_config(out: &mut String, has_system_config: bool) -> anyhow::Resu// Check for deprecations with emit_inline_warnings=false (silent mode)// User config is global, not tied to any repository- // Deprecated patterns supersede the TOML dump below (their diff covers- // the file); a pending-default pin is additive, so the dump stays. An- // empty file still gets the pending-pin details — `wt config update`- // would rewrite it — just no dump.- let mut details_shown = false;+ // Deprecated patterns supersede the TOML dump below because their diff+ // covers the file.let skip_dump = match worktrunk::config::check_and_migrate(&config_path,&contents,@@ -726,8 +723,7 @@ fn render_user_config(out: &mut String, has_system_config: bool) -> anyhow::Resuout.push_str(&worktrunk::config::format_deprecation_details(&info, &contents,));- details_shown = true;- info.has_deprecated_patterns()+ true} else {false}@@ -755,10 +751,6 @@ fn render_user_config(out: &mut String, has_system_config: bool) -> anyhow::Resu// Display TOML with syntax highlighting (gutter at column 0).// Skip when deprecations were shown — the proposed diff already covers it.if !skip_dump {- if details_shown {- // Pending-pin details above end in their diff; separate phases.- out.push('\n');- }writeln!(out, "{}", format_toml(&contents))?;}@@ -913,12 +905,9 @@ fn render_project_config(out: &mut String) -> anyhow::Result<()> {// Check for deprecations with emit_inline_warnings=false (silent mode)// Only write migration file in main worktree, not linked worktrees.- // Deprecated patterns supersede the TOML dump below (their diff covers- // the file); a pending-default pin would be additive, so the dump stays —- // no pending-default rule targets project config today, but the shape- // mirrors render_user_config so the two stay interchangeable.+ // Deprecated patterns supersede the TOML dump below because their diff+ // covers the file.let is_main_worktree = !repo.current_worktree().is_linked().unwrap_or(true);- let mut details_shown = false;let skip_dump = match worktrunk::config::check_and_migrate(&config_path,&contents,@@ -932,8 +921,7 @@ fn render_project_config(out: &mut String) -> anyhow::Result<()> {out.push_str(&worktrunk::config::format_deprecation_details(&info, &contents,));- details_shown = true;- info.has_deprecated_patterns()+ true} else {false}@@ -956,10 +944,6 @@ fn render_project_config(out: &mut String) -> anyhow::Result<()> {// Display TOML with syntax highlighting (gutter at column 0).// Skip when deprecations were shown — the proposed diff already covers it.if !skip_dump {- if details_shown {- // Pending-pin details above end in their diff; separate phases.- out.push('\n');- }writeln!(out, "{}", format_toml(&contents))?;}diff --git a/src/commands/config/update.rs b/src/commands/config/update.rsindex a2d4c7a23..9a14a09e3 100644--- a/src/commands/config/update.rs+++ b/src/commands/config/update.rs@@ -207,7 +207,7 @@ fn check_user_config() -> anyhow::Result<Option<UpdateCandidate>> {return Ok(None);};- let migrated = compute_migrated_content(&original, ConfigFileKind::User);+ let migrated = compute_migrated_content(&original);Ok(Some(UpdateCandidate {config_path,original,@@ -256,7 +256,7 @@ fn check_project_config(read_only: bool) -> anyhow::Result<Option<UpdateCandidatreturn Ok(None);}- let migrated = compute_migrated_content(&original, ConfigFileKind::Project);+ let migrated = compute_migrated_content(&original);Ok(Some(UpdateCandidate {config_path,original,diff --git a/src/commands/list/json_v2.rs b/src/commands/list/json_v2.rsindex acefa654a..316162f63 100644--- a/src/commands/list/json_v2.rs+++ b/src/commands/list/json_v2.rs@@ -2,8 +2,8 @@//! `wt list statusline --format=json`.//!//! One envelope over per-item orthogonal facts, with presentation-//! quarantined under `display`. Selected by `[list] json-schema = 2`;-//! schema 1 is the bare-array format in [`super::json_output`].+//! quarantined under `display`. This is the default; `[list] json-schema = 1`+//! selects the bare-array format in [`super::json_output`].//!//! A JSON Schema derived from these types is published at//! `https://worktrunk.dev/schema/list-v2.json`, regenerated fromdiff --git a/src/commands/list/mod.rs b/src/commands/list/mod.rsindex 1bf1a6172..e7f351d50 100644--- a/src/commands/list/mod.rs+++ b/src/commands/list/mod.rs@@ -175,8 +175,8 @@ pub fn handle_list(// above the rows instead of between them.repo.warn_if_project_config_unloadable();- // Resolve the JSON schema before collecting, so the unset-nag lands- // above the output rather than after a long collection.+ // Resolve the JSON schema before collecting, so an invalid-value warning+ // lands above the output rather than after a long collection.let json_schema =matches!(render_target, RenderTarget::Json).then(|| resolve_json_schema(&repo));@@ -216,27 +216,16 @@ pub fn handle_list(/// Resolve `[list] json-schema` (per-project resolved config) to 1 or 2.///-/// Unset defaults to schema 1 and nags once per process; an out-of-range-/// value warns and defaults to schema 1, matching how config load treats a+/// Unset defaults to schema 2; an out-of-range value warns and defaults to+/// schema 2, matching how config load treats a/// type error in the same key (warn and degrade, never brick a command).-/// Both messages honor warning suppression — on the statusline, stderr-/// would corrupt the consumer's prompt, and the same user sees the nag on-/// their next interactive run.-///-/// The unset state is the `PendingDefault` row in `DEPRECATION_RULES`, but-/// its warning fires here rather than at config load: the setting only-/// matters to JSON consumers, so a load-time warning would nag every command-/// for every user without the key. `wt config update` writes the upcoming-/// `json-schema = 2` (adopting the new schema is the migration; staying on-/// schema 1 is the deliberate manual edit), so the nag's hint offers that-/// command exactly when running it would write the key — decided by the same-/// detection update runs, so a missing, unreadable, or malformed user config-/// falls back to naming the manual setting instead.+/// The warning honors warning suppression because stderr would corrupt the+/// statusline consumer's prompt.pub(crate) fn resolve_json_schema(repo: &Repository) -> u8 {use std::sync::Once;use color_print::cformat;- use worktrunk::styling::{hint_message, warning_message};+ use worktrunk::styling::warning_message;static WARNED: Once = Once::new();match repo.config().list.json_schema {@@ -249,47 +238,13 @@ pub(crate) fn resolve_json_schema(repo: &Repository) -> u8 {eprintln!("{}",warning_message(cformat!(- "[list] json-schema is <bold>{other}</>, expected 1 or 2; using schema 1"- ))- );- });- 1- }- None => {- WARNED.call_once(|| {- if worktrunk::config::warnings_suppressed() {- return;- }- eprintln!(- "{}",- warning_message(- "JSON output is schema 1; a future release switches the default to schema 2"- )- );- let update_would_adopt = worktrunk::config::config_path()- .and_then(|p| std::fs::read_to_string(p).ok())- .is_some_and(|content| {- worktrunk::config::detect_deprecations(- &content,- worktrunk::config::ConfigFileKind::User,- )- .iter()- .any(|k| matches!(k, worktrunk::config::DeprecationKind::JsonSchemaUnset))- });- let adopt = if update_would_adopt {- cformat!("run <underline>wt config update</>")- } else {- cformat!("set <underline>json-schema = 2</>")- };- eprintln!(- "{}",- hint_message(cformat!(- "To keep this format set <underline>[list] json-schema = 1</>; to adopt the new schema, {adopt}"+ "[list] json-schema is <bold>{other}</>, expected 1 or 2; using schema 2")));});- 1+ 2}+ None => 2,}}diff --git a/src/commands/statusline.rs b/src/commands/statusline.rsindex 235e335b1..7e68bcbcb 100644--- a/src/commands/statusline.rs+++ b/src/commands/statusline.rs@@ -911,9 +911,8 @@ fn current_worktree_item(worktree: &WorkingTree) -> Result<Option<list::model::Lfn run_json() -> Result<()> {let repo = Repository::current().context("Not in a git repository")?;- // Warnings are suppressed on this surface, so an unset (or invalid) key- // resolves to schema 1 silently; the nag reaches the same user on their- // next interactive `wt list --format=json`.+ // Warnings are suppressed on this surface, so an invalid key falls back+ // to the default schema without corrupting the prompt.let json_schema = list::resolve_json_schema(&repo);let options = statusline_options(&repo);diff --git a/src/config/deprecation.rs b/src/config/deprecation.rsindex ecc3ec1ab..6b219a905 100644--- a/src/config/deprecation.rs+++ b/src/config/deprecation.rs@@ -14,13 +14,6 @@//! one predicate and cannot drift. The table order is both the//! warning-emission order and the migration order.//!-//! The table also carries pending default changes-//! ([`DeprecationRule::PendingDefault`]): defaults a future release switches,-//! which `wt config update` adopts early by writing the upcoming value. These-//! share the detection-equals-migration predicate but warn at the surface-//! that reads the setting (the `wt list` JSON nag) instead of at config load,-//! and apply only to the config kind that owns the key.-//!//! Detection is purely in-memory — nothing writes to the filesystem from a//! config load path. `check_and_migrate` returns the structurally migrated//! content (for serde) and a `DeprecationInfo` describing what needs fixing.@@ -52,9 +45,7 @@ use crate::styling::{/// Which config file a deprecation pass is examining.////// Replaces the string labels that used to travel with each check: the kind-/// derives the display label, and kind-scoped rules-/// (`DeprecationRule::PendingDefault`) use it to apply only to the config-/// file that owns their key.+/// derives the display label.#[derive(Debug, Clone, Copy, PartialEq, Eq)]pub enum ConfigFileKind {/// `~/.config/worktrunk/config.toml` — the file `wt config update` rewrites.@@ -95,7 +86,7 @@ pub fn suppress_warnings() {}/// Whether [`suppress_warnings`] latched this process. Consulted by warning-/// emitters outside this module (e.g. the `wt list` JSON schema nag) so+/// emitters outside this module (e.g. the `wt list` invalid-schema warning) so/// suppressed surfaces like the statusline stay clean.pub fn warnings_suppressed() -> bool {SUPPRESS_WARNINGS.get().is_some()@@ -504,23 +495,6 @@ pub enum DeprecationKind {/// `task-timeout-ms` under `[list]` (removed — `[list] timeout-ms` bounds/// the collect phase).ListTaskTimeout,- /// `[list] json-schema` unset while the default is scheduled to switch to- /// schema 2 — `wt config update` writes the upcoming `json-schema = 2`.- /// Warns at the JSON-emitting surface (`resolve_json_schema`), not at- /// config load.- JsonSchemaUnset,-}--impl DeprecationKind {- /// Whether this kind tracks a pending default change rather than a- /// deprecated-pattern rewrite. Pending defaults warn at the surface that reads- /// the setting (the `wt list` JSON nag) instead of at config load — the- /// setting only matters to consumers of that surface — and still render- /// on the pull surfaces (`wt config show`, the `wt config update`- /// preview), where the user asked for details.- fn is_pending_default(&self) -> bool {- matches!(self, Self::JsonSchemaUnset)- }}/// All deprecation patterns detected in a config file, in the order their@@ -559,31 +533,18 @@ enum DeprecationRule {/// Silently-migrated rename: rewritten on every load like `Structural`,/// but with no warning by construction.Silent(SilentMigrateFn),- /// Pending default change: a default that a future release switches, which- /// `wt config update` adopts early by writing the upcoming value. Applies- /// only on the update pass and only to the config kind that owns the key —- /// the load path must leave the document alone (an in-memory value would- /// read as an explicit setting, switching behavior without a config edit- /// and silencing the usage-site nag). Its- /// [`DeprecationKind`] returns true from `is_pending_default`, so the warning- /// fires where the setting is consumed rather than on every config load.- PendingDefault {- kind: ConfigFileKind,- migrate: MigrateFn,- },}/// Which pass rules run under.////// `Load` is the structural rewrite before serde parses — `Structural` and/// `Silent` rows only. `Update` is what `wt config update` materializes —-/// every row, with kind-scoped rows applying only to their config kind.-/// Detection always runs the `Update` pass against a scratch copy, so a-/// rule's detection and migration share one predicate and cannot drift.+/// every row. Detection always runs the `Update` pass against a scratch copy,+/// so a rule's detection and migration share one predicate and cannot drift.#[derive(Clone, Copy, PartialEq, Eq)]enum RulePass {Load,- Update(ConfigFileKind),+ Update,}/// Every deprecation, one row each. The table order is the contract:@@ -617,9 +578,7 @@ enum RulePass {/// [`DeprecationKind`] variant with its `format_deprecation_warnings` arm,/// and a row here (plus a [`DeprecatedSection`] entry for a removed top-level/// section). A silently-migrated rename is just a [`DeprecationRule::Silent`]-/// row. A pending default change is a [`DeprecationRule::PendingDefault`] row-/// whose kind returns true from `is_pending_default` — the surface that reads the-/// setting owns the warning.+/// row.const DEPRECATION_RULES: &[DeprecationRule] = &[// Template variables: {{ repo_root }} → {{ repo_path }} etc., inside any// string value.@@ -666,83 +625,15 @@ const DEPRECATION_RULES: &[DeprecationRule] = &[Vec::new()}}),- // [list] json-schema unset → write json-schema = 2, adopting the default- // ahead of the release that switches it. User config only: the key isn't- // valid in project config, and the top-level write covers every repo- // (per-project overrides in user config remain the user's own choice).- DeprecationRule::PendingDefault {- kind: ConfigFileKind::User,- migrate: adopt_json_schema_doc,- },];-/// Write `[list] json-schema = 2` at the top level when the key is absent —-/// adopting the upcoming default ahead of the release that switches it.-///-/// A `list` slot occupied by a non-table is left alone (serde's type error is-/// the messaging); a present key of any value is the user's explicit choice,-/// including out-of-range values, which already warn at resolve time. When-/// the system config layer defines the key, resolution is already explicit —-/// no nag fires — and a user-file write would *override* that deliberate-/// system-level choice, so the rule stays inert — the one rule that reads a-/// second file (detection stays write-free; the common no-system-config case-/// costs one stat).-fn adopt_json_schema_doc(doc: &mut toml_edit::DocumentMut) -> Deprecations {- if system_config_defines_json_schema() {- return Vec::new();- }- // `or_insert` only fills a vacant slot, so a bail through the fallthrough- // arm (scalar occupant, key already present) leaves the document- // unmodified; an absent `list` becomes the empty table the first arm- // then fills.- match doc- .entry("list")- .or_insert(toml_edit::Item::Table(toml_edit::Table::new()))- {- toml_edit::Item::Table(t) if !t.contains_key("json-schema") => {- t.insert("json-schema", toml_edit::value(2));- }- toml_edit::Item::Value(toml_edit::Value::InlineTable(t))- if !t.contains_key("json-schema") =>- {- t.insert("json-schema", 2.into());- }- _ => return Vec::new(),- }- vec![DeprecationKind::JsonSchemaUnset]-}--/// Whether the system config layer sets `[list] json-schema` (any value, any-/// table shape). Unreadable or unparsable system config counts as not-/// defining it.-fn system_config_defines_json_schema() -> bool {- let Some(path) = crate::config::system_config_path() else {- return false;- };- let Ok(content) = std::fs::read_to_string(path) else {- return false;- };- let Ok(doc) = content.parse::<toml_edit::DocumentMut>() else {- return false;- };- match doc.get("list") {- Some(toml_edit::Item::Table(t)) => t.contains_key("json-schema"),- Some(toml_edit::Item::Value(toml_edit::Value::InlineTable(t))) => {- t.contains_key("json-schema")- }- _ => false,- }-}--/// Detect deprecations in config content. Pure function, no I/O.-///-/// Returns the detected deprecation patterns. This is the recommended entry-/// point for deprecation detection.-pub fn detect_deprecations(content: &str, kind: ConfigFileKind) -> Deprecations {+/// Test helper: detect deprecations in config content without I/O.+#[cfg(test)]+fn detect_deprecations(content: &str) -> Deprecations {let Ok(doc) = content.parse::<toml_edit::DocumentMut>() else {return Vec::new();};- detect_deprecations_from_doc(&doc, kind)+ detect_deprecations_from_doc(&doc)}/// Detect deprecations from an already-parsed document.@@ -751,13 +642,10 @@ pub fn detect_deprecations(content: &str, kind: ConfigFileKind) -> Deprecations/// a warning fires exactly when `wt config update` would change the file./// Pushes kinds in [`DEPRECATION_RULES`] order — the warning-emission order —/// so iterating the returned `Vec` reproduces the warning text byte-for-byte.-fn detect_deprecations_from_doc(- doc: &toml_edit::DocumentMut,- kind: ConfigFileKind,-) -> Deprecations {+fn detect_deprecations_from_doc(doc: &toml_edit::DocumentMut) -> Deprecations {let mut scratch = doc.clone();let mut kinds = Vec::new();- apply_rules(&mut scratch, RulePass::Update(kind), &mut kinds);+ apply_rules(&mut scratch, RulePass::Update, &mut kinds);kinds}@@ -765,9 +653,7 @@ fn detect_deprecations_from_doc(/// kinds to `kinds` and returning whether the document changed.////// The load pass excludes [`DeprecationRule::UpdateOnly`] rewrites (cosmetic-/// or still-valid serde fields, so serde doesn't need them applied) and-/// [`DeprecationRule::PendingDefault`] writes (an in-memory value would-/// switch behavior without a config edit and silence the usage-site nag).+/// or still-valid serde fields, so serde doesn't need them applied)./// Detection and [`compute_migrated_content`] run the update pass.fn apply_rules(doc: &mut toml_edit::DocumentMut, pass: RulePass, kinds: &mut Deprecations) -> bool {let mut modified = false;@@ -779,20 +665,13 @@ fn apply_rules(doc: &mut toml_edit::DocumentMut, pass: RulePass, kinds: &mut Depkinds.extend(new_kinds);}DeprecationRule::UpdateOnly(migrate) => {- if matches!(pass, RulePass::Update(_)) {+ if matches!(pass, RulePass::Update) {let new_kinds = migrate(doc);modified |= !new_kinds.is_empty();kinds.extend(new_kinds);}}DeprecationRule::Silent(migrate) => modified |= migrate(doc),- DeprecationRule::PendingDefault { kind, migrate } => {- if pass == RulePass::Update(*kind) {- let new_kinds = migrate(doc);- modified |= !new_kinds.is_empty();- kinds.extend(new_kinds);- }- }}}modified@@ -1537,15 +1416,14 @@ pub struct DeprecationInfo {pub config_path: PathBuf,/// All detected deprecationspub deprecations: Deprecations,- /// Which config file this is; derives the display label and scopes- /// [`compute_migrated_content`] to the rules that apply to it.+ /// Which config file this is; derives the display label.pub kind: ConfigFileKind,/// Main worktree path when viewing from a linked worktree (for `-C` in hints)pub main_worktree_path: Option<PathBuf>,}impl DeprecationInfo {- /// Returns true if any deprecations were found+ /// Returns true if any deprecations were found.pub fn has_deprecations(&self) -> bool {!self.deprecations.is_empty()}@@ -1554,14 +1432,6 @@ impl DeprecationInfo {pub fn label(&self) -> &'static str {self.kind.label()}-- /// True when the file contains deprecated patterns, as opposed to only- /// pending-default writes, which deprecate nothing in the file. `wt config- /// show` dumps the config only when this is false: a deprecation diff- /// supersedes the dump, while a pending-default write is additive.- pub fn has_deprecated_patterns(&self) -> bool {- self.deprecations.iter().any(|k| !k.is_pending_default())- }}/// Result of checking config content for deprecations.@@ -1592,8 +1462,7 @@ pub struct CheckAndMigrateResult {/// 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`).+/// `kind` names the config file being checked and derives the warning label.////// `repo` is used to resolve the primary worktree path for the "run this from/// the main worktree" hint when viewing project config from a linked worktree.@@ -1620,7 +1489,7 @@ pub fn check_and_migrate(// `info` is `Some`) can assume the content parses.let (deprecations, migrated_content) = match content.parse::<toml_edit::DocumentMut>() {Ok(doc) => {- let deprecations = detect_deprecations_from_doc(&doc, kind);+ let deprecations = detect_deprecations_from_doc(&doc);let migrated_content = migrate_content_from_doc(content, doc);(deprecations, migrated_content)}@@ -1654,18 +1523,6 @@ pub fn check_and_migrate(});}- // Pending-default kinds warn at their own usage surface instead of at- // load, so an info carrying only those (most user configs until the- // json-schema default flips) skips the dedup registry and emission- // entirely — no canonicalize + lock on every load for a config with- // nothing to say here.- if !info.has_deprecated_patterns() {- return Ok(CheckAndMigrateResult {- info: Some(info),- migrated_content,- });- }-// Deduplicate warnings per path per processlet canonical_path = path.canonicalize().unwrap_or_else(|_| path.to_path_buf());{@@ -1683,13 +1540,9 @@ pub fn check_and_migrate(// For non-config-show commands, emit per-kind warnings but skip the diff.// The diff is reserved for `wt config show`, where the user has opted into- // details. Pending-default kinds still ride along in a mixed info, so- // they are filtered out of the emitted lines here.+ // details.if emit_inline_warnings && !warnings_suppressed() {- let warnings = format_warning_lines(- info.deprecations.iter().filter(|k| !k.is_pending_default()),- info.label(),- );+ let warnings = format_warning_lines(info.deprecations.iter(), info.label());eprint!("{warnings}");if DEPRECATION_HINT_EMITTED.set(()).is_ok() {eprintln!(@@ -1718,14 +1571,14 @@ pub fn check_and_migrate(/// Pure function — no filesystem access. Idempotent: feeding its own output/// back in is a no-op. Callers materialize the result via `wt config update`/// or display it via `wt config show`.-pub fn compute_migrated_content(content: &str, kind: ConfigFileKind) -> String {+pub fn compute_migrated_content(content: &str) -> String {// Callers (`wt config show`, `wt config update`, `format_deprecation_details`)// all run content through `check_and_migrate` first, so it is known to parse.let mut doc = content.parse::<toml_edit::DocumentMut>().expect("compute_migrated_content called with content that failed TOML parse; callers must funnel through check_and_migrate first");- if apply_rules(&mut doc, RulePass::Update(kind), &mut Vec::new()) {+ if apply_rules(&mut doc, RulePass::Update, &mut Vec::new()) {doc.to_string()} else {content.to_string()@@ -1888,15 +1741,6 @@ fn format_warning_lines<'a>()));}- DeprecationKind::JsonSchemaUnset => {- let _ = writeln!(- out,- "{}",- warning_message(cformat!(- "{label}: <bold>[list] json-schema</> is unset; a future release switches the JSON default to schema 2"- ))- );- }}}@@ -1934,7 +1778,7 @@ pub fn format_deprecation_details(info: &DeprecationInfo, original_content: &strhint_message(cformat!("To apply: <underline>wt config update</>")));- let migrated = compute_migrated_content(original_content, info.kind);+ let migrated = compute_migrated_content(original_content);let label = info.config_path.file_name()@@ -2213,7 +2057,7 @@ mod tests {}fn find_deprecated_vars(content: &str) -> Vec<(&'static str, &'static str)> {- detect_deprecations(content, ConfigFileKind::User)+ detect_deprecations(content).into_iter().filter_map(|k| match k {DeprecationKind::TemplateVar { old, new } => Some((old, new)),@@ -2230,7 +2074,7 @@ mod tests {}fn find_commit_generation_deprecations(content: &str) -> ScopedSections {- detect_deprecations(content, ConfigFileKind::User)+ detect_deprecations(content).into_iter().find_map(|k| match k {DeprecationKind::CommitGeneration(found) => Some(found),@@ -2240,13 +2084,13 @@ mod tests {}fn find_approved_commands_deprecation(content: &str) -> bool {- has_kind(&detect_deprecations(content, ConfigFileKind::User), |k| {+ has_kind(&detect_deprecations(content), |k| {matches!(k, DeprecationKind::ApprovedCommands)})}fn find_select_deprecation(content: &str) -> bool {- has_kind(&detect_deprecations(content, ConfigFileKind::User), |k| {+ has_kind(&detect_deprecations(content), |k| {matches!(k, DeprecationKind::Select(_))})}@@ -2392,7 +2236,7 @@ post-start = "cd {{ worktree_path }} && npm install"#[test]fn test_compute_migrated_content_escaped_quotes() {let content = "pre-start = \"echo \\\"{{ repo_root }}\\\"\"\n";- let migrated = compute_migrated_content(content, ConfigFileKind::User);+ let migrated = compute_migrated_content(content);assert!(!migrated.contains("repo_root"),"compute_migrated_content must migrate vars inside escaped strings; got: {migrated}"@@ -2489,25 +2333,20 @@ timeout = 30/// Canonical config with no deprecations must round-trip through/// `compute_migrated_content` byte-for-byte (the unmodified branch).- /// Canonical includes an explicit json-schema value — without one the- /// pending-default row writes it.#[test]fn test_compute_migrated_content_noop_returns_input_unchanged() {- let content = "pre-start = \"echo {{ repo_path }}\"\n\n[list]\njson-schema = 1\n";- assert_eq!(- compute_migrated_content(content, ConfigFileKind::User),- content- );+ let content = "pre-start = \"echo {{ repo_path }}\"\n";+ assert_eq!(compute_migrated_content(content), content);}#[test]fn test_compute_migrated_content_does_not_rewrite_literal_text_when_other_template_uses_deprecated_var(){- let content = "pre-merge = \"echo repo_root\"\npost-merge = \"echo {{ repo_root }}\"\nlist = { json-schema = 1 }\n";- let migrated = compute_migrated_content(content, ConfigFileKind::User);+ let content = "pre-merge = \"echo repo_root\"\npost-merge = \"echo {{ repo_root }}\"\n";+ let migrated = compute_migrated_content(content);assert_eq!(migrated,- "pre-merge = \"echo repo_root\"\npost-merge = \"echo {{ repo_path }}\"\nlist = { json-schema = 1 }\n"+ "pre-merge = \"echo repo_root\"\npost-merge = \"echo {{ repo_path }}\"\n");}@@ -3106,7 +2945,7 @@ template = "some template"template = "some template""#);assert!(has_kind(- &detect_deprecations(content, ConfigFileKind::User),+ &detect_deprecations(content),|k| matches!(k, DeprecationKind::UnsupportedKey { section, key }if section == "[commit-generation]" && key == "args")));@@ -3355,7 +3194,7 @@ args = [1, "--ok"]command = "echo""#);assert!(has_kind(- &detect_deprecations(content, ConfigFileKind::User),+ &detect_deprecations(content),|k| matches!(k, DeprecationKind::UnsupportedKey { section, key }if section == "[commit-generation]" && key == "args")));@@ -3425,19 +3264,16 @@ platform = "github"json-schema = 1"#;assert_eq!(migrate_content(content), content);- assert!(detect_deprecations(content, ConfigFileKind::User).is_empty());+ assert!(detect_deprecations(content).is_empty());}/// The framework invariant: a warning fires exactly when `wt config/// update` would change the file. Degenerate configs that can't be safely/// rewritten produce no warning and no rewrite; deprecated configs/// produce both, and what the update writes is schema-clean — a rewritten- /// file must not warn about a key the user never typed. (Silent renames+ /// file must not warn about a key the user never typed. Silent renames/// change the file without warning by design and aren't part of this- /// battery. Every case gets an explicit json-schema value appended so only- /// the rule under test drives the diff; the pending-default row satisfies- /// the same invariant with its warning at the JSON-emitting surface — see- /// `test_json_schema_adopt_iff`.)+ /// battery.#[test]fn test_warning_fires_iff_update_changes() {let untouched = [@@ -3468,13 +3304,12 @@ json-schema = 1"[projects.\"github.com/u/r\"]\napproved-commands = []\n",];for content in untouched {- let content = &format!("{content}\n[list]\njson-schema = 1\n");assert!(- detect_deprecations(content, ConfigFileKind::User).is_empty(),+ detect_deprecations(content).is_empty(),"no warning expected for:\n{content}");assert_eq!(- &compute_migrated_content(content, ConfigFileKind::User),+ compute_migrated_content(content),content,"no rewrite expected for:\n{content}");@@ -3497,25 +3332,23 @@ json-schema = 1"[projects.\"github.com/u/r\".select]\nheight = \"50%\"\n",// an `args` that can't be merged into `command` has nowhere to go"[commit-generation]\nargs = [\"-m\", \"haiku\"]\n",- // list.task-timeout-ms, section and inline forms (project-scoped so- // the appended `[list]` below isn't a duplicate table)+ // list.task-timeout-ms, section and inline forms"[projects.\"github.com/u/r\".list]\ntask-timeout-ms = 500\n","[projects.\"github.com/u/r\"]\nlist = { task-timeout-ms = 500 }\n","worktree-path = \"../{{ repo_root }}.{{ branch }}\"\n","[projects.\"github.com/u/r\"]\napproved-commands = [\"npm test\"]\n",];for content in rewritten {- let content = &format!("{content}\n[list]\njson-schema = 1\n");assert!(- !detect_deprecations(content, ConfigFileKind::User).is_empty(),+ !detect_deprecations(content).is_empty(),"warning expected for:\n{content}");- let migrated = compute_migrated_content(content, ConfigFileKind::User);+ let migrated = compute_migrated_content(content);assert_ne!(&migrated, content, "rewrite expected for:\n{content}");// The user-visible loop closes: applying the update silences the// warning.assert!(- detect_deprecations(&migrated, ConfigFileKind::User).is_empty(),+ detect_deprecations(&migrated).is_empty(),"no warning expected after update for:\n{migrated}");// …and closes it for the *other* warning channel too: the update@@ -3541,120 +3374,13 @@ json-schema = 1}}- /// The pending-default row's own iff: the unset nag (fired by- /// `resolve_json_schema`, not at config load) corresponds exactly to- /// `wt config update` writing the key.- #[test]- fn test_json_schema_adopt_iff() {- // Unset → detected and adopted, and applying the update closes the loop.- let migrated = compute_migrated_content("", ConfigFileKind::User);- insta::assert_snapshot!(migrated, @r#"- [list]- json-schema = 2- "#);- assert!(matches!(- detect_deprecations("", ConfigFileKind::User).as_slice(),- [DeprecationKind::JsonSchemaUnset]- ));- assert!(detect_deprecations(&migrated, ConfigFileKind::User).is_empty());-- // Any present value is the user's explicit choice — including- // out-of-range ones, which warn at resolve time instead.- let untouched = [- "[list]\njson-schema = 1\n",- "[list]\njson-schema = 2\n",- "[list]\njson-schema = 42\n",- "list = { json-schema = 2 }\n",- // a non-table `list` is left for serde's type error- "list = 5\n",- ];- for content in untouched {- assert!(- detect_deprecations(content, ConfigFileKind::User).is_empty(),- "no detection expected for:\n{content}"- );- assert_eq!(- compute_migrated_content(content, ConfigFileKind::User),- content,- "no rewrite expected for:\n{content}"- );- }- }-- /// The adopted key lands inside an existing `[list]` section (either- /// shape) rather than duplicating it.- #[test]- fn test_json_schema_adopt_joins_existing_list_section() {- let migrated =- compute_migrated_content("[list]\ncolumns = [\"ci\"]\n", ConfigFileKind::User);- insta::assert_snapshot!(migrated, @r#"- [list]- columns = ["ci"]- json-schema = 2- "#);-- let migrated =- compute_migrated_content("list = { columns = [\"ci\"] }\n", ConfigFileKind::User);- insta::assert_snapshot!(migrated, @r#"list = { columns = ["ci"] , json-schema = 2 }"#);-- // A `list` that exists only implicitly (via a subtable) hosts the key- // too; toml_edit renders the now-explicit [list] header ahead of the- // subtable.- let migrated = compute_migrated_content(- "[list.custom-columns]\nflag = \"echo hi\"\n",- ConfigFileKind::User,- );- insta::assert_snapshot!(migrated, @r#"- [list]- json-schema = 2- [list.custom-columns]- flag = "echo hi"- "#);- }-- /// Every `PendingDefault` row's kinds must return true from- /// `is_pending_default` — that flag is what keeps their warning off the- /// load surface and out of `has_deprecated_patterns`. A row emitting a- /// non-pending kind would leak a load warning and suppress the- /// `wt config show` dump.- #[test]- fn test_pending_default_rules_emit_pending_kinds() {- for rule in DEPRECATION_RULES {- if let DeprecationRule::PendingDefault { migrate, .. } = rule {- let mut doc = toml_edit::DocumentMut::new();- let kinds = migrate(&mut doc);- assert!(!kinds.is_empty(), "pending rule inert on an empty doc");- for kind in kinds {- assert!(kind.is_pending_default(), "{kind:?}");- }- }- }- }-- /// The write is scoped to user config — project config doesn't own the- /// key, and the system layer isn't rewritten by `wt config update` — and- /// to the update pass: an in-memory value at load would read as an- /// explicit setting, switching behavior without a config edit and- /// silencing the usage-site nag.- #[test]- fn test_json_schema_adopt_scope() {- for kind in [ConfigFileKind::System, ConfigFileKind::Project] {- assert!(detect_deprecations("", kind).is_empty());- assert_eq!(compute_migrated_content("", kind), "");- }- assert_eq!(migrate_content(""), "");- }-/// A retired `timeout-ms` key under `[select]` is removed instead of/// being carried into `[switch.picker]`, and reported after the section/// rename: the rename lines first, then one line per unsupported key.#[test]fn test_select_timeout_ms_removed_alongside_rename() {let content = "[select]\npager = \"delta\"\ntimeout-ms = 500\n";- let deprecations: Vec<_> = detect_deprecations(content, ConfigFileKind::User)- .into_iter()- .filter(|kind| !kind.is_pending_default())- .collect();+ let deprecations = detect_deprecations(content);assert!(matches!(deprecations.as_slice(),[@@ -3677,10 +3403,7 @@ json-schema = 1#[test]fn test_select_with_only_unsupported_keys_leaves_no_section() {let content = "[select]\nheight = \"50%\"\n";- let deprecations: Vec<_> = detect_deprecations(content, ConfigFileKind::User)- .into_iter()- .filter(|kind| !kind.is_pending_default())- .collect();+ let deprecations = detect_deprecations(content);assert!(matches!(deprecations.as_slice(),[DeprecationKind::UnsupportedKey { section, key }]@@ -3697,11 +3420,7 @@ json-schema = 1config_path: std::path::PathBuf::from("/tmp/test-config.toml"),deprecations: detect_deprecations("[projects.\"github.com/u/r\".select]\npager = \"delta\"\nheight = \"50%\"\n",- ConfigFileKind::User,- )- .into_iter()- .filter(|kind| !kind.is_pending_default())- .collect(),+ ),kind: ConfigFileKind::User,main_worktree_path: None,};@@ -3720,11 +3439,11 @@ json-schema = 1fn test_project_config_keeps_misplaced_user_only_keys() {let content = "[commit-generation]\ncommand = \"llm\"\nbogus = 1\n";assert!(has_kind(- &detect_deprecations(content, ConfigFileKind::Project),+ &detect_deprecations(content),|k| matches!(k, DeprecationKind::UnsupportedKey { section, key }if section == "[commit-generation]" && key == "bogus")));- let migrated = compute_migrated_content(content, ConfigFileKind::Project);+ let migrated = compute_migrated_content(content);insta::assert_snapshot!(migrated, @r#"[commit.generation]command = "llm"@@ -3974,7 +3693,7 @@ approved-commands = ["npm install"][projects."github.com/user/repo"]approved-commands = ["npm install"]"#;- let deprecations = detect_deprecations(content, ConfigFileKind::User);+ let deprecations = detect_deprecations(content);assert!(has_kind(&deprecations, |k| matches!(k,DeprecationKind::ApprovedCommands@@ -4021,7 +3740,7 @@ approved-commands = ["npm install"][projects."github.com/user/repo"]approved-commands = ["npm install"]"#;- let migrated = compute_migrated_content(content, ConfigFileKind::User);+ let migrated = compute_migrated_content(content);assert!(!migrated.contains("approved-commands"));}@@ -4361,7 +4080,7 @@ full = true[select]pager = "delta""#;- let deprecations = detect_deprecations(content, ConfigFileKind::User);+ let deprecations = detect_deprecations(content);assert!(has_kind(&deprecations, |k| matches!(k,DeprecationKind::Select(_)@@ -4415,7 +4134,7 @@ pager = "delta --paging=never"[select]pager = "delta --paging=never""#;- let migrated = compute_migrated_content(content, ConfigFileKind::User);+ let migrated = compute_migrated_content(content);assert!(migrated.contains("[switch.picker]"),"Migrated content should have [switch.picker]: {migrated}"@@ -4500,7 +4219,7 @@ server = "npm run dev"[list]json-schema = 1"#;- let migrated = compute_migrated_content(content, ConfigFileKind::User);+ let migrated = compute_migrated_content(content);insta::assert_snapshot!(migration_diff(content, &migrated));}@@ -4514,11 +4233,8 @@ timeout-ms = 500[list]json-schema = 1"#;- assert!(detect_deprecations(content, ConfigFileKind::User).is_empty());- assert_eq!(- compute_migrated_content(content, ConfigFileKind::User),- content- );+ assert!(detect_deprecations(content).is_empty());+ assert_eq!(compute_migrated_content(content), content);}#[test]@@ -4528,7 +4244,7 @@ json-schema = 1branches = truetask-timeout-ms = 500"#;- let deprecations = detect_deprecations(content, ConfigFileKind::User);+ let deprecations = detect_deprecations(content);assert!(has_kind(&deprecations, |k| matches!(k,DeprecationKind::ListTaskTimeout@@ -4541,7 +4257,7 @@ task-timeout-ms = 500[projects."github.com/user/repo".list]task-timeout-ms = 300"#;- let deprecations = detect_deprecations(content, ConfigFileKind::User);+ let deprecations = detect_deprecations(content);assert!(has_kind(&deprecations, |k| matches!(k,DeprecationKind::ListTaskTimeout@@ -4554,7 +4270,7 @@ task-timeout-ms = 300[list]timeout-ms = 500"#;- let deprecations = detect_deprecations(content, ConfigFileKind::User);+ let deprecations = detect_deprecations(content);assert!(!has_kind(&deprecations, |k| matches!(k,DeprecationKind::ListTaskTimeout@@ -4632,7 +4348,6 @@ timeout-ms = 500DeprecationKind::NoFf,DeprecationKind::NoCd,DeprecationKind::ListTaskTimeout,- DeprecationKind::JsonSchemaUnset,],kind: ConfigFileKind::User,main_worktree_path: None,@@ -4649,13 +4364,12 @@ timeout-ms = 500▲ User config: merge.no-ff is deprecated in favor of merge.ff (inverted)▲ User config: switch.no-cd is deprecated in favor of switch.cd (inverted)▲ User config: list.task-timeout-ms is no longer used — list.timeout-ms bounds the collect phase- ▲ User config: [list] json-schema is unset; a future release switches the JSON default to schema 2"#);}#[test]fn test_detect_no_ff_deprecation() {- let deprecations = detect_deprecations("[merge]\nno-ff = true\n", ConfigFileKind::User);+ let deprecations = detect_deprecations("[merge]\nno-ff = true\n");assert!(has_kind(&deprecations, |k| matches!(k,DeprecationKind::NoFf@@ -4669,7 +4383,7 @@ timeout-ms = 500#[test]fn test_no_ff_warned_and_removed_when_ff_exists() {let content = "[merge]\nff = true\nno-ff = true\n";- let deprecations = detect_deprecations(content, ConfigFileKind::User);+ let deprecations = detect_deprecations(content);assert!(has_kind(&deprecations, |k| matches!(k,DeprecationKind::NoFf@@ -4682,7 +4396,7 @@ timeout-ms = 500#[test]fn test_detect_no_cd_deprecation() {- let deprecations = detect_deprecations("[switch]\nno-cd = true\n", ConfigFileKind::User);+ let deprecations = detect_deprecations("[switch]\nno-cd = true\n");assert!(has_kind(&deprecations, |k| matches!(k,DeprecationKind::NoCd@@ -4695,7 +4409,7 @@ timeout-ms = 500[projects."github.com/user/repo".merge]no-ff = true"#;- let deprecations = detect_deprecations(content, ConfigFileKind::User);+ let deprecations = detect_deprecations(content);assert!(has_kind(&deprecations, |k| matches!(k,DeprecationKind::NoFf@@ -4767,7 +4481,7 @@ no-ff = true[projects."github.com/user/repo".select]pager = "bat""#;- let deprecations = detect_deprecations(content, ConfigFileKind::User);+ let deprecations = detect_deprecations(content);assert!(has_kind(&deprecations, |k| matches!(k,DeprecationKind::Select(_)@@ -5012,16 +4726,16 @@ server = "npm run dev"[projects."github.com/user/repo"]approved-commands = ["npm test"]"#;- let migrated = compute_migrated_content(content, ConfigFileKind::User);+ let migrated = compute_migrated_content(content);assert_eq!(- compute_migrated_content(&migrated, ConfigFileKind::User),+ compute_migrated_content(&migrated),migrated,"migration must be idempotent");+ let remaining = detect_deprecations(&migrated);assert!(- detect_deprecations(&migrated, ConfigFileKind::User).is_empty(),- "applying the update must silence every warning; got {:?}",- detect_deprecations(&migrated, ConfigFileKind::User)+ remaining.is_empty(),+ "applying the update must silence every warning; got {remaining:?}");insta::assert_snapshot!(migration_diff(content, &migrated));}diff --git a/src/config/mod.rs b/src/config/mod.rsindex 85993fe9f..7d8079e3a 100644--- a/src/config/mod.rs+++ b/src/config/mod.rs@@ -164,7 +164,6 @@ pub use deprecation::DeprecationInfo;pub use deprecation::check_and_migrate;pub use deprecation::compute_migrated_content;pub use deprecation::copy_approved_commands_to_approvals_file;-pub use deprecation::detect_deprecations;pub use deprecation::format_deprecation_details;pub use deprecation::format_deprecation_warnings;pub use deprecation::format_migration_diff;diff --git a/src/config/snapshots/worktrunk__config__deprecation__tests__snapshot_migrate_all_rules_combined.snap b/src/config/snapshots/worktrunk__config__deprecation__tests__snapshot_migrate_all_rules_combined.snapindex 8d84b9445..ed016bd78 100644--- a/src/config/snapshots/worktrunk__config__deprecation__tests__snapshot_migrate_all_rules_combined.snap+++ b/src/config/snapshots/worktrunk__config__deprecation__tests__snapshot_migrate_all_rules_combined.snap@@ -18,9 +18,6 @@ expression: "migration_diff(content, &migrated)"platform = "github"-[select]-+[list]-+json-schema = 2-++[switch.picker]pager = "delta"-timeout-ms = 500diff --git a/src/config/user/path.rs b/src/config/user/path.rsindex bcc91fecc..6bdbdb3c6 100644--- a/src/config/user/path.rs+++ b/src/config/user/path.rs@@ -143,9 +143,7 @@ pub fn system_config_path() -> Option<PathBuf> {//// Deliberately unguarded, unlike `config_path()`: this resolves a// machine-wide file (`/etc/xdg`, `/Library/Application Support`) rather than- // the developer's own config, and `config::deprecation`'s `PendingDefault`- // rules genuinely need the lookup to decide whether the system layer already- // defines a key.+ // the developer's own config.for dir in &system_config_dirs() {let path = dir.join("worktrunk").join("config.toml");if path.exists() {diff --git a/src/config/user/sections.rs b/src/config/user/sections.rsindex 9a2c189d3..93561287e 100644--- a/src/config/user/sections.rs+++ b/src/config/user/sections.rs@@ -165,7 +165,7 @@ pub struct ListConfig {/// JSON output schema for `wt list --format=json` (1 or 2)./// Schema 2 wraps items in an envelope of per-item facts (see the- /// `wt list` JSON docs). Unset emits schema 1 with a warning.+ /// `wt list` JSON docs) and is the default.#[serde(rename = "json-schema", skip_serializing_if = "Option::is_none")]pub json_schema: Option<u8>,diff --git a/tests/CLAUDE.md b/tests/CLAUDE.mdindex ba7710bd6..d3a7866cd 100644--- a/tests/CLAUDE.md+++ b/tests/CLAUDE.md@@ -270,9 +270,8 @@ that forbids it. Nothing exercises that today — no bin-crate test creates aconfig under a scratch `$HOME` — so it's a live requirement on new tests, not aknown leak.-`system_config_path()` is deliberately unguarded: it resolves a machine-wide-file rather than the developer's own, and `config::deprecation`'s-`PendingDefault` rules need the lookup.+`system_config_path()` is deliberately unguarded because it resolves a+machine-wide file rather than the developer's own.## Timing Tests: Polling and Absence Windowsdiff --git a/tests/integration_tests/ci_status.rs b/tests/integration_tests/ci_status.rsindex 5e010e105..99e9713ea 100644--- a/tests/integration_tests/ci_status.rs+++ b/tests/integration_tests/ci_status.rs@@ -141,6 +141,7 @@ fn test_list_full_with_github_pr_conflicts(mut repo: TestRepo) {#[rstest]fn test_list_full_json_ci_repo_from_pr_url(mut repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");let head_sha = setup_github_repo_with_feature(&mut repo);let pr_json = format!(@@ -193,6 +194,7 @@ fn test_list_full_json_ci_repo_from_pr_url(mut repo: TestRepo) {#[rstest]fn test_list_full_json_ci_repo_uses_configured_provider_for_opaque_host(mut repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");repo.run_git(&["remote","set-url",diff --git a/tests/integration_tests/config_show.rs b/tests/integration_tests/config_show.rsindex 1a0575284..7b03d4ed2 100644--- a/tests/integration_tests/config_show.rs+++ b/tests/integration_tests/config_show.rs@@ -472,7 +472,7 @@ fn test_system_config_found_via_xdg_config_dirs(repo: TestRepo) {let stdout = String::from_utf8_lossy(&output.stdout);let json: serde_json::Value = serde_json::from_str(&stdout).unwrap();- let worktrees = json.as_array().unwrap();+ let worktrees = json["items"].as_array().unwrap();for wt in worktrees {if wt["is_primary"].as_bool() == Some(false) {@@ -505,7 +505,7 @@ fn test_system_config_xdg_dirs_set_but_no_config_found(repo: TestRepo) {// Without system config, worktree paths should use the default templatelet stdout = String::from_utf8_lossy(&output.stdout);let json: serde_json::Value = serde_json::from_str(&stdout).unwrap();- let worktrees = json.as_array().unwrap();+ let worktrees = json["items"].as_array().unwrap();for wt in worktrees {if wt["is_primary"].as_bool() == Some(false) {@@ -3762,11 +3762,10 @@ json-schema = 1);}-/// `wt config update` writes `[list] json-schema = 2` when the key is unset,-/// adopting the upcoming default, and a second run has nothing left to do —-/// the pending-default loop closes.+/// `wt config update` leaves `[list] json-schema` unset now that schema 2 is+/// the default.#[rstest]-fn test_config_update_adopts_json_schema(repo: TestRepo) {+fn test_config_update_leaves_json_schema_unset(repo: TestRepo) {fs::write(repo.test_config_path(),"worktree-path = \"../{{ repo }}.{{ branch }}\"\n",@@ -3783,36 +3782,18 @@ fn test_config_update_adopts_json_schema(repo: TestRepo) {assert_eq!(fs::read_to_string(repo.test_config_path()).unwrap(),- "worktree-path = \"../{{ repo }}.{{ branch }}\"\n\n[list]\njson-schema = 2\n"- );-- let output = repo- .wt_command()- .args(["config", "update", "--yes"])- .output()- .unwrap();- assert!(- String::from_utf8_lossy(&output.stderr).contains("No deprecated settings found"),- "second run should have nothing to update"+ "worktree-path = \"../{{ repo }}.{{ branch }}\"\n");}-/// A system config that sets `[list] json-schema` makes the resolved value-/// explicit, so `wt config update` must not write the user file — a user-file-/// value would override the deliberate system-level choice.+/// Updating another deprecated setting does not materialize the default JSON+/// schema in the user config.#[rstest]-fn test_config_update_json_schema_adopt_defers_to_system_config(repo: TestRepo) {- let system_config_dir = tempfile::tempdir().unwrap();- let system_config_path = system_config_dir.path().join("config.toml");- fs::write(&system_config_path, "[list]\njson-schema = 1\n").unwrap();-- // A user config with an unrelated deprecation: update applies that- // rewrite but must not insert json-schema alongside it.+fn test_config_update_does_not_materialize_json_schema(repo: TestRepo) {fs::write(repo.test_config_path(), "[merge]\nno-ff = true\n").unwrap();let mut cmd = repo.wt_command();cmd.args(["config", "update", "--yes"]);- cmd.env("WORKTRUNK_SYSTEM_CONFIG_PATH", &system_config_path);let output = cmd.output().unwrap();assert!(output.status.success());@@ -3898,7 +3879,9 @@ fn test_explicit_config_path_honors_directory_flag(repo: TestRepo) {.current_dir(&outside);let output = cmd.output().unwrap();- let stdout = String::from_utf8_lossy(&output.stdout);+ let stdout = String::from_utf8_lossy(&output.stdout)+ .ansi_strip()+ .into_owned();assert!(stdout.contains("full = true"),"config show should report the config named relative to -C:\n{stdout}"diff --git a/tests/integration_tests/config_state.rs b/tests/integration_tests/config_state.rsindex 3374dd55f..3b246dfa5 100644--- a/tests/integration_tests/config_state.rs+++ b/tests/integration_tests/config_state.rs@@ -2779,6 +2779,7 @@ fn test_vars_overwrite(repo: TestRepo) {#[rstest]fn test_vars_in_json_output(repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");// Set vars datarepo.git_command().args(["config", "worktrunk.state.main.vars.env", "staging"])@@ -2806,6 +2807,7 @@ fn test_vars_in_json_output(repo: TestRepo) {#[rstest]fn test_vars_absent_in_json_when_empty(repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");// No vars data set — vars field should be absent from JSONlet output = repo.wt_command()@@ -2913,6 +2915,7 @@ fn test_vars_branch_with_dots_in_name(repo: TestRepo) {#[rstest]fn test_vars_json_branch_with_vars_in_name(repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");// Regression: branch names containing ".vars." must not confuse the// all_vars_entries parser (which splits on ".vars." to find the separator).let wt_path = repo.root_path().join("..").join("fix-vars-cleanup-wt");diff --git a/tests/integration_tests/list.rs b/tests/integration_tests/list.rsindex 6a8d79130..d49b73fb4 100644--- a/tests/integration_tests/list.rs+++ b/tests/integration_tests/list.rs@@ -150,6 +150,7 @@ fn test_list_detached_head_in_worktree(mut repo: TestRepo) {fn test_list_abbreviated_sha_follows_git(mut repo: TestRepo) {use ansi_str::AnsiStr;+ repo.write_test_config("[list]\njson-schema = 1\n");repo.add_worktree("feature");repo.detach_head_in_worktree("feature");@@ -347,6 +348,8 @@ fn test_list_many_worktrees_with_varied_stats(mut repo: TestRepo) {#[rstest]fn test_list_json_with_metadata(mut repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");+// Create worktree with detached headrepo.add_worktree("feature-detached");@@ -361,13 +364,11 @@ fn test_list_json_with_metadata(mut repo: TestRepo) {});}-/// Schema 2 (`[list] json-schema = 2`): envelope with repo facts and-/// per-item orthogonal facts. Pins the full shape, including the absence-/// rule (locked reason present, integration null vs absent).+/// Schema 2 is the default: an envelope with repo facts and per-item+/// orthogonal facts. Pins the full shape, including the absence rule (locked+/// reason present, integration null vs absent).#[rstest]fn test_list_json_schema_2_envelope(mut repo: TestRepo) {- repo.write_test_config("[list]\njson-schema = 2\n");-repo.add_worktree("feature-detached");repo.add_worktree("locked-feature");repo.lock_worktree("locked-feature", Some("Testing"));@@ -379,47 +380,28 @@ fn test_list_json_schema_2_envelope(mut repo: TestRepo) {});}-/// `[list] json-schema` selects the output schema: unset emits schema 1-/// plus a one-time nag, an explicit value is silent, and anything except-/// 1 or 2 is an error.+/// `[list] json-schema` selects the output schema: unset emits schema 2,+/// explicit schema 1 preserves the bare array, and invalid values warn before+/// falling back to schema 2.#[rstest]fn test_list_json_schema_selection(repo: TestRepo) {- // Unset with no user config file → nag names both settings to write by- // hand; there is no file for `wt config update` to rewrite.- let output = repo- .wt_command()- .args(["list", "--format=json"])- .output()- .unwrap();- assert!(output.status.success());- let json: Vec<serde_json::Value> = serde_json::from_slice(&output.stdout).unwrap();- assert!(!json.is_empty(), "schema 1 root is a bare array");- let stderr = String::from_utf8_lossy(&output.stderr);- assert!(- stderr.contains("json-schema = 1") && stderr.contains("json-schema = 2"),- "unset key should nag with the manual settings: {stderr}"- );- assert!(- !stderr.contains("config update"),- "no update hint without a config file to update: {stderr}"- );-- // Unset with a user config file present → the hint offers wt config- // update, which writes json-schema = 2.- repo.write_test_config("");+ // Unset → schema 2 with no migration warning.let output = repo.wt_command().args(["list", "--format=json"]).output().unwrap();assert!(output.status.success());+ let json: serde_json::Value = serde_json::from_slice(&output.stdout).unwrap();+ assert_eq!(json["schema"], 2);+ assert!(json["items"].as_array().is_some_and(|i| !i.is_empty()));let stderr = String::from_utf8_lossy(&output.stderr);assert!(- stderr.contains("wt config update"),- "unset key with a config file should offer the update command: {stderr}"+ !stderr.contains("json-schema"),+ "the default should not warn: {stderr}");- // Explicit 1 → schema 1, no nag.+ // Explicit 1 → schema 1, no warning.repo.write_test_config("[list]\njson-schema = 1\n");let output = repo.wt_command()@@ -432,10 +414,10 @@ fn test_list_json_schema_selection(repo: TestRepo) {let stderr = String::from_utf8_lossy(&output.stderr);assert!(!stderr.contains("json-schema"),- "explicit value should not nag: {stderr}"+ "explicit value should not warn: {stderr}");- // Explicit 2 → envelope, no nag.+ // Explicit 2 → envelope, no warning.repo.write_test_config("[list]\njson-schema = 2\n");let output = repo.wt_command()@@ -448,9 +430,12 @@ fn test_list_json_schema_selection(repo: TestRepo) {assert_eq!(json["repo"]["default_branch"], "main");assert!(json["items"].as_array().is_some_and(|i| !i.is_empty()));let stderr = String::from_utf8_lossy(&output.stderr);- assert!(!stderr.contains("json-schema"), "no nag with a value set");+ assert!(+ !stderr.contains("json-schema"),+ "no warning with a valid value"+ );- // Invalid value → warn and degrade to schema 1, like a config type+ // Invalid value → warn and degrade to schema 2, like a config type// error (config problems never brick a command).repo.write_test_config("[list]\njson-schema = 3\n");let output = repo@@ -459,8 +444,8 @@ fn test_list_json_schema_selection(repo: TestRepo) {.output().unwrap();assert!(output.status.success(), "invalid value must not fail");- let json: Vec<serde_json::Value> = serde_json::from_slice(&output.stdout).unwrap();- assert!(!json.is_empty(), "degrades to schema 1");+ let json: serde_json::Value = serde_json::from_slice(&output.stdout).unwrap();+ assert_eq!(json["schema"], 2, "degrades to schema 2");let stderr = String::from_utf8_lossy(&output.stderr);assert!(stderr.contains("expected 1 or 2"),@@ -472,6 +457,7 @@ fn test_list_json_schema_selection(repo: TestRepo) {/// remote to its HTTPS web URL without shelling out to a forge.#[rstest]fn test_list_json_repo_url_from_ssh_remote(repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");// A real forge SSH remote. The local-path remote the fixture configures// doesn't parse as a remote URL, so `repo_url` would be absent for it.repo.run_git(&[@@ -515,6 +501,7 @@ fn test_list_json_repo_url_from_ssh_remote(repo: TestRepo) {/// provider follows the name with no config. The statusline stays silent.#[rstest]fn test_list_json_provider_reads_branded_self_hosted_hosts(repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");for (remote, host, provider) in [("https://github-enterprise.acme.com/owner/repo.git",@@ -557,6 +544,7 @@ fn test_list_json_provider_reads_branded_self_hosted_hosts(repo: TestRepo) {#[rstest]fn test_list_json_configured_azure_generic_remote_is_unknown(repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");repo.run_git(&["remote","set-url",@@ -844,6 +832,8 @@ fn test_list_with_orphaned_remote_ref(#[from(repo_with_remote)] repo: TestRepo)fn test_list_remote_row_not_shadowed_by_same_named_local_branch(#[from(repo_with_remote)] repo: TestRepo,) {+ repo.write_test_config("[list]\njson-schema = 1\n");+// Remote `foo` = one commit ahead of main.repo.create_branch("foo");repo.run_git(&["checkout", "foo"]);@@ -1009,6 +999,8 @@ fn test_list_with_upstream_tracking(mut repo: TestRepo) {/// branch reads as ahead by every commit the local default is missing.#[rstest]fn test_list_branch_stats_use_upstream_when_local_default_lags(mut repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");+repo.commit("c0");repo.setup_remote("main");// Persist the default branch so detection is deterministic.@@ -1070,6 +1062,8 @@ fn test_list_branch_stats_use_upstream_when_local_default_lags(mut repo: TestRep/// superset selection rather than naively preferring the upstream ref.#[rstest]fn test_list_branch_stats_stay_local_when_default_ahead_of_upstream(mut repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");+repo.commit("c0");repo.setup_remote("main");repo.run_git(&["config", "worktrunk.default-branch", "main"]);@@ -1165,6 +1159,7 @@ fn test_list_with_user_marker(mut repo: TestRepo) {#[rstest]fn test_list_json_with_user_marker(mut repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");repo.commit_with_age("Initial commit", DAY);// Worktree with user marker (emoji only)@@ -3950,6 +3945,8 @@ fn test_list_nested_worktree_current_indicator(mut repo: TestRepo) {/// Tests JSON output for nested worktrees shows is_current on the correct worktree.#[rstest]fn test_list_nested_worktree_json_is_current(mut repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");+// Create a worktree nested inside the main repolet nested_path = repo.root_path().join(".worktrees").join("feature");let nested_worktree = repo.add_worktree_at_path("feature", &nested_path);@@ -3999,6 +3996,7 @@ fn test_list_empty_repo() {#[test]fn test_list_empty_repo_json() {let repo = TestRepo::empty();+ repo.write_test_config("[list]\njson-schema = 1\n");let output = repo.wt_command().args(["list", "--format=json"])@@ -4091,6 +4089,8 @@ fn test_list_unborn_worktree_no_task_failures(repo: TestRepo) {fn test_list_integrated_when_merged_locally_with_upstream_diverged(#[from(repo_with_remote)] mut repo: TestRepo,) {+ repo.write_test_config("[list]\njson-schema = 1\n");+let remote_path = repo.remote_path().unwrap().to_path_buf();// Advance origin/main with a remote-only commit so local and upstream diverge.@@ -4185,6 +4185,8 @@ fn test_list_integrated_when_merged_locally_with_upstream_diverged(fn test_list_integrated_when_squash_merged_on_remote_with_local_diverged(#[from(repo_with_remote)] repo: TestRepo,) {+ repo.write_test_config("[list]\njson-schema = 1\n");+let remote_path = repo.remote_path().unwrap().to_path_buf();// Build, push, and remote-squash-merge a feature branch.@@ -4454,7 +4456,7 @@ impl Drop for ReadOnlyObjectDirectory {#[cfg(unix)]#[rstest]fn test_list_full_survives_read_only_object_database(mut repo: TestRepo) {- // Explicit schema keeps stderr free of the unset-schema nag.+ // Keep this regression on the schema-1 field vocabulary it asserts below.repo.write_test_config("[list]\njson-schema = 1\n");// Diverged, cleanly-mergeable topology: `feature` adds one file, `main`diff --git a/tests/integration_tests/list_config.rs b/tests/integration_tests/list_config.rsindex 7990c0a57..5c3a73249 100644--- a/tests/integration_tests/list_config.rs+++ b/tests/integration_tests/list_config.rs@@ -136,6 +136,7 @@ url = "http://localhost:{{ branch | hash_port }}"#[rstest]fn test_list_json_url_fields(repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");// Create project config with URL templaterepo.write_project_config(r#"[list]@@ -170,6 +171,7 @@ url = "http://localhost:{{ branch | hash_port }}"#[rstest]fn test_list_json_no_url_without_template(repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");// No project config means no URL template configured.let mut cmd = wt_command();@@ -195,6 +197,7 @@ fn test_list_json_no_url_without_template(repo: TestRepo) {/// Only worktrees should have URLs - branches without worktrees can't have running dev servers.#[rstest]fn test_list_url_with_branches_flag(mut repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");// Remove fixture worktrees and their branches to isolate test (keep only main worktree)repo.remove_fixture_worktrees();@@ -244,6 +247,7 @@ url = "http://localhost:{{ branch | hash_port }}"#[rstest]fn test_list_url_with_branch_variable(repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");// Create project config with {{ branch }} in URLrepo.write_project_config(r#"[list]@@ -750,7 +754,10 @@ template = "{{ vars.ticket }}"fn test_list_custom_columns_json(repo: TestRepo) {fs::write(repo.test_config_path(),- r#"[list.custom-columns.Ticket]+ r#"[list]+json-schema = 1++[list.custom-columns.Ticket]template = "{{ vars.ticket }}""#,)@@ -790,7 +797,10 @@ fn test_list_custom_column_git_branch(repo: TestRepo) {// git-native multi-line description is reduced to its first line.fs::write(repo.test_config_path(),- r#"[list.custom-columns.Jira]+ r#"[list]+json-schema = 1++[list.custom-columns.Jira]template = "{{ git.branch.jira }}"[list.custom-columns.Summary]@@ -856,7 +866,10 @@ fn test_list_custom_column_worktree_identity(repo: TestRepo) {// directory name, a branch with no worktree falls back to an empty cell.fs::write(repo.test_config_path(),- r#"[list.custom-columns.Dir]+ r#"[list]+json-schema = 1++[list.custom-columns.Dir]template = "{{ worktree_name }}""#,)@@ -1113,11 +1126,7 @@ fn test_list_json_ignores_columns_selection(repo: TestRepo) {fs::write(feature_dir.join("dirty.txt"), "uncommitted\n").unwrap();let run_json = |config: &str| -> serde_json::Value {- if config.is_empty() {- let _ = fs::remove_file(repo.test_config_path());- } else {- fs::write(repo.test_config_path(), config).unwrap();- }+ fs::write(repo.test_config_path(), config).unwrap();let mut cmd = wt_command();repo.configure_wt_cmd(&mut cmd);cmd.args(["list", "--format=json"])@@ -1142,7 +1151,7 @@ fn test_list_json_ignores_columns_selection(repo: TestRepo) {// Control: the default set emits the working_tree field, with the untracked// change visible.- let default = run_json("");+ let default = run_json("[list]\njson-schema = 1\n");assert_eq!(working_tree_of(&default)["untracked"],serde_json::Value::Bool(true),@@ -1153,6 +1162,7 @@ fn test_list_json_ignores_columns_selection(repo: TestRepo) {// change JSON output: working_tree stays exactly as the default set emits.let narrowed = run_json(r#"[list]+json-schema = 1columns = ["branch", "age"]"#,);diff --git a/tests/integration_tests/statusline.rs b/tests/integration_tests/statusline.rsindex 8fcce9fb5..1bf7bbd18 100644--- a/tests/integration_tests/statusline.rs+++ b/tests/integration_tests/statusline.rs@@ -227,6 +227,8 @@ fn test_statusline_claude_code_foreign_repo_on_stdin(repo: TestRepo) {#[rstest]fn test_statusline_json_directory_flag(mut repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");+let feature_path = repo.add_worktree("feature");// cwd is the main worktree; only `-C` points at `feature`@@ -571,6 +573,8 @@ url = "http://{{ branch }}.localhost:3000"#[rstest]fn test_statusline_json_basic(repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");+let output = run_statusline(&repo, &["--format=json"], None);let parsed: Value = serde_json::from_str(&output).expect("should be valid JSON");@@ -603,13 +607,10 @@ fn test_statusline_json_basic(repo: TestRepo) {);}-/// `[list] json-schema = 2` switches the statusline JSON to the envelope,-/// with the same single-item contract as the schema-1 array. An unset key-/// stays silent here — the statusline surface suppresses warnings.+/// The default schema 2 wraps statusline JSON in an envelope with the same+/// single-item contract as the schema-1 array.#[rstest]fn test_statusline_json_schema_2(repo: TestRepo) {- repo.write_test_config("[list]\njson-schema = 2\n");-let output = run_statusline(&repo, &["--format=json"], None);let parsed: Value = serde_json::from_str(&output).expect("should be valid JSON");@@ -644,10 +645,6 @@ fn test_statusline_json_schema_2(repo: TestRepo) {fn test_statusline_json_outside_worktree(repo: TestRepo) {let git_dir = repo.root_path().join(".git");- let output = run_statusline_from_dir(&repo, &["--format=json"], None, &git_dir);- assert_eq!(output.trim(), "[]", "schema 1 empty result is a bare array");-- repo.write_test_config("[list]\njson-schema = 2\n");let output = run_statusline_from_dir(&repo, &["--format=json"], None, &git_dir);let parsed: Value = serde_json::from_str(&output).expect("should be valid JSON");assert_eq!(parsed["schema"], 2);@@ -656,9 +653,13 @@ fn test_statusline_json_outside_worktree(repo: TestRepo) {parsed["repo"].get("default_branch").is_none(),"item-less path must not attempt default-branch detection");++ repo.write_test_config("[list]\njson-schema = 1\n");+ let output = run_statusline_from_dir(&repo, &["--format=json"], None, &git_dir);+ assert_eq!(output.trim(), "[]", "schema 1 empty result is a bare array");}-/// An invalid `[list] json-schema` degrades to schema 1 silently here —+/// An invalid `[list] json-schema` degrades to schema 2 silently here —/// the statusline surface suppresses warnings, so a config typo must not/// corrupt the prompt.#[rstest]@@ -666,11 +667,13 @@ fn test_statusline_json_invalid_schema_degrades_silently(repo: TestRepo) {repo.write_test_config("[list]\njson-schema = 7\n");let output = run_statusline(&repo, &["--format=json"], None);let parsed: Value = serde_json::from_str(&output).expect("should be valid JSON");- assert!(parsed.is_array(), "degrades to the schema 1 array");+ assert_eq!(parsed["schema"], 2, "degrades to the schema 2 envelope");}#[rstest]fn test_statusline_json_with_changes(repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");+// Create uncommitted changesstd::fs::write(repo.root_path().join("modified.txt"), "modified content").unwrap();@@ -690,6 +693,8 @@ fn test_statusline_json_with_changes(repo: TestRepo) {#[rstest]fn test_statusline_json_feature_branch(mut repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");+// Create feature worktree with commitslet feature_path = repo.add_worktree("feature");@@ -722,6 +727,8 @@ fn test_statusline_json_feature_branch(mut repo: TestRepo) {#[rstest]fn test_statusline_json_ignores_claude_code(repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");+// When --format=json is used, --claude-code should be ignoredlet escaped_path = escape_path_for_json(repo.root_path());let json = format!(@@ -814,6 +821,8 @@ fn test_statusline_nested_worktree(mut repo: TestRepo) {/// Tests that JSON output correctly identifies nested worktrees.#[rstest]fn test_statusline_json_nested_worktree(mut repo: TestRepo) {+ repo.write_test_config("[list]\njson-schema = 1\n");+// Create a worktree nested inside the main repolet nested_path = repo.root_path().join(".worktrees").join("feature");let nested_worktree = repo.add_worktree_at_path("feature", &nested_path);diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_bash_matched_exe_emits_alias_hint.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_bash_matched_exe_emits_alias_hint.snapindex 58a1a4ada..0aa89abcf 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_bash_matched_exe_emits_alias_hint.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_bash_matched_exe_emits_alias_hint.snap@@ -60,16 +60,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex e69de29..16ea47f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -0,0 +1,2 @@[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m[2m↳[22m [2mEmpty file (using defaults)[22m[36mPROJECT CONFIG[39m @ _REPO_/.config/wt.tomldiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_claude_available_plugin_not_installed.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_claude_available_plugin_not_installed.snapindex 9dfe83200..2beb749d1 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_claude_available_plugin_not_installed.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_claude_available_plugin_not_installed.snap@@ -58,19 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_clis_detected_via_path.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_clis_detected_via_path.snapindex 2654aeeb5..9698c67f1 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_clis_detected_via_path.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_clis_detected_via_path.snap@@ -54,19 +54,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_codex_available.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_codex_available.snapindex 224fdafc0..8ad37a251 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_codex_available.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_codex_available.snap@@ -58,19 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_deprecation_details.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_deprecation_details.snapindex b6ca78cf5..695c07542 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_deprecation_details.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_deprecation_details.snap@@ -60,21 +60,17 @@ exit_code: 0[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml[33m▲[39m [33mUser config: template variable [1mrepo_root[22m is deprecated in favor of [1mrepo_path[22m[39m[33m▲[39m [33mUser config: template variable [1mmain_worktree[22m is deprecated in favor of [1mrepo[22m[39m-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m[2m↳[22m [2mTo apply: [4mwt config update[24m[22m[2m○[22m Proposed diff:[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex dee4883..cfec3c7 100644[m+[107m [0m [1mindex dee4883..5eef8a6 100644[m[107m [0m [1m--- a/config.toml/current[m[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1,2 +1,5 @@[m+[107m [0m [36m@@ -1,2 +1,2 @@[m[107m [0m [31m-worktree-path = "../{{ main_worktree }}.{{ branch }}"[m[107m [0m [31m-pre-start = "ln -sf {{ repo_root }}/node_modules"[m[107m [0m [32m+[m[32mworktree-path = "../{{ repo }}.{{ branch }}"[m[107m [0m [32m+[m[32mpre-start = "ln -sf {{ repo_path }}/node_modules"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22m[36mPROJECT CONFIG[39m @ _REPO_/.config/wt.tomldiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_project_commit_generation_deprecations.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_project_commit_generation_deprecations.snapindex 7ca95492e..bce4f8b61 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_project_commit_generation_deprecations.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_project_commit_generation_deprecations.snap@@ -59,22 +59,18 @@ exit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml[33m▲[39m [33mUser config: [1m[projects."github.com/example/repo".commit-generation][22m is deprecated in favor of [1m[projects."github.com/example/repo".commit.generation][22m[39m-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m[2m↳[22m [2mTo apply: [4mwt config update[24m[22m[2m○[22m Proposed diff:[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex de80729..6a26487 100644[m+[107m [0m [1mindex de80729..131a2fd 100644[m[107m [0m [1m--- a/config.toml/current[m[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1,4 +1,7 @@[m+[107m [0m [36m@@ -1,4 +1,4 @@[m[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m[107m [0m [m[107m [0m [31m-[projects."github.com/example/repo".commit-generation][m[107m [0m [32m+[m[32m[projects."github.com/example/repo".commit.generation][m[107m [0m command = "llm -m gpt-4"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22m[36mPROJECT CONFIG[39m @ _REPO_/.config/wt.tomldiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_empty_project_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_empty_project_config.snapindex 2299c5e33..dba50404c 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_empty_project_config.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_empty_project_config.snap@@ -58,19 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_empty_system_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_empty_system_config.snapindex 35971dfa3..ecc38e5f5 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_empty_system_config.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_empty_system_config.snap@@ -61,16 +61,6 @@ exit_code: 0[2m↳[22m [2mEmpty file (no system defaults)[22m[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex e69de29..16ea47f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -0,0 +1,2 @@[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m[2m↳[22m [2mEmpty file (using defaults)[22m[36mPROJECT CONFIG[39m @ _REPO_/.config/wt.tomldiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_fish_outdated_wrapper.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_fish_outdated_wrapper.snapindex 85c1a989c..eb10c3192 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_fish_outdated_wrapper.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_fish_outdated_wrapper.snap@@ -58,16 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex e69de29..16ea47f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -0,0 +1,2 @@[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m[2m↳[22m [2mEmpty file (using defaults)[22m[36mPROJECT CONFIG[39m @ _REPO_/.config/wt.tomldiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_fish_with_completions.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_fish_with_completions.snapindex b52be925f..bcb2f0bdf 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_fish_with_completions.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_fish_with_completions.snap@@ -58,16 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex e69de29..16ea47f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -0,0 +1,2 @@[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m[2m↳[22m [2mEmpty file (using defaults)[22m[36mPROJECT CONFIG[39m @ _REPO_/.config/wt.tomldiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_fish_without_completions.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_fish_without_completions.snapindex f1dd04b54..887c1d891 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_fish_without_completions.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_fish_without_completions.snap@@ -58,16 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex e69de29..16ea47f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -0,0 +1,2 @@[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m[2m↳[22m [2mEmpty file (using defaults)[22m[36mPROJECT CONFIG[39m @ _REPO_/.config/wt.tomldiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_azure_extension_installed.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_azure_extension_installed.snapindex fd155b575..68d106d6d 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_azure_extension_installed.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_azure_extension_installed.snap@@ -60,21 +60,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a10f823..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m [31m-worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m \ No newline at end of file[m-[107m [0m [32m+[m[32mworktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_azure_extension_missing.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_azure_extension_missing.snapindex 83076e7c0..ab3d6cb7f 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_azure_extension_missing.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_azure_extension_missing.snap@@ -60,21 +60,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a10f823..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m [31m-worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m \ No newline at end of file[m-[107m [0m [32m+[m[32mworktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snapindex 1d7b4c19a..c1736264b 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap@@ -60,21 +60,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex 6114dbb..c559278 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -2,3 +2,6 @@[m [mworktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [m-[107m [0m [commit.generation][m-[107m [0m command = "nonexistent-llm-command-12345 -m test-model"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[107m [0m[107m [0m [2m[36m[commit.generation][0mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_gitea_remote.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_gitea_remote.snapindex 7b123714c..9aad0d770 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_gitea_remote.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_gitea_remote.snap@@ -60,21 +60,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a10f823..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m [31m-worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m \ No newline at end of file[m-[107m [0m [32m+[m[32mworktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snapindex 4ec7f25f2..36ef207c0 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap@@ -60,21 +60,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a10f823..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m [31m-worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m \ No newline at end of file[m-[107m [0m [32m+[m[32mworktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_update_available.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_update_available.snapindex bf471e795..d62e44107 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_update_available.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_update_available.snap@@ -60,21 +60,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a10f823..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m [31m-worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m \ No newline at end of file[m-[107m [0m [32m+[m[32mworktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_version_check_unavailable.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_version_check_unavailable.snapindex 5022dd9bc..e68126198 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_version_check_unavailable.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_version_check_unavailable.snap@@ -60,21 +60,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a10f823..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m [31m-worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m \ No newline at end of file[m-[107m [0m [32m+[m[32mworktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_available_extension_not_installed.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_available_extension_not_installed.snapindex 9ab29eb4e..b7a9d9fd0 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_available_extension_not_installed.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_available_extension_not_installed.snap@@ -58,19 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_extension_installed.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_extension_installed.snapindex e3ddc6dba..112f65fa9 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_extension_installed.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_extension_installed.snap@@ -58,19 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_extension_invalid_manifest.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_extension_invalid_manifest.snapindex 9ab29eb4e..b7a9d9fd0 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_extension_invalid_manifest.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_gemini_extension_invalid_manifest.snap@@ -58,19 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_github_remote.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_github_remote.snapindex e315c2d90..fb0d89eff 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_github_remote.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_github_remote.snap@@ -58,19 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_gitlab_remote.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_gitlab_remote.snapindex b16f6b033..58962d8a2 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_gitlab_remote.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_gitlab_remote.snap@@ -58,19 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_project_toml.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_project_toml.snapindex c74a42f3e..23c599ba2 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_project_toml.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_project_toml.snap@@ -58,21 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a10f823..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m [31m-worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m \ No newline at end of file[m-[107m [0m [32m+[m[32mworktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_system_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_system_config.snapindex 453119acc..2010e9c61 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_system_config.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_invalid_system_config.snap@@ -67,16 +67,6 @@ exit_code: 0[107m [0m [2minvalid = [toml[0m[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex e69de29..16ea47f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -0,0 +1,2 @@[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m[2m↳[22m [2mEmpty file (using defaults)[22m[36mPROJECT CONFIG[39m @ _REPO_/.config/wt.tomldiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snapindex 84991b3f6..f66ff3f5b 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap@@ -58,19 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_nushell_outdated_wrapper.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_nushell_outdated_wrapper.snapindex 50fe53053..8958ea021 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_nushell_outdated_wrapper.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_nushell_outdated_wrapper.snap@@ -59,16 +59,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex e69de29..16ea47f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -0,0 +1,2 @@[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m[2m↳[22m [2mEmpty file (using defaults)[22m[36mPROJECT CONFIG[39m @ _REPO_/.config/wt.tomldiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_available_plugin_not_installed.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_available_plugin_not_installed.snapindex 34251083d..fa601ea50 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_available_plugin_not_installed.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_available_plugin_not_installed.snap@@ -58,19 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_installed.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_installed.snapindex eda1fd233..2040759d7 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_installed.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_installed.snap@@ -58,19 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_outdated.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_outdated.snapindex 82b56ce6a..17b5adb95 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_outdated.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_opencode_plugin_outdated.snap@@ -58,19 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snapindex f7cbb9acd..3a10c4d59 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap@@ -51,19 +51,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snapindex 342252e09..b3f18d6e9 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap@@ -60,16 +60,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex e69de29..16ea47f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -0,0 +1,2 @@[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m[2m↳[22m [2mEmpty file (using defaults)[22m[36mPROJECT CONFIG[39m @ _REPO_/.config/wt.tomldiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_plugin_installed.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_plugin_installed.snapindex 7048f4361..c879d4a71 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_plugin_installed.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_plugin_installed.snap@@ -58,19 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_powershell_detected_via_psmodulepath.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_powershell_detected_via_psmodulepath.snapindex 2f79cf222..f63d19906 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_powershell_detected_via_psmodulepath.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_powershell_detected_via_psmodulepath.snap@@ -59,16 +59,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex e69de29..16ea47f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -0,0 +1,2 @@[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m[2m↳[22m [2mEmpty file (using defaults)[22m[36mPROJECT CONFIG[39m @ _REPO_/.config/wt.tomldiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_shell_active_but_not_in_config_file.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_shell_active_but_not_in_config_file.snapindex 899555f93..b5d54c827 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_shell_active_but_not_in_config_file.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_shell_active_but_not_in_config_file.snap@@ -60,19 +60,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_shell_integration_active.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_shell_integration_active.snapindex 548187bdc..1dca6867e 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_shell_integration_active.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_shell_integration_active.snap@@ -59,19 +59,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_skipped_with_installed_binary.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_skipped_with_installed_binary.snapindex 4c8f1477a..67f62457f 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_skipped_with_installed_binary.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_skipped_with_installed_binary.snap@@ -59,16 +59,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex e69de29..16ea47f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -0,0 +1,2 @@[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m[2m↳[22m [2mEmpty file (using defaults)[22m[36mPROJECT CONFIG[39m @ _REPO_/.config/wt.tomldiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_statusline_configured.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_statusline_configured.snapindex afd6b99cb..6b9ccb0b6 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_statusline_configured.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_statusline_configured.snap@@ -58,19 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_project_config_for_ci.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_project_config_for_ci.snapindex 8c26b5ab5..d2e01903d 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_project_config_for_ci.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_project_config_for_ci.snap@@ -59,14 +59,13 @@ exit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml[33m▲[39m [33mUser config: [1m[ci][22m is deprecated in favor of [1m[forge][22m[39m-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m[2m↳[22m [2mTo apply: [4mwt config update[24m[22m[2m○[22m Proposed diff:[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex 2e0e0bb..74c0cea 100644[m+[107m [0m [1mindex 2e0e0bb..9d78d51 100644[m[107m [0m [1m--- a/config.toml/current[m[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1,4 +1,7 @@[m+[107m [0m [36m@@ -1,4 +1,4 @@[m[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m[107m [0m [m[107m [0m [31m-[ci][m@@ -74,9 +73,6 @@ exit_code: 0[107m [0m \ No newline at end of file[m[107m [0m [32m+[m[32m[forge][m[107m [0m [32m+[m[32mplatform = "github"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m[33m▲[39m [33mKey [1mci[22m belongs in project config as [forge][39m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_user_config_for_commit_generation.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_user_config_for_commit_generation.snapindex e59f4ecea..0743de3ca 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_user_config_for_commit_generation.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_suggests_user_config_for_commit_generation.snap@@ -58,21 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a10f823..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m [31m-worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m \ No newline at end of file[m-[107m [0m [32m+[m[32mworktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_exe_emits_extra_hint.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_exe_emits_extra_hint.snapindex 8c3e0a657..bbfae147a 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_exe_emits_extra_hint.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_exe_emits_extra_hint.snap@@ -59,16 +59,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex e69de29..16ea47f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -0,0 +1,2 @@[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m[2m↳[22m [2mEmpty file (using defaults)[22m[36mPROJECT CONFIG[39m @ _REPO_/.config/wt.tomldiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_not_suppressed_by_wrapper.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_not_suppressed_by_wrapper.snapindex d0ceeeb0b..a617ffa73 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_not_suppressed_by_wrapper.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_not_suppressed_by_wrapper.snap@@ -59,16 +59,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex e69de29..16ea47f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -0,0 +1,2 @@[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m[2m↳[22m [2mEmpty file (using defaults)[22m[36mPROJECT CONFIG[39m @ _REPO_/.config/wt.tomldiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_warning.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_warning.snapindex f79a4bf24..a05dc346a 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_warning.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_unmatched_candidate_warning.snap@@ -59,16 +59,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex e69de29..16ea47f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -0,0 +1,2 @@[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m[2m↳[22m [2mEmpty file (using defaults)[22m[36mPROJECT CONFIG[39m @ _REPO_/.config/wt.tomldiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snapindex 5cb70ee67..ca189874f 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap@@ -58,21 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a10f823..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m [31m-worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m \ No newline at end of file[m-[107m [0m [32m+[m[32mworktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snapindex 6ba09e894..12ee9311d 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap@@ -58,25 +58,7 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex 6019600..d8930f0 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1,4 +1,7 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [m-[107m [0m [commit-gen][m-[107m [0m [31m-command = "llm"[m-[107m [0m \ No newline at end of file[m-[107m [0m [32m+[m[32mcommand = "llm"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m[33m▲[39m [33mUnknown key [1mcommit-gen[22m will be ignored[39m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[107m [0m[107m [0m [2m[36m[commit-gen][0mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snapindex ed3f84852..57a923409 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap@@ -58,19 +58,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[2m↳[22m [2mOptional system config not found @ [2m/etc/xdg/worktrunk/config.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_with_system_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_with_system_config.snapindex 4324a2f84..51748b568 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_with_system_config.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_with_system_config.snap@@ -66,19 +66,6 @@ exit_code: 0[107m [0m [2mcommand = [0m[2m[32m"company-llm-tool"[0m[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[107m [0m [2mworktree-path = [0m[2m[32m"../{{ repo }}.{{ branch }}"[0m[36mPROJECT CONFIG[39m @ _REPO_/.config/wt.tomldiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snapindex a430df1b7..754abb730 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap@@ -59,16 +59,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex e69de29..16ea47f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -0,0 +1,2 @@[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m[2m↳[22m [2mEmpty file (using defaults)[22m[36mPROJECT CONFIG[39m @ _REPO_/.config/wt.tomldiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snapindex 434ffcbbe..1a5989fcb 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap@@ -59,16 +59,6 @@ success: trueexit_code: 0----- stdout -----[36mUSER CONFIG[39m @ ~/.config/worktrunk/config.toml-[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m↳[22m [2mTo apply: [4mwt config update[24m[22m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/config.toml/current b/config.toml/migrated[m-[107m [0m [1mindex e69de29..16ea47f 100644[m-[107m [0m [1m--- a/config.toml/current[m-[107m [0m [1m+++ b/config.toml/migrated[m-[107m [0m [36m@@ -0,0 +1,2 @@[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m[2m↳[22m [2mEmpty file (using defaults)[22m[36mPROJECT CONFIG[39m @ _REPO_/.config/wt.tomldiff --git a/tests/snapshots/integration__integration_tests__config_show__config_update_adopts_json_schema.snap b/tests/snapshots/integration__integration_tests__config_show__config_update_leaves_json_schema_unset.snapsimilarity index 75%rename from tests/snapshots/integration__integration_tests__config_show__config_update_adopts_json_schema.snaprename to tests/snapshots/integration__integration_tests__config_show__config_update_leaves_json_schema_unset.snapindex 2b8b99176..bdff66b20 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_update_adopts_json_schema.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_update_leaves_json_schema_unset.snap@@ -60,15 +60,4 @@ exit_code: 0----- stdout ---------- stderr ------[33m▲[39m [33mUser config: [1m[list] json-schema[22m is unset; a future release switches the JSON default to schema 2[39m-[2m○[22m Proposed diff:-[107m [0m [1mdiff --git a/test-config.toml/current b/test-config.toml/migrated[m-[107m [0m [1mindex a30ca31..894e11f 100644[m-[107m [0m [1m--- a/test-config.toml/current[m-[107m [0m [1m+++ b/test-config.toml/migrated[m-[107m [0m [36m@@ -1 +1,4 @@[m-[107m [0m worktree-path = "../{{ repo }}.{{ branch }}"[m-[107m [0m [32m+[m-[107m [0m [32m+[m[32m[list][m-[107m [0m [32m+[m[32mjson-schema = 2[m-[32m✓[39m [32mUpdated user config[39m+[2m○[22m No deprecated settings founddiff --git a/tests/snapshots/integration__integration_tests__help__help_config_create.snap b/tests/snapshots/integration__integration_tests__help__help_config_create.snapindex 2d034369a..2e408d850 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_create.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_create.snap@@ -176,7 +176,7 @@ Creates [2m~/.config/worktrunk/config.toml[0m with the following content:[107m [0m [2m# branches = false # Include branches without worktrees (--branches)[0m[107m [0m [2m# remotes = false # Include remote-only branches (--remotes)[0m[107m [0m [2m#[0m-[107m [0m [2m# json-schema = 2 # JSON output schema: 2 (envelope) or 1 (bare array, the current default); unset emits 1 with a warning[0m+[107m [0m [2m# json-schema = 2 # JSON output schema: 2 (envelope, default) or 1 (bare array)[0m[107m [0m [2m#[0m[107m [0m [2m# columns = ["branch", "status", "ci", "path"] # Columns to show, in order — built-ins or custom headers (omit for the default set)[0m[107m [0m [2m#[0m@@ -244,7 +244,8 @@ Creates [2m~/.config/worktrunk/config.toml[0m with the following content:[107m [0m [2m# All standard filters work (`sanitize`, `hash_port`, `codename`, …). A row[0m[107m [0m [2m# where the template renders empty (e.g. a branch without the key) shows an[0m[107m [0m [2m# empty cell; a column that is empty for every row is dropped from the table.[0m-[107m [0m [2m# `wt list --format json` includes the rendered values under `columns`.[0m+[107m [0m [2m# `wt list --format json` includes the rendered values under[0m+[107m [0m [2m# `items[].display.columns` in schema 2, or under `columns` in schema 1.[0m[107m [0m [2m#[0m[107m [0m [2m# A `Jira` column reading a key kept in git config, and a `Summary` column[0m[107m [0m [2m# showing just the first line of the git-native branch description:[0mdiff --git a/tests/snapshots/integration__integration_tests__help__help_config_long.snap b/tests/snapshots/integration__integration_tests__help__help_config_long.snapindex c5f4f557a..ba57884e6 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_long.snap@@ -224,7 +224,7 @@ Persistent flag values for [2mwt list[0m. Override on command line as needed.[107m [0m [2mbranches = [0m[2m[33mfalse[0m[2m [0m[2m# Include branches without worktrees (--branches)[0m[107m [0m [2mremotes = [0m[2m[33mfalse[0m[2m [0m[2m# Include remote-only branches (--remotes)[0m[107m [0m-[107m [0m [2mjson-schema = [0m[2m[33m2[0m[2m [0m[2m# JSON output schema: 2 (envelope) or 1 (bare array, the current default); unset emits 1 with a warning[0m+[107m [0m [2mjson-schema = [0m[2m[33m2[0m[2m [0m[2m# JSON output schema: 2 (envelope, default) or 1 (bare array)[0m[107m [0m[107m [0m [2mcolumns = [[0m[2m[32m"branch"[0m[2m, [0m[2m[32m"status"[0m[2m, [0m[2m[32m"ci"[0m[2m, [0m[2m[32m"path"[0m[2m] [0m[2m# Columns to show, in order — built-ins or custom headers (omit for the default set)[0m[107m [0m@@ -292,7 +292,8 @@ namespaces:All standard filters work ([2msanitize[0m, [2mhash_port[0m, [2mcodename[0m, …). A rowwhere the template renders empty (e.g. a branch without the key) shows anempty cell; a column that is empty for every row is dropped from the table.-[2mwt list --format json[0m includes the rendered values under [2mcolumns[0m.+[2mwt list --format json[0m includes the rendered values under+[2mitems[].display.columns[0m in schema 2, or under [2mcolumns[0m in schema 1.A [2mJira[0m column reading a key kept in git config, and a [2mSummary[0m columnshowing just the first line of the git-native branch description:diff --git a/tests/snapshots/integration__integration_tests__help__help_config_update.snap b/tests/snapshots/integration__integration_tests__help__help_config_update.snapindex 9919c3286..da0b27557 100644--- a/tests/snapshots/integration__integration_tests__help__help_config_update.snap+++ b/tests/snapshots/integration__integration_tests__help__help_config_update.snap@@ -71,10 +71,8 @@ Usage: [1m[36mwt config update[0m [36m[OPTIONS][0mSkip approval promptsUpdates 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.+to their current equivalents, removes deprecated keys that have no equivalent,+and reports each one. Shows a diff and asks for confirmation.Migrations are computed in memory on demand; nothing is written outside thiscommand. Set [2m--output <path>[0m to write a migrated config to that destinationdiff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snapindex 6a73cab00..0be2f4a16 100644--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap@@ -296,11 +296,8 @@ These appear across all columns while the table is loading:[1m[32mJSON output[0m-[2m--format=json[0m emits structured data in one of two schemas while the format-migrates: [2m[list] json-schema = 2[0m selects the envelope format below, [2m= 1[0m-the original bare-array format. Unset emits schema 1 with a warning-([2mwt config update[0m adopts [2m= 2[0m); a future release flips the default to-schema 2 and later removes schema 1.+[2m--format=json[0m emits schema 2 by default: the envelope format below. Set+[2m[list] json-schema = 1[0m to retain the original bare-array format.[32mSchema 2[0m@@ -542,10 +539,8 @@ optional there rather than required-and-null.[32mSchema 1[0m-The original bare-array format — one object per row, no envelope — and the-default while [2m[list] json-schema[0m is unset. It is on its way out: [2mwt config[0m-update[2m adopts [0m= 2[2m, a future release flips the default, and a later one[0m-removes schema 1. Its fields all have a schema-2 home:+The original bare-array format — one object per row, no envelope — selected by+[2m[list] json-schema = 1[0m. Its fields all have a schema-2 home:Schema 1 Schema 2───────────────────────────────────────────────────────────────────── ───────────────────────────────────────────────────────────────────────────────────────────────────────────────────diff --git a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snapindex ced9a6ec4..7f74da4e7 100644--- a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap@@ -377,11 +377,8 @@ These appear across all columns while the table is loading:[1m[32mJSON output[0m-[2m--format=json[0m emits structured data in one of two schemas while the format-migrates: [2m[list] json-schema = 2[0m selects the envelope format below, [2m= 1[0m-the original bare-array format. Unset emits schema 1 with a warning-([2mwt config update[0m adopts [2m= 2[0m); a future release flips the default to-schema 2 and later removes schema 1.+[2m--format=json[0m emits schema 2 by default: the envelope format below. Set+[2m[list] json-schema = 1[0m to retain the original bare-array format.[32mSchema 2[0m@@ -688,10 +685,8 @@ optional there rather than required-and-null.[32mSchema 1[0m-The original bare-array format — one object per row, no envelope — and the-default while [2m[list] json-schema[0m is unset. It is on its way out: [2mwt config[0m-update[2m adopts [0m= 2[2m, a future release flips the default, and a later one[0m-removes schema 1. Its fields all have a schema-2 home:+The original bare-array format — one object per row, no envelope — selected by+[2m[list] json-schema = 1[0m. Its fields all have a schema-2 home:Schema 1 Schema 2──────────────────────────────────────── ─────────────────────────────────────diff --git a/tests/snapshots/integration__integration_tests__list__list_bisect_json.snap b/tests/snapshots/integration__integration_tests__list__list_bisect_json.snapindex 8c7652e17..d7a65eaf7 100644--- a/tests/snapshots/integration__integration_tests__list__list_bisect_json.snap+++ b/tests/snapshots/integration__integration_tests__list__list_bisect_json.snap@@ -57,203 +57,242 @@ info:success: trueexit_code: 0----- stdout ------[- {- "branch": "main",- "path": "_REPO_",- "kind": "worktree",- "commit": {- "sha": "05a4a45d0b981dad5c27db59dca482836d59f89e",- "short_sha": "05a4a45",- "message": "Initial commit",- "timestamp": 1735718400- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0- }- },- "main_state": "is_main",- "remote": {- "name": "origin",- "branch": "main",- "ahead": 0,- "behind": 0- },- "worktree": {- "detached": false- },- "is_main": true,- "is_current": true,- "is_previous": false,- "statusline": "main \u001b[2m^\u001b[22m\u001b[2m|\u001b[22m",- "symbols": "^|"+{+ "schema": 2,+ "repo": {+ "default_branch": "main"},- {- "branch": "bisecting",- "path": "_REPO_.bisecting",- "kind": "worktree",- "commit": {- "sha": "05a4a45d0b981dad5c27db59dca482836d59f89e",- "short_sha": "05a4a45",- "message": "Initial commit",- "timestamp": 1735718400- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0- }- },- "main_state": "empty",- "operation_state": "bisect",- "main": {- "ahead": 0,- "behind": 0,- "diff": {- "added": 0,- "deleted": 0- }- },- "worktree": {- "detached": false- },- "is_main": false,- "is_current": false,- "is_previous": false,- "statusline": "bisecting \u001b[33m↻\u001b[39m\u001b[2m_\u001b[22m",- "symbols": "_↻"+ "collected": {+ "ci": false,+ "summary": false},- {- "branch": "feature-a",- "path": "_REPO_.feature-a",- "kind": "worktree",- "commit": {- "sha": "1b87d4731ea707905d15a726e193531c20affa14",- "short_sha": "1b87d47",- "message": "Add feature-a file",- "timestamp": 1735718400- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0- }- },- "main_state": "ahead",- "main": {- "ahead": 1,- "behind": 0,- "diff": {- "added": 1,- "deleted": 0+ "items": [+ {+ "branch": "main",+ "head": {+ "sha": "05a4a45d0b981dad5c27db59dca482836d59f89e",+ "short_sha": "05a4a45",+ "subject": "Initial commit",+ "committed_at": "2025-01-01T08:00:00Z"+ },+ "worktree": {+ "path": "_REPO_",+ "main": true,+ "current": true,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "upstream": {+ "remote": "origin",+ "branch": "main",+ "ahead": 0,+ "behind": 0+ },+ "display": {+ "state": "is_main",+ "symbols": "^|",+ "statusline": "main \u001b[2m^\u001b[22m\u001b[2m|\u001b[22m"}},- "worktree": {- "detached": false- },- "is_main": false,- "is_current": false,- "is_previous": false,- "statusline": "feature-a \u001b[2m↑\u001b[22m \u001b[32m↑1\u001b[0m ^\u001b[32m+1\u001b[0m",- "symbols": "↑"- },- {- "branch": "feature-b",- "path": "_REPO_.feature-b",- "kind": "worktree",- "commit": {- "sha": "f62940fcec424585adf98625e722fdf990810614",- "short_sha": "f62940f",- "message": "Add feature-b file",- "timestamp": 1735718400- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0+ {+ "branch": "bisecting",+ "head": {+ "sha": "05a4a45d0b981dad5c27db59dca482836d59f89e",+ "short_sha": "05a4a45",+ "subject": "Initial commit",+ "committed_at": "2025-01-01T08:00:00Z"+ },+ "worktree": {+ "path": "_REPO_.bisecting",+ "main": false,+ "current": false,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "operation": "bisect",+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "default_branch": {+ "ahead": 0,+ "behind": 0,+ "diff": {+ "added": 0,+ "deleted": 0+ },+ "orphan": false,+ "integration": {+ "reason": "same_commit"+ },+ "merge_conflicts": false+ },+ "display": {+ "state": "empty",+ "symbols": "_↻",+ "statusline": "bisecting \u001b[33m↻\u001b[39m\u001b[2m_\u001b[22m"}},- "main_state": "ahead",- "main": {- "ahead": 1,- "behind": 0,- "diff": {- "added": 1,- "deleted": 0+ {+ "branch": "feature-a",+ "head": {+ "sha": "1b87d4731ea707905d15a726e193531c20affa14",+ "short_sha": "1b87d47",+ "subject": "Add feature-a file",+ "committed_at": "2025-01-01T08:00:00Z"+ },+ "worktree": {+ "path": "_REPO_.feature-a",+ "main": false,+ "current": false,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "default_branch": {+ "ahead": 1,+ "behind": 0,+ "diff": {+ "added": 1,+ "deleted": 0+ },+ "orphan": false,+ "merge_conflicts": false+ },+ "display": {+ "state": "ahead",+ "symbols": "↑",+ "statusline": "feature-a \u001b[2m↑\u001b[22m \u001b[32m↑1\u001b[0m ^\u001b[32m+1\u001b[0m"}},- "worktree": {- "detached": false- },- "is_main": false,- "is_current": false,- "is_previous": false,- "statusline": "feature-b \u001b[2m↑\u001b[22m \u001b[32m↑1\u001b[0m ^\u001b[32m+1\u001b[0m",- "symbols": "↑"- },- {- "branch": "feature-c",- "path": "_REPO_.feature-c",- "kind": "worktree",- "commit": {- "sha": "345c7c93ad7c3d8f5b08380898d78e024019599c",- "short_sha": "345c7c9",- "message": "Add feature-c file",- "timestamp": 1735718400- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0+ {+ "branch": "feature-b",+ "head": {+ "sha": "f62940fcec424585adf98625e722fdf990810614",+ "short_sha": "f62940f",+ "subject": "Add feature-b file",+ "committed_at": "2025-01-01T08:00:00Z"+ },+ "worktree": {+ "path": "_REPO_.feature-b",+ "main": false,+ "current": false,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "default_branch": {+ "ahead": 1,+ "behind": 0,+ "diff": {+ "added": 1,+ "deleted": 0+ },+ "orphan": false,+ "merge_conflicts": false+ },+ "display": {+ "state": "ahead",+ "symbols": "↑",+ "statusline": "feature-b \u001b[2m↑\u001b[22m \u001b[32m↑1\u001b[0m ^\u001b[32m+1\u001b[0m"}},- "main_state": "ahead",- "main": {- "ahead": 1,- "behind": 0,- "diff": {- "added": 1,- "deleted": 0+ {+ "branch": "feature-c",+ "head": {+ "sha": "345c7c93ad7c3d8f5b08380898d78e024019599c",+ "short_sha": "345c7c9",+ "subject": "Add feature-c file",+ "committed_at": "2025-01-01T08:00:00Z"+ },+ "worktree": {+ "path": "_REPO_.feature-c",+ "main": false,+ "current": false,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "default_branch": {+ "ahead": 1,+ "behind": 0,+ "diff": {+ "added": 1,+ "deleted": 0+ },+ "orphan": false,+ "merge_conflicts": false+ },+ "display": {+ "state": "ahead",+ "symbols": "↑",+ "statusline": "feature-c \u001b[2m↑\u001b[22m \u001b[32m↑1\u001b[0m ^\u001b[32m+1\u001b[0m"}- },- "worktree": {- "detached": false- },- "is_main": false,- "is_current": false,- "is_previous": false,- "statusline": "feature-c \u001b[2m↑\u001b[22m \u001b[32m↑1\u001b[0m ^\u001b[32m+1\u001b[0m",- "symbols": "↑"- }-]+ }+ ]+}----- stderr ------[33m▲[39m [33mJSON output is schema 1; a future release switches the default to schema 2[39m-[2m↳[22m [2mTo keep this format set [4m[list] json-schema = 1[24m; to adopt the new schema, set [4mjson-schema = 2[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__list__list_json_tree_matches_main_after_merge.snap b/tests/snapshots/integration__integration_tests__list__list_json_tree_matches_main_after_merge.snapindex f6dd5d756..32d5ca8c2 100644--- a/tests/snapshots/integration__integration_tests__list__list_json_tree_matches_main_after_merge.snap+++ b/tests/snapshots/integration__integration_tests__list__list_json_tree_matches_main_after_merge.snap@@ -57,203 +57,241 @@ info:success: trueexit_code: 0----- stdout ------[- {- "branch": "main",- "path": "_REPO_",- "kind": "worktree",- "commit": {- "sha": "652da662bf0dd2bb559f29afa4d12ec2fffe46fe",- "short_sha": "652da66",- "message": "Same content on main",- "timestamp": 1735689600- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0- }- },- "main_state": "is_main",- "remote": {- "name": "origin",- "branch": "main",- "ahead": 1,- "behind": 0- },- "worktree": {- "detached": false- },- "is_main": true,- "is_current": true,- "is_previous": false,- "statusline": "main \u001b[2m^\u001b[22m\u001b[2m⇡\u001b[22m \u001b[32m⇡1\u001b[0m",- "symbols": "^⇡"+{+ "schema": 2,+ "repo": {+ "default_branch": "main"},- {- "branch": "feature-a",- "path": "_REPO_.feature-a",- "kind": "worktree",- "commit": {- "sha": "1b87d4731ea707905d15a726e193531c20affa14",- "short_sha": "1b87d47",- "message": "Add feature-a file",- "timestamp": 1735718400- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0- }- },- "main_state": "diverged",- "main": {- "ahead": 1,- "behind": 1,- "diff": {- "added": 1,- "deleted": 0- }- },- "worktree": {- "detached": false- },- "is_main": false,- "is_current": false,- "is_previous": false,- "statusline": "feature-a \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m ^\u001b[32m+1\u001b[0m",- "symbols": "↕"+ "collected": {+ "ci": false,+ "summary": false},- {- "branch": "feature-b",- "path": "_REPO_.feature-b",- "kind": "worktree",- "commit": {- "sha": "f62940fcec424585adf98625e722fdf990810614",- "short_sha": "f62940f",- "message": "Add feature-b file",- "timestamp": 1735718400- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0- }- },- "main_state": "diverged",- "main": {- "ahead": 1,- "behind": 1,- "diff": {- "added": 1,- "deleted": 0+ "items": [+ {+ "branch": "main",+ "head": {+ "sha": "652da662bf0dd2bb559f29afa4d12ec2fffe46fe",+ "short_sha": "652da66",+ "subject": "Same content on main",+ "committed_at": "2025-01-01T00:00:00Z"+ },+ "worktree": {+ "path": "_REPO_",+ "main": true,+ "current": true,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "upstream": {+ "remote": "origin",+ "branch": "main",+ "ahead": 1,+ "behind": 0+ },+ "display": {+ "state": "is_main",+ "symbols": "^⇡",+ "statusline": "main \u001b[2m^\u001b[22m\u001b[2m⇡\u001b[22m \u001b[32m⇡1\u001b[0m"}},- "worktree": {- "detached": false- },- "is_main": false,- "is_current": false,- "is_previous": false,- "statusline": "feature-b \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m ^\u001b[32m+1\u001b[0m",- "symbols": "↕"- },- {- "branch": "feature-c",- "path": "_REPO_.feature-c",- "kind": "worktree",- "commit": {- "sha": "345c7c93ad7c3d8f5b08380898d78e024019599c",- "short_sha": "345c7c9",- "message": "Add feature-c file",- "timestamp": 1735718400- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0+ {+ "branch": "feature-a",+ "head": {+ "sha": "1b87d4731ea707905d15a726e193531c20affa14",+ "short_sha": "1b87d47",+ "subject": "Add feature-a file",+ "committed_at": "2025-01-01T08:00:00Z"+ },+ "worktree": {+ "path": "_REPO_.feature-a",+ "main": false,+ "current": false,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "default_branch": {+ "ahead": 1,+ "behind": 1,+ "diff": {+ "added": 1,+ "deleted": 0+ },+ "orphan": false,+ "merge_conflicts": false+ },+ "display": {+ "state": "diverged",+ "symbols": "↕",+ "statusline": "feature-a \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m ^\u001b[32m+1\u001b[0m"}},- "main_state": "diverged",- "main": {- "ahead": 1,- "behind": 1,- "diff": {- "added": 1,- "deleted": 0+ {+ "branch": "feature-b",+ "head": {+ "sha": "f62940fcec424585adf98625e722fdf990810614",+ "short_sha": "f62940f",+ "subject": "Add feature-b file",+ "committed_at": "2025-01-01T08:00:00Z"+ },+ "worktree": {+ "path": "_REPO_.feature-b",+ "main": false,+ "current": false,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "default_branch": {+ "ahead": 1,+ "behind": 1,+ "diff": {+ "added": 1,+ "deleted": 0+ },+ "orphan": false,+ "merge_conflicts": false+ },+ "display": {+ "state": "diverged",+ "symbols": "↕",+ "statusline": "feature-b \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m ^\u001b[32m+1\u001b[0m"}},- "worktree": {- "detached": false- },- "is_main": false,- "is_current": false,- "is_previous": false,- "statusline": "feature-c \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m ^\u001b[32m+1\u001b[0m",- "symbols": "↕"- },- {- "branch": "feature-merged",- "path": "_REPO_.feature-merged",- "kind": "worktree",- "commit": {- "sha": "a5d5aefdd9141e87eb33f70dfaddba421d22d0bd",- "short_sha": "a5d5aef",- "message": "Merge main into feature",- "timestamp": 1735689600- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0+ {+ "branch": "feature-c",+ "head": {+ "sha": "345c7c93ad7c3d8f5b08380898d78e024019599c",+ "short_sha": "345c7c9",+ "subject": "Add feature-c file",+ "committed_at": "2025-01-01T08:00:00Z"+ },+ "worktree": {+ "path": "_REPO_.feature-c",+ "main": false,+ "current": false,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "default_branch": {+ "ahead": 1,+ "behind": 1,+ "diff": {+ "added": 1,+ "deleted": 0+ },+ "orphan": false,+ "merge_conflicts": false+ },+ "display": {+ "state": "diverged",+ "symbols": "↕",+ "statusline": "feature-c \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m ^\u001b[32m+1\u001b[0m"}},- "main_state": "integrated",- "integration_reason": "no-added-changes",- "main": {- "ahead": 2,- "behind": 0,- "diff": {- "added": 0,- "deleted": 0+ {+ "branch": "feature-merged",+ "head": {+ "sha": "a5d5aefdd9141e87eb33f70dfaddba421d22d0bd",+ "short_sha": "a5d5aef",+ "subject": "Merge main into feature",+ "committed_at": "2025-01-01T00:00:00Z"+ },+ "worktree": {+ "path": "_REPO_.feature-merged",+ "main": false,+ "current": false,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "default_branch": {+ "ahead": 2,+ "behind": 0,+ "diff": {+ "added": 0,+ "deleted": 0+ },+ "orphan": false,+ "integration": {+ "reason": "no_added_changes"+ },+ "merge_conflicts": false+ },+ "display": {+ "state": "integrated",+ "symbols": "⊂",+ "statusline": "feature-merged \u001b[2m⊂\u001b[22m \u001b[32m↑2\u001b[0m"}- },- "worktree": {- "detached": false- },- "is_main": false,- "is_current": false,- "is_previous": false,- "statusline": "feature-merged \u001b[2m⊂\u001b[22m \u001b[32m↑2\u001b[0m",- "symbols": "⊂"- }-]+ }+ ]+}----- stderr ------[33m▲[39m [33mJSON output is schema 1; a future release switches the default to schema 2[39m-[2m↳[22m [2mTo keep this format set [4m[list] json-schema = 1[24m; to adopt the new schema, set [4mjson-schema = 2[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__list__list_json_with_display_fields.snap b/tests/snapshots/integration__integration_tests__list__list_json_with_display_fields.snapindex 63a22dea8..6f65d44e0 100644--- a/tests/snapshots/integration__integration_tests__list__list_json_with_display_fields.snap+++ b/tests/snapshots/integration__integration_tests__list__list_json_with_display_fields.snap@@ -57,242 +57,286 @@ info:success: trueexit_code: 0----- stdout ------[- {- "branch": "main",- "path": "_REPO_",- "kind": "worktree",- "commit": {- "sha": "e52e0f4263b6ea30cadae914ebde3d46431b69ca",- "short_sha": "e52e0f4",- "message": "Main commit 2",- "timestamp": 1735689600- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0- }- },- "main_state": "is_main",- "remote": {- "name": "origin",- "branch": "main",- "ahead": 3,- "behind": 0- },- "worktree": {- "detached": false- },- "is_main": true,- "is_current": true,- "is_previous": false,- "statusline": "main \u001b[2m^\u001b[22m\u001b[2m⇡\u001b[22m \u001b[32m⇡3\u001b[0m",- "symbols": "^⇡"+{+ "schema": 2,+ "repo": {+ "default_branch": "main"},- {- "branch": "feature-a",- "path": "_REPO_.feature-a",- "kind": "worktree",- "commit": {- "sha": "1b87d4731ea707905d15a726e193531c20affa14",- "short_sha": "1b87d47",- "message": "Add feature-a file",- "timestamp": 1735718400- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0- }- },- "main_state": "diverged",- "main": {- "ahead": 1,- "behind": 3,- "diff": {- "added": 1,- "deleted": 0- }- },- "worktree": {- "detached": false- },- "is_main": false,- "is_current": false,- "is_previous": false,- "statusline": "feature-a \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓3\u001b[0m ^\u001b[32m+1\u001b[0m",- "symbols": "↕"+ "collected": {+ "ci": false,+ "summary": false},- {- "branch": "feature-b",- "path": "_REPO_.feature-b",- "kind": "worktree",- "commit": {- "sha": "f62940fcec424585adf98625e722fdf990810614",- "short_sha": "f62940f",- "message": "Add feature-b file",- "timestamp": 1735718400- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0- }- },- "main_state": "diverged",- "main": {- "ahead": 1,- "behind": 3,- "diff": {- "added": 1,- "deleted": 0- }- },- "worktree": {- "detached": false- },- "is_main": false,- "is_current": false,- "is_previous": false,- "statusline": "feature-b \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓3\u001b[0m ^\u001b[32m+1\u001b[0m",- "symbols": "↕"- },- {- "branch": "feature-c",- "path": "_REPO_.feature-c",- "kind": "worktree",- "commit": {- "sha": "345c7c93ad7c3d8f5b08380898d78e024019599c",- "short_sha": "345c7c9",- "message": "Add feature-c file",- "timestamp": 1735718400- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0+ "items": [+ {+ "branch": "main",+ "head": {+ "sha": "e52e0f4263b6ea30cadae914ebde3d46431b69ca",+ "short_sha": "e52e0f4",+ "subject": "Main commit 2",+ "committed_at": "2025-01-01T00:00:00Z"+ },+ "worktree": {+ "path": "_REPO_",+ "main": true,+ "current": true,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "upstream": {+ "remote": "origin",+ "branch": "main",+ "ahead": 3,+ "behind": 0+ },+ "display": {+ "state": "is_main",+ "symbols": "^⇡",+ "statusline": "main \u001b[2m^\u001b[22m\u001b[2m⇡\u001b[22m \u001b[32m⇡3\u001b[0m"}},- "main_state": "diverged",- "main": {- "ahead": 1,- "behind": 3,- "diff": {- "added": 1,- "deleted": 0+ {+ "branch": "feature-a",+ "head": {+ "sha": "1b87d4731ea707905d15a726e193531c20affa14",+ "short_sha": "1b87d47",+ "subject": "Add feature-a file",+ "committed_at": "2025-01-01T08:00:00Z"+ },+ "worktree": {+ "path": "_REPO_.feature-a",+ "main": false,+ "current": false,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "default_branch": {+ "ahead": 1,+ "behind": 3,+ "diff": {+ "added": 1,+ "deleted": 0+ },+ "orphan": false,+ "merge_conflicts": false+ },+ "display": {+ "state": "diverged",+ "symbols": "↕",+ "statusline": "feature-a \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓3\u001b[0m ^\u001b[32m+1\u001b[0m"}},- "worktree": {- "detached": false- },- "is_main": false,- "is_current": false,- "is_previous": false,- "statusline": "feature-c \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓3\u001b[0m ^\u001b[32m+1\u001b[0m",- "symbols": "↕"- },- {- "branch": "feature-ahead",- "path": "_REPO_.feature-ahead",- "kind": "worktree",- "commit": {- "sha": "e0c9ce16d24b8c17f0c763f73816037180c89d7f",- "short_sha": "e0c9ce1",- "message": "Feature commit 2",- "timestamp": 1735689600- },- "working_tree": {- "staged": false,- "modified": true,- "untracked": true,- "renamed": false,- "deleted": false,- "diff": {- "added": 2,- "deleted": 1+ {+ "branch": "feature-b",+ "head": {+ "sha": "f62940fcec424585adf98625e722fdf990810614",+ "short_sha": "f62940f",+ "subject": "Add feature-b file",+ "committed_at": "2025-01-01T08:00:00Z"+ },+ "worktree": {+ "path": "_REPO_.feature-b",+ "main": false,+ "current": false,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "default_branch": {+ "ahead": 1,+ "behind": 3,+ "diff": {+ "added": 1,+ "deleted": 0+ },+ "orphan": false,+ "merge_conflicts": false+ },+ "display": {+ "state": "diverged",+ "symbols": "↕",+ "statusline": "feature-b \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓3\u001b[0m ^\u001b[32m+1\u001b[0m"}},- "main_state": "diverged",- "main": {- "ahead": 2,- "behind": 2,- "diff": {- "added": 1,- "deleted": 0+ {+ "branch": "feature-c",+ "head": {+ "sha": "345c7c93ad7c3d8f5b08380898d78e024019599c",+ "short_sha": "345c7c9",+ "subject": "Add feature-c file",+ "committed_at": "2025-01-01T08:00:00Z"+ },+ "worktree": {+ "path": "_REPO_.feature-c",+ "main": false,+ "current": false,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "default_branch": {+ "ahead": 1,+ "behind": 3,+ "diff": {+ "added": 1,+ "deleted": 0+ },+ "orphan": false,+ "merge_conflicts": false+ },+ "display": {+ "state": "diverged",+ "symbols": "↕",+ "statusline": "feature-c \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓3\u001b[0m ^\u001b[32m+1\u001b[0m"}},- "worktree": {- "detached": false- },- "is_main": false,- "is_current": false,- "is_previous": false,- "statusline": "feature-ahead \u001b[36m!\u001b[39m\u001b[36m?\u001b[39m\u001b[2m↕\u001b[22m @\u001b[32m+2\u001b[0m \u001b[31m-1\u001b[0m \u001b[32m↑2\u001b[0m \u001b[2m\u001b[31m↓2\u001b[0m ^\u001b[32m+1\u001b[0m",- "symbols": "!?↕"- },- {- "branch": "feature-behind",- "path": "_REPO_.feature-behind",- "kind": "worktree",- "commit": {- "sha": "01cab36ce221a5ff5c7a6cf60cea6bab3c6315d7",- "short_sha": "01cab36",- "message": "Initial commit on main",- "timestamp": 1735689600- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0+ {+ "branch": "feature-ahead",+ "head": {+ "sha": "e0c9ce16d24b8c17f0c763f73816037180c89d7f",+ "short_sha": "e0c9ce1",+ "subject": "Feature commit 2",+ "committed_at": "2025-01-01T00:00:00Z"+ },+ "worktree": {+ "path": "_REPO_.feature-ahead",+ "main": false,+ "current": false,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "changes": {+ "staged": false,+ "modified": true,+ "untracked": true,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 2,+ "deleted": 1+ }+ }+ },+ "default_branch": {+ "ahead": 2,+ "behind": 2,+ "diff": {+ "added": 1,+ "deleted": 0+ },+ "orphan": false,+ "merge_conflicts": false+ },+ "display": {+ "state": "diverged",+ "symbols": "!?↕",+ "statusline": "feature-ahead \u001b[36m!\u001b[39m\u001b[36m?\u001b[39m\u001b[2m↕\u001b[22m @\u001b[32m+2\u001b[0m \u001b[31m-1\u001b[0m \u001b[32m↑2\u001b[0m \u001b[2m\u001b[31m↓2\u001b[0m ^\u001b[32m+1\u001b[0m"}},- "main_state": "integrated",- "integration_reason": "ancestor",- "main": {- "ahead": 0,- "behind": 2,- "diff": {- "added": 0,- "deleted": 0+ {+ "branch": "feature-behind",+ "head": {+ "sha": "01cab36ce221a5ff5c7a6cf60cea6bab3c6315d7",+ "short_sha": "01cab36",+ "subject": "Initial commit on main",+ "committed_at": "2025-01-01T00:00:00Z"+ },+ "worktree": {+ "path": "_REPO_.feature-behind",+ "main": false,+ "current": false,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "default_branch": {+ "ahead": 0,+ "behind": 2,+ "diff": {+ "added": 0,+ "deleted": 0+ },+ "orphan": false,+ "integration": {+ "reason": "ancestor"+ },+ "merge_conflicts": false+ },+ "display": {+ "state": "integrated",+ "symbols": "⊂",+ "statusline": "feature-behind \u001b[2m⊂\u001b[22m \u001b[2m\u001b[31m↓2\u001b[0m"}- },- "worktree": {- "detached": false- },- "is_main": false,- "is_current": false,- "is_previous": false,- "statusline": "feature-behind \u001b[2m⊂\u001b[22m \u001b[2m\u001b[31m↓2\u001b[0m",- "symbols": "⊂"- }-]+ }+ ]+}----- stderr ------[33m▲[39m [33mJSON output is schema 1; a future release switches the default to schema 2[39m-[2m↳[22m [2mTo keep this format set [4m[list] json-schema = 1[24m; to adopt the new schema, set [4mjson-schema = 2[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__list__list_json_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__list_json_with_git_operation.snapindex 02c7cab5b..67e2bc031 100644--- a/tests/snapshots/integration__integration_tests__list__list_json_with_git_operation.snap+++ b/tests/snapshots/integration__integration_tests__list__list_json_with_git_operation.snap@@ -57,203 +57,239 @@ info:success: trueexit_code: 0----- stdout ------[- {- "branch": "main",- "path": "_REPO_",- "kind": "worktree",- "commit": {- "sha": "c6dc8c756334d089aa446e014cb1d2fda29eb129",- "short_sha": "c6dc8c7",- "message": "Main conflicting changes",- "timestamp": 1735689600- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0- }- },- "main_state": "is_main",- "remote": {- "name": "origin",- "branch": "main",- "ahead": 2,- "behind": 0- },- "worktree": {- "detached": false- },- "is_main": true,- "is_current": true,- "is_previous": false,- "statusline": "main \u001b[2m^\u001b[22m\u001b[2m⇡\u001b[22m \u001b[32m⇡2\u001b[0m",- "symbols": "^⇡"+{+ "schema": 2,+ "repo": {+ "default_branch": "main"},- {- "branch": "feature-a",- "path": "_REPO_.feature-a",- "kind": "worktree",- "commit": {- "sha": "1b87d4731ea707905d15a726e193531c20affa14",- "short_sha": "1b87d47",- "message": "Add feature-a file",- "timestamp": 1735718400- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0- }- },- "main_state": "diverged",- "main": {- "ahead": 1,- "behind": 2,- "diff": {- "added": 1,- "deleted": 0- }- },- "worktree": {- "detached": false- },- "is_main": false,- "is_current": false,- "is_previous": false,- "statusline": "feature-a \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓2\u001b[0m ^\u001b[32m+1\u001b[0m",- "symbols": "↕"+ "collected": {+ "ci": false,+ "summary": false},- {- "branch": "feature-b",- "path": "_REPO_.feature-b",- "kind": "worktree",- "commit": {- "sha": "f62940fcec424585adf98625e722fdf990810614",- "short_sha": "f62940f",- "message": "Add feature-b file",- "timestamp": 1735718400- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0- }- },- "main_state": "diverged",- "main": {- "ahead": 1,- "behind": 2,- "diff": {- "added": 1,- "deleted": 0+ "items": [+ {+ "branch": "main",+ "head": {+ "sha": "c6dc8c756334d089aa446e014cb1d2fda29eb129",+ "short_sha": "c6dc8c7",+ "subject": "Main conflicting changes",+ "committed_at": "2025-01-01T00:00:00Z"+ },+ "worktree": {+ "path": "_REPO_",+ "main": true,+ "current": true,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "upstream": {+ "remote": "origin",+ "branch": "main",+ "ahead": 2,+ "behind": 0+ },+ "display": {+ "state": "is_main",+ "symbols": "^⇡",+ "statusline": "main \u001b[2m^\u001b[22m\u001b[2m⇡\u001b[22m \u001b[32m⇡2\u001b[0m"}},- "worktree": {- "detached": false- },- "is_main": false,- "is_current": false,- "is_previous": false,- "statusline": "feature-b \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓2\u001b[0m ^\u001b[32m+1\u001b[0m",- "symbols": "↕"- },- {- "branch": "feature-c",- "path": "_REPO_.feature-c",- "kind": "worktree",- "commit": {- "sha": "345c7c93ad7c3d8f5b08380898d78e024019599c",- "short_sha": "345c7c9",- "message": "Add feature-c file",- "timestamp": 1735718400- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0+ {+ "branch": "feature-a",+ "head": {+ "sha": "1b87d4731ea707905d15a726e193531c20affa14",+ "short_sha": "1b87d47",+ "subject": "Add feature-a file",+ "committed_at": "2025-01-01T08:00:00Z"+ },+ "worktree": {+ "path": "_REPO_.feature-a",+ "main": false,+ "current": false,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "default_branch": {+ "ahead": 1,+ "behind": 2,+ "diff": {+ "added": 1,+ "deleted": 0+ },+ "orphan": false,+ "merge_conflicts": false+ },+ "display": {+ "state": "diverged",+ "symbols": "↕",+ "statusline": "feature-a \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓2\u001b[0m ^\u001b[32m+1\u001b[0m"}},- "main_state": "diverged",- "main": {- "ahead": 1,- "behind": 2,- "diff": {- "added": 1,- "deleted": 0+ {+ "branch": "feature-b",+ "head": {+ "sha": "f62940fcec424585adf98625e722fdf990810614",+ "short_sha": "f62940f",+ "subject": "Add feature-b file",+ "committed_at": "2025-01-01T08:00:00Z"+ },+ "worktree": {+ "path": "_REPO_.feature-b",+ "main": false,+ "current": false,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "default_branch": {+ "ahead": 1,+ "behind": 2,+ "diff": {+ "added": 1,+ "deleted": 0+ },+ "orphan": false,+ "merge_conflicts": false+ },+ "display": {+ "state": "diverged",+ "symbols": "↕",+ "statusline": "feature-b \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓2\u001b[0m ^\u001b[32m+1\u001b[0m"}},- "worktree": {- "detached": false- },- "is_main": false,- "is_current": false,- "is_previous": false,- "statusline": "feature-c \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓2\u001b[0m ^\u001b[32m+1\u001b[0m",- "symbols": "↕"- },- {- "branch": "feature",- "path": "_REPO_.feature",- "kind": "worktree",- "commit": {- "sha": "c6dc8c756334d089aa446e014cb1d2fda29eb129",- "short_sha": "c6dc8c7",- "message": "Main conflicting changes",- "timestamp": 1735689600- },- "working_tree": {- "staged": false,- "modified": false,- "untracked": false,- "renamed": false,- "deleted": false,- "diff": {- "added": 0,- "deleted": 0+ {+ "branch": "feature-c",+ "head": {+ "sha": "345c7c93ad7c3d8f5b08380898d78e024019599c",+ "short_sha": "345c7c9",+ "subject": "Add feature-c file",+ "committed_at": "2025-01-01T08:00:00Z"+ },+ "worktree": {+ "path": "_REPO_.feature-c",+ "main": false,+ "current": false,+ "previous": false,+ "detached": false,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": false,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "default_branch": {+ "ahead": 1,+ "behind": 2,+ "diff": {+ "added": 1,+ "deleted": 0+ },+ "orphan": false,+ "merge_conflicts": false+ },+ "display": {+ "state": "diverged",+ "symbols": "↕",+ "statusline": "feature-c \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓2\u001b[0m ^\u001b[32m+1\u001b[0m"}},- "main_state": "would_conflict",- "operation_state": "conflicts",- "main": {- "ahead": 1,- "behind": 1,- "diff": {- "added": 2,- "deleted": 2+ {+ "branch": "feature",+ "head": {+ "sha": "c6dc8c756334d089aa446e014cb1d2fda29eb129",+ "short_sha": "c6dc8c7",+ "subject": "Main conflicting changes",+ "committed_at": "2025-01-01T00:00:00Z"+ },+ "worktree": {+ "path": "_REPO_.feature",+ "main": false,+ "current": false,+ "previous": false,+ "detached": true,+ "branch_mismatch": false,+ "duplicate_branch": false,+ "operation": "rebase",+ "changes": {+ "staged": false,+ "modified": false,+ "untracked": false,+ "renamed": false,+ "deleted": false,+ "conflicted": true,+ "diff": {+ "added": 0,+ "deleted": 0+ }+ }+ },+ "default_branch": {+ "ahead": 1,+ "behind": 1,+ "diff": {+ "added": 2,+ "deleted": 2+ },+ "orphan": false,+ "merge_conflicts": true+ },+ "display": {+ "state": "would_conflict",+ "symbols": "✗✘",+ "statusline": "feature \u001b[31m✘\u001b[39m\u001b[33m✗\u001b[39m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m ^\u001b[32m+2\u001b[0m \u001b[31m-2\u001b[0m"}- },- "worktree": {- "detached": true- },- "is_main": false,- "is_current": false,- "is_previous": false,- "statusline": "feature \u001b[31m✘\u001b[39m\u001b[33m✗\u001b[39m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m ^\u001b[32m+2\u001b[0m \u001b[31m-2\u001b[0m",- "symbols": "✗✘"- }-]+ }+ ]+}----- stderr ------[33m▲[39m [33mJSON output is schema 1; a future release switches the default to schema 2[39m-[2m↳[22m [2mTo keep this format set [4m[list] json-schema = 1[24m; to adopt the new schema, set [4mjson-schema = 2[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__list__list_json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__list_json_with_metadata.snapindex 07600dd1c..b9be2a2f5 100644--- a/tests/snapshots/integration__integration_tests__list__list_json_with_metadata.snap+++ b/tests/snapshots/integration__integration_tests__list__list_json_with_metadata.snap@@ -295,5 +295,3 @@ exit_code: 0]----- stderr ------[33m▲[39m [33mJSON output is schema 1; a future release switches the default to schema 2[39m-[2m↳[22m [2mTo keep this format set [4m[list] json-schema = 1[24m; to adopt the new schema, set [4mjson-schema = 2[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__list__list_json_with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__list_json_with_user_marker.snapindex 77835ff44..d6924901c 100644--- a/tests/snapshots/integration__integration_tests__list__list_json_with_user_marker.snap+++ b/tests/snapshots/integration__integration_tests__list__list_json_with_user_marker.snap@@ -294,5 +294,3 @@ exit_code: 0]----- stderr ------[33m▲[39m [33mJSON output is schema 1; a future release switches the default to schema 2[39m-[2m↳[22m [2mTo keep this format set [4m[list] json-schema = 1[24m; to adopt the new schema, set [4mjson-schema = 2[24m[22m