From a8412343e1c9ac4cb33b17de6f5fcd34ada6269f Mon Sep 17 00:00:00 2001
From: "Tommy D. Rossi" <beats.by.morse@gmail.com>
Date: Tue, 27 Jan 2026 13:54:26 +0100
Subject: [PATCH] fix merge artifacts. fix build

---
 extension/src/background.ts |  1 -
 playwriter/src/cdp-relay.ts | 27 +++++++++++++++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/extension/src/background.ts b/extension/src/background.ts
index 88a188b..12ebecf 100644
--- a/extension/src/background.ts
+++ b/extension/src/background.ts
@@ -619,7 +619,6 @@ function getTabByTargetId(targetId: string): { tabId: number; tab: TabInfo } | u
   return undefined
 }
 
-<<<<<<< HEAD
 function emitChildDetachesForTab(tabId: number): void {
   const childEntries = Array.from(childSessions.entries())
     .filter(([_, parentTab]) => parentTab.tabId === tabId)
diff --git a/playwriter/src/cdp-relay.ts b/playwriter/src/cdp-relay.ts
index 92204ff..cf81fc6 100644
--- a/playwriter/src/cdp-relay.ts
+++ b/playwriter/src/cdp-relay.ts
@@ -222,6 +222,24 @@ export async function startPlayWriterCDPRelayServer({
     }
   }
 
+  type ForwardCdpParams = {
+    method: string
+    sessionId?: string
+    params?: unknown
+  }
+
+  function getForwardCdpParams(value: unknown): ForwardCdpParams | undefined {
+    if (!value || typeof value !== 'object') {
+      return undefined
+    }
+    const record = value as { method?: unknown; sessionId?: unknown; params?: unknown }
+    if (typeof record.method !== 'string') {
+      return undefined
+    }
+    const sessionId = typeof record.sessionId === 'string' ? record.sessionId : undefined
+    return { method: record.method, sessionId, params: record.params }
+  }
+
   async function sendToExtension({ method, params, timeout = 30000 }: { method: string; params?: unknown; timeout?: number }): Promise<unknown> {
     if (!extensionWs) {
       throw new Error('Extension not connected')
@@ -230,14 +248,15 @@ export async function startPlayWriterCDPRelayServer({
     const id = ++extensionMessageId
     const message = { id, method, params }
 
-    if (method === 'forwardCDPCommand' && params?.method) {
+    const forwardCdpParams = method === 'forwardCDPCommand' ? getForwardCdpParams(params) : undefined
+    if (forwardCdpParams) {
       logCdpJson({
         timestamp: new Date().toISOString(),
         direction: 'to-extension',
         message: {
-          method: params.method,
-          sessionId: params.sessionId,
-          params: params.params,
+          method: forwardCdpParams.method,
+          sessionId: forwardCdpParams.sessionId,
+          params: forwardCdpParams.params,
         },
       })
     }