jvibe 1.1.8 → 1.1.9

package/CHANGELOG.md

@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **插件管理配置** (`plugins.yaml`)
   - 新增 `docs/.jvibe/plugins.yaml` 管理工具与插件启用状态
   - 区分 `core_plugins`（核心工具）与 `project_plugins`（项目按需）
+  - SessionStart hook 会从 `plugins.yaml` 注入 Core Tools 摘要到上下文
+  - 新增 `jvibe plugins core`：将缺失的 Core MCP Server 追加写入 `.claude/settings.local.json`（已存在则跳过）
 
 - **上下文最小化原则**
   - 所有 Agent 新增"硬规则"章节，禁止全仓库扫描
@@ -60,6 +62,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - 改为 `|| echo 0` 确保输出为数字，避免后续算术运算错误
   - 影响文件：`load-context.sh`、`load-jvibe-full-context.sh`、`sync-jvibe-context.sh`
 
+- **UserPromptSubmit hook 错误处理**
+  - 移除 `set -eo pipefail`，改用 fail-open trap 机制
+  - 添加 `_JVIBE_HOOK_SUCCESS` 标记避免重复输出
+  - 修复 Project.md 摘要提取时 grep 管道无匹配导致的错误
+  - 确保非 JVibe 项目也能正常放行
+
+- **TUI 插件选择写回**
+  - 修复已有 `docs/.jvibe/plugins.yaml` 时项目插件勾选不生效的问题
+  - 默认更新 `project_plugins`；勾选 Force Overwrite 会重置整个文件
+
 ## [1.1.7] - 2026-01-18
 
 ### Added
@@ -86,3 +98,21 @@ This release introduces a major architectural improvement focused on **context m
 2. **Dual-mode Testing**: `targeted` (precise) vs `discover` (user-reported issues without F-XXX)
 3. **Smarter Dispatch**: Main agent no longer directly fixes code; uses `bugfix` for complex issues
 4. **Robust Hooks**: Fixed shell script arithmetic errors with proper fallback values
+
+## [1.1.9] - 2026-01-20
+
+### Added
+
+- **Project Tools 注册表**：新增 `lib/plugins/registry.json` 的 Project Tools 完整条目（含 MCP 模板与依赖）
+- **Core Tools: Skill 支持**：支持 Core Tools 以 `skill` 形态集成（Agent Browser）
+  - 固定 Agent Browser Skill 到 `v0.6.0`，并将 `SKILL.md` vendoring 到 `template/.claude/skills/agent-browser/SKILL.md`
+
+### Changed
+
+- **Core Tools 配置输出**：分离 MCP Server 与 Skill 的计数与提示（init/setup/plugins core）
+
+### Fixed
+
+- **Core Tools env 占位符**：写入 `.claude/settings.local.json` 时自动填充当前环境变量，并避免写入未解析的 `{{VAR}}` 占位符
+- **Skill 下载鲁棒性**：为 Skill 下载增加超时/重定向/体积上限，避免卡死或异常大文件
+- **非交互 stdin**：`jvibe plugins core` 在 CI/重定向 stdin 下默认跳过交互安装提示，避免挂起

package/README.md

