@@ -66,8 +66,9 @@ that may never merge. They are not releases and are not listed here.
   `MAPBOX_CLI_NO_AGENT_SETUP=1` skips it along with the skill question.
 
 - `install.sh` now writes a log of each run to
-  `~/.local/state/mapbox-cli/install.log` (`$XDG_STATE_HOME` when set), with
-  the full output of every command it ran, and keeps the previous run's as
+  `~/.local/state/mapbox-cli/install.log` (`$XDG_STATE_HOME` when set):
+  every step, and the full output of each `mapbox` and Tilesets command it
+  ran after installing the binary. The previous run's is kept as
   `install.log.1`.
 
 - New command: `mapbox styles download <style-id> > style.zip` saves a
 
@@ -117,9 +117,10 @@ without being asked anything:
 curl -fsSL https://cli.mapbox.com/install.sh | MAPBOX_CLI_NO_AGENT_SETUP=1 MAPBOX_INSTALL_TILESETS=no sh
 ```
 
-`install.sh` records each run, including the full output of every command it
-ran, in `~/.local/state/mapbox-cli/install.log` (under `$XDG_STATE_HOME` when
-that is set), and keeps the previous run's as `install.log.1`.
+`install.sh` records each run in `~/.local/state/mapbox-cli/install.log`
+(under `$XDG_STATE_HOME` when that is set): every step, and the full output of
+each `mapbox` and Tilesets command it ran after installing the binary. The
+previous run's log is kept as `install.log.1`.
 
 ### Download the archive yourself
 
 
@@ -183,13 +183,14 @@
     # A line of detail under the step line before it, aligned with its text.
     function Write-Detail([string]$Text) { Write-Host "$($Layout.Indent)  $Text" }
 
-    # A question reads in three layers, as in install.sh: the question in
-    # white, what answering does in gray under it, and the command it runs in
-    # cyan, so the eye lands on the question and the command.
+    # A question reads in three layers, as in install.sh: the question in the
+    # console's own text color, what answering does in gray under it, and the
+    # command it runs in cyan, so the eye lands on the question and the
+    # command. Not White: on a light console theme it all but disappears.
     function Write-AskTitle([string]$Text) {
         Write-Part '  '
         Write-Part '?' 'Cyan'
-        Write-Part " $Text" 'White'
+        Write-Part " $Text"
         Write-Host ''
     }
     # -Parts alternates plain note text and a command: note, command, note...
@@ -474,7 +475,7 @@ This channel is private. Set the credential and run it again:
         $shownVersion = $resolvedVersion
         if (-not $shownVersion) { $shownVersion = $Version }
         Write-Host ''
-        Write-Part "Installing Mapbox CLI $shownVersion" 'White'
+        Write-Part "Installing Mapbox CLI $shownVersion"
         Write-Part " for $platformName" 'DarkGray'
         Write-Host ''
         Write-Host ''
@@ -931,7 +932,7 @@ Windows 11 on Arm has and Windows 10 on Arm does not.
         Write-Part "$installedVersion is ready." 'Green'
         Write-Host ''
         Write-Host ''
-        Write-Part 'Get started' 'White'
+        Write-Part 'Get started'
         Write-Host ''
         foreach ($pair in @(
                 @('mapbox auth login', 'Sign in to your Mapbox account'),
 
@@ -239,12 +239,30 @@ ask_cmd() { printf '%s%s%s%s' "$RESET" "$ACCENT" "$1" "$RESET$DIM"; }
 # either way, for a caller to show in full when it is the diagnosis.
 # <stdout-file>, when not empty, takes the command's stdout instead, for a
 # caller that parses it.
+# The child's own colors and control characters would throw off both the
+# width and the redraw, so only its text is shown.
+run_live_text() {
+    sed "s/${ESC}\\[[0-9;?]*[A-Za-z]//g" | tr '\t' ' ' | tr -d '\000-\010\013-\037\177'
+}
+
+# A line with a URL in it is usually one to open — a sign-in page — and the
+# spinner would cut it to the screen and erase it at the end. So each new one
+# is printed in full above the spinner, with line wrap back on for it, and
+# stays there.
+run_live_urls() {
+    run_total="$(wc -l <"$run_log" 2>/dev/null | tr -d ' ')"
+    [ -n "$run_total" ] && [ "$run_total" -gt "$run_seen" ] || return 0
+    sed -n "$((run_seen + 1)),${run_total}p" "$run_log" | grep -E 'https?://' | run_live_text |
+        while IFS= read -r run_url; do
+            printf '\r\033[2K\n\033[2K\033[1A\r\033[?7h%s  %s\n\033[?7l' "$STEP_INDENT" "$run_url"
+        done
+    run_seen="$run_total"
+}
+
 # One frame of run_live: the spinner and label, then the log's latest line.
 run_live_draw() {
-    # The child's own colors and control characters would throw off both
-    # the width and the redraw, so only its text is shown.
-    run_line="$(tail -n 1 "$run_log" 2>/dev/null | sed "s/${ESC}\\[[0-9;?]*[A-Za-z]//g" |
-        tr '\t' ' ' | tr -d '\000-\010\013-\037\177' | cut -c "1-${run_width}")"
+    run_live_urls
+    run_line="$(tail -n 1 "$run_log" 2>/dev/null | run_live_text | cut -c "1-${run_width}")"
     printf '\r\033[2K%s%s%s%s %s\n\033[2K%s  %s%s%s\033[1A\r' \
         "$STEP_INDENT" "$ACCENT" "$run_frame" "$RESET" "$run_label" "$STEP_INDENT" "$DIM" "$run_line" "$RESET"
 }
@@ -254,7 +272,8 @@ run_live() { # label log stdout-file command...
     shift 3
     : >"$run_log"
     [ -n "$run_stdout" ] || run_stdout="$run_log"
-    if [ ! -t 1 ]; then
+    # A dumb terminal would print the cursor movement as text, every tick.
+    if [ ! -t 1 ] || [ "${TERM:-}" = dumb ]; then
         printf '%s%s %s\n' "$STEP_INDENT" "$MARK_WAIT" "$run_label"
         if [ "$run_stdout" = "$run_log" ]; then
             if "$@" </dev/null >>"$run_log" 2>&1; then run_status=0; else run_status=$?; fi
@@ -293,6 +312,7 @@ run_live() { # label log stdout-file command...
     TERM_MODES_CHANGED=yes
     (
         run_frame="${SPIN_FRAMES%% *}"
+        run_seen=0
         while [ -f "$run_flag" ]; do
             # Word splitting is the point: one frame per word.
             # shellcheck disable=SC2086
@@ -577,7 +597,9 @@ cleanup() {
     # run_live hides the cursor and turns off line wrap while its spinner
     # runs; an interrupt must not leave the user's terminal that way.
     if [ "${TERM_MODES_CHANGED:-no}" = yes ]; then
-        printf '\033[?7h\033[?25h'
+        # Stopped first, or it can draw again after the lines are erased.
+        kill "${run_spinner:-}" 2>/dev/null || true
+        printf '\r\033[2K\n\033[2K\033[1A\r\033[?7h\033[?25h'
     fi
     if [ -n "$STAGED" ] && [ -e "$STAGED" ]; then
         rm -f "$STAGED"
@@ -730,16 +752,46 @@ case "${SHELL:-}" in
     */zsh) profile="${ZDOTDIR:-$HOME}/.zshrc" ;;
     */bash)
         # macOS Terminal opens login shells, which read .bash_profile and
-        # never .bashrc.
+        # never .bashrc — or rather the first of .bash_profile, .bash_login
+        # and .profile that exists, and only that one. Creating a
+        # .bash_profile next to someone's .profile would stop bash reading
+        # their .profile at all, so an existing one wins.
         if [ "$(uname -s)" = Darwin ]; then
             profile="$HOME/.bash_profile"
+            for candidate in .bash_profile .bash_login .profile; do
+                if [ -f "$HOME/$candidate" ]; then
+                    profile="$HOME/$candidate"
+                    break
+                fi
+            done
         else
             profile="$HOME/.bashrc"
         fi
         ;;
     *) profile="$HOME/.profile" ;;
 esac
 
+# Whether a profile line other than a comment names <dir> as a whole path,
+# not as a prefix of another (/x/bin in /x/bin2) or a word inside one. Catches
+# a line the user wrote by hand, in either spelling of the directory.
+profile_names_dir() { # profile_names_dir <profile> <dir>
+    awk -v d="$2" -v before=":=\"' (	" -v after=":\"' )	" '
+        /^[ \t]*#/ { next }
+        {
+            off = 0
+            rest = $0
+            while ((i = index(rest, d)) > 0) {
+                at = off + i
+                b = at > 1 ? substr($0, at - 1, 1) : ""
+                a = substr($0, at + length(d), 1)
+                if ((b == "" || index(before, b)) && (a == "" || index(after, a))) { found = 1; exit }
+                off = at
+                rest = substr($0, at + 1)
+            }
+        }
+        END { exit !found }' "$1" 2>/dev/null
+}
+
 # yes when a profile now puts the install dir on PATH but this shell, which
 # a child process cannot change, does not have it yet.
 needs_new_shell=no
@@ -749,10 +801,11 @@ if [ "$install_dir_on_path" = no ]; then
         echo ""
         echo "      echo '${path_line}' >> $(tildify "$profile")"
         echo ""
-    # A second run must not append a second copy. Matching the directory as
-    # well as the exact line also catches one the user wrote by hand.
+    # A second run must not append a second copy.
     elif [ -f "$profile" ] &&
-        { grep -qF -- "$path_line" "$profile" || grep -qF -- "$INSTALL_DIR" "$profile"; } 2>/dev/null; then
+        { grep -qF -- "$path_line" "$profile" 2>/dev/null ||
+            profile_names_dir "$profile" "$INSTALL_DIR" ||
+            profile_names_dir "$profile" "$path_dir"; }; then
         step_ok "PATH is already set up in $(tildify "$profile")"
         needs_new_shell=yes
     elif mkdir -p "$(dirname "$profile")" 2>/dev/null &&
@@ -970,7 +1023,9 @@ mcp_field() { # mcp_field <key> <object>
     printf '%s' "$2" | sed -n "s/.*\"$1\":\"\([^\"]*\)\".*/\1/p"
 }
 mcp_rows() { # mcp_rows <json>
-    printf '%s' "$1" | grep -o '{[^{}]*}' | while IFS= read -r mcp_row; do
+    # "client" sorts first, so every row starts with it; splitting there
+    # keeps a row whole even when its "error" text has braces of its own.
+    printf '%s' "$1" | awk '{ gsub(/[{]"client":"/, "\n{\"client\":\""); print }' | while IFS= read -r mcp_row; do
         mcp_s="$(mcp_field status "$mcp_row")"
         mcp_v="$(mcp_field server "$mcp_row")"
         mcp_c="$(mcp_field client "$mcp_row")"
@@ -1023,7 +1078,12 @@ if agent_setup_allowed; then
                 mcp_grouped "$(cat "${WORK_DIR}/mcp-install.json" 2>/dev/null)" >"${WORK_DIR}/mcp-rows"
                 # One line per server and outcome, so a server added just now
                 # reads differently from one that was already there.
+                mcp_trouble=no
                 while IFS='|' read -r status what who; do
+                    case "$status" in
+                        installed | already_installed) ;;
+                        *) mcp_trouble=yes ;;
+                    esac
                     case "$status" in
                         installed) step_ok "Added ${what} to ${who}" ;;
                         already_installed) step_skip "${what} was already in ${who}" ;;
@@ -1034,7 +1094,9 @@ if agent_setup_allowed; then
                     esac
                 done <"${WORK_DIR}/mcp-rows"
                 if [ "$mcp_ok" = no ]; then
-                    [ -s "${WORK_DIR}/mcp-rows" ] || step_warn "Could not add the Mapbox MCP servers."
+                    # A failure no row above accounts for still gets a line of
+                    # its own, rather than a list of successes.
+                    [ "$mcp_trouble" = yes ] || step_warn "Not every Mapbox MCP server could be added."
                     step_detail "Run 'mapbox mcp install --global' to see why and try again."
                 fi
             else
 
@@ -342,13 +342,16 @@ case "${1:-}" in
             fi
             echo '{"results":[{"client":"claude-code","server":"mapbox","status":"'"$status"'"},{"client":"claude-code","server":"mapbox-devkit","status":"'"$status"'"},{"client":"vscode","server":"mapbox","status":"'"$status"'"}]}'
         elif [ "$mcp_mode" = fail ]; then
-            echo '{"results":[{"client":"claude-code","server":"mapbox","status":"installed"},{"client":"vscode","error":"boom","server":"mapbox","status":"failed"}]}'
+            echo '{"results":[{"client":"claude-code","server":"mapbox","status":"installed"},{"client":"vscode","error":"--add-mcp rejected {\\"name\\":\\"mapbox\\"}","server":"mapbox","status":"failed"}]}'
             exit 1
         else
             # Like a real client's own output: colored, and longer than any
             # terminal is wide.
             printf '\033[2mFile modified: /%s/zz-end-of-long-line\033[0m\n' \
                 "$(printf 'a%.0s' $(seq 1 200))" >&2
+            printf 'Open https://auth.example.com/authorize?state=%s&end=zz-url-end\n' \
+                "$(printf 'b%.0s' $(seq 1 120))" >&2
+            echo 'waiting for sign-in' >&2
             # Mixed on purpose: added now, already there, and a row with an
             # "error" key, which sorts between "client" and "server" as the
             # real CLI's serde_json maps do.
@@ -1101,6 +1104,31 @@ export MAPBOX_NO_MODIFY_PATH=0
 run_piped && status=0 || status=$?
 expect_file "${HOME}/.zshrc" 'MAPBOX_NO_MODIFY_PATH=0 is not an opt-out'
 
+start 'a mention of the dir that does not put it on PATH is not mistaken for one'
+new_case_env off-path-near-miss
+export SHELL=/bin/zsh
+export MAPBOX_INSTALL_TILESETS=no
+# The $PATH is meant literally: it is profile text.
+# shellcheck disable=SC2016
+printf '# %s is where mapbox goes\nexport PATH="%s2:$PATH"\nalias m=%s/mapbox\n' \
+    "$BIN_DIR" "$BIN_DIR" "$BIN_DIR" >"${HOME}/.zshrc"
+run_piped && status=0 || status=$?
+expect_status 0 "$status" 'exits 0'
+expect_no_out 'already set up' 'a comment, a longer dir and a file under it are not the dir'
+expect_in_file "${HOME}/.zshrc" "export PATH=\"${BIN_DIR}:\$PATH\"" 'so it adds the line'
+
+if [ "$(uname -s)" = Darwin ]; then
+    start 'bash on macOS writes to an existing .profile rather than shadowing it'
+    new_case_env off-path-bash-profile
+    export SHELL=/bin/bash
+    export MAPBOX_INSTALL_TILESETS=no
+    echo 'export EDITOR=vi' >"${HOME}/.profile"
+    run_piped && status=0 || status=$?
+    expect_status 0 "$status" 'exits 0'
+    expect_in_file "${HOME}/.profile" "export PATH=\"${BIN_DIR}:\$PATH\"" 'writes the line into ~/.profile'
+    expect_no_file "${HOME}/.bash_profile" 'and creates no .bash_profile, which login bash would read instead'
+fi
+
 start 'a terminal gets color and NO_COLOR takes it away'
 new_case_env color
 export MAPBOX_INSTALL_TILESETS=no
@@ -1396,7 +1424,8 @@ expect_out 'This runs mapbox mcp install --global' 'names the command it runs'
 expect_out 'This runs mapbox mcp install --global, now or any time later.' 'says it can be run later instead'
 expect_out 'Add them now? [y/N]' 'asks about now'
 expect_out 'Added Mapbox MCP to Claude Code' 'reports each server added now'
-expect_out 'File modified: /aaaa' 'shows the command output live'
+expect_out 'waiting for sign-in' 'shows the command output live'
+expect_out 'zz-url-end' 'prints a URL in full, wider than the screen, so it can be opened'
 expect_no_out 'zz-end-of-long-line' 'cut to the screen, so the spinner can redraw in place'
 expect_out "$(printf '\033[?7l')" 'turns line wrap off while the spinner runs'
 expect_out "$(printf '\033[?7h')" 'and back on after'
@@ -1455,6 +1484,17 @@ expect_status 0 "$status" 'mapbox itself is still installed'
 expect_out 'Could not add Mapbox MCP to VS Code' 'reports which one failed'
 expect_out 'Added Mapbox MCP to Claude Code' 'and still reports the one that worked'
 expect_out "Run 'mapbox mcp install --global' to see why and try again." 'points at the command'
+expect_out 'Could not add Mapbox MCP to VS Code' 'a failure whose error text has braces is still named'
+
+start 'MCP, TERM=dumb: no spinner escape codes'
+new_case_env mcp-dumb
+export MAPBOX_CLI_BASE_URL="file://${AGENT_CHANNEL}"
+export MAPBOX_INSTALL_TILESETS=no
+export MAPBOX_TEST_MCP_MODE=fresh
+TERM=dumb run_interactive "$(printf 'n\ny')" && status=0 || status=$?
+expect_status 0 "$status" 'exits 0'
+expect_out 'Added Mapbox MCP to Claude Code' 'still adds them'
+expect_no_out "$(printf '\033[?25l')" 'without hiding the cursor or redrawing in place'
 
 # --- result ----------------------------------------------------------------