bridgerator 1.1.8 → 1.1.10

package/npm-shrinkwrap.json

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

package/package.json

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

@@ -251,6 +251,8 @@ export async function startEngine(cfg, log = console.log, { ask: askArg, recycle
 
   // bridgerator_setup: applied at once; after Apply on the PC only with askSettings on (setup-tool.mjs).
   const say = (t, isError) => ({ content: [{ type: 'text', text: t }], ...(isError ? { isError: true } : {}) });
+  // The person sees every settings change not made in the window (notify.settingsChanged, on by default; owner 26.10).
+  const toldSettings = (by, lines) => { if (lines.length && cfg.notify?.settingsChanged !== false) showNotice({ kind: 'settings_changed', by, what: lines }, log); };
   async function setup(args) {
     const v = validateSetup(args);
     if (v.error) return say(`Not applied: ${v.error}`, true);
@@ -261,7 +263,7 @@ export async function startEngine(cfg, log = console.log, { ask: askArg, recycle
       delete v.value.preset;
     }
     // Owner 21.10: applied at once; Apply on the PC only when the person turned on "Ask before AI changes settings".
-    if (cfg.askSettings !== true) { await applyValues(v.value, 'bridgerator_setup'); return say('Applied on the PC.'); }
+    if (cfg.askSettings !== true) { const d = diffSetup(cfg, cfg.confirmIni, v.value).short; await applyValues(v.value, 'bridgerator_setup'); toldSettings('ai', d ? [d] : []); return say('Applied on the PC.'); }
     // A diff that fits the notification gets Apply there; a longer one is reviewed in the window.
     const diff = diffSetup(cfg, cfg.confirmIni, v.value);
     let r;
@@ -293,12 +295,13 @@ export async function startEngine(cfg, log = console.log, { ask: askArg, recycle
     const risky = v.changes.filter(ask1), safe = v.changes.filter((c) => !ask1(c));
     for (const c of safe) await rpc('setSetting', { ...c, via: 'bridgerator_settings' });
     const done = safe.map((c) => describe(cur, c));
+    toldSettings('ai', done);
     if (!risky.length) return say(`Applied: ${done.join('; ')}`);
     const lines = risky.map((c) => describe(cur, c)), short = lines.join(' · ');
     const r = short.length <= 180
       ? await gate.askPerson('settings', { head: 'ChatGPT wants to change Bridgerator settings', text: short, buttons: [['allow', 'Apply', ''], ['deny', 'Cancel', 'deny']], secs: 120, auto: 'auto-cancel', ...popup() })
       : await gate.askPerson('settings', { review: true, lines });
-    if (r === 'allow') { for (const c of risky) await rpc('setSetting', { ...c, via: 'bridgerator_settings' }); return say(`Applied${done.length ? `: ${done.join('; ')};` : ':'} after the person's OK: ${lines.join('; ')}`); }
+    if (r === 'allow') { for (const c of risky) await rpc('setSetting', { ...c, via: 'bridgerator_settings' }); toldSettings('ai', lines); return say(`Applied${done.length ? `: ${done.join('; ')};` : ':'} after the person's OK: ${lines.join('; ')}`); }
     return { ...say(`${done.length ? `Applied: ${done.join('; ')}. ` : ''}Not applied (the person at the PC ${r === 'cooldown' ? 'declined a few minutes ago' : 'cancelled or didn\'t answer'}): ${lines.join('; ')}`), notConfirmed: true };
   }
 
@@ -504,7 +507,7 @@ export async function startEngine(cfg, log = console.log, { ask: askArg, recycle
   const bannerNow = () => { const b = planBanner(out.plan); return { ...b, visible: bannerVisible(b, cfg.planBannerDismissed) }; };
   out.banner = bannerNow;
   out.onPlanMsg = (m) => { out.plan = readPlan(m); out.onPlan?.(); };
-  const BOOL_NOTIFY = ['sound', 'offline', 'queueDone', 'queueStalled', 'limit'];
+  const BOOL_NOTIFY = ['sound', 'offline', 'queueDone', 'queueStalled', 'settingsChanged', 'limit'];
 
   // Requests of the Bridgerator window (tray helper). Made by the person at the PC: no extra prompt.
   async function rpc(method, p = {}, paths = []) {
@@ -654,21 +657,27 @@ export async function startEngine(cfg, log = console.log, { ask: askArg, recycle
     const den = list(j.deniedDirectories), denNow = cfg.deniedDirectories || [];
     const denRemoved = denNow.filter((x) => !den.some((y) => y.toLowerCase() === x.toLowerCase()));
     if (!changes.length && JSON.stringify(den) === JSON.stringify(denNow)) return;
-    const risky = changes.filter((c) => widens(cur, c)), safe = changes.filter((c) => !widens(cur, c));
+    // Owner 26.10: a file edit applies at once like an AI change; Apply on the PC only with askSettings on.
+    const ask1 = (c) => cfg.askSettings === true && widens(cur, c);
+    const risky = changes.filter(ask1), safe = changes.filter((c) => !ask1(c));
+    const denAsk = cfg.askSettings === true && denRemoved.length > 0;
     const back = {};
     const top = (key) => (key === 'terminal' ? 'disabledTools' : key.split('.')[0]);
     for (const c of safe) { try { await rpc('setSetting', { ...c, via: 'settings file' }); } catch (e) { log(`[bridgerator] settings file: ${c.key} not applied (${e.message})`); back[top(c.key)] = cfg[top(c.key)]; } }
-    if (!denRemoved.length) { cfg.deniedDirectories = den; policy = makePolicy(); }
-    const lines = [...risky.map((c) => describe(cur, c)), ...(denRemoved.length ? [`Excluded folders: ${denRemoved.map((x) => `−${x}`).join(', ')}`] : [])];
+    if (!denAsk) { cfg.deniedDirectories = den; policy = makePolicy(); }
+    const denLine = denRemoved.length ? [`Excluded folders: ${denRemoved.map((x) => `−${x}`).join(', ')}`] : [];
+    toldSettings('file', [...safe.filter((c) => !(top(c.key) in back)).map((c) => describe(cur, c)), ...(denAsk ? [] : denLine)]);
+    const lines = [...risky.map((c) => describe(cur, c)), ...(denAsk ? denLine : [])];
     if (lines.length) {
       const r = await gate.askPerson('file', { head: 'Bridgerator settings file changed', text: clip(`Apply: ${lines.join(' · ')}?`, '', 180), buttons: [['allow', 'Apply', ''], ['deny', 'Keep', 'deny']], secs: 120, auto: 'auto-keep', ...popup() });
       if (r === 'allow') {
         for (const c of risky) { try { await rpc('setSetting', { ...c, via: 'settings file' }); } catch (e) { log(`[bridgerator] settings file: ${c.key} not applied (${e.message})`); back[top(c.key)] = cfg[top(c.key)]; } }
-        if (denRemoved.length) { cfg.deniedDirectories = den; policy = makePolicy(); }
+        if (denAsk) { cfg.deniedDirectories = den; policy = makePolicy(); }
+        toldSettings('file', lines);
         log(`[bridgerator] settings file change applied on the PC: ${lines.join('; ')}`);
       } else {
         for (const c of risky) back[top(c.key)] = cfg[top(c.key)];
-        if (denRemoved.length) back.deniedDirectories = denNow;
+        if (denAsk) back.deniedDirectories = denNow;
         log(`[bridgerator] settings file change kept out (${r}): ${lines.join('; ')}`);
       }
     }

package/src/cli.mjs

@@ -39,6 +39,8 @@ const INI = path.join(DIR, 'confirm.ini'); // on-PC confirmation settings (confi
 const SNAP_DIR = DIR === path.join(APPDATA, 'Bridgerator') ? path.join(LOCALAPPDATA, 'Bridgerator', 'snapshots') : path.join(DIR, 'snapshots');
 // Automations (scheduled scripts, automations.mjs): inside the always-excluded %LOCALAPPDATA%\Bridgerator.
 const SCRIPTS_DIR = DIR === path.join(APPDATA, 'Bridgerator') ? path.join(LOCALAPPDATA, 'Bridgerator', 'scripts') : path.join(DIR, 'scripts');
+// The window's WebView2 data: a second bridge (--home) gets its own, or its window stays black (one data folder = one browser process).
+const WEBVIEW_DIR = DIR === path.join(APPDATA, 'Bridgerator') ? path.join(LOCALAPPDATA, 'Bridgerator', 'webview') : path.join(DIR, 'webview');
 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 < 22) — see install.ps1.
@@ -335,7 +337,9 @@ const defaultDenied = () => [];
 /** The setup summary's "excluded" line: only what really applies (sensitive folders only when that switch is on). */
 export const excludedLine = (cfg) => [...(cfg.deniedDirectories || []), `built-in: Bridgerator's own folders${cfg.protectSensitive ? ', AppData, credentials (.ssh, .aws, …), Startup, PowerShell profiles' : ''}`].join(', ');
 /** 'ru' when the Windows display language or regional format is Russian, else 'en'. */
-export function osLanguage(locales = [Intl.DateTimeFormat().resolvedOptions().locale, process.env.LANG]) {
+// Node's Intl gives only the regional format: the display language comes from Windows, as in install.ps1.
+const uiCulture = () => { try { return process.platform === 'win32' ? ps('[Globalization.CultureInfo]::CurrentUICulture.Name').trim() : ''; } catch { return ''; } };
+export function osLanguage(locales = [Intl.DateTimeFormat().resolvedOptions().locale, process.env.LANG, uiCulture()]) {
   return locales.some((l) => /^ru([-_.]|$)/i.test(String(l || ''))) ? 'ru' : 'en';
 }
 const keptDenied = (list) => (Array.isArray(list) && !(list.length === 1 && process.env.OneDrive && list[0].toLowerCase() === process.env.OneDrive.toLowerCase()) ? list : []);
@@ -447,7 +451,7 @@ async function main() {
       showNotice({ kind: 'offline' }, log); return true;
     });
     const tray = startTray({
-      log, account: accountUrlOf(cfg),
+      log, account: accountUrlOf(cfg), webview: WEBVIEW_DIR,
       onMenu: (a, m) => {
         if (a === 'quit') { log('[bridgerator] quit from the tray (starts again at the next sign-in)'); tray?.close(); process.exit(0); }
         if (a === 'pause') dc?.setPaused(true, m.minutes);

package/src/notice.mjs

@@ -34,7 +34,13 @@ export function noticeText(n) {
     const title = typeof n.title === 'string' ? n.title.replace(/[\u0000-\u001f\u007f-\u009f]/g, ' ').trim().slice(0, 120) : '';
     if (!title) return undefined;
     const more = int(n.more) || 0;
-    t = ['ChatGPT may be waiting for you', `No activity on the queue task "${title}"${more ? ` and ${more} more` : ''} for 10 minutes. Open the ChatGPT chat: it may be asking you to allow an action.`];
+    t = ['ChatGPT may be waiting for you', `No activity on the queue task "${title}"${more ? ` and ${more} more` : ''} for 10 minutes. Open the ChatGPT chat: it may be asking you to allow an action, or show an error such as "model is at capacity" — press Retry there or pick another model.`];
+  } else if (kind === 'settings_changed') {
+    // The bridge's own change lines (describe / diffSetup): paths and labels, no relay text.
+    const what = Array.isArray(n.what) ? n.what.map((w) => String(w).replace(/[\u0000-\u001f\u007f-\u009f]/g, ' ').trim()).filter(Boolean) : [];
+    if (!what.length || !['ai', 'file'].includes(n.by)) return undefined;
+    const all = what.join(' · ');
+    t = ['Bridgerator settings changed', `${n.by === 'ai' ? 'By the AI' : 'In the settings file'}: ${all.length > 200 ? `${all.slice(0, 199)}…` : all}. Turn this notice off in the Bridgerator window.`];
   } else if (kind === 'protection_off') {
     // Internal list only (the bridge's own labels), never relay text.
     const ok = new Set(['confirmations', 'your own patterns', ...Object.values(LABEL).map((l) => `confirmations for ${l}`)]);

package/src/settings-tool.mjs

@@ -21,11 +21,11 @@ export const DEFAULTS = {
   preset: 'full', terminal: true, allowedDirectories: [], readOnlyDirectories: [], protectSensitive: false,
   confirm: { enabled: false, ...readSettings('').ask, timeoutSeconds: 120 },   // no confirm.ini = the defaults per category
   recycleBin: true, snapshots: { ...SNAP_DEFAULTS }, fuse: { ...FUSE_DEFAULTS }, keepAwake: true, askSettings: false,
-  theme: 'system', language: 'en', popupStyle: 'toast', notify: { sound: true, offline: true, queueDone: true, queueStalled: true, limit: true },
+  theme: 'system', language: 'en', popupStyle: 'toast', notify: { sound: true, offline: true, queueDone: true, queueStalled: true, settingsChanged: true, limit: true },
   deviceName: '', autostart: true, localHistory: false, telemetryEnabled: true,
   ...EXTRA.defaults(),
 };
-const NOTIFY = ['sound', 'offline', 'queueDone', 'queueStalled', 'limit'];
+const NOTIFY = ['sound', 'offline', 'queueDone', 'queueStalled', 'settingsChanged', 'limit'];
 const dirs = { type: 'array', maxItems: 20, items: { type: 'string' } };
 export const SETTINGS_TOOL_DEF = {
   name: 'bridgerator_settings',

package/src/tray.mjs

@@ -56,13 +56,13 @@ export function createLink(write, { onMenu = () => {}, onRpc = async () => null,
 }
 
 /** Starts the helper (Windows only) and keeps it running while the bridge runs. → link-like object. */
-export function startTray({ log = console.log, onMenu, onRpc, onPower, spawn = nodeSpawn, stderr = 'ignore', testEnv = {}, account = '' } = {}) {
+export function startTray({ log = console.log, onMenu, onRpc, onPower, spawn = nodeSpawn, stderr = 'ignore', testEnv = {}, account = '', webview = '' } = {}) {
   if (process.platform !== 'win32') return null;
   let child = null, link = null, closing = false, restartTimer = null;
   // Our own variables only: BR_* / BRIDGERATOR_* from the environment are ignored (a test harness
   // passes its hooks explicitly as testEnv).
   // BR_ACCOUNT: the account page of the site this PC is linked to (a staging install opens staging; V-5).
-  const env = { ...stripOurs(process.env), ...testEnv, BR_PARENT: String(process.pid), BR_PKG: PKG_DIR, ...(/^https:\/\/[a-z0-9.-]+(:\d+)?\/app$/i.test(account) ? { BR_ACCOUNT: account } : {}) };
+  const env = { ...stripOurs(process.env), ...testEnv, BR_PARENT: String(process.pid), BR_PKG: PKG_DIR, ...(webview ? { BR_WEBVIEW: webview } : {}), ...(/^https:\/\/[a-z0-9.-]+(:\d+)?\/app$/i.test(account) ? { BR_ACCOUNT: account } : {}) };
   const start = () => {
     // Plain -Command (not encoded): its command line names the package folder, so the one process
     // matcher (stop / update / uninstall) finds the helper too.

package/src/tray.ps1

@@ -230,7 +230,7 @@ function Open-Window([string]$page = 'home', [switch]$Prewarm) {
   $f.MinimumSize = New-Object Drawing.Size([int](760 * $k), [int](520 * $k))
   $wv = New-Object Microsoft.Web.WebView2.WinForms.WebView2; $wv.Dock = 'Fill'; $wv.DefaultBackgroundColor = $bg
   $cp = New-Object Microsoft.Web.WebView2.WinForms.CoreWebView2CreationProperties
-  $cp.UserDataFolder = Join-Path $env:LOCALAPPDATA 'Bridgerator\webview'; $wv.CreationProperties = $cp
+  $cp.UserDataFolder = if ($env:BR_WEBVIEW) { $env:BR_WEBVIEW } else { Join-Path $env:LOCALAPPDATA 'Bridgerator\webview' }; $wv.CreationProperties = $cp
   if ($env:BR_ZOOM) { $wv.ZoomFactor = [double]$env:BR_ZOOM }
   $f.Controls.Add($wv)
   $post = { param($o) if ($wv.CoreWebView2) { $wv.CoreWebView2.PostWebMessageAsJson(($o | ConvertTo-Json -Compress -Depth 4)) } }.GetNewClosure()

package/ui/app.js

@@ -334,7 +334,7 @@ P.notifications = () => {
   return `<main class="notifications">${bannerHtml()}
 <div class="head"><h1>${esc(t('notify.title'))}</h1><div class="sub">${esc(t('notify.sub'))}</div></div>
 <div class="styles" role="radiogroup" aria-label="${esc(t('aria.style'))}">${style('toast')}${style('popup')}</div>
-<div class="nsplit"><section class="card" aria-label="${esc(t('aria.options'))}">${sw('sound', 'notify.sound')}${sw('offline', 'notify.offline')}${sw('queueDone', 'notify.queueDone')}${sw('queueStalled', 'notify.queueStalled')}${sw('limit', 'notify.limit')}</section>
+<div class="nsplit"><section class="card" aria-label="${esc(t('aria.options'))}">${sw('sound', 'notify.sound')}${sw('offline', 'notify.offline')}${sw('queueDone', 'notify.queueDone')}${sw('queueStalled', 'notify.queueStalled')}${sw('settingsChanged', 'notify.settingsChanged')}${sw('limit', 'notify.limit')}</section>
 <section class="preview" aria-label="${esc(t('notify.preview'))}"><div class="bar-top"><span class="b">${esc(t('notify.preview'))}</span><div class="seg" role="radiogroup" aria-label="${esc(t('aria.previewTheme'))}">${pv('light')}${pv('dark')}</div></div>
 <div class="toast ${previewTheme}"><div class="app">${LOGO16}<span class="grow">Bridgerator</span><span>⋯</span></div><div class="h">${esc(t('notify.pHead'))}</div><div class="c">${esc(t('notify.pCmd'))}</div><div class="m">${esc(t('notify.pMeta', { name: state.name || 'PC' }))}</div>
 <div class="btns"><span>${esc(t('notify.allow'))}</span><span>${esc(t('notify.allow10'))}</span><span>${esc(t('notify.deny'))}</span></div></div>

package/ui/i18n/en.json

@@ -276,7 +276,8 @@
   "sound": "Play a sound",
   "offline": "When the PC goes offline",
   "queueDone": "When a queue task is done",
-  "queueStalled": "When a queue task stalls (ChatGPT may be waiting for your OK in the chat)",
+  "settingsChanged": "When the AI or the settings file changes Bridgerator settings",
+  "queueStalled": "When a queue task stalls (ChatGPT may be waiting for your OK or show an error in the chat)",
   "limit": "Monthly limit warnings",
   "preview": "Preview",
   "light": "Light",
@@ -368,7 +369,7 @@
      "Attach files or folders to a task so ChatGPT knows where to look.",
      "In ChatGPT, say “Work through my Bridgerator queue”. Watch the ticks appear here.",
      "Edit, reorder or delete tasks any time. A failed task shows why it failed.",
-     "ChatGPT may ask you to allow an action in the chat; the task waits for your answer. If a task stalls, Bridgerator shows a notice."
+     "ChatGPT may ask you to allow an action in the chat; the task waits for your answer. If a task stalls, Bridgerator shows a notice. \"Selected model is at capacity\" is ChatGPT's own error: press Retry in the chat or pick another model; the queue keeps its place."
     ],
     "tipLabel": "say",
     "tip": "Work through my Bridgerator queue"

package/ui/i18n/ru.json

@@ -276,7 +276,8 @@
   "sound": "Звук",
   "offline": "Когда ПК уходит из сети",
   "queueDone": "Когда задача из очереди готова",
-  "queueStalled": "Когда задача из очереди зависла (ChatGPT может ждать вашего «Разрешить» в чате)",
+  "settingsChanged": "Когда ИИ или файл настроек меняет настройки Bridgerator",
+  "queueStalled": "Когда задача из очереди зависла (ChatGPT может ждать вашего «Разрешить» или показать ошибку в чате)",
   "limit": "Предупреждения о лимите",
   "preview": "Пример",
   "light": "Светлая",
@@ -368,7 +369,7 @@
      "Прикрепите к задаче файлы или папки, чтобы ChatGPT знал, где искать.",
      "Скажите в ChatGPT «Work through my Bridgerator queue» и смотрите, как появляются галочки.",
      "Меняйте, переставляйте и удаляйте задачи когда угодно. У невыполненной задачи видно, почему.",
-     "ChatGPT может попросить в чате разрешить действие — задача ждёт вашего ответа. Если задача зависла, Bridgerator покажет уведомление."
+     "ChatGPT может попросить в чате разрешить действие — задача ждёт вашего ответа. Если задача зависла, Bridgerator покажет уведомление. «Selected model is at capacity» — ошибка самого ChatGPT: нажмите в чате «Повторить» или выберите другую модель; очередь сохранит место."
     ],
     "tipLabel": "say",
     "tip": "Work through my Bridgerator queue"