feat: CLI output overhaul and bug fixes

.mcp.json

@@ -0,0 +1,8 @@
+{
+  "mcpServers": {
+    "keeperhub": {
+      "command": "kh",
+      "args": ["serve", "--mcp"]
+    }
+  }
+}

cmd/action/get.go

@@ -36,7 +36,7 @@ func NewGetCmd(f *cmdutil.Factory) *cobra.Command {
 			}
 
 			query := args[0]
-			host := cfg.DefaultHost
+			host := cmdutil.ResolveHost(cmd, cfg)
 			apiURL := khhttp.BuildBaseURL(host) + "/api/integrations"
 
 			req, err := client.NewRequest(http.MethodGet, apiURL, nil)

cmd/action/list.go

@@ -56,7 +56,7 @@ func NewListCmd(f *cmdutil.Factory) *cobra.Command {
 				return err
 			}
 
-			host := cfg.DefaultHost
+			host := cmdutil.ResolveHost(cmd, cfg)
 			apiURL := khhttp.BuildBaseURL(host) + "/api/integrations"
 			if category != "" {
 				apiURL += "?category=" + category

cmd/billing/status.go

@@ -47,7 +47,7 @@ func NewStatusCmd(f *cmdutil.Factory) *cobra.Command {
 				return fmt.Errorf("reading config: %w", err)
 			}
 
-			host := cfg.DefaultHost
+			host := cmdutil.ResolveHost(cmd, cfg)
 			url := khhttp.BuildBaseURL(host) + "/api/billing/subscription"
 
 			req, err := client.NewRequest(http.MethodGet, url, nil)

cmd/billing/usage.go

@@ -38,7 +38,7 @@ func NewUsageCmd(f *cmdutil.Factory) *cobra.Command {
 				return fmt.Errorf("reading config: %w", err)
 			}
 
-			host := cfg.DefaultHost
+			host := cmdutil.ResolveHost(cmd, cfg)
 			url := khhttp.BuildBaseURL(host) + "/api/billing/subscription"
 			if period != "" && period != "current" {
 				url += "?period=" + period

cmd/doctor/doctor.go

@@ -127,16 +127,14 @@ func getHTTPClient(_ *cmdutil.Factory) (*http.Client, error) {
 }
 
 // getHost returns the configured host, falling back to the default.
+// NOTE: cmd is not available in check functions, so we pass nil to ResolveHost.
+// The --host flag is still respected via the KH_HOST env var and config fallback.
 func getHost(f *cmdutil.Factory) (string, error) {
 	cfg, err := f.Config()
 	if err != nil {
 		return "", err
 	}
-	host := cfg.DefaultHost
-	if host == "" {
-		host = "app.keeperhub.com"
-	}
-	return host, nil
+	return cmdutil.ResolveHost(nil, cfg), nil
 }
 
 // doGet performs a GET request against url with the given context, returning

cmd/execute/contract_call.go

@@ -52,7 +52,7 @@ func NewContractCallCmd(f *cmdutil.Factory) *cobra.Command {
 			if err != nil {
 				return err
 			}
-			host := cfg.DefaultHost
+			host := cmdutil.ResolveHost(cmd, cfg)
 
 			chain, _ := cmd.Flags().GetString("chain")
 			contract, _ := cmd.Flags().GetString("contract")

cmd/execute/status.go

@@ -51,7 +51,7 @@ See also: kh r st, kh ex transfer, kh ex cc`,
 			if err != nil {
 				return err
 			}
-			host := cfg.DefaultHost
+			host := cmdutil.ResolveHost(cmd, cfg)
 
 			watch, _ := cmd.Flags().GetBool("watch")
 

cmd/execute/transfer.go

@@ -51,7 +51,7 @@ func NewTransferCmd(f *cmdutil.Factory) *cobra.Command {
 			if err != nil {
 				return err
 			}
-			host := cfg.DefaultHost
+			host := cmdutil.ResolveHost(cmd, cfg)
 
 			chain, _ := cmd.Flags().GetString("chain")
 			to, _ := cmd.Flags().GetString("to")

cmd/org/list.go

@@ -44,7 +44,7 @@ func NewListCmd(f *cmdutil.Factory) *cobra.Command {
 				return fmt.Errorf("reading config: %w", err)
 			}
 
-			url := khhttp.BuildBaseURL(cfg.DefaultHost) + "/api/organizations"
+			url := khhttp.BuildBaseURL(cmdutil.ResolveHost(cmd, cfg)) + "/api/organizations"
 
 			req, err := client.NewRequest(http.MethodGet, url, nil)
 			if err != nil {

cmd/org/members.go

@@ -1,7 +1,6 @@
 package org
 
 import (
-	"bytes"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -32,8 +31,8 @@ func memberName(m Member) string {
 	return ""
 }
 
-// membersResponse wraps the Better Auth list-members response.
-type membersResponse struct {
+// listMembersResponse wraps the Better Auth list-members response.
+type listMembersResponse struct {
 	Members []Member `json:"members"`
 }
 
@@ -59,18 +58,12 @@ func NewMembersCmd(f *cmdutil.Factory) *cobra.Command {
 				return fmt.Errorf("reading config: %w", err)
 			}
 
-			url := khhttp.BuildBaseURL(cfg.DefaultHost) + "/api/auth/organization/list-members"
+			url := khhttp.BuildBaseURL(cmdutil.ResolveHost(cmd, cfg)) + "/api/auth/organization/list-members"
 
-			bodyBytes, err := json.Marshal(map[string]string{})
-			if err != nil {
-				return fmt.Errorf("encoding request body: %w", err)
-			}
-
-			req, err := client.NewRequest(http.MethodPost, url, bytes.NewReader(bodyBytes))
+			req, err := client.NewRequest(http.MethodGet, url, nil)
 			if err != nil {
 				return fmt.Errorf("building request: %w", err)
 			}
-			req.Header.Set("Content-Type", "application/json")
 
 			resp, err := client.Do(req)
 			if err != nil {
@@ -82,9 +75,9 @@ func NewMembersCmd(f *cmdutil.Factory) *cobra.Command {
 				return khhttp.NewAPIError(resp)
 			}
 
-			var wrapper membersResponse
+			var wrapper listMembersResponse
 			if err := json.NewDecoder(resp.Body).Decode(&wrapper); err != nil {
-				return fmt.Errorf("unexpected response from member list endpoint: %w", err)
+				return fmt.Errorf("unexpected response from organization endpoint: %w", err)
 			}
 
 			members := wrapper.Members

cmd/org/members_test.go

@@ -29,7 +29,7 @@ func newMembersFactory(server *httptest.Server, ios *iostreams.IOStreams) *cmdut
 func makeMembersServer(t *testing.T, members []map[string]interface{}) *httptest.Server {
 	t.Helper()
 	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != http.MethodPost || r.URL.Path != "/api/auth/organization/list-members" {
+		if r.Method != http.MethodGet || r.URL.Path != "/api/auth/organization/list-members" {
 			http.Error(w, "not found", http.StatusNotFound)
 			return
 		}
@@ -39,7 +39,7 @@ func makeMembersServer(t *testing.T, members []map[string]interface{}) *httptest
 	}))
 }
 
-func TestMembersCmd_UsesPOSTMethod(t *testing.T) {
+func TestMembersCmd_UsesGETMethod(t *testing.T) {
 	method := ""
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.URL.Path == "/api/auth/organization/list-members" {
@@ -59,7 +59,7 @@ func TestMembersCmd_UsesPOSTMethod(t *testing.T) {
 	orgCmd.SetArgs([]string{"members"})
 	err := orgCmd.Execute()
 	require.NoError(t, err)
-	assert.Equal(t, http.MethodPost, method, "expected POST method for list-members endpoint")
+	assert.Equal(t, http.MethodGet, method, "expected GET method for list-members endpoint")
 }
 
 func TestMembersCmd_RendersTableWithColumns(t *testing.T) {

cmd/org/switch.go

@@ -37,7 +37,7 @@ func NewSwitchCmd(f *cmdutil.Factory) *cobra.Command {
 				return fmt.Errorf("reading config: %w", err)
 			}
 
-			baseURL := khhttp.BuildBaseURL(cfg.DefaultHost)
+			baseURL := khhttp.BuildBaseURL(cmdutil.ResolveHost(cmd, cfg))
 
 			// Step 1: Resolve slug to organization ID.
 			listReq, err := client.NewRequest(http.MethodGet, baseURL+"/api/organizations", nil)

cmd/project/create.go

@@ -46,7 +46,7 @@ func NewCreateCmd(f *cmdutil.Factory) *cobra.Command {
 				return fmt.Errorf("building request body: %w", err)
 			}
 
-			url := khhttp.BuildBaseURL(cfg.DefaultHost) + "/api/projects"
+			url := khhttp.BuildBaseURL(cmdutil.ResolveHost(cmd, cfg)) + "/api/projects"
 			req, err := client.NewRequest(http.MethodPost, url, bytes.NewReader(bodyBytes))
 			if err != nil {
 				return fmt.Errorf("building request: %w", err)

cmd/project/delete.go

@@ -37,7 +37,7 @@ func NewDeleteCmd(f *cmdutil.Factory) *cobra.Command {
 			}
 
 			// Fetch project name for display in the confirmation prompt.
-			listURL := khhttp.BuildBaseURL(cfg.DefaultHost) + "/api/projects"
+			listURL := khhttp.BuildBaseURL(cmdutil.ResolveHost(cmd, cfg)) + "/api/projects"
 			listReq, err := client.NewRequest(http.MethodGet, listURL, nil)
 			if err != nil {
 				return fmt.Errorf("building list request: %w", err)
@@ -76,7 +76,7 @@ func NewDeleteCmd(f *cmdutil.Factory) *cobra.Command {
 				}
 			}
 
-			url := khhttp.BuildBaseURL(cfg.DefaultHost) + "/api/projects/" + projectID
+			url := khhttp.BuildBaseURL(cmdutil.ResolveHost(cmd, cfg)) + "/api/projects/" + projectID
 			req, err := client.NewRequest(http.MethodDelete, url, nil)
 			if err != nil {
 				return fmt.Errorf("building request: %w", err)

cmd/project/get.go

@@ -36,7 +36,7 @@ func NewGetCmd(f *cmdutil.Factory) *cobra.Command {
 				return fmt.Errorf("reading config: %w", err)
 			}
 
-			url := khhttp.BuildBaseURL(cfg.DefaultHost) + "/api/projects"
+			url := khhttp.BuildBaseURL(cmdutil.ResolveHost(cmd, cfg)) + "/api/projects"
 			req, err := client.NewRequest(http.MethodGet, url, nil)
 			if err != nil {
 				return fmt.Errorf("building request: %w", err)

cmd/project/list.go

@@ -51,7 +51,7 @@ func NewListCmd(f *cmdutil.Factory) *cobra.Command {
 				return err
 			}
 
-			url := khhttp.BuildBaseURL(cfg.DefaultHost) + "/api/projects?limit=" + strconv.Itoa(limit)
+			url := khhttp.BuildBaseURL(cmdutil.ResolveHost(cmd, cfg)) + "/api/projects?limit=" + strconv.Itoa(limit)
 
 			req, err := client.NewRequest(http.MethodGet, url, nil)
 			if err != nil {

cmd/protocol/list.go

@@ -100,7 +100,7 @@ func loadProtocols(f *cmdutil.Factory, refresh bool, cmd *cobra.Command) ([]Prot
 	}
 
 	// Fetch fresh data
-	raw, fetchErr := fetchSchemas(f)
+	raw, fetchErr := fetchSchemas(f, cmd)
 	if fetchErr != nil {
 		if staleEntry != nil {
 			fmt.Fprintln(f.IOStreams.ErrOut, "Warning: using cached data (could not reach API)")
@@ -118,7 +118,7 @@ func loadProtocols(f *cmdutil.Factory, refresh bool, cmd *cobra.Command) ([]Prot
 }
 
 // fetchSchemas performs a GET /api/mcp/schemas request and returns the raw body.
-func fetchSchemas(f *cmdutil.Factory) (json.RawMessage, error) {
+func fetchSchemas(f *cmdutil.Factory, cmd *cobra.Command) (json.RawMessage, error) {
 	client, err := f.HTTPClient()
 	if err != nil {
 		return nil, fmt.Errorf("creating HTTP client: %w", err)
@@ -129,7 +129,7 @@ func fetchSchemas(f *cmdutil.Factory) (json.RawMessage, error) {
 		return nil, fmt.Errorf("reading config: %w", err)
 	}
 
-	url := khhttp.BuildBaseURL(cfg.DefaultHost) + "/api/mcp/schemas"
+	url := khhttp.BuildBaseURL(cmdutil.ResolveHost(cmd, cfg)) + "/api/mcp/schemas"
 	req, err := client.NewRequest(http.MethodGet, url, nil)
 	if err != nil {
 		return nil, fmt.Errorf("building request: %w", err)

cmd/protocol/list_test.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
-	"strings"
 	"testing"
 	"time"
 
@@ -228,11 +227,8 @@ func TestListCmd_Table(t *testing.T) {
 	require.NoError(t, err)
 
 	out := outBuf.String()
-	// Check NAME and ACTIONS columns
-	outUpper := strings.ToUpper(out)
-	assert.True(t, strings.Contains(outUpper, "NAME"), "expected NAME column in output")
-	assert.True(t, strings.Contains(outUpper, "ACTIONS"), "expected ACTIONS column in output")
-	// Aave has 2 actions, Uniswap has 1
+	// Test streams are non-TTY, so tsvWriter outputs data rows without headers.
+	// Verify protocol names and action counts are present.
 	assert.Contains(t, out, "Aave")
 	assert.Contains(t, out, "2")
 	assert.Contains(t, out, "Uniswap")

cmd/run/cancel.go

@@ -43,13 +43,7 @@ func NewCancelCmd(f *cmdutil.Factory) *cobra.Command {
 				return fmt.Errorf("reading config: %w", err)
 			}
 
-			host, _ := cmd.Flags().GetString("host")
-			if host == "" {
-				host = cfg.DefaultHost
-			}
-			if host == "" {
-				host = "app.keeperhub.com"
-			}
+			host := cmdutil.ResolveHost(cmd, cfg)
 
 			// Confirmation: skip if --yes or non-TTY (auto-proceed in non-interactive mode).
 			yes, _ := cmd.Flags().GetBool("yes")

cmd/run/logs.go

@@ -89,13 +89,7 @@ func NewLogsCmd(f *cmdutil.Factory) *cobra.Command {
 				return fmt.Errorf("reading config: %w", err)
 			}
 
-			host, _ := cmd.Flags().GetString("host")
-			if host == "" {
-				host = cfg.DefaultHost
-			}
-			if host == "" {
-				host = "app.keeperhub.com"
-			}
+			host := cmdutil.ResolveHost(cmd, cfg)
 
 			url := khhttp.BuildBaseURL(host) + "/api/workflows/executions/" + runID + "/logs"
 			req, err := httpClient.NewRequest(http.MethodGet, url, nil)
@@ -125,11 +119,11 @@ func NewLogsCmd(f *cmdutil.Factory) *cobra.Command {
 			}
 
 			p := output.NewPrinter(f.IOStreams, cmd)
+			if len(logsResp.Logs) == 0 && !p.IsJSON() {
+				fmt.Fprintln(f.IOStreams.Out, "No logs found.")
+				return nil
+			}
 			return p.PrintData(logsResp, func(tw table.Writer) {
-				if len(logsResp.Logs) == 0 {
-					fmt.Fprintf(f.IOStreams.Out, "No logs available for run %s\n", runID)
-					return
-				}
 				tw.AppendHeader(table.Row{"STEP", "STATUS", "DURATION", "INPUT", "OUTPUT"})
 				for _, log := range logsResp.Logs {
 					errSuffix := ""

cmd/run/logs_test.go

@@ -116,7 +116,7 @@ func TestLogsCmd_EmptyLogs(t *testing.T) {
 	}
 
 	out := buf.String()
-	if !strings.Contains(out, "No logs available") {
+	if !strings.Contains(out, "No logs found.") {
 		t.Errorf("expected empty logs message, got: %q", out)
 	}
 }

cmd/run/status.go

@@ -7,7 +7,6 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/jedib0t/go-pretty/v6/table"
 	khhttp "github.com/keeperhub/cli/internal/http"
 	"github.com/keeperhub/cli/internal/output"
 	"github.com/keeperhub/cli/pkg/cmdutil"
@@ -73,13 +72,7 @@ See also: kh r l, kh r cancel, kh wf run`,
 				return fmt.Errorf("reading config: %w", err)
 			}
 
-			host, _ := cmd.Flags().GetString("host")
-			if host == "" {
-				host = cfg.DefaultHost
-			}
-			if host == "" {
-				host = "app.keeperhub.com"
-			}
+			host := cmdutil.ResolveHost(cmd, cfg)
 
 			watch, _ := cmd.Flags().GetBool("watch")
 			p := output.NewPrinter(f.IOStreams, cmd)
@@ -115,18 +108,20 @@ See also: kh r l, kh r cancel, kh wf run`,
 			}
 
 			printSummary := func(status *RunStatusResponse) error {
-				return p.PrintData(status, func(tw table.Writer) {
-					tw.AppendHeader(table.Row{"FIELD", "VALUE"})
-					tw.AppendRow(table.Row{"Status", status.Status})
-					tw.AppendRow(table.Row{"Steps", fmt.Sprintf("%d/%d", status.Progress.CompletedSteps, status.Progress.TotalSteps)})
-					currentStep := "-"
-					if status.Progress.CurrentNodeName != nil {
-						currentStep = *status.Progress.CurrentNodeName
-					}
-					tw.AppendRow(table.Row{"Current step", currentStep})
-					tw.AppendRow(table.Row{"Percentage", fmt.Sprintf("%d%%", status.Progress.Percentage)})
-					tw.Render()
+				if p.IsJSON() {
+					return p.PrintJSON(status)
+				}
+				currentStep := "-"
+				if status.Progress.CurrentNodeName != nil {
+					currentStep = *status.Progress.CurrentNodeName
+				}
+				p.PrintKeyValue([][2]string{
+					{"Status", status.Status},
+					{"Steps", fmt.Sprintf("%d/%d", status.Progress.CompletedSteps, status.Progress.TotalSteps)},
+					{"Current step", currentStep},
+					{"Percentage", fmt.Sprintf("%d%%", status.Progress.Percentage)},
 				})
+				return nil
 			}
 
 			if !watch {