neoagent 2.1.13 → 2.1.14

package/server/routes/android.js

@@ -11,6 +11,7 @@ router.use(requireAuth);
 
 const androidApkUploadDir = path.join(DATA_DIR, 'uploads', 'android-apks');
 fs.mkdirSync(androidApkUploadDir, { recursive: true });
+const INSTALLABLE_ANDROID_PACKAGE_EXTENSIONS = new Set(['.apk', '.apks']);
 
 const androidApkUpload = multer({
   storage: multer.diskStorage({
@@ -28,8 +29,9 @@ const androidApkUpload = multer({
     },
   }),
   fileFilter: (_req, file, cb) => {
-    if (!String(file.originalname || '').toLowerCase().endsWith('.apk')) {
-      cb(new Error('Only .apk files can be installed.'));
+    const extension = path.extname(String(file.originalname || '')).toLowerCase();
+    if (!INSTALLABLE_ANDROID_PACKAGE_EXTENSIONS.has(extension)) {
+      cb(new Error('Only .apk or .apks files can be installed.'));
       return;
     }
     cb(null, true);
@@ -192,7 +194,7 @@ router.post('/install-apk', (req, res) => {
       const message =
         uploadError instanceof multer.MulterError &&
           uploadError.code === 'LIMIT_FILE_SIZE'
-        ? 'APK upload is too large. Limit is 512MB.'
+        ? 'Android app upload is too large. Limit is 512MB.'
         : sanitizeError(uploadError);
       res.status(400).json({ error: message });
       return;
@@ -200,7 +202,7 @@ router.post('/install-apk', (req, res) => {
 
     const uploadedApkPath = req.file?.path;
     if (!uploadedApkPath) {
-      res.status(400).json({ error: 'No APK file was uploaded.' });
+      res.status(400).json({ error: 'No APK or APK bundle was uploaded.' });
       return;
     }
 

package/server/services/ai/engine.js

@@ -2,7 +2,12 @@ const { v4: uuidv4 } = require('uuid');
 const fs = require('fs');
 const db = require('../../db/database');
 const { compact } = require('./compaction');
-const { getConversationContext, buildSummaryCarrier, refreshConversationSummary } = require('./history');
+const {
+  getConversationContext,
+  buildSummaryCarrier,
+  refreshConversationSummary,
+  sanitizeConversationMessages
+} = require('./history');
 const { ensureDefaultAiSettings, getAiSettings } = require('./settings');
 const { selectToolsForTask } = require('./toolSelector');
 const { compactToolResult } = require('./toolResult');
@@ -438,6 +443,7 @@ class AgentEngine {
 
     let messages = this.buildContextMessages(systemPrompt, summaryMessage, historyMessages, recallMsg);
     messages.push(this.buildUserMessage(userMessage, options));
+    messages = sanitizeConversationMessages(messages);
 
     if (conversationId) {
       db.prepare('INSERT INTO conversation_messages (conversation_id, role, content) VALUES (?, ?, ?)')
@@ -461,11 +467,13 @@ class AgentEngine {
           conversationId
         });
         messages = steeringAtLoopStart.messages;
+        messages = sanitizeConversationMessages(messages);
 
         let metrics = this.estimatePromptMetrics(messages, tools);
         const contextWindow = provider.getContextWindow(model);
         if (metrics.totalEstimatedTokens > contextWindow * 0.7) {
           messages = await compact(messages, provider, model);
+          messages = sanitizeConversationMessages(messages);
           this.emit(userId, 'run:compaction', { runId, iteration });
           metrics = this.estimatePromptMetrics(messages, tools);
         }
@@ -480,9 +488,10 @@ class AgentEngine {
         const callOptions = { model, reasoningEffort: this.getReasoningEffort(providerName, options) };
 
         const tryModelCall = async (retryForFallback = true) => {
+          const requestMessages = sanitizeConversationMessages(messages);
           try {
             if (options.stream !== false) {
-              const gen = provider.stream(messages, tools, callOptions);
+              const gen = provider.stream(requestMessages, tools, callOptions);
               for await (const chunk of gen) {
                 if (chunk.type === 'content') {
                   streamContent += chunk.content;
@@ -508,7 +517,7 @@ class AgentEngine {
                 }
               }
             } else {
-              response = await provider.chat(messages, tools, callOptions);
+              response = await provider.chat(requestMessages, tools, callOptions);
               responseModel = model;
             }
           } catch (err) {
@@ -528,9 +537,10 @@ class AgentEngine {
 
               // Recursive call once
               const retryOptions = { ...callOptions, model, reasoningEffort: this.getReasoningEffort(providerName, options) };
+              const retryMessages = sanitizeConversationMessages(messages);
 
               if (options.stream !== false) {
-                const gen = provider.stream(messages, tools, retryOptions);
+                const gen = provider.stream(retryMessages, tools, retryOptions);
                 for await (const chunk of gen) {
                   if (chunk.type === 'content') {
                     streamContent += chunk.content;
@@ -556,7 +566,7 @@ class AgentEngine {
                   }
                 }
               } else {
-                response = await provider.chat(messages, tools, retryOptions);
+                response = await provider.chat(retryMessages, tools, retryOptions);
                 responseModel = model;
               }
             } else {
@@ -704,7 +714,7 @@ class AgentEngine {
 
       if ((iteration >= maxIterations && messages[messages.length - 1]?.role === 'tool')
         || (iteration < maxIterations && stepIndex > 0 && !lastContent.trim() && messages[messages.length - 1]?.role !== 'tool')) {
-        const finalResponse = await provider.chat(messages, [], {
+        const finalResponse = await provider.chat(sanitizeConversationMessages(messages), [], {
           model,
           reasoningEffort: this.getReasoningEffort(providerName, options)
         });

package/server/services/ai/history.js

@@ -34,6 +34,67 @@ function normalizeHistoryRows(rows) {
   });
 }
 
+function sanitizeConversationMessages(messages) {
+  const sanitized = [];
+  let pendingToolSequence = null;
+
+  const dropPendingSequence = () => {
+    pendingToolSequence = null;
+  };
+
+  const flushPendingSequence = () => {
+    if (!pendingToolSequence) return;
+    if (pendingToolSequence.pendingIds.size === 0) {
+      sanitized.push(...pendingToolSequence.messages);
+    }
+    pendingToolSequence = null;
+  };
+
+  for (const msg of messages || []) {
+    if (!msg || !msg.role) continue;
+
+    if (msg.role === 'assistant' && Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0) {
+      const toolCallIds = msg.tool_calls
+        .map((toolCall) => toolCall?.id)
+        .filter(Boolean);
+
+      if (toolCallIds.length === 0) {
+        dropPendingSequence();
+        sanitized.push(msg);
+        continue;
+      }
+
+      dropPendingSequence();
+      pendingToolSequence = {
+        messages: [msg],
+        pendingIds: new Set(toolCallIds)
+      };
+      continue;
+    }
+
+    if (msg.role === 'tool') {
+      if (
+        pendingToolSequence
+        && msg.tool_call_id
+        && pendingToolSequence.pendingIds.has(msg.tool_call_id)
+      ) {
+        pendingToolSequence.messages.push(msg);
+        pendingToolSequence.pendingIds.delete(msg.tool_call_id);
+        if (pendingToolSequence.pendingIds.size === 0) {
+          flushPendingSequence();
+        }
+      }
+      continue;
+    }
+
+    dropPendingSequence();
+    sanitized.push(msg);
+  }
+
+  flushPendingSequence();
+  return sanitized;
+}
+
 function serializeHistoryForSummary(messages) {
   return messages.map((msg) => {
     if (msg.role === 'tool') {
@@ -143,7 +204,7 @@ function getConversationContext(conversationId, recentLimit) {
   return {
     summary: convo?.summary || '',
     summaryCount: Number(convo?.summary_message_count || 0),
-    recentMessages: normalizeHistoryRows(recent),
+    recentMessages: sanitizeConversationMessages(normalizeHistoryRows(recent)),
     totalMessages: db.prepare('SELECT COUNT(*) AS count FROM conversation_messages WHERE conversation_id = ?').get(conversationId).count
   };
 }
@@ -184,5 +245,6 @@ module.exports = {
   getWebChatContext,
   refreshConversationSummary,
   refreshWebChatSummary,
+  sanitizeConversationMessages,
   summarizeMessages
 };

package/server/services/ai/tools.js

@@ -332,11 +332,11 @@ function getAvailableTools(app, options = {}) {
         },
         {
             name: 'android_install_apk',
-            description: 'Install or replace an APK on the Android emulator.',
+            description: 'Install or replace an APK or universal .apks bundle on the Android emulator.',
             parameters: {
                 type: 'object',
                 properties: {
-                    apkPath: { type: 'string', description: 'Absolute path to the APK file on disk' }
+                    apkPath: { type: 'string', description: 'Absolute path to an .apk file or universal .apks bundle on disk' }
                 },
                 required: ['apkPath']
             }

package/server/services/android/controller.js

@@ -276,6 +276,49 @@ function extractZip(zipPath, destDir) {
   throw new Error('Neither unzip nor ditto is available to extract Android SDK archives');
 }
 
+function listFilesRecursive(rootDir, predicate, bucket = []) {
+  for (const entry of fs.readdirSync(rootDir, { withFileTypes: true })) {
+    const fullPath = path.join(rootDir, entry.name);
+    if (entry.isDirectory()) {
+      listFilesRecursive(fullPath, predicate, bucket);
+      continue;
+    }
+    if (!predicate || predicate(fullPath, entry)) {
+      bucket.push(fullPath);
+    }
+  }
+  return bucket;
+}
+
+function resolveBundleInstallTargets(bundleDir) {
+  const apkFiles = listFilesRecursive(bundleDir, (filePath) => path.extname(filePath).toLowerCase() === '.apk')
+    .sort((a, b) => a.localeCompare(b));
+  if (apkFiles.length === 0) {
+    throw new Error('APK bundle did not contain any installable .apk files.');
+  }
+
+  const universalApk = apkFiles.find((filePath) => path.basename(filePath).toLowerCase() === 'universal.apk');
+  if (universalApk) {
+    return {
+      mode: 'single',
+      installPaths: [universalApk],
+      layout: 'universal',
+    };
+  }
+
+  if (apkFiles.length === 1) {
+    return {
+      mode: 'single',
+      installPaths: apkFiles,
+      layout: 'single-apk',
+    };
+  }
+
+  throw new Error(
+    'APK bundles must include a universal APK. Export a universal .apks bundle or upload a single .apk instead.'
+  );
+}
+
 function parseLatestCmdlineToolsUrl(xml) {
   const tag = platformTag() === 'mac' ? 'macosx' : 'linux';
   const packageMatch = xml.match(new RegExp(`<remotePackage\\s+path="cmdline-tools;latest">([\\s\\S]*?)<\\/remotePackage>`));
@@ -1162,16 +1205,18 @@ class AndroidController {
       }
     }
 
-    try {
-      const dump = await this.dumpUi({
-        serial: resolvedSerial,
-        includeNodes: options.includeNodes !== false,
-      });
-      observation.uiDumpPath = dump.uiDumpPath;
-      observation.nodeCount = dump.nodeCount;
-      observation.preview = dump.preview;
-    } catch (err) {
-      observation.observationWarnings.push(`ui_dump: ${err.message}`);
+    if (options.uiDump !== false) {
+      try {
+        const dump = await this.dumpUi({
+          serial: resolvedSerial,
+          includeNodes: options.includeNodes !== false,
+        });
+        observation.uiDumpPath = dump.uiDumpPath;
+        observation.nodeCount = dump.nodeCount;
+        observation.preview = dump.preview;
+      } catch (err) {
+        observation.observationWarnings.push(`ui_dump: ${err.message}`);
+      }
     }
 
     if (observation.observationWarnings.length === 0) {
@@ -1233,7 +1278,7 @@ class AndroidController {
     }
 
     await this.#adb(serial, `shell input tap ${Math.round(x)} ${Math.round(y)}`, { timeout: 15000 });
-    const observation = await this.#captureObservation(serial);
+    const observation = await this.#captureObservation(serial, args);
     return {
       success: true,
       serial,
@@ -1267,7 +1312,7 @@ class AndroidController {
       `shell input swipe ${Math.round(x)} ${Math.round(y)} ${Math.round(x)} ${Math.round(y)} ${Math.round(durationMs)}`,
       { timeout: Math.max(15000, durationMs + 5000) },
     );
-    const observation = await this.#captureObservation(serial);
+    const observation = await this.#captureObservation(serial, args);
     return {
       success: true,
       serial,
@@ -1294,6 +1339,8 @@ class AndroidController {
         description: args.description,
         className: args.className,
         clickable: true,
+        screenshot: false,
+        uiDump: false,
       }).catch(() => {});
     }
 
@@ -1301,7 +1348,7 @@ class AndroidController {
     if (args.pressEnter) {
       await this.#adb(serial, 'shell input keyevent 66', { timeout: 10000 });
     }
-    const observation = await this.#captureObservation(serial);
+    const observation = await this.#captureObservation(serial, args);
     return {
       success: true,
       serial,
@@ -1321,7 +1368,7 @@ class AndroidController {
       throw new Error('x1, y1, x2, and y2 are required for android_swipe');
     }
     await this.#adb(serial, `shell input swipe ${Math.round(x1)} ${Math.round(y1)} ${Math.round(x2)} ${Math.round(y2)} ${Math.round(duration)}`, { timeout: 15000 });
-    const observation = await this.#captureObservation(serial);
+    const observation = await this.#captureObservation(serial, args);
     return {
       success: true,
       serial,
@@ -1335,7 +1382,7 @@ class AndroidController {
     const keyCode = Number.isFinite(Number(raw)) ? Number(raw) : (DEFAULT_KEYEVENTS[raw] || null);
     if (!keyCode) throw new Error(`Unsupported Android key: ${args.key}`);
     await this.#adb(serial, `shell input keyevent ${keyCode}`, { timeout: 10000 });
-    const observation = await this.#captureObservation(serial);
+    const observation = await this.#captureObservation(serial, args);
     return {
       success: true,
       serial,
@@ -1363,6 +1410,8 @@ class AndroidController {
       if (node) {
         const observation = await this.#captureObservation(dump.serial, {
           screenshot: args.screenshot !== false,
+          uiDump: args.uiDump !== false,
+          includeNodes: args.includeNodes,
         });
         return {
           success: true,
@@ -1400,7 +1449,7 @@ class AndroidController {
     } else {
       throw new Error('packageName is required for android_open_app');
     }
-    const observation = await this.#captureObservation(serial);
+    const observation = await this.#captureObservation(serial, args);
     return {
       success: true,
       serial,
@@ -1426,7 +1475,7 @@ class AndroidController {
     }
 
     await this.#adb(serial, parts.join(' '), { timeout: 20000 });
-    const observation = await this.#captureObservation(serial);
+    const observation = await this.#captureObservation(serial, args);
     return {
       success: true,
       serial,
@@ -1456,11 +1505,38 @@ class AndroidController {
     const apkPath = path.resolve(String(args.apkPath || ''));
     if (!apkPath || !fs.existsSync(apkPath)) throw new Error(`APK not found: ${apkPath}`);
     const serial = await this.ensureDevice();
+    const extension = path.extname(apkPath).toLowerCase();
+
+    if (extension === '.aab') {
+      throw new Error('.aab app bundles are not directly installable. Export a .apks bundle or .apk first.');
+    }
+
+    if (extension === '.apks') {
+      const extractDir = fs.mkdtempSync(path.join(TMP_DIR, 'apk-bundle-'));
+      try {
+        extractZip(apkPath, extractDir);
+        const bundle = resolveBundleInstallTargets(extractDir);
+        await this.#adb(serial, `install -r ${quoteShell(bundle.installPaths[0])}`, { timeout: 300000 });
+        return {
+          success: true,
+          serial,
+          apkPath,
+          artifactType: 'apks',
+          installedPaths: bundle.installPaths,
+          bundleLayout: bundle.layout,
+        };
+      } finally {
+        fs.rmSync(extractDir, { recursive: true, force: true });
+      }
+    }
+
     await this.#adb(serial, `install -r ${quoteShell(apkPath)}`, { timeout: 300000 });
     return {
       success: true,
       serial,
       apkPath,
+      artifactType: 'apk',
+      installedPaths: [apkPath],
     };
   }