@uniformdev/cli 20.72.3-alpha.40 → 20.72.3-alpha.45

package/dist/{chunk-Z4H2GIQQ.mjs → chunk-7XIFFKLH.mjs}

@@ -21,7 +21,7 @@ import { dirname, extname, isAbsolute, resolve, sep } from "path";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "20.73.0",
+  version: "20.74.1",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",

package/dist/defaultConfig.mjs

@@ -1,4 +1,4 @@
-import "./chunk-Z4H2GIQQ.mjs";
+import "./chunk-7XIFFKLH.mjs";
 
 // src/sync/allSerializableEntitiesConfig.ts
 var allSerializableEntitiesConfig = {

package/dist/index.mjs

@@ -23,7 +23,7 @@ import {
   withFormatOptions,
   withProjectOptions,
   withTeamOptions
-} from "./chunk-Z4H2GIQQ.mjs";
+} from "./chunk-7XIFFKLH.mjs";
 
 // src/index.ts
 import * as dotenv from "dotenv";
@@ -2371,23 +2371,49 @@ function toInputJsonSchema(inputSchema) {
 }
 
 // src/commands/automation/bundleAutomationForDeploy.ts
-async function readAutomationMetadataFromBundle(bundlePath, publicId) {
+async function readDeployInputFromBundle(bundlePath, publicId) {
   const automationModule = await import(pathToFileURL(bundlePath).href);
   const automation = automationModule.default;
   if (!automation?.metadata) {
-    throw new Error("Default export must be the return value of defineAutomation");
+    throw new Error("Default export must be the return value of defineAutomation or defineScoutAutomation");
   }
-  const metadata = automation.metadata;
-  const triggers = metadata.triggers.map(
-    (trigger) => trigger.type === "aiTool" ? { type: "aiTool", inputSchema: toInputJsonSchema(metadata.inputSchema) } : trigger
-  );
-  return {
+  const { metadata } = automation;
+  if (!metadata.name) {
+    throw new Error("An automation must declare a `name` in its metadata.");
+  }
+  const common = {
     publicId,
     name: metadata.name,
     description: metadata.description,
+    permissions: metadata.permissions
+  };
+  if (automation.kind === "scout") {
+    if (typeof automation.instructions !== "string") {
+      throw new Error("A Scout automation must default-export the return value of defineScoutAutomation");
+    }
+    if (!common.permissions) {
+      throw new Error(
+        "A Scout automation must declare `permissions`: it acts solely through its machine identity, so without a role grant it has no authority to act."
+      );
+    }
+    return {
+      ...common,
+      permissions: common.permissions,
+      kind: "scout",
+      // A Scout automation cannot declare an aiTool trigger, so no trigger needs remapping.
+      triggers: metadata.triggers,
+      instructions: automation.instructions
+    };
+  }
+  const triggers = (metadata.triggers ?? []).map(
+    (trigger) => trigger.type === "aiTool" ? { type: "aiTool", inputSchema: toInputJsonSchema(metadata.inputSchema) } : trigger
+  );
+  return {
+    ...common,
+    kind: "typescript",
     triggers,
     compatibilityDate: metadata.compatibilityDate,
-    permissions: metadata.permissions
+    code: readFileSync2(bundlePath, "utf8")
   };
 }
 async function bundleAutomationForDeploy(entryFile) {
@@ -2397,14 +2423,14 @@ async function bundleAutomationForDeploy(entryFile) {
   const bundlePath = join7(workDir, "automation.mjs");
   try {
     await bundleWorkerCodeToFile(absEntry, bundlePath);
-    const metadata = await readAutomationMetadataFromBundle(bundlePath, publicId);
-    const code = readFileSync2(bundlePath, "utf8");
-    console.log(
-      `\u2139\uFE0F ${basename2(absEntry)} was prepared with esbuild. Size: ${Math.round(code.length / 1024)}kb`
-    );
+    const deploy = await readDeployInputFromBundle(bundlePath, publicId);
+    if (deploy.kind === "typescript") {
+      console.log(
+        `\u2139\uFE0F ${basename2(absEntry)} was prepared with esbuild. Size: ${Math.round(deploy.code.length / 1024)}kb`
+      );
+    }
     return {
-      metadata,
-      code,
+      deploy,
       cleanup: () => rmSync(workDir, { recursive: true, force: true })
     };
   } catch (error) {
@@ -2440,7 +2466,7 @@ var AutomationDeployModule = {
           array: true,
           type: "string",
           demandOption: true,
-          describe: "One or more automation source files and/or directories. Each module must default-export the return value of defineAutomation. A directory is scanned (non-recursively) for files matching `*.automation.ts`."
+          describe: "One or more automation source files and/or directories. Each module must default-export the return value of defineAutomation or defineScoutAutomation; which one it is determines how the automation is deployed. A directory is scanned (non-recursively) for files matching `*.automation.ts`."
         }).option("compatibilityDate", {
           type: "string",
           describe: "Overrides the compatibility date in metadata for every deployed automation. Format: YYYY-MM-DD."
@@ -2462,21 +2488,19 @@ var AutomationDeployModule = {
       files.map(async (file) => {
         let cleanup;
         try {
-          const bundled = await bundleAutomationForDeploy(file);
-          cleanup = bundled.cleanup;
-          await client.deploy({
-            ...bundled.metadata,
-            code: bundled.code,
-            compatibilityDate: compatibilityDate ?? bundled.metadata.compatibilityDate
-          });
-          const triggerKinds = bundled.metadata.triggers.map((trigger) => trigger.type);
+          const prepared = await bundleAutomationForDeploy(file);
+          cleanup = prepared.cleanup;
+          const { deploy } = prepared;
+          await client.deploy(
+            deploy.kind === "typescript" ? { ...deploy, compatibilityDate: compatibilityDate ?? deploy.compatibilityDate } : deploy
+          );
+          const triggerKinds = deploy.triggers.map((trigger) => trigger.type);
+          const label = deploy.kind === "scout" ? "Scout automation" : "automation";
           console.log(
-            `\u2705 Deployed automation "${bundled.metadata.publicId}" (${triggerKinds.length} trigger${triggerKinds.length === 1 ? "" : "s"}: ${triggerKinds.join(", ")}).`
+            `\u2705 Deployed ${label} "${deploy.publicId}" (${triggerKinds.length} trigger${triggerKinds.length === 1 ? "" : "s"}: ${triggerKinds.join(", ")}).`
           );
           if (triggerKinds.includes("incomingWebhook")) {
-            console.log(
-              `Webhook URL: ${formatAutomationWebhookUrl(apiHost, projectId, bundled.metadata.publicId)}`
-            );
+            console.log(`Webhook URL: ${formatAutomationWebhookUrl(apiHost, projectId, deploy.publicId)}`);
           }
           return true;
         } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "20.72.3-alpha.40+ffbec41570",
+  "version": "20.72.3-alpha.45+2b8b05d58a",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -27,14 +27,14 @@
   "dependencies": {
     "@inquirer/prompts": "^8.5.2",
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "20.72.3-alpha.40+ffbec41570",
-    "@uniformdev/automations-sdk": "20.72.3-alpha.40+ffbec41570",
-    "@uniformdev/canvas": "20.72.3-alpha.40+ffbec41570",
-    "@uniformdev/context": "20.72.3-alpha.40+ffbec41570",
-    "@uniformdev/files": "20.72.3-alpha.40+ffbec41570",
-    "@uniformdev/project-map": "20.72.3-alpha.40+ffbec41570",
-    "@uniformdev/redirect": "20.72.3-alpha.40+ffbec41570",
-    "@uniformdev/richtext": "20.72.3-alpha.40+ffbec41570",
+    "@uniformdev/assets": "20.72.3-alpha.45+2b8b05d58a",
+    "@uniformdev/automations-sdk": "20.72.3-alpha.45+2b8b05d58a",
+    "@uniformdev/canvas": "20.72.3-alpha.45+2b8b05d58a",
+    "@uniformdev/context": "20.72.3-alpha.45+2b8b05d58a",
+    "@uniformdev/files": "20.72.3-alpha.45+2b8b05d58a",
+    "@uniformdev/project-map": "20.72.3-alpha.45+2b8b05d58a",
+    "@uniformdev/redirect": "20.72.3-alpha.45+2b8b05d58a",
+    "@uniformdev/richtext": "20.72.3-alpha.45+2b8b05d58a",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.2",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ffbec41570c4266c69674871c97146bf7bf86383"
+  "gitHead": "2b8b05d58ab275b4d29a9647feeaad47b0ab5cce"
 }