prizmkit 1.0.89 → 1.0.91

package/bundled/VERSION.json

@@ -1,5 +1,5 @@
 {
-  "frameworkVersion": "1.0.89",
-  "bundledAt": "2026-03-22T14:55:28.566Z",
-  "bundledFrom": "d430233"
+  "frameworkVersion": "1.0.91",
+  "bundledAt": "2026-03-22T16:22:09.148Z",
+  "bundledFrom": "e2ee289"
 }

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

@@ -93,18 +93,23 @@ branch_merge() {
     local auto_push="${4:-0}"
 
     # Step 1: Checkout original branch
+    # First commit any remaining dirty files so checkout is not blocked
+    local remaining_dirty
+    remaining_dirty=$(git -C "$project_root" status --porcelain 2>/dev/null || true)
+    if [[ -n "$remaining_dirty" ]]; then
+        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
     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
+    # Step 2: Merge dev branch (fast-forward only — avoids interactive merge commit editor)
     log_info "Merging $dev_branch into $original_branch..."
-    if ! git -C "$project_root" merge "$dev_branch" 2>&1; then
-        log_error "Merge failed — resolve conflicts manually:"
-        log_error "  git checkout $original_branch && git merge $dev_branch"
-        # Return to dev branch so state is not lost
-        git -C "$project_root" merge --abort 2>/dev/null || true
+    if ! git -C "$project_root" merge --ff-only "$dev_branch" 2>&1; then
+        log_error "Merge failed (non-fast-forward) — 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
     fi

package/bundled/dev-pipeline/retry-bug.sh

@@ -175,6 +175,9 @@ python3 "$SCRIPTS_DIR/update-bug-status.py" \
     log_warn "Failed to clean bug artifacts (continuing with fresh session only)"
 }
 
+# Auto-detect available models (must run before any git commit operations)
+bash "$SCRIPT_DIR/scripts/detect-models.sh" --quiet 2>/dev/null || true
+
 # ============================================================
 # Generate bootstrap prompt
 # ============================================================

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

