prompt-plus 1.1.1 → 1.1.2

package/README.md

@@ -14,7 +14,7 @@ npm install -g prompt-plus
 
 ```bash
 # 1. 添加技能包仓库
-pp repo add official https://github.com/your-repo/skills.git
+pp repo add official https://github.com/LeeSeaside/prompt-plus-templates.git
 
 # 2. 同步仓库
 pp repo sync
@@ -69,7 +69,7 @@ pp ws init                        # 简写
 如果你想创建自己的技能包仓库，请按以下格式组织：
 
 ```
-your-repo/
+prompt-plus-templates/
 └── skills/
     ├── backend_api/
     │   ├── manifest.md      # 执行流程和规范（必需）

package/dist/cli.js

@@ -91,9 +91,10 @@ program
     .action(commands_1.installedSkills))
     .addCommand(new commander_1.Command('upgrade')
     .alias('up')
-    .description('升级技能包（保留 context.md、input/、output/）')
+    .description('升级技能包（智能合并 context.md）')
     .argument('[skillName]', '技能包名称（不指定则交互式选择）')
     .option('-o, --output <path>', '工作区路径', '.ai-workspace')
+    .option('-m, --mode <mode>', 'context.md 处理策略: merge(智能合并) | keep(保留本地) | overwrite(使用仓库)')
     .action(commands_1.upgradeSkill));
 // 工作区管理
 program

package/dist/commands.d.ts

@@ -19,4 +19,5 @@ export declare function installedSkills(options?: {
 }): Promise<void>;
 export declare function upgradeSkill(skillName?: string, options?: {
     output?: string;
+    mode?: string;
 }): Promise<void>;

package/dist/commands.js

