@dbx-tools/databricks 0.9.188 → 0.9.190

package/index.ts

@@ -3,7 +3,7 @@
 // Hand edits are overwritten on the next watch; this file is read-only.
 
 export const PACKAGE_IDENTIFIER = "@dbx-tools/databricks";
-export const PACKAGE_VERSION = "0.9.188";
+export const PACKAGE_VERSION = "0.9.190";
 export * as cloud from "./src/cloud.ts";
 export * as databricksFS from "./src/databricks-fs.ts";
 export * as databricksPath from "./src/databricks-path.ts";

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 export declare const PACKAGE_IDENTIFIER = "@dbx-tools/databricks";
-export declare const PACKAGE_VERSION = "0.9.188";
+export declare const PACKAGE_VERSION = "0.9.190";
 export * as cloud from "./src/cloud.ts";
 export * as databricksFS from "./src/databricks-fs.ts";
 export * as databricksPath from "./src/databricks-path.ts";

package/lib/index.js

@@ -2,7 +2,7 @@
 // Regenerated from the exporting modules in ./src.
 // Hand edits are overwritten on the next watch; this file is read-only.
 export const PACKAGE_IDENTIFIER = "@dbx-tools/databricks";
-export const PACKAGE_VERSION = "0.9.188";
+export const PACKAGE_VERSION = "0.9.190";
 export * as cloud from "./src/cloud.js";
 export * as databricksFS from "./src/databricks-fs.js";
 export * as databricksPath from "./src/databricks-path.js";
