ciphermesh 2.2.0 → 2.4.0

package/src/p2p/index.js

@@ -14,6 +14,7 @@ import {
 } from '../shared/banner.js';
 import { KeyManager } from '../crypto/KeyManager.js';
 import { StateManager } from '../crypto/StateManager.js';
+import { HistoryStore } from '../crypto/HistoryStore.js';
 import { questionHidden } from '../shared/prompt.js';
 import { loadConfig, startupCommands } from '../shared/config.js';
 import { randomTip } from '../shared/tips.js';
@@ -171,6 +172,16 @@ await bootSequence([
 const connManager = new PeerConnectionManager(nickname, () => keyManager.publicKeyB64);
 const discovery = new Discovery();
 const ui = new UI(nickname);
+// Encrypted local history (opt-in — same passphrase that protects the session)
+let historyStore = null;
+if (restoredState?.passphrase) {
+  historyStore = new HistoryStore();
+  if (!historyStore.open(restoredState.passphrase)) {
+    console.log(promptError('History: passphrase mismatch — history disabled for this session'));
+    historyStore = null;
+  }
+}
+
 const controller = new P2PChatController(
   nickname,
   peerServer,
@@ -180,6 +191,7 @@ const controller = new P2PChatController(
   keyManager,
   restoredState,
   pluginManager,
+  historyStore,
 );
 
 ui.setFingerprint(controller.fingerprint);

package/src/protocol/messages.js

@@ -45,8 +45,14 @@ function base(type) {
   return { type, version: PROTOCOL_VERSION, timestamp: Date.now() };
 }
 
-export function createJoin(nickname, publicKeyB64) {
-  return { ...base(MSG.JOIN), nickname, publicKey: publicKeyB64 };
+// pqPublicKey (v3, optional): ML-KEM-768 encapsulation key for the hybrid
+// post-quantum handshake. Absent = classical-only peer (pre-2.3 client).
+export function createJoin(nickname, publicKeyB64, pqPublicKeyB64 = null) {
+  const msg = { ...base(MSG.JOIN), nickname, publicKey: publicKeyB64 };
+  if (pqPublicKeyB64) {
+    msg.pqPublicKey = pqPublicKeyB64;
+  }
+  return msg;
 }
 
 export function createJoinAck(sessionId, peers, queuedCount = 0, room = 'general') {
@@ -85,18 +91,20 @@ export function createEncryptedMessage(from, to, ciphertextB64, nonceB64) {
 }
 
 export function createRatchetedMessage(from, to, payload) {
-  return {
-    ...base(MSG.ENCRYPTED_MESSAGE),
-    from,
-    to,
-    payload: {
-      ephemeralPublicKey: payload.ephemeralPublicKey.toString('base64'),
-      counter: payload.counter,
-      previousCounter: payload.previousCounter,
-      ciphertext: payload.ciphertext.toString('base64'),
-      nonce: payload.nonce.toString('base64'),
-    },
+  const inner = {
+    ephemeralPublicKey: payload.ephemeralPublicKey.toString('base64'),
+    counter: payload.counter,
+    previousCounter: payload.previousCounter,
+    ciphertext: payload.ciphertext.toString('base64'),
+    nonce: payload.nonce.toString('base64'),
   };
+  // Hybrid PQ: the KEM ciphertext rides along until the peer has folded it in.
+  // It is sealed to the recipient like everything else — the relay sees only
+  // an opaque blob.
+  if (payload.pqCiphertext) {
+    inner.pqCiphertext = payload.pqCiphertext.toString('base64');
+  }
+  return { ...base(MSG.ENCRYPTED_MESSAGE), from, to, payload: inner };
 }
 
 // Sealed-sender envelope (protocol v2): the relay sees only the recipient and an

package/src/protocol/validators.js

@@ -7,6 +7,7 @@ import {
   ROOM_AUTH_SIG_SIZE,
   ROOM_CHALLENGE_NONCE_SIZE,
 } from '../shared/constants.js';
+import { PQ_PUBLIC_KEY_SIZE } from '../crypto/PQHybrid.js';
 
 // ── Helpers ────────────────────────────────────────────────────
 function isString(v) {
@@ -65,7 +66,16 @@ export function parseMessage(raw) {
     return { valid: false, error: 'Message must be an object' };
   }
   if (msg.version !== PROTOCOL_VERSION) {
-    return { valid: false, error: `Unsupported protocol version: ${msg.version}` };
+    // Spell out what to do: this reaches a human staring at a chat that just
+    // refuses to work, and "unsupported protocol version" alone tells them
+    // nothing about which side is behind or how to fix it.
+    const side = msg.version < PROTOCOL_VERSION ? 'client is older' : 'server is older';
+    return {
+      valid: false,
+      error:
+        `Protocol mismatch: this ${side} (got v${msg.version}, expected v${PROTOCOL_VERSION}). ` +
+        'Update both sides — `npx ciphermesh@latest`, or `git pull && npm install` if running from source.',
+    };
   }
   if (!isString(msg.type)) {
     return { valid: false, error: 'Missing message type' };
@@ -86,7 +96,11 @@ export function validateJoin(msg) {
   if (!isValidBase64(msg.publicKey, PUBLIC_KEY_SIZE)) {
     return { valid: false, error: 'Invalid public key' };
   }
-  return { valid: true, nickname: nick };
+  // Optional ML-KEM-768 key (hybrid PQ). Absent = classical-only client.
+  if (msg.pqPublicKey !== undefined && !isValidBase64(msg.pqPublicKey, PQ_PUBLIC_KEY_SIZE)) {
+    return { valid: false, error: 'Invalid post-quantum public key' };
+  }
+  return { valid: true, nickname: nick, pqPublicKey: msg.pqPublicKey || null };
 }
 
 // Sealed sender (protocol v2): the relay only ever sees the recipient and an

package/src/server/SessionManager.js

@@ -30,12 +30,13 @@ export class SessionManager {
     return this.#nicknames.has(nickname.toLowerCase());
   }
 
-  addSession(ws, nickname, publicKey, room = 'general') {
+  addSession(ws, nickname, publicKey, room = 'general', pqPublicKey = null) {
     const sessionId = randomUUID();
     const session = {
       ws,
       nickname,
       publicKey,
+      pqPublicKey, // ML-KEM-768 key, relayed verbatim (server never uses it)
       connectedAt: Date.now(),
       rooms: new Set(),
     };
@@ -102,6 +103,7 @@ export class SessionManager {
           sessionId: id,
           nickname: session.nickname,
           publicKey: session.publicKey,
+          ...(session.pqPublicKey ? { pqPublicKey: session.pqPublicKey } : {}),
         });
       }
     }

package/src/server/WebSocketServer.js

@@ -259,7 +259,13 @@ export class SecureWSServer {
     }
 
     const room = 'general';
-    const sessionId = this.#sessionManager.addSession(ws, validation.nickname, msg.publicKey, room);
+    const sessionId = this.#sessionManager.addSession(
+      ws,
+      validation.nickname,
+      msg.publicKey,
+      room,
+      validation.pqPublicKey,
+    );
     ws.sessionId = sessionId;
     ws.hasJoined = true;
     clearTimeout(ws.joinTimer);
@@ -292,6 +298,7 @@ export class SecureWSServer {
         sessionId,
         nickname: validation.nickname,
         publicKey: msg.publicKey,
+        ...(validation.pqPublicKey ? { pqPublicKey: validation.pqPublicKey } : {}),
       }),
       sessionId,
     );
@@ -508,7 +515,12 @@ export class SecureWSServer {
     this.#sessionManager.broadcastToRoom(
       room,
       createPeerJoined(
-        { sessionId: ws.sessionId, nickname: session.nickname, publicKey: session.publicKey },
+        {
+          sessionId: ws.sessionId,
+          nickname: session.nickname,
+          publicKey: session.publicKey,
+          ...(session.pqPublicKey ? { pqPublicKey: session.pqPublicKey } : {}),
+        },
         room,
       ),
       ws.sessionId,
@@ -642,6 +654,7 @@ export class SecureWSServer {
           sessionId: ws.sessionId,
           nickname: session.nickname,
           publicKey: session.publicKey,
+          ...(session.pqPublicKey ? { pqPublicKey: session.pqPublicKey } : {}),
         },
         result.newRoom,
       ),

package/src/shared/dnd.js

@@ -58,3 +58,16 @@ export function mentionsMe(text, nickname) {
   }
   return new RegExp(`(^|[^a-z0-9_-])${nick}([^a-z0-9_-]|$)`).test(t);
 }
+
+/**
+ * True if `text` contains `word` as a whole word (case-insensitive) — the
+ * matcher behind /watch. Whole-word so "dev" doesn't fire on "development",
+ * and the keyword is escaped so punctuation can never build a stray regex.
+ */
+export function matchesKeyword(text, word) {
+  if (typeof text !== 'string' || typeof word !== 'string' || !word) {
+    return false;
+  }
+  const escaped = word.toLowerCase().replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  return new RegExp(`(^|[^a-z0-9_-])${escaped}([^a-z0-9_-]|$)`).test(text.toLowerCase());
+}