bridgerator 1.0.7 → 1.0.8

package/README.md

@@ -40,7 +40,7 @@ Details: https://bridgerator.recondeck.com/pricing
 Update later with the same line (the key and folder settings are kept). Prefer to read first? Download `install.ps1`, read it, then run it.
 Servers or PCs without a browser: create a device key in your account (Add a computer → Advanced) and add `-Token <device key>` to the line.
 
-Manual install (PowerShell): `$env:PUPPETEER_SKIP_DOWNLOAD=1; npm install -g bridgerator`, then `bridgerator.cmd setup` (or `bridgerator.cmd setup --token <key>`). The variable skips a ~700 MB Chrome download that only PDF export needs; PDF export fetches a browser itself on first use.
+Manual install (PowerShell): `$env:PUPPETEER_SKIP_DOWNLOAD=1; npm.cmd install -g bridgerator`, then `bridgerator.cmd setup` (or `bridgerator.cmd setup --token <key>`). The variable skips a ~700 MB Chrome download that only PDF export needs; PDF export fetches a browser itself on first use.
 
 Other MCP clients: server URL `https://mcp.bridgerator.recondeck.com/mcp`, OAuth sign-in.
 
@@ -76,12 +76,13 @@ Bridgerator gives its bundled engine its **own** config folder (`%APPDATA%\Bridg
 ## Commands
 
 ```
-bridgerator.cmd setup [--token <key> | --pair] [--allow <dir>]... [--deny <dir>]...  # pair in the browser (no key yet / --pair) + config + autostart + start
+bridgerator.cmd setup [--token <key> | --pair] [--allow <dir>]... [--deny <dir>]...  # pair in the browser (no key yet, key rejected, or --pair) + config + autostart + start
 bridgerator.cmd run                                                       # foreground (what autostart runs)
 bridgerator.cmd status                                                    # config (token masked) + log tail
-bridgerator.cmd uninstall                                                 # stop + remove autostart
+bridgerator.cmd uninstall --all                                           # THE uninstall: stop, remove autostart, settings + key, the package and the Node.js the installer added
+bridgerator.cmd uninstall [--keep-config]                                 # stop, remove autostart and %APPDATA%\Bridgerator (kept with --keep-config); program files stay
 ```
-Log: `%APPDATA%\Bridgerator\bridge.log`. Stopping the bridge cuts access immediately.
+Log: `%APPDATA%\Bridgerator\bridge.log`. Stopping the bridge cuts access immediately. After uninstalling, also remove the computer on the account page: https://bridgerator.recondeck.com/app
 
 ## Privacy
 

package/install.ps1

@@ -4,7 +4,7 @@
 # A browser tab opens: sign in and confirm this computer — no key to paste. Run again to update
 # (keeps the key and folders). Servers / headless PCs: add -Token <device key> from the account page.
 # What it does: installs Node.js LTS if missing (portable zip, no admin), installs the bridgerator npm package,
-# then runs `bridgerator setup` (pairing in the browser if there is no key yet, config + hidden autostart
+# then runs `bridgerator.cmd setup` (pairing in the browser if there is no key yet, config + hidden autostart
 # at logon for THIS user, no admin rights),
 # then opens the welcome page in the default browser (skip with -NoBrowser).
 param(
@@ -17,17 +17,24 @@ param(
 $ErrorActionPreference = 'Stop'
 $paired = $Token -or (Test-Path (Join-Path $env:APPDATA 'Bridgerator\config.json'))
 
+# Private Node.js (portable zip) used when there is none or it is older than 20; it goes FIRST on
+# the PATH so an old system Node does not shadow it.
+$NodeDir = Join-Path $env:LOCALAPPDATA 'Bridgerator\node'
 function Refresh-Path {
-  $env:Path = [Environment]::GetEnvironmentVariable('Path', 'Machine') + ';' + [Environment]::GetEnvironmentVariable('Path', 'User')
+  $first = if (Test-Path (Join-Path $NodeDir 'node.exe')) { $NodeDir }
+  $env:Path = (@($first, [Environment]::GetEnvironmentVariable('Path', 'Machine'), [Environment]::GetEnvironmentVariable('Path', 'User')) | Where-Object { $_ }) -join ';'
 }
 
+$admin = ([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
+if ($admin) { Write-Warning "This window runs as Administrator. Bridgerator is installed for THIS Windows user only ($env:USERNAME), with this user's rights. To use it as another user, run the install command in that user's normal (not Administrator) PowerShell." }
+
 [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
 $ProgressPreference = 'SilentlyContinue'
 
 # No winget on many clean Windows installs: take the official Node.js LTS zip into the user's
 # profile (no admin rights), checked against nodejs.org SHASUMS256, and put it on the user PATH.
 function Install-PortableNode {
-  $dir = Join-Path $env:LOCALAPPDATA 'Bridgerator\node'
+  $dir = $NodeDir
   $arch = if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64') { 'arm64' } else { 'x64' }
   $rel = (Invoke-RestMethod 'https://nodejs.org/dist/index.json') | Where-Object { $_.lts -and ($_.files -contains "win-$arch-zip") } | Select-Object -First 1
   if (-not $rel) { throw 'Could not find a Node.js LTS build. Install Node.js 20+ from https://nodejs.org and run this again.' }
@@ -48,14 +55,30 @@ function Install-PortableNode {
     New-Item -ItemType Directory -Path (Split-Path $dir) -Force | Out-Null
     Move-Item (Join-Path $tmp $name) $dir
   } finally { Remove-Item $tmp -Recurse -Force -ErrorAction SilentlyContinue }
-  $userPath = [Environment]::GetEnvironmentVariable('Path', 'User')
-  if (($userPath -split ';') -notcontains $dir) { [Environment]::SetEnvironmentVariable('Path', (@($dir, $userPath) | Where-Object { $_ }) -join ';', 'User') }
+  # User PATH through the registry: keeps it REG_EXPAND_SZ with %VARS% unexpanded.
+  $k = [Microsoft.Win32.Registry]::CurrentUser.CreateSubKey('Environment')
+  $userPath = [string]$k.GetValue('Path', '', 'DoNotExpandEnvironmentNames')
+  if (($userPath -split ';') -notcontains $dir) { $k.SetValue('Path', ((@($dir) + ($userPath -split ';')) | Where-Object { $_ }) -join ';', [Microsoft.Win32.RegistryValueKind]::ExpandString) }
+  $k.Close()
+  # Tell Explorer the environment changed (new windows see the new PATH).
+  [Environment]::SetEnvironmentVariable('BRIDGERATOR_PATH_REFRESH', '1', 'User'); [Environment]::SetEnvironmentVariable('BRIDGERATOR_PATH_REFRESH', $null, 'User')
   Refresh-Path
 }
 
+# A running bridge (and its engine / ripgrep children, the hidden autostart loop) locks the package
+# and the private Node.js files: stop them before updating.
+Get-CimInstance Win32_Process -Filter "Name='wscript.exe' OR Name='node.exe' OR Name='rg.exe'" -ErrorAction SilentlyContinue |
+  Where-Object { $s = "$($_.CommandLine) $($_.ExecutablePath)".Replace('/', '\'); $s -like '*\node_modules\bridgerator\*' -or $s -like '*\Bridgerator\run-hidden.vbs*' } |
+  Sort-Object { $_.Name -ne 'wscript.exe' } |
+  ForEach-Object { Stop-Process -Id $_.ProcessId -Force -ErrorAction SilentlyContinue }
+
+if (Test-Path (Join-Path $NodeDir 'node.exe')) { $env:Path = "$NodeDir;$env:Path" }
 if (-not (Get-Command node -ErrorAction SilentlyContinue)) { Install-PortableNode }
 $major = [int]((& node -v).TrimStart('v').Split('.')[0])
-if ($major -lt 20) { throw "Node.js 20+ required, found $(& node -v). Update from https://nodejs.org" }
+if ($major -lt 20) {
+  Write-Host "Node.js $(& node -v) is too old (20+ needed) - Bridgerator gets its own copy, your Node.js stays as is."
+  Install-PortableNode
+}
 
 # The engine's PDF export brings puppeteer, whose postinstall downloads Chrome (~700 MB);
 # skipped here, PDF export fetches a browser itself the first time it is used.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bridgerator",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Connect ChatGPT to your Windows PC: files, search and terminal through an outbound-only bridge with folder limits. No inbound ports, no admin rights.",
   "license": "MIT",
   "type": "module",

package/src/bridge.mjs

@@ -8,10 +8,14 @@ import { createRequire } from 'node:module';
 import WebSocket from 'ws';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
-import { createPolicy, debrand } from './policy.mjs';
+import { createPolicy, debrand, debrandResult } from './policy.mjs';
 import { showNotice } from './notice.mjs';
 
 const RECONNECT_MS = 5000;
+// The relay pings every 30 s: silence for this long means a dead link (sleep/Wi-Fi switch) that
+// TCP alone may not notice for hours — drop it and reconnect.
+const SILENT_MS = 75000;
+const VERSION = createRequire(import.meta.url)('../package.json').version;
 const DC_ENTRY = createRequire(import.meta.url).resolve('@wonderwhy-er/desktop-commander/dist/index.js');
 const ISOLATE = new URL('./dc-isolate.mjs', import.meta.url).href;
 
@@ -26,8 +30,11 @@ export async function startDesktopCommander(cfg, log = console.log) {
     env: { ...process.env, DC_TELEMETRY_ENABLED: 'false', DESKTOP_COMMANDER_DISABLE_TELEMETRY: '1', DC_FLAG_URL: 'data:application/json,{"flags":{}}', BRIDGERATOR_DC_CONFIG_DIR: cfg.dcConfigDir },
     stderr: 'ignore',
   });
-  const client = new Client({ name: 'bridgerator', version: '1.0.0' }, { capabilities: {} });
+  const client = new Client({ name: 'bridgerator', version: VERSION }, { capabilities: {} });
   await client.connect(transport);
+  // Engine gone (crash, killed): nothing works without it — exit, the autostart starts us again.
+  let closing = false;
+  client.onclose = () => { if (closing) return; log('[bridgerator] engine stopped — exiting (autostart restarts the bridge)'); process.exit(1); };
   // The PC owner's limits go into Desktop Commander's own config; the model can't change them
   // (set_config_value is never exposed to the relay, see policy.ALWAYS_HIDDEN).
   const set = (key, value) => client.callTool({ name: 'set_config_value', arguments: { key, value } });
@@ -47,8 +54,9 @@ export async function startDesktopCommander(cfg, log = console.log) {
     const refusal = policy.check(name, args);
     if (refusal) return { content: [{ type: 'text', text: refusal }], isError: true };
     try {
-      // Results are NOT debranded: they carry the user's own file contents verbatim.
-      return policy.filter(await client.callTool({ name, arguments: args || {} }), name, args);
+      // Results are NOT debranded (the user's own file contents), except the engine's own
+      // get_prompts / get_config texts (debrandResult).
+      return policy.filter(debrandResult(name, await client.callTool({ name, arguments: args || {} }), VERSION), name, args);
     } catch (e) {
       return { content: [{ type: 'text', text: `bridge error: ${e?.message || e}` }], isError: true };
     }
@@ -57,18 +65,24 @@ export async function startDesktopCommander(cfg, log = console.log) {
     if (!resourceUris.has(uri)) return { error: 'unknown resource' };
     try { return { result: debrand(await client.readResource({ uri })) }; } catch (e) { return { error: String(e?.message || e) }; }
   }
-  return { client, tools: visible, resources, call, readResource, close: () => client.close() };
+  return { client, tools: visible, resources, call, readResource, close: () => { closing = true; return client.close(); } };
 }
 
 export function connect(cfg, dc, log = console.log) {
   const ws = new WebSocket(cfg.relay, { handshakeTimeout: 15000 });
-  let alive = false;
+  let alive = false, seen = Date.now();
+  const touch = () => { seen = Date.now(); };
+  const watch = setInterval(() => { if (Date.now() - seen > SILENT_MS) { log('[bridgerator] relay silent for 75s'); ws.terminate(); } }, 15000);
+  ws.on('ping', touch);
+  ws.on('pong', touch);
   ws.on('open', () => {
     alive = true;
+    touch();
     ws.send(JSON.stringify({ type: 'hello', token: cfg.token, tools: dc.tools, resources: dc.resources }));
     log('[bridgerator] linked to relay, waiting for calls');
   });
   ws.on('message', async (raw) => {
+    touch();
     let msg; try { msg = JSON.parse(raw); } catch { return; }
     if (msg.type === 'welcome') { log(`[bridgerator] registered as "${msg.device}"`); return; }
     if (msg.type === 'notice') { showNotice(msg, log); return; }
@@ -84,11 +98,20 @@ export function connect(cfg, dc, log = console.log) {
   const die = (why) => {
     if (ws._down) return;
     ws._down = true;
+    clearInterval(watch);
     log(`[bridgerator] disconnected (${why}); reconnecting in ${RECONNECT_MS / 1000}s`);
     setTimeout(() => connect(cfg, dc, log), RECONNECT_MS);
   };
   ws.on('close', (code) => {
-    if (code === 4003) { log('[bridgerator] relay rejected the device token — run the install command from your account page again (or `bridgerator.cmd setup --pair`)'); process.exit(2); }
+    clearInterval(watch);
+    // Exit 0 = done on purpose: the autostart loop (run-hidden.vbs) does not restart it.
+    if (code === 4003) {
+      log('[bridgerator] This computer is no longer linked to your Bridgerator account. Run the install command from https://bridgerator.recondeck.com/app again.');
+      ws._down = true;
+      showNotice({ kind: 'unlinked' }, log, () => process.exit(0));
+      return;
+    }
+    if (code === 4004) { log('[bridgerator] another Bridgerator on this computer took over the link — this one stops'); process.exit(0); }
     die(`close ${code}`);
   });
   ws.on('error', (e) => { if (!alive) die(`connect: ${e.message}`); });

package/src/cli.mjs

@@ -1,14 +1,15 @@
 #!/usr/bin/env node
-// bridgerator setup [--token <t> | --pair] [--relay <wss url>] [--allow <dir>]... [--deny <dir>]...  → config + autostart + start
-//   (no key yet: pairs this PC through the browser — the signed-in owner confirms a code)
-// bridgerator run | status | uninstall
+// bridgerator.cmd setup [--token <t> | --pair] [--relay <wss url>] [--allow <dir>]... [--deny <dir>]...  → config + autostart + start
+//   (no key yet, or the stored key was rejected: pairs this PC through the browser — the signed-in owner confirms a code)
+// bridgerator.cmd run | status | uninstall [--all | --keep-config]
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { spawn, execFileSync } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
 import { startDesktopCommander, connect } from './bridge.mjs';
-import { pair, siteOf } from './pair.mjs';
+import { pair, siteOf, checkKey } from './pair.mjs';
+import { ACCOUNT_URL } from './notice.mjs';
 
 const DEFAULT_RELAY = 'wss://mcp.bridgerator.recondeck.com/link';
 const TASK = 'Bridgerator';
@@ -17,6 +18,9 @@ const DIR = process.env.BRIDGERATOR_HOME || path.join(process.env.APPDATA || pat
 const CONFIG = path.join(DIR, 'config.json');
 const LOG = path.join(DIR, 'bridge.log');
 const SELF = fileURLToPath(import.meta.url);
+const PKG_DIR = path.dirname(path.dirname(SELF)); // …\node_modules\bridgerator
+// Private Node.js the installer puts in when there is none (or < 20) — see install.ps1.
+const NODE_DIR = path.join(process.env.LOCALAPPDATA || path.join(home, 'AppData', 'Local'), 'Bridgerator', 'node');
 
 function parse(argv) {
   const o = { _: [] };
@@ -48,8 +52,7 @@ function log(line) {
 function installAutostart() {
   if (process.platform !== 'win32') return 'autostart: not Windows — start `bridgerator run` yourself';
   const vbs = path.join(DIR, 'run-hidden.vbs');
-  const cmd = `"${process.execPath}" "${SELF}" run`;
-  fs.writeFileSync(vbs, `CreateObject("WScript.Shell").Run "${cmd.replace(/"/g, '""')}", 0, False\r\n`);
+  fs.writeFileSync(vbs, '\ufeff' + hiddenVbs(`"${process.execPath}" "${SELF}" run`), 'utf16le');
   // Registered through PowerShell's ScheduledTasks module: `schtasks /Create … wscript.exe …` spawned
   // from node is refused (EPERM) on clean Windows 11. No 72 h execution limit (the task default
   // would silently stop the bridge after three days); restart on failure.
