prizmkit 1.1.90 → 1.1.92

package/bundled/VERSION.json

@@ -1,5 +1,5 @@
 {
-  "frameworkVersion": "1.1.90",
-  "bundledAt": "2026-07-01T16:16:33.956Z",
-  "bundledFrom": "917deef"
+  "frameworkVersion": "1.1.92",
+  "bundledAt": "2026-07-02T15:14:07.667Z",
+  "bundledFrom": "edf0ddb"
 }

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

@@ -211,18 +211,21 @@ branch_save_wip() {
         return 0
     fi
 
-    # Check if there are any uncommitted changes (tracked or untracked, excluding gitignored)
+    # Check if there are any uncommitted changes (tracked or untracked,
+    # excluding gitignored and root-level hidden tool temporary worktrees)
     local has_changes
-    has_changes=$(git -C "$project_root" status --porcelain 2>/dev/null || true)
+    has_changes=$(prizm_git_status_safe "$project_root" || true)
     if [[ -z "$has_changes" ]]; then
         return 0
     fi
 
     log_warn "Saving uncommitted work-in-progress on branch: $dev_branch"
 
-    # Stage all changes (tracked + untracked, respects .gitignore)
-    if ! git -C "$project_root" add -A 2>/dev/null; then
-        log_warn "git add -A failed — uncommitted work may be lost on branch switch"
+    # Stage all changes (tracked + untracked, respects .gitignore), excluding
+    # root-level hidden tool temporary worktrees so nested agent repos are not
+    # recorded as accidental gitlinks in the user's project.
+    if ! prizm_git_add_all_safe "$project_root"; then
+        log_warn "git add failed — uncommitted work may be lost on branch switch"
         return 0
     fi
 

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

@@ -23,6 +23,128 @@ log_warn()    { echo -e "${YELLOW}[WARN]${NC}    $(date '+%Y-%m-%d %H:%M:%S') $*
 log_error()   { echo -e "${RED}[ERROR]${NC}   $(date '+%Y-%m-%d %H:%M:%S') $*"; }
 log_success() { echo -e "${GREEN}[SUCCESS]${NC} $(date '+%Y-%m-%d %H:%M:%S') $*"; }
 
+prizm_require_positive_int() {
+    local option_name="$1"
+    local option_value="$2"
+    if [[ ! "$option_value" =~ ^[1-9][0-9]*$ ]]; then
+        log_error "$option_name must be a positive integer: $option_value"
+        exit 1
+    fi
+}
+
+# Ignore temporary git worktrees created under root-level hidden AI tool dirs
+# matching .<tool>/worktree(s), without hiding normal source directories.
+PRIZM_GIT_HIDDEN_TOOL_WORKTREE_EXCLUDES=(
+    ':(top,exclude,glob).*/worktree'
+    ':(top,exclude,glob).*/worktree/**'
+    ':(top,exclude,glob).*/worktrees'
+    ':(top,exclude,glob).*/worktrees/**'
+)
+
+prizm_git_status_safe() {
+    local project_root="$1"
+    git -C "$project_root" status --porcelain -- . \
+        "${PRIZM_GIT_HIDDEN_TOOL_WORKTREE_EXCLUDES[@]}" 2>/dev/null
+}
+
+prizm_git_add_all_safe() {
+    local project_root="$1"
+    git -C "$project_root" add -A -- . \
+        "${PRIZM_GIT_HIDDEN_TOOL_WORKTREE_EXCLUDES[@]}" 2>/dev/null
+}
+
+prizm_git_relative_path() {
+    local project_root="$1"
+    local target_path="$2"
+    python3 - "$project_root" "$target_path" <<'PY' 2>/dev/null || true
+import os
+import sys
+root = os.path.abspath(sys.argv[1])
+target = os.path.abspath(sys.argv[2])
+print(os.path.relpath(target, root).replace(os.sep, "/"))
+PY
+}
+
+prizm_git_status_non_bookkeeping() {
+    local project_root="$1"
+    local state_dir="$2"
+    local list_path="$3"
+
+    local state_rel list_rel
+    state_rel="$(prizm_git_relative_path "$project_root" "$state_dir")"
+    list_rel="$(prizm_git_relative_path "$project_root" "$list_path")"
+
+    local line path
+    while IFS= read -r line; do
+        [[ -n "$line" ]] || continue
+        path="${line:3}"
+        if [[ "$path" == *" -> "* ]]; then
+            path="${path##* -> }"
+        fi
+        path="${path%\"}"
+        path="${path#\"}"
+        path="${path#./}"
+        if [[ -n "$list_rel" && "$path" == "$list_rel" ]]; then
+            continue
+        fi
+        if [[ -n "$state_rel" && ( "$path" == "$state_rel" || "$path" == "$state_rel/"* ) ]]; then
+            continue
+        fi
+        printf '%s\n' "$line"
+    done < <(prizm_git_status_safe "$project_root")
+}
+
+prizm_git_status_bookkeeping() {
+    local project_root="$1"
+    local state_dir="$2"
+    local list_path="$3"
+
+    local state_rel list_rel
+    state_rel="$(prizm_git_relative_path "$project_root" "$state_dir")"
+    list_rel="$(prizm_git_relative_path "$project_root" "$list_path")"
+
+    local line path
+    while IFS= read -r line; do
+        [[ -n "$line" ]] || continue
+        path="${line:3}"
+        if [[ "$path" == *" -> "* ]]; then
+            path="${path##* -> }"
+        fi
+        path="${path%\"}"
+        path="${path#\"}"
+        path="${path#./}"
+        if [[ -n "$list_rel" && "$path" == "$list_rel" ]]; then
+            printf '%s\n' "$line"
+            continue
+        fi
+        if [[ -n "$state_rel" && ( "$path" == "$state_rel" || "$path" == "$state_rel/"* ) ]]; then
+            printf '%s\n' "$line"
+        fi
+    done < <(prizm_git_status_safe "$project_root")
+}
+
+prizm_git_commit_paths() {
+    local project_root="$1"
+    local message="$2"
+    shift 2
+
+    local paths=()
+    local path rel_path
+    for path in "$@"; do
+        [[ -n "$path" && -e "$path" ]] || continue
+        rel_path="$(prizm_git_relative_path "$project_root" "$path")"
+        [[ -n "$rel_path" ]] || continue
+        paths+=("$rel_path")
+    done
+    [[ ${#paths[@]} -gt 0 ]] || return 0
+
+    git -C "$project_root" add -- "${paths[@]}" 2>/dev/null || true
+    if ! git -C "$project_root" diff --cached --quiet -- "${paths[@]}" 2>/dev/null; then
+        git -C "$project_root" commit --no-verify -m "$message" -- "${paths[@]}" 2>/dev/null || true
+    fi
+}
+
+
 # ============================================================
 # Path resolution (single source of truth)
 # ============================================================

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

@@ -43,7 +43,10 @@ start_heartbeat() {
         local prev_size=0
         local prev_max_size=0
         local prev_child_activity_signature=""
+        local prev_progress_signature=""
+        local prev_error_loop_signature=""
         local stale_seconds=0
+        local stale_reason="stale_session"
         while kill -0 "$cli_pid" 2>/dev/null; do
             sleep "$heartbeat_interval"
             elapsed=$((elapsed + heartbeat_interval))
@@ -77,9 +80,10 @@ start_heartbeat() {
             local child_activity_signature=""
             local child_total_bytes=0
             local child_session_count=0
+            local progress_signature=""
             if [[ -f "$progress_json" ]]; then
-                local child_activity_data
-                child_activity_data=$(python3 - "$progress_json" <<'PY' 2>/dev/null || true
+                local progress_activity_data
+                progress_activity_data=$(python3 - "$progress_json" <<'PY' 2>/dev/null || true
 import json
 import sys
 
@@ -89,14 +93,31 @@ try:
 except Exception:
     sys.exit(0)
 
-signature = str(progress.get("child_activity_signature") or "")
+child_signature = str(progress.get("child_activity_signature") or "")
 total_bytes = int(progress.get("child_total_bytes") or 0)
 session_count = len(progress.get("child_session_files") or [])
-print(f"{signature}\t{total_bytes}\t{session_count}")
+progress_signature = json.dumps(
+    [
+        progress.get("current_phase") or "",
+        progress.get("current_tool") or "",
+        int(progress.get("message_count") or 0),
+        int(progress.get("total_tool_calls") or 0),
+        int(progress.get("active_subagent_count") or 0),
+        int(progress.get("subagent_spawn_count") or 0),
+        child_signature,
+        total_bytes,
+        session_count,
+        progress.get("fatal_error_code") or "",
+        progress.get("terminal_result_text") or "",
+    ],
+    separators=(",", ":"),
+)
+sep = "\x1f"
+print(sep.join([child_signature, str(total_bytes), str(session_count), progress_signature]))
 PY
                 )
-                if [[ -n "$child_activity_data" ]]; then
-                    IFS=$'\t' read -r child_activity_signature child_total_bytes child_session_count <<< "$child_activity_data"
+                if [[ -n "$progress_activity_data" ]]; then
+                    IFS=$'\037' read -r child_activity_signature child_total_bytes child_session_count progress_signature <<< "$progress_activity_data"
                 fi
             fi
 
@@ -106,6 +127,12 @@ PY
             fi
             prev_child_activity_signature="$child_activity_signature"
 
+            local progress_advanced=0
+            if [[ -n "$progress_signature" && "$progress_signature" != "$prev_progress_signature" ]]; then
+                progress_advanced=1
+            fi
+            prev_progress_signature="$progress_signature"
+
             local effective_stale_kill_threshold="$stale_kill_threshold"
             if [[ $stale_kill_threshold -gt 0 && -f "$progress_json" ]]; then
                 local extended_threshold
@@ -172,8 +199,11 @@ PY
 
             # Check for error-loop: agent is actively producing output but results are
             # all read-offset errors or wasted calls. This is a stuck agent that appears
-            # "active" by log growth but is accomplishing nothing.
+            # "active" by log growth but is accomplishing nothing. Only a newly advancing
+            # error signature counts; stale historical errors must not turn later normal
+            # output into a stale kill.
             local error_loop_detected=false
+            local error_loop_signature=""
             if [[ $effective_stale_kill_threshold -gt 0 && $growth -gt 0 && -f "$progress_json" ]]; then
                 local error_loop_flag
                 error_loop_flag=$(python3 - "$progress_json" <<'PY' 2>/dev/null || true
@@ -187,35 +217,44 @@ errors = progress.get("errors", [])
 if isinstance(errors, list) and len(errors) >= 5:
     recent = errors[-5:]
     if all(isinstance(e, dict) and e.get("type") in ("read_offset_overflow", "wasted_call") for e in recent):
-        print("error_loop")
+        print(json.dumps(recent, sort_keys=True, separators=(",", ":")))
 PY
                 )
-                if [[ "$error_loop_flag" == "error_loop" ]]; then
-                    error_loop_detected=true
+                if [[ -n "$error_loop_flag" ]]; then
+                    error_loop_signature="$error_loop_flag"
+                    if [[ -n "$prev_error_loop_signature" && "$error_loop_signature" != "$prev_error_loop_signature" ]]; then
+                        error_loop_detected=true
+                    fi
                 fi
             fi
+            prev_error_loop_signature="$error_loop_signature"
 
             # Track progress staleness. Parent sessions can sit in a wait/polling
-            # tool while child transcripts keep growing, so child activity counts.
-            # Error loops bypass normal growth-as-progress because the log is only
-            # growing with repeated failed reads or wasted calls.
+            # tool while child transcripts or structured progress counters keep
+            # advancing, so both child activity and progress.json state changes
+            # count as progress. Error loops bypass normal growth-as-progress
+            # because the log is only growing with repeated failed reads or wasted
+            # calls.
             #
             # When the main session log has been truncated (e.g. by subagent stdout
-            # redirection severing the file descriptor), use child activity as the
-            # primary progress signal — the parent process is still running and children
-            # are still producing output, so this is not a true stall.
+            # redirection severing the file descriptor), use structured progress and
+            # child activity as the primary progress signals — the parent process is
+            # still running and children may still be producing output.
             if [[ "$error_loop_detected" == "true" ]]; then
+                stale_reason="error_loop"
                 stale_seconds=$effective_stale_kill_threshold
             elif [[ "$log_truncated" == "true" ]]; then
-                # Log truncated: rely on child growth and CLI process liveness.
-                # Don't increment staleness — the process is still working.
-                if [[ $child_growth -gt 0 ]]; then
+                stale_reason="stale_session"
+                if [[ $progress_advanced -gt 0 || $child_growth -gt 0 ]]; then
                     stale_seconds=0
+                else
+                    stale_seconds=$((stale_seconds + heartbeat_interval))
                 fi
-                # If neither log nor children grow, this is a real stall
-            elif [[ $growth -le 0 && $child_growth -eq 0 ]]; then
+            elif [[ $growth -le 0 && $child_growth -eq 0 && $progress_advanced -eq 0 ]]; then
+                stale_reason="stale_session"
                 stale_seconds=$((stale_seconds + heartbeat_interval))
             else
+                stale_reason="stale_session"
                 stale_seconds=0
             fi
 
@@ -251,7 +290,7 @@ PY
             local status_icon
             if $log_truncated; then
                 status_icon="${RED}⚠${NC}"
-            elif [[ $growth -gt 0 || $child_growth -gt 0 ]]; then
+            elif [[ $growth -gt 0 || $child_growth -gt 0 || $progress_advanced -gt 0 ]]; then
                 status_icon="${GREEN}▶${NC}"
             else
                 status_icon="${YELLOW}⏸${NC}"
@@ -299,14 +338,19 @@ PY
             # stale window to surface stuck agents promptly.
             if [[ $effective_stale_kill_threshold -gt 0 && $stale_seconds -ge $effective_stale_kill_threshold ]]; then
                 local stale_mins=$((stale_seconds / 60))
-                echo -e "  ${RED}[HEARTBEAT]${NC} ${mins}m${secs}s | log: ${size_display} | ${RED}STALE-KILL: no progress for ${stale_mins}m (threshold: ${effective_stale_kill_threshold}s)${NC}"
-                echo -e "  ${RED}[HEARTBEAT]${NC} Killing AI CLI process $cli_pid (stale session)..."
+                if [[ "$stale_reason" == "error_loop" ]]; then
+                    echo -e "  ${RED}[HEARTBEAT]${NC} ${mins}m${secs}s | log: ${size_display} | ${RED}STALE-KILL: repeated read-offset/wasted-call error loop (threshold: ${effective_stale_kill_threshold}s)${NC}"
+                    echo -e "  ${RED}[HEARTBEAT]${NC} Killing AI CLI process $cli_pid (error loop)..."
+                else
+                    echo -e "  ${RED}[HEARTBEAT]${NC} ${mins}m${secs}s | log: ${size_display} | ${RED}STALE-KILL: no progress for ${stale_mins}m (threshold: ${effective_stale_kill_threshold}s)${NC}"
+                    echo -e "  ${RED}[HEARTBEAT]${NC} Killing AI CLI process $cli_pid (stale session)..."
+                fi
                 # Write the marker before killing. Some CLIs exit quickly, and the
                 # parent runner may stop this heartbeat process immediately after
                 # wait(1) returns.
                 local _marker_dir
                 _marker_dir="$(dirname "$session_log")"
-                echo "{\"killed_at\": \"$(date -u +%Y-%m-%dT%H:%M:%SZ)\", \"reason\": \"stale_session\", \"stale_seconds\": $stale_seconds, \"threshold\": $effective_stale_kill_threshold}" > "$_marker_dir/stale-kill.json" 2>/dev/null || true
+                echo "{\"killed_at\": \"$(date -u +%Y-%m-%dT%H:%M:%SZ)\", \"reason\": \"${stale_reason}\", \"stale_seconds\": $stale_seconds, \"threshold\": $effective_stale_kill_threshold}" > "$_marker_dir/stale-kill.json" 2>/dev/null || true
                 kill -TERM "$cli_pid" 2>/dev/null || true
                 # Give process 10s to exit gracefully, then force kill
                 local stale_kill_grace_seconds="${STALE_KILL_GRACE_SECONDS:-10}"