Split ws from jobsearch as a separate test utility rather than a feature of jobsearch

cmd/jobsearch/main.go

@@ -31,7 +31,6 @@ import (
 	"git.avsdev.uk/Go/job-search/internal/cli/migrate"
 	"git.avsdev.uk/Go/job-search/internal/cli/serve"
 	"git.avsdev.uk/Go/job-search/internal/cli/version"
-	"git.avsdev.uk/Go/job-search/internal/cli/ws"
 )
 
 // newRootCmd builds the command tree. It returns a fresh tree on each call so
@@ -77,7 +76,6 @@ opportunities.
 		config.NewCommand(opts),
 		fetch.NewCommand(opts),
 		migrate.NewCommand(opts),
-		ws.NewCommand(opts),
 		serve.NewCommand(opts),
 	)
 

cmd/jobsearch/main_test.go

@@ -18,7 +18,7 @@ func TestCommandTree(t *testing.T) {
 		names = append(names, c.Name())
 	}
 
-	commands := []string{"config", "fetch", "migrate", "version", "ws"}
+	commands := []string{"config", "fetch", "migrate", "serve", "version"}
 	for _, want := range commands {
 		if !slices.Contains(names, want) {
 			t.Errorf("job-search has no %q command; has %v", want, names)

cmd/ws-test/main.go

@@ -0,0 +1,82 @@
+/*
+Copyright © 2026 Craig Williams <craig@avsdev.uk>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+// Command ws-test, for testing JobSearch's WebSocket servers. Run
+// `ws-test --help` for usage.
+package main
+
+import (
+	"fmt"
+	"log/slog"
+	"os"
+	"strings"
+
+	"github.com/spf13/cobra"
+
+	"git.avsdev.uk/Go/job-search/internal/cli"
+	"git.avsdev.uk/Go/job-search/internal/cli/ws"
+)
+
+// newRootCmd builds the command tree. It returns a fresh tree on each call so
+// tests can run commands in isolation.
+func newRootCmd() *cobra.Command {
+	opts := &cli.Options{}
+
+	root := &cobra.Command{
+		Use:   "ws-test",
+		Short: "WebSocket test tools for JobSearch",
+		Long: `ws-test runs a plain TCP server for websocket hub clients (serve), and
+tests the JobSearch HTTP server's /ws endpoint (dial). Defaults come from the
+JobSearch configuration.
+	`,
+		SilenceUsage:  true, // don't print usage on runtime errors
+		SilenceErrors: true, // main prints the error once
+		CompletionOptions: cobra.CompletionOptions{
+			HiddenDefaultCmd: true,
+		},
+		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
+			cli.SetupInitialLogging(cmd)
+
+			slog.Debug("command persistent pre-run", "command", "root")
+			slog.Debug(
+				"command",
+				"path", strings.Join(strings.Split(cmd.CommandPath(), " ")[1:], " "),
+			)
+
+			return nil
+		},
+		PersistentPostRunE: func(cmd *cobra.Command, args []string) error {
+			slog.Debug("command persistent post-run", "command", "root")
+
+			return opts.Finish()
+		},
+	}
+
+	cobra.EnableTraverseRunHooks = true
+
+	opts.Bind(root)
+
+	root.AddCommand(ws.NewCommands(opts)...)
+
+	return root
+}
+
+func main() {
+	if err := newRootCmd().Execute(); err != nil {
+		fmt.Fprintln(os.Stderr, "ws-test:", err)
+		os.Exit(1)
+	}
+}

cmd/ws-test/main_test.go

@@ -0,0 +1,30 @@
+package main
+
+import (
+	"slices"
+	"testing"
+)
+
+// The commands are tested in internal/cli/ws. This test checks newRootCmd
+// puts them together.
+
+func TestCommandTree(t *testing.T) {
+	root := newRootCmd()
+
+	var names []string
+	for _, c := range root.Commands() {
+		names = append(names, c.Name())
+	}
+
+	for _, want := range []string{"dial", "serve"} {
+		if !slices.Contains(names, want) {
+			t.Errorf("ws-test has no %q command; has %v", want, names)
+		}
+	}
+
+	for _, flag := range []string{"config", "debug", "quiet"} {
+		if root.PersistentFlags().Lookup(flag) == nil {
+			t.Errorf("ws-test has no --%s flag", flag)
+		}
+	}
+}