loki-mode 11.3.9 → 11.5.1

package/autonomy/loki

@@ -71,6 +71,15 @@ if [ -f "$_LOKI_SCRIPT_DIR/lib/lock.sh" ]; then
     source "$_LOKI_SCRIPT_DIR/lib/lock.sh"
 fi
 
+# Default per-run spend cap (single source: default_max_cost_usd in loki-ts/data/model-pricing.json,
+# also read by loki-ts/src/e10ext/budget_cap.ts and autonomy/run.sh). Prints a plain number; 100 only if the file is unreadable.
+loki_budget_default_usd() {
+    local v=""
+    [ -f "$_LOKI_SCRIPT_DIR/../loki-ts/data/model-pricing.json" ] && \
+        v="$(sed -n 's/.*"default_max_cost_usd"[[:space:]]*:[[:space:]]*\([0-9][0-9.]*\).*/\1/p' "$_LOKI_SCRIPT_DIR/../loki-ts/data/model-pricing.json" | head -1)"
+    printf '%s\n' "${v:-100}"
+}
+
 # Guarded browser opener (loki_open_url). Every browser open goes through it
 # so tests, CI and non-TTY runs never pop a tab. If missing, nothing opens.
 if [ -f "$_LOKI_SCRIPT_DIR/lib/browser-open.sh" ]; then
@@ -123,6 +132,12 @@ _loki_caveman_narration_level() {
     fi
 }
 
+# loki edit: one-pass small change fast path (functions-only, self-guarded).
+if [ -f "$_LOKI_SCRIPT_DIR/edit.sh" ]; then
+    # shellcheck source=edit.sh
+    source "$_LOKI_SCRIPT_DIR/edit.sh"
+fi
+
 # Quickstart guided interview (v7.29.0): provides cmd_quickstart and its
 # deterministic offline template matcher. Functions-only file (no top-level
 # command), sourced here so the dispatch case can call cmd_quickstart. Composes
@@ -1722,7 +1737,14 @@ _help_verify_dsse() {
     echo "          66  no signing key, or no runs"
 }
 
