serverless-ircd 0.4.0 → 0.6.0

package/packages/irc-core/src/types.ts

@@ -10,12 +10,14 @@ import type { Effect } from './effects.js';
 import type { FloodControlConfig } from './flood-control.js';
 import type {
   AccountStore,
+  AwayStore,
   Clock,
   IdFactory,
   MessageStore,
   MotdProvider,
   MtlsIdentityProvider,
   NickHistoryStore,
+  ReadMarkerStore,
 } from './ports.js';
 import type { IrcMessage } from './protocol/messages.js';
 import type { ConnectionState } from './state/connection.js';
@@ -33,6 +35,23 @@ export interface CloakingConfig {
   readonly cloakedSuffix?: string | undefined;
 }
 
+/**
+ * IRCv3 `sts` (Strict Transport Security) policy as seen by reducers.
+ * Mirrors the {@link StsConfigSchema} shape; the cap builder reads it to
+ * construct the `sts=…` advertisement per connection.
+ *
+ * Optional fields are widened to `T | undefined` to mirror Zod's
+ * `.optional()` output under `exactOptionalPropertyTypes: true`.
+ */
+export interface StsConfig {
+  /** Pin duration in seconds. */
+  readonly duration: number;
+  /** TLS listener port (plaintext advertisements only). */
+  readonly port: number;
+  /** Optional preload directive (plaintext advertisements only). */
+  readonly preload?: boolean | undefined;
+}
+
 /**
  * A single IRC operator credential. The {@link operReducer} consults the
  * configured list to authenticate `OPER <name> <password>`. Both fields are
@@ -48,7 +67,7 @@ export interface OperCred {
  * Per-deployment server configuration. Adapters load this from a KV store
  * (CF) or Secrets Manager / SSM (AWS); the core only reads it.
  *
- * This is the minimum the Phase 1 reducers need; later tickets (SASL,
+ * This is the minimum the Phase 1 reducers need; later phases (SASL,
  * MOTD provider, channel-prefix policy) extend it.
  */
 export interface ServerConfig {
@@ -101,6 +120,13 @@ export interface ServerConfig {
   nickLen: number;
   channelLen: number;
   topicLen: number;
+  /**
+   * Maximum realname (GECOS) length enforced by `SETNAME`. Optional because
+   * registration-time `USER` does not enforce a cap; the parsed config always
+   * supplies a value (schema default), but inline `ServerConfig` literals in
+   * tests may omit it — `SETNAME` then falls back to its built-in default.
+   */
+  readonly realnameLen?: number | undefined;
   quitMessage: string;
   /**
    * Per-connection message-rate flood control. `undefined` → the actor
@@ -120,6 +146,55 @@ export interface ServerConfig {
    * `exactOptionalPropertyTypes: true`.
    */
   chatHistoryPlaybackLimit?: number | undefined;
+  /**
+   * IRCv3 `sts` (Strict Transport Security) policy. `undefined` disables
+   * STS advertisement; an object supplies the policy the cap builder
+   * serializes per connection (plaintext vs TLS).
+   *
+   * Typed `StsConfig | undefined` to mirror Zod's optional output shape
+   * under `exactOptionalPropertyTypes: true`.
+   */
+  readonly sts?: StsConfig | undefined;
+  /**
+   * IRCv3 `draft/multiline` byte budget. Advertised as
+   * `draft/multiline=<n>` in `CAP LS` and enforced on every finalized
+   * multi-line batch. Defaults to {@link DEFAULT_MULTILINE_MAX_BYTES}
+   * (4096) when omitted; the parsed config always supplies a value.
+   *
+   * Typed `number | undefined` to mirror Zod's optional output shape
+   * under `exactOptionalPropertyTypes: true` so inline `ServerConfig`
+   * literals in tests may omit it.
+   */
+  readonly multilineMaxBytes?: number | undefined;
+  /**
+   * Per-connection MONITOR watchlist ceiling, advertised as `MONITOR=<n>`
+   * in `005 RPL_ISUPPORT`. Omitted → the reducer falls back to
+   * {@link DEFAULT_MONITOR_LIMIT} (the monitor cap's built-in ceiling).
+   *
+   * Typed `number | undefined` to mirror Zod's optional output shape under
+   * `exactOptionalPropertyTypes: true`.
+   */
+  readonly monitorLimit?: number | undefined;
+  /**
+   * Extended-ban prefix sigil advertised as `EXTBAN=<prefix>,…` in
+   * `005 RPL_ISUPPORT`. Omitted → defaults to `~` (the IRC-standard
+   * extban prefix).
+   *
+   * Typed `string | undefined` to mirror Zod's optional output shape under
+   * `exactOptionalPropertyTypes: true`.
+   */
+  readonly extbanPrefix?: string | undefined;
+  /**
+   * Whether IRC services (NickServ/ChanServ) are wired up for this
+   * deployment. When true, `005 RPL_ISUPPORT` advertises `ACCOUNTEXTBAN=a`
+   * (account-name extended bans), which are only meaningful once nicks are
+   * registered. Omitted/false → the token is suppressed until services
+   * ship.
+   *
+   * Typed `boolean | undefined` to mirror Zod's optional output shape under
+   * `exactOptionalPropertyTypes: true`.
+   */
+  readonly servicesEnabled?: boolean | undefined;
 }
 
 /** Per-invocation context handed to every reducer. */
@@ -155,10 +230,43 @@ export interface Ctx {
    * entries and the WHOWAS reducer replays them.
    */
   readonly history?: NickHistoryStore;
+  /**
+   * Read-marker persistence source for IRCv3 `draft/read-marker` (absent
+   * when the deployment does not persist read markers). When present, a
+   * `+draft/read-marker=<msgid>` TAGMSG from an identified, cap-enabled
+   * client updates the per-`(account, channel)` marker, and SASL identify
+   * seeds the connection's `lastReadMarkers` from the stored values so a
+   * reconnect restores the user's read position.
+   */
+  readonly readMarkers?: ReadMarkerStore;
+  /**
+   * Away-status persistence source for IRCv3 `draft/pre-away` (absent
+   * when the deployment does not persist away reasons). When present, a
+   * set/clear of `AWAY` from an identified connection mirrors the change
+   * into the per-`account` record, and SASL identify replays the stored
+   * reason onto the connection (emitting `306 RPL_NOWAWAY`) so a
+   * reconnect restores the user's away state. Omitted (→ `ctx.away`
+   * undefined) preserves the session-only behaviour: the connection
+   * still tracks its own `AWAY` but the reason is not shared across
+   * connections or restored on reconnect.
+   */
+  readonly away?: AwayStore;
   /** The connection invoking the command. Reducers mutate this freely. */
   readonly connection: ConnectionState;
   /** Convenience: `connection.id`. */
   readonly connId: string;
+  /**
+   * IRCv3 `labeled-response` label carried by the inbound message (the value
+   * of the `+label` client tag), or `undefined` when the request was
+   * unlabeled. Plumbed through ctx so every reducer's emitted effects are
+   * uniformly attributable to the labeled request; the actor layer wraps the
+   * requester's replies in one `BATCH +label labeled-response … -label` frame
+   * (or emits an empty batch when there is no reply).
+   *
+   * Typed `string | undefined` to mirror the optional-output shape under
+   * `exactOptionalPropertyTypes: true`.
+   */
+  readonly label?: string | undefined;
 }
 
 /** Result of a single reducer invocation. */
@@ -183,7 +291,15 @@ export interface BuildCtxOptions {
   mtlsIdentity?: MtlsIdentityProvider;
   messages?: MessageStore;
   history?: NickHistoryStore;
+  readMarkers?: ReadMarkerStore;
+  away?: AwayStore;
   connection: ConnectionState;
+  /**
+   * IRCv3 `labeled-response` label extracted from the inbound `+label` tag.
+   * Omitted (→ `ctx.label` undefined) when the request was unlabeled. See
+   * {@link Ctx.label}.
+   */
+  readonly label?: string | undefined;
 }
 
 /** Constructs a {@link Ctx} from the required parts. */
@@ -201,6 +317,9 @@ export function buildCtx(opts: BuildCtxOptions): Ctx {
     ...(opts.mtlsIdentity !== undefined ? { mtlsIdentity: opts.mtlsIdentity } : {}),
     ...(opts.messages !== undefined ? { messages: opts.messages } : {}),
     ...(opts.history !== undefined ? { history: opts.history } : {}),
+    ...(opts.readMarkers !== undefined ? { readMarkers: opts.readMarkers } : {}),
+    ...(opts.away !== undefined ? { away: opts.away } : {}),
+    ...(opts.label !== undefined ? { label: opts.label } : {}),
   };
   return ctx;
 }

