karnel-termux 4.16.6 → 4.17.1

package/install.sh

@@ -79,7 +79,9 @@ _INSTALL_KARNEL_SYMLINK_CHANGED=false
 _INSTALL_PREVIOUS_KARNEL_SYMLINK=""
 
 _cleanup_failed() {
-	echo -e "\n  ${P_FAIL}✖${P_NC}  Installation failed at step ${CURRENT_STEP}. Cleaning up..."
+  set +e
+  trap - ERR
+  echo -e "\n  ${P_FAIL}✖${P_NC}  Installation failed at step ${CURRENT_STEP}. Cleaning up..."
 	if $_INSTALL_KARNEL_SYMLINK_CHANGED; then
 		if [[ -n "$_INSTALL_PREVIOUS_KARNEL_SYMLINK" ]]; then
 			local rollback_link_dir
@@ -145,7 +147,7 @@ bootstrap_dependencies() {
 
 	if [[ $needed_tput -eq 1 ]]; then
 		echo -e "  ${P_BORDER}→${P_NC}  Installing ncurses-utils..."
-		pkg install -y ncurses-utils &>/dev/null
+		pkg install -y ncurses-utils &>/dev/null || true
 		echo -e "  ${P_OK}✔${P_NC}  ncurses installed"
 		echo
 	fi
@@ -153,7 +155,7 @@ bootstrap_dependencies() {
 	if [[ $needed_git -eq 1 ]]; then
 		log_info "Installing git..."
 		progress_bar 0 10
-		pkg install -y git &>/dev/null
+		pkg install -y git &>/dev/null || true
 		progress_bar 10 10
 		echo
 		log_ok "git installed"
@@ -162,7 +164,7 @@ bootstrap_dependencies() {
 	if [[ $needed_glow -eq 1 ]]; then
 		log_info "Installing glow..."
 		progress_bar 0 10
-		pkg install -y glow &>/dev/null
+		pkg install -y glow &>/dev/null || true
 		progress_bar 10 10
 		echo
 		log_ok "glow installed"
@@ -171,7 +173,7 @@ bootstrap_dependencies() {
 	if [[ $needed_gh -eq 1 ]]; then
 		log_info "Installing gh (GitHub CLI)..."
 		progress_bar 0 10
-		pkg install -y gh &>/dev/null
+		pkg install -y gh &>/dev/null || true
 		progress_bar 10 10
 		echo
 		log_ok "gh installed"
@@ -180,7 +182,7 @@ bootstrap_dependencies() {
 	if [[ $needed_rg -eq 1 ]]; then
 		log_info "Installing ripgrep..."
 		progress_bar 0 10
-		pkg install -y ripgrep &>/dev/null
+		pkg install -y ripgrep &>/dev/null || true
 		progress_bar 10 10
 		echo
 		log_ok "ripgrep installed"
@@ -287,7 +289,23 @@ clone_repo() {
 			log_fail "Failed to clone repository"
 			return 1
 		fi
-		if [[ -n "$RELEASE_REF" ]]; then
+		if [[ -n "$RELEASE_COMMIT" ]]; then
+			if ! git -C "$candidate_repo" fetch --depth=1 origin "$RELEASE_COMMIT" &>/dev/null; then
+				log_fail "Failed to fetch release commit $RELEASE_COMMIT"
+				return 1
+			fi
+			if ! git -C "$candidate_repo" checkout --quiet --detach "$RELEASE_COMMIT" &>/dev/null; then
+				log_fail "Failed to checkout release commit $RELEASE_COMMIT"
+				return 1
+			fi
+			local candidate_commit
+			candidate_commit=$(git -C "$candidate_repo" rev-parse HEAD 2>/dev/null) || return 1
+			if [[ "$candidate_commit" != "$RELEASE_COMMIT" ]]; then
+				log_fail "Release commit mismatch"
+				log_info "Expected $RELEASE_COMMIT, got $candidate_commit"
+				return 1
+			fi
+		elif [[ -n "$RELEASE_REF" ]]; then
 			local candidate_commit
 			candidate_commit=$(git -C "$candidate_repo" rev-parse HEAD 2>/dev/null) || return 1
 			if [[ "$candidate_commit" != "$RELEASE_COMMIT" ]]; then

package/karnel/RELEASE_COMMIT

@@ -1 +1 @@
-8fe9d579a4a8d7fbcab5a8495b1bba025dc684a9
+c9797260b1affd17127bf2b1e5c22c1cf184adb1

package/karnel/bin/karnel

@@ -30,7 +30,8 @@ import "@/utils/env"
 
 # ===== SEMVER COMPARISON =====
 _semver_gt() {
-  [[ "$(printf '%s\n%s' "$1" "$2" | sort -V | tail -1)" == "$1" ]] && [[ "$1" != "$2" ]]
+  local a="${1#v}" b="${2#v}"
+  [[ "$(printf '%s\n%s' "$a" "$b" | sort -V | tail -1)" == "$a" ]] && [[ "$a" != "$b" ]]
 }
 
 _valid_semver() {

package/karnel/cli/commands/doctor/fixes.sh

@@ -292,7 +292,7 @@ _fix_locale() {
   if [[ ! -f "$config" ]] && [[ -f "$HOME/.bashrc" ]]; then
     config="$HOME/.bashrc"
   fi
-  echo 'export LANG=en_US.UTF-8' >> "$config" 2>/dev/null
+  grep -qxF 'export LANG=en_US.UTF-8' "$config" 2>/dev/null || echo 'export LANG=en_US.UTF-8' >> "$config" 2>/dev/null
 }
 
 
@@ -425,6 +425,6 @@ _fix_keyring() {
 }
 
 _fix_apt_cache() {
-  rm -rf "$PREFIX/var/apt/lists"/* 2>/dev/null
+  rm -rf "${PREFIX:?}/var/apt/lists"/* 2>/dev/null
   pkg update -y &>/dev/null
 }

package/karnel/cli/commands/init.sh

@@ -1078,33 +1078,33 @@ configure_rust() {
 
 	# Append dependencies to Cargo.toml
 	if [[ -f "Cargo.toml" ]]; then
-		# Append after [dependencies] or add it
-		if grep -q '^\[dependencies\]' Cargo.toml; then
-			cat >>Cargo.toml <<EOF
-EOF
-		else
-			echo -e "\n[dependencies]" >> Cargo.toml
+		if ! grep -q '^\[dependencies\]' Cargo.toml; then
+			printf '\n[dependencies]\n' >> Cargo.toml
 		fi
-		cat >>Cargo.toml <<EOF
-tokio = { version = "1.0", features = ["full"] }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-dotenvy = "0.15"
-EOF
+		local dep name spec
+		local -a deps=(
+			'tokio = { version = "1.0", features = ["full"] }'
+			'serde = { version = "1.0", features = ["derive"] }'
+			'serde_json = "1.0"'
+			'dotenvy = "0.15"'
+		)
 		if [[ "$framework_choice" == "Axum" ]]; then
-			cat >>Cargo.toml <<EOF
-axum = "0.7"
-EOF
+			deps+=('axum = "0.7"')
 		else
-			cat >>Cargo.toml <<EOF
-actix-web = "4.0"
-EOF
+			deps+=('actix-web = "4.0"')
 		fi
 		if [[ "$db_choice" == "SQLx (PostgreSQL)" ]]; then
-			cat >>Cargo.toml <<EOF
-sqlx = { version = "0.7", features = ["runtime-tokio", "postgres", "macros"] }
-EOF
+			deps+=('sqlx = { version = "0.7", features = ["runtime-tokio", "postgres", "macros"] }')
 		fi
+		for dep in "${deps[@]}"; do
+			name="${dep%% =*}"
+			name="${name%%[[:space:]]*}"
+			if grep -q "^${name} =" Cargo.toml; then
+				log_info "Dependency already present: ${name}"
+			else
+				sed -i "/^\[dependencies\]/a ${dep}" Cargo.toml
+			fi
+		done
 		log_success "Configured Cargo.toml"
 	fi
 

package/karnel/cli/commands/update.sh

@@ -210,6 +210,18 @@ _update_cleanup() {
   rm -f "$KARNEL_CACHE/new_version" "$KARNEL_CACHE/last_version_check"
 }
 
+_update_release_commit() {
+  local tag="$1" commit=""
+  if command -v git &>/dev/null 2>&1; then
+    commit=$(git ls-remote "https://github.com/israelmarques1024-dotcom/karnel-termux.git" "refs/tags/${tag}^{}" 2>/dev/null | awk '{print $1}')
+  fi
+  if [[ -z "$commit" ]] && command -v curl &>/dev/null 2>&1; then
+    commit=$(curl -fsS -m 10 "https://api.github.com/repos/israelmarques1024-dotcom/karnel-termux/commits/${tag}" 2>/dev/null \
+      | grep -m1 '"sha"' | sed -E 's/.*"sha":[[:space:]]*"([0-9a-f]{40})".*/\1/')
+  fi
+  [[ "$commit" =~ ^[0-9a-f]{40}$ ]] && echo "$commit"
+}
+
 _update_try_curl() {
   command -v curl &>/dev/null || return 1
 
@@ -252,10 +264,23 @@ _update_try_curl() {
 
   rm -f "$meta" "$sumfile"
 
-  if bash "$installer" --ref "$tag"; then
-    rm -f "$installer"
-    log_success "Karnel-Termux updated via curl ($tag)"
-    return 0
+  # Resolve the release's target commit so the installer's "immutable
+  # commit SHA" requirement is satisfied even when the downloaded asset
+  # does not have RELEASE_COMMIT baked in.
+  local commit
+  commit=$(_update_release_commit "$tag")
+  if [[ -n "$commit" ]]; then
+    if bash "$installer" --ref "$tag" --commit "$commit"; then
+      rm -f "$installer"
+      log_success "Karnel-Termux updated via curl ($tag)"
+      return 0
+    fi
+  else
+    if bash "$installer" --ref "$tag"; then
+      rm -f "$installer"
+      log_success "Karnel-Termux updated via curl ($tag)"
+      return 0
+    fi
   fi
 
   rm -f "$installer"

package/karnel/tools/ai/cactus/install.sh

@@ -191,7 +191,7 @@ _cactus_write_wrapper() {
 # The server loads the engine via ctypes inside the python process, so the
 # whole interpreter must run under qemu-aarch64; CACTUS_EMULATE=1 makes the
 # CLI wrap native subprocess children (bin/run) with qemu as well.
-exec proot-distro login --shared-tmp ubuntu -- env CACTUS_EMULATE=1 qemu-aarch64 -cpu max -L / $CACTUS_CONTAINER_DIR/venv/bin/python -m cactus "\$@"
+exec proot-distro login --shared-tmp ubuntu -- env CACTUS_EMULATE=1${CACTUS_CLOUD_KEY:+ CACTUS_CLOUD_KEY="$CACTUS_CLOUD_KEY"}${CACTUS_BASE_URL:+ CACTUS_BASE_URL="$CACTUS_BASE_URL"} qemu-aarch64 -cpu max -L / $CACTUS_CONTAINER_DIR/venv/bin/python -m cactus "$@"
 EOF
   else
     cat >"$temporary" <<EOF

package/karnel/tools/ai/kimchi-code/install.sh

@@ -394,7 +394,13 @@ uninstall_kimchi_code() {
       "$HOME/.local/share/kimchi" \
       "$HOME/.local/state/kimchi" \
       "$HOME/.cache/kimchi"
+    # Also remove the binaries installed inside the ubuntu container for
+    # proot/glibc installs (they are not cleaned by _uninstall_kimchi_impl).
+    if [ -n "$(_kimchi_detect_ubuntu_root)" ] && _kimchi_wrapper_owned; then
+      _kimchi_proot_ubuntu /bin/bash -c 'rm -f /usr/local/bin/kimchi && rm -rf /usr/local/share/kimchi' &>>"$LOG_FILE"
+    fi
     loading "Uninstalling Kimchi" _uninstall_kimchi_impl
+    rm -f "$PREFIX/bin/kimchi"
     return $?
   fi
 

package/karnel/tools/ai/opencode/install.sh

@@ -96,6 +96,8 @@ _install_opencode_proot_impl() {
     npm install -g opencode-ai@1.18.15
   ' &>>"$LOG_FILE"
 
+  proot_ubuntu /bin/bash -c 'touch /root/.opencode/.karnel-managed' &>>"$LOG_FILE"
+
   local ubuntu_root
   ubuntu_root="$(detect_ubuntu_root)"
   if [ -z "$ubuntu_root" ]; then
@@ -153,7 +155,11 @@ uninstall_opencode() {
     return 0
   fi
 
-  proot_ubuntu /bin/bash -c 'rm -rf /root/.opencode' &>>"$LOG_FILE"
+  if proot_ubuntu test -f /root/.opencode/.karnel-managed &>>"$LOG_FILE"; then
+    proot_ubuntu /bin/bash -c 'rm -rf /root/.opencode' &>>"$LOG_FILE"
+  else
+    log_warn "OpenCode data in the Ubuntu container was not installed by Karnel — leaving it untouched"
+  fi
   local ubuntu_root
   ubuntu_root="$(detect_ubuntu_root)/root/.bashrc"
   if [ -f "$ubuntu_root" ]; then
@@ -179,7 +185,12 @@ _do_update_opencode() {
     return $?
   fi
 
-  proot_ubuntu /bin/bash -c 'rm -rf /root/.opencode' &>>"$LOG_FILE"
+  if proot_ubuntu test -f /root/.opencode/.karnel-managed &>>"$LOG_FILE"; then
+    proot_ubuntu /bin/bash -c 'rm -rf /root/.opencode' &>>"$LOG_FILE"
+  else
+    log_warn "Existing OpenCode in the Ubuntu container was not installed by Karnel — aborting update to avoid data loss"
+    return 1
+  fi
   proot_ubuntu /bin/bash -c '
     export SHELL=/bin/bash
     export TMPDIR=/tmp

package/karnel/tools/ai/walkie/install.sh

@@ -646,8 +646,10 @@ update_walkie() {
     return 0
   fi
   log_info "New walkie revision available: $remote_commit (installed: $installed_commit)"
-  local answer
-  read -r -p "Update walkie? [Y/n] " answer
+  local answer="y"
+  if [[ -z "$KARNEL_NONINTERACTIVE" && -t 0 ]]; then
+    read -r -p "Update walkie? [Y/n] " answer
+  fi
   case "$answer" in
     ""|y|Y|yes|Yes|YES) _update_walkie ;;
     *) log_info "Update skipped" ;;

package/karnel/tools/deploy/netlify/install.sh

@@ -15,6 +15,13 @@ install_netlify() {
   if command -v netlify &>/dev/null && netlify --version &>/dev/null; then
     log_info "Netlify CLI is already installed"
     return 2
+  fi
+  if ! command -v node &>/dev/null || ! command -v npm &>/dev/null; then
+    log_info "Installing Node.js..."
+    if ! pkg install -y nodejs-lts &>>"$LOG_FILE"; then
+      log_error "Failed to install Node.js"
+      return 1
+    fi
   fi
 	if ! _netlify_node_supported; then
 		log_error "Netlify CLI requires Node.js 22.13.0 or newer. Update Node.js and retry."

package/karnel/tools/deploy/railway/install.sh

@@ -185,6 +185,15 @@ uninstall_railway() {
 }
 
 update_railway() {
+  if _railway_proot_wrapper_owned; then
+    log_info "Railway was installed via Ubuntu PRoot; updating inside the container..."
+    if proot-distro login ubuntu -- npm update -g @railway/cli &>>"$LOG_FILE"; then
+      log_success "Railway CLI updated through Ubuntu Proot"
+      return 0
+    fi
+    log_warn "Railway CLI update failed inside Ubuntu Proot"
+    return 1
+  fi
   _check_update_needed "Railway CLI" "$(_get_installed_npm_version @railway/cli)" "$(_get_remote_npm_version @railway/cli)" _do_update_railway
 }
 

package/karnel/tools/deploy/vercel/install.sh

@@ -10,6 +10,13 @@ install_vercel() {
     log_info "Vercel CLI is already installed"
     return 2
   fi
+  if ! command -v node &>/dev/null || ! command -v npm &>/dev/null; then
+    log_info "Installing Node.js..."
+    if ! pkg install -y nodejs-lts &>>"$LOG_FILE"; then
+      log_error "Failed to install Node.js"
+      return 1
+    fi
+  fi
   log_info "Installing Vercel CLI..."
   npm install -g vercel &>/dev/null || {
     log_error "Failed to install Vercel CLI"

package/karnel/tools/lang/bun/install.sh

@@ -296,6 +296,7 @@ _install_bun_proot_impl() {
   fi
   sed "s|__UBUNTU_ROOTFS__|$ubuntu_root|g" "$wrapper_src" >"$PREFIX/bin/bun"
   chmod +x "$PREFIX/bin/bun"
+  mkdir -p "$BUN_DATA_DIR" && : >"$BUN_DATA_DIR/.karnel-proot"
   return 0
 }
 
@@ -339,7 +340,12 @@ _uninstall_bun_impl() {
     _uninstall_bun_native
     return $?
   fi
-  _uninstall_bun_proot
+  if [ -f "$BUN_DATA_DIR/.karnel-proot" ]; then
+    _uninstall_bun_proot
+    return $?
+  fi
+  log_error "Refusing to remove unowned bun command: $PREFIX/bin/bun"
+  return 1
 }
 
 uninstall_bun() {

package/karnel/tools/npm/turbopack/install.sh

@@ -178,8 +178,8 @@ install_turbopack() {
 
 uninstall_turbopack() {
 	if ! _has_glibc_node; then
-		log_warn "Turbopack is not installed"
-		return 1
+		log_info "Turbopack is not installed"
+		return 2
 	fi
 
 	loading "Removing CLI wrappers" _uninstall_wrappers