prizmkit 1.0.90 → 1.0.92

package/bundled/VERSION.json

@@ -1,5 +1,5 @@
 {
-  "frameworkVersion": "1.0.90",
-  "bundledAt": "2026-03-22T16:11:50.053Z",
-  "bundledFrom": "0562d30"
+  "frameworkVersion": "1.0.92",
+  "bundledAt": "2026-03-22T16:41:48.152Z",
+  "bundledFrom": "c189001"
 }

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

@@ -93,6 +93,13 @@ 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

package/bundled/skills/_metadata.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.90",
+  "version": "1.0.92",
   "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.90",
+  "version": "1.0.92",
   "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);