loki-mode 11.12.1 → 11.17.1

package/autonomy/quickstart.sh

@@ -824,12 +824,31 @@ _qs_classify_invoke() {
     local to=""
     if command -v timeout >/dev/null 2>&1; then to="timeout"
     elif command -v gtimeout >/dev/null 2>&1; then to="gtimeout"; fi
+    _LOKI_PERM_ARGV=(--dangerously-skip-permissions)
+    if [ "${LOKI_PERMISSION_POLICY:-}" = "compiled" ]; then
+        # P12-26b: nothing on this path sources claude-flags.sh. Compute in a subshell so its
+        # top-level exports (caveman vars) never leak; fail closed to plan when unavailable.
+        local _qs_flags _qs_out _qs_a
+        _qs_flags="$(cd "$(dirname "${BASH_SOURCE[0]}")" 2>/dev/null && pwd)/lib/claude-flags.sh"
+        _LOKI_PERM_ARGV=(--permission-mode plan)
+        _qs_out="$(
+            # shellcheck source=/dev/null
+            . "$_qs_flags" >/dev/null 2>&1 || exit 1
+            type _loki_claude_permission_argv >/dev/null 2>&1 || exit 1
+            _loki_claude_permission_argv
+            printf '%s\n' "${_LOKI_PERM_ARGV[@]}"
+        )" || _qs_out=""
+        if [ -n "$_qs_out" ]; then
+            _LOKI_PERM_ARGV=()
+            while IFS= read -r _qs_a; do _LOKI_PERM_ARGV+=("$_qs_a"); done <<< "$_qs_out"
+        fi
+    fi
     if [ -n "$to" ]; then
         out=$(CAVEMAN_DEFAULT_MODE=off "$to" "${LOKI_QUICKSTART_CLASSIFY_TIMEOUT}" \
-                  claude --dangerously-skip-permissions -p "$prompt" 2>/dev/null) || rc=$?
+                  claude "${_LOKI_PERM_ARGV[@]}" -p "$prompt" 2>/dev/null) || rc=$?
     else
         out=$(CAVEMAN_DEFAULT_MODE=off \
-                  claude --dangerously-skip-permissions -p "$prompt" 2>/dev/null) || rc=$?
+                  claude "${_LOKI_PERM_ARGV[@]}" -p "$prompt" 2>/dev/null) || rc=$?
     fi
     [ "$rc" -ne 0 ] && return 1
     [ -z "$out" ] && return 1

package/autonomy/run.sh

