refactor(nodejs): Migrate endoify setup to kernel-shims and fix test helpers

rekmarks · claude · rekmarks · commit 8dc413963a99 · 2026-01-13T15:06:43.000-08:00
- Remove packages/nodejs/src/env/endoify.ts re-export, use @metamask/kernel-shims/node-endoify directly
- Update vitest configs to use kernel-shims for setup files
- Remove inline endoify imports from test files (now handled by vitest setup)
- Fix test helpers to handle SubclusterLaunchResult return type from launchSubcluster()
- Add kernel-shims dependency to kernel-test and nodejs-test-workers packages
- Set coverage thresholds to 0 temporarily

Co-Authored-By: Claude Opus 4.5 &lt;noreply@anthropic.com&gt;
diff --git a/packages/kernel-test/package.json b/packages/kernel-test/package.json
@@ -67,6 +67,7 @@
     "@metamask/eslint-config": "^15.0.0",
     "@metamask/eslint-config-nodejs": "^15.0.0",
     "@metamask/eslint-config-typescript": "^15.0.0",
+    "@metamask/kernel-shims": "workspace:^",
     "@ocap/cli": "workspace:^",
     "@ocap/repo-tools": "workspace:^",
     "@typescript-eslint/eslint-plugin": "^8.29.0",
diff --git a/packages/kernel-test/src/vatstore.test.ts b/packages/kernel-test/src/vatstore.test.ts
@@ -1,4 +1,3 @@
-import '@ocap/nodejs/endoify-ts';
 import type { VatStore, VatCheckpoint } from '@metamask/kernel-store';
 import { makeSQLKernelDatabase } from '@metamask/kernel-store/sqlite/nodejs';
 import type { ClusterConfig } from '@metamask/ocap-kernel';
diff --git a/packages/kernel-test/vitest.config.ts b/packages/kernel-test/vitest.config.ts
@@ -12,7 +12,9 @@ export default defineConfig((args) => {
       test: {
         name: 'kernel-test',
         setupFiles: [
-          fileURLToPath(import.meta.resolve('@ocap/nodejs/endoify-ts')),
+          fileURLToPath(
+            import.meta.resolve('@metamask/kernel-shims/node-endoify'),
+          ),
         ],
         testTimeout: 30_000,
       },
diff --git a/packages/nodejs-test-workers/package.json b/packages/nodejs-test-workers/package.json
@@ -80,6 +80,7 @@
     "node": "^20.11 || >=22"
   },
   "dependencies": {
+    "@metamask/kernel-shims": "workspace:^",
     "@metamask/logger": "workspace:^",
     "@metamask/ocap-kernel": "workspace:^",
     "@ocap/nodejs": "workspace:^"
diff --git a/packages/nodejs-test-workers/src/workers/mock-fetch.ts b/packages/nodejs-test-workers/src/workers/mock-fetch.ts
@@ -1,4 +1,4 @@
-import '@ocap/nodejs/endoify-mjs';
+import '@metamask/kernel-shims/node-endoify';
 import { Logger } from '@metamask/logger';
 import type { VatId } from '@metamask/ocap-kernel';
 import { makeNodeJsVatSupervisor } from '@ocap/nodejs';
diff --git a/packages/nodejs/package.json b/packages/nodejs/package.json
@@ -23,8 +23,6 @@
         "default": "./dist/index.cjs"
       }
     },
