CLI Improvements: Pagination, Shell Completion, Config, and Debug

README.md

@@ -109,6 +109,13 @@ npm run dev
 
 ## Recent Improvements
 
+### CLI Enhancements
+- **Multiple Output Formats**: `--output table|json|yaml` flag (default: table)
+- **Shell Completion**: `cloud completion [bash|zsh|fish|powershell]`
+- **Persistent Configuration**: `cloud config show|set|unset` for storing API URL and defaults
+- **Debug Mode**: `--debug` flag for tracing API calls
+- **Pagination Support**: `--limit` and `--offset` flags on list commands
+
 ### Code Quality & Features
 - **Simplified Architecture**: Refactored `InstanceService` using parameter structs and helper methods.
 - **Enhanced Storage**: Added support for **LVM Block Storage** and **VNC Console** access.

cmd/cloud/auth.go

@@ -180,8 +180,7 @@ type Config struct {
 }
 
 func getConfigPath() string {
-	home, _ := os.UserHomeDir()
-	return filepath.Join(home, ".cloud", "config.json")
+	return getConfigFilePath()
 }
 
 func saveConfig(key string) {

cmd/cloud/common.go

@@ -6,41 +6,61 @@ import (
 	"os"
 
 	"github.com/poyrazk/thecloud/pkg/sdk"
+	"gopkg.in/yaml.v3"
 )
 
 type CLIOptions struct {
 	JSON     bool
+	Output   string
 	APIKey   string
 	APIURL   string
 	TenantID string
+	Debug    bool
 }
 
 var opts CLIOptions
 
+const errFmt = "Error: %v\n"
+
 func createClient(o CLIOptions) *sdk.Client {
+	cfg := loadFullConfig()
+
 	key := o.APIKey
 	if key == "" {
 		key = os.Getenv("CLOUD_API_KEY")
 	}
 	if key == "" {
-		key = loadConfig()
+		key = loadConfigFile()
 	}
 
 	if key == "" {
 		fmt.Println("[WARN] No API Key found. Run 'cloud auth create-demo <name>' to get one.")
 		os.Exit(1)
 	}
 
-	client := sdk.NewClient(o.APIURL, key)
+	apiURL := o.APIURL
+	if apiURL == "http://localhost:8080" && cfg.APIURL != "" {
+		apiURL = cfg.APIURL
+	}
+
+	client := sdk.NewClient(apiURL, key)
 
 	tenant := o.TenantID
 	if tenant == "" {
 		tenant = os.Getenv("CLOUD_TENANT_ID")
 	}
+	if tenant == "" {
+		tenant = cfg.Tenant
+	}
 
 	if tenant != "" {
 		client.SetTenant(tenant)
 	}
+
+	if o.Debug || cfg.Debug {
+		client.EnableDebug()
+	}
+
 	return client
 }
 
@@ -53,10 +73,47 @@ func printJSON(data interface{}) {
 	fmt.Println(string(b))
 }
 
+func printOutput(data interface{}) {
+	output := opts.Output
+	if output == "" {
+		output = "table"
+	}
+
+	switch output {
+	case "json":
+		printJSON(data)
+	case "yaml":
+		b, err := yaml.Marshal(data)
+		if err != nil {
+			fmt.Printf("Error marshaling YAML: %v\n", err)
+			return
+		}
+		fmt.Println(string(b))
+	default:
+		// For table output, fall back to JSON for now
+		// Commands that use tablewriter handle their own output
+		printJSON(data)
+	}
+}
+
 func truncateID(id string) string {
 	const n = 8
 	if len(id) <= n {
 		return id
 	}
 	return id[:n]
 }
+
+// listWithPagination is a generic helper for list commands that support pagination.
+// It calls the paginated function if limit/offset are set, otherwise calls the regular function.
+func listWithPagination[T any](
+	regularFn func() ([]T, error),
+	pagFn func(int, int) ([]T, *sdk.ListResponse[T], error),
+	limit, offset int,
+) ([]T, *sdk.ListResponse[T], error) {
+	if limit > 0 || offset > 0 {
+		return pagFn(limit, offset)
+	}
+	items, err := regularFn()
+	return items, nil, err
+}

cmd/cloud/config.go

@@ -0,0 +1,156 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/spf13/cobra"
+)
+
+type cliConfig struct {
+	APIKey   string `json:"api_key"`
+	APIURL   string `json:"api_url"`
+	Output   string `json:"output"`
+	Tenant   string `json:"tenant"`
+	Debug    bool   `json:"debug"`
+}
+
+func getConfigFilePath() string {
+	home, _ := os.UserHomeDir()
+	return filepath.Join(home, ".cloud", "config.json")
+}
+
+var configFile = getConfigFilePath()
+
+func loadConfigFile() string {
+	data, err := os.ReadFile(configFile)
+	if err != nil {
+		return ""
+	}
+
+	var cfg cliConfig
+	if err := json.Unmarshal(data, &cfg); err != nil {
+		return ""
+	}
+
+	return cfg.APIKey
+}
+
+func loadFullConfig() *cliConfig {
+	data, err := os.ReadFile(configFile)
+	if err != nil {
+		return &cliConfig{}
+	}
+
+	var cfg cliConfig
+	if err := json.Unmarshal(data, &cfg); err != nil {
+		return &cliConfig{}
+	}
+
+	return &cfg
+}
+
+func saveConfigFile(cfg cliConfig) error {
+	dir := filepath.Dir(configFile)
+	if err := os.MkdirAll(dir, 0755); err != nil {
+		return fmt.Errorf("failed to create config directory: %w", err)
+	}
+
+	data, err := json.MarshalIndent(cfg, "", "  ")
+	if err != nil {
+		return fmt.Errorf("failed to marshal config: %w", err)
+	}
+
+	if err := os.WriteFile(configFile, data, 0600); err != nil {
+		return fmt.Errorf("failed to write config file: %w", err)
+	}
+
+	return nil
+}
+
+var configCmd = &cobra.Command{
+	Use:   "config",
+	Short: "Manage CLI configuration",
+}
+
+var configShowCmd = &cobra.Command{
+	Use:   "show",
+	Short: "Show current configuration",
+	Run: func(cmd *cobra.Command, args []string) {
+		cfg := loadFullConfig()
+		printOutput(cfg)
+	},
+}
+
+var configSetCmd = &cobra.Command{
+	Use:   "set <key> <value>",
+	Short: "Set a configuration value",
+	Args:  cobra.ExactArgs(2),
+	Run: func(cmd *cobra.Command, args []string) {
+		cfg := loadFullConfig()
+		key := args[0]
+		value := args[1]
+
+		switch key {
+		case "api-key":
+			cfg.APIKey = value
+		case "api-url":
+			cfg.APIURL = value
+		case "output":
+			cfg.Output = value
+		case "tenant":
+			cfg.Tenant = value
+		default:
+			fmt.Printf("Error: unknown config key: %s\n", key)
+			fmt.Println("Valid keys: api-key, api-url, output, tenant")
+			os.Exit(1)
+		}
+
+		if err := saveConfigFile(*cfg); err != nil {
+			fmt.Printf("Error saving config: %v\n", err)
+			os.Exit(1)
+		}
+
+		fmt.Println("[SUCCESS] configuration updated")
+	},
+}
+
+var configUnsetCmd = &cobra.Command{
+	Use:   "unset <key>",
+	Short: "Unset a configuration value",
+	Args:  cobra.ExactArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+		cfg := loadFullConfig()
+		key := args[0]
+
+		switch key {
+		case "api-key":
+			cfg.APIKey = ""
+		case "api-url":
+			cfg.APIURL = ""
+		case "output":
+			cfg.Output = ""
+		case "tenant":
+			cfg.Tenant = ""
+		default:
+			fmt.Printf("Error: unknown config key: %s\n", key)
+			fmt.Println("Valid keys: api-key, api-url, output, tenant")
+			os.Exit(1)
+		}
+
+		if err := saveConfigFile(*cfg); err != nil {
+			fmt.Printf("Error saving config: %v\n", err)
+			os.Exit(1)
+		}
+
+		fmt.Printf("[SUCCESS] %s unset\n", key)
+	},
+}
+
+func init() {
+	configCmd.AddCommand(configShowCmd)
+	configCmd.AddCommand(configSetCmd)
+	configCmd.AddCommand(configUnsetCmd)
+}

