@openfn/cli 0.0.38 → 0.0.40

package/README.md

@@ -58,7 +58,6 @@ If you're coming to the CLI from the old openfn devtools, here are a couple of k
 
 * The CLI has a shorter, sleeker syntax, so your command should be much shorter
 * The CLI will automatically install adaptors for you (with full version control)
-* By default, the CLI will only write state.data to output. This is to encourage better state management. Pass `--no-strict-output` to save the entire state object.
 
 ## Basic Usage
 
@@ -76,8 +75,6 @@ Pass the `-i` flag to auto-install any required adaptors (it's safe to do this r
 
 When the finished, the CLI will write the resulting state to disk. By default the CLI will create an `output.json` next to the job file. You can pass a path to output by passing `-o path/to/output.json` and state by adding `-s path/to/state.json`. You can use `-S` and `-O` to pass state through stdin and return the output through stdout.
 
-Note that the CLI will only include the `state.data` key in the output. To write the entire state object (not just `data`), pass `--no-strict-output`.
-
 The CLI maintains a repo for auto-installed adaptors. Run `openfn repo list` to see where the repo is, and what's in it. Set the `OPENFN_REPO_DIR` env var to specify the repo folder. When autoinstalling, the CLI will check to see if a matching version is found in the repo. `openfn repo clean` will remove all adaptors from the repo. The repo also includes any documentation and metadata built with the CLI.
 
 You can specify adaptors with a shorthand (`http`) or use the full package name (`@openfn/language-http`). You can add a specific version like `http@2.0.0`. You can pass a path to a locally installed adaptor like `http=/repo/openfn/adaptors/my-http-build`.

package/dist/chunk-UBDWXKSG.js

@@ -0,0 +1,33 @@
+// src/util/expand-adaptors.ts
+var expand = (name) => {
+  if (typeof name === "string") {
+    const [left] = name.split("=");
+    if (left.match("/") || left.endsWith(".js")) {
+      return name;
+    }
+    return `@openfn/language-${name}`;
+  }
+  return name;
+};
+var expand_adaptors_default = (opts) => {
+  const { adaptors, workflow } = opts;
+  if (adaptors) {
+    opts.adaptors = adaptors?.map(expand);
+  }
+  if (workflow) {
+    Object.values(workflow.jobs).forEach((job) => {
+      if (job.adaptor) {
+        job.adaptor = expand(job.adaptor);
+      }
+    });
+  }
+  return opts;
+};
+
+// src/constants.ts
+var DEFAULT_REPO_DIR = "/tmp/openfn/repo";
+
+export {
+  expand_adaptors_default,
+  DEFAULT_REPO_DIR
+};

package/dist/index.js

@@ -2,7 +2,7 @@
 import {
   DEFAULT_REPO_DIR,
   expand_adaptors_default
-} from "./chunk-DOKL2XM5.js";
+} from "./chunk-UBDWXKSG.js";
 
 // src/process/spawn.ts
 import path from "node:path";