+# Default help screen: core verbs only. `loki help all` prints show_help_all.
 show_help() {
+    # shellcheck source=/dev/null
+    source "$_LOKI_SCRIPT_DIR/lib/help-core.sh"
+    help_core_screen "$(get_version)"
+}
+
+show_help_all() {
     local version=$(get_version)
     # Strip color when stdout is not a TTY (piped/redirected) so captured help
     # output is clean, matching the bare-loki welcome path. Local overrides only.
@@ -1735,6 +1757,7 @@ show_help() {
     echo "Usage: loki <command> [options]"
     echo ""
     echo "New here? Try these in order:"
+    echo "  loki setup                One-step wizard: tools, provider login, model route, spend cap (--yes for defaults)"
     echo "  loki welcome              Friendly first-run opener (what Loki is, next steps)"
     echo "  loki doctor               Check your setup is ready (a few seconds)"
     echo "  loki quickstart           Guided first build from your idea (no PRD needed)"
@@ -1815,6 +1838,7 @@ show_help() {
     echo ""
     echo "Options for 'start':"
     echo "  --provider NAME  AI provider: claude (default), codex, cline, aider, opencode"
+    echo "  --model ID       Model tier or route (e.g. ollama/qwen3-coder)"
     echo "  --simple         Force simple complexity tier (3 phases)"
     echo "  --complex        Force complex complexity tier (8 phases)"
     echo "  --no-dashboard   Disable web dashboard"
@@ -1823,7 +1847,7 @@ show_help() {
     echo "  --spec FILE      Run against an edited spec (written by 'loki plan <task> --spec'; see also --spec-first)"
     echo "  --fresh-prd      Regenerate the PRD from the codebase (no-PRD runs; ignores the reusable generated PRD)"
     echo "  --compliance PRESET  Enable compliance mode (default|healthcare|fintech|government)"
-    echo "  --budget USD     Set cost budget limit (display in dashboard/status)"
+    echo "  --budget USD     Per-run cost cap in USD (default $(loki_budget_default_usd); auto-pause when exceeded; see docs/cost-controls.md)"
     echo "  --bmad-project PATH  Use BMAD Method project artifacts as input"
     echo "  --openspec PATH      Use OpenSpec change directory as input"
     echo "  --config PATH    Load settings from a config file (.yaml/.json/.env). Alias: --env-file, --vars"
@@ -1899,6 +1923,7 @@ show_help() {
     # missing from this list, so a new command cannot ship invisible.
     echo ""
     echo "All commands:"
+    echo "  agents chat diff edit models route"
     echo "  acp agent analyze api assets audit backlog bench checkpoint (cp) ci cleanup"
     echo "  cluster cockpit code compliance completions compound config context (ctx)"
     echo "  cost council crash dashboard demo deploy docker docs doctor dogfood"
@@ -1908,7 +1933,7 @@ show_help() {
     echo "  next notify onboard open optimize otel outcomes own (handoff) pause plan preview"
     echo "  projects proof (receipt) provider quick quickstart rc remote report reset"
     echo "  merge resume review rollback run sandbox secrets secure self-update sentrux"
-    echo "  serve setup-skill share ship spec start state stats status steer stop"
+    echo "  serve setup setup-skill share ship spec start state stats status steer stop"
     echo "  syslog telemetry template test tour trigger trust trust-metrics"
     echo "  ultracode undo update verify version voice watch watchdog web welcome why"
     echo "  wiki workspace worktree (wt)"
@@ -2575,7 +2600,8 @@ cmd_start() {
                 echo "                        Token from LOKI_REMOTE_TOKEN / LOKI_REMOTE_TOKEN_FILE"
                 echo "                        (never an argument). Env: LOKI_REMOTE_URL."
                 echo "  --provider NAME       AI provider: claude (default), codex, cline, aider, opencode"
-                echo "  --allow-haiku         Enable Haiku model for the fast tier (default: disabled)"
+                echo "  --model NAME          Model or route override (for example ollama/qwen3-coder)"
+                echo "  --allow-haiku        Enable Haiku model for the fast tier (default: disabled)"
                 echo "  --simple              Force simple complexity tier (3 phases)"
                 echo "  --complex             Force complex complexity tier (8 phases)"
                 echo "  --no-dashboard        Disable web dashboard"
@@ -2591,7 +2617,7 @@ cmd_start() {
                 echo "                        (ignores the reusable generated PRD; aliases: --regen-prd,"
                 echo "                        --regenerate-prd, --regen, or LOKI_PRD_REGEN=1)"
                 echo "  --compliance PRESET   Enable compliance mode (default|healthcare|fintech|government)"
-                echo "  --budget USD          Cost budget limit (auto-pause when exceeded)"
+                echo "  --budget USD          Per-run cost cap (default $(loki_budget_default_usd); auto-pause when exceeded)"
                 echo "  --bmad-project PATH   Use BMAD Method project artifacts as input"
                 echo "  --openspec PATH       Use OpenSpec change directory as input"
                 echo "  --mirofish [URL]      Enable MiroFish market validation (default: localhost:5001)"
@@ -2634,7 +2660,7 @@ cmd_start() {
                 echo "  LOKI_AUTO_CONFIRM     Set to 'true'/'false' to control prompts (takes precedence over CI)"
                 echo "  CI                    Fallback: auto-confirms when 'true' and LOKI_AUTO_CONFIRM is unset"
                 echo "  LOKI_MAX_ITERATIONS   Max iteration count"
-                echo "  LOKI_BUDGET_LIMIT     Cost budget limit in USD"
+                echo "  LOKI_BUDGET_LIMIT     Cost cap in USD (default $(loki_budget_default_usd); empty means unlimited)"
                 echo ""
                 echo "Examples:"
                 echo "  loki start                              # Interactive, analyze current dir"
@@ -3032,7 +3058,7 @@ cmd_start() {
                         echo -e "${RED}--budget must be greater than 0 (a 0 budget pauses before any work)${NC}" >&2
                         exit 1
                     fi
-                    export LOKI_BUDGET_LIMIT="$2"
+                    export LOKI_BUDGET_LIMIT="$2" LOKI_BUDGET_SOURCE=flag
                     shift 2
                 else
                     echo -e "${RED}--budget requires a USD amount (e.g., --budget 5.00)${NC}"
@@ -3050,7 +3076,7 @@ cmd_start() {
                     echo -e "${RED}--budget must be greater than 0 (a 0 budget pauses before any work)${NC}" >&2
                     exit 1
                 fi
-                export LOKI_BUDGET_LIMIT="$budget_val"
+                export LOKI_BUDGET_LIMIT="$budget_val" LOKI_BUDGET_SOURCE=flag
                 shift
                 ;;
             # v6.84.0: explicit mode flags (override auto-detection)
@@ -3184,7 +3210,7 @@ cmd_start() {
                 ;;
             -*)
                 echo -e "${RED}Unknown option: $1${NC}"
-                exit 1
+                exit 64
                 ;;
             *)
                 # Capture first positional arg for unified mode detection.
@@ -3939,15 +3965,8 @@ cmd_start() {
     if ! command -v "$effective_provider" &>/dev/null; then
         echo -e "${RED}Error: Provider CLI '$effective_provider' is not installed.${NC}"
         echo ""
-        echo "Install it first:"
-        case "$effective_provider" in
-            claude) echo "  npm install -g @anthropic-ai/claude-code" ;;
-            codex)  echo "  npm install -g @openai/codex" ;;
-            cline)  echo "  npm install -g cline" ;;
-            aider)  echo "  pip install aider-chat" ;;
-            opencode) echo "  npm install -g opencode-ai" ;;
-            *)      echo "  Check the provider documentation for installation." ;;
-        esac
+        echo "Install it first (same fix as loki doctor):"
+        _loki_req_fix_line "$effective_provider"
         echo ""
         echo "Check your environment: loki doctor"
         exit 1
@@ -5153,6 +5172,17 @@ cmd_resume() {
         exit 0
     fi
 
+    # RECOVERY: an interrupted engine10 run is resumed at its phase by loki-ts/src/util/run_outputs.ts
+    # (exit 0 resumed, 4 phase reported, 5 publish failed, anything else: nothing for it, fall through).
+    if ls "$LOKI_DIR"/runs/e10-*/events.jsonl >/dev/null 2>&1; then
+        local _e10_rc=0
+        ( _loki_bun_delegate engine10 resume "$@" ) || _e10_rc=$?
+        case "$_e10_rc" in
+            0 | 4) return 0 ;;
+            5) return 1 ;;
+        esac
+    fi
+
     # Check if there is anything to resume before touching signal files
     local has_pause_signal=false
     local has_stop_signal=false
@@ -7102,8 +7132,14 @@ cmd_provider() {
             cmd_provider_list
             ;;
         info)
+            case " $* " in
+                *" --json "*) _loki_bun_delegate provider info "$@" || { echo "loki provider info --json needs bun: ${_LOKI_DELEGATE_WHY}" >&2; return 1; } ;;
+            esac
             cmd_provider_info "$@"
             ;;
+        matrix)
+            _loki_bun_delegate provider matrix "$@" || { echo "loki provider matrix needs bun: ${_LOKI_DELEGATE_WHY}" >&2; return 1; }
+            ;;
         models)
             cmd_provider_models
             ;;
@@ -7116,7 +7152,8 @@ cmd_provider() {
             echo "  show     Show current provider (default)"
             echo "  set      Set provider for this project"
             echo "  list     List available providers"
-            echo "  info     Show provider details"
+            echo "  info     Show provider details (--json: capability contract)"
+            echo "  matrix   Show the capability matrix per provider and engine"
             echo "  models   Show resolved model configuration for all providers"
             echo ""
             echo "Precedence (highest wins):"
@@ -10848,7 +10885,7 @@ cmd_run() {
                 echo "  --no-dashboard     Disable web dashboard"
                 echo "  --sandbox          Run in Docker sandbox (default: off; requires Docker)"
                 echo "  --no-plan          Skip auto-shown PRD analysis at startup"
-                echo "  --budget USD       Set cost budget limit"
+                echo "  --budget USD       Per-run cost cap (default $(loki_budget_default_usd))"
                 echo ""
                 echo "Progressive Isolation:"
                 echo "  --worktree, -w     Git worktree isolation (separate branch)"
@@ -12931,6 +12968,16 @@ cmd_config() {
         show)
             cmd_config_show
             ;;
+        list)
+            # HELP slice: `config list [--json]` is `config show` (json: wrapped).
+            # shellcheck source=/dev/null
+            source "$_LOKI_SCRIPT_DIR/lib/json-output.sh"
+            if loki_json_requested "$@"; then
+                loki_json_wrap config-list cmd_config_show
+            else
+                cmd_config_show
+            fi
+            ;;
         init)
             cmd_config_init
             ;;
@@ -12956,9 +13003,10 @@ cmd_config() {
             cmd_config_validate "$@"
             ;;
         *)
-            echo -e "${YELLOW}Usage: loki config [show|init|edit|path|set|get|example|schema|validate]${NC}"
+            echo -e "${YELLOW}Usage: loki config [show|list|init|edit|path|set|get|example|schema|validate]${NC}"
             echo ""
             echo "  show            Show current configuration (default)"
+            echo "  list [--json]   Same as show; --json emits one JSON object"
             echo "  init            Create a config file from template"
             echo "  edit            Open config file in editor"
             echo "  path            Show config file paths"
@@ -13447,6 +13495,100 @@ cmd_config_path() {
     echo "Create a config file with: loki config init"
 }
 
+# Merge the Loki plugin into a Claude Code settings.json (loki setup-skill --claude-code).
+# Existing keys are never overwritten, invalid JSON is refused (rc 3), writes are atomic.
+_setup_skill_claude_code() {
+    local print_only=0 project=0 stop=0 settings=""
+    while [ $# -gt 0 ]; do
+        case "$1" in
+            --print) print_only=1 ;;
+            --project) project=1 ;;
+            --stop-hook) stop=1 ;;
+            --settings) settings="${2:-}"; shift ;;
+            --help|-h)
+                echo "Usage: loki setup-skill --claude-code [--print] [--project] [--stop-hook] [--settings FILE]"
+                echo ""
+                echo "Registers the Loki plugin marketplace and enables the plugin in Claude Code"
+                echo "settings (default ~/.claude/settings.json; --project uses ./.claude/settings.json)."
+                echo "Merges only: existing keys are kept, invalid JSON is refused."
+                echo ""
+                echo "  --print       Print the settings snippet and change nothing"
+                echo "  --stop-hook   Also opt in to the Stop-hook fast verifier (LOKI_STOP_VERIFY=1)"
+                return 0
+                ;;
+            *) echo "Unknown option: $1" >&2; return 2 ;;
+        esac
+        shift
+    done
+    command -v python3 >/dev/null 2>&1 || { echo "python3 is required" >&2; return 1; }
+    if [ -z "$settings" ] && [ "$print_only" -eq 0 ]; then
+        if [ "$project" -eq 1 ]; then
+            settings="${TARGET_DIR:-.}/.claude/settings.json"
+        else
+            settings="$HOME/.claude/settings.json"
+        fi
+    fi
+    local out rc
+    out="$(python3 - "$settings" "$stop" "$print_only" <<'PY'
+import json, os, sys, tempfile
+path, stop, print_only = sys.argv[1], sys.argv[2] == "1", sys.argv[3] == "1"
+want = {
+    "extraKnownMarketplaces": {
+        "loki-mode": {"source": {"source": "github", "repo": "asklokesh/loki-mode"}}
+    },
+    "enabledPlugins": {"loki-mode@loki-mode": True},
+}
+if stop:
+    want["env"] = {"LOKI_STOP_VERIFY": "1"}
+if print_only:
+    print(json.dumps(want, indent=2))
+    sys.exit(0)
+cur = {}
+if os.path.exists(path):
+    try:
+        raw = open(path).read()
+        cur = json.loads(raw) if raw.strip() else {}
+    except Exception as e:
+        print("REFUSED %s is not valid JSON (%s); fix or move it aside" % (path, e))
+        sys.exit(3)
+    if not isinstance(cur, dict):
+        print("REFUSED %s top level is not an object" % path)
+        sys.exit(3)
+added = []
+for top, kv in want.items():
+    node = cur.get(top)
+    if node is None:
+        cur[top] = {}
+        node = cur[top]
+    elif not isinstance(node, dict):
+        print("KEPT %s (existing value is not an object)" % top)
+        continue
+    for k, v in kv.items():
+        if k in node:
+            print("KEPT %s.%s" % (top, k))
+        else:
+            node[k] = v
+            added.append("%s.%s" % (top, k))
+            print("ADDED %s.%s" % (top, k))
+if added:
+    d = os.path.dirname(os.path.abspath(path))
+    os.makedirs(d, exist_ok=True)
+    fd, tmp = tempfile.mkstemp(dir=d, prefix=".settings.", suffix=".tmp")
+    with os.fdopen(fd, "w") as f:
+        json.dump(cur, f, indent=2)
+        f.write("\n")
+    os.replace(tmp, path)
+else:
+    print("UNCHANGED %s" % path)
+PY
+)"
+    rc=$?
+    printf '%s\n' "$out"
+    [ "$rc" -eq 0 ] || return "$rc"
+    [ "$print_only" -eq 1 ] || echo "Next: in Claude Code run /reload-plugins, then try /loki-mode:start, /loki-mode:loki-verify, /loki-mode:handoff."
+    return 0
+}
+
 # Set up skill symlinks for all providers
 cmd_setup_skill() {
     # v7.6.2 B-13 fix: --help must print help, not install skills.
@@ -13460,11 +13602,17 @@ cmd_setup_skill() {
             echo "skills directory: ~/.claude/skills/, ~/.codex/skills/, etc."
             echo ""
             echo "Options:"
+            echo "  --claude-code  Merge the Loki plugin into Claude Code settings (see --claude-code --help)"
             echo "  --help, -h   Show this help and exit"
             echo ""
             echo "Side effects: writes symlinks/files under ~/.<provider>/skills/loki-mode/."
             return 0
             ;;
+        --claude-code)
+            shift
+            _setup_skill_claude_code "$@"
+            return $?
+            ;;
     esac
     echo -e "${BOLD}Loki Mode Skill Setup${NC}"
     echo ""
@@ -14052,6 +14200,18 @@ _loki_bun_delegate() {
     exec "$bun_bin" "$cli" "$cmd" "$@"
 }
 
+# One-line fix for a requirement id (a provider name is an id), read from the shared
+# table autonomy/lib/setup-requirements.json so runtime errors match loki doctor.
+_loki_req_fix_line() {
+    local _id="$1" _fix=""
+    _fix="$(jq -r --arg id "$_id" '.requirements[] | select(.id == $id) | .fix' "${SKILL_DIR}/autonomy/lib/setup-requirements.json" 2>/dev/null | head -n 1)" || _fix=""
+    if [ -n "$_fix" ]; then
+        echo "  $_fix"
+    else
+        echo "  Check the provider documentation for installation."
+    fi
+}
+
 # loki doctor. The one implementation is loki-ts/src/commands/doctor.ts; this is a
 # delegator. Only --airgap stays in bash (_loki_airgap_audit). If the Bun route is
 # unavailable we print a minimal diagnostic (never a second copy of the checks).
@@ -14097,7 +14257,12 @@ cmd_doctor_json() {
     why="${why//\\/\\\\}"; why="${why//\"/\\\"}"
     fix="${fix//\\/\\\\}"; fix="${fix//\"/\\\"}"
     ver="${ver//\\/\\\\}"; ver="${ver//\"/\\\"}"
-    printf '{"loki_mode_version":"%s","checks":[],"provider_availability":null,"disk":null,"ai_provider":null,"skills":[],"sentrux":null,"memory":null,"model_catalog":null,"summary":{"passed":0,"failed":1,"warnings":0,"ok":false},"route":"unavailable","reason":"%s","fix":"%s"}\n' "$ver" "$why" "$fix"
+    local reqs=null
+    if declare -F loki_requirements_json >/dev/null 2>&1; then
+        reqs="$(loki_requirements_json 2>/dev/null | jq -c . 2>/dev/null)" || reqs=null
+        [ -n "$reqs" ] || reqs=null
+    fi
+    printf '{"loki_mode_version":"%s","checks":[],"provider_availability":null,"disk":null,"ai_provider":null,"skills":[],"sentrux":null,"memory":null,"model_catalog":null,"requirements":%s,"summary":{"passed":0,"failed":1,"warnings":0,"ok":false},"route":"unavailable","reason":"%s","fix":"%s"}\n' "$ver" "$reqs" "$why" "$fix"
 }
 
 # Architectural-drift gate (v7.5.14, opt-in).
@@ -15625,6 +15790,7 @@ cmd_quick() {
             echo ""
             echo "Runs the Loki 10 engine on one small task (no PR is opened). Best for"
             echo "tiny tasks."
+            echo "quick = small task with the verify loop. For a single pass with no loop, use loki edit."
             echo ""
             echo "Examples:"
             echo "  loki quick \"add dark mode to this React app\""
@@ -15654,16 +15820,7 @@ cmd_quick() {
         echo "  loki quick \"fix the login bug in auth.js\""
         echo "  loki quick \"add input validation to the signup form\""
         echo "  loki quick \"write unit tests for the API endpoints\""
-        exit 2
-    fi
-
-    # v7.29.0: provider pre-flight gate. Offer install on a TTY; print honest
-    # manual instructions and exit 2 on non-TTY/CI, before any spend. --help and
-    # the no-args usage path already returned/exited above.
-    if declare -f provider_offer_gate >/dev/null 2>&1; then
-        if ! provider_offer_gate; then
-            exit 2
-        fi
+        exit 64
     fi
 
     # #691: drop the unified config-file aliases from the task description. The
@@ -15682,6 +15839,12 @@ cmd_quick() {
             --verbose|-v) if [ "$_quick_task_seen" = "false" ]; then export LOKI_VERBOSE=1; continue; fi ;;
             --config|--vars|--env-file)        _skip_next=true; continue ;;
             --config=*|--vars=*|--env-file=*)   continue ;;
+            # LM-006: a leading unknown --flag is a usage error, never task text (a typo must not start a paid run).
+            --?*) if [ "$_quick_task_seen" = "false" ] &&[[ "$_qa" != *" "* ]]; then
+                    echo -e "${RED}Error: unknown option: $_qa${NC}" >&2
+                    echo "Usage: loki quick [--verbose] \"description of what to do\"" >&2
+                    exit 64
+                 fi ;;
         esac
         _quick_task_seen=true
         _quick_args+=("$_qa")
