bridgerator 1.1.5 → 1.1.7

package/LICENSE

@@ -19,6 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
-Bundled dependency: Desktop Commander (https://github.com/wonderwhy-er/DesktopCommanderMCP),
-MIT License, Copyright (c) 2024-2025 Eduard Ruzga and Desktop Commander Contributors.

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "bridgerator",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "bridgerator",
-      "version": "1.1.5",
+      "version": "1.1.7",
       "license": "MIT",
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.29.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bridgerator",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "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

@@ -1,5 +1,5 @@
 // Bridgerator bridge: runs on the user's PC.
-//   - starts the bundled open-source Desktop Commander MCP server as a child over stdio;
+//   - starts the bundled MCP engine as a child over stdio;
 //   - pushes this PC's limits (allowedDirectories, blockedCommands) into it at startup;
 //   - opens ONE outbound WebSocket to the relay (no inbound port is opened on this PC);
 //   - forwards each relay `call` through the policy (excluded / read-only folders, disabled tools)
@@ -9,7 +9,7 @@ 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, debrandResult, TERMINAL_TOOLS, ALWAYS_HIDDEN } from './policy.mjs';
+import { createPolicy, debrand, debrandResult, ourUi, engineUi, TERMINAL_TOOLS, ALWAYS_HIDDEN } from './policy.mjs';
 import { showNotice } from './notice.mjs';
 import { usage } from './telemetry.mjs';
 import { createGate, askOnPc, CONFIRM_TOOL_DEFS } from './confirm.mjs';
@@ -78,7 +78,7 @@ export async function localDrivesAsync() {
 }
 const DRIVES_MS = 60000;
 
