agent-window 1.2.7 → 1.3.0

package/package.json

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

package/src/api/routes/instances.js

@@ -244,7 +244,7 @@ export async function registerInstanceRoutes(fastify) {
 
       // Use botName for PM2 lookup, default to bot-{name}
       const botName = instance.botName || `bot-${name}`;
-      const status = await getStatus(botName);
+      const status = await getStatus(botName, { instanceType: instance.instanceType });
       return { ...status, instanceName: name };
     } catch (error) {
       reply.code(500).send({

package/src/api/routes/operations.js

@@ -21,6 +21,37 @@ import { getInstance } from '../../core/instance/manager.js';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const PACKAGE_ROOT = path.join(__dirname, '..', '..', '..');
 
+/**
+ * Normalize instance type to handle legacy values
+ * Maps old/invalid types to current supported types
+ *
+ * @param {string} type - Raw instance type
+ * @returns {'bmad-plugin' | 'simple-config'} Normalized type
+ */
+function normalizeInstanceType(type) {
+  if (!type) return 'simple-config';
+
+  const typeMap = {
+    'standalone': 'simple-config',      // Legacy: convert to simple-config
+    'bmad': 'bmad-plugin',              // Legacy: shorthand
+    'simple': 'simple-config',          // Legacy: shorthand
+    'unknown': 'simple-config',         // Fallback for unknown types
+  };
+
+  // If exact match, return mapped value
+  if (typeMap[type] !== undefined) {
+    return typeMap[type];
+  }
+
+  // If already a valid type, return as-is
+  if (type === 'bmad-plugin' || type === 'simple-config') {
+    return type;
+  }
+
+  // Safe default for any unexpected value
+  return 'simple-config';
+}
+
 /**
  * Register operation routes
  */
@@ -49,28 +80,23 @@ export async function registerOperationRoutes(fastify) {
         });
       }
 
-      // Determine script path based on instance type
+      // Normalize instance type to handle legacy values
+      const normalizedType = normalizeInstanceType(instance.instanceType);
+
+      // Determine script path based on normalized instance type
       let scriptPath;
       const cwd = instance.projectPath;
 
-      switch (instance.instanceType) {
+      switch (normalizedType) {
         case 'bmad-plugin':
           // BMAD plugin: start _agent-bridge/src/bot.js
           scriptPath = path.join(instance.projectPath, '_agent-bridge', 'src', 'bot.js');
           break;
-        case 'standalone':
-          // Standalone: start src/bot.js from project root
-          scriptPath = path.join(instance.projectPath, 'src', 'bot.js');
-          break;
         case 'simple-config':
-          // Simple config: use global agent-window bot.js
+        default:
+          // Simple config: use global agent-window bot.js (default fallback)
           scriptPath = path.join(PACKAGE_ROOT, 'src', 'bot.js');
           break;
-        default:
-          return reply.code(400).send({
-            error: 'Unknown instance type',
-            instanceType: instance.instanceType
-          });
       }
 
       const botName = instance.botName || `bot-${name}`;

package/src/core/instance/manager.js

@@ -144,6 +144,9 @@ export async function addInstance(name, projectPath, options = {}) {
       pluginPath: null,
       botName: `bot-${name}`,
       instanceType: 'simple-config',
+      // Extensible fields for future platform/AI provider support
+      platform: options.platform || 'discord',   // discord | telegram | slack
+      aiProvider: options.aiProvider || null,    // anthropic | openai | microsoft
       addedAt: new Date().toISOString(),
       tags: options.tags || [],
       enabled: true
@@ -165,9 +168,7 @@ export async function addInstance(name, projectPath, options = {}) {
     // Only BMAD plugins can be manually added
     const typeMsg = validation.instanceType === 'simple-config'
       ? '简单配置实例无法通过"添加实例"功能添加。请使用"Discover"功能导入。'
-      : validation.instanceType === 'unknown'
-      ? '无法识别的项目类型，必须是有效的 BMAD 插件'
-      : '项目不是有效的 AgentWindow BMAD 插件';
+      : '项目不是有效的 BMAD 插件';
 
     return {
       success: false,
@@ -196,6 +197,9 @@ export async function addInstance(name, projectPath, options = {}) {
     configPath,
     botName: `bot-${name}`,
     instanceType: validation.instanceType,
+    // Extensible fields for future platform/AI provider support
+    platform: options.platform || 'discord',   // discord | telegram | slack
+    aiProvider: options.aiProvider || null,    // anthropic | openai | microsoft
     addedAt: new Date().toISOString(),
     tags: options.tags || [],
     enabled: true
@@ -285,7 +289,7 @@ export async function updateInstance(name, updates) {
   }
 
   // Allowed fields to update
-  const allowedFields = ['displayName', 'tags', 'enabled', 'configPath'];
+  const allowedFields = ['displayName', 'tags', 'enabled', 'configPath', 'platform', 'aiProvider'];
   const instance = data.instances[index];
 
   for (const [key, value] of Object.entries(updates)) {

package/src/core/instance/pm2-bridge.js

@@ -155,9 +155,12 @@ export async function getLogs(name, options = {}) {
 /**
  * Get process status summary
  * @param {string} name - Process name
+ * @param {Object} options - Options
+ * @param {string} options.instanceType - Instance type for type-aware checks
  * @returns {Promise<Object>} Status info
  */
-export async function getStatus(name) {
+export async function getStatus(name, options = {}) {
+  const { instanceType } = options;
   const proc = await getProcess(name);
 
   if (!proc) {
@@ -198,54 +201,64 @@ export async function getStatus(name) {
     console.debug('[Status] Could not read config for container name:', e.message);
   }
 
-  // Check Docker container status (always check, don't rely on stale health file)
+  // Type-aware status detection
   let dockerRunning = false;
-  if (containerName && procStatus === 'online') {
-    try {
-      const { execSync } = await import('child_process');
-      const result = execSync(
-        `docker inspect -f '{{.State.Running}}' ${containerName} 2>/dev/null`,
-        { encoding: 'utf-8', timeout: 5000 }
-      ).trim();
-      dockerRunning = result === 'true';
-    } catch (e) {
-      // Docker container not running or doesn't exist
-      dockerRunning = false;
+
+  // For bmad-plugin: Only check PM2 status (BMAD plugin manages its own Docker)
+  if (instanceType === 'bmad-plugin') {
+    healthStatus.docker = false; // Not tracked by AgentWindow for BMAD plugins
+    healthStatus.pm2 = procStatus === 'online';
+
+    // BMAD plugin status depends only on PM2
+    if (procStatus === 'online') {
+      healthStatus.overall = 'healthy';
+    } else if (procStatus === 'errored') {
+      healthStatus.overall = 'error';
+    } else {
+      healthStatus.overall = 'stopped';
     }
   }
+  // For simple-config: Check both PM2 and Docker status
+  else {
+    // simple-config instances may use Docker sandbox
+    if (containerName && procStatus === 'online') {
+      try {
+        const { execSync } = await import('child_process');
+        const result = execSync(
+          `docker inspect -f '{{.State.Running}}' ${containerName} 2>/dev/null`,
+          { encoding: 'utf-8', timeout: 5000 }
+        ).trim();
+        dockerRunning = result === 'true';
+      } catch (e) {
+        dockerRunning = false;
+      }
+    }
 
-  healthStatus.docker = dockerRunning;
-  healthStatus.pm2 = procStatus === 'online';
+    healthStatus.docker = dockerRunning;
+    healthStatus.pm2 = procStatus === 'online';
 
-  // Determine overall status based on PM2 + Docker combination
-  if (procStatus === 'stopped') {
-    healthStatus.overall = 'stopped';
-  } else if (procStatus === 'errored' || procStatus === 'stopped') {
-    healthStatus.overall = 'error';
-  } else if (procStatus === 'online') {
-    if (dockerRunning) {
-      healthStatus.overall = 'healthy';
-    } else if (containerName) {
-      // Has container name but container not running = degraded
-      healthStatus.overall = 'degraded';
+    // Determine overall status based on PM2 + Docker combination
+    if (procStatus === 'stopped') {
+      healthStatus.overall = 'stopped';
+    } else if (procStatus === 'errored') {
+      healthStatus.overall = 'error';
+    } else if (procStatus === 'online') {
+      if (dockerRunning) {
+        healthStatus.overall = 'healthy';
+      } else if (containerName) {
+        healthStatus.overall = 'degraded';  // Has container but not running
+      } else {
+        healthStatus.overall = 'healthy';   // No Docker configured
+      }
     } else {
-      // No container configured (simple instance without Docker)
-      healthStatus.overall = 'healthy';
+      healthStatus.overall = 'unknown';
     }
-  } else {
-    healthStatus.overall = 'unknown';
   }
 
   // Determine display status (what frontend shows)
   let displayStatus = procStatus;
   if (procStatus === 'online') {
-    if (dockerRunning) {
-      displayStatus = 'running';
-    } else if (containerName) {
-      displayStatus = 'degraded';  // PM2 running but Docker down
-    } else {
-      displayStatus = 'running';  // No Docker, just PM2
-    }
+    displayStatus = 'running';  // PM2 online = running (Docker state is in health.docker)
   }
 
   return {
@@ -258,7 +271,8 @@ export async function getStatus(name) {
     memory: proc.memory || 0,
     cpu: proc.cpu || 0,
     restarts: proc.restarts || 0,
-    health: healthStatus
+    health: healthStatus,
+    instanceType // Include for frontend reference
   };
 }
 

package/src/core/instance/validator.js

@@ -12,9 +12,18 @@ import path from 'path';
 import { existsSync } from 'fs';
 
 /**
- * Detect instance type
+ * Detect instance type based on project structure
+ *
  * @param {string} projectPath - Path to check
- * @returns {string} 'bmad-plugin' | 'simple-config' | 'unknown'
+ * @returns {'bmad-plugin' | 'simple-config'} Instance type (always returns one of two types)
+ *
+ * Detection Logic:
+ * 1. BMAD Plugin: Has _agent-bridge/src/bot.js (full BMAD framework)
+ * 2. Simple Config: Any other path (fallback, uses global bot.js)
+ *
+ * @example
+ * detectInstanceType('/path/to/bmad-project') // returns 'bmad-plugin'
+ * detectInstanceType('/path/to/simple')       // returns 'simple-config'
  */
 export function detectInstanceType(projectPath) {
   const normalizedPath = path.resolve(projectPath);
@@ -28,15 +37,9 @@ export function detectInstanceType(projectPath) {
     return 'bmad-plugin';
   }
 
-  // Check if it has config.json (simple config instance)
-  // This takes precedence over _bmad directory, as many BMAD projects
-  // are run as simple-config bots
-  const hasConfig = existsSync(path.join(normalizedPath, 'config.json'));
-  if (hasConfig) {
-    return 'simple-config';
-  }
-
-  return 'unknown';
+  // Default to simple-config for all other cases
+  // This provides a safe fallback that allows the instance to run
+  return 'simple-config';
 }
 
 /**
@@ -52,7 +55,7 @@ export function detectInstanceType(projectPath) {
  * Validation result
  * @typedef {Object} ValidationResult
  * @property {boolean} valid - Overall validation result
- * @property {string} instanceType - 'bmad' | 'simple' | 'unknown'
+ * @property {string} instanceType - 'bmad-plugin' | 'simple-config'
  * @property {Array<Object>} checks - Individual check results
  * @property {string|null} pluginPath - Path to the plugin directory
  * @property {string} projectPath - Path to the project directory
@@ -96,11 +99,12 @@ export async function validateInstance(projectPath) {
   // Detect instance type
   const instanceType = detectInstanceType(normalizedPath);
 
+  // Type detection always succeeds (returns bmad-plugin or simple-config)
   checks.push({
     name: 'type.detected',
-    passed: instanceType !== 'unknown',
+    passed: true,  // Always passes - detectInstanceType always returns a valid type
     required: true,
-    error: instanceType === 'unknown' ? '无法识别的实例类型' : `检测到${instanceType === 'bmad-plugin' ? ' BMAD 插件' : '简单配置'}实例`
+    error: null  // No error - type is always valid
   });
 
   let pluginPath = null;