@@ -34,77 +34,6 @@ function spawn_default(basePath, opts2) {
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 
-// src/repo/command.ts
-var repo = {
-  command: "repo [subcommand]",
-  desc: "Run commands on the module repo (install|clean)",
-  builder: (yargs2) => yargs2.command(clean).command(install).command(pwd).command(list).example("repo install -a http", "Install @openfn/language-http").example("repo clean", "Remove everything from the repo working dir").example("repo pwd", "Print the current repo working dir")
-};
-var install = {
-  command: "install [packages...]",
-  desc: "install one or more packages to the runtime repo",
-  handler: (argv) => {
-    argv.command = "repo-install";
-  },
-  builder: (yargs2) => {
-    return yargs2.option("adaptor", {
-      alias: ["a"],
-      description: "Install an adaptor by passing a shortened version of the name",
-      boolean: true
-    }).example("install axios", "Install the axios npm package to the repo").example(
-      "install -a http",
-      "Install @openfn/language-http adaptor to the repo"
-    ).example(
-      "install @openfn/language-http",
-      "Install the language-http adaptor to the repo"
-    );
-  }
-};
-var clean = {
-  command: "clean",
-  desc: "Removes all modules from the runtime module repo",
-  handler: (argv) => {
-    argv.command = "repo-clean";
-  },
-  builder: (yargs2) => yargs2.option("force", {
-    alias: ["f"],
-    description: "Skip the prompt and force deletion",
-    boolean: true
-  })
-};
-var pwd = {
-  command: "pwd",
-  desc: "Print repo's current working directory",
-  handler: (argv) => {
-    argv.command = "repo-pwd";
-  }
-};
-var list = {
-  command: "list",
-  desc: "Show a report on what is installed in the repo",
-  handler: (argv) => {
-    argv.command = "repo-list";
-  }
-};
-
-// src/util/command-builders.ts
-var build = (opts2, yargs2) => opts2.reduce((_y, o) => yargs2.option(o.name, o.yargs), yargs2);
-var ensure = (command, opts2) => (yargs2) => {
-  yargs2.command = command;
-  opts2.filter((opt) => opt.ensure).forEach((opt) => {
-    opt.ensure(yargs2);
-  });
-};
-var override = (command, yargs2) => {
-  return {
-    ...command,
-    yargs: {
-      ...command.yargs || {},
-      ...yargs2
-    }
-  };
-};
-
 // src/options.ts
 import path2 from "node:path";
 var setDefaultValue = (opts2, key, value) => {
@@ -259,10 +188,10 @@ var outputPath = {
 };
 var repoDir = {
   name: "repo-dir",
-  yargs: {
+  yargs: () => ({
     description: "Provide a path to the repo root dir",
     default: process.env.OPENFN_REPO_DIR || DEFAULT_REPO_DIR
-  }
+  })
 };
 var start = {
   name: "start",
@@ -274,11 +203,28 @@ var start = {
 var strictOutput = {
   name: "no-strict-output",
   yargs: {
+    deprecated: true,
+    hidden: true,
+    boolean: true
+  },
+  ensure: (opts2) => {
+    if (!opts2.hasOwnProperty("strict")) {
+      opts2.strict = opts2.strictOutput;
+    }
+    delete opts2.strictOutput;
+  }
+};
+var strict = {
+  name: "strict",
+  yargs: {
+    default: false,
     boolean: true,
-    description: "Allow properties other than data to be returned in the output"
+    description: "Enables strict state handling, meaning only state.data is returned from a job."
   },
   ensure: (opts2) => {
-    setDefaultValue(opts2, "strictOutput", true);
+    if (!opts2.hasOwnProperty("strictOutput")) {
+      setDefaultValue(opts2, "strict", false);
+    }
   }
 };
 var skipAdaptorValidation = {
@@ -326,6 +272,85 @@ var useAdaptorsMonorepo = {
   }
 };
 
+// src/util/command-builders.ts
+var expandYargs = (y2) => {
+  if (typeof y2 === "function") {
+    return y2();
+  }
+  return y2;
+};
+var build = (opts2, yargs2) => opts2.reduce((_y, o) => yargs2.option(o.name, expandYargs(o.yargs)), yargs2);
+var ensure = (command, opts2) => (yargs2) => {
+  yargs2.command = command;
+  opts2.filter((opt) => opt.ensure).forEach((opt) => {
+    opt.ensure(yargs2);
+  });
+};
+var override = (command, yargs2) => {
+  return {
+    ...command,
+    yargs: {
+      ...command.yargs || {},
+      ...yargs2
+    }
+  };
+};
+
+// src/repo/command.ts
+var repo = {
+  command: "repo [subcommand]",
+  desc: "Run commands on the module repo (install|clean)",
+  builder: (yargs2) => yargs2.command(clean).command(install).command(list).example("repo install -a http", "Install @openfn/language-http").example("repo clean", "Remove everything from the repo working dir")
+};
+var installOptions = [
+  repoDir,
+  override(expandAdaptors, {
+    default: true,
+    hidden: true
+  }),
+  override(adaptors, {
+    description: "Specify which language-adaptor to install (allows short-form names to be used, eg, http)"
+  })
+];
+var install = {
+  command: "install [packages...]",
+  desc: "install one or more packages to the runtime repo. Use -a to pass shorthand adaptor names.",
+  handler: ensure("repo-install", installOptions),
+  builder: (yargs2) => build(installOptions, yargs2).example("install axios", "Install the axios npm package to the repo").example(
+    "install -a http",
+    "Install @openfn/language-http adaptor to the repo"
+  ).example(
+    "install @openfn/language-http",
+    "Install the language-http adaptor to the repo"
+  )
+};
+var clean = {
+  command: "clean",
+  desc: "Removes all modules from the runtime module repo",
+  handler: ensure("repo-clean", [repoDir]),
+  builder: (yargs2) => build(
+    [
+      repoDir,
+      {
+        name: "force",
+        yargs: {
+          alias: ["f"],
+          description: "Skip the prompt and force deletion",
+          boolean: true
+        }
+      }
+    ],
+    yargs2
+  )
+};
+var list = {
+  command: "list",
+  desc: "Show a report on what is installed in the repo",
+  aliases: ["$0"],
+  handler: ensure("repo-list", [repoDir]),
+  builder: (yargs2) => build([repoDir], yargs2)
+};
+
 // src/execute/command.ts
 var options = [
   expandAdaptors,
@@ -343,6 +368,7 @@ var options = [
   start,
   statePath,
   stateStdin,
+  strict,
   strictOutput,
   timeout,
   useAdaptorsMonorepo
@@ -353,7 +379,7 @@ var executeCommand = {
   
 Execute will run a job/workflow at the path and write the output state to disk (to ./state.json unless otherwise specified)
   
-By default only state.data will be written to the output. Include --no-strict-output to write the entire state object.
+By default only state.data will be returned fron a job. Include --no-strict to write the entire state object.
   
 Remember to include the adaptor name with -a. Auto install adaptors with the -i flag.`,
   aliases: ["$0"],
@@ -365,8 +391,8 @@ Remember to include the adaptor name with -a. Auto install adaptors with the -i
     "openfn foo/job.js",
     "Execute foo/job.js with no adaptor and write the final state to foo/job.json"
   ).example(
-    "openfn workflow.json -ia common",
-    "Execute workflow.json using @openfn/language-commom (with autoinstall enabled)"
+    "openfn workflow.json -i",
+    "Execute workflow.json with autoinstall enabled"
   ).example(
     "openfn job.js -a common --log info",
     "Execute job.js with common adaptor and info-level logging"

package/dist/process/runner.js

@@ -1,41 +1,90 @@
 import {
-  CLI,
-  COMPILER,
-  JOB,
-  RUNTIME,
-  createNullLogger,
-  defaultLogger,
-  ensureLogOpts,
-  ensureOpts,
-  expand_adaptors_default,
-  logger_default,
-  printDuration
-} from "../chunk-DOKL2XM5.js";
+  DEFAULT_REPO_DIR,
+  expand_adaptors_default
+} from "../chunk-UBDWXKSG.js";
 
 // src/execute/execute.ts
 import run, { getNameAndVersion } from "@openfn/runtime";
-var execute_default = (input, state, opts) => {
-  return run(input, state, {
-    start: opts.start,
-    timeout: opts.timeout,
-    immutableState: opts.immutable,
-    logger: logger_default(RUNTIME, opts),
-    jobLogger: logger_default(JOB, opts),
-    linker: {
-      repo: opts.repoDir,
-      modules: parseAdaptors(opts)
-    }
+
+// src/util/logger.ts
+import actualCreateLogger, { printDuration } from "@openfn/logger";
+import { isValidLogLevel, defaultLogger } from "@openfn/logger";
+var CLI = "cli";
+var COMPILER = "compiler";
+var RUNTIME = "runtime";
+var JOB = "job";
+var namespaces = {
+  [CLI]: "CLI",
+  [RUNTIME]: "R/T",
+  [COMPILER]: "CMP",
+  [JOB]: "JOB"
+};
+var createLogger = (name = "", options) => {
+  const logOptions = options.log || {};
+  let json = false;
+  let level = logOptions[name] || logOptions.default || "default";
+  if (options.logJson) {
+    json = true;
+  }
+  return actualCreateLogger(namespaces[name] || name, {
+    level,
+    json,
+    ...logOptions
   });
 };
+var logger_default = createLogger;
+var createNullLogger = () => createLogger(void 0, { log: { default: "none" } });
+
+// src/util/abort.ts
+var AbortError = class extends Error {
+  constructor(reason) {
+    super(reason);
+    this.handled = true;
+  }
+};
+var abort_default = (logger, reason, error, help) => {
+  const e = new AbortError(reason);
+  logger.error(reason);
+  if (error) {
+    logger.error(error.message);
+  }
+  if (help) {
+    logger.always(help);
+  }
+  logger.break();
+  logger.error("Critical error: aborting command");
+  throw e;
+};
+
+// src/execute/execute.ts
+var execute_default = async (input, state, opts, logger) => {
+  try {
+    const result = await run(input, state, {
+      strict: opts.strict,
+      start: opts.start,
+      timeout: opts.timeout,
+      immutableState: opts.immutable,
+      logger: logger_default(RUNTIME, opts),
+      jobLogger: logger_default(JOB, opts),
+      linker: {
+        repo: opts.repoDir,
+        modules: parseAdaptors(opts)
+      }
+    });
+    return result;
+  } catch (e) {
+    abort_default(logger, "Invalid workflow", e);
+  }
+};
 function parseAdaptors(opts) {
   const extractInfo = (specifier) => {
-    const [module, path6] = specifier.split("=");
+    const [module, path7] = specifier.split("=");
     const { name, version } = getNameAndVersion(module);
     const info = {
       name
     };
-    if (path6) {
-      info.path = path6;
+    if (path7) {
+      info.path = path7;
     }
     if (version) {
       info.version = version;
@@ -66,14 +115,14 @@ import { writeFile } from "node:fs/promises";
 var serializeOutput = async (options, result, logger) => {
   let output = result;
   if (output && (output.configuration || output.data)) {
-    const { data, configuration, ...rest } = result;
-    if (options.strictOutput !== false) {
-      output = { data };
+    if (options.strict) {
+      output = { data: output.data };
+      if (result.errors) {
+        output.errors = result.errors;
+      }
     } else {
-      output = {
-        data,
-        ...rest
-      };
+      const { configuration, ...rest } = result;
+      output = rest;
     }
   }
   if (output === void 0) {
@@ -83,10 +132,11 @@ var serializeOutput = async (options, result, logger) => {
   }
   if (options.outputStdout) {
     logger.success(`Result: `);
-    logger.success(output);
+    logger.always(output);
   } else if (options.outputPath) {
-    logger.success(`Writing output to ${options.outputPath}`);
+    logger.debug(`Writing output to ${options.outputPath}`);
     await writeFile(options.outputPath, output);
+    logger.success(`State written to ${options.outputPath}`);
   }
   return output;
 };
@@ -115,16 +165,13 @@ import { exec } from "node:child_process";
 import treeify from "treeify";
 import { install as rtInstall, loadRepoPkg } from "@openfn/runtime";
 var install = async (opts, log = defaultLogger) => {
-  let { packages, adaptor, repoDir } = opts;
-  if (packages) {
+  let { packages, adaptors, repoDir } = opts;
+  const targets = [].concat(packages ?? [], adaptors ?? []);
+  if (targets) {
     log.timer("install");
     log.success("Installing packages...");
     log.debug("repoDir is set to:", repoDir);
-    if (adaptor) {
-      const expanded = expand_adaptors_default({ adaptors: packages });
-      packages = expanded.adaptors;
-    }
-    await rtInstall(packages ?? [], repoDir, log);
+    await rtInstall(targets, repoDir, log);
     const duration = log.timer("install");
     log.success(`Installation complete in ${duration}`);
   }
@@ -190,16 +237,28 @@ var compile_default = async (opts, log) => {
   if (opts.workflow) {
     job = compileWorkflow(opts.workflow, opts, log);
   } else {
-    const compilerOptions = await loadTransformOptions(opts, log);
-    job = compile(opts.job || opts.jobPath, compilerOptions);
+    job = await compileJob(opts.job || opts.jobPath, opts, log);
   }
   if (opts.jobPath) {
-    log.success(`Compiled job from ${opts.jobPath}`);
+    log.success(`Compiled from ${opts.jobPath}`);
   } else {
-    log.success("Compiled job");
+    log.success("Compilation complete");
   }
   return job;
 };
+var compileJob = async (job, opts, log, jobName) => {
+  try {
+    const compilerOptions = await loadTransformOptions(opts, log);
+    return compile(job, compilerOptions);
+  } catch (e) {
+    abort_default(
+      log,
+      `Failed to compile job ${jobName ?? ""}`.trim(),
+      e,
+      "Check the syntax of the job expression:\n\n" + job
+    );
+  }
+};
 var compileWorkflow = async (workflow, opts, log) => {
   for (const job of workflow.jobs) {
     const jobOpts = {
@@ -208,9 +267,13 @@ var compileWorkflow = async (workflow, opts, log) => {
     if (job.adaptor) {
       jobOpts.adaptors = [job.adaptor];
     }
-    const compilerOptions = await loadTransformOptions(jobOpts, log);
     if (job.expression) {
-      job.expression = compile(job.expression, compilerOptions);
+      job.expression = await compileJob(
+        job.expression,
+        jobOpts,
+        log,
+        job.id
+      );
     }
   }
   return workflow;
@@ -223,10 +286,10 @@ var stripVersionSpecifier = (specifier) => {
   return specifier;
 };
 var resolveSpecifierPath = async (pattern, repoDir, log) => {
-  const [specifier, path6] = pattern.split("=");
-  if (path6) {
-    log.debug(`Resolved ${specifier} to path: ${path6}`);
-    return path6;
+  const [specifier, path7] = pattern.split("=");
+  if (path7) {
+    log.debug(`Resolved ${specifier} to path: ${path7}`);
+    return path7;
   }
   const repoPath = await getModulePath(specifier, repoDir, log);
   if (repoPath) {
@@ -243,16 +306,16 @@ var loadTransformOptions = async (opts, log) => {
     const [pattern] = opts.adaptors;
     const [specifier] = pattern.split("=");
     log.debug(`Attempting to preload types for ${specifier}`);
-    const path6 = await resolveSpecifierPath(pattern, opts.repoDir, log);
-    if (path6) {
+    const path7 = await resolveSpecifierPath(pattern, opts.repoDir, log);
+    if (path7) {
       try {
         exports = await preloadAdaptorExports(
-          path6,
+          path7,
           opts.useAdaptorsMonorepo,
           log
         );
       } catch (e) {
-        log.error(`Failed to load adaptor typedefs from path ${path6}`);
+        log.error(`Failed to load adaptor typedefs from path ${path7}`);
         log.error(e);
       }
     }
@@ -340,7 +403,6 @@ import path from "node:path";
 import fs2 from "node:fs/promises";
 import { isPath } from "@openfn/compiler";
 var load_input_default = async (opts, log) => {
-  log.debug("Loading input...");
   const { job, workflow, jobPath, workflowPath } = opts;
   if (workflow || workflowPath) {
     return loadWorkflow(opts, log);
@@ -349,36 +411,94 @@ var load_input_default = async (opts, log) => {
     return job;
   }
   if (jobPath) {
-    log.debug(`Loading job from ${jobPath}`);
-    opts.job = await fs2.readFile(jobPath, "utf8");
-    return opts.job;
+    try {
+      log.debug(`Loading job from ${jobPath}`);
+      opts.job = await fs2.readFile(jobPath, "utf8");
+      return opts.job;
+    } catch (e) {
+      abort_default(
+        log,
+        "Job not found",
+        void 0,
+        `Failed to load the job from ${jobPath}`
+      );
+    }
   }
 };
-var fetchFile = (rootDir, filePath) => {
-  const jobPath = filePath.startsWith("~") ? filePath : path.resolve(rootDir, filePath);
-  return fs2.readFile(jobPath, "utf8");
-};
 var loadWorkflow = async (opts, log) => {
   const { workflowPath, workflow } = opts;
+  const readWorkflow = async () => {
+    try {
+      const text = await fs2.readFile(workflowPath, "utf8");
+      return text;
+    } catch (e) {
+      abort_default(
+        log,
+        "Workflow not found",
+        void 0,
+        `Failed to load a workflow from ${workflowPath}`
+      );
+    }
+  };
+  const parseWorkflow = (contents) => {
+    try {
+      return JSON.parse(contents);
+    } catch (e) {
+      abort_default(
+        log,
+        "Invalid JSON in workflow",
+        e,
+        `Check the syntax of the JSON at ${workflowPath}`
+      );
+    }
+  };
+  const fetchWorkflowFile = async (jobId, rootDir = "", filePath) => {
+    try {
+      const fullPath = filePath.startsWith("~") ? filePath : path.resolve(rootDir, filePath);
+      const result = await fs2.readFile(fullPath, "utf8");
+      return result;
+    } catch (e) {
+      abort_default(
+        log,
+        `File not found for job ${jobId}: ${filePath}`,
+        void 0,
+        `This workflow references a file which cannot be found at ${filePath}
+
+Paths inside the workflow are relative to the workflow.json`
+      );
+    }
+  };
   log.debug(`Loading workflow from ${workflowPath}`);
   try {
     let wf;
     let rootDir = opts.baseDir;
     if (workflowPath) {
-      const workflowRaw = await fs2.readFile(workflowPath, "utf8");
-      wf = JSON.parse(workflowRaw);
+      let workflowRaw = await readWorkflow();
+      wf = parseWorkflow(workflowRaw);
       if (!rootDir) {
         rootDir = path.dirname(workflowPath);
       }
     } else {
       wf = workflow;
     }
+    let idx = 0;
     for (const job of wf.jobs) {
-      if (typeof job.expression === "string" && isPath(job.expression)) {
-        job.expression = await fetchFile(rootDir, job.expression);
+      idx += 1;
+      const expressionStr = typeof job.expression === "string" && job.expression?.trim();
+      const configurationStr = typeof job.configuration === "string" && job.configuration?.trim();
+      if (expressionStr && isPath(expressionStr)) {
+        job.expression = await fetchWorkflowFile(
+          job.id || `${idx}`,
+          rootDir,
+          expressionStr
+        );
       }
-      if (typeof job.configuration === "string" && isPath(job.configuration)) {
-        const configString = await fetchFile(rootDir, job.configuration);
+      if (configurationStr && isPath(configurationStr)) {
+        const configString = await fetchWorkflowFile(
+          job.id || `${idx}`,
+          rootDir,
+          configurationStr
+        );
         job.configuration = JSON.parse(configString);
       }
     }
@@ -418,15 +538,23 @@ var executeHandler = async (options, logger) => {
     logger.info("Skipping compilation as noCompile is set");
   }
   try {
-    const result = await execute_default(input, state, options);
+    const result = await execute_default(input, state, options, logger);
     await serialize_output_default(options, result, logger);
     const duration = printDuration(new Date().getTime() - start);
-    logger.success(`Done in ${duration}! \u2728`);
+    if (result.errors) {
+      logger.warn(
+        `Errors reported in ${Object.keys(result.errors).length} jobs`
+      );
+    }
+    logger.success(`Finished in ${duration}${result.errors ? "" : " \u2728"}`);
     return result;
-  } catch (error) {
-    logger.error(error);
+  } catch (err) {
+    if (!err.handled) {
+      logger.error("Unexpected error in execution");
+      logger.error(err);
+    }
     const duration = printDuration(new Date().getTime() - start);
-    logger.error(`Took ${duration}.`);
+    logger.always(`Workflow failed in ${duration}.`);
     process.exitCode = 1;
   }
 };
@@ -509,20 +637,20 @@ var RETRY_COUNT = 20;
 var TIMEOUT_MS = 1e3 * 60;
 var actualDocGen = (specifier) => describePackage(specifier, {});
 var ensurePath = (filePath) => mkdirSync(path2.dirname(filePath), { recursive: true });
-var generatePlaceholder = (path6) => {
-  writeFileSync(path6, `{ "loading": true, "timestamp": ${Date.now()}}`);
+var generatePlaceholder = (path7) => {
+  writeFileSync(path7, `{ "loading": true, "timestamp": ${Date.now()}}`);
 };
 var finish = (logger, resultPath) => {
   logger.success("Done! Docs can be found at:\n");
   logger.print(`  ${path2.resolve(resultPath)}`);
 };
-var generateDocs = async (specifier, path6, docgen, logger) => {
+var generateDocs = async (specifier, path7, docgen, logger) => {
   const result = await docgen(specifier);
-  await writeFile3(path6, JSON.stringify(result, null, 2));
-  finish(logger, path6);
-  return path6;
+  await writeFile3(path7, JSON.stringify(result, null, 2));
+  finish(logger, path7);
+  return path7;
 };
-var waitForDocs = async (docs, path6, logger, retryDuration = RETRY_DURATION) => {
+var waitForDocs = async (docs, path7, logger, retryDuration = RETRY_DURATION) => {
   try {
     if (docs.hasOwnProperty("loading")) {
       logger.info("Docs are being loaded by another process. Waiting.");
@@ -534,19 +662,19 @@ var waitForDocs = async (docs, path6, logger, retryDuration = RETRY_DURATION) =>
             clearInterval(i);
             reject(new Error("Timed out waiting for docs to load"));
           }
-          const updated = JSON.parse(readFileSync(path6, "utf8"));
+          const updated = JSON.parse(readFileSync(path7, "utf8"));
           if (!updated.hasOwnProperty("loading")) {
             logger.info("Docs found!");
             clearInterval(i);
-            resolve(path6);
+            resolve(path7);
           }
           count++;
         }, retryDuration);
       });
     } else {
-      logger.info(`Docs already written to cache at ${path6}`);
-      finish(logger, path6);
-      return path6;
+      logger.info(`Docs already written to cache at ${path7}`);
+      finish(logger, path7);
+      return path7;
     }
   } catch (e) {
     logger.error("Existing doc JSON corrupt. Aborting");
@@ -563,28 +691,28 @@ var docgenHandler = (options, logger, docgen = actualDocGen, retryDuration = RET
     process.exit(9);
   }
   logger.success(`Generating docs for ${specifier}`);
-  const path6 = `${repoDir}/docs/${specifier}.json`;
-  ensurePath(path6);
+  const path7 = `${repoDir}/docs/${specifier}.json`;
+  ensurePath(path7);
   const handleError = () => {
     logger.info("Removing placeholder");
-    rmSync(path6);
+    rmSync(path7);
   };
   try {
-    const existing = readFileSync(path6, "utf8");
+    const existing = readFileSync(path7, "utf8");
     const json = JSON.parse(existing);
     if (json && json.timeout && Date.now() - json.timeout >= TIMEOUT_MS) {
       logger.info(`Expired placeholder found. Removing.`);
-      rmSync(path6);
+      rmSync(path7);
       throw new Error("TIMEOUT");
     }
-    return waitForDocs(json, path6, logger, retryDuration);
+    return waitForDocs(json, path7, logger, retryDuration);
   } catch (e) {
     if (e.message !== "TIMEOUT") {
-      logger.info(`Docs JSON not found at ${path6}`);
+      logger.info(`Docs JSON not found at ${path7}`);
     }
     logger.debug("Generating placeholder");
-    generatePlaceholder(path6);
-    return generateDocs(specifier, path6, docgen, logger).catch((e2) => {
+    generatePlaceholder(path7);
+    return generateDocs(specifier, path7, docgen, logger).catch((e2) => {
       logger.error("Error generating documentation");
       logger.error(e2);
       handleError();
@@ -633,7 +761,7 @@ var docsHandler = async (options, logger) => {
     logger.success(`Showing docs for ${adaptorName} v${version}`);
   }
   logger.info("Generating/loading documentation...");
-  const path6 = await handler_default4(
+  const path7 = await handler_default4(
     {
       specifier: `${name}@${version}`,
       repoDir
@@ -641,8 +769,8 @@ var docsHandler = async (options, logger) => {
     createNullLogger()
   );
   let didError = false;
-  if (path6) {
-    const source = await readFile(path6, "utf8");
+  if (path7) {
+    const source = await readFile(path7, "utf8");
     const data = JSON.parse(source);
     let desc;
     if (operation) {
@@ -788,9 +916,104 @@ var metadataHandler = async (options, logger) => {
 };
 var handler_default6 = metadataHandler;
 
+// src/util/ensure-opts.ts
+import path4 from "node:path";
+var defaultLoggerOptions = {
+  default: "default",
+  job: "debug"
+};
+var ERROR_MESSAGE_LOG_LEVEL = "Unknown log level. Valid levels are none, debug, info and default.";
+var ERROR_MESSAGE_LOG_COMPONENT = "Unknown log component. Valid components are cli, compiler, runtime and job.";
+var componentShorthands = {
+  cmp: "compiler",
+  rt: "runtime",
+  "r/t": "runtime"
+};
+var isValidComponent = (v) => /^(cli|runtime|compiler|job|default)$/i.test(v);
+var ensureLogOpts = (opts) => {
+  const components = {};
+  if (!opts.log && /^(version|test)$/.test(opts.command)) {
+    opts.log = { default: "info" };
+    return opts;
+  } else if (opts.log) {
+    opts.log.forEach((l) => {
+      let component = "";
+      let level = "";
+      if (l.match(/=/)) {
+        const parts = l.split("=");
+        component = parts[0].toLowerCase();
+        if (componentShorthands[component]) {
+          component = componentShorthands[component];
+        }
+        level = parts[1].toLowerCase();
+      } else {
+        component = "default";
+        level = l.toLowerCase();
+      }
+      if (!isValidComponent(component)) {
+        throw new Error(ERROR_MESSAGE_LOG_COMPONENT);
+      }
+      level = level.toLowerCase();
+      if (!isValidLogLevel(level)) {
+        throw new Error(ERROR_MESSAGE_LOG_LEVEL);
+      }
+      components[component] = level;
+    });
+  }
+  opts.log = {
+    ...defaultLoggerOptions,
+    ...components
+  };
+  return opts;
+};
+function ensureOpts(basePath = ".", opts) {
+  const newOpts = {
+    adaptor: opts.adaptor,
+    adaptors: opts.adaptors || [],
+    autoinstall: opts.autoinstall,
+    command: opts.command,
+    expandAdaptors: opts.expandAdaptors !== false,
+    force: opts.force || false,
+    immutable: opts.immutable || false,
+    log: opts.log,
+    logJson: typeof opts.logJson == "boolean" ? opts.logJson : Boolean(process.env.OPENFN_LOG_JSON),
+    compile: Boolean(opts.compile),
+    operation: opts.operation,
+    outputStdout: Boolean(opts.outputStdout),
+    packages: opts.packages,
+    repoDir: opts.repoDir || process.env.OPENFN_REPO_DIR || DEFAULT_REPO_DIR,
+    skipAdaptorValidation: opts.skipAdaptorValidation ?? false,
+    specifier: opts.specifier,
+    stateStdin: opts.stateStdin,
+    timeout: opts.timeout
+  };
+  const set2 = (key, value) => {
+    newOpts[key] = opts.hasOwnProperty(key) ? opts[key] : value;
+  };
+  if (opts.useAdaptorsMonorepo) {
+    newOpts.monorepoPath = process.env.OPENFN_ADAPTORS_REPO || "ERR";
+  }
+  let baseDir = basePath;
+  if (basePath.endsWith(".js")) {
+    baseDir = path4.dirname(basePath);
+    set2("jobPath", basePath);
+  } else {
+    set2("jobPath", `${baseDir}/job.js`);
+  }
+  set2("statePath", `${baseDir}/state.json`);
+  if (!opts.outputStdout) {
+    set2(
+      "outputPath",
+      newOpts.command === "compile" ? `${baseDir}/output.js` : `${baseDir}/output.json`
+    );
+  }
+  ensureLogOpts(newOpts);
+  return newOpts;
+}
+
 // src/util/use-adaptors-repo.ts
 import { readFile as readFile2 } from "node:fs/promises";
-import path4 from "node:path";
+import path5 from "node:path";
 import assert from "node:assert";
 import { getNameAndVersion as getNameAndVersion5 } from "@openfn/runtime";
 var validateMonoRepo = async (repoPath, log) => {
@@ -814,7 +1037,7 @@ var updatePath = (adaptor, repoPath, log) => {
     );
   }
   const shortName = name.replace("@openfn/language-", "");
-  const abspath = path4.resolve(repoPath, "packages", shortName);
+  const abspath = path5.resolve(repoPath, "packages", shortName);
   return `${name}=${abspath}`;
 };
 var useAdaptorsRepo = async (adaptors, repoPath, log) => {
@@ -831,7 +1054,7 @@ var use_adaptors_repo_default = useAdaptorsRepo;
 
 // src/util/print-versions.ts
 import { readFileSync as readFileSync3 } from "node:fs";
-import path5 from "node:path";
+import path6 from "node:path";
 import { getNameAndVersion as getNameAndVersion6 } from "@openfn/runtime";
 import { mainSymbols } from "figures";
 var NODE = "node.js";
@@ -841,7 +1064,7 @@ var COMPILER2 = "compiler";
 var { triangleRightSmall: t } = mainSymbols;
 var loadVersionFromPath = (adaptorPath) => {
   try {
-    const pkg = JSON.parse(readFileSync3(path5.resolve(adaptorPath, "package.json"), "utf8"));
+    const pkg = JSON.parse(readFileSync3(path6.resolve(adaptorPath, "package.json"), "utf8"));
     return pkg.version;
   } catch (e) {
     return "unknown";
@@ -918,7 +1141,7 @@ var handlers = {
   ["repo-list"]: list,
   version: async (opts, logger) => print_versions_default(logger, opts)
 };
-var maybeEnsureOpts = (basePath, options) => /^(execute|compile|test)$/.test(options.command) ? ensureLogOpts(options) : ensureOpts(basePath, options);
+var maybeEnsureOpts = (basePath, options) => /(^(execute|compile|test)$)|(repo-)/.test(options.command) ? ensureLogOpts(options) : ensureOpts(basePath, options);
 var parse = async (basePath, options, log) => {
   const opts = maybeEnsureOpts(basePath, options);
   const logger = log || logger_default(CLI, opts);
@@ -964,9 +1187,12 @@ var parse = async (basePath, options, log) => {
     if (!process.exitCode) {
       process.exitCode = e.exitCode || 1;
     }
-    logger.break();
-    logger.error("Command failed!");
-    logger.error(e);
+    if (e.handled) {
+    } else {
+      logger.break();
+      logger.error("Command failed!");
+      logger.error(e);
+    }
   }
 };
 var commands_default = parse;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/cli",
-  "version": "0.0.38",
+  "version": "0.0.40",
   "description": "CLI devtools for the openfn toolchain.",
   "engines": {
     "node": ">=18",
@@ -36,10 +36,10 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@openfn/compiler": "0.0.31",
+    "@openfn/compiler": "0.0.32",
     "@openfn/describe-package": "0.0.16",
-    "@openfn/logger": "0.0.12",
-    "@openfn/runtime": "0.0.23",
+    "@openfn/logger": "0.0.13",
+    "@openfn/runtime": "0.0.25",
     "figures": "^5.0.0",
     "rimraf": "^3.0.2",
     "treeify": "^1.1.0",

package/dist/chunk-DOKL2XM5.js

@@ -1,166 +0,0 @@
-// src/util/expand-adaptors.ts
-var expand = (name) => {
-  if (typeof name === "string") {
-    const [left] = name.split("=");
-    if (left.match("/") || left.endsWith(".js")) {
-      return name;
-    }
-    return `@openfn/language-${name}`;
-  }
-  return name;
-};
-var expand_adaptors_default = (opts) => {
-  const { adaptors, workflow } = opts;
-  if (adaptors) {
-    opts.adaptors = adaptors?.map(expand);
-  }
-  if (workflow) {
-    Object.values(workflow.jobs).forEach((job) => {
-      if (job.adaptor) {
-        job.adaptor = expand(job.adaptor);
-      }
-    });
-  }
-  return opts;
-};
-
-// src/util/logger.ts
-import actualCreateLogger, { printDuration } from "@openfn/logger";
-import { isValidLogLevel, defaultLogger } from "@openfn/logger";
-var CLI = "cli";
-var COMPILER = "compiler";
-var RUNTIME = "runtime";
-var JOB = "job";
-var namespaces = {
-  [CLI]: "CLI",
-  [RUNTIME]: "R/T",
-  [COMPILER]: "CMP",
-  [JOB]: "JOB"
-};
-var createLogger = (name = "", options) => {
-  const logOptions = options.log || {};
-  let json = false;
-  let level = logOptions[name] || logOptions.default || "default";
-  if (options.logJson) {
-    json = true;
-  }
-  return actualCreateLogger(namespaces[name] || name, {
-    level,
-    json,
-    ...logOptions
-  });
-};
-var logger_default = createLogger;
-var createNullLogger = () => createLogger(void 0, { log: { default: "none" } });
-
-// src/util/ensure-opts.ts
-import path from "node:path";
-var defaultLoggerOptions = {
-  default: "default",
-  job: "debug"
-};
-var ERROR_MESSAGE_LOG_LEVEL = "Unknown log level. Valid levels are none, debug, info and default.";
-var ERROR_MESSAGE_LOG_COMPONENT = "Unknown log component. Valid components are cli, compiler, runtime and job.";
-var DEFAULT_REPO_DIR = "/tmp/openfn/repo";
-var componentShorthands = {
-  cmp: "compiler",
-  rt: "runtime",
-  "r/t": "runtime"
-};
-var isValidComponent = (v) => /^(cli|runtime|compiler|job|default)$/i.test(v);
-var ensureLogOpts = (opts) => {
-  const components = {};
-  if (!opts.log && /^(version|test)$/.test(opts.command)) {
-    opts.log = { default: "info" };
-    return opts;
-  } else if (opts.log) {
-    opts.log.forEach((l) => {
-      let component = "";
-      let level = "";
-      if (l.match(/=/)) {
-        const parts = l.split("=");
-        component = parts[0].toLowerCase();
-        if (componentShorthands[component]) {
-          component = componentShorthands[component];
-        }
-        level = parts[1].toLowerCase();
-      } else {
-        component = "default";
-        level = l.toLowerCase();
-      }
-      if (!isValidComponent(component)) {
-        throw new Error(ERROR_MESSAGE_LOG_COMPONENT);
-      }
-      level = level.toLowerCase();
-      if (!isValidLogLevel(level)) {
-        throw new Error(ERROR_MESSAGE_LOG_LEVEL);
-      }
-      components[component] = level;
-    });
-  }
-  opts.log = {
-    ...defaultLoggerOptions,
-    ...components
-  };
-  return opts;
-};
-function ensureOpts(basePath = ".", opts) {
-  const newOpts = {
-    adaptor: opts.adaptor,
-    adaptors: opts.adaptors || [],
-    autoinstall: opts.autoinstall,
-    command: opts.command,
-    expandAdaptors: opts.expandAdaptors !== false,
-    force: opts.force || false,
-    immutable: opts.immutable || false,
-    log: opts.log,
-    logJson: typeof opts.logJson == "boolean" ? opts.logJson : Boolean(process.env.OPENFN_LOG_JSON),
-    compile: Boolean(opts.compile),
-    operation: opts.operation,
-    outputStdout: Boolean(opts.outputStdout),
-    packages: opts.packages,
-    repoDir: opts.repoDir || process.env.OPENFN_REPO_DIR || DEFAULT_REPO_DIR,
-    skipAdaptorValidation: opts.skipAdaptorValidation ?? false,
-    specifier: opts.specifier,
-    stateStdin: opts.stateStdin,
-    strictOutput: opts.strictOutput ?? true,
-    timeout: opts.timeout
-  };
-  const set = (key, value) => {
-    newOpts[key] = opts.hasOwnProperty(key) ? opts[key] : value;
-  };
-  if (opts.useAdaptorsMonorepo) {
-    newOpts.monorepoPath = process.env.OPENFN_ADAPTORS_REPO || "ERR";
-  }
-  let baseDir = basePath;
-  if (basePath.endsWith(".js")) {
-    baseDir = path.dirname(basePath);
-    set("jobPath", basePath);
-  } else {
-    set("jobPath", `${baseDir}/job.js`);
-  }
-  set("statePath", `${baseDir}/state.json`);
-  if (!opts.outputStdout) {
-    set(
-      "outputPath",
-      newOpts.command === "compile" ? `${baseDir}/output.js` : `${baseDir}/output.json`
-    );
-  }
-  ensureLogOpts(newOpts);
-  return newOpts;
-}
-
-export {
-  expand_adaptors_default,
-  printDuration,
-  CLI,
-  COMPILER,
-  RUNTIME,
-  JOB,
-  logger_default,
-  createNullLogger,
-  defaultLogger,
-  DEFAULT_REPO_DIR,
-  ensureLogOpts,
-  ensureOpts
-};