From 8c6897767652417019d55500b554f42ee49c9da4 Mon Sep 17 00:00:00 2001
From: Adam Svoboda <eidamsvoboda@gmail.com>
Date: Sat, 13 Jun 2026 22:34:47 +0200
Subject: [PATCH 1/7] akill/ikill -n flag, adb improvements, readme fixes, stay
 dead launch

---
 CLAUDE.md         | 82 +++++++++++++++++++++++++++++++++++++++++++++++
 README.md         | 52 ++++++++++++++++--------------
 android/aemulator |  7 ++--
 android/akill     | 29 ++++++++++++++---
 changelog.txt     | 34 ++++++++++++--------
 common_tools      | 13 ++++++--
 ios/ikill         | 45 +++++++++++++++++++-------
 7 files changed, 204 insertions(+), 58 deletions(-)
 create mode 100644 CLAUDE.md

diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 00000000..8f7b760b
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,82 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## What This Is
+
+A collection of shell scripts for controlling Android and iOS devices/emulators/simulators from the terminal. No build step — scripts are executable bash files added to `$PATH`.
+
+## Linting
+
+Shellcheck runs in CI on every push (`.github/workflows/shellcheck.yml`). To run it locally:
+
+```bash
+shellcheck android/<script> ios/<script> common_tools
+```
+
+Disabled rules (match CI): `SC1090`, `SC2207`, `SC2001`, `SC1091`
+
+## Testing
+
+No automated test suite. Testing is manual and requires a connected device or running emulator/simulator.
+
+To test a single script, run it directly:
+
+```bash
+# Android (requires ADB device connected or emulator running)
+./android/ascreenshot
+./android/ascreenshot -a   # all devices
+
+# iOS (requires physical device paired via go-ios, or simulator)
+./ios/iscreenshot
+./ios/iscreenshot -a        # all devices
+```
+
+## Architecture
+
+```
+android/          # 31 bash scripts — ADB-based Android device control
+ios/              # 14 bash scripts — go-ios based iOS device control
+common_tools      # Shared bash library sourced by all scripts
+~/.local/state/mobile-toolkit/  # Runtime state: device lists, metadata, appledb cache
+```
+
+### Script Pattern
+
+Every script follows this structure:
+
+```bash
+#!/bin/bash
+LOCATION=$(dirname "$0")
+source "$LOCATION"/../common_tools
+
+# script logic here
+```
+
+### `common_tools` Library
+
+The central shared library. Key functions:
+
+- `android_choose_device` / `ios_choose_device` — interactive or automatic device selection
+- `android_device_info` / `ios_device_info` — fetch device metadata
+- `check_dependency <tool>` — verify a tool (adb, jq, go-ios, etc.) is installed
+- `check_for_update` — daily `git fetch`/`git pull` auto-update trigger
+
+### Android vs iOS
+
+| | Android | iOS |
+|---|---|---|
+| Core tool | `adb` (Android Debug Bridge) | `go-ios` (cross-platform) |
+| Screen control | `scrcpy` | Simulator-specific APIs |
+| JSON parsing | `jq` | `jq` |
+
+### Multi-device Support
+
+Most scripts accept `-a` (all devices) or `-d <udid>` flags. When multiple devices are connected and no flag is passed, the script prompts for interactive selection.
+
+## Contribution Guidelines (from CONTRIBUTING.md)
+
+- Test every code change and all usage variants before submitting
+- Follow the existing script format and emoji-based terminal output style
+- Update README.md with any new commands or changed behavior
+- Update `changelog.txt` with your changes
diff --git a/README.md b/README.md
index c5a1bd85..e9976881 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 ## What is its purpose?
 🛠 **Control Android & iOS devices:** Capture screen, manage apps, simulate input, examine system logs etc.<br>
 
-⚡️ **Speed++** Are you an app developer or a tester? Boost your effectivity, discover new tools!
+⚡️ **Speed++** Are you an app developer or a tester? Boost your efficiency, discover new tools!
 
 
 <div id='section-id-8'/>
@@ -13,7 +13,7 @@
 
 📲 **Control Android and iOS devices** or Emulators/Simulators using terminal commands<br>
 
-🛠 **Take screeshots, change device settings**, gather app & device information<br>
+🛠 **Take screenshots, change device settings**, gather app & device information<br>
 
 ⚙️ **Manage mobile applications** - install, restart, wipe data and much more<br>
 
@@ -93,26 +93,25 @@
 _Note: This tool targets macOS for compatibility, but most interactions should work on any Unix system._
 <br>
 1. **Open terminal**