-export async function startDesktopCommander(cfg, log = console.log, { ask: askArg, recycle: recycleArg, drives: drivesArg, delegate: delegateOpts } = {}) {
+export async function startEngine(cfg, log = console.log, { ask: askArg, recycle: recycleArg, drives: drivesArg, delegate: delegateOpts } = {}) {
   const ask0 = askArg || askOnPc;
   const recycle = recycleArg || recycleOnPc;
   // Drive list: refreshed in the background once a minute (new / removed drives are seen); only the
@@ -115,7 +115,7 @@ export async function startDesktopCommander(cfg, log = console.log, { ask: askAr
   const absPath = (p) => path.resolve(engineDir, String(p).replace(/^~(?=[\\/]|$)/, os.homedir()));
   const transport = new StdioClientTransport({
     command: process.execPath,
-    // Own Desktop Commander config (dc-isolate.mjs): a DC the user runs elsewhere keeps its limits.
+    // The engine's own config folder (dc-isolate.mjs): a copy of the engine the user runs elsewhere keeps its limits.
     args: ['--import', ISOLATE, DC_ENTRY],
     // No calls home: telemetry kill-switch, and remote feature flags (onboarding page, promo text
     // injected into tool results, A/B tests) replaced by an empty local set.
@@ -133,7 +133,7 @@ export async function startDesktopCommander(cfg, log = console.log, { ask: askAr
   // 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)${engineErr()}`); process.exit(1); };
-  // The PC owner's limits go into Desktop Commander's own config; the model can't change them
+  // The PC owner's limits go into the engine'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 } });
   await set('allowedDirectories', cfg.allowedDirectories || []);
@@ -152,7 +152,7 @@ export async function startDesktopCommander(cfg, log = console.log, { ask: askAr
   // Snapshots + Undo (on by default) in %LOCALAPPDATA%\Bridgerator\snapshots (given by the CLI).
   const snapCfg = () => ({ ...SNAP_DEFAULTS, ...(cfg.snapshots || {}) });
   const snapshots = cfg.snapshotsDir ? createSnapshots(cfg.snapshotsDir, { limits: snapCfg, log }) : null;
-  const visible = [...tools.filter(listed).map(debrand), ...CONFIRM_TOOL_DEFS, SETUP_TOOL_DEF, ...(cfg.configFile ? [SETTINGS_TOOL_DEF] : []), ...(cfg.configDir ? QUEUE_TOOL_DEFS : []), ...(snapshots ? [UNDO_TOOL_DEF] : []), ...extra.defs.filter(policy.visible)].map(shorten);
+  const visible = [...tools.filter(listed).map(debrand), ...CONFIRM_TOOL_DEFS, SETUP_TOOL_DEF, ...(cfg.configFile ? [SETTINGS_TOOL_DEF] : []), ...(cfg.configDir ? QUEUE_TOOL_DEFS : []), ...(snapshots ? [UNDO_TOOL_DEF] : []), ...extra.defs.filter(policy.visible)].map(shorten).map(ourUi);
   const virtual = new Set(CONFIRM_TOOL_DEFS.map((t) => t.name));
   // namePending: a computer name given on this PC not yet accepted by the relay — kept in config.json too,
   // so a restart before the next link does not lose it; cleared by nameSent() (welcome / live mode message).
@@ -197,7 +197,7 @@ export async function startDesktopCommander(cfg, log = console.log, { ask: askAr
     return gate.accept(s ? { enabled: s.enabled } : {});
   };
   // MCP Apps widgets (file preview, config view) — served to ChatGPT through the relay as-is.
-  const resources = ((await client.listResources().catch(() => ({ resources: [] }))).resources || []).map(debrand);
+  const resources = ourUi(((await client.listResources().catch(() => ({ resources: [] }))).resources || []).map(debrand));
   const resourceUris = new Set(resources.map((r) => r.uri));
   log(`[bridgerator] engine up: ${visible.length} tools; allowed=${JSON.stringify(cfg.allowedDirectories || [])} excluded=${JSON.stringify(cfg.deniedDirectories || [])} read-only=${JSON.stringify(cfg.readOnlyDirectories || [])} confirm=${gate.mode()}`);
   if (!(cfg.allowedDirectories || []).length) log('[bridgerator] folders: all (no list), except the always-blocked ones');
@@ -492,8 +492,9 @@ export async function startDesktopCommander(cfg, log = console.log, { ask: askAr
     return { ...rest, confirm: { enabled: confirm.enabled, ...confirm.ask, timeoutSeconds: confirm.timeoutSec }, telemetryEnabled: telemetry };
   };
   async function readResource(uri) {
-    if (!resourceUris.has(uri)) return { error: 'unknown resource' };
-    try { return { result: debrand(await client.readResource({ uri })) }; } catch (e) { return { error: String(e?.message || e) }; }
+    // The old widget URI still works: ChatGPT and the relay's offline list may have cached it.
+    if (!resourceUris.has(ourUi(String(uri)))) return { error: 'unknown resource' };
+    try { return { result: ourUi(debrand(await client.readResource({ uri: engineUi(uri) }))) }; } catch (e) { return { error: String(e?.message || e) }; }
   }
   // Requests of the Bridgerator window (tray helper). Made by the person at the PC: no extra prompt.
   // Theme for our pop-ups = the window's theme (Settings → Appearance); sound / style from Notifications.

package/src/cli.mjs

@@ -10,7 +10,7 @@ import crypto from 'node:crypto';
 import { spawn, execFileSync } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
 import { isSea } from 'node:sea';
-import { startDesktopCommander, connect, checkRelay } from './bridge.mjs';
+import { startEngine, connect, checkRelay } from './bridge.mjs';
 import { pair, siteOf, checkKey, machineFp } from './pair.mjs';
 import { ACCOUNT_URL } from './notice.mjs';
 import { send, VERSION } from './telemetry.mjs';
@@ -393,7 +393,7 @@ async function main() {
       protectSensitive: prev.protectSensitive === true,
       // Readable, never changed by the file tools (the terminal is not bound by folders).
       readOnlyDirectories: o['read-only'] ? abs(o['read-only']) : prev.readOnlyDirectories || [],
-      // blockedCommands: absent = Desktop Commander's own default list (format, diskpart, reg, net, sc, runas, …).
+      // blockedCommands: absent = the engine's own default list (format, diskpart, reg, net, sc, runas, …).
       ...(prev.blockedCommands ? { blockedCommands: prev.blockedCommands } : {}),
       disabledTools: prev.disabledTools || [],
       installId: prev.installId || crypto.randomUUID(),
@@ -471,7 +471,7 @@ async function main() {
         plan: b.kind === 'none' ? null : { label: b.action === 'renew' ? 'Renew Pro…' : 'Upgrade to Pro…', url: b.url, badge: b.tone },
       });
     };
-    dc = await startDesktopCommander({ ...cfg, dcConfigDir: path.join(DIR, 'dc'), configDir: DIR, confirmIni: INI, configFile: CONFIG, snapshotsDir: SNAP_DIR, scriptsDir: SCRIPTS_DIR }, log, { ask: tray ? (q) => tray.ask(q) : undefined });
+    dc = await startEngine({ ...cfg, dcConfigDir: path.join(DIR, 'dc'), configDir: DIR, confirmIni: INI, configFile: CONFIG, snapshotsDir: SNAP_DIR, scriptsDir: SCRIPTS_DIR }, log, { ask: tray ? (q) => tray.ask(q) : undefined });
     dc.cfgName = () => readConfig()?.deviceName;
     dc.openWindow = (page) => tray?.open(page);
     dc.onPlan = pushTray;

package/src/dc-config-hooks.mjs

@@ -25,7 +25,7 @@ const PATCHES = [
   { file: /[\\/]dist[\\/]terminal-manager\.js$/, from: "args: ['-Command', command],", to: "args: ['-Command', '[Console]::OutputEncoding=[Text.Encoding]::UTF8;' + command]," },
   { file: /[\\/]dist[\\/]index\.js$/, from: '            ensureChromeAvailable();\n', to: '            // bridgerator: no Chrome pre-download\n' },
 ];
-const ENGINE = /[\\/]bridgerator-engine[\\/]dist[\\/]/; // the bundled engine (Desktop Commander, MIT) installed under our own name (npm alias, owner 26.10)
+const ENGINE = /[\\/]bridgerator-engine[\\/]dist[\\/]/; // the bundled engine, installed under our own name (owner 26.10)
 
 export async function load(url, context, nextLoad) {
   const r = await nextLoad(url, context);

package/src/dc-isolate.mjs

@@ -1,4 +1,4 @@
-// Preload for the Desktop Commander child: registers dc-config-hooks.mjs (see there).
+// Preload for the engine child: registers dc-config-hooks.mjs (see there).
 import { register } from 'node:module';
 
 if (!process.env.BRIDGERATOR_DC_CONFIG_DIR) throw new Error('bridgerator: BRIDGERATOR_DC_CONFIG_DIR not set');

package/src/policy.mjs

@@ -1,5 +1,5 @@
-// Bridge-side access policy, applied BEFORE a call reaches Desktop Commander and to its results.
-// Desktop Commander itself only knows allowedDirectories; it has no "except these folders" rule,
+// Bridge-side access policy, applied BEFORE a call reaches the engine and to its results.
+// The engine itself only knows allowedDirectories; it has no "except these folders" rule,
 // so deniedDirectories is enforced here: input paths are resolved (symlinks/junctions included)
 // and refused when they fall inside a denied folder; result lines that mention a denied path are
 // dropped (search hits, recursive listings).
@@ -53,7 +53,7 @@ const expandHome = (p) => (p === '~' || p.startsWith('~/') || p.startsWith('~\\'
 // base: the folder a relative path is resolved against (default: this process's cwd).
 export const norm = (p, base) => path.resolve(base || '.', expandHome(String(p))).replace(/[\\/]+$/, '').toLowerCase();
 
-// Resolve symlinks/junctions on the deepest existing ancestor, like Desktop Commander does.
+// Resolve symlinks/junctions on the deepest existing ancestor, like the engine does.
 export function realish(p, base) {
   const start = path.resolve(base || '.', expandHome(String(p)));
   let cur = start;
@@ -157,6 +157,8 @@ const SELF_CHANGE = [
   /\b(?:taskkill|tskill|pskill|kill|stop-process|wmic|schtasks|(?:start|stop|disable|enable|unregister|set)-scheduledtask)\b[^|;&\n]*\bbridgerator/i,
   /\bbridgerator[^;&\n]*\|\s*(?:stop-process|kill|(?:stop|disable|unregister|set)-scheduledtask)\b/i,
 ];
+// Tools whose result is the text of files that passed the folder check (shown whole, never filtered).
+const FILE_TEXT = new Set(['read_file', 'read_multiple_files']);
 export function createPolicy(cfg = {}) {
   const base = cfg.cwd || process.cwd();
   // protectSensitive absent = on (callers that don't say); the bridge passes the person's setting.
@@ -249,8 +251,10 @@ export function createPolicy(cfg = {}) {
     },
     // Drop result lines that reveal anything inside a denied folder. `args` lets a listing of a
     // parent folder hide the excluded child, whose entries are printed relative to that parent.
+    // Not for the text of a file that was allowed to be read: a line that merely NAMES an excluded folder is the
+    // person's own content (E2E 26.10: .md notes lost lines, a later full rewrite would delete them from disk).
     filter(result, name, args) {
-      if (!denied.length || !result || !Array.isArray(result.content)) return result;
+      if (!denied.length || !result || !Array.isArray(result.content) || FILE_TEXT.has(name)) return result;
       const rel = [];
       if (name === 'list_directory' && typeof args?.path === 'string') {
         const at = norm(realish(args.path, base));
@@ -274,6 +278,11 @@ export function createPolicy(cfg = {}) {
 // The bundled engine's own name and links are not shown to the user: tool titles/descriptions and
 // widget HTML say Bridgerator. Tool RESULTS are never rewritten (they are the user's own data).
 const BRAND = [[/"DC: \.\.\." or /g, ''], [/Desktop ?Commander/g, 'Bridgerator'], [/https?:\/\/(www\.)?desktopcommander\.app[^\s"'\)<]*/g, 'https://bridgerator.recondeck.com']];
+// The engine's widget URIs and their in-page state key carry its name: ChatGPT sees them in tool _meta and resources.
+// Shown as ui://bridgerator/…, mapped back when a resource is read (owner 26.10: "как будто наш код").
+const UI_ENGINE = 'ui://desktop-commander/', UI_OURS = 'ui://bridgerator/';
+export const ourUi = (v) => JSON.parse(JSON.stringify(v).replaceAll(UI_ENGINE, UI_OURS).replaceAll('desktop-commander:widget-state', 'bridgerator:widget-state'));
+export const engineUi = (uri) => String(uri).replace(UI_OURS, UI_ENGINE);
 export function debrand(v) {
   if (typeof v === 'string') return BRAND.reduce((s, [re, to]) => s.replace(re, to), v);
   if (Array.isArray(v)) return v.map(debrand);
@@ -287,7 +296,7 @@ export function debrand(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
+// its own brand in the heading) 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;

package/ui/app.js

@@ -172,7 +172,7 @@ function awakeLine() {
   return `<div class="awake-line ${a.on ? 'on' : ''}"><span class="dot ${a.on ? 'online' : 'offline'}"></span>${esc(t(k))}</div>`;
 }
 // The Bridgerator app's "Permission" page in ChatGPT (App ID of the store app). Owner 26.10: on first use ChatGPT
-// asks before most actions ("Allow low-risk"); one switch to "Allow all" stops that, like Desktop Commander.
+// asks before most actions ("Allow low-risk"); one switch to "Allow all" stops that.
 const CHATGPT_PERMISSIONS = 'https://chatgpt.com/settings/plugins-settings/plugin_asdk_app_6ad78d4a3c408191a9215fd304394c4a/permissions';
 P.home = () => {
   const st = state.state || 'offline';