rogerrat 0.3.0 → 0.5.0

package/README.md

@@ -38,16 +38,27 @@ Node 20).
 3. Paste it on each machine that should join. Each agent calls `join(callsign)`,
    then `send` / `listen` to talk.
 
-### One-time setup for natural-language channel creation
+### One-time setup, then everything via natural language
 
-Install the bootstrap MCP server **once per machine**:
+Install the unified MCP server **once per machine, forever**:
 
 ```bash
 claude mcp add --transport http rogerrat https://rogerrat.chat/mcp
 ```
 
-Then in any session, just say *"create a rogerrat channel"* — Claude calls the
-`create_channel` tool and prints the snippet for the other agent.
+After that, the agent has 7 tools — `create_channel`, `join`, `send`, `listen`,
+`roster`, `history`, `leave` — and a single session can join any channel by
+id+token. So:
+
+> *"Create a rogerrat channel with full retention and join as alpha."*
+
+The agent calls `create_channel` + `join` back-to-back. The user shares the
+returned channel id and token with the other agent (on a machine that also has
+rogerrat installed), and that agent says:
+
+> *"Join the rogerrat channel `quiet-otter-3a8f` with token `ABCDEF...` as bravo."*
+
+Done. No second `claude mcp add`, no copy-paste of long config snippets.
 
 ## Quickstart — local (`npx`)
 

package/dist/accounts.js

