yiyan-browser-agent 1.0.28 → 1.0.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yiyan-browser-agent",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "description": "AI coding agent powered by Yiyan (文心一言) via browser automation — no API key needed",
   "main": "src/index.js",
   "bin": {

package/src/agent.js

@@ -1,68 +1,46 @@
-// src/agent.js — The core agent loop
+// src/agent.js — Simple agent, one browser per process
 'use strict';
 
-const config                       = require('./config');
-const logger                       = require('./logger');
-const BrowserManager               = require('./browser-manager');
-const PageAgent                    = require('./page-agent');
-
-// ─────────────────────────────────────────────
-//  Agent class
-// ─────────────────────────────────────────────
+const config     = require('./config');
+const logger     = require('./logger');
+const YiyanBrowser = require('./browser');
 
 class YiyanAgent {
   constructor(options = {}) {
-    this.pageAgent   = null;
-    this.options     = options;
-    this._running    = false;
+    this.browser = new YiyanBrowser();
+    this.options = options;
   }
 
-  // ── Public API ──────────────────────────────────────────────────────────────
-
-  /** Get browser and create page agent */
   async init() {
-    const { browser, page } = await BrowserManager.getInstance();
-    this.pageAgent = new PageAgent(page);
+    await this.browser.launch();
   }
 
-  /** Shutdown */
   async shutdown() {
-    await BrowserManager.forceClose();
+    await this.browser.close();
   }
 
-  /**
-   * Run a task
-   */
   async run(task) {
-    this._running = true;
     const startTime = Date.now();
 
     logger.info('Sending task to Yiyan...');
-    await this.pageAgent.sendMessage(task);
+    await this.browser.sendMessage(task);
 
     logger.info('Waiting for response...');
-    const answer = await this.pageAgent.waitForResponse();
+    const answer = await this.browser.waitForResponse();
 
     const duration = Date.now() - startTime;
-    this._running = false;
 
     return {
       question: task,
-      answer: answer || 'No response received',
+      answer: answer || 'No response',
       duration,
       status: answer ? 'success' : 'error'
     };
   }
 
-  // ── Interactive Mode ────────────────────────────────────────────────────────
-
   async runInteractive() {
     const readline = require('readline');
-    const rl = readline.createInterface({
-      input: process.stdin,
-      output: process.stdout,
-    });
-
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     const ask = () => new Promise(resolve => rl.question('', resolve));
 
     while (true) {
@@ -71,22 +49,15 @@ class YiyanAgent {
       if (['exit', 'quit', 'q'].includes(task.toLowerCase())) break;
 
       try {
-        // Re-init for new tab
-        await this.init();
+        await this.browser.newChat();
         const result = await this.run(task);
         console.log(JSON.stringify(result, null, 2));
       } catch (err) {
-        console.log(JSON.stringify({
-          question: task,
-          answer: `Error: ${err.message}`,
-          duration: 0,
-          status: 'error'
-        }, null, 2));
+        console.log(JSON.stringify({ question: task, answer: `Error: ${err.message}`, duration: 0, status: 'error' }, null, 2));
       }
     }
-
     rl.close();
   }
 }
 
-module.exports = YiyanAgent;
+module.exports = YiyanAgent;

package/src/index.js

@@ -1,223 +1,116 @@
 #!/usr/bin/env node
-// src/index.js — CLI entry point for Yiyan Agent
+// src/index.js — CLI entry point
 'use strict';
 
-const path         = require('path');
-const fs           = require('fs');
-const config       = require('./config');
-const logger       = require('./logger');
-const YiyanAgent   = require('./agent');
-const BrowserManager = require('./browser-manager');
-
-// ─────────────────────────────────────────────
-//  Parse CLI arguments
-// ─────────────────────────────────────────────
+const path   = require('path');
+const fs     = require('fs');
+const config = require('./config');
+const logger = require('./logger');
+const YiyanAgent = require('./agent');
 
 function parseArgs(argv) {
   const args = argv.slice(2);
-  const opts = {
-    task        : null,
-    interactive : false,
-    debug       : false,
-    headless    : false,
-    saveLog     : false,
-    workingDir  : null,
-    calibrate   : false,
-    help        : false,
-  };
+  const opts = { task: null, interactive: false, debug: false, headless: false, showBrowser: false, workingDir: null, calibrate: false, help: false };
 
-  let i = 0;
-  while (i < args.length) {
+  for (let i = 0; i < args.length; i++) {
     const a = args[i];
-    switch (a) {
-      case '-i':
-      case '--interactive': opts.interactive = true;    break;
-      case '--debug':       opts.debug       = true;    break;
-      case '--headless':    opts.headless    = true;    break;
-      case '--save-log':    opts.saveLog     = true;    break;
-      case '--calibrate':   opts.calibrate   = true;    break;
-      case '-h':
-      case '--help':        opts.help        = true;    break;
-
-      case '-d':
-      case '--dir':
-        opts.workingDir = args[++i];
-        break;
-
-      case '-t':
-      case '--task':
-        opts.task = args[++i];
-        break;
-
-      default:
-        // If it doesn't start with '-', treat it as an inline task
-        if (!a.startsWith('-')) {
-          opts.task = args.slice(i).join(' ');
-          i = args.length; // consume the rest
-        }
-    }
-    i++;
+    if (a === '-i' || a === '--interactive') opts.interactive = true;
+    else if (a === '--debug') opts.debug = true;
+    else if (a === '--headless') opts.headless = true;
+    else if (a === '--show-browser') opts.showBrowser = true;
+    else if (a === '--calibrate') opts.calibrate = true;
+    else if (a === '-h' || a === '--help') opts.help = true;
+    else if (a === '-d' || a === '--dir') opts.workingDir = args[++i];
+    else if (a === '-t' || a === '--task') opts.task = args[++i];
+    else if (!a.startsWith('-')) { opts.task = args.slice(i).join(' '); break; }
   }
-
   return opts;
 }
 
-// ─────────────────────────────────────────────
-//  Help text
-// ─────────────────────────────────────────────
-
 function printHelp() {
   console.log(`
-\x1b[1mYIYAN AGENT (文心一言)\x1b[0m — AI Coding Agent via Browser Automation
+\x1b[1mYIYAN AGENT\x1b[0m — AI Coding Agent via Browser
 
 \x1b[33mUSAGE\x1b[0m
-  node src/index.js [OPTIONS] [TASK]
+  yiyan-agent [TASK]            # Headless mode (no browser window)
+  yiyan-agent -i                 # Interactive mode (shows browser for login)
 
 \x1b[33mOPTIONS\x1b[0m
-  -t, --task <task>    Task to run (can also be the last argument without a flag)
-  -i, --interactive    Interactive REPL mode — keep browser open, run multiple tasks
-  -d, --dir <path>     Set working directory (default: current directory)
-  --debug              Verbose debug output
-  --headless           Run browser in headless mode (must be logged in already)
-  --save-log           Save conversation log to ~/.yiyan-agent/logs/
-  --calibrate          Open browser and print DOM info to help fix selectors
-  -h, --help           Show this help
+  -i, --interactive    Interactive mode (shows browser)
+  --show-browser       Show browser window for single task
+  --debug              Show debug info
+  --calibrate          Debug DOM selectors
+  -h, --help           Show help
 
 \x1b[33mEXAMPLES\x1b[0m
-  # Run a single task
-  node src/index.js "Create a REST API in Express with CRUD for users"
-
-  # Interactive mode (recommended)
-  node src/index.js --interactive
-
-  # Run on a specific project directory
-  node src/index.js --dir ~/projects/myapp "Add TypeScript to this project"
-
-  # Debug mode (shows raw responses)
-  node src/index.js --debug "Write a binary search in Python"
-
-  # Headless (faster, requires prior login)
-  node src/index.js --headless "Refactor index.js to use async/await"
-
-\x1b[33mFIRST-TIME SETUP\x1b[0m
-  1. npm run setup         (installs deps + Playwright browser)
-  2. node src/index.js -i  (opens browser, log in to Yiyan, then use normally)
-     Session is saved — you only log in once.
-
-\x1b[33mCONFIG FILE\x1b[0m
-  Create \x1b[36myiyan-agent.config.json\x1b[0m in your working directory to override settings:
-  {
-    "HEADLESS": true,
-    "MAX_ITERATIONS": 50,
-    "STABLE_DELAY": 3000
-  }
+  yiyan-agent "济宁天气"          # Runs headless (fast)
+  yiyan-agent -i                 # Login first time
+  yiyan-agent "写个脚本" --show-browser  # Watch browser work
 `);
 }
 
-// ─────────────────────────────────────────────
-//  Main
-// ─────────────────────────────────────────────
-
 async function main() {
   const opts = parseArgs(process.argv);
 
-  // ── Help ───────────────────────────────────────────────────────────────────
-  if (opts.help) {
-    printHelp();
-    process.exit(0);
-  }
+  if (opts.help) { printHelp(); process.exit(0); }
+
+  if (opts.debug) config.DEBUG = true;
 
-  // ── Apply options to config ────────────────────────────────────────────────
-  if (opts.debug)      config.DEBUG    = true;
-  if (opts.headless)   config.HEADLESS = true;
+  // Headless logic: interactive mode shows browser, single task runs headless by default
+  // User can override with --show-browser to watch single task
+  if (opts.interactive || opts.calibrate || opts.showBrowser) {
+    config.HEADLESS = false;  // Show browser
+  } else {
+    config.HEADLESS = true;   // Single task: headless by default (faster)
+  }
   if (opts.workingDir) {
     const resolved = path.resolve(opts.workingDir);
-    if (!fs.existsSync(resolved)) {
-      logger.error(`Working directory not found: ${resolved}`);
-      process.exit(1);
-    }
+    if (!fs.existsSync(resolved)) { logger.error(`Dir not found: ${resolved}`); process.exit(1); }
     config.WORKING_DIR = resolved;
   }
 
-  // ── Banner ─────────────────────────────────────────────────────────────────
   logger.banner();
-  logger.info(`Working directory : \x1b[36m${config.WORKING_DIR}\x1b[0m`);
-  logger.info(`Session directory : \x1b[36m${config.SESSION_DIR}\x1b[0m`);
-  logger.info(`Headless mode     : \x1b[36m${config.HEADLESS}\x1b[0m`);
-  logger.info(`Debug mode        : \x1b[36m${config.DEBUG}\x1b[0m`);
-  console.log('');
-
-  // ── Create agent ───────────────────────────────────────────────────────────
-  const agent = new YiyanAgent({ saveLog: opts.saveLog });
-
-  // ── Graceful shutdown handler ──────────────────────────────────────────────
-  // Only delete endpoint file on Ctrl+C (explicit exit)
-  const shutdown = async (code = 0, keepBrowser = true) => {
-    if (!keepBrowser) {
-      try { BrowserManager.forceClose(); } catch {}
-    }
+  logger.info(`Working dir: ${config.WORKING_DIR}`);
+
+  const agent = new YiyanAgent();
+
+  const shutdown = async (code = 0) => {
+    logger.info('Shutting down...');
+    try { await agent.shutdown(); } catch {}
     process.exit(code);
   };
 
-  process.on('SIGINT',  () => shutdown(0, false));  // Ctrl+C: close browser
-  process.on('SIGTERM', () => shutdown(0, false));  // Kill: close browser
-  process.on('uncaughtException', async err => {
-    logger.error(`Uncaught error: ${err.message}`);
-    if (config.DEBUG) console.error(err.stack);
-    await shutdown(1, false);  // Error: close browser
-  });
-  process.on('unhandledRejection', async reason => {
-    logger.error(`Unhandled rejection: ${reason}`);
-    if (config.DEBUG) console.error(reason);
-    await shutdown(1, false);  // Error: close browser
-  });
-
-  // ── Calibrate mode ─────────────────────────────────────────────────────────
+  process.on('SIGINT', () => shutdown(0));
+  process.on('SIGTERM', () => shutdown(0));
+
   if (opts.calibrate) {
-    logger.header('Calibration Mode — Reading DOM selectors');
     await agent.init();
     await agent.browser.dumpDebugInfo();
     await agent.browser.screenshot();
-    logger.info('Done. Check the output above to update selectors in src/browser.js if needed.');
     await shutdown(0);
   }
 
-  // ── Validate we have a task or interactive mode ────────────────────────────
-  if (!opts.interactive && !opts.task) {
-    logger.warn('No task provided. Switching to interactive mode...\n');
-    opts.interactive = true;
-  }
+  if (!opts.interactive && !opts.task) opts.interactive = true;
 
-  // ── Launch browser ─────────────────────────────────────────────────────────
   try {
     await agent.init();
   } catch (err) {
-    logger.error(`Failed to launch browser: ${err.message}`);
-    if (config.DEBUG) console.error(err.stack);
+    logger.error(`Failed: ${err.message}`);
     process.exit(1);
   }
 
-  // ── Run ────────────────────────────────────────────────────────────────────
   try {
     if (opts.interactive) {
       await agent.runInteractive();
-      await shutdown(0, true);
     } else {
       const result = await agent.run(opts.task);
       console.log(JSON.stringify(result, null, 2));
-      // Success: don't close browser, next process can connect to it
-      // Error: close browser
-      process.exit(result.status === 'error' ? 1 : 0);
     }
   } catch (err) {
-    console.log(JSON.stringify({
-      question: opts.task || '',
-      answer: `Error: ${err.message}`,
-      duration: 0,
-      status: 'error'
-    }, null, 2));
-    await shutdown(1, true);  // Error: close browser
+    console.log(JSON.stringify({ question: opts.task || '', answer: `Error: ${err.message}`, duration: 0, status: 'error' }, null, 2));
   }
+
+  await shutdown(0);
 }
 
-main();
+main();

package/src/browser-manager.js

@@ -1,128 +0,0 @@
-// src/browser-manager.js — Cross-process browser reuse via CDP
-'use strict';
-
-const { chromium } = require('playwright');
-const path         = require('path');
-const os           = require('os');
-const fs           = require('fs');
-const logger       = require('./logger');
-const config       = require('./config');
-
-const CDP_PORT_FILE = path.join(os.homedir(), '.yiyan-agent', 'cdp-port.json');
-const CDP_PORT = 9222;
-const SESSION_DIR = path.join(os.homedir(), '.yiyan-agent', 'session');
-
-class BrowserManager {
-  /**
-   * Get browser - connect existing or launch new
-   */
-  static async getInstance() {
-    // Ensure directories exist
-    fs.mkdirSync(SESSION_DIR, { recursive: true });
-
-    // Try connect existing browser (with retries for concurrent launches)
-    for (let retry = 0; retry < 3; retry++) {
-      try {
-        if (fs.existsSync(CDP_PORT_FILE)) {
-          const endpointInfo = JSON.parse(fs.readFileSync(CDP_PORT_FILE, 'utf8'));
-          const wsEndpoint = endpointInfo.wsEndpoint;
-
-          if (!wsEndpoint) {
-            throw new Error('No wsEndpoint in file');
-          }
-
-          logger.info('Connecting to existing browser...');
-          const browser = await chromium.connect({ wsEndpoint, timeout: 10000 });
-
-          // Show current browser info
-          const existingContexts = browser.contexts();
-          const existingPages = existingContexts.reduce((sum, ctx) => sum + ctx.pages().length, 0);
-          logger.dim(`Browser has ${existingContexts.length} contexts, ${existingPages} existing tabs`);
-
-          // Create NEW context and page (tab) for this task
-          const context = await browser.newContext({
-            viewport: { width: 1280, height: 900 },
-            userAgent: 'Mozilla/5.0 AppleWebKit/537.36 Chrome/124.0.0.0 Safari/537.36',
-          });
-          const page = await context.newPage();
-          await page.goto(config.YIYAN_URL, { waitUntil: 'networkidle', timeout: 20000 });
-          await page.waitForTimeout(1500);
-
-          logger.success('Connected! New tab opened.');
-          return { browser, context, page, isNew: false };
-        }
-      } catch (err) {
-        // If connection failed, wait and retry (another process might be starting)
-        if (retry < 2) {
-          logger.warn(`Connection attempt ${retry + 1} failed, waiting 3 seconds...`);
-          await new Promise(r => setTimeout(r, 3000));
-        } else {
-          logger.warn('Connection failed after retries, launching new browser...');
-          try { fs.unlinkSync(CDP_PORT_FILE); } catch {}
-        }
-      }
-    }
-
-    // Launch new browser
-    return await this._launchNew();
-  }
-
-  /**
-   * Launch new browser with CDP port
-   */
-  static async _launchNew() {
-    logger.info('Launching new browser server...');
-
-    // Use launchServer to create independent browser process
-    const browserServer = await chromium.launchServer({
-      headless: false,
-      args: [
-        '--disable-blink-features=AutomationControlled',
-        '--no-first-run',
-        '--no-sandbox',
-      ],
-    });
-
-    // Get the WebSocket endpoint
-    const wsEndpoint = browserServer.wsEndpoint();
-    logger.dim('WebSocket endpoint: ' + wsEndpoint);
-
-    // Save endpoint info IMMEDIATELY before any other operations
-    fs.writeFileSync(CDP_PORT_FILE, JSON.stringify({
-      wsEndpoint: wsEndpoint,
-      launchedAt: Date.now()
-    }));
-    logger.dim('Endpoint saved to: ' + CDP_PORT_FILE);
-
-    logger.success('Browser server started!');
-
-    // Connect to our own server
-    const browser = await chromium.connect({ wsEndpoint });
-
-    // Create context and page
-    const context = await browser.newContext({
-      viewport: { width: 1280, height: 900 },
-      userAgent: 'Mozilla/5.0 AppleWebKit/537.36 Chrome/124.0.0.0 Safari/537.36',
-    });
-    const page = await context.newPage();
-
-    await page.goto(config.YIYAN_URL, { waitUntil: 'domcontentloaded', timeout: 15000 });
-    await page.waitForTimeout(800);
-
-    logger.success('Tab ready.');
-
-    // Return without browserServer - let it run independently
-    // Do NOT close browserServer on process exit
-    return { browser, context, page, isNew: true };
-  }
-
-  /**
-   * Force close everything (for cleanup)
-   */
-  static async forceClose() {
-    try { fs.unlinkSync(CDP_PORT_FILE); } catch {}
-    // Browser continues running independently
-  }
-}
-
-module.exports = BrowserManager;

package/src/page-agent.js

@@ -1,157 +0,0 @@
-// src/page-agent.js — Agent for a single page/tab
-'use strict';
-
-const logger = require('./logger');
-const config = require('./config');
-
-// Selectors for Yiyan
-const SEL = {
-  chatInput: [
-    '.editable__T7WAW4uW',
-    '[role="textbox"]',
-    '[contenteditable="true"]',
-    'textarea',
-  ],
-  sendButton: [
-    'button[aria-label*="发送"]',
-    'button[type="submit"]',
-  ],
-};
-
-class PageAgent {
-  constructor(page) {
-    this.page = page;
-  }
-
-  /**
-   * Send message to Yiyan
-   */
-  async sendMessage(text) {
-    // Wait for page to be fully loaded
-    await this.page.waitForLoadState('networkidle', { timeout: 10000 }).catch(() => {});
-    await this.page.waitForTimeout(1000);
-
-    // Find input
-    let inputEl = null;
-    for (const sel of SEL.chatInput) {
-      try {
-        inputEl = await this.page.waitForSelector(sel, { timeout: 8000, state: 'visible' });
-        if (inputEl) {
-          logger.dim('Found input: ' + sel);
-          break;
-        }
-      } catch {}
-    }
-
-    if (!inputEl) {
-      throw new Error('Cannot find input box. Make sure Yiyan page is loaded.');
-    }
-
-    // Focus and clear
-    await inputEl.click({ clickCount: 3, force: true });
-    await this.page.waitForTimeout(100);
-    await this.page.keyboard.press('Delete');
-    await this.page.waitForTimeout(50);
-
-    // Type message
-    await this.page.keyboard.type(text, { delay: 10 });
-    await this.page.keyboard.press('Enter');
-  }
-
-  /**
-   * Wait for response
-   */
-  async waitForResponse() {
-    const timeout = config.RESPONSE_TIMEOUT;
-    const stableDelay = config.STABLE_DELAY;
-    const start = Date.now();
-
-    // Wait for new content
-    await this.page.waitForTimeout(1000);
-
-    // Poll for stable response
-    let lastText = '';
-    let stableStart = null;
-
-    while (Date.now() - start < timeout) {
-      const text = await this._extractAnswer();
-
-      if (text !== lastText && text.length > 0) {
-        lastText = text;
-        stableStart = Date.now();
-      } else if (stableStart && Date.now() - stableStart >= stableDelay) {
-        if (!await this._isGenerating()) {
-          break;
-        }
-        stableStart = null;
-      }
-
-      await this.page.waitForTimeout(200);
-    }
-
-    return this._cleanText(lastText);
-  }
-
-  /**
-   * Extract answer from page
-   */
-  async _extractAnswer() {
-    return await this.page.evaluate(() => {
-      // Try specific selector first
-      const answerEl = document.querySelector('#answer_text_id');
-      if (answerEl) return answerEl.textContent || '';
-
-      // Fallback
-      const candidates = document.querySelectorAll('[class*="answer"], [class*="response"], [class*="markdown"]');
-      for (const el of candidates) {
-        const text = el.textContent || '';
-        if (text.length > 20) return text;
-      }
-
-      return '';
-    });
-  }
-
-  /**
-   * Check if still generating
-   */
-  async _isGenerating() {
-    return await this.page.evaluate(() => {
-      const stopBtn = document.querySelector('button[aria-label*="停止"]');
-      if (stopBtn && stopBtn.offsetParent !== null) return true;
-
-      const loading = document.querySelector('[class*="loading"], [class*="typing"]');
-      if (loading) return true;
-
-      return false;
-    });
-  }
-
-  /**
-   * Clean response text
-   */
-  _cleanText(text) {
-    if (!text) return '';
-
-    // Remove before "准备输出结果"
-    const marker = '准备输出结果';
-    const idx = text.indexOf(marker);
-    if (idx !== -1) {
-      text = text.slice(idx + marker.length).trim();
-    }
-
-    // Remove after markers
-    const cutMarkers = ['重新生成', '换个回答', '输出更详细的', '再多提供'];
-    for (const m of cutMarkers) {
-      const cutIdx = text.indexOf(m);
-      if (cutIdx !== -1) {
-        text = text.slice(0, cutIdx).trim();
-        break;
-      }
-    }
-
-    return text.trim();
-  }
-}
-
-module.exports = PageAgent;