neoagent 2.3.1-beta.85 → 2.3.1-beta.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neoagent",
-  "version": "2.3.1-beta.85",
+  "version": "2.3.1-beta.86",
   "description": "Proactive personal AI agent with no limits",
   "license": "MIT",
   "main": "server/index.js",

package/server/guest-agent.android.package.json

@@ -0,0 +1,13 @@
+{
+  "name": "neoagent-guest-agent-android",
+  "private": true,
+  "version": "1.0.0",
+  "description": "Guest runtime for NeoAgent Android and CLI services",
+  "engines": {
+    "node": ">=20"
+  },
+  "dependencies": {
+    "express": "^4.21.2",
+    "proper-lockfile": "^4.1.2"
+  }
+}

package/server/guest-agent.browser.package.json

@@ -0,0 +1,14 @@
+{
+  "name": "neoagent-guest-agent-browser",
+  "private": true,
+  "version": "1.0.0",
+  "description": "Guest runtime for NeoAgent browser and CLI services",
+  "engines": {
+    "node": ">=20"
+  },
+  "dependencies": {
+    "express": "^4.21.2",
+    "playwright-chromium": "^1.59.1",
+    "proper-lockfile": "^4.1.2"
+  }
+}

package/server/guest_agent.js

@@ -5,8 +5,6 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const { CLIExecutor } = require('./services/cli/executor');
-const { BrowserController } = require('./services/browser/controller');
-const { AndroidController } = require('./services/android/controller');
 const { RUNTIME_HOME } = require('../runtime/paths');
 
 const PORT = Number(process.env.NEOAGENT_GUEST_AGENT_PORT || 8421);
@@ -23,6 +21,9 @@ function resolveGuestToken() {
 }
 
 const AUTH_TOKEN = resolveGuestToken();
+const GUEST_PROFILE = String(process.env.NEOAGENT_GUEST_PROFILE || 'browser_cli').trim() === 'android'
+  ? 'android'
+  : 'browser_cli';
 const FILE_ROOT = path.join(RUNTIME_HOME, 'guest-agent-files');
 const MAX_APK_STREAM_BYTES = Number(process.env.NEOAGENT_GUEST_MAX_APK_STREAM_BYTES || 512 * 1024 * 1024);
 
@@ -32,8 +33,12 @@ const app = express();
 app.use(express.json({ limit: '100mb' }));
 
 const cliExecutor = new CLIExecutor();
