karnel-termux 4.9.4 → 4.9.6

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

@@ -3,54 +3,18 @@
 import "@/utils/log"
 import "@/utils/version"
 import "@/utils/colors"
+import "@/utils/proot"
+import "@/utils/install"
 
 LOG_FILE="$KARNEL_CACHE/install_ai.log"
 OPENCODE_DATA_DIR="$HOME/.local/share/karnel-data/opencode"
 
-_opencode_detect_ubuntu_root() {
-  local root
-  root="$(find /data/data/com.termux -maxdepth 10 -type d \
-    -name "rootfs" -path "*/containers/ubuntu/*" 2>/dev/null | head -1)"
-
-  if [ -z "$root" ]; then
-    root="$(find /data/data/com.termux -maxdepth 10 -type d \
-      -name "ubuntu" -path "*/installed-rootfs/*" 2>/dev/null | head -1)"
-  fi
-
-  echo "$root"
-}
-
-_opencode_proot_ubuntu() {
-  proot-distro login \
-    --shared-tmp \
-    ubuntu \
-    -- "$@"
-}
-
-_get_latest_opencode_version() {
-  curl -fsSL https://api.github.com/repos/anomalyco/opencode/releases/latest |
-    grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/'
+_install_opencode_deps() {
+  loading "Installing glibc and dependencies" _install_opencode_deps_impl
 }
 
-_opencode_install_deps_native() {
-  loading "Installing glibc and dependencies" _opencode_install_deps_native_impl
-}
-
-_opencode_install_deps_native_impl() {
-  if [[ ! -f $PREFIX/etc/apt/sources.list.d/glibc.list ]]; then
-    if ! pkg install glibc-repo -y &>>"$LOG_FILE"; then
-      log_error "Failed to install glibc-repo"
-      return 1
-    fi
-  fi
-
-  if [[ ! -f $PREFIX/glibc/lib/libc.so.6 ]]; then
-    if ! pkg install glibc -y &>>"$LOG_FILE"; then
-      log_error "Failed to install glibc"
-      return 1
-    fi
-  fi
-
+_install_opencode_deps_impl() {
+  install_glibc || return 1
   declare -A DEPS=(
     ["git"]="git"
     ["ripgrep"]="rg"
@@ -61,18 +25,7 @@ _opencode_install_deps_native_impl() {
     ["curl"]="curl"
     ["tar"]="tar"
   )
-
-  local pkg_name bin_name
-  for pkg_name in "${!DEPS[@]}"; do
-    bin_name="${DEPS[$pkg_name]}"
-    if ! command -v "$bin_name" &>/dev/null; then
-      if ! pkg install "$pkg_name" -y &>>"$LOG_FILE"; then
-        log_error "Failed to install $pkg_name"
-        return 1
-      fi
-    fi
-  done
-
+  install_deps DEPS || return 1
   return 0
 }
 
@@ -82,34 +35,21 @@ _download_opencode_binary() {
 
 _download_opencode_binary_impl() {
   local latest_version
-  latest_version=$(_get_latest_opencode_version)
+  latest_version=$(github_latest_tag anomalyco/opencode)
   if [ -z "$latest_version" ]; then
     log_error "Failed to fetch latest OpenCode version"
     return 1
   fi
 
   mkdir -p "$OPENCODE_DATA_DIR"
-
-  local tarball="opencode-linux-arm64.tar.gz"
-  local download_url="https://github.com/anomalyco/opencode/releases/download/$latest_version/$tarball"
-
-  if ! curl -fsSL "$download_url" -o "$OPENCODE_DATA_DIR/$tarball" &>>"$LOG_FILE"; then
-    log_error "Failed to download OpenCode binary"
-    return 1
-  fi
-
-  if ! tar -zxf "$OPENCODE_DATA_DIR/$tarball" -C "$OPENCODE_DATA_DIR" &>>"$LOG_FILE"; then
-    log_error "Failed to extract OpenCode binary"
-    return 1
-  fi
-
-  rm -f "$OPENCODE_DATA_DIR/$tarball"
+  github_download_and_extract \
+    anomalyco/opencode "$latest_version" \
+    "opencode-linux-arm64.tar.gz" "$OPENCODE_DATA_DIR" || return 1
 
   if [ ! -f "$OPENCODE_DATA_DIR/opencode" ]; then
     log_error "OpenCode binary not found after extraction"
     return 1
   fi
-
   chmod +x "$OPENCODE_DATA_DIR/opencode"
   return 0
 }
@@ -119,23 +59,14 @@ _compile_opencode_helper() {
 }
 
 _compile_opencode_helper_impl() {
-  local HELPER_SRC="$KARNEL_PATH/tools/ai/opencode/helper/opencode_helper.c"
-  if [ ! -f "$HELPER_SRC" ]; then
-    log_error "Helper source not found at $HELPER_SRC"
-    return 1
-  fi
-
-  if ! cc -O2 -o "$PREFIX/bin/opencode" "$HELPER_SRC" &>>"$LOG_FILE"; then
-    log_error "Failed to compile opencode helper"
-    return 1
-  fi
-
-  chmod +x "$PREFIX/bin/opencode"
+  compile_helper \
+    "$KARNEL_PATH/tools/ai/opencode/helper/opencode_helper.c" \
+    "$PREFIX/bin/opencode" || return 1
   return 0
 }
 
 _install_opencode_native() {
-  _opencode_install_deps_native || return 1
+  _install_opencode_deps || return 1
   _download_opencode_binary || return 1
   _compile_opencode_helper || return 1
   log_success "OpenCode installed natively"
@@ -148,48 +79,35 @@ _install_opencode_proot() {
 
 _install_opencode_proot_impl() {
   mkdir -p "$(dirname "$LOG_FILE")"
+  proot_install_ubuntu ubuntu:24.04
 
-  if ! command -v proot-distro &>/dev/null; then
-    pkg install proot-distro -y &>>"$LOG_FILE"
-  fi
-
-  if [ ! -d "$(_opencode_detect_ubuntu_root)" ]; then
-    proot-distro install ubuntu:24.04 &>>"$LOG_FILE"
-  fi
-
-  _opencode_proot_ubuntu /bin/bash -c \
+  proot_ubuntu /bin/bash -c \
     'apt-get update && apt-get upgrade -y && apt-get install -y curl ca-certificates' \
     &>>"$LOG_FILE"
 
-  _opencode_proot_ubuntu /bin/bash -c '
-		export SHELL=/bin/bash
-		export TMPDIR=/tmp
-		export HOME=/root
-		curl -fsSL https://opencode.ai/install | bash -s -- --no-modify-path
-	' &>>"$LOG_FILE"
+  proot_ubuntu /bin/bash -c '
+    export SHELL=/bin/bash
+    export TMPDIR=/tmp
+    export HOME=/root
+    curl -fsSL https://opencode.ai/install | bash -s -- --no-modify-path
+  ' &>>"$LOG_FILE"
 
   local ubuntu_root
-  ubuntu_root="$(_opencode_detect_ubuntu_root)"
-
+  ubuntu_root="$(detect_ubuntu_root)"
   if [ -z "$ubuntu_root" ]; then
     log_error "Ubuntu rootfs not found"
     return 1
   fi
 
   local opencode_bin="$ubuntu_root/root/.opencode/bin/opencode"
-
   if [ ! -f "$opencode_bin" ]; then
     log_error "OpenCode binary not found after install"
     return 1
   fi
 
-  local wrapper_src="$KARNEL_PATH/tools/ai/opencode/bin/opencode"
-  if [ ! -f "$wrapper_src" ]; then
-    log_error "Wrapper template not found at $wrapper_src"
-    return 1
-  fi
-  sed "s|__UBUNTU_ROOTFS__|$ubuntu_root|g" "$wrapper_src" >"$PREFIX/bin/opencode"
-  chmod +x "$PREFIX/bin/opencode"
+  generate_wrapper \
+    "$KARNEL_PATH/tools/ai/opencode/bin/opencode" \
+    "$ubuntu_root" "$PREFIX/bin/opencode" || return 1
 
   if ! grep -q '.opencode/bin' "$ubuntu_root/root/.bashrc" 2>/dev/null; then
     printf '\n# opencode\nexport PATH=/root/.opencode/bin:$PATH\n' >>"$ubuntu_root/root/.bashrc"
@@ -205,18 +123,13 @@ install_opencode() {
   fi
 
   log_info "Select installation method for OpenCode:"
-
   read_select "Installation method" SELECTED_METHOD \
     "Native (recommended) - Compile with glibc support" \
     "Proot-distro (alternative) - Ubuntu container"
 
   case "$SELECTED_METHOD" in
-  *Native*)
-    _install_opencode_native
-    ;;
-  *Proot-distro*)
-    _install_opencode_proot
-    ;;
+  *Native*) _install_opencode_native ;;
+  *Proot-distro*) _install_opencode_proot ;;
   esac
 }
 
@@ -236,13 +149,11 @@ uninstall_opencode() {
     return 0
   fi
 
-  _opencode_proot_ubuntu /bin/bash -c 'rm -rf /root/.opencode' &>>"$LOG_FILE"
-
-  local ubuntu_bashrc
-  ubuntu_bashrc="$(_opencode_detect_ubuntu_root)/root/.bashrc"
-
-  if [ -f "$ubuntu_bashrc" ]; then
-    sed -i '/# opencode/d; /export PATH=\/root\/.opencode\/bin/d' "$ubuntu_bashrc"
+  proot_ubuntu /bin/bash -c 'rm -rf /root/.opencode' &>>"$LOG_FILE"
+  local ubuntu_root
+  ubuntu_root="$(detect_ubuntu_root)/root/.bashrc"
+  if [ -f "$ubuntu_root" ]; then
+    sed -i '/# opencode/d; /export PATH=\/root\/.opencode\/bin/d' "$ubuntu_root"
   fi
 
   if rm -f "$PREFIX/bin/opencode" &>>"$LOG_FILE"; then
@@ -264,9 +175,8 @@ _do_update_opencode() {
     return $?
   fi
 
-  _opencode_proot_ubuntu /bin/bash -c 'rm -rf /root/.opencode' &>>"$LOG_FILE"
-
-  _opencode_proot_ubuntu /bin/bash -c '
+  proot_ubuntu /bin/bash -c 'rm -rf /root/.opencode' &>>"$LOG_FILE"
+  proot_ubuntu /bin/bash -c '
     export SHELL=/bin/bash
     export TMPDIR=/tmp
     export HOME=/root
@@ -274,14 +184,11 @@ _do_update_opencode() {
   ' &>>"$LOG_FILE"
 
   local ubuntu_root
-  ubuntu_root="$(_opencode_detect_ubuntu_root)"
-  local opencode_bin="$ubuntu_root/root/.opencode/bin/opencode"
-
-  if [ ! -f "$opencode_bin" ]; then
+  ubuntu_root="$(detect_ubuntu_root)"
+  if [ -z "$ubuntu_root" ] || [ ! -f "$ubuntu_root/root/.opencode/bin/opencode" ]; then
     log_error "OpenCode binary not found after update"
     return 1
   fi
-
   return 0
 }
 

package/karnel/tools/lang/bun/src/bun-shim.c

@@ -240,14 +240,15 @@ int access(const char *p, int mode) {
 ssize_t readlinkat(int dirfd, const char *path, char *buf, size_t bufsiz) {
     if (path && streq(path, "/proc/self/exe")) {
         int len = slen(wrapper_path);
-        if (len < (int)bufsiz) {
+        int to_copy = len < (int)bufsiz ? len : (int)bufsiz - 1;
+        if (to_copy > 0) {
             char *d = buf;
             const char *s = wrapper_path;
-            while (*s)
+            for (int i = 0; i < to_copy; i++)
                 *d++ = *s++;
             *d = '\0';
         }
-        return len;
+        return to_copy > 0 ? to_copy : 0;
     }
     return (ssize_t)SREADLINKAT(dirfd, path, buf, bufsiz);
 }
@@ -270,9 +271,14 @@ ssize_t readlinkat(int dirfd, const char *path, char *buf, size_t bufsiz) {
  * bionic binaries. We use --library-path/--preload for glibc binaries instead.
  * Returns pointer to static buffer. */
 static char **strip_glibc_env(char *const envp[]) {
-    static char *clean[256];
+    int count = 0;
+    while (envp[count])
+        count++;
+    static char *clean[4096];
+    if (count > 4095)
+        count = 4095;
     int j = 0;
-    for (int i = 0; envp[i] && j < 255; i++) {
+    for (int i = 0; envp[i] && j < count; i++) {
         const char *e = envp[i];
         /* Skip LD_LIBRARY_PATH=* */
         if (e[0] == 'L' && e[1] == 'D' && e[2] == '_' && e[3] == 'L' &&
@@ -301,7 +307,9 @@ int execve(const char *pathname, char *const argv[], char *const envp[]) {
         while (argv[argc])
             argc++;
 
-        char *new_argv[64];
+        if (argc + 7 > 1024)
+            goto fallback;
+        char *new_argv[1024];
         int i = 0;
         new_argv[i++] = (char *)pathname;
         new_argv[i++] = "--library-path";
@@ -331,7 +339,9 @@ int execve(const char *pathname, char *const argv[], char *const envp[]) {
             while (argv[argc])
                 argc++;
 
-            char *new_argv[64];
+            if (argc + 8 > 1024)
+                goto fallback;
+            char *new_argv[1024];
             int i = 0;
             new_argv[i++] = (char *)ld_path;
             new_argv[i++] = "--library-path";
@@ -349,4 +359,15 @@ int execve(const char *pathname, char *const argv[], char *const envp[]) {
 
     errno = err;
     return -1;
+
+fallback:
+    /* If argv was too large for our static buffer, try the original execve */
+    r = SEXECVE(pathname, argv, clean_env);
+    if (r >= 0)
+        return (int)r;
+    r = SEXECVE(pathname, argv, envp);
+    if (r >= 0)
+        return (int)r;
+    errno = (int)(-r);
+    return -1;
 }

package/karnel/tools/plugins/install.sh

@@ -0,0 +1,150 @@
+PLUGINS_DIR="${KARNEL_DATA}/plugins"
+
+_plugin_dir() {
+  echo "$PLUGINS_DIR/$1"
+}
+
+_plugin_manifest() {
+  echo "$(_plugin_dir "$1")/karnel-plugin.json"
+}
+
+_plugin_installed() {
+  [[ -f "$(_plugin_manifest "$1")" ]]
+}
+
+_plugin_name_from_repo() {
+  local repo="$1"
+  basename "$repo" | sed 's/\.git$//'
+}
+
+install_plugin() {
+  local repo="$1"
+  local name
+  name="$(_plugin_name_from_repo "$repo")"
+
+  if _plugin_installed "$name"; then
+    log_info "Plugin '$name' is already installed"
+    return 2
+  fi
+
+  mkdir -p "$PLUGINS_DIR"
+  log_info "Installing plugin '$name' from $repo..."
+
+  if ! git clone "https://github.com/$repo.git" "$(_plugin_dir "$name")" 2>/dev/null; then
+    log_error "Failed to clone $repo"
+    return 1
+  fi
+
+  if [[ ! -f "$(_plugin_manifest "$name")" ]]; then
+    log_warn "Plugin '$name' has no karnel-plugin.json manifest"
+    log_info "Creating default manifest..."
+    cat > "$(_plugin_manifest "$name")" <<MANIFEST
+{
+  "name": "$name",
+  "version": "1.0.0",
+  "description": "Plugin installed from $repo",
+  "commands": [],
+  "tools": []
+}
+MANIFEST
+  fi
+
+  chmod +x "$(_plugin_dir "$name")/commands/"*.sh 2>/dev/null || true
+
+  log_success "Plugin '$name' installed"
+  return 0
+}
+
+uninstall_plugin() {
+  local name="$1"
+
+  if ! _plugin_installed "$name"; then
+    log_info "Plugin '$name' is not installed"
+    return 2
+  fi
+
+  log_info "Removing plugin '$name'..."
+  rm -rf "$(_plugin_dir "$name")"
+  log_success "Plugin '$name' removed"
+  return 0
+}
+
+update_plugin() {
+  local name="$1"
+
+  if ! _plugin_installed "$name"; then
+    log_info "Plugin '$name' is not installed"
+    return 2
+  fi
+
+  log_info "Updating plugin '$name'..."
+  if ! git -C "$(_plugin_dir "$name")" pull 2>/dev/null; then
+    log_error "Failed to update '$name'"
+    return 1
+  fi
+
+  log_success "Plugin '$name' updated"
+  return 0
+}
+
+reinstall_plugin() {
+  local name="$1"
+  uninstall_plugin "$name"
+  local repo
+  repo="$(git -C "$(_plugin_dir "$name")" remote get-url origin 2>/dev/null || echo "")"
+  repo="${repo#https://github.com/}"
+  repo="${repo%.git}"
+  if [[ -n "$repo" ]]; then
+    install_plugin "$repo"
+  else
+    log_error "Cannot determine repository for '$name'"
+    return 1
+  fi
+}
+
+_list_plugins() {
+  mkdir -p "$PLUGINS_DIR"
+  local found=0
+  for dir in "$PLUGINS_DIR"/*/; do
+    [[ -d "$dir" ]] || continue
+    local name
+    name="$(basename "$dir")"
+    if [[ -f "$dir/karnel-plugin.json" ]]; then
+      local desc
+      desc="$(sed -n 's/.*"description": "\(.*\)",/\1/p' "$dir/karnel-plugin.json" 2>/dev/null || echo "No description")"
+      printf "  ${D_GREEN}%-20s${NC} %s\n" "$name" "$desc"
+      found=1
+    fi
+  done
+  [[ $found -eq 0 ]] && echo "  No plugins installed"
+}
+
+_plugin_commands() {
+  mkdir -p "$PLUGINS_DIR"
+  for dir in "$PLUGINS_DIR"/*/; do
+    [[ -d "$dir" ]] || continue
+    local cmd_dir="$dir/commands"
+    [[ -d "$cmd_dir" ]] || continue
+    for cmd_file in "$cmd_dir"/*.sh; do
+      [[ -f "$cmd_file" ]] || continue
+      local cmd_name
+      cmd_name="$(basename "$cmd_file" .sh)"
+      echo "$cmd_file:$cmd_name"
+    done
+  done
+}
+
+_plugin_dispatch() {
+  local cmd="$1"
+  shift
+  while IFS=':' read -r cmd_file cmd_name; do
+    if [[ "$cmd_name" == "$cmd" ]]; then
+      source "$cmd_file"
+      if declare -f "${cmd_name}_main" &>/dev/null; then
+        "${cmd_name}_main" "$@"
+        return $?
+      fi
+    fi
+  done < <(_plugin_commands)
+  return 1
+}

package/karnel/tools/security/all.sh

@@ -0,0 +1,42 @@
+SECURITY_TOOLS=(
+  "nmap"
+  "hydra"
+  "nikto"
+  "sqlmap"
+  "gobuster"
+  "dirb"
+  "wpscan"
+  "john"
+  "aircrack-ng"
+  "metasploit"
+)
+
+for _tool in "${SECURITY_TOOLS[@]}"; do
+  source "$(dirname "${BASH_SOURCE[0]}")/$_tool/install.sh"
+done
+
+_batch_security() {
+  local action="$1"
+  local action_past="$2"
+  local -n count_var="$3"
+  for tool in "${SECURITY_TOOLS[@]}"; do
+    func_name="${action}_${tool//-/_}"
+    loading "${action_past^}ing ${tool}" "$func_name"
+    case $? in
+      0) ((count_var++)) ;;
+      2) ((skipped_count++)) ;;
+      1) ((failed_count++)) ;;
+    esac
+  done
+}
+
+install_all_security() {
+  local installed_count=0 skipped_count=0 failed_count=0
+  _batch_security "install" "install" installed_count
+  echo
+  log_success "Security: $installed_count installed, $skipped_count skipped, $failed_count failed"
+}
+
+uninstall_all_security() { _batch_security "uninstall" "uninstall" _unused; }
+update_all_security()   { _batch_security "update" "update" _unused; }
+reinstall_all_security() { _batch_security "reinstall" "reinstall" _unused; }

package/karnel/tools/security/template.sh

@@ -0,0 +1,35 @@
+# Template for security tool installers.
+# Copy this file and replace TOOL_NAME with the actual tool name.
+
+_TOOL="tool"
+_TOOL_PKG="$1"
+
+install_${_TOOL}() {
+  if command -v "$_TOOL" &>/dev/null; then
+    log_info "$_TOOL is already installed"
+    return 2
+  fi
+  log_info "Installing $_TOOL..."
+  if pkg install -y "$_TOOL_PKG" 2>/dev/null || apt install -y "$_TOOL_PKG" 2>/dev/null; then
+    log_success "$_TOOL installed"
+    return 0
+  fi
+  log_error "Failed to install $_TOOL"
+  return 1
+}
+
+uninstall_${_TOOL}() {
+  log_info "Removing $_TOOL..."
+  pkg uninstall -y "$_TOOL_PKG" 2>/dev/null || true
+  log_success "$_TOOL removed"
+}
+
+update_${_TOOL}() {
+  log_info "$_TOOL updated via package manager"
+  return 2
+}
+
+reinstall_${_TOOL}() {
+  uninstall_$_TOOL
+  install_$_TOOL
+}

package/karnel/utils/banner.sh

@@ -103,23 +103,37 @@ _repeat() {
 # ================================================================
 # Counters
 # ================================================================
-_count_ai() { local c=0; for cmd in opencode claude gemini codex qwen vibe mimo hermes kimi ollama freebuff agy mmx pi engram codegraph command-code gentle-ai gga openclaude openclaw kiro crush odysseus kilocode kimchi cline omni-route ctx7 openspec; do command -v "$cmd" &>/dev/null && ((c++)); done; echo "$c"; }
-_count_lang() { local c=0; for cmd in node python python3 rustc go clang php perl; do command -v "$cmd" &>/dev/null && ((c++)); done; echo "$c"; }
-_count_db() { local c=0; command -v pg_ctl &>/dev/null && ((c++)); command -v mariadb &>/dev/null && ((c++)); command -v sqlite3 &>/dev/null && ((c++)); command -v mongod &>/dev/null && ((c++)); echo "$c"; }
-_uptime() {
-  if [[ -f /proc/uptime ]]; then
-    local secs; secs=$(awk '{print int($1)}' /proc/uptime 2>/dev/null)
-    local d=$((secs/86400)) h=$((secs%86400/3600)) m=$((secs%3600/60))
-    if (( d>0 )); then printf "%dd %dh" "$d" "$h"
-    elif (( h>0 )); then printf "%dh %dm" "$h" "$m"
-    else printf "%dm" "$m"; fi
-  else echo "?"; fi
+_count_ai() {
+  local reg="$KARNEL_PATH/tools/ai/all.sh"
+  local c=0
+  if [[ -f "$reg" ]]; then
+    while IFS= read -r line; do
+      [[ "$line" =~ ^[[:space:]]*\"([^\"]+)\" ]] || continue
+      local entry="${BASH_REMATCH[1]}"
+      local bin="${entry##*:}"
+      command -v "$bin" &>/dev/null && ((c++))
+    done < <(grep -E '^\s+"' "$reg" 2>/dev/null || true)
+  fi
+  echo "$c"
+}
+_count_lang() { local c=0; for cmd in node python rustc go clang php perl bun; do command -v "$cmd" &>/dev/null && ((c++)); done; echo "$c"; }
+_count_db() { local c=0; command -v pg_ctl &>/dev/null && ((c++)); command -v mariadb &>/dev/null && ((c++)); command -v sqlite3 &>/dev/null && ((c++)); command -v mongod &>/dev/null && ((c++)); command -v redis-cli &>/dev/null && ((c++)); echo "$c"; }
+_count_doctor() {
+  local doc_sh="$KARNEL_PATH/cli/commands/doctor/code_langs.sh"
+  if [[ -f "$doc_sh" ]]; then
+    local count; count=$(grep -c 'LANG_TOOLS\[' "$doc_sh" 2>/dev/null || echo 0)
+    echo "$count"
+  else echo "0"; fi
 }
-_ram_free() {
-  if [[ -f /proc/meminfo ]]; then
-    local kb; kb=$(grep MemAvailable /proc/meminfo 2>/dev/null | awk '{print $2}')
-    [[ -n "$kb" ]] && echo "$((kb/1024))MB" || echo "?"
-  else echo "?"; fi
+_pg_status() {
+  if command -v pg_ctl &>/dev/null; then
+    local data="$KARNEL_DATA/pg/data"
+    if [[ -d "$data" ]] && pg_ctl status -D "$data" &>/dev/null 2>&1; then
+      echo "ON"
+    else
+      echo "OFF"
+    fi
+  else echo "—"; fi
 }
 
 # ================================================================
@@ -236,16 +250,16 @@ _render_frame_line() {
 # ================================================================
 # Panel
 # ================================================================
-PANEL_HEADERS=("AI" "Lang" "DB" "Up" "RAM")
-PANEL_ICONS=("◆" "</>" "⛁" "↗" "◫")
+PANEL_HEADERS=("AI" "Lang" "DB" "Doctor" "PG")
+PANEL_ICONS=("◆" "</>" "⛁" "◈" "🐘")
 
 _panel_value() {
   case $1 in
     0) echo "${KAI_VAL:-$(_count_ai)}" ;;
     1) echo "${KLANG_VAL:-$(_count_lang)}" ;;
     2) echo "${KDB_VAL:-$(_count_db)}" ;;
-    3) echo "${KUP_VAL:-$(_uptime)}" ;;
-    4) echo "${KRAM_VAL:-$(_ram_free)}" ;;
+    3) echo "${KDOCTOR_VAL:-$(_count_doctor)}" ;;
+    4) echo "${KPG_VAL:-$(_pg_status)}" ;;
   esac
 }
 
@@ -430,8 +444,8 @@ _render_animated() {
 KAI_VAL=$(_count_ai)
 KLANG_VAL=$(_count_lang)
 KDB_VAL=$(_count_db)
-KUP_VAL=$(_uptime)
-KRAM_VAL=$(_ram_free)
+KDOCTOR_VAL=$(_count_doctor)
+KPG_VAL=$(_pg_status)
 
 # Cache banner for clear() override (capture only, no terminal output)
 _banner_output=$(_render 2>/dev/null) || true