loki-mode 5.58.2 → 6.0.0

package/providers/claude.sh

@@ -121,12 +121,62 @@ provider_get_tier_param() {
     fi
 }
 
+# Dynamic model resolution (v6.0.0)
+# Resolves a capability tier to a concrete model name at runtime.
+# Respects LOKI_MAX_TIER to cap cost (e.g., maxTier=sonnet prevents opus usage).
+# Capability aliases: "best" -> planning tier, "fast" -> fast tier, "balanced" -> development tier
+resolve_model_for_tier() {
+    local tier="$1"
+
+    # Handle capability aliases
+    case "$tier" in
+        best)    tier="planning" ;;
+        balanced) tier="development" ;;
+        cheap)   tier="fast" ;;
+    esac
+
+    local max_tier="${LOKI_MAX_TIER:-}"
+    local model=""
+
+    # Resolve tier to model
+    case "$tier" in
+        planning)    model="$PROVIDER_MODEL_PLANNING" ;;
+        development) model="$PROVIDER_MODEL_DEVELOPMENT" ;;
+        fast)        model="$PROVIDER_MODEL_FAST" ;;
+        *)           model="$PROVIDER_MODEL_DEVELOPMENT" ;;
+    esac
+
+    # Apply maxTier ceiling if set
+    if [ -n "$max_tier" ]; then
+        case "$max_tier" in
+            haiku)
+                # Cap everything to haiku/fast
+                model="$PROVIDER_MODEL_FAST"
+                ;;
+            sonnet)
+                # Cap planning to development
+                if [ "$tier" = "planning" ]; then
+                    model="$PROVIDER_MODEL_DEVELOPMENT"
+                fi
+                ;;
+            opus)
+                # No cap needed, opus is max
+                ;;
+        esac
+    fi
+
+    echo "$model"
+}
+
 # Tier-aware invocation (Claude supports model selection via --model flag)
 provider_invoke_with_tier() {
     local tier="$1"
     local prompt="$2"
     shift 2
     local model
-    model=$(provider_get_tier_param "$tier")
-    claude --dangerously-skip-permissions --model "$model" -p "$prompt" "$@"
+    model=$(resolve_model_for_tier "$tier")
+    # Extract short name for Task tool (opus/sonnet/haiku)
+    local short_model
+    short_model=$(echo "$model" | sed 's/claude-\([a-z]*\).*/\1/')
+    claude --dangerously-skip-permissions --model "$short_model" -p "$prompt" "$@"
 }

package/providers/codex.sh

@@ -113,15 +113,50 @@ provider_get_tier_param() {
     esac
 }
 
+# Dynamic model resolution (v6.0.0)
+# Resolves a capability tier to a concrete effort level at runtime.
+# Codex uses a single model with effort parameter, so maxTier maps to effort cap.
+resolve_model_for_tier() {
+    local tier="$1"
+
+    # Handle capability aliases
+    case "$tier" in
+        best)    tier="planning" ;;
+        balanced) tier="development" ;;
+        cheap)   tier="fast" ;;
+    esac
+
+    local max_tier="${LOKI_MAX_TIER:-}"
+    local effort=""
+
+    case "$tier" in
+        planning)    effort="$PROVIDER_EFFORT_PLANNING" ;;
+        development) effort="$PROVIDER_EFFORT_DEVELOPMENT" ;;
+        fast)        effort="$PROVIDER_EFFORT_FAST" ;;
+        *)           effort="$PROVIDER_EFFORT_DEVELOPMENT" ;;
+    esac
+
+    # Apply maxTier ceiling (maps to effort levels)
+    if [ -n "$max_tier" ]; then
+        case "$max_tier" in
+            haiku|low)   effort="low" ;;
+            sonnet|high)
+                if [ "$effort" = "xhigh" ]; then effort="high"; fi
+                ;;
+            opus|xhigh)  ;; # No cap
+        esac
+    fi
+
+    echo "$effort"
+}
+
 # Tier-aware invocation
-# Note: Codex CLI does not support effort CLI flags
-# Effort must be configured via environment: CODEX_MODEL_REASONING_EFFORT
-# This function sets the env var before invocation
+# Codex CLI uses CODEX_MODEL_REASONING_EFFORT env var for effort control
 provider_invoke_with_tier() {
     local tier="$1"
     local prompt="$2"
     shift 2
     local effort
-    effort=$(provider_get_tier_param "$tier")
+    effort=$(resolve_model_for_tier "$tier")
     CODEX_MODEL_REASONING_EFFORT="$effort" codex exec --full-auto "$prompt" "$@"
 }

package/providers/gemini.sh

@@ -139,6 +139,48 @@ provider_get_tier_param() {
     esac
 }
 
+# Dynamic model resolution (v6.0.0)
+# Resolves a capability tier to a concrete model name at runtime.
+# Respects LOKI_MAX_TIER to cap cost.
+resolve_model_for_tier() {
+    local tier="$1"
+
+    # Handle capability aliases
+    case "$tier" in
+        best)    tier="planning" ;;
+        balanced) tier="development" ;;
+        cheap)   tier="fast" ;;
+    esac
+
+    local max_tier="${LOKI_MAX_TIER:-}"
+    local model=""
+
+    case "$tier" in
+        planning)    model="$PROVIDER_MODEL_PLANNING" ;;
+        development) model="$PROVIDER_MODEL_DEVELOPMENT" ;;
+        fast)        model="$PROVIDER_MODEL_FAST" ;;
+        *)           model="$PROVIDER_MODEL_DEVELOPMENT" ;;
+    esac
+
+    # Apply maxTier ceiling
+    if [ -n "$max_tier" ]; then
+        case "$max_tier" in
+            haiku|flash)
+                model="$PROVIDER_MODEL_FAST"
+                ;;
+            sonnet|pro)
+                # Cap planning to development (pro)
+                if [ "$tier" = "planning" ]; then
+                    model="$PROVIDER_MODEL_DEVELOPMENT"
+                fi
+                ;;
+            opus)  ;; # No cap
+        esac
+    fi
+
+    echo "$model"
+}
+
 # Tier-aware invocation with rate limit fallback
 # Uses --model flag to specify model
 # Falls back to flash model if pro hits rate limit
@@ -148,9 +190,8 @@ provider_invoke_with_tier() {
     local prompt="$2"
     shift 2
 
-    # Select model based on tier
-    local model="$PROVIDER_MODEL"
-    [[ "$tier" == "fast" ]] && model="$PROVIDER_MODEL_FAST"
+    local model
+    model=$(resolve_model_for_tier "$tier")
 
     echo "[loki] Using tier: $tier, model: $model" >&2