@@ -13,4 +13,4 @@ export { DatabricksFileSystem } from "./src/databricks-fs.js";
 export { expandHomePath, normalizeDatabricksRoot, resolveDatabricksRoot, isWorkspaceFilesPath, isVolumesPath, isDbfsPath, resolveDatabricksFilesBackend } from "./src/databricks-path.js";
 export { getPublicIp, resolveHostIps } from "./src/net.js";
 export { createWorkspaceClient, refreshWorkspaceClientAuthentication, toLegacyWorkspaceClient, tryGetWorkspaceClient, getWorkspaceClient, getCurrentUserName, getWorkspaceUrl, getWorkspaceId } from "./src/workspace-client.js";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQ0FBMkM7QUFDM0MsbURBQW1EO0FBQ25ELHdFQUF3RTtBQUV4RSxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyx1QkFBdUIsQ0FBQztBQUMxRCxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsU0FBUyxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxLQUFLLE1BQU0sZ0JBQWdCLENBQUM7QUFDeEMsT0FBTyxLQUFLLFlBQVksTUFBTSx3QkFBd0IsQ0FBQztBQUN2RCxPQUFPLEtBQUssY0FBYyxNQUFNLDBCQUEwQixDQUFDO0FBQzNELE9BQU8sS0FBSyxHQUFHLE1BQU0sY0FBYyxDQUFDO0FBQ3BDLE9BQU8sS0FBSyxlQUFlLE1BQU0sMkJBQTJCLENBQUM7QUFDN0QsT0FBTyxFQUFFLGtCQUFrQixFQUFFLGFBQWEsRUFBRSxvQkFBb0IsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRTdHLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlELE9BQU8sRUFBRSxjQUFjLEVBQUUsdUJBQXVCLEVBQUUscUJBQXFCLEVBQUUsb0JBQW9CLEVBQUUsYUFBYSxFQUFFLFVBQVUsRUFBRSw2QkFBNkIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTFMLE9BQU8sRUFBRSxXQUFXLEVBQUUsY0FBYyxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQzNELE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxvQ0FBb0MsRUFBRSx1QkFBdUIsRUFBRSxxQkFBcUIsRUFBRSxrQkFBa0IsRUFBRSxrQkFBa0IsRUFBRSxlQUFlLEVBQUUsY0FBYyxFQUFFLE1BQU0sMkJBQTJCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBHRU5FUkFURUQgYnkgcHJvamVuIHdhdGNoIC0gRE8gTk9UIEVESVQuXG4vLyBSZWdlbmVyYXRlZCBmcm9tIHRoZSBleHBvcnRpbmcgbW9kdWxlcyBpbiAuL3NyYy5cbi8vIEhhbmQgZWRpdHMgYXJlIG92ZXJ3cml0dGVuIG9uIHRoZSBuZXh0IHdhdGNoOyB0aGlzIGZpbGUgaXMgcmVhZC1vbmx5LlxuXG5leHBvcnQgY29uc3QgUEFDS0FHRV9JREVOVElGSUVSID0gXCJAZGJ4LXRvb2xzL2RhdGFicmlja3NcIjtcbmV4cG9ydCBjb25zdCBQQUNLQUdFX1ZFUlNJT04gPSBcIjAuOS4xODhcIjtcbmV4cG9ydCAqIGFzIGNsb3VkIGZyb20gXCIuL3NyYy9jbG91ZC50c1wiO1xuZXhwb3J0ICogYXMgZGF0YWJyaWNrc0ZTIGZyb20gXCIuL3NyYy9kYXRhYnJpY2tzLWZzLnRzXCI7XG5leHBvcnQgKiBhcyBkYXRhYnJpY2tzUGF0aCBmcm9tIFwiLi9zcmMvZGF0YWJyaWNrcy1wYXRoLnRzXCI7XG5leHBvcnQgKiBhcyBuZXQgZnJvbSBcIi4vc3JjL25ldC50c1wiO1xuZXhwb3J0ICogYXMgd29ya3NwYWNlQ2xpZW50IGZyb20gXCIuL3NyYy93b3Jrc3BhY2UtY2xpZW50LnRzXCI7XG5leHBvcnQgeyBSQU5HRV9DQUNIRV9UVExfTVMsIENsb3VkUHJvdmlkZXIsIHJlc29sdmVDbG91ZExvY2F0aW9uLCBsb2FkUHJvdmlkZXJSYW5nZXMgfSBmcm9tIFwiLi9zcmMvY2xvdWQudHNcIjtcbmV4cG9ydCB0eXBlIHsgQ2xvdWRMb2NhdGlvbiB9IGZyb20gXCIuL3NyYy9jbG91ZC50c1wiO1xuZXhwb3J0IHsgRGF0YWJyaWNrc0ZpbGVTeXN0ZW0gfSBmcm9tIFwiLi9zcmMvZGF0YWJyaWNrcy1mcy50c1wiO1xuZXhwb3J0IHR5cGUgeyBEYXRhYnJpY2tzRmlsZVN5c3RlbUNsaWVudFJlc29sdmVyLCBEYXRhYnJpY2tzRmlsZVN5c3RlbU9wdGlvbnMsIERhdGFicmlja3NTdHJlYW1Xcml0ZU9wdGlvbnMgfSBmcm9tIFwiLi9zcmMvZGF0YWJyaWNrcy1mcy50c1wiO1xuZXhwb3J0IHsgZXhwYW5kSG9tZVBhdGgsIG5vcm1hbGl6ZURhdGFicmlja3NSb290LCByZXNvbHZlRGF0YWJyaWNrc1Jvb3QsIGlzV29ya3NwYWNlRmlsZXNQYXRoLCBpc1ZvbHVtZXNQYXRoLCBpc0RiZnNQYXRoLCByZXNvbHZlRGF0YWJyaWNrc0ZpbGVzQmFja2VuZCB9IGZyb20gXCIuL3NyYy9kYXRhYnJpY2tzLXBhdGgudHNcIjtcbmV4cG9ydCB0eXBlIHsgRGF0YWJyaWNrc0ZpbGVzQmFja2VuZCwgTm9ybWFsaXplRGF0YWJyaWNrc1Jvb3RPcHRpb25zLCBSZXNvbHZlRGF0YWJyaWNrc1Jvb3RPcHRpb25zIH0gZnJvbSBcIi4vc3JjL2RhdGFicmlja3MtcGF0aC50c1wiO1xuZXhwb3J0IHsgZ2V0UHVibGljSXAsIHJlc29sdmVIb3N0SXBzIH0gZnJvbSBcIi4vc3JjL25ldC50c1wiO1xuZXhwb3J0IHsgY3JlYXRlV29ya3NwYWNlQ2xpZW50LCByZWZyZXNoV29ya3NwYWNlQ2xpZW50QXV0aGVudGljYXRpb24sIHRvTGVnYWN5V29ya3NwYWNlQ2xpZW50LCB0cnlHZXRXb3Jrc3BhY2VDbGllbnQsIGdldFdvcmtzcGFjZUNsaWVudCwgZ2V0Q3VycmVudFVzZXJOYW1lLCBnZXRXb3Jrc3BhY2VVcmwsIGdldFdvcmtzcGFjZUlkIH0gZnJvbSBcIi4vc3JjL3dvcmtzcGFjZS1jbGllbnQudHNcIjtcbmV4cG9ydCB0eXBlIHsgV29ya3NwYWNlQ2xpZW50IH0gZnJvbSBcIi4vc3JjL3dvcmtzcGFjZS1jbGllbnQudHNcIjtcbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQ0FBMkM7QUFDM0MsbURBQW1EO0FBQ25ELHdFQUF3RTtBQUV4RSxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyx1QkFBdUIsQ0FBQztBQUMxRCxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsU0FBUyxDQUFDO0FBQ3pDLE9BQU8sS0FBSyxLQUFLLE1BQU0sZ0JBQWdCLENBQUM7QUFDeEMsT0FBTyxLQUFLLFlBQVksTUFBTSx3QkFBd0IsQ0FBQztBQUN2RCxPQUFPLEtBQUssY0FBYyxNQUFNLDBCQUEwQixDQUFDO0FBQzNELE9BQU8sS0FBSyxHQUFHLE1BQU0sY0FBYyxDQUFDO0FBQ3BDLE9BQU8sS0FBSyxlQUFlLE1BQU0sMkJBQTJCLENBQUM7QUFDN0QsT0FBTyxFQUFFLGtCQUFrQixFQUFFLGFBQWEsRUFBRSxvQkFBb0IsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRTdHLE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlELE9BQU8sRUFBRSxjQUFjLEVBQUUsdUJBQXVCLEVBQUUscUJBQXFCLEVBQUUsb0JBQW9CLEVBQUUsYUFBYSxFQUFFLFVBQVUsRUFBRSw2QkFBNkIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRTFMLE9BQU8sRUFBRSxXQUFXLEVBQUUsY0FBYyxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQzNELE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxvQ0FBb0MsRUFBRSx1QkFBdUIsRUFBRSxxQkFBcUIsRUFBRSxrQkFBa0IsRUFBRSxrQkFBa0IsRUFBRSxlQUFlLEVBQUUsY0FBYyxFQUFFLE1BQU0sMkJBQTJCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBHRU5FUkFURUQgYnkgcHJvamVuIHdhdGNoIC0gRE8gTk9UIEVESVQuXG4vLyBSZWdlbmVyYXRlZCBmcm9tIHRoZSBleHBvcnRpbmcgbW9kdWxlcyBpbiAuL3NyYy5cbi8vIEhhbmQgZWRpdHMgYXJlIG92ZXJ3cml0dGVuIG9uIHRoZSBuZXh0IHdhdGNoOyB0aGlzIGZpbGUgaXMgcmVhZC1vbmx5LlxuXG5leHBvcnQgY29uc3QgUEFDS0FHRV9JREVOVElGSUVSID0gXCJAZGJ4LXRvb2xzL2RhdGFicmlja3NcIjtcbmV4cG9ydCBjb25zdCBQQUNLQUdFX1ZFUlNJT04gPSBcIjAuOS4xOTBcIjtcbmV4cG9ydCAqIGFzIGNsb3VkIGZyb20gXCIuL3NyYy9jbG91ZC50c1wiO1xuZXhwb3J0ICogYXMgZGF0YWJyaWNrc0ZTIGZyb20gXCIuL3NyYy9kYXRhYnJpY2tzLWZzLnRzXCI7XG5leHBvcnQgKiBhcyBkYXRhYnJpY2tzUGF0aCBmcm9tIFwiLi9zcmMvZGF0YWJyaWNrcy1wYXRoLnRzXCI7XG5leHBvcnQgKiBhcyBuZXQgZnJvbSBcIi4vc3JjL25ldC50c1wiO1xuZXhwb3J0ICogYXMgd29ya3NwYWNlQ2xpZW50IGZyb20gXCIuL3NyYy93b3Jrc3BhY2UtY2xpZW50LnRzXCI7XG5leHBvcnQgeyBSQU5HRV9DQUNIRV9UVExfTVMsIENsb3VkUHJvdmlkZXIsIHJlc29sdmVDbG91ZExvY2F0aW9uLCBsb2FkUHJvdmlkZXJSYW5nZXMgfSBmcm9tIFwiLi9zcmMvY2xvdWQudHNcIjtcbmV4cG9ydCB0eXBlIHsgQ2xvdWRMb2NhdGlvbiB9IGZyb20gXCIuL3NyYy9jbG91ZC50c1wiO1xuZXhwb3J0IHsgRGF0YWJyaWNrc0ZpbGVTeXN0ZW0gfSBmcm9tIFwiLi9zcmMvZGF0YWJyaWNrcy1mcy50c1wiO1xuZXhwb3J0IHR5cGUgeyBEYXRhYnJpY2tzRmlsZVN5c3RlbUNsaWVudFJlc29sdmVyLCBEYXRhYnJpY2tzRmlsZVN5c3RlbU9wdGlvbnMsIERhdGFicmlja3NTdHJlYW1Xcml0ZU9wdGlvbnMgfSBmcm9tIFwiLi9zcmMvZGF0YWJyaWNrcy1mcy50c1wiO1xuZXhwb3J0IHsgZXhwYW5kSG9tZVBhdGgsIG5vcm1hbGl6ZURhdGFicmlja3NSb290LCByZXNvbHZlRGF0YWJyaWNrc1Jvb3QsIGlzV29ya3NwYWNlRmlsZXNQYXRoLCBpc1ZvbHVtZXNQYXRoLCBpc0RiZnNQYXRoLCByZXNvbHZlRGF0YWJyaWNrc0ZpbGVzQmFja2VuZCB9IGZyb20gXCIuL3NyYy9kYXRhYnJpY2tzLXBhdGgudHNcIjtcbmV4cG9ydCB0eXBlIHsgRGF0YWJyaWNrc0ZpbGVzQmFja2VuZCwgTm9ybWFsaXplRGF0YWJyaWNrc1Jvb3RPcHRpb25zLCBSZXNvbHZlRGF0YWJyaWNrc1Jvb3RPcHRpb25zIH0gZnJvbSBcIi4vc3JjL2RhdGFicmlja3MtcGF0aC50c1wiO1xuZXhwb3J0IHsgZ2V0UHVibGljSXAsIHJlc29sdmVIb3N0SXBzIH0gZnJvbSBcIi4vc3JjL25ldC50c1wiO1xuZXhwb3J0IHsgY3JlYXRlV29ya3NwYWNlQ2xpZW50LCByZWZyZXNoV29ya3NwYWNlQ2xpZW50QXV0aGVudGljYXRpb24sIHRvTGVnYWN5V29ya3NwYWNlQ2xpZW50LCB0cnlHZXRXb3Jrc3BhY2VDbGllbnQsIGdldFdvcmtzcGFjZUNsaWVudCwgZ2V0Q3VycmVudFVzZXJOYW1lLCBnZXRXb3Jrc3BhY2VVcmwsIGdldFdvcmtzcGFjZUlkIH0gZnJvbSBcIi4vc3JjL3dvcmtzcGFjZS1jbGllbnQudHNcIjtcbmV4cG9ydCB0eXBlIHsgV29ya3NwYWNlQ2xpZW50IH0gZnJvbSBcIi4vc3JjL3dvcmtzcGFjZS1jbGllbnQudHNcIjtcbiJdfQ==

