diff --git a/.nextchanges/cli/aitools-hint-exempt-commands.md b/.nextchanges/cli/aitools-hint-exempt-commands.md new file mode 100644 index 00000000000..6af94675aef --- /dev/null +++ b/.nextchanges/cli/aitools-hint-exempt-commands.md @@ -0,0 +1 @@ +* Stop printing the Databricks AI tooling install hint on `auth`, `configure`, `current-user me`, `version`, `help`, and shell-completion commands. ([#7452](https://github.com/databricks/cli/pull/7452)) diff --git a/acceptance/cmd/aitools/agent-hints/output.txt b/acceptance/cmd/aitools/agent-hints/output.txt index ed22089e902..bb5ea266748 100644 --- a/acceptance/cmd/aitools/agent-hints/output.txt +++ b/acceptance/cmd/aitools/agent-hints/output.txt @@ -1,46 +1,36 @@ === Codex is hinted once per thread ->>> CODEX_CI=1 CODEX_THREAD_ID=thread-1 [CLI] version +>>> CODEX_CI=1 CODEX_THREAD_ID=thread-1 [CLI] jobs list Databricks skills are not installed. To work with Databricks reliably, first run: databricks aitools install --agents codex --scope global -Databricks CLI v[CLI_VERSION] ->>> CODEX_CI=1 CODEX_THREAD_ID=thread-1 [CLI] version -Databricks CLI v[CLI_VERSION] +>>> CODEX_CI=1 CODEX_THREAD_ID=thread-1 [CLI] jobs list ->>> CODEX_CI=1 CODEX_THREAD_ID=thread-2 [CLI] version +>>> CODEX_CI=1 CODEX_THREAD_ID=thread-2 [CLI] jobs list Databricks skills are not installed. To work with Databricks reliably, first run: databricks aitools install --agents codex --scope global -Databricks CLI v[CLI_VERSION] === Cursor exposes no session id, so it is hinted once per machine ->>> CURSOR_AGENT=1 [CLI] version +>>> CURSOR_AGENT=1 [CLI] jobs list Databricks skills are not installed. To work with Databricks reliably, first run: databricks aitools install --agents cursor --scope global -Databricks CLI v[CLI_VERSION] ->>> CURSOR_AGENT=1 [CLI] version -Databricks CLI v[CLI_VERSION] +>>> CURSOR_AGENT=1 [CLI] jobs list === Copilot CLI maps to the copilot registry agent ->>> COPILOT_CLI=1 [CLI] version +>>> COPILOT_CLI=1 [CLI] jobs list Databricks skills are not installed. To work with Databricks reliably, first run: databricks aitools install --agents copilot --scope global -Databricks CLI v[CLI_VERSION] === Gemini CLI with its own Databricks skills is not hinted ->>> GEMINI_CLI=1 [CLI] version -Databricks CLI v[CLI_VERSION] +>>> GEMINI_CLI=1 [CLI] jobs list === Agents the CLI cannot install for are not hinted ->>> WINDSURF_AGENT=1 [CLI] version -Databricks CLI v[CLI_VERSION] +>>> WINDSURF_AGENT=1 [CLI] jobs list ->>> VSCODE_AGENT=1 [CLI] version -Databricks CLI v[CLI_VERSION] +>>> VSCODE_AGENT=1 [CLI] jobs list === Nested agents are not hinted ->>> CODEX_CI=1 CURSOR_AGENT=1 CODEX_THREAD_ID=thread-3 [CLI] version -Databricks CLI v[CLI_VERSION] +>>> CODEX_CI=1 CURSOR_AGENT=1 CODEX_THREAD_ID=thread-3 [CLI] jobs list diff --git a/acceptance/cmd/aitools/agent-hints/script b/acceptance/cmd/aitools/agent-hints/script index 405596d991b..fa7436674b4 100644 --- a/acceptance/cmd/aitools/agent-hints/script +++ b/acceptance/cmd/aitools/agent-hints/script @@ -1,27 +1,28 @@ -# aitools commands skip the install hint; version exercises it without auth or network. +# Hint-exempt commands such as aitools and version skip the install hint; jobs list +# exercises it against the fake server and prints nothing to stdout. sethome ./home unset XDG_CONFIG_HOME GEMINI_CLI_HOME CODEX_THREAD_ID title "Codex is hinted once per thread" -trace CODEX_CI=1 CODEX_THREAD_ID=thread-1 $CLI version -trace CODEX_CI=1 CODEX_THREAD_ID=thread-1 $CLI version -trace CODEX_CI=1 CODEX_THREAD_ID=thread-2 $CLI version +trace CODEX_CI=1 CODEX_THREAD_ID=thread-1 $CLI jobs list +trace CODEX_CI=1 CODEX_THREAD_ID=thread-1 $CLI jobs list +trace CODEX_CI=1 CODEX_THREAD_ID=thread-2 $CLI jobs list title "Cursor exposes no session id, so it is hinted once per machine" -trace CURSOR_AGENT=1 $CLI version -trace CURSOR_AGENT=1 $CLI version +trace CURSOR_AGENT=1 $CLI jobs list +trace CURSOR_AGENT=1 $CLI jobs list title "Copilot CLI maps to the copilot registry agent" -trace COPILOT_CLI=1 $CLI version +trace COPILOT_CLI=1 $CLI jobs list title "Gemini CLI with its own Databricks skills is not hinted" sethome ./gemini-home -trace GEMINI_CLI=1 $CLI version +trace GEMINI_CLI=1 $CLI jobs list sethome ./home title "Agents the CLI cannot install for are not hinted" -trace WINDSURF_AGENT=1 $CLI version -trace VSCODE_AGENT=1 $CLI version +trace WINDSURF_AGENT=1 $CLI jobs list +trace VSCODE_AGENT=1 $CLI jobs list title "Nested agents are not hinted" -trace CODEX_CI=1 CURSOR_AGENT=1 CODEX_THREAD_ID=thread-3 $CLI version +trace CODEX_CI=1 CURSOR_AGENT=1 CODEX_THREAD_ID=thread-3 $CLI jobs list diff --git a/acceptance/cmd/aitools/claude-config-dir/output.txt b/acceptance/cmd/aitools/claude-config-dir/output.txt index e36484dff36..f191ee55907 100644 --- a/acceptance/cmd/aitools/claude-config-dir/output.txt +++ b/acceptance/cmd/aitools/claude-config-dir/output.txt @@ -1,38 +1,57 @@ === Plugin installed only in the custom config directory ->>> CLAUDE_CONFIG_DIR=custom [CLI] version -Databricks CLI v[CLI_VERSION] +>>> CLAUDE_CONFIG_DIR=custom [CLI] clusters list +ID Name State +4321 some-test-cluster +9876 some-other-cluster === Custom directory takes precedence over the default installation ->>> CLAUDE_CONFIG_DIR=missing [CLI] version +>>> CLAUDE_CONFIG_DIR=missing [CLI] clusters list Databricks skills are not installed. To work with Databricks reliably, first run: databricks aitools install -Databricks CLI v[CLI_VERSION] +ID Name State +4321 some-test-cluster +9876 some-other-cluster + +=== Exempt commands never hint, even without the tooling + +>>> CLAUDE_CONFIG_DIR=missing [CLI] current-user me +json.userName = "[USERNAME]"; === Empty override uses the default installation ->>> CLAUDE_CONFIG_DIR= [CLI] version -Databricks CLI v[CLI_VERSION] +>>> CLAUDE_CONFIG_DIR= [CLI] clusters list +ID Name State +4321 some-test-cluster +9876 some-other-cluster === Unset override uses the default installation ->>> [CLI] version -Databricks CLI v[CLI_VERSION] +>>> [CLI] clusters list +ID Name State +4321 some-test-cluster +9876 some-other-cluster === Outside a Claude Code subprocess only the text hint prints ->>> CLAUDE_CODE_CHILD_SESSION= [CLI] version +>>> CLAUDE_CODE_CHILD_SESSION= [CLI] clusters list Databricks skills are not installed. To work with Databricks reliably, first run: databricks aitools install -Databricks CLI v[CLI_VERSION] +ID Name State +4321 some-test-cluster +9876 some-other-cluster === Within one session both lines print once, so 2>&1 pipelines see them only on the first command ->>> [CLI] version +>>> [CLI] clusters list Databricks skills are not installed. To work with Databricks reliably, first run: databricks aitools install -Databricks CLI v[CLI_VERSION] - ->>> [CLI] version -Databricks CLI v[CLI_VERSION] +ID Name State +4321 some-test-cluster +9876 some-other-cluster + +>>> [CLI] clusters list +ID Name State +4321 some-test-cluster +9876 some-other-cluster diff --git a/acceptance/cmd/aitools/claude-config-dir/script b/acceptance/cmd/aitools/claude-config-dir/script index ce77b7d518a..aee1021fb8f 100644 --- a/acceptance/cmd/aitools/claude-config-dir/script +++ b/acceptance/cmd/aitools/claude-config-dir/script @@ -6,30 +6,34 @@ unset CLAUDE_CODE_SESSION_ID # CI and the CI/CD provider markers the SDK detects (GitHub Actions sets both). unset CI GITHUB_ACTIONS GITLAB_CI JENKINS_URL TF_BUILD CIRCLECI TRAVIS BITBUCKET_BUILD_NUMBER PROJECT_ID CODEBUILD_BUILD_ARN TFC_RUN_ID -# aitools commands skip the install hint; version exercises it without auth or network. +# Hint-exempt commands (aitools, auth, one-shot lookups such as version and current-user me, +# completion) skip the install hint; clusters list exercises it against the fake server. sethome ./empty-home title "Plugin installed only in the custom config directory" -trace CLAUDE_CONFIG_DIR=custom $CLI version +trace CLAUDE_CONFIG_DIR=custom $CLI clusters list sethome ./installed-home title "Custom directory takes precedence over the default installation" -trace CLAUDE_CONFIG_DIR=missing $CLI version +trace CLAUDE_CONFIG_DIR=missing $CLI clusters list + +title "Exempt commands never hint, even without the tooling" +trace CLAUDE_CONFIG_DIR=missing $CLI current-user me | gron.py | grep userName title "Empty override uses the default installation" -trace CLAUDE_CONFIG_DIR= $CLI version +trace CLAUDE_CONFIG_DIR= $CLI clusters list title "Unset override uses the default installation" unset CLAUDE_CONFIG_DIR -trace $CLI version +trace $CLI clusters list sethome ./empty-home title "Outside a Claude Code subprocess only the text hint prints" -trace CLAUDE_CODE_CHILD_SESSION= $CLI version +trace CLAUDE_CODE_CHILD_SESSION= $CLI clusters list # The session throttle lives in the file cache, which a host could disable. export DATABRICKS_CACHE_ENABLED=true title "Within one session both lines print once, so 2>&1 pipelines see them only on the first command" export CLAUDE_CODE_SESSION_ID=session-1 -trace $CLI version -trace $CLI version +trace $CLI clusters list +trace $CLI clusters list unset CLAUDE_CODE_SESSION_ID diff --git a/acceptance/cmd/aitools/telemetry/hint/output.txt b/acceptance/cmd/aitools/telemetry/hint/output.txt index 0cf25cd970e..09416a6c706 100644 --- a/acceptance/cmd/aitools/telemetry/hint/output.txt +++ b/acceptance/cmd/aitools/telemetry/hint/output.txt @@ -11,10 +11,9 @@ Databricks skills are not installed. To work with Databricks reliably, first run === hint printed on a command that resolves no auth: nothing is uploaded ->>> [CLI] version +>>> [CLI] bundle schema Databricks skills are not installed. To work with Databricks reliably, first run: databricks aitools install -Databricks CLI v[CLI_VERSION] >>> print_telemetry diff --git a/acceptance/cmd/aitools/telemetry/hint/script b/acceptance/cmd/aitools/telemetry/hint/script index 4aa3253b9f1..f1edd5eec54 100644 --- a/acceptance/cmd/aitools/telemetry/hint/script +++ b/acceptance/cmd/aitools/telemetry/hint/script @@ -14,7 +14,7 @@ trace $CLI jobs list trace print_telemetry title "hint printed on a command that resolves no auth: nothing is uploaded" -trace $CLI version +trace $CLI bundle schema > /dev/null trace print_telemetry title "plugin installed: no hint, no event" diff --git a/acceptance/cmd/version/output.txt b/acceptance/cmd/version/output.txt index 7fc22af691d..6665722a9c1 100644 --- a/acceptance/cmd/version/output.txt +++ b/acceptance/cmd/version/output.txt @@ -35,16 +35,14 @@ Tip: coding agents detected without Databricks skills. Run 'databricks aitools i "development_build": true } -=== version --check from Claude Code prints only the root hint +=== version --check from Claude Code prints no hint >>> [CLI] version --check -Databricks skills are not installed. To work with Databricks reliably, first run: databricks aitools install Databricks CLI v[CLI_VERSION] This is a development build; skipping the update check. -=== version --check from Codex prints only the root hint +=== version --check from Codex prints no hint >>> [CLI] version --check -Databricks skills are not installed. To work with Databricks reliably, first run: databricks aitools install --agents codex --scope global Databricks CLI v[CLI_VERSION] This is a development build; skipping the update check. diff --git a/acceptance/cmd/version/script b/acceptance/cmd/version/script index 58a59538f05..1e4557664e1 100644 --- a/acceptance/cmd/version/script +++ b/acceptance/cmd/version/script @@ -23,15 +23,16 @@ trace $CLI version --check title "version --check --output json with a coding agent prints no tip" trace $CLI version --check --output json -# Callers that agents.MaybeHint hints get only the root hint, not the tip. -title "version --check from Claude Code prints only the root hint" +# version is hint-exempt, and callers that agents.MaybeHint hints get no tip +# either, so they see no install nudge at all. +title "version --check from Claude Code prints no hint" sethome ./claude-home export CLAUDECODE=1 unset CLAUDE_CODE_SESSION_ID trace $CLI version --check unset CLAUDECODE -title "version --check from Codex prints only the root hint" +title "version --check from Codex prints no hint" sethome ./codex-home export CODEX_CI=1 unset CODEX_THREAD_ID diff --git a/libs/aitools/agents/hint.go b/libs/aitools/agents/hint.go index 10f9aeeb506..bee5ed0afaa 100644 --- a/libs/aitools/agents/hint.go +++ b/libs/aitools/agents/hint.go @@ -48,11 +48,6 @@ const ( // unattended runs. ciEnv = "CI" - // aiToolsCommandName is the top-level command whose subtree is never hinted: - // telling the agent to run `databricks aitools install` while it is already - // running an aitools command makes no sense. - aiToolsCommandName = "aitools" - // authCommandName and tokenCommandName name `databricks auth token`, the // credential helper the SDKs and Terraform run. They embed its stderr // mid-line in their own errors, where Claude Code can't strip the native @@ -171,9 +166,10 @@ func (h *agentHint) nativeLine(ctx context.Context) string { // MaybeHint recommends installing the Databricks AI tooling when a supported // agent drives the CLI without it installed. It is a no-op for human callers, -// unsupported agents, aitools commands themselves, the `auth token` and `auth -// docker token` credential helpers, a CLI process the CLI started itself, when -// there is no output stream, and once the tooling is present. +// unsupported agents, hint-exempt commands (isHintExemptCommand), the `auth +// token` and `auth docker token` credential helpers, a CLI process the CLI +// started itself, when there is no output stream, and once the tooling is +// present. // Both lines, the agent-native one (if any) and the model-facing text, and // their hint-shown events are throttled together per session, or per agent on // this machine for agents without a session id (fallbackKey). @@ -187,7 +183,7 @@ func MaybeHint(ctx context.Context, cmd *cobra.Command, pluginRecorded PluginRec if hint == nil { return } - if isAIToolsCommand(cmd) { + if isHintExemptCommand(cmd) { return } if isCredentialHelperCommand(cmd) { @@ -278,11 +274,33 @@ func isCredentialHelperCommand(cmd *cobra.Command) bool { return parent != nil && parent.Name() == authCommandName } -// isAIToolsCommand reports whether cmd is the aitools command or one of its -// subcommands, walking the parent chain (mirrors versioncheck.isExemptCommand). -func isAIToolsCommand(cmd *cobra.Command) bool { - for c := cmd; c != nil; c = c.Parent() { - if c.Name() == aiToolsCommandName { +// hintExemptCommands are the commands, with their subcommands, on which no +// tooling hint prints. Paths are relative to the root command. The aitools +// trees are exempt because telling the agent to run aitools while it already +// runs aitools makes no sense. The rest are plumbing or one-shot lookups (auth +// checks, "who am I", version, help, shell completion): the agent has no task +// to apply the skills to. The nudge eval measured only "who am I": 0 of 20 +// runs installed the tooling. +var hintExemptCommands = []string{ + "aitools", + "experimental aitools", + "auth", + "configure", + "current-user me", + "version", + "completion", + "help", + cobra.ShellCompRequestCmd, +} + +// isHintExemptCommand reports whether cmd is one of hintExemptCommands or a +// subcommand of one. +func isHintExemptCommand(cmd *cobra.Command) bool { + path := cmd.CommandPath() + root := cmd.Root().CommandPath() + for _, exempt := range hintExemptCommands { + full := root + " " + exempt + if path == full || strings.HasPrefix(path, full+" ") { return true } } @@ -367,8 +385,7 @@ func SelfExecEnv(environ []string) []string { // ExecutionContext.Command names the command the hint was shown on. // // The event is buffered and uploaded by cmd/root at exit, which needs resolved -// auth: a hint shown on a command that never resolves auth (e.g. `databricks -// version`) is not uploaded. +// auth: a hint shown on a command that never resolves auth is not uploaded. func logHintShown(ctx context.Context, kind protos.AitoolsHintKind) { telemetry.Log(ctx, protos.DatabricksCliLog{ AitoolsHintEvent: &protos.AitoolsHintEvent{HintKind: kind}, diff --git a/libs/aitools/agents/hint_agents_test.go b/libs/aitools/agents/hint_agents_test.go index 7d00aa1840d..73c42aaf6d1 100644 --- a/libs/aitools/agents/hint_agents_test.go +++ b/libs/aitools/agents/hint_agents_test.go @@ -259,10 +259,7 @@ func TestMaybeHint_AgentAuthTokenSilent(t *testing.T) { func TestMaybeHint_AgentAIToolsCommandSilent(t *testing.T) { setAgentEnv(t, "CODEX_CI") ctx, stderr := agentCtx(t, t.TempDir(), t.TempDir()) - parent := &cobra.Command{Use: aiToolsCommandName} - child := &cobra.Command{Use: "install"} - parent.AddCommand(child) - MaybeHint(ctx, child, noPluginRecorded) + MaybeHint(ctx, commandAt("aitools install"), noPluginRecorded) assert.Empty(t, stderr.String()) } diff --git a/libs/aitools/agents/hint_test.go b/libs/aitools/agents/hint_test.go index b2b70d72ff4..558ae25500c 100644 --- a/libs/aitools/agents/hint_test.go +++ b/libs/aitools/agents/hint_test.go @@ -8,6 +8,7 @@ import ( "log/slog" "os" "path/filepath" + "strings" "testing" "github.com/databricks/cli/internal/testutil" @@ -47,7 +48,7 @@ func claudeCtx(t *testing.T, home string) (context.Context, *bytes.Buffer) { return ctx, stderr } -func regularCmd() *cobra.Command { return &cobra.Command{Use: "current-user"} } +func regularCmd() *cobra.Command { return commandAt("clusters list") } func writePluginManifest(t *testing.T, home, body string) { dir := filepath.Join(home, ".claude", "plugins") @@ -234,15 +235,51 @@ func TestMaybeHint_AIToolsCommandSilent(t *testing.T) { ctx, stderr := claudeCtx(t, t.TempDir()) ctx = telemetry.WithNewLogger(ctx) - parent := &cobra.Command{Use: aiToolsCommandName} - child := &cobra.Command{Use: "install"} - parent.AddCommand(child) - - MaybeHint(ctx, child, noPluginRecorded) + MaybeHint(ctx, commandAt("aitools install"), noPluginRecorded) assert.Empty(t, stderr.String()) assert.Empty(t, hintKinds(t, ctx)) } +// commandAt builds a command tree under a "databricks" root and returns the +// command at the space-separated path, e.g. "current-user me". +func commandAt(path string) *cobra.Command { + cmd := &cobra.Command{Use: "databricks"} + for name := range strings.FieldsSeq(path) { + child := &cobra.Command{Use: name} + cmd.AddCommand(child) + cmd = child + } + return cmd +} + +func TestIsHintExemptCommand(t *testing.T) { + tests := []struct { + path string + want bool + }{ + {"aitools install", true}, + {"experimental aitools skills install", true}, + {"auth login", true}, + {"auth token", true}, + {"configure", true}, + {"current-user me", true}, + {"completion bash", true}, + {"help", true}, + {cobra.ShellCompRequestCmd, true}, + {"version", true}, + {"authz", false}, + {"bundle help", false}, + {"current-user", false}, + {"clusters list", false}, + {"jobs run-now", false}, + } + for _, tc := range tests { + t.Run(tc.path, func(t *testing.T) { + assert.Equal(t, tc.want, isHintExemptCommand(commandAt(tc.path))) + }) + } +} + func TestMaybeHint_NoIONoPanic(t *testing.T) { setClaudeAgent(t) // Bare context without cmdio installed: cobra resolves --help and bare @@ -363,6 +400,9 @@ func TestMaybeHint_NativeHint(t *testing.T) { writeClaudeSkill(t, home, "databricks") }, }, + // The auth cases below root the tree at auth, so only the credential-helper + // check applies; under the databricks root, hintExemptCommands covers all + // of auth. { name: "auth token prints nothing", env: map[string]string{claudeChildSessionEnv: "1"}, @@ -404,12 +444,7 @@ func TestMaybeHint_NativeHint(t *testing.T) { { name: "aitools command prints nothing", env: map[string]string{claudeChildSessionEnv: "1"}, - cmd: func() *cobra.Command { - parent := &cobra.Command{Use: aiToolsCommandName} - child := &cobra.Command{Use: "install"} - parent.AddCommand(child) - return child - }, + cmd: func() *cobra.Command { return commandAt("aitools install") }, }, } { t.Run(tc.name, func(t *testing.T) { diff --git a/libs/aitools/agents/recommend.go b/libs/aitools/agents/recommend.go index dfbefa435f8..ea66ebe4016 100644 --- a/libs/aitools/agents/recommend.go +++ b/libs/aitools/agents/recommend.go @@ -24,9 +24,8 @@ func PrintSkillsTip(ctx context.Context) { // MaybeVersionCheckTip prints skillsTipText after `databricks version --check` // when a coding agent is detected without Databricks tooling. Callers that // MaybeHint hints (Claude Code and the registry agents, see isHintedAgent) are -// skipped: the root hook already names the install command for them, with its -// own throttle, and a second, different command in the same run would compete -// with it. installedPlugins is a parameter because this package +// skipped: `version` is in hintExemptCommands, and the tip must not undo that +// exemption for them. installedPlugins is a parameter because this package // cannot import the installer; callers pass installer.InstalledPluginAgents, // which counts a plugin recorded in the CLI install state with or without a // known version. No telemetry is logged: `databricks version` never resolves diff --git a/libs/telemetry/protos/README.md b/libs/telemetry/protos/README.md index 4186b6614d7..aacdcca2e50 100644 --- a/libs/telemetry/protos/README.md +++ b/libs/telemetry/protos/README.md @@ -9,13 +9,14 @@ or image references. Set `DATABRICKS_CLI_DISABLE_TELEMETRY=1` to opt out. The CLI logs an `aitools_hint_event` for each install-hint line it prints for a coding agent (Claude Code's native `` line and its text line are one event each; another agent's text line is one event) and for the `apps init` skills tip or install prompt. The install -hint is never printed on aitools commands, `auth token`, `auth docker token` or in CLI processes the -CLI started itself. It carries only the kind of hint (`hint_kind`); the command it was shown on is -the entry's `execution_context.command`. The event uploads at exit only when the command resolved -auth. The install hint prints at most once per hour per agent session (or per agent on the machine, -for agents without a session id), so when the command that printed it resolves no auth (e.g. -`databricks version`), no install hint event is logged for that hour even though the agent saw the -hint. +hint is never printed on hint-exempt commands (`hintExemptCommands` in +`libs/aitools/agents/hint.go`: aitools, `auth`, one-shot lookups, help, completion) or in CLI +processes the CLI started itself. It carries only the kind of hint (`hint_kind`); the command it was +shown on is the entry's `execution_context.command`. The event uploads at exit only when the command +resolved auth. The install hint prints at most once per hour per agent session (or per agent on the +machine, for agents without a session id), so when the command that printed it resolves no auth +(e.g. `databricks bundle schema`), no install hint event is logged for that hour even though the +agent saw the hint. `databricks aitools` install, update, list, version and uninstall log an `aitools_command_event` funnel per run: STARTED, one STEP_COMPLETED per install step reached (install only), and FINISHED