From 182ec4f3e8432c3f7f7514cf260ddc3846c6e844 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennetbo@gmx.de>
Date: Wed, 25 Jun 2025 15:46:07 +0200
Subject: [PATCH] agent: Fix issue where unconfigured MCP extensions would not
 start server (backport #33365)

---
 crates/extension_host/src/wasm_host/wit/since_v0_6_0.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crates/extension_host/src/wasm_host/wit/since_v0_6_0.rs b/crates/extension_host/src/wasm_host/wit/since_v0_6_0.rs
index 158dee7989a04a949f3cb4d88faf83696c6af091..96d9a039873eac7b2d636d34a323130db410577e 100644
--- a/crates/extension_host/src/wasm_host/wit/since_v0_6_0.rs
+++ b/crates/extension_host/src/wasm_host/wit/since_v0_6_0.rs
@@ -945,7 +945,11 @@ impl ExtensionImports for WasmState {
                                     .get(key.as_str())
                             })
                             .cloned()
-                            .context("Failed to get context server configuration")?;
+                            .unwrap_or_else(|| {
+                                project::project_settings::ContextServerSettings::Extension {
+                                    settings: serde_json::json!({}),
+                                }
+                            });
 
                         match settings {
                             project::project_settings::ContextServerSettings::Custom {