diff --git a/packages/cli/vite.node.config.ts b/packages/cli/vite.node.config.ts
index 8e9d662999..791a0131ac 100644
--- a/packages/cli/vite.node.config.ts
+++ b/packages/cli/vite.node.config.ts
@@ -1,5 +1,6 @@
 import path from "node:path"
 import { readFile } from "node:fs/promises"
+import { createRequire } from "node:module"
 import { defineConfig, type Plugin, type UserConfig } from "vite"
 import solid from "vite-plugin-solid"
 import { nodeExecArgv, nodeTarget, type NodeTarget, photonWasmAsset } from "./src/node/target"
@@ -33,7 +34,10 @@ const resolve = {
   alias: [
     { find: /^solid-js\/store$/, replacement: "solid-js/store/dist/store.js" },
     { find: /^solid-js$/, replacement: "solid-js/dist/solid.js" },
-    { find: /^ws$/, replacement: path.resolve(dir, "node_modules/ws/wrapper.mjs") },
+    {
+      find: /^ws$/,
+      replacement: path.join(path.dirname(createRequire(import.meta.url).resolve("ws/package.json")), "wrapper.mjs"),
+    },
   ],
   conditions: ["node"],
 }
diff --git a/packages/tui/test/cli/tui/diff-viewer-file-tree.test.tsx b/packages/tui/test/cli/tui/diff-viewer-file-tree.test.tsx
index 6a7cb174a9..172dadee2a 100644
--- a/packages/tui/test/cli/tui/diff-viewer-file-tree.test.tsx
+++ b/packages/tui/test/cli/tui/diff-viewer-file-tree.test.tsx
@@ -170,7 +170,7 @@ async function renderOnceSettled(app: Awaited<ReturnType<typeof testRender>>) {
 async function captureSettledFrame(app: Awaited<ReturnType<typeof testRender>>) {
   for (let attempt = 0; attempt < 5; attempt++) {
     const frame = app.captureCharFrame()
-    if (frame.trim().length > 0) return frame
+    if (visibleLines(frame).length > 0) return frame
     await new Promise((resolve) => setTimeout(resolve, 25))
     await app.renderOnce()
   }