agent-canvas 0.1.4 → 0.1.7

package/daemon/src/server.ts

@@ -1,12 +1,13 @@
-import { join, resolve, dirname } from "path";
-import { readdir } from "fs/promises";
 import { writeFileSync, mkdirSync } from "fs";
+import { join } from "path";
 import { tmpdir } from "os";
-import { DATA_DIR } from "./paths";
 import { SessionManager } from "./session";
-import { compilePlan } from "./compiler";
-import { watchSession } from "./watcher";
-import { LANG_MAP } from "../langMap";
+import { createWebSocketManager, type WSData } from "./websocket";
+import { dispatch } from "./router";
+import { jsonResponse, corsHeaders } from "./handlers/utils";
+import { createApiHandlers } from "./handlers/api";
+import { createFileHandlers } from "./handlers/files";
+import { createStaticHandlers } from "./handlers/static";
 
 const PORT = parseInt(process.env.CANVAS_PORT || "19400", 10);
 
@@ -14,146 +15,49 @@ const PORT = parseInt(process.env.CANVAS_PORT || "19400", 10);
 const pidDir = join(tmpdir(), "agent-canvas");
 mkdirSync(pidDir, { recursive: true });
 writeFileSync(join(pidDir, "daemon.pid"), String(process.pid));
-const sessionManager = new SessionManager();
-
-function jsonResponse(data: unknown, status = 200): Response {
-  return new Response(JSON.stringify(data), {
-    status,
-    headers: { "Content-Type": "application/json" },
-  });
-}
 
-function corsHeaders(headers: Record<string, string> = {}): Record<string, string> {
-  return {
-    "Access-Control-Allow-Origin": "http://localhost:" + PORT,
-    "Access-Control-Allow-Methods": "GET, POST, OPTIONS",
-    "Access-Control-Allow-Headers": "Content-Type",
-    ...headers,
-  };
-}
-
-// WebSocket connections
-type WS<T = undefined> = import("bun").ServerWebSocket<T>;
-const browserSockets = new Map<string, Set<WS<{ type: string; sessionId: string }>>>();
-const waitSockets = new Map<string, Set<WS<{ type: string; sessionId: string }>>>();
+const sessionManager = new SessionManager();
+const wsManager = createWebSocketManager(sessionManager);
 
