jishushell 0.4.24 → 0.4.30

package/INSTALL-NOTICE

@@ -20,6 +20,17 @@ software bundled with or installed by this product.
   with its respective license terms, including any restrictions on
   commercial use, competitive offerings, or redistribution.
 
+  Xcode Command Line Tools (build tools for macOS)
+    URL     : https://www.apple.com/legal/sla/docs/xcode.pdf
+    License : Apple Xcode and Apple SDKs Agreement
+    Author  : Apple Inc.
+
+  Homebrew (package manager for macOS)
+    URL     : https://github.com/Homebrew/brew
+    License : BSD 2-Clause License
+              https://github.com/Homebrew/brew/blob/HEAD/LICENSE.txt
+    Author  : Homebrew contributors
+
   Docker Engine
     URL     : https://github.com/moby/moby
     License : Apache License, Version 2.0

package/apps/browserless-chromium-container.yaml

@@ -0,0 +1,78 @@
+id: browserless-chromium-container
+name: Browserless Chromium
+version: "1.0.0"
+jishushell:
+  min_version: "0.4.30"
+description: "运行 browserless/chromium 服务，提供可嵌入实例页的浏览器调试画面与自动化连接端点"
+singleInstance: true
+
+tasks:
+  - name: browserless
+    role: service
+    runtime: container
+    image: "ghcr.io/browserless/chromium:latest"
+    env:
+      HOST: "0.0.0.0"
+      PORT: "3000"
+      TOKEN: ""
+      CONCURRENT: "5"
+      QUEUED: "10"
+      TIMEOUT: "120000"
+      # 防反爬虫配置
+      DEFAULT_USER_AGENT: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36"
+      FUNCTION_ENABLE_INCOGNITO: "true"
+      NAVIGATION_TIMEOUT: "30000"
+      # 减少自动化检测特征
+      DEFAULT_LAUNCH_ARGS: "--disable-blink-features=AutomationControlled --disable-infobars --window-size=1920,1080 --start-maximized"
+      DEFAULT_HEADLESS: "new"
+      # 持久化用户数据（cookies/localStorage/session），登录后会话保持
+      DATA_DIR: "/tmp/browserless-data"
+    volumes:
+      - source: "~/.jishushell/apps/${app_id}/data"
+        target: "/tmp/browserless-data"
+    resources:
+      cpu: "1000m"
+      memory: "2048Mi"
+    ports:
+      - name: http
+        port: 3000
+        visibility: external
+    health:
+      http:
+        path: /docs
+        port: 3000
+      interval: "15s"
+      timeout: "5s"
+      retries: 6
+      start_period: "35s"
+
+provides:
+  - capability: "browserless-debugger"
+    port: 3000
+    path: "/debugger/"
+    protocol: "http"
+    description: "Browserless Debug Viewer，可在实例页中嵌入浏览器画面"
+  - capability: "browserless-api"
+    port: 3000
+    path: "/"
+    protocol: "http"
+    description: "Browserless 根 API（供调试器页面连接 ws 与 sessions 接口）"
+  - capability: "browserless-docs"
+    port: 3000
+    path: "/docs/"
+    protocol: "http"
+    description: "Browserless API 文档页"
+  - capability: "browser-ws"
+    task: "browserless"
+    port: 3000
+    protocol: "ws"
+    description: "Browserless CDP/WebSocket 连接端点（ws://host:3000），用于 browser 类 require 自动绑定（命名遵循 <category>-<vendor> 约定）"
+
+lifecycle:
+  install:
+    - downloadImage: "ghcr.io/browserless/chromium:latest"
+    - mkdir: "~/.jishushell/apps/${app_id}/data"
+  pre_start:
+    - mkdir: "~/.jishushell/apps/${app_id}/data"
+  uninstall:
+    - deleteImage: "ghcr.io/browserless/chromium:latest"

package/apps/hermes-container.yaml

@@ -2,7 +2,7 @@ id: hermes-container
 name: Hermes Agent
 version: "1.0.0"
 jishushell:
-  min_version: "0.4.24"
+  min_version: "0.4.30"
 agentType: hermes
 description: "Hermes Agent 容器运行时，使用 apps 目录作为统一安装根"
 singleInstance: false
@@ -32,4 +32,38 @@ tasks:
       interval: "15s"
       timeout: "5s"
       retries: 3
-      start_period: "30s"
+      start_period: "30s"
+
+provides:
+  - capability: "web-hermes"
+    task: "gateway"
+    port: 8642
+    protocol: "http"
+    description: "Hermes Agent Web UI"
+  - capability: "llm-agent"
+    task: "gateway"
+    port: 8642
+    protocol: "http"
+    path: "/v1"
+    auth:
+      kind: "bearer"
+      tokenSource: "instance.env.API_SERVER_KEY"
+    description: "OpenAI-compatible chat endpoint (verified on Pi: GET /v1/models returns hermes-agent model)"
+
+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"

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}"