@@ -15690,7 +15853,17 @@ cmd_quick() {
     if [ $# -eq 0 ]; then
         echo -e "${RED}Error: No task description provided${NC}"
         echo "Usage: loki quick [--verbose] \"description of what to do\""
-        exit 2
+        exit 64
+    fi
+
+    # v7.29.0: provider pre-flight gate. Offer install on a TTY; print honest
+    # manual instructions and exit 2 on non-TTY/CI, before any spend. --help and
+    # every usage error (no task, unknown option, exit 64) is decided above,
+    # so a host with no provider still reports a typo as 64, not 2.
+    if declare -f provider_offer_gate >/dev/null 2>&1; then
+        if ! provider_offer_gate; then
+            exit 2
+        fi
     fi
 
     local task_desc="$*"
@@ -15757,14 +15930,8 @@ QPRDEOF
     if ! command -v "$_quick_provider" &>/dev/null; then
         echo -e "${RED}Error: Provider CLI '$_quick_provider' is not installed.${NC}"
         echo ""
-        echo "Install your AI provider CLI first:"
-        case "$_quick_provider" in
-            claude) echo "  npm install -g @anthropic-ai/claude-code" ;;
-            codex)  echo "  npm install -g @openai/codex" ;;
-            cline)  echo "  npm install -g cline" ;;
-            aider)  echo "  pip install aider-chat" ;;
-            *)      echo "  Check the provider documentation for installation." ;;
-        esac
+        echo "Install your AI provider CLI first (same fix as loki doctor):"
+        _loki_req_fix_line "$_quick_provider"
         echo ""
         echo "Then verify: loki doctor"
         exit 1
