From 12a33ea21a271ff2cbd9d0e98dc77e133f0645cf Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Thu, 29 Oct 2026 08:59:45 +0100
Subject: [PATCH] fix(agents): restore optional MCP requirements on daemon
 hydration

---
 packages/server/src/server/persistence-hooks.test.ts | 11 +++++++++++
 packages/server/src/server/persistence-hooks.ts      |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/packages/server/src/server/persistence-hooks.test.ts b/packages/server/src/server/persistence-hooks.test.ts
index a0bbb49035..144c76a231 100644
--- a/packages/server/src/server/persistence-hooks.test.ts
+++ b/packages/server/src/server/persistence-hooks.test.ts
@@ -214,3 +214,14 @@ describe("persistence hooks", () => {
     expect(handle).toBeNull();
   });
 });
+
+test("restores optional MCP requirements for continuation", () => {
+  const record = createRecord({
+    config: {
+      mcpServerRequirements: { hub: "optional" },
+      mcpServers: { hub: { type: "http", url: "https://hub.test/mcp" } },
+    },
+  });
+  expect(buildConfigOverrides(record).mcpServerRequirements).toEqual({ hub: "optional" });
+  expect(buildSessionConfig(record)?.mcpServerRequirements).toEqual({ hub: "optional" });
+});
diff --git a/packages/server/src/server/persistence-hooks.ts b/packages/server/src/server/persistence-hooks.ts
index e95743d6be..cdb8485c84 100644
--- a/packages/server/src/server/persistence-hooks.ts
+++ b/packages/server/src/server/persistence-hooks.ts
@@ -78,6 +78,7 @@ export function buildConfigOverrides(record: StoredAgentRecord): Partial<AgentSe
     toolPolicy: record.config?.toolPolicy ?? undefined,
     systemPrompt: record.config?.systemPrompt ?? undefined,
     mcpServers: record.config?.mcpServers ?? undefined,
+    mcpServerRequirements: record.config?.mcpServerRequirements ?? undefined,
   });
 }
 
@@ -100,6 +101,7 @@ export function buildSessionConfig(
     toolPolicy: overrides.toolPolicy,
     systemPrompt: overrides.systemPrompt,
     mcpServers: overrides.mcpServers,
+    mcpServerRequirements: overrides.mcpServerRequirements,
   });
 }