ciphermesh 2.13.0 → 2.14.0

package/docs/SETUP.md

@@ -293,6 +293,24 @@ Run `/help` in the chat for the **full list**. The main ones:
   - Or: `netsh advfirewall firewall add rule name="CipherMesh" dir=in action=allow protocol=TCP localport=3600`
 - Test whether the port responds: `curl ws://IP:3600` or open `http://IP:3600` in the browser (it will error out, but if the port connects it is open)
 
+### Shift+Enter does not insert a newline
+
+A terminal cannot tell Shift+Enter from Enter unless the application asks it to,
+so on startup CipherMesh requests the two protocols that make the difference
+visible — the kitty keyboard protocol and xterm's `modifyOtherKeys`. Terminals
+that implement neither simply ignore the request.
+
+On those, use **Alt+Enter** or **Ctrl+J**, which work everywhere.
+
+If a terminal reacts badly to the request, `CIPHERMESH_LEGACY_KEYS=1` turns the
+negotiation off and hands the terminal to blessed untouched:
+
+```bash
+CIPHERMESH_LEGACY_KEYS=1 ciphermesh
+```
+
+Alt+Enter and Ctrl+J keep working in that mode; only Shift+Enter is lost.
+
 ### "npm install" fails on sodium-native
 
 `sodium-native` needs to compile C code. Requirements:

package/docs/commands.json

@@ -582,7 +582,7 @@
         {
           "name": "/notify",
           "args": "",
-          "summary": "Sound / desktop notifications",
+          "summary": "Desktop notifications — rate-limited, and muted for the session (with a line saying why) if the OS refuses them",
           "modes": [
             "relay",
             "p2p"
@@ -618,7 +618,7 @@
         {
           "name": "/sound",
           "args": "",
-          "summary": "Sound / desktop notifications",
+          "summary": "Sound alerts on incoming messages",
           "modes": [
             "relay",
             "p2p"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ciphermesh",
-  "version": "2.13.0",
+  "version": "2.14.0",
   "description": "Secure terminal chat for the local network (LAN) with real end-to-end encryption (E2EE) using libsodium",
   "type": "module",
   "main": "src/client/index.js",
@@ -67,7 +67,7 @@
   },
   "devDependencies": {
     "@eslint/js": "10.0.1",
-    "eslint": "10.8.1",
+    "eslint": "10.9.1",
     "figlet": "^1.11.4",
     "globals": "^17.7.0",
     "prettier": "^3.9.5"

package/src/client/ChatController.js

@@ -2,7 +2,6 @@ import { mkdirSync, writeFileSync } from 'node:fs';
 import { dirname, resolve } from 'node:path';
 import { tmpdir } from 'node:os';
 import sodium from 'sodium-native';
-import notifier from 'node-notifier';
 import qrcode from 'qrcode-terminal';
 import {
   MSG,
@@ -84,6 +83,7 @@ import {
 import { saveLastSession } from '../shared/lastSession.js';
 import { diagnose, formatDiagnosis } from '../shared/doctor.js';
 import { pluginsCommand } from '../shared/pluginCommand.js';
+import { DesktopNotifier } from '../shared/desktopNotify.js';
 import { COMMANDS } from './UI.js';
 
 const TYPING_SEND_INTERVAL = 2000; // debounce: max 1 typing event per 2s
@@ -132,6 +132,7 @@ export class ChatController {
   #inviteRoom;
   #historyStore;
   #receiptsEnabled;
+  #desktopNotifier;
   #sentMessageLines; // Map<messageId, { lineIndex, baseLine }>
   #messageReaders; // Map<messageId, Set<nickname>>
   #away;
@@ -240,6 +241,9 @@ export class ChatController {
     this.#coverMode = 'off';
     this.#coverTimer = null;
     this.#paceQueue = [];
+    this.#desktopNotifier = new DesktopNotifier({
+      onUnavailable: (reason) => this.#onNotifierUnavailable(reason),
+    });
 
     this.#setupConnectionHandlers();
     this.#setupUIHandlers();
@@ -2326,7 +2330,7 @@ export class ChatController {
 
       // DND / mentions-only gates desktop notifications too.
       if (notify && (this.#ui.notifyEnabled || mentioned)) {
-        notifier.notify({
+        this.#desktopNotifier.notify({
           title: mentioned
             ? `🔔 ${peer.nickname} mentioned you`
             : data.isDM
@@ -2346,6 +2350,17 @@ export class ChatController {
     }
   }
 
+  // The OS refused a desktop notification (Windows with notifications turned
+  // off for the app is the common case). Say it once, then stay quiet — the
+  // notifier has already stopped trying, so the chat never sees it again.
+  #onNotifierUnavailable(reason) {
+    this.#ui.setNotifyEnabled(false);
+    this.#ui.addInfoMessage(
+      `Desktop notifications unavailable — ${reason}. Muted for this session; ` +
+        'sound alerts still work. Use /notify on to retry.',
+    );
+  }
+
   // True if an incoming message references my nickname (@nick or standalone word).
   #mentionsMe(text) {
     return mentionsMe(text, this.#nickname);
@@ -2664,14 +2679,17 @@ export class ChatController {
         const notifyArg = parts[1]?.toLowerCase();
         if (notifyArg === 'off') {
           this.#ui.setNotifyEnabled(false);
+          this.#desktopNotifier.disable();
           this.#ui.addInfoMessage('Desktop notifications disabled');
         } else if (notifyArg === 'on') {
           this.#ui.setNotifyEnabled(true);
+          this.#desktopNotifier.reset(); // give a previously refusing OS another go
           this.#ui.addInfoMessage('Desktop notifications enabled');
         } else {
           const status = this.#ui.notifyEnabled ? 'enabled' : 'disabled';
+          const blocked = this.#desktopNotifier.available ? '' : ' (blocked by the OS)';
           this.#ui.addInfoMessage(
-            `Desktop notifications: ${status}. Use /notify on or /notify off`,
+            `Desktop notifications: ${status}${blocked}. Use /notify on or /notify off`,
           );
         }
         break;
@@ -4605,7 +4623,7 @@ export class ChatController {
 
     // Show own message locally
     if (replyTo) {
-      this.#ui.addQuoteLine(replyTo.nickname, replyTo.excerpt, true);
+      this.#ui.addQuoteLine(replyTo.nickname, replyTo.excerpt);
     }
     const ephLabel = this.#ephemeralMode ? this.#formatDuration(this.#ephemeralDurationMs) : null;
     const { lineIndex, render } = isAction