amalgm 0.1.121 → 0.1.122

package/package.json

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

package/runtime/scripts/chat-core/tests/native-binaries.test.js

@@ -53,8 +53,10 @@ function installFakePackagedAgentDeps(resourcesPath) {
     codexTarget.packageName,
   );
   writePackage(codexRoot, codexTarget.packageName);
-  const codex = path.join(codexRoot, 'vendor', codexTarget.triple, 'codex', codexTarget.binaryName);
+  const codex = path.join(codexRoot, 'vendor', codexTarget.triple, 'bin', codexTarget.binaryName);
   writeExecutable(codex);
+  const codexRg = path.join(codexRoot, 'vendor', codexTarget.triple, 'codex-path', process.platform === 'win32' ? 'rg.exe' : 'rg');
+  writeExecutable(codexRg);
 
   const openCodeRoot = packagePath(
     path.join(nodeModules, 'opencode-ai', 'node_modules'),
@@ -108,6 +110,10 @@ test('packaged nested agent dependencies resolve to exact executable paths and s
 
     assert.equal(nativeBinaries.__private.bundledClaudeBinary(), expected.claude);
     assert.equal(nativeBinaries.bundledCodexBinary(), expected.codex);
+    assert.deepEqual(
+      nativeBinaries.bundledCodexPathDirs(),
+      [path.join(path.dirname(path.dirname(expected.codex)), 'codex-path')],
+    );
     assert.equal(nativeBinaries.bundledOpenCodeBinary(), expected.opencode);
 
     const result = nativeBinaries.ensureAgentCommandShims({ quiet: true, logger: { log() {} } });

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

@@ -250,13 +250,22 @@ function codexVendorRoot() {
   return null;
 }
 
+function codexBinaryCandidates(vendorRoot, target) {
+  if (!vendorRoot || !target) return [];
+  return [
+    path.join(vendorRoot, target.triple, 'bin', target.binaryName),
+    path.join(vendorRoot, target.triple, 'codex', target.binaryName),
+  ];
+}
+
 function bundledCodexBinary() {
   const target = codexTarget();
   const vendorRoot = codexVendorRoot();
   if (target && vendorRoot) {
-    const candidate = path.join(vendorRoot, target.triple, 'codex', target.binaryName);
-    const executable = executablePath(candidate);
-    if (executable) return executable;
+    for (const candidate of codexBinaryCandidates(vendorRoot, target)) {
+      const executable = executablePath(candidate);
+      if (executable) return executable;
+    }
   }
   return packageBin('@openai/codex', 'codex');
 }
@@ -265,8 +274,11 @@ function bundledCodexPathDirs() {
   const target = codexTarget();
   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 candidates = [
+    path.join(vendorRoot, target.triple, 'codex-path'),
+    path.join(vendorRoot, target.triple, 'path'),
+  ];
+  return candidates.filter((candidate) => executableExists(path.join(candidate, process.platform === 'win32' ? 'rg.exe' : 'rg')));
 }
 
 function openCodePlatform() {
@@ -372,7 +384,7 @@ function commandTargets() {
     {
       command: 'codex',
       name: 'Codex',
-      path: packageBin('@openai/codex', 'codex') || bundledCodexBinary(),
+      path: bundledCodexBinary() || packageBin('@openai/codex', 'codex'),
     },
     {
       command: 'opencode',