bridgerator 1.1.11 → 1.1.12

package/npm-shrinkwrap.json

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

package/package.json

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

@@ -252,7 +252,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); };
+  // `on` is read before the change: the call that turns this notice off is still announced (review 26.10).
+  const toldSettings = (by, lines, on = cfg.notify?.settingsChanged !== false) => { const what = lines.filter((l) => l && l !== 'No changes' && !/: unchanged$/.test(l)).sort((a, b) => /settingsChanged/.test(b) - /settingsChanged/.test(a)); if (what.length && on) showNotice({ kind: 'settings_changed', by, what }, log); };
   async function setup(args) {
     const v = validateSetup(args);
     if (v.error) return say(`Not applied: ${v.error}`, true);
@@ -263,7 +264,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) { 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.'); }
+    if (cfg.askSettings !== true) { const d = diffSetup(cfg, cfg.confirmIni, v.value).short, on = cfg.notify?.settingsChanged !== false; try { await applyValues(v.value, 'bridgerator_setup'); } finally { toldSettings('ai', [d], on); } 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,15 +294,18 @@ export async function startEngine(cfg, log = console.log, { ask: askArg, recycle
     // Owner 21.10: everything applies at once unless "Ask before AI changes settings" is on (then only lowering protection asks).
     const ask1 = (c) => cfg.askSettings === true && widens(cur, c);
     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 on = cfg.notify?.settingsChanged !== false;
+    // Announced: what really changed (not a value sent again), also when a later change fails.
+    const real = (c) => JSON.stringify(c.key.split('.').reduce((o, k) => o?.[k], cur)) !== JSON.stringify(c.value);
+    const apply = async (list) => { const ok = []; try { for (const c of list) { await rpc('setSetting', { ...c, via: 'bridgerator_settings' }); if (real(c)) ok.push(describe(cur, c)); } } finally { toldSettings('ai', ok, on); } };
+    await apply(safe);
     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' }); toldSettings('ai', lines); return say(`Applied${done.length ? `: ${done.join('; ')};` : ':'} after the person's OK: ${lines.join('; ')}`); }
+    if (r === 'allow') { await apply(risky); 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 };
   }
 
@@ -660,20 +664,22 @@ export async function startEngine(cfg, log = console.log, { ask: askArg, recycle
     // 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;
+    // Excluded folders are never AI-editable (bridgerator_settings / setup can't touch them): removing one from the file always asks.
+    const denAsk = denRemoved.length > 0;
+    const on = cfg.notify?.settingsChanged !== false;
     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 (!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)]);
+    toldSettings('file', safe.filter((c) => !(top(c.key) in back)).map((c) => describe(cur, c)), on);
     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 (denAsk) { cfg.deniedDirectories = den; policy = makePolicy(); }
-        toldSettings('file', lines);
+        toldSettings('file', [...risky.filter((c) => !(top(c.key) in back)).map((c) => describe(cur, c)), ...(denRemoved.length ? denLine : [])], on);
         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)];
@@ -786,6 +792,7 @@ export function connect(cfg, dc, log = console.log) {
       return;
     }
     if (msg.type === 'notice') {
+      if (msg.kind === 'settings_changed') return; // the bridge's own notice, never from the relay
       if (['limit', 'expiring', 'expired'].includes(msg.kind) && cfg.notify?.limit === false) return;
       showNotice({ ...msg, renewUrl: msg.renewUrl ?? dc.plan?.renewUrl }, log);
       return;

package/src/cli.mjs

@@ -338,9 +338,10 @@ const defaultDenied = () => [];
 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'. */
 // 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 uiCulture = () => { try { return process.platform === 'win32' ? execFileSync(POWERSHELL, psArgs('[Globalization.CultureInfo]::CurrentUICulture.Name'), { stdio: 'pipe', timeout: 15000 }).toString().trim() : ''; } catch { return ''; } };
+export function osLanguage(locales = [Intl.DateTimeFormat().resolvedOptions().locale, process.env.LANG], askWindows = arguments.length === 0) {
+  const ru = (l) => /^ru([-_.]|$)/i.test(String(l || ''));
+  return locales.some(ru) || (askWindows && ru(uiCulture())) ? 'ru' : 'en';
 }
 const keptDenied = (list) => (Array.isArray(list) && !(list.length === 1 && process.env.OneDrive && list[0].toLowerCase() === process.env.OneDrive.toLowerCase()) ? list : []);
 

package/src/notice.mjs

@@ -39,8 +39,11 @@ export function noticeText(n) {
     // 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.`];
+    // Whole lines up to ~200 chars, then "+N more" (the window has the full list): nothing is cut silently.
+    let all = what[0].slice(0, 200), k = 1;
+    while (k < what.length && all.length + what[k].length + 3 <= 200) all += ` · ${what[k++]}`;
+    if (k < what.length) all += ` · +${what.length - k} more`;
+    t = ['Bridgerator settings changed', `${n.by === 'ai' ? 'By the AI' : 'In the settings file'}: ${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/queue.mjs

@@ -199,7 +199,7 @@ export function queueTool(q, name, args = {}) {
         for (const x of want) { const d = args.allowDuplicate === true ? undefined : open.get(key(x?.title)); if (d) skipped.push({ title: x.title, duplicate_of: d }); else keep.push(x); }
         const why = skipped.length ? { skipped, message: 'Already in the queue (open), not added again: work on those items (queue_list / queue_next), or pass allowDuplicate: true to add them anyway.' } : {};
         if (!keep.length && skipped.length) return ok({ added: 0, ...why });
-        if (args.items === undefined) return ok({ item: q.add(args) });
+        if (args.items == null) return ok({ item: q.add(args) });
         return ok({ items: q.addMany(Array.isArray(args.items) ? keep : args.items), ...why });
       }
       case 'queue_clear': { if (args.status === 'all') throw new Error('clearing every item needs the person\'s OK'); const gone = q.clear({ status: args.status || 'finished' }); return ok({ removed: gone.length, counts: q.counts() }); }

package/src/settings-tool.mjs

@@ -114,6 +114,7 @@ export function widens(cur, { key, value }) {
   if (key === 'fuse.enabled') return !value && fuse.enabled;
   if (key === 'fuse.limit') return fuse.enabled && value > fuse.limit;
   if (key === 'askSettings') return !value && cur.askSettings === true;
+  if (key === 'notify.settingsChanged') return !value && cur.notify?.settingsChanged !== false; // the person's view of AI changes
   if (key === 'keepAwake' || key === 'preset') return false;                     // preset: judged by its parts (presetChanges)
   if (key === 'autostart') return value !== cur.autostart;
   if (key === 'telemetryEnabled') return value && !cur.telemetry;