diff --git a/warzone/crates/warzone-server/src/routes/web.rs b/warzone/crates/warzone-server/src/routes/web.rs
index 76bda85..43f6281 100644
--- a/warzone/crates/warzone-server/src/routes/web.rs
+++ b/warzone/crates/warzone-server/src/routes/web.rs
@@ -10,8 +10,6 @@ pub fn routes() -> Router<AppState> {
     Router::new().route("/", get(web_ui))
 }
 
-/// Serve the web client — a single-page app that talks to /v1/* APIs.
-/// Uses Web Crypto API for E2E encryption (same protocol as CLI client).
 async fn web_ui() -> Html<&'static str> {
     Html(WEB_HTML)
 }
@@ -26,346 +24,405 @@ const WEB_HTML: &str = r##"<!DOCTYPE html>
 <style>
   * { box-sizing: border-box; margin: 0; padding: 0; }
   html, body { height: 100%; overflow: hidden; }
-  body { background: #0a0a1a; color: #c8d6e5; font-family: 'JetBrains Mono', 'Fira Code', monospace;
-         display: flex; flex-direction: column; height: 100dvh; }
+  body { background: #0a0a1a; color: #c8d6e5; font-family: 'JetBrains Mono', 'Fira Code', 'Courier New', monospace;
+         display: flex; flex-direction: column; height: 100dvh; font-size: 14px; }
 
