@jobshimo/browser-link 0.40.0 → 0.41.0

package/dist/commands/free-port.d.ts

@@ -1,4 +1,5 @@
 import type { Language } from './welcome.js';
+import { type ProcessEntry } from '../lifecycle/processes.js';
 export interface FreePortResult {
     /** True when the port was free (nothing to do) OR the owning process was killed. */
     ok: boolean;
@@ -8,7 +9,36 @@ export interface FreePortResult {
     imageName: string | null;
     /** Human-readable message in the requested language. */
     message: string;
+    /** Since 0.41.0: every browser-link process this run tried to stop (the
+     * 17529 owner, the 17530 owner and every other live bridge), in kill
+     * order. Absent when there was none, so the "already free" result keeps
+     * its exact previous shape. */
+    processes?: StoppedProcess[];
 }
+export interface StoppedProcess {
+    pid: number;
+    /** Short display form, e.g. `node browser-link start`. */
+    command: string;
+    stopped: boolean;
+}
+/**
+ * Best-effort lookup of the PID owning the WS port, cross-platform.
+ * Returns null when nothing is listening on the port, when the OS tools
+ * needed to find the owner are missing, or when parsing fails.
+ *
+ * We don't shell out via a string command — `execFileSync` with an argv
+ * array avoids any quoting / injection surprises.
+ */
+export declare function findPidOnPort(port: number): number | null;
+/**
+ * Return the image / executable name of a PID, or null when the lookup
+ * fails. We use this as a safety check before killing: we will only kill
+ * processes whose image name starts with "node" — refuse to nuke anything
+ * else that happens to share the port (some other dev server, malware,
+ * a misconfigured tool, etc.).
+ */
+export declare function imageNameOf(pid: number): string | null;
+export declare function isNodeImage(image: string | null): boolean;
 /**
  * Find the process listening on WS_PORT and try to stop it.
  *
@@ -17,5 +47,14 @@ export interface FreePortResult {
  * This stops a stray browser-link from blocking the next MCP client
  * without ever risking killing some unrelated user process that happens
  * to share the port.
+ *
+ * Since 0.41.0 it then stops every OTHER live browser-link bridge too: the
+ * 17530 (IPC) owner when it is a node process, and every process whose
+ * command line runs this package with no subcommand or `start` (see
+ * `lifecycle/processes.ts`; never this process, its ancestors, or short
+ * commands such as `doctor`). Each one gets a line under the original
+ * message; with nothing else running, the result is exactly what it was.
  */
-export declare function runFreePort(language?: Language): FreePortResult;
+export declare function runFreePort(language?: Language, deps?: {
+    listBridgeProcesses?: () => ProcessEntry[];
+}): FreePortResult;

package/dist/commands/free-port.js

@@ -1,5 +1,7 @@
 import { execFileSync } from 'node:child_process';
 import { platform } from 'node:os';
+import { IPC_PORT } from '../bridge/protocol.js';
+import { listBridgeProcesses, shortCommand } from '../lifecycle/processes.js';
 const WS_HOST = '127.0.0.1';
 const WS_PORT = 17529;
 /**
@@ -10,7 +12,7 @@ const WS_PORT = 17529;
  * We don't shell out via a string command — `execFileSync` with an argv
  * array avoids any quoting / injection surprises.
  */
-function findPidOnPort(port) {
+export function findPidOnPort(port) {
     try {
         if (platform() === 'win32') {
             // netstat -ano -p TCP produces lines like:
@@ -50,7 +52,7 @@ function findPidOnPort(port) {
  * else that happens to share the port (some other dev server, malware,
  * a misconfigured tool, etc.).
  */
-function imageNameOf(pid) {
+export function imageNameOf(pid) {
     try {
         if (platform() === 'win32') {
             // tasklist /FI "PID eq 13212" /FO CSV /NH produces:
@@ -78,7 +80,7 @@ function imageNameOf(pid) {
         return null;
     }
 }
-function isNodeImage(image) {
+export function isNodeImage(image) {
     if (!image)
         return false;
     const lc = image.toLowerCase();
@@ -108,6 +110,9 @@ const I18N = {
             `Refusing to kill it — close that process yourself if you know what it is.`,
         unknownOwner: (pid) => `✗ Port ${WS_HOST}:${WS_PORT} is held by PID ${pid}, but we could not identify the process. ` +
             `Refusing to kill it. Close it manually with: taskkill /F /PID ${pid} (Windows) or kill ${pid} (Unix).`,
+        othersHeader: 'Other browser-link processes:',
+        stopped: '✓ stopped',
+        stopFailed: '✗ could not stop',
     },
     es: {
         alreadyFree: `El puerto ${WS_HOST}:${WS_PORT} ya está libre — no hay nada que parar.`,
@@ -117,6 +122,9 @@ const I18N = {
             `Por seguridad no se mata — cerralo a mano si sabés qué es.`,
         unknownOwner: (pid) => `✗ El puerto ${WS_HOST}:${WS_PORT} lo tiene el PID ${pid}, pero no pudimos identificar el proceso. ` +
             `Por seguridad no se mata. Cerralo a mano con: taskkill /F /PID ${pid} (Windows) o kill ${pid} (Unix).`,
+        othersHeader: 'Otros procesos de browser-link:',
+        stopped: '✓ detenido',
+        stopFailed: '✗ no se pudo detener',
     },
 };
 /**
@@ -127,19 +135,75 @@ const I18N = {
  * This stops a stray browser-link from blocking the next MCP client
  * without ever risking killing some unrelated user process that happens
  * to share the port.
+ *
+ * Since 0.41.0 it then stops every OTHER live browser-link bridge too: the
+ * 17530 (IPC) owner when it is a node process, and every process whose
+ * command line runs this package with no subcommand or `start` (see
+ * `lifecycle/processes.ts`; never this process, its ancestors, or short
+ * commands such as `doctor`). Each one gets a line under the original
+ * message; with nothing else running, the result is exactly what it was.
  */
-export function runFreePort(language = 'en') {
+export function runFreePort(language = 'en', deps = {}) {
     const t = I18N[language];
+    const primary = stopPortOwner(t);
+    const list = (deps.listBridgeProcesses ?? (() => listBridgeProcesses()))();
+    const commandOf = (pid, fallback) => {
+        const entry = list.find((p) => p.pid === pid);
+        return entry ? shortCommand(entry.command) : (fallback ?? '?');
+    };
+    const processes = [];
+    if (primary.pid !== null && primary.attempted) {
+        processes.push({
+            pid: primary.pid,
+            command: commandOf(primary.pid, primary.imageName),
+            stopped: primary.ok,
+        });
+    }
+    // Everything else: the IPC owner (node only, same safety rule) and every
+    // other bridge, each once, never the 17529 owner a second time.
+    const seen = new Set(primary.pid !== null ? [primary.pid] : []);
+    const others = [];
+    const ipcPid = findPidOnPort(IPC_PORT);
+    if (ipcPid !== null && !seen.has(ipcPid) && isNodeImage(imageNameOf(ipcPid))) {
+        seen.add(ipcPid);
+        others.push({ pid: ipcPid, command: commandOf(ipcPid, 'node') });
+    }
+    for (const p of list) {
+        if (seen.has(p.pid))
+            continue;
+        seen.add(p.pid);
+        others.push({ pid: p.pid, command: shortCommand(p.command) });
+    }
+    const lines = [primary.message];
+    if (others.length > 0)
+        lines.push(t.othersHeader);
+    let allStopped = true;
+    for (const o of others) {
+        const stopped = killByPid(o.pid);
+        allStopped &&= stopped;
+        processes.push({ pid: o.pid, command: o.command, stopped });
+        lines.push(`  PID ${o.pid}  ${o.command}  ${stopped ? t.stopped : t.stopFailed}`);
+    }
+    return {
+        ok: primary.ok && allStopped,
+        pid: primary.pid,
+        imageName: primary.imageName,
+        message: lines.join('\n'),
+        ...(processes.length > 0 ? { processes } : {}),
+    };
+}
+/** The original 17529 rule, unchanged: only a node owner is killed. */
+function stopPortOwner(t) {
     const pid = findPidOnPort(WS_PORT);
     if (pid == null) {
-        return { ok: true, pid: null, imageName: null, message: t.alreadyFree };
+        return { ok: true, pid: null, imageName: null, message: t.alreadyFree, attempted: false };
     }
     const image = imageNameOf(pid);
     if (image == null) {
-        return { ok: false, pid, imageName: null, message: t.unknownOwner(pid) };
+        return { ok: false, pid, imageName: null, message: t.unknownOwner(pid), attempted: false };
     }
     if (!isNodeImage(image)) {
-        return { ok: false, pid, imageName: image, message: t.notNode(pid, image) };
+        return { ok: false, pid, imageName: image, message: t.notNode(pid, image), attempted: false };
     }
     const killed = killByPid(pid);
     return {
@@ -147,6 +211,7 @@ export function runFreePort(language = 'en') {
         pid,
         imageName: image,
         message: killed ? t.killed(pid) : t.killFailed(pid),
+        attempted: true,
     };
 }
 //# sourceMappingURL=free-port.js.map

package/dist/commands/free-port.js.map

@@ -1 +1 @@
-{"version":3,"file":"free-port.js","sourceRoot":"","sources":["../../src/commands/free-port.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"free-port.js","sourceRoot":"","sources":["../../src/commands/free-port.ts"],"names":[],"mappings":"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"}

package/dist/extension/background.js

@@ -13,6 +13,8 @@ import { DEFAULT_FLOW_RECORDING_ENABLED, FLOW_RECORDING_STORAGE_KEY, FLOW_RECORD
 import { buildRecorderJs, buildStopRecorderJs } from './inpage/recorder.js';
 import { DISCARDED_WHILE_SAVING_MESSAGE, appendRecordingStep, buildAmbiguousNote, buildNavigationWaitForStep, generateRecordingSession, isNavigationForRecording, isSameRecordingSession, parseRecordedPayload, toFlowStep, } from './recording.js';
 import { ALARM_MIN_DELAY_MS, CONNECT_IN_PROGRESS_ERROR, createReconnectScheduler, isInvoluntaryClose, planResume, reconnectStorageKey, tabIdFromReconnectKey, } from './reconnect-policy.js';
+import { REPAIR_TIMEOUT_MS, describeReconnectResults, describeRepairReply, planRepair, prevTabIdKey, rememberedTabIds, } from './repair-policy.js';
+import { computeVersionCheck } from './version-status.js';
 const WS_URL = 'ws://127.0.0.1:17529';
 const CDP_VERSION = '1.3';
 const CONSOLE_BUFFER_MAX = 200;
@@ -148,6 +150,8 @@ function isRuntimeMessage(msg) {
     const m = msg;
     if (m.action === 'versionCheck')
         return true;
+    if (m.action === 'repairConnection')
+        return true;
     if (m.action === 'openActivityWindow')
         return true;
     if (m.action === 'activityQuery')
@@ -2486,7 +2490,7 @@ chrome.debugger.onEvent.addListener((source, method, params) => {
  * stale tab_ids after a re-election.
  */
 async function readPreviousTabId(chromeTabId) {
-    const key = `prevTabId:${chromeTabId}`;
+    const key = prevTabIdKey(chromeTabId);
     try {
         const data = await chrome.storage.session.get(key);
         const v = data[key];
@@ -2497,7 +2501,7 @@ async function readPreviousTabId(chromeTabId) {
     }
 }
 async function storeTabId(chromeTabId, serverTabId) {
-    const key = `prevTabId:${chromeTabId}`;
+    const key = prevTabIdKey(chromeTabId);
     try {
         await chrome.storage.session.set({ [key]: serverTabId });
     }
@@ -2506,7 +2510,7 @@ async function storeTabId(chromeTabId, serverTabId) {
     }
 }
 async function forgetTabId(chromeTabId) {
-    const key = `prevTabId:${chromeTabId}`;
+    const key = prevTabIdKey(chromeTabId);
     try {
         await chrome.storage.session.remove(key);
     }
@@ -2770,6 +2774,13 @@ async function doConnectTab(tabId) {
                         if (typeof msg.payload.serverVersion === 'string') {
                             state.serverVersion = msg.payload.serverVersion;
                         }
+                        // Same narrowing for the 0.41.0 fields.
+                        if (typeof msg.payload.installedVersion === 'string') {
+                            state.installedVersion = msg.payload.installedVersion;
+                        }
+                        if (typeof msg.payload.serverPid === 'number') {
+                            state.serverPid = msg.payload.serverPid;
+                        }
                         // Remember this id so the next reconnect (after a primary swap)
                         // asks the new primary to honour it. The primary emits
                         // `tab-renamed` in the bridge event log if it can't.
@@ -2845,6 +2856,11 @@ async function doConnectTab(tabId) {
                         settleActivityRequest(msg.request_id, msg);
                         return;
                     }
+                    case 'bridge.repair.result': {
+                        // Not tab activity: the popup's Repair button is waiting on it.
+                        settleRepairRequest(msg);
+                        return;
+                    }
                     default: {
                         // Compile-time exhaustiveness check; at runtime an unknown kind
                         // (newer server, older extension) is ignored defensively.
@@ -2927,17 +2943,87 @@ function getTabStatus(tabId) {
 function getVersionCheck() {
     const extension = chrome.runtime.getManifest().version;
     let server = null;
+    let installed = null;
     for (const s of tabStates.values()) {
         if (typeof s.serverVersion === 'string' && s.serverVersion.length > 0) {
             server = s.serverVersion;
+            installed =
+                typeof s.installedVersion === 'string' && s.installedVersion.length > 0
+                    ? s.installedVersion
+                    : null;
             break;
         }
     }
-    return {
-        extension,
-        server,
-        aligned: server === null ? null : server === extension,
-    };
+    return computeVersionCheck({ extension, server, installed });
+}
+/* "Repair connection" (popup button). The decision lives in repair-policy.ts;
+ * this is the thin wiring that gathers its inputs and carries out the step. */
+/** The one in-flight `bridge.repair`, keyed by request id. A late or unknown
+ * reply is dropped, same rule as `settleActivityRequest`. */
+const pendingRepairs = new Map();
+function settleRepairRequest(reply) {
+    const pending = pendingRepairs.get(reply.request_id);
+    if (typeof pending !== 'function')
+        return;
+    pendingRepairs.delete(reply.request_id);
+    pending(reply);
+}
+async function readRememberedTabIds() {
+    try {
+        return rememberedTabIds(await chrome.storage.session.get(null));
+    }
+    catch {
+        return [];
+    }
+}
+/** Send `bridge.repair` on one open socket and wait for the answer. On
+ * success the server drops every socket uncleanly and the existing
+ * auto-reconnect scheduler brings the tabs back; nothing else to do here. */
+function askServerRestart(socket) {
+    const requestId = crypto.randomUUID();
+    return new Promise((resolve) => {
+        const timer = setTimeout(() => {
+            pendingRepairs.delete(requestId);
+            resolve(describeRepairReply('timeout'));
+        }, REPAIR_TIMEOUT_MS);
+        pendingRepairs.set(requestId, (reply) => {
+            clearTimeout(timer);
+            resolve(describeRepairReply(reply));
+        });
+        send(socket, { kind: 'bridge.repair', request_id: requestId });
+    });
+}
+async function repairConnection() {
+    const socket = [...tabStates.values()]
+        .map((s) => s.ws)
+        .find((ws) => ws !== undefined && ws.readyState === WebSocket.OPEN);
+    const plan = planRepair({
+        connected: socket !== undefined,
+        serverVersion: getVersionCheck().server,
+        rememberedTabIds: await readRememberedTabIds(),
+    });
+    switch (plan.step) {
+        case 'ask-server-restart':
+            // `planRepair` only picks this step when a socket is open.
+            return socket ? askServerRestart(socket) : { ok: false, message: 'Not connected' };
+        case 'reconnect-only': {
+            // Same path as the popup's Connect: an explicit attempt replaces any
+            // pending auto-reconnect for the tab, and connectTab's per-tab lock
+            // turns a race with an in-flight retry into a benign result.
+            const results = await Promise.all(plan.tabIds.map(async (tabId) => {
+                reconnectScheduler.cancel(tabId);
+                try {
+                    return await connectTab(tabId);
+                }
+                catch {
+                    return { ok: false };
+                }
+            }));
+            return describeReconnectResults(results);
+        }
+        case 'manual':
+            return { ok: false, message: plan.message };
+    }
 }
 // === Flow recording by demonstration ===================================
 //
@@ -3304,6 +3390,12 @@ chrome.runtime.onMessage.addListener((msg, _sender, sendResponse) => {
         sendResponse(getVersionCheck());
         return false;
     }
+    if (msg.action === 'repairConnection') {
+        void repairConnection().then(sendResponse, (err) => {
+            sendResponse({ ok: false, message: err instanceof Error ? err.message : String(err) });
+        });
+        return true;
+    }
     if (msg.action === 'openActivityWindow') {
         void openActivityWindow().then(sendResponse);
         return true;