Commit 5a755ada28fa8da9d435f2e1f14697e83f4aa6db | the-knife

author	Julius Marminge <julius0216@outlook.com> 2026-02-25 18:01:07-08:00
committer	Julius Marminge <jmarminge@gmail.com> 2026-02-26 13:20:36-08:00
log	5a755ada28fa8da9d435f2e1f14697e83f4aa6db
tree	4839da3b79b19f57e1d3cde38994131cbcb79199
parent	b211d059d2b88e3ffce38b5e9b59cdc7b2e0259a

nits

3 files changed, 33 insertions(+), 29 deletions(-)

apps
- server
  - src
    wsServer.ts
- web
  - src
    session-logic.test.ts
    session-logic.ts

apps/server/src/wsServer.ts+30-27

 @@ -183,23 +183,22 @@ export const createServer = Effect.fn(function* (options: ServerOptions = {}): E
     });
   }
-  const onTerminalEvent = (event: TerminalEvent) =>
+  const onTerminalEvent = Effect.fnUntraced(function* (event: TerminalEvent) {
-    Effect.gen(function* () {
+    const push: WsPush = {
-      const push: WsPush = {
+      type: "push",
-        type: "push",
+      channel: WS_CHANNELS.terminalEvent,
-        channel: WS_CHANNELS.terminalEvent,
+      data: event,
-        data: event,
+    };
-      };
+    const message = yield* Schema.encodeEffect(Schema.fromJsonString(WsPush))(push);
-      const message = yield* Schema.encodeEffect(Schema.fromJsonString(WsPush))(push);
+    let recipients = 0;
-      let recipients = 0;
+    for (const client of yield* Ref.get(clients)) {
-      for (const client of yield* Ref.get(clients)) {
+      if (client.readyState === client.OPEN) {
-        if (client.readyState === client.OPEN) {
+        client.send(message);
-          client.send(message);
+        recipients += 1;
-          recipients += 1;
-        }
       }
-      logOutgoingPush(push, recipients);
+    }
-    }).pipe(Effect.runPromise);
+    logOutgoingPush(push, recipients);
+  });
   // HTTP server — serves static files or redirects to Vite dev server
   const httpServer = http.createServer((req, res) => {
 @@ -289,9 +288,7 @@ export const createServer = Effect.fn(function* (options: ServerOptions = {}): E
   const { openInEditor } = yield* Open;
   const subscriptionsScope = yield* Scope.make("sequential");
-  yield* Effect.addFinalizer(() =>
+  yield* Effect.addFinalizer(() => Scope.close(subscriptionsScope, Exit.void));
-    Scope.close(subscriptionsScope, Exit.void).pipe(Effect.orElseSucceed(() => undefined)),
-  );
   yield* Stream.runForEach(orchestrationEngine.streamDomainEvents, (event) =>
     Effect.gen(function* () {
 @@ -312,7 +309,7 @@ export const createServer = Effect.fn(function* (options: ServerOptions = {}): E
     }),
   ).pipe(Effect.forkIn(subscriptionsScope));
-  yield* orchestrationReactor.start.pipe(Scope.provide(subscriptionsScope));
+  yield* Scope.provide(orchestrationReactor.start, subscriptionsScope);
   if (autoBootstrapProjectFromCwd) {
     const snapshot = yield* projectionReadModelQuery.getSnapshot();
 @@ -332,7 +329,7 @@ export const createServer = Effect.fn(function* (options: ServerOptions = {}): E
     }
   }
-  const routeRequest = Effect.fn(function* (request: WebSocketRequest) {
+  const routeRequest = Effect.fnUntraced(function* (request: WebSocketRequest) {
     switch (request.body._tag) {
       case ORCHESTRATION_WS_METHODS.getSnapshot:
         return yield* projectionReadModelQuery.getSnapshot();
 @@ -573,18 +570,24 @@ export const createServer = Effect.fn(function* (options: ServerOptions = {}): E
     ),
   );
-  const unsubscribeTerminalEvents = yield* terminalManager.subscribe(onTerminalEvent);
+  const unsubscribeTerminalEvents = yield* terminalManager.subscribe(
+    (event) => void Effect.runPromise(onTerminalEvent(event)),
+  );
   yield* Effect.addFinalizer(() =>
-    Effect.sync(() => {
+    Effect.all([Effect.sync(() => unsubscribeTerminalEvents()), terminalManager.dispose()]),
-      unsubscribeTerminalEvents();
-    }),
   );
-  yield* Effect.addFinalizer(terminalManager.dispose);
   yield* NodeHttpServer.make(() => httpServer, listenOptions);
   yield* Effect.addFinalizer(() =>
-    Effect.all([closeAllClients, closeWebSocketServer.pipe(Effect.orElseSucceed(() => undefined))]),
+    Effect.all([
+      closeAllClients,
+      closeWebSocketServer.pipe(
+        Effect.catch((error) =>
+          Effect.logWarning("failed to close web socket server", { cause: error }),
+        ),
+      ),
+    ]),
   );
   return httpServer;

apps/web/src/session-logic.test.ts+2-2

...	@@ -69,7 +69,7 @@ describe("derivePendingApprovals", () => {	...	@@ -69,7 +69,7 @@ describe("derivePendingApprovals", () => {
69	});	69	});
70		70
71	describe("deriveWorkLogEntries", () => {	71	describe("deriveWorkLogEntries", () => {
72	it("returns entries in chronological order", () => {	72	it("omits tool started entries and keeps completed entries", () => {
73	const activities: OrchestrationThreadActivity[] = [	73	const activities: OrchestrationThreadActivity[] = [
74	makeActivity({	74	makeActivity({
75	id: "tool-complete",	75	id: "tool-complete",
...	@@ -86,7 +86,7 @@ describe("deriveWorkLogEntries", () => {	...	@@ -86,7 +86,7 @@ describe("deriveWorkLogEntries", () => {
86	];	86	];
87		87
88	const entries = deriveWorkLogEntries(activities, undefined);	88	const entries = deriveWorkLogEntries(activities, undefined);
89	expect(entries.map((entry) => entry.id)).toEqual(["tool-start", "tool-complete"]);	89	expect(entries.map((entry) => entry.id)).toEqual(["tool-complete"]);
90	});	90	});
91		91
92	it("filters by turn id when provided", () => {	92	it("filters by turn id when provided", () => {

apps/web/src/session-logic.ts+1

...	@@ -127,6 +127,7 @@ export function deriveWorkLogEntries(	...	@@ -127,6 +127,7 @@ export function deriveWorkLogEntries(
127	);	127	);
128	return ordered	128	return ordered
129	.filter((activity) => (latestTurnId ? activity.turnId === latestTurnId : true))	129	.filter((activity) => (latestTurnId ? activity.turnId === latestTurnId : true))
		130	.filter((activity) => activity.kind !== "tool.started")
130	.filter((activity) => activity.summary !== "Checkpoint captured")	131	.filter((activity) => activity.summary !== "Checkpoint captured")
131	.map((activity) => {	132	.map((activity) => {
132	const payload =	133	const payload =