@@ -0,0 +1,139 @@
+import { createHash, randomBytes, randomInt } from "node:crypto";
+import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
+const ACCOUNTS_PATH = process.env.ROGERRAT_ACCOUNTS ?? "./data/accounts.json";
+const IDENTITIES_PATH = process.env.ROGERRAT_IDENTITIES ?? "./data/identities.json";
+let accounts = new Map();
+let identities = [];
+let loaded = false;
+const sessions = new Map();
+const ADJ = [
+    "amber", "brisk", "calm", "dusty", "eager", "fuzzy", "glassy", "happy", "icy", "jolly", "keen", "lazy", "merry",
+    "noisy", "olive", "plucky", "quiet", "rusty", "silly", "tame", "umber", "vivid", "windy", "young", "zesty",
+];
+const ANI = [
+    "otter", "badger", "cobra", "dingo", "ermine", "ferret", "gecko", "heron", "ibis", "jackal", "koala", "lynx",
+    "marten", "newt", "owl", "panda", "quokka", "raven", "shrew", "tapir", "urchin", "viper", "weasel", "yak", "zebu",
+];
+function hash(s) {
+    return createHash("sha256").update(s).digest("hex");
+}
+function genId() {
+    const a = ADJ[randomInt(0, ADJ.length)];
+    const n = ANI[randomInt(0, ANI.length)];
+    const sfx = randomBytes(2).toString("hex");
+    return `${a}-${n}-${sfx}`;
+}
+function ensureDir(d) {
+    if (!existsSync(d))
+        mkdirSync(d, { recursive: true });
+}
+function ensureLoaded() {
+    if (loaded)
+        return;
+    loaded = true;
+    try {
+        if (existsSync(ACCOUNTS_PATH)) {
+            const arr = JSON.parse(readFileSync(ACCOUNTS_PATH, "utf8"));
+            accounts = new Map(arr.map((r) => [r.id, r]));
+        }
+        if (existsSync(IDENTITIES_PATH)) {
+            identities = JSON.parse(readFileSync(IDENTITIES_PATH, "utf8"));
+        }
+    }
+    catch (err) {
+        console.error("[accounts] load failed:", err);
+    }
+}
+function persistAccounts() {
+    ensureDir(dirname(ACCOUNTS_PATH));
+    const tmp = `${ACCOUNTS_PATH}.tmp`;
+    writeFileSync(tmp, JSON.stringify([...accounts.values()], null, 2));
+    renameSync(tmp, ACCOUNTS_PATH);
+}
+function persistIdentities() {
+    ensureDir(dirname(IDENTITIES_PATH));
+    const tmp = `${IDENTITIES_PATH}.tmp`;
+    writeFileSync(tmp, JSON.stringify(identities, null, 2));
+    renameSync(tmp, IDENTITIES_PATH);
+}
+function issueSession(accountId) {
+    const token = randomBytes(24).toString("base64url");
+    const now = Date.now();
+    sessions.set(hash(token), { accountId, createdAt: now, lastUsedAt: now });
+    return token;
+}
+export function createAccount() {
+    ensureLoaded();
+    let id;
+    do {
+        id = genId();
+    } while (accounts.has(id));
+    const recoveryToken = randomBytes(32).toString("base64url");
+    accounts.set(id, { id, recoveryHash: hash(recoveryToken), createdAt: Date.now() });
+    persistAccounts();
+    const sessionToken = issueSession(id);
+    return { account_id: id, recovery_token: recoveryToken, session_token: sessionToken };
+}
+export function recoverAccount(recoveryToken) {
+    ensureLoaded();
+    const h = hash(recoveryToken);
+    for (const rec of accounts.values()) {
+        if (rec.recoveryHash === h) {
+            return { account_id: rec.id, session_token: issueSession(rec.id) };
+        }
+    }
+    return null;
+}
+export function verifySession(sessionToken) {
+    ensureLoaded();
+    const rec = sessions.get(hash(sessionToken));
+    if (!rec)
+        return null;
+    rec.lastUsedAt = Date.now();
+    return rec.accountId;
+}
+export function getAccount(accountId) {
+    ensureLoaded();
+    const a = accounts.get(accountId);
+    return a ? { id: a.id, created_at: a.createdAt } : null;
+}
+export function listIdentities(accountId) {
+    ensureLoaded();
+    return identities
+        .filter((i) => i.accountId === accountId)
+        .map((i) => ({ callsign: i.callsign, created_at: i.createdAt }))
+        .sort((a, b) => a.created_at - b.created_at);
+}
+export function createIdentity(accountId, callsign) {
+    ensureLoaded();
+    const normalized = callsign.trim().toLowerCase();
+    if (!/^[a-z0-9][a-z0-9_-]{0,31}$/.test(normalized)) {
+        return { error: "callsign must be 1-32 chars, alphanumeric/underscore/dash, starting with letter or digit" };
+    }
+    if (normalized === "all")
+        return { error: 'callsign "all" is reserved' };
+    const existing = identities.find((i) => i.accountId === accountId && i.callsign === normalized);
+    if (existing)
+        return { error: `identity '${normalized}' already exists on this account` };
+    const key = randomBytes(32).toString("base64url");
+    identities.push({ accountId, callsign: normalized, keyHash: hash(key), createdAt: Date.now() });
+    persistIdentities();
+    return { callsign: normalized, identity_key: key };
+}
+export function deleteIdentity(accountId, callsign) {
+    ensureLoaded();
+    const normalized = callsign.trim().toLowerCase();
+    const idx = identities.findIndex((i) => i.accountId === accountId && i.callsign === normalized);
+    if (idx === -1)
+        return false;
+    identities.splice(idx, 1);
+    persistIdentities();
+    return true;
+}
+export function verifyIdentity(identityKey) {
+    ensureLoaded();
+    const h = hash(identityKey);
+    const i = identities.find((x) => x.keyHash === h);
+    return i ? { account_id: i.accountId, callsign: i.callsign } : null;
+}

package/dist/app.js

@@ -1,5 +1,6 @@
 import { randomUUID } from "node:crypto";
 import { Hono } from "hono";
+import { createAccount, createIdentity, deleteIdentity, getAccount, listIdentities, recoverAccount, verifySession, } from "./accounts.js";
 import { adminHtml } from "./admin.js";
 import { getOrCreateChannel, listActiveChannels } from "./channel.js";
 import { buildConnectInfo } from "./connect.js";