@@ -17902,6 +18069,8 @@ cmd_verify() {
     fi
     # shellcheck source=/dev/null
     source "$verify_mod"
+    # verify_main handles --json natively (evidence document on stdout, banner
+    # on stderr); the generic json-output.sh wrapper must not intercept it.
     verify_main "$@"
     return $?
 }
@@ -20677,8 +20846,33 @@ print()
 # Dry-run PRD analysis and cost estimation (v6.18.0; refactored v6.81.1)
 # Thin wrapper around show_prd_plan() so the same analysis is reusable from
 # `loki start`, `loki run`, and other commands without duplicated code.
+# Read-only view of .loki/state/requirements-map.json (REQTRACE; contract: docs/spec-first-intent.md).
+_plan_show_requirements() {
+    local as_json="${1:-false}" map="${LOKI_DIR:-.loki}/state/requirements-map.json"
+    if [ ! -s "$map" ]; then
+        if [ "$as_json" = true ]; then printf '{"error":"no requirements map","path":"%s"}\n' "$map"; return 1; fi
+        echo "No requirements map at $map (written after a run that had a PRD checklist, a spec, or a multi-requirement PRD)."
+        return 1
+    fi
+    if [ "$as_json" = true ]; then cat "$map"; return 0; fi
+    LOKI_RM="$map" python3 -I -c "
+import json, os, sys
+try:
+    m = json.load(open(os.environ['LOKI_RM']))
+    reqs = m['requirements']
+except Exception:
+    print('requirements map is unreadable: ' + os.environ['LOKI_RM']); sys.exit(1)
+cov = sum(1 for r in reqs if r.get('status') == 'covered')
+print('Requirements: %d/%d covered (revision %s)' % (cov, len(reqs), str(m.get('revision', ''))[:12]))
+for r in reqs:
+    chk = ('  <- ' + ', '.join(r.get('checks', []))) if r.get('checks') else ''
+    print('  %s %-9s %-9s %s%s' % (r.get('id'), r.get('status'), r.get('method'), str(r.get('text', ''))[:80], chk))
+"
+}
+
 cmd_plan() {
     local prd_file=""
+    local show_requirements=false
     local show_json=false
     local show_verbose=false
 
@@ -20695,6 +20889,7 @@ cmd_plan() {
                 echo "Options:"
                 echo "  --json        Machine-readable JSON output"
                 echo "  --spec        With a task: write the acceptance criteria to .loki/specs/<slug>.md for you to edit"
+                echo "  --requirements  Print the last run's requirement-to-check map (.loki/state/requirements-map.json), read-only"
                 echo "  --verbose     Show detailed per-iteration breakdown"
                 echo "  --help, -h    Show this help"
                 echo ""
@@ -20712,6 +20907,7 @@ cmd_plan() {
                 ;;
             --json) show_json=true; shift ;;
             --verbose) show_verbose=true; shift ;;
+            --requirements) show_requirements=true; shift ;;
             *)
                 if [ -z "$prd_file" ]; then
                     prd_file="$1"