-2. **Clone this repository** `git clone https://github.com/IntergalacticPenguin/mobile-toolkit.git`
+2. **Clone this repository** `git clone https://github.com/IGPenguin/mobile-toolkit.git`
 3. **Setup Android tools**
 	* **[Download](https://developer.android.com/studio/ "Android Studio") and install Android Studio** and **Android command line tools** (using Android Studio SDK manager)
 	* **Edit .zshrc** (or .bash_profile if you have bash shell) `open -e ~/.zshrc`
-	  * **Insert this line at the end** `PATH=$PATH:/Users/dummyuser/Library/Android/sdk/platform-tools export PATH`
+	  * **Insert this line at the end** `export PATH=$PATH:/Users/dummyuser/Library/Android/sdk/platform-tools`
 	  * **Don't forget to replace "dummyuser" with your account username**
-	  * **Use full path to the "platform-tools" directory**
+	  * **Use full path to the "platform-tools" directory on your machine**
 	* **[Allow USB debugging](https://developer.android.com/studio/debug/dev-options) on your device, connect it and authorize your computer** (click OK on the device screen)
 4. **Setup iOS tools**
 	* **Install latest Xcode and iOS command line tools** using [App Store](https://apps.apple.com/cz/app/xcode/id497799835?mt=12)
-	* **Install [Homebrew](https://brew.sh/ "Homberew") package manager**
+	* **Install [Homebrew](https://brew.sh/ "Homebrew") package manager**
 	* **Run Xcode, connect iOS device to USB and authorize your computer** (click "Trust" on the device screen)
-	* **Run any script i.e. `iscreenshot`, installation of all required tools will be initiated automatically** ([jq](https://stedolan.github.io/jq/) and [go-ios](https://github.com/danielpaulus/go-ios "go-ios"))
+	* **Run any script e.g. `iscreenshot`, installation of all required tools will be initiated automatically** ([jq](https://stedolan.github.io/jq/) and [go-ios](https://github.com/danielpaulus/go-ios "go-ios"))
 5. **Add Mobile Toolkit to $PATH**, it is mandatory for iOS scripts and it will let you run scripts in any directory
 	* **Edit .zshrc** (or .bash_profile if you have bash shell) `open -e ~/.zshrc`
-	  * **Insert the following lines at the end** <br> `PATH=$PATH:/Users/dummyuser/mobile-toolkit/android` <br>
-	`PATH=$PATH:/Users/dummyuser/mobile-toolkit/ios`
+	  * **Insert the following lines at the end** <br> `export PATH=$PATH:/Users/dummyuser/mobile-toolkit/android` <br>
+	`export PATH=$PATH:/Users/dummyuser/mobile-toolkit/ios`
 	  * **Don't forget to replace "dummyuser" with your account username**
 	  * **Use full path to the "mobile-toolkit" directory** (where you cloned this repository)
-	  * **Add** `export PATH` **to the end of the file**
 
 </details>
 
@@ -170,7 +169,7 @@ _Note: This tool targets macOS for compatibility, but most interactions should w
 <div id='section-id-85'/>
 
 ### 🔊 atalkback
-* `atalkback` Toggle TalkBack screen reader accessiblity option
+* `atalkback` Toggle TalkBack screen reader accessibility option
 
 <div id='section-id-88'/>
 
@@ -221,7 +220,7 @@ _Note: This tool targets macOS for compatibility, but most interactions should w
 
 ### 🚀 alaunch
 * `alaunch` List third-party apps and choose one to run it
-* `alaunch -s` List all available apps (including os pre-installed) and choose one to run it
+* `alaunch -s` List all available apps (including OS pre-installed) and choose one to run it
 * `alaunch com.dummy.package.name.app` Run app by package name
 
 <div id='section-id-118'/>
@@ -240,7 +239,9 @@ _Note: This tool targets macOS for compatibility, but most interactions should w
 
 ### 🔪 akill
 * `akill` Restart the foreground app
+* `akill -n` Kill the foreground app without relaunching it
 * `akill com.dummy.package.name.app` Target specific app by passing package name as argument
+* `akill com.dummy.package.name.app -n` Kill selected app without relaunching it
 
 <div id='section-id-132'/>
 
@@ -259,7 +260,7 @@ _Note: This tool targets macOS for compatibility, but most interactions should w
 ### 🗑 auninstall
 * `auninstall` Uninstall third-party app, choose from the list
 * `auninstall com.dummy.package.name.app` pass package name as argument
-* `auninstall -w` Uninstall all-third party packages
+* `auninstall -w` Uninstall all third-party packages
 	* Skips some essential apps, edit IGNORED_PACKAGES in this script to customize the list to your needs
 
 <div id='section-id-146'/>
@@ -313,8 +314,8 @@ _Note: This tool targets macOS for compatibility, but most interactions should w
 <div id='section-id-180'/>
 
 ### 📋 acheckdevice
-* Print genereal device information
-* Perform basic safety-checks and toggle "testing firendly" settings
+* Print general device information
+* Perform basic safety-checks and toggle "testing friendly" settings
   * 10 minutes screen timeout
   * Highest brightness
   * Automatic date
@@ -343,7 +344,7 @@ _Note: This tool targets macOS for compatibility, but most interactions should w
   * **Add the following line at the end of the file** `export JAVA_HOME='/Applications/Android Studio.app/Contents/jbr/Contents/Home'`
 
 * Android emulator supports all listed scripts by default + extra actions listed below
-* `aemulator <option>` Handle various Android emulator activites
+* `aemulator <option>` Handle various Android emulator activities
   * `start` - choose and launch installed emulator
   * `gprs | edge | 3g` - simulate network latency, choose one
   * `call <number>` - receive fake call
@@ -359,7 +360,7 @@ _Note: This tool targets macOS for compatibility, but most interactions should w
 * `atestmonkey` Default test with random seed and 15000 input events
 * `atestmonkey <event-count>` Test with random seed and custom input event count
 * `atestmonkey <event-count> <seed>` Test with custom seed and custom event count
-* Perform automated stress test using [Application Excersciser Monkey](https://developer.android.com/studio/test/monkey)
+* Perform automated stress test using [Application Exerciser Monkey](https://developer.android.com/studio/test/monkey)
 * You can end test prematurely using ctrl^c or `atestmonkeykill` in case something goes wrong
 * App under test needs to be pinned to fullscreen mode to prevent unwanted interactions elsewhere
 * Screen pinning button location is directly tied to OS version and device manufacturer skin.
@@ -426,15 +427,18 @@ _Note: This tool targets macOS for compatibility, but most interactions should w
 
 ### 🚀 ilaunch
 * `ilaunch` List third-party apps and choose one to run it
-* `ilaunch -s` List os pre-installed apps and choose one to run it
+* `ilaunch -s` List OS pre-installed apps and choose one to run it
 * `ilaunch com.dummy.bundle.id.app` Run app by bundle id
 
 <div id='section-id-271'/>
 
 ### 🔪 ikill
 * `ikill` List third-party apps and choose one to restart
-* `ikill -s` List os pre-installed apps and choose one to restart
+* `ikill -n` List third-party apps and choose one to kill without relaunching it
+* `ikill -s` List OS pre-installed apps and choose one to restart
+* `ikill -s -n` List OS pre-installed apps and choose one to kill without relaunching it
 * `ikill com.dummy.bundle.id.app` Target specific app by passing bundle id as argument
+* `ikill com.dummy.bundle.id.app -n` Kill selected app without relaunching it
 
 <div id='section-id-276'/>
 
@@ -448,7 +452,7 @@ _Note: This tool targets macOS for compatibility, but most interactions should w
 <div id='section-id-281'/>
 
 ### 💬 ilang
-* `ilang <lang>` Change the device language to different one, according to ISO-639 (i.e. "cs")
+* `ilang <lang>` Change the device language to different one, according to ISO-639 (e.g. "cs")
 * `ilang` Change the device language to different one, choose from a list of all supported
 
 <div id='section-id-285'/>
@@ -471,7 +475,7 @@ _Note: This tool targets macOS for compatibility, but most interactions should w
 
 ### 📱 isimulator
 * Simulator has limited functionality (no camera, biometrics, Appstore...), but **offers some extra options, unavailable on physical iOS devices**
-* `isimulator <option>` Handle various simulator related activites
+* `isimulator <option>` Handle various simulator related activities
   * `start` - choose and launch installed simulator
   * `screenshot` - save screenshot to ~/Desktop
   * `record` - save screen recording to ~/Desktop (full resolution and frame rate, without QuickTime hassle)
@@ -494,7 +498,7 @@ _Note: This tool targets macOS for compatibility, but most interactions should w
 
 <strong>Feedback & Contribution</strong><br>
 
-<sup>⁉️ [Submit an issue](https://github.com/IntergalacticPenguin/mobile-toolkit/issues/new/choose) to report any bugs, request a feature or ask questions.</sup><br>
-<sup>🤝 [Pull requests](https://github.com/IntergalacticPenguin/mobile-toolkit/blob/master/.github/CONTRIBUTING.md "contribution rules") are highly **appreciated**, see the [issue board](https://github.com/IntergalacticPenguin/mobile-toolkit/projects/3).</sup><br>
-<sup>💬 Also <strong>visit my [NoMo](https://github.com/IGPenguin/nomo)</strong> project and leave a star.</sup><br>
+<sup>⁉️ [Submit an issue](https://github.com/IGPenguin/mobile-toolkit/issues/new/choose) to report any bugs, request a feature or ask questions.</sup><br>
+<sup>🤝 [Pull requests](https://github.com/IGPenguin/mobile-toolkit/blob/master/.github/CONTRIBUTING.md "contribution rules") are highly **appreciated**, see the [issue board](https://github.com/IGPenguin/mobile-toolkit/projects/3).</sup><br>
+<sup>💀 Check out <strong>[Stay Dead](https://igpenguin.github.io/stay-dead)</strong> - my choice-based RPG, now in open beta!</sup><br>
 <sup>🔗 Find me on [LinkedIn](https://www.linkedin.com/in/intergalacticpenguin/) or [Twitter](https://twitter.com/IGPenguin).</sup><br>
diff --git a/android/aemulator b/android/aemulator
index a6a4b9f8..860d6a7b 100755
--- a/android/aemulator
+++ b/android/aemulator
@@ -18,7 +18,7 @@ help(){
   else
     echo "🤷 Option missing"
   fi
-  echo -e "Use one of the following options:\\n  start - choose and launch installed emulator\\n  gprs | edge | 3g - set network latency\\n  call <number> - receive fake call\\n  sms <number> <text> - recieve fake sms\\n  gps <lat> <long> - set manual gps location\\n  battery <0-100> - set manual battery level\\n  telnet <command> - call telnet command (see README.md)"
+  echo -e "Use one of the following options:\\n  start - choose and launch installed emulator\\n  gprs | edge | 3g - set network latency\\n  call <number> - receive fake call\\n  sms <number> <text> - receive fake sms\\n  gps <lat> <long> - set manual gps location\\n  battery <0-100> - set manual battery level\\n  telnet <command> - call telnet command (see README.md)"
 }
 
 check_java_dependency(){
@@ -47,7 +47,8 @@ check_running_emulator(){
 get_emulator_list(){
   echo "⏳ Getting Android emulator list..."
   rm -f "$LOCAL_EMULATOR_LIST"
-  "$ANDROID_HOME"/cmdline-tools/latest/bin/avdmanager list avd | grep Name | awk '{print $2}' >> "$LOCAL_EMULATOR_LIST"
+  ANDROID_SDK="${ANDROID_HOME:-$HOME/Library/Android/sdk}"
+  "$ANDROID_SDK"/emulator/emulator -list-avds >> "$LOCAL_EMULATOR_LIST" 2>/dev/null
   if [ "$(nl "$LOCAL_EMULATOR_LIST")" == "" ]; then
     should_proceed "🤷‍ No emulators installed, install via Android Studio?"
     echo "⏳ Opening Android Studio..."
@@ -73,7 +74,7 @@ launch_emulator(){
     launch_emulator
   else
     echo  "🚀 Launching emulator..."
-    nohup "$ANDROID_HOME"/emulator/emulator -avd "$EMULATOR_NAME" -no-snapshot &> /dev/null &
+    nohup "$ANDROID_SDK"/emulator/emulator -avd "$EMULATOR_NAME" -no-snapshot &> /dev/null &
     rm "$LOCAL_EMULATOR_LIST"
   fi
 }
diff --git a/android/akill b/android/akill
index 3b37f57d..0312f7af 100755
--- a/android/akill
+++ b/android/akill
@@ -3,15 +3,36 @@ LOCATION=$(dirname "$0")
 source "$LOCATION"/../common_tools
 android_choose_device
 
-if [[ "$1" != "" ]];
-then
+# Usage:
+#  akill [PACKAGE_NAME]        # kills and (by default) relaunches the app
+#  akill -n                   # kill foreground package and DO NOT relaunch
+#  akill PACKAGE_NAME -n      # kill given package and DO NOT relaunch
+# If -n is not provided, the script will relaunch the app after killing it.
+
+# Determine package and relaunch flag (relaunch is default)
+RELAUNCH=true
+if [[ "$1" == "-n" ]]; then
+    RELAUNCH=false
+    if [[ -n "$2" ]]; then
+        PACKAGE_NAME=$2
+        android_is_package_installed "$PACKAGE_NAME"
+    else
+        PACKAGE_NAME=$(android_get_foreground_package)
+    fi
+elif [[ -n "$1" ]]; then
     PACKAGE_NAME=$1
     android_is_package_installed "$PACKAGE_NAME"
+    if [[ "$2" == "-n" ]]; then
+        RELAUNCH=false
+    fi
 else
     PACKAGE_NAME=$(android_get_foreground_package)
 fi
 
 echo "🔪 Package \"$PACKAGE_NAME\" process killed"
 adb -s "$SELECTED_DEVICE" shell am force-stop "$PACKAGE_NAME"
-echo "🚀 Relaunching the app..."
-adb -s "$SELECTED_DEVICE" shell monkey -p "$PACKAGE_NAME" -c android.intent.category.LAUNCHER 1 &> /dev/null
+
+if [[ "$RELAUNCH" == true ]]; then
+  echo "🚀 Relaunching the app..."
+  adb -s "$SELECTED_DEVICE" shell monkey -p "$PACKAGE_NAME" -c android.intent.category.LAUNCHER 1 &> /dev/null
+fi
diff --git a/changelog.txt b/changelog.txt
index 16f0d1b7..42032871 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,17 +1,25 @@
-  🎉 This is a new (experimental) version 1.4.1!
+  🎉 Version 1.5.0 - compatibility update for 2026: Android 16, iOS 17-26 and Apple Silicon
 
-    📹 arecord was fixed to work with latest scrcpy version
-    If you are experiencing issues, try running "brew upgrade scrcpy"
-
-    📷 iscreenshot was fixed to work with iOS 17 or newer
-    This change is still experimental - please, report back any issues
+    🛠 Major compatibility fixes, verified on real hardware (iPhone 16 Pro / iOS 26, Pixel 6 / Android 16):
+    - Foreground app detection rewritten - was silently broken on Android 16
+    - irecord rebuilt for Apple Silicon and iOS 17+ using MJPEG and ffmpeg
+    - Developer disk images now mount automatically via go-ios (no more Xcode workaround)
+    - go-ios pinned to v1.2.0, no Go toolchain required
+    - Prompts no longer loop forever when running non-interactively
+    - Daily update check no longer exits the command you just ran
+    - Runtime state moved out of the repo to ~/.local/state/mobile-toolkit
+    ❤️ All of the above thanks to Franceskooo and the Futured team!
+    https://github.com/franceskoooo
 
-    👋 apowerbutton was added based on a pull request by luispinho
-    Thanks for your contribution, mate!
+    🔪 akill and ikill now support -n flag to kill an app without relaunching it
+    ❤️ Thanks to luispinho for the original contribution!
+    https://github.com/luispinho
 
-    ⭐️ Special thanks to Lenka and František for proposing compatibility fixes
-    https://github.com/vrbajiva
-    https://github.com/franceskoooo
+    🩹 ikill supports all flag combos (-s -n); multi-device relaunch fixed (missing --udid)
+    🤖 aemulator now lists AVDs via emulator -list-avds (avdmanager was often unreliable)
+    🔍 adb auto-detected from ANDROID_HOME when not in PATH
+    📝 README typo fixes, corrected installation instructions and updated links
+    🖤 All these small additions/fixes by me, it's been a while...
 
-    💌 Rate Mobile Toolkit and provide optional feedback using this link
-    https://forms.gle/nfBHeMSjxEQMs1kv5
+    ⭐️ BTW, I just launched Stay Dead, my choice-based RPG!
+    https://github.com/IGPenguin/stay-dead
diff --git a/common_tools b/common_tools
index 7fdc781e..f764a152 100644
--- a/common_tools
+++ b/common_tools
@@ -28,6 +28,7 @@ android_check_connected(){
 }
 
 android_wait_for_device(){
+  check_adb_dependency
   echo "⏳ Waiting for Android device..."
   adb wait-for-any-device
   android_get_devices
@@ -448,9 +449,15 @@ ios_translate_name(){
 
 check_adb_dependency(){
   if ! [ -x "$(command -v "adb")" ]; then
-    echo "🤷‍ Android Debug Bridge required!"
-    should_proceed "🔄 Install via homebrew? (this may take a while)"
-    brew install --cask "android-platform-tools"
+    ANDROID_SDK_GUESS="${ANDROID_HOME:-$HOME/Library/Android/sdk}"
+    ADB_CANDIDATE="$ANDROID_SDK_GUESS/platform-tools/adb"
+    if [ -x "$ADB_CANDIDATE" ]; then
+      export PATH="$ANDROID_SDK_GUESS/platform-tools:$PATH"
+    else
+      echo "🤷‍ Android Debug Bridge required!"
+      should_proceed "🔄 Install via homebrew? (this may take a while)"
+      brew install --cask "android-platform-tools"
+    fi
   fi
 }
 
diff --git a/ios/ikill b/ios/ikill
index 87f767b1..a27de6e3 100755
--- a/ios/ikill
+++ b/ios/ikill
@@ -3,16 +3,36 @@ LOCATION=$(dirname "$0")
 source "$LOCATION"/../common_tools
 ios_choose_device
 
-if [[ "$1" == "-s" ]]; then
-  PACKAGES=($(go-ios apps --udid="$SELECTED_DEVICE" --system | jq -r '.[] | .CFBundleIdentifier'))
-elif [[ -n "$1" ]]; then
-  PACKAGE="$1"
-  ios_is_package_installed "$PACKAGE"
-else
-  PACKAGES=($(go-ios apps --udid="$SELECTED_DEVICE" | jq -r '.[] | .CFBundleIdentifier'))
-fi
+RELAUNCH=true
+INCLUDE_SYSTEM=false
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    -n)
+      RELAUNCH=false
+      ;;
+    -s)
+      INCLUDE_SYSTEM=true
+      ;;
+    -* )
+      echo "❓ Unknown flag: $1"
+      exit 1
+      ;;
+    * )
+      PACKAGE="$1"
+      ios_is_package_installed "$PACKAGE"
+      ;;
+  esac
+  shift
+done
+
+if [[ -z "$PACKAGE" ]]; then
+  if [[ "$INCLUDE_SYSTEM" == true ]]; then
+    PACKAGES=($(go-ios apps --udid="$SELECTED_DEVICE" --system | jq -r '.[] | .CFBundleIdentifier'))
+  else
+    PACKAGES=($(go-ios apps --udid="$SELECTED_DEVICE" | jq -r '.[] | .CFBundleIdentifier'))
+  fi
 
-if [ -z "$PACKAGE" ]; then
   PACKAGES_LISTED=()
   for P in "${PACKAGES[@]}" #removes trailing \r
   do
@@ -36,5 +56,8 @@ fi
 
 echo "🔪 Killing $PACKAGE..."
 go-ios kill "$PACKAGE" --udid="$SELECTED_DEVICE" &> /dev/null
-echo "🚀 Relaunching the app..."
-go-ios launch "$PACKAGE" --udid="$SELECTED_DEVICE" &> /dev/null
+
+if [[ "$RELAUNCH" == true ]]; then
+  echo "🚀 Relaunching the app..."
+  go-ios launch "$PACKAGE" --udid="$SELECTED_DEVICE" &> /dev/null
+fi

From 30b7db4024845dc9b6691edf56856703e96ceaed Mon Sep 17 00:00:00 2001
From: Adam Svoboda <eidamsvoboda@gmail.com>
Date: Sat, 13 Jun 2026 23:01:33 +0200
Subject: [PATCH 2/7] update output

---
 android/aerase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/aerase b/android/aerase
index b80caf83..3118c60b 100755
--- a/android/aerase
+++ b/android/aerase
@@ -13,5 +13,5 @@ fi
 
 should_proceed "🧽 Do you really want to erase $APP data?"
 adb -s "$SELECTED_DEVICE" shell pm clear "$APP" &> /dev/null
-echo "🚀 Launching..."
+echo "🚀 Relaunching the app..."
 adb -s "$SELECTED_DEVICE" shell monkey -p "$APP" -c android.intent.category.LAUNCHER 1 &> /dev/null

From cea83846bfa48a1edf7a9430f8ef54d3b48ab28d Mon Sep 17 00:00:00 2001
From: Adam Svoboda <eidamsvoboda@gmail.com>
Date: Sat, 13 Jun 2026 23:02:17 +0200
Subject: [PATCH 3/7] handle failing ios tunnel, update readme with ios dev
 mode info

---
 README.md    |  2 ++
 common_tools | 36 +++++++++++++++++++++++++++++++++++-
 ios/ikill    |  4 +++-
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e9976881..5021ab19 100644
--- a/README.md
+++ b/README.md
@@ -105,6 +105,8 @@ _Note: This tool targets macOS for compatibility, but most interactions should w
 	* **Install latest Xcode and iOS command line tools** using [App Store](https://apps.apple.com/cz/app/xcode/id497799835?mt=12)
 	* **Install [Homebrew](https://brew.sh/ "Homebrew") package manager**
 	* **Run Xcode, connect iOS device to USB and authorize your computer** (click "Trust" on the device screen)
+	* **Enable Developer Mode** on the device - required for commands that control apps (`ikill`, etc.)
+		* Connecting to Xcode once reveals the option: **Settings → Privacy & Security → Developer Mode → enable → restart device**
 	* **Run any script e.g. `iscreenshot`, installation of all required tools will be initiated automatically** ([jq](https://stedolan.github.io/jq/) and [go-ios](https://github.com/danielpaulus/go-ios "go-ios"))
 5. **Add Mobile Toolkit to $PATH**, it is mandatory for iOS scripts and it will let you run scripts in any directory
 	* **Edit .zshrc** (or .bash_profile if you have bash shell) `open -e ~/.zshrc`
diff --git a/common_tools b/common_tools
index f764a152..a20656e0 100644
--- a/common_tools
+++ b/common_tools
@@ -276,6 +276,40 @@ ios_get_devices(){
   IOS_USB_DEVICES=( $(go-ios list --nojson | sort -u) )
 }
 
+ios_restart_tunnel(){
+  pkill -f "go-ios tunnel" &> /dev/null
+  sleep 1
+  nohup go-ios tunnel start --userspace --pair-record-path="$STATE_DIR" --nojson >/dev/null 2>&1 &
+  disown $!
+  sleep 3
+}
+
+ios_exec_dtx(){
+  # Runs a go-ios command that requires an active tunnel (DTX/instruments protocol).
+  # On tunnel or instrument error: restarts the tunnel once and retries automatically.
+  # Usage: ios_exec_dtx go-ios kill "$PACKAGE" --udid="$UDID"
+  local OUTPUT
+  OUTPUT=$("$@" 2>&1)
+  if echo "$OUTPUT" | grep -qi "tunnel\|DVTSecure\|processcontrol\|connection reset\|Timed out\|broken pipe\|InvalidService"; then
+    echo "⚠️ Instrument connection failed, restarting tunnel..."
+    ios_restart_tunnel
+    OUTPUT=$("$@" 2>&1)
+    if echo "$OUTPUT" | grep -qi "tunnel\|DVTSecure\|processcontrol\|connection reset\|Timed out\|broken pipe\|InvalidService"; then
+      echo "❌ Failed after tunnel restart"
+      echo "💡 Developer Mode must be enabled for this command:"
+      echo "   1. Open Xcode and connect your device - this reveals Developer Mode in Settings"
+      echo "   2. Settings → Privacy & Security → Developer Mode → enable → restart device"
+      echo "   3. Reconnect and retry"
+      return 1
+    fi
+  fi
+  if echo "$OUTPUT" | grep -qi "process not found"; then
+    echo "🤷 Process not found - app may not be running"
+    return 1
+  fi
+  return 0
+}
+
 ios_pair_device(){
   go-ios pair --udid="$1" --nojson &> /dev/null
   EXIT_CODE=$?
@@ -353,7 +387,7 @@ ios_choose_device(){
 
   if [ ${#IOS_USB_DEVICES[@]} -eq 0 ] #No device connected
   then
-     echo "❌ No iOS devices detected"
+     echo "❌ No iOS devices detected, reconnect the USB and try again"
      exit 1
   fi
 
diff --git a/ios/ikill b/ios/ikill
index a27de6e3..747a74d2 100755
--- a/ios/ikill
+++ b/ios/ikill
@@ -54,8 +54,10 @@ if [[ -z "$PACKAGE" ]]; then
   done
 fi
 
+ios_check_developer_image "$SELECTED_DEVICE"
+
 echo "🔪 Killing $PACKAGE..."
-go-ios kill "$PACKAGE" --udid="$SELECTED_DEVICE" &> /dev/null
+ios_exec_dtx go-ios kill "$PACKAGE" --udid="$SELECTED_DEVICE" || exit 1
 
 if [[ "$RELAUNCH" == true ]]; then
   echo "🚀 Relaunching the app..."

From 927cc7122ee32ce05cdd543ff0006a3689c48658 Mon Sep 17 00:00:00 2001
From: Adam Svoboda <eidamsvoboda@gmail.com>
Date: Sat, 13 Jun 2026 23:11:15 +0200
Subject: [PATCH 4/7] mute non-toolkit output

---
 ios/irecord | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ios/irecord b/ios/irecord
index ae9a1fa3..c58819e6 100755
--- a/ios/irecord
+++ b/ios/irecord
@@ -27,7 +27,7 @@ done
 STREAM_LOG="$TEMPORARY_FILE-irecord-$$"
 go-ios screenshot --stream --port="$STREAM_PORT" --udid="$SELECTED_DEVICE" > "$STREAM_LOG" 2>&1 &
 STREAM_PID=$!
-trap 'kill $STREAM_PID &> /dev/null; rm -f "$STREAM_LOG"' EXIT
+trap 'kill $STREAM_PID &> /dev/null; wait $STREAM_PID 2>/dev/null; rm -f "$STREAM_LOG"' EXIT
 
 # go-ios <= 1.2.0 ignores --port and always binds its default - read the real port from the log
 ACTUAL_PORT=""
@@ -66,7 +66,7 @@ echo "💡 Recording is ~6 fps - use \"iquicktime\" when you need smooth high-fp
 # video plays back in real time regardless of how bursty the changes are.
 # ctrl^c stops ffmpeg (which finalizes the file); keep the script alive to report the result
 trap 'true' INT
-ffmpeg -y -hide_banner -loglevel error \
+ffmpeg -y -hide_banner -loglevel fatal \
   -use_wallclock_as_timestamps 1 -f mjpeg -i "http://localhost:$ACTUAL_PORT/" \
   -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" \
   -fps_mode vfr -c:v libx264 -preset veryfast -pix_fmt yuv420p "$OUTPUT_PATH"

From 4b402d5cc22c97378d6a3a74a93da45e8c38f2c4 Mon Sep 17 00:00:00 2001
From: Adam Svoboda <eidamsvoboda@gmail.com>
Date: Sat, 13 Jun 2026 23:14:52 +0200
Subject: [PATCH 5/7] update output

---
 ios/irecord | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ios/irecord b/ios/irecord
index c58819e6..10f63442 100755
--- a/ios/irecord
+++ b/ios/irecord
@@ -18,6 +18,8 @@ else
 fi
 OUTPUT_PATH=~/Desktop/"$FILENAME".mp4
 
+echo "⏳ Preparing screenshot stream to record screen..."
+
 # Find a free port for the local MJPEG stream server
 STREAM_PORT=3333
 while lsof -i ":$STREAM_PORT" &> /dev/null; do
@@ -58,7 +60,7 @@ fi
 sleep 1
 
 echo "📹 Recording screen on $SELECTED_DEVICE ($MODEL), stop it using ctrl^c"
-echo "💡 Recording is ~6 fps - use \"iquicktime\" when you need smooth high-fps video"
+echo "💡 Recording is ~6 fps - use \"iquicktime\" if you need smooth high-fps video"
 
 # The MJPEG stream carries no timestamps and only delivers a frame when the
 # screen changes. Stamp each frame with the wall clock as it ARRIVES over the

From d910bad87cb0f59da18b6a8edf2c8fb5138dd078 Mon Sep 17 00:00:00 2001
From: Adam Svoboda <eidamsvoboda@gmail.com>
Date: Sat, 13 Jun 2026 23:18:16 +0200
Subject: [PATCH 6/7] update error handling for simctl

---
 common_tools   | 16 ++++++++++++++++
 ios/isimulator |  1 +
 2 files changed, 17 insertions(+)

diff --git a/common_tools b/common_tools
index a20656e0..94de070b 100644
--- a/common_tools
+++ b/common_tools
@@ -495,6 +495,22 @@ check_adb_dependency(){
   fi
 }
 
+check_simctl_dependency(){
+  if ! xcrun simctl help &> /dev/null; then
+    echo "❌ Xcode Simulator tools (simctl) are not accessible"
+    if [ -d "/Applications/Xcode.app" ]; then
+      echo "💡 Xcode is installed but xcode-select is pointing elsewhere"
+      should_proceed "🔄 Fix with: sudo xcode-select -s /Applications/Xcode.app"
+      sudo xcode-select -s /Applications/Xcode.app
+    else
+      echo "💡 Install Xcode from the App Store, then connect your device and trust your computer"
+      should_proceed "🛍 Open App Store?"
+      open -a "App Store"
+      exit 1
+    fi
+  fi
+}
+
 check_dependency(){
   if ! [ -x "$(command -v "$1")" ]; then
     echo "💥 \"$1\" command required!"
diff --git a/ios/isimulator b/ios/isimulator
index a7b85dc2..3caf2b4b 100755
--- a/ios/isimulator
+++ b/ios/isimulator
@@ -172,6 +172,7 @@ set_time(){
 }
 
 check_for_update
+check_simctl_dependency
 
 case $1 in
   'start')

From 4a495c6eaa72e6e600f9db84ef3b500fb4da3b4c Mon Sep 17 00:00:00 2001
From: Adam Svoboda <eidamsvoboda@gmail.com>
Date: Sat, 13 Jun 2026 23:26:08 +0200
Subject: [PATCH 7/7] update changelog

---
 changelog.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/changelog.txt b/changelog.txt
index 42032871..d5f8a310 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -16,10 +16,14 @@
     https://github.com/luispinho
 
     🩹 ikill supports all flag combos (-s -n); multi-device relaunch fixed (missing --udid)
+    🔁 ikill auto-restarts the go-ios tunnel on failure and guides through Developer Mode setup
+    📵 irecord no longer leaks raw ffmpeg or bash process output to the terminal
+    🖥 isimulator detects xcode-select misconfiguration and offers to fix it automatically
     🤖 aemulator now lists AVDs via emulator -list-avds (avdmanager was often unreliable)
     🔍 adb auto-detected from ANDROID_HOME when not in PATH
-    📝 README typo fixes, corrected installation instructions and updated links
+    📝 README and output text polish, corrected install instructions, iOS Developer Mode guide
     🖤 All these small additions/fixes by me, it's been a while...
+    https://github.com/IGPenguin
 
     ⭐️ BTW, I just launched Stay Dead, my choice-based RPG!
     https://github.com/IGPenguin/stay-dead