Merge branch 'charmbracelet:main' into main

Author: plitc

.github/cla-signatures.json

@@ -1175,6 +1175,78 @@
       "created_at": "2026-02-02T19:27:08Z",
       "repoId": 987670088,
       "pullRequestNo": 2095
+    },
+    {
+      "name": "zhiquanchi",
+      "id": 29973289,
+      "comment_id": 3845838711,
+      "created_at": "2026-02-04T07:39:06Z",
+      "repoId": 987670088,
+      "pullRequestNo": 2112
+    },
+    {
+      "name": "inquam",
+      "id": 1265038,
+      "comment_id": 3849304908,
+      "created_at": "2026-02-04T19:22:33Z",
+      "repoId": 987670088,
+      "pullRequestNo": 2124
+    },
+    {
+      "name": "nickgrim",
+      "id": 8376,
+      "comment_id": 3852565144,
+      "created_at": "2026-02-05T10:17:46Z",
+      "repoId": 987670088,
+      "pullRequestNo": 2131
+    },
+    {
+      "name": "francescoalemanno",
+      "id": 50984334,
+      "comment_id": 3858464719,
+      "created_at": "2026-02-06T07:16:50Z",
+      "repoId": 987670088,
+      "pullRequestNo": 2142
+    },
+    {
+      "name": "biisal",
+      "id": 153633053,
+      "comment_id": 3866503536,
+      "created_at": "2026-02-08T08:15:11Z",
+      "repoId": 987670088,
+      "pullRequestNo": 2164
+    },
+    {
+      "name": "mishudark",
+      "id": 211144,
+      "comment_id": 3866939317,
+      "created_at": "2026-02-08T10:27:09Z",
+      "repoId": 987670088,
+      "pullRequestNo": 2165
+    },
+    {
+      "name": "portertech",
+      "id": 149630,
+      "comment_id": 3878650318,
+      "created_at": "2026-02-10T15:39:14Z",
+      "repoId": 987670088,
+      "pullRequestNo": 2183
+    },
+    {
+      "name": "wallacegibbon",
+      "id": 22029486,
+      "comment_id": 3890517245,
+      "created_at": "2026-02-12T11:58:04Z",
+      "repoId": 987670088,
+      "pullRequestNo": 2203
+    },
+    {
+      "name": "PHPCraftdream",
+      "id": 14233546,
+      "comment_id": 3893502046,
+      "created_at": "2026-02-12T21:34:20Z",
+      "repoId": 987670088,
+      "pullRequestNo": 2212
     }
   ]
 }

.github/workflows/lint.yml

@@ -8,5 +8,5 @@ jobs:
     uses: charmbracelet/meta/.github/workflows/lint.yml@main
     with:
       golangci_path: .golangci.yml
-      golangci_version: v2.4
+      golangci_version: v2.9
       timeout: 10m

.github/workflows/release.yml

@@ -27,7 +27,6 @@ jobs:
       fury_token: ${{ secrets.FURY_TOKEN }}
       nfpm_gpg_key: ${{ secrets.NFPM_GPG_KEY }}
       nfpm_passphrase: ${{ secrets.NFPM_PASSPHRASE }}
-      npm_token: ${{ secrets.NPM_TOKEN }}
       snapcraft_token: ${{ secrets.SNAPCRAFT_TOKEN }}
       aur_key: ${{ secrets.AUR_KEY }}
       macos_sign_p12: ${{ secrets.MACOS_SIGN_P12 }}

.github/workflows/security.yml

@@ -30,11 +30,11 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+      - uses: github/codeql-action/init@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
         with:
           languages: ${{ matrix.language }}
-      - uses: github/codeql-action/autobuild@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
-      - uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+      - uses: github/codeql-action/autobuild@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
+      - uses: github/codeql-action/analyze@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
 
   grype:
     runs-on: ubuntu-latest
@@ -46,13 +46,13 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - uses: anchore/scan-action@8d2fce09422cd6037e577f4130e9b925e9a37175 # v7.3.1
+      - uses: anchore/scan-action@7037fa011853d5a11690026fb85feee79f4c946c # v7.3.2
         id: scan
         with:
           path: "."
           fail-build: true
           severity-cutoff: critical
-      - uses: github/codeql-action/upload-sarif@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+      - uses: github/codeql-action/upload-sarif@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
         with:
           sarif_file: ${{ steps.scan.outputs.sarif }}
 
@@ -73,7 +73,7 @@ jobs:
       - name: Run govulncheck
         run: |
           govulncheck -C . -format sarif ./... > results.sarif
-      - uses: github/codeql-action/upload-sarif@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+      - uses: github/codeql-action/upload-sarif@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
         with:
           sarif_file: results.sarif
 

.gitignore

@@ -50,3 +50,4 @@ Thumbs.db
 manpages/
 completions/crush.*sh
 .prettierignore
+.task

AGENTS.md

