amalgm 0.1.52 → 0.1.53

package/package.json

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

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

@@ -60,15 +60,57 @@ function tabInfo(session, extra = {}) {
   return info;
 }
 
+function executableExists(file) {
+  try {
+    fs.accessSync(file, fs.constants.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function linuxLibcSuffix() {
+  if (process.platform !== 'linux') return '';
+  const glibc = process.report?.getReport?.().header?.glibcVersionRuntime;
+  return glibc ? '' : '-musl';
+}
+
+function agentBrowserBinaryName() {
+  if (!['darwin', 'linux', 'win32'].includes(process.platform)) return null;
+  if (!['arm64', 'x64'].includes(process.arch)) return null;
+  const platform = process.platform === 'win32' ? 'win32' : `${process.platform}${linuxLibcSuffix()}`;
+  const ext = process.platform === 'win32' ? '.exe' : '';
+  return `agent-browser-${platform}-${process.arch}${ext}`;
+}
+
+function asarUnpackedPath(file) {
+  const marker = `${path.sep}app.asar${path.sep}`;
+  return file.includes(marker)
+    ? file.replace(marker, `${path.sep}app.asar.unpacked${path.sep}`)
+    : file;
+}
+
+function nativeAgentBrowserCommand(entrypoint) {
+  const binaryName = agentBrowserBinaryName();
+  if (!entrypoint || !binaryName) return null;
+  const candidate = path.join(path.dirname(entrypoint), binaryName);
+  const unpacked = asarUnpackedPath(candidate);
+  const candidates = unpacked === candidate ? [candidate] : [unpacked];
+  return candidates.find(executableExists) || null;
+}
+
 function agentBrowserCommand() {
   if (process.env.AMALGM_AGENT_BROWSER_BIN) {
     return { command: process.env.AMALGM_AGENT_BROWSER_BIN, prefix: [] };
   }
 
   try {
+    const entrypoint = require.resolve('agent-browser/bin/agent-browser.js');
+    const nativeCommand = nativeAgentBrowserCommand(entrypoint);
+    if (nativeCommand) return { command: nativeCommand, prefix: [] };
     return {
       command: process.execPath,
-      prefix: [require.resolve('agent-browser/bin/agent-browser.js')],
+      prefix: [entrypoint],
     };
   } catch {
     return { command: 'agent-browser', prefix: [] };

package/runtime/scripts/chat-core/tooling/native-binaries.js

@@ -25,6 +25,25 @@ function executableExists(file) {
   }
 }
 
+function asarUnpackedPath(file) {
+  const marker = `${path.sep}app.asar${path.sep}`;
+  return file && file.includes(marker)
+    ? file.replace(marker, `${path.sep}app.asar.unpacked${path.sep}`)
+    : file;
+}
+
+function executablePath(file) {
+  const unpacked = asarUnpackedPath(file);
+  if (unpacked !== file) return executableExists(unpacked) ? unpacked : null;
+  return executableExists(file) ? file : null;
+}
+
+function existingPath(file) {
+  const unpacked = asarUnpackedPath(file);
+  if (unpacked !== file && fs.existsSync(unpacked)) return unpacked;
+  return fs.existsSync(file) ? file : null;
+}
+
 function findPackageJson(packageName) {
   const candidateDirs = [
     ...nativeNodeModulesDirs(),
@@ -160,7 +179,7 @@ function bundledClaudeBinary() {
   const root = packageRoot(packageName);
   if (!root) return null;
   const candidate = path.join(root, process.platform === 'win32' ? 'claude.exe' : 'claude');
-  return executableExists(candidate) ? candidate : null;
+  return executablePath(candidate);
 }
 
 function resolveClaudeBinary() {
@@ -213,8 +232,10 @@ function codexVendorRoot() {
   if (platformRoot) return path.join(platformRoot, 'vendor');
   const wrapperRoot = packageRoot('@openai/codex');
   if (wrapperRoot) {
-    const localVendorRoot = path.join(wrapperRoot, 'vendor');
-    if (fs.existsSync(localVendorRoot)) return localVendorRoot;
+    const nestedVendorRoot = existingPath(path.join(wrapperRoot, 'node_modules', target.packageName, 'vendor'));
+    if (nestedVendorRoot) return nestedVendorRoot;
+    const localVendorRoot = existingPath(path.join(wrapperRoot, 'vendor'));
+    if (localVendorRoot) return localVendorRoot;
   }
   return null;
 }
@@ -224,7 +245,8 @@ function bundledCodexBinary() {
   const vendorRoot = codexVendorRoot();
   if (target && vendorRoot) {
     const candidate = path.join(vendorRoot, target.triple, 'codex', target.binaryName);
-    if (executableExists(candidate)) return candidate;
+    const binary = executablePath(candidate);
+    if (binary) return binary;
   }
   return packageBin('@openai/codex', 'codex');
 }
@@ -234,7 +256,8 @@ function bundledCodexPathDirs() {
   const vendorRoot = codexVendorRoot();
   if (!target || !vendorRoot) return [];
   const candidate = path.join(vendorRoot, target.triple, 'path');
-  return executableExists(path.join(candidate, process.platform === 'win32' ? 'rg.exe' : 'rg')) ? [candidate] : [];
+  const rgPath = executablePath(path.join(candidate, process.platform === 'win32' ? 'rg.exe' : 'rg'));
+  return rgPath ? [path.dirname(rgPath)] : [];
 }
 
 function openCodePlatform() {
@@ -291,12 +314,14 @@ function bundledOpenCodeBinary() {
     const root = packageRoot(packageName);
     if (!root) continue;
     const candidate = path.join(root, 'bin', binaryName);
-    if (executableExists(candidate)) return candidate;
+    const binary = executablePath(candidate);
+    if (binary) return binary;
   }
   const wrapperRoot = packageRoot('opencode-ai');
   if (wrapperRoot) {
     const cached = path.join(wrapperRoot, 'bin', '.opencode');
-    if (executableExists(cached)) return cached;
+    const binary = executablePath(cached);
+    if (binary) return binary;
   }
   return packageBin('opencode-ai', 'opencode');
 }
@@ -340,12 +365,12 @@ function commandTargets() {
     {
       command: 'codex',
       name: 'Codex',
-      path: packageBin('@openai/codex', 'codex') || bundledCodexBinary(),
+      path: bundledCodexBinary() || packageBin('@openai/codex', 'codex'),
     },
     {
       command: 'opencode',
       name: 'OpenCode',
-      path: packageBin('opencode-ai', 'opencode') || bundledOpenCodeBinary(),
+      path: bundledOpenCodeBinary() || packageBin('opencode-ai', 'opencode'),
     },
   ];
 }