From aa6b4d1ccf374350d5b83886b5778b1929dd5166 Mon Sep 17 00:00:00 2001
From: Jiro <j.code.public@gmail.com>
Date: Fri, 14 Aug 2026 15:09:59 +0900
Subject: [PATCH] feat(web): show build version in sidebar

Share release build metadata between tq and the web binary, inject it into the embedded frontend, and render the version at the bottom of the sidebar. Preserve dev fallbacks, expose known commits as hover text, and cover the metadata path with Go and frontend tests.
---
 .goreleaser.yml                               |  4 +-
 Makefile                                      |  6 +-
 cmd/web/frontend/docs/ui-design-system.ja.md  |  5 +-
 cmd/web/frontend/docs/ui-design-system.md     |  5 +-
 cmd/web/frontend/index.html                   |  2 +
 .../layout/sidebar/index.module.css           |  8 ++
 .../src/components/layout/sidebar/index.tsx   |  9 ++
 cmd/web/frontend/src/lib/build-info.test.ts   | 22 +++++
 cmd/web/frontend/src/lib/build-info.ts        | 29 +++++++
 cmd/web/main.go                               | 11 ++-
 cmd/web/main_test.go                          | 26 ++++++
 docs/design/operations.ja.md                  |  2 +-
 docs/design/operations.md                     |  2 +-
 docs/references/makefile.ja.md                |  2 +-
 docs/references/makefile.md                   |  2 +-
 internal/buildinfo/buildinfo.go               | 83 +++++++++++++++++++
 internal/buildinfo/buildinfo_test.go          | 42 ++++++++++
 internal/cli/tq/command_test.go               | 37 ---------
 internal/cli/tq/version.go                    | 76 +----------------
 19 files changed, 247 insertions(+), 126 deletions(-)
 create mode 100644 cmd/web/frontend/src/lib/build-info.test.ts
 create mode 100644 cmd/web/frontend/src/lib/build-info.ts
 create mode 100644 internal/buildinfo/buildinfo.go
 create mode 100644 internal/buildinfo/buildinfo_test.go

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 4e989fef..e1929cd1 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -5,7 +5,7 @@ builds:
     binary: tq
     id: tq
     ldflags:
-      - -s -w -X github.com/version-1/tasq/internal/cli/tq.buildVersion={{.Version}} -X github.com/version-1/tasq/internal/cli/tq.buildCommit={{.ShortCommit}} -X github.com/version-1/tasq/internal/config.defaultHomeProfile={{.Env.TQ_BUILD_PROFILE}}
+      - -s -w -X github.com/version-1/tasq/internal/buildinfo.version={{.Version}} -X github.com/version-1/tasq/internal/buildinfo.commit={{.ShortCommit}} -X github.com/version-1/tasq/internal/config.defaultHomeProfile={{.Env.TQ_BUILD_PROFILE}}
     env:
       - CGO_ENABLED=0
     goos:
@@ -44,7 +44,7 @@ builds:
     binary: web
     id: web
     ldflags:
-      - -s -w -X github.com/version-1/tasq/internal/config.defaultHomeProfile={{.Env.TQ_BUILD_PROFILE}}
+      - -s -w -X github.com/version-1/tasq/internal/buildinfo.version={{.Version}} -X github.com/version-1/tasq/internal/buildinfo.commit={{.ShortCommit}} -X github.com/version-1/tasq/internal/config.defaultHomeProfile={{.Env.TQ_BUILD_PROFILE}}
     env:
       - CGO_ENABLED=0
     goos:
diff --git a/Makefile b/Makefile
index becf4901..bcde26f6 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ TQ_INSTALL_DIR ?= $(HOME)/.local/bin
 TQ_INSTALL_NAME ?= tq
 TQ_BUILD_COMMIT ?= $(shell git rev-parse --short HEAD 2>/dev/null || printf unknown)
 TQ_BUILD_PROFILE ?=