package/lib/src/workspace-client.d.ts

@@ -5,8 +5,8 @@
  *
  * @module
  */
-import { type WorkspaceClient as AppKitWorkspaceClient } from "@databricks/appkit";
-import { type DatabricksAuthOptions } from "@dbx-tools/auth";
+import type { WorkspaceClient as AppKitWorkspaceClient } from "@databricks/appkit";
+import type { DatabricksAuthOptions } from "@dbx-tools/auth";
 import { type UrlBuilder } from "@dbx-tools/shared-core";
 /** Legacy SDK client exposed by AppKit for APIs not yet on its facade. */
 export type WorkspaceClient = ReturnType<AppKitWorkspaceClient["toLegacyWorkspaceClient"]>;

package/lib/src/workspace-client.js

@@ -5,13 +5,10 @@
  *
  * @module
  */
-import { createWorkspaceClient as _createWorkspaceClient, } from "@databricks/appkit";
-import { tryGetExecutionContext } from "@dbx-tools/appkit";
-import { createAuthClient } from "@dbx-tools/auth";
+import { databricks as appkitDatabricks, tryGetExecutionContext } from "@dbx-tools/appkit";
 import { memoize, urlBuilder, trimToUndefined } from "@dbx-tools/shared-core";
 /** Databricks workspace ids are a 10-20 digit run embedded in the host. */
 const WORKSPACE_ID_REGEX = /\d{10,20}/;
