diff --git a/main.go b/main.go
index 879e0fd7..42f78a8d 100644
--- a/main.go
+++ b/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"forge.lthn.ai/core/go/pkg/cli"
 
-	// Commands — local to CLI
 	_ "forge.lthn.ai/core/cli/cmd/config"
 	_ "forge.lthn.ai/core/cli/cmd/doctor"
 	_ "forge.lthn.ai/core/cli/cmd/help"
@@ -11,9 +10,6 @@ import (
 	_ "forge.lthn.ai/core/cli/cmd/pkgcmd"
 	_ "forge.lthn.ai/core/cli/cmd/plugin"
 	_ "forge.lthn.ai/core/cli/cmd/session"
-
-	// Commands — from ecosystem repos
-	_ "forge.lthn.ai/core/go/cmd/gocmd"
 	_ "forge.lthn.ai/core/go-agentic/cmd/workspace"
 	_ "forge.lthn.ai/core/go-ai/cmd/lab"
 	_ "forge.lthn.ai/core/go-devops/cmd/dev"
@@ -22,6 +18,7 @@ import (
 	_ "forge.lthn.ai/core/go-devops/cmd/monitor"
 	_ "forge.lthn.ai/core/go-devops/cmd/qa"
 	_ "forge.lthn.ai/core/go-devops/cmd/setup"
+	_ "forge.lthn.ai/core/go/cmd/gocmd"
 )
 
 func main() {