Repository navigation
aitools: throttle the native Claude Code hint on its own shorter clock - #7692
Conversation
329003c to
cfed319
Compare
|
Commit: Regression test reportSelected 1 changed tests (limit=20, 0 not selected) 1 tests: regression=1 unreleased=0 coverage=0 failing=0
TestAccept/cmd/aitools/claude-config-dir: branch ✅ | main (bdc5f0e) ❌ | latest (v1.26.0) ❌main (bdc5f0e): latest (v1.26.0): |
✅ Integration test reportCommit: feeecc5
Top 5 slowest tests (at least 2 minutes):
|
simonfaltum
left a comment
There was a problem hiding this comment.
🤖 Automated review from simonfaltum's review agent (pr-review skill) at cfed319. Each finding was verified against the code; simonfaltum may follow up.
Not approving yet: 1 blocking issue(s), tagged [blocking].
This PR gives Claude Code's native <claude-code-hint> line its own 10-minute throttle per session, written only when the line prints. A withheld line, or a subagent making the session's first call, no longer hides the install dialog for an hour. The throttle logic is correct and its tests pass locally. However, the branch conflicts with main: #7586 has since rewritten MaybeHint around agent-prefixed throttle keys and a durable claim, and main's hint_agents.go uses the constants this PR removes. So it needs a careful rebase and a fresh CI run. The other comments are about the stale telemetry README, the extra exit-time telemetry uploads from native-only repeats, and two nits on the changelog and test helpers.
Accepted answers
- Why repeat the native line every 10 minutes instead of keeping its own key on the text hint's hour?
| // Check the throttles before the filesystem probe, so a throttled session | ||
| // skips the plugin/skills detection. A throttle marker is written only | ||
| // after its line prints, so an already-installed environment never burns | ||
| // one, and neither does a native line withheld from this invocation. | ||
| session := sessionID(ctx, hint.sessionEnv) | ||
| native := hint.nativeLine(ctx) | ||
| if native != "" && nativeHintThrottle.seen(ctx, session) { | ||
| native = "" | ||
| } | ||
| textDue := !textHintThrottle.seen(ctx, session) | ||
| if native == "" && !textDue { | ||
| return | ||
| } | ||
| if claudeToolingInstalled(ctx) { | ||
| if hint.installed(ctx) { | ||
| return | ||
| } | ||
| cmdio.LogString(ctx, hintText) | ||
| logHintShown(ctx, protos.AitoolsHintKindInstallText) | ||
| recordSessionHint(ctx) | ||
| if native != "" { | ||
| cmdio.LogString(ctx, native) | ||
| logHintShown(ctx, hint.nativeKind) | ||
| nativeHintThrottle.record(ctx, session) | ||
| } | ||
| if textDue { | ||
| cmdio.LogString(ctx, hint.text) | ||
| logHintShown(ctx, hint.textKind) | ||
| textHintThrottle.record(ctx, session) | ||
| } |
There was a problem hiding this comment.
[blocking] This branch conflicts with main, and the conflict isn't mechanical. After this commit, #7586 (d285909) rewrote MaybeHint on main in three ways. It keys the throttle by throttleKey: an agent-prefixed session id, or a per-machine fallbackKey. It prints non-Claude hints only after claim/claimHintMarker has persisted the marker. And it takes a third pluginRecorded argument. Main's hint_agents.go:59 (claimHintMarker) still uses hintCacheComponent and hintSessionTTL, which this PR deletes. The new tests also call the two-argument MaybeHint. If the conflict is resolved by taking this branch's hint.go, the build breaks and the non-Claude throttle is lost.
Please rebase onto main and then:
- key
hintThrottleby the throttle key; - have
claimHintMarkerusetextHintThrottle, or keep the constants; - keep the native throttle for Claude Code only;
- update the new tests and the acceptance output.
The green CI ran before #7585 and #7586 landed, so it needs a fresh run after the rebase.
There was a problem hiding this comment.
Rebased onto main as one commit, 9d0ae56. hintThrottle is now keyed by throttleKey, and claimHintMarker uses textHintThrottle, so non-Claude hints still print only after the claim persists. The native 10-minute throttle applies only to Claude Code. The tests use the three-argument MaybeHint, and the acceptance output is regenerated. Fresh CI is running.
| uploads at exit only when the command resolved auth. The install hint prints at most once per | ||
| Claude Code session per hour, so when the command that printed it resolves no auth (e.g. | ||
| `databricks version`), that session logs no install hint event for the next hour even though the | ||
| agent saw the hint. |
There was a problem hiding this comment.
[nice to have] This paragraph still says the install hint prints at most once per Claude Code session per hour, and that a command that resolves no auth means no event "for the next hour". With this PR, the native line and its CLAUDE_CODE_NATIVE event can repeat on their own every 10 minutes per session. Anyone who reads native-event counts with this doc in mind can be off by up to 6x.
Please say that the text line prints at most once per hour and the native line at most once per 10 minutes. Main reworded this sentence in #7586, so update that version after the rebase. The acceptance title at acceptance/cmd/aitools/claude-config-dir/script:31 ("both lines print once, so 2>&1 pipelines see them only on the first command") has the same problem.
There was a problem hiding this comment.
Done in 9d0ae56. The README now says the text line prints at most once per hour and the native line at most once per 10 minutes, while the native event stays at most hourly. The claude-config-dir title now describes both clocks.
| if native != "" { | ||
| cmdio.LogString(ctx, native) | ||
| logHintShown(ctx, hint.nativeKind) | ||
| nativeHintThrottle.record(ctx, session) | ||
| } |
There was a problem hiding this comment.
[nice to have] The description counts the cost of the 10-minute clock as a raw tag in a 2>&1 | jq pipeline. It leaves out telemetry. Each native-only repeat logs a CLAUDE_CODE_NATIVE event, and a command that resolved auth then uploads telemetry at exit. That upload waits up to hintOnlyUploadTimeout (1s); without the event, the command wouldn't upload at all.
Take a long session without the plugin, where an agent runs databricks jobs list every few minutes. It now makes up to 6 of these uploads per hour instead of 1, and native-event counts grow with session length rather than with the number of dialog chances. Consider keeping the native event on the text hint's hourly clock. Otherwise, mention the extra uploads in the description and the README. (in reply to #7692)
There was a problem hiding this comment.
Went with keeping the native event on the text hint's hourly clock (9d0ae56). The CLAUDE_CODE_NATIVE event is logged only for the first native line since the text last printed, so a native-only repeat logs nothing and triggers no exit-time upload. TestMaybeHint_NativeOnlyRepeatLogsNoEvent covers this, and the description's cost paragraph is updated.
| @@ -0,0 +1 @@ | |||
| * Repeat Claude Code's native plugin install hint every 10 minutes per session instead of hourly with the text hint, so the install dialog isn't held back for an hour when a subagent or hook runs the session's first `databricks` command. ([#7692](https://github.com/databricks/cli/pull/7692)) | |||
There was a problem hiding this comment.
[nit] No release contains #7585 yet (v1.26.0 predates it), so both fragments ship in the same release. Readers will first see "Print the native hint alongside the text hint", then "Repeat it every 10 minutes ... instead of hourly with the text hint". That describes an hourly behaviour no release ever had. "Every 10 minutes" also reads like a timer, but the line prints at most once per 10 minutes, on the next command.
Please fold this into .nextchanges/cli/claude-code-native-hint.md: drop "alongside the text hint", describe the 10-minute throttle and link both PRs. Then delete this file.
There was a problem hiding this comment.
|
|
||
| // sessionCtx returns a context for one command in session-abc, sharing home | ||
| // and cacheDir with the session's other commands. | ||
| func sessionCtx(t *testing.T, home, cacheDir string, childSession bool) (context.Context, *bytes.Buffer) { |
There was a problem hiding this comment.
[nit] sessionCtx duplicates the newCtx closures in TestMaybeHint_NativeHintThrottledPerSession (line 463) and TestMaybeHint_LogsEventsOncePerSession (line 625, which is identical). .agents/rules/style-guide-go.md asks for a named function instead of closures like these. Since this PR adds the helper, please use it in both tests and drop the closures.
There was a problem hiding this comment.
Done in 9d0ae56. A single named sessionCtx(t, home, cacheDir, childSession) replaces the closures in TestMaybeHint_ThrottledPerSession, TestMaybeHint_NativeHintThrottledPerSession and TestMaybeHint_LogsEventsOncePerSession, and the new tests use it too.
The native <claude-code-hint> line shared the text hint's one-hour session marker, which was written whenever the text printed, including when the native line was withheld (no child-session marker, CI, terminal attached) or printed where Claude Code strips it without prompting (subagents, hooks). The main loop could then go an hour without the install dialog. Throttle the native line under its own cache bucket with a 10-minute TTL, keyed by the hint's throttle key and written only when it prints. The text hint keeps its one-hour marker, and other agents' durable claim now goes through the same text throttle. The CLAUDE_CODE_NATIVE event stays on the text hint's hourly clock: it is logged only for the first native line printed since the text last printed, so a native-only repeat logs no event and triggers no telemetry upload at exit. Co-authored-by: Isaac <no-reply@databricks.com>
cfed319 to
9d0ae56
Compare
simonfaltum
left a comment
There was a problem hiding this comment.
🤖 Follow-up review from simonfaltum's review agent (pr-review skill) at 9d0ae56, covering the changes since cfed319. Each finding was verified against the code; simonfaltum may follow up.
No blocking issues found, approving. 2 non-blocking comment(s) below.
4 earlier comment(s) fixed since cfed319.
The rebase onto main carries the separate 10-minute native throttle over cleanly to #7586's throttle keys and durable claim. The new event marker keeps CLAUDE_CODE_NATIVE on the text hint's hourly window, so native-only repeats no longer trigger telemetry uploads. That addresses all five earlier comments: four are fixed, and the reworded, separate changelog fragment is fine. CI is green and nothing blocking is left. Two small follow-ups remain: a test for the textDue || branch, and README wording that overstates how rarely the native event is logged.
Accepted answers
- Fold the throttle changelog into #7585's fragment?: #7692 (comment)
| nativeHintThrottle.record(ctx, key) | ||
| // A text print starts a new text window, in which this is the first | ||
| // native print. | ||
| if textDue || !nativeEventThrottle.seen(ctx, key) { |
There was a problem hiding this comment.
[nice to have] No test covers the textDue || half of this condition. With it removed, go test ./libs/aitools/agents/ still passes, because every test that prints the text and native lines together starts with the event marker missing or aged out.
It matters when the previous window's first native line printed late. Say a text-only command runs at T0 and the first native line at T0+55m, which writes a true event marker that lasts until T0+115m. A command at T0+61m then prints both lines. Without textDue ||, that command logs only INSTALL_TEXT, so the new window's CLAUDE_CODE_NATIVE event is lost.
Please add a test for this sequence:
- Run a text-only command.
- Age the text marker by 55 minutes and run a Claude Code command.
- Age the text marker past 1 hour and the native marker past 10 minutes, leaving the event marker fresh.
- Run another Claude Code command and expect both lines and both events.
There was a problem hiding this comment.
Added TestMaybeHint_TextAndNativePrintStartsNewNativeEventWindow in feeecc5, following your sequence. It fails with textDue || removed.
| (e.g. `databricks bundle schema`), no install hint event is logged for that hour even though the | ||
| resolved auth. The text line prints at most once per hour per agent session (or per agent on the | ||
| machine, for agents without a session id). Claude Code's native line prints at most once per 10 | ||
| minutes per session, but its event is logged at most once per hour: only for the first native line |
There was a problem hiding this comment.
[nit] "its event is logged at most once per hour" is stronger than what the code does. The bound is one native event per text-line print, and two can land about one native TTL apart. Here is a sequence:
- T0: a command outside a Claude Code subprocess prints only the text.
- T0+55m: a Claude Code command prints the native line and logs the event.
- T0+61m: the text prints again while the native line is still throttled, which resets the marker.
- T0+66m: the native line prints and logs the event again.
That's two CLAUDE_CODE_NATIVE events 11 minutes apart. Since this paragraph is what people read when they interpret the counts, consider "its event is logged at most once per text-line print: only for the first native line printed since the text line last printed".
There was a problem hiding this comment.
Reworded in feeecc5 to "logged at most once per text-line print", using your wording. The closing sentence now says no event is uploaded "until the text line prints again" instead of "for that hour".
… bound Cover the textDue half of the native-event condition: a command that prints both lines starts a new text window and logs the native event, even when the previous window's late native print left a fresh event marker. The README now states the real bound, one native event per text-line print, rather than once per hour. Co-authored-by: Isaac <no-reply@databricks.com>
## Release v1.27.0 ### Notable Changes * `databricks aitools install`, `update` and `uninstall` now exit with code 1 when they do nothing they were asked to. `install` fails when it sets up nothing: no coding agent is detected, every agent is skipped or fails to install, or no skill in the release can be installed (also with `--path`). `update` fails when every update or check it attempts fails, and `uninstall` when every removal it attempts fails. Scripts that ran these commands as a best-effort step and relied on exit code 0 should handle the new exit code. ([#7481](#7481)) * Add `file:<path>` selectors to `pipelines run` and pipeline `bundle run`. `--refresh` and `--full-refresh` now use space-separated lists, such as `--refresh "orders payments"`, instead of comma-separated lists. Single names containing spaces now require backticks, e.g. ``--refresh 'table:`order details`'``. ([#7184](#7184)) * The Databricks CLI is now available on PyPI as `databricks`: run it with `uvx databricks`, or install it with `uv tool install databricks`, `pipx install databricks` or `pip install databricks`. The package contains only the prebuilt CLI binary. Uninstall the legacy `databricks-cli` package first, since both install a `databricks` command. ([#7704](#7704), [#7777](#7777)) ### CLI * Add `databricks sandbox fs` commands (`cp`, `ls`, `cat`, `mkdir`, `rm`) to transfer files between your local filesystem and sandboxes using `<sandbox-id>:/path`. ([#7372](#7372)) * `databricks fs` commands retry reads (stat, list, open) and deletes on DBFS and Volumes when the server returns a transient error or does not respond within the HTTP timeout. ([#7556](#7556)) * Retry UC Volumes file operations (`fs cp`, `fs ls`, `fs rm`, bundle uploads to Volumes) when the Files API returns HTTP 408, 429, 502, 503 or 504 (for example "AWS S3 is throttling requests"), or on a transient network error; this regressed in v1.10.0. ([#7559](#7559)) * Stop warning when the host metadata request (`/.well-known/databricks-config`) times out; the CLI already falls back to your config, and the message is still shown with `--debug`. ([#7752](#7752)) * Add `databricks aitools auto-install disable` and `enable` to turn off (or back on) the automatic installation of Databricks AI tools on CLI upgrades. A global-scope `databricks aitools uninstall` also turns it off. ([#7701](#7701)) * Stop printing the Databricks AI tooling install hint on `auth`, `configure`, `current-user me`, `version`, `help`, and shell-completion commands. ([#7452](#7452)) * When Codex, Cursor, GitHub Copilot CLI, OpenCode, Gemini CLI, Antigravity, Pi, Goose or Kiro run the CLI without Databricks skills installed for that agent, the CLI now prints a one-line hint to install them with `databricks aitools install --agents <agent> --scope global`, previously shown only to Claude Code. ([#7586](#7586)) * `databricks aitools install` now rejects an unknown `--agents` name before it shows the scope prompt, instead of after. ([#7469](#7469)) * `databricks aitools install` no longer asks "Proceed?" after the agent picker; the picker selection confirms the plan. The picker title now shows the install scope, its hint says Enter installs, `--skills-only` runs label plugin agents "skills" and pre-check every agent whose config dir exists, and the plan summary after it is reduced to the scope line. ([#7478](#7478)) * `databricks aitools install --output json` reports more specific `error_category` values: `SKILLS_FETCH_FAILED`, `RELEASE_LOOKUP_FAILED`, `RATE_LIMITED`, `MANIFEST_INVALID`, `STATE_INVALID` and `PLUGIN_CLI_TIMEOUT`. A coding agent CLI that does not answer in time is now reported as `timed out after <duration>`, followed by any stderr it wrote before it was stopped. ([#7475](#7475)) * `databricks aitools install` no longer prompts when a coding agent runs it, even in a pseudo-terminal; it uses the non-interactive defaults instead and prints a note saying so. ([#7477](#7477)) * `databricks aitools install` now prints the directory it installed skills into (for example `Installed 1 skill in ~/.databricks/aitools/skills.`), so agents can open the installed `SKILL.md` files without searching for them. ([#7668](#7668)) * `databricks aitools install` now ends a failed install with a step to recover, in the text output and in a new `recovery` field of `--output json`. ([#7480](#7480)) * `databricks aitools install` now installs plugins for the other coding agents even when installing skill files fails. ([#7479](#7479)) * `databricks aitools install` now installs skill files for a detected coding agent whose CLI is not on PATH (for example a Claude Code desktop or IDE install), unless it already has the plugin, says how to switch to the plugin later, and warns when the current project also has the plugin. `databricks aitools update` no longer tries to install the plugin for such an agent, and no longer writes skill files next to a plugin that such an agent already has. ([#7482](#7482)) * Fix `databricks aitools install` waiting a long time on an unreachable or slow workspace while it resolves authentication for telemetry; that wait is now limited to a few seconds. ([#7468](#7468)) * `databricks aitools install`, `update` and `list` now refuse a skills manifest that names a skill or file outside the skills directory, before writing any skill files. A skill whose name or file paths are not portable is skipped with a warning, and `update` keeps its installed copy. ([#7722](#7722)) * `databricks aitools install` and `databricks aitools update` refresh only the marketplace the Databricks plugin is listed in, so another unreachable marketplace no longer blocks them. When that refresh fails, both commands warn, install or update the plugin from the local copy of the marketplace, and record the plugin version as unknown. ([#7473](#7473)) * `databricks aitools install` and `databricks aitools update` now wait up to 20 seconds instead of 5 for a coding agent's CLI to answer the plugin capability check, so a slow first start is less likely to report the agent as unavailable. ([#7472](#7472)) * `databricks aitools install` no longer fails a plugin-only install when the lookup of the latest skills release on GitHub fails or is rate-limited. The plugin is installed and its version is recorded as unknown. ([#7474](#7474)) * `databricks aitools` commands now send usage telemetry, and the CLI records when it recommends installing Databricks AI tools. When the configured workspace is slow or unreachable, `aitools install`, `update` and `uninstall` can take up to about 6 seconds longer, and `list`, `version` and runs that stop early up to about 3 seconds. Set `DATABRICKS_CLI_DISABLE_TELEMETRY=1` to opt out. ([#7467](#7467), [#7469](#7469), [#7470](#7470)) * `databricks aitools install` and `databricks aitools update` now report a coding agent CLI shim (`.cmd` or `.bat`) on Windows that prints its plugin help and then exits with an error as `shim-exited-with-error`, with the command to run to see the error, instead of reporting the CLI as not on PATH. ([#7476](#7476)) * `apps init` no longer suggests installing skills when every detected coding agent already has the Databricks plugin. ([#7467](#7467)) * `databricks auth login` now gives up on the optional workspace lookup after about 5 seconds instead of retrying for about 5 minutes, and explains the fallback to the manual workspace ID prompt. ([#7522](#7522)) * Throttle Claude Code's native plugin install hint separately from the text hint: it prints at most once per 10 minutes per session, so the install dialog still comes up when a subagent, a hook, or a command outside a Claude Code subprocess runs the session's first `databricks` command. ([#7692](#7692)) * Print Claude Code's native plugin install hint alongside the text hint, so Claude Code offers a one-click install of the Databricks plugin. Claude Code now counts as having the tooling only when it loads it: skills only in `~/.databricks/aitools/skills` don't count, and a project- or local-scope plugin counts only when the CLI runs inside that project. `auth token`, `auth docker token` and CLI subprocesses no longer print install hints. ([#7585](#7585)) * Interactive prompts and pagers now work in Git for Windows' bash and other MSYS2 shells when they run under ConPTY (the default since Git for Windows 2.47) or directly in a Windows console. ([#7699](#7699)) * Add the `databricks feedback` command to send feedback about the CLI to Databricks. ([#7724](#7724)) * Fix shell completion in `databricks fs` commands for local paths typed with a leading `./` or repeated separators, which previously offered no suggestions. ([#7679](#7679)) * Fix a panic in `databricks labs` commands when a non-string SDK setting such as `DATABRICKS_DEBUG_HEADERS` or `DATABRICKS_RATE_LIMIT` is set in the environment. ([#7673](#7673)) * Fix a panic in `databricks labs install` for projects whose `labs.yml` has no `install` section. ([#7673](#7673)) * `NO_COLOR` no longer disables prompts, spinners or the list pager; they run without color. ([#7700](#7700)) * Add the Beta `databricks pipelines test` command, which runs the tests of a pipeline, and the `testing` property of pipelines in bundles. ([#7429](#7429)) * Add `databricks sandbox forward`, which serves an app running in a sandbox at a local URL. ([#7395](#7395)) * Bound the whole telemetry upload at exit, including config resolution and authentication, by its timeout, so a stalled auth or telemetry endpoint no longer keeps a command from exiting. ([#7467](#7467)) * `databricks version --check` now suggests `databricks aitools install` on stderr when a coding agent is detected without the Databricks plugin or skills. ([#7471](#7471)) ### AI Runtime * `air get -o json` now reports `PENDING` while the run waits for compute, matching `air list`, and includes the run's `status_message`. ([#7455](#7455)) * Wrap long failure reasons and log lines in the `air list` info and logs panes, keep the MLflow link (labeled with its retry) when a run's last retry failed before starting, and point `air logs` at earlier retries when the last one has no logs. ([#7456](#7456)) * `databricks air logs --node` now reports an out-of-range node index when it can determine the run's node count, instead of looking like a successful run with no logs. ([#7516](#7516)) * Add experiment, duration, accelerator, and dashboard metadata to `air list --output json`. For retried runs, `started_at` now reports the latest attempt, matching `air get`. ([#7568](#7568)) * `air list` shortens MLflow run names and unnamed-run IDs by keeping their end behind a leading `…`, and its columns no longer overflow on wide (for example CJK) text; `air get` shows an unnamed run's full MLflow run ID. ([#7582](#7582)) * Shrink the Experiment and User columns of the interactive `air list` table to fit the terminal width, keeping the end of a shortened experiment name. ([#7583](#7583)) * Show the experiment, accelerators and configuration in the `air list` info pane for runs where it showed `N/A`. ([#7587](#7587)) * Strip terminal control characters from the MLflow run, experiment and user names shown by `air list` and `air get`, so a run name cannot clear or retitle the terminal of whoever lists it. ([#7601](#7601)) * `air logs`, `air get`, and `air run --watch` no longer make an extra credential-check request before fetching the run, and `air get` reuses the configured workspace ID instead of looking it up. ([#7613](#7613)) * `air list` no longer waits on extra current-user requests before listing runs, which makes the default list about 150ms faster. ([#7615](#7615)) * `air list --all-status` requests larger index pages, so it makes far fewer round trips once the server supports `page_size`. ([#7616](#7616)) * Fit the interactive `air list` table to narrow terminals: when the Experiment and User columns are at their floors, shorten Started to `MM-DD HH:MM` and size the MLflow column to its labels, then hide Accelerators, User, MLflow and Progress in that order, naming the hidden columns in the hint line. ([#7629](#7629)) * `air get -o json` now includes `mlflow_run_id` and `mlflow_experiment_id`, so a run can be handed to MLflow-based steps without parsing `mlflow_url`. They identify the MLflow run `mlflow_url` links to, including one from an earlier retry that `mlflow_retry` names. ([#7636](#7636)) * `air get` and the `air list` info pane now show the environment of runs on the Databricks AI environment (`databricks_ai_v*`) instead of `N/A`. ([#7637](#7637)) * `air run` now rejects a `code_source.include_paths` path that selects no files instead of uploading a snapshot without it; glob patterns and pathspec magic are left to git. ([#7643](#7643)) * `air convert-to-dabs` now suggests the `--output-dir` that converts a working-tree workload whose `code_source.root_path` is outside the bundle directory, instead of suggesting `sync.paths`. ([#7644](#7644)) * `air run` now lists a `code_source.root_path` outside a git repository relative to `root_path`, so running from a subdirectory of `root_path` no longer uploads an empty or partial snapshot. ([#7646](#7646)) * `air list --all-status` now fills `--limit` past purged or inaccessible indexed runs. ([#7743](#7743)) * `air run` now warns about missing PyTorch when a pinned snapshot's `include_paths` selects a Python file. ([#7744](#7744)) * `air cancel JOB_RUN_ID` now rejects run IDs that are not AI Runtime runs instead of cancelling unrelated Jobs runs. In `-o json` output, the `failed[].error` text for a run that does not exist or that you cannot view now starts with `failed to get run <id>:` instead of the cancel API error. ([#7569](#7569)) * `air get -o json` now reports `mlflow_retry` when the MLflow link comes from an earlier retry because the run's last retry never reached MLflow. ([#7620](#7620)) * `databricks air run --help` now shows how to install the databricks-ai-runtime coding agent skill. ([#7652](#7652)) * `air run --watch -o json` now reports each lifecycle `STATUS` transition once and never reports a non-terminal state after the run has ended, including when logs are served from MLflow artifacts. ([#7621](#7621)) * `air convert-to-dabs` now explains the `--output-dir` workaround when `code_source.root_path` resolves to the bundle root, and notes when the generated job carries the default `max_retries`. ([#7579](#7579)) * `air run` now refuses to upload a `code_source` snapshot that selects no files (for example when `root_path` is git-ignored) and explains the cause, and `--dry-run` runs the snapshot file selection and reports the file count. ([#7570](#7570)) * Repeat the Jobs run link after live log streaming ends. ([#7571](#7571)) * `air get -o json` includes run details including flat `accelerator_type` and `num_accelerators`. Use `--include-config` to include stored config, which may contain plaintext `env_variables` and parameters; downloads over 1 MiB are omitted, and config-dependent `max_retries` is otherwise null. ([#7624](#7624)) * `air get` and the `air list` info pane no longer show `Max Retries 0` when the Jobs API leaves the task's retry limit out. For a run submitted with `air run`, the limit now comes from the run's uploaded config, shown as `3 (CLI default)` when the config doesn't set `max_retries`; it shows `N/A` when the limit can't be known (job runs, multi-container runs, legacy runs with no explicit value, or an unreadable config). ([#7623](#7623)) * Reorganize `databricks air` help: subcommands are grouped by task, `air run` has examples, and YAML fields are listed under headings, with pool fields marked optional and `command`, `compute.num_accelerators`, and `compute.accelerator_type` correctly marked required. ([#7512](#7512)) * `air run -h config` now lists the environment variables AI Runtime sets on every node (such as `MLFLOW_RUN_ID` and `CODE_SOURCE_PATH`), and `air logs --help` notes that `--download-to` cannot be combined with `--tail` or `--minutes`. ([#7655](#7655)) * Support full workspace accelerator types in `air list` filters while preserving family matching, and reject invalid filter values. ([#7515](#7515)) * `databricks air list --all-status` now warns when the AI Runtime run index is unavailable and it falls back to scanning Jobs runs. That fallback scan is capped at 250 runs, and a stuck index request fails after 15 seconds instead of retrying for minutes. `--all-status --filter user=<your email>` now uses the run index instead of scanning the workspace's full run history. ([#7619](#7619)) * Return structured JSON errors for invalid `air list --filter` values when `-o json` is used. ([#7612](#7612)) * `air list --all-status` no longer fails when a listed run has been purged. ([#7523](#7523)) * **Behavior change:** `databricks air logs` now prints the logs available now and exits, also for an active run, matching `kubectl logs`, `docker logs` and `databricks apps logs`. Pass `--follow` (`-f`) to stream new lines until the run completes; `--tail N --follow` prints the last N lines first. `databricks air run --watch` still submits and streams. ([#7658](#7658)) * `databricks air logs -o json` and `databricks air run --watch -o json` now emit a `WAITING` event, for example `{"type":"WAITING","message":"Waiting for accelerator compute capacity..."}`, when the reported waiting status changes. ([#7695](#7695)) * `databricks air logs` on a run that ended in the last two minutes now waits for the log index to settle before printing, instead of sometimes dropping lines that were indexed late. ([#7663](#7663)) * `air logs` and `air run --watch` now print the waiting status (for example `Waiting for accelerator compute capacity...`) as a line on stderr when stderr is not a terminal, instead of printing nothing until the run produces logs. ([#7657](#7657)) * Route AIR log links to the MLflow Logs page instead of the hidden artifact path. ([#7491](#7491)) * Invalid `compute.accelerator_type` errors and `air run -h config.compute` no longer list the CLI's built-in accelerator types, which could differ from the workspace's. ([#7520](#7520)) * `databricks air --help` now notes that GPU pools are not required to run workloads. ([#7581](#7581)) * `air run` now prints the job run URL with the `?o=<workspace-id>` suffix, matching `air get` and `air list`; `dashboard_url` in `air run -o json` and the `--watch` events gains it too. When `air list` cannot resolve the workspace ID, its links now omit `?o=` instead of ending in `?o=0`. ([#7573](#7573)) * `databricks air run` now reports an unknown workload YAML key by its field path, suggests the closest valid field, and points to `-h config` instead of naming an internal Go type. ([#7574](#7574)) * `air run` (including `--dry-run`) now warns before submitting when the `code_source` imports `torch` but PyTorch is not declared: the environment is the Standard environment (version 5 or later) with no `torch` dependency, so the run may fail after it waits for a GPU. ([#7656](#7656)) ### Bundles * Add `isolation_mode` to the `catalogs` resource, so a catalog can be deployed as `OPEN` or `ISOLATED`. ([#7463](#7463)) * `bundle validate` no longer warns when resource permissions and top-level or target permissions name the same principal. ([#7291](#7291)) * Retry bundle file uploads, reads and deletes when the server does not respond within the HTTP timeout ("request timed out after ... of inactivity"). ([#7521](#7521)) * Show how to recover when `bundle deploy` fails because an app's service principal does not exist or was deleted. ([#7533](#7533)) * Retry transient server errors when creating Lakebase (`postgres_*`) resources in the direct deployment engine. ([#7557](#7557)) * Fix `bundle plan` reporting the `spark_conf` and `custom_tags` the backend derives from `is_single_node: true` as drift on clusters. ([#7577](#7577)) * Stop planning a spurious update for Lakeflow Connect pipelines whose `ingestion_definition.data_staging_options` is filled in by the backend. ([#7603](#7603)) * Retry the root path check in `bundle destroy` on transient errors, so a dropped connection no longer fails the destroy. ([#7597](#7597)) * Use the Lakebase branch when its create request times out but the branch was created, instead of failing the deploy, in the direct deployment engine. ([#7602](#7602)) * Retry transient server errors when deleting resources in the direct deployment engine. ([#7708](#7708)) * Use the Lakebase project when its create request times out but the project was created, instead of failing the deploy with "already exists", in the direct deployment engine. ([#7747](#7747)) * Use the feature, model serving endpoint or dashboard that a create request created despite timing out, instead of failing the deploy, in the direct deployment engine. ([#7757](#7757)) * Use the Lakebase role when its create request fails with a transient error but the role was created, instead of failing the deploy, in the direct deployment engine. ([#7767](#7767)) * Use the MCP service, model service or model provider service that a create request created despite failing with a timeout, a 499 or a reset stream, instead of failing the deploy, in the direct deployment engine. Create recovery for features, serving endpoints and dashboards now also covers 499 and reset streams. ([#7782](#7782)) * Retry app updates and deletes in the direct deployment engine when they fail with 400 BAD_REQUEST because the app compute is `UPDATING`, after waiting for the compute to settle. ([#7606](#7606)) * Enable drift detection for `source_code_path` and `git_source` on apps. ([#6399](#6399)) * `bundle destroy` and `bundle deploy` no longer fail with "internal error, missing in state" when the state holds an empty-ID entry left by an interrupted recreate in an older CLI. ([#7676](#7676)) * Fix a feature whose `full_name` contains uppercase letters being recreated on every deploy. ([#7398](#7398)) * Fix `bundle deployment bind` (and `bundle generate --bind`) failing with `no such node "resources.internal_immutable_snapshots.immutable"` when `workspace.sync_mode` is `immutable`, as reported in [#7306](#7306). ([#7329](#7329)) * Retry creating the deployment lock (without `--force-lock`) when the request fails with a transient server error, times out ("request timed out after ... of inactivity") or loses its connection ("unexpected EOF"). ([#7594](#7594)) * Fix a materialization set member whose `feature_name` contains uppercase letters failing to deploy, or recreating the set on every deploy. ([#7398](#7398)) * Delete the old resource when its name follows a renamed schema. ([#7718](#7718)) * Fix `pipelines dry-run` starting a real run when given a job KEY, and a crash in its shell completion. ([#7672](#7672)) * Rename schemas in place; schemas and volumes follow a renamed catalog or schema. ([#7343](#7343)) * Fix a panic when validating or deploying jobs with local libraries and serverless job clusters. ([#7725](#7725)) * Fix `tgz` artifacts with `git` set producing an empty tarball or failing when the bundle is in a subdirectory of the git repository. ([#7674](#7674)) * Apply `presets.trigger_pause_status` and the development mode pause default to `triggers[]` entries on jobs. ([#7450](#7450)) ### Dependency Updates * Bump dependencies with known vulnerabilities. ([#7750](#7750)) * Update the Go SDK to [v0.198.0](https://github.com/databricks/databricks-sdk-go/releases/tag/v0.198.0). ([#7530](#7530)) * Update the Go SDK to [v0.199.0](https://github.com/databricks/databricks-sdk-go/releases/tag/v0.199.0). ([#7584](#7584)) * Update the Go SDK to [v0.200.0](https://github.com/databricks/databricks-sdk-go/releases/tag/v0.200.0). ([#7653](#7653)) * Update the Go SDK to [v0.201.0](https://github.com/databricks/databricks-sdk-go/releases/tag/v0.201.0). ([#7769](#7769))
## Changes Adds an `unset_ci_env` helper to `acceptance/script.prepare`. It replaces the three copies of the CI and CI/CD provider `unset` line in `cmd/aitools/claude-config-dir`, `cmd/aitools/telemetry/hint` and `air/image-push`. The helper's comment points at `listCiCdProviders` in the Go SDK's `useragent/cicd.go` so the list stays in sync. The helper is also listed in the built-in helpers section of `.agents/rules/testing.md`. ## Why Addresses simonfaltum's review comment on databricks#7585 about the duplicated line. The helper lives in the root `script.prepare` because that is the only prepare file that covers both `cmd/aitools` and `air`. After this change, `unset_ci_env` is the only copy of the list. ## Tests - Rebased on current main, which includes databricks#7692. `go test ./acceptance -run TestAccept/cmd/aitools` (14 dirs) and `-run TestAccept/air` (24 dirs) both pass with no golden changes. They pass in a clean env and with `CI=true GITHUB_ACTIONS=true` exported. - Negative control: I turned the helper into a no-op and exported the CI vars. `cmd/aitools/telemetry/hint`, `cmd/aitools/claude-config-dir` and `air/image-push` all fail. This pull request and its description were written by Isaac. --------- Co-authored-by: Isaac <no-reply@databricks.com>
Changes
The native
<claude-code-hint>line now has its own throttle (a separate cache bucket, 10-minute TTL), keyed by the hint's throttle key from #7586 and written only when the line actually prints. The text hint keeps its one-hour marker, and other agents' durable claim (claimHintMarker) now goes through the same text throttle. The native throttle applies only to Claude Code, the one agent with a native line. All throttles are still checked before the plugin/skills filesystem probe.The
CLAUDE_CODE_NATIVEhint-shown event stays on the text hint's hourly clock. It is logged only for the first native line printed since the text line last printed, so a native-only repeat logs no event.Why
This addresses simonfaltum's review comment on
hint.goin #7585. The single shared marker was written whenever the text hint printed. That included commands where the native line was withheld (noCLAUDE_CODE_CHILD_SESSION, CI, a terminal attached), and commands where Claude Code strips the tag without prompting (subagents, hooks). After that, the main loop got neither line for an hour.The CLI can't tell a subagent from the main loop, because both carry the same session id and child-session marker. So a separate key alone doesn't fix the subagent case; the shorter TTL is what bounds it. Claude Code shows the dialog at most once per session, so repeating the line is cheap: a raw tag reaches a
2>&1 | jqreader at most once per 10 minutes. Telemetry costs nothing extra, because a native-only repeat logs no event and so triggers no exit-time upload (hintOnlyUploadTimeout). Native-event counts stay at most one per text window instead of growing with session length. In return, a session waits at most 10 minutes for the dialog.Tests
acceptance/cmd/aitools/claude-config-dircase for the withheld-then-native sequence. The existing throttle case's title now describes both clocks.libs/telemetry/protos/README.mddescribes both clocks and the hourly native event.go test ./libs/aitools/... ./cmd/root/...,go test ./acceptance -run 'TestAccept/cmd/aitools',./task test-exp-aitools,./task checksand./task lint-qall pass.This pull request and its description were written by Isaac.