cmd/cloud/container.go

@@ -40,7 +40,15 @@ var listDeploymentsCmd = &cobra.Command{
 	Short: "List all deployments",
 	Run: func(cmd *cobra.Command, args []string) {
 		client := createClient(opts)
-		deps, err := client.ListDeployments()
+
+		limit, _ := cmd.Flags().GetInt("limit")
+		offset, _ := cmd.Flags().GetInt("offset")
+
+		deps, meta, err := listWithPagination(
+			client.ListDeployments,
+			client.ListDeploymentsWithPagination,
+			limit, offset,
+		)
 		if err != nil {
 			fmt.Printf(containerErrorFormat, err)
 			return
@@ -59,6 +67,14 @@ var listDeploymentsCmd = &cobra.Command{
 			})
 		}
 		table.Render()
+
+		if meta != nil {
+			fmt.Printf("\nShowing %d of %d total", len(deps), meta.TotalCount)
+			if meta.HasMore {
+				fmt.Print(" (more available)")
+			}
+			fmt.Println()
+		}
 	},
 }
 
@@ -103,6 +119,9 @@ func init() {
 	createDeploymentCmd.Flags().IntP("replicas", "r", 1, "Number of replicas")
 	createDeploymentCmd.Flags().StringP("ports", "p", "", "Ports to expose (e.g. 80:80)")
 
+	listDeploymentsCmd.Flags().Int("limit", 0, "Maximum number of results (0 = use server default)")
+	listDeploymentsCmd.Flags().Int("offset", 0, "Number of results to skip")
+
 	containerCmd.AddCommand(createDeploymentCmd)
 	containerCmd.AddCommand(listDeploymentsCmd)
 	containerCmd.AddCommand(scaleDeploymentCmd)

cmd/cloud/container_cli_test.go

@@ -55,6 +55,10 @@ func TestCreateDeploymentCmd(t *testing.T) {
 }
 
 func TestListDeploymentsCmd(t *testing.T) {
+	type listDeploymentsResponse struct {
+		Data []map[string]interface{} `json:"data"`
+	}
+
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
 		if r.URL.Path != "/containers/deployments" || r.Method != http.MethodGet {
@@ -74,7 +78,7 @@ func TestListDeploymentsCmd(t *testing.T) {
 				},
 			},
 		}
-		_ = json.NewEncoder(w).Encode(payload)
+		_ = json.NewEncoder(w).Encode(listDeploymentsResponse{Data: payload["data"].([]map[string]interface{})})
 	}))
 	defer server.Close()