windmill-cli 1.711.0 → 1.712.0

package/esm/main.js

@@ -16772,7 +16772,7 @@ var init_OpenAPI = __esm(() => {
     PASSWORD: undefined,
     TOKEN: getEnv3("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: "1.711.0",
+    VERSION: "1.712.0",
     WITH_CREDENTIALS: true,
     interceptors: {
       request: new Interceptors,
@@ -67379,6 +67379,14 @@ async function pull(opts) {
       checkoutGitSyncDeployBranch(deployBranch);
     }
     if (opts.onlyCreateBranch) {
+      gitSyncDeployPush({
+        items: deployItems,
+        authorName: process.env["WM_USERNAME"] || "windmill",
+        authorEmail: process.env["WM_EMAIL"] || "windmill@windmill.dev",
+        committerName: opts.gitCommitterName,
+        committerEmail: opts.gitCommitterEmail,
+        onlyCreateBranch: true
+      });
       return;
     }
   }
@@ -67662,9 +67670,12 @@ function prettyChanges(changes, specificItems, branchOverride, folderDefaultAnno
     } else if (change.name === "deleted") {
       info(colors.red(`- ${getTypeStrFromPath(change.path)} ` + displayPath + colors.gray(wsNote)));
     } else if (change.name === "edited") {
-      info(colors.yellow(`~ ${getTypeStrFromPath(change.path)} ` + displayPath + colors.gray(wsNote) + (change.codebase ? ` (codebase changed)` : "")));
+      const changeType = getTypeStrFromPath(change.path);
+      info(colors.yellow(`~ ${changeType} ` + displayPath + colors.gray(wsNote) + (change.codebase ? ` (codebase changed)` : "")));
       if (change.before != change.after) {
-        if (change.path.endsWith(".yaml")) {
+        if (changeType === "encryption_key") {
+          showDiff(redactEncryptionKey(change.before), redactEncryptionKey(change.after));
+        } else if (change.path.endsWith(".yaml")) {
           try {
             showDiff(import_yaml11.stringify(yamlParseContent(change.path, change.before), yamlOptions), import_yaml11.stringify(yamlParseContent(change.path, change.after), yamlOptions));
           } catch {
@@ -75804,11 +75815,35 @@ function showDiff(local, remote) {
 }
 function showConflict(path21, local, remote) {
   info(colors.yellow(`- ${path21}`));
-  showDiff(local, remote);
+  let isEncryptionKey = false;
+  try {
+    isEncryptionKey = getTypeStrFromPath(path21) === "encryption_key";
+  } catch {}
+  if (isEncryptionKey) {
+    showDiff(redactEncryptionKey(local), redactEncryptionKey(remote));
+  } else {
+    showDiff(local, remote);
+  }
   info("\x1B[31mlocal\x1B[31m - \x1B[32mremote\x1B[32m");
   info(`
 `);
 }
+function redactEncryptionKey(content) {
+  if (!content)
+    return content;
+  try {
+    const parsed = JSON.parse(content);
+    if (typeof parsed === "string") {
+      return JSON.stringify(redactString(parsed));
+    }
+  } catch {}
+  return redactString(content);
+}
+function redactString(s) {
+  if (s.length <= 5)
+    return s;
+  return s.slice(0, 5) + "*".repeat(s.length - 5);
+}
 async function pushObj(workspace, p, befObj, newObj, plainSecrets, alreadySynced3, message, originalLocalPath, permissionedAsContext, wsSpecific) {
   const typeEnding = getTypeStrFromPath(p);
   if (typeEnding === "app") {
@@ -90161,7 +90196,11 @@ ${options.includeLine}
 }
 function referencesIncludeLine(content, includeLine) {
   for (const line of content.split(/\r?\n/)) {
-    if (line.trim() === includeLine) {
+    const trimmed = line.trim();
+    if (trimmed.startsWith("<!--") || trimmed.endsWith("-->")) {
+      continue;
+    }
+    if (trimmed.split(/\s+/).includes(includeLine)) {
       return true;
     }
   }
@@ -93620,7 +93659,7 @@ var object_storage_default = command41;
 
 // src/main.ts
 await init_context();
-var VERSION = "1.711.0";
+var VERSION = "1.712.0";
 async function checkVersionSafe(cmd) {
   const mainCommand = cmd.getMainCommand();
   const upgradeCommand = mainCommand.getCommand("upgrade");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-cli",
-  "version": "1.711.0",
+  "version": "1.712.0",
   "description": "CLI for Windmill",
   "license": "Apache 2.0",
   "type": "module",