Refactor secrets, info, and logs commands for consistency and robustness

Author: bdsoha

.claude/settings.local.json

@@ -0,0 +1,17 @@
+{
+  "permissions": {
+    "allow": [
+      "WebFetch(domain:raw.githubusercontent.com)",
+      "WebFetch(domain:github.com)",
+      "Bash(go doc:*)",
+      "Bash(go build:*)",
+      "Bash(./ws-cli template:*)",
+      "Bash(./ws-cli:*)",
+      "WebSearch",
+      "mcp__ide__getDiagnostics",
+      "Bash(go mod:*)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

.todo

@@ -0,0 +1,5 @@
+- add a vault.yaml `version: v1`
+- remove WS_SECRET_* during startup
+- document the removal of WS_SECRET_* and WS_PASS during startup
+- create a WS_PASSWORD_*_FILE
+- create WS_PASSWORD from ws-cli secrets generate

CLAUDE.md

@@ -0,0 +1,25 @@
+# Requirements
+
+1. **Separation of concerns**
+   Keep argument/flag parsing at the edges. Commands should delegate to exported functions that contain the business logic (MVC-inspired: parsing ≠ logic).
+
+2. **Command tree wiring**
+   The root command registers its direct children (e.g., `rootCmd.AddCommand(log.LogCmd)`), and each child registers its own subcommands.
+
+3. **Pragmatic structure**
+   Avoid over-engineering: no DI frameworks and don’t create `internal/*` packages for every command. Place shared logic in importable modules so it’s reusable and testable without duplication.
+
+4. **Dependency policy**
+   Prefer native/standard library solutions over third-party packages whenever possible.
+
+5. **Testing**
+   For tests, use the `gotest.tools/v3/assert` library instead of `if/fail` conditions.
+
+6. **Backwards compatibility**
+   This is not a public library; legacy compatibility isn’t required.
+
+7. **CLI UX**
+   Add colorized output to make the CLI more user-friendly.
+
+8. **Comments**
+   Do not not add comments unless specifically instructed

cmd/info/info.go

@@ -5,52 +5,56 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"strings"
 
 	"github.com/kloudkit/ws-cli/internals/config"
+	internalIO "github.com/kloudkit/ws-cli/internals/io"
 	"github.com/kloudkit/ws-cli/internals/styles"
 	"github.com/spf13/cobra"
 )
 
-func readJsonFile() map[string]any {
-	var content map[string]any
-
-	data, _ := os.ReadFile(config.DefaultManifestPath)
-
-	_ = json.Unmarshal(data, &content)
-
-	return content
+type Manifest struct {
+	Version string `json:"version"`
+	VSCode  struct {
+		Version string `json:"version"`
+	} `json:"vscode"`
 }
 
-func readJson(content map[string]any, key string) string {
-	keys := strings.Split(key, ".")
-	var value any = content
-
-	for _, k := range keys {
-		m, ok := value.(map[string]any)
-		if !ok {
-			return ""
-		}
+func readManifest() (*Manifest, error) {
+	if !internalIO.FileExists(config.DefaultManifestPath) {
+		return nil, fmt.Errorf("manifest not found at %s", config.DefaultManifestPath)
+	}
 
-		value = m[k]
+	data, err := os.ReadFile(config.DefaultManifestPath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read manifest: %w", err)
 	}
 
-	if str, ok := value.(string); ok {
-		return str
+	var m Manifest
+	if err := json.Unmarshal(data, &m); err != nil {
+		return nil, fmt.Errorf("failed to parse manifest: %w", err)
 	}
 
-	return fmt.Sprintf("%v", value)
+	return &m, nil
 }
 
 func showVersion(writer io.Writer) {
-	content := readJsonFile()
+	manifest, err := readManifest()
+	if err != nil {
+		styles.PrintWarning(writer, fmt.Sprintf("Could not read workspace version: %v", err))
+		fmt.Fprintf(writer, "%s\n", styles.Title().Render("Versions"))
+		t := styles.Table().Rows(
+			[]string{"ws-cli", Version},
+		)
+		fmt.Fprintln(writer, t.Render())
+		return
+	}
 
 	fmt.Fprintf(writer, "%s\n", styles.Title().Render("Versions"))
 
 	t := styles.Table().Rows(
-		[]string{"workspace", readJson(content, "version")},
+		[]string{"workspace", manifest.Version},
 		[]string{"ws-cli", Version},
-		[]string{"VSCode", readJson(content, "vscode.version")},
+		[]string{"VSCode", manifest.VSCode.Version},
 	)
 
 	fmt.Fprintln(writer, t.Render())

cmd/logs/logs.go

@@ -2,7 +2,6 @@ package logs
 
 import (
 	"fmt"
-	"os"
 
 	"github.com/kloudkit/ws-cli/internals/logger"
 	"github.com/kloudkit/ws-cli/internals/styles"
@@ -28,13 +27,13 @@ func execute(cmd *cobra.Command, args []string) error {
 			{"warn", "Warning messages"},
 			{"error", "Error messages only"},
 		})
-		os.Exit(1)
+		return fmt.Errorf("invalid log level")
 	}
 
 	reader, err := logger.NewReader(tail, level)
 	if err != nil {
 		styles.PrintError(cmd.ErrOrStderr(), fmt.Sprintf("Failed to initialize log reader: %s", err))
-		os.Exit(1)
+		return err
 	}
 
 	if follow {
@@ -45,7 +44,7 @@ func execute(cmd *cobra.Command, args []string) error {
 
 	if err != nil {
 		styles.PrintError(cmd.ErrOrStderr(), fmt.Sprintf("Error reading logs: %s", err))
-		os.Exit(1)
+		return err
 	}
 
 	return nil

cmd/secrets/encrypt.go

@@ -37,4 +37,3 @@ var encryptCmd = &cobra.Command{
 		return handleOutput(cmd, cfg, encrypted, "Encrypted Value", "Secret encrypted successfully", true)
 	},
 }
-

cmd/secrets/generate/generate.go cmd/secrets/generate.gocmd/secrets/generate/generate.go renamed to cmd/secrets/generate.go

@@ -1,12 +1,12 @@
-package generate
+package secrets
 
 import "github.com/spf13/cobra"
 
-var GenerateCmd = &cobra.Command{
+var generateCmd = &cobra.Command{
 	Use:   "generate",
 	Short: "Generate master keys or login password hashes",
 }
 
 func init() {
-	GenerateCmd.AddCommand(masterCmd, loginCmd)
+	generateCmd.AddCommand(masterCmd, loginCmd)
 }