refactor: Consolidate endoify setup and rationalize extension globals #787

rekmarks · 2026-01-28T04:34:40Z

Summary

This PR consolidates several refactoring improvements to improve code organization and reduce circular dependencies:

Migrate endoify setup to kernel-shims: Moved Node.js-specific initialization from @ocap/nodejs to @metamask/kernel-shims/endoify-node
Rationalize globalThis.kernel: Simplified global kernel API in extension and omnium-gatherum packages
Improve dependency management: Enhanced linting configuration and removed unused dependencies

Motivation

The endoify setup logic was split between @ocap/nodejs and @metamask/kernel-shims, creating circular dependency patterns
Multiple packages were importing endoify from @ocap/nodejs when it logically belongs in the shims package
The globalThis.kernel API had unnecessary wrapper methods (ping(), getKernel()) when a direct reference would suffice

Changes

Endoify consolidation

Created @metamask/kernel-shims/endoify-node for Node.js-specific lockdown initialization
Removed @ocap/nodejs/endoify-mjs and @ocap/nodejs/endoify-ts exports
Updated all test setup files and worker scripts to use @metamask/kernel-shims/endoify-node
Added @libp2p/webrtc as peer dependency to kernel-shims (imports before lockdown to modify globals)

Global API rationalization

Before:

globalThis.kernel = {
  ping: () => Promise<void>,
  getKernel: () => Promise<KernelFacade>
}

After:

globalThis.kernel: KernelFacade | Promise<KernelFacade>

This simplification:

Reduces API surface area
Eliminates wrapper methods
Provides direct access to kernel facade
Usage becomes E(globalThis.kernel).ping() instead of kernel.ping()

Dependency improvements

Configured depcheck to ignore dist/ directories (avoids false positives from build artifacts)
Added @libp2p/webrtc to depcheck ignores (peer dependency of kernel-shims)
Removed @ocap/nodejs from @metamask/kernel-browser-runtime devDependencies (was only used for test setup)
Added proper test dependencies to packages that were inheriting them transitively

Files changed

30 files changed, 89 insertions(+), 133 deletions(-)
Net reduction of 44 lines while improving code organization

🤖 Generated with Claude Code

Note

Medium Risk
Medium risk because it changes Node.js SES/lockdown initialization order (including new @libp2p/webrtc peer import) and modifies how browser background scripts expose and use globalThis.kernel, which could affect runtime startup and tests.

Overview
Moves Node.js “endoify”/lockdown setup out of @ocap/nodejs into a new @metamask/kernel-shims/endoify-node entrypoint (copied to dist/, exports added), and updates all Vitest configs/worker entrypoints to use it; @metamask/kernel-shims now declares @libp2p/webrtc as a peer dependency and repo config silences dep/lavamoat noise for that path.

Simplifies the dev-console globals in the extension and omnium-gatherum backgrounds by making globalThis.kernel a direct kernel facade (or promise) and removing the wrapper ping/getKernel helpers, updating click-to-wake and subcluster startup to call E(globalThis.kernel) directly.

^{Written by Cursor Bugbot for commit 8e9f293. This will update automatically on new commits. Configure here.}

Set globalThis.kernel in the extension and omnium to the kernel itself. Remove ping and getKernel methods from background console interface. The kernel exposes ping().

…helpers - 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 <[email protected]>

…e configs - Fix accidentally broken nodejs vat worker (which broke all tests relying on it) - Rename node-endoify.js to endoify-node.js for consistency - Update package.json export from ./node-endoify to ./endoify-node - Update all vitest configs to use the new export path - Update depcheckrc.yml ignore pattern Co-Authored-By: Claude Opus 4.5 <[email protected]>

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

packages/kernel-shims/package.json

github-actions · 2026-01-28T04:43:39Z

Coverage Report

Status	Category	Percentage	Covered / Total
🔵	Lines	88.59% ⬆️ +0.16%	5778 / 6522
🔵	Statements	88.47% ⬆️ +0.16%	5870 / 6635
🔵	Functions	87.66% ⬆️ +0.40%	1507 / 1719
🔵	Branches	84.83% ⬇️ -0.13%	2086 / 2459

File Coverage

