v3.46.4

docs(changelog): add entry for #2592
fix(completion): use posix whitespace in fish sed regex (#2592 )
2026-06-19 05:41:39 +00:00 · 2025-12-24 18:57:17 -03:00 · 2025-12-24 18:55:21 -03:00 · 2025-12-24 18:48:54 -03:00 · 2025-12-23 20:36:40 +01:00 · 2025-12-23 20:35:57 +01:00
15 changed files with 371 additions and 271 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,20 @@
 # Changelog

-## v3.46.0 - 2025-12-18
+## v3.46.4 - 2025-12-24
+
+- Fixed regressions in completion script for Fish (#2591, #2604, #2592 by
+  @WinkelCode).
+
+## v3.46.3 - 2025-12-19
+
+- Fixed regression in completion script for zsh (#2593, #2594 by @vmaerten).
+
+## v3.46.2 - 2025-12-18
+
+- Fixed a regression on previous release that affected variables passed via
+  command line (#2588, #2589 by @vmaerten).
+
+## v3.46.1 - 2025-12-18

 ### ✨ Features

--- a/cmd/task/task.go
+++ b/cmd/task/task.go
@@ -172,18 +172,23 @@ func run() error {
 		calls = append(calls, &task.Call{Task: "default"})
 	}

+	// Merge CLI variables first (e.g. FOO=bar) so they take priority over Taskfile defaults
+	e.Taskfile.Vars.Merge(globals, nil)
+
+	// Then ReverseMerge special variables so they're available for templating
 	cliArgsPostDashQuoted, err := args.ToQuotedString(cliArgsPostDash)
 	if err != nil {
 		return err
 	}
-	globals.Set("CLI_ARGS", ast.Var{Value: cliArgsPostDashQuoted})
-	globals.Set("CLI_ARGS_LIST", ast.Var{Value: cliArgsPostDash})
-	globals.Set("CLI_FORCE", ast.Var{Value: flags.Force || flags.ForceAll})
-	globals.Set("CLI_SILENT", ast.Var{Value: flags.Silent})
-	globals.Set("CLI_VERBOSE", ast.Var{Value: flags.Verbose})
-	globals.Set("CLI_OFFLINE", ast.Var{Value: flags.Offline})
-	globals.Set("CLI_ASSUME_YES", ast.Var{Value: flags.AssumeYes})
-	e.Taskfile.Vars.ReverseMerge(globals, nil)
+	specialVars := ast.NewVars()
+	specialVars.Set("CLI_ARGS", ast.Var{Value: cliArgsPostDashQuoted})
+	specialVars.Set("CLI_ARGS_LIST", ast.Var{Value: cliArgsPostDash})
+	specialVars.Set("CLI_FORCE", ast.Var{Value: flags.Force || flags.ForceAll})
+	specialVars.Set("CLI_SILENT", ast.Var{Value: flags.Silent})
+	specialVars.Set("CLI_VERBOSE", ast.Var{Value: flags.Verbose})
+	specialVars.Set("CLI_OFFLINE", ast.Var{Value: flags.Offline})
+	specialVars.Set("CLI_ASSUME_YES", ast.Var{Value: flags.AssumeYes})
+	e.Taskfile.Vars.ReverseMerge(specialVars, nil)
 	if !flags.Watch {
 		e.InterceptInterruptSignals()
 	}
--- a/completion/fish/task.fish
+++ b/completion/fish/task.fish
@@ -54,7 +54,7 @@ function __task_get_tasks --description "Prints all available tasks with their d
  end

  # Grab names and descriptions (if any) of the tasks
-  set -l output (echo $rawOutput | sed -e '1d; s/\* \(.*\):\s\{2,\}\(.*\)\s\{2,\}(\(aliases.*\))/\1\t\2\t\3/' -e 's/\* \(.*\):\s\{2,\}\(.*\)/\1\t\2/'| string split0)
+  set -l output (echo $rawOutput | sed -e '1d; s/\* \(.*\):[[:space:]]\{2,\}\(.*\)[[:space:]]\{2,\}(\(aliases.*\))/\1\t\2\t\3/' -e 's/\* \(.*\):[[:space:]]\{2,\}\(.*\)/\1\t\2/'| string split0)
  if test $output
    echo $output
  end
--- a/completion/zsh/_task
+++ b/completion/zsh/_task
@@ -34,7 +34,7 @@ function __task_list() {
    fi

    # Check if global flag is set
-    if (( ${+opt_args[(i)-g|--global]} )); then
+    if (( ${+opt_args[-g]} || ${+opt_args[--global]} )); then
        cmd+=(--global)
    fi

--- a/executor_test.go
+++ b/executor_test.go
@@ -263,6 +263,23 @@ func TestVars(t *testing.T) {
 			task.WithSilent(true),
 		),
 	)
+	NewExecutorTest(t,
+		WithName("cli-var-priority-default"),
+		WithExecutorOptions(
+			task.WithDir("testdata/vars"),
+			task.WithSilent(true),
+		),
+		WithTask("cli-var-priority"),
+	)
+	NewExecutorTest(t,
+		WithName("cli-var-priority-override"),
+		WithExecutorOptions(
+			task.WithDir("testdata/vars"),
+			task.WithSilent(true),
+		),
+		WithTask("cli-var-priority"),
+		WithVar("CLI_VAR", "from_cli"),
+	)
 }

 func TestRequires(t *testing.T) {
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.24.0
 require (
 	github.com/Ladicle/tabwriter v1.0.0
 	github.com/Masterminds/semver/v3 v3.4.0
-	github.com/alecthomas/chroma/v2 v2.20.0
+	github.com/alecthomas/chroma/v2 v2.21.1
 	github.com/chainguard-dev/git-urls v1.0.2
 	github.com/davecgh/go-spew v1.1.1
 	github.com/dominikbraun/graph v0.23.0
--- a/go.sum
+++ b/go.sum
@@ -18,6 +18,8 @@ github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8v
 github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
 github.com/alecthomas/chroma/v2 v2.20.0 h1:sfIHpxPyR07/Oylvmcai3X/exDlE8+FA820NTz+9sGw=
 github.com/alecthomas/chroma/v2 v2.20.0/go.mod h1:e7tViK0xh/Nf4BYHl00ycY6rV7b8iXBksI9E359yNmA=
+github.com/alecthomas/chroma/v2 v2.21.1 h1:FaSDrp6N+3pphkNKU6HPCiYLgm8dbe5UXIXcoBhZSWA=
+github.com/alecthomas/chroma/v2 v2.21.1/go.mod h1:NqVhfBR0lte5Ouh3DcthuUCTUpDC9cxBOfyMbMQPs3o=
 github.com/alecthomas/repr v0.5.1 h1:E3G4t2QbHTSNpPKBgMTln5KLkZHLOcU7r37J4pXBuIg=
 github.com/alecthomas/repr v0.5.1/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/aws/aws-sdk-go-v2 v1.36.3 h1:mJoei2CxPutQVxaATCzDUjcZEjVRdpsiiXi2o38yqWM=
--- a/internal/version/version.txt
+++ b/internal/version/version.txt
@@ -1 +1 @@
-3.46.1
+3.46.4
--- a/testdata/vars/Taskfile.yml
+++ b/testdata/vars/Taskfile.yml
@@ -49,3 +49,10 @@ tasks:
      - echo "{{.MESSAGE}}"

  from-dot-env: echo '{{.DOT_ENV_VAR}}'
+
+  # Test that CLI variables take priority over Taskfile defaults
+  cli-var-priority:
+    vars:
+      CLI_VAR: '{{.CLI_VAR | default "default_value"}}'
+    cmds:
+      - echo '{{.CLI_VAR}}'
--- a/testdata/vars/testdata/TestVars-cli-var-priority-default.golden
+++ b/testdata/vars/testdata/TestVars-cli-var-priority-default.golden
@@ -0,0 +1 @@
+default_value
--- a/testdata/vars/testdata/TestVars-cli-var-priority-override.golden
+++ b/testdata/vars/testdata/TestVars-cli-var-priority-override.golden
@@ -0,0 +1 @@
+from_cli
--- a/website/package.json
+++ b/website/package.json
@@ -23,5 +23,5 @@
    "vitepress-plugin-llms": "^1.9.1",
    "vue": "^3.5.18"
  },
-  "packageManager": "pnpm@10.26.0+sha512.3b3f6c725ebe712506c0ab1ad4133cf86b1f4b687effce62a9b38b4d72e3954242e643190fc51fa1642949c735f403debd44f5cb0edd657abe63a8b6a7e1e402"
+  "packageManager": "pnpm@10.26.2+sha512.0e308ff2005fc7410366f154f625f6631ab2b16b1d2e70238444dd6ae9d630a8482d92a451144debc492416896ed16f7b114a86ec68b8404b2443869e68ffda6"
 }
--- a/website/pnpm-lock.yaml
+++ b/website/pnpm-lock.yaml
--- a/website/src/docs/changelog.md
+++ b/website/src/docs/changelog.md
@@ -7,7 +7,21 @@ outline: deep

 ::: v-pre

-## v3.46.0 - 2025-12-18
+## v3.46.4 - 2025-12-24
+
+- Fixed regressions in completion script for Fish (#2591, #2604, #2592 by
+  @WinkelCode).
+
+## v3.46.3 - 2025-12-19
+
+- Fixed regression in completion script for zsh (#2593, #2594 by @vmaerten).
+
+## v3.46.2 - 2025-12-18
+
+- Fixed a regression on previous release that affected variables passed via
+  command line (#2588, #2589 by @vmaerten).
+
+## v3.46.1 - 2025-12-18

 ### ✨ Features

--- a/website/src/public/schema-taskrc.json
+++ b/website/src/public/schema-taskrc.json
@@ -43,6 +43,10 @@
          "description": "Expiry duration for cached remote Taskfiles (e.g., '1h', '24h')",
          "pattern": "^[0-9]+(ns|us|µs|ms|s|m|h)$"
        },
+        "cache-dir": {
+          "type": "string",
+          "description": "Directory to cache remote Taskfiles"
+        },
        "trusted-hosts": {
          "type": "array",
          "description": "List of trusted hosts for remote Taskfiles (e.g., 'github.com', 'gitlab.com', 'example.com:8080').",
Author	SHA1	Message	Date
Andrey Nering	179bde1f37	v3.46.4	2025-12-24 18:57:17 -03:00
Andrey Nering	e4de687aee	docs(changelog): add entry for #2592	2025-12-24 18:55:21 -03:00
WinkelCode	06538860a8	fix(completion): use posix whitespace in fish sed regex (#2592 )	2025-12-24 18:48:54 -03:00
renovate[bot]	8a37bf5c1f	chore(deps): update all non-major dependencies (#2598 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-12-23 20:36:40 +01:00
Valentin Maerten	ca99266aea	feat(schema): add cache-dir property to taskrc schema (#2603 )	2025-12-23 20:35:57 +01:00
Andrey Nering	8dfafe507f	v3.46.3	2025-12-19 15:50:51 -03:00
Andrey Nering	678fdec7d2	docs(changelog): add entry for #2593 and #2594	2025-12-19 15:50:33 -03:00
Valentin Maerten	3626b271a7	fix(completion): correct zsh pattern matching for global flag (#2594 )	2025-12-19 15:48:59 -03:00
Andrey Nering	fc378cfb92	v3.46.2	2025-12-18 17:55:19 -03:00
Andrey Nering	9488a2a744	docs(changelog): add entry for #2588 and #2589	2025-12-18 17:54:38 -03:00
Andrey Nering	6ece2445ae	docs(changelog): change tag to match release on github	2025-12-18 17:51:33 -03:00
Valentin Maerten	9b95e758f4	fix: cli variables should take priority over aaskfile defaults (#2589 ) When using `task FOO=bar` with a Taskfile containing `FOO: '{{.FOO \| default "foo"}}'`, the CLI value was being overwritten by the Taskfile default. Split the variable merging into two steps: 1. Merge CLI variables (FOO=bar) first so they override Taskfile vars 2. ReverseMerge special variables (CLI_ARGS, CLI_FORCE, etc.) so they're available for templating in Taskfile vars Fixes regression introduced in #2403. Co-authored-by: Timothy Rule <timothy.rule@gmail.com>	2025-12-18 17:50:00 -03:00
@@ -1 +1 @@
 .46.1
 .46.4