ghost-bridge 0.7.1 → 0.8.0

package/extension/background.js

@@ -13,13 +13,15 @@ const CONFIG = {
 }
 
 let attachedTabId = null
+let targetMode = 'focused' // focused | pinned
+let pinnedTabId = null
 let scriptMap = new Map()
 let scriptSourceCache = new Map()
 let lastErrors = []
 let lastErrorLocation = null
 let requestMap = new Map()
 let networkRequests = []
-let state = { enabled: false, connected: false, port: null, currentPort: null, connectionStatus: 'disconnected', connectionError: '' }
+let state = { enabled: false, connected: false, port: null, currentPort: null, connectionStatus: 'disconnected', connectionError: '', serverInfo: null }
 
 // 待处理的请求（等待 offscreen 响应）
 const pendingRequests = new Map()
@@ -248,10 +250,7 @@ function trimPendingRequests() {
 chrome.debugger.onDetach.addListener((source, reason) => {
   if (source.tabId && source.tabId === attachedTabId) {
     attachedTabId = null
-    scriptMap = new Map()
-    scriptSourceCache = new Map()
-    networkRequests = []
-    requestMap = new Map()
+    resetDebuggerState()
     
     if (!state.enabled) return
     if (reason === "canceled_by_user") {
@@ -295,20 +294,66 @@ function compactStack(stackTrace) {
 
 // ========== Debugger 操作 ==========
 
+function resetDebuggerState() {
+  scriptMap = new Map()
+  scriptSourceCache = new Map()
+  networkRequests = []
+  requestMap = new Map()
+}
+
+function summarizeTab(tab) {
+  if (!tab) return null
+  return {
+    id: tab.id,
+    windowId: tab.windowId,
+    index: tab.index,
+    active: !!tab.active,
+    title: tab.title || '',
+    url: tab.url || '',
+  }
+}
+
+async function getFocusedTabOrThrow() {
+  const [tab] = await chrome.tabs.query({ active: true, lastFocusedWindow: true })
+  if (!tab || tab.id === undefined) throw new Error("没有激活的标签页")
+  return tab
+}
+
+async function getTabOrThrow(tabId) {
+  if (!Number.isInteger(tabId) || tabId < 0) throw new Error("需要提供有效的 tabId")
+  try {
+    const tab = await chrome.tabs.get(tabId)
+    if (!tab || tab.id === undefined) throw new Error("标签页不可用")
+    return tab
+  } catch (e) {
+    throw new Error(`标签页 ${tabId} 不可用：${e.message}`)
+  }
+}
+
+async function resolveTargetTab(params = {}) {
+  if (params.tabId !== undefined) {
+    return getTabOrThrow(Number(params.tabId))
+  }
+  if (targetMode === 'pinned') {
+    if (pinnedTabId === null) throw new Error("锁定的标签页不可用，请重新 pin")
+    return getTabOrThrow(pinnedTabId)
+  }
+  return getFocusedTabOrThrow()
+}
+
 // attach 互斥锁：防止并发调用 ensureAttached 导致重复 attach / 状态竞态
 let _attachLock = Promise.resolve()
 
-async function ensureAttached() {
+async function ensureAttached(params = {}) {
   let _release
   const _prev = _attachLock
   _attachLock = new Promise(r => _release = r)
   await _prev
   try {
     if (!state.enabled) throw new Error("扩展已暂停，点击图标开启后再试")
-    const [tab] = await chrome.tabs.query({ active: true, lastFocusedWindow: true })
-    if (!tab) throw new Error("没有激活的标签页")
+    const tab = await resolveTargetTab(params)
     if (attachedTabId !== tab.id) {
-      if (attachedTabId) {
+      if (attachedTabId !== null) {
         try { await chrome.debugger.detach({ tabId: attachedTabId }) } catch (e) {}
       }
       try {
@@ -324,10 +369,7 @@ async function ensureAttached() {
         throw e
       }
       attachedTabId = tab.id
-      scriptMap = new Map()
-      scriptSourceCache = new Map()
-      networkRequests = []
-      requestMap = new Map()
+      resetDebuggerState()
       await chrome.debugger.sendCommand({ tabId: attachedTabId }, "Runtime.enable")
       await chrome.debugger.sendCommand({ tabId: attachedTabId }, "Log.enable")
       await chrome.debugger.sendCommand({ tabId: attachedTabId }, "Console.enable").catch(() => {})
@@ -349,13 +391,14 @@ async function ensureAttached() {
 }
 
 async function maybeDetach(force = false) {
-  if ((CONFIG.autoDetach || force) && attachedTabId) {
+  if ((CONFIG.autoDetach || force) && attachedTabId !== null) {
     try {
       await chrome.debugger.detach({ tabId: attachedTabId })
     } catch (e) {
       log(`detach 失败：${e.message}`)
     } finally {
       attachedTabId = null
+      resetDebuggerState()
     }
   }
 }
@@ -382,10 +425,105 @@ async function detachAllTargets() {
     }
   } catch {}
   attachedTabId = null
+  resetDebuggerState()
 }
 
 // ========== 命令处理 ==========
 
+async function buildTargetInfo() {
+  const viewingTab = await chrome.tabs.query({ active: true, lastFocusedWindow: true })
+    .then(([tab]) => tab || null)
+    .catch(() => null)
+
+  let targetTab = null
+  let targetError = ''
+  const targetTabId = targetMode === 'pinned' ? pinnedTabId : attachedTabId
+
+  if (targetTabId !== null && targetTabId !== undefined) {
+    try {
+      targetTab = await chrome.tabs.get(targetTabId)
+    } catch (e) {
+      targetError = e.message
+    }
+  } else if (targetMode === 'focused') {
+    targetTab = viewingTab
+  }
+
+  return {
+    targetMode,
+    pinnedTabId,
+    attachedTabId,
+    targetTab: summarizeTab(targetTab),
+    viewingTab: summarizeTab(viewingTab),
+    targetError,
+  }
+}
+
+async function handleListTabs() {
+  const tabs = await chrome.tabs.query({})
+  const targetInfo = await buildTargetInfo()
+  return {
+    ...targetInfo,
+    tabs: tabs
+      .filter((tab) => tab.id !== undefined)
+      .sort((a, b) => (a.windowId - b.windowId) || (a.index - b.index))
+      .map(summarizeTab),
+  }
+}
+
+async function pinTab(tab) {
+  const previousMode = targetMode
+  const previousPinnedTabId = pinnedTabId
+  targetMode = 'pinned'
+  pinnedTabId = tab.id
+  try {
+    await ensureAttached({ tabId: tab.id })
+  } catch (e) {
+    targetMode = previousMode
+    pinnedTabId = previousPinnedTabId
+    throw e
+  }
+  broadcastStatus()
+  return buildTargetInfo()
+}
+
+async function handlePinCurrentTab() {
+  return pinTab(await getFocusedTabOrThrow())
+}
+
+async function handlePinTab(params = {}) {
+  if (params.tabId !== undefined) {
+    return pinTab(await getTabOrThrow(Number(params.tabId)))
+  }
+
+  const urlContains = String(params.urlContains || '')
+  const titleContains = String(params.titleContains || '')
+  if (!urlContains && !titleContains) {
+    throw new Error("需要提供 tabId、urlContains 或 titleContains")
+  }
+
+  const tabs = await chrome.tabs.query({})
+  const matches = tabs.filter((tab) => {
+    const urlOk = !urlContains || (tab.url || '').includes(urlContains)
+    const titleOk = !titleContains || (tab.title || '').includes(titleContains)
+    return tab.id !== undefined && urlOk && titleOk
+  })
+  if (matches.length === 0) throw new Error("没有找到匹配的标签页")
+
+  matches.sort((a, b) => Number(b.active) - Number(a.active) || (a.windowId - b.windowId) || (a.index - b.index))
+  return pinTab(matches[0])
+}
+
+async function handleUnpinTab() {
+  targetMode = 'focused'
+  pinnedTabId = null
+  if (state.enabled && state.connected) {
+    await ensureAttached()
+  }
+  broadcastStatus()
+  return buildTargetInfo()
+}
+
 async function handleGetLastError(params = {}) {
   await ensureAttached()
   const severity = params.severity || "error"
@@ -1092,7 +1230,12 @@ async function handleCommand(message) {
   }
   try {
     let result
-    if (command === "getLastError") result = await handleGetLastError(params)
+    if (command === "listTabs") result = await handleListTabs()
+    else if (command === "getTargetTab") result = await buildTargetInfo()
+    else if (command === "pinCurrentTab") result = await handlePinCurrentTab()
+    else if (command === "pinTab") result = await handlePinTab(params)
+    else if (command === "unpinTab") result = await handleUnpinTab()
+    else if (command === "getLastError") result = await handleGetLastError(params)
     else if (command === "getScriptSource") result = await handleGetScriptSource(params)
     else if (command === "coverageSnapshot") result = await handleCoverageSnapshot(params)
     else if (command === "findByString") result = await handleFindByString(params)
@@ -1124,8 +1267,7 @@ function sendToServer(data) {
 
 // ========== 状态广播 ==========
 
-// 主动推送状态给 popup
-function broadcastStatus() {
+function getConnectionStatus() {
   let status
   if (!state.enabled) {
     status = 'disconnected'
@@ -1134,43 +1276,50 @@ function broadcastStatus() {
   } else {
     status = state.connectionStatus || 'connecting'
   }
+  return status
+}
 
-  let tabUrl = ''
-  let tabTitle = ''
-  
-  if (attachedTabId) {
-    chrome.tabs.get(attachedTabId).then(t => {
-      tabUrl = t.url
-      tabTitle = t.title
-      doBroadcast()
-    }).catch(() => doBroadcast())
-  } else {
-    doBroadcast()
+async function buildPopupState() {
+  const status = getConnectionStatus()
+  const targetInfo = await buildTargetInfo()
+  const targetTab = targetInfo.targetTab
+  const viewingTab = targetInfo.viewingTab
+  return {
+    status,
+    enabled: state.enabled,
+    port: state.port,
+    currentPort: state.currentPort,
+    basePort: CONFIG.basePort,
+    connectionError: state.connectionError,
+    serverInfo: state.serverInfo,
+    targetMode: targetInfo.targetMode,
+    pinnedTabId: targetInfo.pinnedTabId,
+    attachedTabId: targetInfo.attachedTabId,
+    targetTab,
+    viewingTab,
+    targetError: targetInfo.targetError,
+    tabTitle: targetTab?.title || '',
+    tabUrl: targetTab?.url || '',
+    viewingTitle: viewingTab?.title || '',
+    viewingUrl: viewingTab?.url || '',
   }
+}
 
-  function doBroadcast() {
-    const actualErrors = lastErrors.filter(e => e.severity === 'error')
+// 主动推送状态给 popup
+async function broadcastStatus() {
+  try {
     chrome.runtime.sendMessage({
       type: 'statusUpdate',
-      state: {
-        status,
-        enabled: state.enabled,
-        port: state.port,
-        currentPort: state.currentPort,
-        basePort: CONFIG.basePort,
-        connectionError: state.connectionError,
-        errorCount: actualErrors.length,
-        recentErrors: actualErrors.slice(0, 5),
-        tabTitle,
-        tabUrl,
-      }
+      state: await buildPopupState()
     }).catch(() => {}) // popup 可能未打开，忽略错误
+  } catch (e) {
+    log(`状态广播失败：${e.message}`)
   }
 }
 
 // 监听被调试页面的导航变化，实时推送到 popup
 chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
-  if (tabId === attachedTabId && (changeInfo.title || changeInfo.url)) {
+  if ((tabId === attachedTabId || tab.active) && (changeInfo.title || changeInfo.url)) {
     if (state.connected) broadcastStatus()
   }
 })
@@ -1179,8 +1328,10 @@ chrome.tabs.onUpdated.addListener((tabId, changeInfo, tab) => {
 chrome.tabs.onActivated.addListener(async (activeInfo) => {
   if (state.enabled && state.connected) {
     try {
-      // 这里的 ensureAttached() 会自动处理从旧 Tab detach 并 attach 到新 Tab
-      await ensureAttached()
+      if (targetMode === 'focused') {
+        // focused 模式保持旧行为：切换 Tab 时自动跟随
+        await ensureAttached()
+      }
       broadcastStatus()
     } catch (e) {
       log(`自动跟随切换 Tab 失败：${e.message}`)
@@ -1188,6 +1339,18 @@ chrome.tabs.onActivated.addListener(async (activeInfo) => {
   }
 })
 
+chrome.tabs.onRemoved.addListener((tabId) => {
+  if (tabId === pinnedTabId) {
+    targetMode = 'focused'
+    pinnedTabId = null
+  }
+  if (tabId === attachedTabId) {
+    attachedTabId = null
+    resetDebuggerState()
+  }
+  if (state.connected) broadcastStatus()
+})
+
 
 // ========== 消息监听 ==========
 
@@ -1210,29 +1373,36 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
       state.currentPort = message.port
       state.connectionStatus = 'connected'
       state.connectionError = ''
+      state.serverInfo = message.serverInfo || null
       setBadgeState('on')
       log(`✅ 已连接到 ghost-bridge 服务 (端口 ${message.port})`)
-      ensureAttached().catch((e) => log(`attach 失败：${e.message}`))
+      ensureAttached()
+        .then(() => broadcastStatus())
+        .catch((e) => log(`attach 失败：${e.message}`))
     } else if (message.status === 'disconnected') {
       state.connected = false
       state.port = null
       state.connectionStatus = 'connecting'
       state.connectionError = ''
+      state.serverInfo = null
       if (state.enabled) setBadgeState('connecting')
     } else if (message.status === 'connecting') {
       state.currentPort = message.currentPort
       state.connectionStatus = 'connecting'
       state.connectionError = ''
+      state.serverInfo = null
       setBadgeState('connecting')
     } else if (message.status === 'error') {
       state.currentPort = message.currentPort
       state.connectionStatus = 'error'
       state.connectionError = message.errorMessage || ''
+      state.serverInfo = null
       setBadgeState('err')
     } else if (message.status === 'not_found') {
       state.currentPort = message.currentPort
       state.connectionStatus = 'not_found'
-      state.connectionError = ''
+      state.connectionError = message.errorMessage || ''
+      state.serverInfo = null
       setBadgeState('connecting')
     }
     broadcastStatus() // 状态变化时主动推送
@@ -1258,44 +1428,25 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
 
   // 来自 popup 的状态查询
   if (message.type === 'getStatus') {
-    let status
-    if (!state.enabled) {
-      status = 'disconnected'
-    } else if (state.connected) {
-      status = 'connected'
-    } else {
-      status = state.connectionStatus || 'connecting'
-    }
+    buildPopupState().then(sendResponse).catch((e) => sendResponse({ status: 'error', connectionError: e.message }))
+    return true
+  }
 
-    let tabUrl = ''
-    let tabTitle = ''
-    if (attachedTabId) {
-      chrome.tabs.get(attachedTabId).then(t => {
-        tabUrl = t.url
-        tabTitle = t.title
-        sendStatusResponse()
-      }).catch(() => {
-        sendStatusResponse()
-      })
-    } else {
-      sendStatusResponse()
+  if (message.type === 'pinCurrentTab') {
+    if (!state.enabled || !state.connected) {
+      sendResponse({ ok: false, error: "Ghost Bridge 尚未连接" })
+      return true
     }
+    handlePinCurrentTab().then((result) => sendResponse({ ok: true, result })).catch((e) => sendResponse({ ok: false, error: e.message }))
+    return true
+  }
 
-    function sendStatusResponse() {
-      const actualErrors = lastErrors.filter(e => e.severity === 'error')
-      sendResponse({
-        status,
-        enabled: state.enabled,
-        port: state.port,
-        currentPort: state.currentPort,
-        basePort: CONFIG.basePort,
-        connectionError: state.connectionError,
-        errorCount: actualErrors.length,
-        recentErrors: actualErrors.slice(0, 5),
-        tabTitle,
-        tabUrl,
-      })
+  if (message.type === 'unpinTab') {
+    if (!state.enabled || !state.connected) {
+      sendResponse({ ok: false, error: "Ghost Bridge 尚未连接" })
+      return true
     }
+    handleUnpinTab().then((result) => sendResponse({ ok: true, result })).catch((e) => sendResponse({ ok: false, error: e.message }))
     return true
   }
 
@@ -1311,6 +1462,7 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
     state.currentPort = CONFIG.basePort
     state.connectionStatus = 'connecting'
     state.connectionError = ''
+    state.serverInfo = null
     setBadgeState('connecting')
 
     // 启动 offscreen 并开始连接
@@ -1334,6 +1486,9 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
     state.currentPort = null
     state.connectionStatus = 'disconnected'
     state.connectionError = ''
+    state.serverInfo = null
+    targetMode = 'focused'
+    pinnedTabId = null
     setBadgeState('off')
     detachAllTargets().catch(() => {})
 

package/extension/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Ghost Bridge",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "Zero-restart Chrome debugger bridge for Claude MCP, optimized for no-sourcemap production debugging.",
   "permissions": [
     "debugger",

package/extension/offscreen.js

@@ -4,6 +4,7 @@
 let ws = null
 let reconnectTimer = null
 let manualDisconnect = false  // 用户主动断开标志，防止 onclose 触发重连
+let connectionGeneration = 0
 let config = {
   basePort: 33333,
   token: '',
@@ -17,12 +18,42 @@ function log(msg) {
 
 const DEFAULT_TOKEN = 'ghost-bridge-local'
 
+function clearReconnectTimer() {
+  if (reconnectTimer) {
+    clearTimeout(reconnectTimer)
+    reconnectTimer = null
+  }
+}
+
+function isCurrentConnection(generation, socket) {
+  return generation === connectionGeneration && socket === ws
+}
+
+function scheduleReconnect(generation, delay) {
+  if (generation !== connectionGeneration) return
+  clearReconnectTimer()
+  reconnectTimer = setTimeout(() => {
+    if (generation === connectionGeneration) connect()
+  }, delay)
+}
+
+function closeCurrentSocket() {
+  if (!ws) return
+  try {
+    ws.close()
+  } catch {}
+  ws = null
+}
+
 // 连接到服务器
 function connect() {
   // 如果已手动断开，不再尝试连接
   if (manualDisconnect) return
+  clearReconnectTimer()
+  closeCurrentSocket()
 
   const port = config.basePort
+  const generation = ++connectionGeneration
   const url = new URL(`ws://localhost:${port}`)
   url.searchParams.set('token', config.token)
   log(`尝试连接固定端口 ${port}...`)
@@ -32,12 +63,13 @@ function connect() {
     currentPort: port,
   }).catch(() => {})
 
-  ws = new WebSocket(url.toString())
-  ws.binaryType = 'blob' // 明确设置
+  const socket = new WebSocket(url.toString())
+  ws = socket
+  socket.binaryType = 'blob' // 明确设置
 
   const connectionTimeout = setTimeout(() => {
-    if (ws && ws.readyState === WebSocket.CONNECTING) {
-      ws.close()
+    if (isCurrentConnection(generation, socket) && socket.readyState === WebSocket.CONNECTING) {
+      socket.close()
     }
   }, 2000) // 增加到 2 秒
 
@@ -45,19 +77,22 @@ function connect() {
   let socketOpened = false
   let terminalErrorMessage = ''
 
-  ws.onopen = () => {
+  socket.onopen = () => {
+    if (!isCurrentConnection(generation, socket)) return
     socketOpened = true
     clearTimeout(connectionTimeout)
     log(`WebSocket 已连接端口 ${port}，等待身份验证...`)
   }
 
-  ws.onmessage = async (event) => {
+  socket.onmessage = async (event) => {
     try {
+      if (!isCurrentConnection(generation, socket)) return
       // 处理 Blob 类型的消息
       let data = event.data
       if (data instanceof Blob) {
         data = await data.text()
       }
+      if (!isCurrentConnection(generation, socket)) return
       const msg = JSON.parse(data)
 
       if (msg.type === 'identity') {
@@ -68,6 +103,13 @@ function connect() {
             type: 'status',
             status: 'connected',
             port: port,
+            serverInfo: {
+              version: msg.version,
+              pid: msg.pid,
+              port: msg.port,
+              startedAt: msg.startedAt,
+              serverPath: msg.serverPath,
+            },
           }).catch(() => {})
         } else {
           terminalErrorMessage = msg.service === 'ghost-bridge'
@@ -94,7 +136,8 @@ function connect() {
     }
   }
 
-  ws.onclose = (event) => {
+  socket.onclose = (event) => {
+    if (!isCurrentConnection(generation, socket)) return
     clearTimeout(connectionTimeout)
 
     // 用户主动断开，不重连
@@ -110,22 +153,28 @@ function connect() {
           currentPort: port,
           errorMessage,
         }).catch(() => {})
-        reconnectTimer = setTimeout(() => connect(), 2000)
+        scheduleReconnect(generation, 2000)
         return
       }
       log(`固定端口 ${port} 未发现可用服务，2秒后重试...`)
-      chrome.runtime.sendMessage({ type: 'status', status: 'not_found', currentPort: port }).catch(() => {})
-      reconnectTimer = setTimeout(() => connect(), 2000)
+      chrome.runtime.sendMessage({
+        type: 'status',
+        status: 'not_found',
+        currentPort: port,
+        errorMessage: `No ghost-bridge WebSocket service was found on port ${port}.`,
+      }).catch(() => {})
+      scheduleReconnect(generation, 2000)
       return
     }
 
     // 连接断开，重试
     log(`端口 ${port} 连接断开，尝试重连...`)
     chrome.runtime.sendMessage({ type: 'status', status: 'disconnected' }).catch(() => {})
-    reconnectTimer = setTimeout(() => connect(), 1000)
+    scheduleReconnect(generation, 1000)
   }
 
-  ws.onerror = () => {
+  socket.onerror = () => {
+    if (!isCurrentConnection(generation, socket)) return
     clearTimeout(connectionTimeout)
   }
 }
@@ -142,14 +191,9 @@ function sendToServer(data) {
 // 断开连接
 function disconnect() {
   manualDisconnect = true  // 标记为手动断开，阻止 onclose 重连
-  if (reconnectTimer) {
-    clearTimeout(reconnectTimer)
-    reconnectTimer = null
-  }
-  if (ws) {
-    ws.close()
-    ws = null
-  }
+  connectionGeneration++
+  clearReconnectTimer()
+  closeCurrentSocket()
   log('已断开连接')
 }
 
@@ -158,7 +202,6 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
   if (message.type === 'connect') {
     config.basePort = message.basePort || 33333
     config.token = message.token || DEFAULT_TOKEN
-    disconnect()
     manualDisconnect = false  // 用户重新连接，清除断开标志
     connect()
     sendResponse({ ok: true })