prizmkit 1.1.18 → 1.1.20

package/bundled/VERSION.json

@@ -1,5 +1,5 @@
 {
-  "frameworkVersion": "1.1.18",
-  "bundledAt": "2026-04-10T12:27:28.516Z",
-  "bundledFrom": "cc123c5"
+  "frameworkVersion": "1.1.20",
+  "bundledAt": "2026-04-11T05:49:50.851Z",
+  "bundledFrom": "13e5e58"
 }

package/bundled/dev-pipeline/run-bugfix.sh

@@ -670,7 +670,17 @@ else:
             _DEV_BRANCH_NAME=""
         else
             log_warn "Auto-merge failed — dev branch preserved: $_DEV_BRANCH_NAME"
+            log_warn "Merge manually: git checkout $_ORIGINAL_BRANCH && git rebase $_DEV_BRANCH_NAME"
+            git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null || true
+            _DEV_BRANCH_NAME=""
+        fi
+    elif [[ -n "$_DEV_BRANCH_NAME" ]]; then
+        # Session failed — return to original branch, preserve dev branch for inspection
+        if ! git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null; then
+            log_warn "Failed to checkout $_ORIGINAL_BRANCH after session failure — staying on dev branch"
         fi
+        log_warn "Session failed — dev branch preserved for inspection: $_DEV_BRANCH_NAME"
+        _DEV_BRANCH_NAME=""
     fi
 
     echo ""

package/bundled/dev-pipeline/run-feature.sh

@@ -845,7 +845,17 @@ else:
             _DEV_BRANCH_NAME=""
         else
             log_warn "Auto-merge failed — dev branch preserved: $_DEV_BRANCH_NAME"
+            log_warn "Merge manually: git checkout $_ORIGINAL_BRANCH && git rebase $_DEV_BRANCH_NAME"
+            git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null || true
+            _DEV_BRANCH_NAME=""
+        fi
+    elif [[ -n "$_DEV_BRANCH_NAME" ]]; then
+        # Session failed — return to original branch, preserve dev branch for inspection
+        if ! git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null; then
+            log_warn "Failed to checkout $_ORIGINAL_BRANCH after session failure — staying on dev branch"
         fi
+        log_warn "Session failed — dev branch preserved for inspection: $_DEV_BRANCH_NAME"
+        _DEV_BRANCH_NAME=""
     fi
 
     echo ""

package/bundled/dev-pipeline/run-refactor.sh

@@ -700,7 +700,17 @@ else:
             _DEV_BRANCH_NAME=""
         else
             log_warn "Auto-merge failed — dev branch preserved: $_DEV_BRANCH_NAME"
+            log_warn "Merge manually: git checkout $_ORIGINAL_BRANCH && git rebase $_DEV_BRANCH_NAME"
+            git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null || true
+            _DEV_BRANCH_NAME=""
+        fi
+    elif [[ -n "$_DEV_BRANCH_NAME" ]]; then
+        # Session failed — return to original branch, preserve dev branch for inspection
+        if ! git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null; then
+            log_warn "Failed to checkout $_ORIGINAL_BRANCH after session failure — staying on dev branch"
         fi
+        log_warn "Session failed — dev branch preserved for inspection: $_DEV_BRANCH_NAME"
+        _DEV_BRANCH_NAME=""
     fi
 
     echo ""

