diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07c363f..d215093 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ Exceptions are acceptable depending on the circumstances (critical bug fixes tha
 
 ### Added
 
+- added automatic version check on CLI startup using `CheckForUpdates`
 - added `version` subcommand to display the current CLI version
 - added `self-update` subcommand to update the CLI binary from GitHub releases
 - added `FlagBinder` optional interface for controllers to register command-specific flags
diff --git a/cmd/code-guru/main.go b/cmd/code-guru/main.go
index 0d5a5de..ec0e7fc 100644
--- a/cmd/code-guru/main.go
+++ b/cmd/code-guru/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"os"
 
+	"github.com/rios0rios0/cliforge/pkg/selfupdate"
 	logger "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
@@ -88,6 +89,8 @@ func main() {
 	appContext := injectAppContext()
 	addSubcommands(cobraRoot, appContext)
 
+	selfupdate.NewCommand("rios0rios0", "code-guru", "code-guru", version).CheckForUpdates()
+
 	if err := cobraRoot.Execute(); err != nil {
 		logger.Fatalf("error executing 'code-guru': %s", err)
 	}
diff --git a/go.mod b/go.mod
index 2411774..2197e5c 100644
--- a/go.mod
+++ b/go.mod
@@ -2,7 +2,7 @@ module github.com/rios0rios0/codeguru
 
 go 1.26.1
 
-require github.com/rios0rios0/cliforge v0.1.1-0.20260402173400-cd7225c728db
+require github.com/rios0rios0/cliforge v0.2.1-0.20260404230949-b9683f7eded2
 
 require (
 	github.com/anthropics/anthropic-sdk-go v1.29.0
diff --git a/go.sum b/go.sum
index 5efa296..865b5cb 100644
--- a/go.sum
+++ b/go.sum
@@ -69,8 +69,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rios0rios0/cliforge v0.1.1-0.20260402173400-cd7225c728db h1:uplUAe01ckRMX7GzquWtdmnYweYLh0yLr7UFZfjQ2nI=
-github.com/rios0rios0/cliforge v0.1.1-0.20260402173400-cd7225c728db/go.mod h1:xqHRf5C15as2KOOTXdyNZQnfExtXOpSkRljkhZ4hVsQ=
+github.com/rios0rios0/cliforge v0.2.1-0.20260404230949-b9683f7eded2 h1:cRuv/NTZ7B7UzTzO3JQy8VQlYxo45xC0RPhnVN6Ar7k=
+github.com/rios0rios0/cliforge v0.2.1-0.20260404230949-b9683f7eded2/go.mod h1:Ma0C18zImHW305Ezt+XCsmUmtSj3BM1mcBk7G5lttv0=
 github.com/rios0rios0/gitforge v0.9.1 h1:HykXcbckOwiMhOKvtJ1ICEry9pEq8/2gMIJcjqjIr6A=
 github.com/rios0rios0/gitforge v0.9.1/go.mod h1:1ts/2K9iVaMYBk4b/XWPN5vfjt7A6ktWxXSgm0ox2FU=
 github.com/rios0rios0/langforge v0.5.0 h1:mRXfvgna9PGc4S2iYBztmYmwTW9o8MHj0Ne1W8pAy80=