agent-window 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-window",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "A window to interact with AI agents through chat interfaces. Simplified interaction, powerful backend capabilities.",
   "type": "module",
   "main": "src/bot.js",

package/src/core/instance/manager.js

@@ -8,7 +8,7 @@
 import fs from 'fs/promises';
 import path from 'path';
 import { existsSync } from 'fs';
-import { validateInstance } from './validator.js';
+import { validateInstance, detectInstanceType } from './validator.js';
 import { paths } from '../platform/index.js';
 import { getProcesses } from './pm2-bridge.js';
 
@@ -92,9 +92,16 @@ export async function addInstance(name, projectPath, options = {}) {
   // Validate the instance
   const validation = await validateInstance(projectPath);
   if (!validation.valid) {
+    // Provide helpful error message based on instance type
+    const typeMsg = validation.instanceType === 'simple-config'
+      ? '简单配置实例无法通过"添加实例"功能添加。请先使用 PM2 启动 bot，然后在 Web UI 中导入。'
+      : validation.instanceType === 'unknown'
+      ? '无法识别的项目类型'
+      : '项目不是有效的 AgentWindow BMAD 插件';
+
     return {
       success: false,
-      error: '验证失败：项目不是有效的 AgentWindow BMAD 插件',
+      error: '验证失败：' + typeMsg,
       validation
     };
   }
@@ -113,6 +120,7 @@ export async function addInstance(name, projectPath, options = {}) {
     pluginPath: validation.pluginPath,
     configPath,
     botName: `bot-${name}`,
+    instanceType: validation.instanceType,  // Save instance type
     addedAt: new Date().toISOString(),
     tags: options.tags || [],
     enabled: true
@@ -249,10 +257,24 @@ export async function discoverInstances() {
       let configPath = null;
       let pluginPath = null;
 
-      // Priority 1: Use CONFIG_PATH from environment variables
-      if (proc.configPath) {
+      // Priority 1: Read CONFIG_PATH and extract PROJECT_DIR from config
+      if (proc.configPath && existsSync(proc.configPath)) {
         configPath = proc.configPath;
-        projectPath = path.dirname(configPath);
+        try {
+          const configContent = await fs.readFile(proc.configPath, 'utf8');
+          const config = JSON.parse(configContent);
+
+          // Use PROJECT_DIR from config if available
+          if (config.PROJECT_DIR) {
+            projectPath = config.PROJECT_DIR;
+          } else {
+            // Fallback to config directory
+            projectPath = path.dirname(configPath);
+          }
+        } catch {
+          // If config read fails, use directory name
+          projectPath = path.dirname(configPath);
+        }
       }
       // Priority 2: Use cwd
       else if (proc.cwd) {
@@ -267,6 +289,23 @@ export async function discoverInstances() {
         pluginPath = path.join(projectPath, 'src');
       }
 
+      // Detect instance type based on project structure
+      let instanceType = 'unknown';
+      if (projectPath) {
+        // Check if it has BMAD plugin (_agent-bridge directory)
+        if (existsSync(path.join(projectPath, '_agent-bridge'))) {
+          instanceType = 'bmad-plugin';
+        }
+        // Check if it has a config file (simple config instance)
+        else if (existsSync(path.join(projectPath, 'config.json'))) {
+          instanceType = 'simple-config';
+        }
+        // Check if configPath exists and has config.json
+        else if (configPath && existsSync(configPath)) {
+          instanceType = 'simple-config';
+        }
+      }
+
       discovered.push({
         botName: proc.name,
         name: instanceName,
@@ -274,6 +313,7 @@ export async function discoverInstances() {
         projectPath,
         configPath,
         pluginPath,
+        instanceType,  // 'bmad' | 'simple' | 'unknown'
         status: proc.status || 'unknown',
         pid: proc.pid,
         memory: proc.memory || 0,
@@ -325,6 +365,7 @@ export async function importInstance(discovered) {
     configPath: discovered.configPath,
     pluginPath: validatedPluginPath,
     botName: discovered.botName,
+    instanceType: discovered.instanceType || 'simple-config',  // Save instance type
     addedAt: new Date().toISOString(),
     tags: ['imported'],
     enabled: true,

package/src/core/instance/validator.js

@@ -2,12 +2,39 @@
  * Instance Validator
  *
  * Validates if a project path contains a valid AgentWindow BMAD plugin instance.
+ * Supports two types:
+ * 1. Simple config (基础版) - Only has config.json
+ * 2. BMAD plugin (增强版) - Has _bmad and _agent-bridge directories
  */
 
 import fs from 'fs/promises';
 import path from 'path';
 import { existsSync } from 'fs';
 
+/**
+ * Detect instance type
+ * @param {string} projectPath - Path to check
+ * @returns {string} 'bmad-plugin' | 'simple-config' | 'unknown'
+ */
+export function detectInstanceType(projectPath) {
+  const normalizedPath = path.resolve(projectPath);
+
+  // Check if it has BMAD plugin (_agent-bridge directory)
+  const hasPlugin = existsSync(path.join(normalizedPath, '_agent-bridge'));
+
+  if (hasPlugin) {
+    return 'bmad-plugin';
+  }
+
+  // Check if it has config.json (simple config instance)
+  const hasConfig = existsSync(path.join(normalizedPath, 'config.json'));
+  if (hasConfig) {
+    return 'simple-config';
+  }
+
+  return 'unknown';
+}
+
 /**
  * Validation check definition
  * @typedef {Object} ValidationCheck
@@ -21,6 +48,7 @@ import { existsSync } from 'fs';
  * Validation result
  * @typedef {Object} ValidationResult
  * @property {boolean} valid - Overall validation result
+ * @property {string} instanceType - 'bmad' | 'simple' | 'unknown'
  * @property {Array<Object>} checks - Individual check results
  * @property {string|null} pluginPath - Path to the plugin directory
  * @property {string} projectPath - Path to the project directory
@@ -61,63 +89,88 @@ export async function validateInstance(projectPath) {
   const checks = [];
   const normalizedPath = path.resolve(projectPath);
 
-  // 1. Path exists check
-  checks.push({
-    name: 'path.exists',
-    passed: pathExists(normalizedPath),
-    required: true,
-    error: pathExists(normalizedPath) ? null : '项目路径不存在'
-  });
-
-  // 2. BMAD framework check
-  const bmadPath = path.join(normalizedPath, '_bmad');
-  const bmadExists = pathExists(bmadPath);
-  checks.push({
-    name: 'bmad.exists',
-    passed: bmadExists,
-    required: true,
-    error: bmadExists ? null : '未检测到 BMAD 框架 (_bmad 目录)'
-  });
-
-  // 3. Plugin directory check
-  const pluginPath = path.join(normalizedPath, '_agent-bridge');
-  const pluginExists = pathExists(pluginPath);
-  checks.push({
-    name: 'plugin.exists',
-    passed: pluginExists,
-    required: true,
-    error: pluginExists ? null : '未检测到 _agent-bridge 插件目录'
-  });
+  // Detect instance type
+  const instanceType = detectInstanceType(normalizedPath);
 
-  // 4. Core bot.js file check
-  const botJsPath = path.join(pluginPath, 'src/bot.js');
-  const botJsExists = pathExists(botJsPath);
   checks.push({
-    name: 'plugin.botjs',
-    passed: botJsExists,
+    name: 'type.detected',
+    passed: instanceType !== 'unknown',
     required: true,
-    error: botJsExists ? null : '插件缺少核心文件 src/bot.js'
+    error: instanceType === 'unknown' ? '无法识别的实例类型' : `检测到${instanceType === 'bmad-plugin' ? ' BMAD 插件' : '简单配置'}实例`
   });
 
-  // 5. package.json validation (check dependencies, not hardcoded name)
-  const pluginPkgPath = path.join(pluginPath, 'package.json');
-  const hasDiscord = await hasDependency(pluginPkgPath, 'discord.js');
-  checks.push({
-    name: 'plugin.package',
-    passed: hasDiscord,
-    required: true,
-    error: hasDiscord ? null : '插件 package.json 缺少 discord.js 依赖'
-  });
-
-  // 6. BMAD config check (optional)
-  const bmadConfigPath = path.join(normalizedPath, '_bmad/core/config.yaml');
-  const bmadConfigExists = pathExists(bmadConfigPath);
-  checks.push({
-    name: 'bmad.config',
-    passed: bmadConfigExists,
-    required: false,
-    error: bmadConfigExists ? null : 'BMAD 配置文件不存在（非致命）'
-  });
+  let pluginPath = null;
+
+  if (instanceType === 'bmad-plugin') {
+    // BMAD-specific checks
+    const bmadPath = path.join(normalizedPath, '_bmad');
+    const bmadExists = pathExists(bmadPath);
+    checks.push({
+      name: 'bmad.exists',
+      passed: bmadExists,
+      required: true,
+      error: bmadExists ? null : '未检测到 BMAD 框架 (_bmad 目录)'
+    });
+
+    pluginPath = path.join(normalizedPath, '_agent-bridge');
+    const pluginExists = pathExists(pluginPath);
+    checks.push({
+      name: 'plugin.exists',
+      passed: pluginExists,
+      required: true,
+      error: pluginExists ? null : '未检测到 _agent-bridge 插件目录'
+    });
+
+    const botJsPath = path.join(pluginPath, 'src/bot.js');
+    const botJsExists = pathExists(botJsPath);
+    checks.push({
+      name: 'plugin.botjs',
+      passed: botJsExists,
+      required: true,
+      error: botJsExists ? null : '插件缺少核心文件 src/bot.js'
+    });
+
+    const pluginPkgPath = path.join(pluginPath, 'package.json');
+    const hasDiscord = await hasDependency(pluginPkgPath, 'discord.js');
+    checks.push({
+      name: 'plugin.package',
+      passed: hasDiscord,
+      required: true,
+      error: hasDiscord ? null : '插件 package.json 缺少 discord.js 依赖'
+    });
+  } else if (instanceType === 'simple-config') {
+    // Simple config instance
+    const configPath = path.join(normalizedPath, 'config.json');
+    const configExists = pathExists(configPath);
+    checks.push({
+      name: 'config.exists',
+      passed: configExists,
+      required: true,
+      error: configExists ? null : '配置文件不存在'
+    });
+
+    // Try to validate config structure
+    if (configExists) {
+      try {
+        const configContent = await fs.readFile(configPath, 'utf-8');
+        const config = JSON.parse(configContent);
+        const hasBotToken = !!(config.BOT_TOKEN || config.token);
+        checks.push({
+          name: 'config.token',
+          passed: hasBotToken,
+          required: true,
+          error: hasBotToken ? null : '配置文件缺少 BOT_TOKEN'
+        });
+      } catch (e) {
+        checks.push({
+          name: 'config.valid',
+          passed: false,
+          required: true,
+          error: '配置文件格式错误'
+        });
+      }
+    }
+  }
 
   // Determine overall validity
   const allRequiredPassed = checks
@@ -126,8 +179,9 @@ export async function validateInstance(projectPath) {
 
   return {
     valid: allRequiredPassed,
+    instanceType,
     checks,
-    pluginPath: pluginExists ? pluginPath : null,
+    pluginPath,
     projectPath: normalizedPath
   };
 }
@@ -140,6 +194,7 @@ export async function validateInstance(projectPath) {
 export function formatValidationResult(result) {
   const lines = [
     '验证结果: ' + (result.valid ? '✓ 通过' : '✗ 失败'),
+    `实例类型: ${result.instanceType === 'bmad-plugin' ? 'BMAD 插件' : result.instanceType === 'simple-config' ? '简单配置' : '未知'}`,
     ''
   ];
 
@@ -152,7 +207,7 @@ export function formatValidationResult(result) {
     }
   }
 
-  if (result.valid) {
+  if (result.valid && result.pluginPath) {
     lines.push('');
     lines.push(`插件路径: ${result.pluginPath}`);
   }