@@ -7,17 +7,18 @@
 - **Update Golden Files**: `go test ./... -update` (regenerates .golden files when test output changes)
   - Update specific package: `go test ./internal/tui/components/core -update` (in this case, we're updating "core")
 - **Lint**: `task lint:fix`
-- **Format**: `task fmt` (gofumpt -w .)
+- **Format**: `task fmt` (`gofumpt -w .`)
+- **Modernize**: `task modernize` (runs `modernize` which make code simplifications)
 - **Dev**: `task dev` (runs with profiling enabled)
 
 ## Code Style Guidelines
 
-- **Imports**: Use goimports formatting, group stdlib, external, internal packages
+- **Imports**: Use `goimports` formatting, group stdlib, external, internal packages
 - **Formatting**: Use gofumpt (stricter than gofmt), enabled in golangci-lint
 - **Naming**: Standard Go conventions - PascalCase for exported, camelCase for unexported
 - **Types**: Prefer explicit types, use type aliases for clarity (e.g., `type AgentName string`)
 - **Error handling**: Return errors explicitly, use `fmt.Errorf` for wrapping
-- **Context**: Always pass context.Context as first parameter for operations
+- **Context**: Always pass `context.Context` as first parameter for operations
 - **Interfaces**: Define interfaces in consuming packages, keep them small and focused
 - **Structs**: Use struct embedding for composition, group related fields
 - **Constants**: Use typed constants with iota for enums, group in const blocks

LICENSE.md

@@ -6,7 +6,7 @@ FSL-1.1-MIT
 
 ## Notice
 
-Copyright 2025 Charmbracelet, Inc
+Copyright 2025-2026 Charmbracelet, Inc.
 
 ## Terms and Conditions
 

README.md

@@ -187,9 +187,11 @@ That said, you can also set environment variables for preferred providers.
 | `GEMINI_API_KEY`            | Google Gemini                                      |
 | `SYNTHETIC_API_KEY`         | Synthetic                                          |
 | `ZAI_API_KEY`               | Z.ai                                               |
+| `MINIMAX_API_KEY`           | MiniMax                                            |
 | `HF_TOKEN`                  | Hugging Face Inference                             |
 | `CEREBRAS_API_KEY`          | Cerebras                                           |
 | `OPENROUTER_API_KEY`        | OpenRouter                                         |
+| `IONET_API_KEY`             | io.net                                             |
 | `GROQ_API_KEY`              | Groq                                               |
 | `VERTEXAI_PROJECT`          | Google Cloud VertexAI (Gemini)                     |
 | `VERTEXAI_LOCATION`         | Google Cloud VertexAI (Gemini)                     |
@@ -202,6 +204,16 @@ That said, you can also set environment variables for preferred providers.
 | `AZURE_OPENAI_API_KEY`      | Azure OpenAI models (optional when using Entra ID) |
 | `AZURE_OPENAI_API_VERSION`  | Azure OpenAI models                                |
 
+### Subscriptions
+
+If you prefer subscription-based usage, here are some plans that work well in
+Crush:
+
+- [Synthetic](https://synthetic.new/pricing)
+- [GLM Coding Plan](https://z.ai/subscribe)
+- [Kimi Code](https://www.kimi.com/membership/pricing)
+- [MiniMax Coding Plan](https://platform.minimax.io/subscribe/coding-plan)
+
 ### By the Way
 
 Is there a provider you’d like to see in Crush? Is there an existing model that needs an update?

Taskfile.yaml

@@ -45,15 +45,36 @@ tasks:
     vars:
       LDFLAGS: '{{if .VERSION}}-ldflags="-X github.com/charmbracelet/crush/internal/version.Version={{.VERSION}}"{{end}}'
     cmds:
-      - "go build {{if .RACE}}-race{{end}} {{.LDFLAGS}} ."
+      - "go build -v {{if .RACE}}-race{{end}} {{.LDFLAGS}} ."
+    sources:
+      - ./**/*.go
+      - go.mod
     generates:
-      - crush
+      - crush{{exeExt}}
 
   run:
     desc: Run build
     cmds:
       - task: build
-      - "./crush {{.CLI_ARGS}} {{if .RACE}}2>race.log{{end}}"
+      - "./crush{{exeExt}} {{.CLI_ARGS}} {{if .RACE}}2>race.log{{end}}"
+
+  run:catwalk:
+    desc: Run build with local Catwalk
+    env:
+      CATWALK_URL: http://localhost:8080
+    cmds:
+      - task: build
+      - ./crush{{exeExt}} {{.CLI_ARGS}}
+
+  run:onboarding:
+    desc: Run build with custom config to test onboarding
+    env:
+      CRUSH_GLOBAL_DATA: tmp/onboarding/data
+      CRUSH_GLOBAL_CONFIG: tmp/onboarding/config
+    cmds:
+      - task: build
+      - rm -rf tmp/onboarding
+      - ./crush{exeExt} {{.CLI_ARGS}}
 
   test:
     desc: Run tests
@@ -77,6 +98,11 @@ tasks:
     cmds:
       - prettier --write internal/cmd/stats/index.html internal/cmd/stats/index.css internal/cmd/stats/index.js
 
+  modernize:
+    desc: Run modernize
+    cmds:
+      - go run golang.org/x/tools/go/analysis/passes/modernize/cmd/modernize@latest -fix -test ./...
+
   dev:
     desc: Run with profiling enabled
     env:
@@ -91,6 +117,9 @@ tasks:
     cmds:
       - task: fetch-tags
       - go install {{.LDFLAGS}} -v .
+    sources:
+      - ./**/*.go
+      - go.mod
 
   profile:cpu:
     desc: 10s CPU profile