-  #setup { display: flex; flex-direction: column; align-items: center; justify-content: center;
-           flex: 1; padding: 20px; }
-  #setup h1 { color: #e94560; margin-bottom: 8px; font-size: 1.5em; }
-  #setup .subtitle { color: #555; margin-bottom: 24px; font-size: 0.85em; }
-  #setup .fingerprint { background: #111; border: 1px solid #333; padding: 12px 20px;
-                        border-radius: 6px; font-size: 1.2em; color: #4ade80; letter-spacing: 2px;
-                        margin: 12px 0; font-family: monospace; }
-  #setup .mnemonic { background: #111; border: 1px solid #333; padding: 16px; border-radius: 6px;
-                     margin: 12px 0; max-width: 400px; width: 100%; color: #e6a23c;
-                     font-size: 0.85em; line-height: 1.8; text-align: center; }
-  #setup .warning { color: #e94560; font-size: 0.8em; margin: 8px 0; }
+  /* Setup screen */
+  .screen { display: none; flex-direction: column; flex: 1; }
+  .screen.active { display: flex; }
+
+  #setup { align-items: center; justify-content: center; padding: 20px; }
+  #setup h1 { color: #e94560; font-size: 1.8em; margin-bottom: 4px; }
+  #setup .sub { color: #555; margin-bottom: 24px; font-size: 0.8em; }
+  .fp-display { background: #111; border: 1px solid #333; padding: 12px 20px; border-radius: 6px;
+                font-size: 1.1em; color: #4ade80; letter-spacing: 1px; margin: 8px 0; font-family: monospace;
+                user-select: all; cursor: pointer; }
+  .seed-display { background: #111; border: 1px solid #333; padding: 12px; border-radius: 6px;
+                  margin: 8px 0; max-width: 420px; width: 100%; color: #e6a23c; font-size: 0.8em;
+                  line-height: 1.8; text-align: center; user-select: all; word-break: break-all; }
+  .warn { color: #e94560; font-size: 0.75em; margin: 6px 0; }
   .btn { padding: 10px 24px; background: #e94560; border: none; color: #fff; border-radius: 6px;
          cursor: pointer; font-family: inherit; font-size: 0.9em; margin: 4px; }
   .btn:hover { background: #c73e54; }
-  .btn-secondary { background: #1a1a3e; border: 1px solid #444; }
-  .btn-secondary:hover { background: #252550; }
+  .btn-alt { background: #1a1a3e; border: 1px solid #444; }
+  .btn-alt:hover { background: #252550; }
+  #recover-area { display: none; margin-top: 12px; max-width: 420px; width: 100%; }
+  #recover-area textarea { width: 100%; padding: 10px; background: #1a1a2e; border: 1px solid #333;
+                           color: #c8d6e5; border-radius: 6px; font-family: inherit; min-height: 50px;
+                           resize: none; margin-bottom: 8px; font-size: 14px; }
 
-  #chat { display: none; flex-direction: column; flex: 1; }
-  #chat-header { padding: 8px 12px; background: #111; border-bottom: 1px solid #222;
-                 display: flex; align-items: center; gap: 8px; }
-  #chat-header .fp { color: #4ade80; font-size: 0.8em; }
-  #chat-header .server { color: #555; font-size: 0.7em; margin-left: auto; }
-  #messages { flex: 1; overflow-y: auto; padding: 12px; }
-  .msg { padding: 4px 0; font-size: 0.85em; white-space: pre-wrap; word-wrap: break-word; }
-  .msg .ts { color: #444; }
-  .msg .sys { color: #5e9ca0; font-style: italic; }
-  .msg .from { font-weight: bold; }
-  .msg .dm { color: #ff6b9d; }
-  #bottom { display: flex; padding: 8px; gap: 6px; border-top: 1px solid #222; background: #111; }
-  #msg-input { flex: 1; padding: 10px; background: #1a1a2e; border: 1px solid #333;
-               color: #c8d6e5; border-radius: 20px; font-family: inherit; font-size: 14px;
-               resize: none; min-height: 40px; max-height: 120px; }
-  #send-btn { padding: 10px 16px; background: #e94560; border: none; color: #fff;
-              border-radius: 20px; cursor: pointer; font-size: 14px; min-height: 40px; }
+  /* Chat screen */
+  #chat-header { padding: 6px 10px; background: #111; border-bottom: 1px solid #222;
+                 display: flex; align-items: center; gap: 8px; font-size: 0.8em; flex-wrap: wrap; }
+  #chat-header .tag { padding: 1px 6px; border-radius: 3px; font-size: 0.85em; }
+  .tag-fp { background: #0a2e0a; color: #4ade80; }
+  .tag-peer { background: #2e2e0a; color: #e6a23c; }
+  .tag-server { color: #444; }
+  #chat-header input { background: #1a1a2e; border: 1px solid #333; color: #e6a23c; padding: 2px 6px;
+                       border-radius: 3px; font-family: inherit; font-size: 0.85em; width: 280px; }
 
-  #recover-section { display: none; margin-top: 12px; }
-  #recover-input { width: 100%; max-width: 400px; padding: 10px; background: #1a1a2e;
-                   border: 1px solid #333; color: #c8d6e5; border-radius: 6px;
-                   font-family: inherit; min-height: 60px; resize: none; margin-bottom: 8px; }
+  #messages { flex: 1; overflow-y: auto; padding: 8px 10px; -webkit-overflow-scrolling: touch; }
+  .msg { padding: 2px 0; font-size: 0.85em; white-space: pre-wrap; word-wrap: break-word; }
+  .msg .ts { color: #333; margin-right: 4px; }
+  .msg .from-self { color: #4ade80; font-weight: bold; }
+  .msg .from-peer { color: #e6a23c; font-weight: bold; }
+  .msg .from-sys { color: #5e9ca0; font-style: italic; }
+  .msg .lock { color: #ff6b9d; }
+
+  #bottom { display: flex; padding: 6px; gap: 6px; border-top: 1px solid #222; background: #111;
+            align-items: flex-end; }
+  #msg-input { flex: 1; padding: 10px; background: #1a1a2e; border: 1px solid #333; color: #c8d6e5;
+               border-radius: 20px; font-family: inherit; font-size: 14px; resize: none;
+               min-height: 40px; max-height: 120px; line-height: 1.4; }
+  #send-btn { padding: 10px 16px; background: #e94560; border: none; color: #fff; border-radius: 20px;
+              cursor: pointer; font-size: 14px; min-height: 40px; }
+  #send-btn:hover { background: #c73e54; }
+
+  @media (max-width: 500px) {
+    .msg { font-size: 0.8em; }
+    #chat-header input { width: 180px; }
+  }
 </style>
 </head>
 <body>
 
-<div id="setup">
+<!-- Setup screen -->
+<div id="setup" class="screen active">
   <h1>WARZONE</h1>
-  <div class="subtitle">end-to-end encrypted messenger</div>
+  <div class="sub">end-to-end encrypted messenger</div>
 
-  <div id="new-identity" style="text-align:center">
-    <button class="btn" onclick="generateIdentity()">Generate New Identity</button>
-    <button class="btn btn-secondary" onclick="showRecover()">Recover from Mnemonic</button>
-
-    <div id="recover-section">
-      <textarea id="recover-input" placeholder="Enter your 24-word mnemonic..." rows="3"></textarea>
-      <br>
-      <button class="btn" onclick="recoverIdentity()">Recover</button>
+  <div id="gen-section">
+    <button class="btn" onclick="doGenerate()">Generate Identity</button>
+    <button class="btn btn-alt" onclick="document.getElementById('recover-area').style.display='block'">Recover</button>
+    <div id="recover-area">
+      <textarea id="recover-input" placeholder="Paste your hex seed (64 chars)..." rows="2"></textarea>
+      <button class="btn" onclick="doRecover()">Recover Identity</button>
     </div>
   </div>
 
-  <div id="identity-display" style="display:none; text-align:center">
+  <div id="id-section" style="display:none">
     <div>Your fingerprint:</div>
-    <div class="fingerprint" id="my-fingerprint"></div>
-    <div class="mnemonic" id="my-mnemonic"></div>
-    <div class="warning">WRITE DOWN YOUR MNEMONIC — it's the only way to recover your identity</div>
+    <div class="fp-display" id="my-fp" title="Click to copy"></div>
+    <div class="seed-display" id="my-seed"></div>
+    <div class="warn">SAVE YOUR SEED — only way to recover your identity</div>
     <br>
     <button class="btn" onclick="enterChat()">Enter Chat</button>
   </div>
 </div>
 
-<div id="chat">
+<!-- Chat screen -->
+<div id="chat" class="screen">
   <div id="chat-header">
-    <span style="color:#e94560; font-weight:bold;">WZ</span>
-    <span class="fp" id="header-fp"></span>
-    <span class="server" id="header-server"></span>
+    <span class="tag tag-fp" id="hdr-fp"></span>
+    <span>→</span>
+    <input id="peer-input" placeholder="Paste peer fingerprint..." autocomplete="off">
+    <span class="tag-server" id="hdr-server"></span>
   </div>
   <div id="messages"></div>
   <div id="bottom">
-    <textarea id="msg-input" placeholder="Message... (Shift+Enter for newline)" rows="1"></textarea>
-    <button id="send-btn" onclick="sendMessage()">&#9654;</button>
+    <textarea id="msg-input" placeholder="Message... (Enter to send)" rows="1"></textarea>
+    <button id="send-btn" onclick="doSend()">&#9654;</button>
   </div>
 </div>
 
 <script>
-// ── State ──
-let seed = null;          // Uint8Array(32)
-let signingKeyPair = null;
-let encryptionKeyPair = null;
-let fingerprint = '';
-let mnemonic = '';
-
 const SERVER = window.location.origin;
+const $messages = document.getElementById('messages');
+const $input = document.getElementById('msg-input');
+const $peerInput = document.getElementById('peer-input');
 
-// ── Crypto helpers (mirrors warzone-protocol in JS) ──
+// ── State ──
+let seed = null;           // Uint8Array(32)
+let myKeyPair = null;      // ECDH CryptoKeyPair
+let myFingerprint = '';
+let derivedKeys = {};      // peerFP -> AES CryptoKey
+let pollTimer = null;
 
-async function hkdfDerive(ikm, salt, info, length) {
-  const key = await crypto.subtle.importKey('raw', ikm, 'HKDF', false, ['deriveBits']);
-  const bits = await crypto.subtle.deriveBits(
-    { name: 'HKDF', hash: 'SHA-256', salt: salt, info: new TextEncoder().encode(info) },
-    key, length * 8
-  );
-  return new Uint8Array(bits);
+// ── Crypto ──
+
+function toHex(buf) {
+  return Array.from(new Uint8Array(buf)).map(b => b.toString(16).padStart(2, '0')).join('');
 }
 
-async function deriveIdentity(seedBytes) {
-  // Ed25519 for signing - derive 32 bytes
-  const edSeed = await hkdfDerive(seedBytes, new Uint8Array(0), 'warzone-ed25519', 32);
-  // X25519 for encryption - derive 32 bytes
-  const xSeed = await hkdfDerive(seedBytes, new Uint8Array(0), 'warzone-x25519', 32);
-
-  // Import Ed25519 key pair
-  // Note: Web Crypto doesn't support Ed25519 in all browsers yet.
-  // For now we use ECDSA P-256 as a stand-in for the web client.
-  // The CLI client uses the real Ed25519. Cross-client compatibility
-  // will be handled via a compatibility layer in Phase 2.
-
-  // For the web client, we derive ECDH P-256 keys for encryption
-  // and use them for the DM protocol (same as chat.py v14).
-  const ecdhKeyPair = await crypto.subtle.generateKey(
-    { name: 'ECDH', namedCurve: 'P-256' }, true, ['deriveBits']
-  );
-
-  // Fingerprint: SHA-256 of the public key, first 16 bytes
-  const pubExported = await crypto.subtle.exportKey('raw', ecdhKeyPair.publicKey);
-  const hash = await crypto.subtle.digest('SHA-256', pubExported);
-  const fpBytes = new Uint8Array(hash).slice(0, 16);
-
-  return {
-    keyPair: ecdhKeyPair,
-    fingerprint: fpBytes,
-    seed: seedBytes,
-  };
-}
-
-function formatFingerprint(fpBytes) {
-  const hex = Array.from(fpBytes).map(b => b.toString(16).padStart(2, '0')).join('');
-  return hex.slice(0,4) + ':' + hex.slice(4,8) + ':' + hex.slice(8,12) + ':' + hex.slice(12,16);
-}
-
-// ── BIP39 (simplified — we store seed in localStorage, mnemonic is display only) ──
-// Full BIP39 requires the wordlist. For the web client, we'll hex-encode the seed
-// and let users copy it. Real BIP39 will come from WASM in Phase 2.
-
-function seedToHexMnemonic(seedBytes) {
-  return Array.from(seedBytes).map(b => b.toString(16).padStart(2, '0')).join(' ');
-}
-
-function hexMnemonicToSeed(hex) {
-  const clean = hex.replace(/\s+/g, '');
-  if (clean.length !== 64) throw new Error('Invalid seed length');
-  const bytes = new Uint8Array(32);
-  for (let i = 0; i < 32; i++) {
-    bytes[i] = parseInt(clean.substr(i * 2, 2), 16);
-  }
+function fromHex(h) {
+  const clean = h.replace(/[^0-9a-fA-F]/g, '');
+  const bytes = new Uint8Array(clean.length / 2);
+  for (let i = 0; i < bytes.length; i++) bytes[i] = parseInt(clean.substr(i*2, 2), 16);
   return bytes;
 }
 
-// ── Identity management ──
-
-async function generateIdentity() {
-  seed = crypto.getRandomValues(new Uint8Array(32));
-  const identity = await deriveIdentity(seed);
-  encryptionKeyPair = identity.keyPair;
-  fingerprint = formatFingerprint(identity.fingerprint);
-  mnemonic = seedToHexMnemonic(seed);
-
-  // Save to localStorage
-  localStorage.setItem('wz-seed', mnemonic);
-
-  // Display
-  document.getElementById('my-fingerprint').textContent = fingerprint;
-  document.getElementById('my-mnemonic').textContent = mnemonic;
-  document.getElementById('new-identity').style.display = 'none';
-  document.getElementById('identity-display').style.display = 'block';
+function formatFP(bytes) {
+  const h = toHex(bytes);
+  return h.match(/.{4}/g).join(':');
 }
 
-function showRecover() {
-  document.getElementById('recover-section').style.display = 'block';
+function normFP(fp) {
+  return fp.replace(/[^0-9a-fA-F]/g, '').toLowerCase();
 }
 
-async function recoverIdentity() {
-  const input = document.getElementById('recover-input').value.trim();
+async function generateKeyPair() {
+  return crypto.subtle.generateKey({ name: 'ECDH', namedCurve: 'P-256' }, true, ['deriveBits']);
+}
+
+async function computeFingerprint(publicKey) {
+  const raw = await crypto.subtle.exportKey('raw', publicKey);
+  const hash = await crypto.subtle.digest('SHA-256', raw);
+  return new Uint8Array(hash).slice(0, 16);
+}
+
+async function deriveAESKey(theirPubJwk) {
+  const theirPub = await crypto.subtle.importKey('jwk', theirPubJwk, { name: 'ECDH', namedCurve: 'P-256' }, false, []);
+  const bits = await crypto.subtle.deriveBits({ name: 'ECDH', public: theirPub }, myKeyPair.privateKey, 256);
+  return crypto.subtle.importKey('raw', bits, 'AES-GCM', false, ['encrypt', 'decrypt']);
+}
+
+async function aesEncrypt(key, plaintext) {
+  const iv = crypto.getRandomValues(new Uint8Array(12));
+  const ct = await crypto.subtle.encrypt({ name: 'AES-GCM', iv }, key, new TextEncoder().encode(plaintext));
+  // iv(12) + ciphertext
+  const result = new Uint8Array(12 + ct.byteLength);
+  result.set(iv, 0);
+  result.set(new Uint8Array(ct), 12);
+  return result;
+}
+
+async function aesDecrypt(key, data) {
+  const iv = data.slice(0, 12);
+  const ct = data.slice(12);
+  const plain = await crypto.subtle.decrypt({ name: 'AES-GCM', iv }, key, ct);
+  return new TextDecoder().decode(plain);
+}
+
+// ── Identity ──
+
+async function initIdentity(seedBytes) {
+  seed = seedBytes;
+  myKeyPair = await generateKeyPair();
+  const fpBytes = await computeFingerprint(myKeyPair.publicKey);
+  myFingerprint = formatFP(fpBytes);
+
+  // Persist
+  const privJwk = await crypto.subtle.exportKey('jwk', myKeyPair.privateKey);
+  const pubJwk = await crypto.subtle.exportKey('jwk', myKeyPair.publicKey);
+  localStorage.setItem('wz-seed', toHex(seed));
+  localStorage.setItem('wz-priv', JSON.stringify(privJwk));
+  localStorage.setItem('wz-pub', JSON.stringify(pubJwk));
+  localStorage.setItem('wz-fp', myFingerprint);
+}
+
+async function loadIdentity() {
+  const savedSeed = localStorage.getItem('wz-seed');
+  const savedPriv = localStorage.getItem('wz-priv');
+  const savedPub = localStorage.getItem('wz-pub');
+  const savedFP = localStorage.getItem('wz-fp');
+  if (!savedSeed || !savedPriv || !savedPub || !savedFP) return false;
+
+  seed = fromHex(savedSeed);
+  const privJwk = JSON.parse(savedPriv);
+  const pubJwk = JSON.parse(savedPub);
+  const priv = await crypto.subtle.importKey('jwk', privJwk, { name: 'ECDH', namedCurve: 'P-256' }, true, ['deriveBits']);
+  const pub_ = await crypto.subtle.importKey('jwk', pubJwk, { name: 'ECDH', namedCurve: 'P-256' }, true, []);
+  myKeyPair = { privateKey: priv, publicKey: pub_ };
+  myFingerprint = savedFP;
+  return true;
+}
+
+// ── Server API ──
+
+async function registerKey() {
+  const pubJwk = await crypto.subtle.exportKey('jwk', myKeyPair.publicKey);
+  const fp = normFP(myFingerprint);
+  const bundleBytes = new TextEncoder().encode(JSON.stringify({ type: 'web', jwk: pubJwk }));
+  await fetch(SERVER + '/v1/keys/register', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ fingerprint: fp, bundle: Array.from(bundleBytes) })
+  });
+}
+
+async function fetchPeerKey(peerFP) {
+  const fp = normFP(peerFP);
+  const cached = derivedKeys[fp];
+  if (cached) return cached;
+
+  const resp = await fetch(SERVER + '/v1/keys/' + fp);
+  if (!resp.ok) throw new Error('Peer not registered');
+  const data = await resp.json();
+  const bundleBytes = Uint8Array.from(atob(data.bundle), c => c.charCodeAt(0));
+  const bundleStr = new TextDecoder().decode(bundleBytes);
+  const bundle = JSON.parse(bundleStr);
+
+  if (bundle.type !== 'web') throw new Error('Peer is CLI client (incompatible crypto). Use CLI to chat with them.');
+
+  const aesKey = await deriveAESKey(bundle.jwk);
+  derivedKeys[fp] = aesKey;
+  return aesKey;
+}
+
+async function sendEncrypted(peerFP, plaintext) {
+  const aesKey = await fetchPeerKey(peerFP);
+  const encrypted = await aesEncrypt(aesKey, plaintext);
+
+  const envelope = JSON.stringify({
+    type: 'web',
+    from: normFP(myFingerprint),
+    ciphertext: toHex(encrypted)
+  });
+
+  await fetch(SERVER + '/v1/messages/send', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ to: normFP(peerFP), message: Array.from(new TextEncoder().encode(envelope)) })
+  });
+}
+
+async function pollMessages() {
   try {
-    seed = hexMnemonicToSeed(input);
-    const identity = await deriveIdentity(seed);
-    encryptionKeyPair = identity.keyPair;
-    fingerprint = formatFingerprint(identity.fingerprint);
-    mnemonic = seedToHexMnemonic(seed);
+    const fp = normFP(myFingerprint);
+    const resp = await fetch(SERVER + '/v1/messages/poll/' + fp);
+    if (!resp.ok) return;
+    const msgs = await resp.json();
 
-    localStorage.setItem('wz-seed', mnemonic);
+    for (const b64 of msgs) {
+      try {
+        const bytes = Uint8Array.from(atob(b64), c => c.charCodeAt(0));
+        const str = new TextDecoder().decode(bytes);
 
-    document.getElementById('my-fingerprint').textContent = fingerprint;
-    document.getElementById('my-mnemonic').textContent = '(recovered)';
-    document.getElementById('new-identity').style.display = 'none';
-    document.getElementById('identity-display').style.display = 'block';
-  } catch(e) {
-    alert('Invalid seed: ' + e.message);
-  }
+        // Try JSON (web client message)
+        try {
+          const env = JSON.parse(str);
+          if (env.type === 'web') {
+            const aesKey = await fetchPeerKey(env.from);
+            const ct = fromHex(env.ciphertext);
+            const text = await aesDecrypt(aesKey, ct);
+            addMsg(formatFP(fromHex(env.from)).slice(0, 19), text, false);
+            continue;
+          }
+        } catch(e) { /* not JSON, might be CLI bincode */ }
+
+        addSys('[encrypted message from CLI client — use CLI to read]');
+      } catch(e) {
+        addSys('[failed to process message]');
+      }
+    }
+  } catch(e) { /* server offline */ }
 }
 
-async function tryAutoLoad() {
-  const saved = localStorage.getItem('wz-seed');
-  if (!saved) return;
-  try {
-    seed = hexMnemonicToSeed(saved);
-    const identity = await deriveIdentity(seed);
-    encryptionKeyPair = identity.keyPair;
-    fingerprint = formatFingerprint(identity.fingerprint);
-    enterChat();
-  } catch(e) {
-    localStorage.removeItem('wz-seed');
-  }
+// ── UI ──
+
+function ts() {
+  return new Date().toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
 }
 
-function enterChat() {
-  document.getElementById('setup').style.display = 'none';
-  document.getElementById('chat').style.display = 'flex';
-  document.getElementById('header-fp').textContent = fingerprint;
-  document.getElementById('header-server').textContent = SERVER;
-  addSystemMsg('Identity loaded: ' + fingerprint);
-  addSystemMsg('Type /help for commands');
-
-  // Register key with server
-  registerKey();
-  // Start polling
-  pollLoop();
-}
-
-// ── Chat ──
-
-const $messages = document.getElementById('messages');
-const $input = document.getElementById('msg-input');
-
-function addSystemMsg(text) {
-  const d = document.createElement('div');
-  d.className = 'msg';
-  const t = new Date().toLocaleTimeString([], {hour:'2-digit',minute:'2-digit'});
-  d.innerHTML = '<span class="ts">' + t + '</span> <span class="sys">' + escHtml(text) + '</span>';
-  $messages.appendChild(d);
-  $messages.scrollTop = $messages.scrollHeight;
-}
-
-function addChatMsg(from, text, isDM) {
-  const d = document.createElement('div');
-  d.className = 'msg';
-  const t = new Date().toLocaleTimeString([], {hour:'2-digit',minute:'2-digit'});
-  const cls = isDM ? 'dm' : 'from';
-  const prefix = isDM ? '&#128274; ' : '';
-  d.innerHTML = '<span class="ts">' + t + '</span> <span class="' + cls + '">' + prefix + escHtml(from) + '</span>: ' + escHtml(text);
-  $messages.appendChild(d);
-  $messages.scrollTop = $messages.scrollHeight;
-}
-
-function escHtml(s) {
+function esc(s) {
   const d = document.createElement('div');
   d.textContent = s;
   return d.innerHTML;
 }
 
-async function registerKey() {
-  const pubJwk = await crypto.subtle.exportKey('jwk', encryptionKeyPair.publicKey);
+function addMsg(from, text, isSelf) {
+  const d = document.createElement('div');
+  d.className = 'msg';
+  const cls = isSelf ? 'from-self' : 'from-peer';
+  const lock = isSelf ? '' : '<span class="lock">&#128274; </span>';
+  d.innerHTML = '<span class="ts">' + ts() + '</span> ' + lock + '<span class="' + cls + '">' + esc(from) + '</span>: ' + esc(text);
+  $messages.appendChild(d);
+  $messages.scrollTop = $messages.scrollHeight;
+}
+
+function addSys(text) {
+  const d = document.createElement('div');
+  d.className = 'msg';
+  d.innerHTML = '<span class="ts">' + ts() + '</span> <span class="from-sys">' + esc(text) + '</span>';
+  $messages.appendChild(d);
+  $messages.scrollTop = $messages.scrollHeight;
+}
+
+// ── Actions ──
+
+async function doGenerate() {
+  const s = crypto.getRandomValues(new Uint8Array(32));
+  await initIdentity(s);
+  document.getElementById('my-fp').textContent = myFingerprint;
+  document.getElementById('my-seed').textContent = toHex(seed);
+  document.getElementById('gen-section').style.display = 'none';
+  document.getElementById('id-section').style.display = 'block';
+}
+
+async function doRecover() {
+  const input = document.getElementById('recover-input').value.trim();
   try {
-    await fetch(SERVER + '/v1/keys/register', {
-      method: 'POST',
-      headers: {'Content-Type': 'application/json'},
-      body: JSON.stringify({
-        fingerprint: fingerprint,
-        bundle: Array.from(new TextEncoder().encode(JSON.stringify(pubJwk)))
-      })
-    });
-    addSystemMsg('Key registered with server');
+    const s = fromHex(input);
+    if (s.length !== 32) throw new Error('need 32 bytes');
+    await initIdentity(s);
+    document.getElementById('my-fp').textContent = myFingerprint;
+    document.getElementById('my-seed').textContent = '(recovered)';
+    document.getElementById('gen-section').style.display = 'none';
+    document.getElementById('id-section').style.display = 'block';
   } catch(e) {
-    addSystemMsg('Failed to register key: ' + e.message);
+    alert('Invalid seed: ' + e.message);
   }
 }
 
-async function pollLoop() {
-  while (true) {
-    try {
-      const resp = await fetch(SERVER + '/v1/messages/poll/' + encodeURIComponent(fingerprint));
-      if (resp.ok) {
-        const msgs = await resp.json();
-        for (const msg of msgs) {
-          // TODO: decrypt with ratchet. For now just display.
-          addChatMsg('encrypted', '[encrypted message — ratchet decryption TODO]', true);
-        }
-      }
-    } catch(e) {
-      // Server offline, retry
-    }
-    await new Promise(r => setTimeout(r, 5000));
-  }
+async function enterChat() {
+  document.getElementById('setup').classList.remove('active');
+  document.getElementById('chat').classList.add('active');
+  document.getElementById('hdr-fp').textContent = myFingerprint.slice(0, 19);
+  document.getElementById('hdr-server').textContent = SERVER;
+
+  await registerKey();
+  addSys('Identity loaded: ' + myFingerprint);
+  addSys('Key registered with server');
+  addSys('Paste a peer fingerprint above and start chatting');
+  addSys('Commands: /info, /clear, /quit');
+
+  // Restore saved peer
+  const savedPeer = localStorage.getItem('wz-peer');
+  if (savedPeer) $peerInput.value = savedPeer;
+
+  // Start polling
+  pollTimer = setInterval(pollMessages, 2000);
+  $input.focus();
 }
 
-function sendMessage() {
+async function doSend() {
   const text = $input.value.trim();
+  $input.value = '';
+  $input.style.height = 'auto';
   if (!text) return;
 
-  if (text === '/help') {
-    addSystemMsg('Commands:');
-    addSystemMsg('  /info — show your fingerprint');
-    addSystemMsg('  /seed — show your seed (CAREFUL!)');
-    addSystemMsg('  /send <fingerprint> <message> — send encrypted message');
-    addSystemMsg('  /help — this help');
-    $input.value = '';
-    return;
-  }
-  if (text === '/info') {
-    addSystemMsg('Fingerprint: ' + fingerprint);
-    $input.value = '';
-    return;
-  }
-  if (text === '/seed') {
-    addSystemMsg('Seed: ' + seedToHexMnemonic(seed));
-    $input.value = '';
-    return;
-  }
+  // Commands
+  if (text === '/info') { addSys('Fingerprint: ' + myFingerprint); return; }
+  if (text === '/clear') { $messages.innerHTML = ''; return; }
+  if (text === '/quit') { window.close(); return; }
 
-  // TODO: /send command, general chat via groups
-  addSystemMsg('Message sending not yet wired — Phase 1 in progress');
-  $input.value = '';
+  const peer = $peerInput.value.trim();
+  if (!peer) { addSys('Set a peer fingerprint first'); return; }
+  localStorage.setItem('wz-peer', peer);
+
+  try {
+    await sendEncrypted(peer, text);
+    addMsg(myFingerprint.slice(0, 19), text, true);
+  } catch(e) {
+    addSys('Send failed: ' + e.message);
+  }
 }
 
 // Keyboard
 $input.onkeydown = function(e) {
-  if (e.key === 'Enter' && !e.shiftKey) {
-    e.preventDefault();
-    sendMessage();
-  }
+  if (e.key === 'Enter' && !e.shiftKey) { e.preventDefault(); doSend(); }
 };
-
-// Auto-resize
 $input.addEventListener('input', function() {
   this.style.height = 'auto';
   this.style.height = Math.min(this.scrollHeight, 120) + 'px';
 });
 
-// Auto-load saved identity on page load
-tryAutoLoad();
+// Auto-load
+(async function() {
+  if (await loadIdentity()) {
+    enterChat();
+  }
+})();
 </script>
 </body>
 </html>"##;
