@code-yeongyu/senpi 2026.9.2 → 2026.9.3

package/dist/modes/rpc/session-event-fanout.js

@@ -0,0 +1,146 @@
+import { SocketEventSinkActor } from "./socket-event-fanout.js";
+export const RENDERED_COMPONENT_RECORD = "__senpiRenderedComponent";
+const BROADCAST_LIFECYCLE_RECORDS = new Set([
+    "agent_start",
+    "agent_settled",
+    "agent_idle",
+    "session_opened",
+    "session_closed",
+]);
+export class SessionEventFanout {
+    constructor() {
+        this.connections = new Map();
+        this.sessionSnapshots = new Map();
+        this.connectionCapabilities = new Map();
+        this.connectionSessions = new Map();
+        this.registeredCapabilityConnections = new Set();
+    }
+    registerConnection(id, connection) {
+        const actor = new SocketEventSinkActor(connection, () => {
+            if (this.connections.get(id)?.actor === actor) {
+                this.connections.delete(id);
+                this.connectionCapabilities.delete(id);
+                this.connectionSessions.delete(id);
+                this.registeredCapabilityConnections.delete(id);
+            }
+        });
+        this.connections.set(id, { connection, actor });
+        this.connectionCapabilities.set(id, new Set());
+        this.connectionSessions.set(id, new Set());
+    }
+    unregisterConnection(id) {
+        const registered = this.connections.get(id);
+        if (!registered)
+            return;
+        registered.actor.close();
+        this.connections.delete(id);
+        this.connectionCapabilities.delete(id);
+        this.connectionSessions.delete(id);
+        this.registeredCapabilityConnections.delete(id);
+    }
+    attachConnectionToSession(id, sessionId) {
+        if (!this.connections.has(id))
+            return;
+        const sessions = this.connectionSessions.get(id) ?? new Set();
+        if (sessions.has(sessionId))
+            return;
+        sessions.add(sessionId);
+        this.connectionSessions.set(id, sessions);
+        this.replaySnapshot(id, sessionId);
+    }
+    detachConnectionFromSession(id, sessionId) {
+        this.connectionSessions.get(id)?.delete(sessionId);
+    }
+    setConnectionCapabilities(id, capabilities) {
+        const registered = this.connections.get(id);
+        if (!registered)
+            return;
+        const wasCapable = this.connectionCapabilities.get(id)?.has("rendered_components") ?? false;
+        this.connectionCapabilities.set(id, new Set(capabilities));
+        this.registeredCapabilityConnections.add(id);
+        if (!wasCapable && capabilities.includes("rendered_components"))
+            for (const sessionId of this.connectionSessions.get(id) ?? [])
+                this.replayRendered(id, sessionId);
+    }
+    clearConnectionCapabilities(id) {
+        if (this.connections.has(id)) {
+            this.connectionCapabilities.set(id, new Set());
+            this.registeredCapabilityConnections.delete(id);
+        }
+    }
+    hasRegisteredConnectionCapabilities(id) {
+        return this.registeredCapabilityConnections.has(id);
+    }
+    getConnectionCapabilities(id) {
+        if (!this.registeredCapabilityConnections.has(id))
+            return undefined;
+        return [...(this.connectionCapabilities.get(id) ?? [])];
+    }
+    hasCapableConnection(sessionId) {
+        for (const [id, capabilities] of this.connectionCapabilities)
+            if (capabilities.has("rendered_components") && this.connectionSessions.get(id)?.has(sessionId))
+                return true;
+        return false;
+    }
+    targets(sessionId, targetId, isTargeted, rendered, recordType) {
+        if (isTargeted)
+            return [targetId];
+        if (typeof recordType === "string" && BROADCAST_LIFECYCLE_RECORDS.has(recordType))
+            return this.connections.size > 0 ? [...this.connections.keys()] : [undefined];
+        if (rendered)
+            return this.connections.size > 0
+                ? [...this.connections.keys()].filter((id) => this.connectionCapabilities.get(id)?.has("rendered_components") &&
+                    this.connectionSessions.get(id)?.has(sessionId))
+                : [undefined];
+        return this.connections.size > 0
+            ? [...this.connections.keys()].filter((id) => this.connectionSessions.get(id)?.has(sessionId))
+            : [undefined];
+    }
+    get(id) {
+        return this.connections.get(id);
+    }
+    values() {
+        return this.connections.values();
+    }
+    /** True when no socket connection is registered, i.e. records must fall back to the stdio lane. */
+    isEmpty() {
+        return this.connections.size === 0;
+    }
+    broadcast(line) {
+        for (const { actor } of this.connections.values())
+            actor.enqueue(line);
+    }
+    rememberSnapshot(sessionId, value, line) {
+        const event = value.assistantMessageEvent;
+        const record = { line, rendered: value[RENDERED_COMPONENT_RECORD] === true };
+        if (value.type === "message_start" || (value.type === "message_update" && event?.type === "text_start")) {
+            this.sessionSnapshots.set(sessionId, [record]);
+        }
+        else if (this.sessionSnapshots.has(sessionId)) {
+            this.sessionSnapshots.get(sessionId)?.push(record);
+        }
+        if (value.type === "message_end")
+            this.sessionSnapshots.delete(sessionId);
+    }
+    forgetSession(sessionId) {
+        this.sessionSnapshots.delete(sessionId);
+    }
+    replaySnapshot(id, sessionId) {
+        const actor = this.connections.get(id)?.actor;
+        if (!actor)
+            return;
+        const capable = this.connectionCapabilities.get(id)?.has("rendered_components") ?? false;
+        for (const record of this.sessionSnapshots.get(sessionId) ?? [])
+            if (!record.rendered || capable)
+                actor.enqueue(record.line);
+    }
+    replayRendered(id, sessionId) {
+        const actor = this.connections.get(id)?.actor;
+        if (!actor)
+            return;
+        for (const record of this.sessionSnapshots.get(sessionId) ?? [])
+            if (record.rendered)
+                actor.enqueue(record.line);
+    }
+}
+//# sourceMappingURL=session-event-fanout.js.map

