@sebastienrousseau/dotfiles 0.2.502 → 0.2.504

package/scripts/diagnostics/security-score.sh

@@ -30,9 +30,9 @@ set -euo pipefail
 set +o xtrace 2>/dev/null || true
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../dot/lib/ui.sh
+# shellcheck source=../../lib/dot/ui.sh
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/../dot/lib/ui.sh"
+source "$SCRIPT_DIR/../../lib/dot/ui.sh"
 
 # Parse arguments
 VERBOSE=true
@@ -64,7 +64,25 @@ YELLOW="${YELLOW:-}"
 # Scoring
 TOTAL_POINTS=0
 MAX_POINTS=0
-declare -A CATEGORY_SCORES
+# Parallel indexed arrays instead of `declare -A` (bash 4+; macOS ships
+# bash 3.2). CAT_NAMES[i] holds a category name, CAT_SCORES[i] its running
+# total. Category names can contain spaces, so an emulation via dynamic
+# variable names wouldn't work — a linear scan over the handful of
+# categories is fine.
+CAT_NAMES=()
+CAT_SCORES=()
+
+_cat_add() {
+  local name="$1" pts="$2" i
+  for ((i = 0; i < ${#CAT_NAMES[@]}; i++)); do
+    if [[ "${CAT_NAMES[$i]}" == "$name" ]]; then
+      CAT_SCORES[i]=$((CAT_SCORES[i] + pts))
+      return 0
+    fi
+  done
+  CAT_NAMES+=("$name")
+  CAT_SCORES+=("$pts")
+}
 
 add_points() {
   local category="$1"
@@ -74,7 +92,7 @@ add_points() {
 
   TOTAL_POINTS=$((TOTAL_POINTS + points))
   MAX_POINTS=$((MAX_POINTS + max))
-  CATEGORY_SCORES["$category"]=$((${CATEGORY_SCORES[$category]:-0} + points))
+  _cat_add "$category" "$points"
 
   if ! $JSON_OUTPUT && $VERBOSE; then
     local icon
@@ -339,10 +357,11 @@ print_summary() {
     echo "  \"grade\": \"$(get_grade $score)\","
     echo "  \"categories\": {"
     local first=true
-    for cat in "${!CATEGORY_SCORES[@]}"; do
+    local _ci
+    for ((_ci = 0; _ci < ${#CAT_NAMES[@]}; _ci++)); do
       $first || echo ","
       first=false
-      printf "    \"%s\": %d" "$cat" "${CATEGORY_SCORES[$cat]}"
+      printf "    \"%s\": %d" "${CAT_NAMES[$_ci]}" "${CAT_SCORES[$_ci]}"
     done
     echo ""
     echo "  }"

package/scripts/diagnostics/smoke-test.sh

@@ -5,9 +5,9 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../dot/lib/ui.sh
+# shellcheck source=../../lib/dot/ui.sh
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/../dot/lib/ui.sh"
+source "$SCRIPT_DIR/../../lib/dot/ui.sh"
 ui_init
 
 ui_header "Dotfiles Smoke Tests"

package/scripts/diagnostics/snapshot.sh

@@ -6,9 +6,9 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../dot/lib/ui.sh
+# shellcheck source=../../lib/dot/ui.sh
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/../dot/lib/ui.sh"
+source "$SCRIPT_DIR/../../lib/dot/ui.sh"
 
 ui_init
 

package/scripts/diagnostics/verify.sh

@@ -6,9 +6,9 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../dot/lib/ui.sh
+# shellcheck source=../../lib/dot/ui.sh
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/../dot/lib/ui.sh"
+source "$SCRIPT_DIR/../../lib/dot/ui.sh"
 
 ui_init
 ui_dot_banner "Diagnostics"
@@ -43,8 +43,8 @@ resolve_dot_bin() {
   elif [[ -d "$HOME/.local/share/chezmoi" ]]; then
     src_dir="$HOME/.local/share/chezmoi"
   fi
-  if [[ -n "$src_dir" && -x "$src_dir/dot_local/bin/executable_dot" ]]; then
-    printf "%s\n" "$src_dir/dot_local/bin/executable_dot"
+  if [[ -n "$src_dir" && -x "$src_dir/bin/dot" ]]; then
+    printf "%s\n" "$src_dir/bin/dot"
     return
   fi
   return 1

package/scripts/diagnostics/version-locks.sh

@@ -6,9 +6,9 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../dot/lib/ui.sh
+# shellcheck source=../../lib/dot/ui.sh
 # shellcheck disable=SC1091
-source "$SCRIPT_DIR/../dot/lib/ui.sh"
+source "$SCRIPT_DIR/../../lib/dot/ui.sh"
 
 ui_init
 
@@ -30,10 +30,20 @@ resolve_source_dir() {
 
 src_dir=$(resolve_source_dir)
 
+# resolve_source_dir returns the repo root, but since the defaults/ reorg the
+# deployable tree lives under the .chezmoiroot subdir (defaults/). Descend
+# into it so paths like dot_config/... resolve. (Without this the mise lookup
+# below silently reported "config not found" on every run.)
+cm_src="$src_dir"
+if [[ -f "$src_dir/.chezmoiroot" ]]; then
+  _cm_root="$(tr -d '[:space:]' <"$src_dir/.chezmoiroot")"
+  [[ -n "$_cm_root" && -d "$src_dir/$_cm_root" ]] && cm_src="$src_dir/$_cm_root"
+fi
+
 ui_header "Version Locks"
 
 ui_section "mise toolchain"
-mise_config="$src_dir/dot_config/mise/config.toml"
+mise_config="$cm_src/dot_config/mise/conf.d/00-dotfiles.toml"
 if [[ -f "$mise_config" ]]; then
   awk -F= '
     /^\[tools\]/ {in_tools=1; next}

package/scripts/diagnostics/workstation-attestation.sh

@@ -13,12 +13,12 @@ REPO_ROOT="${REPO_ROOT:-$(cd "$SCRIPT_DIR/../.." && pwd)}"
 # without the env-prefix dance that confuses shellcheck (SC2097/SC2098).
 export REPO_ROOT
 
-# shellcheck source=../dot/lib/ui.sh
-source "$SCRIPT_DIR/../dot/lib/ui.sh"
-# shellcheck source=../dot/lib/platform.sh
-source "$SCRIPT_DIR/../dot/lib/platform.sh"
-# shellcheck source=../dot/lib/utils.sh
-source "$SCRIPT_DIR/../dot/lib/utils.sh"
+# shellcheck source=../../lib/dot/ui.sh
+source "$SCRIPT_DIR/../../lib/dot/ui.sh"
+# shellcheck source=../../lib/dot/platform.sh
+source "$SCRIPT_DIR/../../lib/dot/platform.sh"
+# shellcheck source=../../lib/dot/utils.sh
+source "$SCRIPT_DIR/../../lib/dot/utils.sh"
 
 JSON_MODE=0
 WRITE_PATH=""
@@ -72,14 +72,14 @@ platform_id="$(dot_platform_id)"
 host_os="$(dot_host_os)"
 arch="$(uname -m)"
 hostname_value="$(hostname 2>/dev/null || true)"
-agent_profile_file="$REPO_ROOT/dot_config/dotfiles/agent-profiles.json"
-agent_card_file="$REPO_ROOT/dot_config/dotfiles/agent-card.json"
+agent_profile_file="$REPO_ROOT/defaults/dot_config/dotfiles/agent-profiles.json"
+agent_card_file="$REPO_ROOT/defaults/dot_config/dotfiles/agent-card.json"
 agent_state_file="${AGENT_STATE_FILE:-$HOME/.config/dotfiles/agent-mode.env}"
-policy_bundles_file="$REPO_ROOT/dot_config/dotfiles/policy-bundles.json"
-model_registry_file="$REPO_ROOT/dot_config/dotfiles/model-registry.json"
-prompt_registry_file="$REPO_ROOT/dot_config/dotfiles/prompt-registry.json"
-mcp_policy_file="$REPO_ROOT/dot_config/dotfiles/mcp-policy.json"
-mcp_registry_file="$REPO_ROOT/dot_config/dotfiles/mcp-registry.json"
+policy_bundles_file="$REPO_ROOT/defaults/dot_config/dotfiles/policy-bundles.json"
+model_registry_file="$REPO_ROOT/defaults/dot_config/dotfiles/model-registry.json"
+prompt_registry_file="$REPO_ROOT/defaults/dot_config/dotfiles/prompt-registry.json"
+mcp_policy_file="$REPO_ROOT/defaults/dot_config/dotfiles/mcp-policy.json"
+mcp_registry_file="$REPO_ROOT/defaults/dot_config/dotfiles/mcp-registry.json"
 signing_format="$(git config --global gpg.format 2>/dev/null || echo ssh)"
 signing_key="$(git config --global user.signingkey 2>/dev/null || true)"
 allowed_signers="$(git config --global gpg.ssh.allowedSignersFile 2>/dev/null || echo "$HOME/.config/git/allowed_signers")"
@@ -94,7 +94,7 @@ if [[ -z "$current_profile" ]] && [[ -f "$agent_profile_file" ]]; then
   current_profile="$(jq -r '.defaultProfile // "ask"' "$agent_profile_file")"
 fi
 
-MCP_CONFIG="$REPO_ROOT/dot_config/claude/mcp_servers.json"
+MCP_CONFIG="$REPO_ROOT/defaults/dot_config/claude/mcp_servers.json"
 export MCP_CONFIG
 mcp_summary="$(bash "$REPO_ROOT/scripts/diagnostics/mcp-doctor.sh" --strict --json)"
 

package/scripts/dot/commands/agent.sh

@@ -9,6 +9,14 @@ set -euo pipefail
 # These functions are sourced by meta.sh for dispatch.
 
 _agent_repo_root() {
+  # Post-Phase-4b: agent profile/card JSON ships under defaults/dot_config/.
+  # Prefer the chezmoi source dir so callers can append dot_config/... directly.
+  local dir
+  dir="$(resolve_chezmoi_source_dir)"
+  [[ -n "$dir" ]] && {
+    printf '%s\n' "$dir"
+    return
+  }
   require_source_dir
 }
 

package/scripts/dot/commands/agents.sh

@@ -25,8 +25,8 @@ set -euo pipefail
 
 # shellcheck disable=SC1091
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "$SCRIPT_DIR/../lib/ui.sh"
-source "$SCRIPT_DIR/../lib/utils.sh"
+source "$SCRIPT_DIR/../../../lib/dot/ui.sh"
+source "$SCRIPT_DIR/../../../lib/dot/utils.sh"
 
 _agents_repo_root() {
   # Resolve the chezmoi source dir (where CLAUDE.md/AGENTS.md live).
@@ -40,16 +40,26 @@ _agents_repo_root() {
   # we treat that as "not a match" and fall through to git, rather
   # than accepting the wrong candidate.
   local candidate=""
+  # Sanity probe: post-Phase-4b the data file lives at
+  # defaults/.chezmoidata.toml; older deployments kept it at the root.
+  _has_chezmoidata() {
+    [[ -f "$1/.chezmoidata.toml" || -f "$1/defaults/.chezmoidata.toml" ]]
+  }
   if command -v chezmoi >/dev/null 2>&1; then
     candidate="$(chezmoi source-path 2>/dev/null || true)"
-    if [[ -n "$candidate" && ! -f "$candidate/.chezmoidata.toml" ]]; then
+    # chezmoi source-path returns defaults/ when .chezmoiroot is set;
+    # peel back one level so callers receive the actual repo root.
+    if [[ -n "$candidate" && -f "$candidate/.chezmoidata.toml" && "$(basename "$candidate")" == "defaults" ]]; then
+      candidate="$(dirname "$candidate")"
+    fi
+    if [[ -n "$candidate" ]] && ! _has_chezmoidata "$candidate"; then
       candidate=""
     fi
   fi
   if [[ -z "$candidate" ]]; then
     candidate="$(git -C "$PWD" rev-parse --show-toplevel 2>/dev/null || true)"
   fi
-  if [[ -z "$candidate" ]] || [[ ! -f "$candidate/.chezmoidata.toml" ]]; then
+  if [[ -z "$candidate" ]] || ! _has_chezmoidata "$candidate"; then
     return 1
   fi
   printf '%s\n' "$candidate"

package/scripts/dot/commands/ai.sh

@@ -4,13 +4,13 @@
 ##
 ## Provides AI CLI status, setup, RAG query, and bridge commands.
 ## Wraps AI CLI tools with contextual patterns and system metadata.
-## Usage: dot ai|ai-setup|ai-query|cl|copilot|gemini|kiro|sgpt|ollama|opencode|aider|autohand|vibe|qwen|zai
+## Usage: dot ai [delegate|cost|status]|ai-setup|ai-query|cl|copilot|gemini|kiro|sgpt|ollama|opencode|aider|autohand|vibe|qwen|zai
 
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../lib/utils.sh
-source "$SCRIPT_DIR/../lib/utils.sh"
+# shellcheck source=../../../lib/dot/utils.sh
+source "$SCRIPT_DIR/../../../lib/dot/utils.sh"
 
 dot_ui_command_banner "AI and Agents" "${1:-}"
 
@@ -53,7 +53,8 @@ _ai_extract_version() {
 }
 
 _ai_refresh_status_cache() {
-  local -n ai_entries=$1
+  # Entries passed by value (not a `local -n` nameref — bash 4.3+; macOS bash is 3.2).
+  local ai_entries=("$@")
   local tmp_file
   tmp_file="$(mktemp)"
   mkdir -p "$AI_CACHE_DIR"
@@ -82,16 +83,18 @@ _ai_refresh_status_cache() {
     indexed+=("$i|$entry")
     i=$((i + 1))
   done
+  # Probe is non-interactive: </dev/null is a clean EOF for tools that
+  # prompt for an API key on first run; `timeout 3` caps the wait.
   # shellcheck disable=SC2016
+  local _TO=""
+  command -v timeout >/dev/null 2>&1 && _TO="timeout 3 "
   local probe_script='
-    payload="$1"
-    out_dir="$2"
-    i="${payload%%|*}"
-    entry="${payload#*|}"
+    payload="$1"; out_dir="$2"; to="$3"
+    i="${payload%%|*}"; entry="${payload#*|}"
     IFS="|" read -r category role name bin desc <<<"$entry"
     if command -v "$bin" >/dev/null 2>&1; then
-      output=$("$bin" --version 2>/dev/null | head -1) || true
-      version=$(printf "%s" "$output" | sed "s/^[^0-9]*//" | sed "s/[[:space:]]*$//" | sed "s/\.$//")
+      output=$($to "$bin" --version </dev/null 2>/dev/null | head -1) || true
+      version=$(printf "%s" "$output" | sed "s/^[^0-9]*//;s/[[:space:]]*$//;s/\.$//")
       printf "%s\t1\t%s\n" "$bin" "$version" >"$out_dir/$i"
     else
       printf "%s\t0\t\n" "$bin" >"$out_dir/$i"
@@ -107,7 +110,7 @@ _ai_refresh_status_cache() {
   # agent") don't trigger xargs's "unterminated quote" parser.
   printf '%s\0' "${indexed[@]}" |
     xargs -0 -I{} -P"$jobs" \
-      bash -c "$probe_script" _ {} "$probe_dir" \
+      bash -c "$probe_script" _ {} "$probe_dir" "$_TO" \
       2>/dev/null || true
 
   # Re-assemble in original entry order.
@@ -132,6 +135,12 @@ _ai_get_cached_status() {
   cat "$AI_STATUS_CACHE_FILE"
 }
 
+# Look up field $2 (2=present 0/1, 3=version) for binary $1 from the
+# cached TSV. Replaces a bash-4 associative array for macOS bash 3.2.
+_ai_status_field() {
+  awk -F'\t' -v b="$1" -v f="$2" '$1==b{print $f;exit}' "$AI_STATUS_CACHE_FILE" 2>/dev/null
+}
+
 # binary -> mise package mapping
 _ai_mise_pkg() {
   case "$1" in
@@ -175,17 +184,9 @@ cmd_ai_status() {
   )
 
   if ! _ai_cache_fresh "$AI_STATUS_CACHE_FILE"; then
-    _ai_refresh_status_cache ai_clis
+    _ai_refresh_status_cache "${ai_clis[@]}"
   fi
 
-  declare -A ai_present=()
-  declare -A ai_version=()
-  local cached_bin cached_present cached_version
-  while IFS=$'\t' read -r cached_bin cached_present cached_version; do
-    ai_present["$cached_bin"]="$cached_present"
-    ai_version["$cached_bin"]="$cached_version"
-  done < <(_ai_get_cached_status)
-
   local -a installed=()
   local -a missing=()
   local current_category=""
@@ -197,8 +198,9 @@ cmd_ai_status() {
       ui_section "$category"
       current_category="$category"
     fi
-    if [[ "${ai_present[$bin]:-0}" == "1" ]]; then
-      ver="${ai_version[$bin]:-installed}"
+    if [[ "$(_ai_status_field "$bin" 2)" == "1" ]]; then
+      ver="$(_ai_status_field "$bin" 3)"
+      [[ -z "$ver" ]] && ver="installed"
       [[ "$bin" == "claude" ]] && ver="${ver%% *}"
       ui_ok "$name" "$ver — $desc"
       installed+=("$name|$bin|$role")
@@ -312,6 +314,94 @@ cmd_ai_query() {
   run_script "dot_local/bin/executable_dot-ai" "AI RAG script" "$@"
 }
 
+# Locate the vibe-delegate / delegate-report tools deployed by the
+# /vibe Claude Code skill. Path stays in sync with
+# defaults/dot_claude/skills/vibe/tools/.
+_ai_delegate_tool() {
+  local tool="$1" # vibe-delegate | delegate-report
+  local path="${HOME}/.claude/skills/vibe/tools/${tool}"
+  if [[ ! -x "$path" ]]; then
+    # Errors to stderr so callers capturing stdout via $() get just the path.
+    ui_err "$tool" "not found at $path" >&2
+    ui_info "Hint" "Run 'chezmoi apply' to deploy the /vibe skill" >&2
+    return 1
+  fi
+  printf '%s\n' "$path"
+}
+
+cmd_ai_delegate() {
+  # Front-door to the same delegator the /vibe slash command uses.
+  # Usage: dot ai delegate "<prompt>" [max-turns] [agent] [timeout]
+  if [[ $# -lt 1 ]]; then
+    ui_err "Usage" "dot ai delegate \"<prompt>\" [max-turns] [agent] [timeout-secs]"
+    ui_info "Example" "dot ai delegate \"add a CHANGELOG entry for v0.2.504\""
+    return 1
+  fi
+  local prompt="$1"
+  shift
+  local max_turns="${1:-10}"
+  local agent="${2:-}"
+  local timeout="${3:-180}"
+  local tool
+  tool="$(_ai_delegate_tool vibe-delegate)" || return 1
+  if ! has_command vibe; then
+    ui_warn "vibe" "not installed"
+    ui_info "Install" "mise use -g pipx:mistral-vibe"
+    return 1
+  fi
+  "$tool" "$(pwd)" "$prompt" "$max_turns" "$agent" "$timeout"
+}
+
+cmd_ai_cost() {
+  # Unified AI spend report. Wraps delegate-report (vibe runs) and is
+  # the documented interface for users: path may move later.
+  local tool
+  tool="$(_ai_delegate_tool delegate-report)" || return 1
+  "$tool" "$@"
+}
+
+# Append a best-effort run entry to the unified AI log read by
+# delegate-report. Token/cost fields are left blank when the provider
+# CLI does not surface them — the report tolerates missing fields and
+# groups by `model`. This gives users one place to see invocations
+# across Claude, Gemini, Aider, Vibe, etc., not just Vibe.
+_ai_log_run() {
+  local provider="$1" exit_code="$2" duration_secs="$3" prompt_words="$4"
+  local log_file="${HOME}/.local/share/delegate-runs.jsonl"
+  mkdir -p "$(dirname "$log_file")"
+  local project ts
+  project="$(basename "$PWD")"
+  ts="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
+  # python3 keeps the encoding boring; jq would also work but isn't
+  # guaranteed present everywhere this script runs.
+  python3 - "$log_file" "$provider" "$project" "$exit_code" "$duration_secs" "$prompt_words" "$ts" <<'PY'
+import json, sys
+log, provider, project, ec, dur, pw, ts = sys.argv[1:8]
+entry = {
+    "ts": ts,
+    "delegate": provider,
+    "model": provider,
+    "project": project,
+    "exit_code": int(ec),
+    "duration_secs": float(dur),
+    "prompt_words": int(pw),
+    "tool_calls": 0,
+    "files_changed": 0,
+    "wrote_nothing": False,
+    "warn_count": 0,
+    "search_replace_fails": 0,
+    "syntax_errors": 0,
+    "tokens_in": 0,
+    "tokens_out": 0,
+    "tokens_total": 0,
+    "cost_usd": 0,
+    "cost_claude_eq": 0,
+}
+with open(log, "a") as fh:
+    fh.write(json.dumps(entry) + "\n")
+PY
+}
+
 run_ai_with_context() {
   local tool="$1"
   shift
@@ -405,61 +495,90 @@ ${prompt}"
 
   ui_info "Executing $tool with pattern: ${pattern_name:-none}"
 
+  # Wrap the provider invocation so we can log it to the unified AI run
+  # log. Each entry feeds `dot ai cost` so users see spend across every
+  # provider, not just vibe. Token-level fields are zero for providers
+  # that don't surface them — the report tolerates missing data.
+  local _ai_start_ts _ai_exit _ai_end_ts _ai_dur _ai_prompt_words
+  _ai_start_ts=$(date +%s)
+  _ai_prompt_words=$(printf '%s' "$prompt" | wc -w | tr -d ' ')
+  _ai_exit=0
   case "$tool" in
     cl | claude)
-      printf "%s" "$full_prompt" | claude
+      printf "%s" "$full_prompt" | claude || _ai_exit=$?
       ;;
     codex)
-      printf "%s" "$full_prompt" | codex
+      printf "%s" "$full_prompt" | codex || _ai_exit=$?
       ;;
     copilot)
-      copilot -sp "$full_prompt"
+      copilot -sp "$full_prompt" || _ai_exit=$?
       ;;
     gemini)
-      printf "%s" "$full_prompt" | gemini chat
+      printf "%s" "$full_prompt" | gemini chat || _ai_exit=$?
       ;;
     goose)
-      printf "%s" "$full_prompt" | goose session start
+      printf "%s" "$full_prompt" | goose session start || _ai_exit=$?
       ;;
     kiro | kiro-cli)
-      printf "%s" "$full_prompt" | kiro-cli chat
+      printf "%s" "$full_prompt" | kiro-cli chat || _ai_exit=$?
       ;;
     sgpt)
-      printf "%s" "$full_prompt" | sgpt --chat shell-gpt
+      printf "%s" "$full_prompt" | sgpt --chat shell-gpt || _ai_exit=$?
       ;;
     ollama)
-      printf "%s" "$full_prompt" | ollama run llama3.2
+      printf "%s" "$full_prompt" | ollama run llama3.2 || _ai_exit=$?
       ;;
     opencode)
-      printf "%s" "$full_prompt" | opencode query
+      printf "%s" "$full_prompt" | opencode query || _ai_exit=$?
       ;;
     aider)
-      printf "%s" "$full_prompt" | aider --msg "-"
+      printf "%s" "$full_prompt" | aider --msg "-" || _ai_exit=$?
       ;;
     autohand)
-      printf "%s" "$full_prompt" | autohand chat
+      printf "%s" "$full_prompt" | autohand chat || _ai_exit=$?
       ;;
     vibe)
-      printf "%s" "$full_prompt" | vibe chat
+      printf "%s" "$full_prompt" | vibe chat || _ai_exit=$?
       ;;
     qwen)
-      printf "%s" "$full_prompt" | qwen chat
+      printf "%s" "$full_prompt" | qwen chat || _ai_exit=$?
       ;;
     zai)
-      printf "%s" "$full_prompt" | zai chat
+      printf "%s" "$full_prompt" | zai chat || _ai_exit=$?
       ;;
     *)
       ui_err "Unsupported tool" "$tool"
       exit 1
       ;;
   esac
+  _ai_end_ts=$(date +%s)
+  _ai_dur=$((_ai_end_ts - _ai_start_ts))
+  _ai_log_run "$tool_bin" "$_ai_exit" "$_ai_dur" "$_ai_prompt_words" 2>/dev/null || true
+  return "$_ai_exit"
 }
 
 # Dispatch
 case "${1:-}" in
   ai)
     shift
-    cmd_ai_status "$@"
+    # Subcommands first: `dot ai delegate`, `dot ai cost`. Fall through
+    # to status if no subcommand or unknown one.
+    case "${1:-}" in
+      delegate)
+        shift
+        cmd_ai_delegate "$@"
+        ;;
+      cost)
+        shift
+        cmd_ai_cost "$@"
+        ;;
+      "" | status)
+        cmd_ai_status "$@"
+        ;;
+      *)
+        cmd_ai_status "$@"
+        ;;
+    esac
     ;;
   ai-setup)
     shift

