farming-code 2.2.29 → 2.2.30

package/dist/index.html

@@ -27,6 +27,7 @@
           ? (window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light')
           : preference
         root.dataset.appearance = appearance
+        document.querySelector('meta[name="color-scheme"]')?.setAttribute('content', appearance)
         document.querySelector('meta[name="theme-color"]')?.setAttribute(
           'content',
           appearance === 'dark' ? '#181818' : '#ffffff',
@@ -44,7 +45,7 @@
     <link rel="apple-touch-icon" sizes="180x180" href="/farming/farming-2/app-icon-v2-180.png" />
     <link rel="manifest" href="/farming/farming-2/site.webmanifest" />
     <title>Farming 2</title>
-    <script type="module" crossorigin src="/farming/assets/index-CQNaZc3l.js"></script>
+    <script type="module" crossorigin src="/farming/assets/index-D-zetSol.js"></script>
     <link rel="modulepreload" crossorigin href="/farming/assets/chunk-DECur_0Z.js">
     <link rel="modulepreload" crossorigin href="/farming/assets/preload-helper-mJowh_hw.js">
     <link rel="modulepreload" crossorigin href="/farming/assets/jsx-runtime-BthL93pI.js">

package/extensions/browser/backend/browser-resource-manager.js

@@ -13,6 +13,7 @@ const {
   discoverBrowserExecutables,
   discoverBrowserRuntime,
 } = require('./executable-discovery');
+const { ManagedChromiumInstaller } = require('./managed-chromium-installer');
 
 const MAX_VIEWER_BUFFER_BYTES = 2 * 1024 * 1024;
 const VIEWER_RESIZE_SETTLE_MS = 80;
@@ -144,13 +145,23 @@ class BrowserResourceManager extends EventEmitter {
     super();
     this.configDir = options.configDir;
     this.store = options.store || new BrowserResourceStore(options.configDir);
+    this.chromiumInstaller = options.chromiumInstaller || new ManagedChromiumInstaller({
+      ...options,
+      configDir: this.configDir,
+    });
     this.discoverExecutable = options.discoverExecutable || (selection => discoverBrowserRuntime({
       ...options,
       ...selection,
       configDir: this.configDir,
+      managedBrowserPath: this.chromiumInstaller.browserOption()?.path || '',
     }));
     this.discoverBrowserOptions = options.discoverBrowserOptions
-      || (options.discoverExecutable ? () => [] : () => discoverBrowserExecutables(options));
+      || (options.discoverExecutable
+        ? () => []
+        : () => discoverBrowserExecutables({
+          ...options,
+          managedBrowserPath: this.chromiumInstaller.browserOption()?.path || '',
+        }));
     this.getBrowserSettings = typeof options.getBrowserSettings === 'function'
       ? options.getBrowserSettings
       : () => ({ browserSource: 'system', browserExecutablePath: '', browserExternalCdpUrl: '' });
@@ -303,17 +314,19 @@ class BrowserResourceManager extends EventEmitter {
       browser: runnable ? { kind: executable.kind, path: executable.path } : null,
       selection,
       options: this.browserOptions.map(option => ({ kind: option.kind, path: option.path })),
+      installation: this.chromiumInstaller.status(),
       message: !enabled
         ? 'Browser extension is disabled'
         : (executable?.error || (runnable
             ? ''
-            : 'Install agent-browser and a Chromium-based browser, or configure a loopback external CDP endpoint')),
+            : 'Install Farming-managed Chromium, choose a system Chromium browser, or configure a loopback external CDP endpoint')),
     };
   }
 
   browserSelection(settings = this.getBrowserSettings()) {
+    const source = settings?.browserSource;
     return {
-      source: settings?.browserSource === 'external-cdp' ? 'external-cdp' : 'system',
+      source: ['external-cdp', 'managed'].includes(source) ? source : 'system',
       executablePath: String(settings?.browserExecutablePath || ''),
       externalCdpUrl: String(settings?.browserExternalCdpUrl || 'http://127.0.0.1:9222'),
     };
@@ -338,6 +351,15 @@ class BrowserResourceManager extends EventEmitter {
     return this.runtimeCapability;
   }
 
+  async installManagedChromium() {
+    if (this.disposed) {
+      throw browserError('Browser manager is stopping', 503, 'BROWSER_MANAGER_STOPPING');
+    }
+    await this.chromiumInstaller.install();
+    await this.refreshCapability();
+    return this.capability();
+  }
+
   list() {
     this.requireEnabled();
     return this.store.list().map(resource => publicResource(resource, this.store.revision));
@@ -412,7 +434,7 @@ class BrowserResourceManager extends EventEmitter {
         const failed = this.store.update(id, {
           status: 'failed',
           error: executable?.error
-            || 'Install agent-browser and a Chromium-based browser, or configure a loopback external CDP endpoint',
+            || 'Install Farming-managed Chromium, choose a system Chromium browser, or configure a loopback external CDP endpoint',
         });
         this.emitResource(failed);
         throw browserError(failed.error, 503, 'BROWSER_EXECUTABLE_NOT_FOUND');
@@ -1012,7 +1034,7 @@ class BrowserResourceManager extends EventEmitter {
     const executable = this.runtimeCapability;
     if (!executable || executable.error) {
       throw browserError(
-        executable?.error || 'Install agent-browser and a Chromium-based browser, or configure a loopback external CDP endpoint',
+        executable?.error || 'Install Farming-managed Chromium, choose a system Chromium browser, or configure a loopback external CDP endpoint',
         503,
         'BROWSER_EXECUTABLE_NOT_FOUND',
       );

package/extensions/browser/backend/browser-router.js

@@ -20,6 +20,14 @@ function createBrowserRouter(manager, workspaceRootRegistry) {
     }
   });
 
+  router.post('/install', async (_req, res) => {
+    try {
+      res.json(await manager.installManagedChromium());
+    } catch (error) {
+      sendError(res, error);
+    }
+  });
+
   router.get('/', (_req, res) => {
     try {
       res.json(manager.snapshot());

package/extensions/browser/backend/executable-discovery.js

@@ -109,10 +109,15 @@ function discoverWindowsBrowser(env) {
 function discoverBrowserExecutables(options = {}) {
   const env = options.env || process.env;
   const platform = options.platform || process.platform;
-  if (platform === 'darwin') return uniqueExecutables(macBrowserCandidates());
-  if (platform === 'linux') return uniqueExecutables(linuxBrowserCandidates());
-  if (platform === 'win32') return uniqueExecutables(windowsBrowserCandidates(env));
-  return [];
+  let candidates = [];
+  if (platform === 'darwin') candidates = macBrowserCandidates();
+  if (platform === 'linux') candidates = linuxBrowserCandidates();
+  if (platform === 'win32') candidates = windowsBrowserCandidates(env);
+  const managed = executable(options.managedBrowserPath, 'managed-chromium');
+  return [
+    ...uniqueExecutables(candidates),
+    ...(managed ? [managed] : []),
+  ];
 }
 
 function normalizeExternalCdpUrl(value) {
@@ -146,6 +151,13 @@ function discoverBrowserExecutable(options = {}) {
           error: 'External CDP must be a loopback http(s) or ws(s) endpoint without credentials or query parameters',
         };
   }
+  if (source === 'managed') {
+    return executable(options.managedBrowserPath, 'managed-chromium') || {
+      kind: 'managed-chromium',
+      path: String(options.managedBrowserPath || ''),
+      error: 'Install or update the Farming-managed Chromium for this agent-browser version',
+    };
+  }
   if (source === 'system') {
     const configuredPath = String(options.executablePath || '').trim();
     if (configuredPath) {
@@ -156,10 +168,11 @@ function discoverBrowserExecutable(options = {}) {
         error: 'The selected Chromium browser is no longer available',
       };
     }
-    if (platform === 'darwin') return discoverMacBrowser();
-    if (platform === 'linux') return discoverLinuxBrowser();
-    if (platform === 'win32') return discoverWindowsBrowser(env);
-    return null;
+    let systemBrowser = null;
+    if (platform === 'darwin') systemBrowser = discoverMacBrowser();
+    if (platform === 'linux') systemBrowser = discoverLinuxBrowser();
+    if (platform === 'win32') systemBrowser = discoverWindowsBrowser(env);
+    return systemBrowser || executable(options.managedBrowserPath, 'managed-chromium');
   }
   const externalCdpInput = String(options.externalCdpUrl || env.FARMING_BROWSER_CDP_URL || '').trim();
   if (externalCdpInput) {
@@ -177,10 +190,11 @@ function discoverBrowserExecutable(options = {}) {
   if (configured) {
     return executable(path.resolve(configured), 'custom');
   }
-  if (platform === 'darwin') return discoverMacBrowser();
-  if (platform === 'linux') return discoverLinuxBrowser();
-  if (platform === 'win32') return discoverWindowsBrowser(env);
-  return null;
+  let systemBrowser = null;
+  if (platform === 'darwin') systemBrowser = discoverMacBrowser();
+  if (platform === 'linux') systemBrowser = discoverLinuxBrowser();
+  if (platform === 'win32') systemBrowser = discoverWindowsBrowser(env);
+  return systemBrowser || executable(options.managedBrowserPath, 'managed-chromium');
 }
 
 async function discoverBrowserRuntime(options = {}) {