prizmkit 1.0.113 → 1.0.115

package/bundled/VERSION.json

@@ -1,5 +1,5 @@
 {
-  "frameworkVersion": "1.0.113",
-  "bundledAt": "2026-03-26T06:56:50.821Z",
-  "bundledFrom": "fca917f"
+  "frameworkVersion": "1.0.115",
+  "bundledAt": "2026-03-26T08:40:28.718Z",
+  "bundledFrom": "0e9b475"
 }

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

@@ -76,6 +76,7 @@ spawn_and_wait_session() {
     local bootstrap_prompt="$4"
     local session_dir="$5"
     local max_retries="$6"
+    local base_branch="${7:-main}"
 
     local session_log="$session_dir/logs/session.log"
     local progress_json="$session_dir/logs/progress.json"
@@ -169,10 +170,7 @@ spawn_and_wait_session() {
     local session_status
     local project_root
     project_root="$(cd "$SCRIPT_DIR/.." && pwd)"
-    local default_branch
-    default_branch=$(git -C "$project_root" symbolic-ref refs/remotes/origin/HEAD 2>/dev/null \
-        | sed 's@^refs/remotes/origin/@@') \
-        || default_branch=$(git -C "$project_root" rev-parse --abbrev-ref HEAD 2>/dev/null | grep -E '^(main|master)$' || echo "main")
+    local default_branch="$base_branch"
 
     if [[ $exit_code -eq 124 ]]; then
         log_warn "Session timed out after ${SESSION_TIMEOUT}s"
@@ -463,7 +461,7 @@ sys.exit(1)
 
     spawn_and_wait_session \
         "$bug_id" "$bug_list" "$session_id" \
-        "$bootstrap_prompt" "$session_dir" 999
+        "$bootstrap_prompt" "$session_dir" 999 "$_ORIGINAL_BRANCH"
     local session_status="$_SPAWN_RESULT"
 
     # Merge dev branch back to original on success
@@ -650,7 +648,7 @@ main() {
 
         spawn_and_wait_session \
             "$bug_id" "$bug_list" "$session_id" \
-            "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES"
+            "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES" "$_ORIGINAL_BRANCH"
 
         session_count=$((session_count + 1))
 

package/bundled/dev-pipeline/run.sh

@@ -91,6 +91,7 @@ spawn_and_wait_session() {
     local session_dir="$5"
     local max_retries="$6"
     local feature_model="${7:-}"
+    local base_branch="${8:-main}"
 
     local session_log="$session_dir/logs/session.log"
     local progress_json="$session_dir/logs/progress.json"
@@ -191,10 +192,7 @@ spawn_and_wait_session() {
     local session_status
     local project_root
     project_root="$(cd "$SCRIPT_DIR/.." && pwd)"
-    local default_branch
-    default_branch=$(git -C "$project_root" symbolic-ref refs/remotes/origin/HEAD 2>/dev/null \
-        | sed 's@^refs/remotes/origin/@@') \
-        || default_branch=$(git -C "$project_root" rev-parse --abbrev-ref HEAD 2>/dev/null | grep -E '^(main|master)$' || echo "main")
+    local default_branch="$base_branch"
 
     if [[ $exit_code -eq 124 ]]; then
         log_warn "Session timed out after ${SESSION_TIMEOUT}s"
@@ -739,7 +737,7 @@ sys.exit(1)
 
     spawn_and_wait_session \
         "$feature_id" "$feature_list" "$session_id" \
-        "$bootstrap_prompt" "$session_dir" 999 "$feature_model"
+        "$bootstrap_prompt" "$session_dir" 999 "$feature_model" "$_ORIGINAL_BRANCH"
     local session_status="$_SPAWN_RESULT"
 
     # Merge dev branch back to original on success
@@ -1028,7 +1026,7 @@ for f in data.get('stuck_features', []):
 
         spawn_and_wait_session \
             "$feature_id" "$feature_list" "$session_id" \
-            "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES" "$feature_model"
+            "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES" "$feature_model" "$_ORIGINAL_BRANCH"
         local session_status="$_SPAWN_RESULT"
 
         # Merge per-feature dev branch back to original on success

package/bundled/skills/_metadata.json

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

package/bundled/skills/prizm-kit/assets/project-memory-template.md

@@ -1,3 +1,4 @@
+<!-- PRIZMKIT:START — managed by PrizmKit, do not edit manually -->
 ## PrizmKit Documentation Framework
 
 This project uses PrizmKit with the Prizm documentation system for AI-optimized progressive context loading.
@@ -36,3 +37,4 @@ Not every change needs the full spec -> plan workflow. Use fast path for:
 
 Use the full workflow (/prizmkit-specify -> /prizmkit-plan -> /prizmkit-analyze -> /prizmkit-implement) for:
 - New features, multi-file coordinated changes, architectural decisions, data model or API changes
+<!-- PRIZMKIT:END -->

package/package.json

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

package/src/scaffold.js

@@ -502,10 +502,16 @@ export async function installPrizmkitScripts(projectRoot, dryRun) {
   }
 }
 
+const PRIZMKIT_MARKER_START = '<!-- PRIZMKIT:START';
+const PRIZMKIT_MARKER_END = '<!-- PRIZMKIT:END -->';
+
 /**
- * 安装项目记忆文件（CODEBUDDY.md / CLAUDE.md）
+ * Merge PrizmKit template content into a project memory file (CLAUDE.md / CODEBUDDY.md).
+ * - File missing → create with template content
+ * - File exists with markers → replace content between markers
+ * - File exists without markers → append template content
  */
-async function installProjectMemory(platform, projectRoot, dryRun) {
+export async function installProjectMemory(platform, projectRoot, dryRun) {
   const templatesDir = getTemplatesDir();
   const skillsDir = getSkillsDir();
   const templateName = 'project-memory-template.md';
@@ -520,21 +526,42 @@ async function installProjectMemory(platform, projectRoot, dryRun) {
   ];
   const templatePath = templateCandidates.find(candidate => fs.pathExistsSync(candidate));
 
-  if (await fs.pathExists(targetPath)) {
-    console.log(chalk.yellow(`      ⚠ ${targetName} 已存在，跳过`));
+  if (!templatePath || !await fs.pathExists(templatePath)) {
+    console.log(chalk.yellow(`      ⚠ 模板文件不存在: ${templateName}，跳过`));
     return;
   }
 
+  const templateContent = (await fs.readFile(templatePath, 'utf-8')).trimEnd();
+
   if (dryRun) {
     console.log(chalk.gray(`      [dry-run] ${targetName}`));
     return;
   }
 
-  if (templatePath && await fs.pathExists(templatePath)) {
-    await fs.copy(templatePath, targetPath);
-    console.log(chalk.green(`      ✓ ${targetName}`));
+  if (!await fs.pathExists(targetPath)) {
+    // File doesn't exist — create with template content
+    await fs.writeFile(targetPath, templateContent + '\n', 'utf-8');
+    console.log(chalk.green(`      ✓ ${targetName} (created)`));
+    return;
+  }
+
+  // File exists — merge via markers
+  const existing = await fs.readFile(targetPath, 'utf-8');
+  const startIdx = existing.indexOf(PRIZMKIT_MARKER_START);
+  const endIdx = existing.indexOf(PRIZMKIT_MARKER_END);
+
+  if (startIdx !== -1 && endIdx !== -1 && endIdx > startIdx) {
+    // Replace content between markers (inclusive)
+    const before = existing.substring(0, startIdx);
+    const after = existing.substring(endIdx + PRIZMKIT_MARKER_END.length);
+    const merged = before + templateContent + after;
+    await fs.writeFile(targetPath, merged, 'utf-8');
+    console.log(chalk.green(`      ✓ ${targetName} (updated PrizmKit section)`));
   } else {
-    console.log(chalk.yellow(`      ⚠ 模板文件不存在: ${templateName}，跳过`));
+    // No markers found — append template content
+    const separator = existing.endsWith('\n') ? '\n' : '\n\n';
+    await fs.writeFile(targetPath, existing + separator + templateContent + '\n', 'utf-8');
+    console.log(chalk.green(`      ✓ ${targetName} (appended PrizmKit section)`));
   }
 }
 

package/src/upgrade.js

@@ -28,6 +28,7 @@ import {
   installPrizmkitScripts,
   installGitHook,
   installGitignore,
+  installProjectMemory,
   resolvePipelineFileList,
 } from './scaffold.js';
 
@@ -371,20 +372,9 @@ export async function runUpgrade(directory, options = {}) {
   console.log(chalk.blue('    PrizmKit Scripts:'));
   await installPrizmkitScripts(projectRoot, dryRun);
 
-  // 7c. Project memory — skip unless --force
-  if (force) {
-    console.log(chalk.blue('\n    Project Memory (forced):'));
-    const memoryFile = platform === 'claude' ? 'CLAUDE.md' : 'CODEBUDDY.md';
-    console.log(chalk.yellow(`      ⚠ --force: ${memoryFile} will be overwritten if template exists`));
-    // Force overwrite by removing first, then let scaffold write fresh
-    const memoryPath = path.join(projectRoot, memoryFile);
-    if (!dryRun && await fs.pathExists(memoryPath)) {
-      await fs.remove(memoryPath);
-    }
-    // installProjectMemory is not exported, but the template logic is in scaffold
-    // For force mode, we just warn; the file was already there from initial install
-    console.log(chalk.gray(`      (project memory files are user-customizable, skipped by default)`));
-  }
+  // 7c. Project memory — smart merge via markers
+  console.log(chalk.blue('\n    Project Memory:'));
+  await installProjectMemory(platform, projectRoot, dryRun);
 
   // 8. Write new manifest
   if (!dryRun) {