From c47f8341bb4e1e921fbf25ee224b804edfc61ce8 Mon Sep 17 00:00:00 2001
From: Dotta <bippadotta@protonmail.com>
Date: Sat, 12 Sep 2026 13:36:21 -0500
Subject: [PATCH] fix: reconcile Claude session codec after master integration

Keep one MCP server identity field alongside the persisted execution identity.

Co-Authored-By: Paperclip <noreply@paperclip.ing>
---
 packages/adapters/claude-local/src/server/index.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/adapters/claude-local/src/server/index.ts b/packages/adapters/claude-local/src/server/index.ts
index b92cff1db6..a5b5b5da24 100644
--- a/packages/adapters/claude-local/src/server/index.ts
+++ b/packages/adapters/claude-local/src/server/index.ts
@@ -83,7 +83,6 @@ export const sessionCodec: AdapterSessionCodec = {
     const promptBundleKey =
       readNonEmptyString(record.promptBundleKey) ??
       readNonEmptyString(record.prompt_bundle_key);
-    const mcpServerIdentity = readNonEmptyString(record.mcpServerIdentity);
     const workspaceId = readNonEmptyString(record.workspaceId) ?? readNonEmptyString(record.workspace_id);
     const repoUrl = readNonEmptyString(record.repoUrl) ?? readNonEmptyString(record.repo_url);
     const repoRef = readNonEmptyString(record.repoRef) ?? readNonEmptyString(record.repo_ref);
@@ -93,7 +92,6 @@ export const sessionCodec: AdapterSessionCodec = {
       sessionId,
       ...(cwd ? { cwd } : {}),
       ...(remoteExecution ? { remoteExecution } : {}),
-      ...(mcpServerIdentity ? { mcpServerIdentity } : {}),
       ...(promptBundleKey ? { promptBundleKey } : {}),
       ...(mcpServerIdentity ? { mcpServerIdentity } : {}),
       ...(workspaceId ? { workspaceId } : {}),
@@ -112,7 +110,6 @@ export const sessionCodec: AdapterSessionCodec = {
     const promptBundleKey =
       readNonEmptyString(params.promptBundleKey) ??
       readNonEmptyString(params.prompt_bundle_key);
-    const mcpServerIdentity = readNonEmptyString(params.mcpServerIdentity);
     const workspaceId = readNonEmptyString(params.workspaceId) ?? readNonEmptyString(params.workspace_id);
     const repoUrl = readNonEmptyString(params.repoUrl) ?? readNonEmptyString(params.repo_url);
     const repoRef = readNonEmptyString(params.repoRef) ?? readNonEmptyString(params.repo_ref);
@@ -122,7 +119,6 @@ export const sessionCodec: AdapterSessionCodec = {
       sessionId,
       ...(cwd ? { cwd } : {}),
       ...(remoteExecution ? { remoteExecution } : {}),
-      ...(mcpServerIdentity ? { mcpServerIdentity } : {}),
       ...(promptBundleKey ? { promptBundleKey } : {}),
       ...(mcpServerIdentity ? { mcpServerIdentity } : {}),
       ...(workspaceId ? { workspaceId } : {}),