fix: set version in one place (coder#73)

johnstcn · web-flow · commit 7aa0cc805133 · 2025-09-03T09:30:25.000+01:00
diff --git a/.github/workflows/go-test.yml b/.github/workflows/go-test.yml
@@ -33,3 +33,8 @@ jobs:
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
         with:
           version: v2.1
+
+      - name: Check for unstaged changes
+        run: |
+          make gen
+          ./check_unstaged.sh
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,6 +33,11 @@ jobs:
     - name: Install Chat Dependencies
       run: cd chat && bun install
 
+    - name: Run make gen and check for unstaged changes
+      run: |
+        make gen
+        ./check_unstaged.sh
+
     - name: Build and Upload
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.6.2
+
+- Fix incorrect version string.
+
 ## 0.6.1
 
 ### Features
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -5,15 +5,15 @@
 Before performing a release, perform a local "smoke-test".
 If everything seems OK, you can proceed to do the following:
 
-1. Update the version string in the following places:
-   - `openapi.json`
-   - `chat/package.json`
-   - `lib/httpapi/server.go`
+1. Update the version string in `internal/version/version.go` and run `make gen`.
 2. Add details in `CHANGELOG.md` on what changed.
 3. Create a PR with the subject `chore: update version to X.Y.Z`
-4. Once the above PR is approved and merged, create a new git tag `vX.Y.Z` pointing to the commit of the above PR merged to `main`:S
+4. Once the above PR is approved and merged, create a new git tag `vX.Y.Z` pointing to the commit of the above PR merged to `main`:
 
    ```shell
+     # Ensure your local copy is up to date with main. Be sure to stash any changes first.
+     git fetch origin
+     git reset --hard origin/main
      # Fetch existing tags first!
      git fetch --tags
      git tag -a vX.Y.Z -m 'vX.Y.Z'
diff --git a/Makefile b/Makefile
@@ -16,5 +16,9 @@ embed: $(CHAT_SOURCES_STAMP)
 	@echo "Chat build is up to date."
 
 .PHONY: build
-build: embed
+build: gen embed
 	CGO_ENABLED=0 go build -o ${BINPATH} main.go
+
+.PHONY: gen
+gen:
+	go generate ./...
diff --git a/chat/package.json b/chat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chat",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "private": true,
   "scripts": {
     "dev": "next dev --turbopack",
@@ -45,4 +45,4 @@
     "tw-animate-css": "^1.3.0",
     "typescript": "^5"
   }
-}
+}
diff --git a/check_unstaged.sh b/check_unstaged.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+FILES=()
+IFS=$'\n' read -r -d '' -a FILES < <(git ls-files --other --modified --exclude-standard && printf '\0')
+if [[ ${#FILES[@]} -gt 0 ]]; then
+
+	echo
+	echo "The following files contain unstaged changes:"
+	echo
+	for file in "${FILES[@]}"; do
+		echo "  - $file"
+	done
+
+	echo
+	echo "These are the changes:"
+	echo
+	for file in "${FILES[@]}"; do
+		git --no-pager diff -- "$file" 1>&2
+	done
+
+	echo
+	echo "ERROR: Unstaged changes, see above for details."
+	exit 1
+fi
diff --git a/cmd/root.go b/cmd/root.go
@@ -6,14 +6,15 @@ import (
 
 	"github.com/coder/agentapi/cmd/attach"
 	"github.com/coder/agentapi/cmd/server"
+	"github.com/coder/agentapi/internal/version"
 	"github.com/spf13/cobra"
 )
 
 var rootCmd = &cobra.Command{
 	Use:     "agentapi",
 	Short:   "AgentAPI CLI",
 	Long:    `AgentAPI - HTTP API for Claude Code, Goose, Aider, Gemini and Codex`,
-	Version: "0.4.1",
+	Version: version.Version,
 }
 
 func Execute() {
diff --git a/cmd/server/server.go b/cmd/server/server.go
@@ -184,6 +184,10 @@ func CreateServerCmd() *cobra.Command {
 				return
 			}
 			logger := slog.New(slog.NewTextHandler(os.Stdout, nil))
+			if viper.GetBool(FlagPrintOpenAPI) {
+				// We don't want log output here.
+				logger = slog.New(logctx.DiscardHandler)
+			}
 			ctx := logctx.WithLogger(context.Background(), logger)
 			if err := runServer(ctx, logger, cmd.Flags().Args()); err != nil {
 				fmt.Fprintf(os.Stderr, "%+v\n", err)
diff --git a/internal/version/version.go b/internal/version/version.go
@@ -0,0 +1,5 @@
+// package version defines the current version of agentapi.
+
+package version
+
+var Version = "0.6.2"
diff --git a/lib/httpapi/server.go b/lib/httpapi/server.go
@@ -13,6 +13,7 @@ import (
 	"time"
 	"unicode"
 
+	"github.com/coder/agentapi/internal/version"
 	"github.com/coder/agentapi/lib/logctx"
 	mf "github.com/coder/agentapi/lib/msgfmt"
 	st "github.com/coder/agentapi/lib/screentracker"
@@ -188,7 +189,7 @@ func NewServer(ctx context.Context, config ServerConfig) (*Server, error) {
 	})
 	router.Use(corsMiddleware.Handler)
 
-	humaConfig := huma.DefaultConfig("AgentAPI", "0.6.1")
+	humaConfig := huma.DefaultConfig("AgentAPI", version.Version)
 	humaConfig.Info.Description = "HTTP API for Claude Code, Goose, and Aider.\n\nhttps://github.com/coder/agentapi"
 	api := humachi.New(router, humaConfig)
 	formatMessage := func(message string, userInput string) string {
diff --git a/lib/logctx/logctx.go b/lib/logctx/logctx.go
@@ -23,3 +23,14 @@ func From(ctx context.Context) *slog.Logger {
 	}
 	panic("no logger found in context")
 }
+
+// plucked from log/slog
+// remove once we update to go 1.24
+var DiscardHandler slog.Handler = discardHandler{}
+
+type discardHandler struct{}
+
+func (dh discardHandler) Enabled(context.Context, slog.Level) bool  { return false }
+func (dh discardHandler) Handle(context.Context, slog.Record) error { return nil }
+func (dh discardHandler) WithAttrs(attrs []slog.Attr) slog.Handler  { return dh }
+func (dh discardHandler) WithGroup(name string) slog.Handler        { return dh }
diff --git a/main.go b/main.go
@@ -1,5 +1,7 @@
 package main
 
+//go:generate sh -c "go run main.go server --print-openapi dummy > openapi.json"
+//go:generate ./set_version.sh
 import "github.com/coder/agentapi/cmd"
 
 func main() {
diff --git a/openapi.json b/openapi.json
@@ -307,7 +307,7 @@
   "info": {
     "description": "HTTP API for Claude Code, Goose, and Aider.\n\nhttps://github.com/coder/agentapi",
     "title": "AgentAPI",
-    "version": "0.6.1"
+    "version": "0.6.2"
   },
   "openapi": "3.1.0",
   "paths": {
@@ -497,4 +497,4 @@
       }
     }
   }
-}
+}
diff --git a/set_version.sh b/set_version.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+if ! command -v go >/dev/null 2>&1; then
+    echo "go is required to run this script" && exit 1
+elif ! command -v jq >/dev/null 2>&1; then
+    echo "jq is required to run this script" && exit 1
+fi
+
+version=$(go run main.go --version | awk '{print $3}')
+
+jq --arg version "${version}" '.info.version = $version' openapi.json > openapi.json.tmp && mv openapi.json.tmp openapi.json
+jq --arg version "${version}" '.version = $version' chat/package.json > chat/package.json.tmp && mv chat/package.json.tmp chat/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "chat",`
`3`		`- "version": "0.6.1",`
	`3`	`+ "version": "0.6.2",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"dev": "next dev --turbopack",`
`@@ -45,4 +45,4 @@`
`45`	`45`	`"tw-animate-css": "^1.3.0",`
`46`	`46`	`"typescript": "^5"`
`47`	`47`	`}`
`48`		`-}`
	`48`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,15 @@ import (`
`6`	`6`
`7`	`7`	`"github.com/coder/agentapi/cmd/attach"`
`8`	`8`	`"github.com/coder/agentapi/cmd/server"`
	`9`	`+ "github.com/coder/agentapi/internal/version"`
`9`	`10`	`"github.com/spf13/cobra"`
`10`	`11`	`)`
`11`	`12`
`12`	`13`	`var rootCmd = &cobra.Command{`
`13`	`14`	`Use: "agentapi",`
`14`	`15`	`Short: "AgentAPI CLI",`
`15`	`16`	Long: `AgentAPI - HTTP API for Claude Code, Goose, Aider, Gemini and Codex`,
`16`		`- Version: "0.4.1",`
	`17`	`+ Version: version.Version,`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`func Execute() {`