@@ -20721,6 +20917,11 @@ cmd_plan() {
         esac
     done
 
+    if [ "$show_requirements" = true ]; then
+        _plan_show_requirements "$show_json"
+        return $?
+    fi
+
     if [ -z "$prd_file" ]; then
         # Under --json, a machine consumer expects JSON on every path, including
         # errors -- never ANSI-colored prose. Emit a structured error to stdout.
@@ -20794,13 +20995,14 @@ _suggest_command() {
 ultracode council demo dogfood heal modernize import issue github init template \
 status stop pause resume monitor watch watchdog dashboard web open preview share \
 memory context ctx checkpoint state report kpis cost metrics stats logs otel \
-syslog telemetry crash config provider doctor setup-skill onboard quickstart \
+syslog telemetry crash config provider doctor setup setup-skill onboard quickstart \
 welcome update self-update rollback merge failover cluster enterprise remote deploy docker \
 sandbox api mcp magic compound assets export wiki control docs explain why audit compliance \
 welcome update self-update rollback failover cluster enterprise remote deploy docker \
 sandbox api mcp acp magic compound assets export wiki control docs explain why audit compliance \
 secrets analyze optimize bench ci reset cleanup notify trigger voice sentrux \
-worktree wt projects cp rc trust-metrics serve agent code self_update test help version"
+worktree wt projects cp rc trust-metrics serve agent code self_update test help version \
+chat route agents models edit receipt setup diff undo"
     local best
     best=$(printf '%s\n' $known | awk -v t="$typo" '
         function min3(a, b, c) { if (a < b) { if (a < c) return a; return c } if (b < c) return b; return c }
@@ -20968,6 +21170,32 @@ main() {
         quick)
             cmd_quick "$@"
             ;;
+        chat)
+            # shellcheck disable=SC1091
+            source "$_LOKI_SCRIPT_DIR/lib/chat.sh"
+            cmd_chat "$@"
+            ;;
+        edit)
+            cmd_edit "$@"
+            ;;
+        diff)
+            # Show what the last run changed: uncommitted changes, else the HEAD commit.
+            # Extra args pass through to git (for example --stat or a path).
+            if [ "${1:-}" = "--help" ] || [ "${1:-}" = "-h" ]; then
+                echo "Usage: loki diff [git diff args]"
+                echo "Show uncommitted changes; if there are none, show the latest commit."
+                exit 0
+            fi
+            if ! git rev-parse --git-dir >/dev/null 2>&1; then
+                echo "loki diff: not inside a git repository" >&2
+                exit 1
+            fi
+            if git diff --quiet HEAD -- 2>/dev/null; then
+                git show --format='%h %s' "$@" HEAD
+            else
+                git diff "$@" HEAD
+            fi
+            ;;
         monitor)
             cmd_monitor "$@"
             ;;
