From fa0477b1dff97ccded0d112c9a04beb50bec3529 Mon Sep 17 00:00:00 2001
From: "Mark S. Miller" <erights@gmail.com>
Date: Sat, 1 Feb 2025 18:28:24 -0800
Subject: [PATCH] fix(daemon,cli): fix #2700 use endo/init to prepare async
 hooks

---
 packages/cli/src/endo.js           | 3 +++
 packages/daemon/src/daemon-node.js | 5 +----
 packages/daemon/src/worker-node.js | 5 +----
 packages/daemon/test/endo.test.js  | 3 +++
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/cli/src/endo.js b/packages/cli/src/endo.js
index 5f2ec338d0..237ed4e9c8 100644
--- a/packages/cli/src/endo.js
+++ b/packages/cli/src/endo.js
@@ -3,6 +3,9 @@
 /* eslint-disable no-await-in-loop, no-bitwise, no-throw-literal */
 
 // Establish a perimeter:
+// TODO should this
+//   import '@endo/init';
+// rather than the following three lines?
 import 'ses';
 import '@endo/eventual-send/shim.js';
 import '@endo/lockdown/commit.js';
diff --git a/packages/daemon/src/daemon-node.js b/packages/daemon/src/daemon-node.js
index 4c84c5502e..8a7090ce08 100644
--- a/packages/daemon/src/daemon-node.js
+++ b/packages/daemon/src/daemon-node.js
@@ -2,10 +2,7 @@
 /* global process */
 
 // Establish a perimeter:
-import 'ses';
-import '@endo/eventual-send/shim.js';
-import '@endo/promise-kit/shim.js';
-import '@endo/lockdown/commit.js';
+import '@endo/init';
 
 import crypto from 'crypto';
 import net from 'net';
diff --git a/packages/daemon/src/worker-node.js b/packages/daemon/src/worker-node.js
index b0ca493c0a..c61b2e31b9 100644
--- a/packages/daemon/src/worker-node.js
+++ b/packages/daemon/src/worker-node.js
@@ -2,10 +2,7 @@
 /* global process */
 
 // Establish a perimeter:
-import 'ses';
-import '@endo/eventual-send/shim.js';
-import '@endo/promise-kit/shim.js';
-import '@endo/lockdown/commit.js';
+import '@endo/init';
 
 import fs from 'fs';
 import url from 'url';
diff --git a/packages/daemon/test/endo.test.js b/packages/daemon/test/endo.test.js
index d8b9107186..547424122d 100644
--- a/packages/daemon/test/endo.test.js
+++ b/packages/daemon/test/endo.test.js
@@ -2,6 +2,9 @@
 /* global process */
 
 // Establish a perimeter:
+// TODO should this
+//   import '@endo/init/debug.js';
+// rather than the following three lines?
 import 'ses';
 import '@endo/eventual-send/shim.js';
 import '@endo/lockdown/commit-debug.js';