@yeaft/webchat-agent 0.1.667 → 0.1.670

package/connection/message-router.js

@@ -35,7 +35,7 @@ import {
 import { sendToServer, flushMessageBuffer } from './buffer.js';
 import { handleRestartAgent, handleUpgradeAgent } from './upgrade.js';
 import { loadMcpServers, updateMcpConfig } from '../mcp.js';
-import { getLlmConfig, updateLlmConfig, getUnifySettings, updateUnifySettings } from '../unify/config-api.js';
+import { getLlmConfig, updateLlmConfig, getUnifySettings, updateUnifySettings, getSearchSettings, updateSearchSettings, fetchTavilyUsage } from '../unify/config-api.js';
 import { handleUnifyChat, handleUnifyGroupChat, handleUnifyModeSwitch, handleUnifyModelSwitch, resetUnifySession, handleUnifyLoadHistory, handleUnifyAbortThread, handleUnifyAbortAll, handleUnifyVpSubscribe, handleUnifyVpCreate, handleUnifyVpUpdate, handleUnifyVpDelete, handleUnifyVpRead, handleUnifyFeatureMessage, handleUnifyFetchSummaryHistory, handleUnifyFeatureCrud, handleUnifyListGroups, handleUnifyCreateGroup, handleUnifyRenameGroup, handleUnifyArchiveGroup, handleUnifyDeleteGroup, handleUnifyAddMember, handleUnifyRemoveMember, handleUnifySetDefaultVp, handleUnifyDreamTrigger } from '../unify/web-bridge.js';
 
 export async function handleMessage(msg) {
@@ -355,6 +355,29 @@ export async function handleMessage(msg) {
       break;
     }
 
+    // Search settings (web-search backend + Tavily key) — read/write the
+    // `search` section of config.json. `get_tavily_usage` hits Tavily's
+    // /usage endpoint with the saved key and is fired from the UI only
+    // when the Search tab opens or the user clicks "Refresh" (no polling
+    // — the user explicitly asked for live read on open).
+    case 'get_search_settings': {
+      const settings = getSearchSettings(ctx.CONFIG?.yeaftDir);
+      sendToServer({ type: 'search_settings', ...settings });
+      break;
+    }
+
+    case 'update_search_settings': {
+      const result = updateSearchSettings(msg.settings || msg.config || {}, ctx.CONFIG?.yeaftDir);
+      sendToServer({ type: 'search_settings_updated', ...result });
+      break;
+    }
+
+    case 'get_tavily_usage': {
+      const usage = await fetchTavilyUsage(ctx.CONFIG?.yeaftDir);
+      sendToServer({ type: 'tavily_usage', ...usage });
+      break;
+    }
+
     // Unify — independent chat via Engine
     case 'unify_chat':
       await handleUnifyChat(msg);

package/index.js

@@ -126,7 +126,8 @@ async function detectCapabilities() {
   return capabilities;
 }
 
-// 确保依赖已安装（特别是 optionalDependencies 如 node-pty）
+// 确保依赖已安装。node-pty 已被 @homebridge/node-pty-prebuilt-multiarch
+// 取代（regular dep + 全平台预编译），不再需要 optionalDependency 的特判。
 async function ensureDependencies() {
   const agentDir = new URL('.', import.meta.url).pathname.replace(/^\/([A-Z]:)/, '$1');
   const nodeModulesPath = join(agentDir, 'node_modules');
@@ -140,20 +141,6 @@ async function ensureDependencies() {
     } catch (e) {
       console.warn('[Startup] npm install failed:', e.message);
     }
-    return;
-  }
-
-  // 检查 node-pty 是否可用（optionalDependency，可能需要编译）
-  try {
-    await import('node-pty');
-  } catch (e) {
-    console.log('[Startup] node-pty not available, attempting install...');
-    try {
-      await execAsync('npm install node-pty', { cwd: agentDir, timeout: 120000 });
-      console.log('[Startup] node-pty installed successfully');
-    } catch (installErr) {
-      console.warn('[Startup] node-pty install failed (terminal will be unavailable):', installErr.message);
-    }
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "0.1.667",
+  "version": "0.1.670",
   "description": "Remote agent for Yeaft WebChat — connects worker machines to the central server",
   "main": "index.js",
   "type": "module",
@@ -54,13 +54,11 @@
     "ext": "js"
   },
   "dependencies": {
+    "@homebridge/node-pty-prebuilt-multiarch": "^0.13.1",
     "dotenv": "^16.3.1",
     "tweetnacl": "^1.0.3",
     "tweetnacl-util": "^0.15.1",
     "uuid": "^11.1.0",
     "ws": "^8.16.0"
-  },
-  "optionalDependencies": {
-    "node-pty": "^1.0.0"
   }
 }

package/terminal.js

@@ -4,15 +4,20 @@ import { join, dirname } from 'path';
 import { createRequire } from 'module';
 import ctx from './context.js';
 
+// Package name of the PTY backend. We use the Homebridge prebuilt fork
+// because upstream node-pty ships no Linux prebuilds and falls back to
+// node-gyp + C++20, which silently fails on older toolchains. The fork
+// ships prebuilds for darwin/linux/win32 across x64/arm64 (incl. musl).
+const PTY_PKG = '@homebridge/node-pty-prebuilt-multiarch';
+
 // Ensure spawn-helper has executable permission on Unix systems.
 // npm may strip execute bits from prebuilt binaries, causing
 // "posix_spawnp failed" on macOS/Linux.
-// TODO: Remove this workaround once node-pty ships with correct permissions.
 function ensureSpawnHelperPermissions() {
   if (platform() === 'win32') return;
   try {
     const cjsRequire = createRequire(import.meta.url);
-    const ptyPkgPath = dirname(cjsRequire.resolve('node-pty/package.json'));
+    const ptyPkgPath = dirname(cjsRequire.resolve(`${PTY_PKG}/package.json`));
     const targets = [
       join(ptyPkgPath, 'prebuilds', `${platform()}-${arch()}`, 'spawn-helper'),
       join(ptyPkgPath, 'build', 'Release', 'spawn-helper'),
@@ -30,11 +35,15 @@ function ensureSpawnHelperPermissions() {
   }
 }
 
-// 动态加载 node-pty (optionalDependency)
+// Load PTY backend. With the prebuilt fork this is essentially never
+// expected to fail at runtime — it's a regular `dependencies` entry and
+// every supported (platform, abi) combination ships a prebuilt binary.
+// We still catch and degrade so a single missing binary doesn't crash
+// the whole agent on an exotic host.
 export async function loadNodePty() {
   if (ctx.nodePty !== null) return ctx.nodePty;
   try {
-    let pty = await import('node-pty');
+    let pty = await import(PTY_PKG);
     if (pty.default) pty = pty.default;
     ensureSpawnHelperPermissions();
     ctx.nodePty = pty;
@@ -69,7 +78,7 @@ export async function handleTerminalCreate(msg) {
       type: 'terminal_error',
       conversationId,
       terminalId,
-      message: 'node-pty is not installed. Run: npm install node-pty'
+      message: 'Terminal backend is not installed. Run: npm install'
     });
     return;
   }

package/unify/config-api.js

@@ -215,3 +215,154 @@ export function updateUnifySettings(update, dir) {
 
   return merged;
 }
+
+// ─── Search settings (web-search backend selection + Tavily key) ────
+
+/**
+ * Valid backend values. `playwright` is reserved for the upcoming
+ * playwright-service tool — its UI option is currently disabled, but we
+ * accept the literal so a hand-edited config doesn't trip validation.
+ * Anything else is rejected on write and normalized to `tavily` on read.
+ */
+const VALID_BACKENDS = ['tavily', 'playwright'];
+
+function maskKey(key) {
+  if (!key || typeof key !== 'string') return null;
+  if (key.length <= 10) return '***';
+  return `${key.slice(0, 6)}...${key.slice(-4)}`;
+}
+
+/**
+ * Read the `search` section of config.json. Tavily key is returned in
+ * masked form (`tvly-d...j3dgV`) — the raw key never leaves the agent.
+ * UI uses `tavilyKeyConfigured` to decide whether the input shows a
+ * "(unchanged)" placeholder vs an empty box.
+ *
+ * @param {string} [dir]
+ * @returns {{ backend: string, tavilyKeyConfigured: boolean, tavilyKeyMasked: string|null, disableHtmlFallback: boolean } | { error: string }}
+ */
+export function getSearchSettings(dir) {
+  const root = dir || process.env.YEAFT_DIR || DEFAULT_YEAFT_DIR;
+  const configPath = join(root, 'config.json');
+  const defaults = {
+    backend: 'tavily',
+    tavilyKeyConfigured: false,
+    tavilyKeyMasked: null,
+    disableHtmlFallback: false,
+  };
+  if (!existsSync(configPath)) return defaults;
+  try {
+    const json = JSON.parse(readFileSync(configPath, 'utf8'));
+    const s = (json && typeof json.search === 'object' && json.search) || {};
+    const backend = VALID_BACKENDS.includes(s.backend) ? s.backend : 'tavily';
+    const key = typeof s.tavilyApiKey === 'string' ? s.tavilyApiKey : '';
+    return {
+      backend,
+      tavilyKeyConfigured: !!key,
+      tavilyKeyMasked: key ? maskKey(key) : null,
+      disableHtmlFallback: !!s.disableHtmlFallback,
+    };
+  } catch (e) {
+    return { error: `Failed to read config.json: ${e.message}` };
+  }
+}
+
+/**
+ * Update the `search` section of config.json. Update is shallow-merged:
+ * any field omitted from `update` keeps its previous value. Pass
+ * `tavilyApiKey: ''` explicitly to clear the key; pass `undefined` (or
+ * omit) to keep it unchanged — this is what the UI relies on so the
+ * "(unchanged)" placeholder doesn't accidentally wipe a saved key when
+ * the user only touches the backend radio.
+ *
+ * @param {{ backend?: string, tavilyApiKey?: string, disableHtmlFallback?: boolean }} update
+ * @param {string} [dir]
+ * @returns {ReturnType<typeof getSearchSettings>}
+ */
+export function updateSearchSettings(update, dir) {
+  const root = dir || process.env.YEAFT_DIR || DEFAULT_YEAFT_DIR;
+  const configPath = join(root, 'config.json');
+
+  if (!update || typeof update !== 'object') {
+    return { error: 'update payload required' };
+  }
+  if (update.backend !== undefined && !VALID_BACKENDS.includes(update.backend)) {
+    return { error: `backend must be one of: ${VALID_BACKENDS.join(', ')}` };
+  }
+  if (update.tavilyApiKey !== undefined && typeof update.tavilyApiKey !== 'string') {
+    return { error: 'tavilyApiKey must be a string' };
+  }
+
+  let existing = {};
+  if (existsSync(configPath)) {
+    try {
+      existing = JSON.parse(readFileSync(configPath, 'utf8'));
+    } catch {
+      existing = {};
+    }
+  }
+  const prev = (existing && typeof existing.search === 'object' && existing.search) || {};
+  const merged = { ...prev };
+  if (update.backend !== undefined) merged.backend = update.backend;
+  if (update.tavilyApiKey !== undefined) merged.tavilyApiKey = update.tavilyApiKey;
+  if (update.disableHtmlFallback !== undefined) merged.disableHtmlFallback = !!update.disableHtmlFallback;
+  existing.search = merged;
+
+  try {
+    writeFileSync(configPath, JSON.stringify(existing, null, 2) + '\n', 'utf8');
+  } catch (e) {
+    return { error: `Failed to write config.json: ${e.message}` };
+  }
+  return getSearchSettings(root);
+}
+
+/**
+ * Probe Tavily's `/usage` endpoint with the currently-saved key. Returns
+ * the plan + usage fields the UI shows, or `{ error }` for any of:
+ *   - no key configured
+ *   - HTTP error from Tavily (401 = bad key, etc.)
+ *   - network failure
+ *
+ * Called only when the user opens the Search settings tab (the user
+ * explicitly asked for "open settings → live read, don't poll"). No
+ * caching here — a stale display is more confusing than a fresh probe.
+ *
+ * @param {string} [dir]
+ * @returns {Promise<{ plan: string, used: number, limit: number|null, paygoUsed: number, paygoLimit: number|null } | { error: string }>}
+ */
+export async function fetchTavilyUsage(dir) {
+  const root = dir || process.env.YEAFT_DIR || DEFAULT_YEAFT_DIR;
+  const configPath = join(root, 'config.json');
+  if (!existsSync(configPath)) return { error: 'config.json not found' };
+  let key;
+  try {
+    const json = JSON.parse(readFileSync(configPath, 'utf8'));
+    key = json?.search?.tavilyApiKey;
+  } catch (e) {
+    return { error: `Failed to read config.json: ${e.message}` };
+  }
+  if (!key) return { error: 'Tavily API key not configured' };
+
+  try {
+    const res = await fetch('https://api.tavily.com/usage', {
+      method: 'GET',
+      headers: { Authorization: `Bearer ${key}` },
+    });
+    if (!res.ok) {
+      const text = await res.text().catch(() => '');
+      return { error: `${res.status} ${res.statusText} ${text.slice(0, 200)}` };
+    }
+    const data = await res.json();
+    const account = data?.account || {};
+    return {
+      plan: account.current_plan || 'unknown',
+      used: Number(account.plan_usage) || 0,
+      limit: account.plan_limit ?? null,
+      paygoUsed: Number(account.paygo_usage) || 0,
+      paygoLimit: account.paygo_limit ?? null,
+    };
+  } catch (e) {
+    return { error: e.message || String(e) };
+  }
+}
+

package/unify/tools/web-search.js

@@ -60,6 +60,14 @@ Guidelines:
     const signal = ctx?.signal;
     const errors = [];
 
+    // Backend preference set in UnifySettings → Search tab. When the
+    // user picks `playwright` we'd normally call the playwright-service;
+    // that service is not yet shipped (next PR), so the preference is
+    // recorded for forward-compat and we transparently fall through to
+    // Tavily / HTML scrape. Once the service lands we'll insert a
+    // tryPlaywright backend here ahead of Tavily.
+    // Anything other than 'playwright' is treated as 'tavily'.
+
     // 1. Tavily — default, fast, structured.
     if (search.tavilyApiKey) {
       const r = await tryTavily(query, limit, search.tavilyApiKey, signal);