@@ -117,7 +117,7 @@ async function listRepos() {
     console.log(chalk.cyan('\n📦 技能包仓库列表:\n'));
     if (config.repos.length === 0) {
         console.log(chalk.gray('  暂无仓库，请先添加:'));
-        console.log(chalk.gray('  pp repo add official https://github.com/your-repo/skills.git\n'));
+        console.log(chalk.gray('  pp repo add official https://github.com/LeeSeaside/prompt-plus-templates.git\n'));
         return;
     }
     for (const repo of config.repos) {
@@ -444,7 +444,31 @@ function restoreDirFromMemory(dir, files) {
         fs.writeFileSync(fullPath, content);
     }
 }
-// 升级技能包（保留 context.md、input/、output/）
+// 智能合并 context.md：保留用户填充的值，更新模板结构
+function mergeContextMd(localContent, repoContent) {
+    // 提取本地已填充的值（非注释、非占位符的内容）
+    const userValues = new Map();
+    // 匹配 "- **Key**: Value" 或 "- Key: Value" 格式
+    const valuePattern = /^[-*]\s*\*?\*?([^:*]+)\*?\*?:\s*(.+)$/gm;
+    let match;
+    while ((match = valuePattern.exec(localContent)) !== null) {
+        const key = match[1].trim();
+        const value = match[2].trim();
+        // 跳过占位符和注释
+        if (value && !value.startsWith('<!--') && !value.includes('待填充') && !value.includes('⚠️')) {
+            userValues.set(key.toLowerCase(), value);
+        }
+    }
+    // 在新模板中填充用户值
+    let merged = repoContent;
+    for (const [key, value] of userValues) {
+        // 替换占位符
+        const placeholderPattern = new RegExp(`([-*]\\s*\\*?\\*?${key}\\*?\\*?:\\s*)<!--[^>]*-->`, 'gi');
+        merged = merged.replace(placeholderPattern, `$1${value}`);
+    }
+    return merged;
+}
+// 升级技能包
 async function upgradeSkill(skillName, options) {
     const chalk = await getChalk();
     const inquirer = await getInquirer();
@@ -464,7 +488,6 @@ async function upgradeSkill(skillName, options) {
     const repoSkills = await getAllSkillsWithRepo();
     let skillsToUpgrade = [];
     if (skillName) {
-        // 指定技能名
         if (!localSkills.find((s) => s.name === skillName)) {
             console.log(chalk.red(`\n❌ 未安装技能包: ${skillName}\n`));
             return;
@@ -472,7 +495,6 @@ async function upgradeSkill(skillName, options) {
         skillsToUpgrade = [skillName];
     }
     else {
-        // 交互式选择
         const choices = localSkills.map((s) => ({
             name: s.name,
             value: s.name,
@@ -492,6 +514,24 @@ async function upgradeSkill(skillName, options) {
         console.log(chalk.yellow('\n⚠️  未选择任何技能包\n'));
         return;
     }
+    // 选择 context.md 处理策略
+    let contextMode = options?.mode;
+    if (!contextMode) {
+        const modeAnswer = await inquirer.prompt([
+            {
+                type: 'list',
+                name: 'mode',
+                message: 'context.md 处理策略:',
+                choices: [
+                    { name: '智能合并 - 保留用户数据，更新模板结构（推荐）', value: 'merge' },
+                    { name: '保留本地 - 完全保留本地 context.md', value: 'keep' },
+                    { name: '使用仓库 - 使用仓库最新版本（会丢失已填充数据）', value: 'overwrite' },
+                ],
+                default: 'merge',
+            },
+        ]);
+        contextMode = modeAnswer.mode;
+    }
     console.log(chalk.cyan('\n🔄 开始升级技能包...\n'));
     for (const name of skillsToUpgrade) {
         const repoSkill = repoSkills.find((s) => s.name === name);
@@ -500,28 +540,52 @@ async function upgradeSkill(skillName, options) {
             continue;
         }
         const localDir = path.join(localSkillsDir, name);
-        // 备份需要保留的文件
         const contextPath = path.join(localDir, 'context.md');
         const inputDir = path.join(localDir, 'input');
         const outputDir = path.join(localDir, 'output');
-        const contextBackup = fs.existsSync(contextPath) ? fs.readFileSync(contextPath, 'utf-8') : null;
+        // 备份
+        const localContext = fs.existsSync(contextPath) ? fs.readFileSync(contextPath, 'utf-8') : null;
         const inputBackup = fs.existsSync(inputDir) ? copyDirToMemory(inputDir) : null;
         const outputBackup = fs.existsSync(outputDir) ? copyDirToMemory(outputDir) : null;
         // 删除旧技能包
         fs.rmSync(localDir, { recursive: true, force: true });
         // 复制新技能包
         (0, skills_1.copySkill)(repoSkill.path, localDir);
-        // 恢复备份
-        if (contextBackup) {
-            fs.writeFileSync(contextPath, contextBackup, 'utf-8');
+        // 处理 context.md
+        const repoContextPath = path.join(repoSkill.path, 'context.md');
+        const repoContext = fs.existsSync(repoContextPath) ? fs.readFileSync(repoContextPath, 'utf-8') : null;
+        if (localContext && repoContext) {
+            let finalContext;
+            switch (contextMode) {
+                case 'keep':
+                    finalContext = localContext;
+                    break;
+                case 'overwrite':
+                    finalContext = repoContext;
+                    break;
+                case 'merge':
+                default:
+                    finalContext = mergeContextMd(localContext, repoContext);
+                    break;
+            }
+            fs.writeFileSync(contextPath, finalContext, 'utf-8');
+        }
+        else if (localContext) {
+            fs.writeFileSync(contextPath, localContext, 'utf-8');
         }
+        // 恢复 input 和 output
         if (inputBackup) {
             restoreDirFromMemory(inputDir, inputBackup);
         }
         if (outputBackup) {
             restoreDirFromMemory(outputDir, outputBackup);
         }
-        console.log(chalk.green(`  ✅ ${name}: 已升级（保留 context.md、input/、output/）`));
+        const modeLabel = contextMode === 'merge' ? '智能合并' : contextMode === 'keep' ? '保留本地' : '使用仓库';
+        console.log(chalk.green(`  ✅ ${name}: 已升级（context.md: ${modeLabel}）`));
     }
     console.log(chalk.gray('\n升级完成！\n'));
+    if (contextMode === 'merge') {
+        console.log(chalk.cyan('💡 提示: 智能合并已尝试保留您的配置数据。'));
+        console.log(chalk.gray('   如果仓库新增了配置项，请检查 context.md 并补充填写。\n'));
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prompt-plus",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "AI技能包管理工具 - 基于技能包驱动的 AI 开发工作流",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",