OpenFn · josephjclark · May 10, 2026 · May 7, 2026 · May 7, 2026 · May 8, 2026
diff --git a/integration-tests/cli/CHANGELOG.md b/integration-tests/cli/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @openfn/integration-tests-cli
 
+## 1.0.21
+
+### Patch Changes
+
+- @openfn/lightning-mock@2.4.16
+- @openfn/project@0.15.1
+
 ## 1.0.20
 
 ### Patch Changes

diff --git a/integration-tests/cli/package.json b/integration-tests/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@openfn/integration-tests-cli",
   "private": true,
-  "version": "1.0.20",
+  "version": "1.0.21",
   "description": "CLI integration tests",
   "author": "Open Function Group <admin@openfn.org>",
   "license": "ISC",

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @openfn/cli
 
+## 1.35.2
+
+### Patch Changes
+
+Update type interfaces to match new portability spec.
+
+- Updated dependencies [728e6cb]
+- Updated dependencies [380bccd]
+  - @openfn/lexicon@2.0.0
+  - @openfn/runtime@1.9.3
+  - @openfn/compiler@1.2.5
+  - @openfn/project@0.15.1
+
 ## 1.35.1
 
 ### Patch Changes

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfn/cli",
-  "version": "1.35.1",
+  "version": "1.35.2",
   "description": "CLI devtools for the OpenFn toolchain",
   "engines": {
     "node": ">=18",

diff --git a/packages/cli/src/compile/compile.ts b/packages/cli/src/compile/compile.ts
@@ -3,12 +3,8 @@ import compile, {
   Options,
   getExports,
 } from '@openfn/compiler';
-import { getModulePath } from '@openfn/runtime';
-import type {
-  ExecutionPlan,
-  Job,
-  SourceMapWithOperations,
-} from '@openfn/lexicon';
+import { getModulePath, type ExecutionPlan, type Job } from '@openfn/runtime';
+import type { SourceMapWithOperations } from '@openfn/lexicon';
 
 import createLogger, { COMPILER, Logger } from '../util/logger';
 import abort from '../util/abort';

diff --git a/packages/cli/src/execute/apply-credential-map.ts b/packages/cli/src/execute/apply-credential-map.ts
@@ -3,7 +3,7 @@
  * and apply credentials to each step
  */
 
-import { ExecutionPlan } from '@openfn/lexicon';
+import { ExecutionPlan } from '@openfn/runtime';
 import { Logger } from '../util';
 
 type JobId = string;

diff --git a/packages/cli/src/execute/execute.ts b/packages/cli/src/execute/execute.ts
@@ -1,6 +1,7 @@
 import run, { NOTIFY_JOB_COMPLETE, getNameAndVersion } from '@openfn/runtime';
-import type { ExecutionPlan, Job } from '@openfn/lexicon';
 import type {
+  ExecutionPlan,
+  Job,
   ModuleInfo,
   ModuleInfoMap,
   NotifyJobCompletePayload,

diff --git a/packages/cli/src/execute/get-autoinstall-targets.ts b/packages/cli/src/execute/get-autoinstall-targets.ts
@@ -1,4 +1,4 @@
-import { ExecutionPlan, Job } from '@openfn/lexicon';
+import { ExecutionPlan, Job } from '@openfn/runtime';
 
 const getAutoinstallTargets = (plan: ExecutionPlan) => {
   const adaptors = {} as Record<string, true>;

diff --git a/packages/cli/src/execute/handler.ts b/packages/cli/src/execute/handler.ts
@@ -1,4 +1,4 @@
-import type { ExecutionPlan } from '@openfn/lexicon';
+import type { ExecutionPlan } from '@openfn/runtime';
 import path from 'node:path';
 
 import type { ExecuteOptions } from './command';

diff --git a/packages/cli/src/metadata/handler.ts b/packages/cli/src/metadata/handler.ts
@@ -2,8 +2,11 @@ import { Logger } from '../util/logger';
 import { MetadataOpts } from './command';
 import loadState from '../util/load-state';
 import * as cache from './cache';
-import { getModuleEntryPoint, registerEsmHook } from '@openfn/runtime';
-import { ExecutionPlan } from '@openfn/lexicon';
+import {
+  getModuleEntryPoint,
+  registerEsmHook,
+  type ExecutionPlan,
+} from '@openfn/runtime';
 import { install, removePackage } from '../repo/handler';
 
 // Add created date stamp to the metadata object

diff --git a/packages/cli/src/test/handler.ts b/packages/cli/src/test/handler.ts
@@ -1,4 +1,4 @@
-import type { ExecutionPlan } from '@openfn/lexicon';
+import type { ExecutionPlan } from '@openfn/runtime';
 
 import { TestOptions } from './command';
 import { createNullLogger, Logger } from '../util/logger';

diff --git a/packages/cli/src/types.ts b/packages/cli/src/types.ts
@@ -1,43 +1,34 @@
-// the executionPLan for the CLI is a bit differnt to the runtime's perspective
+import { WorkflowOptions } from '@openfn/lexicon';
+import type { ExecutionPlan, Job, Trigger } from '@openfn/runtime';
 
-import { Trigger, UUID, WorkflowOptions } from '@openfn/lexicon';
-
-// Ie config can be a string
 export type JobNodeID = string;
 
 export type OldCLIWorkflow = {
-  id?: string; // UUID for this plan
+  id?: string;
   start?: JobNodeID;
   jobs: CLIJobNode[];
 };
 
-export type CLIExecutionPlan = {
-  id?: UUID;
+// Input-format wrapper around the runtime ExecutionPlan.
+// Accepts singular `adaptor` on jobs (normalized to `adaptors[]` by ensureAdaptors
+// before handing to the runtime) and adds the CLI-only collectionsEndpoint option.
+export type CLIExecutionPlan = Omit<ExecutionPlan, 'workflow' | 'options'> & {
   options?: WorkflowOptions & {
     collectionsEndpoint?: string;
   };
-  workflow: {
-    id?: string;
-    name?: string;
+  workflow: Omit<ExecutionPlan['workflow'], 'steps'> & {
     steps: Array<CLIJobNode | Trigger>;
-    globals?: string;
   };
 };
 
-export type CLIJobNode = {
-  id?: string;
-  expression?: string; // path or expression
-  configuration?: string | object; // path or credential object
+// Loose input variant of Job: `adaptor` (singular) is normalized to `adaptors[]`
+// by the CLI before the plan reaches the runtime.
+export type CLIJobNode = Job & {
   data?: any;
-  next?: string | Record<JobNodeID, true | CLIJobEdge>;
-
-  // We can accept a single adaptor or multiple
-  // The CLI will convert it to adaptors as an array
   adaptor?: string;
-  adaptors?: string[];
 };
 
 export type CLIJobEdge = {
-  condition?: string; // Javascript expression (function body, not function)
+  condition?: string;
   label?: string;
 };
diff --git a/packages/cli/src/util/cache.ts b/packages/cli/src/util/cache.ts
@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { rmdir } from 'node:fs/promises';
 
-import type { ExecutionPlan } from '@openfn/lexicon';
+import type { ExecutionPlan } from '@openfn/runtime';
 import type { Opts } from '../options';
 import type { Logger } from './logger';
 

diff --git a/packages/cli/src/util/expand-adaptors.ts b/packages/cli/src/util/expand-adaptors.ts
@@ -1,4 +1,4 @@
-import { ExecutionPlan, Job } from '@openfn/lexicon';
+import { ExecutionPlan, Job } from '@openfn/runtime';
 
 const expand = (name: string) => {
   if (typeof name === 'string') {

diff --git a/packages/cli/src/util/fuzzy-match-step.ts b/packages/cli/src/util/fuzzy-match-step.ts
@@ -1,4 +1,4 @@
-import { ExecutionPlan } from '@openfn/lexicon';
+import { ExecutionPlan } from '@openfn/runtime';
 
 export default (plan: ExecutionPlan, stepPattern?: string) => {
   if (stepPattern) {

diff --git a/packages/cli/src/util/load-plan.ts b/packages/cli/src/util/load-plan.ts
@@ -6,7 +6,8 @@ import { Workspace, yamlToJson } from '@openfn/project';
 import abort from './abort';
 import expandAdaptors from './expand-adaptors';
 import mapAdaptorsToMonorepo from './map-adaptors-to-monorepo';
-import type { ExecutionPlan, Job, WorkflowOptions } from '@openfn/lexicon';
+import type { WorkflowOptions } from '@openfn/lexicon';
+import type { ExecutionPlan, Job } from '@openfn/runtime';
 import type { Opts } from '../options';
 import type { Logger } from './logger';
 import type { CLIExecutionPlan, CLIJobNode, OldCLIWorkflow } from '../types';

diff --git a/packages/cli/src/util/load-state.ts b/packages/cli/src/util/load-state.ts
@@ -2,7 +2,7 @@ import fs from 'node:fs/promises';
 
 import { getCachePath } from './cache';
 
-import type { ExecutionPlan } from '@openfn/lexicon';
+import type { ExecutionPlan } from '@openfn/runtime';
 import type { Logger } from '@openfn/logger';
 import type { Opts } from '../options';
 

diff --git a/packages/cli/src/util/map-adaptors-to-monorepo.ts b/packages/cli/src/util/map-adaptors-to-monorepo.ts
@@ -2,8 +2,11 @@ import { readFile } from 'node:fs/promises';
 import path from 'node:path';
 import assert from 'node:assert';
 import { Logger } from '@openfn/logger';
-import { getNameAndVersion } from '@openfn/runtime';
-import type { ExecutionPlan, Job } from '@openfn/lexicon';
+import {
+  getNameAndVersion,
+  type ExecutionPlan,
+  type Job,
+} from '@openfn/runtime';
 
 import type { Opts } from '../options';
 

diff --git a/packages/cli/src/util/override-plan-adaptors.ts b/packages/cli/src/util/override-plan-adaptors.ts
@@ -1,4 +1,4 @@
-import { ExecutionPlan, Job, Step } from '@openfn/lexicon';
+import { ExecutionPlan, Job, Step } from '@openfn/runtime';
 
 function overridePlanAdaptors(
   plan: ExecutionPlan,

diff --git a/packages/cli/src/util/validate-plan.ts b/packages/cli/src/util/validate-plan.ts
@@ -1,4 +1,5 @@
-import { ExecutionPlan, Job, Trigger, WorkflowOptions } from '@openfn/lexicon';
+import { WorkflowOptions } from '@openfn/lexicon';
+import { ExecutionPlan, Job, Trigger } from '@openfn/runtime';
 import { Logger } from '@openfn/logger';
 
 const assertWorkflowStructure = (plan: ExecutionPlan, logger: Logger) => {

diff --git a/packages/cli/test/compile/compile.test.ts b/packages/cli/test/compile/compile.test.ts
@@ -11,7 +11,7 @@ import compile, {
 import { CompileOptions } from '../../src/compile/command';
 import { mockFs, resetMockFs } from '../util';
 
-import type { ExecutionPlan, Job } from '@openfn/lexicon';
+import type { ExecutionPlan, Job } from '@openfn/runtime';
 
 const mockLog = createMockLogger();
 

diff --git a/packages/cli/test/execute/get-autoinstall-targets.test.ts b/packages/cli/test/execute/get-autoinstall-targets.test.ts
@@ -1,7 +1,7 @@
 import test from 'ava';
 
 import getAutoinstallTargets from '../../src/execute/get-autoinstall-targets';
-import { ExecutionPlan, Job } from '@openfn/lexicon';
+import { ExecutionPlan, Job } from '@openfn/runtime';
 
 const getPlan = (steps: Job[]) =>
   ({

diff --git a/packages/cli/test/execute/parse-adaptors.test.ts b/packages/cli/test/execute/parse-adaptors.test.ts
@@ -1,5 +1,5 @@
 import test from 'ava';
-import { ExecutionPlan, Job } from '@openfn/lexicon';
+import { ExecutionPlan, Job } from '@openfn/runtime';
 
 import { parseAdaptors } from '../../src/execute/execute';
 

diff --git a/packages/cli/test/util.ts b/packages/cli/test/util.ts
@@ -4,7 +4,7 @@
 import mock from 'mock-fs';
 import path from 'node:path';
 
-import type { ExecutionPlan, Job, StepEdge } from '@openfn/lexicon';
+import type { ExecutionPlan, Job, StepEdge } from '@openfn/runtime';
 
 export const mockFs = (files: Record<string, string>) => {
   // We have to explicitly expose some modules paths so that dependencies can run in the tests

diff --git a/packages/cli/test/util/load-plan.test.ts b/packages/cli/test/util/load-plan.test.ts
@@ -2,7 +2,7 @@ import test from 'ava';
 import mock from 'mock-fs';
 import { createMockLogger } from '@openfn/logger';
 import { omit } from 'lodash-es';
-import type { Job } from '@openfn/lexicon';
+import type { Job } from '@openfn/runtime';
 
 import loadPlan from '../../src/util/load-plan';
 import { Opts } from '../../src/options';

diff --git a/packages/cli/test/util/map-adaptors-to-monorepo.test.ts b/packages/cli/test/util/map-adaptors-to-monorepo.test.ts
@@ -7,7 +7,7 @@ import mapAdaptorsToMonorepo, {
   validateMonoRepo,
   updatePath,
 } from '../../src/util/map-adaptors-to-monorepo';
-import { ExecutionPlan } from '@openfn/lexicon';
+import { ExecutionPlan } from '@openfn/runtime';
 
 const REPO_PATH = 'a/b/c';
 const ABS_REPO_PATH = path.resolve(REPO_PATH);

diff --git a/packages/cli/test/util/override-plan-adaptor.test.ts b/packages/cli/test/util/override-plan-adaptor.test.ts
@@ -1,4 +1,4 @@
-import { ExecutionPlan } from '@openfn/lexicon';
+import { ExecutionPlan } from '@openfn/runtime';
 import test from 'ava';
 import overridePlanAdaptors, {
   isJob,

diff --git a/packages/cli/test/util/validate-plan.test.ts b/packages/cli/test/util/validate-plan.test.ts
@@ -1,6 +1,6 @@
 import test from 'ava';
 import { createMockLogger } from '@openfn/logger';
-import type { ExecutionPlan } from '@openfn/lexicon';
+import type { ExecutionPlan } from '@openfn/runtime';
 import validate from '../../src/util/validate-plan';
 
 const logger = createMockLogger('', { level: 'debug' });

diff --git a/packages/compiler/CHANGELOG.md b/packages/compiler/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @openfn/compiler
 
+## 1.2.5
+
+### Patch Changes
+
+Update type interfaces to match new portability spec.
+
+- Updated dependencies [728e6cb]
+  - @openfn/lexicon@2.0.0
+
 ## 1.2.4
 
 ### Patch Changes

diff --git a/packages/compiler/package.json b/packages/compiler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfn/compiler",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "Compiler and language tooling for openfn jobs.",
   "author": "Open Function Group <admin@openfn.org>",
   "license": "ISC",

diff --git a/packages/engine-multi/CHANGELOG.md b/packages/engine-multi/CHANGELOG.md
@@ -1,5 +1,17 @@
 # engine-multi
 
+## 1.11.4
+
+### Patch Changes
+
+Update type interfaces to match new portability spec.
+
+- Updated dependencies [728e6cb]
+- Updated dependencies [380bccd]
+  - @openfn/lexicon@2.0.0
+  - @openfn/runtime@1.9.3
+  - @openfn/compiler@1.2.5
+
 ## 1.11.3
 
 ### Patch Changes

diff --git a/packages/engine-multi/package.json b/packages/engine-multi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfn/engine-multi",
-  "version": "1.11.3",
+  "version": "1.11.4",
   "description": "Multi-process runtime engine",
   "main": "dist/index.js",
   "type": "module",

diff --git a/packages/engine-multi/src/api/autoinstall.ts b/packages/engine-multi/src/api/autoinstall.ts
@@ -4,9 +4,10 @@ import {
   getNameAndVersion,
   getLatestVersion,
   loadRepoPkg,
+  install as runtimeInstall,
+  type ExecutionPlan,
+  type Job,
 } from '@openfn/runtime';
-import { install as runtimeInstall } from '@openfn/runtime';
-import type { ExecutionPlan, Job } from '@openfn/lexicon';
 import type { Logger } from '@openfn/logger';
 
 import { AUTOINSTALL_COMPLETE, AUTOINSTALL_ERROR } from '../events';

diff --git a/packages/engine-multi/src/api/preload-credentials.ts b/packages/engine-multi/src/api/preload-credentials.ts
@@ -1,4 +1,4 @@
-import { ExecutionPlan, Job } from '@openfn/lexicon';
+import { ExecutionPlan, Job } from '@openfn/runtime';
 import type { Logger } from '@openfn/logger';
 import { CredentialErrorObj, CredentialLoadError } from '../errors';
 

diff --git a/packages/engine-multi/src/engine.ts b/packages/engine-multi/src/engine.ts
@@ -1,7 +1,8 @@
 import { EventEmitter } from 'node:events';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import type { ExecutionPlan, State, UUID } from '@openfn/lexicon';
+import type { State, UUID } from '@openfn/lexicon';
+import type { ExecutionPlan } from '@openfn/runtime';
 import type { Logger } from '@openfn/logger';
 
 import {

diff --git a/packages/engine-multi/src/test/util.ts b/packages/engine-multi/src/test/util.ts
@@ -1,4 +1,4 @@
-import { ExecutionPlan } from '@openfn/lexicon';
+import { ExecutionPlan } from '@openfn/runtime';
 
 export const createPlan = (job = {}) =>
   ({

diff --git a/packages/engine-multi/src/test/worker-functions.ts b/packages/engine-multi/src/test/worker-functions.ts
@@ -2,7 +2,7 @@ import path from 'node:path';
 
 import { register, publish, threadId } from '../worker/thread/runtime';
 import { increment } from './counter.js';
-import { ExecutionPlan, Job } from '@openfn/lexicon';
+import { ExecutionPlan, Job } from '@openfn/runtime';
 
 const tasks = {
   test: async (result = 42) => {