package/packages/irc-core/src/ws-framing.ts

@@ -0,0 +1,132 @@
+/**
+ * WebSocket IRC-message framing and the IRCv3 510-byte message budget.
+ *
+ * The IRCv3 WebSocket spec
+ * (https://ircv3.net/specs/websockets.html) changes two things about how a
+ * WebSocket text/binary message maps to an IRC message, relative to the
+ * legacy framing a raw-TCP-tolerant adapter uses:
+ *
+ *   1. **One IRC message per WebSocket message.** A frame never carries
+ *      several `\r\n`-joined messages, so framing MUST NOT split on an
+ *      embedded line break. A single optional trailing CR-LF (or bare LF)
+ *      is stripped and the remainder is treated as exactly one IRC line.
+ *
+ *   2. **No trailing CR-LF on the wire.** The 512-byte IRC line limit
+ *      therefore applies to the message content only, giving a hard cap of
+ *      {@link MAX_WS_MESSAGE_BYTES} (510) bytes per WebSocket message.
+ *
+ * The legacy framing (`WsFrameMode === 'legacy'`) preserves the original
+ * adapter behaviour: split the whole frame on `/\r?\n/` so older clients
+ * that concatenate messages into one frame keep working. That is the same
+ * `splitFrameLines` logic the transport layer shipped before subprotocol
+ * negotiation existed.
+ *
+ * Everything here is pure and platform-agnostic so it runs unchanged on
+ * every WebSocket runtime (Node `ws`, Cloudflare Durable Objects, Lambda).
+ */
+
+import type { WsSubprotocol } from './ws-subprotocol.js';
+
+/**
+ * How a WebSocket message is framed into IRC lines.
+ *
+ *   - `spec-text`   — `text.ircv3.net`: one IRC message per frame, trailing
+ *                     CR-LF stripped, never split.
+ *   - `spec-binary` — `binary.ircv3.net`: same framing as `spec-text`.
+ *   - `legacy`      — no IRCv3 subprotocol negotiated: split the frame on
+ *                     `/\r?\n/` (the original adapter behaviour).
+ */
+export type WsFrameMode = 'spec-text' | 'spec-binary' | 'legacy';
+
+/**
+ * Maximum number of bytes allowed in a single IRCv3 WebSocket message.
+ *
+ * The IRC line limit is 512 bytes *including* the trailing CR-LF. WebSocket
+ * messages omit the trailing CR-LF, so the content budget is `512 - 2 = 510`.
+ * Inbound messages exceeding this MUST be rejected.
+ */
+export const MAX_WS_MESSAGE_BYTES = 510;
+
+/**
+ * Maps a negotiated IRCv3 subprotocol onto the matching {@link WsFrameMode}.
+ * `undefined` (no subprotocol) maps to the legacy-tolerant framing.
+ */
+export function wsFrameModeFor(subproto: WsSubprotocol | undefined): WsFrameMode {
+  if (subproto === 'text.ircv3.net') return 'spec-text';
+  if (subproto === 'binary.ircv3.net') return 'spec-binary';
+  return 'legacy';
+}
+
+/**
+ * Strips a single trailing `\r\n` (or bare `\n`) from `s`. Leaves every
+ * other character — including leading or embedded terminators — untouched.
+ * Used by the spec-mode framing to yield one bare IRC line per frame.
+ */
+export function stripTrailingCrLf(s: string): string {
+  if (s.endsWith('\r\n')) return s.slice(0, -2);
+  if (s.endsWith('\n')) return s.slice(0, -1);
+  return s;
+}
+
+/**
+ * Splits a WebSocket text frame into IRC lines using the legacy-tolerant
+ * contract: split the whole frame on `/\r?\n/`, returning every part
+ * (including a possible trailing empty string). The empty frame yields no
+ * lines.
+ *
+ * This is the exact behaviour the transport layer shipped before IRCv3
+ * subprotocol negotiation; spec-mode framing ({@link frameToLines}) does
+ * NOT use it.
+ */
+export function splitFrameLines(text: string): string[] {
+  if (text.length === 0) return [];
+  return text.split(/\r?\n/u);
+}
+
+/**
+ * Frames `frame` into IRC lines according to `mode`.
+ *
+ *   - `spec-text` / `spec-binary`: one IRC message per frame. A single
+ *     trailing CR-LF (or bare LF) is stripped and the remainder is returned
+ *     as the sole element. The frame is never split on an embedded line
+ *     break. An empty frame (or a frame that is only a terminator) yields
+ *     no lines.
+ *   - `legacy`: delegates to {@link splitFrameLines} (split on `/\r?\n/`).
+ */
+export function frameToLines(frame: string, mode: WsFrameMode): string[] {
+  if (mode === 'legacy') return splitFrameLines(frame);
+  const line = stripTrailingCrLf(frame);
+  if (line.length === 0) return [];
+  return [line];
+}
+
+/**
+ * Returns `true` when `frame` fits within the IRCv3 WebSocket 510-byte
+ * message budget, `false` when it exceeds it and MUST be rejected by the
+ * inbound path. Measured in UTF-16 code units, consistent with how
+ * {@link enforceLineLimit} and the input parser cap line length across this
+ * package (every supported runtime exposes `.length`).
+ */
+export function isWithinWsByteBudget(frame: string): boolean {
+  return frame.length <= MAX_WS_MESSAGE_BYTES;
+}
+
+/**
+ * Replaces every unpaired UTF-16 surrogate in `str` with U+FFFD (the
+ * Unicode replacement character).
+ *
+ * `text.ircv3.net` frames are UTF-8 text. A lone surrogate (half of a
+ * surrogate pair) has no valid UTF-8 encoding, so per the Unicode
+ * recommendation it is substituted with U+FFFD before the frame is handed
+ * to the parser. Valid surrogate pairs (supplementary-plane code points)
+ * are preserved unchanged, as is all BMP text.
+ */
+export function sanitizeForTextMode(str: string): string {
+  // A lone high surrogate (0xD800–0xDBFF) NOT followed by a low surrogate,
+  // and a lone low surrogate (0xDC00–0xDFFF) NOT preceded by a high
+  // surrogate. Both are replaced with U+FFFD.
+  return str.replace(
+    /(?:[\uD800-\uDBFF](?![\uDC00-\uDFFF]))|(?:(?<![\uD800-\uDBFF])[\uDC00-\uDFFF])/gu,
+    '\uFFFD',
+  );
+}

