ai-helper-agent 1.14.5 → 1.14.7

package/bin/agent.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 // agent/bin/agent.js - CLI entry point
 // Usage: ai-helper-agent <start|stop|restart|status|paircode|config> [options]
-import { join, dirname } from 'path';
+import { join, dirname, resolve } from 'path';
 import { existsSync, readFileSync, writeFileSync, unlinkSync, mkdirSync } from 'fs';
 import { spawn } from 'child_process';
 import { homedir } from 'os';
@@ -38,12 +38,14 @@ function resolveLang(args) {
   return detectSystemLang();
 }
 
-// Remove --lang <val> from args to avoid passing to server
+// Remove --lang <val> and background flags from args to avoid passing to server
 function filterLangArgs(args) {
   const filtered = [];
   for (let i = 0; i < args.length; i++) {
     if (args[i] === '--lang' && args[i + 1]) {
       i++; // skip the value too
+    } else if (args[i] === '-b' || args[i] === '--background') {
+      // 过滤后台标志，避免子进程递归 fork 孙进程
     } else {
       filtered.push(args[i]);
     }
@@ -51,6 +53,29 @@ function filterLangArgs(args) {
   return filtered;
 }
 
+// 健康检查：轮询 GET /api/status，直到成功或超时（最多 8 秒）
+async function healthCheck(port, host, timeoutMs = 8000, intervalMs = 500) {
+  const endpoint = `http://${host}:${port}/api/status`;
+  const maxAttempts = Math.ceil(timeoutMs / intervalMs);
+  for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+    try {
+      const res = await fetch(endpoint);
+      if (res.ok) return true;
+    } catch {
+      // 服务尚未就绪，继续等待
+    }
+    if (attempt < maxAttempts) {
+      await new Promise((r) => setTimeout(r, intervalMs));
+    }
+  }
+  return false;
+}
+
+// 等待后台服务就绪（带超时），成功返回 true
+async function waitForAgentReady(port, host) {
+  return healthCheck(port, host);
+}
+
 const lang = resolveLang(process.argv);
 process.env.AI_HELPER_LANG = lang;
 const translations = loadCliTranslations();
@@ -272,9 +297,11 @@ if (command === 'start') {
       process.exit(0);
     }
 
+    const agentScript = resolve(process.argv[1]);
+
     const child = spawn(process.execPath, [
       ...process.execArgv,
-      process.argv[1],
+      agentScript,
       'start',
       ...passArgs
     ], {
@@ -293,9 +320,11 @@ if (command === 'start') {
       process.exit(1);
     });
 
-    await new Promise(resolve => setTimeout(resolve, 500));
+    // 健康检查：轮询 /api/status，最多等待 8 秒，确保服务真正就绪
+    const readyConfig = applyCliArgs(readAgentConfig(), passArgs);
+    const healthy = !spawnFailed && child.pid ? await waitForAgentReady(readyConfig.port, readyConfig.host) : false;
 
-    if (!spawnFailed && child.pid) {
+    if (!spawnFailed && child.pid && healthy) {
       try {
         writeFileSync(PID_FILE, String(child.pid));
       } catch (err) {
@@ -306,6 +335,11 @@ if (command === 'start') {
       console.log(`[Agent] ${t('agentStartedBg', { pid: child.pid })}`);
       console.log(`[Agent] ${t('stopHint')}`);
       console.log(`[Agent] ${t('statusHint')}`);
+    } else if (!spawnFailed && child.pid && !healthy) {
+      // 服务未在超时内就绪，清理 PID 文件并报错
+      try { unlinkSync(PID_FILE); } catch {}
+      console.error(`[Agent] ${t('backgroundStartFailed')}: health check timed out`);
+      process.exit(1);
     }
 
     process.exit(spawnFailed ? 1 : 0);
@@ -398,9 +432,11 @@ if (command === 'start') {
   if (isBg) {
     ensureAgentDir();
 
+    const agentScript = resolve(process.argv[1]);
+
     const child = spawn(process.execPath, [
       ...process.execArgv,
-      process.argv[1],
+      agentScript,
       'start',
       ...passArgs
     ], {
@@ -419,9 +455,11 @@ if (command === 'start') {
       process.exit(1);
     });
 
-    await new Promise(resolve => setTimeout(resolve, 500));
+    // 健康检查：轮询 /api/status，最多等待 8 秒，确保服务真正就绪
+    const readyConfig = applyCliArgs(readAgentConfig(), passArgs);
+    const healthy = !spawnFailed && child.pid ? await waitForAgentReady(readyConfig.port, readyConfig.host) : false;
 
-    if (!spawnFailed && child.pid) {
+    if (!spawnFailed && child.pid && healthy) {
       try {
         writeFileSync(PID_FILE, String(child.pid));
       } catch (err) {
@@ -431,6 +469,10 @@ if (command === 'start') {
       child.unref();
       console.log(`[Agent] ${t('agentRestartedBg', { pid: child.pid })}`);
       console.log(`[Agent] ${t('stopHint')}`);
+    } else if (!spawnFailed && child.pid && !healthy) {
+      try { unlinkSync(PID_FILE); } catch {}
+      console.error(`[Agent] ${t('backgroundRestartFailed')}: health check timed out`);
+      process.exit(1);
     }
 
     process.exit(spawnFailed ? 1 : 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-helper-agent",
-  "version": "1.14.5",
+  "version": "1.14.7",
   "description": "AI Helper Agent - Local file access and system command execution proxy for Chrome extension / AI Helper 代理服务，为 Chrome 扩展提供本地文件读写和系统命令执行",
   "type": "module",
   "main": "./src/server.js",

package/src/server.js

@@ -1,7 +1,7 @@
 // agent/src/server.js - HTTP Router + WebSocket 服务器
 import http from 'http';
 import { WebSocketServer } from 'ws';
-import { readFileSync, createWriteStream, createReadStream, statSync, existsSync } from 'fs';
+import { readFileSync, createWriteStream, createReadStream, statSync, existsSync, watch } from 'fs';
 import { readFile, writeFile, readdir, stat, unlink, rmdir, chmod, mkdir, rename } from 'fs/promises';
 import { join, dirname, basename, resolve, isAbsolute, relative } from 'path';
 import { fileURLToPath, pathToFileURL } from 'url';
@@ -2069,12 +2069,45 @@ export function startServer() {
 
       try {
         await initializeSkillRegistry();
+        startSkillDirWatcher();
       } catch (err) {
         console.error(`[Agent] ${ln('skillInitFailed')}:`, err.message);
       }
     })();
   });
 
+  /**
+   * 监听技能目录（~/.ai-helper-agent/skills/）的文件变更，
+   * 当对话中通过写文件创建/更新技能后，自动重新扫描并加载，无需手动「重新加载」。
+   */
+  let skillDirWatchTimer = null;
+  let skillDirWatcher = null;
+  function startSkillDirWatcher() {
+    try {
+      const dir = getSkillsDir();
+      if (!existsSync(dir)) return;
+      skillDirWatcher = watch(dir, { recursive: true }, (_event, filename) => {
+        if (!filename) return;
+        // 仅关心 SKILL.md / _meta.json 等技能相关文件变更
+        if (!/\.md$|\.json$/.test(filename)) return;
+        if (skillDirWatchTimer) clearTimeout(skillDirWatchTimer);
+        skillDirWatchTimer = setTimeout(async () => {
+          try {
+            await reloadSkills();
+            logSystem('skill_auto_reload', { reason: 'dir_change', file: filename });
+          } catch (err) {
+            console.error(`[Agent] Skill auto-reload failed:`, err.message);
+          }
+        }, 800);
+      });
+      skillDirWatcher.on('error', (err) => {
+        console.warn(`[Agent] Skill dir watcher error:`, err.message);
+      });
+    } catch (err) {
+      console.warn(`[Agent] Failed to start skill dir watcher:`, err.message);
+    }
+  }
+
   // 优雅关闭（异步 + 防并发 + 超时兜底）
   async function shutdown() {
     if (shuttingDown) return;

package/src/skill/executor.js

@@ -124,22 +124,18 @@ async function executeToolCall(toolName, args) {
         if (cmdCheck.level === 'confirm') {
           return { success: false, error: tr('skill.commandNeedsConfirm', { reason: cmdCheck.reason }) };
         }
-        const { exec } = await import('child_process');
-        return new Promise((resolve) => {
-          exec(args.command, {
-            cwd: args.cwd || process.cwd(),
-            encoding: 'utf-8',
-            timeout: 30000,
-            maxBuffer: 10 * 1024 * 1024,
-            windowsHide: true
-          }, (error, stdout, stderr) => {
-            if (error) {
-              resolve({ success: false, error: error.message, stdout, stderr });
-            } else {
-              resolve({ success: true, stdout, exitCode: 0, stderr });
-            }
-          });
-        });
+        // 走统一命令执行器（支持 Git Bash 等环境下 Bash 花括号扩展等特性）
+        const { executeCommandSync } = await import('../executor.js');
+        const result = await executeCommandSync(args.command, args.cwd || process.cwd());
+        const stdout = result.stdout || '';
+        const stderr = result.stderr || '';
+        if (result.error) {
+          return { success: false, error: result.error, stdout, stderr };
+        }
+        if (result.exitCode !== 0) {
+          return { success: false, error: stderr || tr('skill.execFailed'), stdout, stderr };
+        }
+        return { success: true, stdout, exitCode: result.exitCode, stderr };
       }
 
       case 'agent_search':

package/src/skill/registry.js

@@ -22,6 +22,53 @@ export function setSkillRegistryLang(lang) {
 // Skill 映射表: name → skill定义
 const skills = new Map();
 
+/**
+ * 名称归一化：转小写 + 空格/连字符/下划线统一为连字符
+ * 用于大小写/分隔符不敏感的模糊匹配
+ * @param {string} name
+ * @returns {string}
+ */
+function normalizeName(name) {
+  return String(name || '').toLowerCase().replace(/[\s_]+/g, '-').trim();
+}
+
+/**
+ * 三级模糊查找 Agent Skill
+ * 解决 SKILL.md frontmatter `name`（如 "Agent Browser"）与目录名/slug（如 `agent-browser`）不一致的问题
+ *
+ * 匹配顺序：
+ *   ① 精确 name 匹配（skills Map 的 key）
+ *   ② 目录名匹配（basename(dirPath)）
+ *   ③ 归一化后大小写/空格/连字符/下划线不敏感匹配
+ *
+ * @param {string} name - AI 调用时使用的名称（可能是 frontmatter name、目录名或 slug）
+ * @returns {Object|undefined} 匹配到的 skill 定义，未找到返回 undefined
+ */
+function findAgentSkillByName(name) {
+  if (!name) return undefined;
+
+  // ① 精确 name 匹配
+  const exact = skills.get(name);
+  if (exact && exact.type === 'agent') return exact;
+
+  // ② 目录名匹配
+  for (const [, skill] of skills) {
+    if (skill.type !== 'agent') continue;
+    if (skill.dirPath && basename(skill.dirPath) === name) return skill;
+  }
+
+  // ③ 归一化后模糊匹配
+  const target = normalizeName(name);
+  if (!target) return undefined;
+  for (const [, skill] of skills) {
+    if (skill.type !== 'agent') continue;
+    if (normalizeName(skill.name) === target) return skill;
+    if (skill.dirPath && normalizeName(basename(skill.dirPath)) === target) return skill;
+  }
+
+  return undefined;
+}
+
 // 内置技能状态持久化文件
 const BUILTIN_STATE_FILE = join(dirname(SKILLS_DIR), 'builtin_skills_state.json');
 
@@ -167,6 +214,10 @@ export function getSkillList(type) {
     } else if (skill.type === 'agent') {
       item.resourceCount = skill.resources?.length || 0;
       item.resources = (skill.resources || []).map(r => ({ name: r.name, type: r.type, size: r.size }));
+      // 暴露目录名（slug），方便前端展示和 AI 调用
+      if (skill.dirPath) {
+        item.dirName = basename(skill.dirPath);
+      }
     }
 
     list.push(item);
@@ -232,7 +283,13 @@ export function getAgentSkillPrompts() {
   parts.push('');
 
   for (const skill of agentSkills) {
-    parts.push(`### ${skill.name}`);
+    // 当 frontmatter name 与目录名（slug）不一致时，标题同时显示 slug，引导 AI 用正确名称调用
+    const dirName = skill.dirPath ? basename(skill.dirPath) : '';
+    if (dirName && dirName !== skill.name) {
+      parts.push(`### ${skill.name} (slug: \`${dirName}\`)`);
+    } else {
+      parts.push(`### ${skill.name}`);
+    }
     parts.push(T('skill.skillPromptDesc', { description: skill.description }));
     if (skill.resources && skill.resources.length > 0) {
       const resourceNames = skill.resources.map(r => `\`${r.name}\``).join(', ');
@@ -250,8 +307,8 @@ export function getAgentSkillPrompts() {
  * @returns {{ success: boolean, error?: string, skill?: Object, prompt?: string }}
  */
 export function getAgentSkillPrompt(name) {
-  const skill = skills.get(name);
-  if (!skill || skill.type !== 'agent') {
+  const skill = findAgentSkillByName(name);
+  if (!skill) {
     return { success: false, error: `Skill "${name}" 不存在或不是 Agent Skill` };
   }
   // 如果 skill 有 dirPath，在 prompt 前注入工作目录信息，方便 AI 解析相对路径引用

package/src/skill/skill-creator-seed.js

@@ -8,7 +8,7 @@ export const SKILL_CREATOR_SEED_MD = `---
 name: skill-creator
 description: "创建新技能的元技能。当用户要求创建技能、沉淀技能、新增技能、或任何创建/添加技能的意图时，必须立即调用此技能。"
 enabled: true
-version: 1.2.1
+version: 1.2.2
 ---
 
 # Skill Creator
@@ -114,7 +114,7 @@ enabled: true
 
    **推荐做法**：先用 \`agent_exec\` 获取用户主目录的绝对路径，再拼接完整路径。
 
-6. **告知用户**：创建完成后，告知用户技能已就绪，说明触发关键词。建议用户在工具箱页面点击「重新加载」使技能生效。
+6. **告知用户**：创建完成后，技能会被自动加载并立即生效，告知用户技能已就绪、说明触发关键词即可，无需手动重新加载。
 
 ## 更新流程（已有技能）
 
@@ -125,7 +125,7 @@ enabled: true
 3. **分析更新需求**：结合当前对话上下文，识别需要更新的部分
 4. **合并内容**：保留原技能的核心结构，将新内容融入适当位置
 5. **覆盖写入**：使用 \`agent_file\`（action: write）覆盖写入 SKILL.md（路径规则同上，必须使用绝对路径）
-6. **告知用户**：告知更新内容，建议重新加载
+6. **告知用户**：覆盖写入后技能会被自动重新加载并立即生效，告知用户更新内容即可，无需手动重新加载。
 
 ## 更新注意事项