Skip to content

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

feat(alias): canonicalize hyphens to underscores in variable names (#2096)

Maximilian Roos597c7d9536e9
diff --git a/docs/content/step.md b/docs/content/step.md
index 0972a7c5e..cc1e1a525 100644
--- a/docs/content/step.md
+++ b/docs/content/step.md
@@ -822,7 +822,9 @@ deploy = "make deploy BRANCH={{ branch }}"
port = "echo http://localhost:{{ branch | hash_port }}"
```
-{{ terminal(cmd="wt step deploy # run the alias|||wt step deploy --dry-run # show expanded command|||wt step deploy --env=staging # pass template variable|||wt step deploy --var env=staging # equivalent long form|||wt step deploy --yes # skip approval prompt") }}
+{{ terminal(cmd="wt step deploy # run the alias|||wt step deploy --dry-run # show expanded command|||wt step deploy --env=staging # pass template variable|||wt step deploy --var env=staging # equivalent long form|||wt step deploy --my-var=value # hyphens become underscores (__WT_OPEN2__ my_var __WT_CLOSE2__)|||wt step deploy --yes # skip approval prompt") }}
+
+Hyphens in variable names are canonicalized to underscores at parse time, so `--my-var=value` is referenced as `{{ my_var }}` in templates. This lets flags use natural kebab-case while avoiding the minijinja parser's interpretation of `{{ my-var }}` as subtraction.
Multi-line aliases work too. This `up` alias fetches all remotes and rebases each worktree onto its upstream, skipping worktrees without a tracking branch or with a rebase already in progress:
diff --git a/skills/worktrunk/reference/step.md b/skills/worktrunk/reference/step.md
index a76d8b582..21f2b592a 100644
--- a/skills/worktrunk/reference/step.md
+++ b/skills/worktrunk/reference/step.md
@@ -872,9 +872,12 @@ $ wt step deploy # run the alias
$ wt step deploy --dry-run # show expanded command
$ wt step deploy --env=staging # pass template variable
$ wt step deploy --var env=staging # equivalent long form
+$ wt step deploy --my-var=value # hyphens become underscores ({{ my_var }})
$ wt step deploy --yes # skip approval prompt
```
+Hyphens in variable names are canonicalized to underscores at parse time, so `--my-var=value` is referenced as `{{ my_var }}` in templates. This lets flags use natural kebab-case while avoiding the minijinja parser's interpretation of `{{ my-var }}` as subtraction.
+
Multi-line aliases work too. This `up` alias fetches all remotes and rebases each worktree onto its upstream, skipping worktrees without a tracking branch or with a rebase already in progress:
```toml
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 56abed938..cc8598f92 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -1162,9 +1162,12 @@ $ wt step deploy # run the alias
$ wt step deploy --dry-run # show expanded command
$ wt step deploy --env=staging # pass template variable
$ wt step deploy --var env=staging # equivalent long form
+$ wt step deploy --my-var=value # hyphens become underscores ({{ my_var }})
$ wt step deploy --yes # skip approval prompt
```
+Hyphens in variable names are canonicalized to underscores at parse time, so `--my-var=value` is referenced as `{{ my_var }}` in templates. This lets flags use natural kebab-case while avoiding the minijinja parser's interpretation of `{{ my-var }}` as subtraction.
+
Multi-line aliases work too. This `up` alias fetches all remotes and rebases each worktree onto its upstream, skipping worktrees without a tracking branch or with a rebase already in progress:
```toml
diff --git a/src/commands/alias.rs b/src/commands/alias.rs
index 0ce47a077..9dd68dd0c 100644
--- a/src/commands/alias.rs
+++ b/src/commands/alias.rs
@@ -78,6 +78,10 @@ impl AliasOptions {
/// so `--env=staging` is equivalent to `--var env=staging`. The `=` is
/// required — bare `--key` flags (without a value) are rejected. Use
/// `--var KEY=VALUE` if a variable name collides with a built-in flag.
+ ///
+ /// Hyphens in variable names are canonicalized to underscores so users can
+ /// write `--my-var=value` and reference `{{ my_var }}` in templates
+ /// (minijinja parses `{{ my-var }}` as subtraction).
pub fn parse(args: Vec<String>) -> anyhow::Result<Self> {
let Some(name) = args.first().cloned() else {
bail!("Missing alias name");
@@ -109,7 +113,7 @@ impl AliasOptions {
if key.is_empty() {
bail!("Variable name must not be empty (got '--={value}')");
}
- vars.push((key.to_string(), value.to_string()));
+ vars.push((key.replace('-', "_"), value.to_string()));
} else {
bail!(
"Unknown flag '{arg}' for alias '{name}' (use --{rest}=VALUE to pass a variable)"
@@ -137,7 +141,7 @@ fn parse_var(s: &str) -> anyhow::Result<(String, String)> {
if key.is_empty() {
bail!("--var key must not be empty (got '={value}')");
}
- Ok((key.to_string(), value.to_string()))
+ Ok((key.replace('-', "_"), value.to_string()))
}
/// Determine whether an alias requires project-config approval.
@@ -569,6 +573,90 @@ mod tests {
],
}
"#);
+ // Hyphens in shorthand key are canonicalized to underscores
+ assert_debug_snapshot!(parse(&["deploy", "--my-var=value"]).unwrap(), @r#"
+ AliasOptions {
+ name: "deploy",
+ dry_run: false,
+ yes: false,
+ vars: [
+ (
+ "my_var",
+ "value",
+ ),
+ ],
+ }
+ "#);
+ // Hyphens in --var KEY=VALUE are canonicalized too
+ assert_debug_snapshot!(parse(&["deploy", "--var", "my-var=value"]).unwrap(), @r#"
+ AliasOptions {
+ name: "deploy",
+ dry_run: false,
+ yes: false,
+ vars: [
+ (
+ "my_var",
+ "value",
+ ),
+ ],
+ }
+ "#);
+ // Hyphens in --var=KEY=VALUE form
+ assert_debug_snapshot!(parse(&["deploy", "--var=my-var=value"]).unwrap(), @r#"
+ AliasOptions {
+ name: "deploy",
+ dry_run: false,
+ yes: false,
+ vars: [
+ (
+ "my_var",
+ "value",
+ ),
+ ],
+ }
+ "#);
+ // Already-underscored keys pass through unchanged
+ assert_debug_snapshot!(parse(&["deploy", "--my_var=value"]).unwrap(), @r#"
+ AliasOptions {
+ name: "deploy",
+ dry_run: false,
+ yes: false,
+ vars: [
+ (
+ "my_var",
+ "value",
+ ),
+ ],
+ }
+ "#);
+ // Multiple hyphens in a single key
+ assert_debug_snapshot!(parse(&["deploy", "--long-var-name=x"]).unwrap(), @r#"
+ AliasOptions {
+ name: "deploy",
+ dry_run: false,
+ yes: false,
+ vars: [
+ (
+ "long_var_name",
+ "x",
+ ),
+ ],
+ }
+ "#);
+ // Hyphens in value are preserved (only key is canonicalized)
+ assert_debug_snapshot!(parse(&["deploy", "--region=us-east-1"]).unwrap(), @r#"
+ AliasOptions {
+ name: "deploy",
+ dry_run: false,
+ yes: false,
+ vars: [
+ (
+ "region",
+ "us-east-1",
+ ),
+ ],
+ }
+ "#);
}
#[test]
diff --git a/tests/snapshots/integration__integration_tests__help__help_step_long.snap b/tests/snapshots/integration__integration_tests__help__help_step_long.snap
index 2a454b1eb..735c6b0e5 100644
--- a/tests/snapshots/integration__integration_tests__help__help_step_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_step_long.snap
@@ -111,8 +111,11 @@ Custom command templates configured in user config (~/.config/worktrunk/conf
  wt step deploy --dry-run # show expanded command
  wt step deploy --env=staging # pass template variable
  wt step deploy --var env=staging # equivalent long form
+  wt step deploy --my-var=value # hyphens become underscores ({{ my_var }})
  wt step deploy --yes # skip approval prompt
+Hyphens in variable names are canonicalized to underscores at parse time, so --my-var=value is referenced as {{ my_var }} in templates. This lets flags use natural kebab-case while avoiding the minijinja parser's interpretation of {{ my-var }} as subtraction.
+
Multi-line aliases work too. This up alias fetches all remotes and rebases each worktree onto its upstream, skipping worktrees without a tracking branch or with a rebase already in progress:
  # ~/.config/worktrunk/config.toml