karnel-termux 4.16.1 → 4.16.3

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

@@ -188,7 +188,10 @@ _cactus_write_wrapper() {
     cat >"$temporary" <<EOF
 #!$PREFIX/bin/bash
 # Karnel-managed Cactus wrapper (qemu-aarch64 emulation)
-exec proot-distro login --shared-tmp ubuntu -- env CACTUS_EMULATE=1 $CACTUS_CONTAINER_DIR/venv/bin/cactus "\$@"
+# 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 "\$@"
 EOF
   else
     cat >"$temporary" <<EOF
@@ -336,12 +339,18 @@ _cactus_cli_create_glibc_wrapper() {
     log_error "Wrapper template not found at $wrapper_src"
     return 1
   fi
-  cp "$wrapper_src" "$PREFIX/bin/cactus"
+  sed "1s|^#!.*|#!$PREFIX/bin/bash|" "$wrapper_src" >"$PREFIX/bin/cactus"
   chmod +x "$PREFIX/bin/cactus"
   return 0
 }
 
 _cactus_cli_install_native() {
+  if ! _cactus_cpu_supported; then
+    log_error "This CPU lacks ARMv8.1 features (LSE/fp16/dotprod) required by the native Cactus engine — it would crash with Illegal instruction"
+    list_item "Re-run ${D_CYAN}karnel install ai --cactus${D_NC} and choose ${D_CYAN}proot-distro (ubuntu container)${D_NC}"
+    list_item "That method runs under qemu-aarch64 emulation: functional but very slow on this CPU"
+    return 1
+  fi
   _cactus_cli_install_deps_native || return 1
   _cactus_cli_install_pip_glibc || return 1
   _cactus_cli_verify_glibc || return 1
@@ -370,7 +379,7 @@ _cactus_cli_create_proot_wrapper() {
     log_error "Wrapper template not found at $wrapper_src"
     return 1
   fi
-  cp "$wrapper_src" "$PREFIX/bin/cactus"
+  sed "1s|^#!.*|#!$PREFIX/bin/bash|" "$wrapper_src" >"$PREFIX/bin/cactus"
   chmod +x "$PREFIX/bin/cactus"
   return 0
 }
@@ -396,7 +405,7 @@ _cactus_cli_installed_version() {
   fi
 
   if [ "$method" = "proot" ]; then
-    _spin_capture "Detecting version" bash -c 'proot-distro login --shared-tmp ubuntu -- python3 -c "from importlib.metadata import version; print(version(\"cactus-compute\"))" 2>/dev/null'
+    _spin_capture "Detecting version" bash -c 'proot-distro login --shared-tmp ubuntu -- /opt/karnel/cactus/venv/bin/python -c "from importlib.metadata import version; print(version(\"cactus-compute\"))" 2>/dev/null'
   else
     _spin_capture "Detecting version" bash -c 'printf "%s\n" "from importlib.metadata import version; print(version(\"cactus-compute\"))" | glibc-runner -s "$PREFIX/glibc/bin/python" - 2>/dev/null'
   fi
@@ -409,14 +418,11 @@ _cactus_update_native() {
   fi
 
   if [ "$method" = "proot" ]; then
-    if ! _cactus_proot /bin/bash -c 'python3 -m pip install --break-system-packages --upgrade cactus-compute' &>>"$CACTUS_CLI_LOG_FILE"; then
+    _cactus_ensure_ubuntu || return 1
+    if ! _install_cactus_inside_ubuntu || ! _cactus_apply_emulation_patch || ! _cactus_write_wrapper || ! _cactus_validate; then
       log_error "Failed to update Cactus Engine CLI"
       return 1
     fi
-    if ! timeout 300 proot-distro login --shared-tmp ubuntu -- python3 -c "import cactus" &>>"$CACTUS_CLI_LOG_FILE"; then
-      log_error "Cactus Engine CLI updated but the native engine failed to load"
-      return 1
-    fi
     log_success "Cactus Engine CLI (proot-distro) updated"
     return 0
   fi
@@ -434,7 +440,7 @@ _cactus_uninstall_native() {
   fi
 
   if [ "$method" = "proot" ]; then
-    _cactus_proot python3 -m pip uninstall -y cactus-compute &>>"$CACTUS_CLI_LOG_FILE"
+    proot-distro login ubuntu -- rm -rf /opt/karnel/cactus &>>"$CACTUS_CLI_LOG_FILE"
     rm -f "$PREFIX/bin/cactus"
     rm -rf "$CACTUS_DATA_DIR"
     log_success "Cactus Engine CLI (proot-distro) uninstalled"

package/karnel/utils/agent_actions.sh

@@ -1144,18 +1144,22 @@ agent_server_ensure() {
 	if ! command -v cactus &>/dev/null; then
 		echo
 		log_warn "Cactus (the local model server) is not installed"
-		if agent_confirm "Install Cactus now? (karnel install ai --cactus)" _agent_install_cactus; then
+		list_item "Install: ${D_CYAN}karnel install ai --cactus${D_NC}"
+		echo
+		if agent_confirm "Install Cactus now?" _agent_install_cactus; then
 			import "@/tools/ai/cactus/install"
-			if install_cactus; then
+			install_cactus
+			local _cactus_rc=$?
+			if (( _cactus_rc == 0 || _cactus_rc == 2 )); then
 				log_success "Cactus installed — starting the model server…"
 			else
-				log_error "Cactus installation failed — start the server manually:"
-				list_item "${D_CYAN}$AGENT_SERVER_CMD${D_NC}"
+				log_error "Cactus installation failed — try again later:"
+				list_item "${D_CYAN}karnel install ai --cactus${D_NC}"
+				list_item "Log: ${D_CYAN}$KARNEL_CACHE/install_ai.log${D_NC}"
 				return 1
 			fi
 		else
-			log_info "Install it later with: ${D_CYAN}karnel install ai --cactus${D_NC}"
-			list_item "Or start the server manually: ${D_CYAN}$AGENT_SERVER_CMD${D_NC}"
+			list_item "When it is installed, the server starts automatically"
 			return 1
 		fi
 	fi
@@ -1202,7 +1206,7 @@ agent_server_stop() {
 agent_confirm() {
 	local prompt="$1" var="$2" _val
 	while true; do
-		printf '    %s%s [%s]%s\n' "$D_YELLOW" "$prompt" "${D_GREEN}y${GRAY}/${D_RED}n${NC}" "$NC" >&2
+		printf '    %b%b [%b]%b\n' "$D_YELLOW" "$prompt" "${D_GREEN}y${GRAY}/${D_RED}n${NC}" "$NC" >&2
 		printf '    > ' >&2
 		read -rn1 _val
 		echo >&2
@@ -1215,7 +1219,7 @@ agent_confirm() {
 			read -r "$var" <<<"n"
 			return 1
 			;;
-		*) printf '    %s✖%s Reply y or n\n' "$RED" "$NC" >&2 ;;
+		*) printf '    %b✖%b Reply y or n\n' "$RED" "$NC" >&2 ;;
 		esac
 	done
 }

package/karnel/utils/agent_llm.sh

@@ -121,7 +121,14 @@ agent_models_url() {
 agent_check_server() {
 	local models
 	models=$(curl -fsS -m 6 "$(agent_models_url)" 2>/dev/null) || {
-		if ! command -v cactus &>/dev/null; then
+		if agent_server_running; then
+			log_warn "The model server is starting — first run downloads the model (${D_CYAN}this can take several minutes${D_NC})"
+			list_item "Watch progress: ${D_CYAN}tail -f $AGENT_SERVER_LOG${D_NC}"
+			list_item "It will answer automatically once ${D_CYAN}$AGENT_ENDPOINT${D_NC} is up"
+		elif pgrep -f "cactus.* serve|cactus.launcher.py serve" &>/dev/null; then
+			log_warn "A Cactus server process is running but ${D_CYAN}$AGENT_ENDPOINT${D_NC} is not answering yet — it may still be downloading or loading the model"
+			list_item "Watch progress: ${D_CYAN}tail -f $AGENT_SERVER_LOG${D_NC}"
+		elif ! command -v cactus &>/dev/null; then
 			log_warn "Cannot reach endpoint: ${D_CYAN}$AGENT_ENDPOINT${D_NC} — Cactus is not installed"
 			list_item "Install it: ${D_CYAN}karnel install ai --cactus${D_NC}"
 			list_item "Or point to a running server: ${D_CYAN}karnel agent config endpoint <url>${D_NC}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karnel-termux",
-  "version": "4.16.1",
+  "version": "4.16.3",
   "description": "Modular Dev Environment for Termux — install languages, databases, AI agents, editors, and more with one command",
   "bin": {
     "karnel": "karnel/bin/karnel"