amalgm 0.1.131 → 0.1.132

package/lib/cli.js

@@ -229,6 +229,7 @@ const SAFE_DAEMON_ENV_KEYS = [
   'LC_ALL',
   'LOGNAME',
   'NODE_PATH',
+  'NPM_CONFIG_PREFIX',
   'PATH',
   'PORT_MONITOR_PORT',
   'SHELL',
@@ -241,6 +242,7 @@ const SAFE_DAEMON_ENV_KEYS = [
   'XDG_CACHE_HOME',
   'XDG_CONFIG_HOME',
   'XDG_DATA_HOME',
+  'npm_config_prefix',
 ];
 
 function daemonEnv(localOnly) {

package/lib/service.js

@@ -65,6 +65,7 @@ const SERVICE_ENV_KEYS = [
   'LANG',
   'LC_ALL',
   'NODE_PATH',
+  'NPM_CONFIG_PREFIX',
   'PATH',
   'PORT_MONITOR_PORT',
   'SHELL',
@@ -75,6 +76,7 @@ const SERVICE_ENV_KEYS = [
   'XDG_CACHE_HOME',
   'XDG_CONFIG_HOME',
   'XDG_DATA_HOME',
+  'npm_config_prefix',
 ];
 
 function ensureDir(dir, mode = 0o700) {
@@ -143,6 +145,27 @@ function systemdQuote(value) {
   return `"${String(value).replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`;
 }
 
+function pathLooksLikeDesktopBundle(value) {
+  return /(?:^|\/)[^/]+\.app\/Contents\/(?:Resources\/cli|MacOS)(?:\/|$)/.test(String(value || '').replace(/\\/g, '/'));
+}
+
+function serviceStateCanOwnRuntime(state) {
+  if (!state) return false;
+  const pointsAtDesktopBundle = [
+    state.package_root,
+    state.node,
+    state.bin,
+    state.files?.plist,
+    state.files?.unit,
+    state.files?.script,
+    state.files?.nodeScript,
+  ].some(pathLooksLikeDesktopBundle);
+  if (pointsAtDesktopBundle) return false;
+  if (state.runtime_host === 'node') return true;
+  if (state.runtime_host === 'electron') return false;
+  return true;
+}
+
 function isPidRunning(pid) {
   if (!Number.isInteger(pid) || pid <= 0) return false;
   try {
@@ -283,7 +306,6 @@ function buildServiceEnv(localOnly) {
     AMALGM_LOCAL_ONLY: localOnly ? 'true' : 'false',
     AMALGM_SERVICE_MANAGED: 'true',
     AMALGM_SERVICE_LABEL: SERVICE_LABEL,
-    ELECTRON_RUN_AS_NODE: process.env.ELECTRON_RUN_AS_NODE || '1',
     PATH: process.env.PATH || '/usr/local/bin:/usr/bin:/bin',
   };
 
@@ -656,6 +678,7 @@ function serviceStateFor(backend, localOnly, files = {}) {
     package_root: PACKAGE_ROOT,
     node: process.execPath,
     bin: AMALGM_BIN,
+    runtime_host: process.versions.electron ? 'electron' : 'node',
     files,
     updated_at: new Date().toISOString(),
   };
@@ -710,6 +733,7 @@ function stateMatchesRequest(state, options = {}) {
 // Explicit `amalgm service install` still takes over via installService().
 function deferToExistingInstall(state, options = {}) {
   if (!state || !state.backend || !state.bin || !state.package_version) return false;
+  if (!serviceStateCanOwnRuntime(state)) return false;
   if (state.package_root === PACKAGE_ROOT) return false;
   if (!!state.local_only !== !!options.localOnly) return false;
   const requested = normalizeMode(options.mode || 'auto');
@@ -941,7 +965,10 @@ module.exports = {
     SERVICE_PID_FILE,
     clearPortableServiceStateForDeadPid,
     lockOwnedByAnother,
+    pathLooksLikeDesktopBundle,
     portableLockDir,
+    serviceStateCanOwnRuntime,
+    writeLaunchdPlist,
     writePortableNodeScript,
     writeSystemdUnit,
   },

package/lib/supervisor.js

@@ -186,6 +186,7 @@ const SAFE_PROCESS_ENV_KEYS = [
   'ELECTRON_RUN_AS_NODE',
   'PATH',
   'NODE_PATH',
+  'NPM_CONFIG_PREFIX',
   'SHELL',
   'SSH_AUTH_SOCK',
   'TERM',
@@ -196,6 +197,7 @@ const SAFE_PROCESS_ENV_KEYS = [
   'XDG_CACHE_HOME',
   'XDG_CONFIG_HOME',
   'XDG_DATA_HOME',
+  'npm_config_prefix',
 ];
 
 function safeBaseProcessEnv() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amalgm",
-  "version": "0.1.131",
+  "version": "0.1.132",
   "description": "Amalgm local computer runtime: login, MCP, chat, events, previews, and tunnels.",
   "license": "UNLICENSED",
   "private": false,