File	Stmts	Branches	Functions	Lines	Uncovered Lines
Changed Files
packages/extension/src/background.ts	0% 🟰 ±0%	0% 🟰 ±0%	0% 🟰 ±0%	0% 🟰 ±0%	15-171
packages/extension/src/global.d.ts	100% 🟰 ±0%	100% 🟰 ±0%	100% 🟰 ±0%	100% 🟰 ±0%
packages/nodejs-test-workers/src/workers/mock-fetch.ts	0% 🟰 ±0%	0% 🟰 ±0%	0% 🟰 ±0%	0% 🟰 ±0%	6-36
packages/nodejs/src/vat/vat-worker.ts	0% 🟰 ±0%	0% 🟰 ±0%	0% 🟰 ±0%	0% 🟰 ±0%	8-28
packages/omnium-gatherum/src/background.ts	0% 🟰 ±0%	0% 🟰 ±0%	0% 🟰 ±0%	0% 🟰 ±0%	20-228
packages/omnium-gatherum/src/global.d.ts	100% 🟰 ±0%	100% 🟰 ±0%	100% 🟰 ±0%	100% 🟰 ±0%

Generated in workflow #3419 for commit 8e9f293 by the Vitest Coverage Report Action

The endoify-node export was pointing to src/endoify-node.js, but the files array only includes dist/, causing the file to be missing from published packages. The file cannot be bundled because it imports @libp2p/webrtc (a peer dependency), so the build script now copies it to dist/ instead. Changes: - Update build script to copy endoify-node.js to dist/ - Update package.json export to point to dist/endoify-node.js - Update source comment to reflect new build process Co-Authored-By: Claude Sonnet 4.5 <[email protected]>

Simplify the build script by using the built-in copyFile function instead of manually reading and writing the file. Co-Authored-By: Claude Sonnet 4.5 <[email protected]>

sirtimid

looks good

rekmarks and others added 6 commits January 27, 2026 20:18

refactor: Rationalize globalThis.kernel

07a70d9

Set globalThis.kernel in the extension and omnium to the kernel itself. Remove ping and getKernel methods from background console interface. The kernel exposes ping().

fix(kernel-shims): Use relative import in node-endoify.js

709e811

chore: Remove unused dependency

d1c17d7

chore: Make dependency linter ignore dist

3b8585f

rekmarks requested a review from a team as a code owner January 28, 2026 04:34

cursor bot reviewed Jan 28, 2026

View reviewed changes

packages/kernel-shims/package.json Outdated Show resolved Hide resolved

rekmarks changed the title ~~refactor: Consolidate endoify setup and rationalize global APIs~~ refactor: Consolidate endoify setup and rationalize exension globals Jan 28, 2026

rekmarks and others added 2 commits January 27, 2026 20:51

refactor(kernel-shims): Use copyFile instead of readFile + writeFile

b3afe55

Simplify the build script by using the built-in copyFile function instead of manually reading and writing the file. Co-Authored-By: Claude Sonnet 4.5 <[email protected]>

sirtimid changed the title ~~refactor: Consolidate endoify setup and rationalize exension globals~~ refactor: Consolidate endoify setup and rationalize extension globals Jan 28, 2026

sirtimid previously approved these changes Jan 28, 2026

View reviewed changes

rekmarks added this pull request to the merge queue Jan 28, 2026

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 28, 2026

rekmarks added this pull request to the merge queue Jan 28, 2026

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 28, 2026

rekmarks added 2 commits January 28, 2026 15:05

Merge branch 'main' into rekm/omnium-refactors

d86dbc4

fix: Remove faulty import in nodejs e2e test

8e9f293

rekmarks dismissed sirtimid’s stale review via 8e9f293 January 28, 2026 23:22

rekmarks enabled auto-merge January 28, 2026 23:27

sirtimid approved these changes Jan 29, 2026

View reviewed changes

rekmarks added this pull request to the merge queue Jan 29, 2026

Merged via the queue into main with commit c582dea Jan 29, 2026
32 checks passed

rekmarks deleted the rekm/omnium-refactors branch January 29, 2026 08:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: Consolidate endoify setup and rationalize extension globals #787

refactor: Consolidate endoify setup and rationalize extension globals #787

Uh oh!

rekmarks commented Jan 28, 2026 •

edited by cursor bot

Loading

Uh oh!

cursor bot left a comment

Uh oh!

Uh oh!

github-actions bot commented Jan 28, 2026 •

edited

Loading

Uh oh!

sirtimid left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

refactor: Consolidate endoify setup and rationalize extension globals #787

refactor: Consolidate endoify setup and rationalize extension globals #787

Uh oh!

Conversation

rekmarks commented Jan 28, 2026 • edited by cursor bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Motivation

Changes

Endoify consolidation

Global API rationalization

Dependency improvements

Files changed

Uh oh!

cursor bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Jan 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Coverage Report

Uh oh!

sirtimid left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

rekmarks commented Jan 28, 2026 •

edited by cursor bot

Loading

github-actions bot commented Jan 28, 2026 •

edited

Loading