package/dist/modes/rpc/session-event-fanout.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-event-fanout.js","sourceRoot":"","sources":["../../../src/modes/rpc/session-event-fanout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAUhE,MAAM,CAAC,MAAM,yBAAyB,GAAG,0BAA0B,CAAC;AAEpE,MAAM,2BAA2B,GAAG,IAAI,GAAG,CAAC;IAC3C,aAAa;IACb,eAAe;IACf,YAAY;IACZ,gBAAgB;IAChB,gBAAgB;CAChB,CAAC,CAAC;AASH,MAAM,OAAO,kBAAkB;IAA/B;QACkB,gBAAW,GAAG,IAAI,GAAG,EAAgC,CAAC;QACtD,qBAAgB,GAAG,IAAI,GAAG,EAA4B,CAAC;QACvD,2BAAsB,GAAG,IAAI,GAAG,EAAuB,CAAC;QACxD,uBAAkB,GAAG,IAAI,GAAG,EAAuB,CAAC;QACpD,oCAA+B,GAAG,IAAI,GAAG,EAAU,CAAC;IA2ItE,CAAC;IAzIA,kBAAkB,CAAC,EAAU,EAAE,UAAwC;QACtE,MAAM,KAAK,GAAG,IAAI,oBAAoB,CAAC,UAAU,EAAE,GAAG,EAAE;YACvD,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,KAAK,KAAK,EAAE,CAAC;gBAC/C,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC5B,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACvC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACnC,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACjD,CAAC;QACF,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;QAChD,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;QAC/C,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,oBAAoB,CAAC,EAAU;QAC9B,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC5C,IAAI,CAAC,UAAU;YAAE,OAAO;QACxB,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC5B,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,yBAAyB,CAAC,EAAU,EAAE,SAAiB;QACtD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,OAAO;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,GAAG,EAAU,CAAC;QACtE,IAAI,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC;YAAE,OAAO;QACpC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACxB,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC1C,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IACpC,CAAC;IAED,2BAA2B,CAAC,EAAU,EAAE,SAAiB;QACxD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IACpD,CAAC;IAED,yBAAyB,CAAC,EAAU,EAAE,YAA+B;QACpE,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC5C,IAAI,CAAC,UAAU;YAAE,OAAO;QACxB,MAAM,UAAU,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,qBAAqB,CAAC,IAAI,KAAK,CAAC;QAC5F,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;QAC3D,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC7C,IAAI,CAAC,UAAU,IAAI,YAAY,CAAC,QAAQ,CAAC,qBAAqB,CAAC;YAC9D,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE;gBAAE,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IACpG,CAAC;IAED,2BAA2B,CAAC,EAAU;QACrC,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YAC9B,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;YAC/C,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACjD,CAAC;IACF,CAAC;IAED,mCAAmC,CAAC,EAAU;QAC7C,OAAO,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,yBAAyB,CAAC,EAAU;QACnC,IAAI,CAAC,IAAI,CAAC,+BAA+B,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,OAAO,SAAS,CAAC;QACpE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,oBAAoB,CAAC,SAAiB;QACrC,KAAK,MAAM,CAAC,EAAE,EAAE,YAAY,CAAC,IAAI,IAAI,CAAC,sBAAsB;YAC3D,IAAI,YAAY,CAAC,GAAG,CAAC,qBAAqB,CAAC,IAAI,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC;gBAAE,OAAO,IAAI,CAAC;QAC7G,OAAO,KAAK,CAAC;IACd,CAAC;IAED,OAAO,CACN,SAAiB,EACjB,QAA4B,EAC5B,UAAmB,EACnB,QAAiB,EACjB,UAAmB;QAEnB,IAAI,UAAU;YAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,2BAA2B,CAAC,GAAG,CAAC,UAAU,CAAC;YAChF,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC/E,IAAI,QAAQ;YACX,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC;gBAC/B,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CACnC,CAAC,EAAE,EAAE,EAAE,CACN,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,qBAAqB,CAAC;oBAC/D,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,CAChD;gBACF,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAChB,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC;YAC/B,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;YAC9F,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAChB,CAAC;IAED,GAAG,CAAC,EAAU;QACb,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,MAAM;QACL,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;IAClC,CAAC;IAED,mGAAmG;IACnG,OAAO;QACN,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,CAAC;IACpC,CAAC;IAED,SAAS,CAAC,IAAY;QACrB,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE;YAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACxE,CAAC;IAED,gBAAgB,CAAC,SAAiB,EAAE,KAA8B,EAAE,IAAY;QAC/E,MAAM,KAAK,GAAG,KAAK,CAAC,qBAA4D,CAAC;QACjF,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,yBAAyB,CAAC,KAAK,IAAI,EAAE,CAAC;QAC7E,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,gBAAgB,IAAI,KAAK,EAAE,IAAI,KAAK,YAAY,CAAC,EAAE,CAAC;YACzG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAChD,CAAC;aAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACjD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC;QACD,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa;YAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC3E,CAAC;IAED,aAAa,CAAC,SAAiB;QAC9B,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;IAEO,cAAc,CAAC,EAAU,EAAE,SAAiB;QACnD,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC;QAC9C,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,MAAM,OAAO,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,qBAAqB,CAAC,IAAI,KAAK,CAAC;QACzF,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE;YAC9D,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,OAAO;gBAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC9D,CAAC;IAEO,cAAc,CAAC,EAAU,EAAE,SAAiB;QACnD,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC;QAC9C,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE;YAAE,IAAI,MAAM,CAAC,QAAQ;gBAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAClH,CAAC;CACD","sourcesContent":["import { SocketEventSinkActor } from \"./socket-event-fanout.ts\";\n\nexport type RawWriter = (chunk: string) => void;\nexport type BackpressureWaiter = () => Promise<void>;\n\nexport interface SessionEventWriterConnection {\n\treadonly writeRaw: RawWriter;\n\treadonly waitForBackpressure: BackpressureWaiter;\n}\n\nexport const RENDERED_COMPONENT_RECORD = \"__senpiRenderedComponent\";\n\nconst BROADCAST_LIFECYCLE_RECORDS = new Set([\n\t\"agent_start\",\n\t\"agent_settled\",\n\t\"agent_idle\",\n\t\"session_opened\",\n\t\"session_closed\",\n]);\n\ntype RegisteredConnection = {\n\treadonly connection: SessionEventWriterConnection;\n\treadonly actor: SocketEventSinkActor;\n};\n\ntype SnapshotRecord = { readonly line: string; readonly rendered: boolean };\n\nexport class SessionEventFanout {\n\tprivate readonly connections = new Map<string, RegisteredConnection>();\n\tprivate readonly sessionSnapshots = new Map<string, SnapshotRecord[]>();\n\tprivate readonly connectionCapabilities = new Map<string, Set<string>>();\n\tprivate readonly connectionSessions = new Map<string, Set<string>>();\n\tprivate readonly registeredCapabilityConnections = new Set<string>();\n\n\tregisterConnection(id: string, connection: SessionEventWriterConnection): void {\n\t\tconst actor = new SocketEventSinkActor(connection, () => {\n\t\t\tif (this.connections.get(id)?.actor === actor) {\n\t\t\t\tthis.connections.delete(id);\n\t\t\t\tthis.connectionCapabilities.delete(id);\n\t\t\t\tthis.connectionSessions.delete(id);\n\t\t\t\tthis.registeredCapabilityConnections.delete(id);\n\t\t\t}\n\t\t});\n\t\tthis.connections.set(id, { connection, actor });\n\t\tthis.connectionCapabilities.set(id, new Set());\n\t\tthis.connectionSessions.set(id, new Set());\n\t}\n\n\tunregisterConnection(id: string): void {\n\t\tconst registered = this.connections.get(id);\n\t\tif (!registered) return;\n\t\tregistered.actor.close();\n\t\tthis.connections.delete(id);\n\t\tthis.connectionCapabilities.delete(id);\n\t\tthis.connectionSessions.delete(id);\n\t\tthis.registeredCapabilityConnections.delete(id);\n\t}\n\n\tattachConnectionToSession(id: string, sessionId: string): void {\n\t\tif (!this.connections.has(id)) return;\n\t\tconst sessions = this.connectionSessions.get(id) ?? new Set<string>();\n\t\tif (sessions.has(sessionId)) return;\n\t\tsessions.add(sessionId);\n\t\tthis.connectionSessions.set(id, sessions);\n\t\tthis.replaySnapshot(id, sessionId);\n\t}\n\n\tdetachConnectionFromSession(id: string, sessionId: string): void {\n\t\tthis.connectionSessions.get(id)?.delete(sessionId);\n\t}\n\n\tsetConnectionCapabilities(id: string, capabilities: readonly string[]): void {\n\t\tconst registered = this.connections.get(id);\n\t\tif (!registered) return;\n\t\tconst wasCapable = this.connectionCapabilities.get(id)?.has(\"rendered_components\") ?? false;\n\t\tthis.connectionCapabilities.set(id, new Set(capabilities));\n\t\tthis.registeredCapabilityConnections.add(id);\n\t\tif (!wasCapable && capabilities.includes(\"rendered_components\"))\n\t\t\tfor (const sessionId of this.connectionSessions.get(id) ?? []) this.replayRendered(id, sessionId);\n\t}\n\n\tclearConnectionCapabilities(id: string): void {\n\t\tif (this.connections.has(id)) {\n\t\t\tthis.connectionCapabilities.set(id, new Set());\n\t\t\tthis.registeredCapabilityConnections.delete(id);\n\t\t}\n\t}\n\n\thasRegisteredConnectionCapabilities(id: string): boolean {\n\t\treturn this.registeredCapabilityConnections.has(id);\n\t}\n\n\tgetConnectionCapabilities(id: string): readonly string[] | undefined {\n\t\tif (!this.registeredCapabilityConnections.has(id)) return undefined;\n\t\treturn [...(this.connectionCapabilities.get(id) ?? [])];\n\t}\n\n\thasCapableConnection(sessionId: string): boolean {\n\t\tfor (const [id, capabilities] of this.connectionCapabilities)\n\t\t\tif (capabilities.has(\"rendered_components\") && this.connectionSessions.get(id)?.has(sessionId)) return true;\n\t\treturn false;\n\t}\n\n\ttargets(\n\t\tsessionId: string,\n\t\ttargetId: string | undefined,\n\t\tisTargeted: boolean,\n\t\trendered: boolean,\n\t\trecordType: unknown,\n\t): readonly (string | undefined)[] {\n\t\tif (isTargeted) return [targetId];\n\t\tif (typeof recordType === \"string\" && BROADCAST_LIFECYCLE_RECORDS.has(recordType))\n\t\t\treturn this.connections.size > 0 ? [...this.connections.keys()] : [undefined];\n\t\tif (rendered)\n\t\t\treturn this.connections.size > 0\n\t\t\t\t? [...this.connections.keys()].filter(\n\t\t\t\t\t\t(id) =>\n\t\t\t\t\t\t\tthis.connectionCapabilities.get(id)?.has(\"rendered_components\") &&\n\t\t\t\t\t\t\tthis.connectionSessions.get(id)?.has(sessionId),\n\t\t\t\t\t)\n\t\t\t\t: [undefined];\n\t\treturn this.connections.size > 0\n\t\t\t? [...this.connections.keys()].filter((id) => this.connectionSessions.get(id)?.has(sessionId))\n\t\t\t: [undefined];\n\t}\n\n\tget(id: string): RegisteredConnection | undefined {\n\t\treturn this.connections.get(id);\n\t}\n\n\tvalues(): IterableIterator<RegisteredConnection> {\n\t\treturn this.connections.values();\n\t}\n\n\t/** True when no socket connection is registered, i.e. records must fall back to the stdio lane. */\n\tisEmpty(): boolean {\n\t\treturn this.connections.size === 0;\n\t}\n\n\tbroadcast(line: string): void {\n\t\tfor (const { actor } of this.connections.values()) actor.enqueue(line);\n\t}\n\n\trememberSnapshot(sessionId: string, value: Record<string, unknown>, line: string): void {\n\t\tconst event = value.assistantMessageEvent as Record<string, unknown> | undefined;\n\t\tconst record = { line, rendered: value[RENDERED_COMPONENT_RECORD] === true };\n\t\tif (value.type === \"message_start\" || (value.type === \"message_update\" && event?.type === \"text_start\")) {\n\t\t\tthis.sessionSnapshots.set(sessionId, [record]);\n\t\t} else if (this.sessionSnapshots.has(sessionId)) {\n\t\t\tthis.sessionSnapshots.get(sessionId)?.push(record);\n\t\t}\n\t\tif (value.type === \"message_end\") this.sessionSnapshots.delete(sessionId);\n\t}\n\n\tforgetSession(sessionId: string): void {\n\t\tthis.sessionSnapshots.delete(sessionId);\n\t}\n\n\tprivate replaySnapshot(id: string, sessionId: string): void {\n\t\tconst actor = this.connections.get(id)?.actor;\n\t\tif (!actor) return;\n\t\tconst capable = this.connectionCapabilities.get(id)?.has(\"rendered_components\") ?? false;\n\t\tfor (const record of this.sessionSnapshots.get(sessionId) ?? [])\n\t\t\tif (!record.rendered || capable) actor.enqueue(record.line);\n\t}\n\n\tprivate replayRendered(id: string, sessionId: string): void {\n\t\tconst actor = this.connections.get(id)?.actor;\n\t\tif (!actor) return;\n\t\tfor (const record of this.sessionSnapshots.get(sessionId) ?? []) if (record.rendered) actor.enqueue(record.line);\n\t}\n}\n"]}

