chore: sync main into feat/ai-sre

.github/workflows/ci.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v7
         with:
           go-version-file: "go.mod"
 

.github/workflows/code-scanning.yml

@@ -27,7 +27,7 @@ jobs:
             build-mode: autobuild
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v4
@@ -36,7 +36,7 @@ jobs:
           build-mode: ${{ matrix.build-mode }}
 
       - name: Setup Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v7
         if: matrix.language == 'go'
         with:
           go-version-file: "go.mod"

.github/workflows/e2e.yml

@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v7
         with:
           go-version-file: "go.mod"
 

.github/workflows/install-scripts.yml

@@ -24,7 +24,7 @@ jobs:
     name: shellcheck + parse
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: shellcheck
         run: shellcheck -s sh install.sh
       - name: sh parse
@@ -40,7 +40,7 @@ jobs:
     needs: lint
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Upload install scripts to S3-compatible storage
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.MIRROR_S3_ACCESS_KEY_ID }}

.github/workflows/lint.yml

@@ -14,8 +14,8 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-go@v6
+      - uses: actions/checkout@v7
+      - uses: actions/setup-go@v7
         with:
           go-version: stable
       - name: golangci-lint

.github/workflows/release.yml

@@ -16,12 +16,12 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0
 
       - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v7
         with:
           go-version-file: "go.mod"
 

.gitignore

@@ -8,3 +8,4 @@ bin/
 *.out
 .DS_Store
 docs/
+.worktrees/

Makefile

@@ -1,7 +1,7 @@
 # Build configuration
 BINARY_NAME ?= flashduty
 BUILD_DIR := bin
-GOLANGCI_LINT_VERSION := v2.2.1
+GOLANGCI_LINT_VERSION := v2.11.4
 GOLANGCI_LINT := $(BUILD_DIR)/golangci-lint
 GCI_VERSION := v0.13.5
 GCI := $(BUILD_DIR)/gci
@@ -52,11 +52,11 @@ gci: $(GCI) ## Sort imports using gci
 
 .PHONY: lint
 lint: $(GOLANGCI_LINT) ## Run golangci-lint
-	$(GOLANGCI_LINT) run
+	$(GOLANGCI_LINT) run --allow-serial-runners
 
 .PHONY: lint-fix
 lint-fix: $(GOLANGCI_LINT) ## Run golangci-lint with auto-fix
-	$(GOLANGCI_LINT) run --fix
+	$(GOLANGCI_LINT) run --fix --allow-serial-runners
 
 .PHONY: test
 test: ## Run unit tests

go.mod

@@ -3,17 +3,17 @@ module github.com/flashcatcloud/flashduty-cli
 go 1.25.1
 
 require (
-	github.com/flashcatcloud/go-flashduty v0.5.4-0.20260629091912-04a0bfaf665d
+	github.com/flashcatcloud/go-flashduty v0.5.7
 	github.com/mattn/go-runewidth v0.0.24
 	github.com/spf13/cobra v1.10.2
 	github.com/spf13/pflag v1.0.10
 	github.com/toon-format/toon-go v0.0.0-20251202084852-7ca0e27c4e8c
-	golang.org/x/term v0.44.0
+	golang.org/x/term v0.45.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/clipperhouse/uax29/v2 v2.2.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	golang.org/x/sys v0.46.0 // indirect
+	golang.org/x/sys v0.47.0 // indirect
 )

go.sum

@@ -1,8 +1,8 @@
 github.com/clipperhouse/uax29/v2 v2.2.0 h1:ChwIKnQN3kcZteTXMgb1wztSgaU+ZemkgWdohwgs8tY=
 github.com/clipperhouse/uax29/v2 v2.2.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
-github.com/flashcatcloud/go-flashduty v0.5.4-0.20260629091912-04a0bfaf665d h1:jWzPzsWn46dCWC/PL5nncOTL1Zid4UMynbPsbL1mGdU=
-github.com/flashcatcloud/go-flashduty v0.5.4-0.20260629091912-04a0bfaf665d/go.mod h1:aA0RtZEs0AYOwwdNKdtVeD8YMOdnmVY1zAlVD+9Ovx8=
+github.com/flashcatcloud/go-flashduty v0.5.7 h1:bTgs4wN2mLMaVi8tuPDdR+8ZA6Dd4y6SKeZD+KhL4w8=
+github.com/flashcatcloud/go-flashduty v0.5.7/go.mod h1:aA0RtZEs0AYOwwdNKdtVeD8YMOdnmVY1zAlVD+9Ovx8=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/mattn/go-runewidth v0.0.24 h1:cpokDiIn0MGnhdHwuWnJBITySJ20QyNGnY2kR/ay2DU=
@@ -16,10 +16,10 @@ github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3A
 github.com/toon-format/toon-go v0.0.0-20251202084852-7ca0e27c4e8c h1:D8lDFovBMZywze1eh9iwMLcYor5f11mHBocLhO7cBe8=
 github.com/toon-format/toon-go v0.0.0-20251202084852-7ca0e27c4e8c/go.mod h1:j/BOnpF2ihnz4lELs99h9mwGJBx/zdleOUCnLLRPCsc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
-golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
-golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc=
-golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y=
+golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
+golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0=
+golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

internal/cli/args.go

@@ -41,6 +41,40 @@ func requireExactArg(name string) cobra.PositionalArgs {
 	}
 }
 
+// requireBodyFieldOrArgs validates a required variadic positional that folds
+// into a request-body field. The same field can also come from --data or from
+// its typed flag, so zero positional args are valid when either source is set.
+func requireBodyFieldOrArgs(name, flagName string) cobra.PositionalArgs {
+	return func(cmd *cobra.Command, args []string) error {
+		if len(args) > 0 || bodyFieldSourceSet(cmd, flagName) {
+			return nil
+		}
+		return fmt.Errorf("missing %s. Usage: %s", name, cmd.UseLine())
+	}
+}
+
+// requireBodyFieldOrExactArg validates a required scalar positional that folds
+// into a request-body field. The value may instead come from --data or from the
+// typed flag, but extra positionals are still rejected.
+func requireBodyFieldOrExactArg(name, flagName string) cobra.PositionalArgs {
+	return func(cmd *cobra.Command, args []string) error {
+		switch {
+		case len(args) == 1:
+			return nil
+		case len(args) > 1:
+			return fmt.Errorf("expects exactly one %s. Usage: %s", name, cmd.UseLine())
+		case bodyFieldSourceSet(cmd, flagName):
+			return nil
+		default:
+			return fmt.Errorf("missing %s. Usage: %s", name, cmd.UseLine())
+		}
+	}
+}
+
+func bodyFieldSourceSet(cmd *cobra.Command, flagName string) bool {
+	return cmd.Flags().Changed("data") || cmd.Flags().Changed(flagName)
+}
+
 // optionalArg returns a positional argument validator that accepts zero or one
 // argument named name. It backs generated commands whose positional folds into
 // an OPTIONAL body field because the operation also accepts an alternative