From 47e8310d4cc808710a5f79201cdbc5c2133ff8e0 Mon Sep 17 00:00:00 2001
From: Farhan Yahaya <yahyafarhan48@gmail.com>
Date: Mon, 20 Apr 2026 09:21:58 +0000
Subject: [PATCH 1/4] feat: override endpoint with one from openfn.yaml

---
 packages/cli/src/pull/handler.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/cli/src/pull/handler.ts b/packages/cli/src/pull/handler.ts
index b8d0ae891..15220d724 100644
--- a/packages/cli/src/pull/handler.ts
+++ b/packages/cli/src/pull/handler.ts
@@ -12,6 +12,7 @@ import type { Logger } from '../util/logger';
 import { PullOptions } from '../pull/command';
 import beta from '../projects/pull';
 import { fileExists } from '../util/file-exists';
+import { yamlToJson } from '@openfn/project';
 
 async function pullHandler(options: PullOptions, logger: Logger) {
   if (options.beta) {
@@ -26,6 +27,12 @@ async function pullHandler(options: PullOptions, logger: Logger) {
       'openfn.yaml'
     );
     if (await fileExists(v2ConfigPath)) {
+      // override endpoint with one from openfn.yaml
+      const config = yamlToJson(await fs.readFile(v2ConfigPath, 'utf-8'));
+      if (config?.project?.endpoint) {
+        config.endpoint = config.project.endpoint;
+      }
+
       logger.always(
         'Detected openfn.yaml file - switching to v2 pull (openfn project pull)'
       );

From be11b0639f6e8278784f73b030929135ea48a39e Mon Sep 17 00:00:00 2001
From: Farhan Yahaya <yahyafarhan48@gmail.com>
Date: Mon, 20 Apr 2026 09:28:41 +0000
Subject: [PATCH 2/4] feat: override endpoint for deploy

---
 packages/cli/src/deploy/handler.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/cli/src/deploy/handler.ts b/packages/cli/src/deploy/handler.ts
index a9700ef85..cd27c3349 100644
--- a/packages/cli/src/deploy/handler.ts
+++ b/packages/cli/src/deploy/handler.ts
@@ -10,6 +10,8 @@ import { DeployOptions } from './command';
 import * as beta from '../projects/deploy';
 import path from 'node:path';
 import { fileExists } from '../util/file-exists';
+import { yamlToJson } from '@openfn/project';
+import fs from 'node:fs/promises';
 
 export type DeployFn = typeof deploy;
 
@@ -39,6 +41,12 @@ async function deployHandler(
       'openfn.yaml'
     );
     if (await fileExists(v2ConfigPath)) {
+      // override endpoint with one from openfn.yaml
+      const config = yamlToJson(await fs.readFile(v2ConfigPath, 'utf-8'));
+      if (config?.project?.endpoint) {
+        config.endpoint = config.project.endpoint;
+      }
+
       logger.always(
         'Detected openfn.yaml file - switching to v2 deploy (openfn project deploy)'
       );

From 3918358d223c1e54656a13150a732a69bffd5965 Mon Sep 17 00:00:00 2001
From: Farhan Yahaya <yahyafarhan48@gmail.com>
Date: Mon, 20 Apr 2026 10:03:49 +0000
Subject: [PATCH 3/4] chore: update changelog

---
 .changeset/six-ties-sell.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/six-ties-sell.md

diff --git a/.changeset/six-ties-sell.md b/.changeset/six-ties-sell.md
new file mode 100644
index 000000000..ee711f079
--- /dev/null
+++ b/.changeset/six-ties-sell.md
@@ -0,0 +1,5 @@
+---
+'@openfn/cli': patch
+---
+
+Override config.endpoint with one from openfn.yaml

From 9ecc3baeaaf4f0caa2008551491148557eaacc55 Mon Sep 17 00:00:00 2001
From: Farhan Yahaya <yahyafarhan48@gmail.com>
Date: Mon, 20 Apr 2026 10:04:20 +0000
Subject: [PATCH 4/4] chore: update changelog

---
 .changeset/six-ties-sell.md | 5 -----
 packages/cli/CHANGELOG.md   | 6 ++++++
 packages/cli/package.json   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 .changeset/six-ties-sell.md

diff --git a/.changeset/six-ties-sell.md b/.changeset/six-ties-sell.md
deleted file mode 100644
index ee711f079..000000000
--- a/.changeset/six-ties-sell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@openfn/cli': patch
----
-
-Override config.endpoint with one from openfn.yaml
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index 205578c68..764f6fcba 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @openfn/cli
 
+## 1.34.2
+
+### Patch Changes
+
+- 3918358: Override config.endpoint with one from openfn.yaml
+
 ## 1.34.1
 
 ### Patch Changes
diff --git a/packages/cli/package.json b/packages/cli/package.json
index af316d9f2..7f9b29d32 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfn/cli",
-  "version": "1.34.1",
+  "version": "1.34.2",
   "description": "CLI devtools for the OpenFn toolchain",
   "engines": {
     "node": ">=18",