package/dist/modes/rpc/session-event-writer.d.ts

@@ -1,3 +1,5 @@
+import { type SessionEventWriterConnection } from "./session-event-fanout.ts";
+export { RENDERED_COMPONENT_RECORD, type SessionEventWriterConnection } from "./session-event-fanout.ts";
 type RawWriter = (chunk: string) => void;
 type BackpressureWaiter = () => Promise<void>;
 type FlushScheduler = (flush: () => Promise<void>) => void;
@@ -10,19 +12,10 @@ type FlushScheduler = (flush: () => Promise<void>) => void;
  * by itself: coalescing records from different sessions would obscure the
  * scheduling boundary and violate D9.
  */
-export interface SessionEventWriterConnection {
-    readonly writeRaw: RawWriter;
-    readonly waitForBackpressure: BackpressureWaiter;
-}
-export declare const RENDERED_COMPONENT_RECORD = "__senpiRenderedComponent";
 export declare class SessionEventWriter {
     private readonly queues;
-    private readonly connections;
-    private readonly sessionSnapshots;
+    private readonly fanout;
     private readonly connectionContext;
-    private readonly connectionCapabilities;
-    private readonly connectionSessions;
-    private readonly registeredCapabilityConnections;
     private readonly controlQueue;
     private readonly readyQueues;
     private readonly sealedSessions;
@@ -50,7 +43,7 @@ export declare class SessionEventWriter {
     withConnection<T>(id: string, task: () => T): T;
     /** Connection id of the command currently being dispatched, when one owns it. */
     currentConnection(): string | undefined;
-    /** Queue a session record. Lifecycle/events are broadcast; responses/UI are targeted. */
+    /** Queue a session record. Content events target connections attached to the session. */
     enqueue(sessionId: string, value: object): boolean;
     /** Queue one untagged host-control response for the current connection. */
     enqueueControl(value: object): Promise<void>;
@@ -60,6 +53,8 @@ export declare class SessionEventWriter {
      * session's final stdout record.
      */
     closeSession(sessionId: string, response: object): void;
+    /** Queue a successful response for a joined close after the terminal lifecycle record. */
+    enqueueClosedResponse(sessionId: string, response: object): void;
     /**
      * Drops per-session bookkeeping for a handle whose runtime is fully disposed.
      * Routing handles are unique per process epoch, so nothing can legitimately
@@ -71,7 +66,6 @@ export declare class SessionEventWriter {
     flush(): Promise<void>;
     private drainUntilEmpty;
     private drainReadyQueues;
-    private rememberSnapshot;
     private connectionQueue;
     private appendSessionRecord;
     private demoteAndMerge;
@@ -82,5 +76,4 @@ export declare class SessionEventWriter {
     private fail;
     private allQueues;
 }
-export {};
 //# sourceMappingURL=session-event-writer.d.ts.map

package/dist/modes/rpc/session-event-writer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-event-writer.d.ts","sourceRoot":"","sources":["../../../src/modes/rpc/session-event-writer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-event-writer.d.ts","sourceRoot":"","sources":["../../../src/modes/rpc/session-event-writer.ts"],"names":[],"mappings":"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"}

package/dist/modes/rpc/session-event-writer.js

@@ -1,6 +1,7 @@
 import { AsyncLocalStorage } from "node:async_hooks";
 import { serializeJsonLine } from "./jsonl.js";
-import { SocketEventSinkActor } from "./socket-event-fanout.js";
+import { RENDERED_COMPONENT_RECORD, SessionEventFanout, } from "./session-event-fanout.js";
+export { RENDERED_COMPONENT_RECORD } from "./session-event-fanout.js";
 const MESSAGE_KEY = "message";
 const COMPACT_DELTA_TYPES = new Set(["text_delta", "thinking_delta", "toolcall_delta"]);
 function compactDelta(value) {
@@ -27,16 +28,20 @@ function toolUpdateKey(value) {
         ? `tool:${value.toolCallId}`
         : undefined;
 }
-export const RENDERED_COMPONENT_RECORD = "__senpiRenderedComponent";
+/**
+ * Process-wide stdout scheduler for multi-session RPC mode.
+ *
+ * Each queue contains complete structured JSONL records for one routing handle.
+ * Draining takes one record per queue in round-robin order and waits for stdout
+ * backpressure before selecting the next one. A record is deliberately written
+ * by itself: coalescing records from different sessions would obscure the
+ * scheduling boundary and violate D9.
+ */
 export class SessionEventWriter {
     constructor(writeRaw, waitOrSchedule, scheduleFlush) {
         this.queues = new Map();
-        this.connections = new Map();
-        this.sessionSnapshots = new Map();
+        this.fanout = new SessionEventFanout();
         this.connectionContext = new AsyncLocalStorage();
-        this.connectionCapabilities = new Map();
-        this.connectionSessions = new Map();
-        this.registeredCapabilityConnections = new Set();
         this.controlQueue = { latestByKey: new Map(), ready: false };
         this.readyQueues = [];
         this.sealedSessions = new Set();
@@ -68,78 +73,31 @@ export class SessionEventWriter {
         return bytes;
     }
     registerConnection(id, connection) {
-        const actor = new SocketEventSinkActor(connection, () => {
-            if (this.connections.get(id)?.actor === actor) {
-                this.connections.delete(id);
-                this.connectionCapabilities.delete(id);
-                this.connectionSessions.delete(id);
-                this.registeredCapabilityConnections.delete(id);
-            }
-        });
-        this.connections.set(id, { connection, actor });
-        this.connectionCapabilities.set(id, new Set());
-        this.connectionSessions.set(id, new Set());
-        for (const snapshot of this.sessionSnapshots.values())
-            for (const record of snapshot)
-                if (!record.rendered)
-                    actor.enqueue(record.line);
+        this.fanout.registerConnection(id, connection);
     }
     unregisterConnection(id) {
-        const registered = this.connections.get(id);
-        if (!registered)
-            return;
-        registered.actor.close();
-        this.connections.delete(id);
-        this.connectionCapabilities.delete(id);
-        this.connectionSessions.delete(id);
-        this.registeredCapabilityConnections.delete(id);
+        this.fanout.unregisterConnection(id);
     }
     attachConnectionToSession(id, sessionId) {
-        if (!this.connections.has(id))
-            return;
-        const sessions = this.connectionSessions.get(id) ?? new Set();
-        sessions.add(sessionId);
-        this.connectionSessions.set(id, sessions);
-        if (this.connectionCapabilities.get(id)?.has("rendered_components"))
-            for (const record of this.sessionSnapshots.get(sessionId) ?? [])
-                if (record.rendered)
-                    this.connections.get(id).actor.enqueue(record.line);
+        this.fanout.attachConnectionToSession(id, sessionId);
     }
     detachConnectionFromSession(id, sessionId) {
-        this.connectionSessions.get(id)?.delete(sessionId);
+        this.fanout.detachConnectionFromSession(id, sessionId);
     }
     setConnectionCapabilities(id, capabilities) {
-        const registered = this.connections.get(id);
-        if (!registered)
-            return;
-        const wasCapable = this.connectionCapabilities.get(id)?.has("rendered_components") ?? false;
-        this.connectionCapabilities.set(id, new Set(capabilities));
-        this.registeredCapabilityConnections.add(id);
-        if (!wasCapable && capabilities.includes("rendered_components"))
-            for (const sessionId of this.connectionSessions.get(id) ?? [])
-                for (const record of this.sessionSnapshots.get(sessionId) ?? [])
-                    if (record.rendered)
-                        registered.actor.enqueue(record.line);
+        this.fanout.setConnectionCapabilities(id, capabilities);
     }
     clearConnectionCapabilities(id) {
-        if (this.connections.has(id)) {
-            this.connectionCapabilities.set(id, new Set());
-            this.registeredCapabilityConnections.delete(id);
-        }
+        this.fanout.clearConnectionCapabilities(id);
     }
     hasRegisteredConnectionCapabilities(id) {
-        return this.registeredCapabilityConnections.has(id);
+        return this.fanout.hasRegisteredConnectionCapabilities(id);
     }
     getConnectionCapabilities(id) {
-        if (!this.registeredCapabilityConnections.has(id))
-            return undefined;
-        return [...(this.connectionCapabilities.get(id) ?? [])];
+        return this.fanout.getConnectionCapabilities(id);
     }
     hasCapableConnection(sessionId) {
-        for (const [id, capabilities] of this.connectionCapabilities)
-            if (capabilities.has("rendered_components") && this.connectionSessions.get(id)?.has(sessionId))
-                return true;
-        return false;
+        return this.fanout.hasCapableConnection(sessionId);
     }
     /** Execute a connection's command with its response destination in context. */
     withConnection(id, task) {
@@ -149,7 +107,7 @@ export class SessionEventWriter {
     currentConnection() {
         return this.connectionContext.getStore();
     }
-    /** Queue a session record. Lifecycle/events are broadcast; responses/UI are targeted. */
+    /** Queue a session record. Content events target connections attached to the session. */
     enqueue(sessionId, value) {
         if (this.sealedSessions.has(sessionId))
             return false;
@@ -162,19 +120,13 @@ export class SessionEventWriter {
         const tagged = { ...value, sessionId };
         const { [RENDERED_COMPONENT_RECORD]: _rendered, ...wireTagged } = tagged;
         const line = serializeJsonLine(wireTagged);
-        this.rememberSnapshot(sessionId, tagged, line);
-        const targets = isTargeted
-            ? [targetId]
-            : record[RENDERED_COMPONENT_RECORD] && this.connections.size > 0
-                ? [...this.connections.keys()].filter((id) => this.connectionCapabilities.get(id)?.has("rendered_components") &&
-                    this.connectionSessions.get(id)?.has(sessionId))
-                : this.connections.size > 0
-                    ? [...this.connections.keys()]
-                    : [undefined];
+        if (!isTargeted)
+            this.fanout.rememberSnapshot(sessionId, tagged, line);
+        const targets = this.fanout.targets(sessionId, targetId, isTargeted, record[RENDERED_COMPONENT_RECORD] === true, record.type);
         for (const target of targets) {
-            if (target !== undefined && !this.connections.has(target))
+            if (target !== undefined && !this.fanout.get(target))
                 continue;
-            const registered = target === undefined ? undefined : this.connections.get(target);
+            const registered = target === undefined ? undefined : this.fanout.get(target);
             if (registered)
                 registered.actor.enqueue(line, compactDelta(tagged) && tagged.message !== null ? MESSAGE_KEY : undefined);
             else
@@ -188,7 +140,7 @@ export class SessionEventWriter {
         if (this.failure !== undefined)
             return Promise.reject(this.failure);
         const targetId = this.connectionContext.getStore();
-        const registered = targetId === undefined ? undefined : this.connections.get(targetId);
+        const registered = targetId === undefined ? undefined : this.fanout.get(targetId);
         if (registered) {
             registered.actor.enqueue(serializeJsonLine(value));
             return Promise.resolve();
@@ -212,11 +164,23 @@ export class SessionEventWriter {
         this.sealedSessions.add(sessionId);
         const targetId = this.connectionContext.getStore();
         const lifecycle = { type: "session_closed", sessionId };
-        for (const connectionId of this.connections.keys()) {
-            this.connections.get(connectionId).actor.enqueue(serializeJsonLine(lifecycle));
-        }
+        if (this.fanout.isEmpty())
+            this.appendSessionRecord(sessionId, lifecycle);
+        else
+            this.fanout.broadcast(serializeJsonLine(lifecycle));
         const taggedResponse = { ...response, sessionId };
-        const registered = targetId === undefined ? undefined : this.connections.get(targetId);
+        const registered = targetId === undefined ? undefined : this.fanout.get(targetId);
+        if (registered)
+            registered.actor.enqueue(serializeJsonLine(taggedResponse));
+        else
+            this.appendSessionRecord(sessionId, taggedResponse, targetId);
+        this.requestFlush();
+    }
+    /** Queue a successful response for a joined close after the terminal lifecycle record. */
+    enqueueClosedResponse(sessionId, response) {
+        const targetId = this.connectionContext.getStore();
+        const taggedResponse = { ...response, sessionId };
+        const registered = targetId === undefined ? undefined : this.fanout.get(targetId);
         if (registered)
             registered.actor.enqueue(serializeJsonLine(taggedResponse));
         else
@@ -231,7 +195,7 @@ export class SessionEventWriter {
      */
     forgetSession(sessionId) {
         this.sealedSessions.delete(sessionId);
-        this.sessionSnapshots.delete(sessionId);
+        this.fanout.forgetSession(sessionId);
     }
     /** Drain every retained lane and the current in-flight record. */
     flush() {
@@ -241,7 +205,7 @@ export class SessionEventWriter {
         if (this.drainPromise)
             return this.drainPromise;
         if (this.readyQueues.length === 0)
-            return Promise.all([...this.connections.values()].map(({ actor }) => actor.flush())).then(() => undefined);
+            return Promise.all([...this.fanout.values()].map(({ actor }) => actor.flush())).then(() => undefined);
         let resolveDrain;
         let rejectDrain;
         const drain = new Promise((resolve, reject) => {
@@ -266,7 +230,7 @@ export class SessionEventWriter {
         do {
             await this.drainReadyQueues();
         } while (this.readyQueues.length > 0);
-        await Promise.all([...this.connections.values()].map(({ actor }) => actor.flush()));
+        await Promise.all([...this.fanout.values()].map(({ actor }) => actor.flush()));
     }
     async drainReadyQueues() {
         while (this.readyQueues.length > 0) {
@@ -280,7 +244,7 @@ export class SessionEventWriter {
             try {
                 // D9: exactly one complete record per raw write. The next lane is not
                 // selected until this record has cleared stdout backpressure.
-                const connection = queue.targetId ? this.connections.get(queue.targetId)?.connection : undefined;
+                const connection = queue.targetId ? this.fanout.get(queue.targetId)?.connection : undefined;
                 const writeRaw = connection?.writeRaw ?? this.writeRaw;
                 const waitForBackpressure = connection?.waitForBackpressure ?? this.waitForBackpressure;
                 if (!connection && queue.targetId) {
@@ -311,18 +275,6 @@ export class SessionEventWriter {
             }
         }
     }
-    rememberSnapshot(sessionId, value, line) {
-        const event = value.assistantMessageEvent;
-        const record = { line, rendered: value[RENDERED_COMPONENT_RECORD] === true };
-        if (value.type === "message_start" || (value.type === "message_update" && event?.type === "text_start")) {
-            this.sessionSnapshots.set(sessionId, [record]);
-        }
-        else if (this.sessionSnapshots.has(sessionId)) {
-            this.sessionSnapshots.get(sessionId).push(record);
-        }
-        if (value.type === "message_end")
-            this.sessionSnapshots.delete(sessionId);
-    }
     connectionQueue(targetId) {
         const key = `connection:${targetId}`;
         let queue = this.queues.get(key);