jishushell 0.4.24 → 0.5.15

package/apps/ollama-binary.yaml

@@ -2,7 +2,7 @@ id: ollama-binary
 name: Ollama
 version: "1.0.0"
 jishushell:
-  min_version: "0.4.24"
+  min_version: "0.4.30"
 description: "通过官方脚本，安装并运行Ollama"
 singleInstance: true
 
@@ -62,8 +62,15 @@ provides:
           - cmd: "help"
             description: "Help about any command"
   - capability: "ollama-api"
+    task: "gateway"
     port: 11434
+    protocol: "http"
     description: "Ollama HTTP API，兼容 OpenAI /v1/chat/completions 端点"
+  - capability: "llm-ollama"
+    task: "gateway"
+    port: 11434
+    protocol: "http"
+    description: "Ollama OpenAI-compatible LLM endpoint (Connections 主推命名)"
 
 lifecycle:
   pre_install:
@@ -75,76 +82,74 @@ lifecycle:
         fi;
   install:
     - run: >-
-        if ! command -v ollama >/dev/null 2>&1; then
-          echo "未检测到 ollama，开始安装..." >&2;
-          if [ "$(id -u)" -ne 0 ]; then
-            if ! command -v sudo >/dev/null 2>&1; then
-              echo "未检测到 sudo，当前环境无法自动安装 Ollama。请以 root 身份重试。" >&2;
-              exit 1;
-            fi;
-            if [ -n "${JISHUSHELL_SUDO_ASKPASS:-}" ]; then
-              sudo_probe_output="$(sudo -k -A true 2>&1)" || {
-                if printf '%s\n' "$sudo_probe_output" | grep -qi "no new privileges"; then
-                  echo "当前运行环境禁止 sudo 提权（no new privileges），无法自动安装 Ollama。请在系统终端手动安装，或调整容器/服务配置后重试。" >&2;
-                else
-                  echo "提供的 sudo 密码无效，无法安装 Ollama。" >&2;
-                fi;
-                exit 1;
-              };
-              run_as_root() { sudo -A "$@"; };
-            else
-              sudo_probe_output="$(sudo -n true 2>&1)" || {
-                if printf '%s\n' "$sudo_probe_output" | grep -qi "no new privileges"; then
-                  echo "当前运行环境禁止 sudo 提权（no new privileges），无法自动安装 Ollama。请在系统终端手动安装，或调整容器/服务配置后重试。" >&2;
-                else
-                  echo "安装 Ollama 需要 sudo 密码；请在页面弹窗中输入后重试。" >&2;
-                fi;
-                exit 1;
-              };
-              run_as_root() { sudo -n "$@"; };
-            fi;
+        install_marker="$HOME/.jishushell/apps/${app_id}/.ollama-install-needed";
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${app_id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${app_id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${app_id}";
+        rm -f "$install_marker";
+        if command -v ollama >/dev/null 2>&1; then
+          if [ -f "$owner_marker" ] || [ -f "$legacy_owner_marker" ]; then
+            echo "检测到由 JishuShell 安装的 ollama，复用现有二进制。" >&2;
+            rm -f "$system_install_marker";
           else
-            run_as_root() { "$@"; };
+            echo "检测到系统中已安装 ollama，跳过二进制安装。" >&2;
+            rm -f "$owner_marker" "$legacy_owner_marker";
+            : > "$system_install_marker";
           fi;
-          for BINDIR in /usr/local/bin /usr/bin /bin; do
-            echo "$PATH" | grep -q "$BINDIR" && break || continue;
-          done;
-          OLLAMA_INSTALL_DIR="$(dirname "${BINDIR:-/usr/local/bin}")";
-          if [ -d "$OLLAMA_INSTALL_DIR/lib/ollama" ]; then
-            old_dir="$OLLAMA_INSTALL_DIR/lib/ollama.jishushell-old-$(date +%s)";
-            echo "检测到旧版 Ollama 目录，先移动到 $old_dir 以避免长时间卡在清理步骤..." >&2;
-            run_as_root mv "$OLLAMA_INSTALL_DIR/lib/ollama" "$old_dir";
-            ( run_as_root rm -rf "$old_dir" >/dev/null 2>&1 || true ) &
-          fi;
-          curl -fsSL https://ollama.com/install.sh | run_as_root sh;
         else
-          echo "检测到系统中已安装 ollama，跳过二进制安装。" >&2;
+          echo "未检测到 ollama，开始安装..." >&2;
+          rm -f "$owner_marker" "$legacy_owner_marker" "$system_install_marker";
+          : > "$install_marker";
         fi
+    - run: >-
+        install_marker="$HOME/.jishushell/apps/${app_id}/.ollama-install-needed";
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${app_id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${app_id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${app_id}";
+        for BINDIR in /usr/local/bin /usr/bin /bin; do
+          echo "$PATH" | grep -q "$BINDIR" && break || continue;
+        done;
+        OLLAMA_INSTALL_DIR="$(dirname "${BINDIR:-/usr/local/bin}")";
+        if [ -d "$OLLAMA_INSTALL_DIR/lib/ollama" ]; then
+          old_dir="$OLLAMA_INSTALL_DIR/lib/ollama.jishushell-old-$(date +%s)";
+          echo "检测到旧版 Ollama 目录，先移动到 $old_dir 以避免长时间卡在清理步骤..." >&2;
+          mv "$OLLAMA_INSTALL_DIR/lib/ollama" "$old_dir";
+          ( rm -rf "$old_dir" >/dev/null 2>&1 || true ) &
+        fi;
+        curl -fsSL https://ollama.com/install.sh | sh;
+        rm -f "$install_marker";
+        rm -f "$legacy_owner_marker";
+        rm -f "$system_install_marker";
+        : > "$owner_marker"
+      sudo: true
+      ifFileExists: "~/.jishushell/apps/${app_id}/.ollama-install-needed"
       timeout_ms: 900000
       successIfCommandExists: "ollama"
     - run: >-
+        install_marker="$HOME/.jishushell/apps/${app_id}/.ollama-install-needed";
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${app_id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${app_id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${app_id}";
+        if [ -f "$install_marker" ] && command -v ollama >/dev/null 2>&1; then
+          echo "检测到 ollama 已可用，补记为由 JishuShell 安装。" >&2;
+          rm -f "$install_marker";
+          rm -f "$legacy_owner_marker";
+          rm -f "$system_install_marker";
+          : > "$owner_marker";
+        fi
+      ifFileExists: "~/.jishushell/apps/${app_id}/.ollama-install-needed"
+    - run: >-
+        service_active_marker="$HOME/.jishushell/apps/${app_id}/.ollama-service-active";
+        rm -f "$service_active_marker";
         case "$(uname -s)" in
           Linux)
             if command -v systemctl >/dev/null 2>&1 && systemctl list-unit-files ollama.service >/dev/null 2>&1; then
-              echo "停止并禁用 ollama.service，后续交由 Nomad 管理..." >&2;
-              if [ "$(id -u)" -eq 0 ]; then
-                run_as_root() { "$@"; };
-              elif [ -n "${JISHUSHELL_SUDO_ASKPASS:-}" ]; then
-                sudo_probe_output="$(sudo -k -A true 2>&1)" || {
-                  if printf '%s\n' "$sudo_probe_output" | grep -qi "no new privileges"; then
-                    echo "当前运行环境禁止 sudo 提权（no new privileges），无法清理 ollama.service。请在系统终端手动执行后重试。" >&2;
-                  else
-                    echo "提供的 sudo 密码无效，无法清理 ollama.service。" >&2;
-                  fi;
-                  exit 1;
-                };
-                run_as_root() { sudo -A "$@"; };
-              elif command -v sudo >/dev/null 2>&1; then
-                run_as_root() { sudo -n "$@"; };
+              if systemctl is-active --quiet ollama.service 2>/dev/null; then
+                echo "检测到正在运行的 ollama.service，尝试停止并禁用，后续交由 Nomad 管理..." >&2;
+                : > "$service_active_marker";
               else
-                run_as_root() { "$@"; };
+                echo "检测到未运行的 ollama.service，保留当前 systemd 配置不变。" >&2;
               fi;
-              run_as_root systemctl disable --now ollama;
             else
               echo "Linux 环境未检测到 ollama.service，跳过 systemd 清理。" >&2;
             fi
@@ -163,38 +168,34 @@ lifecycle:
             echo "当前平台不支持自动清理 Ollama 自启，跳过。" >&2
             ;;
         esac
+    - run: >-
+        systemctl disable --now ollama;
+        rm -f "$HOME/.jishushell/apps/${app_id}/.ollama-service-active"
+      sudo: true
+      ifFileExists: "~/.jishushell/apps/${app_id}/.ollama-service-active"
 
   uninstall:
     - run: >-
-        if [ "$(id -u)" -ne 0 ]; then
-          if ! command -v sudo >/dev/null 2>&1; then
-            echo "当前环境未检测到 sudo，无法卸载 Ollama。请以 root 身份重试。" >&2;
-            exit 1;
-          fi;
-          if [ -n "${JISHUSHELL_SUDO_ASKPASS:-}" ]; then
-            sudo_probe_output="$(sudo -k -A true 2>&1)" || {
-              if printf '%s\n' "$sudo_probe_output" | grep -qi "no new privileges"; then
-                echo "当前运行环境禁止 sudo 提权（no new privileges），无法卸载 Ollama。请在系统终端手动执行，或调整容器/服务配置后重试。" >&2;
-              else
-                echo "提供的 sudo 密码无效，无法卸载 Ollama。" >&2;
-              fi;
-              exit 1;
-            };
-            run_as_root() { sudo -A "$@"; };
-          else
-            sudo_probe_output="$(sudo -n true 2>&1)" || {
-              if printf '%s\n' "$sudo_probe_output" | grep -qi "no new privileges"; then
-                echo "当前运行环境禁止 sudo 提权（no new privileges），无法卸载 Ollama。请在系统终端手动执行，或调整容器/服务配置后重试。" >&2;
-              else
-                echo "卸载 Ollama 需要 sudo 密码；请在页面弹窗中输入后重试。" >&2;
-              fi;
-              exit 1;
-            };
-            run_as_root() { sudo -n "$@"; };
-          fi;
-        else
-          run_as_root() { "$@"; };
-        fi;
-        run_as_root rm -f /usr/local/bin/ollama /usr/bin/ollama /bin/ollama;
-        run_as_root rm -rf /usr/local/lib/ollama /usr/lib/ollama /usr/share/ollama 2>/dev/null || true
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${app_id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${app_id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${app_id}";
+        uninstall_marker="$HOME/.jishushell/.ollama-uninstall-needed-${app_id}";
+        rm -f "$uninstall_marker";
+        if [ -f "$system_install_marker" ]; then
+          echo "检测到复用的是系统已有 ollama，卸载时保留系统安装。" >&2;
+          rm -f "$system_install_marker";
+        elif [ -f "$owner_marker" ] || [ -f "$legacy_owner_marker" ]; then
+          : > "$uninstall_marker";
+        fi
+    - run: >-
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${app_id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${app_id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${app_id}";
+        uninstall_marker="$HOME/.jishushell/.ollama-uninstall-needed-${app_id}";
+        rm -f /usr/local/bin/ollama /usr/bin/ollama /bin/ollama;
+        rm -rf /usr/local/lib/ollama /usr/lib/ollama /usr/share/ollama 2>/dev/null || true;
+        rm -rf /Applications/Ollama.app "$HOME/Applications/Ollama.app" 2>/dev/null || true;
+        rm -f "$owner_marker" "$legacy_owner_marker" "$system_install_marker" "$uninstall_marker"
+      sudo: true
+      ifFileExists: "~/.jishushell/.ollama-uninstall-needed-${app_id}"
 

package/apps/ollama-cpu-container.yaml

@@ -2,7 +2,7 @@ id: ollama-cpu-docker
 name: Ollama CPU(Docker)
 version: "1.0.0"
 jishushell:
-  min_version: "0.4.24"
+  min_version: "0.4.30"
 description: "使用 alpine/ollama 镜像运行的纯 CPU 版 Ollama"
 singleInstance: true
 
@@ -33,5 +33,12 @@ tasks:
 
 provides:
   - capability: "ollama-api"
+    task: "gateway"
     port: 11434
+    protocol: "http"
     description: "Ollama HTTP API，兼容 OpenAI /v1/chat/completions 端点"
+  - capability: "llm-ollama"
+    task: "gateway"
+    port: 11434
+    protocol: "http"
+    description: "Ollama OpenAI-compatible LLM endpoint (Connections 主推命名)"

package/apps/ollama-with-hollama-binary.yaml

@@ -2,7 +2,7 @@ id: ollama-with-hollama-binary
 name: Ollama
 version: "1.0.0"
 jishushell:
-  min_version: "0.4.24"
+  min_version: "0.4.30"
 description: "通过官方脚本安装并运行 Ollama，同时提供 Hollama Web UI。"
 singleInstance: true
 
@@ -52,13 +52,20 @@ tasks:
 
 provides:
   - capability: "hollama-web"
+    task: "hollama"
     port: 4173
     protocol: "http"
     description: "Hollama Web 界面"
   - capability: "ollama-api"
+    task: "gateway"
     port: 11434
     protocol: "http"
     description: "Ollama HTTP API，兼容 OpenAI /v1/chat/completions 端点"
+  - capability: "llm-ollama"
+    task: "gateway"
+    port: 11434
+    protocol: "http"
+    description: "Ollama OpenAI-compatible LLM endpoint (Connections 主推命名)"
 
 lifecycle:
   pre_install:
@@ -71,76 +78,74 @@ lifecycle:
   install:
     - downloadImage: "ghcr.io/fmaclen/hollama:latest"
     - run: >-
-        if ! command -v ollama >/dev/null 2>&1; then
-          echo "未检测到 ollama，开始安装..." >&2;
-          if [ "$(id -u)" -ne 0 ]; then
-            if ! command -v sudo >/dev/null 2>&1; then
-              echo "未检测到 sudo，当前环境无法自动安装 Ollama。请以 root 身份重试。" >&2;
-              exit 1;
-            fi;
-            if [ -n "${JISHUSHELL_SUDO_ASKPASS:-}" ]; then
-              sudo_probe_output="$(sudo -A true 2>&1)" || {
-                if printf '%s\n' "$sudo_probe_output" | grep -qi "no new privileges"; then
-                  echo "当前运行环境禁止 sudo 提权（no new privileges），无法自动安装 Ollama。请在系统终端手动安装，或调整容器/服务配置后重试。" >&2;
-                else
-                  echo "提供的 sudo 密码无效，无法安装 Ollama。" >&2;
-                fi;
-                exit 1;
-              };
-              run_as_root() { sudo -A "$@"; };
-            else
-              sudo_probe_output="$(sudo -n true 2>&1)" || {
-                if printf '%s\n' "$sudo_probe_output" | grep -qi "no new privileges"; then
-                  echo "当前运行环境禁止 sudo 提权（no new privileges），无法自动安装 Ollama。请在系统终端手动安装，或调整容器/服务配置后重试。" >&2;
-                else
-                  echo "安装 Ollama 需要 sudo 密码；请在页面弹窗中输入后重试。" >&2;
-                fi;
-                exit 1;
-              };
-              run_as_root() { sudo -n "$@"; };
-            fi;
+        install_marker="$HOME/.jishushell/apps/${app_id}/.ollama-install-needed";
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${app_id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${app_id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${app_id}";
+        rm -f "$install_marker";
+        if command -v ollama >/dev/null 2>&1; then
+          if [ -f "$owner_marker" ] || [ -f "$legacy_owner_marker" ]; then
+            echo "检测到由 JishuShell 安装的 ollama，复用现有二进制。" >&2;
+            rm -f "$system_install_marker";
           else
-            run_as_root() { "$@"; };
+            echo "检测到系统中已安装 ollama，跳过二进制安装。" >&2;
+            rm -f "$owner_marker" "$legacy_owner_marker";
+            : > "$system_install_marker";
           fi;
-          for BINDIR in /usr/local/bin /usr/bin /bin; do
-            echo "$PATH" | grep -q "$BINDIR" && break || continue;
-          done;
-          OLLAMA_INSTALL_DIR="$(dirname "${BINDIR:-/usr/local/bin}")";
-          if [ -d "$OLLAMA_INSTALL_DIR/lib/ollama" ]; then
-            old_dir="$OLLAMA_INSTALL_DIR/lib/ollama.jishushell-old-$(date +%s)";
-            echo "检测到旧版 Ollama 目录，先移动到 $old_dir 以避免长时间卡在清理步骤..." >&2;
-            run_as_root mv "$OLLAMA_INSTALL_DIR/lib/ollama" "$old_dir";
-            ( run_as_root rm -rf "$old_dir" >/dev/null 2>&1 || true ) &
-          fi;
-          curl -fsSL https://ollama.com/install.sh | run_as_root sh;
         else
-          echo "检测到系统中已安装 ollama，跳过二进制安装。" >&2;
+          echo "未检测到 ollama，开始安装..." >&2;
+          rm -f "$owner_marker" "$legacy_owner_marker" "$system_install_marker";
+          : > "$install_marker";
         fi
+    - run: >-
+        install_marker="$HOME/.jishushell/apps/${app_id}/.ollama-install-needed";
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${app_id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${app_id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${app_id}";
+        for BINDIR in /usr/local/bin /usr/bin /bin; do
+          echo "$PATH" | grep -q "$BINDIR" && break || continue;
+        done;
+        OLLAMA_INSTALL_DIR="$(dirname "${BINDIR:-/usr/local/bin}")";
+        if [ -d "$OLLAMA_INSTALL_DIR/lib/ollama" ]; then
+          old_dir="$OLLAMA_INSTALL_DIR/lib/ollama.jishushell-old-$(date +%s)";
+          echo "检测到旧版 Ollama 目录，先移动到 $old_dir 以避免长时间卡在清理步骤..." >&2;
+          mv "$OLLAMA_INSTALL_DIR/lib/ollama" "$old_dir";
+          ( rm -rf "$old_dir" >/dev/null 2>&1 || true ) &
+        fi;
+        curl -fsSL https://ollama.com/install.sh | sh;
+        rm -f "$install_marker";
+        rm -f "$legacy_owner_marker";
+        rm -f "$system_install_marker";
+        : > "$owner_marker"
+      sudo: true
+      ifFileExists: "~/.jishushell/apps/${app_id}/.ollama-install-needed"
       timeout_ms: 900000
       successIfCommandExists: "ollama"
     - run: >-
+        install_marker="$HOME/.jishushell/apps/${app_id}/.ollama-install-needed";
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${app_id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${app_id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${app_id}";
+        if [ -f "$install_marker" ] && command -v ollama >/dev/null 2>&1; then
+          echo "检测到 ollama 已可用，补记为由 JishuShell 安装。" >&2;
+          rm -f "$install_marker";
+          rm -f "$legacy_owner_marker";
+          rm -f "$system_install_marker";
+          : > "$owner_marker";
+        fi
+      ifFileExists: "~/.jishushell/apps/${app_id}/.ollama-install-needed"
+    - run: >-
+        service_active_marker="$HOME/.jishushell/apps/${app_id}/.ollama-service-active";
+        rm -f "$service_active_marker";
         case "$(uname -s)" in
           Linux)
             if command -v systemctl >/dev/null 2>&1 && systemctl list-unit-files ollama.service >/dev/null 2>&1; then
-              echo "停止并禁用 ollama.service，后续交由 Nomad 管理..." >&2;
-              if [ "$(id -u)" -eq 0 ]; then
-                run_as_root() { "$@"; };
-              elif [ -n "${JISHUSHELL_SUDO_ASKPASS:-}" ]; then
-                sudo_probe_output="$(sudo -A true 2>&1)" || {
-                  if printf '%s\n' "$sudo_probe_output" | grep -qi "no new privileges"; then
-                    echo "当前运行环境禁止 sudo 提权（no new privileges），无法清理 ollama.service。请在系统终端手动执行后重试。" >&2;
-                  else
-                    echo "提供的 sudo 密码无效，无法清理 ollama.service。" >&2;
-                  fi;
-                  exit 1;
-                };
-                run_as_root() { sudo -A "$@"; };
-              elif command -v sudo >/dev/null 2>&1; then
-                run_as_root() { sudo -n "$@"; };
+              if systemctl is-active --quiet ollama.service 2>/dev/null; then
+                echo "检测到正在运行的 ollama.service，尝试停止并禁用，后续交由 Nomad 管理..." >&2;
+                : > "$service_active_marker";
               else
-                run_as_root() { "$@"; };
+                echo "检测到未运行的 ollama.service，保留当前 systemd 配置不变。" >&2;
               fi;
-              run_as_root systemctl disable --now ollama;
             else
               echo "Linux 环境未检测到 ollama.service，跳过 systemd 清理。" >&2;
             fi
@@ -159,37 +164,33 @@ lifecycle:
             echo "当前平台不支持自动清理 Ollama 自启，跳过。" >&2
             ;;
         esac
+    - run: >-
+        systemctl disable --now ollama;
+        rm -f "$HOME/.jishushell/apps/${app_id}/.ollama-service-active"
+      sudo: true
+      ifFileExists: "~/.jishushell/apps/${app_id}/.ollama-service-active"
 
   uninstall:
     - run: >-
-        if [ "$(id -u)" -ne 0 ]; then
-          if ! command -v sudo >/dev/null 2>&1; then
-            echo "当前环境未检测到 sudo，无法卸载 Ollama。请以 root 身份重试。" >&2;
-            exit 1;
-          fi;
-          if [ -n "${JISHUSHELL_SUDO_ASKPASS:-}" ]; then
-            sudo_probe_output="$(sudo -A true 2>&1)" || {
-              if printf '%s\n' "$sudo_probe_output" | grep -qi "no new privileges"; then
-                echo "当前运行环境禁止 sudo 提权（no new privileges），无法卸载 Ollama。请在系统终端手动执行，或调整容器/服务配置后重试。" >&2;
-              else
-                echo "提供的 sudo 密码无效，无法卸载 Ollama。" >&2;
-              fi;
-              exit 1;
-            };
-            run_as_root() { sudo -A "$@"; };
-          else
-            sudo_probe_output="$(sudo -n true 2>&1)" || {
-              if printf '%s\n' "$sudo_probe_output" | grep -qi "no new privileges"; then
-                echo "当前运行环境禁止 sudo 提权（no new privileges），无法卸载 Ollama。请在系统终端手动执行，或调整容器/服务配置后重试。" >&2;
-              else
-                echo "卸载 Ollama 需要 sudo 密码；请在页面弹窗中输入后重试。" >&2;
-              fi;
-              exit 1;
-            };
-            run_as_root() { sudo -n "$@"; };
-          fi;
-        else
-          run_as_root() { "$@"; };
-        fi;
-        run_as_root rm -f /usr/local/bin/ollama /usr/bin/ollama /bin/ollama;
-        run_as_root rm -rf /usr/local/lib/ollama /usr/lib/ollama /usr/share/ollama 2>/dev/null || true
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${app_id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${app_id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${app_id}";
+        uninstall_marker="$HOME/.jishushell/.ollama-uninstall-needed-${app_id}";
+        rm -f "$uninstall_marker";
+        if [ -f "$system_install_marker" ]; then
+          echo "检测到复用的是系统已有 ollama，卸载时保留系统安装。" >&2;
+          rm -f "$system_install_marker";
+        elif [ -f "$owner_marker" ] || [ -f "$legacy_owner_marker" ]; then
+          : > "$uninstall_marker";
+        fi
+    - run: >-
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${app_id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${app_id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${app_id}";
+        uninstall_marker="$HOME/.jishushell/.ollama-uninstall-needed-${app_id}";
+        rm -f /usr/local/bin/ollama /usr/bin/ollama /bin/ollama;
+        rm -rf /usr/local/lib/ollama /usr/lib/ollama /usr/share/ollama 2>/dev/null || true;
+        rm -rf /Applications/Ollama.app "$HOME/Applications/Ollama.app" 2>/dev/null || true;
+        rm -f "$owner_marker" "$legacy_owner_marker" "$system_install_marker" "$uninstall_marker"
+      sudo: true
+      ifFileExists: "~/.jishushell/.ollama-uninstall-needed-${app_id}"

package/apps/openclaw-binary.yaml

@@ -2,7 +2,7 @@ id: openclaw-binary
 name: OpenClaw Binary
 version: "1.0.0"
 jishushell:
-  min_version: "0.4.24"
+  min_version: "0.4.30"
 agentType: openclaw
 description: "将 OpenClaw 安装到应用目录内的 npm prefix，并以 process runtime 运行网关"
 singleInstance: false
@@ -33,8 +33,45 @@ tasks:
 
 provides:
   - capability: "openclaw-dashboard"
+    task: "gateway"
     port: 18789
+    protocol: "http"
     description: "OpenClaw Dashboard"
+  - capability: "llm-agent"
+    task: "gateway"
+    port: 18789
+    protocol: "http"
+    path: "/v1"
+    description: "OpenAI-compatible agent endpoint backed by OpenClaw"
+    auth:
+      kind: "bearer"
+      tokenSource: "instance.config.gateway.auth.token"
+
+requires:
+  - capability: "llm"
+    inject_as: "LLM_ENDPOINT"
+    required: false
+    cardinality: "one"
+  - capability: "search"
+    inject_as: "SEARCH_API_BASE_URL"
+    required: false
+    cardinality: "one"
+  - capability: "browser"
+    inject_as: "BROWSER_CDP_URL"
+    required: false
+    cardinality: "one"
+  - capability: "mcp"
+    inject_as: "MCP_SERVERS"
+    required: false
+    cardinality: "many"
+  - capability: "files"
+    inject_as: "FILES_BROWSER_URL"
+    required: false
+    cardinality: "one"
+  - capability: "knowledge"
+    inject_as: "KNOWLEDGE_BASE_URL"
+    required: false
+    cardinality: "one"
 
 lifecycle:
   install:

package/apps/openclaw-container.yaml

@@ -2,7 +2,7 @@ id: openclaw-container
 name: OpenClaw Container
 version: "1.0.0"
 jishushell:
-  min_version: "0.4.24"
+  min_version: "0.4.30"
 agentType: openclaw
 description: "基于 openclaw-runtime 容器运行的 OpenClaw 网关"
 singleInstance: false
@@ -33,5 +33,48 @@ tasks:
 
 provides:
   - capability: "openclaw-dashboard"
+    task: "gateway"
     port: 18789
-    description: "OpenClaw Dashboard"
+    protocol: "http"
+    description: "OpenClaw Dashboard"
+  # OpenClaw exposes OpenAI-compatible chat/completions when its config has
+  # `gateway.http.endpoints.chatCompletions.enabled = true`. The runtime
+  # adapter's startInstance hook patches openclaw.json on every start to
+  # ensure that flag is on, so any consumer binding this provider gets a
+  # working /v1/chat/completions endpoint regardless of when the instance
+  # was originally created. Auth uses the gateway token from openclaw.json.
+  - capability: "llm-agent"
+    task: "gateway"
+    port: 18789
+    protocol: "http"
+    path: "/v1"
+    description: "OpenAI-compatible agent endpoint backed by OpenClaw"
+    auth:
+      kind: "bearer"
+      tokenSource: "instance.config.gateway.auth.token"
+
+requires:
+  - capability: "llm"
+    inject_as: "LLM_ENDPOINT"
+    required: false
+    cardinality: "one"
+  - capability: "search"
+    inject_as: "SEARCH_API_BASE_URL"
+    required: false
+    cardinality: "one"
+  - capability: "browser"
+    inject_as: "BROWSER_CDP_URL"
+    required: false
+    cardinality: "one"
+  - capability: "mcp"
+    inject_as: "MCP_SERVERS"
+    required: false
+    cardinality: "many"
+  - capability: "files"
+    inject_as: "FILES_BROWSER_URL"
+    required: false
+    cardinality: "one"
+  - capability: "knowledge"
+    inject_as: "KNOWLEDGE_BASE_URL"
+    required: false
+    cardinality: "one"

package/apps/openclaw-with-ollama-container.yaml

@@ -2,7 +2,7 @@ id: openclaw-with-ollama-container
 name: OpenClaw With Ollama
 version: "1.0.0"
 jishushell:
-  min_version: "0.4.24"
+  min_version: "0.4.30"
 agentType: openclaw
 description: "通过 requires 消费 ollama-api 能力，并将解析地址注入 OpenClaw 运行环境"
 singleInstance: false
@@ -39,4 +39,13 @@ tasks:
 provides:
   - capability: "openclaw-dashboard"
     port: 18789
-    description: "OpenClaw Dashboard"
+    description: "OpenClaw Dashboard"
+  - capability: "llm-agent"
+    task: "gateway"
+    port: 18789
+    protocol: "http"
+    path: "/v1"
+    description: "OpenAI-compatible agent endpoint backed by OpenClaw"
+    auth:
+      kind: "bearer"
+      tokenSource: "instance.config.gateway.auth.token"