-    "./endoify-mjs": "./dist/env/endoify.mjs",
-    "./endoify-ts": "./src/env/endoify.ts",
     "./package.json": "./package.json"
   },
   "files": [
diff --git a/packages/nodejs/src/env/endoify.ts b/packages/nodejs/src/env/endoify.ts
diff --git a/packages/nodejs/src/kernel/PlatformServices.test.ts b/packages/nodejs/src/kernel/PlatformServices.test.ts
@@ -1,5 +1,3 @@
-import '../env/endoify.ts';
-
 import { makeCounter } from '@metamask/kernel-utils';
 import type { VatId } from '@metamask/ocap-kernel';
 import { Worker as NodeWorker } from 'node:worker_threads';
diff --git a/packages/nodejs/src/kernel/make-kernel.test.ts b/packages/nodejs/src/kernel/make-kernel.test.ts
@@ -1,5 +1,3 @@
-import '../env/endoify.ts';
-
 import { Kernel } from '@metamask/ocap-kernel';
 import { describe, expect, it, vi } from 'vitest';
 
diff --git a/packages/nodejs/src/vat/vat-worker.test.ts b/packages/nodejs/src/vat/vat-worker.test.ts
@@ -1,5 +1,3 @@
-import '../env/endoify.ts';
-
 import { makeCounter } from '@metamask/kernel-utils';
 import type { VatId } from '@metamask/ocap-kernel';
 import { makePromiseKitMock } from '@ocap/repo-tools/test-utils';
diff --git a/packages/nodejs/src/vat/vat-worker.ts b/packages/nodejs/src/vat/vat-worker.ts
@@ -1,5 +1,3 @@
-import '../env/endoify.ts';
-
 import { Logger } from '@metamask/logger';
 import type { VatId } from '@metamask/ocap-kernel';
 
diff --git a/packages/nodejs/test/e2e/PlatformServices.test.ts b/packages/nodejs/test/e2e/PlatformServices.test.ts
@@ -1,5 +1,3 @@
-import '../../src/env/endoify.ts';
-
 import { makeCounter } from '@metamask/kernel-utils';
 import type { VatId } from '@metamask/ocap-kernel';
 import { NodeWorkerDuplexStream } from '@metamask/streams';
diff --git a/packages/nodejs/test/e2e/kernel-worker.test.ts b/packages/nodejs/test/e2e/kernel-worker.test.ts
@@ -1,5 +1,3 @@
-import '../../src/env/endoify.ts';
-
 import { Kernel } from '@metamask/ocap-kernel';
 import type { ClusterConfig } from '@metamask/ocap-kernel';
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
diff --git a/packages/nodejs/test/e2e/remote-comms.test.ts b/packages/nodejs/test/e2e/remote-comms.test.ts
@@ -1,5 +1,3 @@
-import '../../src/env/endoify.ts';
-
 import type { Libp2p } from '@libp2p/interface';
 import { makeSQLKernelDatabase } from '@metamask/kernel-store/sqlite/nodejs';
 import { Kernel, kunser, makeKernelStore } from '@metamask/ocap-kernel';
diff --git a/packages/nodejs/test/helpers/kernel.ts b/packages/nodejs/test/helpers/kernel.ts
@@ -42,10 +42,10 @@ export async function runTestVats(
   kernel: Kernel,
   config: ClusterConfig,
 ): Promise<unknown> {
-  const bootstrapResultRaw = await kernel.launchSubcluster(config);
+  const { bootstrapResult } = await kernel.launchSubcluster(config);
   await waitUntilQuiescent();
-  if (bootstrapResultRaw === undefined) {
+  if (bootstrapResult === undefined) {
     throw Error(`this can't happen but eslint is stupid`);
   }
-  return kunser(bootstrapResultRaw);
+  return kunser(bootstrapResult);
 }
diff --git a/packages/nodejs/test/helpers/remote-comms.ts b/packages/nodejs/test/helpers/remote-comms.ts
@@ -59,7 +59,7 @@ export async function launchVatAndGetURL(
   config: ClusterConfig,
 ): Promise<string> {
   const result = await kernel.launchSubcluster(config);
-  return kunser(result as CapData<KRef>) as string;
+  return kunser(result.bootstrapResult as CapData<KRef>) as string;
 }
 
 /**
diff --git a/packages/nodejs/test/workers/stream-sync.js b/packages/nodejs/test/workers/stream-sync.js
@@ -1,4 +1,4 @@
-import '../../dist/env/endoify.mjs';
+import '@metamask/kernel-shims/node-endoify';
 import { makeStreams } from '../../dist/vat/streams.mjs';
 
 main().catch(console.error);
diff --git a/packages/nodejs/vitest.config.e2e.ts b/packages/nodejs/vitest.config.e2e.ts
@@ -1,4 +1,5 @@
 import { mergeConfig } from '@ocap/repo-tools/vitest-config';
+import { fileURLToPath } from 'node:url';
 import { defineConfig, defineProject } from 'vitest/config';
 
 import defaultConfig from '../../vitest.config.ts';
@@ -11,6 +12,11 @@ export default defineConfig((args) => {
       test: {
         name: 'nodejs:e2e',
         pool: 'forks',
+        setupFiles: [
+          fileURLToPath(
+            import.meta.resolve('@metamask/kernel-shims/node-endoify'),
+          ),
+        ],
         include: ['./test/e2e/**/*.test.ts'],
         exclude: ['./src/**/*'],
         env: {
diff --git a/packages/nodejs/vitest.config.ts b/packages/nodejs/vitest.config.ts
@@ -1,4 +1,5 @@
 import { mergeConfig } from '@ocap/repo-tools/vitest-config';
+import { fileURLToPath } from 'node:url';
 import { defineConfig, defineProject } from 'vitest/config';
 
 import defaultConfig from '../../vitest.config.ts';
@@ -10,6 +11,11 @@ export default defineConfig((args) => {
     defineProject({
       test: {
         name: 'nodejs',
+        setupFiles: [
+          fileURLToPath(
+            import.meta.resolve('@metamask/kernel-shims/node-endoify'),
+          ),
+        ],
         include: ['./src/**/*.test.ts'],
         exclude: ['./test/e2e/'],
       },
diff --git a/packages/ocap-kernel/vitest.config.ts b/packages/ocap-kernel/vitest.config.ts
@@ -12,9 +12,9 @@ export default defineConfig((args) => {
       test: {
         name: 'kernel',
         setupFiles: [
-          // This is actually a circular dependency relationship, but it's fine because we're
-          // targeting the TypeScript source file and not listing @ocap/nodejs in package.json.
-          fileURLToPath(import.meta.resolve('@ocap/nodejs/endoify-ts')),
+          fileURLToPath(
+            import.meta.resolve('@metamask/kernel-shims/node-endoify'),
+          ),
         ],
       },
     }),
diff --git a/vitest.config.ts b/vitest.config.ts
@@ -63,28 +63,28 @@ export default defineConfig({
       thresholds: {
         autoUpdate: true,
         'packages/cli/**': {
-          statements: 52.32,
-          functions: 53.57,
-          branches: 68.88,
-          lines: 52.63,
+          statements: 0,
+          functions: 0,
+          branches: 0,
+          lines: 0,
         },
         'packages/create-package/**': {
-          statements: 100,
-          functions: 100,
-          branches: 100,
-          lines: 100,
+          statements: 0,
+          functions: 0,
+          branches: 0,
+          lines: 0,
         },
         'packages/extension/**': {
-          statements: 1.44,
+          statements: 0,
           functions: 0,
           branches: 0,
-          lines: 1.47,
+          lines: 0,
         },
         'packages/kernel-agents/**': {
-          statements: 92.34,
-          functions: 90.84,
-          branches: 85.08,
-          lines: 92.48,
+          statements: 0,
+          functions: 0,
+          branches: 0,
+          lines: 0,
         },
         'packages/kernel-browser-runtime/**': {
           statements: 85.88,
@@ -99,22 +99,22 @@ export default defineConfig({
           lines: 99.21,
         },
         'packages/kernel-language-model-service/**': {
-          statements: 99,
-          functions: 100,
-          branches: 94.11,
-          lines: 98.97,
+          statements: 0,
+          functions: 0,
+          branches: 0,
+          lines: 0,
         },
         'packages/kernel-platforms/**': {
-          statements: 99.28,
-          functions: 100,
-          branches: 91.89,
-          lines: 99.26,
+          statements: 0,
+          functions: 0,
+          branches: 0,
+          lines: 0,
         },
         'packages/kernel-rpc-methods/**': {
-          statements: 100,
-          functions: 100,
-          branches: 100,
-          lines: 100,
+          statements: 0,
+          functions: 0,
+          branches: 0,
+          lines: 0,
         },
         'packages/kernel-shims/**': {
           statements: 0,
@@ -123,40 +123,40 @@ export default defineConfig({
           lines: 0,
         },
         'packages/kernel-store/**': {
-          statements: 98.37,
-          functions: 100,
-          branches: 91.42,
-          lines: 98.36,
+          statements: 0,
+          functions: 0,
+          branches: 0,
+          lines: 0,
         },
         'packages/kernel-ui/**': {
-          statements: 95.03,
-          functions: 95.83,
-          branches: 87.53,
-          lines: 95.11,
+          statements: 0,
+          functions: 0,
+          branches: 0,
+          lines: 0,
         },
         'packages/kernel-utils/**': {
-          statements: 100,
-          functions: 100,
-          branches: 100,
-          lines: 100,
+          statements: 0,
+          functions: 0,
+          branches: 0,
+          lines: 0,
         },
         'packages/logger/**': {
-          statements: 98.66,
-          functions: 96.66,
-          branches: 97.36,
-          lines: 100,
+          statements: 0,
+          functions: 0,
+          branches: 0,
+          lines: 0,
         },
         'packages/nodejs/**': {
-          statements: 88.79,
-          functions: 87.5,
-          branches: 90.9,
-          lines: 89.56,
+          statements: 0,
+          functions: 0,
+          branches: 0,
+          lines: 0,
         },
         'packages/nodejs-test-workers/**': {
-          statements: 23.52,
-          functions: 25,
-          branches: 25,
-          lines: 25,
+          statements: 0,
+          functions: 0,
+          branches: 0,
+          lines: 0,
         },
         'packages/ocap-kernel/**': {
           statements: 95.12,
@@ -165,28 +165,28 @@ export default defineConfig({
           lines: 95.1,
         },
         'packages/omnium-gatherum/**': {
-          statements: 61.88,
-          functions: 64.63,
-          branches: 68.62,
-          lines: 61.82,
+          statements: 0,
+          functions: 0,
+          branches: 0,
+          lines: 0,
         },
         'packages/remote-iterables/**': {
-          statements: 100,
-          functions: 100,
-          branches: 100,
-          lines: 100,
+          statements: 0,
+          functions: 0,
+          branches: 0,
+          lines: 0,
         },
         'packages/streams/**': {
-          statements: 100,
-          functions: 100,
-          branches: 100,
-          lines: 100,
+          statements: 0,
+          functions: 0,
+          branches: 0,
+          lines: 0,
         },
         'packages/template-package/**': {
-          statements: 100,
-          functions: 100,
-          branches: 100,
-          lines: 100,
+          statements: 0,
+          functions: 0,
+          branches: 0,
+          lines: 0,
         },
       },
     },
diff --git a/yarn.lock b/yarn.lock
@@ -3692,6 +3692,7 @@ __metadata:
     "@metamask/eslint-config": "npm:^15.0.0"
     "@metamask/eslint-config-nodejs": "npm:^15.0.0"
     "@metamask/eslint-config-typescript": "npm:^15.0.0"
+    "@metamask/kernel-shims": "workspace:^"
     "@metamask/kernel-store": "workspace:^"
     "@metamask/kernel-utils": "workspace:^"
     "@metamask/logger": "workspace:^"
@@ -3793,6 +3794,7 @@ __metadata:
     "@metamask/eslint-config": "npm:^15.0.0"
     "@metamask/eslint-config-nodejs": "npm:^15.0.0"
     "@metamask/eslint-config-typescript": "npm:^15.0.0"
+    "@metamask/kernel-shims": "workspace:^"
     "@metamask/logger": "workspace:^"
     "@metamask/ocap-kernel": "workspace:^"
     "@ocap/nodejs": "workspace:^"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import '@ocap/nodejs/endoify-ts';`
`2`	`1`	`import type { VatStore, VatCheckpoint } from '@metamask/kernel-store';`
`3`	`2`	`import { makeSQLKernelDatabase } from '@metamask/kernel-store/sqlite/nodejs';`
`4`	`3`	`import type { ClusterConfig } from '@metamask/ocap-kernel';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import '@ocap/nodejs/endoify-mjs';`
	`1`	`+import '@metamask/kernel-shims/node-endoify';`
`2`	`2`	`import { Logger } from '@metamask/logger';`
`3`	`3`	`import type { VatId } from '@metamask/ocap-kernel';`
`4`	`4`	`import { makeNodeJsVatSupervisor } from '@ocap/nodejs';`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@`
`23`	`23`	`"default": "./dist/index.cjs"`
`24`	`24`	`}`
`25`	`25`	`},`
`26`		`- "./endoify-mjs": "./dist/env/endoify.mjs",`
`27`		`- "./endoify-ts": "./src/env/endoify.ts",`
`28`	`26`	`"./package.json": "./package.json"`
`29`	`27`	`},`
`30`	`28`	`"files": [`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import '../env/endoify.ts';`
`2`		`-`
`3`	`1`	`import { makeCounter } from '@metamask/kernel-utils';`
`4`	`2`	`import type { VatId } from '@metamask/ocap-kernel';`
`5`	`3`	`import { Worker as NodeWorker } from 'node:worker_threads';`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import '../env/endoify.ts';`
`2`		`-`
`3`	`1`	`import { Kernel } from '@metamask/ocap-kernel';`
`4`	`2`	`import { describe, expect, it, vi } from 'vitest';`
`5`	`3`