@@ -20991,6 +21219,11 @@ main() {
         welcome)
             cmd_welcome "$@"
             ;;
+        setup)
+            # shellcheck disable=SC1091
+            . "${SKILL_DIR}/autonomy/setup-wizard.sh"
+            cmd_setup "$@"
+            ;;
         init)
             cmd_init "$@"
             ;;
@@ -21174,6 +21407,9 @@ main() {
         doctor)
             cmd_doctor "$@"
             ;;
+        models)
+            bash "$SKILL_DIR/providers/model_routes.sh" "$@"
+            ;;
         sentrux)
             cmd_sentrux "$@"
             ;;
@@ -21255,6 +21491,9 @@ main() {
         agent)
             cmd_agent "$@"
             ;;
+        agents)
+            cmd_agents "$@"
+            ;;
         template)
             cmd_template "$@"
             ;;
@@ -21401,6 +21640,10 @@ main() {
             # deprecated-alias table; bare help prints the grouped front page.
             if [ "${1:-}" = "aliases" ]; then
                 show_help_aliases
+            elif [ "${1:-}" = "all" ]; then
+                show_help_all
+            elif [ -n "${1:-}" ] && case "${1:-}" in providers|exit-codes) true ;; *) false ;; esac && { source "$_LOKI_SCRIPT_DIR/lib/help-core.sh"; help_topic_text "$1"; }; then
+                :
             elif [ -n "${1:-}" ]; then
                 # `loki help <command>` reaches the command's own help. Before
                 # this, $1 was read only for the literal "aliases" and otherwise