-const workspaceAuth = new WeakMap();
 /**
  * Create an AppKit workspace client whose SDK credential visitor delegates to
  * `@dbx-tools/auth`.
@@ -22,20 +19,7 @@ const workspaceAuth = new WeakMap();
  * execution.
  */
 export async function createWorkspaceClient(options = {}) {
-    const auth = await createAuthClient(options);
-    const client = _createWorkspaceClient({ host: auth.host });
-    client.config.credentials = {
-        name: "pat",
-        async configure() {
-            return async (headers) => {
-                for (const [name, value] of Object.entries(await auth.headers())) {
-                    headers.set(name, value);
-                }
-            };
-        },
-    };
-    workspaceAuth.set(client, auth);
-    return client;
+    return appkitDatabricks.createWorkspaceClient(options);
 }
 /**
  * Refresh the dbx-tools credential lifecycle attached by
@@ -43,11 +27,7 @@ export async function createWorkspaceClient(options = {}) {
  * AppKit clients whose credential owner is unknown.
  */
 export async function refreshWorkspaceClientAuthentication(client) {
-    const auth = workspaceAuth.get(client);
-    if (!auth)
-        return false;
-    await auth.headers({ login: false, refresh: true });
-    return true;
+    return appkitDatabricks.refreshWorkspaceClientAuthentication(client);
 }
 /** Resolve AppKit's facade or an existing legacy client to the legacy SDK surface. */
 export function toLegacyWorkspaceClient(client) {
@@ -146,4 +126,4 @@ export async function getWorkspaceId(workspaceHost) {
     }
     return undefined;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"workspace-client.js","sourceRoot":"","sources":["../../src/workspace-client.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Resolve the current Databricks workspace's URL, numeric id, and client from\n * the active execution context (AppKit, when initialized), a default\n * {@link WorkspaceClient}, or the environment. Server-only.\n *\n * @module\n */\n\nimport {\n  createWorkspaceClient as _createWorkspaceClient,\n  type WorkspaceClient as AppKitWorkspaceClient,\n} from \"@databricks/appkit\";\nimport { tryGetExecutionContext } from \"@dbx-tools/appkit\";\nimport { type AuthClient, type DatabricksAuthOptions, createAuthClient } from \"@dbx-tools/auth\";\nimport { memoize, type UrlBuilder, urlBuilder, trimToUndefined } from \"@dbx-tools/shared-core\";\n\n/** Databricks workspace ids are a 10-20 digit run embedded in the host. */\nconst WORKSPACE_ID_REGEX = /\\d{10,20}/;\nconst workspaceAuth = new WeakMap<AppKitWorkspaceClient, AuthClient>();\n\n/** Legacy SDK client exposed by AppKit for APIs not yet on its facade. */\nexport type WorkspaceClient = ReturnType<AppKitWorkspaceClient[\"toLegacyWorkspaceClient\"]>;\ntype Config = WorkspaceClient[\"config\"];\n\n/**\n * Create an AppKit workspace client whose SDK credential visitor delegates to\n * `@dbx-tools/auth`.\n *\n * The auth package resolves the active profile, host, token lifecycle, and\n * unified-workspace header without requiring callers to mirror profile values\n * into environment variables. The SDK still owns workspace APIs and request\n * execution.\n */\nexport async function createWorkspaceClient(\n  options: DatabricksAuthOptions = {},\n): Promise<AppKitWorkspaceClient> {\n  const auth = await createAuthClient(options);\n  const client = _createWorkspaceClient({ host: auth.host });\n  client.config.credentials = {\n    name: \"pat\",\n    async configure() {\n      return async (headers) => {\n        for (const [name, value] of Object.entries(await auth.headers())) {\n          headers.set(name, value);\n        }\n      };\n    },\n  };\n  workspaceAuth.set(client, auth);\n  return client;\n}\n\n/**\n * Refresh the dbx-tools credential lifecycle attached by\n * {@link createWorkspaceClient}. Returns `false` for externally supplied\n * AppKit clients whose credential owner is unknown.\n */\nexport async function refreshWorkspaceClientAuthentication(\n  client: AppKitWorkspaceClient,\n): Promise<boolean> {\n  const auth = workspaceAuth.get(client);\n  if (!auth) return false;\n  await auth.headers({ login: false, refresh: true });\n  return true;\n}\n\n/** Resolve AppKit's facade or an existing legacy client to the legacy SDK surface. */\nexport function toLegacyWorkspaceClient(\n  client: AppKitWorkspaceClient | WorkspaceClient,\n): WorkspaceClient {\n  return \"toLegacyWorkspaceClient\" in client ? client.toLegacyWorkspaceClient() : client;\n}\n\n/**\n * Lazily-constructed default `WorkspaceClient` (env / profile auth), memoized so\n * construction happens at most once per process. Used only when there's no\n * AppKit execution context to borrow a client from.\n */\nconst getDefaultWorkspaceClient = memoize(async () =>\n  (await createWorkspaceClient()).toLegacyWorkspaceClient(),\n);\n\n/**\n * The AppKit execution-context workspace client when available, otherwise\n * `undefined`. Never constructs a fallback client and never throws for a\n * missing AppKit scope.\n */\nexport function tryGetWorkspaceClient(): WorkspaceClient | undefined {\n  return tryGetExecutionContext()?.client.toLegacyWorkspaceClient();\n}\n\n/**\n * Resolve a {@link WorkspaceClient}: {@link tryGetWorkspaceClient} first, else\n * a memoized default client from env / profile auth.\n */\nexport async function getWorkspaceClient(): Promise<WorkspaceClient> {\n  return tryGetWorkspaceClient() ?? (await getDefaultWorkspaceClient());\n}\n\n/**\n * The active workspace `Config`: the AppKit execution-context client's config\n * when AppKit is initialized, else the default client's. Returns `undefined`\n * (never throws) when neither is available.\n */\nasync function getWorkspaceConfig(): Promise<Config | undefined> {\n  try {\n    return (await getWorkspaceClient()).config;\n  } catch {\n    return undefined;\n  }\n}\n\n/**\n * Current Databricks username for workspace home paths\n * (`/Workspace/Users/<userName>`).\n *\n * Prefers `userName` on the AppKit execution context when set, otherwise\n * calls `currentUser.me()` on {@link client} (or {@link getWorkspaceClient}).\n */\nexport async function getCurrentUserName(client?: WorkspaceClient): Promise<string> {\n  const contextUser = readContextUserName(tryGetExecutionContext());\n  if (contextUser) return contextUser;\n\n  const resolved = client ?? (await getWorkspaceClient());\n  const me = await resolved.currentUser.me();\n  const userName = me.userName?.trim();\n  if (!userName) {\n    throw new Error(\"Databricks currentUser.me() did not return a userName\");\n  }\n  return userName;\n}\n\n/** Best-effort `userName` off an AppKit execution context (shape varies by mode). */\nfunction readContextUserName(ctx: unknown): string | undefined {\n  if (typeof ctx !== \"object\" || ctx === null || !(\"userName\" in ctx)) return undefined;\n  const value = (ctx as { userName?: unknown }).userName;\n  return trimToUndefined(value);\n}\n\n/**\n * Resolve the current workspace host as a `net.UrlBuilder`: the workspace\n * `Config` host first, then the `DATABRICKS_HOST` env var, else `undefined`.\n */\nexport async function getWorkspaceUrl(): Promise<UrlBuilder | undefined> {\n  const config = await getWorkspaceConfig();\n  if (config) {\n    const configHost = urlBuilder(await config.getHost());\n    if (configHost) return configHost;\n  }\n  const databricksHost = urlBuilder(process.env.DATABRICKS_HOST);\n  if (databricksHost) return databricksHost;\n  return undefined;\n}\n\n/**\n * Resolve the numeric workspace id: the workspace `Config`'s `workspaceId`\n * first, else the 10-20 digit run of `workspaceHost` (defaulting to\n * {@link getWorkspaceUrl}'s host). `undefined` when neither yields an id.\n */\nexport async function getWorkspaceId(workspaceHost?: string): Promise<string | undefined> {\n  const workspaceId = (await getWorkspaceConfig())?.workspaceId;\n  if (workspaceId) return workspaceId;\n  workspaceHost = workspaceHost ?? (await getWorkspaceUrl())?.host;\n  if (workspaceHost) {\n    const match = workspaceHost.match(WORKSPACE_ID_REGEX)?.[0];\n    if (match) return match;\n  }\n  return undefined;\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"workspace-client.js","sourceRoot":"","sources":["../../src/workspace-client.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Resolve the current Databricks workspace's URL, numeric id, and client from\n * the active execution context (AppKit, when initialized), a default\n * {@link WorkspaceClient}, or the environment. Server-only.\n *\n * @module\n */\n\nimport type { WorkspaceClient as AppKitWorkspaceClient } from \"@databricks/appkit\";\nimport { databricks as appkitDatabricks, tryGetExecutionContext } from \"@dbx-tools/appkit\";\nimport type { DatabricksAuthOptions } from \"@dbx-tools/auth\";\nimport { memoize, type UrlBuilder, urlBuilder, trimToUndefined } from \"@dbx-tools/shared-core\";\n\n/** Databricks workspace ids are a 10-20 digit run embedded in the host. */\nconst WORKSPACE_ID_REGEX = /\\d{10,20}/;\n\n/** Legacy SDK client exposed by AppKit for APIs not yet on its facade. */\nexport type WorkspaceClient = ReturnType<AppKitWorkspaceClient[\"toLegacyWorkspaceClient\"]>;\ntype Config = WorkspaceClient[\"config\"];\n\n/**\n * Create an AppKit workspace client whose SDK credential visitor delegates to\n * `@dbx-tools/auth`.\n *\n * The auth package resolves the active profile, host, token lifecycle, and\n * unified-workspace header without requiring callers to mirror profile values\n * into environment variables. The SDK still owns workspace APIs and request\n * execution.\n */\nexport async function createWorkspaceClient(\n  options: DatabricksAuthOptions = {},\n): Promise<AppKitWorkspaceClient> {\n  return appkitDatabricks.createWorkspaceClient(options);\n}\n\n/**\n * Refresh the dbx-tools credential lifecycle attached by\n * {@link createWorkspaceClient}. Returns `false` for externally supplied\n * AppKit clients whose credential owner is unknown.\n */\nexport async function refreshWorkspaceClientAuthentication(\n  client: AppKitWorkspaceClient,\n): Promise<boolean> {\n  return appkitDatabricks.refreshWorkspaceClientAuthentication(client);\n}\n\n/** Resolve AppKit's facade or an existing legacy client to the legacy SDK surface. */\nexport function toLegacyWorkspaceClient(\n  client: AppKitWorkspaceClient | WorkspaceClient,\n): WorkspaceClient {\n  return \"toLegacyWorkspaceClient\" in client ? client.toLegacyWorkspaceClient() : client;\n}\n\n/**\n * Lazily-constructed default `WorkspaceClient` (env / profile auth), memoized so\n * construction happens at most once per process. Used only when there's no\n * AppKit execution context to borrow a client from.\n */\nconst getDefaultWorkspaceClient = memoize(async () =>\n  (await createWorkspaceClient()).toLegacyWorkspaceClient(),\n);\n\n/**\n * The AppKit execution-context workspace client when available, otherwise\n * `undefined`. Never constructs a fallback client and never throws for a\n * missing AppKit scope.\n */\nexport function tryGetWorkspaceClient(): WorkspaceClient | undefined {\n  return tryGetExecutionContext()?.client.toLegacyWorkspaceClient();\n}\n\n/**\n * Resolve a {@link WorkspaceClient}: {@link tryGetWorkspaceClient} first, else\n * a memoized default client from env / profile auth.\n */\nexport async function getWorkspaceClient(): Promise<WorkspaceClient> {\n  return tryGetWorkspaceClient() ?? (await getDefaultWorkspaceClient());\n}\n\n/**\n * The active workspace `Config`: the AppKit execution-context client's config\n * when AppKit is initialized, else the default client's. Returns `undefined`\n * (never throws) when neither is available.\n */\nasync function getWorkspaceConfig(): Promise<Config | undefined> {\n  try {\n    return (await getWorkspaceClient()).config;\n  } catch {\n    return undefined;\n  }\n}\n\n/**\n * Current Databricks username for workspace home paths\n * (`/Workspace/Users/<userName>`).\n *\n * Prefers `userName` on the AppKit execution context when set, otherwise\n * calls `currentUser.me()` on {@link client} (or {@link getWorkspaceClient}).\n */\nexport async function getCurrentUserName(client?: WorkspaceClient): Promise<string> {\n  const contextUser = readContextUserName(tryGetExecutionContext());\n  if (contextUser) return contextUser;\n\n  const resolved = client ?? (await getWorkspaceClient());\n  const me = await resolved.currentUser.me();\n  const userName = me.userName?.trim();\n  if (!userName) {\n    throw new Error(\"Databricks currentUser.me() did not return a userName\");\n  }\n  return userName;\n}\n\n/** Best-effort `userName` off an AppKit execution context (shape varies by mode). */\nfunction readContextUserName(ctx: unknown): string | undefined {\n  if (typeof ctx !== \"object\" || ctx === null || !(\"userName\" in ctx)) return undefined;\n  const value = (ctx as { userName?: unknown }).userName;\n  return trimToUndefined(value);\n}\n\n/**\n * Resolve the current workspace host as a `net.UrlBuilder`: the workspace\n * `Config` host first, then the `DATABRICKS_HOST` env var, else `undefined`.\n */\nexport async function getWorkspaceUrl(): Promise<UrlBuilder | undefined> {\n  const config = await getWorkspaceConfig();\n  if (config) {\n    const configHost = urlBuilder(await config.getHost());\n    if (configHost) return configHost;\n  }\n  const databricksHost = urlBuilder(process.env.DATABRICKS_HOST);\n  if (databricksHost) return databricksHost;\n  return undefined;\n}\n\n/**\n * Resolve the numeric workspace id: the workspace `Config`'s `workspaceId`\n * first, else the 10-20 digit run of `workspaceHost` (defaulting to\n * {@link getWorkspaceUrl}'s host). `undefined` when neither yields an id.\n */\nexport async function getWorkspaceId(workspaceHost?: string): Promise<string | undefined> {\n  const workspaceId = (await getWorkspaceConfig())?.workspaceId;\n  if (workspaceId) return workspaceId;\n  workspaceHost = workspaceHost ?? (await getWorkspaceUrl())?.host;\n  if (workspaceHost) {\n    const match = workspaceHost.match(WORKSPACE_ID_REGEX)?.[0];\n    if (match) return match;\n  }\n  return undefined;\n}\n"]}

package/package.json

@@ -24,12 +24,12 @@
   },
   "dependencies": {
     "@databricks/appkit": "0.81.0",
-    "@dbx-tools/appkit": "^0.9.188",
-    "@dbx-tools/auth": "^0.9.188",
-    "@dbx-tools/cli-service": "^0.9.188",
-    "@dbx-tools/core": "^0.9.188",
-    "@dbx-tools/shared-core": "^0.9.188",
-    "@dbx-tools/shared-fs": "^0.9.188"
+    "@dbx-tools/appkit": "0.9.190",
+    "@dbx-tools/auth": "0.9.190",
+    "@dbx-tools/cli-service": "0.9.190",
+    "@dbx-tools/core": "0.9.190",
+    "@dbx-tools/shared-core": "0.9.190",
+    "@dbx-tools/shared-fs": "0.9.190"
   },
   "main": "./lib/index.js",
   "license": "Apache-2.0",
