neoagent 2.3.1-beta.76 → 2.3.1-beta.78

package/server/services/runtime/backends/local-vm.js

@@ -373,7 +373,8 @@ class LocalVmExecutionBackend {
       await client.waitForHealth({
         timeoutMs: Number(process.env.NEOAGENT_VM_BOOT_TIMEOUT_MS || 20 * 60 * 1000),
         checkLiveness: () => {
-          const session = this.vmManager.instances.get(userId);
+          const key = String(userId || '').trim();
+          const session = this.vmManager.instances.get(key);
           return session && session.process && !session.process.killed && session.process.exitCode === null;
         },
       });

package/server/services/runtime/guest_bootstrap.js

@@ -156,7 +156,6 @@ function createCloudInitScript({
     'echo "NeoAgent guest bootstrap completed."',
     '',
   ].join('\n');
-  ].join('\n');
 }
 
 function createCloudInitUserData({
@@ -390,6 +389,7 @@ function ensureGuestBootstrapSeed({
   guestToken,
   hostShareMount = '/mnt/neoagent-host',
   guestAgentPort = 8421,
+  guestArch = 'x64',
 }) {
   const seedRoot = path.join(userRoot, 'cloud-init');
   const seedDir = path.join(seedRoot, 'seed');
@@ -405,14 +405,23 @@ function ensureGuestBootstrapSeed({
     instanceId: `neoagent-${path.basename(userRoot)}`,
     localHostName: `neoagent-${path.basename(userRoot)}`,
   });
-  const startupNsh = [
-    '@echo -off',
-    'map -r',
-    'fs0:',
-    '\\EFI\\ubuntu\\shimx64.efi',
-    '\\EFI\\ubuntu\\grubx64.efi',
-    '\\EFI\\BOOT\\BOOTX64.EFI',
-  ].join('\r\n');
+  const startupNsh = guestArch === 'arm64'
+    ? [
+      '@echo -off',
+      'map -r',
+      'fs0:',
+      '\\EFI\\ubuntu\\shimaa64.efi',
+      '\\EFI\\ubuntu\\grubaa64.efi',
+      '\\EFI\\BOOT\\BOOTAA64.EFI',
+    ].join('\r\n')
+    : [
+      '@echo -off',
+      'map -r',
+      'fs0:',
+      '\\EFI\\ubuntu\\shimx64.efi',
+      '\\EFI\\ubuntu\\grubx64.efi',
+      '\\EFI\\BOOT\\BOOTX64.EFI',
+    ].join('\r\n');
 
   fs.writeFileSync(userDataPath, userData);
   fs.writeFileSync(metaDataPath, metaData);

package/server/services/runtime/qemu.js

@@ -568,6 +568,7 @@ class QemuVmManager {
     const bootstrap = ensureGuestBootstrapSeed({
       userRoot,
       guestToken,
+      guestArch: this.guestArch,
     });
     const guestDataRoot = path.join(userRoot, 'guest-data');
     const consoleLogPath = path.join(userRoot, 'console.log');
@@ -629,6 +630,12 @@ class QemuVmManager {
     });
 
     if (consoleLogPath) {
+      // Ensure file exists before reading to avoid race condition
+      try {
+        fs.closeSync(fs.openSync(consoleLogPath, 'a'));
+      } catch (err) {
+        console.warn(`[VM] Failed to pre-create console log at ${consoleLogPath}: ${err.message}`);
+      }
       // Stream serial output to console for easier debugging on remote machines
       const serialStream = fs.createReadStream(consoleLogPath, { flags: 'r' });
       serialStream.on('data', (chunk) => {