@@ -6709,13 +6709,15 @@ spawn_worktree_session() {
                 # Expand the auto-flag array with the bash-3.2 empty-array guard
                 # (${arr[@]+...}) so a bare "${arr[@]}" under set -u does not
                 # abort with "unbound variable" when no flags were collected.
+                _LOKI_PERM_ARGV=(--dangerously-skip-permissions)
+                ! type _loki_claude_permission_argv >/dev/null 2>&1 || _loki_claude_permission_argv
                 if [ -n "$_loki_wt_cm" ]; then
-                    CAVEMAN_DEFAULT_MODE="$_loki_wt_cm" claude --dangerously-skip-permissions \
+                    CAVEMAN_DEFAULT_MODE="$_loki_wt_cm" claude "${_LOKI_PERM_ARGV[@]}" \
                         "${_LOKI_WT_AUTO_FLAGS[@]+"${_LOKI_WT_AUTO_FLAGS[@]}"}" \
                         -p "Loki Mode: $task_prompt. Read .loki/CONTINUITY.md for context." \
                         >> "$log_file" 2>&1 || _wt_exit=$?
                 else
-                    claude --dangerously-skip-permissions \
+                    claude "${_LOKI_PERM_ARGV[@]}" \
                         "${_LOKI_WT_AUTO_FLAGS[@]+"${_LOKI_WT_AUTO_FLAGS[@]}"}" \
                         -p "Loki Mode: $task_prompt. Read .loki/CONTINUITY.md for context." \
                         >> "$log_file" 2>&1 || _wt_exit=$?
@@ -6950,7 +6952,9 @@ Output ONLY the resolved file content with no conflict markers. No explanations.
                 # variable (the shell, not the agent, writes the resolved file).
                 # It needs no hooks, LSP, CLAUDE.md auto-discovery, or MCP, so
                 # --bare is safe and cheaper. Gated + opt-out LOKI_BARE_SUBCALLS=0.
-                local _cr_argv=("--dangerously-skip-permissions")
+                _LOKI_PERM_ARGV=(--dangerously-skip-permissions)
+                ! type _loki_claude_permission_argv >/dev/null 2>&1 || _loki_claude_permission_argv
+                local _cr_argv=("${_LOKI_PERM_ARGV[@]}")
                 if type loki_subcall_bare_enabled >/dev/null 2>&1 && loki_subcall_bare_enabled; then
                     _cr_argv+=("--bare")
                 fi
@@ -16282,7 +16286,9 @@ _dispatch_reviewer() {
             #     Guardrail, not a sandbox -- echo>/sed -i/etc. remain; the
             #     real net is commit-before-agent-wave. Opt out
             #     LOKI_REVIEW_TOOL_GUARD=0. See loki_review_guard_denylist.
-            local _rv_argv=("--dangerously-skip-permissions")
+            _LOKI_PERM_ARGV=(--dangerously-skip-permissions)
+            ! type _loki_claude_permission_argv >/dev/null 2>&1 || _loki_claude_permission_argv
+            local _rv_argv=("${_LOKI_PERM_ARGV[@]}")
             # OPT-IN advisor pin (v7.104.0, LOKI_ADVISOR_MODEL): reviewers still
             # pass NO --model by default (unchanged behavior: they run on the
             # account default). When the operator/user sets LOKI_ADVISOR_MODEL to
@@ -21352,7 +21358,9 @@ ${_commits}"
     # needed, so --bare is safe and cheaper. Opt out LOKI_BARE_SUBCALLS=0.
     # Always at least --dangerously-skip-permissions, so the array is never
     # empty (empty "${arr[@]}" under set -u errors on bash 3.2, stock macOS).
-    local _ic_argv=("--dangerously-skip-permissions")
+    _LOKI_PERM_ARGV=(--dangerously-skip-permissions)
+    ! type _loki_claude_permission_argv >/dev/null 2>&1 || _loki_claude_permission_argv
+    local _ic_argv=("${_LOKI_PERM_ARGV[@]}")
     if type loki_subcall_bare_enabled >/dev/null 2>&1 && loki_subcall_bare_enabled; then
         _ic_argv+=("--bare")
     fi
@@ -25529,7 +25537,9 @@ except Exception as exc:
         # present so the array is never empty (empty "${arr[@]}" under `set -u`
         # is an error on bash 3.2, the stock macOS shell). The autonomy override
         # is appended conditionally.
-        local _loki_claude_argv=("--dangerously-skip-permissions" "--model" "$tier_param")
+        _LOKI_PERM_ARGV=(--dangerously-skip-permissions)
+        ! type _loki_claude_permission_argv >/dev/null 2>&1 || _loki_claude_permission_argv
+        local _loki_claude_argv=("${_LOKI_PERM_ARGV[@]}" "--model" "$tier_param")
         if [ "${LOKI_AUTONOMY_OVERRIDE:-on}" != "off" ] \
            && type _loki_autonomy_override_text >/dev/null 2>&1 \
            && type loki_claude_flag_supported >/dev/null 2>&1 \
@@ -28292,6 +28302,41 @@ check_human_intervention() {
 }
 
 # Handle pause state - wait for resume
+# Writes .loki/state/interventions.json. Mirrors loki-ts/src/runner/intervention.ts
+# (count, basis, by_type enum counts, waited_s). Modes: "count" bumps count and
+# the by_type bucket inferred from the signal files; "waited <secs>" adds
+# wall-clock blocked seconds (an upper bound on human attention, not active
+# minutes). Best-effort: never fails a run.
+_loki_iv_record() {
+    local loki_dir="$1" mode="$2" secs="${3:-0}" iv_type="authorization"
+    [ -n "$loki_dir" ] || return 0
+    if [ -e "$loki_dir/HUMAN_INPUT.md" ]; then iv_type="input"
+    elif [ -e "$loki_dir/signals/GATE_ESCALATION" ] || [ -e "$loki_dir/signals/COUNCIL_REVIEW_REQUESTED" ]; then iv_type="repair"
+    elif [ -e "$loki_dir/signals/BUDGET_EXCEEDED" ]; then iv_type="steer"
+    fi
+    mkdir -p "$loki_dir/state" 2>/dev/null || true
+    python3 -I -c 'import json,sys
+p,mode,secs,t=sys.argv[1:5]
+def n(v):
+    return v if isinstance(v,int) and not isinstance(v,bool) and v>=0 else 0
+try:
+    d=json.load(open(p))
+    if not isinstance(d,dict): d={}
+except Exception:
+    d={}
+if mode=="waited" and not d:
+    sys.exit(0)
+bt=d.get("by_type") if isinstance(d.get("by_type"),dict) else {}
+out={k:n(bt.get(k)) for k in ("steer","input","authorization","repair")}
+if mode=="count":
+    out[t]+=1
+    d["count"]=n(d.get("count"))+1
+d["basis"]="blocking pauses that waited on a human"
+d["by_type"]=out
+d["waited_s"]=n(d.get("waited_s"))+(int(secs) if mode=="waited" else 0)
+open(p,"w").write(json.dumps(d)+"\n")' "$loki_dir/state/interventions.json" "$mode" "$secs" "$iv_type" 2>/dev/null || true
+}
+
 handle_pause() {
     # BUG-ST-007: Guard against concurrent pause handler execution
     if [ "${_PAUSE_IN_PROGRESS:-0}" -eq 1 ]; then
@@ -28312,21 +28357,8 @@ handle_pause() {
     #
     # proof-generator reads this; when the file is absent the receipt renders NO
     # interventions row rather than claiming zero. Best-effort: never fail a run.
-    if [ -n "${loki_dir}" ]; then
-        mkdir -p "$loki_dir/state" 2>/dev/null || true
-        local _iv_file="$loki_dir/state/interventions.json"
-        local _iv_prev=0
-        if [ -f "$_iv_file" ]; then
-            _iv_prev=$(python3 -c "import json,sys
-try:
-    v=json.load(open(sys.argv[1])).get('count')
-    print(int(v) if isinstance(v,int) and v>=0 else 0)
-except Exception:
-    print(0)" "$_iv_file" 2>/dev/null || echo 0)
-        fi
-        printf '{"count":%s,"basis":"blocking pauses that waited on a human"}\n' \
-            "$(( _iv_prev + 1 ))" > "$_iv_file" 2>/dev/null || true
-    fi
+    local _iv_t0=$SECONDS
+    _loki_iv_record "$loki_dir" count
 
     # Save state before pausing so it persists across potential crashes
     save_state ${RETRY_COUNT:-0} "paused" 0
@@ -28426,6 +28458,7 @@ except Exception:
         # Check for stop signal
         if [ -f "$loki_dir/STOP" ]; then
             rm -f "$loki_dir/STOP" "$loki_dir/PAUSED.md"
+            _loki_iv_record "$loki_dir" waited "$(( SECONDS - ${_iv_t0:-$SECONDS} ))" 2>/dev/null || true
             PAUSED=false
             _PAUSE_IN_PROGRESS=0
             return 1
@@ -28471,6 +28504,7 @@ except Exception:
     done
 
     rm -f "$loki_dir/PAUSED.md"
+    _loki_iv_record "$loki_dir" waited "$(( SECONDS - ${_iv_t0:-$SECONDS} ))" 2>/dev/null || true
     log_info "Resuming execution..."
     PAUSED=false
     _PAUSE_IN_PROGRESS=0