windmill-cli 1.589.0 → 1.589.2

package/esm/src/commands/init/init.js

@@ -181,15 +181,13 @@ async function initAction(opts) {
         // Create CLAUDE.md file
         if (!(await dntShim.Deno.stat("CLAUDE.md").catch(() => null))) {
             await dntShim.Deno.writeTextFile("CLAUDE.md", `
-                        # Claude
+You are a helpful assistant that can help with Windmill scripts and flows creation.
 
-                        You are a helpful assistant that can help with Windmill scripts and flows creation.
+## Script Guidance
+${scriptGuidanceContent}
 
-                        ## Script Guidance
-                        ${scriptGuidanceContent}
-
-                        ## Flow Guidance
-                        ${flowGuidanceContent}
+## Flow Guidance
+${flowGuidanceContent}
                     `);
             log.info(colors.green("Created CLAUDE.md"));
         }

package/esm/src/commands/sync/sync.js

@@ -1,13 +1,13 @@
 import * as dntShim from "../../../_dnt.shims.js";
 import { requireLogin } from "../../core/auth.js";
-import { fetchVersion, resolveWorkspace } from "../../core/context.js";
+import { resolveWorkspace } from "../../core/context.js";
 import { colors, Command, Confirm, ensureDir, log, minimatch, path, SEP, yamlParseContent, yamlStringify, } from "../../../deps.js";
 import * as wmill from "../../../gen/services.gen.js";
 import { getTypeStrFromPath, parseFromPath, pushObj, showConflict, showDiff, } from "../../types.js";
 import { downloadZip } from "./pull.js";
 import { exts, findContentFile, findResourceFile, handleScriptMetadata, removeExtensionToPath, } from "../script/script.js";
 import { handleFile } from "../script/script.js";
-import { deepEqual, isFileResource, isRawAppFile, isWorkspaceDependencies, } from "../../utils/utils.js";
+import { deepEqual, fetchRemoteVersion, isFileResource, isRawAppFile, isWorkspaceDependencies, } from "../../utils/utils.js";
 import { getEffectiveSettings, mergeConfigWithConfigFile, validateBranchConfiguration, } from "../../core/conf.js";
 import { fromBranchSpecificPath, getBranchSpecificPath, getSpecificItemsForCurrentBranch, isBranchSpecificFile, isCurrentBranchFile, isSpecificItem, } from "../../core/specific_items.js";
 import { getCurrentGitBranch } from "../../utils/git.js";
@@ -19,8 +19,7 @@ import { newPathAssigner, } from "../../../windmill-utils-internal/src/path-util
 import { extractInlineScripts as extractInlineScriptsForFlows } from "../../../windmill-utils-internal/src/inline-scripts/extractor.js";
 import { generateFlowLockInternal } from "../flow/flow_metadata.js";
 import { isExecutionModeAnonymous } from "../app/apps.js";
-import { generateAppLocksInternal } from "../app/app_metadata.js";
-import { updateGlobalVersions } from "./global.js";
+import { APP_BACKEND_FOLDER, generateAppLocksInternal, } from "../app/app_metadata.js";
 // Merge CLI options with effective settings, preserving CLI flags as overrides
 function mergeCliWithEffectiveOptions(cliOpts, effectiveOpts) {
     // overlay CLI options on top (undefined cliOpts won't override effectiveOpts)
@@ -416,7 +415,7 @@ function ZipFSElement(zip, useYaml, defaultTs, resourceTypeToFormatExtension, ig
                         for (const s of inlineScripts) {
                             yield {
                                 isDirectory: false,
-                                path: path.join(finalPath, "runnables", s.path),
+                                path: path.join(finalPath, APP_BACKEND_FOLDER, s.path),
                                 async *getChildren() { },
                                 // deno-lint-ignore require-await
                                 async getContentText() {
@@ -1369,7 +1368,11 @@ export async function pull(opts) {
         }
         for (const change of tracker.rawApps) {
             log.info(`Updating lock metadata for raw app ${change}`);
-            await generateAppLocksInternal(change, false, workspace, opts, true, true);
+            await generateAppLocksInternal(change, false, true, workspace, opts, true, true);
+        }
+        for (const change of tracker.apps) {
+            log.info(`Updating lock metadata for app ${change}`);
+            await generateAppLocksInternal(change, false, false, workspace, opts, true, true);
         }
         if (opts.jsonOutput) {
             const result = {
@@ -1520,6 +1523,7 @@ export async function push(opts) {
     const tracker = await buildTracker(changes);
     const staleScripts = [];
     const staleFlows = [];
+    const staleApps = [];
     for (const change of tracker.scripts) {
         const stale = await generateScriptMetadataInternal(change, workspace, opts, true, true, rawWorkspaceDependencies, codebases, false);
         if (stale) {
@@ -1547,11 +1551,26 @@ export async function push(opts) {
         }
         log.info("");
     }
-    const version = await fetchVersion(workspace.remote);
-    if (version) {
-        updateGlobalVersions(version);
+    for (const change of tracker.apps) {
+        const stale = await generateAppLocksInternal(change, false, true, workspace, opts, true, true);
+        if (stale) {
+            staleApps.push(stale);
+        }
+    }
+    for (const change of tracker.rawApps) {
+        const stale = await generateAppLocksInternal(change, true, true, workspace, opts, true, true);
+        if (stale) {
+            staleApps.push(stale);
+        }
+    }
+    if (staleApps.length > 0) {
+        log.warn("Stale apps locks found, you may want to update them using 'wmill app generate-locks' before pushing:");
+        for (const stale of staleApps) {
+            log.warn(stale);
+        }
+        log.info("");
     }
-    log.info(colors.gray("Remote version: " + version));
+    await fetchRemoteVersion(workspace);
     log.info(`remote (${workspace.name}) <- local: ${changes.length} changes to apply`);
     // Handle JSON output for dry-run
     if (opts.dryRun && opts.jsonOutput) {

package/esm/src/commands/trigger/trigger.js

@@ -2,7 +2,7 @@ import * as dntShim from "../../../_dnt.shims.js";
 import * as wmill from "../../../gen/services.gen.js";
 import { colors, Command, log, SEP, Table } from "../../../deps.js";
 import { isSuperset, parseFromFile, removeType, TRIGGER_TYPES, } from "../../types.js";
-import { fromBranchSpecificPath, isBranchSpecificFile } from "../../core/specific_items.js";
+import { fromBranchSpecificPath, isBranchSpecificFile, } from "../../core/specific_items.js";
 import { getCurrentGitBranch } from "../../utils/git.js";
 import { requireLogin } from "../../core/auth.js";
 import { validatePath, resolveWorkspace } from "../../core/context.js";
@@ -31,9 +31,7 @@ async function updateTrigger(triggerType, workspace, path, trigger) {
         postgres: wmill.updatePostgresTrigger,
         mqtt: wmill.updateMqttTrigger,
         sqs: wmill.updateSqsTrigger,
-        gcp: async (args) => {
-            throw new Error("GCP triggers are not supported yet");
-        },
+        gcp: wmill.updateGcpTrigger,
         email: wmill.updateEmailTrigger,
     };
     const triggerFunction = triggerFunctions[triggerType];
@@ -48,9 +46,7 @@ async function createTrigger(triggerType, workspace, path, trigger) {
         postgres: wmill.createPostgresTrigger,
         mqtt: wmill.createMqttTrigger,
         sqs: wmill.createSqsTrigger,
-        gcp: async (args) => {
-            throw new Error("GCP triggers are not supported yet");
-        },
+        gcp: wmill.createGcpTrigger,
         email: wmill.createEmailTrigger,
     };
     const triggerFunction = triggerFunctions[triggerType];

package/esm/src/main.js

@@ -20,7 +20,6 @@ import gitsyncSettings from "./commands/gitsync-settings/gitsync-settings.js";
 import instance from "./commands/instance/instance.js";
 import workerGroups from "./commands/worker-groups/worker_groups.js";
 import dev from "./commands/dev/dev.js";
-import { fetchVersion } from "./core/context.js";
 import { OpenAPI } from "../gen/index.js";
 import { getHeaders, getIsWin } from "./utils/utils.js";
 import { setShowDiffs } from "./core/conf.js";
@@ -33,6 +32,7 @@ import queues from "./commands/queues/queues.js";
 import dependencies from "./commands/dependencies/dependencies.js";
 import init from "./commands/init/init.js";
 import jobs from "./commands/jobs/jobs.js";
+import { fetchVersion } from "./core/context.js";
 export { flow, app, script, workspace, resource, resourceType, user, variable, hub, folder, schedule, trigger, sync, gitsyncSettings, instance, dev, hubPull, pull, push, workspaceAdd, };
 // addEventListener("error", (event) => {
 //   if (event.error) {
@@ -40,7 +40,7 @@ export { flow, app, script, workspace, resource, resourceType, user, variable, h
 //     console.error(JSON.stringify(event.error, null, 4));
 //   }
 // });
-export const VERSION = "1.589.0";
+export const VERSION = "1.589.2";
 export const WM_FORK_PREFIX = "wm-fork";
 const command = new Command()
     .name("wmill")

package/esm/src/utils/utils.js

@@ -4,6 +4,8 @@ import * as dntShim from "../../_dnt.shims.js";
 // @ts-nocheck This file is copied from a JS project, so it's not type-safe.
 import { colors, encodeHex, log, SEP } from "../../deps.js";
 import crypto from "node:crypto";
+import { fetchVersion } from "../core/context.js";
+import { updateGlobalVersions } from "../commands/sync/global.js";
 export function deepEqual(a, b) {
     if (a === b)
         return true;
@@ -214,3 +216,10 @@ export function writeIfChanged(path, content) {
     dntShim.Deno.writeTextFileSync(path, content);
     return true; // File was written
 }
+export async function fetchRemoteVersion(workspace) {
+    const version = await fetchVersion(workspace.remote);
+    if (version) {
+        updateGlobalVersions(version);
+    }
+    log.info(colors.gray("Remote version: " + version));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-cli",
-  "version": "1.589.0",
+  "version": "1.589.2",
   "description": "CLI for Windmill",
   "repository": {
     "type": "git",

package/types/gen/types.gen.d.ts

@@ -4757,6 +4757,7 @@ export type GetScriptDeploymentStatusData = {
 export type GetScriptDeploymentStatusResponse = ({
     lock?: string;
     lock_error_logs?: string;
+    job_id?: string;
 });
 export type ListSelectedJobGroupsData = {
     /**
@@ -5465,6 +5466,7 @@ export type GetFlowDeploymentStatusData = {
 };
 export type GetFlowDeploymentStatusResponse = ({
     lock_error_logs?: string;
+    job_id?: string;
 });
 export type GetTriggersCountOfFlowData = {
     path: string;