diff --git a/packages/integration-tests/src/agent-claude-code.integration.test.ts b/packages/integration-tests/src/agent-claude-code.integration.test.ts
index 2c65a2d45..559f931ba 100644
--- a/packages/integration-tests/src/agent-claude-code.integration.test.ts
+++ b/packages/integration-tests/src/agent-claude-code.integration.test.ts
@@ -139,6 +139,7 @@ describe.skipIf(!realProject)("path encoding & JSONL reading (real Claude data)"
         "user",
         "assistant",
         "system",
+        "last-prompt",
         "tool_use",
         "progress",
         "permission_request",
diff --git a/packages/web/src/app/globals.css b/packages/web/src/app/globals.css
index 24915a350..4d617244d 100644
--- a/packages/web/src/app/globals.css
+++ b/packages/web/src/app/globals.css
@@ -3088,6 +3088,12 @@ html.light .xterm .xterm-viewport:hover::-webkit-scrollbar-thumb:active {
   pointer-events: none;
 }
 
+@media (max-width: 767px) {
+  .toast-container {
+    bottom: calc(env(safe-area-inset-bottom, 0px) + 76px);
+  }
+}
+
 .toast {
   pointer-events: auto;
   display: flex;
diff --git a/scripts/ao-doctor.sh b/scripts/ao-doctor.sh
index 6652df22f..dee26e12d 100755
--- a/scripts/ao-doctor.sh
+++ b/scripts/ao-doctor.sh
@@ -197,19 +197,19 @@ check_launcher() {
     return
   fi
 
-  if [ "$FIX_MODE" = true ] && command -v npm >/dev/null 2>&1 && [ -d "$REPO_ROOT/packages/cli" ]; then
-    if (cd "$REPO_ROOT/packages/cli" && npm link >/dev/null 2>&1) && command -v ao >/dev/null 2>&1; then
+  if [ "$FIX_MODE" = true ] && command -v npm >/dev/null 2>&1 && [ -d "$REPO_ROOT/packages/ao" ]; then
+    if (cd "$REPO_ROOT/packages/ao" && npm link >/dev/null 2>&1) && command -v ao >/dev/null 2>&1; then
       fixed "ao launcher refreshed with npm link"
       return
     fi
     if [ -t 0 ]; then
       printf '  Permission denied. Retrying with sudo...\n'
-      if (cd "$REPO_ROOT/packages/cli" && sudo npm link >/dev/null 2>&1) && command -v ao >/dev/null 2>&1; then
+      if (cd "$REPO_ROOT/packages/ao" && sudo npm link >/dev/null 2>&1) && command -v ao >/dev/null 2>&1; then
         fixed "ao launcher refreshed with sudo npm link"
         return
       fi
     fi
-    warn "ao launcher refresh failed. Fix: cd $REPO_ROOT/packages/cli && sudo npm link"
+    warn "ao launcher refresh failed. Fix: cd $REPO_ROOT/packages/ao && sudo npm link"
     return
   fi
 
diff --git a/scripts/ao-update.sh b/scripts/ao-update.sh
index 77a08d3fd..43a2b26c4 100755
--- a/scripts/ao-update.sh
+++ b/scripts/ao-update.sh
@@ -116,14 +116,14 @@ if [ "$SMOKE_ONLY" = false ]; then
 
   printf '\nRefreshing ao launcher...\n'
   (
-    cd "$REPO_ROOT/packages/cli"
+    cd "$REPO_ROOT/packages/ao"
     if npm link 2>/dev/null; then
       :
     elif [ -t 0 ]; then
       printf '  Permission denied. Retrying with sudo...\n'
       sudo npm link
     else
-      printf 'ERROR: Permission denied. Run manually: cd %s/packages/cli && sudo npm link\n' "$REPO_ROOT"
+      printf 'ERROR: Permission denied. Run manually: cd %s/packages/ao && sudo npm link\n' "$REPO_ROOT"
       exit 1
     fi
   )
diff --git a/scripts/setup.sh b/scripts/setup.sh
index a41f6d7cc..ce50fb3c7 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -136,14 +136,14 @@ pnpm build
 
 echo ""
 echo "Linking CLI globally..."
-cd packages/cli
+cd packages/ao
 if npm link 2>/dev/null; then
   :
 elif [ "$INTERACTIVE" = true ]; then
   echo "  Permission denied. Retrying with sudo..."
   sudo npm link
 else
-  echo "ERROR: Permission denied. Run manually: cd packages/cli && sudo npm link"
+  echo "ERROR: Permission denied. Run manually: cd packages/ao && sudo npm link"
   exit 1
 fi
 cd "$REPO_ROOT"