package/scripts/dot/commands/appearance.sh

@@ -6,8 +6,8 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../lib/utils.sh
-source "$SCRIPT_DIR/../lib/utils.sh"
+# shellcheck source=../../../lib/dot/utils.sh
+source "$SCRIPT_DIR/../../../lib/dot/utils.sh"
 
 dot_ui_command_banner "Appearance" "${1:-}"
 

package/scripts/dot/commands/core.sh

@@ -26,8 +26,8 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../lib/utils.sh
-source "$SCRIPT_DIR/../lib/utils.sh"
+# shellcheck source=../../../lib/dot/utils.sh
+source "$SCRIPT_DIR/../../../lib/dot/utils.sh"
 
 if [[ "${1:-}" != "cd" ]]; then
   dot_ui_command_banner "Core" "${1:-}"

package/scripts/dot/commands/diagnostics.sh

@@ -7,8 +7,8 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=../lib/utils.sh
-source "$SCRIPT_DIR/../lib/utils.sh"
+# shellcheck source=../../../lib/dot/utils.sh
+source "$SCRIPT_DIR/../../../lib/dot/utils.sh"
 
 dot_ui_command_banner "Diagnostics" "${1:-}" "$@"
 
@@ -29,7 +29,7 @@ cmd_smoke_test() {
 }
 
 cmd_intelligence() {
-  run_script "scripts/dot/lib/bento.sh" "Intelligence Surface" "$@"
+  run_script "lib/dot/bento.sh" "Intelligence Surface" "$@"
 }
 
 cmd_heal() {
@@ -120,9 +120,9 @@ cmd_metrics() {
     echo "Dotfiles source not found." >&2
     exit 1
   fi
-  # shellcheck source=../lib/log.sh
+  # shellcheck source=../../../lib/dot/log.sh
   # shellcheck disable=SC1091
-  source "$src_dir/scripts/dot/lib/log.sh"
+  source "$src_dir/lib/dot/log.sh"
   ui_header "Recent Metrics"
   echo ""
   dot_metrics_summary "${1:-20}"