From 171b4544ff518a677cbcb8d80bc79765bd715153 Mon Sep 17 00:00:00 2001
From: ciregenz <ciregenz@berkeley.edu>
Date: Sun, 2 Aug 2026 19:54:17 -0700
Subject: [PATCH] [eric] vmp: find the EVS client in its own venv, PEP 668
 keeps it out of system python

---
 electron/build/after-pack.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/electron/build/after-pack.js b/electron/build/after-pack.js
index 30325ca8..25b2f84b 100644
--- a/electron/build/after-pack.js
+++ b/electron/build/after-pack.js
@@ -10,6 +10,7 @@
 // is handled by the package.json extraResources filter; only node_modules needs
 // this rescue.
 const fs = require('fs');
+const os = require('os');
 const path = require('path');
 const { execFileSync } = require('child_process');
 
@@ -21,6 +22,22 @@ const { execFileSync } = require('child_process');
 // app, just with limited DRM); VMP_REQUIRE_SIGN=1 (set by the signed release paths)
 // turns a missing/failed signature into a hard build failure so prod never ships
 // an unsigned-for-DRM client silently.
+// The EVS client is a pip package, and a system python3 on a modern Mac refuses to install into
+// itself (PEP 668). scripts/setup-evs.sh therefore puts it in its own venv, so look there before
+// falling back to whatever `python3` means today. Without this the creds can be perfectly correct
+// and the sign still dies on ModuleNotFoundError, ten minutes into a release build.
+function resolveEvsPython() {
+  if (process.platform === 'win32') return 'python';
+  const venv = path.join(os.homedir(), '.openswarm-evs-venv', 'bin', 'python');
+  if (fs.existsSync(venv)) {
+    try {
+      execFileSync(venv, ['-c', 'import castlabs_evs'], { stdio: 'ignore' });
+      return venv;
+    } catch { /* venv exists but lacks the package; fall through */ }
+  }
+  return 'python3';
+}
+
 function signVmp(context) {
   const { appOutDir, electronPlatformName, packager } = context;
   const required = process.env.VMP_REQUIRE_SIGN === '1';
@@ -39,7 +56,7 @@ function signVmp(context) {
   const target = electronPlatformName === 'darwin'
     ? path.join(appOutDir, `${packager.appInfo.productFilename}.app`)
     : appOutDir;
-  const py = process.platform === 'win32' ? 'python' : 'python3';
+  const py = resolveEvsPython();
 
   try {
     console.log(`[afterPack] VMP-signing ${target}`);