fix: correct API paths, drop bad params, tighten MCP arg handling

reports: fix family path mappings (chat, email, happiness/ratings, user)
teams: remove unsupported pageSize query param
mcp: reject empty required positional args, restrict StructuredContent to objects

Author: rmorse

internal/cmd/mcp_execute.go

@@ -79,8 +79,8 @@ func (r *mcpCommandRunner) execute(ctx context.Context, spec mcpToolSpec, args m
 		}},
 	}
 
-	if parsed, ok := parseJSONValue(stdoutText); ok {
-		result.StructuredContent = parsed
+	if structured, ok := parseStructuredContent(stdoutText); ok {
+		result.StructuredContent = structured
 	}
 
 	return result
@@ -130,6 +130,13 @@ func (r *mcpCommandRunner) buildInvocation(spec mcpToolSpec, args map[string]jso
 		if err != nil {
 			return nil, "", fmt.Errorf("invalid %s: %w", arg.Property, err)
 		}
+		value = strings.TrimSpace(value)
+		if value == "" {
+			if arg.Required {
+				return nil, "", fmt.Errorf("missing required argument: %s", arg.Property)
+			}
+			continue
+		}
 		argv = append(argv, value)
 	}
 
@@ -230,6 +237,18 @@ func parseJSONValue(value string) (any, bool) {
 	return parsed, true
 }
 
+func parseStructuredContent(value string) (map[string]any, bool) {
+	parsed, ok := parseJSONValue(value)
+	if !ok {
+		return nil, false
+	}
+	obj, ok := parsed.(map[string]any)
+	if !ok {
+		return nil, false
+	}
+	return obj, true
+}
+
 func setEnvVar(env []string, key, value string) []string {
 	prefix := key + "="
 	out := make([]string, 0, len(env)+1)

internal/cmd/mcp_execute_test.go

@@ -87,3 +87,28 @@ func TestMCPBuildInvocation_ForwardsGlobalConfigAndDebug(t *testing.T) {
 		"--format", "json",
 	}, argv)
 }
+
+func TestMCPBuildInvocation_RejectsEmptyRequiredPositionalArgument(t *testing.T) {
+	runner := &mcpCommandRunner{defaultOutputMode: mcpOutputJSON}
+	spec := mcpToolSpec{
+		CommandPath: []string{"inbox", "teams", "members"},
+		PositionalArgs: []mcpPositionalArgSpec{
+			{Name: "team-id", Property: "team_id", Required: true},
+		},
+	}
+
+	_, _, err := runner.buildInvocation(spec, map[string]json.RawMessage{
+		"team_id": json.RawMessage(`""`),
+	})
+	require.Error(t, err)
+	assert.Contains(t, err.Error(), "missing required argument: team_id")
+}
+
+func TestParseStructuredContent_ObjectOnly(t *testing.T) {
+	obj, ok := parseStructuredContent(`{"ok":true}`)
+	require.True(t, ok)
+	assert.Equal(t, true, obj["ok"])
+
+	_, ok = parseStructuredContent(`[{"id":1}]`)
+	assert.False(t, ok)
+}

internal/cmd/reports.go

@@ -13,15 +13,15 @@ import (
 )
 
 var reportFamilies = map[string]string{
-	"chats":         "chats",
+	"chats":         "chat",
 	"company":       "company",
 	"conversations": "conversations",
 	"customers":     "customers",
 	"docs":          "docs",
-	"email":         "emails",
+	"email":         "email",
 	"productivity":  "productivity",
-	"ratings":       "ratings",
-	"users":         "users",
+	"ratings":       "happiness/ratings",
+	"users":         "user",
 }
 
 func newReportsCmd() *cobra.Command {

internal/cmd/reports_test.go

@@ -42,7 +42,7 @@ func TestReportsCompany(t *testing.T) {
 func TestReportsEmailPathMapping(t *testing.T) {
 	mock := &mockClient{
 		GetReportFn: func(ctx context.Context, family string, params url.Values) (json.RawMessage, error) {
-			assert.Equal(t, "emails", family)
+			assert.Equal(t, "email", family)
 			return json.RawMessage(`{"ok":true}`), nil
 		},
 	}
@@ -53,6 +53,34 @@ func TestReportsEmailPathMapping(t *testing.T) {
 	require.NoError(t, rootCmd.Execute())
 }
 
+func TestReportsRatingsPathMapping(t *testing.T) {
+	mock := &mockClient{
+		GetReportFn: func(ctx context.Context, family string, params url.Values) (json.RawMessage, error) {
+			assert.Equal(t, "happiness/ratings", family)
+			return json.RawMessage(`{"ok":true}`), nil
+		},
+	}
+	setupTest(mock)
+	defer func() { output.Out = os.Stdout }()
+
+	rootCmd.SetArgs([]string{"inbox", "reports", "ratings"})
+	require.NoError(t, rootCmd.Execute())
+}
+
+func TestReportsUsersPathMapping(t *testing.T) {
+	mock := &mockClient{
+		GetReportFn: func(ctx context.Context, family string, params url.Values) (json.RawMessage, error) {
+			assert.Equal(t, "user", family)
+			return json.RawMessage(`{"ok":true}`), nil
+		},
+	}
+	setupTest(mock)
+	defer func() { output.Out = os.Stdout }()
+
+	rootCmd.SetArgs([]string{"inbox", "reports", "users"})
+	require.NoError(t, rootCmd.Execute())
+}
+
 func TestReportsFamiliesExposed(t *testing.T) {
 	reportsCmd := newReportsCmd()
 	names := make(map[string]struct{})

internal/cmd/teams.go

@@ -39,7 +39,6 @@ func teamsListCmd() *cobra.Command {
 			ctx := context.Background()
 			params := url.Values{}
 			params.Set("page", strconv.Itoa(page))
-			params.Set("pageSize", strconv.Itoa(perPage))
 
 			if isJSON() {
 				items, _, err := api.PaginateAll(ctx, apiClient.ListTeams, params, "teams", noPaginate)
@@ -85,7 +84,6 @@ func teamsMembersCmd() *cobra.Command {
 			ctx := context.Background()
 			params := url.Values{}
 			params.Set("page", strconv.Itoa(page))
-			params.Set("pageSize", strconv.Itoa(perPage))
 
 			fetch := func(ctx context.Context, p url.Values) (json.RawMessage, error) {
 				return apiClient.ListTeamMembers(ctx, args[0], p)

internal/cmd/teams_test.go

@@ -15,6 +15,8 @@ import (
 func TestTeamsList(t *testing.T) {
 	mock := &mockClient{
 		ListTeamsFn: func(ctx context.Context, params url.Values) (json.RawMessage, error) {
+			assert.Equal(t, "1", params.Get("page"))
+			assert.Empty(t, params.Get("pageSize"))
 			return halJSON("teams", `[{"id":1,"name":"Support"}]`), nil
 		},
 	}
@@ -30,6 +32,8 @@ func TestTeamsMembers(t *testing.T) {
 	mock := &mockClient{
 		ListTeamMembersFn: func(ctx context.Context, id string, params url.Values) (json.RawMessage, error) {
 			assert.Equal(t, "1", id)
+			assert.Equal(t, "1", params.Get("page"))
+			assert.Empty(t, params.Get("pageSize"))
 			return halJSON("users", `[{"id":2,"firstName":"Agent","lastName":"One","email":"agent@test.com","role":"user"}]`), nil
 		},
 	}