more commands

Author: adhikjoshi

AGENTS.md

@@ -4,7 +4,7 @@
 
 ## Project Overview
 
-Go CLI for the ModelsLab AI platform. 103 commands across 14 groups covering auth, profile, keys, models, generate (image/video/audio/3D/chat), billing, wallet, subscriptions, teams, usage, config, MCP, docs, and shell completions. ~10k lines across 26 Go files.
+Go CLI for the ModelsLab AI platform. 105 commands across 14 groups covering auth, profile, keys, models, generate (image/video/audio/3D/chat), billing, wallet, subscriptions, teams, usage, config, MCP, docs, and shell completions. ~10k lines across 26 Go files.
 
 **Stack**: Go 1.26 · Cobra + Viper · Charmbracelet (bubbletea, lipgloss, huh, glamour) · go-keyring · gojq · mcp-go · GoReleaser v2
 
@@ -37,9 +37,9 @@ MODELSLAB_TEST_TOKEN="<token>" MODELSLAB_TEST_API_KEY="<key>" go test ./tests/ -
 | `internal/cmd/keys.go` | 5 API key commands |
 | `internal/cmd/models.go` | 8 model discovery commands |
 | `internal/cmd/generate.go` | 20 generation commands + async polling + file download |
-| `internal/cmd/billing.go` | 10 billing commands + Stripe card tokenization |
+| `internal/cmd/billing.go` | 13 billing commands + Stripe card tokenization + payment links + setup intents |
 | `internal/cmd/wallet.go` | 10 wallet commands |
-| `internal/cmd/subscriptions.go` | 11 subscription commands |
+| `internal/cmd/subscriptions.go` | 10 subscription commands |
 | `internal/cmd/teams.go` | 7 team commands |
 | `internal/cmd/usage.go` | 3 usage commands |
 | `internal/cmd/config.go` | 6 config/profile commands |
@@ -151,4 +151,4 @@ Generation commands use `pollAndDownload()` for async workflows:
 
 ## Design Spec
 
-The authoritative spec for all 103 commands, API endpoints, and UX flows is in `cli.md` (1075 lines). Always consult it when adding features or fixing behavior.
+The authoritative spec for all 102 commands, API endpoints, and UX flows is in `cli.md`. Always consult it when adding features or fixing behavior.

CLAUDE.md

@@ -2,7 +2,7 @@
 
 ## What is this project?
 
