Update the canonical .golangci.yml for golangci-lint v2.15.0 (closes #142)

Moves the pin to v2.15.0 and enables canonicalheader again, because that
release fixes the random misses behind
#105.

The depguard exemption reached every directory below one ending in test,
and a whole checkout under such a directory. It now covers only the files
directly inside, and the directory a repository is cloned into does not
count. gomodguard_v2 also blocks github.com/go-redis/redis/v9, whose
pre-releases can still be imported.

uniq-by-line is now false, so a line that trips two linters reports both
findings.

Three comments are corrected. A new comment says the file has no
formatters section, so golangci-lint run does not run gofmt.

Model: opus-5-5

.golangci.yml

@@ -3,6 +3,9 @@ version: "2"
 # Config schema uses the golangci-lint v2 layout (settings live under
 # linters.settings, not top-level linters-settings) so that the
 # thresholds below are actually applied by golangci-lint >= v2.
+#
+# This file has no formatters section, so golangci-lint run does not run
+# gofmt. A repository's script/fmt-check runs it, on the host.
 
 run:
   timeout: 5m
@@ -16,17 +19,15 @@ linters:
     - gomodguard_v2
   disable:
     # Genuinely incompatible with project patterns
-    - exhaustruct      # Requires all struct fields
+    - exhaustruct_v5   # Requires all struct fields
-    - exhaustruct_v5   # Requires all struct fields (successor to exhaustruct)
     - godot            # Requires comments to end with periods
     - wrapcheck        # Too verbose for internal packages
     - varnamelen       # Short names like db, id are idiomatic Go
     # Deprecated: the warning is attached to the old name, so it is
     # silenced by disabling that name, not by enabling the successor.
+    - exhaustruct      # Deprecated, replaced by exhaustruct_v5
     - wsl              # Deprecated, replaced by wsl_v5
     - gomodguard       # Deprecated, replaced by gomodguard_v2
-    # Misses findings at random in v2.14.0; back once a pinned release fixes it
-    - canonicalheader
   settings:
     lll:
       line-length: 88
@@ -42,7 +43,10 @@ linters:
       # test-support package exists to hand a test privileges the program
       # itself must never have, so a file that is not a test must not import
       # one. Test files, and the files inside a package whose directory name
-      # ends in `test`, are where that code belongs, and are exempt.
+      # ends in `test`, are where that code belongs, and are exempt. A package
+      # in a subdirectory of that directory is not exempt. `${base-path}` is
+      # the directory holding this file, so the name of the directory a
+      # repository is cloned into does not count.
       #
       # The deny list below is the one part of this file a repository is
       # expected to extend, and the only part it may. depguard matches an
@@ -57,24 +61,25 @@ linters:
           files:
             - "$all"
             - "!$test"
-            - "!**/*test/**"
+            - "!${base-path}**/*test/*"
           deny:
             - pkg: net/http/httptest
               desc: >-
                 Test-support code belongs in test files and in packages whose
                 directory name ends in test, not in the shipped binary.
-    # Only decisions already recorded in the Go package defaults are
+    # Each entry names a module not to use and what to use instead. Every
-    # listed here. Every entry matches the module path exactly.
+    # entry matches the module path exactly.
     gomodguard_v2:
       blocked:
         - module: github.com/rs/zerolog
           recommendations:
             - log/slog
           reason: "Structured logging is stdlib log/slog."
-        # One entry per pre-fork module path, because the later releases
+        # These entries cover only the github.com/go-redis/redis module paths,
-        # are separate paths. A prefix match would be shorter but would
+        # one entry per path, because the later releases are separate paths.
-        # also reach github.com/go-redis/redismock, the test double for
+        # A prefix match would be shorter but would also reach
-        # the successor these entries recommend.
+        # github.com/go-redis/redismock/v9, the test double for the successor
+        # these entries recommend.
         - module: github.com/go-redis/redis
           recommendations:
             - github.com/redis/go-redis/v9
@@ -87,6 +92,10 @@ linters:
           recommendations:
             - github.com/redis/go-redis/v9
           reason: "Pre-fork module; use the maintained go-redis v9."
+        - module: github.com/go-redis/redis/v9
+          recommendations:
+            - github.com/redis/go-redis/v9
+          reason: "Pre-fork module; use the maintained go-redis v9."
         - module: github.com/sergi/go-diff
           recommendations:
             - github.com/aymanbagabas/go-udiff
@@ -110,3 +119,4 @@ linters:
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
+  uniq-by-line: false

TODO.md

@@ -21,6 +21,37 @@ fmt-check, and commit.
 
 # Completed Steps
 
+- 2026-11-03: The canonical golangci-lint is now v2.15.0, still built with
+  go1.27.0, so the `go` directive rule is unchanged (issue 142). Repositories
+  pick this up on their next re-vendor. Each item in the canonical
+  `.golangci.yml` was tried on a scratch module. These changed:
+    - `canonicalheader` is enabled again, because v2.15.0 fixes the random
+      misses behind issue 105.
+    - The `depguard` exemption covers only the files directly inside a directory
+      whose name ends in `test`. It used to reach every directory below that one
+      too. The name of the directory a repository is cloned into no longer
+      counts.
+    - `gomodguard_v2` also blocks `github.com/go-redis/redis/v9`, whose
+      pre-releases can still be imported under that path.
+    - `uniq-by-line` is now `false`, so a line that trips two linters reports
+      both findings.
+    - Three comments are corrected:
+        - `exhaustruct` is listed as deprecated.
+        - The test double is named `github.com/go-redis/redismock/v9`.
+        - The claim that every blocked module is in the Go package defaults is
+          gone.
+    - A comment says the file has no `formatters` section, so
+      `golangci-lint run` does not run `gofmt`.
+- 2026-11-03: A first test run that timed out now gets no verbose rerun
+  (https://git.eeqj.de/sneak/prompts/issues/61), on sneak's approval at
+  https://git.eeqj.de/sneak/prompts/issues/61#issuecomment-165195. The Go recipe
+  in `REPO_POLICIES.md` looks in the first run's output for
+  `panic: test timed out` or `*** Test killed`, and exits 1 when either is
+  there. The Python `make test` example takes the same `timeout 90 sh -c`
+  wrapper as its `Dockerfile` example. The 60 and 90 second rule and the
+  5-minute rule now say a hung package uses the backstop once. The Go item in
+  both repo checklists now asks for this, so a repository with the old recipe
+  fails it.
 - 2026-10-27: Added `prompts/API_POLICIES.md`
   (https://git.eeqj.de/sneak/prompts/issues/137). It holds sneak's rule from
   https://git.eeqj.de/sneak/routewatch/issues/199 that a value in an API

prompts/EXISTING_REPO_CHECKLIST.md

@@ -1,6 +1,6 @@
 ---
 title: Existing Repo Checklist
-last_modified: 2026-10-26
+last_modified: 2026-11-03
 ---
 
 Use this checklist when beginning work in a repo that may not yet conform to our
@@ -70,8 +70,9 @@ with your task.
       (`--mount=type=cache,target=/root/.cache/go-build`), `golangci-lint run`
       also mounts golangci-lint's
       (`--mount=type=cache,target=/root/.cache/golangci-lint`), and no step
-      mounts anything else; both `go test` runs carry `-count=1`, as in the
+      mounts anything else; both `go test` runs carry `-count=1`; a first run
-      canonical Go `Dockerfile` in `REPO_POLICIES.md`
+      that timed out gets no rerun, as in the canonical Go `Dockerfile` in
+      `REPO_POLICIES.md`
 - [ ] Python: a `test` phase that installs its packages from `Pipfile.lock` does
       it above `ARG CACHEBUST`, with `COPY script/ script/`,
       `COPY Pipfile Pipfile.lock ./` and `RUN script/bootstrap`. When

prompts/NEW_REPO_CHECKLIST.md

@@ -1,6 +1,6 @@
 ---
 title: New Repo Checklist
-last_modified: 2026-10-26
+last_modified: 2026-11-03
 ---
 
 Use this checklist when creating a new repository from scratch. Follow the steps
@@ -129,8 +129,9 @@ Template files can be fetched from:
       (`--mount=type=cache,target=/root/.cache/go-build`), `golangci-lint run`
       also mounts golangci-lint's
       (`--mount=type=cache,target=/root/.cache/golangci-lint`), and no step
-      mounts anything else; both `go test` runs carry `-count=1`, as in the
+      mounts anything else; both `go test` runs carry `-count=1`; a first run
-      canonical Go `Dockerfile` in `REPO_POLICIES.md`
+      that timed out gets no rerun, as in the canonical Go `Dockerfile` in
+      `REPO_POLICIES.md`
     - Python: a `test` phase that installs its packages from `Pipfile.lock` does
       it above `ARG CACHEBUST`, with `COPY script/ script/`,
       `COPY Pipfile Pipfile.lock ./` and `RUN script/bootstrap`. When

prompts/REPO_POLICIES.md

@@ -1,6 +1,6 @@
 ---
 title: Repository Policies
-last_modified: 2026-10-27
+last_modified: 2026-11-03
 ---
 
 This document covers repository structure, tooling, and workflow standards. Code
@@ -233,6 +233,8 @@ style conventions are in separate documents:
     # Test phase. -race needs cgo and so a C compiler, which the Debian Go
     # image ships and the alpine one does not. -count=1 because the mounted
     # cache also holds test results, which go test would otherwise replay.
+    # A first run that timed out gets no rerun, because a rerun would only
+    # wait for the same hang.
     # golang:1.x, YYYY-MM-DD
     FROM golang@sha256:... AS test
     WORKDIR /src
@@ -241,9 +243,16 @@ style conventions are in separate documents:
     ARG CACHEBUST
     COPY . .
     RUN --mount=type=cache,target=/root/.cache/go-build \
-        go test -count=1 -timeout 90s -race -cover ./... || \
+        status=0; \
-        { echo "--- Rerunning with -v for details ---"; \
+        output=$(go test -count=1 -timeout 90s -race -cover ./... 2>&1) || status=$?; \
-          go test -count=1 -timeout 90s -race -v ./...; exit 1; }
+        printf '%s\n' "$output"; \
+        test "$status" -eq 0 && exit 0; \
+        case "$output" in \
+            *"panic: test timed out"*|*"*** Test killed"*) exit 1 ;; \
+        esac; \
+        echo "--- Rerunning with -v for details ---"; \
+        go test -count=1 -timeout 90s -race -v ./...; \
+        exit 1
 
     # Build stage. Nothing is wanted from either phase above; the copies
     # are what make BuildKit build them first, so nothing after them can
@@ -413,7 +422,8 @@ style conventions are in separate documents:
     `pipenv install --dev --deploy`:
 
     ```dockerfile
-    # Test phase. The 90-second timeout covers both pytest runs.
+    # Test phase. Both pytest runs share one 90-second timeout, so a hang
+    # uses it once and gets no rerun.
     # python:3.x-slim, YYYY-MM-DD
     FROM python@sha256:... AS test
     # make and git are base tools that script/bootstrap installs when they
@@ -484,15 +494,19 @@ style conventions are in separate documents:
   improvement bug against that repo. Add a 90-second timeout to the test
   invocation (`go test -timeout 90s`). The backstop deliberately sits above the
   hard cap so that it catches a genuinely hung test rather than a merely slow
-  one.
+  one. A hung package uses the backstop once, because a first run that timed out
+  gets no rerun. `-timeout` applies to each package, so several hung packages
+  can each use it.
 
 - **The test command should use the conditional verbose rerun pattern.** Run
   tests without `-v` (verbose) first. If tests fail, automatically rerun with
   `-v` to show full output. This keeps CI logs and `docker build` output clean
   on success (just package/suite summaries) while providing full diagnostic
-  detail on failure (every test case, every assertion). The command lives in the
+  detail on failure (every test case, every assertion). A first run that timed
-  `test` phase of the `Dockerfile`, since `script/test` builds that phase; the
+  out gets no rerun, because the rerun would only wait for the same hang. The
-  Makefile form below is the same pattern for any repo-local invocation:
+  command lives in the `test` phase of the `Dockerfile`, since `script/test`
+  builds that phase; the Makefile form below is the same pattern for any
+  repo-local invocation:
 
     ```makefile
     test:
@@ -505,11 +519,29 @@ style conventions are in separate documents:
 
     ```makefile
     test:
-    	@go test -count=1 -timeout 90s -race -cover ./... || \
+    	@status=0; \
-    		{ echo "--- Rerunning with -v for details ---"; \
+    		output=$$(go test -count=1 -timeout 90s -race -cover ./... 2>&1) || status=$$?; \
-    		  go test -count=1 -timeout 90s -race -v ./...; exit 1; }
+    		printf '%s\n' "$$output"; \
+    		test "$$status" -eq 0 && exit 0; \
+    		case "$$output" in \
+    			*"panic: test timed out"*|*"*** Test killed"*) exit 1 ;; \
+    		esac; \
+    		echo "--- Rerunning with -v for details ---"; \
+    		go test -count=1 -timeout 90s -race -v ./...; \
+    		exit 1
     ```
 
+    The first run's output is kept so that the recipe can look in it for what Go
+    prints for a hang:
+    - `panic: test timed out` means the test's own timer fired.
+    - `*** Test killed` means `go test` stopped a test that ignored that timer,
+      about a minute later.
+
+    Go prints the goroutine stacks with either line, as long as the test can
+    still respond. A rerun would only wait for the same hang, so the recipe
+    exits 1. A failure with neither line in its output reruns with `-v`. The
+    kept output prints when the first run ends, not while it runs.
+
     `-count=1` is required on both invocations: it defeats Go's test _result_
     cache, so neither run can report a stored pass in place of running the
     tests. It leaves the build cache alone, so it costs the runtime of the suite
@@ -528,17 +560,25 @@ style conventions are in separate documents:
 
     ```makefile
     test:
-    	@python -m pytest || \
+    	@timeout 90 sh -c 'python -m pytest || { \
-    		{ echo "--- Rerunning with -v for details ---"; \
+    		echo "--- Rerunning with -v for details ---"; \
-    		  python -m pytest -v; exit 1; }
+    		python -m pytest -v; exit 1; }'
     ```
 
+    Both pytest runs share that one 90-second timeout, as in the `Dockerfile`
+    example above, so a hang uses it once and gets no rerun. Ctrl-C does not
+    stop a running `make test`, which goes on until the tests end or the 90
+    seconds run out. On a Mac without `timeout`, the target fails until it is
+    installed.
+
     The `exit 1` ensures the target always fails after a rerun — the first run
     already proved the tests are broken, so the build must not pass even if a
     flaky test happens to succeed on the second attempt. The rerun exists solely
     for diagnostic output.
 
-- Docker builds must complete in under 5 minutes.
+- Docker builds must complete in under 5 minutes. A hung package uses the
+  90-second test backstop once, because a first run that timed out gets no
+  rerun.
 
 - `make check` must not modify any files in the repo. Tests may use temporary
   directories.
@@ -658,10 +698,10 @@ style conventions are in separate documents:
   `test-support` depguard rule, where a repo names its own test-support packages
   by full import path. A repo adds entries there and changes nothing else, and a
   re-vendor carries its entries forward. The canonical golangci-lint version is
-  v2.14.0 (released 2026-09-24), pinned as the digest of the lint phase's base
+  v2.15.0 (released 2026-10-16), pinned as the digest of the lint phase's base
   image
-  (`golangci/golangci-lint@sha256:ad862ba6b3798cbe0fd9fd7408d498fd74fbd2623a92406b2fd3898faf0bf98f`,
+  (`golangci/golangci-lint@sha256:fbfcfd12a6f8d7f1b97b3362ca80fc2a244d46863148c73cb88e7793af96c481`,
-  which reports `2.14.0 built with go1.27.0 from 114493f9`). A module's `go`
+  which reports `2.15.0 built with go1.27.0 from 25c5369a`). A module's `go`
   directive must not name a newer Go minor version than the one golangci-lint
   was built with, or golangci-lint refuses to lint it: this release lints
   `go 1.27.1` but not `go 1.28`. That digest is the only pin, since no repo