prizmkit 1.1.18 → 1.1.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
1
  {
2
- "frameworkVersion": "1.1.18",
3
- "bundledAt": "2026-04-10T12:27:28.516Z",
4
- "bundledFrom": "cc123c5"
2
+ "frameworkVersion": "1.1.19",
3
+ "bundledAt": "2026-04-11T01:16:59.208Z",
4
+ "bundledFrom": "fff3866"
5
5
  }
@@ -670,7 +670,17 @@ else:
670
670
  _DEV_BRANCH_NAME=""
671
671
  else
672
672
  log_warn "Auto-merge failed — dev branch preserved: $_DEV_BRANCH_NAME"
673
+ log_warn "Merge manually: git checkout $_ORIGINAL_BRANCH && git rebase $_DEV_BRANCH_NAME"
674
+ git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null || true
675
+ _DEV_BRANCH_NAME=""
676
+ fi
677
+ elif [[ -n "$_DEV_BRANCH_NAME" ]]; then
678
+ # Session failed — return to original branch, preserve dev branch for inspection
679
+ if ! git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null; then
680
+ log_warn "Failed to checkout $_ORIGINAL_BRANCH after session failure — staying on dev branch"
673
681
  fi
682
+ log_warn "Session failed — dev branch preserved for inspection: $_DEV_BRANCH_NAME"
683
+ _DEV_BRANCH_NAME=""
674
684
  fi
675
685
 
676
686
  echo ""
@@ -845,7 +845,17 @@ else:
845
845
  _DEV_BRANCH_NAME=""
846
846
  else
847
847
  log_warn "Auto-merge failed — dev branch preserved: $_DEV_BRANCH_NAME"
848
+ log_warn "Merge manually: git checkout $_ORIGINAL_BRANCH && git rebase $_DEV_BRANCH_NAME"
849
+ git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null || true
850
+ _DEV_BRANCH_NAME=""
851
+ fi
852
+ elif [[ -n "$_DEV_BRANCH_NAME" ]]; then
853
+ # Session failed — return to original branch, preserve dev branch for inspection
854
+ if ! git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null; then
855
+ log_warn "Failed to checkout $_ORIGINAL_BRANCH after session failure — staying on dev branch"
848
856
  fi
857
+ log_warn "Session failed — dev branch preserved for inspection: $_DEV_BRANCH_NAME"
858
+ _DEV_BRANCH_NAME=""
849
859
  fi
850
860
 
851
861
  echo ""
@@ -700,7 +700,17 @@ else:
700
700
  _DEV_BRANCH_NAME=""
701
701
  else
702
702
  log_warn "Auto-merge failed — dev branch preserved: $_DEV_BRANCH_NAME"
703
+ log_warn "Merge manually: git checkout $_ORIGINAL_BRANCH && git rebase $_DEV_BRANCH_NAME"
704
+ git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null || true
705
+ _DEV_BRANCH_NAME=""
706
+ fi
707
+ elif [[ -n "$_DEV_BRANCH_NAME" ]]; then
708
+ # Session failed — return to original branch, preserve dev branch for inspection
709
+ if ! git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null; then
710
+ log_warn "Failed to checkout $_ORIGINAL_BRANCH after session failure — staying on dev branch"
703
711
  fi
712
+ log_warn "Session failed — dev branch preserved for inspection: $_DEV_BRANCH_NAME"
713
+ _DEV_BRANCH_NAME=""
704
714
  fi
705
715
 
706
716
  echo ""
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "1.1.18",
2
+ "version": "1.1.19",
3
3
  "skills": {
4
4
  "prizm-kit": {
5
5
  "description": "Full-lifecycle dev toolkit. Covers spec-driven development, Prizm context docs, code quality, debugging, deployment, and knowledge management.",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "prizmkit",
3
- "version": "1.1.18",
3
+ "version": "1.1.19",
4
4
  "description": "Create a new PrizmKit-powered project with clean initialization — no framework dev files, just what you need.",
5
5
  "type": "module",
6
6
  "bin": {