neoagent 3.2.1-beta.0 → 3.2.1-beta.10

package/lib/schema_migrations.js

@@ -30,20 +30,41 @@ function migrateMemoryEmbeddingIndex(db) {
       .map((column) => column.name),
   );
   if (!columns.has('index_version')) {
-    db.exec('ALTER TABLE memory_embedding_bands ADD COLUMN index_version INTEGER');
-  }
-  db.exec(`
-    DROP INDEX IF EXISTS idx_memory_embedding_bands_lookup;
-    CREATE INDEX idx_memory_embedding_bands_lookup
-      ON memory_embedding_bands(
-        user_id,
-        agent_id,
-        dimension,
-        index_version,
-        band_index,
-        band_value
+    try {
+      db.exec('ALTER TABLE memory_embedding_bands ADD COLUMN index_version INTEGER');
+    } catch (error) {
+      const refreshedColumns = new Set(
+        db.prepare('PRAGMA table_info(memory_embedding_bands)').all()
+          .map((column) => column.name),
       );
-  `);
+      if (!refreshedColumns.has('index_version')) throw error;
+    }
+  }
+  const expectedIndexColumns = [
+    'user_id',
+    'agent_id',
+    'dimension',
+    'index_version',
+    'band_index',
+    'band_value',
+  ];
+  const indexColumns = db.prepare(
+    'PRAGMA index_info(idx_memory_embedding_bands_lookup)',
+  ).all().map((column) => column.name);
+  if (indexColumns.join('\0') !== expectedIndexColumns.join('\0')) {
+    db.exec(`
+      DROP INDEX IF EXISTS idx_memory_embedding_bands_lookup;
+      CREATE INDEX IF NOT EXISTS idx_memory_embedding_bands_lookup
+        ON memory_embedding_bands(
+          user_id,
+          agent_id,
+          dimension,
+          index_version,
+          band_index,
+          band_value
+        );
+    `);
+  }
 }
 
 function removeRetiredCaptureData(db) {
@@ -633,6 +654,111 @@ function migrateBilling(db) {
   `);
 }
 
+function migrateAgentRunLifecycle(db) {
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS agent_run_controls (
+      run_id       TEXT PRIMARY KEY,
+      user_id      INTEGER NOT NULL,
+      action       TEXT NOT NULL CHECK(action IN ('pause', 'stop', 'interrupt')),
+      reason       TEXT DEFAULT '',
+      requested_at TEXT DEFAULT (datetime('now')),
+      consumed_at  TEXT,
+      FOREIGN KEY (run_id) REFERENCES agent_runs(id) ON DELETE CASCADE,
+      FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
+    );
+
+    CREATE TABLE IF NOT EXISTS agent_run_checkpoints (
+      run_id          TEXT PRIMARY KEY,
+      version         INTEGER NOT NULL DEFAULT 1,
+      phase           TEXT NOT NULL,
+      state_json      TEXT NOT NULL DEFAULT '{}',
+      created_at      TEXT DEFAULT (datetime('now')),
+      updated_at      TEXT DEFAULT (datetime('now')),
+      FOREIGN KEY (run_id) REFERENCES agent_runs(id) ON DELETE CASCADE
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_agent_run_controls_pending
+      ON agent_run_controls(user_id, consumed_at, requested_at);
+  `);
+}
+
+function migrateMessagingInboundJobs(db) {
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS messaging_inbound_jobs (
+      id                TEXT PRIMARY KEY,
+      message_id        INTEGER NOT NULL UNIQUE,
+      user_id           INTEGER NOT NULL,
+      agent_id          TEXT,
+      platform          TEXT NOT NULL,
+      platform_msg_id   TEXT,
+      platform_chat_id  TEXT,
+      payload_json      TEXT NOT NULL,
+      status            TEXT NOT NULL DEFAULT 'pending'
+                        CHECK(status IN ('pending', 'processing', 'completed', 'failed')),
+      attempts          INTEGER NOT NULL DEFAULT 0,
+      run_id            TEXT,
+      last_error        TEXT,
+      created_at        TEXT NOT NULL DEFAULT (datetime('now')),
+      updated_at        TEXT NOT NULL DEFAULT (datetime('now')),
+      completed_at      TEXT,
+      FOREIGN KEY (message_id) REFERENCES messages(id) ON DELETE CASCADE,
+      FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
+      FOREIGN KEY (agent_id) REFERENCES agents(id) ON DELETE SET NULL
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_messaging_inbound_jobs_pending
+      ON messaging_inbound_jobs(status, platform, user_id, agent_id, created_at);
+    CREATE INDEX IF NOT EXISTS idx_messaging_inbound_jobs_run
+      ON messaging_inbound_jobs(run_id);
+  `);
+}
+
+function migrateCredentialBroker(db) {
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS credential_bindings (
+      id TEXT PRIMARY KEY,
+      user_id INTEGER NOT NULL,
+      agent_id TEXT NOT NULL,
+      provider_key TEXT NOT NULL,
+      connection_id INTEGER NOT NULL,
+      alias TEXT NOT NULL,
+      usage_type TEXT NOT NULL CHECK(usage_type IN ('browser', 'http')),
+      item_ref_encrypted TEXT NOT NULL,
+      field_config_encrypted TEXT NOT NULL,
+      target_config_json TEXT NOT NULL DEFAULT '{}',
+      created_at TEXT DEFAULT (datetime('now')),
+      updated_at TEXT DEFAULT (datetime('now')),
+      FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
+      FOREIGN KEY (agent_id) REFERENCES agents(id) ON DELETE CASCADE,
+      FOREIGN KEY (connection_id) REFERENCES integration_connections(id) ON DELETE CASCADE,
+      UNIQUE(user_id, agent_id, alias)
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_credential_bindings_scope
+      ON credential_bindings(user_id, agent_id, provider_key, usage_type);
+
+    CREATE TABLE IF NOT EXISTS credential_usage_audit (
+      id TEXT PRIMARY KEY,
+      user_id INTEGER NOT NULL,
+      agent_id TEXT NOT NULL,
+      run_id TEXT,
+      binding_id TEXT,
+      operation TEXT NOT NULL,
+      target TEXT,
+      outcome TEXT NOT NULL,
+      error_code TEXT,
+      created_at TEXT DEFAULT (datetime('now')),
+      FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE,
+      FOREIGN KEY (agent_id) REFERENCES agents(id) ON DELETE CASCADE,
+      FOREIGN KEY (run_id) REFERENCES agent_runs(id) ON DELETE SET NULL,
+      FOREIGN KEY (binding_id) REFERENCES credential_bindings(id) ON DELETE SET NULL
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_credential_usage_audit_scope
+      ON credential_usage_audit(user_id, agent_id, created_at DESC);
+  `);
+}
+
 function runSchemaMigrations(db) {
   removeRetiredCaptureData(db);
   migrateMemoryEmbeddingIndex(db);
@@ -647,6 +773,9 @@ function runSchemaMigrations(db) {
   migrateApprovalPersistence(db);
   migrateToolPoliciesAllowAlways(db);
   migrateBilling(db);
+  migrateAgentRunLifecycle(db);
+  migrateMessagingInboundJobs(db);
+  migrateCredentialBroker(db);
 }
 
 module.exports = {
@@ -664,5 +793,8 @@ module.exports = {
   migrateApprovalPersistence,
   migrateToolPoliciesAllowAlways,
   migrateBilling,
+  migrateAgentRunLifecycle,
+  migrateMessagingInboundJobs,
+  migrateCredentialBroker,
   runSchemaMigrations,
 };

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "neoagent",
-  "version": "3.2.1-beta.0",
+  "version": "3.2.1-beta.10",
   "description": "Self-hosted AI agent for long-running tasks, automation, messaging, device control, and local memory",
   "license": "AGPL-3.0-only",
   "main": "server/index.js",
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.19.0"
   },
   "bin": {
     "neoagent": "bin/neoagent.js"
@@ -67,10 +67,11 @@
   "homepage": "https://github.com/NeoLabs-Systems/NeoAgent#readme",
   "dependencies": {
     "@anthropic-ai/sdk": "^0.39.0",
-    "@google/generative-ai": "^0.24.0",
-    "@modelcontextprotocol/sdk": "^1.12.1",
+    "@bitwarden/cli": "^2026.6.0",
+    "@google/genai": "^2.13.0",
+    "@modelcontextprotocol/sdk": "^1.29.0",
     "@remotion/cli": "^4.0.459",
-    "@slidev/cli": "^52.15.2",
+    "@slidev/cli": "^52.18.0",
     "@slidev/theme-default": "^0.25.0",
     "baileys": "^6.7.21",
     "bcrypt": "^6.0.0",
@@ -78,7 +79,7 @@
     "better-sqlite3-session-store": "^0.1.0",
     "cheerio": "^1.0.0-rc.12",
     "cors": "^2.8.5",
-    "discord.js": "^14.25.1",
+    "discord.js": "^14.27.0",
     "dotenv": "^16.4.7",
     "express": "^4.21.2",
     "express-rate-limit": "^7.5.0",
@@ -86,10 +87,10 @@
     "geoip-lite": "^1.4.10",
     "googleapis": "^150.0.1",
     "helmet": "^8.0.0",
-    "multer": "^1.4.5-lts.1",
-    "node-cron": "^3.0.3",
+    "multer": "^2.2.0",
+    "node-cron": "^4.6.0",
     "node-pty": "^1.0.0",
-    "nodemailer": "^8.0.5",
+    "nodemailer": "^9.0.3",
     "openai": "^4.85.4",
     "otplib": "^13.4.0",
     "playwright-chromium": "^1.59.1",
@@ -99,7 +100,7 @@
     "puppeteer-extra-plugin-stealth": "^2.11.2",
     "qrcode": "^1.5.4",
     "remotion": "^4.0.459",
-    "sharp": "^0.34.5",
+    "sharp": "^0.35.3",
     "socket.io": "^4.8.1",
     "stripe": "^22.2.1",
     "telegraf": "^4.16.3",
@@ -109,19 +110,33 @@
     "ws": "^8.21.0"
   },
   "overrides": {
+    "@bitwarden/cli": {
+      "form-data": "4.0.6",
+      "inquirer": "8.2.7",
+      "multer": "2.2.0"
+    },
+    "@hono/node-server": "^2.0.11",
     "axios": "^1.15.2",
     "basic-ftp": "^5.3.0",
+    "dompurify": "^3.4.12",
+    "fast-uri": "^3.1.4",
+    "form-data": "4.0.6",
     "follow-redirects": "^1.16.0",
-    "hono": "^4.12.14",
-    "protobufjs": "^7.5.5",
+    "hono": "^4.12.31",
+    "ip-address": "^10.2.0",
+    "linkify-it": "^5.0.2",
+    "protobufjs": "^7.6.5",
     "serialize-javascript": "^7.0.5",
-    "undici": "^6.24.0",
+    "tmp": "0.2.7",
+    "undici": "^6.27.0",
+    "uuid": "$uuid",
     "webpackbar": "^7.0.0",
     "ws": "^8.21.0"
   },
   "devDependencies": {
-    "@docusaurus/core": "3.10.0",
-    "@docusaurus/preset-classic": "3.10.0",
+    "@docusaurus/core": "3.10.2",
+    "@docusaurus/preset-classic": "3.10.2",
+    "@types/node": "^20.19.0",
     "autocannon": "^7.15.0",
     "react": "18.3.1",
     "react-dom": "18.3.1",

package/runtime/paths.js

@@ -109,26 +109,69 @@ function readEnvFileRaw(envFile = ENV_FILE) {
   }
 }
 
+function writeEnvFileAtomic(envFile, content) {
+  const resolved = path.resolve(envFile);
+  const directory = path.dirname(resolved);
+  const temporary = path.join(
+    directory,
+    `.${path.basename(resolved)}.${process.pid}.${crypto.randomBytes(8).toString('hex')}.tmp`,
+  );
+  fs.mkdirSync(directory, { recursive: true });
+  let descriptor = null;
+  try {
+    descriptor = fs.openSync(temporary, 'wx', 0o600);
+    fs.writeFileSync(descriptor, content, 'utf8');
+    fs.fsyncSync(descriptor);
+    fs.closeSync(descriptor);
+    descriptor = null;
+    fs.renameSync(temporary, resolved);
+  } finally {
+    if (descriptor !== null) {
+      try { fs.closeSync(descriptor); } catch {}
+    }
+    try { fs.rmSync(temporary, { force: true }); } catch {}
+  }
+}
+
+function normalizeEnvKey(key) {
+  const normalized = String(key).replace(/[\r\n]/g, '');
+  if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(normalized)) {
+    throw new Error(`Invalid environment variable name: ${normalized || '(empty)'}`);
+  }
+  return normalized;
+}
+
 function upsertEnvValue(envFile, key, value) {
+  const safeKey = normalizeEnvKey(key);
+  const safeValue = String(value).replace(/[\r\n]/g, '');
   const raw = readEnvFileRaw(envFile);
   const lines = raw ? raw.split('\n') : [];
   let replaced = false;
 
   for (let i = 0; i < lines.length; i++) {
-    if (lines[i].startsWith(`${key}=`)) {
-      lines[i] = `${key}=${value}`;
+    if (lines[i].startsWith(`${safeKey}=`)) {
+      lines[i] = `${safeKey}=${safeValue}`;
       replaced = true;
       break;
     }
   }
 
   if (!replaced) {
-    lines.push(`${key}=${value}`);
+    lines.push(`${safeKey}=${safeValue}`);
   }
 
   const output = lines.filter((line, idx, arr) => idx !== arr.length - 1 || line !== '').join('\n') + '\n';
-  fs.mkdirSync(path.dirname(envFile), { recursive: true });
-  fs.writeFileSync(envFile, output, { mode: 0o600 });
+  writeEnvFileAtomic(envFile, output);
+}
+
+function removeEnvValue(envFile, key) {
+  const safeKey = normalizeEnvKey(key);
+  const raw = readEnvFileRaw(envFile);
+  if (!raw) return false;
+  const lines = raw.split('\n').filter((line) => !line.startsWith(`${safeKey}=`));
+  const output = lines.filter((line, idx, arr) => idx !== arr.length - 1 || line !== '').join('\n') + '\n';
+  writeEnvFileAtomic(envFile, output);
+  return true;
 }
 
 function generateSecret(bytes = 32) {
@@ -247,6 +290,7 @@ module.exports = {
   ensureSecureRuntimeEnv,
   getDefaultVmBaseImageUrl,
   migrateLegacyRuntime,
+  removeEnvValue,
   upsertEnvValue,
   readEnvFileRaw,
 };

package/server/db/database.js

@@ -1021,7 +1021,7 @@ function interruptStaleAgentRuns(reason = STALE_RUN_INTERRUPTED_ERROR) {
   const staleRunIds = db.prepare(
     `SELECT id
      FROM agent_runs
-     WHERE status = 'running'`
+     WHERE status IN ('running', 'pausing', 'paused', 'resuming')`
   ).all().map((row) => row.id);
   const runsResult = db.prepare(
     `UPDATE agent_runs
@@ -1029,7 +1029,7 @@ function interruptStaleAgentRuns(reason = STALE_RUN_INTERRUPTED_ERROR) {
          error = COALESCE(NULLIF(error, ''), ?),
          updated_at = datetime('now'),
          completed_at = COALESCE(completed_at, datetime('now'))
-     WHERE status = 'running'`
+     WHERE status IN ('running', 'pausing', 'paused', 'resuming')`
   ).run(normalizedReason);
 
   db.prepare(
@@ -1311,8 +1311,8 @@ function getMainAgentId(userId) {
        id, user_id, slug, display_name, description, responsibilities, instructions,
        is_default, can_delegate, can_be_delegated_to, delegate_targets_json
      )
-     VALUES (?, ?, 'main', 'Main', 'Default personal assistant and fallback agent.',
-       'Handle general requests and delegate to specialist agents only when there is a clear match.',
+     VALUES (?, ?, 'main', 'Main', 'Default personal AI contact and fallback agent.',
+       'Handle general requests like a proactive favorite contact and delegate to specialist agents only when there is a clear match.',
        '', 1, 1, 0, '[]'
      )`
   ).run(id, userId);

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

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

package/server/guest_agent.js

@@ -4,7 +4,6 @@ const express = require('express');
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { CLIExecutor } = require('./services/cli/executor');
 const { RUNTIME_HOME, DATA_DIR } = require('../runtime/paths');
 
 const PORT = Number(process.env.NEOAGENT_GUEST_AGENT_PORT || 8421);
@@ -21,8 +20,9 @@ function resolveGuestToken() {
 }
 
 const AUTH_TOKEN = resolveGuestToken();
-const GUEST_PROFILE = String(process.env.NEOAGENT_GUEST_PROFILE || 'browser_cli').trim() === 'android'
-  ? 'android'
+const RAW_GUEST_PROFILE = String(process.env.NEOAGENT_GUEST_PROFILE || 'browser_cli').trim();
+const GUEST_PROFILE = ['android', 'browser', 'cli', 'browser_cli'].includes(RAW_GUEST_PROFILE)
+  ? RAW_GUEST_PROFILE
   : '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 +32,10 @@ fs.mkdirSync(FILE_ROOT, { recursive: true });
 const app = express();
 app.use(express.json({ limit: '100mb' }));
 
-const cliExecutor = new CLIExecutor();
-const browserController = GUEST_PROFILE === 'browser_cli'
+const cliExecutor = ['cli', 'browser_cli', 'android'].includes(GUEST_PROFILE)
+  ? new (require('./services/cli/executor').CLIExecutor)()
+  : null;
+const browserController = ['browser', 'browser_cli'].includes(GUEST_PROFILE)
   ? new (require('./services/browser/controller').BrowserController)({ runtimeBackend: 'vm' })
   : null;
 const androidController = GUEST_PROFILE === 'android'
@@ -105,6 +107,26 @@ async function handle(res, work) {
   }
 }
 
+async function handleRequest(req, res, work) {
+  const controller = new AbortController();
+  const abort = () => {
+    if (!res.writableEnded) controller.abort('Guest runtime request disconnected.');
+  };
+  req.once('aborted', abort);
+  res.once('close', abort);
+  try {
+    const result = await work(controller.signal);
+    if (!res.headersSent && !res.writableEnded) res.json(result);
+  } catch (err) {
+    if (!res.headersSent && !res.writableEnded) {
+      res.status(controller.signal.aborted ? 499 : 500).json({ error: sanitizeError(err) });
+    }
+  } finally {
+    req.removeListener('aborted', abort);
+    res.removeListener('close', abort);
+  }
+}
+
 app.use(requireToken);
 
 app.get('/health', (_req, res) => {
@@ -118,36 +140,40 @@ app.get('/health', (_req, res) => {
 });
 
 app.post('/exec', async (req, res) => {
-  await handle(res, async () => {
+  await handleRequest(req, res, async (signal) => {
+    const executor = requireCapability(cliExecutor, 'cli');
     const command = String(req.body?.command || '').trim();
     if (!command) {
       return { error: 'command is required' };
     }
     if (req.body?.pty) {
-      return cliExecutor.executeInteractive(command, req.body?.inputs || [], {
+      return executor.executeInteractive(command, req.body?.inputs || [], {
         cwd: req.body?.cwd,
         timeout: req.body?.timeout,
+        signal,
       });
     }
-    return cliExecutor.execute(command, {
+    return executor.execute(command, {
       cwd: req.body?.cwd,
       timeout: req.body?.timeout,
       stdinInput: req.body?.stdin_input,
+      signal,
     });
   });
 });
 
 app.post('/exec/kill', async (req, res) => {
   await handle(res, async () => {
+    const executor = requireCapability(cliExecutor, 'cli');
     const pid = Number(req.body?.pid);
     if (!Number.isInteger(pid) || pid <= 0) {
       return { error: 'pid is required' };
     }
     const reason = String(req.body?.reason || 'aborted').trim();
-    if (typeof cliExecutor.isManaged === 'function' && !cliExecutor.isManaged(pid)) {
+    if (typeof executor.isManaged === 'function' && !executor.isManaged(pid)) {
       return { error: 'pid not managed' };
     }
-    const killed = cliExecutor.kill(pid, reason || 'aborted');
+    const killed = executor.kill(pid, reason || 'aborted');
     return { success: killed, pid };
   });
 });
@@ -185,6 +211,22 @@ app.get('/browser/status', async (_req, res) => {
     };
   });
 });
+
+app.use('/browser', (req, res, next) => {
+  if (!browserController?.hasProtectedCredentialFill?.()) return next();
+  const allowed = new Set([
+    '/status',
+    '/credential-submit',
+    '/credential-cancel',
+    '/close',
+  ]);
+  if (allowed.has(req.path)) return next();
+  return res.status(423).json({
+    error: 'Browser control is paused while a protected credential fill is active. Submit or cancel it first.',
+    code: 'PROTECTED_CREDENTIAL_FILL_ACTIVE',
+  });
+});
+
 function requireCapability(controller, name) {
   if (!controller) {
     throw new Error(`${name} runtime is unavailable in this guest profile.`);
@@ -192,43 +234,46 @@ function requireCapability(controller, name) {
   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/screenshot-jpeg', async (req, res) => handle(res, async () => {
-  const jpeg = await requireCapability(browserController, 'browser').screenshotJpeg(req.body?.quality, req.body || {});
+app.post('/browser/launch', async (req, res) => handleRequest(req, res, (signal) => requireCapability(browserController, 'browser').launch({ ...(req.body || {}), signal })));
+app.post('/browser/navigate', async (req, res) => handleRequest(req, res, (signal) => requireCapability(browserController, 'browser').navigate(req.body?.url, { ...(req.body || {}), signal })));
+app.post('/browser/screenshot', async (req, res) => handleRequest(req, res, (signal) => requireCapability(browserController, 'browser').screenshot({ ...(req.body || {}), signal })));
+app.post('/browser/screenshot-jpeg', async (req, res) => handleRequest(req, res, async (signal) => {
+  const jpeg = await requireCapability(browserController, 'browser').screenshotJpeg(req.body?.quality, { ...(req.body || {}), signal });
   return {
     contentType: 'image/jpeg',
     contentBase64: Buffer.from(jpeg).toString('base64'),
   };
 }));
-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/click', async (req, res) => handleRequest(req, res, (signal) => requireCapability(browserController, 'browser').click(req.body?.selector, req.body?.text, req.body?.screenshot !== false, { signal })));
+app.post('/browser/click-point', async (req, res) => handleRequest(req, res, (signal) => requireCapability(browserController, 'browser').clickPoint(req.body?.x, req.body?.y, req.body?.screenshot !== false, { signal })));
+app.post('/browser/fill', async (req, res) => handleRequest(req, res, (signal) => requireCapability(browserController, 'browser').type(req.body?.selector, String(req.body?.value ?? req.body?.text ?? ''), { ...(req.body || {}), signal })));
+app.post('/browser/credential-fill', async (req, res) => handleRequest(req, res, (signal) => requireCapability(browserController, 'browser').fillCredential(req.body || {}, { signal })));
+app.post('/browser/credential-submit', async (req, res) => handleRequest(req, res, (signal) => requireCapability(browserController, 'browser').submitProtectedCredential(req.body?.protectedFillId, { signal })));
+app.post('/browser/credential-cancel', async (req, res) => handleRequest(req, res, () => requireCapability(browserController, 'browser').cancelProtectedCredential(req.body?.protectedFillId)));
+app.post('/browser/type-text', async (req, res) => handleRequest(req, res, (signal) => requireCapability(browserController, 'browser').typeText(String(req.body?.text || ''), { ...(req.body || {}), signal })));
+app.post('/browser/press-key', async (req, res) => handleRequest(req, res, (signal) => requireCapability(browserController, 'browser').pressKey(req.body?.key, req.body?.screenshot !== false, { signal })));
+app.post('/browser/scroll', async (req, res) => handleRequest(req, res, (signal) => requireCapability(browserController, 'browser').scroll(req.body?.deltaX ?? 0, req.body?.deltaY ?? 0, req.body?.screenshot !== false, { signal })));
+app.post('/browser/extract', async (req, res) => handleRequest(req, res, (signal) => requireCapability(browserController, 'browser').extractContent({ ...(req.body || {}), signal })));
+app.post('/browser/execute', async (req, res) => handleRequest(req, res, (signal) => requireCapability(browserController, 'browser').executeJS(req.body?.code, { signal })));
 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, () => 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/start', async (req, res) => handleRequest(req, res, (signal) => requireCapability(androidController, 'android').requestStartEmulator({ ...(req.body || {}), signal })));
+app.post('/android/stop', async (req, res) => handleRequest(req, res, (signal) => requireCapability(androidController, 'android').stopEmulator({ signal })));
+app.get('/android/devices', async (req, res) => handleRequest(req, res, async (signal) => ({ devices: await requireCapability(androidController, 'android').listDevices({ signal }) })));
+app.post('/android/screenshot', async (req, res) => handleRequest(req, res, (signal) => requireCapability(androidController, 'android').screenshot({ ...(req.body || {}), signal })));
+app.post('/android/observe', async (req, res) => handleRequest(req, res, (signal) => requireCapability(androidController, 'android').observe({ ...(req.body || {}), signal })));
+app.post('/android/ui-dump', async (req, res) => handleRequest(req, res, (signal) => requireCapability(androidController, 'android').dumpUi({ ...(req.body || {}), signal })));
+app.get('/android/apps', async (req, res) => handleRequest(req, res, (signal) => requireCapability(androidController, 'android').listApps({ includeSystem: req.query.includeSystem === 'true', signal })));
+app.post('/android/open-app', async (req, res) => handleRequest(req, res, (signal) => requireCapability(androidController, 'android').openApp({ ...(req.body || {}), signal })));
+app.post('/android/open-intent', async (req, res) => handleRequest(req, res, (signal) => requireCapability(androidController, 'android').openIntent({ ...(req.body || {}), signal })));
+app.post('/android/tap', async (req, res) => handleRequest(req, res, (signal) => requireCapability(androidController, 'android').tap({ ...(req.body || {}), signal })));
+app.post('/android/long-press', async (req, res) => handleRequest(req, res, (signal) => requireCapability(androidController, 'android').longPress({ ...(req.body || {}), signal })));
+app.post('/android/type', async (req, res) => handleRequest(req, res, (signal) => requireCapability(androidController, 'android').type({ ...(req.body || {}), signal })));
+app.post('/android/swipe', async (req, res) => handleRequest(req, res, (signal) => requireCapability(androidController, 'android').swipe({ ...(req.body || {}), signal })));
+app.post('/android/press-key', async (req, res) => handleRequest(req, res, (signal) => requireCapability(androidController, 'android').pressKey({ ...(req.body || {}), signal })));
+app.post('/android/wait-for', async (req, res) => handleRequest(req, res, (signal) => requireCapability(androidController, 'android').waitFor({ ...(req.body || {}), signal })));
+app.post('/android/shell', async (req, res) => handleRequest(req, res, (signal) => requireCapability(androidController, 'android').shell({ ...(req.body || {}), signal })));
 app.post('/android/install-apk', async (req, res) => {
   await handle(res, async () => {
     requireCapability(androidController, 'android');
@@ -325,7 +370,7 @@ async function shutdown() {
   } catch (err) {
     console.warn('[GuestAgent] Failed to close android controller:', err?.message);
   }
-  cliExecutor.killAll('shutdown');
+  cliExecutor?.killAll?.('shutdown');
   server.close(() => process.exit(0));
 }