aitools list: preserve scoped text labels

Author: simonfaltum

NEXT_CHANGELOG.md

@@ -7,8 +7,9 @@
 * Breaking change: OAuth tokens for interactive logins (`auth_type = databricks-cli`) are now stored in the OS-native secure store by default (Keychain on macOS, Credential Manager on Windows, Secret Service on Linux) instead of `~/.databricks/token-cache.json`. After upgrading, run `databricks auth login` once per profile to re-authenticate; cached tokens from older versions are not migrated. To keep the previous file-backed storage, set `DATABRICKS_AUTH_STORAGE=plaintext` or add `auth_storage = plaintext` under `[__settings__]` in `~/.databrickscfg` (the env var takes precedence over the config setting), then re-run `databricks auth login`. On systems where the OS keyring is not reachable (e.g. Linux containers without a D-Bus session bus), the CLI transparently falls back to the file cache when reading tokens so legacy `token-cache.json` entries remain accessible without manual configuration.
 
 ### CLI
-* Added `databricks aitools` command group for installing Databricks skills into your coding agents (Claude Code, Cursor, Codex CLI, OpenCode, GitHub Copilot, Antigravity). Skills are fetched from [github.com/databricks/databricks-agent-skills](https://github.com/databricks/databricks-agent-skills) and either symlinked into each agent's skills directory or copied into the current project. Use `databricks aitools install` to set up, `update` to pull newer versions, `list` to see what's available, and `uninstall` to remove them.
+* Added `databricks aitools` command group for installing Databricks skills into your coding agents (Claude Code, Cursor, Codex CLI, OpenCode, GitHub Copilot, Antigravity). Skills are fetched from [github.com/databricks/databricks-agent-skills](https://github.com/databricks/databricks-agent-skills) and either symlinked into each agent's skills directory or copied into the current project. Use `databricks aitools install` to set up, `update` to pull newer versions, `list` to see what's available, and `uninstall` to remove them. Pick where they go with `--scope=project|global` (`--scope=both` is accepted on `update` and `list`).
 * `databricks aitools list` honors `--output json`, emitting a structured `{release, skills[...], summary{}}` document so coding agents and CI can consume the skill/version/installation matrix without scraping the tabular text output.
+* `[__settings__].default_profile` is now consulted as a fallback by `databricks api`, `databricks auth token`, and bundle commands when neither `--profile` nor `DATABRICKS_CONFIG_PROFILE` is set. `databricks auth token` continues to give precedence to `DATABRICKS_HOST` over `default_profile`. For bundle commands, `default_profile` only applies when the bundle does not pin its own `workspace.host`.
 
 ### Bundles
 * Make sure warnings asking for approval are understood by agents ([#5239](https://github.com/databricks/cli/pull/5239))

cmd/aitools/list.go

@@ -197,9 +197,9 @@ func renderListText(ctx context.Context, out listOutput, scope string) {
 	cmdio.LogString(ctx, "Available skills (v"+out.Release+"):")
 	cmdio.LogString(ctx, "")
 
-	bothScopes := scope == "" && len(out.Summary) == 2 &&
-		out.Summary[installer.ScopeGlobal].Installed+out.Summary[installer.ScopeProject].Installed > 0 &&
-		anyInstalled(out, installer.ScopeGlobal) && anyInstalled(out, installer.ScopeProject)
+	bothScopes := scope == "" &&
+		out.Summary[installer.ScopeGlobal].loaded &&
+		out.Summary[installer.ScopeProject].loaded
 
 	var buf strings.Builder
 	tw := tabwriter.NewWriter(&buf, 0, 4, 2, ' ', 0)
@@ -217,16 +217,6 @@ func renderListText(ctx context.Context, out listOutput, scope string) {
 	cmdio.LogString(ctx, summaryLine(out, scope))
 }
 
-// anyInstalled reports whether at least one skill is installed in the named scope.
-func anyInstalled(out listOutput, scope string) bool {
-	for _, s := range out.Skills {
-		if _, ok := s.Installed[scope]; ok {
-			return true
-		}
-	}
-	return false
-}
-
 func installedStatusFromEntry(s skillEntry, bothScopes bool) string {
 	globalVer := s.Installed[installer.ScopeGlobal]
 	projectVer := s.Installed[installer.ScopeProject]

cmd/aitools/list_test.go

@@ -224,6 +224,32 @@ func TestSummaryLinePreservesStatePresence(t *testing.T) {
 	}
 }
 
+func TestRenderListTextUsesLoadedStateForScopeLabels(t *testing.T) {
+	ctx, stderr := cmdio.NewTestContextWithStderr(t.Context())
+	out := listOutput{
+		Release: "0.1.0",
+		Skills: []skillEntry{
+			{
+				Name:          "databricks-jobs",
+				LatestVersion: "1.0.0",
+				Installed: map[string]string{
+					installer.ScopeGlobal: "1.0.0",
+				},
+			},
+		},
+		Summary: map[string]scopeSummary{
+			installer.ScopeGlobal:  {Installed: 1, Total: 1, loaded: true},
+			installer.ScopeProject: {Installed: 0, Total: 1, loaded: true},
+		},
+	}
+
+	renderListText(ctx, out, "")
+
+	got := stderr.String()
+	assert.Contains(t, got, "v1.0.0 (up to date) (global)")
+	assert.Contains(t, got, "1/1 skills installed (global), 0/1 (project)")
+}
+
 func TestListScopeFlag(t *testing.T) {
 	tests := []struct {
 		name      string