@@ -65,11 +68,35 @@ function installAutostart() {
   return vbs;
 }
 
+// Hidden, waits for the bridge and restarts it after a crash (exit code ≠ 0); exit 0 = stopped on
+// purpose (computer unlinked, replaced). Saved as UTF-16 with BOM: WSH reads a BOM-less file as
+// ANSI, so a Cyrillic & co. profile path (C:\Users\Иван) would break the autostart.
+export function hiddenVbs(cmd) {
+  return [
+    'Set sh = CreateObject("WScript.Shell")',
+    'Do',
+    `  rc = sh.Run("${cmd.replace(/"/g, '""')}", 0, True)`,
+    '  If rc = 0 Then Exit Do',
+    '  WScript.Sleep 30000',
+    'Loop',
+    'WScript.Quit rc',
+    '',
+  ].join('\r\n');
+}
+
 function stopRunning() {
   if (process.platform !== 'win32') return;
-  // Only our own bridge processes: node.exe whose command line runs this cli with `run`.
-  const ps = `Get-CimInstance Win32_Process -Filter "Name='node.exe'" | Where-Object { $_.CommandLine -like '*bridgerator*cli.mjs*run*' -and $_.ProcessId -ne ${process.pid} } | ForEach-Object { Stop-Process -Id $_.ProcessId -Force }`;
-  try { execFileSync('powershell', ['-NoProfile', '-Command', ps], { stdio: 'pipe' }); } catch { /* none running */ }
+  // Only our own processes: the autostart loop (wscript, first — or it restarts the bridge), the
+  // bridge, its engine child and the engine's ripgrep — all run from this package / config folder.
+  const q = (s) => `'${s.toLowerCase().replace(/'/g, "''")}'`;
+  const ps = `Get-CimInstance Win32_Process -Filter "Name='wscript.exe' OR Name='node.exe' OR Name='rg.exe'" | Where-Object { $s = ("$($_.CommandLine) $($_.ExecutablePath)").ToLower().Replace('/', '\\'); $_.ProcessId -ne ${process.pid} -and ($s.Contains(${q(PKG_DIR)}) -or $s.Contains(${q(path.join(DIR, 'run-hidden.vbs'))})) } | Sort-Object { $_.Name -ne 'wscript.exe' } | ForEach-Object { Stop-Process -Id $_.ProcessId -Force -ErrorAction SilentlyContinue }`;
+  try { execFileSync('powershell', ['-NoProfile', '-NonInteractive', '-EncodedCommand', Buffer.from(ps, 'utf16le').toString('base64')], { stdio: 'pipe' }); } catch { /* none running */ }
+}
+
+// Removes `dir` from the user PATH, keeping its registry type (REG_EXPAND_SZ stays expandable).
+function removeFromUserPath(dir) {
+  const ps = `$k = [Microsoft.Win32.Registry]::CurrentUser.OpenSubKey('Environment', $true); if ($k -and $null -ne $k.GetValue('Path')) { $kind = $k.GetValueKind('Path'); $old = $k.GetValue('Path', '', 'DoNotExpandEnvironmentNames'); $new = ($old -split ';' | Where-Object { $_ -and $_.TrimEnd('\\') -ne ${`'${dir.replace(/'/g, "''")}'`} }) -join ';'; if ($new -ne $old) { $k.SetValue('Path', $new, $kind) } }`;
+  try { execFileSync('powershell', ['-NoProfile', '-NonInteractive', '-EncodedCommand', Buffer.from(ps, 'utf16le').toString('base64')], { stdio: 'pipe' }); } catch { /* PATH left as is */ }
 }
 
 // Start through the scheduled task itself — same as at logon, and not a child of this console
