prizmkit 1.0.91 → 1.0.93

package/bundled/VERSION.json

@@ -1,5 +1,5 @@
 {
-  "frameworkVersion": "1.0.91",
-  "bundledAt": "2026-03-22T16:22:09.148Z",
-  "bundledFrom": "e2ee289"
+  "frameworkVersion": "1.0.93",
+  "bundledAt": "2026-03-22T17:12:01.644Z",
+  "bundledFrom": "62f12ab"
 }

package/bundled/dev-pipeline/lib/branch.sh

@@ -81,9 +81,10 @@ branch_return() {
 # Merges dev_branch into original_branch, then optionally pushes.
 # Steps:
 #   1. Checkout original_branch
-#   2. Merge dev_branch (fast-forward when possible)
-#   3. Push to remote if auto_push == "1"
-#   4. Delete dev_branch (local only, it's been merged)
+#   2. Rebase dev_branch onto original_branch (handles diverged main)
+#   3. Fast-forward merge original_branch to rebased dev tip
+#   4. Push to remote if auto_push == "1"
+#   5. Delete dev_branch (local only, it's been merged)
 #
 # Returns 0 on success, 1 on failure.
 branch_merge() {
@@ -100,15 +101,28 @@ branch_merge() {
         git -C "$project_root" add -A 2>/dev/null || true
         git -C "$project_root" commit --no-verify -m "chore: include pipeline state artifacts" 2>/dev/null || true
     fi
+
+    # Step 2: Rebase dev branch onto original to make it fast-forwardable.
+    # This handles the case where original_branch has diverged
+    # (e.g. commits were made on main while the pipeline was running).
+    # "git rebase A B" is equivalent to: git checkout B && git rebase A
+    log_info "Merging $dev_branch into $original_branch..."
+    if ! git -C "$project_root" rebase "$original_branch" "$dev_branch" 2>&1; then
+        log_error "Rebase of $dev_branch onto $original_branch failed — resolve manually:"
+        log_error "  git rebase --abort  # then resolve conflicts and retry"
+        git -C "$project_root" rebase --abort 2>/dev/null || true
+        git -C "$project_root" checkout "$dev_branch" 2>/dev/null || true
+        return 1
+    fi
+    # After the rebase we are on dev_branch — checkout original for the fast-forward
     if ! git -C "$project_root" checkout "$original_branch" 2>/dev/null; then
         log_error "Failed to checkout $original_branch for merge"
         return 1
     fi
 
-    # Step 2: Merge dev branch (fast-forward only — avoids interactive merge commit editor)
-    log_info "Merging $dev_branch into $original_branch..."
+    # Step 3: Fast-forward original_branch to the rebased dev tip
     if ! git -C "$project_root" merge --ff-only "$dev_branch" 2>&1; then
-        log_error "Merge failed (non-fast-forward) — resolve manually:"
+        log_error "Merge failed after rebase — this should not happen, resolve manually:"
         log_error "  git checkout $original_branch && git rebase $dev_branch"
         git -C "$project_root" checkout "$dev_branch" 2>/dev/null || true
         return 1
@@ -116,7 +130,7 @@ branch_merge() {
 
     log_success "Merged $dev_branch into $original_branch"
 
-    # Step 3: Push if AUTO_PUSH enabled
+    # Step 4: Push if AUTO_PUSH enabled
     if [[ "$auto_push" == "1" ]]; then
         log_info "Pushing $original_branch to remote..."
         if git -C "$project_root" push 2>/dev/null; then
@@ -126,7 +140,7 @@ branch_merge() {
         fi
     fi
 
-    # Step 4: Delete merged dev branch
+    # Step 5: Delete merged dev branch
     git -C "$project_root" branch -d "$dev_branch" 2>/dev/null && \
         log_info "Deleted merged branch: $dev_branch" || true
 

package/bundled/dev-pipeline/run.sh

@@ -28,7 +28,7 @@ set -euo pipefail
 #   LOG_RETENTION_DAYS    Delete logs older than N days (default: 14)
 #   LOG_MAX_TOTAL_MB      Keep total logs under N MB via oldest-first cleanup (default: 1024)
 #   PIPELINE_MODE         Override mode for all features: lite|standard|full|self-evolve (used by daemon)
-#   DEV_BRANCH            Custom dev branch name (default: auto-generated dev/pipeline-{run_id})
+#   DEV_BRANCH            Custom dev branch name (default: auto-generated dev/{feature_id}-YYYYMMDDHHmm)
 #   AUTO_PUSH             Auto-push to remote after successful feature (default: 0). Set to 1 to enable.
 # ============================================================
 
@@ -744,7 +744,7 @@ sys.exit(1)
     _source_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
     _ORIGINAL_BRANCH="$_source_branch"
 
-    local _branch_name="${DEV_BRANCH:-dev/${feature_id}-$(date +%s)}"
+    local _branch_name="${DEV_BRANCH:-dev/${feature_id}-$(date +%Y%m%d%H%M)}"
     if branch_create "$_proj_root" "$_branch_name" "$_source_branch"; then
         _DEV_BRANCH_NAME="$_branch_name"
     else
@@ -895,23 +895,13 @@ main() {
     echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
     echo ""
 
-    # Branch lifecycle: create dev branch for this pipeline run
+    # Branch lifecycle: each feature gets its own dev branch (created per-iteration below)
     local _proj_root
     _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
     local _source_branch
     _source_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
     _ORIGINAL_BRANCH="$_source_branch"
 
-    local run_id_for_branch
-    run_id_for_branch=$(jq -r '.run_id' "$STATE_DIR/pipeline.json" 2>/dev/null || echo "$$")
-    local _branch_name="${DEV_BRANCH:-dev/pipeline-${run_id_for_branch}}"
-    if branch_create "$_proj_root" "$_branch_name" "$_source_branch"; then
-        _DEV_BRANCH_NAME="$_branch_name"
-        log_info "Dev branch: $_branch_name"
-    else
-        log_warn "Failed to create dev branch; running on current branch: $_source_branch"
-    fi
-
     # Main processing loop
     local session_count=0
 
@@ -952,16 +942,6 @@ for f in data.get('stuck_features', []):
             log_success "  Total sessions: $session_count"
             log_success "════════════════════════════════════════════════════"
             rm -f "$STATE_DIR/current-session.json"
-
-            # Merge dev branch back to original
-            if [[ -n "$_DEV_BRANCH_NAME" ]]; then
-                if branch_merge "$_proj_root" "$_DEV_BRANCH_NAME" "$_ORIGINAL_BRANCH" "$AUTO_PUSH"; then
-                    _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"
-                fi
-            fi
             break
         fi
 
@@ -989,6 +969,16 @@ for f in data.get('stuck_features', []):
         fi
         echo -e "${BOLD}────────────────────────────────────────────────────${NC}"
 
+        # Create per-feature dev branch
+        local _feature_branch="${DEV_BRANCH:-dev/${feature_id}-$(date +%Y%m%d%H%M)}"
+        if branch_create "$_proj_root" "$_feature_branch" "$_ORIGINAL_BRANCH"; then
+            _DEV_BRANCH_NAME="$_feature_branch"
+            log_info "Dev branch: $_feature_branch"
+        else
+            log_warn "Failed to create dev branch; running on current branch: $_ORIGINAL_BRANCH"
+            _DEV_BRANCH_NAME=""
+        fi
+
         # Generate session ID and bootstrap prompt
         local session_id run_id
         run_id=$(jq -r '.run_id' "$STATE_DIR/pipeline.json")
@@ -1071,6 +1061,22 @@ os.replace(tmp, target)
             "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES" "$feature_model"
         local session_status="$_SPAWN_RESULT"
 
+        # Merge per-feature dev branch back to original on success
+        if [[ "$session_status" == "success" && -n "$_DEV_BRANCH_NAME" ]]; then
+            if branch_merge "$_proj_root" "$_DEV_BRANCH_NAME" "$_ORIGINAL_BRANCH" "$AUTO_PUSH"; then
+                _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"
+                _DEV_BRANCH_NAME=""
+            fi
+        elif [[ -n "$_DEV_BRANCH_NAME" ]]; then
+            # Session failed — return to original branch, preserve dev branch for inspection
+            git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null || true
+            log_warn "Session failed — dev branch preserved for inspection: $_DEV_BRANCH_NAME"
+            _DEV_BRANCH_NAME=""
+        fi
+
         session_count=$((session_count + 1))
 
         # Brief pause before next iteration

package/bundled/dev-pipeline/scripts/init-bugfix-pipeline.py

@@ -195,7 +195,7 @@ def create_state_directory(state_dir, bug_list_path, bugs):
     bugs_dir = os.path.join(abs_state_dir, "bugs")
 
     now = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
-    run_id = "bugfix-run-" + datetime.now(timezone.utc).strftime("%Y%m%d-%H%M%S")
+    run_id = "bugfix-run-" + datetime.now(timezone.utc).strftime("%Y%m%d%H%M")
 
     # Create top-level state directory
     os.makedirs(abs_state_dir, exist_ok=True)

package/bundled/dev-pipeline/scripts/init-pipeline.py

@@ -231,7 +231,7 @@ def create_state_directory(state_dir, feature_list_path, features):
     features_dir = os.path.join(abs_state_dir, "features")
 
     now = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
-    run_id = "run-" + datetime.now(timezone.utc).strftime("%Y%m%d-%H%M%S")
+    run_id = "run-" + datetime.now(timezone.utc).strftime("%Y%m%d%H%M")
 
     # Create top-level state directory
     os.makedirs(abs_state_dir, exist_ok=True)

package/bundled/skills/_metadata.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.91",
+  "version": "1.0.93",
   "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.0.91",
+  "version": "1.0.93",
   "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

@@ -680,8 +680,9 @@ export async function installPipeline(projectRoot, dryRun, { forceOverwrite = fa
 /**
  * 生成 .gitignore
  */
-async function installGitignore(projectRoot, options, dryRun) {
+export async function installGitignore(projectRoot, options, dryRun) {
   const targetPath = path.join(projectRoot, '.gitignore');
+  const MODELS_ENTRY = '.prizmkit/available-models.json';
 
   if (dryRun) {
     console.log(chalk.gray(`      [dry-run] .gitignore`));
@@ -689,12 +690,21 @@ async function installGitignore(projectRoot, options, dryRun) {
   }
 
   if (await fs.pathExists(targetPath)) {
-    // 追加 PrizmKit 相关条目
     const existing = await fs.readFile(targetPath, 'utf8');
+
+    // If .prizmkit/ (whole dir) is already ignored, available-models.json is covered
     if (existing.includes('.prizmkit/')) {
+      console.log(chalk.yellow(`      ⚠ .gitignore 已包含 .prizmkit/ 条目，跳过`));
+      return;
+    }
+
+    // If the specific entry is already present, nothing to do
+    if (existing.includes(MODELS_ENTRY)) {
       console.log(chalk.yellow(`      ⚠ .gitignore 已包含 PrizmKit 条目，跳过`));
       return;
     }
+
+    // No PrizmKit entries at all — append full .prizmkit/ block
     const prizmkitSection = '\n\n# PrizmKit\n.prizmkit/\n';
     await fs.appendFile(targetPath, prizmkitSection);
     console.log(chalk.green(`      ✓ .gitignore (追加 PrizmKit 条目)`));

package/src/upgrade.js

@@ -28,6 +28,7 @@ import {
   installPrizmkitScripts,
   installGitHook,
   installPostMergeHook,
+  installGitignore,
   resolvePipelineFileList,
 } from './scaffold.js';
 
@@ -364,6 +365,10 @@ export async function runUpgrade(directory, options = {}) {
   await installGitHook(projectRoot, dryRun);
   await installPostMergeHook(projectRoot, dryRun);
 
+  // .gitignore
+  console.log(chalk.blue('    Gitignore:'));
+  await installGitignore(projectRoot, { pipeline }, dryRun);
+
   // PrizmKit scripts
   console.log(chalk.blue('    PrizmKit Scripts:'));
   await installPrizmkitScripts(projectRoot, dryRun);