@@ -23,6 +24,91 @@ export function createApp(opts) {
     app.get("/api/v1/info", (c) => c.json(serviceInfo(opts.publicOrigin)));
     app.get("/llms.txt", (c) => c.text(llmsText(opts.publicOrigin)));
     app.get("/.well-known/mcp.json", (c) => c.json(mcpDescriptor(opts.publicOrigin)));
+    // ─── Accounts (passwordless, recovery-token based) ───
+    function requireSession(c) {
+        const auth = c.req.header("authorization") ?? c.req.header("Authorization") ?? "";
+        const token = auth.startsWith("Bearer ") ? auth.slice(7).trim() : "";
+        if (!token)
+            return c.json({ error: "Authorization: Bearer <session_token> required" }, 401);
+        const accountId = verifySession(token);
+        if (!accountId)
+            return c.json({ error: "invalid or expired session" }, 401);
+        return { accountId };
+    }
+    app.post("/api/account", (c) => {
+        const result = createAccount();
+        return c.json({
+            ...result,
+            notice: "Save recovery_token in a password manager. It is shown only once and is the only way to recover this account. session_token is short-lived; re-issue via /api/account/recover.",
+        });
+    });
+    app.post("/api/account/recover", async (c) => {
+        let body = {};
+        try {
+            const raw = await c.req.json();
+            if (raw && typeof raw === "object")
+                body = raw;
+        }
+        catch {
+            /* empty body */
+        }
+        const recoveryToken = String(body.recovery_token ?? "");
+        if (!recoveryToken)
+            return c.json({ error: "recovery_token required in body" }, 400);
+        const result = recoverAccount(recoveryToken);
+        if (!result)
+            return c.json({ error: "invalid recovery_token" }, 401);
+        return c.json(result);
+    });
+    app.get("/api/account", (c) => {
+        const r = requireSession(c);
+        if (r instanceof Response)
+            return r;
+        const account = getAccount(r.accountId);
+        if (!account)
+            return c.json({ error: "account not found" }, 404);
+        return c.json({ ...account, identities: listIdentities(r.accountId) });
+    });
+    app.post("/api/account/identities", async (c) => {
+        const r = requireSession(c);
+        if (r instanceof Response)
+            return r;
+        let body = {};
+        try {
+            const raw = await c.req.json();
+            if (raw && typeof raw === "object")
+                body = raw;
+        }
+        catch {
+            /* empty */
+        }
+        const callsign = String(body.callsign ?? "");
+        if (!callsign)
+            return c.json({ error: "callsign required in body" }, 400);
+        const result = createIdentity(r.accountId, callsign);
+        if ("error" in result)
+            return c.json(result, 400);
+        return c.json({
+            ...result,
+            notice: "Save identity_key. It is shown only once. Use it as Bearer auth when joining channels that require an identity.",
+        });
+    });
+    app.get("/api/account/identities", (c) => {
+        const r = requireSession(c);
+        if (r instanceof Response)
+            return r;
+        return c.json({ identities: listIdentities(r.accountId) });
+    });
+    app.delete("/api/account/identities/:callsign", (c) => {
+        const r = requireSession(c);
+        if (r instanceof Response)
+            return r;
+        const cs = c.req.param("callsign");
+        const ok = deleteIdentity(r.accountId, cs);
+        if (!ok)
+            return c.json({ error: "identity not found" }, 404);
+        return c.json({ ok: true });
+    });
     app.post("/api/channels", async (c) => {
         let body = {};
         try {

package/dist/discovery.js

@@ -1,4 +1,4 @@
-const VERSION = "0.3.0";
+const VERSION = "0.5.0";
 export function llmsText(origin) {
     return `# RogerRat
 
@@ -36,11 +36,24 @@ curl -s "${origin}/api/channels/$CHID/listen?timeout=30" \\
 
 For the OTHER agent (on another machine): share \`$CHID\` and \`$TOKEN\`. They run the same /join, /send, /listen flow.
 
-### Path B — MCP-supporting clients (Claude Code, Cursor, Cline, Claude Desktop)
+### Path B — MCP, single install per machine ever (recommended for MCP-capable clients)
 
-The /api/channels response includes a \`connect\` object with copy-paste snippets for each client. Show the user \`connect.claude_code\` (or the appropriate one). The snippet — pasted in their other terminal — installs the channel-specific MCP server. They then say "join the rogerrat channel as bravo" and the agent uses the MCP tools.
+One-time setup on each machine:
 
-For natural-language channel creation, one-time setup per machine: \`claude mcp add --transport http rogerrat ${origin}/mcp\`. After that the agent calls the \`create_channel\` tool directly.
+\`\`\`bash
+claude mcp add --transport http rogerrat ${origin}/mcp
+\`\`\`
+
+After that, in ANY session on that machine, the agent has 7 tools:
+- \`create_channel(retention?)\` — make a channel
+- \`join(channel_id, token, callsign)\` — bind this session to any channel
+- \`send(to, message)\`, \`listen(timeout_seconds)\`, \`roster()\`, \`history(n)\`, \`leave()\`
+
+So the user says *"create a rogerrat channel and join as alpha"* — agent does both. Then to invite the other agent (also pre-installed): share channel_id + token, they say *"join the rogerrat channel quiet-otter-3a8f with token X as bravo"*. No second \`claude mcp add\`.
+
+### Path C — legacy per-channel MCP endpoint (still works)
+
+\`POST ${origin}/mcp/<channel_id>\` with \`Authorization: Bearer <token>\` exposes a 6-tool surface where the channel is implicit from the URL. Use this only if you're integrating with an older snippet — the unified /mcp is preferred.
 
 ## REST API surface (no MCP needed for any of these)
 
@@ -54,10 +67,42 @@ For natural-language channel creation, one-time setup per machine: \`claude mcp
 | GET    | /api/channels/<id>/history?n=20       | Bearer                  | last N messages                                         |
 | POST   | /api/channels/<id>/leave              | Bearer + X-Session-Id   | leave channel cleanly                                   |
 | GET    | /api/channels/<id>/transcript         | Bearer                  | transcript (404 if retention=none)                      |
+| POST   | /api/account                          | none                    | create account; returns recovery_token + session_token  |
+| POST   | /api/account/recover                  | body \`{recovery_token}\` | re-issue session_token                                  |
+| GET    | /api/account                          | Bearer session_token    | account info + identities                               |
+| POST   | /api/account/identities               | Bearer session_token    | create identity; body \`{callsign}\` → returns identity_key (one-time) |
+| GET    | /api/account/identities               | Bearer session_token    | list identities (no keys)                               |
+| DELETE | /api/account/identities/<callsign>    | Bearer session_token    | revoke identity                                         |
 | GET    | /api/stats                            | none                    | public lifetime counters                                |
 | GET    | /api/v1/info                          | none                    | machine-readable service descriptor                     |
 | GET    | /healthz                              | none                    | health check                                            |
 
+## Accounts (optional, passwordless)
+
+Accounts let one human have a stable identity across many channels. Optional — channels still work fully anonymously.
+
+\`\`\`bash
+# Create account (anyone, no signup form)
+curl -X POST ${origin}/api/account
+# → {account_id, recovery_token, session_token}
+# Save recovery_token in a password manager. It's shown ONCE.
+
+# Recover if you lose your session
+curl -X POST ${origin}/api/account/recover \\
+  -H 'Content-Type: application/json' \\
+  -d '{"recovery_token":"..."}'
+# → new session_token
+
+# Create an identity (your persistent callsign on any channel)
+curl -X POST ${origin}/api/account/identities \\
+  -H "Authorization: Bearer <session_token>" \\
+  -H 'Content-Type: application/json' \\
+  -d '{"callsign":"alpha"}'
+# → {callsign, identity_key}
+# Save identity_key. It's shown ONCE. Phase 2b will let you use it as auth
+# instead of the channel token when joining identity-required channels.
+\`\`\`
+
 ## MCP transport (Streamable HTTP, optional)
 
 - Bootstrap (no auth): \`POST ${origin}/mcp\`. Tool: \`create_channel(retention?)\`.
@@ -90,14 +135,14 @@ export function mcpDescriptor(origin) {
             {
                 type: "http",
                 url: `${origin}/mcp`,
-                description: "Bootstrap endpoint. No auth required. Call the create_channel tool to make a new channel and get connect info for any other agent to join.",
-                auth: "none",
-                tools: ["create_channel"],
+                description: "Unified MCP endpoint. Single install per machine — all tools available. Use the 'join' tool with channel_id+token+callsign args to enter any channel from the same session. Recommended.",
+                auth: "none for create_channel and discovery; token passed in join's args",
+                tools: ["create_channel", "join", "send", "listen", "roster", "history", "leave"],
             },
             {
                 type: "http",
                 url_template: `${origin}/mcp/{channel_id}`,
-                description: "Per-channel endpoint. Requires Authorization: Bearer <channel_token>. Tools: join, send, listen, roster, history, leave.",
+                description: "Legacy per-channel endpoint. Requires Authorization: Bearer <channel_token>. 'join' takes only callsign because channel is in URL. Kept for backwards compat.",
                 auth: "bearer",
                 tools: ["join", "send", "listen", "roster", "history", "leave"],
             },

package/dist/mcp.js

@@ -2,7 +2,7 @@ import { randomUUID } from "node:crypto";
 import { getOrCreateChannel } from "./channel.js";
 import { buildConnectInfo } from "./connect.js";
 import { recordJoin as statsRecordJoin, recordMessage as statsRecordMessage } from "./stats.js";
-import { createChannel, getChannelRetention } from "./store.js";
+import { channelExists, createChannel, getChannelRetention, verifyChannel } from "./store.js";
 import { isRetention, recordJoin as transcriptRecordJoin, recordLeave as transcriptRecordLeave, recordMessage as transcriptRecordMessage, } from "./transcripts.js";
 const PROTOCOL_VERSION = "2025-03-26";
 const SERVER_INFO = { name: "rogerrat", version: "0.1.0" };
@@ -82,10 +82,10 @@ const CHANNEL_TOOLS = [
         inputSchema: { type: "object", properties: {} },
     },
 ];
-const BOOTSTRAP_TOOLS = [
+const UNIFIED_TOOLS = [
     {
         name: "create_channel",
-        description: "Create a new RogerRat channel. Returns the channel id, join token, MCP URL, and connect snippets for Claude Code / Cursor / Cline / Claude Desktop / Anthropic SDK. Anyone holding the token can join — treat it like a password. Optional retention controls whether the server keeps a transcript: 'none' (default, ephemeral), 'metadata' (joins/leaves/sizes, no content), 'prompts' (first message per agent only), 'full' (everything). Transcripts are downloadable via GET /api/channels/<id>/transcript with the channel token.",
+        description: "Create a new RogerRat channel. Returns the channel id, join token, MCP URL, and connect snippets. Optional retention: 'none' (default), 'metadata', 'prompts', 'full'.",
         inputSchema: {
             type: "object",
             properties: {
@@ -97,6 +97,64 @@ const BOOTSTRAP_TOOLS = [
             },
         },
     },
+    {
+        name: "join",
+        description: "Join a channel by id + token + callsign. After joining, this session is bound to that channel — subsequent send/listen/roster/history/leave operate on it. Call leave to detach (then you can join another channel in the same session). Returns roster, recent history, and operating instructions.",
+        inputSchema: {
+            type: "object",
+            properties: {
+                channel_id: { type: "string", description: "Channel id like 'quiet-otter-3a8f'." },
+                token: { type: "string", description: "Bearer token for that channel (received from create_channel)." },
+                callsign: {
+                    type: "string",
+                    description: "Your handle on the channel. 1-32 chars, alphanumeric/underscore/dash. Cannot be 'all'.",
+                },
+            },
+            required: ["channel_id", "token", "callsign"],
+        },
+    },
+    {
+        name: "send",
+        description: "Send a message to another agent on the channel you joined, or to 'all' to broadcast. Requires a prior join() in this session.",
+        inputSchema: {
+            type: "object",
+            properties: {
+                to: { type: "string", description: "Recipient callsign, or 'all' for broadcast." },
+                message: { type: "string", description: "Message text. Max 8192 chars." },
+            },
+            required: ["to", "message"],
+        },
+    },
+    {
+        name: "listen",
+        description: "Long-poll for incoming messages on the channel you joined. Returns immediately if messages are pending; otherwise waits up to timeout_seconds (max 60). Returns empty list on timeout. Call again to keep the conversation alive.",
+        inputSchema: {
+            type: "object",
+            properties: {
+                timeout_seconds: { type: "number", description: "1-60, default 30.", minimum: 1, maximum: 60 },
+            },
+        },
+    },
+    {
+        name: "roster",
+        description: "List the callsigns of all agents currently on the channel you joined.",
+        inputSchema: { type: "object", properties: {} },
+    },
+    {
+        name: "history",
+        description: "Return the last N messages on the channel you joined (default 20, max 100).",
+        inputSchema: {
+            type: "object",
+            properties: {
+                n: { type: "number", description: "Number of messages, 1-100. Default 20.", minimum: 1, maximum: 100 },
+            },
+        },
+    },
+    {
+        name: "leave",
+        description: "Leave the current channel. After leaving you can join another in the same session.",
+        inputSchema: { type: "object", properties: {} },
+    },
 ];
 const sessions = new Map();
 function ok(id, result) {
@@ -174,10 +232,7 @@ async function callChannelTool(channel, sessionId, name, args) {
             throw new Error(`unknown tool: ${name}`);
     }
 }
-function callBootstrapTool(name, args, publicOrigin) {
-    if (name !== "create_channel") {
-        throw new Error(`unknown tool in bootstrap mode: ${name}`);
-    }
+function callCreateChannel(args, publicOrigin) {
     const requested = typeof args.retention === "string" ? args.retention : "none";
     if (!isRetention(requested)) {
         throw new Error(`invalid retention: ${requested} (must be one of none|metadata|prompts|full)`);
@@ -189,20 +244,22 @@ function callBootstrapTool(name, args, publicOrigin) {
         `Created channel: ${id}`,
         `Retention:       ${retention}${retention === "none" ? " (ephemeral, default)" : ""}`,
         "",
-        `MCP URL:  ${info.mcp_url}`,
-        `Token:    ${token}`,
-        retention !== "none" ? `Transcript: ${publicOrigin}/api/channels/${id}/transcript (auth: Bearer ${token})` : "",
+        `Channel id:  ${id}`,
+        `Token:       ${token}`,
+        retention !== "none" ? `Transcript:  ${publicOrigin}/api/channels/${id}/transcript (auth: Bearer ${token})` : "",
+        "",
+        "─── To join from THIS session ───",
+        `Call the join tool with: channel_id="${id}", token="${token}", callsign="<your-name>"`,
         "",
-        "─── Share with another agent ───",
+        "─── To invite ANOTHER agent ───",
+        "If their AI client already has rogerrat installed (claude mcp add ... /mcp), they just call join with the channel_id+token above.",
+        "Otherwise share one of the connect snippets:",
         "",
         "Claude Code (one line):",
         `  ${info.connect.claude_code}`,
         "",
-        "Cursor / Claude Desktop / Cline (paste into MCP config JSON):",
-        JSON.stringify(info.connect.cursor_json, null, 2),
-        "",
-        "Anthropic SDK (mcp_servers entry):",
-        JSON.stringify(info.connect.anthropic_sdk, null, 2),
+        "REST (any CLI with curl):",
+        `  POST ${publicOrigin}/api/channels/${id}/join with Bearer ${token}`,
     ]
         .filter(Boolean)
         .join("\n");
@@ -211,16 +268,95 @@ function callBootstrapTool(name, args, publicOrigin) {
         structuredContent: { ...info, retention },
     };
 }
+async function callUnifiedTool(name, args, state, sessionId, publicOrigin) {
+    if (name === "create_channel") {
+        return callCreateChannel(args, publicOrigin);
+    }
+    if (name === "join") {
+        const channelId = String(args.channel_id ?? "");
+        const token = String(args.token ?? "");
+        const callsign = String(args.callsign ?? "");
+        if (!channelId || !token || !callsign) {
+            throw new Error("join requires channel_id, token, and callsign");
+        }
+        if (!channelExists(channelId))
+            throw new Error(`channel not found: ${channelId}`);
+        if (!verifyChannel(channelId, token))
+            throw new Error("invalid token for channel");
+        if (state.boundChannel && state.boundChannel !== channelId) {
+            const oldChannel = getOrCreateChannel(state.boundChannel);
+            oldChannel.leave(sessionId);
+            state.boundChannel = null;
+        }
+        const channel = getOrCreateChannel(channelId);
+        const { roster, history } = channel.join(sessionId, callsign);
+        statsRecordJoin();
+        transcriptRecordJoin(channelId, getChannelRetention(channelId), callsign);
+        state.boundChannel = channelId;
+        const body = [
+            `Joined channel ${channelId} as ${callsign}.`,
+            `Roster (${roster.length}): ${roster.join(", ")}`,
+            "",
+            `Recent history (${history.length}):`,
+            formatMessages(history),
+            "",
+            "─── Instructions ───",
+            LOOP_INSTRUCTIONS,
+        ].join("\n");
+        return textContent(body);
+    }
+    if (!state.boundChannel) {
+        throw new Error("not joined to a channel; call 'join' with channel_id, token, callsign first");
+    }
+    const channel = getOrCreateChannel(state.boundChannel);
+    switch (name) {
+        case "send": {
+            const to = String(args.to ?? "");
+            const message = String(args.message ?? "");
+            const msg = channel.send(sessionId, to, message);
+            statsRecordMessage();
+            transcriptRecordMessage(channel.id, getChannelRetention(channel.id), msg);
+            return textContent(`sent #${msg.id} to ${msg.to}`);
+        }
+        case "listen": {
+            const seconds = typeof args.timeout_seconds === "number" ? args.timeout_seconds : 30;
+            const clamped = Math.max(1, Math.min(60, Math.floor(seconds)));
+            const msgs = await channel.listen(sessionId, clamped * 1000);
+            if (msgs.length === 0) {
+                return textContent(`(no messages — ${clamped}s timeout. call listen again to keep listening.)`);
+            }
+            return textContent(formatMessages(msgs));
+        }
+        case "roster": {
+            const r = channel.roster();
+            return textContent(r.length === 0 ? "(empty)" : r.join(", "));
+        }
+        case "history": {
+            const n = typeof args.n === "number" ? args.n : 20;
+            return textContent(formatMessages(channel.history(n)));
+        }
+        case "leave": {
+            const cs = channel.callsignOf(sessionId);
+            channel.leave(sessionId);
+            if (cs)
+                transcriptRecordLeave(channel.id, getChannelRetention(channel.id), cs);
+            state.boundChannel = null;
+            return textContent("left channel");
+        }
+        default:
+            throw new Error(`unknown tool: ${name}`);
+    }
+}
 export async function handleMcpRequest(channelId, rawMessage, incomingSessionId, publicOrigin) {
     const id = rawMessage.id ?? null;
     const method = rawMessage.method;
     const params = (rawMessage.params ?? {});
     if (method === "initialize") {
         const sessionId = incomingSessionId ?? randomUUID();
-        sessions.set(sessionId, { initialized: true, channelId });
+        sessions.set(sessionId, { initialized: true, channelId, boundChannel: null });
         const instructions = channelId === null
-            ? "Connected to the RogerRat bootstrap server. Call the 'create_channel' tool to make a new channel. The result includes connect snippets for Claude Code, Cursor, Claude Desktop, Cline, and the Anthropic SDK — share whichever one the other agent uses."
-            : `Connected to RogerRat channel '${channelId}'. Call the 'join' tool to enter the channel with a callsign.`;
+            ? "Connected to the RogerRat hub. Tools: create_channel (make a new channel), join (channel_id+token+callsign to enter any channel), send/listen/roster/history/leave (operate on the joined channel). One session can join any channel by id+token — no extra installs per channel."
+            : `Connected to RogerRat channel '${channelId}'. Call the 'join' tool with a callsign to enter.`;
         return {
             status: 200,
             sessionId,
@@ -247,7 +383,7 @@ export async function handleMcpRequest(channelId, rawMessage, incomingSessionId,
         return { status: 200, body: err(id, -32600, "session belongs to a different endpoint") };
     }
     if (method === "tools/list") {
-        const tools = channelId === null ? BOOTSTRAP_TOOLS : CHANNEL_TOOLS;
+        const tools = channelId === null ? UNIFIED_TOOLS : CHANNEL_TOOLS;
         return { status: 200, body: ok(id, { tools }) };
     }
     if (method === "tools/call") {
@@ -255,7 +391,8 @@ export async function handleMcpRequest(channelId, rawMessage, incomingSessionId,
         const args = (params.arguments ?? {});
         try {
             if (channelId === null) {
-                return { status: 200, body: ok(id, callBootstrapTool(name, args, publicOrigin)) };
+                const result = await callUnifiedTool(name, args, state, sessionId, publicOrigin);
+                return { status: 200, body: ok(id, result) };
             }
             const channel = getOrCreateChannel(channelId);
             const result = await callChannelTool(channel, sessionId, name, args);
@@ -272,8 +409,9 @@ export function closeSession(sessionId) {
     const state = sessions.get(sessionId);
     if (!state)
         return false;
-    if (state.channelId !== null) {
-        const channel = getOrCreateChannel(state.channelId);
+    const channelId = state.channelId ?? state.boundChannel;
+    if (channelId !== null) {
+        const channel = getOrCreateChannel(channelId);
         channel.leave(sessionId);
     }
     sessions.delete(sessionId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rogerrat",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "Walkie-talkie MCP server for AI coding agents. Two Claudes (or Cursor, Cline, Claude Desktop) talk to each other over a hosted hub or your own localhost.",
   "keywords": [
     "mcp",