amalgm 0.1.53 → 0.1.55

package/package.json

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

package/runtime/scripts/amalgm-mcp/browser/electron-bridge.js

@@ -1,12 +1,58 @@
 const http = require('http');
 const https = require('https');
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
 
 const DEFAULT_SESSION = `mcp-${process.pid}-default`;
 
+function amalgmDir() {
+  return process.env.AMALGM_DIR || path.join(os.homedir(), '.amalgm');
+}
+
+function bridgeConfigFile() {
+  return path.join(amalgmDir(), 'electron-browser-bridge.json');
+}
+
+function isLoopbackUrl(value) {
+  try {
+    const url = new URL(value);
+    return url.protocol === 'http:' && (url.hostname === '127.0.0.1' || url.hostname === 'localhost');
+  } catch {
+    return false;
+  }
+}
+
+function pidIsRunning(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (err) {
+    return err && err.code === 'EPERM';
+  }
+}
+
+function normalizeConfig(data) {
+  const baseUrl = typeof data?.baseUrl === 'string' ? data.baseUrl : '';
+  const token = typeof data?.token === 'string' ? data.token : '';
+  if (!baseUrl || !token || !isLoopbackUrl(baseUrl)) return null;
+  if (typeof data?.pid === 'number' && !pidIsRunning(data.pid)) return null;
+  return { baseUrl, token };
+}
+
+function fileConfig() {
+  try {
+    return normalizeConfig(JSON.parse(fs.readFileSync(bridgeConfigFile(), 'utf8')));
+  } catch {
+    return null;
+  }
+}
+
 function config() {
   const baseUrl = process.env.AMALGM_ELECTRON_BROWSER_URL;
   const token = process.env.AMALGM_ELECTRON_BROWSER_TOKEN;
-  return baseUrl && token ? { baseUrl, token } : null;
+  return normalizeConfig({ baseUrl, token }) || fileConfig();
 }
 
 function isConfigured() {

package/runtime/scripts/amalgm-mcp/browser/page.js

@@ -1,6 +1,11 @@
 const electron = require('./electron-bridge');
 const agentBrowser = require('./agent-browser');
 
+function isPackagedDesktopRuntime() {
+  const execPath = process.execPath || '';
+  return process.env.ELECTRON_RUN_AS_NODE === '1' && execPath.includes('.app/Contents/MacOS/');
+}
+
 function backend() {
   const requested = (process.env.AMALGM_BROWSER_BACKEND || '').toLowerCase();
   if (requested === 'agent-browser' || requested === 'external') return agentBrowser;
@@ -8,7 +13,8 @@ function backend() {
 
   // In the desktop app this bridge drives the visible in-tab Electron webview.
   // Outside Electron, keep the agent-browser CLI fallback for headless/remote use.
-  return electron.isConfigured() ? electron : agentBrowser;
+  if (electron.isConfigured() || isPackagedDesktopRuntime()) return electron;
+  return agentBrowser;
 }
 
 const exported = {};