From 5127ebe875f7ae5e998be332f706d19efc5ee431 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 15 Jul 2025 15:47:50 +0200
Subject: [PATCH] catalog-backend: switch default stitiching mode to 'deferred'

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/clever-windows-judge.md             | 5 +++++
 plugins/catalog-backend/config.d.ts            | 2 +-
 plugins/catalog-backend/src/stitching/types.ts | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/clever-windows-judge.md

diff --git a/.changeset/clever-windows-judge.md b/.changeset/clever-windows-judge.md
new file mode 100644
index 0000000000..5ba16226d8
--- /dev/null
+++ b/.changeset/clever-windows-judge.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-backend': major
+---
+
+**BREAKING**: The default `catalog.stitchingStrategy` has been switched to `{ mode: 'deferred' }`.
diff --git a/plugins/catalog-backend/config.d.ts b/plugins/catalog-backend/config.d.ts
index b60273af03..6329bcb111 100644
--- a/plugins/catalog-backend/config.d.ts
+++ b/plugins/catalog-backend/config.d.ts
@@ -172,7 +172,7 @@ export interface Config {
     orphanProviderStrategy?: 'keep' | 'delete';
 
     /**
-     * The strategy to use when stitching together the final entities.
+     * The strategy to use when stitching together the final entities. The default mode is "deferred".
      */
     stitchingStrategy?:
       | {
diff --git a/plugins/catalog-backend/src/stitching/types.ts b/plugins/catalog-backend/src/stitching/types.ts
index bbb6223968..7c8a5c7d65 100644
--- a/plugins/catalog-backend/src/stitching/types.ts
+++ b/plugins/catalog-backend/src/stitching/types.ts
@@ -61,11 +61,11 @@ export function stitchingStrategyFromConfig(config: Config): StitchingStrategy {
     'catalog.stitchingStrategy.mode',
   );
 
-  if (strategyMode === undefined || strategyMode === 'immediate') {
+  if (strategyMode === 'immediate') {
     return {
       mode: 'immediate',
     };
-  } else if (strategyMode === 'deferred') {
+  } else if (strategyMode === undefined || strategyMode === 'deferred') {
     const pollingIntervalKey = 'catalog.stitchingStrategy.pollingInterval';
     const stitchTimeoutKey = 'catalog.stitchingStrategy.stitchTimeout';