From adfb6611c8b548f7646f7941adc242028c97ef5d Mon Sep 17 00:00:00 2001
From: Taylor Downs <downs.taylor@gmail.com>
Date: Mon, 15 Apr 2024 12:42:11 +0100
Subject: [PATCH 1/2] better error message for state/spec mismatch on deploy

---
 .changeset/eleven-colts-march.md      |  5 +++++
 packages/deploy/src/stateTransform.ts | 11 +++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 .changeset/eleven-colts-march.md

diff --git a/.changeset/eleven-colts-march.md b/.changeset/eleven-colts-march.md
new file mode 100644
index 000000000..519bf3f88
--- /dev/null
+++ b/.changeset/eleven-colts-march.md
@@ -0,0 +1,5 @@
+---
+'@openfn/deploy': patch
+---
+
+Error message for when workflow found in 'state' but not 'spec' during deploy
diff --git a/packages/deploy/src/stateTransform.ts b/packages/deploy/src/stateTransform.ts
index 1d17397b0..78dee1e15 100644
--- a/packages/deploy/src/stateTransform.ts
+++ b/packages/deploy/src/stateTransform.ts
@@ -216,6 +216,17 @@ export function mergeSpecIntoState(
           ];
         }
 
+        if (!specWorkflow && !isEmpty(stateWorkflow || {})) {
+          console.log(
+            'Workflow found in project state but not spec.',
+            `Spec: ${specWorkflow}`,
+            `State: ${stateWorkflow}`
+          );
+          throw new Error(
+            'Cannot continue: workflow from state not found in spec.'
+          );
+        }
+
         return [
           workflowKey,
           {

From 176dc399936b3e3a2ac7f3b11a8cf5bc212e5791 Mon Sep 17 00:00:00 2001
From: Joe Clark <jclark@openfn.org>
Date: Wed, 17 Apr 2024 09:50:56 +0100
Subject: [PATCH 2/2] version: cli@1.2.2

---
 .changeset/eleven-colts-march.md | 5 -----
 packages/cli/CHANGELOG.md        | 7 +++++++
 packages/cli/package.json        | 2 +-
 packages/deploy/CHANGELOG.md     | 6 ++++++
 packages/deploy/package.json     | 2 +-
 5 files changed, 15 insertions(+), 7 deletions(-)
 delete mode 100644 .changeset/eleven-colts-march.md

diff --git a/.changeset/eleven-colts-march.md b/.changeset/eleven-colts-march.md
deleted file mode 100644
index 519bf3f88..000000000
--- a/.changeset/eleven-colts-march.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@openfn/deploy': patch
----
-
-Error message for when workflow found in 'state' but not 'spec' during deploy
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index 4e88b8592..fb693c786 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @openfn/cli
 
+## 1.2.2
+
+### Patch Changes
+
+- Updated dependencies [adfb661]
+  - @openfn/deploy@0.4.5
+
 ## 1.2.1
 
 ### Patch Changes
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 53cf3a725..151d8a32d 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfn/cli",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "CLI devtools for the openfn toolchain.",
   "engines": {
     "node": ">=18",
diff --git a/packages/deploy/CHANGELOG.md b/packages/deploy/CHANGELOG.md
index 97bb19677..a1fd881f5 100644
--- a/packages/deploy/CHANGELOG.md
+++ b/packages/deploy/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @openfn/deploy
 
+## 0.4.5
+
+### Patch Changes
+
+- adfb661: Error message for when workflow found in 'state' but not 'spec' during deploy
+
 ## 0.4.4
 
 ### Patch Changes
diff --git a/packages/deploy/package.json b/packages/deploy/package.json
index 37c6eada7..986e8572c 100644
--- a/packages/deploy/package.json
+++ b/packages/deploy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfn/deploy",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "Deploy projects to Lightning instances",
   "type": "module",
   "exports": {