From 3cb0c3e0ed7a25bc7fa2e5ed5b9f3ed9d5b60242 Mon Sep 17 00:00:00 2001
From: 28allday <gavin.nugent@hey.com>
Date: Fri, 29 May 2026 15:54:53 +0100
Subject: [PATCH] =?UTF-8?q?firstrun:=20track=20omaterm=20install=20changes?=
 =?UTF-8?q?=20=E2=80=94=20drop=20redundant=20AI-agent=20step,=20run=20OMAT?=
 =?UTF-8?q?ERM=20last?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

omaterm.org/install now installs the AI agents itself (node/opencode/
claude-code/codex/gemini are in its mise.packages) and its installer ends
with `exec bash -l`, which re-sources ~/.bash_profile.

- Remove our now-redundant "Install AI agents via mise" prompt and its
  stale comment (omaterm provides them).
- Guard against the re-sourced .bash_profile re-firing the welcome: the
  firstrun script removes itself up-front, so the one-shot stays one-shot.
- Reorder so OMATERM runs last (Once + Omarchy-Send first), since its
  `exec bash -l` hijacks the shell and drops the user into their session.
- Update welcome banner + in-script docs to list the bundled AI agents
  and the new ordering. Also gitignore build.log.

Verified: pty-backed logic harness (ordering, one-shot, no recursion) and
a full VM boot of the rebuilt ISO (welcome + Once-first + clean no-recursion
shell on omaterm's failure path).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .gitignore  |  1 +
 omalocal.sh | 89 +++++++++++++++++++++--------------------------------
 2 files changed, 36 insertions(+), 54 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1190225..ca8b2c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ omalocal-arch-*.iso
 omaterm-arch-*.iso
 *.ppm
 *.png
+build.log
diff --git a/omalocal.sh b/omalocal.sh
index 305e6ff..2c8f366 100755
--- a/omalocal.sh
+++ b/omalocal.sh
@@ -364,8 +364,12 @@ chmod 644 /mnt/etc/profile.d/mise-shims.sh
 echo "==> Installing omalocal first-login prompt for $USERNAME..."
 cat > "/mnt/home/$USERNAME/.omalocal-firstrun.sh" <<'OMALOCAL_FIRSTRUN'
 #!/usr/bin/env bash
-# Shown once, on first interactive login. The .bash_profile hook removes this
-# file after it runs, so the prompt never appears again.
+# Shown once, on first interactive login. Remove ourselves up-front: OMATERM's
+# installer ends with `exec bash -l`, which re-sources ~/.bash_profile. If this
+# file still existed at that point the first-run hook would re-fire and we'd
+# recurse into the welcome prompt. Deleting it now (rather than letting the
+# .bash_profile hook delete it after we return) makes the prompt strictly once.
+rm -f "$HOME/.omalocal-firstrun.sh"
 
 clear
 cat <<'BANNER'
@@ -379,7 +383,8 @@ cat <<'BANNER'
   Setting up the server installs two things:
 
     OMATERM  — a terminal-first toolkit: starship, neovim, tmux,
-               mise, docker, lazygit, claude-code, yay, etc.
+               mise, docker, lazygit, yay, plus AI agents
+               (claude-code, codex, opencode, gemini), etc.
     Once     — Basecamp's self-hosted app deployment platform.
 
   Optional extra:
@@ -394,61 +399,24 @@ cat <<'BANNER'
 
 BANNER
 
+setup_server=0
 read -rp "  Set up this server (OMATERM + Once) now? [Y/n] " ans </dev/tty
 case "$ans" in
   [Nn]*)
     echo
     echo "  Skipped. To set up later, run:"
-    echo "      curl -fsSL https://omaterm.org/install | bash"
     echo "      curl https://get.once.com | ONCE_INTERACTIVE=false sh"
+    echo "      curl -fsSL https://omaterm.org/install | bash"
     echo
     ;;
   *)
+    setup_server=1
+    # Install Once FIRST. OMATERM is deferred to the very end of this script
+    # because its installer finishes with `exec bash -l`, hijacking this shell
+    # and dropping the user straight into their new tmux session — nothing after
+    # that call would ever run. So Once (and Omarchy-Send below) go first.
     echo