-A Go CLI for the [ModelsLab](https://modelslab.com) platform. It covers account management, model discovery, AI generation (image/video/audio/3D/chat), billing, wallet, subscriptions, teams, usage analytics, and MCP server mode. ~10k lines of Go across 26 files, 103 subcommands in 14 groups.
+A Go CLI for the [ModelsLab](https://modelslab.com) platform. It covers account management, model discovery, AI generation (image/video/audio/3D/chat), billing, wallet, subscriptions, teams, usage analytics, and MCP server mode. ~10k lines of Go across 26 files, 105 subcommands in 14 groups.
 
 ## Quick Reference
 
@@ -40,9 +40,9 @@ internal/
     keys.go                    # 5 API key commands
     models.go                  # 8 model discovery commands
     generate.go                # 20 generation commands + polling + download
-    billing.go                 # 10 billing commands + Stripe tokenization
+    billing.go                 # 13 billing commands + Stripe tokenization + payment links + setup intents
     wallet.go                  # 10 wallet commands
-    subscriptions.go           # 11 subscription commands
+    subscriptions.go           # 10 subscription commands
     teams.go                   # 7 team commands
     usage.go                   # 3 usage analytics commands
     config.go                  # 6 config/profile commands
@@ -110,7 +110,7 @@ CLI flags → env vars (`MODELSLAB_*`) → project config → user config (`~/.c
 
 ### MCP Server
 
-`internal/mcp/server.go` registers ~30 tools covering both control plane and generation endpoints. Supports `stdio` (default) and `sse` transports. Used by Claude Desktop/Code:
+`internal/mcp/server.go` registers ~37 tools covering both control plane and generation endpoints. Supports `stdio` (default) and `sse` transports. Used by Claude Desktop/Code:
 ```json
 { "mcpServers": { "modelslab": { "command": "modelslab", "args": ["mcp", "serve"] } } }
 ```
@@ -172,4 +172,4 @@ Check `internal/cmd/helpers.go` for the shared response parsing helpers. If the
 
 ## Design Document
 
-The full design spec is in `cli.md` (1075 lines). It contains the complete API endpoint mapping, all 103 commands, UX flows, and architectural decisions. Consult it for the authoritative specification.
+The full design spec is in `cli.md`. It contains the complete API endpoint mapping, all 102 commands, UX flows, and architectural decisions. Consult it for the authoritative specification.

README.md

@@ -86,7 +86,7 @@ modelslab models        Discover models (search, detail, filters, tags, provider
 modelslab generate      Generate AI content (image, video, audio, 3D, chat)
 modelslab billing       Manage billing (overview, payment methods, invoices)
 modelslab wallet        Manage wallet (balance, fund, transactions, coupons)
-modelslab subscriptions Manage subscriptions (plans, create, cancel, pause)
+modelslab subscriptions Manage subscriptions (plans, create, pause, resume)
 modelslab teams         Manage teams (list, invite, update, remove)
 modelslab usage         View usage analytics (summary, products, history)
 modelslab config        Manage CLI configuration (set, get, profiles)

internal/cmd/billing.go

@@ -312,6 +312,119 @@ var billingInvoiceDetailCmd = &cobra.Command{
 	},
 }
 
+var billingStripeConfigCmd = &cobra.Command{
+	Use:   "stripe-config",
+	Short: "Get Stripe publishable key for client-side card tokenization",
+	RunE: func(cmd *cobra.Command, args []string) error {
+		client := getClient()
+		var result map[string]interface{}
+		err := client.DoControlPlane("GET", "/billing/stripe-config", nil, &result)
+		if err != nil {
+			return err
+		}
+
+		outputResult(result, func() {
+			data := extractData(result)
+			pairs := [][2]string{}
+			if pk, ok := data["publishable_key"].(string); ok {
+				pairs = append(pairs, [2]string{"publishable_key", pk})
+			}
+			if instr, ok := data["instructions"].(string); ok {
+				pairs = append(pairs, [2]string{"instructions", instr})
+			}
+			output.PrintKeyValue(pairs)
+		})
+		return nil
+	},
+}
+
+var billingPaymentLinkCmd = &cobra.Command{
+	Use:   "payment-link",
+	Short: "Create a Stripe-hosted payment URL for human-assisted payments",
+	Long: `Create a Stripe Checkout payment link that a human can open in a browser.
+Used for the human-assisted payment flow where the CLI cannot tokenize cards directly.
+
+The success_url and cancel_url are controlled by ModelsLab and cannot be overridden.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		purpose, _ := cmd.Flags().GetString("purpose")
+		amount, _ := cmd.Flags().GetFloat64("amount")
+		planID, _ := cmd.Flags().GetInt("plan-id")
+		idempotencyKey, _ := cmd.Flags().GetString("idempotency-key")
+
+		body := map[string]interface{}{
+			"purpose": purpose,
+		}
+		if purpose == "fund" {
+			if amount <= 0 {
+				return fmt.Errorf("--amount is required when purpose is 'fund'")
+			}
+			body["amount"] = amount
+		} else if purpose == "subscribe" {
+			if planID <= 0 {
+				return fmt.Errorf("--plan-id is required when purpose is 'subscribe'")
+			}
+			body["plan_id"] = planID
+		} else {
+			return fmt.Errorf("--purpose must be 'fund' or 'subscribe'")
+		}
+
+		client := getClient()
+		var result map[string]interface{}
+		err := client.DoControlPlaneIdempotent("POST", "/billing/payment-link", body, &result, idempotencyKey)
+		if err != nil {
+			return err
+		}
+
+		outputResult(result, func() {
+			data := extractData(result)
+			if url, ok := data["payment_url"].(string); ok {
+				fmt.Println("Payment URL:", url)
+				fmt.Println("Open this URL in a browser to complete payment.")
+			}
+			if sessionID, ok := data["session_id"].(string); ok {
+				fmt.Printf("Session ID: %s\n", sessionID)
+			}
+			if expiresAt, ok := data["expires_at"].(string); ok {
+				fmt.Printf("Expires at: %s\n", expiresAt)
+			}
+		})
+		return nil
+	},
+}
+
+var billingSetupIntentCmd = &cobra.Command{
+	Use:   "setup-intent",
+	Short: "Create a Stripe SetupIntent for saving payment methods",
+	Long: `Create a Stripe SetupIntent to save a payment method for future use.
+The returned client_secret can be used with Stripe.js or the Stripe API
+to confirm the setup and attach the payment method to the customer.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		idempotencyKey, _ := cmd.Flags().GetString("idempotency-key")
+
+		client := getClient()
+		var result map[string]interface{}
+		err := client.DoControlPlaneIdempotent("POST", "/billing/setup-intent", nil, &result, idempotencyKey)
+		if err != nil {
+			return err
+		}
+
+		outputResult(result, func() {
+			data := extractData(result)
+			pairs := [][2]string{}
+			for _, key := range []string{"setup_intent_id", "client_secret", "status"} {
+				if v, ok := data[key]; ok && v != nil {
+					pairs = append(pairs, [2]string{key, fmt.Sprintf("%v", v)})
+				}
+			}
+			if instr, ok := data["instructions"].(string); ok {
+				pairs = append(pairs, [2]string{"instructions", instr})
+			}
+			output.PrintKeyValue(pairs)
+		})
+		return nil
+	},
+}
+
 var billingInvoicePDFCmd = &cobra.Command{
 	Use:   "invoice-pdf",
 	Short: "Download invoice PDF",
@@ -366,6 +479,14 @@ func init() {
 	billingInvoiceDetailCmd.Flags().String("id", "", "Invoice ID")
 	billingInvoicePDFCmd.Flags().String("id", "", "Invoice ID")
 
+	billingPaymentLinkCmd.Flags().String("purpose", "", "Payment purpose: 'fund' or 'subscribe'")
+	billingPaymentLinkCmd.Flags().Float64("amount", 0, "Amount in USD (required when purpose is 'fund')")
+	billingPaymentLinkCmd.Flags().Int("plan-id", 0, "Plan ID (required when purpose is 'subscribe')")
+	billingPaymentLinkCmd.Flags().String("idempotency-key", "", "Idempotency key")
+	billingPaymentLinkCmd.MarkFlagRequired("purpose")
+
+	billingSetupIntentCmd.Flags().String("idempotency-key", "", "Idempotency key")
+
 	billingCmd.AddCommand(billingOverviewCmd)
 	billingCmd.AddCommand(billingPaymentMethodsCmd)
 	billingCmd.AddCommand(billingAddPMCmd)
@@ -376,4 +497,7 @@ func init() {
 	billingCmd.AddCommand(billingInvoicesCmd)
 	billingCmd.AddCommand(billingInvoiceDetailCmd)
 	billingCmd.AddCommand(billingInvoicePDFCmd)
+	billingCmd.AddCommand(billingStripeConfigCmd)
+	billingCmd.AddCommand(billingPaymentLinkCmd)
+	billingCmd.AddCommand(billingSetupIntentCmd)
 }

internal/cmd/subscriptions.go

@@ -273,7 +273,6 @@ func makeSubsActionCmd(action, short, httpMethod string) *cobra.Command {
 	}
 }
 
-var subsCancelCmd = makeSubsActionCmd("cancel", "Cancel subscription", "POST")
 var subsPauseCmd = makeSubsActionCmd("pause", "Pause subscription", "POST")
 var subsResumeCmd = makeSubsActionCmd("resume", "Resume subscription", "POST")
 var subsResetCycleCmd = makeSubsActionCmd("reset-cycle", "Reset billing cycle", "POST")
@@ -326,7 +325,7 @@ func init() {
 	subsUpdateCmd.MarkFlagRequired("id")
 	subsUpdateCmd.MarkFlagRequired("new-plan-id")
 
-	for _, c := range []*cobra.Command{subsCancelCmd, subsPauseCmd, subsResumeCmd, subsResetCycleCmd} {
+	for _, c := range []*cobra.Command{subsPauseCmd, subsResumeCmd, subsResetCycleCmd} {
 		c.Flags().String("id", "", "Subscription ID")
 		c.Flags().String("idempotency-key", "", "Idempotency key")
 		c.MarkFlagRequired("id")
@@ -342,7 +341,6 @@ func init() {
 	subscriptionsCmd.AddCommand(subsConfirmCheckoutCmd)
 	subscriptionsCmd.AddCommand(subsStatusCmd)
 	subscriptionsCmd.AddCommand(subsUpdateCmd)
-	subscriptionsCmd.AddCommand(subsCancelCmd)
 	subscriptionsCmd.AddCommand(subsPauseCmd)
 	subscriptionsCmd.AddCommand(subsResumeCmd)
 	subscriptionsCmd.AddCommand(subsResetCycleCmd)

internal/mcp/server.go

@@ -148,6 +148,32 @@ func (s *Server) registerControlPlaneTools() {
 		return result, err
 	})
 
+	s.addTool("billing-stripe-config", "Get Stripe publishable key for client-side card tokenization", nil, func(args map[string]interface{}) (interface{}, error) {
+		var result map[string]interface{}
+		err := s.client.DoControlPlane("GET", "/billing/stripe-config", nil, &result)
+		return result, err
+	})
+
+	s.addTool("billing-payment-link", "Create a Stripe-hosted payment URL for human-assisted payments", map[string]interface{}{
+		"type": "object",
+		"properties": map[string]interface{}{
+			"purpose": map[string]string{"type": "string", "description": "Payment purpose: 'fund' or 'subscribe'"},
+			"amount":  map[string]interface{}{"type": "number", "description": "Amount in USD (required when purpose is 'fund')"},
+			"plan_id": map[string]interface{}{"type": "integer", "description": "Plan ID (required when purpose is 'subscribe')"},
+		},
+		"required": []string{"purpose"},
+	}, func(args map[string]interface{}) (interface{}, error) {
+		var result map[string]interface{}
+		err := s.client.DoControlPlaneIdempotent("POST", "/billing/payment-link", args, &result, "")
+		return result, err
+	})
+
+	s.addTool("billing-setup-intent", "Create a Stripe SetupIntent for saving payment methods", nil, func(args map[string]interface{}) (interface{}, error) {
+		var result map[string]interface{}
+		err := s.client.DoControlPlaneIdempotent("POST", "/billing/setup-intent", nil, &result, "")
+		return result, err
+	})
+
 	s.addTool("wallet-balance", "Check wallet balance", nil, func(args map[string]interface{}) (interface{}, error) {
 		var result map[string]interface{}
 		err := s.client.DoControlPlane("GET", "/wallet/balance", nil, &result)
@@ -167,6 +193,31 @@ func (s *Server) registerControlPlaneTools() {
 		return result, err
 	})
 
+	s.addTool("wallet-confirm-checkout", "Confirm a Stripe Checkout wallet funding session", map[string]interface{}{
+		"type": "object",
+		"properties": map[string]interface{}{
+			"session_id": map[string]string{"type": "string", "description": "Stripe checkout session ID (cs_...)"},
+		},
+		"required": []string{"session_id"},
+	}, func(args map[string]interface{}) (interface{}, error) {
+		var result map[string]interface{}
+		err := s.client.DoControlPlaneIdempotent("POST", "/wallet/confirm-checkout", args, &result, "")
+		return result, err
+	})
+
+	s.addTool("wallet-payment-status", "Check payment intent status", map[string]interface{}{
+		"type": "object",
+		"properties": map[string]interface{}{
+			"payment_intent_id": map[string]string{"type": "string", "description": "Payment intent ID"},
+		},
+		"required": []string{"payment_intent_id"},
+	}, func(args map[string]interface{}) (interface{}, error) {
+		id := fmt.Sprintf("%v", args["payment_intent_id"])
+		var result map[string]interface{}
+		err := s.client.DoControlPlane("GET", "/payments/"+id+"/status", nil, &result)
+		return result, err
+	})
+
 	// Usage tools
 	s.addTool("usage-summary", "Get usage overview", nil, func(args map[string]interface{}) (interface{}, error) {
 		var result map[string]interface{}
@@ -193,6 +244,31 @@ func (s *Server) registerControlPlaneTools() {
 		err := s.client.DoControlPlane("GET", "/subscriptions", nil, &result)
 		return result, err
 	})
+
+	s.addTool("subscriptions-confirm-checkout", "Confirm a Stripe Checkout subscription session", map[string]interface{}{
+		"type": "object",
+		"properties": map[string]interface{}{
+			"session_id": map[string]string{"type": "string", "description": "Stripe checkout session ID (cs_...)"},
+		},
+		"required": []string{"session_id"},
+	}, func(args map[string]interface{}) (interface{}, error) {
+		var result map[string]interface{}
+		err := s.client.DoControlPlaneIdempotent("POST", "/subscriptions/confirm-checkout", args, &result, "")
+		return result, err
+	})
+
+	s.addTool("subscriptions-status", "Check subscription status", map[string]interface{}{
+		"type": "object",
+		"properties": map[string]interface{}{
+			"id": map[string]string{"type": "string", "description": "Subscription ID"},
+		},
+		"required": []string{"id"},
+	}, func(args map[string]interface{}) (interface{}, error) {
+		id := fmt.Sprintf("%v", args["id"])
+		var result map[string]interface{}
+		err := s.client.DoControlPlane("GET", "/subscriptions/"+id+"/status", nil, &result)
+		return result, err
+	})
 }
 
 func (s *Server) registerGenerationTools() {
@@ -400,12 +476,19 @@ func (s *Server) ListTools() []ToolInfo {
 		{"models-search", "Search AI models"},
 		{"models-detail", "Get model details"},
 		{"billing-overview", "View billing overview"},
+		{"billing-stripe-config", "Get Stripe publishable key"},
+		{"billing-payment-link", "Create payment URL for human-assisted payments"},
+		{"billing-setup-intent", "Create SetupIntent for saving payment methods"},
 		{"wallet-balance", "Check wallet balance"},
 		{"wallet-fund", "Add funds to wallet"},
+		{"wallet-confirm-checkout", "Confirm wallet funding checkout session"},
+		{"wallet-payment-status", "Check payment intent status"},
 		{"usage-summary", "Get usage overview"},
 		{"teams-list", "List team members"},
 		{"subscriptions-plans", "List subscription plans"},
 		{"subscriptions-list", "List user subscriptions"},
+		{"subscriptions-confirm-checkout", "Confirm subscription checkout session"},
+		{"subscriptions-status", "Check subscription status"},
 		// Generation
 		{"text-to-image", "Generate images from text"},
 		{"image-to-image", "Transform images"},

tests/integration_test.go

@@ -182,7 +182,7 @@ func TestSubscriptions_Help(t *testing.T) {
 	assert.Equal(t, 0, code)
 	assert.Contains(t, stdout, "plans")
 	assert.Contains(t, stdout, "create")
-	assert.Contains(t, stdout, "cancel")
+	assert.Contains(t, stdout, "pause")
 }
 
 func TestTeams_Help(t *testing.T) {