minimal-agent 0.13.0 → 0.15.0

package/src/tools/webbrowser/agentBrowserPath.ts

@@ -39,9 +39,9 @@ import { spawn } from 'node:child_process';
 import { chmodSync, existsSync } from 'node:fs';
 import { dirname, isAbsolute, resolve, win32 } from 'node:path';
 
+import { sanitizeCredentialEnv } from '../../config/configService.js';
 import { execSiblingDir } from '../../utils/greenRoot.js';
 import { findPackageRoot } from '../../utils/packageRoot.js';
-import { sanitizeCredentialEnv } from '../../config/configService.js';
 
 /** 可注入依赖（默认走真实实现，单测注入假实现）。 */
 export interface ResolveDeps {
@@ -104,7 +104,11 @@ export function _resetAgentBrowserCache(): void {
  * 经 CLI 调 agent-browser 的 skill/bash 走 agent-browser 自身的自动探测/在线安装。
  */
 export async function ensureAgentBrowserOnPath(): Promise<void> {
-  applyBinToPath(await resolveAgentBrowserPath(), process.env, process.platform);
+  applyBinToPath(
+    await resolveAgentBrowserPath(),
+    process.env,
+    process.platform,
+  );
 }
 
 /** 纯函数：把 bin 所在目录前置进 env.PATH（已含则跳过；非绝对路径/null 不动）。 */
@@ -124,7 +128,9 @@ export function applyBinToPath(
 }
 
 /** 纯解析（可注入依赖）：按 ①→⑤ 优先级返回 agent-browser 二进制路径或 null。 */
-export async function detectAgentBrowser(deps: ResolveDeps): Promise<string | null> {
+export async function detectAgentBrowser(
+  deps: ResolveDeps,
+): Promise<string | null> {
   const sub = subdir(deps);
   const bin = binName(deps);
 
@@ -143,7 +149,13 @@ export async function detectAgentBrowser(deps: ResolveDeps): Promise<string | nu
   }
 
   // ③ 绿色版 exe 同级
-  const sibling = resolve(deps.siblingDir(), 'vendor', 'agent-browser', sub, bin);
+  const sibling = resolve(
+    deps.siblingDir(),
+    'vendor',
+    'agent-browser',
+    sub,
+    bin,
+  );
   if (deps.exists(sibling)) {
     ensureExecutable(sibling, deps.platform);
     return sibling;
@@ -163,9 +175,13 @@ export async function detectAgentBrowser(deps: ResolveDeps): Promise<string | nu
  * 约定布局：vendor/chromium/<arch>-<platform>/ 下放该平台 chromium，可执行名按平台
  * 探测一组常见相对路径（不同 chromium 构建解包名不一，宁可多探几个）。
  */
-export function resolveBundledChromium(deps: ResolveDeps = realDeps()): string | null {
+export function resolveBundledChromium(
+  deps: ResolveDeps = realDeps(),
+): string | null {
   const sub = subdir(deps);
-  const roots: string[] = [resolve(deps.siblingDir(), 'vendor', 'chromium', sub)];
+  const roots: string[] = [
+    resolve(deps.siblingDir(), 'vendor', 'chromium', sub),
+  ];
   const root = deps.packageRoot();
   if (root) roots.push(resolve(root, 'vendor', 'chromium', sub));
 
@@ -186,33 +202,59 @@ export function resolveBundledChromium(deps: ResolveDeps = realDeps()): string |
  * own profile directory. This improves site compatibility without touching
  * the user's normal Chrome profile or attempting fingerprint evasion.
  */
-export function resolveSystemBrowser(deps: ResolveDeps = realDeps()): string | null {
-  const explicit = deps.env.MINIMAL_AGENT_BROWSER_EXECUTABLE_PATH
-    ?? deps.env.AGENT_BROWSER_EXECUTABLE_PATH;
+export function resolveSystemBrowser(
+  deps: ResolveDeps = realDeps(),
+): string | null {
+  const explicit =
+    deps.env.MINIMAL_AGENT_BROWSER_EXECUTABLE_PATH ??
+    deps.env.AGENT_BROWSER_EXECUTABLE_PATH;
   if (explicit && deps.exists(explicit)) return explicit;
 
   const home = deps.env.HOME ?? deps.env.USERPROFILE ?? '';
-  const candidates = deps.platform === 'darwin'
-    ? [
-        '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
-        '/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge',
-        '/Applications/Chromium.app/Contents/MacOS/Chromium',
-        home ? resolve(home, 'Applications/Google Chrome.app/Contents/MacOS/Google Chrome') : '',
-      ]
-    : deps.platform === 'win32'
+  const candidates =
+    deps.platform === 'darwin'
       ? [
-          deps.env.PROGRAMFILES ? resolve(deps.env.PROGRAMFILES, 'Google/Chrome/Application/chrome.exe') : '',
-          deps.env['PROGRAMFILES(X86)'] ? resolve(deps.env['PROGRAMFILES(X86)'], 'Microsoft/Edge/Application/msedge.exe') : '',
-          deps.env.LOCALAPPDATA ? resolve(deps.env.LOCALAPPDATA, 'Google/Chrome/Application/chrome.exe') : '',
+          '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+          '/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge',
+          '/Applications/Chromium.app/Contents/MacOS/Chromium',
+          home
+            ? resolve(
+                home,
+                'Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+              )
+            : '',
         ]
-      : [
-          '/usr/bin/google-chrome-stable',
-          '/usr/bin/google-chrome',
-          '/usr/bin/microsoft-edge-stable',
-          '/usr/bin/chromium',
-          '/usr/bin/chromium-browser',
-        ];
-  return candidates.find((candidate) => candidate && deps.exists(candidate)) ?? null;
+      : deps.platform === 'win32'
+        ? [
+            deps.env.PROGRAMFILES
+              ? resolve(
+                  deps.env.PROGRAMFILES,
+                  'Google/Chrome/Application/chrome.exe',
+                )
+              : '',
+            deps.env['PROGRAMFILES(X86)']
+              ? resolve(
+                  deps.env['PROGRAMFILES(X86)'],
+                  'Microsoft/Edge/Application/msedge.exe',
+                )
+              : '',
+            deps.env.LOCALAPPDATA
+              ? resolve(
+                  deps.env.LOCALAPPDATA,
+                  'Google/Chrome/Application/chrome.exe',
+                )
+              : '',
+          ]
+        : [
+            '/usr/bin/google-chrome-stable',
+            '/usr/bin/google-chrome',
+            '/usr/bin/microsoft-edge-stable',
+            '/usr/bin/chromium',
+            '/usr/bin/chromium-browser',
+          ];
+  return (
+    candidates.find((candidate) => candidate && deps.exists(candidate)) ?? null
+  );
 }
 
 /** vendor 子目录名 = <arch>-<platform>（对齐 rgPath.ts / build-green.ts 的 vendor 约定）。 */

package/src/tools/webbrowser/browser.js

@@ -15,7 +15,7 @@ import { chmod, mkdir, readdir, realpath, rm, stat } from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import { sanitizeCredentialEnv } from '../../config/configService.js';
-import { pathContains, pathContainedByAny } from '../../utils/pathContains.js';
+import { pathContainedByAny, pathContains } from '../../utils/pathContains.js';
 /**
  * minimal-agent 进程级固定 session 名：隔离机器上其它 agent-browser 用法，
  * 同时让本进程多次调用复用同一浏览器（与原 playwright「一 session 一 page」语义一致）。
@@ -38,7 +38,11 @@ export async function ensureBrowserProfile(profileId = 'default') {
     return profile;
 }
 export async function browserGlobalArgs(sessionName = BROWSER_SESSION, profileId = 'default') {
-    return [...sessionArgs(sessionName), '--profile', await ensureBrowserProfile(profileId)];
+    return [
+        ...sessionArgs(sessionName),
+        '--profile',
+        await ensureBrowserProfile(profileId),
+    ];
 }
 /**
  * 默认 spawn 运行器：收集 stdout/stderr 后结算；spawn 抛错也 resolve 成失败。
@@ -83,13 +87,21 @@ export const spawnRunner = (bin, args, signal) => new Promise((resolveP) => {
         });
     }
     catch (e) {
-        resolveP({ code: -1, stdout: '', stderr: e instanceof Error ? e.message : String(e) });
+        resolveP({
+            code: -1,
+            stdout: '',
+            stderr: e instanceof Error ? e.message : String(e),
+        });
         return;
     }
     child.stdout?.setEncoding('utf8');
-    child.stdout?.on('data', (c) => (stdout += c));
+    child.stdout?.on('data', (c) => {
+        stdout += c;
+    });
     child.stderr?.setEncoding('utf8');
-    child.stderr?.on('data', (c) => (stderr += c));
+    child.stderr?.on('data', (c) => {
+        stderr += c;
+    });
     child.on('error', (e) => finish(-1, e instanceof Error ? e.message : String(e)));
     // 正常路径：'close' 紧随 'exit'（pipe 关闭）→ 以完整输出立即结算，并清掉宽限计时器。
     child.on('close', (code) => finish(code));
@@ -169,10 +181,14 @@ async function pruneStaleArtifacts(dir) {
                 if (info.mtimeMs < cutoff)
                     await rm(target, { force: true, recursive: true });
             }
-            catch { /* 单个文件清不掉不影响其它 */ }
+            catch {
+                /* 单个文件清不掉不影响其它 */
+            }
         }));
     }
-    catch { /* 目录不存在或不可读：没什么可清的 */ }
+    catch {
+        /* 目录不存在或不可读：没什么可清的 */
+    }
 }
 /**
  * 生成一个托管的产物输出路径，并确保目录存在、旧产物已清理。
@@ -216,7 +232,9 @@ const ALLOWED_URL_SCHEMES = new Set(['http', 'https', 'about', 'file']);
  * 而不是替调用方创建——凭一个路径参数就造目录树同样是越权。
  */
 export async function validateArtifactOutputPath(candidate, allowedRoots) {
-    const absolute = path.isAbsolute(candidate) ? candidate : path.resolve(candidate);
+    const absolute = path.isAbsolute(candidate)
+        ? candidate
+        : path.resolve(candidate);
     const parent = path.dirname(absolute);
     let realParent;
     try {
@@ -236,9 +254,7 @@ export async function validateArtifactOutputPath(candidate, allowedRoots) {
     if (!pathContainedByAny(roots, realParent)) {
         return {
             ok: false,
-            error: `输出路径超出允许范围：${absolute}\n`
-                + `允许写入：${roots.join('、')}\n`
-                + '省略 path 参数即可写到托管的临时目录。',
+            error: `输出路径超出允许范围：${absolute}\n允许写入：${roots.join('、')}\n省略 path 参数即可写到托管的临时目录。`,
         };
     }
     const managed = await realpath(browserArtifactDir()).catch(() => browserArtifactDir());

package/src/tools/webbrowser/browser.ts

@@ -17,7 +17,7 @@ import os from 'node:os';
 import path from 'node:path';
 
 import { sanitizeCredentialEnv } from '../../config/configService.js';
-import { pathContains, pathContainedByAny } from '../../utils/pathContains.js';
+import { pathContainedByAny, pathContains } from '../../utils/pathContains.js';
 
 export interface AgentBrowserRun {
   code: number;
@@ -46,18 +46,34 @@ export function sessionArgs(sessionName = BROWSER_SESSION): string[] {
 /** KakadeAI-owned persistent browser profile. It is never the user's system Chrome profile. */
 export function browserProfilePath(profileId = 'default'): string {
   const safe = /^[a-zA-Z0-9._-]+$/.test(profileId) ? profileId : 'default';
-  return path.join(process.env.MINIMAL_AGENT_HOME ?? os.homedir(), '.minimal-agent', 'browser', 'profiles', safe);
+  return path.join(
+    process.env.MINIMAL_AGENT_HOME ?? os.homedir(),
+    '.minimal-agent',
+    'browser',
+    'profiles',
+    safe,
+  );
 }
 
-export async function ensureBrowserProfile(profileId = 'default'): Promise<string> {
+export async function ensureBrowserProfile(
+  profileId = 'default',
+): Promise<string> {
   const profile = browserProfilePath(profileId);
   await mkdir(profile, { recursive: true, mode: 0o700 });
-  if (process.platform !== 'win32') await chmod(profile, 0o700).catch(() => undefined);
+  if (process.platform !== 'win32')
+    await chmod(profile, 0o700).catch(() => undefined);
   return profile;
 }
 
-export async function browserGlobalArgs(sessionName = BROWSER_SESSION, profileId = 'default'): Promise<string[]> {
-  return [...sessionArgs(sessionName), '--profile', await ensureBrowserProfile(profileId)];
+export async function browserGlobalArgs(
+  sessionName = BROWSER_SESSION,
+  profileId = 'default',
+): Promise<string[]> {
+  return [
+    ...sessionArgs(sessionName),
+    '--profile',
+    await ensureBrowserProfile(profileId),
+  ];
 }
 
 /**
@@ -83,8 +99,12 @@ export const spawnRunner: AgentBrowserRunner = (bin, args, signal) =>
       settled = true;
       if (graceTimer) clearTimeout(graceTimer);
       // 主动释放父侧 pipe 读端（daemon 攥着写端、我们已拿到结果，不再依赖它关闭）。
-      try { child?.stdout?.destroy(); } catch {}
-      try { child?.stderr?.destroy(); } catch {}
+      try {
+        child?.stdout?.destroy();
+      } catch {}
+      try {
+        child?.stderr?.destroy();
+      } catch {}
       resolveP({ code: code ?? -1, stdout, stderr: stderr || errMsg || '' });
     };
     try {
@@ -95,14 +115,24 @@ export const spawnRunner: AgentBrowserRunner = (bin, args, signal) =>
         signal,
       });
     } catch (e) {
-      resolveP({ code: -1, stdout: '', stderr: e instanceof Error ? e.message : String(e) });
+      resolveP({
+        code: -1,
+        stdout: '',
+        stderr: e instanceof Error ? e.message : String(e),
+      });
       return;
     }
     child.stdout?.setEncoding('utf8');
-    child.stdout?.on('data', (c) => (stdout += c));
+    child.stdout?.on('data', (c) => {
+      stdout += c;
+    });
     child.stderr?.setEncoding('utf8');
-    child.stderr?.on('data', (c) => (stderr += c));
-    child.on('error', (e) => finish(-1, e instanceof Error ? e.message : String(e)));
+    child.stderr?.on('data', (c) => {
+      stderr += c;
+    });
+    child.on('error', (e) =>
+      finish(-1, e instanceof Error ? e.message : String(e)),
+    );
     // 正常路径：'close' 紧随 'exit'（pipe 关闭）→ 以完整输出立即结算，并清掉宽限计时器。
     child.on('close', (code) => finish(code));
     // 拉 daemon 的命令：daemon 继承 pipe → 'close' 永不来。以 'exit' 为准，给一小段宽限等 'close'
@@ -184,11 +214,16 @@ async function pruneStaleArtifacts(dir: string): Promise<void> {
         const target = path.join(dir, name);
         try {
           const info = await stat(target);
-          if (info.mtimeMs < cutoff) await rm(target, { force: true, recursive: true });
-        } catch { /* 单个文件清不掉不影响其它 */ }
+          if (info.mtimeMs < cutoff)
+            await rm(target, { force: true, recursive: true });
+        } catch {
+          /* 单个文件清不掉不影响其它 */
+        }
       }),
     );
-  } catch { /* 目录不存在或不可读：没什么可清的 */ }
+  } catch {
+    /* 目录不存在或不可读：没什么可清的 */
+  }
 }
 
 /**
@@ -197,10 +232,14 @@ async function pruneStaleArtifacts(dir: string): Promise<void> {
  * 文件名带 pid + 随机数：`Date.now()` 单独用会在同一毫秒内两次调用时撞名
  * （两个并发截图互相覆盖，症状是「截出来的图不是那一刻的画面」）。
  */
-export async function createArtifactPath(prefix = 'browser', ext = 'png'): Promise<string> {
+export async function createArtifactPath(
+  prefix = 'browser',
+  ext = 'png',
+): Promise<string> {
   const dir = browserArtifactDir();
   await mkdir(dir, { recursive: true, mode: 0o700 });
-  if (process.platform !== 'win32') await chmod(dir, 0o700).catch(() => undefined);
+  if (process.platform !== 'win32')
+    await chmod(dir, 0o700).catch(() => undefined);
   await pruneStaleArtifacts(dir);
   const unique = `${Date.now()}-${process.pid}-${randomUUID().slice(0, 8)}`;
   return path.join(dir, `${prefix}-${unique}.${ext}`);
@@ -237,7 +276,9 @@ export async function validateArtifactOutputPath(
   candidate: string,
   allowedRoots: string[],
 ): Promise<{ ok: true; path: string } | { ok: false; error: string }> {
-  const absolute = path.isAbsolute(candidate) ? candidate : path.resolve(candidate);
+  const absolute = path.isAbsolute(candidate)
+    ? candidate
+    : path.resolve(candidate);
   const parent = path.dirname(absolute);
   let realParent: string;
   try {
@@ -247,19 +288,22 @@ export async function validateArtifactOutputPath(
   }
   const roots = await Promise.all(
     allowedRoots.map(async (root) => {
-      try { return await realpath(root); } catch { return path.resolve(root); }
+      try {
+        return await realpath(root);
+      } catch {
+        return path.resolve(root);
+      }
     }),
   );
   if (!pathContainedByAny(roots, realParent)) {
     return {
       ok: false,
-      error:
-        `输出路径超出允许范围：${absolute}\n`
-        + `允许写入：${roots.join('、')}\n`
-        + '省略 path 参数即可写到托管的临时目录。',
+      error: `输出路径超出允许范围：${absolute}\n允许写入：${roots.join('、')}\n省略 path 参数即可写到托管的临时目录。`,
     };
   }
-  const managed = await realpath(browserArtifactDir()).catch(() => browserArtifactDir());
+  const managed = await realpath(browserArtifactDir()).catch(() =>
+    browserArtifactDir(),
+  );
   if (!pathContains(managed, realParent)) {
     const exists = await stat(path.join(realParent, path.basename(absolute)))
       .then(() => true)