-TQ_BUILD_LDFLAGS ?= -X github.com/version-1/tasq/internal/cli/tq.buildCommit=$(TQ_BUILD_COMMIT) -X github.com/version-1/tasq/internal/config.defaultHomeProfile=$(TQ_BUILD_PROFILE)
+TQ_BUILD_LDFLAGS ?= -X github.com/version-1/tasq/internal/buildinfo.commit=$(TQ_BUILD_COMMIT) -X github.com/version-1/tasq/internal/config.defaultHomeProfile=$(TQ_BUILD_PROFILE)
 TQ_INSTALL_HOME = $(if $(filter file,$(origin TQ_HOME)),,$(TQ_HOME))
 
 export TQ_HOME
@@ -69,10 +69,10 @@ build-tq: ## Build tq for the host into ./bin/tq.
 build-tq-dev: ## Build tq and service binaries with the dev profile.
 	cd cmd/web/frontend && npm ci && npm run build
 	mkdir -p "$(HOME)/.tasq-dev/system/bin"
-	go build -ldflags "-X github.com/version-1/tasq/internal/cli/tq.buildCommit=$(TQ_BUILD_COMMIT) -X github.com/version-1/tasq/internal/config.defaultHomeProfile=dev" -o ./tqdev ./cmd/tq
+	go build -ldflags "-X github.com/version-1/tasq/internal/buildinfo.commit=$(TQ_BUILD_COMMIT) -X github.com/version-1/tasq/internal/config.defaultHomeProfile=dev" -o ./tqdev ./cmd/tq
 	go build -o "$(HOME)/.tasq-dev/system/bin/issue-tracker" ./cmd/issue-tracker
 	go build -o "$(HOME)/.tasq-dev/system/bin/orchestrator" ./cmd/orchestrator
-	go build -o "$(HOME)/.tasq-dev/system/bin/web" ./cmd/web
+	go build -ldflags "-X github.com/version-1/tasq/internal/buildinfo.commit=$(TQ_BUILD_COMMIT)" -o "$(HOME)/.tasq-dev/system/bin/web" ./cmd/web
 
 .PHONY: dev-check
 dev-check:
diff --git a/cmd/web/frontend/docs/ui-design-system.ja.md b/cmd/web/frontend/docs/ui-design-system.ja.md
index 241f3c8e..63f968b8 100644
--- a/cmd/web/frontend/docs/ui-design-system.ja.md
+++ b/cmd/web/frontend/docs/ui-design-system.ja.md
@@ -363,8 +363,9 @@ documented token になるまでは literal のまま扱います。
 - nav 行: 最小高さ `44px`、icon gap `12px`、`--radius-sm`、hover で
   `--surface-hover`。
 - アクティブな route は `--surface-hover` 背景を使用 (border アクセントはなし)。
-- sidebar 下部: settings リンクが `border-top` と theme switch 行で
-  仕切られた同じ separator を持ちます。
+- sidebar 下部: settings リンクが `border-top`、同じ separator を持つ theme
+  switch 行、そして小さく muted な現在の release version を表示します。
+  commit が分かる場合のみ hover text で確認できます。
 
 ### Header
 
diff --git a/cmd/web/frontend/docs/ui-design-system.md b/cmd/web/frontend/docs/ui-design-system.md
index f7922a6c..fe4032f0 100644
--- a/cmd/web/frontend/docs/ui-design-system.md
+++ b/cmd/web/frontend/docs/ui-design-system.md
@@ -366,8 +366,9 @@ The application shell is a two-column grid declared in
 - Nav rows: `44px` min height, `12px` icon gap, `--radius-sm`, and
   `--surface-hover` hover.
 - The active route uses `--surface-hover` background (no border accent).
-- Bottom of sidebar: settings link separated by `border-top` and a theme switch
-  row with the same separator.
+- Bottom of sidebar: settings link separated by `border-top`, a theme switch
+  row with the same separator, and the current release version in small muted
+  text. The commit is available only as hover text when known.
 
 ### Header
 
diff --git a/cmd/web/frontend/index.html b/cmd/web/frontend/index.html
index 1fe9736a..93baf19b 100644
--- a/cmd/web/frontend/index.html
+++ b/cmd/web/frontend/index.html
@@ -4,6 +4,8 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/png" sizes="32x32" href="/logo/BlackLogo-2.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="tasq-version" content="__TASQ_VERSION__" />
+    <meta name="tasq-commit" content="__TASQ_COMMIT__" />
     <script>
       const systemTheme = window.matchMedia("(prefers-color-scheme: dark)").matches
         ? "dark"
