px2cc 2.2.3 → 2.2.5

package/bin.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 /**
  * Px2CC 启动器 - Windows兼容版本

package/cli.js

@@ -186,11 +186,17 @@ async function showRoleMenu(systemRoles, userRoles, availableServers) {
         },
         {
           name: `⚙️  Command - 通过 /${roleAnswer.selectedRole.role} 调用`,
-          value: 'commands', 
+          value: 'commands',
           short: 'Command'
         }
       ]
     },
+    {
+      type: 'confirm',
+      name: 'includeKnowledge',
+      message: '是否包含专业知识(Knowledge)？（知识内容可能较多，会增加文件大小）',
+      default: true
+    },
     {
       type: 'confirm',
       name: 'customName',
@@ -246,6 +252,7 @@ async function showRoleMenu(systemRoles, userRoles, availableServers) {
   return {
     selectedRole: roleAnswer.selectedRole,
     installType: typeAnswer.installType,
+    includeKnowledge: typeAnswer.includeKnowledge,
     confirm: confirmAnswer.confirm,
     customName: customName,
     selectedTools: selectedTools
@@ -268,7 +275,7 @@ function checkDirectory() {
 }
 
 // 安装角色
-async function installRole(selectedRole, installType, claudeDir, selectedTools, customName = '') {
+async function installRole(selectedRole, installType, claudeDir, selectedTools, customName = '', includeKnowledge = true) {
   const roleName = selectedRole.role;
   const results = {};
   
@@ -276,7 +283,7 @@ async function installRole(selectedRole, installType, claudeDir, selectedTools,
     // 使用新的PromptXActionProcessor执行完整的action流程
     const processor = new PromptXActionProcessor();
     const mode = installType === 'agents' ? 'subagent' : 'command';
-    const processedContent = await processor.processRole(roleName, mode);
+    const processedContent = await processor.processRole(roleName, mode, { includeKnowledge });
     
     // 根据安装模式创建相应文件
     const finalName = customName || (installType === 'agents' ? `${roleName}-agent` : roleName);
@@ -376,7 +383,7 @@ export async function main() {
     console.log(`📊 发现 ${chalk.bold(systemRoles.length)} 个系统角色，${chalk.bold(userRoles.length)} 个用户角色\n`);
     
     // 显示角色选择
-    const { selectedRole, installType, confirm, selectedTools, customName } = await showRoleMenu(systemRoles, userRoles, availableServers);
+    const { selectedRole, installType, includeKnowledge, confirm, selectedTools, customName } = await showRoleMenu(systemRoles, userRoles, availableServers);
     
     if (!confirm) {
       console.log(chalk.yellow('\n👋 安装已取消'));
@@ -387,9 +394,12 @@ export async function main() {
     const claudeDir = checkDirectory();
     
     console.log(chalk.blue(`\n🎭 开始安装角色: ${selectedRole.role} (${installType})`));
+    if (!includeKnowledge) {
+      console.log(chalk.gray('   📚 不包含专业知识(Knowledge)'));
+    }
     
     // 安装角色
-    const result = await installRole(selectedRole, installType, claudeDir, selectedTools, customName);
+    const result = await installRole(selectedRole, installType, claudeDir, selectedTools, customName, includeKnowledge);
     
     console.log(chalk.green.bold('\n✅ 角色安装完成！'));
     console.log(`\n📄 生成的文件:`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "px2cc",
-  "version": "2.2.3",
+  "version": "2.2.5",
   "description": "CLI tool that implements complete PromptX Action flow in Claude Code - role activation, dependency loading, cognition networks & memory systems",
   "main": "cli.js",
   "type": "module",

package/src/PromptXActionProcessor.js

@@ -60,38 +60,80 @@ class RoleLoader {
   }
 
   /**
-   * 解析DPML角色文档
+   * 解析DPML角色文档（支持新旧两种格式）
    * @param {string} content - 原始内容
    * @returns {Object} 解析后的sections
    */
   parseDPMLContent(content) {
     const sections = {};
     
-    // 解析 <role> 标签
+    // 尝试旧格式：<role>...</role> 包裹的 XML 格式
     const roleMatch = content.match(/<role>([\s\S]*?)<\/role>/);
     if (roleMatch) {
       const roleContent = roleMatch[1];
       
       // 提取各个部分
-      sections.personality = this.extractSection(roleContent, 'personality');
-      sections.principle = this.extractSection(roleContent, 'principle');
-      sections.knowledge = this.extractSection(roleContent, 'knowledge');
+      sections.personality = this.extractXMLSection(roleContent, 'personality');
+      sections.principle = this.extractXMLSection(roleContent, 'principle');
+      sections.knowledge = this.extractXMLSection(roleContent, 'knowledge');
+      
+      // 如果成功提取到内容，返回
+      if (sections.personality || sections.principle || sections.knowledge) {
+        return sections;
+      }
+    }
+    
+    // 尝试新格式：<role id="..."> 开头的 Markdown 格式
+    const newRoleMatch = content.match(/<role\s+id="[^"]*">/);
+    if (newRoleMatch || !roleMatch) {
+      // 新格式：直接使用整个内容作为角色定义
+      // 移除 <role id="..."> 和 </role> 标签
+      let cleanContent = content
+        .replace(/<role\s+id="[^"]*">\s*/g, '')
+        .replace(/<\/role>\s*$/g, '')
+        .trim();
+      
+      // 将整个 Markdown 内容作为角色定义
+      sections.fullContent = cleanContent;
+      
+      // 尝试从 Markdown 中提取结构化内容
+      sections.personality = this.extractMarkdownSection(cleanContent, ['核心定位', '角色定位', '人格', '身份']);
+      sections.principle = this.extractMarkdownSection(cleanContent, ['核心能力', '工作原则', '原则', '方法论']);
+      sections.knowledge = this.extractMarkdownSection(cleanContent, ['专业知识', '知识体系', '领域知识']);
     }
     
     return sections;
   }
 
   /**
-   * 提取XML标签内容
+   * 提取XML标签内容（旧格式）
    * @param {string} content - 内容
    * @param {string} tagName - 标签名
    * @returns {string|null} 提取的内容
    */
