From dcf58c94a0b4a63e733d6ca694ccbe01cff592e7 Mon Sep 17 00:00:00 2001 From: MarioCadenas Date: Thu, 8 Oct 2026 10:39:11 +0200 Subject: [PATCH 1/2] Bump cli-compat to appkit 0.76.1 (CLI 1.0.0-1.19.x) and 0.84.0 (CLI 1.20.0+) CLI 1.20.0 and newer resolve AppKit 0.84.0; CLI 1.0.0 through 1.19.x stay on a separate entry with AppKit 0.76.1. Skills stay at 0.2.10. The package_manager acceptance test tags the embedded template version in its local repo, so it now tags template-v0.84.0. That version is at or above the pnpm dual-manager threshold (0.82.0), so the fallback app now uses pnpm instead of npm. Co-authored-by: Isaac Signed-off-by: MarioCadenas --- acceptance/cmd/apps/init/package_manager/output.txt | 12 ++++++------ acceptance/cmd/apps/init/package_manager/script | 2 +- internal/build/cli-compat.json | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/acceptance/cmd/apps/init/package_manager/output.txt b/acceptance/cmd/apps/init/package_manager/output.txt index b5e2d34f609..aa19d20b479 100644 --- a/acceptance/cmd/apps/init/package_manager/output.txt +++ b/acceptance/cmd/apps/init/package_manager/output.txt @@ -458,8 +458,8 @@ null === Missing version falls back to the embedded template and its package manager >>> DATABRICKS_CACHE_DIR=cache DATABRICKS_CACHE_ENABLED=true DATABRICKS_FORCE_EMBEDDED_COMPAT=false [CLI] apps init --name fallback-app --skip-install -Warn: Template version not found, falling back to embedded version 0.57.0 -✔ Cloning template (version 0.57.0) +Warn: Template version not found, falling back to embedded version 0.84.0 +✔ Cloning template (version 0.84.0) ✔ Creating project ✔ Project created successfully! @@ -470,16 +470,16 @@ Warn: Template version not found, falling back to embedded version 0.57.0 Next steps: cd fallback-app - npm ci && npm run dev + pnpm install --frozen-lockfile && pnpm run dev display_name: "fallback-app" description: "A Databricks App powered by AppKit" command: - - "npm" + - "pnpm" - "run" - "start" -"npm run build:server && npm run build:client" -null +"pnpm run build:server && pnpm run build:client" +"pnpm@11.0.8" === Version downgrade resolves the installed npm pin >>> CLI_TEST_NPM_VERSION=11.4.1 [CLI] apps init --name installed-older-app --version 0.81.0 diff --git a/acceptance/cmd/apps/init/package_manager/script b/acceptance/cmd/apps/init/package_manager/script index c189b779218..aba7dd17302 100755 --- a/acceptance/cmd/apps/init/package_manager/script +++ b/acceptance/cmd/apps/init/package_manager/script @@ -140,7 +140,7 @@ git-repo-init git add template git commit -qm 'Add template' git tag template-v0.81.0 -git tag template-v0.57.0 +git tag template-v0.84.0 git tag template-v0.82.0 git branch 0.81-maintenance repo_url=$(python3 -c 'from pathlib import Path; print(Path.cwd().as_uri())') diff --git a/internal/build/cli-compat.json b/internal/build/cli-compat.json index cfffe3c8d5a..d2de9e6d98a 100644 --- a/internal/build/cli-compat.json +++ b/internal/build/cli-compat.json @@ -1,4 +1,5 @@ { - "1.0.0": { "appkit": "0.57.0", "skills": "0.2.10" }, + "1.20.0": { "appkit": "0.84.0", "skills": "0.2.10" }, + "1.0.0": { "appkit": "0.76.1", "skills": "0.2.10" }, "0.299.2": { "appkit": "0.24.0", "skills": "0.1.5" } } From 4d2b08362d448ce4686a61edd04eda68e8f1f5a6 Mon Sep 17 00:00:00 2001 From: MarioCadenas Date: Thu, 8 Oct 2026 10:52:43 +0200 Subject: [PATCH 2/2] Bump cli-compat skills to 0.2.27 for CLI 1.20.0+ CLI 1.20.0 and newer (AppKit 0.84.0) now pin Agent Skills 0.2.27; CLI 1.0.0 through 1.19.x stay on 0.2.10. The installer test that falls back to the embedded pin expects the highest entry's skills version, so it now expects v0.2.27. Co-authored-by: Isaac Signed-off-by: MarioCadenas --- internal/build/cli-compat.json | 2 +- libs/aitools/installer/installer_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/build/cli-compat.json b/internal/build/cli-compat.json index d2de9e6d98a..ad23bc8b7e6 100644 --- a/internal/build/cli-compat.json +++ b/internal/build/cli-compat.json @@ -1,5 +1,5 @@ { - "1.20.0": { "appkit": "0.84.0", "skills": "0.2.10" }, + "1.20.0": { "appkit": "0.84.0", "skills": "0.2.27" }, "1.0.0": { "appkit": "0.76.1", "skills": "0.2.10" }, "0.299.2": { "appkit": "0.24.0", "skills": "0.1.5" } } diff --git a/libs/aitools/installer/installer_test.go b/libs/aitools/installer/installer_test.go index 47138e543fc..560c28db2e9 100644 --- a/libs/aitools/installer/installer_test.go +++ b/libs/aitools/installer/installer_test.go @@ -1062,7 +1062,7 @@ func TestGetSkillsRefLatestReleaseFallsBackToEmbeddedPin(t *testing.T) { ref, explicit, err := GetSkillsRef(t.Context()) require.NoError(t, err) - assert.Equal(t, "v0.2.10", ref) + assert.Equal(t, "v0.2.27", ref) assert.False(t, explicit, "an embedded fallback is not a user pin") }