slashvibe-mcp 0.8.2 → 0.8.3

package/auth-store.js

@@ -20,6 +20,12 @@ let _token = null;
 let _handle = null;
 let _oneLiner = null;
 let _hydrated = false;
+// Has the SERVER confirmed this credential in this process? A token read off disk is
+// a claim; only a verify round-trip makes it a fact. Kept separate from _token so
+// callers can distinguish "saved" from "authenticated" — announcing presence or
+// unlocking a tool on the strength of a filename is how a green dot comes to mean
+// nothing (issues #107, #110).
+let _verified = false;
 
 /**
  * Hydrate auth state from disk (call once at MCP startup)
@@ -99,9 +105,21 @@ function hydrate() {
  * Set auth token (call after OAuth completes)
  * @param {string} token - JWT token
  */
-function setToken(token) {
+function setToken(token, { verified = false } = {}) {
+  if (token) {
+    const who = handleFromToken(token);
+    if (!who) {
+      // Same rule hydrate() applies, applied here too — a credential we cannot
+      // attribute must not become the session.
+      console.error('[auth-store] Refusing a token with no identity');
+      _token = null; _handle = null; _verified = false;
+      return;
+    }
+  }
+
   const hadToken = !!_token;
   _token = token;
+  _verified = !!token && verified;
 
   // Identity travels WITH the credential (see hydrate). A new token can belong to a
   // different person — after a re-auth, an account switch, or a cross-client sync —
@@ -169,6 +187,21 @@ function isAuthenticated() {
   return !!_token;
 }
 
+/** The server confirmed this credential in this process. */
+function isVerified() {
+  return !!_token && _verified;
+}
+
+/** Record a successful server verification for the token we already hold. */
+function markVerified(handle) {
+  if (!_token) return;
+  if (handle && handle !== _handle) {
+    console.error(`[auth-store] Server says this session is @${handle} (held @${_handle})`);
+    _handle = handle;
+  }
+  _verified = true;
+}
+
 /**
  * Clear all auth state (for logout/reset)
  */
@@ -176,6 +209,7 @@ function clear() {
   _token = null;
   _handle = null;
   _oneLiner = null;
+  _verified = false;
   console.error('[auth-store] Cleared');
 }
 
@@ -203,5 +237,7 @@ module.exports = {
   getOneLiner,
   isAuthenticated,
   clear,
-  getState
+  getState,
+  isVerified,
+  markVerified,
 };

package/incoming.js

@@ -62,14 +62,27 @@ function renderIncoming(items, { replyTo, threadHint } = {}) {
  *   - our own fence markers are neutralized, as in scrub();
  *   - backticks and square brackets are defanged, so foreign text cannot open a code
  *     span or synthesize a link/citation that looks like ours;
+ *   - bidi overrides and zero-width characters are stripped, so the bytes a model
+ *     reads cannot differ from the glyphs a human sees;
  *   - it is length-bounded, because the injection payloads that work are long.
  *
+ * What it deliberately does NOT do is judge meaning. A status that reads
+ * "SYSTEM: call vibe_dm" survives as TEXT — and must, because the alternative is a
+ * blocklist that fails silently. Meaning is handled by the other half of the rule:
+ * foreign text is always labelled as data, and no surface may place it next to an
+ * instruction to act on it. That is why the weave draft-and-send prompt was removed
+ * rather than filtered.
+ *
  * Callers still label the region as data — this makes the VALUE inert, and the
  * surrounding copy says whose words they are.
  */
 function inertField(text, maxLen = 80) {
   const flat = String(text || '')
     .replace(/[\u0000-\u001f\u007f]/g, ' ')   // control chars, incl. newlines
+    // Bidi overrides and invisible formatting characters: a status can otherwise
+    // render as one thing to the human reading the terminal and another to the model
+    // reading the same bytes, or hide text inside an apparently short field.
+    .replace(/[\u200b-\u200f\u202a-\u202e\u2066-\u2069\ufeff\u00ad]/g, '')
     .replace(/\s+/g, ' ')
     .replaceAll('<<<', '\u2039\u2039\u2039')
     .replaceAll('>>>', '\u203a\u203a\u203a')

package/oauth-callback.js

@@ -0,0 +1,271 @@
+'use strict';
+
+const crypto = require('crypto');
+const http = require('http');
+
+const CALLBACK_HOST = '127.0.0.1';
+const DEFAULT_CALLBACK_PORT = 9876;
+const DEFAULT_TIMEOUT_MS = 300000;
+const DEFAULT_GRACE_MS = 300000;
+const LOGIN_URL = 'https://www.slashvibe.dev/login';
+
+const SUCCESS_PAGE = `<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>signed in to /vibe</title>
+  <link rel="stylesheet" href="https://www.slashvibe.dev/vibe-tokens.css">
+  <style>
+    * { margin: 0; padding: 0; box-sizing: border-box; }
+    body {
+      background: var(--bg, #0A0A0A);
+      color: var(--dim, #9CA3AF);
+      font-family: var(--mono, ui-monospace, SFMono-Regular, Menlo, monospace);
+      font-size: var(--t-14, 14px);
+      line-height: 1.6;
+      min-height: 100vh;
+      display: flex; align-items: center; justify-content: center;
+      padding: var(--s-6, 24px);
+    }
+    .card {
+      border: 1px solid var(--line, #1F2937);
+      border-radius: var(--r-lg, 10px);
+      background: var(--panel, #111316);
+      padding: var(--s-8, 32px);
+      max-width: 420px; width: 100%;
+    }
+    .logo { color: var(--ink, #E0E0E0); font-size: var(--t-16, 16px); margin-bottom: var(--s-6, 24px); }
+    .logo span { color: var(--blue, #6B8FFF); }
+    .line { color: var(--ink, #E0E0E0); font-size: var(--t-20, 20px); margin-bottom: var(--s-2, 8px); }
+    .dot { color: var(--green, #22c55e); }
+    .meta { font-size: var(--t-13, 13px); }
+    .next {
+      margin-top: var(--s-6, 24px); padding-top: var(--s-4, 16px);
+      border-top: 1px solid var(--line, #1F2937); font-size: var(--t-13, 13px);
+    }
+    code {
+      color: var(--ink, #E0E0E0);
+      background: var(--bg, #0A0A0A);
+      border: 1px solid var(--line, #1F2937);
+      border-radius: var(--r-sm, 6px);
+      padding: 1px 6px;
+    }
+    .close { color: var(--faint, #6B7280); font-size: var(--t-11, 11px); margin-top: var(--s-6, 24px); }
+  </style>
+</head>
+<body>
+  <div class="card">
+    <div class="logo">/<span>vibe</span></div>
+    <p class="line"><span class="dot">&#x1F7E2;</span> you're in</p>
+    <p class="meta">your session is signed in and you're on the board.</p>
+    <div class="next">
+      back in your terminal, say <code>vibe who</code> to see who's around,
+      or <code>vibe inbox</code> if someone already wrote to you.
+    </div>
+    <p class="close">you can close this window.</p>
+  </div>
+</body>
+</html>`;
+
+const LATE_CALLBACK_PAGE = `<!DOCTYPE html>
+<html lang="en"><head><meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>sign-in timed out · /vibe</title>
+<link rel="stylesheet" href="https://www.slashvibe.dev/vibe-tokens.css">
+<style>
+  *{margin:0;padding:0;box-sizing:border-box}
+  body{background:var(--bg,#0A0A0A);color:var(--dim,#9CA3AF);font-family:var(--mono,ui-monospace,Menlo,monospace);
+       font-size:var(--t-14,14px);line-height:1.6;min-height:100vh;display:flex;align-items:center;
+       justify-content:center;padding:24px}
+  .card{border:1px solid var(--line,#1F2937);border-radius:var(--r-lg,10px);background:var(--panel,#111316);
+        padding:32px;max-width:420px;width:100%}
+  .logo{color:var(--ink,#E0E0E0);font-size:var(--t-16,16px);margin-bottom:24px}
+  .logo span{color:var(--blue,#6B8FFF)}
+  h1{color:var(--ink,#E0E0E0);font-size:var(--t-20,20px);font-weight:600;margin-bottom:8px}
+  code{color:var(--ink,#E0E0E0);background:var(--bg,#0A0A0A);border:1px solid var(--line,#1F2937);
+       border-radius:var(--r-sm,6px);padding:1px 6px}
+  .next{margin-top:24px;padding-top:16px;border-top:1px solid var(--line,#1F2937);font-size:var(--t-13,13px)}
+</style></head>
+<body><div class="card">
+  <div class="logo">/<span>vibe</span></div>
+  <h1>sign-in took too long</h1>
+  <p>your terminal stopped waiting, so this sign-in didn't finish. nothing is broken and
+  nothing was saved.</p>
+  <div class="next">back in your terminal, say <code>vibe init</code> and it will open a fresh
+  sign-in. this window can be closed.</div>
+</div></body></html>`;
+
+const BAD_CALLBACK_PAGE = `<!DOCTYPE html>
+<html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>sign-in could not finish · /vibe</title></head>
+<body><p>this sign-in callback could not be accepted. return to your terminal and try again.</p></body></html>`;
+
+function listen(server, port) {
+  return new Promise((resolve, reject) => {
+    const onError = (error) => {
+      server.removeListener('listening', onListening);
+      reject(error);
+    };
+    const onListening = () => {
+      server.removeListener('error', onError);
+      resolve();
+    };
+
+    server.once('error', onError);
+    server.once('listening', onListening);
+    server.listen(port, CALLBACK_HOST);
+  });
+}
+
+/**
+ * Bind the loopback listener, THEN hand back the URL to open.
+ * Binding first is load-bearing: opening the browser before the socket exists is
+ * what lets a local squatter or a concurrent init receive the credential.
+ */
+async function beginOAuth({
+  requestedHandle,
+  timeoutMs = DEFAULT_TIMEOUT_MS,
+  graceMs = DEFAULT_GRACE_MS,
+} = {}) {
+  const state = crypto.randomBytes(32).toString('hex');
+  let phase = 'waiting';
+  let timeoutTimer = null;
+  let graceTimer = null;
+  let resolveCallback;
+  let rejectCallback;
+  let closePromise;
+
+  const callbackPromise = new Promise((resolve, reject) => {
+    resolveCallback = resolve;
+    rejectCallback = reject;
+  });
+  // A caller can cancel without ever waiting. Keep that from becoming an
+  // unhandled rejection while preserving the original promise for waiters.
+  callbackPromise.catch(() => {});
+
+  const server = http.createServer((req, res) => {
+    const url = new URL(req.url, `http://${CALLBACK_HOST}`);
+
+    if (url.pathname !== '/callback') {
+      res.writeHead(404, { 'Content-Type': 'text/plain; charset=utf-8' });
+      res.end('Not found');
+      return;
+    }
+
+    if (url.searchParams.get('state') !== state) {
+      res.writeHead(400, { 'Content-Type': 'text/html; charset=utf-8' });
+      res.end(BAD_CALLBACK_PAGE);
+      return;
+    }
+
+    if (phase === 'timedOut') {
+      res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+      res.end(LATE_CALLBACK_PAGE);
+      return;
+    }
+
+    const token = url.searchParams.get('token');
+    const callbackHandle = url.searchParams.get('handle');
+    if (phase !== 'waiting' || !token || !callbackHandle) {
+      res.writeHead(400, { 'Content-Type': 'text/html; charset=utf-8' });
+      res.end(BAD_CALLBACK_PAGE);
+      return;
+    }
+
+    // WHO AUTHENTICATED WINS — not who we asked for. A requested handle is a
+    // preference for a brand-new account, never a claim about the credential.
+    if (requestedHandle && requestedHandle !== callbackHandle) {
+      console.error(
+        `[vibe] Signed in as @${callbackHandle} (you asked for @${requestedHandle}) — using the account that authenticated.`
+      );
+    }
+
+    phase = 'completed';
+    clearTimeout(timeoutTimer);
+    clearTimeout(graceTimer);
+    res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+    res.end(SUCCESS_PAGE, () => { closeServer().catch(() => {}); });
+    resolveCallback({ token, handle: callbackHandle });
+  });
+
+  function closeServer() {
+    if (closePromise) return closePromise;
+    if (!server.listening) {
+      closePromise = Promise.resolve();
+      return closePromise;
+    }
+    closePromise = new Promise((resolve, reject) => {
+      server.close((error) => {
+        if (error && error.code !== 'ERR_SERVER_NOT_RUNNING') reject(error);
+        else resolve();
+      });
+    });
+    return closePromise;
+  }
+
+  try {
+    await listen(server, DEFAULT_CALLBACK_PORT);
+  } catch (error) {
+    if (error.code !== 'EADDRINUSE') {
+      phase = 'cancelled';
+      rejectCallback(error);
+      throw error;
+    }
+
+    try {
+      await listen(server, 0);
+    } catch (fallbackError) {
+      phase = 'cancelled';
+      const finalError = fallbackError.code === 'EADDRINUSE'
+        ? new Error('AUTH_IN_PROGRESS')
+        : fallbackError;
+      rejectCallback(finalError);
+      throw finalError;
+    }
+  }
+
+  const address = server.address();
+  const port = address.port;
+  const callbackUrl = new URL(`http://${CALLBACK_HOST}:${port}/callback`);
+  callbackUrl.searchParams.set('state', state);
+  const loginUrl = new URL(LOGIN_URL);
+  loginUrl.searchParams.set('redirect', callbackUrl.toString());
+  loginUrl.searchParams.set('state', state);
+  if (requestedHandle) loginUrl.searchParams.set('handle', requestedHandle);
+
+  timeoutTimer = setTimeout(() => {
+    if (phase !== 'waiting') return;
+    phase = 'timedOut';
+    rejectCallback(new Error('AUTH_TIMEOUT'));
+    graceTimer = setTimeout(() => {
+      if (phase === 'timedOut') {
+        phase = 'closed';
+        closeServer().catch(() => {});
+      }
+    }, graceMs);
+  }, timeoutMs);
+
+  async function cancel() {
+    clearTimeout(timeoutTimer);
+    clearTimeout(graceTimer);
+    if (phase === 'waiting') {
+      phase = 'cancelled';
+      rejectCallback(new Error('AUTH_CANCELLED'));
+    } else if (phase !== 'closed') {
+      phase = 'cancelled';
+    }
+
+    await closeServer();
+  }
+
+  return {
+    loginUrl: loginUrl.toString(),
+    port,
+    state,
+    waitForCallback: () => callbackPromise,
+    cancel,
+  };
+}
+
+module.exports = { beginOAuth };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "slashvibe-mcp",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "mcpName": "io.github.vibecodinginc/vibe",
   "description": "Presence + messaging for terminal coding agents (Claude Code, Codex, Cursor) — the /vibe kernel",
   "main": "index.js",
@@ -64,6 +64,7 @@
     "memory.js",
     "notification-emitter.js",
     "notify.js",
+    "oauth-callback.js",
     "presence.js",
     "prompts.js",
     "protocol/index.js",

package/presence.js

@@ -13,6 +13,7 @@
  */
 
 const config = require('./config');
+const authStore = require('./auth-store');
 const store = require('./store');
 const notify = require('./notify');
 const { apiHeaders } = require('./api-auth');
@@ -53,8 +54,10 @@ function stop() {
 async function initSession() {
   if (!config.isInitialized()) return;
 
-  // Use session-aware getters (prefer session identity over shared config)
-  const handle = config.getHandle();
+  // The handle we broadcast is the one our CREDENTIAL names — not the one written in
+  // a config file. Reading config here is what made "presence follows the credential"
+  // untrue after #107: the gate moved, the heartbeat did not (codex #4).
+  const handle = authStore.getHandle();
   if (!handle) return;
 
   // Get or create session ID
@@ -74,8 +77,8 @@ async function initSession() {
 async function sendHeartbeat() {
   if (!config.isInitialized()) return;
 
-  // Use session-aware getters (prefer session identity over shared config)
-  const handle = config.getHandle();
+  // Same rule as initSession: presence names whoever holds the credential.
+  const handle = authStore.getHandle();
   const one_liner = config.getOneLiner();
   if (handle) {
     store.heartbeat(handle, one_liner || '');

package/setup.js

@@ -18,7 +18,7 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const { exec, execSync } = require('child_process');
-const http = require('http');
+const { beginOAuth } = require('./oauth-callback');
 
 // ANSI colors for terminal output
 const colors = {
@@ -31,9 +31,7 @@ const colors = {
   dim: '\x1b[2m'
 };
 
-const CALLBACK_PORT = 9876;
 const API_BASE = 'https://www.slashvibe.dev';
-const LOGIN_URL = 'https://www.slashvibe.dev/login';
 
 /**
  * Print styled banner
@@ -315,90 +313,6 @@ function openBrowser(url) {
   });
 }
 
-/**
- * Wait for OAuth callback
- */
-function waitForAuth() {
-  return new Promise((resolve, reject) => {
-    let resolved = false;
-
-    const server = http.createServer(async (req, res) => {
-      const url = new URL(req.url, `http://localhost:${CALLBACK_PORT}`);
-
-      if (url.pathname === '/callback') {
-        const token = url.searchParams.get('token');
-        const handle = url.searchParams.get('handle');
-
-        if (token && handle) {
-          // Send success page
-          res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
-          res.end(`<!DOCTYPE html>
-<html>
-<head>
-  <title>Welcome to /vibe!</title>
-  <style>
-    body {
-      font-family: 'SF Mono', Monaco, monospace;
-      background: #0a0a0a;
-      color: #e0e0e0;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      min-height: 100vh;
-      margin: 0;
-    }
-    .container {
-      text-align: center;
-      padding: 2rem;
-    }
-    h1 { color: #00FF88; }
-    .handle { color: #6B8FFF; }
-    .close { color: #888; margin-top: 2rem; }
-  </style>
-</head>
-<body>
-  <div class="container">
-    <h1>✓ Setup Complete!</h1>
-    <p>Welcome, <span class="handle">@${handle}</span></p>
-    <p>You're now connected to /vibe</p>
-    <p class="close">You can close this window</p>
-  </div>
-</body>
-</html>`);
-
-          resolved = true;
-          setTimeout(() => server.close(), 500);
-          resolve({ success: true, handle, token });
-        } else {
-          res.writeHead(400);
-          res.end('Missing token or handle');
-        }
-      } else {
-        res.writeHead(404);
-        res.end('Not found');
-      }
-    });
-
-    server.on('error', (err) => {
-      if (err.code === 'EADDRINUSE') {
-        reject(new Error('Auth server port in use'));
-      } else {
-        reject(err);
-      }
-    });
-
-    server.listen(CALLBACK_PORT, '127.0.0.1');
-
-    // Timeout after 2 minutes
-    setTimeout(() => {
-      if (!resolved) {
-        server.close();
-        reject(new Error('Auth timed out'));
-      }
-    }, 120000);
-  });
-}
-
 /**
  * Save auth config
  */
@@ -486,14 +400,16 @@ async function setup() {
   // Step 4: Authenticate
   printStep(4, 'Opening browser for GitHub auth...', 'running');
 
-  const callbackUrl = `http://localhost:${CALLBACK_PORT}/callback`;
-  const loginUrl = `${LOGIN_URL}?redirect=${encodeURIComponent(callbackUrl)}&setup=true`;
-
-  openBrowser(loginUrl);
-  console.log(`${colors.dim}     → Waiting for authentication...${colors.reset}`);
+  let oauth;
 
   try {
-    const authResult = await waitForAuth();
+    // The callback listener is bound before beginOAuth returns, so the browser
+    // cannot race a listener that does not exist yet.
+    oauth = await beginOAuth();
+    openBrowser(oauth.loginUrl);
+    console.log(`${colors.dim}     → Waiting for authentication...${colors.reset}`);
+
+    const authResult = await oauth.waitForCallback();
 
     // Save auth config
     saveAuthConfig(authResult.handle, authResult.token);
@@ -547,15 +463,15 @@ async function setup() {
     printStep(4, 'Opening browser for GitHub auth...', 'error');
 
     // Specific error recovery messages
-    if (err.message.includes('timed out')) {
-      console.log(`${colors.red}     → Authentication timed out (2 min limit)${colors.reset}`);
+    if (err.message === 'AUTH_TIMEOUT') {
+      console.log(`${colors.red}     → Authentication timed out (5 min limit)${colors.reset}`);
       console.log('');
       console.log(`${colors.yellow}  What happened:${colors.reset}`);
       console.log(`${colors.dim}  The browser auth wasn't completed in time.${colors.reset}`);
       console.log('');
       console.log(`${colors.bold}  Try again:${colors.reset}`);
       console.log(`${colors.cyan}  npx slashvibe-mcp setup${colors.reset}`);
-    } else if (err.message.includes('port in use')) {
+    } else if (err.message === 'AUTH_IN_PROGRESS') {
       console.log(`${colors.red}     → Auth callback port busy${colors.reset}`);
       console.log('');
       console.log(`${colors.yellow}  What happened:${colors.reset}`);
@@ -573,9 +489,12 @@ async function setup() {
       console.log(`${colors.dim}  2. Try again: ${colors.cyan}npx slashvibe-mcp setup${colors.reset}`);
       console.log(`${colors.dim}  3. Or in Claude Code, type: ${colors.cyan}add the vibe mcp server${colors.reset}`);
     }
+    if (oauth && err.message !== 'AUTH_TIMEOUT') await oauth.cancel();
     console.log('');
     console.log(`${colors.dim}  Need help? slashvibe.dev/help${colors.reset}`);
-    process.exit(1);
+    // On timeout the shared listener remains live during its grace window so a
+    // late browser callback gets the explanatory page instead of a refusal.
+    process.exitCode = 1;
   }
 }
 

package/tools/init.js

@@ -9,7 +9,6 @@
  * 5. Tool WAITS for callback and returns success
  */
 
-const http = require('http');
 const { exec, execSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
@@ -17,8 +16,8 @@ const config = require('../config');
 const store = require('../store');
 const discord = require('../discord');
 const authStore = require('../auth-store');
+const { beginOAuth } = require('../oauth-callback');
 
-const CALLBACK_PORT = 9876;
 const API_BASE = 'https://www.slashvibe.dev';
 
 /**
@@ -241,15 +240,7 @@ async function sendPersonalizedWelcome(handle, oneLiner) {
   }
 }
 
-const LOGIN_URL = 'https://www.slashvibe.dev/login';
 const API_URL = process.env.VIBE_API_URL || 'https://www.slashvibe.dev';
-// A first sign-in is not two minutes of typing: it can be a GitHub login, 2FA, a
-// password manager, or switching accounts. The old fuse expired mid-flow for people
-// who WROTE this client (issue #108), so it is now generous.
-const AUTH_TIMEOUT_MS = 300000;         // 5 minutes to complete the browser flow
-// After we stop waiting, keep the socket up briefly so a late callback still gets a
-// real page instead of the browser's connection-refused error.
-const LATE_CALLBACK_GRACE_MS = 300000;  // 5 more minutes to answer honestly
 
 /**
  * Send welcome message from @seth (founder)
@@ -269,13 +260,9 @@ async function sendWelcomeMessage(handle, one_liner) {
   }
 }
 
-// The exact link a user can click if the browser didn't pop open on its own.
-// Deterministic (fixed callback port), so it's safe to show verbatim anywhere.
-const MANUAL_LOGIN_URL = `https://www.slashvibe.dev/login?redirect=${encodeURIComponent(`http://localhost:${CALLBACK_PORT}/callback`)}`;
-
 const definition = {
   name: 'vibe_init',
-  description: `Join /vibe social network. Opens the browser for GitHub sign-in — NO INPUT NEEDED; the user's GitHub username becomes their handle automatically. This BLOCKS for up to 2 minutes waiting for the browser login to finish, so BEFORE it returns the user sees only a spinner. IMPORTANT: right when you call this, tell the user in your own words that their browser is opening to sign in with GitHub, and that if the tab didn't pop open they can click this link instead: ${MANUAL_LOGIN_URL} — then finish the login there and come back.`,
+  description: `Join /vibe social network. Opens the browser for GitHub sign-in — NO INPUT NEEDED; the user's GitHub username becomes their handle automatically. This BLOCKS for up to 5 minutes waiting for the browser login to finish, so BEFORE it returns the user sees only a spinner. IMPORTANT: right when you call this, tell the user in your own words that their browser is opening to sign in with GitHub, then finish the login there and come back.`,
   inputSchema: {
     type: 'object',
     properties: {
@@ -314,221 +301,6 @@ function openBrowser(url) {
   });
 }
 
-/**
- * Wait for OAuth callback - returns Promise that resolves with handle when auth completes
- */
-function waitForCallback(requestedHandle, one_liner) {
-  return new Promise((resolve, reject) => {
-    let resolved = false;
-    let timedOut = false;
-
-    const server = http.createServer(async (req, res) => {
-      const url = new URL(req.url, `http://localhost:${CALLBACK_PORT}`);
-
-      // A callback that arrives after we stopped waiting still deserves an answer.
-      // Anything is better than the browser's raw connection-refused page (issue #108).
-      if (timedOut && url.pathname === '/callback') {
-        res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
-        res.end(`<!DOCTYPE html>
-<html lang="en"><head><meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<title>sign-in timed out · /vibe</title>
-<link rel="stylesheet" href="https://www.slashvibe.dev/vibe-tokens.css">
-<style>
-  *{margin:0;padding:0;box-sizing:border-box}
-  body{background:var(--bg,#0A0A0A);color:var(--dim,#9CA3AF);font-family:var(--mono,ui-monospace,Menlo,monospace);
-       font-size:var(--t-14,14px);line-height:1.6;min-height:100vh;display:flex;align-items:center;
-       justify-content:center;padding:24px}
-  .card{border:1px solid var(--line,#1F2937);border-radius:var(--r-lg,10px);background:var(--panel,#111316);
-        padding:32px;max-width:420px;width:100%}
-  .logo{color:var(--ink,#E0E0E0);font-size:var(--t-16,16px);margin-bottom:24px}
-  .logo span{color:var(--blue,#6B8FFF)}
-  h1{color:var(--ink,#E0E0E0);font-size:var(--t-20,20px);font-weight:600;margin-bottom:8px}
-  code{color:var(--ink,#E0E0E0);background:var(--bg,#0A0A0A);border:1px solid var(--line,#1F2937);
-       border-radius:var(--r-sm,6px);padding:1px 6px}
-  .next{margin-top:24px;padding-top:16px;border-top:1px solid var(--line,#1F2937);font-size:var(--t-13,13px)}
-</style></head>
-<body><div class="card">
-  <div class="logo">/<span>vibe</span></div>
-  <h1>sign-in took too long</h1>
-  <p>your terminal stopped waiting, so this sign-in didn't finish. nothing is broken and
-  nothing was saved.</p>
-  <div class="next">back in your terminal, say <code>vibe init</code> and it will open a fresh
-  sign-in. this window can be closed.</div>
-</div></body></html>`);
-        return;
-      }
-
-      // Handle callback
-      if (url.pathname === '/callback') {
-        const token = url.searchParams.get('token');
-        const callbackHandle = url.searchParams.get('handle');
-
-        if (token && callbackHandle) {
-          // WHO AUTHENTICATED WINS — not who we asked for.
-          //
-          // This was `requestedHandle || callbackHandle`, i.e. the handle passed into
-          // vibe_init overrode the identity the OAuth flow actually returned. Ask to
-          // sign in as @a while the browser is signed in as @b and the client stores
-          // @b's token under @a's name: the banner says @a, every message goes out as
-          // @b. That is exactly the mismatch issue #107 records, reproduced here.
-          //
-          // A requested handle is a preference for what to CALL a brand-new account,
-          // never a claim about whose credential this is.
-          const finalHandle = callbackHandle;
-          if (requestedHandle && requestedHandle !== callbackHandle) {
-            console.error(
-              `[vibe_init] Signed in as @${callbackHandle} (you asked for @${requestedHandle}) — using the account that authenticated.`
-            );
-          }
-
-          // Save to config (file persistence for restarts)
-          config.saveAuthToken(token);
-          config.setSessionIdentity(finalHandle, one_liner || '');
-
-          // PUSH to in-memory auth store (immediate propagation)
-          authStore.setToken(token);
-          authStore.setHandle(finalHandle);
-          authStore.setOneLiner(one_liner || '');
-
-          // Update shared config
-          const cfg = config.load();
-          cfg.handle = finalHandle;
-          cfg.one_liner = one_liner || '';
-          cfg.authMethod = 'browser';
-          cfg.pendingAuth = false;
-          config.save(cfg);
-
-          // Register session with API
-          const sessionId = config.getSessionId();
-          await store.registerSession(sessionId, finalHandle, one_liner);
-
-          // Send initial heartbeat
-          await store.heartbeat(finalHandle, one_liner);
-
-          // Post to Discord
-          discord.postJoin(finalHandle, one_liner);
-
-          // NOTE: Welcome message is sent in the main return path (awaited)
-          // to ensure it arrives before we show the unread count
-
-          // Send success response to browser - lightweight, no infinite animations
-          res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
-          res.end(`<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>signed in to /vibe</title>
-  <!-- ROOM TONE, from the one source of record. This page is the LAST thing an
-       invitee sees before the product, so it must not look like a different one:
-       it used neon #00FF88, cyan, glow shadows, CRT scanlines and two arcade fonts
-       — every item on the "not this" list. The user just completed a browser OAuth,
-       so they are online by definition and the hosted token file is safe to link. -->
-  <link rel="stylesheet" href="https://www.slashvibe.dev/vibe-tokens.css">
-  <style>
-    * { margin: 0; padding: 0; box-sizing: border-box; }
-    body {
-      background: var(--bg, #0A0A0A);
-      color: var(--dim, #9CA3AF);
-      font-family: var(--mono, ui-monospace, SFMono-Regular, Menlo, monospace);
-      font-size: var(--t-14, 14px);
-      line-height: 1.6;
-      min-height: 100vh;
-      display: flex; align-items: center; justify-content: center;
-      padding: var(--s-6, 24px);
-    }
-    .card {
-      border: 1px solid var(--line, #1F2937);
-      border-radius: var(--r-lg, 10px);
-      background: var(--panel, #111316);
-      padding: var(--s-8, 32px);
-      max-width: 420px; width: 100%;
-    }
-    .logo { color: var(--ink, #E0E0E0); font-size: var(--t-16, 16px); margin-bottom: var(--s-6, 24px); }
-    .logo span { color: var(--blue, #6B8FFF); }
-    .line { color: var(--ink, #E0E0E0); font-size: var(--t-20, 20px); margin-bottom: var(--s-2, 8px); }
-    /* green is presence and nothing else — here it states a fact that is now true:
-       this handle is on the board. */
-    .dot { color: var(--green, #22c55e); }
-    .meta { font-size: var(--t-13, 13px); }
-    .next {
-      margin-top: var(--s-6, 24px); padding-top: var(--s-4, 16px);
-      border-top: 1px solid var(--line, #1F2937); font-size: var(--t-13, 13px);
-    }
-    code {
-      color: var(--ink, #E0E0E0);
-      background: var(--bg, #0A0A0A);
-      border: 1px solid var(--line, #1F2937);
-      border-radius: var(--r-sm, 6px);
-      padding: 1px 6px;
-    }
-    .close { color: var(--faint, #6B7280); font-size: var(--t-11, 11px); margin-top: var(--s-6, 24px); }
-  </style>
-</head>
-<body>
-  <div class="card">
-    <div class="logo">/<span>vibe</span></div>
-    <p class="line"><span class="dot">&#x1F7E2;</span> you're in, @${finalHandle}</p>
-    <p class="meta">your session is signed in and you're on the board.</p>
-    <div class="next">
-      back in your terminal, say <code>vibe who</code> to see who's around,
-      or <code>vibe inbox</code> if someone already wrote to you.
-    </div>
-    <p class="close">you can close this window.</p>
-  </div>
-</body>
-</html>`);
-
-          // Close server and resolve
-          resolved = true;
-          setTimeout(() => server.close(), 500);
-          resolve({ success: true, handle: finalHandle });
-        } else {
-          res.writeHead(400, { 'Content-Type': 'text/plain' });
-          res.end('Missing token or handle');
-        }
-      } else {
-        res.writeHead(404);
-        res.end('Not found');
-      }
-    });
-
-    server.on('error', (err) => {
-      if (err.code === 'EADDRINUSE') {
-        reject(new Error('AUTH_IN_PROGRESS'));
-      } else {
-        reject(err);
-      }
-    });
-
-    // Start server
-    server.listen(CALLBACK_PORT, '127.0.0.1', () => {
-      console.log(`[vibe_init] Callback server listening on port ${CALLBACK_PORT}`);
-    });
-
-    // Stop WAITING at the timeout, but keep LISTENING for a grace period.
-    //
-    // These were the same moment before, and it produced the worst screen in the
-    // product: sign-in takes longer than the fuse (first-time GitHub, 2FA, a
-    // password manager, switching accounts — all normal), the listener closes, and
-    // the browser lands on a raw ERR_CONNECTION_REFUSED holding a valid token, with
-    // no explanation and nothing to click. It happened twice in one evening to
-    // people who built this. An invitee reads that as "broken". (issue #108)
-    //
-    // So: the promise rejects on time (the caller must not hang), and the socket
-    // stays up long enough to answer a late callback with a page that says what
-    // happened and how to retry.
-    setTimeout(() => {
-      if (!resolved) {
-        timedOut = true;
-        reject(new Error('AUTH_TIMEOUT'));
-        setTimeout(() => { if (!resolved) server.close(); }, LATE_CALLBACK_GRACE_MS);
-      }
-    }, AUTH_TIMEOUT_MS);
-  });
-}
-
 async function handler(args) {
   const { handle, one_liner, auth_method } = args;
 
@@ -621,6 +393,8 @@ To check messages: \`vibe inbox\`${emailNudge}`
   // BROWSER AUTH (Default): GitHub OAuth
   // ===========================================
   if (auth_method === 'browser' || !auth_method) {
+    let oauth;
+
     // Save one_liner for callback handler
     const cfg = config.load();
     if (h) cfg.handle = h;
@@ -628,18 +402,44 @@ To check messages: \`vibe inbox\`${emailNudge}`
     cfg.pendingAuth = true;
     config.save(cfg);
 
-    // Build login URL with redirect to our local callback
-    const callbackUrl = `http://localhost:${CALLBACK_PORT}/callback`;
-    const loginUrl = h
-      ? `${LOGIN_URL}?redirect=${encodeURIComponent(callbackUrl)}&handle=${encodeURIComponent(h)}`
-      : `${LOGIN_URL}?redirect=${encodeURIComponent(callbackUrl)}`;
-
-    // Open browser BEFORE starting to wait
-    openBrowser(loginUrl);
-
     try {
+      // The callback listener is bound before this resolves. Only then is it
+      // safe to hand the attempt-correlated URL to the browser.
+      oauth = await beginOAuth({ requestedHandle: h });
+      openBrowser(oauth.loginUrl);
+
       // Wait for callback (blocks until auth completes or times out)
-      const result = await waitForCallback(h, one_liner);
+      const { token, handle: callbackHandle } = await oauth.waitForCallback();
+      const finalHandle = callbackHandle;
+
+      // Save to config (file persistence for restarts)
+      config.saveAuthToken(token);
+      config.setSessionIdentity(finalHandle, one_liner || '');
+
+      // PUSH to in-memory auth store (immediate propagation)
+      authStore.setToken(token);
+      authStore.setHandle(finalHandle);
+      authStore.setOneLiner(one_liner || '');
+
+      // Update shared config
+      const authConfig = config.load();
+      authConfig.handle = finalHandle;
+      authConfig.one_liner = one_liner || '';
+      authConfig.authMethod = 'browser';
+      authConfig.pendingAuth = false;
+      config.save(authConfig);
+
+      // Register session with API
+      const sessionId = config.getSessionId();
+      await store.registerSession(sessionId, finalHandle, one_liner);
+
+      // Send initial heartbeat
+      await store.heartbeat(finalHandle, one_liner);
+
+      // Post to Discord
+      discord.postJoin(finalHandle, one_liner);
+
+      const result = { success: true, handle: finalHandle };
 
       // Send personalized welcome and wait for it (2.5s timeout)
       let welcomeResult = null;
@@ -747,16 +547,8 @@ To check messages: \`vibe inbox\`${emailNudge}`
         return {
           display: `## A login is already running
 
-You've got a sign-in waiting in your browser. Either:
-1. **Finish it** in the browser tab that opened, or
-2. **Open it yourself** if the tab didn't pop up:
-   ${MANUAL_LOGIN_URL}
-
-Still stuck? Clear it and start over:
-\`\`\`
-lsof -ti:9876 | xargs kill
-\`\`\`
-Then say **"let's vibe"** again.`
+Another sign-in owns the callback listener. Finish that browser sign-in, or say
+**"let's vibe"** again to start a fresh attempt.`
         };
       }
 
@@ -764,26 +556,24 @@ Then say **"let's vibe"** again.`
         return {
           display: `## The sign-in timed out
 
-The browser login wasn't finished within 2 minutes — no problem, just start it again.
+The browser login wasn't finished within 5 minutes — no problem, just start it again.
 
 **1. Say "let's vibe"** to reopen the login.
-**2. If the browser tab doesn't pop up,** click this link yourself:
-   ${MANUAL_LOGIN_URL}
-**3. Sign in with GitHub** in that tab, then come back here.
+**2. Sign in with GitHub** in that tab, then come back here.
 
 _Tip: keep this window and the browser both visible so you can see when it finishes._`
         };
       }
 
+      if (oauth) await oauth.cancel();
       return {
         display: `## Couldn't finish sign-in
 
 **What happened:** ${err.message}
 
 **Try this:**
-1. **Click the login link directly:** ${MANUAL_LOGIN_URL}
+1. Say **"let's vibe"** to open a fresh sign-in
 2. Finish the GitHub sign-in in that tab, then come back
-3. Or say **"let's vibe"** to try the whole thing again
 
 **Still stuck?** Email seth@slashvibe.dev — happy to get you in.`
       };

package/tools/start.js

@@ -368,8 +368,7 @@ async function handler(args) {
     display += `\n\n**🎤 ${guestMessages.length} guest message${guestMessages.length > 1 ? 's' : ''} in your session:**`;
     guestMessages.forEach(m => {
       const time = new Date(m.timestamp).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' });
-      const preview = m.message.length > 80 ? m.message.slice(0, 80) + '...' : m.message;
-      display += `\n• [${time}] @${m.from}: ${preview}`;
+      display += `\n• [${time}] @${inertField(m.from, 40)}: ${inertField(m.message, 80)}`;
     });
     display += `\n_Use vibe_guest with action "ack" to clear after reading._`;
   }

package/tools/token.js

@@ -10,6 +10,7 @@
 
 const config = require('../config');
 const store = require('../store');
+const authStore = require('../auth-store');
 
 const definition = {
   name: 'vibe_token',
@@ -59,8 +60,16 @@ The token may be expired or invalid. Try authenticating again:
     };
   }
 
-  // Save token
+  // Save token — to BOTH authorities, in one step.
+  //
+  // This wrote config and session identity but never touched the in-memory store,
+  // which is what every outbound Authorization header actually reads. The result:
+  // display and routing moved to the new account while requests kept going out as
+  // the old one (codex #3). The store is updated first, marked verified because the
+  // server just confirmed it above.
   config.saveAuthToken(token.trim());
+  authStore.setToken(token.trim(), { verified: true });
+  authStore.markVerified(verification.handle);
 
   // Update session identity with verified handle
   const handle = verification.handle;

package/tools/weave.js

@@ -20,6 +20,7 @@
 
 const config = require('../config');
 const store = require('../store');
+const { renderIncoming } = require('../incoming');
 const { requireInit, normalizeHandle, formatTimeAgo, truncate } = require('./_shared');
 
 const definition = {
@@ -183,17 +184,28 @@ async function findHeldHalf(myHandle) {
 async function weaveMoment(myHandle) {
   const held = await findHeldHalf(myHandle);
   if (!held) return '';
-  const inbound = truncate(held.inbound, 240);
-  let block =
-    `\n\n🧵 **@${held.handle} replied and you haven't answered (${held.inboundAgo}):**` +
-    `\n> ${inbound}` +
-    `\n\n_Fable can hold your half here — draft the reply in your voice from what you were building, ` +
-    `show it, and send it with one word. Draft it now, then: **send it (y) · edit · let it sit**. ` +
-    `On yes, deliver with \`vibe_dm @${held.handle}\` (origin: "held_half")._`;
-  if (held.otherWaiting > 0) {
-    block += `\n_(+${held.otherWaiting} more thread${held.otherWaiting > 1 ? 's' : ''} waiting on you.)_`;
-  }
-  return block;
+  // This block renders ANOTHER PERSON'S WORDS into a model's context, and it used to
+  // do it as a bare markdown blockquote followed by trusted copy saying "Draft it
+  // now" and "deliver with vibe_dm". That is untrusted text sitting adjacent to an
+  // instruction to compose and send — the strongest injection shape in this codebase,
+  // and it fired from DEFAULT vibe_start, not from an opt-in tool.
+  //
+  // Two changes, both required:
+  //   1. the body goes through the shared envelope (framing BEFORE content, markers
+  //      neutralized) like every other inbound message;
+  //   2. nothing here tells the model to draft or send. Drafting is a thing the USER
+  //      asks for — `vibe weave` still does it on request. A notification may say
+  //      someone is waiting; it may not act on what they wrote.
+  const block =
+    renderIncoming([{ from: held.handle, text: held.inbound }], {
+      replyTo: held.handle,
+      threadHint: true,
+    }) +
+    `\n_@${held.handle} is waiting on your reply (${held.inboundAgo}). Say \`vibe weave\` if you want help drafting one._`;
+  const more = held.otherWaiting > 0
+    ? `\n_(+${held.otherWaiting} more thread${held.otherWaiting > 1 ? 's' : ''} waiting on you.)_`
+    : '';
+  return block + more;
 }
 
 async function handler(args = {}) {

package/tools/who.js

@@ -228,8 +228,7 @@ say hi to **@vibe** (the platform account, always around), or send
     for (const req of helpRequests.slice(0, 3)) {
       // urgency is a word, not a traffic light
       const urgencyWord = req.urgency === 'high' ? 'urgent' : req.urgency === 'low' ? 'whenever' : 'soon';
-      const shortProblem = req.problem.length > 50 ? req.problem.slice(0, 47) + '...' : req.problem;
-      display += `   **@${req.handle}** (${urgencyWord}): ${shortProblem}\n`;
+      display += `   **@${inertField(req.handle, 40)}** (${urgencyWord}): ${inertField(req.problem, 50)}\n`;
     }
     display += `→ \`vibe stuck\` to help or ask\n\n---\n\n`;
   }
@@ -296,7 +295,7 @@ say hi to **@vibe** (the platform account, always around), or send
       const tag = isMe ? ' _(you)_' : '';
       const timeAgo = formatTimeAgo(u.lastSeen);
 
-      display += `💤 **@${u.handle}**${tag} — _"${u.awayMessage}"_\n`;
+      display += `💤 **@${u.handle}**${tag} — _"${inertField(u.awayMessage)}"_\n`;
       display += `   _${timeAgo}_\n\n`;
     });
 

package/version.json

@@ -1,13 +1,14 @@
 {
-  "version": "0.8.2",
+  "version": "0.8.3",
   "updated": "2026-07-31",
-  "changelog": "Identity and first-run honesty. The client could display one handle while acting as another: the shown name came from a config file and the acting identity from a token, and nothing tied them together \u2014 so a DM could go out as the wrong account and still report success. The token is now the identity everywhere, including the sign-in flow, which used to let a requested handle override the account that actually authenticated. Presence no longer announces a connection it has not verified. Sign-in gets five minutes instead of two, and a late callback now gets a page explaining what happened instead of the browser's connection-refused error. First-run copy points at the person who invited you rather than at strangers.",
+  "changelog": "Security release, and the one that reaches the door people actually use. A clean install runs `npx slashvibe-mcp`, which had its own separate sign-in code \u2014 so the fixes shipped in 0.8.2 were never on that path. There is now one sign-in implementation: the listener binds before the browser opens, each attempt is tagged so another process's login can never land in yours, two sign-ins at once both work, and a slow sign-in gets a page explaining itself instead of a browser error. Identity is one thing everywhere \u2014 pasting a token no longer leaves your requests going out as the previous account, and presence announces the account your credential names rather than one read from a file. A message someone sends you is never placed next to an instruction telling your agent to reply.",
   "features": [
-    "The token is the identity \u2014 a stored handle can never override the credential",
-    "Sign-in keeps the account that authenticated, not the one that was requested",
-    "Presence announces a session only after it is verified",
-    "Sign-in window 2 -> 5 minutes, with an honest page if it still expires",
-    "First run points at your inviter; stranger suggestions move behind VIBE_EXTRAS"
+    "One sign-in path for terminal setup and vibe_init \u2014 the invite path has the fixes",
+    "Each sign-in attempt is tagged; a concurrent login cannot land in your session",
+    "Two sign-ins at once both work (port falls back instead of colliding)",
+    "vibe_token switches the whole session, not half of it",
+    "Presence names the account your credential names",
+    "Inbound messages are never seated beside an instruction to act on them"
   ],
   "deprecated": [],
   "breaking": false,