diff --git a/cmd/web/frontend/src/components/layout/sidebar/index.module.css b/cmd/web/frontend/src/components/layout/sidebar/index.module.css
index 7e70014d..22cd0b99 100644
--- a/cmd/web/frontend/src/components/layout/sidebar/index.module.css
+++ b/cmd/web/frontend/src/components/layout/sidebar/index.module.css
@@ -111,6 +111,14 @@
   font-weight: 700;
 }
 
+.version {
+  align-self: flex-end;
+  color: var(--medium-gray);
+  font-size: 11px;
+  line-height: 1;
+  padding-inline: var(--space-1-5);
+}
+
 @media (max-width: 900px) {
   .sidebar {
     border-bottom: 1px solid var(--light-gray);
diff --git a/cmd/web/frontend/src/components/layout/sidebar/index.tsx b/cmd/web/frontend/src/components/layout/sidebar/index.tsx
index 5b8802aa..f8fbac23 100644
--- a/cmd/web/frontend/src/components/layout/sidebar/index.tsx
+++ b/cmd/web/frontend/src/components/layout/sidebar/index.tsx
@@ -2,6 +2,7 @@ import { Link } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import { IconProxy } from "@/components/ui/icon-proxy";
 import { Switch } from "@/components/ui/switch";
+import { getBuildInfo } from "@/lib/build-info";
 import type { Project } from "@/lib/types";
 import styles from "./index.module.css";
 
@@ -23,6 +24,7 @@ export function Sidebar({
   projects,
 }: SidebarProps) {
   const { t } = useTranslation();
+  const buildInfo = getBuildInfo();
 
   return (
     <aside className={styles.sidebar}>
@@ -97,6 +99,13 @@ export function Sidebar({
           onChange={onDarkModeChange}
         />
       </label>
+
+      <small
+        className={styles.version}
+        title={buildInfo.commit ? `commit: ${buildInfo.commit}` : undefined}
+      >
+        {buildInfo.version}
+      </small>
     </aside>
   );
 }
diff --git a/cmd/web/frontend/src/lib/build-info.test.ts b/cmd/web/frontend/src/lib/build-info.test.ts
new file mode 100644
index 00000000..5abbd26e
--- /dev/null
+++ b/cmd/web/frontend/src/lib/build-info.test.ts
@@ -0,0 +1,22 @@
+import { describe, expect, it } from "vitest";
+import { getBuildInfo } from "./build-info";
+
+describe("getBuildInfo", () => {
+  it("reads release metadata from the document", () => {
+    document.head.innerHTML = `
+      <meta name="tasq-version" content="0.1.0" />
+      <meta name="tasq-commit" content="abc1234" />
+    `;
+
+    expect(getBuildInfo()).toEqual({ version: "v0.1.0", commit: "abc1234" });
+  });
+
+  it("falls back to dev and omits an unknown commit", () => {
+    document.head.innerHTML = `
+      <meta name="tasq-version" content="__TASQ_VERSION__" />
+      <meta name="tasq-commit" content="unknown" />
+    `;
+
+    expect(getBuildInfo()).toEqual({ version: "dev", commit: null });
+  });
+});
diff --git a/cmd/web/frontend/src/lib/build-info.ts b/cmd/web/frontend/src/lib/build-info.ts
new file mode 100644
index 00000000..9d892c70
--- /dev/null
+++ b/cmd/web/frontend/src/lib/build-info.ts
@@ -0,0 +1,29 @@
+export type BuildInfo = {
+  version: string;
+  commit: string | null;
+};
+
+const PLACEHOLDER_PREFIX = "__TASQ_";
+
+function readMetadata(name: string): string | null {
+  const value = document.querySelector<HTMLMetaElement>(`meta[name="${name}"]`)?.content;
+  if (!value || value.startsWith(PLACEHOLDER_PREFIX)) {
+    return null;
+  }
+  return value;
+}
+
+function formatVersion(version: string): string {
+  if (version === "dev" || version.startsWith("v")) {
+    return version;
+  }
+  return `v${version}`;
+}
+
+export function getBuildInfo(): BuildInfo {
+  const commit = readMetadata("tasq-commit");
+  return {
+    version: formatVersion(readMetadata("tasq-version") ?? "dev"),
+    commit: commit === "unknown" ? null : commit,
+  };
+}
diff --git a/cmd/web/main.go b/cmd/web/main.go
index 63533585..8f749a30 100644
--- a/cmd/web/main.go
+++ b/cmd/web/main.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"flag"
 	"fmt"
+	"html"
 	"io/fs"
 	"log"
 	"net"
@@ -18,6 +19,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/version-1/tasq/internal/buildinfo"
 	"github.com/version-1/tasq/internal/config"
 )
 
@@ -145,8 +147,8 @@ func (handler spaHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		path = "index.html"
 	}
 
-	info, err := fs.Stat(handler.assets, path)
-	if err == nil && !info.IsDir() {
+	fileInfo, err := fs.Stat(handler.assets, path)
+	if path != "index.html" && err == nil && !fileInfo.IsDir() {
 		http.FileServer(http.FS(handler.assets)).ServeHTTP(w, r)
 		return
 	}
@@ -157,5 +159,8 @@ func (handler spaHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	w.Header().Set("Content-Type", "text/html; charset=utf-8")
-	_, _ = w.Write(index)
+	info := buildinfo.Current()
+	page := strings.ReplaceAll(string(index), "__TASQ_VERSION__", html.EscapeString(info.Version))
+	page = strings.ReplaceAll(page, "__TASQ_COMMIT__", html.EscapeString(info.Commit))
+	_, _ = w.Write([]byte(page))
 }
diff --git a/cmd/web/main_test.go b/cmd/web/main_test.go
index 2e1fd04d..45eb7ab7 100644
--- a/cmd/web/main_test.go
+++ b/cmd/web/main_test.go
@@ -3,6 +3,7 @@ package main
 import (
 	"net/http"
 	"net/http/httptest"
+	"strings"
 	"testing"
 )
 
@@ -20,3 +21,28 @@ func TestHealth(t *testing.T) {
 		t.Fatalf("status=%d", response.Code)
 	}
 }
+
+func TestIndexIncludesBuildMetadata(t *testing.T) {
+	handler, err := newMux("http://127.0.0.1:1", "http://127.0.0.1:2")
+	if err != nil {
+		t.Fatalf("new mux: %v", err)
+	}
+
+	request := httptest.NewRequest(http.MethodGet, "/", nil)
+	response := httptest.NewRecorder()
+	handler.ServeHTTP(response, request)
+
+	body := response.Body.String()
+	if response.Code != http.StatusOK {
+		t.Fatalf("status=%d", response.Code)
+	}
+	if strings.Contains(body, "__TASQ_") {
+		t.Fatalf("body contains unresolved build metadata placeholder")
+	}
+	if !strings.Contains(body, `meta name="tasq-version" content="dev"`) {
+		t.Fatalf("body does not contain development version metadata")
+	}
+	if !strings.Contains(body, `meta name="tasq-commit" content="`) {
+		t.Fatalf("body does not contain commit metadata")
+	}
+}
diff --git a/docs/design/operations.ja.md b/docs/design/operations.ja.md
index cc6c9cf2..34f12909 100644
--- a/docs/design/operations.ja.md
+++ b/docs/design/operations.ja.md
@@ -32,7 +32,7 @@ CLI コマンド:
 
 `tq tui` には対話型端末と text 出力が必要です。Issue Tracker の URL は通常の CLI 解決順に従います。`--orchestrator-url` はサービス状態に保存されたオーケストレーターのアドレスより優先されます。オーケストレーターが未設定または利用できない場合は Run タブだけを縮退表示し、Issue Tracker の障害時は再試行画面を表示します。
 
-`make build-tq` はホスト用の `tq` binary を `./bin/tq` に build し、release build と同じ `buildCommit` ldflags variable を通じて現在の short commit hash を `tq version` に注入します。
+`make build-tq` はホスト用の `tq` binary を `./bin/tq` に build し、release build と同じ共有 build-info ldflags variable を通じて現在の short commit hash を `tq version` に注入します。
 
 `make dev-up` は OpenAPI UI を起動し、`dev` container 内で issue-tracker、orchestrator、web-ui を起動します。実行時状態は `$TQ_HOME` 配下に保存され、container 内の既定値は `/workspace/.tasq` です。`run-all` step はサービス起動前に migration を明示的に適用します。`make dev-codex-login` は device auth を使い、Codex の認証情報を `codex-home` Docker volume に永続化します。
 
diff --git a/docs/design/operations.md b/docs/design/operations.md
index 1b1de33e..2c9b1e7a 100644
--- a/docs/design/operations.md
+++ b/docs/design/operations.md
@@ -32,7 +32,7 @@ CLI commands:
 
 `tq tui` requires an interactive terminal and text output. The issue-tracker URL follows the normal CLI resolution order. `--orchestrator-url` overrides the orchestrator address from service state. A missing or unavailable orchestrator degrades only the Run tab; tracker failures show a retry screen.
 
-`make build-tq` builds the host `tq` binary at `./bin/tq` and injects the current short commit hash into `tq version` through the same `buildCommit` ldflags variable used by release builds.
+`make build-tq` builds the host `tq` binary at `./bin/tq` and injects the current short commit hash into `tq version` through the shared build-info ldflags variable used by release builds.
 
 `make dev-up` starts the OpenAPI UI and launches the issue-tracker, orchestrator, and web-ui inside the `dev` container. Runtime state is stored under `$TQ_HOME`, which defaults to `/workspace/.tasq` inside the container. The `run-all` step applies migrations explicitly before starting services. `make dev-codex-login` uses device auth and persists Codex authentication in the `codex-home` Docker volume.
 
diff --git a/docs/references/makefile.ja.md b/docs/references/makefile.ja.md
index f8dd3879..600ba325 100644
--- a/docs/references/makefile.ja.md
+++ b/docs/references/makefile.ja.md
@@ -23,7 +23,7 @@
 | `TQ_INSTALL_NAME` | `tq` | リリース版 `tq` バイナリとしてインストールするコマンド名。管理対象サービスの実行ファイルは、固定名で同じ場所にインストールされます。 |
 | `TQ_BUILD_COMMIT` | current short Git commit | ホスト用 `tq` ビルドに ldflags 経由で注入するコミット値。 |
 | `TQ_BUILD_PROFILE` | empty | local `tq` binary に注入し、既定の `TQ_HOME` を選ぶ build profile。 |
-| `TQ_BUILD_LDFLAGS` | `buildCommit` ldflags assignment | `make build-tq` が使う Go linker flags。 |
+| `TQ_BUILD_LDFLAGS` | 共有 build-info commit ldflags assignment | `make build-tq` が使う Go linker flags。 |
 | `AIR_VERSION` | `v1.52.3` | Go サービスを watch mode で動かすために使う Air のバージョン。 |
 
 固定ポートを使う例:
diff --git a/docs/references/makefile.md b/docs/references/makefile.md
index d4509a9a..8bd603ea 100644
--- a/docs/references/makefile.md
+++ b/docs/references/makefile.md
@@ -23,7 +23,7 @@ Use `make help` to print the prefix guide and sectioned target list generated fr
 | `TQ_INSTALL_NAME` | `tq` | Installed command name for the release `tq` binary. Managed service executables are installed next to it with fixed names. |
 | `TQ_BUILD_COMMIT` | current short Git commit | Commit value injected into host `tq` builds through ldflags. |
 | `TQ_BUILD_PROFILE` | empty | Build profile injected into the local `tq` binary to select its default `TQ_HOME`. |
-| `TQ_BUILD_LDFLAGS` | `buildCommit` ldflags assignment | Go linker flags used by `make build-tq`. |
+| `TQ_BUILD_LDFLAGS` | shared build-info commit ldflags assignment | Go linker flags used by `make build-tq`. |
 | `AIR_VERSION` | `v1.52.3` | Air version used to run Go services in watch mode. |
 
 Example with fixed ports:
diff --git a/internal/buildinfo/buildinfo.go b/internal/buildinfo/buildinfo.go
new file mode 100644
index 00000000..3ced6f6c
--- /dev/null
+++ b/internal/buildinfo/buildinfo.go
@@ -0,0 +1,83 @@
+package buildinfo
+
+import (
+	"runtime/debug"
+	"strings"
+)
+
+var (
+	version = "dev"
+	commit  = "unknown"
+)
+
+type Info struct {
+	Version string
+	Commit  string
+}
+
+func Current() Info {
+	info := Info{Version: version, Commit: commit}
+	build, ok := debug.ReadBuildInfo()
+	if !ok {
+		return info
+	}
+	if info.Version == "dev" && build.Main.Version != "" && build.Main.Version != "(devel)" && !isPseudoVersion(build.Main.Version) {
+		info.Version = build.Main.Version
+	}
+
+	modified := false
+	for _, setting := range build.Settings {
+		switch setting.Key {
+		case "vcs.revision":
+			if info.Commit != "unknown" {
+				continue
+			}
+			if len(setting.Value) > 7 {
+				info.Commit = setting.Value[:7]
+			} else if setting.Value != "" {
+				info.Commit = setting.Value
+			}
+		case "vcs.modified":
+			modified = strings.EqualFold(setting.Value, "true")
+		}
+	}
+	if modified && info.Commit != "unknown" {
+		info.Commit += "-dirty"
+	}
+	return info
+}
+
+func isPseudoVersion(value string) bool {
+	value = strings.TrimSuffix(value, "+dirty")
+	parts := strings.Split(value, "-")
+	if len(parts) < 3 {
+		return false
+	}
+	timestamp := parts[len(parts)-2]
+	revision := parts[len(parts)-1]
+	return isDigits(timestamp, 14) && isHex(revision, 12)
+}
+
+func isDigits(value string, length int) bool {
+	if len(value) != length {
+		return false
+	}
+	for _, char := range value {
+		if char < '0' || char > '9' {
+			return false
+		}
+	}
+	return true
+}
+
+func isHex(value string, length int) bool {
+	if len(value) != length {
+		return false
+	}
+	for _, char := range value {
+		if (char < '0' || char > '9') && (char < 'a' || char > 'f') {
+			return false
+		}
+	}
+	return true
+}
diff --git a/internal/buildinfo/buildinfo_test.go b/internal/buildinfo/buildinfo_test.go
new file mode 100644
index 00000000..acbcb2bd
--- /dev/null
+++ b/internal/buildinfo/buildinfo_test.go
@@ -0,0 +1,42 @@
+package buildinfo
+
+import "testing"
+
+func TestCurrentUsesInjectedBuildMetadata(t *testing.T) {
+	originalVersion := version
+	originalCommit := commit
+	t.Cleanup(func() {
+		version = originalVersion
+		commit = originalCommit
+	})
+	version = "v0.1.0"
+	commit = "abc1234"
+
+	got := Current()
+	if got.Version != "v0.1.0" {
+		t.Fatalf("Version=%q, want %q", got.Version, "v0.1.0")
+	}
+	if got.Commit != "abc1234" {
+		t.Fatalf("Commit=%q, want %q", got.Commit, "abc1234")
+	}
+}
+
+func TestIsPseudoVersion(t *testing.T) {
+	tests := []struct {
+		name    string
+		version string
+		want    bool
+	}{
+		{name: "release", version: "v0.1.0", want: false},
+		{name: "release candidate", version: "v0.1.0-rc.1", want: false},
+		{name: "pseudo", version: "v0.0.0-20260603232640-51f272dbd384", want: true},
+		{name: "dirty pseudo", version: "v0.0.0-20260603232640-51f272dbd384+dirty", want: true},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			if got := isPseudoVersion(test.version); got != test.want {
+				t.Fatalf("isPseudoVersion(%q)=%t, want %t", test.version, got, test.want)
+			}
+		})
+	}
+}
diff --git a/internal/cli/tq/command_test.go b/internal/cli/tq/command_test.go
index 48622b21..6a870807 100644
--- a/internal/cli/tq/command_test.go
+++ b/internal/cli/tq/command_test.go
@@ -90,43 +90,6 @@ func TestConfigWritesJSON(t *testing.T) {
 	}
 }
 
