@contrail/cli 3.5.3-alpha.8e9fe43 → 3.5.3-alpha.b5668f4

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/3.5.3-alpha.8e9fe43 linux-x64 node-v24.16.0
+@contrail/cli/3.5.3-alpha.b5668f4 linux-x64 node-v24.16.0
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND

package/dist/commands/workflow-templates/export.js

@@ -78,7 +78,8 @@ async function exportWorkflowsByApp(outputDir, overwrite) {
         if (!appIdentifier && workflow.identifier) {
             const match = workflow.identifier.match(/^@([^@]+)@/);
             if (match) {
-                appIdentifier = match[1];
+                // Keep the @ prefix in the appIdentifier
+                appIdentifier = `@${match[1]}`;
             }
         }
         if (appIdentifier) {
@@ -100,18 +101,13 @@ async function exportWorkflowsByApp(outputDir, overwrite) {
         for (const workflow of workflows) {
             exportObj.workflows.push(await buildExportWorkflow(workflow, allSchedules));
         }
-        const filePath = path.join(resolvedDir, `workflows-${appIdentifier}.yml`);
+        const safeAppIdentifier = appIdentifier.replace(/[\\/]/g, '-');
+        const filePath = path.join(resolvedDir, `workflows-${safeAppIdentifier}.yml`);
         await writeYamlFile(exportObj, filePath, overwrite);
         console.log(`${chalk_1.default.green('EXPORTED')} ${filePath}`);
     }
     if (unassigned.length > 0) {
-        const exportObj = { workflows: [] };
-        for (const workflow of unassigned) {
-            exportObj.workflows.push(await buildExportWorkflow(workflow, allSchedules));
-        }
-        const filePath = path.join(resolvedDir, exports.DEFAULT_FILE_LOCATION);
-        await writeYamlFile(exportObj, filePath, overwrite);
-        console.log(`${chalk_1.default.green('EXPORTED')} ${filePath}`);
+        console.log(`${chalk_1.default.yellow('SKIPPED')} ${unassigned.length} workflows could not be associated with an app. Re-run with --outFile to export them to a single file.`);
     }
 }
 exports.exportWorkflowsByApp = exportWorkflowsByApp;
@@ -149,5 +145,6 @@ async function writeYamlFile(data, absolutePath, overwrite) {
     if (fs_1.default.existsSync(absolutePath)) {
         await (0, file_helpers_1.safeFileOverwrite)(absolutePath, overwrite);
     }
+    fs_1.default.mkdirSync(path.dirname(absolutePath), { recursive: true });
     fs_1.default.writeFileSync(absolutePath, js_yaml_1.default.dump(data), 'utf8');
 }

package/dist/helpers/workflow-templates/helper.js

@@ -20,7 +20,6 @@ class LocalWorkflowTemplateDeployer {
         const existingWorkflows = await (0, event_workflow_templates_1.getExistingWorkflowTemplates)();
         // UPSERT / DELETE BASED ON WORKFLOW TEMPLATES IDENTIFIER
         logger_1.default.info(`${chalk_1.default.yellow.bold('WORKFLOW TEMPLATES')} Deploying workflow templates.`);
-        logger_1.default.info(wtDeclaration);
         for (const workflowKey of Object.keys(wtDeclaration.workflows)) {
             await this.deployWorkflowTemplate(wtDeclaration.workflows[workflowKey], existingWorkflows, wtDeclaration.appIdentifier);
         }
@@ -35,14 +34,14 @@ class LocalWorkflowTemplateDeployer {
         return await this.createNewWorkflowTemplate(identifier, workflow, appIdentifier);
     }
     async createNewWorkflowTemplate(workflowKey, workflowTemplate, appIdentifier) {
-        await this.populateActionIds(workflowTemplate, workflowKey, appIdentifier);
+        const resolvedAppId = await this.populateActionIds(workflowTemplate, workflowKey, appIdentifier);
         const newObject = {
             identifier: getWorkflowTemplateIdentifier(workflowTemplate),
             name: workflowTemplate.name,
             triggerKey: workflowTemplate.triggerKey,
             workflowDefinition: workflowTemplate.workflowDefinition,
             isActive: workflowTemplate.isActive,
-            supportingAppId: workflowTemplate.supportingAppId,
+            supportingAppId: resolvedAppId ?? workflowTemplate.supportingAppId,
             messageGroupId: workflowTemplate.messageGroupId,
             messageGroup: workflowTemplate.messageGroup,
             dynamicMessageGroupId: workflowTemplate.dynamicMessageGroupId,
@@ -57,10 +56,12 @@ class LocalWorkflowTemplateDeployer {
     }
     async populateActionIds(workflowTemplate, workflowKey, appIdentifier) {
         const installedApps = await (0, apps_1.getInstalledApps)();
-        const appOrg = installedApps.find((x) => x.app.identifier === appIdentifier);
-        logger_1.default.info('workflow template:', JSON.stringify(workflowTemplate, null, 2));
+        const appOrg = installedApps.find((x) => x.app?.identifier === appIdentifier);
+        if (!appOrg) {
+            throw new Error(`Could not find installed app with identifier "${appIdentifier}". Make sure the app is installed in this org before importing workflows.`);
+        }
         if (!workflowTemplate?.workflowDefinition?.paths) {
-            return;
+            return appOrg.appId;
         }
         for (const path of workflowTemplate.workflowDefinition.paths) {
             if (!path?.actionDefinitionConfigs) {
@@ -86,6 +87,7 @@ class LocalWorkflowTemplateDeployer {
                 }
             }
         }
+        return appOrg.appId;
     }
     async createWorkflowSchedule(workflowTemplate, workflowId) {
         if (!workflowTemplate?.crons?.length) {
@@ -154,12 +156,13 @@ class LocalWorkflowTemplateDeployer {
         }
     }
     async updateWorkflowTemplate(workflowKey, existingWorkflowTemplate, workflowTemplate, appIdentifier) {
-        await this.populateActionIds(workflowTemplate, workflowKey, appIdentifier);
+        const resolvedAppId = await this.populateActionIds(workflowTemplate, workflowKey, appIdentifier);
         const updates = Object.assign(new Object(), {
             name: workflowTemplate.name,
             triggerKey: workflowTemplate.triggerKey,
             builtIn: workflowTemplate.builtIn,
             workflowDefinition: workflowTemplate.workflowDefinition,
+            supportingAppId: resolvedAppId ?? existingWorkflowTemplate.supportingAppId,
             dynamicMessageGroupId: workflowTemplate.dynamicMessageGroupId ?? existingWorkflowTemplate.dynamicMessageGroupId,
             parallelWorkerCount: workflowTemplate.parallelWorkerCount ?? existingWorkflowTemplate.parallelWorkerCount,
         });

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.5.3-alpha.8e9fe43",
+  "version": "3.5.3-alpha.b5668f4",
   "commands": {
     "app:create": {
       "id": "app:create",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "3.5.3-alpha.8e9fe43",
+  "version": "3.5.3-alpha.b5668f4",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",