@@ -533,6 +533,9 @@ main() {
         log_info "Resuming existing bugfix pipeline..."
     fi
 
+    # Auto-detect available models (must run before any git commit operations)
+    bash "$SCRIPT_DIR/scripts/detect-models.sh" --quiet 2>/dev/null || true
+
     # Print header
     echo ""
     echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
@@ -594,7 +597,7 @@ main() {
                     _DEV_BRANCH_NAME=""
                 else
                     log_warn "Auto-merge failed — dev branch preserved: $_DEV_BRANCH_NAME"
-                    log_warn "Merge manually: git checkout $_ORIGINAL_BRANCH && git merge $_DEV_BRANCH_NAME"
+                    log_warn "Merge manually: git checkout $_ORIGINAL_BRANCH && git rebase $_DEV_BRANCH_NAME"
                 fi
             fi
             break

package/bundled/dev-pipeline/run.sh

@@ -959,7 +959,7 @@ for f in data.get('stuck_features', []):
                     _DEV_BRANCH_NAME=""
                 else
                     log_warn "Auto-merge failed — dev branch preserved: $_DEV_BRANCH_NAME"
-                    log_warn "Merge manually: git checkout $_ORIGINAL_BRANCH && git merge $_DEV_BRANCH_NAME"
+                    log_warn "Merge manually: git checkout $_ORIGINAL_BRANCH && git rebase $_DEV_BRANCH_NAME"
                 fi
             fi
             break

package/bundled/dev-pipeline/scripts/detect-stuck.py

@@ -13,6 +13,7 @@ features are found, 0 otherwise.
 Usage:
     python3 detect-stuck.py --state-dir <path> [--feature-id <id>]
                             [--max-retries <n>] [--stale-threshold <seconds>]
+                            [--feature-list <path>]
 """
 
 import argparse
@@ -53,6 +54,11 @@ def parse_args():
         default=600,
         help="Heartbeat staleness threshold in seconds (default: 600)",
     )
+    parser.add_argument(
+        "--feature-list",
+        default=None,
+        help="Path to feature-list.json (overrides pipeline.json reference)",
+    )
     return parser.parse_args()
 
 
@@ -289,14 +295,26 @@ def check_dependency_deadlock(feature_id, feature_list_data, state_dir):
 
 
 def find_feature_list(state_dir):
-    """Attempt to locate and load feature-list.json via pipeline.json reference."""
+    """Attempt to locate and load feature-list.json via pipeline.json reference.
+
+    Resolves feature_list_path relative to state_dir when it is a relative path,
+    so that pipeline.json is portable across machines and directory structures.
+    """
     pipeline_path = os.path.join(state_dir, "pipeline.json")
     pipeline = load_json(pipeline_path)
     if pipeline is None:
         return None
 
     fl_path = pipeline.get("feature_list_path")
-    if fl_path and os.path.isfile(fl_path):
+    if not fl_path:
+        return None
+
+    # Resolve relative paths relative to state_dir (not process cwd)
+    if not os.path.isabs(fl_path):
+        fl_path = os.path.join(state_dir, fl_path)
+
+    fl_path = os.path.normpath(fl_path)
+    if os.path.isfile(fl_path):
         return load_json(fl_path)
 
     return None
@@ -354,7 +372,11 @@ def main():
         feature_ids = discover_feature_ids(state_dir)
 
     # Load feature list for dependency checks
-    feature_list_data = find_feature_list(state_dir)
+    # Prefer CLI-provided path; fall back to pipeline.json reference
+    if args.feature_list:
+        feature_list_data = load_json(os.path.abspath(args.feature_list))
+    else:
+        feature_list_data = find_feature_list(state_dir)
 
     stuck_features = []
     for fid in feature_ids:

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

@@ -190,6 +190,8 @@ def create_state_directory(state_dir, bug_list_path, bugs):
     """Create the state directory structure with pipeline.json and per-bug status files."""
     abs_state_dir = os.path.abspath(state_dir)
     abs_bug_list_path = os.path.abspath(bug_list_path)
+    # Store as relative path from state_dir so pipeline.json is portable across machines
+    rel_bug_list_path = os.path.relpath(abs_bug_list_path, abs_state_dir)
     bugs_dir = os.path.join(abs_state_dir, "bugs")
 
     now = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
@@ -204,7 +206,7 @@ def create_state_directory(state_dir, bug_list_path, bugs):
         "run_id": run_id,
         "pipeline_type": "bugfix",
         "status": "initialized",
-        "bug_list_path": abs_bug_list_path,
+        "bug_list_path": rel_bug_list_path,
         "created_at": now,
         "total_bugs": len(bugs),
         "completed_bugs": 0,

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

@@ -226,6 +226,8 @@ def create_state_directory(state_dir, feature_list_path, features):
     """Create the state directory structure with pipeline.json and per-feature status files."""
     abs_state_dir = os.path.abspath(state_dir)
     abs_feature_list_path = os.path.abspath(feature_list_path)
+    # Store as relative path from state_dir so pipeline.json is portable across machines
+    rel_feature_list_path = os.path.relpath(abs_feature_list_path, abs_state_dir)
     features_dir = os.path.join(abs_state_dir, "features")
 
     now = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
@@ -245,7 +247,7 @@ def create_state_directory(state_dir, feature_list_path, features):
     pipeline_state = {
         "run_id": run_id,
         "status": "initialized",
-        "feature_list_path": abs_feature_list_path,
+        "feature_list_path": rel_feature_list_path,
         "created_at": now,
         "total_features": len(features),
         "completed_features": completed_count,

package/bundled/skills/_metadata.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.89",
+  "version": "1.0.91",
   "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.89",
+  "version": "1.0.91",
   "description": "Create a new PrizmKit-powered project with clean initialization — no framework dev files, just what you need.",
   "type": "module",
   "bin": {