Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

feat(config): wt config update adopts json-schema = 2 instead of pinning 1 (#3436)

Maximilian Roosd12c55a32034
diff --git a/CLAUDE.md b/CLAUDE.md
index 914e6ebd6..47f08b194 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -177,7 +177,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` pins a default a future release switches (currently `[list] json-schema = 1`, 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 pin. 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`; `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.
## Adding CLI Commands
diff --git a/dev/config.example.toml b/dev/config.example.toml
index 1a7585a40..6d4772b62 100644
--- a/dev/config.example.toml
+++ b/dev/config.example.toml
@@ -99,7 +99,7 @@
# branches = false # Include branches without worktrees (--branches)
# remotes = false # Include remote-only branches (--remotes)
#
-# json-schema = 1 # JSON output schema: 1 (current, bare array) or 2 (envelope); unset emits 1 with a warning
+# json-schema = 2 # JSON output schema: 2 (envelope) or 1 (bare array, the current default); unset emits 1 with a warning
#
# columns = ["branch", "status", "ci", "path"] # Columns to show, in order — built-ins or custom headers (omit for the default set)
#
diff --git a/docs/content/config.md b/docs/content/config.md
index 420594d60..3939b5d49 100644
--- a/docs/content/config.md
+++ b/docs/content/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 = 1 # JSON output schema: 1 (current, bare array) or 2 (envelope); unset emits 1 with a warning
+json-schema = 2 # JSON output schema: 2 (envelope) or 1 (bare array, the current default); unset emits 1 with a warning
columns = ["branch", "status", "ci", "path"] # Columns to show, in order — built-ins or custom headers (omit for the default set)
diff --git a/docs/content/list.md b/docs/content/list.md
index 277311799..57cc12581 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -220,7 +220,7 @@ These appear across all columns while the table is loading:
`--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` pins `= 1`); a future release flips the default to
+(`wt config update` adopts `= 2`); a future release flips the default to
schema 2 and later removes schema 1.
### Schema 2
diff --git a/skills/worktrunk/reference/config.md b/skills/worktrunk/reference/config.md
index 2bfd54204..09048e09b 100644
--- a/skills/worktrunk/reference/config.md
+++ b/skills/worktrunk/reference/config.md
@@ -185,7 +185,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 = 1 # JSON output schema: 1 (current, bare array) or 2 (envelope); unset emits 1 with a warning
+json-schema = 2 # JSON output schema: 2 (envelope) or 1 (bare array, the current default); unset emits 1 with a warning
columns = ["branch", "status", "ci", "path"] # Columns to show, in order — built-ins or custom headers (omit for the default set)
diff --git a/skills/worktrunk/reference/list.md b/skills/worktrunk/reference/list.md
index bb686c4eb..8b98ea209 100644
--- a/skills/worktrunk/reference/list.md
+++ b/skills/worktrunk/reference/list.md
@@ -205,7 +205,7 @@ These appear across all columns while the table is loading:
`--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` pins `= 1`); a future release flips the default to
+(`wt config update` adopts `= 2`); a future release flips the default to
schema 2 and later removes schema 1.
### Schema 2
diff --git a/src/cli/config.rs b/src/cli/config.rs
index f1e67ef2c..62996cc06 100644
--- a/src/cli/config.rs
+++ b/src/cli/config.rs
@@ -513,9 +513,10 @@ This tests:
/// Update deprecated config settings
#[command(
after_long_help = r#"Updates deprecated settings in user and project config files
-to their current equivalents, and pins defaults that a future release
-switches — currently `[list] json-schema = 1` — so upgrading doesn't change
-behavior. Shows a diff and asks for confirmation.
+to their current equivalents, and adopts defaults that a future release
+switches — currently `[list] json-schema = 2` — so the switch happens as a
+reviewed config edit rather than at upgrade. Shows a diff and asks for
+confirmation.
Migrations are computed in memory on demand; nothing is written outside this
command. Use `--print` to see the migrated TOML without touching any file.
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 79bf41679..4b7810a69 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -961,7 +961,7 @@ These appear across all columns while the table is loading:
`--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` pins `= 1`); a future release flips the default to
+(`wt config update` adopts `= 2`); a future release flips the default to
schema 2 and later removes schema 1.
### Schema 2
@@ -2036,7 +2036,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 = 1 # JSON output schema: 1 (current, bare array) or 2 (envelope); unset emits 1 with a warning
+json-schema = 2 # JSON output schema: 2 (envelope) or 1 (bare array, the current default); unset emits 1 with a warning
columns = ["branch", "status", "ci", "path"] # Columns to show, in order — built-ins or custom headers (omit for the default set)
diff --git a/src/commands/list/mod.rs b/src/commands/list/mod.rs
index 8ffc85e57..427333b5d 100644
--- a/src/commands/list/mod.rs
+++ b/src/commands/list/mod.rs
@@ -210,12 +210,12 @@ pub(crate) fn print_json<T: serde::Serialize>(value: &T) -> anyhow::Result<()> {
/// 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` pins the current
-/// `json-schema = 1` (the behavior-preserving choice; adopting schema 2 is a
-/// deliberate manual edit), so the nag's hint offers that command exactly
-/// when running it would write the pin — decided by the same detection
-/// update runs, so a missing, unreadable, or malformed user config falls
-/// back to naming the manual setting instead (migration plan in
+/// 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 (migration plan in
/// design/list-json-v2.md, reviewed in #3357).
pub(crate) fn resolve_json_schema(repo: &Repository) -> u8 {
use std::sync::Once;
@@ -251,7 +251,7 @@ pub(crate) fn resolve_json_schema(repo: &Repository) -> u8 {
"JSON output is schema 1; a future release switches the default to schema 2"
)
);
- let update_would_pin = worktrunk::config::config_path()
+ 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(
@@ -261,15 +261,15 @@ pub(crate) fn resolve_json_schema(repo: &Repository) -> u8 {
.iter()
.any(|k| matches!(k, worktrunk::config::DeprecationKind::JsonSchemaUnset))
});
- let keep = if update_would_pin {
+ let adopt = if update_would_adopt {
cformat!("run <underline>wt config update</>")
} else {
- cformat!("<underline>json-schema = 1</>")
+ cformat!("set <underline>json-schema = 2</>")
};
eprintln!(
"{}",
hint_message(cformat!(
- "To adopt the new schema set <underline>[list] json-schema = 2</>; to keep this format, {keep}"
+ "To keep this format set <underline>[list] json-schema = 1</>; to adopt the new schema, {adopt}"
))
);
});
diff --git a/src/config/deprecation.rs b/src/config/deprecation.rs
index d937f40e6..4f76fcc31 100644
--- a/src/config/deprecation.rs
+++ b/src/config/deprecation.rs
@@ -16,10 +16,10 @@
//!
//! The table also carries pending default changes
//! ([`DeprecationRule::PendingDefault`]): defaults a future release switches,
-//! which `wt config update` pins to their current 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.
+//! 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
@@ -485,15 +485,15 @@ pub enum DeprecationKind {
/// `timeout-ms` under `[switch.picker]` (removed — picker renders progressively).
SwitchPickerTimeout,
/// `[list] json-schema` unset while the default is scheduled to switch to
- /// schema 2 — `wt config update` pins the current `json-schema = 1`.
+ /// 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 pins a pending default change rather than rewriting
- /// a deprecated pattern. Pending defaults warn at the surface that reads
+ /// 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`
@@ -540,10 +540,11 @@ enum DeprecationRule {
/// but with no warning by construction.
Silent(SilentMigrateFn),
/// Pending default change: a default that a future release switches, which
- /// `wt config update` pins to its current 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 pin would read as an
- /// explicit setting and silence the usage-site nag). Its
+ /// `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 {
@@ -646,27 +647,28 @@ const DEPRECATION_RULES: &[DeprecationRule] = &[
Vec::new()
}
}),
- // [list] json-schema unset → pin json-schema = 1 ahead of the default
- // switching to schema 2. User config only: the key isn't valid in project
- // config, and the top-level pin covers every repo (per-project overrides
- // in user config remain the user's own choice).
+ // [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: pin_json_schema_doc,
+ migrate: adopt_json_schema_doc,
},
];
-/// Pin `[list] json-schema = 1` at the top level when the key is absent.
+/// 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
-/// and a user-file pin would *override* the system value rather than
-/// preserve behavior, so the rule stays inert — the one rule that reads a
+/// 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 pin_json_schema_doc(doc: &mut toml_edit::DocumentMut) -> Deprecations {
+fn adopt_json_schema_doc(doc: &mut toml_edit::DocumentMut) -> Deprecations {
if system_config_defines_json_schema() {
return Vec::new();
}
@@ -679,12 +681,12 @@ fn pin_json_schema_doc(doc: &mut toml_edit::DocumentMut) -> Deprecations {
.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(1));
+ 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", 1.into());
+ t.insert("json-schema", 2.into());
}
_ => return Vec::new(),
}
@@ -745,9 +747,9 @@ fn detect_deprecations_from_doc(
///
/// The load pass excludes [`DeprecationRule::UpdateOnly`] rewrites (cosmetic
/// or still-valid serde fields, so serde doesn't need them applied) and
-/// [`DeprecationRule::PendingDefault`] pins (an in-memory pin would silence
-/// the usage-site nag). Detection and [`compute_migrated_content`] run the
-/// update pass.
+/// [`DeprecationRule::PendingDefault`] writes (an in-memory value would
+/// switch behavior without a config edit and silence the usage-site nag).
+/// 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;
for rule in DEPRECATION_RULES {
@@ -1364,9 +1366,9 @@ impl DeprecationInfo {
}
/// True when the file contains deprecated patterns, as opposed to only
- /// pending-default pins, which deprecate nothing in the file. `wt config
+ /// 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 pin is additive.
+ /// 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())
}
@@ -1462,7 +1464,7 @@ pub fn check_and_migrate(
}
// Pending-default kinds warn at their own usage surface instead of at
- // load, so an info carrying only pins (most user configs until the
+ // 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.
@@ -2227,7 +2229,7 @@ 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 pins it.
+ /// 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";
@@ -3169,9 +3171,9 @@ json-schema = 1
/// rewritten produce no warning and no rewrite; deprecated configs
/// produce both. (Silent renames change the file without warning by
/// design and aren't part of this battery. Every case gets an explicit
- /// json-schema pin appended so only the rule under test drives the diff;
+ /// 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_pin_iff`.)
+ /// at the JSON-emitting surface — see `test_json_schema_adopt_iff`.)
#[test]
fn test_warning_fires_iff_update_changes() {
let untouched = [
@@ -3241,14 +3243,14 @@ 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` pinning the key.
+ /// `wt config update` writing the key.
#[test]
- fn test_json_schema_pin_iff() {
- // Unset → detected and pinned, and applying the update closes the loop.
+ 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 = 1
+ json-schema = 2
"#);
assert!(matches!(
detect_deprecations("", ConfigFileKind::User).as_slice(),
@@ -3279,23 +3281,23 @@ json-schema = 1
}
}
- /// The pin lands inside an existing `[list]` section (either shape)
- /// rather than duplicating it.
+ /// The adopted key lands inside an existing `[list]` section (either
+ /// shape) rather than duplicating it.
#[test]
- fn test_json_schema_pin_joins_existing_list_section() {
+ 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 = 1
+ json-schema = 2
"#);
let migrated =
compute_migrated_content("list = { columns = [\"ci\"] }\n", ConfigFileKind::User);
- insta::assert_snapshot!(migrated, @r#"list = { columns = ["ci"] , json-schema = 1 }"#);
+ insta::assert_snapshot!(migrated, @r#"list = { columns = ["ci"] , json-schema = 2 }"#);
- // A `list` that exists only implicitly (via a subtable) hosts the pin
+ // 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(
@@ -3304,7 +3306,7 @@ json-schema = 1
);
insta::assert_snapshot!(migrated, @r#"
[list]
- json-schema = 1
+ json-schema = 2
[list.custom-columns]
flag = "echo hi"
"#);
@@ -3329,12 +3331,13 @@ json-schema = 1
}
}
- /// The pin 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 pin at load would read as an explicit
- /// setting and silence the usage-site nag.
+ /// 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_pin_scope() {
+ 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), "");
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.snap
index 473d43bea..8d84b9445 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
@@ -19,7 +19,7 @@ expression: "migration_diff(content, &migrated)"
-[select]
+[list]
-+json-schema = 1
++json-schema = 2
+
+[switch.picker]
pager = "delta"
diff --git a/tests/integration_tests/config_show.rs b/tests/integration_tests/config_show.rs
index fd48f5a20..5ac5122f2 100644
--- a/tests/integration_tests/config_show.rs
+++ b/tests/integration_tests/config_show.rs
@@ -3328,7 +3328,7 @@ fn test_config_update_print_emits_migrated_without_writing(repo: TestRepo) {
/// `wt config update` with no deprecated settings reports nothing to do
#[rstest]
fn test_config_update_no_deprecations(repo: TestRepo) {
- // Clean config: no deprecated patterns, json-schema explicitly pinned
+ // Clean config: no deprecated patterns, json-schema explicitly set
fs::write(
repo.test_config_path(),
r#"worktree-path = "../{{ repo }}.{{ branch }}"
@@ -3348,10 +3348,11 @@ json-schema = 1
});
}
-/// `wt config update` pins `[list] json-schema = 1` when the key is unset,
-/// and a second run has nothing left to do — the pending-default loop closes.
+/// `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.
#[rstest]
-fn test_config_update_pins_json_schema(repo: TestRepo) {
+fn test_config_update_adopts_json_schema(repo: TestRepo) {
fs::write(
repo.test_config_path(),
"worktree-path = \"../{{ repo }}.{{ branch }}\"\n",
@@ -3368,7 +3369,7 @@ fn test_config_update_pins_json_schema(repo: TestRepo) {
assert_eq!(
fs::read_to_string(repo.test_config_path()).unwrap(),
- "worktree-path = \"../{{ repo }}.{{ branch }}\"\n\n[list]\njson-schema = 1\n"
+ "worktree-path = \"../{{ repo }}.{{ branch }}\"\n\n[list]\njson-schema = 2\n"
);
let output = repo
@@ -3383,16 +3384,16 @@ fn test_config_update_pins_json_schema(repo: TestRepo) {
}
/// A system config that sets `[list] json-schema` makes the resolved value
-/// explicit, so `wt config update` must not pin the user file — a user-file
-/// pin would override the system value and flip JSON output.
+/// explicit, so `wt config update` must not write the user file — a user-file
+/// value would override the deliberate system-level choice.
#[rstest]
-fn test_config_update_json_schema_pin_defers_to_system_config(repo: TestRepo) {
+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 = 2\n").unwrap();
+ 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 the pin alongside it.
+ // rewrite but must not insert json-schema alongside it.
fs::write(repo.test_config_path(), "[merge]\nno-ff = true\n").unwrap();
let mut cmd = repo.wt_command();
@@ -3404,7 +3405,7 @@ fn test_config_update_json_schema_pin_defers_to_system_config(repo: TestRepo) {
assert_eq!(
fs::read_to_string(repo.test_config_path()).unwrap(),
"[merge]\nff = false\n",
- "the no-ff rewrite applies; the json-schema pin must not"
+ "the no-ff rewrite applies; the json-schema write must not"
);
}
diff --git a/tests/integration_tests/list.rs b/tests/integration_tests/list.rs
index 274eb11df..edb99fb2c 100644
--- a/tests/integration_tests/list.rs
+++ b/tests/integration_tests/list.rs
@@ -248,7 +248,7 @@ fn test_list_json_schema_2_envelope(mut repo: TestRepo) {
/// 1 or 2 is an error.
#[rstest]
fn test_list_json_schema_selection(repo: TestRepo) {
- // Unset with no user config file → nag names the setting to write by
+ // 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()
@@ -260,8 +260,8 @@ fn test_list_json_schema_selection(repo: TestRepo) {
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"),
- "unset key should nag with the manual setting: {stderr}"
+ stderr.contains("json-schema = 1") && stderr.contains("json-schema = 2"),
+ "unset key should nag with the manual settings: {stderr}"
);
assert!(
!stderr.contains("config update"),
@@ -269,7 +269,7 @@ fn test_list_json_schema_selection(repo: TestRepo) {
);
// Unset with a user config file present → the hint offers wt config
- // update, which pins json-schema = 1.
+ // update, which writes json-schema = 2.
repo.write_test_config("");
let output = repo
.wt_command()
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.snap
index 37c8c8648..08883b3c6 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
@@ -52,12 +52,12 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index e69de29..83a9aa1 100644
+  index e69de29..16ea47f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -0,0 +1,2 @@
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --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.snap
index 7336700bc..c7607ed1d 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
@@ -50,14 +50,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index d44225f85..35ea49988 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
@@ -46,14 +46,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index 880d28338..f4bad3368 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
@@ -50,14 +50,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index ca5b39bf9..fcb633e47 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
@@ -52,7 +52,7 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index dee4883..e90e8fd 100644
+  index dee4883..cfec3c7 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1,2 +1,5 @@
@@ -62,7 +62,7 @@ exit_code: 0
  +pre-start = "ln -sf {{ repo_path }}/node_modules"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_no_cd_deprecation.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_no_cd_deprecation.snap
index bf87829bb..fdd96baec 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_no_cd_deprecation.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_no_cd_deprecation.snap
@@ -51,7 +51,7 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index ec5c19e..5c6669a 100644
+  index ec5c19e..3d9f6a7 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1,2 +1,5 @@
@@ -60,7 +60,7 @@ exit_code: 0
  +cd = false
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_no_ff_deprecation.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_no_ff_deprecation.snap
index 44aacbe48..5d7359c32 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_no_ff_deprecation.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_no_ff_deprecation.snap
@@ -51,7 +51,7 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index f4de629..2ae2c3d 100644
+  index f4de629..abacac3 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1,2 +1,5 @@
@@ -60,7 +60,7 @@ exit_code: 0
  +ff = false
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --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.snap
index 5117db371..3724b142f 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
@@ -51,7 +51,7 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index de80729..c3295a3 100644
+  index de80729..6a26487 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1,4 +1,7 @@
@@ -62,7 +62,7 @@ exit_code: 0
  command = "llm -m gpt-4"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_select_section_deprecation.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_select_section_deprecation.snap
index e67912c3c..981fe6828 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_displays_select_section_deprecation.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_displays_select_section_deprecation.snap
@@ -51,7 +51,7 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index 0d6352a..62cd06c 100644
+  index 0d6352a..d8b30e0 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1,2 +1,5 @@
@@ -60,7 +60,7 @@ exit_code: 0
  pager = "delta --paging=never"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --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.snap
index aa812c6d0..866f893a4 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
@@ -50,14 +50,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index 30a16100e..cc6f4462f 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
@@ -53,12 +53,12 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index e69de29..83a9aa1 100644
+  index e69de29..16ea47f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -0,0 +1,2 @@
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --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.snap
index 953f87242..81cf6e171 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
@@ -50,12 +50,12 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index e69de29..83a9aa1 100644
+  index e69de29..16ea47f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -0,0 +1,2 @@
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --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.snap
index fb24c49ba..4be523db9 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
@@ -50,12 +50,12 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index e69de29..83a9aa1 100644
+  index e69de29..16ea47f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -0,0 +1,2 @@
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --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.snap
index 241d55150..b8ffee2e1 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
@@ -50,12 +50,12 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index e69de29..83a9aa1 100644
+  index e69de29..16ea47f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -0,0 +1,2 @@
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --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.snap
index e8b935af5..a4bec0f57 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
@@ -52,7 +52,7 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index 6114dbb..0167af2 100644
+  index 6114dbb..c559278 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -2,3 +2,6 @@ worktree-path = "../{{ repo }}.{{ branch }}"
@@ -61,7 +61,7 @@ exit_code: 0
  command = "nonexistent-llm-command-12345 -m test-model"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
 
diff --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.snap
index 2f1a3bb96..7979ccff8 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
@@ -52,7 +52,7 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a10f823..cea088e 100644
+  index a10f823..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
@@ -61,7 +61,7 @@ exit_code: 0
  +worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index 48d45e35d..3a1ddb337 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
@@ -52,7 +52,7 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a10f823..cea088e 100644
+  index a10f823..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
@@ -61,7 +61,7 @@ exit_code: 0
  +worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index d5c330d63..284bf9901 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
@@ -52,7 +52,7 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a10f823..cea088e 100644
+  index a10f823..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
@@ -61,7 +61,7 @@ exit_code: 0
  +worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index fb07f914a..9026f2559 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
@@ -52,7 +52,7 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a10f823..cea088e 100644
+  index a10f823..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
@@ -61,7 +61,7 @@ exit_code: 0
  +worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index 6daa52efd..8dd4b0ee7 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
@@ -50,14 +50,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index 4b9480488..62fe721cb 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
@@ -50,14 +50,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index 6daa52efd..8dd4b0ee7 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
@@ -50,14 +50,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index e160c2974..3d69a0441 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
@@ -50,14 +50,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index 1db58d09b..71242b1e6 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
@@ -50,14 +50,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index f42686bc0..a218bedc1 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
@@ -50,7 +50,7 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a10f823..cea088e 100644
+  index a10f823..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
@@ -59,7 +59,7 @@ exit_code: 0
  +worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index b043691cb..991ce205c 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
@@ -59,12 +59,12 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index e69de29..83a9aa1 100644
+  index e69de29..16ea47f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -0,0 +1,2 @@
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --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.snap
index 0b046f83e..9df6735a2 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
@@ -50,14 +50,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index 8a827db33..fffb89e2d 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
@@ -51,12 +51,12 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index e69de29..83a9aa1 100644
+  index e69de29..16ea47f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -0,0 +1,2 @@
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --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.snap
index 7b03de0b1..5d64019ee 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
@@ -50,14 +50,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index 242901938..8b0c48f54 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
@@ -50,14 +50,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index a2252fbc6..19ca6a025 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
@@ -50,14 +50,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index 22d225930..fc36748f2 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
@@ -45,14 +45,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index 96e9ad803..c3f95ada1 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
@@ -52,12 +52,12 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index e69de29..83a9aa1 100644
+  index e69de29..16ea47f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -0,0 +1,2 @@
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --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.snap
index aad627d20..983e1ce9f 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
@@ -50,14 +50,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index 4d81c3231..3fa6a0258 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
@@ -51,12 +51,12 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index e69de29..83a9aa1 100644
+  index e69de29..16ea47f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -0,0 +1,2 @@
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --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.snap
index d5c752770..0d6363802 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
@@ -52,14 +52,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index 99349e2e2..55ff2a9b8 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
@@ -51,14 +51,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index 61c0f9a00..85ff91b44 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
@@ -51,12 +51,12 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index e69de29..83a9aa1 100644
+  index e69de29..16ea47f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -0,0 +1,2 @@
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --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.snap
index d944ff1aa..470202c20 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
@@ -50,14 +50,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index 47714e315..7b9641c5e 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
@@ -51,7 +51,7 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index 2e0e0bb..9dc4e69 100644
+  index 2e0e0bb..74c0cea 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1,4 +1,7 @@
@@ -64,7 +64,7 @@ exit_code: 0
  +platform = "github"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
▲ Key ci belongs in project config as [forge]
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index cbebf5c5a..2f8f4d888 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
@@ -50,7 +50,7 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a10f823..cea088e 100644
+  index a10f823..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
@@ -59,7 +59,7 @@ exit_code: 0
  +worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index 5fd818fc9..bb77ff942 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
@@ -51,12 +51,12 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index e69de29..83a9aa1 100644
+  index e69de29..16ea47f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -0,0 +1,2 @@
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --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.snap
index 928ee4c94..4afe16dec 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
@@ -51,12 +51,12 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index e69de29..83a9aa1 100644
+  index e69de29..16ea47f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -0,0 +1,2 @@
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --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.snap
index 6dcab69c4..4d3658b05 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
@@ -51,12 +51,12 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index e69de29..83a9aa1 100644
+  index e69de29..16ea47f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -0,0 +1,2 @@
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --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.snap
index f7ad451b2..faf7172bb 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
@@ -50,7 +50,7 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a10f823..cea088e 100644
+  index a10f823..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
@@ -59,7 +59,7 @@ exit_code: 0
  +worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index 8252064e8..1e989f633 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
@@ -50,7 +50,7 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index 6019600..c468244 100644
+  index 6019600..d8930f0 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1,4 +1,7 @@
@@ -62,7 +62,7 @@ exit_code: 0
  +command = "llm"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
▲ Unknown key commit-gen will be ignored
  worktree-path = "../{{ repo }}.{{ branch }}"
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_whitespace_only_project_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_whitespace_only_project_config.snap
index aa812c6d0..866f893a4 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_whitespace_only_project_config.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_whitespace_only_project_config.snap
@@ -50,14 +50,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index faa5bbd0c..49f19f8fb 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
@@ -50,14 +50,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
↳ Optional system config not found @ /etc/xdg/worktrunk/config.toml
diff --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.snap
index 2c300d4fe..2a224cece 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
@@ -58,14 +58,14 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
  worktree-path = "../{{ repo }}.{{ branch }}"
diff --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.snap
index 7c9bd7cdb..488538ff3 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
@@ -51,12 +51,12 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index e69de29..83a9aa1 100644
+  index e69de29..16ea47f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -0,0 +1,2 @@
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --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.snap
index 8ec59e608..5b3dee029 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
@@ -51,12 +51,12 @@ exit_code: 0
↳ To apply: wt config update
○ Proposed diff:
  diff --git a/config.toml/current b/config.toml/migrated
-  index e69de29..83a9aa1 100644
+  index e69de29..16ea47f 100644
  --- a/config.toml/current
  +++ b/config.toml/migrated
  @@ -0,0 +1,2 @@
  +[list]
-  +json-schema = 1
+  +json-schema = 2
↳ Empty file (using defaults)
PROJECT CONFIG @ _REPO_/.config/wt.toml
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_update_pins_json_schema.snap b/tests/snapshots/integration__integration_tests__config_show__config_update_adopts_json_schema.snap
similarity index 95%
rename from tests/snapshots/integration__integration_tests__config_show__config_update_pins_json_schema.snap
rename to tests/snapshots/integration__integration_tests__config_show__config_update_adopts_json_schema.snap
index 4527e543d..58826f8be 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_update_pins_json_schema.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_update_adopts_json_schema.snap
@@ -51,12 +51,12 @@ exit_code: 0
▲ User config: [list] json-schema is unset; a future release switches the JSON default to schema 2
○ Proposed diff:
  diff --git a/test-config.toml/current b/test-config.toml/migrated
-  index a30ca31..cea088e 100644
+  index a30ca31..894e11f 100644
  --- a/test-config.toml/current
  +++ b/test-config.toml/migrated
  @@ -1 +1,4 @@
  worktree-path = "../{{ repo }}.{{ branch }}"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
✓ Updated user config
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_update_applies_approved_commands_migration.snap b/tests/snapshots/integration__integration_tests__config_show__config_update_applies_approved_commands_migration.snap
index 856e0b97c..c1d59e9cb 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_update_applies_approved_commands_migration.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_update_applies_approved_commands_migration.snap
@@ -52,7 +52,7 @@ exit_code: 0
▲ User config: [list] json-schema is unset; a future release switches the JSON default to schema 2
○ Proposed diff:
  diff --git a/test-config.toml/current b/test-config.toml/migrated
-  index 51f8ab1..cea088e 100644
+  index 51f8ab1..894e11f 100644
  --- a/test-config.toml/current
  +++ b/test-config.toml/migrated
  @@ -1,4 +1,4 @@
@@ -61,6 +61,6 @@ exit_code: 0
  -[projects."github.com/user/repo"]
  -approved-commands = ["npm install", "npm test"]
  +[list]
-  +json-schema = 1
+  +json-schema = 2
○ Copied approved commands to approvals.toml
✓ Updated user config
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_update_applies_commit_generation_migration.snap b/tests/snapshots/integration__integration_tests__config_show__config_update_applies_commit_generation_migration.snap
index c9b7737d1..14f6f6128 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_update_applies_commit_generation_migration.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_update_applies_commit_generation_migration.snap
@@ -52,7 +52,7 @@ exit_code: 0
▲ User config: [list] json-schema is unset; a future release switches the JSON default to schema 2
○ Proposed diff:
  diff --git a/test-config.toml/current b/test-config.toml/migrated
-  index 40d0385..7f2d33c 100644
+  index 40d0385..c495877 100644
  --- a/test-config.toml/current
  +++ b/test-config.toml/migrated
  @@ -1,5 +1,7 @@
@@ -65,5 +65,5 @@ exit_code: 0
  +command = "llm -m haiku"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
✓ Updated user config
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_update_applies_template_var_migration.snap b/tests/snapshots/integration__integration_tests__config_show__config_update_applies_template_var_migration.snap
index 28830ee5b..c73dd32a3 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_update_applies_template_var_migration.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_update_applies_template_var_migration.snap
@@ -54,7 +54,7 @@ exit_code: 0
▲ User config: [list] json-schema is unset; a future release switches the JSON default to schema 2
○ Proposed diff:
  diff --git a/test-config.toml/current b/test-config.toml/migrated
-  index 7cc556b..fbfd97d 100644
+  index 7cc556b..fa857a1 100644
  --- a/test-config.toml/current
  +++ b/test-config.toml/migrated
  @@ -1,2 +1,5 @@
@@ -64,5 +64,5 @@ exit_code: 0
  +pre-start = "ln -sf {{ repo_path }}/node_modules {{ worktree_path }}/node_modules"
  +
  +[list]
-  +json-schema = 1
+  +json-schema = 2
✓ Updated user config
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_create.snap b/tests/snapshots/integration__integration_tests__help__help_config_create.snap
index 5e9b8e856..a9b32c087 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_create.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_create.snap
@@ -165,7 +165,7 @@ Creates ~/.config/worktrunk/config.toml with the following content:
  # branches = false # Include branches without worktrees (--branches)
  # remotes = false # Include remote-only branches (--remotes)
  #
-  # json-schema = 1 # JSON output schema: 1 (current, bare array) or 2 (envelope); unset emits 1 with a warning
+  # json-schema = 2 # JSON output schema: 2 (envelope) or 1 (bare array, the current default); unset emits 1 with a warning
  #
  # columns = ["branch", "status", "ci", "path"] # Columns to show, in order — built-ins or custom headers (omit for the default set)
  #
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_long.snap b/tests/snapshots/integration__integration_tests__help__help_config_long.snap
index 2720590c8..5b31fd7fc 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_long.snap
@@ -213,7 +213,7 @@ Persistent flag values for wt list. Override on command line as needed.
  branches = false # Include branches without worktrees (--branches)
  remotes = false # Include remote-only branches (--remotes)
 
-  json-schema = 1 # JSON output schema: 1 (current, bare array) or 2 (envelope); unset emits 1 with a warning
+  json-schema = 2 # JSON output schema: 2 (envelope) or 1 (bare array, the current default); unset emits 1 with a warning
 
  columns = ["branch", "status", "ci", "path"] # Columns to show, in order — built-ins or custom headers (omit for the default set)
 
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
index 07116383b..62f4ff9d5 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
@@ -274,7 +274,7 @@ These appear across all columns while the table is loading:
--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 pins = 1); a future release flips the default to
+(wt config update adopts = 2); a future release flips the default to
schema 2 and later removes 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.snap
index 0e5b3fb51..a9df5407d 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
@@ -337,7 +337,7 @@ These appear across all columns while the table is loading:
--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 pins = 1); a future release flips the default to
+(wt config update adopts = 2); a future release flips the default to
schema 2 and later removes schema 1.
Schema 2
diff --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.snap
index e95922d88..baea02a23 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
@@ -244,4 +244,4 @@ exit_code: 0
----- stderr -----
▲ JSON output is schema 1; a future release switches the default to schema 2
-↳ To adopt the new schema set [list] json-schema = 2; to keep this format, json-schema = 1
+↳ To keep this format set [list] json-schema = 1; to adopt the new schema, set json-schema = 2
diff --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.snap
index 42e7df762..eb9592651 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
@@ -283,4 +283,4 @@ exit_code: 0
----- stderr -----
▲ JSON output is schema 1; a future release switches the default to schema 2
-↳ To adopt the new schema set [list] json-schema = 2; to keep this format, json-schema = 1
+↳ To keep this format set [list] json-schema = 1; to adopt the new schema, set json-schema = 2
diff --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.snap
index c9e4c2290..4ac00f899 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
@@ -244,4 +244,4 @@ exit_code: 0
----- stderr -----
▲ JSON output is schema 1; a future release switches the default to schema 2
-↳ To adopt the new schema set [list] json-schema = 2; to keep this format, json-schema = 1
+↳ To keep this format set [list] json-schema = 1; to adopt the new schema, set json-schema = 2
diff --git a/tests/snapshots/integration__integration_tests__list__list_json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__list_json_with_metadata.snap
index 1045af70d..89dcae034 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
@@ -284,4 +284,4 @@ exit_code: 0
----- stderr -----
▲ JSON output is schema 1; a future release switches the default to schema 2
-↳ To adopt the new schema set [list] json-schema = 2; to keep this format, json-schema = 1
+↳ To keep this format set [list] json-schema = 1; to adopt the new schema, set json-schema = 2
diff --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.snap
index 15bc79f99..2689fd39e 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
@@ -282,4 +282,4 @@ exit_code: 0
----- stderr -----
▲ JSON output is schema 1; a future release switches the default to schema 2
-↳ To adopt the new schema set [list] json-schema = 2; to keep this format, json-schema = 1
+↳ To keep this format set [list] json-schema = 1; to adopt the new schema, set json-schema = 2