package/packages/irc-core/src/ws-subprotocol.ts

@@ -0,0 +1,66 @@
+/**
+ * WebSocket subprotocol negotiation for IRC connections (IRCv3).
+ *
+ * The IRCv3 WebSocket specification defines two subprotocols a client may
+ * offer in its opening handshake via the `Sec-WebSocket-Protocol` header:
+ *
+ *   - `text.ircv3.net`   — UTF-8 text frames, one IRC message per WebSocket
+ *                          message, no trailing CR-LF.
+ *   - `binary.ircv3.net` — binary frames, one IRC message per WebSocket
+ *                          message, no trailing CR-LF.
+ *
+ * The header is a comma-separated list offered in client-preference order.
+ * These pure helpers parse the header and select the single subprotocol the
+ * server should agree to (the first supported entry, honouring the client's
+ * preference). They are dependency-free so they run unchanged on every
+ * runtime (Node, Workers, Lambda).
+ */
+
+/** The IRCv3 binary WebSocket subprotocol. */
+export const WS_SUBPROTO_BINARY = 'binary.ircv3.net';
+
+/** The IRCv3 text WebSocket subprotocol. */
+export const WS_SUBPROTO_TEXT = 'text.ircv3.net';
+
+/** A supported IRCv3 WebSocket subprotocol name. */
+export type WsSubprotocol = typeof WS_SUBPROTO_TEXT | typeof WS_SUBPROTO_BINARY;
+
+/**
+ * Parses the `Sec-WebSocket-Protocol` header value into an ordered list of
+ * offered protocols (client-preference order). Whitespace around each item is
+ * trimmed and empty entries (stray/leading/trailing commas) are dropped.
+ * Duplicate entries are preserved in their original order.
+ *
+ * `null`, `undefined`, or an empty string yield an empty array.
+ *
+ * @param header The raw `Sec-WebSocket-Protocol` header value, if present.
+ */
+export function parseSecWsProtocolOffers(header: string | null | undefined): string[] {
+  if (header === null || header === undefined || header === '') {
+    return [];
+  }
+  const offers: string[] = [];
+  for (const raw of header.split(',')) {
+    const item = raw.trim();
+    if (item !== '') {
+      offers.push(item);
+    }
+  }
+  return offers;
+}
+
+/**
+ * Selects the supported subprotocol to agree to from a list of client offers
+ * (in client-preference order). Returns the first offer that matches a
+ * supported subprotocol, or `null` when none match.
+ *
+ * @param offers The ordered list of offered protocols.
+ */
+export function selectSubprotocol(offers: readonly string[]): WsSubprotocol | null {
+  for (const offer of offers) {
+    if (offer === WS_SUBPROTO_TEXT || offer === WS_SUBPROTO_BINARY) {
+      return offer as WsSubprotocol;
+    }
+  }
+  return null;
+}

