Replace bs version subcommand with --version flag showing client and server versions

bs --version (-v) now contacts the server and prints both client and
server versions as plain text, or 'server: unavailable' if the server
cannot be reached. This makes it a quick way to check server presence.
The separate 'bs version' subcommand is removed.

Author: vector76

README.md

@@ -125,6 +125,7 @@ The client also reads `BS_TOKEN`, `BS_USER`, and `BS_URL` from a `.env` file in
 
 | Command | Description |
 |---------|-------------|
+| `bs -v` / `bs --version` | Show client version and server version (or `server: unavailable` if unreachable) |
 | `bs whoami` | Print current agent identity (local, no server contact) |
 | `bs add "title"` | Create a bead (`--type`, `--priority`, `--description`, `--tags`, `--parent <id>`, `--status open\|not_ready`) |
 | `bs show <id>` | Show full bead details |
@@ -144,7 +145,7 @@ The client also reads `BS_TOKEN`, `BS_USER`, and `BS_URL` from a `.env` file in
 | `bs move <id> --into <epic-id>` | Move a bead into an epic (set parent) |
 | `bs move <id> --out` | Detach a bead from its parent epic |
 
-All output is pretty-printed JSON. IDs are short by default (`bd-` + 4 chars) and must be specified exactly and in full.
+All command output is pretty-printed JSON except `--version`, which outputs plain text. IDs are short by default (`bd-` + 4 chars) and must be specified exactly and in full.
 
 Hidden aliases (not shown in `bs --help`): `bs create` = `bs add`, `bs resolve` = `bs close`.
 

internal/cli/commands_query.go

@@ -1,54 +1,13 @@
 package cli
 
 import (
-	"encoding/json"
 	"fmt"
 	"net/url"
 	"strconv"
 
 	"github.com/spf13/cobra"
 )
 
-func newVersionCmd() *cobra.Command {
-	return &cobra.Command{
-		Use:   "version",
-		Short: "Show client and server versions",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			c, err := NewClientFromEnv()
-			if err != nil {
-				return err
-			}
-
-			data, err := c.Do("GET", "/api/v1/version", nil)
-			if err != nil {
-				return err
-			}
-
-			var serverResp struct {
-				Version string `json:"version"`
-			}
-			if err := json.Unmarshal(data, &serverResp); err != nil {
-				return fmt.Errorf("parsing server response: %w", err)
-			}
-
-			combined := struct {
-				Client string `json:"client"`
-				Server string `json:"server"`
-			}{Client: version, Server: serverResp.Version}
-			b, err := json.Marshal(combined)
-			if err != nil {
-				return err
-			}
-			out, err := prettyJSON(b)
-			if err != nil {
-				return err
-			}
-			fmt.Fprintln(cmd.OutOrStdout(), out)
-			return nil
-		},
-	}
-}
-
 func newListCmd() *cobra.Command {
 	var all bool
 	var ready bool

internal/cli/commands_query_test.go

@@ -9,24 +9,6 @@ import (
 	"github.com/yourorg/beads_server/internal/store"
 )
 
-func TestVersionCmd(t *testing.T) {
-	ts := startTestServerWithVersion(t, "9.8.7")
-	setClientEnv(t, ts.URL)
-
-	out := runCmd(t, "version")
-
-	var result map[string]string
-	if err := json.Unmarshal([]byte(out), &result); err != nil {
-		t.Fatalf("parse output: %v\noutput: %s", err, out)
-	}
-	if result["server"] != "9.8.7" {
-		t.Errorf("server = %q, want 9.8.7", result["server"])
-	}
-	if result["client"] != version {
-		t.Errorf("client = %q, want %q", result["client"], version)
-	}
-}
-
 func TestList_Default(t *testing.T) {
 	ts := startTestServer(t)
 	setClientEnv(t, ts.URL)

internal/cli/commands_test.go

@@ -606,6 +606,38 @@ func TestRedirectCmd_BlockHelp(t *testing.T) {
 	}
 }
 
+func TestVersionFlag(t *testing.T) {
+	ts := startTestServerWithVersion(t, "9.8.7")
+	setClientEnv(t, ts.URL)
+
+	out := runCmd(t, "--version")
+
+	if !strings.Contains(out, "client: "+version) {
+		t.Errorf("expected client version in output, got: %s", out)
+	}
+	if !strings.Contains(out, "server: 9.8.7") {
+		t.Errorf("expected server: 9.8.7 in output, got: %s", out)
+	}
+}
+
+func TestVersionFlagServerUnavailable(t *testing.T) {
+	os.Setenv("BS_URL", "http://localhost:59999")
+	os.Setenv("BS_TOKEN", testToken)
+	t.Cleanup(func() {
+		os.Unsetenv("BS_URL")
+		os.Unsetenv("BS_TOKEN")
+	})
+
+	out := runCmd(t, "--version")
+
+	if !strings.Contains(out, "client: "+version) {
+		t.Errorf("expected client version in output, got: %s", out)
+	}
+	if !strings.Contains(out, "server: unavailable") {
+		t.Errorf("expected server: unavailable in output, got: %s", out)
+	}
+}
+
 func TestRedirectCmdsHiddenFromHelp(t *testing.T) {
 	out := runCmd(t, "--help")
 	if strings.Contains(out, "\n  depend") {

internal/cli/root.go

@@ -1,6 +1,9 @@
 package cli
 
 import (
+	"encoding/json"
+	"fmt"
+
 	"github.com/spf13/cobra"
 )
 
@@ -9,12 +12,32 @@ var version = "dev"
 // NewRootCmd creates the root cobra command for the bs CLI.
 func NewRootCmd() *cobra.Command {
 	root := &cobra.Command{
-		Use:     "bs",
-		Short:   "Beads server CLI",
-		Long:    "Beads server CLI — a tool for managing beads (issues/tasks).\n\nClient commands require BS_TOKEN and optionally BS_URL (default http://localhost:9999).",
-		Version: version,
+		Use:   "bs",
+		Short: "Beads server CLI",
+		Long:  "Beads server CLI — a tool for managing beads (issues/tasks).\n\nClient commands require BS_TOKEN and optionally BS_URL (default http://localhost:9999).",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			showVersion, _ := cmd.Flags().GetBool("version")
+			if !showVersion {
+				return cmd.Help()
+			}
+			fmt.Fprintf(cmd.OutOrStdout(), "client: %s\n", version)
+			serverVersion := "unavailable"
+			if c, err := NewClientFromEnv(); err == nil {
+				if data, err := c.Do("GET", "/api/v1/version", nil); err == nil {
+					var resp struct {
+						Version string `json:"version"`
+					}
+					if json.Unmarshal(data, &resp) == nil && resp.Version != "" {
+						serverVersion = resp.Version
+					}
+				}
+			}
+			fmt.Fprintf(cmd.OutOrStdout(), "server: %s\n", serverVersion)
+			return nil
+		},
 	}
 
+	root.Flags().BoolP("version", "v", false, "show version information")
 	root.CompletionOptions.DisableDefaultCmd = true
 	root.AddGroup(
 		&cobra.Group{ID: "server", Title: "Server Commands:"},
@@ -26,7 +49,6 @@ func NewRootCmd() *cobra.Command {
 	root.AddCommand(serveCmd)
 
 	for _, cmd := range []*cobra.Command{
-		newVersionCmd(),
 		newWhoamiCmd(),
 		newAddCmd(),
 		newShowCmd(),