-type WSData = { type: "browser" | "wait"; sessionId: string };
+const routes = [
+  ...createApiHandlers({ sessionManager, broadcastPlanUpdate: wsManager.broadcastPlanUpdate, port: PORT }),
+  ...createFileHandlers(sessionManager),
+  ...createStaticHandlers(),
+];
 
 const server = Bun.serve<WSData>({
   port: PORT,
   hostname: "localhost",
   fetch(req, server) {
     const url = new URL(req.url);
-    const path = url.pathname;
 
-    // OPTIONS (CORS preflight)
+    // CORS preflight
     if (req.method === "OPTIONS") {
-      return new Response(null, { status: 204, headers: corsHeaders() });
-    }
-
-    // Health
-    if (path === "/health" && req.method === "GET") {
-      const sessions = sessionManager.list().map((s) => s.id);
-      return jsonResponse({ ok: true, sessions });
-    }
-
-    // POST /api/session/:id/plan
-    const planPostMatch = path.match(/^\/api\/session\/([^/]+)\/plan$/);
-    if (planPostMatch && req.method === "POST") {
-      const sessionId = planPostMatch[1];
-      return handlePlanPost(req, sessionId);
-    }
-
-    // GET /api/session/:id/plan.js?rev=N
-    const planJsMatch = path.match(/^\/api\/session\/([^/]+)\/plan\.js$/);
-    if (planJsMatch && req.method === "GET") {
-      const sessionId = planJsMatch[1];
-      const revParam = url.searchParams.get("rev");
-      const rev = revParam ? parseInt(revParam, 10) : undefined;
-      return handlePlanJs(sessionId, rev);
-    }
-
-    // GET /api/session/:id/meta
-    const metaMatch = path.match(/^\/api\/session\/([^/]+)\/meta$/);
-    if (metaMatch && req.method === "GET") {
-      const sessionId = metaMatch[1];
-      const session = sessionManager.get(sessionId);
-      if (!session) return jsonResponse({ error: "Session not found" }, 404);
-      return jsonResponse({
-        projectRoot: session.projectRoot,
-        currentRevision: session.currentRevision,
-        revisions: session.revisions,
-        createdAt: session.createdAt,
-        updatedAt: session.updatedAt,
-      });
-    }
-
-    // GET /api/session/:id/revision/:rev/feedback
-    const feedbackMatch = path.match(/^\/api\/session\/([^/]+)\/revision\/(\d+)\/feedback$/);
-    if (feedbackMatch && req.method === "GET") {
-      const sessionId = feedbackMatch[1];
-      const rev = parseInt(feedbackMatch[2], 10);
-      const feedback = sessionManager.getFeedback(sessionId, rev);
-      if (feedback === null) return jsonResponse({ error: "No feedback" }, 404);
-      return jsonResponse({ feedback });
-    }
-
-    // GET /api/sessions
-    if (path === "/api/sessions" && req.method === "GET") {
-      return jsonResponse(sessionManager.list().map((s) => ({
-        id: s.id,
-        projectRoot: s.projectRoot,
-        currentRevision: s.currentRevision,
-        updatedAt: s.updatedAt,
-      })));
-    }
-
-    // GET /api/file
-    if (path === "/api/file" && req.method === "GET") {
-      return handleFileServe(url);
-    }
-
-    // GET /api/image
-    if (path === "/api/image" && req.method === "GET") {
-      return handleImageServe(url);
-    }
-
-    // GET /api/tree
-    if (path === "/api/tree" && req.method === "GET") {
-      return handleTreeServe(url);
+      return new Response(null, { status: 204, headers: corsHeaders(PORT) });
     }
 
     // WebSocket upgrade: /ws/session/:id
-    const wsBrowserMatch = path.match(/^\/ws\/session\/([^/]+)$/);
+    const wsBrowserMatch = url.pathname.match(/^\/ws\/session\/([^/]+)$/);
     if (wsBrowserMatch) {
-      const sessionId = wsBrowserMatch[1];
-      const upgraded = server.upgrade(req, { data: { type: "browser", sessionId } });
+      const upgraded = server.upgrade(req, { data: { type: "browser", sessionId: wsBrowserMatch[1] } });
       if (!upgraded) return new Response("WebSocket upgrade failed", { status: 400 });
       return undefined as any;
     }
 
     // WebSocket upgrade: /ws/wait/:id
-    const wsWaitMatch = path.match(/^\/ws\/wait\/([^/]+)$/);
+    const wsWaitMatch = url.pathname.match(/^\/ws\/wait\/([^/]+)$/);
     if (wsWaitMatch) {
-      const sessionId = wsWaitMatch[1];
-      const upgraded = server.upgrade(req, { data: { type: "wait", sessionId } });
+      const upgraded = server.upgrade(req, { data: { type: "wait", sessionId: wsWaitMatch[1] } });
       if (!upgraded) return new Response("WebSocket upgrade failed", { status: 400 });
       return undefined as any;
     }
 
-    // GET /s/:id — serve session UI
-    const sessionPageMatch = path.match(/^\/s\/([^/]+)$/);
-    if (sessionPageMatch && req.method === "GET") {
-      return serveSessionPage(sessionPageMatch[1]);
-    }
-
-    // GET /assets/* — static files
-    if (path.startsWith("/assets/") && req.method === "GET") {
-      return serveStaticAsset(path);
-    }
+    // Route dispatch
+    const response = dispatch(routes, req, url);
+    if (response) return response;
 
-    // GET / — redirect to last active session or list
-    if (path === "/" && req.method === "GET") {
+    // Root redirect
+    if (url.pathname === "/" && req.method === "GET") {
       const sessions = sessionManager.list();
       if (sessions.length > 0) {
         const latest = sessions.sort((a, b) =>
@@ -167,291 +71,12 @@ const server = Bun.serve<WSData>({
     return jsonResponse({ error: "Not found" }, 404);
   },
 
-  websocket: {
-    open(ws) {
-      const { type, sessionId } = ws.data;
-      const map = type === "browser" ? browserSockets : waitSockets;
-      if (!map.has(sessionId)) map.set(sessionId, new Set());
-      map.get(sessionId)!.add(ws);
-    },
-    message(ws, message) {
-      const { type, sessionId } = ws.data;
-      if (type === "browser") {
-        // Browser sends submit
-        try {
-          const data = JSON.parse(typeof message === "string" ? message : new TextDecoder().decode(message));
-          if (data.type === "submit") {
-            const feedback = data.feedback as string;
-
-            // Persist feedback to current revision
-            const session = sessionManager.get(sessionId);
-            if (session) {
-              sessionManager.saveFeedback(sessionId, session.currentRevision, feedback);
-              // Notify browsers that revision metadata changed
-              broadcastRevisionUpdate(sessionId);
-            }
-
-            // Forward to all waiting CLI sockets
-            const waiters = waitSockets.get(sessionId);
-            if (waiters) {
-              const payload = JSON.stringify({ type: "submit", feedback });
-              for (const waiter of waiters) {
-                waiter.send(payload);
-                waiter.close();
-              }
-              waitSockets.delete(sessionId);
-            }
-          }
-        } catch {}
-      }
-    },
-    close(ws) {
-      const { type, sessionId } = ws.data;
-      const map = type === "browser" ? browserSockets : waitSockets;
-      map.get(sessionId)?.delete(ws);
-      if (map.get(sessionId)?.size === 0) map.delete(sessionId);
-    },
-  },
+  websocket: wsManager.handlers,
 });
 
-async function handlePlanPost(req: Request, sessionId: string): Promise<Response> {
-  try {
-    const body = await req.json();
-    const { jsx, projectRoot, label, sourceFile } = body;
-    if (!jsx) return jsonResponse({ error: "Missing jsx" }, 400);
-
-    const isNew = !sessionManager.get(sessionId);
-    const session = sessionManager.upsert(sessionId, jsx, projectRoot || process.cwd(), label, sourceFile);
-
-    const result = await compilePlan(jsx, session.projectRoot);
-    if (result.ok) {
-      sessionManager.saveCompiled(sessionId, result.js, session.currentRevision);
-      broadcastPlanUpdate(sessionId);
-    }
-
-    // Start watching for file changes
-    watchSession(sessionId, sessionManager, broadcastPlanUpdate);
-
-    const browserUrl = `http://localhost:${PORT}/s/${sessionId}`;
-    return jsonResponse({
-      ok: result.ok,
-      browserUrl,
-      isNew,
-      revision: session.currentRevision,
-      error: result.ok ? undefined : result.error,
-    });
-  } catch (e: any) {
-    return jsonResponse({ error: e.message }, 500);
-  }
-}
-
-async function handlePlanJs(sessionId: string, rev?: number): Promise<Response> {
-  let compiled = sessionManager.getCompiled(sessionId, rev);
-
-  // On-demand compilation for historical revisions without compiled JS
-  if (!compiled && rev) {
-    const session = sessionManager.get(sessionId);
-    if (session) {
-      const jsx = readRevisionJsx(sessionId, rev);
-      if (jsx) {
-        const result = await compilePlan(jsx, session.projectRoot);
-        if (result.ok) {
-          sessionManager.saveCompiled(sessionId, result.js, rev);
-          compiled = result.js;
-        }
-      }
-    }
-  }
-
-  if (!compiled) return jsonResponse({ error: "No compiled plan" }, 404);
-  return new Response(compiled, {
-    headers: {
-      "Content-Type": "application/javascript",
-      "Cache-Control": "no-cache",
-    },
-  });
-}
-
-function readRevisionJsx(sessionId: string, rev: number): string | null {
-  try {
-    const path = sessionManager.getRevisionJsxPath(sessionId, rev);
-    return require("fs").readFileSync(path, "utf-8");
-  } catch {
-    return null;
-  }
-}
-
-function broadcastPlanUpdate(sessionId: string) {
-  const sockets = browserSockets.get(sessionId);
-  if (!sockets) return;
-  const session = sessionManager.get(sessionId);
-  if (!session) return;
-  const payload = JSON.stringify({
-    type: "plan-updated",
-    currentRevision: session.currentRevision,
-    revisions: session.revisions,
-  });
-  for (const ws of sockets) {
-    ws.send(payload);
-  }
-}
-
-function broadcastRevisionUpdate(sessionId: string) {
-  const sockets = browserSockets.get(sessionId);
-  if (!sockets) return;
-  const session = sessionManager.get(sessionId);
-  if (!session) return;
-  const payload = JSON.stringify({
-    type: "revision-updated",
-    revisions: session.revisions,
-  });
-  for (const ws of sockets) {
-    ws.send(payload);
-  }
-}
-
-async function handleFileServe(url: URL): Promise<Response> {
-  const sessionId = url.searchParams.get("session");
-  const relPath = url.searchParams.get("path");
-  if (!sessionId || !relPath) return jsonResponse({ error: "Missing session or path" }, 400);
-
-  const session = sessionManager.get(sessionId);
-  if (!session) return jsonResponse({ error: "Session not found" }, 404);
-
-  const fullPath = resolve(join(session.projectRoot, relPath));
-  if (!fullPath.startsWith(resolve(session.projectRoot))) {
-    return jsonResponse({ error: "Path traversal rejected" }, 403);
-  }
-
-  try {
-    const file = Bun.file(fullPath);
-    const stat = await file.exists();
-    if (!stat) return jsonResponse({ error: "File not found" }, 404);
-    if (file.size > 1024 * 1024) return jsonResponse({ error: "File too large" }, 413);
-
-    const content = await file.text();
-    const ext = relPath.split(".").pop() || "";
-    return jsonResponse({ content, language: LANG_MAP[ext] || "text" });
-  } catch {
-    return jsonResponse({ error: "Failed to read file" }, 500);
-  }
-}
-
-const IMAGE_MIME: Record<string, string> = {
-  png: "image/png", jpg: "image/jpeg", jpeg: "image/jpeg",
-  gif: "image/gif", svg: "image/svg+xml", webp: "image/webp",
-  ico: "image/x-icon", bmp: "image/bmp", avif: "image/avif",
-};
-
-async function handleImageServe(url: URL): Promise<Response> {
-  const sessionId = url.searchParams.get("session");
-  const relPath = url.searchParams.get("path");
-  if (!sessionId || !relPath) return jsonResponse({ error: "Missing session or path" }, 400);
-
-  const session = sessionManager.get(sessionId);
-  if (!session) return jsonResponse({ error: "Session not found" }, 404);
-
-  const fullPath = resolve(join(session.projectRoot, relPath));
-  if (!fullPath.startsWith(resolve(session.projectRoot))) {
-    return jsonResponse({ error: "Path traversal rejected" }, 403);
-  }
-
-  try {
-    const file = Bun.file(fullPath);
-    if (!(await file.exists())) return jsonResponse({ error: "File not found" }, 404);
-    if (file.size > 10 * 1024 * 1024) return jsonResponse({ error: "File too large" }, 413);
-
-    const ext = relPath.split(".").pop()?.toLowerCase() || "";
-    const mime = IMAGE_MIME[ext];
-    if (!mime) return jsonResponse({ error: "Unsupported image format" }, 415);
-
-    return new Response(file, {
-      headers: {
-        "Content-Type": mime,
-        "Cache-Control": "public, max-age=300",
-      },
-    });
-  } catch {
-    return jsonResponse({ error: "Failed to read file" }, 500);
-  }
-}
-
-async function handleTreeServe(url: URL): Promise<Response> {
-  const sessionId = url.searchParams.get("session");
-  const relPath = url.searchParams.get("path") || "";
-  if (!sessionId) return jsonResponse({ error: "Missing session" }, 400);
-
-  const session = sessionManager.get(sessionId);
-  if (!session) return jsonResponse({ error: "Session not found" }, 404);
-
-  const fullPath = resolve(join(session.projectRoot, relPath));
-  if (!fullPath.startsWith(resolve(session.projectRoot))) {
-    return jsonResponse({ error: "Path traversal rejected" }, 403);
-  }
-  const ignoreDirs = new Set([".git", "node_modules", ".next", "__pycache__", "dist", ".cache"]);
-
-  try {
-    const dirents = await readdir(fullPath, { withFileTypes: true });
-    const entries = dirents
-      .filter((d) => !ignoreDirs.has(d.name) && !d.name.startsWith("."))
-      .map((d) => ({
-        name: d.name,
-        type: d.isDirectory() ? "dir" : "file",
-      }))
-      .sort((a, b) => {
-        if (a.type !== b.type) return a.type === "dir" ? -1 : 1;
-        return a.name.localeCompare(b.name);
-      });
-    return jsonResponse({ entries });
-  } catch {
-    return jsonResponse({ error: "Failed to read directory" }, 500);
-  }
-}
-
-let cachedDistDir: string | null = null;
-async function getDistDir(): Promise<string> {
-  if (cachedDistDir) return cachedDistDir;
-  const localDist = join(dirname(import.meta.dir), "dist");
-  if (await Bun.file(join(localDist, "index.html")).exists()) {
-    cachedDistDir = localDist;
-  } else {
-    cachedDistDir = join(DATA_DIR, "daemon");
-  }
-  return cachedDistDir;
-}
-
-async function serveSessionPage(_sessionId: string): Promise<Response> {
-  const distDir = await getDistDir();
-  const file = Bun.file(join(distDir, "index.html"));
-  if (await file.exists()) {
-    return new Response(file, { headers: { "Content-Type": "text/html" } });
-  }
-  return new Response("Build not found. Run: bun run daemon/build.ts", { status: 500 });
-}
-
-async function serveStaticAsset(path: string): Promise<Response> {
-  const distDir = await getDistDir();
-  const assetPath = join(distDir, path.replace("/assets/", ""));
-  const file = Bun.file(assetPath);
-  if (!(await file.exists())) return new Response("Not found", { status: 404 });
-
-  const ext = path.split(".").pop() || "";
-  const mimeTypes: Record<string, string> = {
-    js: "application/javascript",
-    css: "text/css",
-    html: "text/html",
-    svg: "image/svg+xml",
-    png: "image/png",
-  };
-  return new Response(file, {
-    headers: { "Content-Type": mimeTypes[ext] || "application/octet-stream" },
-  });
-}
-
-// Export for file watcher to use
-export { broadcastPlanUpdate, sessionManager, server };
+export { sessionManager, server };
+export const broadcastPlanUpdate = wsManager.broadcastPlanUpdate;
 
-// Periodically clean up stale sessions (every hour)
 setInterval(() => sessionManager.cleanupStale(), 60 * 60 * 1000);
 
 console.log(`Planner daemon listening on http://localhost:${PORT}`);

package/daemon/src/session.ts

@@ -8,6 +8,7 @@ export interface RevisionInfo {
   sourceFile?: string;
   createdAt: string;
   hasFeedback: boolean;
+  feedbackConsumed: boolean;
 }
 
 export interface SessionData {
@@ -119,7 +120,7 @@ export class SessionManager {
         const revDir = this.revisionDir(id, num);
         mkdirSync(revDir, { recursive: true });
         renameSync(join(historyDir, file), join(revDir, "plan.jsx"));
-        revisions.push({ revision: num, createdAt: legacy.createdAt, hasFeedback: false });
+        revisions.push({ revision: num, createdAt: legacy.createdAt, hasFeedback: false, feedbackConsumed: false });
       }
       rmSync(historyDir, { recursive: true, force: true });
     }
@@ -134,7 +135,7 @@ export class SessionManager {
     if (existsSync(flatCompiled)) {
       renameSync(flatCompiled, join(revDir, "plan.compiled.js"));
     }
-    revisions.push({ revision: currentRev, createdAt: legacy.updatedAt, hasFeedback: false });
+    revisions.push({ revision: currentRev, createdAt: legacy.updatedAt, hasFeedback: false, feedbackConsumed: false });
 
     // Write new meta
     const meta: SessionMeta = {
@@ -160,7 +161,7 @@ export class SessionManager {
     const now = new Date().toISOString();
     const revision = existing ? existing.currentRevision + 1 : 1;
 
-    const revInfo: RevisionInfo = { revision, createdAt: now, hasFeedback: false, ...(label ? { label } : {}), ...(sourceFile ? { sourceFile } : {}) };
+    const revInfo: RevisionInfo = { revision, createdAt: now, hasFeedback: false, feedbackConsumed: false, ...(label ? { label } : {}), ...(sourceFile ? { sourceFile } : {}) };
     const revisions = existing ? [...existing.revisions, revInfo] : [revInfo];
 
     const session: SessionData = {
@@ -178,15 +179,7 @@ export class SessionManager {
     return session;
   }
 
-  private persistToDisk(session: SessionData) {
-    const dir = this.sessionDir(session.id);
-    const revDir = this.revisionDir(session.id, session.currentRevision);
-    mkdirSync(revDir, { recursive: true });
-
-    // Write revision JSX
-    writeFileSync(join(revDir, "plan.jsx"), session.jsx);
-
-    // Write meta
+  private persistMeta(session: SessionData) {
     const meta: SessionMeta = {
       projectRoot: session.projectRoot,
       createdAt: session.createdAt,
@@ -194,7 +187,14 @@ export class SessionManager {
       currentRevision: session.currentRevision,
       revisions: session.revisions,
     };
-    writeFileSync(join(dir, "meta.json"), JSON.stringify(meta, null, 2));
+    writeFileSync(join(this.sessionDir(session.id), "meta.json"), JSON.stringify(meta, null, 2));
+  }
+
+  private persistToDisk(session: SessionData) {
+    const revDir = this.revisionDir(session.id, session.currentRevision);
+    mkdirSync(revDir, { recursive: true });
+    writeFileSync(join(revDir, "plan.jsx"), session.jsx);
+    this.persistMeta(session);
   }
 
   get(id: string): SessionData | undefined {
@@ -235,19 +235,14 @@ export class SessionManager {
     mkdirSync(revDir, { recursive: true });
     writeFileSync(join(revDir, "feedback.md"), markdown);
 
-    // Update in-memory and on-disk meta
     const session = this.sessions.get(id);
     if (session) {
       const ri = session.revisions.find((r) => r.revision === rev);
-      if (ri) ri.hasFeedback = true;
-      const meta: SessionMeta = {
-        projectRoot: session.projectRoot,
-        createdAt: session.createdAt,
-        updatedAt: session.updatedAt,
-        currentRevision: session.currentRevision,
-        revisions: session.revisions,
-      };
-      writeFileSync(join(this.sessionDir(id), "meta.json"), JSON.stringify(meta, null, 2));
+      if (ri) {
+        ri.hasFeedback = true;
+        ri.feedbackConsumed = false;
+      }
+      this.persistMeta(session);
     }
   }
 
@@ -259,6 +254,29 @@ export class SessionManager {
     }
   }
 
+  consumeFeedback(id: string, rev: number) {
+    const session = this.sessions.get(id);
+    if (!session) return;
+    const ri = session.revisions.find((r) => r.revision === rev);
+    if (!ri || !ri.hasFeedback || ri.feedbackConsumed) return;
+    ri.feedbackConsumed = true;
+    this.persistMeta(session);
+  }
+
+  getLatestUnconsumedFeedback(id: string): { revision: number; feedback: string } | null {
+    const session = this.sessions.get(id);
+    if (!session) return null;
+    // Search from newest to oldest
+    for (let i = session.revisions.length - 1; i >= 0; i--) {
+      const ri = session.revisions[i];
+      if (ri.hasFeedback && !ri.feedbackConsumed) {
+        const feedback = this.getFeedback(id, ri.revision);
+        if (feedback) return { revision: ri.revision, feedback };
+      }
+    }
+    return null;
+  }
+
   getRevisionJsxPath(id: string, rev: number): string {
     return join(this.revisionDir(id, rev), "plan.jsx");
   }

package/daemon/src/websocket.ts

@@ -0,0 +1,83 @@
+import type { ServerWebSocket } from "bun";
+import type { SessionManager } from "./session";
+
+export type WSData = { type: "browser" | "wait"; sessionId: string };
+
+export function createWebSocketManager(sessionManager: SessionManager) {
+  const browserSockets = new Map<string, Set<ServerWebSocket<WSData>>>();
+  const waitSockets = new Map<string, Set<ServerWebSocket<WSData>>>();
+
+  function broadcastPlanUpdate(sessionId: string) {
+    const sockets = browserSockets.get(sessionId);
+    if (!sockets) return;
+    const session = sessionManager.get(sessionId);
+    if (!session) return;
+    const payload = JSON.stringify({
+      type: "plan-updated",
+      currentRevision: session.currentRevision,
+      revisions: session.revisions,
+    });
+    for (const ws of sockets) {
+      ws.send(payload);
+    }
+  }
+
+  function broadcastRevisionUpdate(sessionId: string) {
+    const sockets = browserSockets.get(sessionId);
+    if (!sockets) return;
+    const session = sessionManager.get(sessionId);
+    if (!session) return;
+    const payload = JSON.stringify({
+      type: "revision-updated",
+      revisions: session.revisions,
+    });
+    for (const ws of sockets) {
+      ws.send(payload);
+    }
+  }
+
+  const handlers = {
+    open(ws: ServerWebSocket<WSData>) {
+      const { type, sessionId } = ws.data;
+      const map = type === "browser" ? browserSockets : waitSockets;
+      if (!map.has(sessionId)) map.set(sessionId, new Set());
+      map.get(sessionId)!.add(ws);
+    },
+    message(ws: ServerWebSocket<WSData>, message: string | Buffer) {
+      const { type, sessionId } = ws.data;
+      if (type === "browser") {
+        try {
+          const data = JSON.parse(typeof message === "string" ? message : new TextDecoder().decode(message));
+          if (data.type === "submit") {
+            const feedback = data.feedback as string;
+
+            const session = sessionManager.get(sessionId);
+            if (session) {
+              sessionManager.saveFeedback(sessionId, session.currentRevision, feedback);
+              broadcastRevisionUpdate(sessionId);
+
+              const waiters = waitSockets.get(sessionId);
+              if (waiters && waiters.size > 0) {
+                sessionManager.consumeFeedback(sessionId, session.currentRevision);
+                const payload = JSON.stringify({ type: "submit", feedback });
+                for (const waiter of waiters) {
+                  waiter.send(payload);
+                  waiter.close();
+                }
+                waitSockets.delete(sessionId);
+              }
+            }
+          }
+        } catch {}
+      }
+    },
+    close(ws: ServerWebSocket<WSData>) {
+      const { type, sessionId } = ws.data;
+      const map = type === "browser" ? browserSockets : waitSockets;
+      map.get(sessionId)?.delete(ws);
+      if (map.get(sessionId)?.size === 0) map.delete(sessionId);
+    },
+  };
+
+  return { handlers, broadcastPlanUpdate, broadcastRevisionUpdate };
+}