npm - @agent-native/core - Versions diffs - 0.115.4 → 0.117.0 - Mend

@agent-native/core 0.115.4 → 0.117.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (487) hide show

package/src/mcp/connect-route.ts CHANGED Viewed

@@ -467,10 +467,6 @@ function renderConnectPage(params: {
   });
   const safeMcpUrl = escapeHtml(mcpUrl);
   const connectTemplateValues = { appName, appUrl, mcpUrl, serverId };
-  const brandMarkSvg = agentNativeMarkSvg(
-    "brand-mark",
-    "agent-native-connect-brand-gradient",
-  );
   const flowMarkSvg = agentNativeMarkSvg(
     "flow-mark",
     "agent-native-connect-flow-gradient",
@@ -561,21 +557,6 @@ function renderConnectPage(params: {
       0 30px 90px rgba(0,0,0,0.5);
     padding: 1.25rem;
   }
-  .topbar {
-    display: flex; align-items: center; justify-content: space-between;
-    gap: 0.75rem; margin-bottom: 1.75rem;
-  }
-  .brand-lockup {
-    display: flex; align-items: center; gap: 0.55rem;
-    color: var(--muted); font-size: 0.78rem; font-weight: 600;
-  }
-  .brand-mark { width: 18px; height: auto; display: block; }
-  .app-pill {
-    max-width: 50%; border: 1px solid var(--border);
-    border-radius: 999px; padding: 0.28rem 0.55rem;
-    color: var(--subtle); font-size: 0.72rem; line-height: 1;
-    overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
-  }
   .hero { padding: 0 0.75rem; text-align: center; }
   .flow {
     display: flex; align-items: center; justify-content: center;
@@ -597,11 +578,6 @@ function renderConnectPage(params: {
     background: linear-gradient(90deg, transparent, var(--border-strong), transparent);
     background-position: center;
   }
-  .eyebrow {
-    text-align: center; font-size: 0.72rem; font-weight: 600;
-    letter-spacing: 0.08em; text-transform: uppercase;
-    color: var(--subtle); margin-bottom: 0.55rem;
-  }
   h1 {
     text-align: center; font-size: 1.45rem; font-weight: 680;
     line-height: 1.25; margin-bottom: 0.7rem;
@@ -714,8 +690,7 @@ function renderConnectPage(params: {
   .connections-title { font-weight: 600; color: var(--muted); }
   .connections-state {
     margin-left: auto; color: var(--subtle); font-size: 0.73rem;
-    border: 1px solid var(--border); border-radius: 999px;
-    padding: 0.18rem 0.45rem; line-height: 1;
+    line-height: 1;
   }
   .connections .chev {
     width: 7px; height: 7px; border-right: 1.5px solid currentColor;
@@ -738,8 +713,16 @@ function renderConnectPage(params: {
     margin-bottom: 0.9rem; display: none; line-height: 1.4; }
   .msg.err { display: block; color: var(--error); background: var(--error-bg);
     border: 1px solid rgba(252,165,165,0.16); }
-  .msg.ok { display: block; color: var(--ok); background: var(--ok-bg);
+  .msg.ok { display: block; background: var(--ok-bg);
     border: 1px solid var(--ok-border); }
+  .msg-title {
+    display: block; color: var(--ok); font-size: 0.95rem;
+    font-weight: 700; line-height: 1.25;
+  }
+  .msg-copy {
+    display: block; color: rgba(134,239,172,0.72); font-size: 0.78rem;
+    line-height: 1.4; margin-top: 0.2rem;
+  }
   .result-panel { padding-top: 0.15rem; }
   .result-title {
     color: var(--text); font-size: 0.95rem; font-weight: 650;
@@ -757,9 +740,7 @@ function renderConnectPage(params: {
     body { align-items: flex-start; padding: 0.75rem; }
     .card { padding: 1rem; }
     .hero { padding: 0; }
-    .topbar { margin-bottom: 1.35rem; }
     h1 { font-size: 1.3rem; }
-    .app-pill { max-width: 46%; }
     pre { font-size: 0.72rem; }
   }
   /* MCP URL display + per-host tabs (the non-dev path). */
@@ -861,9 +842,6 @@ function renderConnectPage(params: {
     border-color: var(--ok-border) !important;
   }
   .static-token-mint .static-token-body { padding-top: 0.5rem; }
-  .static-token-mint > summary .connections-state {
-    font-style: normal;
-  }
   @media (min-width: 560px) {
     .card { max-width: 580px; }
   }
@@ -872,17 +850,8 @@ function renderConnectPage(params: {
 </head>
 <body>
 <div class="card">
-  <div class="topbar">
-    <div class="brand-lockup">
-      ${brandMarkSvg}
-      <span>Agent Native</span>
-    </div>
-    <div class="app-pill" title="${safeApp}">${safeApp}</div>
-  </div>
   <div class="hero">
-    <!-- "Connect an external agent" is kept as the accessible consent label. -->
-    <div class="flow" role="img" aria-label="Connect an external agent to ${safeApp}">
+    <div class="flow" role="img" aria-label="Authorize ${safeApp}">
       <span class="tile" aria-hidden="true">
         ${flowMarkSvg}
       </span>
@@ -892,7 +861,6 @@ function renderConnectPage(params: {
       </span>
     </div>
-    <div class="eyebrow">Connect an external agent</div>
     <h1>${safeUserCode ? `Authorize ${safeApp} from your terminal?` : `Use ${safeApp} from your AI assistant`}</h1>
     <p class="identity">
       <span>Signed in as <strong>${safeEmail}</strong></span>
@@ -909,7 +877,6 @@ function renderConnectPage(params: {
   <details id="staticTokenMint" class="connections static-token-mint"${safeUserCode ? " open" : ""}>
     <summary>
       <span class="connections-title">${safeUserCode ? "Authorize this device" : MCP_STATIC_TOKEN_FALLBACK.title}</span>
-      <span class="connections-state">${safeUserCode ? "From your terminal" : MCP_STATIC_TOKEN_FALLBACK.state}</span>
       <span class="chev" aria-hidden="true"></span>
     </summary>
     <div class="static-token-body">
@@ -939,7 +906,7 @@ function renderConnectPage(params: {
   <details id="connections" class="connections">
     <summary>
       <span class="connections-title">Existing connections</span>
-      <span id="connectionsState" class="connections-state">Checking</span>
+      <span id="connectionsState" class="connections-state hidden" aria-live="polite"></span>
       <span class="chev" aria-hidden="true"></span>
     </summary>
     <div id="tokenList" class="token-list"><div class="empty-state">Checking connections...</div></div>
@@ -990,8 +957,20 @@ function renderConnectPage(params: {
       }, 1400);
     });
   });
-  function showMsg(text, kind) {
-    msgEl.textContent = text;
+  function showMsg(text, kind, title) {
+    msgEl.textContent = "";
+    if (title) {
+      var titleEl = document.createElement("strong");
+      titleEl.className = "msg-title";
+      titleEl.textContent = title;
+      msgEl.appendChild(titleEl);
+      var copyEl = document.createElement("span");
+      copyEl.className = "msg-copy";
+      copyEl.textContent = text;
+      msgEl.appendChild(copyEl);
+    } else {
+      msgEl.textContent = text;
+    }
     msgEl.className = "msg " + (kind || "err");
   }
   function clearMsg() { msgEl.className = "msg"; msgEl.textContent = ""; }
@@ -1039,19 +1018,22 @@ function renderConnectPage(params: {
       var res = await fetch(BASE + "/tokens", { credentials: "same-origin" });
       if (!res.ok) {
         connectionsStateEl.textContent = "Unavailable";
+        connectionsStateEl.classList.remove("hidden");
         listEl.innerHTML = '<div class="empty-state">Could not load connections.</div>';
         return;
       }
       var data = await res.json();
       var tokens = (data && data.tokens) || [];
       if (!tokens.length) {
-        connectionsStateEl.textContent = "None";
+        connectionsStateEl.textContent = "";
+        connectionsStateEl.classList.add("hidden");
         connectionsEl.open = false;
         listEl.innerHTML = '<div class="empty-state">Created connections will appear here for revoking later.</div>';
         return;
       }
       var activeCount = tokens.filter(function (t) { return !t.revokedAt; }).length;
-      connectionsStateEl.textContent = activeCount === 1 ? "1 active" : activeCount + " active";
+      connectionsStateEl.textContent = activeCount ? String(activeCount) : "";
+      connectionsStateEl.classList.toggle("hidden", activeCount === 0);
       listEl.innerHTML = "";
       tokens.forEach(function (t) {
         var div = document.createElement("div");
@@ -1082,6 +1064,7 @@ function renderConnectPage(params: {
       });
     } catch (e) {
       connectionsStateEl.textContent = "Unavailable";
+      connectionsStateEl.classList.remove("hidden");
       listEl.innerHTML = '<div class="empty-state">Could not load connections.</div>';
     }
   }
@@ -1098,7 +1081,7 @@ function renderConnectPage(params: {
           showMsg((a.data && a.data.error) || "Could not authorize this device code.");
           return;
         }
-        showMsg("Device authorized — finishing connection… you can return to your terminal.", "ok");
+        showMsg("Finishing connection… you can return to your terminal.", "ok", "Device authorized");
         btn.classList.add("hidden");
         document.getElementById("mintForm").classList.add("hidden");
         var cc = document.getElementById("codeCallout");
@@ -1133,7 +1116,7 @@ function renderConnectPage(params: {
               });
               if (fresh.length > 0) {
                 clearInterval(iv);
-                showMsg("Connected. This device can now act as you — manage or revoke it below.", "ok");
+                showMsg("This device can now act as you — manage or revoke it below.", "ok", "Connected");
                 loadTokens();
                 return;
               }

package/src/provider-api/index.ts CHANGED Viewed

@@ -1100,7 +1100,7 @@ const PROVIDER_CONFIGS: Record<ProviderApiId, ProviderApiConfig> = {
     docsUrls: ["https://developers.google.com/drive/api/reference/rest/v3"],
     specUrls: ["https://www.googleapis.com/discovery/v1/apis/drive/v3/rest"],
     allowedHostSuffixes: ["googleapis.com"],
-    templateUses: ["brain", "content", "slides", "dispatch"],
+    templateUses: ["brain", "content", "slides", "dispatch", "analytics"],
     examples: [
       { label: "List files", method: "GET", path: "/files" },
       { label: "Get file metadata", method: "GET", path: "/files/{fileId}" },

package/src/realtime-protocol.ts ADDED Viewed

@@ -0,0 +1,92 @@
+/**
+ * Realtime SSE wire protocol — shared by the server SSE handlers (framework
+ * in-process path + the hosted Realtime Gateway) and the client transport.
+ *
+ * Pure constants, types, and parsers only — NO h3/node/browser deps — so both
+ * the Node server and the browser client import it.
+ *
+ * Frame taxonomy:
+ *   - CHANGE / batch frames ride the default (unnamed) SSE `message` event and
+ *     are parsed by the client's existing `normalizeEventPayload`. Unchanged.
+ *   - CONTROL frames (handshake, token rotation) ride NAMED SSE events, so
+ *     `EventSource.addEventListener(name)` routes them separately and an older
+ *     client that only reads `onmessage` silently ignores them (backward safe).
+ */
+export const REALTIME_PROTOCOL_VERSION = 1;
+/** Named SSE event carrying the one-time handshake ({@link RealtimeHandshake}). */
+export const REALTIME_SSE_HANDSHAKE_EVENT = "handshake";
+/** Named SSE event carrying a rotated subscribe token ({@link RealtimeTokenFrame}). */
+export const REALTIME_SSE_TOKEN_EVENT = "token";
+/**
+ * Capability advertised by the hosted gateway: awareness/presence is NOT
+ * forwarded (it lives only on the in-process emitter, never in `sync_events`),
+ * so the collab client must keep its own presence cadence. The framework's
+ * in-process SSE path forwards awareness and therefore sends no handshake — the
+ * client treats an absent handshake as "all capabilities present."
+ */
+export const REALTIME_CAP_NO_AWARENESS = "no-awareness";
+export interface RealtimeHandshake {
+  protocol: number;
+  capabilities: string[];
+}
+export interface RealtimeTokenFrame {
+  token: string;
+  /** ISO expiry, informational; the client re-mints/rotates before this. */
+  expiresAt?: string;
+}
+export function buildHandshakeFrame(
+  capabilities: readonly string[] = [],
+): RealtimeHandshake {
+  return {
+    protocol: REALTIME_PROTOCOL_VERSION,
+    capabilities: [...capabilities],
+  };
+}
+export function parseHandshakeFrame(data: string): RealtimeHandshake | null {
+  try {
+    const parsed = JSON.parse(data);
+    if (
+      parsed &&
+      typeof parsed === "object" &&
+      typeof parsed.protocol === "number" &&
+      Array.isArray(parsed.capabilities)
+    ) {
+      return {
+        protocol: parsed.protocol,
+        capabilities: parsed.capabilities.filter(
+          (c: unknown): c is string => typeof c === "string",
+        ),
+      };
+    }
+  } catch {
+    // fall through
+  }
+  return null;
+}
+export function parseTokenFrame(data: string): RealtimeTokenFrame | null {
+  try {
+    const parsed = JSON.parse(data);
+    if (
+      parsed &&
+      typeof parsed === "object" &&
+      typeof parsed.token === "string"
+    ) {
+      return {
+        token: parsed.token,
+        expiresAt:
+          typeof parsed.expiresAt === "string" ? parsed.expiresAt : undefined,
+      };
+    }
+  } catch {
+    // fall through
+  }
+  return null;
+}

package/src/server/collab-plugin.ts CHANGED Viewed

@@ -5,7 +5,11 @@
  * ```ts
  * // server/plugins/collab.ts
  * import { createCollabPlugin } from "@agent-native/core/server";
- * export default createCollabPlugin({ table: "documents", contentColumn: "content" });
+ * export default createCollabPlugin({
+ *   table: "documents",
+ *   contentColumn: "content",
+ *   access: { mode: "resource", resourceType: "document" },
+ * });
  * ```
  */
@@ -52,12 +56,47 @@ type CollabAwarenessScope = {
   resourceId?: string;
 };
+export type CollabResourceIdResolver = (
+  docId: string,
+) => string | null | Promise<string | null>;
+export type CollabAccess =
+  | {
+      mode: "resource";
+      /** The shareable resource type registered via `registerShareableResource`. */
+      resourceType: string;
+      /** Map a collab document id to its parent shareable resource id. */
+      resolveResourceId?: CollabResourceIdResolver;
+    }
+  | {
+      /** Deliver collaboration events to every authenticated user. */
+      mode: "all-authenticated";
+    };
+type NormalizedCollabAccess =
+  | {
+      mode: "resource";
+      resourceType: string;
+      resolveResourceId?: CollabResourceIdResolver;
+    }
+  | {
+      mode: "all-authenticated";
+      explicit: boolean;
+    };
 /**
- * Whether the no-resourceType warning has already been logged once per server
- * process. Avoids flooding logs on every request in templates that deliberately
- * have no sharing model.
+ * Tables whose implicit all-authenticated warning has already been logged in
+ * this process. Avoids duplicate warnings during hot reloads while still
+ * identifying every affected table.
  */
-let _unscoped_warning_logged = false;
+const COLLAB_WARNING_TABLES_KEY =
+  "__agentNativeImplicitCollabAccessWarningTables__";
+const collabWarningGlobal = globalThis as typeof globalThis & {
+  [COLLAB_WARNING_TABLES_KEY]?: Set<string>;
+};
+const _unscoped_warning_tables = (collabWarningGlobal[
+  COLLAB_WARNING_TABLES_KEY
+] ??= new Set<string>());
 export interface CollabPluginOptions {
   /** Table name containing document content. Default: "documents" */
@@ -77,18 +116,25 @@ export interface CollabPluginOptions {
   contentType?: "text" | "json";
   /** Column name for JSON content (used when contentType is "json"). */
   jsonColumn?: string;
+  /**
+   * Access policy for collaboration routes and event delivery.
+   * Use `resource` for registered shareable resources, or explicitly choose
+   * `all-authenticated` for deployment-wide collaboration.
+   */
+  access?: CollabAccess;
   /**
    * The shareable resource type registered via `registerShareableResource`.
    * Used to enforce access checks on collab routes.
-   * Omit only for resources that are always public (no sharing model).
+   * @deprecated Use `access: { mode: "resource", resourceType }`.
    */
   resourceType?: string;
   /**
    * Map the collab document id to the shareable resource id. Many templates
    * use route-specific collab ids (for example, one doc per slide inside a
    * deck) while sharing is enforced at the parent resource level.
+   * @deprecated Use `access: { mode: "resource", resourceType, resolveResourceId }`.
    */
-  resolveResourceId?: (docId: string) => string | null | Promise<string | null>;
+  resolveResourceId?: CollabResourceIdResolver;
   /**
    * Maximum allowed body size in bytes for write operations
    * (update/text/json/patch). Requests exceeding this are rejected with 413.
@@ -97,18 +143,100 @@ export interface CollabPluginOptions {
   maxPayloadBytes?: number;
 }
+export function normalizeCollabAccess(
+  options: Pick<
+    CollabPluginOptions,
+    "access" | "resourceType" | "resolveResourceId"
+  >,
+): NormalizedCollabAccess {
+  const hasLegacyAccess =
+    options.resourceType !== undefined ||
+    options.resolveResourceId !== undefined;
+  if (options.access && hasLegacyAccess) {
+    throw new Error(
+      'createCollabPlugin cannot combine "access" with the deprecated root "resourceType" or "resolveResourceId" options. Move those fields into access.',
+    );
+  }
+  if (options.access?.mode === "resource") {
+    if (!options.access.resourceType.trim()) {
+      throw new Error(
+        'createCollabPlugin access mode "resource" requires a non-empty resourceType.',
+      );
+    }
+    return options.access;
+  }
+  if (options.access?.mode === "all-authenticated") {
+    return { mode: "all-authenticated", explicit: true };
+  }
+  if (options.access) {
+    throw new Error(
+      `createCollabPlugin received an unsupported access mode: ${String((options.access as { mode?: unknown }).mode)}`,
+    );
+  }
+  if (options.resourceType !== undefined) {
+    if (!options.resourceType.trim()) {
+      throw new Error(
+        'createCollabPlugin "resourceType" must be a non-empty string when provided.',
+      );
+    }
+    return {
+      mode: "resource",
+      resourceType: options.resourceType,
+      resolveResourceId: options.resolveResourceId,
+    };
+  }
+  if (options.resolveResourceId !== undefined) {
+    throw new Error(
+      'createCollabPlugin "resolveResourceId" requires a non-empty "resourceType".',
+    );
+  }
+  return { mode: "all-authenticated", explicit: false };
+}
+function warnForImplicitAllAuthenticatedAccess(table: string): void {
+  if (_unscoped_warning_tables.has(table)) return;
+  _unscoped_warning_tables.add(table);
+  console.warn(
+    `[collab] WARNING: createCollabPlugin for table "${table}" does not declare an access policy. ` +
+      "Collab events will be delivered to ALL authenticated users on this deployment without document-level access scoping. " +
+      'Use access: { mode: "resource", resourceType: "..." } for access-scoped delivery, ' +
+      'or access: { mode: "all-authenticated" } to explicitly acknowledge deployment-wide delivery.',
+  );
+}
 export function createCollabPlugin(
   options: CollabPluginOptions = {},
 ): NitroPluginDef {
+  const normalizedAccess = normalizeCollabAccess(options);
   const {
     table = "documents",
     contentColumn = "content",
     idColumn = "id",
     autoSeed = true,
-    resourceType,
-    resolveResourceId,
     maxPayloadBytes = DEFAULT_MAX_PAYLOAD_BYTES,
   } = options;
+  const resourceType =
+    normalizedAccess.mode === "resource"
+      ? normalizedAccess.resourceType
+      : undefined;
+  const resolveResourceId =
+    normalizedAccess.mode === "resource"
+      ? normalizedAccess.resolveResourceId
+      : undefined;
+  if (
+    normalizedAccess.mode === "all-authenticated" &&
+    !normalizedAccess.explicit
+  ) {
+    warnForImplicitAllAuthenticatedAccess(table);
+  }
   return async (nitroApp: any) => {
     await awaitBootstrap(nitroApp);
@@ -129,15 +257,6 @@ export function createCollabPlugin(
     //     who don't match owner/org — instead of only degrading them to the
     //     poll fallback.
     // See also: SECURITY comment in poll.ts on canSeeChangeForUser.
-    if (!resourceType && !_unscoped_warning_logged) {
-      _unscoped_warning_logged = true;
-      console.warn(
-        "[collab] WARNING: createCollabPlugin called without resourceType. " +
-          "Collab events will be delivered to ALL authenticated users on this deployment " +
-          "without document-level access scoping. Set resourceType to enable access-scoped delivery.",
-      );
-    }
     const collabEmitter = getCollabEmitter();
     collabEmitter.on("collab", async (event) => {
       if (!resourceType) {

package/src/server/core-routes-plugin.ts CHANGED Viewed

@@ -170,6 +170,7 @@ import { handleIdentitySso } from "./identity-sso.js";
 import { createOpenRouteHandler } from "./open-route.js";
 import { createPollEventsHandler } from "./poll-events.js";
 import { createPollHandler } from "./poll.js";
+import { createRealtimeTokenHandler } from "./realtime-token.js";
 import { runWithRequestContext } from "./request-context.js";
 import {
   findUnsupportedScopedKeyNames,
@@ -1414,6 +1415,12 @@ export function createCoreRoutesPlugin(
       // Polling
       getH3App(nitroApp).use(`${P}/poll`, createPollHandler());
+      // Realtime subscribe-token mint (hosted gateway path)
+      getH3App(nitroApp).use(
+        `${P}/realtime-token`,
+        createRealtimeTokenHandler(),
+      );
       // SSE
       if (!options.disableSSE) {
         for (const route of resolveFrameworkSseRoutes(options.sseRoute)) {

package/src/server/index.ts CHANGED Viewed

@@ -287,7 +287,9 @@ export {
 } from "../terminal/terminal-plugin.js";
 export {
   createCollabPlugin,
+  type CollabAccess,
   type CollabPluginOptions,
+  type CollabResourceIdResolver,
 } from "./collab-plugin.js";
 export {

package/src/server/poll-events.ts CHANGED Viewed

@@ -7,10 +7,11 @@ import {
 } from "../collab/awareness.js";
 import { getSession } from "./auth.js";
 import {
+  type AppSyncState,
   canSeeChangeForUser,
-  getPollEmitter,
-  POLL_CHANGE_EVENT,
   type ChangeEvent,
+  getDefaultAppSyncState,
+  POLL_CHANGE_EVENT,
 } from "./poll.js";
 export function canSeeAwarenessChangeForUser(
@@ -37,8 +38,15 @@ export function canSeeAwarenessChangeForUser(
  * connected peers receive cursor moves push-style instead of waiting for
  * the next poll cycle. Polling fallback keeps working — cursors degrade
  * gracefully to poll cadence without SSE.
+ *
+ * `state` defaults to the process-wide instance so self-hosted apps are
+ * unchanged; the hosted gateway passes a per-app instance to fan out that
+ * app's events (awareness stays on the process-global emitter and is a v0
+ * gateway Non-Goal).
  */
-export function createPollEventsHandler() {
+export function createPollEventsHandler(
+  state: AppSyncState = getDefaultAppSyncState(),
+) {
   return defineEventHandler(async (event) => {
     const session = await getSession(event).catch(() => null);
     if (!session?.email) {
@@ -60,7 +68,9 @@ export function createPollEventsHandler() {
     const push = (change: ChangeEvent) => {
       if (closed) return;
-      if (!canSeeChangeForUser(change, session.email, session.orgId)) return;
+      if (!state.canSeeChangeForUser(change, session.email, session.orgId)) {
+        return;
+      }
       safePush(JSON.stringify(change));
     };
@@ -74,13 +84,24 @@ export function createPollEventsHandler() {
       safePush(JSON.stringify(change));
     };
-    getPollEmitter().on(POLL_CHANGE_EVENT, push);
-    getAwarenessEmitter().on(AWARENESS_CHANGE_EVENT, pushAwareness);
+    state.getPollEmitter().on(POLL_CHANGE_EVENT, push);
+    // Awareness lives ONLY on the process-global emitter and is filtered via the
+    // module-level (default-state) access path — both untenable in a multi-app
+    // gateway process, where they'd leak another app's presence/document id and
+    // resolve access against the wrong tenant. Fail closed: only the default
+    // (in-process) instance forwards awareness. The gateway advertises
+    // `no-awareness` so collab keeps its own presence cadence.
+    const forwardAwareness = state === getDefaultAppSyncState();
+    if (forwardAwareness) {
+      getAwarenessEmitter().on(AWARENESS_CHANGE_EVENT, pushAwareness);
+    }
     stream.onClosed(() => {
       closed = true;
-      getPollEmitter().off(POLL_CHANGE_EVENT, push);
-      getAwarenessEmitter().off(AWARENESS_CHANGE_EVENT, pushAwareness);
+      state.getPollEmitter().off(POLL_CHANGE_EVENT, push);
+      if (forwardAwareness) {
+        getAwarenessEmitter().off(AWARENESS_CHANGE_EVENT, pushAwareness);
+      }
     });
     return stream.send();