-const browserController = new BrowserController({ runtimeBackend: 'vm' });
-const androidController = new AndroidController({ runtimeBackend: 'vm' });
+const browserController = GUEST_PROFILE === 'browser_cli'
+  ? new (require('./services/browser/controller').BrowserController)({ runtimeBackend: 'vm' })
+  : null;
+const androidController = GUEST_PROFILE === 'android'
+  ? new (require('./services/android/controller').AndroidController)({ runtimeBackend: 'vm' })
+  : null;
 
 const ALLOWED_READABLE_ROOTS = [
   FILE_ROOT,
@@ -85,10 +90,10 @@ async function handle(res, work) {
 app.use(requireToken);
 
 app.get('/health', (_req, res) => {
-  console.log('[Guest Agent] Health check requested');
   res.json({
     status: 'ok',
     runtime: 'guest-agent',
+    profile: GUEST_PROFILE,
     platform: process.platform,
     arch: process.arch,
   });
@@ -151,45 +156,56 @@ app.post('/files/read', async (req, res) => {
 });
 
 app.get('/browser/status', async (_req, res) => {
-  await handle(res, async () => ({
-    launched: await Promise.resolve(browserController.isLaunched()),
-    pages: await Promise.resolve(browserController.getPageCount()),
-    headless: browserController.headless,
-    pageInfo: await browserController.getPageInfo(),
-  }));
+  await handle(res, async () => {
+    const controller = requireCapability(browserController, 'browser');
+    return {
+      launched: await Promise.resolve(controller.isLaunched()),
+      pages: await Promise.resolve(controller.getPageCount()),
+      headless: controller.headless,
+      pageInfo: await controller.getPageInfo(),
+    };
+  });
 });
-app.post('/browser/launch', async (req, res) => handle(res, () => browserController.launch(req.body || {})));
-app.post('/browser/navigate', async (req, res) => handle(res, () => browserController.navigate(req.body?.url, req.body || {})));
-app.post('/browser/screenshot', async (req, res) => handle(res, () => browserController.screenshot(req.body || {})));
-app.post('/browser/click', async (req, res) => handle(res, () => browserController.click(req.body?.selector, req.body?.text, req.body?.screenshot !== false)));
-app.post('/browser/click-point', async (req, res) => handle(res, () => browserController.clickPoint(req.body?.x, req.body?.y, req.body?.screenshot !== false)));
-app.post('/browser/fill', async (req, res) => handle(res, () => browserController.type(req.body?.selector, String(req.body?.value ?? req.body?.text ?? ''), req.body || {})));
-app.post('/browser/type-text', async (req, res) => handle(res, () => browserController.typeText(String(req.body?.text || ''), req.body || {})));
-app.post('/browser/press-key', async (req, res) => handle(res, () => browserController.pressKey(req.body?.key, req.body?.screenshot !== false)));
-app.post('/browser/scroll', async (req, res) => handle(res, () => browserController.scroll(req.body?.deltaX ?? 0, req.body?.deltaY ?? 0, req.body?.screenshot !== false)));
-app.post('/browser/extract', async (req, res) => handle(res, () => browserController.extractContent(req.body || {})));
-app.post('/browser/execute', async (req, res) => handle(res, () => browserController.executeJS(req.body?.code)));
-app.post('/browser/close', async (_req, res) => handle(res, () => browserController.closeBrowser().then(() => ({ success: true }))));
+function requireCapability(controller, name) {
+  if (!controller) {
+    throw new Error(`${name} runtime is unavailable in this guest profile.`);
+  }
+  return controller;
+}
+
+app.post('/browser/launch', async (req, res) => handle(res, () => requireCapability(browserController, 'browser').launch(req.body || {})));
+app.post('/browser/navigate', async (req, res) => handle(res, () => requireCapability(browserController, 'browser').navigate(req.body?.url, req.body || {})));
+app.post('/browser/screenshot', async (req, res) => handle(res, () => requireCapability(browserController, 'browser').screenshot(req.body || {})));
+app.post('/browser/click', async (req, res) => handle(res, () => requireCapability(browserController, 'browser').click(req.body?.selector, req.body?.text, req.body?.screenshot !== false)));
+app.post('/browser/click-point', async (req, res) => handle(res, () => requireCapability(browserController, 'browser').clickPoint(req.body?.x, req.body?.y, req.body?.screenshot !== false)));
+app.post('/browser/fill', async (req, res) => handle(res, () => requireCapability(browserController, 'browser').type(req.body?.selector, String(req.body?.value ?? req.body?.text ?? ''), req.body || {})));
+app.post('/browser/type-text', async (req, res) => handle(res, () => requireCapability(browserController, 'browser').typeText(String(req.body?.text || ''), req.body || {})));
+app.post('/browser/press-key', async (req, res) => handle(res, () => requireCapability(browserController, 'browser').pressKey(req.body?.key, req.body?.screenshot !== false)));
+app.post('/browser/scroll', async (req, res) => handle(res, () => requireCapability(browserController, 'browser').scroll(req.body?.deltaX ?? 0, req.body?.deltaY ?? 0, req.body?.screenshot !== false)));
+app.post('/browser/extract', async (req, res) => handle(res, () => requireCapability(browserController, 'browser').extractContent(req.body || {})));
+app.post('/browser/execute', async (req, res) => handle(res, () => requireCapability(browserController, 'browser').executeJS(req.body?.code)));
+app.post('/browser/close', async (_req, res) => handle(res, () => requireCapability(browserController, 'browser').closeBrowser().then(() => ({ success: true }))));
 
-app.get('/android/status', async (_req, res) => handle(res, () => androidController.getStatus()));
-app.post('/android/start', async (req, res) => handle(res, () => androidController.requestStartEmulator(req.body || {})));
-app.post('/android/stop', async (_req, res) => handle(res, () => androidController.stopEmulator()));
-app.get('/android/devices', async (_req, res) => handle(res, async () => ({ devices: await androidController.listDevices() })));
-app.post('/android/screenshot', async (req, res) => handle(res, () => androidController.screenshot(req.body || {})));
-app.post('/android/observe', async (req, res) => handle(res, () => androidController.observe(req.body || {})));
-app.post('/android/ui-dump', async (req, res) => handle(res, () => androidController.dumpUi(req.body || {})));
-app.get('/android/apps', async (req, res) => handle(res, () => androidController.listApps({ includeSystem: req.query.includeSystem === 'true' })));
-app.post('/android/open-app', async (req, res) => handle(res, () => androidController.openApp(req.body || {})));
-app.post('/android/open-intent', async (req, res) => handle(res, () => androidController.openIntent(req.body || {})));
-app.post('/android/tap', async (req, res) => handle(res, () => androidController.tap(req.body || {})));
-app.post('/android/long-press', async (req, res) => handle(res, () => androidController.longPress(req.body || {})));
-app.post('/android/type', async (req, res) => handle(res, () => androidController.type(req.body || {})));
-app.post('/android/swipe', async (req, res) => handle(res, () => androidController.swipe(req.body || {})));
-app.post('/android/press-key', async (req, res) => handle(res, () => androidController.pressKey(req.body || {})));
-app.post('/android/wait-for', async (req, res) => handle(res, () => androidController.waitFor(req.body || {})));
-app.post('/android/shell', async (req, res) => handle(res, () => androidController.shell(req.body || {})));
+app.get('/android/status', async (_req, res) => handle(res, () => requireCapability(androidController, 'android').getStatus()));
+app.post('/android/start', async (req, res) => handle(res, () => requireCapability(androidController, 'android').requestStartEmulator(req.body || {})));
+app.post('/android/stop', async (_req, res) => handle(res, () => requireCapability(androidController, 'android').stopEmulator()));
+app.get('/android/devices', async (_req, res) => handle(res, async () => ({ devices: await requireCapability(androidController, 'android').listDevices() })));
+app.post('/android/screenshot', async (req, res) => handle(res, () => requireCapability(androidController, 'android').screenshot(req.body || {})));
+app.post('/android/observe', async (req, res) => handle(res, () => requireCapability(androidController, 'android').observe(req.body || {})));
+app.post('/android/ui-dump', async (req, res) => handle(res, () => requireCapability(androidController, 'android').dumpUi(req.body || {})));
+app.get('/android/apps', async (req, res) => handle(res, () => requireCapability(androidController, 'android').listApps({ includeSystem: req.query.includeSystem === 'true' })));
+app.post('/android/open-app', async (req, res) => handle(res, () => requireCapability(androidController, 'android').openApp(req.body || {})));
+app.post('/android/open-intent', async (req, res) => handle(res, () => requireCapability(androidController, 'android').openIntent(req.body || {})));
+app.post('/android/tap', async (req, res) => handle(res, () => requireCapability(androidController, 'android').tap(req.body || {})));
+app.post('/android/long-press', async (req, res) => handle(res, () => requireCapability(androidController, 'android').longPress(req.body || {})));
+app.post('/android/type', async (req, res) => handle(res, () => requireCapability(androidController, 'android').type(req.body || {})));
+app.post('/android/swipe', async (req, res) => handle(res, () => requireCapability(androidController, 'android').swipe(req.body || {})));
+app.post('/android/press-key', async (req, res) => handle(res, () => requireCapability(androidController, 'android').pressKey(req.body || {})));
+app.post('/android/wait-for', async (req, res) => handle(res, () => requireCapability(androidController, 'android').waitFor(req.body || {})));
+app.post('/android/shell', async (req, res) => handle(res, () => requireCapability(androidController, 'android').shell(req.body || {})));
 app.post('/android/install-apk', async (req, res) => {
   await handle(res, async () => {
+    requireCapability(androidController, 'android');
     const filename = String(req.body?.filename || 'upload.apk').trim() || 'upload.apk';
     const contentBase64 = String(req.body?.contentBase64 || '').trim();
     if (!contentBase64) {
@@ -255,6 +271,7 @@ app.post('/android/install-apk-stream', async (req, res) => {
       return;
     }
     try {
+      requireCapability(androidController, 'android');
       const result = await androidController.installApk({ apkPath: tempPath });
       finished = true;
       await cleanup();
@@ -267,18 +284,18 @@ app.post('/android/install-apk-stream', async (req, res) => {
   req.pipe(output);
 });
 
-const server = app.listen(PORT, () => {
-  console.log(`NeoAgent guest agent listening on http://127.0.0.1:${PORT}`);
+const server = app.listen(PORT, '0.0.0.0', () => {
+  console.log(`NeoAgent guest agent listening on http://0.0.0.0:${PORT}`);
 });
 
 async function shutdown() {
   try {
-    await browserController.closeBrowser();
+    await browserController?.closeBrowser?.();
   } catch (err) {
     console.warn('[GuestAgent] Failed to close browser:', err?.message);
   }
   try {
-    await androidController.close();
+    await androidController?.close?.();
   } catch (err) {
     console.warn('[GuestAgent] Failed to close android controller:', err?.message);
   }

package/server/public/.last_build_id

@@ -1 +1 @@
-76e31ddbfeee7f5921472f8ab23aa471
+bce6c4c5b95c45547f84f5deb90ff314

package/server/public/flutter_bootstrap.js

@@ -37,6 +37,6 @@ _flutter.buildConfig = {"engineRevision":"42d3d75a56efe1a2e9902f52dc8006099c45d9
 
 _flutter.loader.load({
   serviceWorkerSettings: {
-    serviceWorkerVersion: "3623988917" /* Flutter's service worker is deprecated and will be removed in a future Flutter release. */
+    serviceWorkerVersion: "893082776" /* Flutter's service worker is deprecated and will be removed in a future Flutter release. */
   }
 });

package/server/public/main.dart.js

@@ -127331,7 +127331,7 @@ r===$&&A.b()
 o.push(A.id(p,A.iS(!1,new A.a3(B.tF,A.e_(new A.cU(B.h8,new A.a5o(r,p),p),p,p),p),!1,B.I,!0),p,p,0,0,0,p))}r=!1
 if(!s.ay)if(!s.ch){r=s.e
 r===$&&A.b()
-r=B.b.A("mp3vgg2g-ba72b1e").length!==0&&r.b}if(r){r=s.d
+r=B.b.A("mp5cfk5n-0931d39").length!==0&&r.b}if(r){r=s.d
 r===$&&A.b()
 r=r.V&&!r.a0?84:0
 q=s.e
@@ -131991,7 +131991,7 @@ $S:324}
 A.Y_.prototype={}
 A.R_.prototype={
 mJ(a){var s=this
-if(B.b.A("mp3vgg2g-ba72b1e").length===0||s.a!=null)return
+if(B.b.A("mp5cfk5n-0931d39").length===0||s.a!=null)return
 s.zY()
 s.a=A.pN(B.Pq,new A.b3i(s))},
 zY(){var s=0,r=A.l(t.H),q,p=2,o=[],n=this,m,l,k,j,i,h,g,f
@@ -132009,7 +132009,7 @@ if(!t.f.b(k)){s=1
 break}i=J.Z(k,"buildId")
 h=i==null?null:B.b.A(J.r(i))
 j=h==null?"":h
-if(J.bi(j)===0||J.c(j,"mp3vgg2g-ba72b1e")){s=1
+if(J.bi(j)===0||J.c(j,"mp5cfk5n-0931d39")){s=1
 break}n.b=!0
 n.J()
 p=2
@@ -132026,7 +132026,7 @@ case 2:return A.i(o.at(-1),r)}})
 return A.k($async$zY,r)},
 v0(){var s=0,r=A.l(t.H),q,p=2,o=[],n=this,m,l,k,j,i,h,g,f,e,d,c,b,a,a0,a1
 var $async$v0=A.h(function(a2,a3){if(a2===1){o.push(a3)
-s=p}for(;;)switch(s){case 0:if(B.b.A("mp3vgg2g-ba72b1e").length===0||n.c){s=1
+s=p}for(;;)switch(s){case 0:if(B.b.A("mp5cfk5n-0931d39").length===0||n.c){s=1
 break}n.c=!0
 n.J()
 p=4

package/server/routes/android.js

@@ -48,7 +48,7 @@ async function getAndroidController(req) {
   if (runtimeManager && typeof runtimeManager.getAndroidProviderForUser === 'function') {
     return runtimeManager.getAndroidProviderForUser(req.session?.userId);
   }
-  throw new Error('Android controller is unavailable. VM runtime is required.');
+  throw new Error('Android controller is unavailable.');
 }
 
 function getAndroidStatusSnapshot(req) {
@@ -77,17 +77,8 @@ function handleAndroidAction(action) {
 
 router.get('/status', async (req, res) => {
   try {
-    const runtimeManager = req.app?.locals?.runtimeManager;
-    if (!runtimeManager?.hasVmForUser?.(req.session?.userId)) {
-      res.json(getAndroidStatusSnapshot(req));
-      return;
-    }
-    if (!await runtimeManager?.isGuestAgentReadyForUser?.(req.session?.userId, 1000)) {
-      res.json(getAndroidStatusSnapshot(req));
-      return;
-    }
     const controller = await getAndroidController(req);
-    res.json(await controller.getStatus());
+    res.json(await controller.getStatus().catch(() => getAndroidStatusSnapshot(req)));
   } catch (err) {
     res.status(500).json({ error: sanitizeError(err) });
   }

package/server/routes/browser.js

@@ -41,11 +41,11 @@ function getBrowserStatusSnapshot(req) {
 router.get('/status', async (req, res) => {
   try {
     const runtimeManager = req.app?.locals?.runtimeManager;
-    if (!runtimeManager?.hasVmForUser?.(req.session?.userId)) {
+    if (!runtimeManager?.hasVmForUser?.(req.session?.userId, 'browser')) {
       res.json(getBrowserStatusSnapshot(req));
       return;
     }
-    if (!await runtimeManager?.isGuestAgentReadyForUser?.(req.session?.userId, 1000)) {
+    if (!await runtimeManager?.isGuestAgentReadyForUser?.(req.session?.userId, 1000, 'browser')) {
       res.json(getBrowserStatusSnapshot(req));
       return;
     }

package/server/services/ai/capabilityHealth.js

@@ -1,6 +1,5 @@
 const db = require('../../db/database');
 const { getProviderHealthCatalog } = require('./models');
-const { resolveBrowserExecutablePath } = require('../browser/controller');
 const { deriveCloudBrowserBackend } = require('../runtime/settings');
 
 function capabilityEntry(overrides = {}) {
@@ -38,7 +37,6 @@ function summarizeCapabilityHealth(health) {
 
 async function getBrowserHealth(userId, app, engine) {
   const runtimeManager = app?.locals?.runtimeManager || engine?.runtimeManager || null;
-  const executablePath = resolveBrowserExecutablePath();
   const runtimeSettings = typeof runtimeManager?.getSettings === 'function'
     ? runtimeManager.getSettings(userId)
     : null;
@@ -83,12 +81,11 @@ async function getBrowserHealth(userId, app, engine) {
 
   if (!controller && resolutionError) {
     return capabilityEntry({
-      configured: Boolean(executablePath),
+      configured: true,
       healthy: false,
       degraded: true,
       summary: `Browser controller resolution failed: ${resolutionError.message}`,
       details: {
-        executablePath: executablePath || null,
         error: resolutionError.message,
       },
     });
@@ -108,20 +105,15 @@ async function getBrowserHealth(userId, app, engine) {
 
   return capabilityEntry({
     connected: launched,
-    configured: Boolean(executablePath),
-    healthy: Boolean(executablePath) && !error,
+    configured: true,
+    healthy: !error,
     degraded: Boolean(error) || runtimeSettings?.browser_backend === 'extension',
     summary: error
       ? `Browser runtime error: ${error}`
       : runtimeSettings?.browser_backend === 'extension'
-        ? executablePath
-          ? `No extension device is active. Falling back to the ${deriveCloudBrowserBackend(runtimeSettings)} browser runtime.`
-          : 'No extension device is active and no browser executable was found for Puppeteer.'
-        : executablePath
-          ? (launched ? 'Browser runtime is ready.' : 'Browser executable is available but not launched.')
-          : 'No browser executable was found for Puppeteer.',
+        ? `No extension device is active. Falling back to the ${deriveCloudBrowserBackend(runtimeSettings)} browser runtime.`
+        : (launched ? 'Browser runtime is ready.' : 'Browser runtime is available but not launched.'),
     details: {
-      executablePath: executablePath || null,
       preferredBackend: runtimeSettings?.browser_backend || null,
       backend: runtimeSettings?.browser_backend === 'extension'
         ? deriveCloudBrowserBackend(runtimeSettings)
@@ -175,7 +167,7 @@ async function getAndroidHealth(userId, app, engine) {
       summary: status.lastStartError
         ? `Android tooling reported: ${status.lastStartError}`
         : bootstrapped
-          ? 'Android environment is bootstrapped.'
+          ? 'Android environment is ready on this host.'
           : (canBootstrap ? 'Android environment can be bootstrapped on this host.' : 'Android tooling cannot bootstrap on this host.'),
       details: status,
     });

package/server/services/android/android_bootstrap_worker.js

@@ -10,10 +10,10 @@ function parseBoolean(value) {
 async function main() {
   const controller = new AndroidController({
     userId: process.env.NEOAGENT_ANDROID_BOOTSTRAP_USER_ID || null,
-    runtimeBackend: 'vm',
+    runtimeBackend: 'host',
   });
   const headless = parseBoolean(process.env.NEOAGENT_ANDROID_BOOTSTRAP_HEADLESS);
-  const timeoutMs = Math.max(120000, Number(process.env.NEOAGENT_ANDROID_BOOTSTRAP_TIMEOUT_MS) || 240000);
+  const timeoutMs = Math.max(120000, Number(process.env.NEOAGENT_ANDROID_BOOTSTRAP_TIMEOUT_MS) || 600000);
 
   try {
     await controller.bootstrapEmulator({ headless, timeoutMs });