-    echo "  [1/2] Installing OMATERM..."
-    omaterm_ok=0
-    if curl -fsSL https://omaterm.org/install | bash; then
-      echo "        OMATERM installed."
-      omaterm_ok=1
-    else
-      echo "        OMATERM install did not complete — retry later with:"
-      echo "          curl -fsSL https://omaterm.org/install | bash"
-    fi
-
-    # AI agents (opencode, claude-code, codex, gemini) are NOT installed by the
-    # bare-metal omaterm.org installer — they're mise tools that only the Docker
-    # image bakes in. Offer to add them here via mise. mise itself comes with
-    # OMATERM (pacman), so it's on PATH even before this shell sources its hooks.
-    # gemini (@google/gemini-cli) is an npm package, so it needs Node — which the
-    # bare-metal OMATERM install does NOT provide. Install node@latest first or
-    # gemini fails with "npm not found"; the other three are standalone binaries.
-    if [ "$omaterm_ok" = 1 ] && command -v mise >/dev/null 2>&1; then
-      echo
-      read -rp "  Install AI agents (opencode, claude-code, codex, gemini) via mise? [Y/n] " ans </dev/tty
-      case "$ans" in
-        [Nn]*)
-          echo "        Skipped. Add later with: mise use -g node@latest opencode claude-code codex gemini"
-          ;;
-        *)
-          echo "        Installing agents (this can take a while)..."
-          # node@latest first: gemini-cli is npm-based and needs it.
-          if mise use -g -y node@latest opencode claude-code codex gemini; then
-            # Generate shims so claude/codex/opencode/gemini land on PATH (the
-            # /etc/profile.d/mise-shims.sh snippet adds the shims dir next login).
-            mise reshim 2>/dev/null || true
-            echo "        Agents installed."
-            echo "        Runnable as: claude, codex, opencode, gemini"
-            echo "        (start a fresh shell / re-login to pick them up on PATH)"
-          else
-            echo "        Some agents did not install — retry later with:"
-            echo "          mise use -g node@latest opencode claude-code codex gemini"
-          fi
-          ;;
-      esac
-    fi
-
-    echo
-    echo "  [2/2] Installing Once..."
+    echo "  [1/2] Installing Once..."
     if curl https://get.once.com | ONCE_INTERACTIVE=false sh; then
       echo "        Once installed."
     else
@@ -467,10 +435,6 @@ case "$ans" in
     echo "        once-add book ghcr.io/basecamp/writebook   # non-interactive"
     echo "    -> reachable at http://book.local from any machine on the LAN."
     echo "    Use a single-label name; it serves over http:// (no TLS on a LAN box)."
-
-    echo
-    echo "  Done. Start a fresh shell to pick up OMATERM's changes."
-    echo
     ;;
 esac
 
@@ -499,6 +463,23 @@ case "$ans" in
     echo
     ;;
 esac
+
+# OMATERM goes LAST. Its installer (omaterm.org/install) ends with `exec bash -l`,
+# which replaces this shell and drops the user into their configured tmux session
+# — so nothing after this call would run, which is exactly why it's the closer.
+# OMATERM now also installs the AI agents itself (node, opencode, claude-code,
+# codex, gemini are in its mise.packages), so there's no separate agent step.
+if [ "$setup_server" = 1 ]; then
+  echo
+  echo "  [2/2] Installing OMATERM (toolkit + AI agents: claude-code, codex,"
+  echo "        opencode, gemini)... when it finishes you'll be dropped straight"
+  echo "        into your new shell."
+  echo
+  curl -fsSL https://omaterm.org/install | bash || {
+    echo "        OMATERM install did not complete — retry later with:"
+    echo "          curl -fsSL https://omaterm.org/install | bash"
+  }
+fi
 OMALOCAL_FIRSTRUN
 
 # Append the one-shot hook. Only fires on an interactive login shell, and only
@@ -680,10 +661,10 @@ Installed by `omalocal.sh`, a single-script patcher that takes a stock Arch ISO
 - **Bootloader**: systemd-boot at `/boot/loader/`.
 - **Login banner**: `/etc/issue` shows hostname + IPv4 + ssh hint above the console login prompt.
 
-On the user's first interactive login a self-removing `~/.bash_profile` hook offers to set up the server, which installs two things back-to-back:
+On the user's first interactive login a self-removing `~/.bash_profile` hook offers to set up the server. Once is installed first; OMATERM is installed last because its installer ends with `exec bash -l` and drops the user straight into their new shell:
 
-- **Omaterm** (https://omaterm.org) — `curl -fsSL https://omaterm.org/install | bash` — terminal-first toolkit: starship, neovim, tmux, mise, docker, lazygit, claude-code, yay, etc.
 - **Once** (https://once.com) — `curl https://get.once.com | ONCE_INTERACTIVE=false sh` — Basecamp's self-hosted app deployment platform.
+- **Omaterm** (https://omaterm.org) — `curl -fsSL https://omaterm.org/install | bash` — terminal-first toolkit: starship, neovim, tmux, mise, docker, lazygit, yay, plus AI agents (claude-code, codex, opencode, gemini), etc. OMATERM installs the AI agents itself (they're in its `mise.packages`), so there's no separate agent step.
 
 If the user declined, install them manually with those same two commands.