@@ -21470,8 +21713,8 @@ main() {
                 echo "Did you mean 'loki ${_suggestion}'?" >&2
             fi
             # Always point to the full command list, even with no near-miss match.
-            echo "Run 'loki help' to see every command." >&2
-            exit 1
+            echo "Run 'loki help' for the core commands, 'loki help all' for every command." >&2
+            exit 2
             ;;
     esac
 }
@@ -29495,6 +29738,28 @@ PYEOF
     esac
 }
 
+# User-configurable child agents: .loki/agents/<name>.md, ~/.config/loki/agents/<name>.md
+cmd_agents() {
+    local sub="${1:-list}"
+    case "$sub" in
+        help|-h|--help)
+            echo "Usage: loki agents <list|new|show|export> [args]"
+            echo "  list                    List configured agents (project overrides user)"
+            echo "  new <name> [--user]     Scaffold .loki/agents/<name>.md (or ~/.config/loki/agents)"
+            echo "                          Names reviewer, planner, tester copy the shipped examples"
+            echo "  show <name>             Show one agent and its system prompt"
+            echo "  export --claude [--user] Write agents as Claude Code subagents (.claude/agents/)"
+            echo "Council reviewers use a configured agent named reviewer, tester or security."
+            return 0
+            ;;
+    esac
+    local script_dir helper
+    script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+    helper="${script_dir}/../agents/custom_agents.py"
+    [ -f "$helper" ] || { echo -e "${RED}Error: agents/custom_agents.py not found${NC}"; return 1; }
+    python3 -I "$helper" "$@"
+}
+
 # Agent type dispatch (v6.7.0)
 cmd_agent() {
     local subcommand="${1:-list}"
@@ -35999,7 +36264,7 @@ PYEOF
 }
 
 # loki bench - head-to-head benchmark harness (R2).
