bmad-method 6.0.0-alpha.1 → 6.0.0-alpha.11

package/tools/cli/bundlers/web-bundler.js

@@ -51,8 +51,13 @@ class WebBundler {
     console.log(chalk.cyan.bold('═══════════════════════════════════════════════\n'));
 
     try {
-      // Pre-discover all modules to generate complete manifests
+      // Vendor cross-module workflows FIRST
       const modules = await this.discoverModules();
+      for (const module of modules) {
+        await this.vendorCrossModuleWorkflows(module);
+      }
+
+      // Pre-discover all modules to generate complete manifests
       for (const module of modules) {
         await this.preDiscoverModule(module);
       }
@@ -92,6 +97,9 @@ class WebBundler {
       teams: [],
     };
 
+    // Vendor cross-module workflows first (if not already done by bundleAll)
+    await this.vendorCrossModuleWorkflows(moduleName);
+
     // Pre-discover all agents and teams for manifest generation
     await this.preDiscoverModule(moduleName);
 
@@ -134,6 +142,9 @@ class WebBundler {
 
     console.log(chalk.dim(`  → Processing: ${agentName}`));
 
+    // Vendor cross-module workflows first (if not already done)
+    await this.vendorCrossModuleWorkflows(moduleName);
+
     const agentPath = path.join(this.modulesPath, moduleName, 'agents', agentFile);
 
     // Check if agent file exists
@@ -148,6 +159,16 @@ class WebBundler {
 
     // Handle YAML agents - build in-memory to XML
     if (agentFile.endsWith('.agent.yaml')) {
+      // Check for webskip flag in YAML before building
+      const yamlContent = await fs.readFile(agentPath, 'utf8');
+      const agentYaml = yaml.load(yamlContent);
+
+      if (agentYaml?.agent?.webskip === true) {
+        this.stats.skippedAgents++;
+        console.log(chalk.gray(`    ⊘ Skipped (webskip="true")`));
+        return;
+      }
+
       // Build agent from YAML (no customize file for web bundles)
       const xmlContent = await this.yamlBuilder.buildFromYaml(agentPath, null, {
         includeMetadata: false, // Don't include build metadata in web bundles
@@ -194,6 +215,18 @@ class WebBundler {
       this.stats.warnings.push({ agent: agentName, warnings: dependencyWarnings });
     }
 
+    // Check for module's default-party.csv and include it as agent manifest
+    const defaultPartyPath = path.join(this.modulesPath, moduleName, 'teams', 'default-party.csv');
+    if (await fs.pathExists(defaultPartyPath)) {
+      const partyContent = await fs.readFile(defaultPartyPath, 'utf8');
+      // Process any placeholders in the CSV content
+      const processedPartyContent = this.processProjectRootReferences(partyContent);
+      // Wrap as text to preserve raw CSV format in CDATA
+      const wrappedParty = this.wrapContentInXml(processedPartyContent, 'bmad/_cfg/agent-manifest.csv', 'text');
+      dependencies.set('bmad/_cfg/agent-manifest.csv', wrappedParty);
+      console.log(chalk.gray(`    + Added party manifest from module default-party.csv`));
+    }
+
     // Remove commands for skipped workflows from agent XML
     if (skippedWorkflows.length > 0) {
       agentXml = this.removeSkippedWorkflowCommands(agentXml, skippedWorkflows);
@@ -209,10 +242,13 @@ class WebBundler {
       console.log(chalk.red(`    ⚠ Invalid XML generated!`));
     }
 
+    // Format XML for readability
+    const formattedBundle = this.formatXml(bundle);
+
     // Write bundle to output
     const outputPath = path.join(this.outputDir, moduleName, 'agents', `${agentName}.xml`);
     await fs.ensureDir(path.dirname(outputPath));
-    await fs.writeFile(outputPath, bundle, 'utf8');
+    await fs.writeFile(outputPath, formattedBundle, 'utf8');
 
     this.stats.bundledAgents++;
     const statusIcon = isValid ? chalk.green('✓') : chalk.yellow('⚠');
@@ -249,6 +285,24 @@ class WebBundler {
     const allAgentXmls = [];
     const warnings = [];
 
+    // Check if team has a party CSV file (agent manifest)
+    const hasPartyFile = teamConfig.party && teamConfig.party.endsWith('.csv');
+    if (hasPartyFile) {
+      // Load the party CSV and add it as bmad/_cfg/agent-manifest.csv
+      const partyPath = path.join(path.dirname(teamPath), teamConfig.party.replace(/^\.\//, ''));
+      if (await fs.pathExists(partyPath)) {
+        const partyContent = await fs.readFile(partyPath, 'utf8');
+        // Process any placeholders in the CSV content
+        const processedPartyContent = this.processProjectRootReferences(partyContent);
+        // Wrap as text/csv to preserve raw CSV format in CDATA
+        const wrappedParty = this.wrapContentInXml(processedPartyContent, 'bmad/_cfg/agent-manifest.csv', 'text');
+        dependencies.set('bmad/_cfg/agent-manifest.csv', wrappedParty);
+        console.log(chalk.gray(`    + Added agent manifest from: ${teamConfig.party}`));
+      } else {
+        console.log(chalk.yellow(`    ⚠ Party file not found: ${partyPath}`));
+      }
+    }
+
     // 1. First, always add the bmad-web-orchestrator (XML file only, no transformation needed)
     const orchestratorXmlPath = path.join(this.sourceDir, 'core', 'agents', 'bmad-web-orchestrator.agent.xml');
 
@@ -316,6 +370,15 @@ class WebBundler {
       let agentXml;
 
       if (isYaml) {
+        // Check for webskip flag in YAML
+        const yamlContent = await fs.readFile(agentPath, 'utf8');
+        const agentYaml = yaml.load(yamlContent);
+
+        if (agentYaml?.agent?.webskip === true) {
+          console.log(chalk.gray(`    ⊘ Skipped agent (webskip="true"): ${agentName}`));
+          continue;
+        }
+
         // Build YAML agent in-memory - skip activation for team agents (orchestrator handles it)
         const xmlContent = await this.yamlBuilder.buildFromYaml(agentPath, null, {
           includeMetadata: false,
@@ -380,10 +443,13 @@ class WebBundler {
       console.log(chalk.red(`    ⚠ Invalid XML generated for team!`));
     }
 
+    // Format XML for readability
+    const formattedBundle = this.formatXml(bundle);
+
     // 6. Write bundle to output
     const outputPath = path.join(this.outputDir, moduleName, 'teams', `${teamName}.xml`);
     await fs.ensureDir(path.dirname(outputPath));
-    await fs.writeFile(outputPath, bundle, 'utf8');
+    await fs.writeFile(outputPath, formattedBundle, 'utf8');
 
     const statusIcon = isValid ? chalk.green('✓') : chalk.yellow('⚠');
     console.log(`    ${statusIcon} Bundled team: ${teamName}.xml${isValid ? '' : chalk.yellow(' (invalid XML)')}`);
@@ -433,6 +499,99 @@ class WebBundler {
     return parts.join('\n');
   }
 
+  /**
+   * Vendor cross-module workflows for a module
+   * Scans source agent YAML files for workflow-install attributes and copies workflows
+   */
+  async vendorCrossModuleWorkflows(moduleName) {
+    const modulePath = path.join(this.modulesPath, moduleName);
+    const agentsPath = path.join(modulePath, 'agents');
+
+    if (!(await fs.pathExists(agentsPath))) {
+      return;
+    }
+
+    // Find all agent YAML files
+    const files = await fs.readdir(agentsPath);
+    const yamlFiles = files.filter((f) => f.endsWith('.agent.yaml'));
+
+    for (const agentFile of yamlFiles) {
+      const agentPath = path.join(agentsPath, agentFile);
+      const agentYaml = yaml.load(await fs.readFile(agentPath, 'utf8'));
+
+      const menuItems = agentYaml?.agent?.menu || [];
+      const workflowInstallItems = menuItems.filter((item) => item['workflow-install']);
+
+      for (const item of workflowInstallItems) {
+        const sourceWorkflowPath = item.workflow;
+        const installWorkflowPath = item['workflow-install'];
+
+        if (!sourceWorkflowPath || !installWorkflowPath) {
+          continue;
+        }
+
+        // Parse paths to extract module and workflow location
+        // Support both {project-root}/bmad/... and {project-root}/{bmad_folder}/... patterns
+        const sourceMatch = sourceWorkflowPath.match(/\{project-root\}\/(?:\{bmad_folder\}|bmad)\/([^/]+)\/workflows\/(.+)/);
+        const installMatch = installWorkflowPath.match(/\{project-root\}\/(?:\{bmad_folder\}|bmad)\/([^/]+)\/workflows\/(.+)/);
+
+        if (!sourceMatch || !installMatch) {
+          continue;
+        }
+
+        const sourceModule = sourceMatch[1];
+        const sourceWorkflowRelPath = sourceMatch[2];
+        const installModule = installMatch[1];
+        const installWorkflowRelPath = installMatch[2];
+
+        // Build actual filesystem paths
+        const actualSourceWorkflowPath = path.join(this.modulesPath, sourceModule, 'workflows', sourceWorkflowRelPath);
+        const actualDestWorkflowPath = path.join(this.modulesPath, installModule, 'workflows', installWorkflowRelPath);
+
+        // Check if source workflow exists
+        if (!(await fs.pathExists(actualSourceWorkflowPath))) {
+          console.log(chalk.yellow(`    ⚠ Source workflow not found for vendoring: ${sourceWorkflowPath}`));
+          continue;
+        }
+
+        // Check if destination already exists (skip if already vendored)
+        if (await fs.pathExists(actualDestWorkflowPath)) {
+          continue;
+        }
+
+        // Get workflow directory (workflow.yaml is in a directory with other files)
+        const sourceWorkflowDir = path.dirname(actualSourceWorkflowPath);
+        const destWorkflowDir = path.dirname(actualDestWorkflowPath);
+
+        // Copy entire workflow directory
+        await fs.copy(sourceWorkflowDir, destWorkflowDir, { overwrite: false });
+
+        // Update config_source in the vendored workflow.yaml
+        const workflowYamlPath = actualDestWorkflowPath;
+        if (await fs.pathExists(workflowYamlPath)) {
+          await this.updateWorkflowConfigSource(workflowYamlPath, installModule);
+        }
+
+        console.log(chalk.dim(`    → Vendored workflow: ${sourceWorkflowRelPath} → ${installModule}/workflows/${installWorkflowRelPath}`));
+      }
+    }
+  }
+
+  /**
+   * Update config_source in a vendored workflow YAML file
+   */
+  async updateWorkflowConfigSource(workflowYamlPath, newModuleName) {
+    let yamlContent = await fs.readFile(workflowYamlPath, 'utf8');
+
+    // Replace config_source with new module reference
+    // Support both old format (bmad) and new format ({bmad_folder})
+    const configSourcePattern = /config_source:\s*["']?\{project-root\}\/(?:\{bmad_folder\}|bmad)\/[^/]+\/config\.yaml["']?/g;
+    const newConfigSource = `config_source: "{project-root}/{bmad_folder}/${newModuleName}/config.yaml"`;
+
+    const updatedYaml = yamlContent.replaceAll(configSourcePattern, newConfigSource);
+    await fs.writeFile(workflowYamlPath, updatedYaml, 'utf8');
+  }
+
   /**
    * Pre-discover all agents and teams in a module for manifest generation
    */
@@ -452,6 +611,14 @@ class WebBundler {
           let content;
 
           if (file.endsWith('.agent.yaml')) {
+            // Check for webskip flag in YAML
+            const yamlContent = await fs.readFile(agentPath, 'utf8');
+            const agentYaml = yaml.load(yamlContent);
+
+            if (agentYaml?.agent?.webskip === true) {
+              continue; // Skip this agent
+            }
+
             // Build YAML agent in-memory
             content = await this.yamlBuilder.buildFromYaml(agentPath, null, {
               includeMetadata: false,
@@ -539,6 +706,12 @@ class WebBundler {
     const refs = new Set();
     const workflowRefs = new Set();
 
+    // Remove agent id attribute to prevent it from being treated as a dependency
+    // The id attribute is just a metadata identifier, not a file reference
+    const xmlWithoutAgentId = xml.replace(/<agent[^>]*id="[^"]*"[^>]*>/, (match) => {
+      return match.replace(/\sid="[^"]*"/, '');
+    });
+
     // Match various file reference patterns
     const patterns = [
       /exec="([^"]+)"/g, // Command exec paths
@@ -549,18 +722,27 @@ class WebBundler {
       /system-prompts="([^"]+)"/g,
       /tools="([^"]+)"/g,
       /knowledge="([^"]+)"/g,
-      /{project-root}\/([^"'\s<>]+)/g,
+      /{project-root}\/([^"'\s<>]+)/g, // Legacy {project-root} paths
+      /\bbmad\/([^"'\s<>]+)/g, // Direct bmad/ paths (after {bmad_folder} replacement)
     ];
 
     for (const pattern of patterns) {
       let match;
-      while ((match = pattern.exec(xml)) !== null) {
+      // Use the XML with agent id removed for pattern matching
+      while ((match = pattern.exec(xmlWithoutAgentId)) !== null) {
         let filePath = match[1];
         // Remove {project-root} prefix if present
         filePath = filePath.replace(/^{project-root}\//, '');
+        // Remove {bmad_folder} prefix if present (should be rare, mostly replaced already)
+        filePath = filePath.replace(/^{bmad_folder}\//, 'bmad/');
+
+        // For bmad/ pattern, prepend 'bmad/' since it was captured without it
+        if (pattern.source.includes(String.raw`\bbmad\/`)) {
+          filePath = 'bmad/' + filePath;
+        }
 
         // Skip obvious placeholder/example paths
-        if (filePath && !filePath.includes('path/to/') && !filePath.includes('example')) {
+        if (filePath && !filePath.includes('path/to/') && !filePath.includes('example') && !filePath.includes('...')) {
           refs.add(filePath);
         }
       }
@@ -575,9 +757,12 @@ class WebBundler {
 
     for (const pattern of workflowPatterns) {
       let match;
+      // Use original xml for workflow patterns (they don't conflict with agent id)
       while ((match = pattern.exec(xml)) !== null) {
         let workflowPath = match[1];
         workflowPath = workflowPath.replace(/^{project-root}\//, '');
+        // Remove {bmad_folder} prefix if present and replace with bmad
+        workflowPath = workflowPath.replace(/^{bmad_folder}\//, 'bmad/');
 
         // Skip obvious placeholder/example paths
         if (workflowPath && workflowPath.endsWith('.yaml') && !workflowPath.includes('path/to/') && !workflowPath.includes('example')) {
@@ -595,16 +780,25 @@ class WebBundler {
   removeSkippedWorkflowCommands(agentXml, skippedWorkflows) {
     let modifiedXml = agentXml;
 
-    // For each skipped workflow, find and remove the corresponding <c> command
+    // For each skipped workflow, find and remove menu items and commands
     for (const workflowPath of skippedWorkflows) {
-      // Match: <c cmd="..." run-workflow="workflowPath">...</c>
       // Need to escape special regex characters in the path
       const escapedPath = workflowPath.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`);
 
-      // Pattern to match the command line with this workflow
-      const pattern = new RegExp(`\\s*<c\\s+cmd="[^"]*"\\s+run-workflow="[^"]*${escapedPath}"[^>]*>.*?</c>\\s*`, 'gs');
+      // Pattern 1: Remove <item> tags with workflow attribute
+      // Match: <item cmd="..." workflow="workflowPath">...</item>
+      const itemWorkflowPattern = new RegExp(`\\s*<item\\s+[^>]*workflow="[^"]*${escapedPath}"[^>]*>.*?</item>\\s*`, 'gs');
+      modifiedXml = modifiedXml.replace(itemWorkflowPattern, '');
+
+      // Pattern 2: Remove <item> tags with run-workflow attribute
+      // Match: <item cmd="..." run-workflow="workflowPath">...</item>
+      const itemRunWorkflowPattern = new RegExp(`\\s*<item\\s+[^>]*run-workflow="[^"]*${escapedPath}"[^>]*>.*?</item>\\s*`, 'gs');
+      modifiedXml = modifiedXml.replace(itemRunWorkflowPattern, '');
 
-      modifiedXml = modifiedXml.replace(pattern, '');
+      // Pattern 3: Remove <c> tags with run-workflow attribute (legacy)
+      // Match: <c cmd="..." run-workflow="workflowPath">...</c>
+      const cPattern = new RegExp(`\\s*<c\\s+[^>]*run-workflow="[^"]*${escapedPath}"[^>]*>.*?</c>\\s*`, 'gs');
+      modifiedXml = modifiedXml.replace(cPattern, '');
     }
 
     return modifiedXml;
@@ -614,6 +808,11 @@ class WebBundler {
    * Process a file dependency recursively
    */
   async processFileDependency(filePath, dependencies, processed, moduleName, warnings = []) {
+    // Skip workflow YAML files - they're handled by processWorkflowDependency
+    if (filePath.includes('/workflow') && filePath.endsWith('workflow.yaml')) {
+      return;
+    }
+
     // Skip if already processed
     if (processed.has(filePath)) {
       return;
@@ -639,6 +838,13 @@ class WebBundler {
       return;
     }
 
+    // Skip if it's a directory
+    const stats = await fs.stat(actualPath);
+    if (stats.isDirectory()) {
+      // Silently skip directories - they're not file dependencies
+      return;
+    }
+
     // Read file content
     let content = await fs.readFile(actualPath, 'utf8');
 
@@ -655,7 +861,8 @@ class WebBundler {
         const deps = depMatch[1].match(/['"]([^'"]+)['"]/g);
         if (deps) {
           for (const dep of deps) {
-            const depPath = dep.replaceAll(/['"]/g, '').replace(/^{project-root}\//, '');
+            let depPath = dep.replaceAll(/['"]/g, '').replace(/^{project-root}\//, '');
+            depPath = depPath.replace(/^{bmad_folder}\//, 'bmad/');
             if (depPath && !processed.has(depPath)) {
               await this.processFileDependency(depPath, dependencies, processed, moduleName, warnings);
             }
@@ -668,7 +875,8 @@ class WebBundler {
         const templates = templateMatch[1].match(/['"]([^'"]+)['"]/g);
         if (templates) {
           for (const template of templates) {
-            const templatePath = template.replaceAll(/['"]/g, '').replace(/^{project-root}\//, '');
+            let templatePath = template.replaceAll(/['"]/g, '').replace(/^{project-root}\//, '');
+            templatePath = templatePath.replace(/^{bmad_folder}\//, 'bmad/');
             if (templatePath && !processed.has(templatePath)) {
               await this.processFileDependency(templatePath, dependencies, processed, moduleName, warnings);
             }
@@ -856,8 +1064,13 @@ class WebBundler {
       bundleYamlContent = yamlContent;
     }
 
+    // Process {project-root} and {bmad_folder} references in the YAML content
+    bundleYamlContent = this.processProjectRootReferences(bundleYamlContent);
+
     // Include the YAML file with only web_bundle content, wrapped in XML
-    const yamlId = workflowPath.replace(/^{project-root}\//, '');
+    // Process the workflow path to create a clean ID
+    let yamlId = workflowPath.replace(/^{project-root}\//, '');
+    yamlId = yamlId.replace(/^{bmad_folder}\//, 'bmad/');
     const wrappedYaml = this.wrapContentInXml(bundleYamlContent, yamlId, 'yaml');
     dependencies.set(yamlId, wrappedYaml);
 
@@ -874,14 +1087,19 @@ class WebBundler {
       const bundleFiles = workflowConfig.web_bundle.web_bundle_files;
 
       for (const bundleFilePath of bundleFiles) {
-        if (processed.has(bundleFilePath)) {
+        // Process the file path to create a clean ID for checking if already processed
+        let cleanFilePath = bundleFilePath.replace(/^{project-root}\//, '');
+        cleanFilePath = cleanFilePath.replace(/^{bmad_folder}\//, 'bmad/');
+
+        if (processed.has(cleanFilePath)) {
           continue;
         }
 
         const bundleActualPath = this.resolveFilePath(bundleFilePath, moduleName);
 
         if (!bundleActualPath || !(await fs.pathExists(bundleActualPath))) {
-          warnings.push(bundleFilePath);
+          // Use the cleaned path in warnings (with {bmad_folder} replaced)
+          warnings.push(cleanFilePath);
           continue;
         }
 
@@ -891,15 +1109,18 @@ class WebBundler {
           await this.processWorkflowDependency(bundleFilePath, dependencies, processed, moduleName, warnings);
         } else {
           // Regular file - process normally
-          processed.add(bundleFilePath);
+          processed.add(cleanFilePath);
 
           // Read the file content
-          const fileContent = await fs.readFile(bundleActualPath, 'utf8');
+          let fileContent = await fs.readFile(bundleActualPath, 'utf8');
           const fileExt = path.extname(bundleActualPath).toLowerCase().replace('.', '');
 
+          // Process {project-root} references before wrapping
+          fileContent = this.processProjectRootReferences(fileContent);
+
           // Wrap in XML with proper escaping
-          const wrappedContent = this.wrapContentInXml(fileContent, bundleFilePath, fileExt);
-          dependencies.set(bundleFilePath, wrappedContent);
+          const wrappedContent = this.wrapContentInXml(fileContent, cleanFilePath, fileExt);
+          dependencies.set(cleanFilePath, wrappedContent);
         }
       }
     }
@@ -925,7 +1146,9 @@ class WebBundler {
       return;
     }
 
-    const fileContent = await fs.readFile(actualPath, 'utf8');
+    let fileContent = await fs.readFile(actualPath, 'utf8');
+    // Process {project-root} and {bmad_folder} references
+    fileContent = this.processProjectRootReferences(fileContent);
     const wrappedContent = this.wrapContentInXml(fileContent, coreWorkflowPath, 'xml');
     dependencies.set(coreWorkflowPath, wrappedContent);
   }
@@ -934,7 +1157,7 @@ class WebBundler {
    * Include advanced elicitation files
    */
   async includeAdvancedElicitationFiles(dependencies, processed, moduleName, warnings = []) {
-    const elicitationFiles = ['bmad/core/tasks/adv-elicit.xml', 'bmad/core/tasks/adv-elicit-methods.csv'];
+    const elicitationFiles = ['bmad/core/tasks/advanced-elicitation.xml', 'bmad/core/tasks/advanced-elicitation-methods.csv'];
 
     for (const filePath of elicitationFiles) {
       if (processed.has(filePath)) {
@@ -949,7 +1172,9 @@ class WebBundler {
         continue;
       }
 
-      const fileContent = await fs.readFile(actualPath, 'utf8');
+      let fileContent = await fs.readFile(actualPath, 'utf8');
+      // Process {project-root} and {bmad_folder} references
+      fileContent = this.processProjectRootReferences(fileContent);
       const fileExt = path.extname(actualPath).toLowerCase().replace('.', '');
       const wrappedContent = this.wrapContentInXml(fileContent, filePath, fileExt);
       dependencies.set(filePath, wrappedContent);
@@ -982,6 +1207,8 @@ class WebBundler {
   async processWildcardDependency(pattern, dependencies, processed, moduleName, warnings = []) {
     // Remove {project-root} prefix
     pattern = pattern.replace(/^{project-root}\//, '');
+    // Replace {bmad_folder} with bmad
+    pattern = pattern.replace(/^{bmad_folder}\//, 'bmad/');
 
     // Get directory and file pattern
     const lastSlash = pattern.lastIndexOf('/');
@@ -1049,6 +1276,9 @@ class WebBundler {
   resolveFilePath(filePath, moduleName) {
     // Remove {project-root} prefix
     filePath = filePath.replace(/^{project-root}\//, '');
+    // Replace {bmad_folder} with bmad
+    filePath = filePath.replace(/^{bmad_folder}\//, 'bmad/');
+    filePath = filePath.replace(/^{bmad_folder}$/, 'bmad');
 
     // Check temp directory first for _cfg files
     if (filePath.startsWith('bmad/_cfg/')) {
@@ -1115,13 +1345,15 @@ class WebBundler {
   }
 
   /**
-   * Process and remove {project-root} references
+   * Process and remove {project-root} references and replace {bmad_folder} with bmad
    */
   processProjectRootReferences(content) {
     // Remove {project-root}/ prefix (with slash)
     content = content.replaceAll('{project-root}/', '');
     // Also remove {project-root} without slash
     content = content.replaceAll('{project-root}', '');
+    // Replace {bmad_folder} with bmad
+    content = content.replaceAll('{bmad_folder}', 'bmad');
     return content;
   }
 
@@ -1425,6 +1657,63 @@ class WebBundler {
     }
   }
 
+  /**
+   * Format XML content for readability
+   */
+  formatXml(xml) {
+    const TAB = '  '; // 2 spaces
+    let result = '';
+    let depth = 0;
+
+    // Split by tags while preserving them
+    const parts = xml.split(/(<[^>]+>)/g);
+
+    for (let i = 0; i < parts.length; i++) {
+      const part = parts[i];
+      if (!part) continue;
+
+      if (part.startsWith('<?xml')) {
+        // XML declaration - no indent
+        result += part + '\n';
+      } else if (part.startsWith('<!--')) {
+        // Comment
+        result += TAB.repeat(depth) + part + '\n';
+      } else if (part.startsWith('</')) {
+        // Closing tag - unindent first
+        depth = Math.max(0, depth - 1);
+        result += TAB.repeat(depth) + part + '\n';
+      } else if (part.startsWith('<')) {
+        // Opening or self-closing tag
+        const isSelfClosing = part.endsWith('/>');
+        const tagName = part.match(/<(\w+)/)?.[1];
+
+        // Check if next part is simple text content
+        const nextPart = parts[i + 1];
+        const hasSimpleContent = nextPart && !nextPart.startsWith('<') && nextPart.trim().length > 0 && nextPart.trim().length <= 100;
+
+        if (hasSimpleContent && parts[i + 2] && parts[i + 2] === `</${tagName}>`) {
+          // Simple tag with inline content: <tag>content</tag>
+          result += TAB.repeat(depth) + part + nextPart.trim() + parts[i + 2] + '\n';
+          i += 2; // Skip content and closing tag
+        } else {
+          // Multi-line tag
+          result += TAB.repeat(depth) + part + '\n';
+          if (!isSelfClosing) {
+            depth++;
+          }
+        }
+      } else {
+        // Text content between tags
+        const trimmed = part.trim();
+        if (trimmed) {
+          result += TAB.repeat(depth) + trimmed + '\n';
+        }
+      }
+    }
+
+    return result;
+  }
+
   /**
    * Display summary statistics
    */
@@ -1436,7 +1725,9 @@ class WebBundler {
     console.log(chalk.bold('Bundle Statistics:'));
     console.log(`  Total agents found:    ${this.stats.totalAgents}`);
     console.log(`  Successfully bundled:  ${chalk.green(this.stats.bundledAgents)}`);
-    console.log(`  Skipped (bundle=false): ${chalk.gray(this.stats.skippedAgents)}`);
+    if (this.stats.skippedAgents > 0) {
+      console.log(`  Skipped (webskip/bundle): ${chalk.gray(this.stats.skippedAgents)}`);
+    }
 
     if (this.stats.failedAgents > 0) {
       console.log(`  Failed to bundle:      ${chalk.red(this.stats.failedAgents)}`);
@@ -1447,7 +1738,10 @@ class WebBundler {
     }
 
     // Display warnings summary
-    if (this.stats.warnings.length > 0) {
+    // Check if there are actually any warnings with content
+    const hasActualWarnings = this.stats.warnings.some((w) => w && w.warnings && w.warnings.length > 0);
+
+    if (hasActualWarnings) {
       console.log(chalk.yellow('\n⚠ Missing Dependencies by Agent:'));
 
       // Group and display warnings by agent
@@ -1461,6 +1755,8 @@ class WebBundler {
           }
         }
       }
+    } else {
+      console.log(chalk.green('\n✓ No missing dependencies'));
     }
 
     // Final status