@@ -83,13 +110,20 @@ async function main() {
   const o = parse(process.argv.slice(2));
   const cmd = o._[0];
   if (cmd === 'setup') {
-    const prev = readConfig() || {};
     if (o.token === true) throw new Error('--token needs the device key from your Bridgerator account');
+    stopRunning(); // the old bridge must not hold the engine files / the link while we reconfigure
+    const prev = readConfig() || {};
     const relay = o.relay || prev.relay || DEFAULT_RELAY;
-    // --pair: get a new key through the browser even if one is configured (computer removed in the account).
-    const paired = !o.token && (o.pair || !prev.token);
-    const token = o.token || (paired ? (await pair(siteOf(relay), os.hostname())).token : prev.token);
-    if (paired) console.log('Confirmed — this computer is linked to your account.');
+    // --pair: get a new key through the browser even if one is configured. Without it, a stored key
+    // the relay rejects (computer removed in the account) is replaced the same way; offline = keep it.
+    let paired = !o.token && (o.pair || !prev.token);
+    if (!o.token && !paired && (await checkKey(siteOf(relay), prev.token)) === 'rejected') {
+      console.log("This computer was removed from your account — let's connect it again.");
+      paired = true;
+    }
+    const linked = paired ? await pair(siteOf(relay), os.hostname()) : null;
+    const token = o.token || (linked ? linked.token : prev.token);
+    if (linked) console.log(`Confirmed — this computer is linked to ${linked.email ? `the account ${linked.email}` : 'your account'}.`);
     const cfg = {
       relay,
       token,
@@ -105,7 +139,6 @@ async function main() {
     console.log(`allowed:  ${cfg.allowedDirectories.join(', ')}`);
     console.log(`excluded: ${cfg.deniedDirectories.join(', ') || '-'}`);
     console.log(installAutostart() ? `autostart: scheduled task "${TASK}" (at logon, hidden)` : '');
-    stopRunning();
     startHidden();
     console.log(`started in background — log: ${LOG}`);
     console.log('Next: in ChatGPT add the Bridgerator app and sign in with the same account.');
@@ -113,7 +146,7 @@ async function main() {
   }
   if (cmd === 'run') {
     const cfg = readConfig();
-    if (!cfg) throw new Error(`no config at ${CONFIG} — run: bridgerator setup`);
+    if (!cfg) throw new Error(`no config at ${CONFIG} — run the install command from ${ACCOUNT_URL}`);
     const dc = await startDesktopCommander({ ...cfg, dcConfigDir: path.join(DIR, 'dc') }, log);
     connect(cfg, dc, log);
     return;
@@ -126,12 +159,32 @@ async function main() {
     return;
   }
   if (cmd === 'uninstall') {
+    // uninstall --all: everything (THE uninstall for customers); --keep-config: keep key + folder settings.
+    if (process.platform === 'win32') try { execFileSync('schtasks', ['/Delete', '/F', '/TN', TASK], { stdio: 'pipe' }); } catch { /* not installed */ }
     stopRunning();
-    try { execFileSync('schtasks', ['/Delete', '/F', '/TN', TASK], { stdio: 'pipe' }); } catch { /* not installed */ }
-    console.log(`stopped and autostart removed. Config kept at ${CONFIG}. Remove the package: npm rm -g bridgerator`);
+    console.log('Bridgerator stopped, autostart removed.');
+    if (!o['keep-config']) { fs.rmSync(DIR, { recursive: true, force: true, maxRetries: 5 }); console.log(`Removed ${DIR} (device key, settings, history).`); }
+    const ownNode = fs.existsSync(path.join(NODE_DIR, 'node.exe'));
+    if (o.all) {
+      console.log('Removing the program files...');
+      // The npm next to the node.exe running us is the one whose global folder holds this package.
+      const npm = path.join(path.dirname(process.execPath), 'npm.cmd');
+      try { execFileSync('cmd', ['/d', '/c', fs.existsSync(npm) ? npm : 'npm.cmd', 'rm', '-g', 'bridgerator', '--loglevel=error'], { stdio: 'inherit' }); } catch { console.log('Could not remove the npm package — run: npm.cmd rm -g bridgerator'); }
+      if (ownNode) {
+        removeFromUserPath(NODE_DIR);
+        // This very process may run on that node.exe: delete the folder a few seconds after we exit.
+        spawn('cmd', ['/d', '/c', `ping -n 4 127.0.0.1 >nul & rmdir /s /q "${NODE_DIR}" & rmdir "${path.dirname(NODE_DIR)}"`], { detached: true, stdio: 'ignore', windowsHide: true, windowsVerbatimArguments: true }).unref();
+        console.log(`Removed the Node.js that Bridgerator installed (${NODE_DIR}).`);
+      }
+    } else {
+      console.log('To remove the program files: npm.cmd rm -g bridgerator');
+      if (ownNode) console.log(`and the Node.js that Bridgerator installed: Remove-Item -Recurse -Force '${NODE_DIR}'`);
+      console.log('(or remove everything at once: bridgerator.cmd uninstall --all)');
+    }
+    console.log(`Also remove this computer in your account: ${ACCOUNT_URL}`);
     return;
   }
-  console.log('usage: bridgerator setup [--token <key> | --pair] [--allow <dir>]... [--deny <dir>]... | run | status | uninstall');
+  console.log('usage: bridgerator.cmd setup [--token <key> | --pair] [--allow <dir>]... [--deny <dir>]... | run | status | uninstall [--all | --keep-config]');
 }
 
 main().catch((e) => { console.error(`[bridgerator] ${e?.message || e}`); process.exit(1); });

package/src/notice.mjs

@@ -13,6 +13,7 @@ export function noticeText(n) {
     limit: ['Bridgerator: monthly limit reached', `${n.calls} of ${n.limit} tool calls used. ChatGPT can't use this PC until the 1st. Turn on Pro in your account.`],
     expired: ['Bridgerator Pro has ended', "You're on Free now (10,000 tool calls a month). Renew Pro in your account."],
     expiring: [`Bridgerator Pro ends on ${day(n.until)}`, 'Pay for 30 more days in your account to keep unlimited calls.'],
+    unlinked: ['Bridgerator: this computer is no longer linked', 'ChatGPT can no longer reach this PC. Run the install command from your account page again.'],
   }[n.kind];
   return t && { title: t[0], body: t[1], button: 'Open account' };
 }
@@ -22,11 +23,12 @@ export function toastXml({ title, body, button }) {
     + `<actions><action content="${xml(button)}" activationType="protocol" arguments="${ACCOUNT_URL}"/></actions></toast>`;
 }
 
-export function showNotice(n, log = console.log) {
+// `done` runs once the notification is shown (or could not be): lets the caller exit after it.
+export function showNotice(n, log = console.log, done = () => {}) {
   const t = noticeText(n);
-  if (!t) return;
+  if (!t) return done();
   log(`[bridgerator] notice: ${t.title} — ${t.body} ${ACCOUNT_URL}`);
-  if (process.platform !== 'win32') return;
+  if (process.platform !== 'win32') return done();
   // Own app id under HKCU (no admin): the notification header reads "Bridgerator", not "Windows PowerShell".
   const ps = `$k = 'HKCU:\\Software\\Classes\\AppUserModelId\\Bridgerator'
 if (-not (Test-Path $k)) { New-Item $k -Force | Out-Null; New-ItemProperty $k -Name DisplayName -Value 'Bridgerator' -Force | Out-Null }
@@ -35,5 +37,5 @@ if (-not (Test-Path $k)) { New-Item $k -Force | Out-Null; New-ItemProperty $k -N
 $x = New-Object Windows.Data.Xml.Dom.XmlDocument
 $x.LoadXml('${toastXml(t).replace(/'/g, "''")}')
 [Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier('Bridgerator').Show([Windows.UI.Notifications.ToastNotification]::new($x))`;
-  execFile('powershell', ['-NoProfile', '-NonInteractive', '-EncodedCommand', Buffer.from(ps, 'utf16le').toString('base64')], { windowsHide: true }, (e) => { if (e) log(`[bridgerator] notification failed: ${e.message}`); });
+  execFile('powershell', ['-NoProfile', '-NonInteractive', '-EncodedCommand', Buffer.from(ps, 'utf16le').toString('base64')], { windowsHide: true }, (e) => { if (e) log(`[bridgerator] notification failed: ${e.message}`); done(); });
 }

package/src/pair.mjs

@@ -17,7 +17,7 @@ export function openBrowser(url) {
   } catch { /* no browser: the URL is printed */ }
 }
 
-/** → { token, name } once the owner confirmed; throws when the code expires. */
+/** → { token, name, email? } once the owner confirmed; throws when the code expires. */
 export async function pair(site, name, { fetch: f = globalThis.fetch, open = openBrowser, log = console.log, sleep = (ms) => new Promise((r) => setTimeout(r, ms)), everyMs = 3000 } = {}) {
   const post = (path, body) => f(`${site}${path}`, { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify(body), signal: AbortSignal.timeout(20000) });
   const r = await post('/pair/start', { name });
@@ -36,8 +36,20 @@ export async function pair(site, name, { fetch: f = globalThis.fetch, open = ope
     await sleep(everyMs);
     let p;
     try { p = await post('/pair/poll', { poll: s.poll }); } catch { continue; } // network blip: try again
-    if (p.status === 200) { const j = await p.json(); if (j.token) return { token: j.token, name: j.name || name }; }
+    if (p.status === 200) { const j = await p.json(); if (j.token) return { token: j.token, name: j.name || name, ...(typeof j.email === 'string' ? { email: j.email } : {}) }; }
     if (p.status === 410) break;
+    if (p.status === 404) throw new Error('this pairing code is no longer valid — run the install command again');
+    if (p.status === 429) throw new Error('too many attempts — wait a few minutes, then run the install command again');
   }
   throw new Error('the code expired before it was confirmed — run the command again');
 }
+
+/** Is the stored device key still accepted? → 'ok' | 'rejected' (computer removed in the account) | 'unknown' (network). */
+export async function checkKey(site, token, { fetch: f = globalThis.fetch } = {}) {
+  try {
+    const r = await f(`${site}/pair/check`, { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ token }), signal: AbortSignal.timeout(15000) });
+    if (r.status === 401) return 'rejected';
+    if (r.status === 200 && (await r.json().catch(() => ({}))).ok === true) return 'ok';
+  } catch { /* offline: keep the key */ }
+  return 'unknown';
+}

package/src/policy.mjs

@@ -107,3 +107,18 @@ export function debrand(v) {
   }
   return v;
 }
+
+// Two results are the engine's own text, not user data: the prompt catalog (get_prompts says
+// "Desktop Commander Prompt Categories") and get_config, whose `version` is the engine's and is
+// shown as "Bridgerator version" — replaced by the bridge's own version.
+export function debrandResult(name, result, version) {
+  if (!result || typeof result !== 'object') return result;
+  if (name === 'get_prompts') return debrand(result);
+  const sc = result.structuredContent, engine = sc?.config?.version;
+  if (name !== 'get_config' || typeof engine !== 'string') return result;
+  const label = `"version": ${JSON.stringify(engine)}`;
+  const content = Array.isArray(result.content)
+    ? result.content.map((c) => (c?.type === 'text' && typeof c.text === 'string' ? { ...c, text: c.text.replace(label, `"version": ${JSON.stringify(version)}`) } : c))
+    : result.content;
+  return { ...result, content, structuredContent: { ...sc, config: { ...sc.config, version } } };
+}