-func TestIsPseudoVersion(t *testing.T) {
-	tests := []struct {
-		version string
-		want    bool
-	}{
-		{version: "v0.1.0", want: false},
-		{version: "v0.1.0-rc.1", want: false},
-		{version: "v0.0.0-20260603232640-51f272dbd384", want: true},
-		{version: "v0.0.0-20260603232640-51f272dbd384+dirty", want: true},
-	}
-	for _, test := range tests {
-		if got := isPseudoVersion(test.version); got != test.want {
-			t.Fatalf("isPseudoVersion(%q)=%t, want %t", test.version, got, test.want)
-		}
-	}
-}
-
-func TestVersionInfoUsesInjectedBuildMetadata(t *testing.T) {
-	originalVersion := buildVersion
-	originalCommit := buildCommit
-	t.Cleanup(func() {
-		buildVersion = originalVersion
-		buildCommit = originalCommit
-	})
-
-	buildVersion = "v0.1.0"
-	buildCommit = "abc1234"
-
-	version, commit := versionInfo()
-	if version != "v0.1.0" {
-		t.Fatalf("version=%q, want %q", version, "v0.1.0")
-	}
-	if commit != "abc1234" {
-		t.Fatalf("commit=%q, want %q", commit, "abc1234")
-	}
-}
-
 func TestNewGHCommandDisablesInteractivePrompts(t *testing.T) {
 	t.Setenv("GH_PROMPT_DISABLED", "")
 
diff --git a/internal/cli/tq/version.go b/internal/cli/tq/version.go
index bd86357f..781bba48 100644
--- a/internal/cli/tq/version.go
+++ b/internal/cli/tq/version.go
@@ -3,86 +3,16 @@ package tq
 import (
 	"fmt"
 	"io"
-	"runtime/debug"
-	"strings"
-)
 
-var (
-	buildVersion = "dev"
-	buildCommit  = "unknown"
+	"github.com/version-1/tasq/internal/buildinfo"
 )
 
 func versionInfo() (version, commit string) {
-	version = buildVersion
-	commit = buildCommit
-
-	info, ok := debug.ReadBuildInfo()
-	if !ok {
-		return version, commit
-	}
-
-	if version == "dev" && info.Main.Version != "" && info.Main.Version != "(devel)" && !isPseudoVersion(info.Main.Version) {
-		version = info.Main.Version
-	}
-
-	modified := false
-	for _, setting := range info.Settings {
-		switch setting.Key {
-		case "vcs.revision":
-			if commit != "unknown" {
-				continue
-			}
-			if len(setting.Value) > 7 {
-				commit = setting.Value[:7]
-			} else if setting.Value != "" {
-				commit = setting.Value
-			}
-		case "vcs.modified":
-			modified = strings.EqualFold(setting.Value, "true")
-		}
-	}
-	if modified && commit != "unknown" {
-		commit += "-dirty"
-	}
-	return version, commit
+	info := buildinfo.Current()
+	return info.Version, info.Commit
 }
 
 func printVersion(w io.Writer) {
 	version, commit := versionInfo()
 	fmt.Fprintf(w, "tq %s (commit: %s)\n", version, commit)
 }
-
-func isPseudoVersion(version string) bool {
-	version = strings.TrimSuffix(version, "+dirty")
-	parts := strings.Split(version, "-")
-	if len(parts) < 3 {
-		return false
-	}
-	timestamp := parts[len(parts)-2]
-	revision := parts[len(parts)-1]
-	return isDigits(timestamp, 14) && isHex(revision, 12)
-}
-
-func isDigits(value string, length int) bool {
-	if len(value) != length {
-		return false
-	}
-	for _, char := range value {
-		if char < '0' || char > '9' {
-			return false
-		}
-	}
-	return true
-}
-
-func isHex(value string, length int) bool {
-	if len(value) != length {
-		return false
-	}
-	for _, char := range value {
-		if (char < '0' || char > '9') && (char < 'a' || char > 'f') {
-			return false
-		}
-	}
-	return true
-}