aitools list: preserve fallback and text summaries

Author: simonfaltum

cmd/aitools/list.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/databricks/cli/libs/aitools/installer"
 	"github.com/databricks/cli/cmd/root"
+	"github.com/databricks/cli/libs/aitools/installer"
 	"github.com/databricks/cli/libs/cmdio"
 	"github.com/databricks/cli/libs/flags"
 	"github.com/databricks/cli/libs/log"
@@ -36,7 +36,7 @@ func NewListCmd() *cobra.Command {
 				return err
 			}
 
-			// list: empty scope = show both. Both flags set is equivalent.
+			// list: empty scope = show both. --scope=both also lands here.
 			var scope string
 			switch {
 			case projectFlag && !globalFlag:
@@ -74,6 +74,9 @@ type skillEntry struct {
 type scopeSummary struct {
 	Installed int `json:"installed"`
 	Total     int `json:"total"`
+
+	// loaded preserves text rendering semantics without changing the JSON contract.
+	loaded bool
 }
 
 func defaultListSkills(cmd *cobra.Command, scope string) error {
@@ -97,13 +100,13 @@ func defaultListSkills(cmd *cobra.Command, scope string) error {
 // returns the structured listOutput. scope=="" loads both scopes; "global"
 // or "project" loads only that scope.
 func buildListOutput(ctx context.Context, scope string) (listOutput, error) {
-	ref, _, err := installer.GetSkillsRef(ctx)
+	ref, explicit, err := installer.GetSkillsRef(ctx)
 	if err != nil {
 		return listOutput{}, err
 	}
 
 	src := &installer.GitHubManifestSource{}
-	manifest, err := src.FetchManifest(ctx, ref)
+	manifest, ref, err := installer.FetchSkillsManifestWithFallback(ctx, src, ref, !explicit)
 	if err != nil {
 		return listOutput{}, fmt.Errorf("failed to fetch manifest: %w", err)
 	}
@@ -147,10 +150,10 @@ func buildListOutput(ctx context.Context, scope string) (listOutput, error) {
 	// install state is missing — agents should see "0/N" rather than guess
 	// from the absence of a key.
 	if scope != installer.ScopeProject {
-		out.Summary[installer.ScopeGlobal] = scopeSummary{Installed: globalCount, Total: len(names)}
+		out.Summary[installer.ScopeGlobal] = scopeSummary{Installed: globalCount, Total: len(names), loaded: globalState != nil}
 	}
 	if scope != installer.ScopeGlobal {
-		out.Summary[installer.ScopeProject] = scopeSummary{Installed: projectCount, Total: len(names)}
+		out.Summary[installer.ScopeProject] = scopeSummary{Installed: projectCount, Total: len(names), loaded: projectState != nil}
 	}
 
 	return out, nil
@@ -259,10 +262,10 @@ func summaryLine(out listOutput, scope string) string {
 	case gOK && pOK:
 		// Mirror prior behavior: only print the dual-scope line when both
 		// scopes have a state file; otherwise only mention the one that does.
-		if anyInstalled(out, installer.ScopeGlobal) && anyInstalled(out, installer.ScopeProject) {
+		if g.loaded && p.loaded {
 			return fmt.Sprintf("%d/%d skills installed (global), %d/%d (project)", g.Installed, g.Total, p.Installed, p.Total)
 		}
-		if anyInstalled(out, installer.ScopeProject) {
+		if p.loaded {
 			return fmt.Sprintf("%d/%d skills installed (project)", p.Installed, p.Total)
 		}
 		return fmt.Sprintf("%d/%d skills installed (global)", g.Installed, g.Total)

cmd/aitools/list_test.go

@@ -170,6 +170,60 @@ func TestInstalledStatusFromEntry(t *testing.T) {
 	}
 }
 
+func TestSummaryLinePreservesStatePresence(t *testing.T) {
+	tests := []struct {
+		name string
+		out  listOutput
+		want string
+	}{
+		{
+			name: "both state files loaded even with no installs",
+			out: listOutput{
+				Skills: []skillEntry{
+					{Name: "databricks-jobs", LatestVersion: "1.0.0", Installed: map[string]string{}},
+				},
+				Summary: map[string]scopeSummary{
+					installer.ScopeGlobal:  {Installed: 0, Total: 1, loaded: true},
+					installer.ScopeProject: {Installed: 0, Total: 1, loaded: true},
+				},
+			},
+			want: "0/1 skills installed (global), 0/1 (project)",
+		},
+		{
+			name: "only project state loaded",
+			out: listOutput{
+				Skills: []skillEntry{
+					{Name: "databricks-jobs", LatestVersion: "1.0.0", Installed: map[string]string{}},
+				},
+				Summary: map[string]scopeSummary{
+					installer.ScopeGlobal:  {Installed: 0, Total: 1},
+					installer.ScopeProject: {Installed: 0, Total: 1, loaded: true},
+				},
+			},
+			want: "0/1 skills installed (project)",
+		},
+		{
+			name: "only global state loaded",
+			out: listOutput{
+				Skills: []skillEntry{
+					{Name: "databricks-jobs", LatestVersion: "1.0.0", Installed: map[string]string{}},
+				},
+				Summary: map[string]scopeSummary{
+					installer.ScopeGlobal:  {Installed: 0, Total: 1, loaded: true},
+					installer.ScopeProject: {Installed: 0, Total: 1},
+				},
+			},
+			want: "0/1 skills installed (global)",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			assert.Equal(t, tt.want, summaryLine(tt.out, ""))
+		})
+	}
+}
+
 func TestListScopeFlag(t *testing.T) {
 	tests := []struct {
 		name      string