package/packages/irc-core/stryker.commands.conf.json

@@ -36,6 +36,5 @@
   },
   "reporters": ["clear-text", "html"],
   "timeoutMS": 5000,
-  "concurrency": 2,
-  "ignoreStatic": true
+  "concurrency": 2
 }

package/packages/irc-core/tests/admission.test.ts

@@ -211,6 +211,24 @@ describe('AdmissionStats — release', () => {
     const stats = makeStats(clock);
     expect(() => stats.release('unknown')).not.toThrow();
   });
+
+  it('deletes the per-IP and per-user keys when the last admission is released', () => {
+    // Covers the `next <= 0` delete branch in `release`: a single recorded
+    // admission, when released, must clear the keys entirely rather than
+    // leaving a zero entry in the maps.
+    const clock = new FakeClock(1_000);
+    const stats = makeStats(clock);
+    const d = decideAdmission('5.6.7.8', 'carol', stats, BASE_CONFIG);
+    if (!d.ok) throw new Error('precondition: d should admit');
+    stats.recordAdmission('5.6.7.8', 'carol', d.recordId);
+
+    stats.release(d.recordId);
+
+    // A fresh admission from the same IP/user must be allowed (counts are
+    // back to zero because the keys were deleted, not just decremented).
+    const after = decideAdmission('5.6.7.8', 'carol', stats, BASE_CONFIG);
+    expect(after.ok).toBe(true);
+  });
 });
 
 describe('AdmissionStats — determinism', () => {

package/packages/irc-core/tests/away-store.test.ts

@@ -0,0 +1,73 @@
+import { describe, expect, it } from 'vitest';
+import { type AwayStore, InMemoryAwayStore } from '../src/ports';
+
+describe('InMemoryAwayStore — port conformance', () => {
+  it('implements the AwayStore port', () => {
+    const store: AwayStore = new InMemoryAwayStore();
+    expect(store).toBeDefined();
+  });
+});
+
+describe('InMemoryAwayStore — get / set / clear', () => {
+  it('returns undefined for an unknown account', () => {
+    const store = new InMemoryAwayStore();
+    expect(store.get('alice')).toBeUndefined();
+  });
+
+  it('stores and returns the away reason for a known account', () => {
+    const store = new InMemoryAwayStore();
+    store.set('alice', 'brb');
+    expect(store.get('alice')).toBe('brb');
+  });
+
+  it('overwrites the reason on a subsequent set for the same account', () => {
+    const store = new InMemoryAwayStore();
+    store.set('alice', 'brb');
+    store.set('alice', 'lunch');
+    expect(store.get('alice')).toBe('lunch');
+  });
+
+  it('keys accounts case-insensitively (rfc1459 fold)', () => {
+    const store = new InMemoryAwayStore();
+    store.set('Alice', 'brb');
+    expect(store.get('alice')).toBe('brb');
+    expect(store.get('ALICE')).toBe('brb');
+  });
+
+  it('keeps reasons for distinct accounts separate', () => {
+    const store = new InMemoryAwayStore();
+    store.set('alice', 'brb');
+    store.set('bob', 'afk');
+    expect(store.get('alice')).toBe('brb');
+    expect(store.get('bob')).toBe('afk');
+  });
+
+  it('clears the reason for an account on clear', () => {
+    const store = new InMemoryAwayStore();
+    store.set('alice', 'brb');
+    store.clear('alice');
+    expect(store.get('alice')).toBeUndefined();
+  });
+
+  it('is a no-op to clear an account that has no stored reason', () => {
+    const store = new InMemoryAwayStore();
+    store.clear('alice');
+    expect(store.get('alice')).toBeUndefined();
+  });
+
+  it('clears only the named account, leaving others intact', () => {
+    const store = new InMemoryAwayStore();
+    store.set('alice', 'brb');
+    store.set('bob', 'afk');
+    store.clear('alice');
+    expect(store.get('alice')).toBeUndefined();
+    expect(store.get('bob')).toBe('afk');
+  });
+
+  it('folds the account name case-insensitively on clear', () => {
+    const store = new InMemoryAwayStore();
+    store.set('Alice', 'brb');
+    store.clear('ALICE');
+    expect(store.get('alice')).toBeUndefined();
+  });
+});

package/packages/irc-core/tests/caps/capabilities.test.ts

@@ -14,23 +14,44 @@ describe('SUPPORTED_CAPABILITIES', () => {
     const names = SUPPORTED_CAPABILITIES.map((c) => c.name).sort();
     expect(names).toEqual(
       [
+        'account-notify',
         'account-tag',
         'away-notify',
         'batch',
         'chghost',
         'draft/chathistory',
+        'draft/multiline',
+        'draft/pre-away',
+        'draft/read-marker',
+        'draft/typing',
         'echo-message',
         'extended-join',
         'invite-notify',
+        'labeled-response',
         'message-tags',
+        'msgid',
+        'monitor',
         'multi-prefix',
         'safelist',
         'sasl',
         'server-time',
+        'standard-replies',
       ].sort(),
     );
   });
 
+  it('advertises draft/typing as a bare name (no value parameter)', () => {
+    const cap = SUPPORTED_CAPABILITIES.find((c) => c.name === 'draft/typing');
+    expect(cap).toBeDefined();
+    expect(cap?.value).toBeUndefined();
+  });
+
+  it('advertises the standard-replies cap as a bare name (no value parameter)', () => {
+    const cap = SUPPORTED_CAPABILITIES.find((c) => c.name === 'standard-replies');
+    expect(cap).toBeDefined();
+    expect(cap?.value).toBeUndefined();
+  });
+
   it('declares the sasl value as the base mechanism list (PLAIN only by default)', () => {
     const sasl = SUPPORTED_CAPABILITIES.find((c) => c.name === 'sasl');
     expect(sasl).toBeDefined();
@@ -38,9 +59,11 @@ describe('SUPPORTED_CAPABILITIES', () => {
   });
 
   it('does not attach a value to caps that have no parameter', () => {
-    // sasl is the only cap with a value.
+    // sasl and draft/multiline are the caps with a value parameter.
+    const withValue = SUPPORTED_CAPABILITIES.filter((c) => c.value !== undefined);
+    expect(withValue.map((c) => c.name).sort()).toEqual(['draft/multiline', 'sasl']);
     const noValue = SUPPORTED_CAPABILITIES.filter((c) => c.value === undefined);
-    expect(noValue.length).toBe(SUPPORTED_CAPABILITIES.length - 1);
+    expect(noValue.length).toBe(SUPPORTED_CAPABILITIES.length - withValue.length);
   });
 
   it('advertises safelist as a bare name (no value parameter)', () => {
@@ -134,6 +157,100 @@ describe('draft/chathistory advertisement', () => {
   });
 });
 
+describe('msgid advertisement', () => {
+  it('is advertised as a bare name (no value parameter)', () => {
+    const cap = SUPPORTED_CAPABILITIES.find((c) => c.name === 'msgid');
+    expect(cap).toBeDefined();
+    expect(cap?.value).toBeUndefined();
+  });
+
+  it('appears in CAP LS output as the bare token', () => {
+    expect(getLsString()).toContain('msgid');
+    expect(getLsString()).not.toContain('msgid=');
+  });
+
+  it('is ACKable via SUPPORTED_CAP_NAMES membership (CAP REQ round-trip)', () => {
+    expect(SUPPORTED_CAP_NAMES.has('msgid')).toBe(true);
+  });
+});
+
+describe('draft/typing advertisement', () => {
+  it('appears in CAP LS output as the bare token', () => {
+    expect(getLsString()).toContain('draft/typing');
+    expect(getLsString()).not.toContain('draft/typing=');
+  });
+
+  it('is ACKable via SUPPORTED_CAP_NAMES membership (CAP REQ round-trip)', () => {
+    expect(SUPPORTED_CAP_NAMES.has('draft/typing')).toBe(true);
+  });
+
+  it('is recognized by isSupportedCap', () => {
+    expect(isSupportedCap('draft/typing')).toBe(true);
+  });
+});
+
+describe('draft/read-marker advertisement', () => {
+  it('is advertised as a bare name (no value parameter)', () => {
+    const cap = SUPPORTED_CAPABILITIES.find((c) => c.name === 'draft/read-marker');
+    expect(cap).toBeDefined();
+    expect(cap?.value).toBeUndefined();
+  });
+
+  it('appears in CAP LS output as the bare token', () => {
+    expect(getLsString()).toContain('draft/read-marker');
+    expect(getLsString()).not.toContain('draft/read-marker=');
+  });
+
+  it('is ACKable via SUPPORTED_CAP_NAMES membership (CAP REQ round-trip)', () => {
+    expect(SUPPORTED_CAP_NAMES.has('draft/read-marker')).toBe(true);
+  });
+
+  it('is recognized by isSupportedCap', () => {
+    expect(isSupportedCap('draft/read-marker')).toBe(true);
+  });
+});
+
+describe('draft/pre-away advertisement', () => {
+  it('is advertised as a bare name (no value parameter)', () => {
+    const cap = SUPPORTED_CAPABILITIES.find((c) => c.name === 'draft/pre-away');
+    expect(cap).toBeDefined();
+    expect(cap?.value).toBeUndefined();
+  });
+
+  it('appears in CAP LS output as the bare token', () => {
+    expect(getLsString()).toContain('draft/pre-away');
+    expect(getLsString()).not.toContain('draft/pre-away=');
+  });
+
+  it('is ACKable via SUPPORTED_CAP_NAMES membership (CAP REQ round-trip)', () => {
+    expect(SUPPORTED_CAP_NAMES.has('draft/pre-away')).toBe(true);
+  });
+
+  it('is recognized by isSupportedCap', () => {
+    expect(isSupportedCap('draft/pre-away')).toBe(true);
+  });
+});
+
+describe('draft/multiline advertisement', () => {
+  it('is advertised with the default byte budget value', () => {
+    const cap = SUPPORTED_CAPABILITIES.find((c) => c.name === 'draft/multiline');
+    expect(cap).toBeDefined();
+    expect(cap?.value).toBe('4096');
+  });
+
+  it('appears in CAP LS output as the name=4096 token', () => {
+    expect(getLsString()).toContain('draft/multiline=4096');
+  });
+
+  it('is ACKable via SUPPORTED_CAP_NAMES membership (CAP REQ round-trip)', () => {
+    expect(SUPPORTED_CAP_NAMES.has('draft/multiline')).toBe(true);
+  });
+
+  it('is recognized by isSupportedCap', () => {
+    expect(isSupportedCap('draft/multiline')).toBe(true);
+  });
+});
+
 describe('splitCapsForWire', () => {
   it('returns a single chunk when everything fits', () => {
     const tokens = ['a', 'b', 'c'];