@@ -45,7 +45,7 @@
       "./package.json": "./package.json"
     }
   },
-  "version": "0.9.188",
+  "version": "0.9.190",
   "types": "./lib/index.d.ts",
   "dbxToolsConfig": {
     "tags": [

package/src/workspace-client.ts

@@ -6,17 +6,13 @@
  * @module
  */
 
-import {
-  createWorkspaceClient as _createWorkspaceClient,
-  type WorkspaceClient as AppKitWorkspaceClient,
-} from "@databricks/appkit";
-import { tryGetExecutionContext } from "@dbx-tools/appkit";
-import { type AuthClient, type DatabricksAuthOptions, createAuthClient } from "@dbx-tools/auth";
+import type { WorkspaceClient as AppKitWorkspaceClient } from "@databricks/appkit";
+import { databricks as appkitDatabricks, tryGetExecutionContext } from "@dbx-tools/appkit";
+import type { DatabricksAuthOptions } from "@dbx-tools/auth";
 import { memoize, type UrlBuilder, urlBuilder, trimToUndefined } from "@dbx-tools/shared-core";
 
 /** Databricks workspace ids are a 10-20 digit run embedded in the host. */
 const WORKSPACE_ID_REGEX = /\d{10,20}/;
-const workspaceAuth = new WeakMap<AppKitWorkspaceClient, AuthClient>();
 
 /** Legacy SDK client exposed by AppKit for APIs not yet on its facade. */
 export type WorkspaceClient = ReturnType<AppKitWorkspaceClient["toLegacyWorkspaceClient"]>;
@@ -34,20 +30,7 @@ type Config = WorkspaceClient["config"];
 export async function createWorkspaceClient(
   options: DatabricksAuthOptions = {},
 ): Promise<AppKitWorkspaceClient> {
-  const auth = await createAuthClient(options);
-  const client = _createWorkspaceClient({ host: auth.host });
-  client.config.credentials = {
-    name: "pat",
-    async configure() {
-      return async (headers) => {
-        for (const [name, value] of Object.entries(await auth.headers())) {
-          headers.set(name, value);
-        }
-      };
-    },
-  };
-  workspaceAuth.set(client, auth);
-  return client;
+  return appkitDatabricks.createWorkspaceClient(options);
 }
 
 /**
@@ -58,10 +41,7 @@ export async function createWorkspaceClient(
 export async function refreshWorkspaceClientAuthentication(
   client: AppKitWorkspaceClient,
 ): Promise<boolean> {
-  const auth = workspaceAuth.get(client);
-  if (!auth) return false;
-  await auth.headers({ login: false, refresh: true });
-  return true;
+  return appkitDatabricks.refreshWorkspaceClientAuthentication(client);
 }
 
 /** Resolve AppKit's facade or an existing legacy client to the legacy SDK surface. */