@@ -29,6 +29,7 @@
 - [文档体系](#-文档体系)
 - [Agent 架构](#-agent-架构)
 - [CLI 命令](#-cli-命令)
+- [Core Tools 维护](#-core-tools-维护)
 - [核心原则](#-核心原则)
 - [���见问题](#-常见问题)
 - [文档](#-文档)
@@ -329,6 +330,44 @@ TODO 完成情况 → 功能状态
 
 ---
 
+## 🔌 Core Tools 维护
+
+### Agent Browser Skill 更新
+
+Agent Browser Skill 当前固定在 **v0.6.0** 版本，以确保稳定性。如需更新到最新版本：
+
+#### 方法 1：手动更新（推荐）
+
+```bash
+# 1. 访问 GitHub Releases 页面查看最新版本
+# https://github.com/vercel-labs/agent-browser/releases
+
+# 2. 下载最新版本的 SKILL.md
+curl -o .claude/skills/agent-browser/SKILL.md \
+  https://raw.githubusercontent.com/vercel-labs/agent-browser/v0.7.0/skills/agent-browser/SKILL.md
+
+# 3. 更新 CLI 到对应版本
+npm install -g agent-browser@latest
+agent-browser install
+```
+
+#### 方法 2：修改 registry.json（高级用户）
+
+如果你想让 `jvibe plugins core` 自动使用新版本：
+
+1. 编辑 `lib/plugins/registry.json`
+2. 找到 `agent-browser` 配置（约第 80 行）
+3. 修改 `skillSource` 指向新版本：
+   ```json
+   "skillSource": "https://raw.githubusercontent.com/vercel-labs/agent-browser/v0.7.0/skills/agent-browser/SKILL.md"
+   ```
+4. 删除现有 Skill 文件：`rm -rf .claude/skills/agent-browser`
+5. 重新运行：`jvibe plugins core`
+
+> **注意**：更新前请查看 [Agent Browser Changelog](https://github.com/vercel-labs/agent-browser/releases) 确认兼容性。
+
+---
+
 ## 🎯 核心原则
 
 JVibe 基于以下原则设计：

package/bin/jvibe.js

@@ -69,25 +69,14 @@ program
 // upgrade 命令
 program
   .command('upgrade')
-  .description('升级到最新版本（默认卸载重装）')
+  .description('升级到最新版本（卸载重装）')
   .option('--check', '仅检查更新，不执行升级', false)
   .option('--force', '强制升级，跳过确认', false)
-  .option('--migrate', '仅执行迁移，不更新到最新版本', false)
   .action(async (options) => {
     const upgrade = require('../scripts/upgrade');
     await upgrade(options);
   });
 
-// migrate 命令（upgrade --migrate 的别名）
-program
-  .command('migrate')
-  .description('迁移旧版本配置到新格式')
-  .option('--force', '强制迁移，跳过确认', false)
-  .action(async (options) => {
-    const upgrade = require('../scripts/upgrade');
-    await upgrade({ ...options, migrate: true });
-  });
-
 // uninstall 命令
 program
   .command('uninstall')
@@ -120,6 +109,19 @@ program
     await validate();
   });
 
+// plugins 命令
+const plugins = program
+  .command('plugins')
+  .description('插件相关操作（Core Tools 等）');
+
+plugins
+  .command('core')
+  .description('配置 Core Tools（写入缺失的 MCP Server 到 .claude/settings.local.json）')
+  .action(async () => {
+    const { configureCore } = require('../scripts/plugins');
+    await configureCore();
+  });
+
 (async () => {
   try {
     const handled = await maybeRunSetup();

package/lib/migrations/index.js

@@ -81,13 +81,6 @@ const MIGRATIONS = [
           format: '**优先级**：P0 | P1 | P2 | P3',
           example: '**优先级**：P1'
         },
-        {
-          file: 'docs/core/Feature-List.md',
-          field: '预估工时',
-          description: '功能条目新增预估工时字段',
-          format: '**预估工时**：Xh | Xd',
-          example: '**预估工时**：4h'
-        },
         {
           file: 'docs/core/Feature-List.md',
           field: '关联模块',
@@ -108,7 +101,7 @@ const MIGRATIONS = [
           field: '功能条目格式',
           description: '功能条目格式扩展，支持更多元数据',
           oldFormat: '## F-XXX [状态] 功能名称\n\n**描述**：...\n\n**TODO**\n- [ ] ...',
-          newFormat: '## F-XXX [状态] 功能名称\n\n**描述**：...\n**优先级**：P1\n**预估工时**：4h\n**关联模块**：ModuleName\n\n**TODO**\n- [ ] ...'
+          newFormat: '## F-XXX [状态] 功能名称\n\n**描述**：...\n**优先级**：P1\n**关联模块**：ModuleName\n\n**TODO**\n- [ ] ...'
         }
       ],
       removed: [],

package/lib/plugins/core-tools.js

@@ -0,0 +1,398 @@
+const fs = require('fs-extra');
+const path = require('path');
+const { parsePluginListsFromYaml } = require('./plugins-yaml');
+
+const PLUGIN_REGISTRY_PATH = path.join(__dirname, 'registry.json');
+
+const DEFAULT_CORE_PLUGINS = [
+  'serena',
+  'filesystem-mcp',
+  'github-mcp',
+  'context7',
+  'agent-browser'
+];
+
+async function readJsonIfExists(filePath) {
+  try {
+    if (!await fs.pathExists(filePath)) return null;
+    return await fs.readJson(filePath);
+  } catch {
+    return null;
+  }
+}
+
+function substituteTemplateString(value, variables) {
+  if (typeof value !== 'string') return value;
+  return value.replace(/\{\{\s*([A-Za-z0-9_]+)\s*\}\}/g, (match, key) => (
+    Object.prototype.hasOwnProperty.call(variables, key) ? String(variables[key]) : match
+  ));
+}
+
+function substituteTemplateDeep(value, variables) {
+  if (Array.isArray(value)) {
+    return value.map(item => substituteTemplateDeep(item, variables));
+  }
+  if (value && typeof value === 'object') {
+    const out = {};
+    for (const [k, v] of Object.entries(value)) {
+      out[k] = substituteTemplateDeep(v, variables);
+    }
+    return out;
+  }
+  return substituteTemplateString(value, variables);
+}
+
+function extractNpxPackageArg(template) {
+  if (!template || typeof template !== 'object') return null;
+  if (template.command !== 'npx') return null;
+  const args = Array.isArray(template.args) ? template.args : null;
+  if (!args) return null;
+
+  for (const arg of args) {
+    if (typeof arg !== 'string') continue;
+    if (arg === '-y') continue;
+    if (arg.startsWith('-')) continue;
+    if (arg.includes('{{')) continue;
+    return arg;
+  }
+  return null;
+}
+
+function getRequiredEnvKeys(plugin) {
+  const keys = plugin && plugin.requires && Array.isArray(plugin.requires.env)
+    ? plugin.requires.env
+    : [];
+  return keys.filter(k => typeof k === 'string' && k.length > 0);
+}
+
+function buildTemplateVariables(plugin, cwd) {
+  const requiredEnvKeys = getRequiredEnvKeys(plugin);
+  const missingEnvKeys = [];
+  const variables = { project_root: cwd };
+
+  for (const key of requiredEnvKeys) {
+    const value = process.env[key];
+    if (typeof value === 'string' && value.length > 0) {
+      variables[key] = value;
+    } else {
+      missingEnvKeys.push(key);
+    }
+  }
+
+  return { variables, missingEnvKeys };
+}
+
+function stripUnresolvedTemplateEnv(serverConfig) {
+  if (!serverConfig || typeof serverConfig !== 'object') return serverConfig;
+  if (!serverConfig.env || typeof serverConfig.env !== 'object') return serverConfig;
+
+  const envEntries = Object.entries(serverConfig.env);
+  const cleanedEnv = {};
+
+  for (const [key, value] of envEntries) {
+    if (typeof value === 'string' && value.includes('{{') && value.includes('}}')) {
+      continue;
+    }
+    cleanedEnv[key] = value;
+  }
+
+  if (Object.keys(cleanedEnv).length === envEntries.length) return serverConfig;
+  const out = { ...serverConfig };
+  if (Object.keys(cleanedEnv).length === 0) {
+    delete out.env;
+  } else {
+    out.env = cleanedEnv;
+  }
+  return out;
+}
+
+async function loadPluginRegistry() {
+  try {
+    const registry = await fs.readJson(PLUGIN_REGISTRY_PATH);
+    const plugins = Array.isArray(registry.plugins) ? registry.plugins : [];
+    return { ...registry, plugins };
+  } catch {
+    return { version: 1, plugins: [] };
+  }
+}
+
+function getCorePluginIdsFromRegistry(registry) {
+  const plugins = Array.isArray(registry.plugins) ? registry.plugins : [];
+  const core = plugins
+    .filter(p => p && typeof p.id === 'string' && p.default_tier === 'core')
+    .map(p => p.id);
+  return core.length > 0 ? core : DEFAULT_CORE_PLUGINS;
+}
+
+async function getCorePluginIdsFromProject(cwd, registry) {
+  const pluginsPath = path.join(cwd, 'docs', '.jvibe', 'plugins.yaml');
+  try {
+    if (await fs.pathExists(pluginsPath)) {
+      const raw = await fs.readFile(pluginsPath, 'utf-8');
+      const parsed = parsePluginListsFromYaml(raw);
+      const core = Array.isArray(parsed.core_plugins) ? parsed.core_plugins : [];
+      if (core.length > 0) return core;
+    }
+  } catch {
+    // ignore
+  }
+  return getCorePluginIdsFromRegistry(registry);
+}
+
+async function fetchSkillFile(url, redirectCount = 0) {
+  const https = require('https');
+  const http = require('http');
+  const MAX_REDIRECTS = 5;
+  const TIMEOUT_MS = 10000;
+  const MAX_SIZE_BYTES = 10 * 1024 * 1024; // 10MB
+
+  if (redirectCount > MAX_REDIRECTS) {
+    throw new Error(`Too many redirects (>${MAX_REDIRECTS})`);
+  }
+
+  return new Promise((resolve, reject) => {
+    const client = url.startsWith('https') ? https : http;
+    const req = client.get(url, { timeout: TIMEOUT_MS }, (res) => {
+      if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+        return fetchSkillFile(res.headers.location, redirectCount + 1).then(resolve).catch(reject);
+      }
+      if (res.statusCode !== 200) {
+        return reject(new Error(`HTTP ${res.statusCode}`));
+      }
+
+      let data = '';
+      let size = 0;
+
+      res.on('data', chunk => {
+        size += chunk.length;
+        if (size > MAX_SIZE_BYTES) {
+          req.destroy();
+          return reject(new Error(`Response too large (>${MAX_SIZE_BYTES} bytes)`));
+        }
+        data += chunk;
+      });
+      res.on('end', () => resolve(data));
+      res.on('error', reject);
+    });
+
+    req.on('timeout', () => {
+      req.destroy();
+      reject(new Error(`Request timeout (>${TIMEOUT_MS}ms)`));
+    });
+    req.on('error', reject);
+  });
+}
+
+function checkCommandExists(command) {
+  if (!command || typeof command !== 'string') return false;
+
+  // If it's an explicit path, check it directly.
+  if (command.includes('/') || command.includes('\\')) {
+    try {
+      return fs.statSync(command).isFile();
+    } catch {
+      return false;
+    }
+  }
+
+  const pathValue = process.env.PATH || '';
+  const pathEntries = pathValue.split(path.delimiter).filter(Boolean);
+  const isWindows = process.platform === 'win32';
+  const pathExts = isWindows
+    ? (process.env.PATHEXT ? process.env.PATHEXT.split(';') : ['.EXE', '.CMD', '.BAT', '.COM'])
+    : [''];
+  const hasWindowsExt = isWindows && /\.[A-Za-z0-9]+$/.test(command);
+
+  for (const dir of pathEntries) {
+    if (hasWindowsExt) {
+      const fullPath = path.join(dir, command);
+      try {
+        if (fs.statSync(fullPath).isFile()) return true;
+      } catch {
+        // continue
+      }
+      continue;
+    }
+
+    for (const ext of pathExts) {
+      const fullPath = path.join(dir, isWindows ? `${command}${ext}` : command);
+      try {
+        if (fs.statSync(fullPath).isFile()) return true;
+      } catch {
+        // continue
+      }
+    }
+  }
+
+  return false;
+}
+
+async function configureSkillPlugin(cwd, plugin, result) {
+  const claudeConfig = plugin.claude;
+  if (!claudeConfig || !claudeConfig.skillDir || !claudeConfig.skillSource) {
+    result.missingTemplates.push(plugin.id);
+    return false;
+  }
+
+  const skillDir = path.join(cwd, claudeConfig.skillDir);
+  const skillFile = path.join(skillDir, 'SKILL.md');
+  const cliCommand = claudeConfig.skillName || plugin.id;
+  const globalInstall = claudeConfig.globalInstall || null;
+
+  // 检查 Skill 是否已存在
+  if (await fs.pathExists(skillFile)) {
+    if (globalInstall && cliCommand && !checkCommandExists(cliCommand)) {
+      result.skillsNeedingCli.push({
+        pluginId: plugin.id,
+        skillDir: claudeConfig.skillDir,
+        cliCommand,
+        globalInstall
+      });
+    }
+    result.skipped += 1;
+    return false;
+  }
+
+  // 下载 SKILL.md
+  try {
+    const content = await fetchSkillFile(claudeConfig.skillSource);
+    await fs.ensureDir(skillDir);
+    await fs.writeFile(skillFile, content, 'utf-8');
+    result.added += 1;
+    result.skillsAdded.push({ pluginId: plugin.id, skillDir: claudeConfig.skillDir });
+
+    if (globalInstall && cliCommand && !checkCommandExists(cliCommand)) {
+      result.skillsNeedingCli.push({
+        pluginId: plugin.id,
+        skillDir: claudeConfig.skillDir,
+        cliCommand,
+        globalInstall
+      });
+    }
+    return true;
+  } catch (e) {
+    result.missingTemplates.push(plugin.id);
+    return false;
+  }
+}
+
+async function configureClaudeCoreTools(cwd, registry) {
+  const claudeDir = path.join(cwd, '.claude');
+  if (!await fs.pathExists(claudeDir)) {
+    return { added: 0, skipped: 0, missingTemplates: [], missingEnv: [], mcpAdded: 0, skillsAdded: [], skillsNeedingCli: [] };
+  }
+
+  const settingsPath = path.join(claudeDir, 'settings.json');
+  const settingsLocalPath = path.join(claudeDir, 'settings.local.json');
+
+  const settings = await readJsonIfExists(settingsPath) || {};
+  const settingsLocal = await readJsonIfExists(settingsLocalPath);
+
+  if (await fs.pathExists(settingsLocalPath) && settingsLocal === null) {
+    return { added: 0, skipped: 0, missingTemplates: [], missingEnv: [], mcpAdded: 0, skillsAdded: [], skillsNeedingCli: [], error: 'settings.local.json 解析失败，已跳过自动配置' };
+  }
+
+  const local = settingsLocal || {};
+  const settingsServers = settings.mcpServers || {};
+  const localServers = local.mcpServers || {};
+  const existingServers = new Set([
+    ...Object.keys(settingsServers),
+    ...Object.keys(localServers)
+  ]);
+  const existingServerConfigs = [
+    ...Object.values(settingsServers),
+    ...Object.values(localServers)
+  ].filter(Boolean);
+
+  const corePluginIds = await getCorePluginIdsFromProject(cwd, registry);
+
+  const result = {
+    added: 0,
+    skipped: 0,
+    missingTemplates: [],
+    missingEnv: [],
+    mcpAdded: 0,
+    skillsNeedingCli: [],
+    skillsAdded: []
+  };
+
+  let mcpAdded = 0;
+
+  for (const pluginId of corePluginIds) {
+    const plugin = registry.plugins.find(p => p && p.id === pluginId);
+    if (!plugin) continue;
+
+    const integrationType = plugin.integration && plugin.integration.type;
+
+    // 处理 Skill 类型插件
+    if (integrationType === 'skill') {
+      await configureSkillPlugin(cwd, plugin, result);
+      continue;
+    }
+
+    // 处理 MCP 类型插件
+    if (integrationType !== 'mcp') continue;
+
+    const { variables, missingEnvKeys } = buildTemplateVariables(plugin, cwd);
+    if (missingEnvKeys.length > 0) {
+      result.missingEnv.push({ pluginId, keys: missingEnvKeys });
+    }
+
+    const serverName = plugin.claude && typeof plugin.claude.mcpServerName === 'string'
+      ? plugin.claude.mcpServerName
+      : pluginId;
+    const aliasNames = new Set([
+      pluginId,
+      serverName,
+      ...((plugin.claude && Array.isArray(plugin.claude.mcpAliases)) ? plugin.claude.mcpAliases : [])
+    ]);
+
+    const alreadyConfigured = [...aliasNames].some(name => existingServers.has(name));
+    if (alreadyConfigured) {
+      result.skipped += 1;
+      continue;
+    }
+
+    const template = plugin.claude && plugin.claude.mcpServer ? plugin.claude.mcpServer : null;
+    if (!template) {
+      result.missingTemplates.push(pluginId);
+      continue;
+    }
+
+    const npxPackageArg = extractNpxPackageArg(template);
+    const alreadyConfiguredBySignature = npxPackageArg
+      ? existingServerConfigs.some(cfg => (
+        cfg &&
+        typeof cfg === 'object' &&
+        cfg.command === 'npx' &&
+        Array.isArray(cfg.args) &&
+        cfg.args.includes(npxPackageArg)
+      ))
+      : false;
+    if (alreadyConfiguredBySignature) {
+      result.skipped += 1;
+      continue;
+    }
+
+    const resolved = stripUnresolvedTemplateEnv(substituteTemplateDeep(template, variables));
+    local.mcpServers = local.mcpServers || {};
+    local.mcpServers[serverName] = resolved;
+    existingServers.add(serverName);
+    result.added += 1;
+    mcpAdded += 1;
+  }
+
+  if (mcpAdded > 0) {
+    await fs.writeJson(settingsLocalPath, local, { spaces: 2 });
+  }
+
+  result.mcpAdded = mcpAdded;
+  return result;
+}
+
+module.exports = {
+  loadPluginRegistry,
+  getCorePluginIdsFromRegistry,
+  getCorePluginIdsFromProject,
+  configureClaudeCoreTools
+};

package/lib/plugins/plugins-yaml.js

@@ -0,0 +1,49 @@
+function stripYamlComment(line) {
+  const index = line.indexOf('#');
+  return index === -1 ? line : line.slice(0, index);
+}
+
+function parsePluginListsFromYaml(content) {
+  const result = {};
+  let currentKey = null;
+
+  for (const rawLine of content.split(/\r?\n/)) {
+    const line = stripYamlComment(rawLine).trim();
+    if (!line) {
+      continue;
+    }
+
+    const keyMatch = line.match(/^([A-Za-z0-9_]+):\s*(.*)$/);
+    if (keyMatch) {
+      const key = keyMatch[1];
+      const value = keyMatch[2].trim();
+      currentKey = null;
+
+      if (value === '' || value === '[]') {
+        result[key] = [];
+        if (value === '') {
+          currentKey = key;
+        }
+        continue;
+      }
+
+      result[key] = value.replace(/^['"]|['"]$/g, '');
+      continue;
+    }
+
+    const itemMatch = line.match(/^-+\s*(.+)$/);
+    if (itemMatch && currentKey) {
+      const item = itemMatch[1].trim().replace(/^['"]|['"]$/g, '');
+      if (item) {
+        result[currentKey].push(item);
+      }
+    }
+  }
+
+  return result;
+}
+
+module.exports = {
+  stripYamlComment,
+  parsePluginListsFromYaml
+};