Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
442fe58
Add interactive pickers to aitools mcp add and remove
simonfaltum Nov 13, 2026
6d81bf8
Regenerate the hidden help golden for pflag 1.1 boolean flags
simonfaltum Nov 16, 2026
3d0d1a9
Regenerate the list and remove help golden for the remove picker
simonfaltum Nov 16, 2026
abc9959
Keep each service picker row on one line
simonfaltum Nov 16, 2026
c6c4506
Open the service picker at the top, with recommended services first
simonfaltum Nov 16, 2026
4467e26
List what the remove picker removes before its confirm
simonfaltum Nov 16, 2026
6854218
Make Esc cancel the MCP pickers and name the search keys in their help
simonfaltum Nov 16, 2026
44defdc
Call SignInRequired as a method in the service picker and its tests
simonfaltum Nov 16, 2026
bd9635a
Refuse unreadable agent configs through refused in aitools mcp add
simonfaltum Nov 17, 2026
832a8a7
Give mcp add and remove their own Proceed confirm that Esc cancels
simonfaltum Nov 17, 2026
7904bcc
Name the agent source in the read-only add test that card 04 added
simonfaltum Nov 17, 2026
a7e2f04
Update the hidden help golden for the card 04 review's --location text
simonfaltum Nov 17, 2026
828e6f7
Name --agents for a read-only config only for agents named with --agents
simonfaltum Nov 17, 2026
f9f2903
Apply the agent prompt policy to the MCP pickers and fix the plan's c…
simonfaltum Nov 17, 2026
c083f48
Keep bad entries reported by the write and isolate the MCP picker tes…
simonfaltum Nov 17, 2026
b77efce
Fit each remove picker row on one line and isolate the fully specifie…
simonfaltum Nov 17, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion acceptance/cmd/aitools/mcp/help/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ Remove Databricks managed MCP servers that this CLI installed.
Choose servers with --names (server names as listed by 'aitools mcp list', or service names; the
last part of a service name, such as github, is enough when only one schema has it), --profile, or
--all. --profile narrows --all or --names to one profile, and --agents narrows them to some agents.
Interactive selection is not available yet, so one of --names, --profile or --all is required.
In a terminal, with none of --names, --profile or --all, the command shows the installed servers to
choose from. Without a terminal, one of them is required.
With --profile or --all and nothing installed to remove, the command succeeds and removes nothing.

Only entries this CLI wrote are removed. An entry that was changed outside this CLI is left in place
Expand Down
12 changes: 7 additions & 5 deletions acceptance/cmd/aitools/mcp/hidden/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,12 @@ Each server runs through 'databricks aitools mcp serve' with that profile's cred

Services come from --names: full names such as system.ai.github, or leaf names such as github. Leaf names
resolve in --location, which defaults to system.ai, or to the one schema that the full names in --names share when there are no leaf names.
Agents come from --agents. Without it, every detected MCP-capable agent is used.
Agents come from --agents.

Interactive selection is not available yet: in a terminal, pass both --names and --agents.
With --output json, both are required.
In a terminal, the command asks for whatever is not given: the profile, the servers and the agents (detected
agents are pre-checked). It confirms the plan when it asked for any of them, and it asks before each sign-in unless
--login or --no-login is given. Without a terminal, --names is required and the agents default to every detected
MCP-capable agent. With --output json, --names and --agents are required.

Supported agents: claude-code, cursor, codex, opencode, copilot, antigravity, gemini

Expand All @@ -54,14 +56,14 @@ Examples:
databricks aitools mcp add --names github,web_search --agents claude-code,cursor --profile dogfood

Flags:
--agents string Agents to install for, comma-separated (default: every detected MCP-capable agent)
--agents string Agents to install for, comma-separated (default: a picker in a terminal; otherwise every detected MCP-capable agent)
--force[=true|false] Overwrite an existing server with the same name that this CLI did not write
-h, --help[=true|false] help for add
--location string Schema to resolve leaf names in, as <catalog>.<schema> (default: system.ai, or the one schema that the full names in --names share when there are no leaf names)
--login[=true|false] Sign in to each sign-in-required server that was installed, after the installs
--name string Server name to use instead of the generated one; only with exactly one service
--names string Services to install: full names (system.ai.github) or leaf names (github), comma-separated
--no-login[=true|false] Do not sign in; print the login commands for sign-in-required servers (default)
--no-login[=true|false] Do not sign in; print the login commands for sign-in-required servers (default without a terminal; in a terminal, the default asks for each one)

Global Flags:
--debug[=true|false] enable debug logging
Expand Down
8 changes: 8 additions & 0 deletions cmd/aitools/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ import (
"github.com/spf13/cobra"
)

// Prompt text shared by install, uninstall and the mcp commands.
const (
// multiSelectHelp is the description of the multi-select prompts of install and mcp add and remove.
multiSelectHelp = "space to toggle, enter to confirm"
// cancelledMessage is printed when the user declines at a prompt, and the command ends without a change.
cancelledMessage = "Cancelled."
)

// Package-level seams for testability. Tests override these via helpers in
// install_test.go.
var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/aitools/mcp.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ func resolveProfile(ctx context.Context, flagValue string) (string, error) {
case 1:
return profiles[0].Name, nil
}
return "", failure(categoryProfileRequired, "several workspace profiles exist; pass --profile. Found: %s", strings.Join(profiles.Names(), ", "))
return "", failureWithCause(categoryProfileRequired, &profileChoice{profiles: profiles}, "several workspace profiles exist; pass --profile. Found: %s", strings.Join(profiles.Names(), ", "))
}

// mcpWorkspaceProfile reports whether auto-detect may pick p. It accepts the profiles that --profile accepts: a
Expand Down
Loading
Loading