-  extractSection(content, tagName) {
+  extractXMLSection(content, tagName) {
     const regex = new RegExp(`<${tagName}>([\\s\\S]*?)<\\/${tagName}>`, 'i');
     const match = content.match(regex);
     return match ? match[1].trim() : null;
   }
+
+  /**
+   * 从 Markdown 内容中提取指定标题下的内容（新格式）
+   * @param {string} content - Markdown 内容
+   * @param {Array<string>} headingKeywords - 可能的标题关键词
+   * @returns {string|null} 提取的内容
+   */
+  extractMarkdownSection(content, headingKeywords) {
+    for (const keyword of headingKeywords) {
+      // 匹配 ## 或 ### 开头的标题
+      const regex = new RegExp(`^##\\s*${keyword}[^\\n]*\\n([\\s\\S]*?)(?=^##\\s|$)`, 'im');
+      const match = content.match(regex);
+      if (match) {
+        return match[1].trim();
+      }
+    }
+    return null;
+  }
 }
 
 /**
@@ -116,12 +158,12 @@ class DependencyAnalyzer {
       knowledges: []
     };
 
-    if (!roleInfo.sections) {
+    if (!roleInfo.sections && !roleInfo.raw) {
       return dependencies;
     }
 
-    // 收集所有资源引用
-    const allRefs = this.extractResourceReferences(roleInfo.sections);
+    // 收集所有资源引用（从 sections 和原始内容中提取）
+    const allRefs = this.extractResourceReferences(roleInfo.sections, roleInfo.raw);
     
     console.log(chalk.gray(`   发现 ${allRefs.length} 个资源引用`));
 
@@ -157,10 +199,12 @@ class DependencyAnalyzer {
   /**
    * 提取资源引用
    * @param {Object} sections - 角色sections
+   * @param {string} rawContent - 原始内容
    * @returns {Array} 引用列表
    */
-  extractResourceReferences(sections) {
+  extractResourceReferences(sections, rawContent) {
     const refs = [];
+    const seenRefs = new Set(); // 用于去重
     
     const extractFromText = (text) => {
       if (!text) return [];
@@ -172,10 +216,25 @@ class DependencyAnalyzer {
       }));
     };
 
+    const addRef = (ref) => {
+      const key = `${ref.protocol}://${ref.resource}`;
+      if (!seenRefs.has(key)) {
+        seenRefs.add(key);
+        refs.push(ref);
+      }
+    };
+
     // 从所有sections中提取引用
-    Object.values(sections).forEach(section => {
-      refs.push(...extractFromText(section));
-    });
+    if (sections) {
+      Object.values(sections).forEach(section => {
+        extractFromText(section).forEach(addRef);
+      });
+    }
+
+    // 从原始内容中提取引用（确保不遗漏）
+    if (rawContent) {
+      extractFromText(rawContent).forEach(addRef);
+    }
 
     return refs;
   }
