@databricks-solutions/lakebase-scm-utils 0.2.45 → 0.2.47

package/dist/scripts/lakebase/schema-diff.cli.cjs

@@ -79276,6 +79276,7 @@ var DEFAULT_DATABASE = "databricks_postgres";
 var DEFAULT_ENDPOINT = "primary";
 var CONSORT_APPLICATION_NAME = "consort";
 var SCM_UTILS_APPLICATION_NAME = "scm-utils";
+var SCM_CLIENT_ENV = "LAKEBASE_SCM_CLIENT";
 var CONSORT_VERSION_ENV = "CONSORT_VERSION";
 
 // scripts/lakebase/self-version.ts
@@ -79287,8 +79288,8 @@ var PKG_NAME = "@databricks-solutions/lakebase-scm-utils";
 var cached;
 function substrateSelfVersion() {
   if (cached !== void 0) return cached;
-  if ("0.2.45".length > 0) {
-    cached = "0.2.45";
+  if ("0.2.47".length > 0) {
+    cached = "0.2.47";
     return cached;
   }
   cached = "unknown";
@@ -79316,9 +79317,17 @@ function substrateSelfVersion() {
 }
 
 // scripts/lakebase/get-connection.ts
+function sanitizeApplicationName(raw) {
+  const cleaned = raw.replace(/[^\x21-\x7e]+/g, "-").replace(/^-+|-+$/g, "");
+  if (!cleaned) return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  return cleaned.length > 63 ? cleaned.slice(0, 63) : cleaned;
+}
 function connectionApplicationName() {
+  const client = process.env[SCM_CLIENT_ENV]?.trim();
+  if (client) return sanitizeApplicationName(client);
   const consortVersion = process.env[CONSORT_VERSION_ENV]?.trim();
-  return consortVersion ? `${CONSORT_APPLICATION_NAME}/${consortVersion}` : `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  if (consortVersion) return `${CONSORT_APPLICATION_NAME}/${consortVersion}`;
+  return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
 }
 async function getConnection(args) {
   const endpointName = args.endpointName ?? DEFAULT_ENDPOINT;

package/dist/scripts/lakebase/schema-diff.cli.js

@@ -378,6 +378,7 @@ var DEFAULT_DATABASE = "databricks_postgres";
 var DEFAULT_ENDPOINT = "primary";
 var CONSORT_APPLICATION_NAME = "consort";
 var SCM_UTILS_APPLICATION_NAME = "scm-utils";
+var SCM_CLIENT_ENV = "LAKEBASE_SCM_CLIENT";
 var CONSORT_VERSION_ENV = "CONSORT_VERSION";
 
 // scripts/lakebase/self-version.ts
@@ -388,8 +389,8 @@ var PKG_NAME = "@databricks-solutions/lakebase-scm-utils";
 var cached;
 function substrateSelfVersion() {
   if (cached !== void 0) return cached;
-  if ("0.2.45".length > 0) {
-    cached = "0.2.45";
+  if ("0.2.47".length > 0) {
+    cached = "0.2.47";
     return cached;
   }
   cached = "unknown";
@@ -417,9 +418,17 @@ function substrateSelfVersion() {
 }
 
 // scripts/lakebase/get-connection.ts
+function sanitizeApplicationName(raw) {
+  const cleaned = raw.replace(/[^\x21-\x7e]+/g, "-").replace(/^-+|-+$/g, "");
+  if (!cleaned) return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  return cleaned.length > 63 ? cleaned.slice(0, 63) : cleaned;
+}
 function connectionApplicationName() {
+  const client = process.env[SCM_CLIENT_ENV]?.trim();
+  if (client) return sanitizeApplicationName(client);
   const consortVersion = process.env[CONSORT_VERSION_ENV]?.trim();
-  return consortVersion ? `${CONSORT_APPLICATION_NAME}/${consortVersion}` : `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  if (consortVersion) return `${CONSORT_APPLICATION_NAME}/${consortVersion}`;
+  return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
 }
 async function getConnection(args) {
   const endpointName = args.endpointName ?? DEFAULT_ENDPOINT;

package/dist/scripts/lakebase/schema-migrate.cli.cjs

@@ -79312,6 +79312,7 @@ var DEFAULT_DATABASE = "databricks_postgres";
 var DEFAULT_ENDPOINT = "primary";
 var CONSORT_APPLICATION_NAME = "consort";
 var SCM_UTILS_APPLICATION_NAME = "scm-utils";
+var SCM_CLIENT_ENV = "LAKEBASE_SCM_CLIENT";
 var CONSORT_VERSION_ENV = "CONSORT_VERSION";
 
 // scripts/lakebase/self-version.ts
@@ -79323,8 +79324,8 @@ var PKG_NAME = "@databricks-solutions/lakebase-scm-utils";
 var cached;
 function substrateSelfVersion() {
   if (cached !== void 0) return cached;
-  if ("0.2.45".length > 0) {
-    cached = "0.2.45";
+  if ("0.2.47".length > 0) {
+    cached = "0.2.47";
     return cached;
   }
   cached = "unknown";
@@ -79352,9 +79353,17 @@ function substrateSelfVersion() {
 }
 
 // scripts/lakebase/get-connection.ts
+function sanitizeApplicationName(raw) {
+  const cleaned = raw.replace(/[^\x21-\x7e]+/g, "-").replace(/^-+|-+$/g, "");
+  if (!cleaned) return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  return cleaned.length > 63 ? cleaned.slice(0, 63) : cleaned;
+}
 function connectionApplicationName() {
+  const client = process.env[SCM_CLIENT_ENV]?.trim();
+  if (client) return sanitizeApplicationName(client);
   const consortVersion = process.env[CONSORT_VERSION_ENV]?.trim();
-  return consortVersion ? `${CONSORT_APPLICATION_NAME}/${consortVersion}` : `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  if (consortVersion) return `${CONSORT_APPLICATION_NAME}/${consortVersion}`;
+  return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
 }
 async function getConnection(args) {
   const endpointName = args.endpointName ?? DEFAULT_ENDPOINT;

package/dist/scripts/lakebase/schema-migrate.cli.js

@@ -416,6 +416,7 @@ var DEFAULT_DATABASE = "databricks_postgres";
 var DEFAULT_ENDPOINT = "primary";
 var CONSORT_APPLICATION_NAME = "consort";
 var SCM_UTILS_APPLICATION_NAME = "scm-utils";
+var SCM_CLIENT_ENV = "LAKEBASE_SCM_CLIENT";
 var CONSORT_VERSION_ENV = "CONSORT_VERSION";
 
 // scripts/lakebase/self-version.ts
@@ -426,8 +427,8 @@ var PKG_NAME = "@databricks-solutions/lakebase-scm-utils";
 var cached;
 function substrateSelfVersion() {
   if (cached !== void 0) return cached;
-  if ("0.2.45".length > 0) {
-    cached = "0.2.45";
+  if ("0.2.47".length > 0) {
+    cached = "0.2.47";
     return cached;
   }
   cached = "unknown";
@@ -455,9 +456,17 @@ function substrateSelfVersion() {
 }
 
 // scripts/lakebase/get-connection.ts
+function sanitizeApplicationName(raw) {
+  const cleaned = raw.replace(/[^\x21-\x7e]+/g, "-").replace(/^-+|-+$/g, "");
+  if (!cleaned) return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  return cleaned.length > 63 ? cleaned.slice(0, 63) : cleaned;
+}
 function connectionApplicationName() {
+  const client = process.env[SCM_CLIENT_ENV]?.trim();
+  if (client) return sanitizeApplicationName(client);
   const consortVersion = process.env[CONSORT_VERSION_ENV]?.trim();
-  return consortVersion ? `${CONSORT_APPLICATION_NAME}/${consortVersion}` : `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  if (consortVersion) return `${CONSORT_APPLICATION_NAME}/${consortVersion}`;
+  return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
 }
 async function getConnection(args) {
   const endpointName = args.endpointName ?? DEFAULT_ENDPOINT;

package/dist/scripts/lakebase/scm-claim-feature.cli.cjs

@@ -79771,6 +79771,7 @@ var RUNTIME_ARTIFACT_IGNORE = [
 var DEFAULT_ENDPOINT = "primary";
 var CONSORT_APPLICATION_NAME = "consort";
 var SCM_UTILS_APPLICATION_NAME = "scm-utils";
+var SCM_CLIENT_ENV = "LAKEBASE_SCM_CLIENT";
 var CONSORT_VERSION_ENV = "CONSORT_VERSION";
 
 // scripts/lakebase/self-version.ts
@@ -79782,8 +79783,8 @@ var PKG_NAME = "@databricks-solutions/lakebase-scm-utils";
 var cached;
 function substrateSelfVersion() {
   if (cached !== void 0) return cached;
-  if ("0.2.45".length > 0) {
-    cached = "0.2.45";
+  if ("0.2.47".length > 0) {
+    cached = "0.2.47";
     return cached;
   }
   cached = "unknown";
@@ -79811,9 +79812,17 @@ function substrateSelfVersion() {
 }
 
 // scripts/lakebase/get-connection.ts
+function sanitizeApplicationName(raw) {
+  const cleaned = raw.replace(/[^\x21-\x7e]+/g, "-").replace(/^-+|-+$/g, "");
+  if (!cleaned) return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  return cleaned.length > 63 ? cleaned.slice(0, 63) : cleaned;
+}
 function connectionApplicationName() {
+  const client = process.env[SCM_CLIENT_ENV]?.trim();
+  if (client) return sanitizeApplicationName(client);
   const consortVersion = process.env[CONSORT_VERSION_ENV]?.trim();
-  return consortVersion ? `${CONSORT_APPLICATION_NAME}/${consortVersion}` : `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  if (consortVersion) return `${CONSORT_APPLICATION_NAME}/${consortVersion}`;
+  return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
 }
 async function getConnection(args) {
   const endpointName = args.endpointName ?? DEFAULT_ENDPOINT;

package/dist/scripts/lakebase/scm-claim-feature.cli.js

@@ -853,6 +853,7 @@ var RUNTIME_ARTIFACT_IGNORE = [
 var DEFAULT_ENDPOINT = "primary";
 var CONSORT_APPLICATION_NAME = "consort";
 var SCM_UTILS_APPLICATION_NAME = "scm-utils";
+var SCM_CLIENT_ENV = "LAKEBASE_SCM_CLIENT";
 var CONSORT_VERSION_ENV = "CONSORT_VERSION";
 
 // scripts/lakebase/self-version.ts
@@ -863,8 +864,8 @@ var PKG_NAME = "@databricks-solutions/lakebase-scm-utils";
 var cached;
 function substrateSelfVersion() {
   if (cached !== void 0) return cached;
-  if ("0.2.45".length > 0) {
-    cached = "0.2.45";
+  if ("0.2.47".length > 0) {
+    cached = "0.2.47";
     return cached;
   }
   cached = "unknown";
@@ -892,9 +893,17 @@ function substrateSelfVersion() {
 }
 
 // scripts/lakebase/get-connection.ts
+function sanitizeApplicationName(raw) {
+  const cleaned = raw.replace(/[^\x21-\x7e]+/g, "-").replace(/^-+|-+$/g, "");
+  if (!cleaned) return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  return cleaned.length > 63 ? cleaned.slice(0, 63) : cleaned;
+}
 function connectionApplicationName() {
+  const client = process.env[SCM_CLIENT_ENV]?.trim();
+  if (client) return sanitizeApplicationName(client);
   const consortVersion = process.env[CONSORT_VERSION_ENV]?.trim();
-  return consortVersion ? `${CONSORT_APPLICATION_NAME}/${consortVersion}` : `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  if (consortVersion) return `${CONSORT_APPLICATION_NAME}/${consortVersion}`;
+  return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
 }
 async function getConnection(args) {
   const endpointName = args.endpointName ?? DEFAULT_ENDPOINT;

package/dist/scripts/lakebase/scm-doctor.cli.cjs

@@ -88228,6 +88228,7 @@ var RUNTIME_ARTIFACT_IGNORE = [
 var DEFAULT_ENDPOINT = "primary";
 var CONSORT_APPLICATION_NAME = "consort";
 var SCM_UTILS_APPLICATION_NAME = "scm-utils";
+var SCM_CLIENT_ENV = "LAKEBASE_SCM_CLIENT";
 var CONSORT_VERSION_ENV = "CONSORT_VERSION";
 
 // scripts/lakebase/self-version.ts
@@ -88239,8 +88240,8 @@ var PKG_NAME = "@databricks-solutions/lakebase-scm-utils";
 var cached;
 function substrateSelfVersion() {
   if (cached !== void 0) return cached;
-  if ("0.2.45".length > 0) {
-    cached = "0.2.45";
+  if ("0.2.47".length > 0) {
+    cached = "0.2.47";
     return cached;
   }
   cached = "unknown";
@@ -88268,9 +88269,17 @@ function substrateSelfVersion() {
 }
 
 // scripts/lakebase/get-connection.ts
+function sanitizeApplicationName(raw) {
+  const cleaned = raw.replace(/[^\x21-\x7e]+/g, "-").replace(/^-+|-+$/g, "");
+  if (!cleaned) return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  return cleaned.length > 63 ? cleaned.slice(0, 63) : cleaned;
+}
 function connectionApplicationName() {
+  const client = process.env[SCM_CLIENT_ENV]?.trim();
+  if (client) return sanitizeApplicationName(client);
   const consortVersion = process.env[CONSORT_VERSION_ENV]?.trim();
-  return consortVersion ? `${CONSORT_APPLICATION_NAME}/${consortVersion}` : `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  if (consortVersion) return `${CONSORT_APPLICATION_NAME}/${consortVersion}`;
+  return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
 }
 async function getConnection(args) {
   const endpointName = args.endpointName ?? DEFAULT_ENDPOINT;

package/dist/scripts/lakebase/scm-doctor.cli.js

@@ -9381,6 +9381,7 @@ var RUNTIME_ARTIFACT_IGNORE = [
 var DEFAULT_ENDPOINT = "primary";
 var CONSORT_APPLICATION_NAME = "consort";
 var SCM_UTILS_APPLICATION_NAME = "scm-utils";
+var SCM_CLIENT_ENV = "LAKEBASE_SCM_CLIENT";
 var CONSORT_VERSION_ENV = "CONSORT_VERSION";
 
 // scripts/lakebase/self-version.ts
@@ -9392,8 +9393,8 @@ var PKG_NAME = "@databricks-solutions/lakebase-scm-utils";
 var cached;
 function substrateSelfVersion() {
   if (cached !== void 0) return cached;
-  if ("0.2.45".length > 0) {
-    cached = "0.2.45";
+  if ("0.2.47".length > 0) {
+    cached = "0.2.47";
     return cached;
   }
   cached = "unknown";
@@ -9421,9 +9422,17 @@ function substrateSelfVersion() {
 }
 
 // scripts/lakebase/get-connection.ts
+function sanitizeApplicationName(raw) {
+  const cleaned = raw.replace(/[^\x21-\x7e]+/g, "-").replace(/^-+|-+$/g, "");
+  if (!cleaned) return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  return cleaned.length > 63 ? cleaned.slice(0, 63) : cleaned;
+}
 function connectionApplicationName() {
+  const client = process.env[SCM_CLIENT_ENV]?.trim();
+  if (client) return sanitizeApplicationName(client);
   const consortVersion = process.env[CONSORT_VERSION_ENV]?.trim();
-  return consortVersion ? `${CONSORT_APPLICATION_NAME}/${consortVersion}` : `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  if (consortVersion) return `${CONSORT_APPLICATION_NAME}/${consortVersion}`;
+  return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
 }
 async function getConnection(args) {
   const endpointName = args.endpointName ?? DEFAULT_ENDPOINT;

package/dist/scripts/lakebase/scm-merge.cli.cjs

@@ -88462,6 +88462,7 @@ var DEFAULT_DATABASE = "databricks_postgres";
 var DEFAULT_ENDPOINT = "primary";
 var CONSORT_APPLICATION_NAME = "consort";
 var SCM_UTILS_APPLICATION_NAME = "scm-utils";
+var SCM_CLIENT_ENV = "LAKEBASE_SCM_CLIENT";
 var CONSORT_VERSION_ENV = "CONSORT_VERSION";
 
 // scripts/lakebase/self-version.ts
@@ -88473,8 +88474,8 @@ var PKG_NAME = "@databricks-solutions/lakebase-scm-utils";
 var cached;
 function substrateSelfVersion() {
   if (cached !== void 0) return cached;
-  if ("0.2.45".length > 0) {
-    cached = "0.2.45";
+  if ("0.2.47".length > 0) {
+    cached = "0.2.47";
     return cached;
   }
   cached = "unknown";
@@ -88502,9 +88503,17 @@ function substrateSelfVersion() {
 }
 
 // scripts/lakebase/get-connection.ts
+function sanitizeApplicationName(raw) {
+  const cleaned = raw.replace(/[^\x21-\x7e]+/g, "-").replace(/^-+|-+$/g, "");
+  if (!cleaned) return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  return cleaned.length > 63 ? cleaned.slice(0, 63) : cleaned;
+}
 function connectionApplicationName() {
+  const client = process.env[SCM_CLIENT_ENV]?.trim();
+  if (client) return sanitizeApplicationName(client);
   const consortVersion = process.env[CONSORT_VERSION_ENV]?.trim();
-  return consortVersion ? `${CONSORT_APPLICATION_NAME}/${consortVersion}` : `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  if (consortVersion) return `${CONSORT_APPLICATION_NAME}/${consortVersion}`;
+  return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
 }
 async function getConnection(args) {
   const endpointName = args.endpointName ?? DEFAULT_ENDPOINT;

package/dist/scripts/lakebase/scm-merge.cli.js

@@ -9615,6 +9615,7 @@ var DEFAULT_DATABASE = "databricks_postgres";
 var DEFAULT_ENDPOINT = "primary";
 var CONSORT_APPLICATION_NAME = "consort";
 var SCM_UTILS_APPLICATION_NAME = "scm-utils";
+var SCM_CLIENT_ENV = "LAKEBASE_SCM_CLIENT";
 var CONSORT_VERSION_ENV = "CONSORT_VERSION";
 
 // scripts/lakebase/self-version.ts
@@ -9626,8 +9627,8 @@ var PKG_NAME = "@databricks-solutions/lakebase-scm-utils";
 var cached;
 function substrateSelfVersion() {
   if (cached !== void 0) return cached;
-  if ("0.2.45".length > 0) {
-    cached = "0.2.45";
+  if ("0.2.47".length > 0) {
+    cached = "0.2.47";
     return cached;
   }
   cached = "unknown";
@@ -9655,9 +9656,17 @@ function substrateSelfVersion() {
 }
 
 // scripts/lakebase/get-connection.ts
+function sanitizeApplicationName(raw) {
+  const cleaned = raw.replace(/[^\x21-\x7e]+/g, "-").replace(/^-+|-+$/g, "");
+  if (!cleaned) return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  return cleaned.length > 63 ? cleaned.slice(0, 63) : cleaned;
+}
 function connectionApplicationName() {
+  const client = process.env[SCM_CLIENT_ENV]?.trim();
+  if (client) return sanitizeApplicationName(client);
   const consortVersion = process.env[CONSORT_VERSION_ENV]?.trim();
-  return consortVersion ? `${CONSORT_APPLICATION_NAME}/${consortVersion}` : `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  if (consortVersion) return `${CONSORT_APPLICATION_NAME}/${consortVersion}`;
+  return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
 }
 async function getConnection(args) {
   const endpointName = args.endpointName ?? DEFAULT_ENDPOINT;

package/dist/scripts/lakebase/scm-prepare-pr.cli.cjs

@@ -8393,6 +8393,8 @@ async function getPullRequest(ownerRepo, headBranch) {
       isDraft: pr.draft || false,
       ciStatus,
       checks,
+      mergeable: pr.mergeable,
+      mergeableState: pr.mergeable_state,
       headBranch: pr.head?.ref || headBranch,
       baseBranch: pr.base?.ref || "",
       body: pr.body || void 0,

package/dist/scripts/lakebase/scm-prepare-pr.cli.js

@@ -8381,6 +8381,8 @@ async function getPullRequest(ownerRepo, headBranch) {
       isDraft: pr.draft || false,
       ciStatus,
       checks,
+      mergeable: pr.mergeable,
+      mergeableState: pr.mergeable_state,
       headBranch: pr.head?.ref || headBranch,
       baseBranch: pr.base?.ref || "",
       body: pr.body || void 0,

package/dist/scripts/lakebase/scm-reconcile-tier.cli.cjs

@@ -79276,6 +79276,7 @@ var DEFAULT_DATABASE = "databricks_postgres";
 var DEFAULT_ENDPOINT = "primary";
 var CONSORT_APPLICATION_NAME = "consort";
 var SCM_UTILS_APPLICATION_NAME = "scm-utils";
+var SCM_CLIENT_ENV = "LAKEBASE_SCM_CLIENT";
 var CONSORT_VERSION_ENV = "CONSORT_VERSION";
 
 // scripts/lakebase/self-version.ts
@@ -79287,8 +79288,8 @@ var PKG_NAME = "@databricks-solutions/lakebase-scm-utils";
 var cached;
 function substrateSelfVersion() {
   if (cached !== void 0) return cached;
-  if ("0.2.45".length > 0) {
-    cached = "0.2.45";
+  if ("0.2.47".length > 0) {
+    cached = "0.2.47";
     return cached;
   }
   cached = "unknown";
@@ -79316,9 +79317,17 @@ function substrateSelfVersion() {
 }
 
 // scripts/lakebase/get-connection.ts
+function sanitizeApplicationName(raw) {
+  const cleaned = raw.replace(/[^\x21-\x7e]+/g, "-").replace(/^-+|-+$/g, "");
+  if (!cleaned) return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  return cleaned.length > 63 ? cleaned.slice(0, 63) : cleaned;
+}
 function connectionApplicationName() {
+  const client = process.env[SCM_CLIENT_ENV]?.trim();
+  if (client) return sanitizeApplicationName(client);
   const consortVersion = process.env[CONSORT_VERSION_ENV]?.trim();
-  return consortVersion ? `${CONSORT_APPLICATION_NAME}/${consortVersion}` : `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  if (consortVersion) return `${CONSORT_APPLICATION_NAME}/${consortVersion}`;
+  return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
 }
 async function getConnection(args) {
   const endpointName = args.endpointName ?? DEFAULT_ENDPOINT;

package/dist/scripts/lakebase/scm-reconcile-tier.cli.js

@@ -378,6 +378,7 @@ var DEFAULT_DATABASE = "databricks_postgres";
 var DEFAULT_ENDPOINT = "primary";
 var CONSORT_APPLICATION_NAME = "consort";
 var SCM_UTILS_APPLICATION_NAME = "scm-utils";
+var SCM_CLIENT_ENV = "LAKEBASE_SCM_CLIENT";
 var CONSORT_VERSION_ENV = "CONSORT_VERSION";
 
 // scripts/lakebase/self-version.ts
@@ -388,8 +389,8 @@ var PKG_NAME = "@databricks-solutions/lakebase-scm-utils";
 var cached;
 function substrateSelfVersion() {
   if (cached !== void 0) return cached;
-  if ("0.2.45".length > 0) {
-    cached = "0.2.45";
+  if ("0.2.47".length > 0) {
+    cached = "0.2.47";
     return cached;
   }
   cached = "unknown";
@@ -417,9 +418,17 @@ function substrateSelfVersion() {
 }
 
 // scripts/lakebase/get-connection.ts
+function sanitizeApplicationName(raw) {
+  const cleaned = raw.replace(/[^\x21-\x7e]+/g, "-").replace(/^-+|-+$/g, "");
+  if (!cleaned) return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  return cleaned.length > 63 ? cleaned.slice(0, 63) : cleaned;
+}
 function connectionApplicationName() {
+  const client = process.env[SCM_CLIENT_ENV]?.trim();
+  if (client) return sanitizeApplicationName(client);
   const consortVersion = process.env[CONSORT_VERSION_ENV]?.trim();
-  return consortVersion ? `${CONSORT_APPLICATION_NAME}/${consortVersion}` : `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
+  if (consortVersion) return `${CONSORT_APPLICATION_NAME}/${consortVersion}`;
+  return `${SCM_UTILS_APPLICATION_NAME}/${substrateSelfVersion()}`;
 }
 async function getConnection(args) {
   const endpointName = args.endpointName ?? DEFAULT_ENDPOINT;

package/dist/scripts/lakebase/scm-wait-ci.cli.cjs

@@ -8235,6 +8235,8 @@ async function getPullRequest(ownerRepo, headBranch) {
       isDraft: pr.draft || false,
       ciStatus,
       checks,
+      mergeable: pr.mergeable,
+      mergeableState: pr.mergeable_state,
       headBranch: pr.head?.ref || headBranch,
       baseBranch: pr.base?.ref || "",
       body: pr.body || void 0,
@@ -8662,6 +8664,12 @@ async function waitForCi(args) {
       if (lastPr.ciStatus === "success") {
         return { done: true, value: lastPr };
       }
+      if (lastPr.mergeableState === "dirty" && lastPr.checks.length === 0) {
+        throw new ScmWaitCiError(
+          `PR ${lastPr.url} is CONFLICTING with ${lastPr.baseBranch} \u2014 GitHub will not dispatch CI (0 runs) until the conflict is resolved. Reconcile the branch and re-push; the synchronize event will trigger CI.`,
+          "pr-conflicting"
+        );
+      }
       if (lastPr.ciStatus === "failure") {
         const failed = lastPr.checks.filter((c) => /(FAILURE|TIMED_OUT|CANCELLED|ACTION_REQUIRED)/i.test(c.conclusion)).map((c) => `${c.name} (${c.conclusion})`);
         throw new ScmWaitCiError(

package/dist/scripts/lakebase/scm-wait-ci.cli.js

@@ -8223,6 +8223,8 @@ async function getPullRequest(ownerRepo, headBranch) {
       isDraft: pr.draft || false,
       ciStatus,
       checks,
+      mergeable: pr.mergeable,
+      mergeableState: pr.mergeable_state,
       headBranch: pr.head?.ref || headBranch,
       baseBranch: pr.base?.ref || "",
       body: pr.body || void 0,
@@ -8650,6 +8652,12 @@ async function waitForCi(args) {
       if (lastPr.ciStatus === "success") {
         return { done: true, value: lastPr };
       }
+      if (lastPr.mergeableState === "dirty" && lastPr.checks.length === 0) {
+        throw new ScmWaitCiError(
+          `PR ${lastPr.url} is CONFLICTING with ${lastPr.baseBranch} \u2014 GitHub will not dispatch CI (0 runs) until the conflict is resolved. Reconcile the branch and re-push; the synchronize event will trigger CI.`,
+          "pr-conflicting"
+        );
+      }
       if (lastPr.ciStatus === "failure") {
         const failed = lastPr.checks.filter((c) => /(FAILURE|TIMED_OUT|CANCELLED|ACTION_REQUIRED)/i.test(c.conclusion)).map((c) => `${c.name} (${c.conclusion})`);
         throw new ScmWaitCiError(