package/bundled/skills/_metadata.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.18",
+  "version": "1.1.20",
   "skills": {
     "prizm-kit": {
       "description": "Full-lifecycle dev toolkit. Covers spec-driven development, Prizm context docs, code quality, debugging, deployment, and knowledge management.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prizmkit",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "description": "Create a new PrizmKit-powered project with clean initialization — no framework dev files, just what you need.",
   "type": "module",
   "bin": {

package/src/config.js

@@ -79,6 +79,65 @@ function expandPlatforms(platform) {
   return platform === 'both' ? ['codebuddy', 'claude'] : [platform];
 }
 
+function getProjectMemoryFile(platform) {
+  if (platform === 'claude') return 'CLAUDE.md';
+  if (platform === 'codebuddy') return 'CODEBUDDY.md';
+  return null;
+}
+
+function getCounterpartPlatform(platform) {
+  return platform === 'claude' ? 'codebuddy' : platform === 'codebuddy' ? 'claude' : null;
+}
+
+async function migrateProjectMemoryOnPlatformDrop(droppedPlatform, newPlatforms, projectRoot, dryRun) {
+  const sourceFile = getProjectMemoryFile(droppedPlatform);
+  if (!sourceFile) return;
+
+  const sourcePath = path.join(projectRoot, sourceFile);
+  if (!await fs.pathExists(sourcePath)) return;
+
+  const counterpart = getCounterpartPlatform(droppedPlatform);
+  const targetPlatform = (counterpart && newPlatforms.includes(counterpart))
+    ? counterpart
+    : newPlatforms.find(p => p !== droppedPlatform);
+
+  if (!targetPlatform || targetPlatform === droppedPlatform) return;
+
+  const targetFile = getProjectMemoryFile(targetPlatform);
+  if (!targetFile || targetFile === sourceFile) return;
+
+  const targetPath = path.join(projectRoot, targetFile);
+
+  if (dryRun) {
+    console.log(chalk.gray(`      [dry-run] migrate ${sourceFile} -> ${targetFile}`));
+    return;
+  }
+
+  const sourceContent = await fs.readFile(sourcePath, 'utf-8');
+  if (!sourceContent.trim()) return;
+
+  if (!await fs.pathExists(targetPath)) {
+    const normalized = sourceContent.endsWith('\n') ? sourceContent : `${sourceContent}\n`;
+    await fs.writeFile(targetPath, normalized, 'utf-8');
+    console.log(chalk.green(`      ✓ migrated ${sourceFile} -> ${targetFile}`));
+    return;
+  }
+
+  const targetContent = await fs.readFile(targetPath, 'utf-8');
+  const normalizedSource = sourceContent.replace(/\r\n/g, '\n').trim();
+  const normalizedTarget = targetContent.replace(/\r\n/g, '\n').trim();
+
+  if (!normalizedSource || normalizedTarget.includes(normalizedSource)) {
+    console.log(chalk.gray(`      • ${targetFile} already contains ${sourceFile} content, skip merge`));
+    return;
+  }
+
+  const separator = targetContent.endsWith('\n') ? '\n' : '\n\n';
+  const merged = `${targetContent}${separator}<!-- MIGRATED FROM ${sourceFile} via prizmkit config -->\n\n${sourceContent.trimEnd()}\n`;
+  await fs.writeFile(targetPath, merged, 'utf-8');
+  console.log(chalk.green(`      ✓ merged ${sourceFile} content into ${targetFile}`));
+}
+
 const platformLabel = (p) => p === 'both' ? 'CodeBuddy + Claude Code'
   : p === 'codebuddy' ? 'CodeBuddy' : 'Claude Code';
 
@@ -364,13 +423,18 @@ export async function runConfig(directory, options = {}) {
   const newRuleFiles = (rulesPresetDef?.rules || []).map(name => `${name}.md`);
   const newPipelineFiles = newConfig.pipeline ? resolvePipelineFileList() : [];
 
-  // 5a. Remove files for platforms being dropped
+  // 5a. Migrate project memory before removing dropped platforms
+  for (const p of platformsToRemove) {
+    await migrateProjectMemoryOnPlatformDrop(p, newPlatforms, projectRoot, false);
+  }
+
+  // 5b. Remove files for platforms being dropped
   for (const p of platformsToRemove) {
     console.log(chalk.bold(`  移除 ${platformLabel(p)} 平台文件...`));
     await removePlatformFiles(p, projectRoot, oldManifest, false);
   }
 
-  // 5b. Handle skill/rule diff for existing platforms (suite or rules changed)
+  // 5c. Handle skill/rule diff for existing platforms (suite or rules changed)
   if (newConfig.suite !== currentConfig.suite || newConfig.rules !== currentConfig.rules) {
     const newTempManifest = buildManifest({
       version: pkg.version, platform: newConfig.platform, suite: newConfig.suite,
@@ -393,7 +457,7 @@ export async function runConfig(directory, options = {}) {
     }
   }
 
-  // 5c. Install/update files for new + existing platforms
+  // 5d. Install/update files for new + existing platforms
   const allTargetPlatforms = [...platformsToAdd, ...platformsToUpdate];
   const needsReinstall = newConfig.platform !== currentConfig.platform
     || newConfig.suite !== currentConfig.suite
@@ -427,7 +491,7 @@ export async function runConfig(directory, options = {}) {
     }
   }
 
-  // 5d. Pipeline changes
+  // 5e. Pipeline changes
   if (newConfig.pipeline !== currentConfig.pipeline) {
     if (newConfig.pipeline) {
       console.log(chalk.blue('\n    安装 Pipeline:'));
@@ -441,11 +505,11 @@ export async function runConfig(directory, options = {}) {
     }
   }
 
-  // 5e. Update .gitignore
+  // 5f. Update .gitignore
   console.log(chalk.blue('\n    Gitignore:'));
   await installGitignore(projectRoot, { pipeline: newConfig.pipeline }, false);
 
-  // 5f. Update .prizmkit/config.json (ai_cli)
+  // 5g. Update .prizmkit/config.json (ai_cli)
   if (newConfig.aiCli !== currentConfig.aiCli) {
     const prizmkitDir = path.join(projectRoot, '.prizmkit');
     await fs.ensureDir(prizmkitDir);
@@ -462,7 +526,7 @@ export async function runConfig(directory, options = {}) {
     console.log(chalk.green(`\n      ✓ .prizmkit/config.json (ai_cli: ${newConfig.aiCli || '(cleared)'})`));
   }
 
-  // 5g. Write new manifest
+  // 5h. Write new manifest
   const newManifest = buildManifest({
     version: pkg.version,
     platform: newConfig.platform,