@@ -260,9 +319,12 @@ class LayerAssembler {
    * @param {Object} dependencies - 依赖资源
    * @param {Object} cognitionData - 认知数据
    * @param {string} mode - 模式 (command|subagent)
+   * @param {Object} options - 选项
+   * @param {boolean} options.includeKnowledge - 是否包含知识内容
    * @returns {string} 组装后的内容
    */
-  assembleContent(roleInfo, dependencies, cognitionData, mode = 'command') {
+  assembleContent(roleInfo, dependencies, cognitionData, mode = 'command', options = {}) {
+    const { includeKnowledge = true } = options;
     const parts = [];
 
     // 标题部分
@@ -294,22 +356,30 @@ class LayerAssembler {
     parts.push('');
 
     // RoleLayer - 角色定义
-    if (roleInfo.sections.personality) {
-      parts.push('## 🎭 角色人格');
-      parts.push(this.cleanContent(roleInfo.sections.personality));
+    // 如果有完整的 Markdown 内容（新格式），直接使用
+    if (roleInfo.sections.fullContent) {
+      parts.push('## 🎭 角色定义');
+      parts.push(this.cleanContent(roleInfo.sections.fullContent));
       parts.push('');
-    }
+    } else {
+      // 旧格式：分别展示各个部分
+      if (roleInfo.sections.personality) {
+        parts.push('## 🎭 角色人格');
+        parts.push(this.cleanContent(roleInfo.sections.personality));
+        parts.push('');
+      }
 
-    if (roleInfo.sections.principle) {
-      parts.push('## 🔧 工作原则');
-      parts.push(this.cleanContent(roleInfo.sections.principle));
-      parts.push('');
-    }
+      if (roleInfo.sections.principle) {
+        parts.push('## 🔧 工作原则');
+        parts.push(this.cleanContent(roleInfo.sections.principle));
+        parts.push('');
+      }
 
-    if (roleInfo.sections.knowledge) {
-      parts.push('## 📚 专业知识');
-      parts.push(this.cleanContent(roleInfo.sections.knowledge));
-      parts.push('');
+      if (roleInfo.sections.knowledge) {
+        parts.push('## 📚 专业知识');
+        parts.push(this.cleanContent(roleInfo.sections.knowledge));
+        parts.push('');
+      }
     }
 
     // 依赖资源
@@ -331,6 +401,20 @@ class LayerAssembler {
       });
     }
 
+    if (includeKnowledge && dependencies.knowledges.length > 0) {
+      parts.push('## 📚 专业知识');
+      dependencies.knowledges.forEach(knowledge => {
+        parts.push(`### ${knowledge.id}`);
+        parts.push(this.cleanContent(knowledge.content));
+        parts.push('');
+      });
+    } else if (!includeKnowledge && dependencies.knowledges.length > 0) {
+      parts.push('## 📚 专业知识');
+      parts.push(`> ℹ️ 该角色包含 ${dependencies.knowledges.length} 个知识模块，已按用户选择跳过加载。`);
+      parts.push(`> 知识模块: ${dependencies.knowledges.map(k => k.id).join(', ')}`);
+      parts.push('');
+    }
+
     // StateLayer - 状态信息
     parts.push('---');
     parts.push('');
@@ -402,11 +486,18 @@ export class PromptXActionProcessor {
    * 执行完整的PromptX Action流程
    * @param {string} roleId - 角色ID
    * @param {string} mode - 模式 (command|subagent)
+   * @param {Object} options - 选项
+   * @param {boolean} options.includeKnowledge - 是否包含知识内容（默认true）
    * @returns {string} 处理后的内容
    */
-  async processRole(roleId, mode = 'command') {
+  async processRole(roleId, mode = 'command', options = {}) {
+    const { includeKnowledge = true } = options;
+    
     try {
       console.log(chalk.blue(`\n🎭 开始执行 ${roleId} 的 PromptX Action 流程 (${mode} 模式)`));
+      if (!includeKnowledge) {
+        console.log(chalk.gray(`   📚 跳过知识内容加载`));
+      }
       
       // 1. 加载角色定义
       const roleInfo = await this.roleLoader.loadRole(roleId);
@@ -418,7 +509,7 @@ export class PromptXActionProcessor {
       const cognitionData = await this.cognitionLoader.checkNetworkExists(roleId);
       
       // 4. 三层组装
-      const content = this.layerAssembler.assembleContent(roleInfo, dependencies, cognitionData, mode);
+      const content = this.layerAssembler.assembleContent(roleInfo, dependencies, cognitionData, mode, { includeKnowledge });
       
       console.log(chalk.green(`✅ PromptX Action 流程完成！`));