From bffa449cede55f7a3f6fefbfd53ae77e31467d7b Mon Sep 17 00:00:00 2001
From: miguelgfierro <miguelgfierro@users.noreply.github.com>
Date: Fri, 19 Jun 2026 22:30:20 +0200
Subject: [PATCH 1/3] chore: ignore .worktrees/ directory

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 20710ca..4c65564 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,4 +138,6 @@ site/
 docs/superpowers/
 assets_test
 .local
-SESSION_SUMMARY.md
\ No newline at end of file
+SESSION_SUMMARY.md
+# Git worktrees
+.worktrees/

From 86d58a1492b2dee66c2d0155b0f439df4d9d2239 Mon Sep 17 00:00:00 2001
From: miguelgfierro <miguelgfierro@users.noreply.github.com>
Date: Fri, 19 Jun 2026 22:30:20 +0200
Subject: [PATCH 2/3] chore: bump pyfly to v26.06.113

Pin pyfly to the latest published release v26.06.113 and raise the lower
bound to >=26.6.113. Replaces the local editable path (../../fireflyframework/
fireflyframework-pyfly) with the published git tag so fresh clones / CI resolve
without a sibling checkout. fireflyframework-agentic stays at v26.05.30.
---
 pyproject.toml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 51a5579..9d0a22f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,7 +15,7 @@ authors = [
 dependencies = [
     # Firefly Framework runtime -- same extras canon uses so a fresh
     # `uv sync` boots the full stack.
-    "pyfly[fastapi,observability,security,data-relational,postgresql,eda,redis,client,scheduling,cli]>=26.5.4",
+    "pyfly[fastapi,observability,security,data-relational,postgresql,eda,redis,client,scheduling,cli]>=26.6.113",
     # GenAI metaframework -- FireflyAgent over pydantic-ai + the OpenAI
     # embeddings provider. flyquery builds its own pgvector hybrid retriever
     # and declares sqlglot directly below for its Text-to-SQL pipeline.
@@ -124,9 +124,9 @@ override-dependencies = [
 ]
 
 [tool.uv.sources]
-# Agentic is consumed from its published git tag so fresh clones / CI resolve
-# it without the sibling path; pyfly stays on the local checkout.
-pyfly = { path = "../../fireflyframework/fireflyframework-pyfly", editable = true }
+# pyfly and agentic are consumed from their published git tags so fresh
+# clones / CI resolve them without any sibling path.
+pyfly = { git = "https://github.com/fireflyframework/fireflyframework-pyfly.git", tag = "v26.06.113" }
 fireflyframework-agentic = { git = "https://github.com/fireflyframework/fireflyframework-agentic.git", tag = "v26.05.30" }
 
 [tool.hatch.build.targets.wheel]

From 65fdb9daa9ba726d0d685791143d86a106aaed60 Mon Sep 17 00:00:00 2001
From: miguelgfierro <miguelgfierro@users.noreply.github.com>
Date: Fri, 19 Jun 2026 22:30:20 +0200
Subject: [PATCH 3/3] fix: keep actuator/admin on the app port under pyfly
 v26.06

pyfly v26.06 splits actuator + admin onto a dedicated management port (9090)
by default. Collapse it onto the app port (8520) via pyfly.management.server.port
so /actuator/* health probes and /admin stay reachable on the single business
port. Without this, GET /actuator/health returns 404 on the app port (the
test_app_boot + test_smoke_e2e health assertions).
---
 pyfly.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pyfly.yaml b/pyfly.yaml
index b3b23ae..fb97854 100644
--- a/pyfly.yaml
+++ b/pyfly.yaml
@@ -26,6 +26,14 @@ pyfly:
     host: 0.0.0.0
     port: 8520
 
+  # pyfly v26.06 runs actuator + admin on a dedicated management port (9090)
+  # by default. Collapse it onto the application port so /actuator/* and /admin
+  # stay reachable on the single business port (Spring management.server.port
+  # parity). Set to -1 to disable, or a distinct port to split them out.
+  management:
+    server:
+      port: 8520
+
   observability:
     enabled: true
   metrics: