prizmkit 1.0.114 → 1.0.115
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.
package/bundled/VERSION.json
CHANGED
|
@@ -76,6 +76,7 @@ spawn_and_wait_session() {
|
|
|
76
76
|
local bootstrap_prompt="$4"
|
|
77
77
|
local session_dir="$5"
|
|
78
78
|
local max_retries="$6"
|
|
79
|
+
local base_branch="${7:-main}"
|
|
79
80
|
|
|
80
81
|
local session_log="$session_dir/logs/session.log"
|
|
81
82
|
local progress_json="$session_dir/logs/progress.json"
|
|
@@ -169,10 +170,7 @@ spawn_and_wait_session() {
|
|
|
169
170
|
local session_status
|
|
170
171
|
local project_root
|
|
171
172
|
project_root="$(cd "$SCRIPT_DIR/.." && pwd)"
|
|
172
|
-
local default_branch
|
|
173
|
-
default_branch=$(git -C "$project_root" symbolic-ref refs/remotes/origin/HEAD 2>/dev/null \
|
|
174
|
-
| sed 's@^refs/remotes/origin/@@') \
|
|
175
|
-
|| default_branch=$(git -C "$project_root" rev-parse --abbrev-ref HEAD 2>/dev/null | grep -E '^(main|master)$' || echo "main")
|
|
173
|
+
local default_branch="$base_branch"
|
|
176
174
|
|
|
177
175
|
if [[ $exit_code -eq 124 ]]; then
|
|
178
176
|
log_warn "Session timed out after ${SESSION_TIMEOUT}s"
|
|
@@ -463,7 +461,7 @@ sys.exit(1)
|
|
|
463
461
|
|
|
464
462
|
spawn_and_wait_session \
|
|
465
463
|
"$bug_id" "$bug_list" "$session_id" \
|
|
466
|
-
"$bootstrap_prompt" "$session_dir" 999
|
|
464
|
+
"$bootstrap_prompt" "$session_dir" 999 "$_ORIGINAL_BRANCH"
|
|
467
465
|
local session_status="$_SPAWN_RESULT"
|
|
468
466
|
|
|
469
467
|
# Merge dev branch back to original on success
|
|
@@ -650,7 +648,7 @@ main() {
|
|
|
650
648
|
|
|
651
649
|
spawn_and_wait_session \
|
|
652
650
|
"$bug_id" "$bug_list" "$session_id" \
|
|
653
|
-
"$bootstrap_prompt" "$session_dir" "$MAX_RETRIES"
|
|
651
|
+
"$bootstrap_prompt" "$session_dir" "$MAX_RETRIES" "$_ORIGINAL_BRANCH"
|
|
654
652
|
|
|
655
653
|
session_count=$((session_count + 1))
|
|
656
654
|
|
|
@@ -91,6 +91,7 @@ spawn_and_wait_session() {
|
|
|
91
91
|
local session_dir="$5"
|
|
92
92
|
local max_retries="$6"
|
|
93
93
|
local feature_model="${7:-}"
|
|
94
|
+
local base_branch="${8:-main}"
|
|
94
95
|
|
|
95
96
|
local session_log="$session_dir/logs/session.log"
|
|
96
97
|
local progress_json="$session_dir/logs/progress.json"
|
|
@@ -191,10 +192,7 @@ spawn_and_wait_session() {
|
|
|
191
192
|
local session_status
|
|
192
193
|
local project_root
|
|
193
194
|
project_root="$(cd "$SCRIPT_DIR/.." && pwd)"
|
|
194
|
-
local default_branch
|
|
195
|
-
default_branch=$(git -C "$project_root" symbolic-ref refs/remotes/origin/HEAD 2>/dev/null \
|
|
196
|
-
| sed 's@^refs/remotes/origin/@@') \
|
|
197
|
-
|| default_branch=$(git -C "$project_root" rev-parse --abbrev-ref HEAD 2>/dev/null | grep -E '^(main|master)$' || echo "main")
|
|
195
|
+
local default_branch="$base_branch"
|
|
198
196
|
|
|
199
197
|
if [[ $exit_code -eq 124 ]]; then
|
|
200
198
|
log_warn "Session timed out after ${SESSION_TIMEOUT}s"
|
|
@@ -739,7 +737,7 @@ sys.exit(1)
|
|
|
739
737
|
|
|
740
738
|
spawn_and_wait_session \
|
|
741
739
|
"$feature_id" "$feature_list" "$session_id" \
|
|
742
|
-
"$bootstrap_prompt" "$session_dir" 999 "$feature_model"
|
|
740
|
+
"$bootstrap_prompt" "$session_dir" 999 "$feature_model" "$_ORIGINAL_BRANCH"
|
|
743
741
|
local session_status="$_SPAWN_RESULT"
|
|
744
742
|
|
|
745
743
|
# Merge dev branch back to original on success
|
|
@@ -1028,7 +1026,7 @@ for f in data.get('stuck_features', []):
|
|
|
1028
1026
|
|
|
1029
1027
|
spawn_and_wait_session \
|
|
1030
1028
|
"$feature_id" "$feature_list" "$session_id" \
|
|
1031
|
-
"$bootstrap_prompt" "$session_dir" "$MAX_RETRIES" "$feature_model"
|
|
1029
|
+
"$bootstrap_prompt" "$session_dir" "$MAX_RETRIES" "$feature_model" "$_ORIGINAL_BRANCH"
|
|
1032
1030
|
local session_status="$_SPAWN_RESULT"
|
|
1033
1031
|
|
|
1034
1032
|
# Merge per-feature dev branch back to original on success
|