-# Subcommands: run <task> | vs <task> | list | verify <result.json>.
+# Subcommands: run <task> | vs <task> | list | verify <result.json> | attribution.
 # Thin pass-through to benchmarks/bench/run.sh (shared python core runner.py).
 # CREDIBILITY: Loki NEVER grades its own success. Success is decided by a
 # held-out acceptance command run by the grader OUTSIDE the agent (exit code).
@@ -36033,6 +36298,7 @@ cmd_bench() {
             echo "  verify <file>   Recompute task_hash + check tool versions for a result.json"
             echo "  oracles         Are the graders trustworthy? Hash-bound, no spend, no provider"
             echo "  report <files>  Build results.json + RESULTS.md from per-tool result-rows"
+            echo "  attribution     Same-model harness attribution: raw Claude Code vs Loki (--dry-run, --execute)"
             echo ""
             echo "Options:"
             echo "  --trials N      Number of trials per tool (default 3)"
@@ -36229,7 +36495,9 @@ cmd_proof() {
             echo "                       reads UNKNOWN when it cannot be computed"
             echo "  phases [--json]      Measured phase history from real phase_change"
             echo "                       events; unrecorded boundaries read UNKNOWN"
-            echo "  show <id>            Pretty-print .loki/proofs/<id>/proof.json"
+            echo "  show <id> [--json]   Compact reviewer summary (label, revision, checks,"
+            echo "                       requirements, modified tests); --json prints the"
+            echo "                       full .loki/proofs/<id>/proof.json"
             echo "  verify <id>          Re-check a receipt against the repo (tamper + drift)."
             echo "                       Exit 0 clean, 1 tamper/drift, 2 could not check,"
             echo "                       64 usage (no id, more than one id, unknown option,"
@@ -36401,6 +36669,14 @@ PYEOF
             exit 0
             ;;
         show)
+            local _ps_json=0 _ps_a _ps_args=()
+            for _ps_a in "$@"; do
+                case "$_ps_a" in
+                    --json) _ps_json=1 ;;
+                    *) _ps_args+=("$_ps_a") ;;
+                esac
+            done
+            set -- "${_ps_args[@]+"${_ps_args[@]}"}"
             local id="${1:-}"
             if [ -z "$id" ]; then
                 echo -e "${RED}Missing proof id.${NC} Use 'loki proof list'."
@@ -36412,6 +36688,21 @@ PYEOF
                 echo "Use 'loki proof list' to see available proofs."
                 exit 1
             fi
+            if [ "$_ps_json" -eq 0 ]; then
+                # Compact reviewer summary (docs/PROOF-PASSPORT.md).
+                local _ps_py _ps_vr="${_LOKI_SCRIPT_DIR}/lib/proof-verify.py"
+                _ps_py="$(loki_verify_tool_path python3)" || {
+                    echo -e "${RED}python3 is unavailable${NC}" >&2
+                    exit 2
+                }
+                local _ps_root
+                _ps_root="$(loki_verify_root 2>/dev/null)" || {
+                    echo -e "${YELLOW}Summary unavailable (project tree not resolved; not checking the ambient cwd).${NC} Use 'loki proof show ${id} --json' for the full record." >&2
+                    exit 2
+                }
+                "$_ps_py" -E "$_ps_vr" summary "$pj" --repo "$_ps_root" --loki-dir "$loki_dir" || exit $?
+                exit 0
+            fi
             if command -v jq &>/dev/null; then
                 jq . "$pj"
             else