jishushell 0.6.5 → 0.7.3

package/apps/jishu-kb-container.yaml

@@ -1,31 +1,35 @@
 id: jishu-kb-container
 name: JishuShell KB
-version: "0.1.0"
+version: "0.1.2"
 jishushell:
-  min_version: "0.5.15"
+  min_version: "0.6.19"
 description: "JishuShell-KB: BM25 + 向量 + cross-encoder rerank 的本地知识库（单镜像）。提供 /api/kb/* 原生检索 API + OpenAI 兼容 /v1 透传 + Web UI。"
 singleInstance: true
+integrations:
+  - kind: jishukb
 
 # 拓扑（单容器，无 sidecar）
-#   jishu-kb (container :8088) ── host :18095 ── 用户浏览器 / shim / agent
+#   jishu-kb (container :8088) ── host :18095 ── 用户浏览器 / JishuShell / OpenClaw
+#                              ├─ /mcp （OpenClaw native remote MCP）
 #                              └─ /data （SQLite + 向量索引 + 上传文档 + ONNX rerank 模型）
 #
 # 端到端调用链（OpenClaw agent）：
-#   用户 → OpenClaw（自带 LLM）→ 决定调 kb_search → mcporter call kb.kb_search
-#     → jishukb-shim → POST http://host.docker.internal:18095/api/kb/default/search
-#     → 返回 ranked chunks + scores → OpenClaw 自带 LLM 拼答案 + 引用
+#   用户 → OpenClaw（自带 LLM）→ native mcp.servers.kb
+#     → POST http://<kb-host>:18095/mcp
+#     → JishuKB 在同一个运行中服务内执行 kb__* 工具
+#     → 返回 ranked chunks / 文档 / jobs / 配置摘要 → OpenClaw 自带 LLM 拼答案 + 引用
 #
 # 关键设计：
-#   - v1 不带 auth（LAN-trust 模型，同 AnythingLLM / WeKnora / SearXNG）。
-#     JISHU_KB_AUTH_TOKEN 留空即可。
-#     **安全 trade-off（与 AnythingLLM 同样接受）**：post_start 通过
-#     LAN HTTP 明文 PUT 上游 LLM api key 到 /api/admin/provider。当
-#     JISHUSHELL_LAN_HOST 非 loopback 时，该请求在用户局域网内传输。
-#     v2 mitigation：把 admin 端点切到 loopback-only / Unix domain
-#     socket，或者切回 W2（panel-proxy 路由上游凭据，不交给 jishu-kb）。
-#   - LLM 生成后端在 post_start 通过 PUT /api/admin/provider 一次性写入；
-#     embedBackend=auto 让 jishu-kb 自动挑（有 Ollama 用 Ollama，否则用
-#     内置 BGE ONNX）。
+#   - remote MCP 是 opt-in 且需要 bearer token。JishuShell 的 jishukb
+#     integration 会在 start/restart 前生成 instance 私有 secret.env，
+#     通过 Nomad env template 注入 JISHU_KB_AUTH_TOKEN，同时设置
+#     JISHU_KB_MCP_HTTP=1，然后把 mcpAuthToken 写入 provider-credentials，
+#     供 OpenClaw 连接使用。
+#   - JishuKB 不再由 Core 注入 default LLM key。generation provider
+#     由用户在 JishuKB 自己的 UI 中手动配置；Core 不把真实 upstream key
+#     写进 /api/admin/provider。
+#   - Core 仍保留知识库默认 default KB 创建、provider-credentials 写入、
+#     knowledge/web capability 暴露等集成能力。
 #   - Ollama URL 通过 `requires: llm-ollama` 注入到 JISHU_KB_OLLAMA_URL，
 #     供 embedding/rerank 模型按需调用；未绑定时为空字符串，jishu-kb
 #     fallback 到自身 config.go 默认值。
@@ -37,16 +41,14 @@ tasks:
   - name: jishukb
     role: service
     runtime: container
-    # 镜像 GHCR public，多架构（amd64/arm64）。Pin 0.1.0 避免 :latest 漂移。
-    image: "ghcr.io/x-aijishu/jishu-kb:0.1.0"
+    # 镜像 GHCR public，多架构（amd64/arm64）。Pin 0.1.2 避免 :latest 漂移。
+    image: "ghcr.io/x-aijishu/jishu-kb:0.1.2"
     user: "host"
     env:
       # 监听端口（container 内）。
       JISHU_KB_PORT: "8088"
       # 数据持久化目录。镜像默认即 /data，显式声明便于看 spec 一目了然。
       JISHU_KB_DATA: "/data"
-      # v1 ships without auth — see manifest top notes + plan.md §5.
-      JISHU_KB_AUTH_TOKEN: ""
       # The panel now embeds KB through the capability proxy. That keeps
       # absolute `/api/...` calls on the KB origin and lets the proxy
       # bootstrap hydrate server-stored conversations into a new browser
@@ -54,27 +56,28 @@ tasks:
       # embedding permissive for users who open :18095 manually.
       #
       # Wildcard is intentional here: panel origin can vary by LAN IP / host
-      # name, while JishuShell-KB v1 already runs without auth in the same
-      # LAN-trust model as AnythingLLM / WeKnora.
+      # name. API and remote MCP writes are protected by the generated bearer
+      # token; the static shell remains loadable so users can enter auth when
+      # opening :18095 manually.
       JISHU_KB_FRAME_ANCESTORS: "*"
       # Ollama URL: injected by `requires: llm-ollama` 下方的 capability slot。
-      # 注意：nomad-manager.ts:2006 的 `${requires.X}` 正则没有 `:-default`
-      # 兜底语法 — 未绑定时这里就是空字符串。jishu-kb 在 internal/config/config.go
+      # `${requires.X}` materialization 当前不支持 `:-default` 兜底语法；
+      # 未绑定时这里就是空字符串。jishu-kb 在 internal/config/config.go
       # 中自带默认值 http://localhost:11434，不影响启动。
       JISHU_KB_OLLAMA_URL: "${requires.JISHU_KB_OLLAMA_URL}"
-      # rerank 默认开；topK 默认 6（与 shim 默认值保持一致）。
+      # rerank 默认开；topK 默认 6（与 OpenClaw KB guidance 保持一致）。
       JISHU_KB_RERANK: "1"
       JISHU_KB_TOPK: "6"
       TZ: "Asia/Shanghai"
-      # 生成后端（genBaseUrl / genApiKey / genModel）在 post_start 阶段
-      # 通过 PUT /api/admin/provider 一次性写入；这里不预置，避免明文落入
-      # nomad job spec / mcporter.json。
+      # generation provider 由用户在 JishuKB UI 内自行配置；Core 不在启动
+      # 时预置默认上游 key，避免明文落入 app 私有配置或运行时 spec。
     resources:
       # jishu-kb 实测 ~300-600MB RSS：Go runtime + ONNX rerank 模型（首启加载）
       # + SQLite/向量索引 mmap。给 1024Mi 留 buffer，1 vCPU 足够并发查询。
       cpu: "1000m"
       memory: "1024Mi"
     ports:
+      # Core 会先把这个值当作宿主端口 seed 尝试；最终 hostPort 以 instance.json 为准。
       - name: http
         port: 18095
         container_port: 8088
@@ -82,7 +85,7 @@ tasks:
         # 默认 external：绑定主机对外网卡，让浏览器从 LAN IP 直接访问 Web UI。
     volumes:
       # 单卷涵盖 SQLite + 向量索引 + 上传文档 + ONNX 模型缓存。
-      - source: "~/.jishushell/apps/${app_id}/data"
+      - source: "~/.jishushell/apps/${instance.id}/data"
         target: "/data"
     health:
       http:
@@ -102,21 +105,29 @@ requires:
   # 未绑定时 env 为空 → jishu-kb 用自身默认 http://localhost:11434
   # （容器内不可达，需用户在 UI 里手动配，或绑定到合适的 Ollama 实例）。
   - capability: "llm-ollama"
+    slot: "llm"
+    kind: "llm"
+    interface: "openai-compatible"
     inject_as: "JISHU_KB_OLLAMA_URL"
     required: false
     cardinality: "one"
 
 provides:
-  # 知识库 capability — agent `requires: knowledge` 时 panel 把
-  # KNOWLEDGE_BASE_URL 注入为 http://<host>:18095（裸根，shim 自己拼
-  # /api/kb/<id>/search）。命名遵循 <category>-<slug>。
+  # 知识库 capability — OpenClaw 绑定此 provider 后，JishuShell 通过
+  # provider-credentials + /api/service/capabilities 发现 remote MCP，并写入
+  # openclaw.json -> mcp.servers.kb。命名遵循 <category>-<slug>。
   - capability: "knowledge-jishukb"
+    id: "jishukb"
+    kind: "knowledge"
+    interface: "kb-search"
     task: "jishukb"
     port: 18095
+    endpoint:
+      portName: "http"
     path: "/"
     protocol: "http"
     visibility: "external"
-    description: "JishuShell-KB native KB API (/api/kb/*) — kb_search returns ranked chunks + scores"
+    description: "JishuShell-KB native KB API and remote MCP (/mcp) for OpenClaw kb__* tools"
 
   # Web UI capability。走 embedded: "proxy"：panel 通过 capability proxy
   # 同源托管 KB 页面，代理 bootstrap 会把绝对 `/api/...`、SSE、WS 等请求
@@ -133,152 +144,14 @@ provides:
 
 lifecycle:
   install:
-    # GHCR 镜像 ~500MB 压缩 / ~1.5GB 解压。给 30 min idle 兜 Pi 慢网，
-    # 与 anythingllm / weknora 同等级。idle_timeout_ms 透传到 docker pull
-    # 的 stall 检测。
-    - downloadImage: "ghcr.io/x-aijishu/jishu-kb:0.1.0"
-      timeout_ms: 1800000
-      idle_timeout_ms: 1800000
-    - mkdir: "~/.jishushell/apps/${app_id}/data"
+    # Container images declared in tasks[].image are pulled automatically by
+    # the install pipeline. Keep this lifecycle focused on app-owned data so
+    # docker pull uses the shared retry/idle-timeout policy.
+    - mkdir: "~/.jishushell/apps/${instance.id}/data"
 
   pre_start:
     # 幂等：start/restart 都过这条路径，目录被误删可自愈。
-    - mkdir: "~/.jishushell/apps/${app_id}/data"
-
-  post_start:
-    # 幂等首启自动布线：
-    #   1) 等 /health 200（首启需要加载 ONNX rerank 模型）
-    #   2) 确保存在 id=default 的默认知识库（重复 POST 被 jishu-kb 自身的
-    #      unique 约束吞掉；`|| true` 兜剩余 4xx）
-    #   3) 写 credentials.json（baseUrl + kbId），供 openclaw adapter 读取
-    #      用于生成 shim
-    #   4) 从 core 拿默认 LLM provider（GET /api/internal/default-provider），
-    #      调 PUT /api/admin/provider 配置生成后端 + embedBackend=auto。
-    #      core 重启窗口内可能暂时不可达，所以这里重试等待；只有明确
-    #      no_provider / no_key 才立即跳过，避免 setup 后首启偶发漏配。
-    #
-    # 整体 set -e 兜，失败时 app currentTaskStatus=error，重启再跑。
-    # JSON 解析/写入用 node -e，与 anythingllm post_start 同模式（保证
-    # 第三方用户初装环境不依赖 jq / python3）。
-    - run: |
-        set -e
-        BASE_URL="http://${JISHUSHELL_LAN_HOST:-127.0.0.1}:18095"
-        # JISHUSHELL_HOME defaults match config.ts so users who override
-        # JISHUSHELL_HOME (rare; mostly CI / dev sandboxes) keep both the
-        # post_start writer and the openclaw adapter reader pointing at
-        # the same credentials.json. AnythingLLM has the same shape;
-        # consider centralising in a follow-up if a third KB lands.
-        CRED_DIR="${JISHUSHELL_HOME:-$HOME/.jishushell}/apps/jishu-kb-container"
-        CRED_FILE="$CRED_DIR/credentials.json"
-        mkdir -p "$CRED_DIR"
-
-        jget() {
-          node -e 'let s="";process.stdin.on("data",c=>s+=c).on("end",()=>{try{let v=JSON.parse(s);for(const k of process.argv[1].split("."))v=v?.[k];process.stdout.write(v==null?"":String(v));}catch{process.stdout.write("")}})' "$1"
-        }
-
-        echo "[post_start] waiting for JishuShell-KB /health ..."
-        for i in $(seq 1 60); do
-          code=$(curl -s -o /dev/null -w '%{http_code}' --max-time 5 "$BASE_URL/health" || echo 000)
-          if [ "$code" = "200" ]; then
-            echo "[post_start] /health is 200 (after ${i}x2s)"
-            break
-          fi
-          sleep 2
-        done
-        curl -sf --max-time 5 "$BASE_URL/health" >/dev/null
-
-        echo "[post_start] ensuring default KB ..."
-        # 409 / 400 (already exists) 也算成功 — jishu-kb 自身 unique 约束。
-        KB_HTTP=$(curl -s -o /tmp/jishukb-kb.json -w '%{http_code}' --max-time 10 \
-          -X POST "$BASE_URL/api/kb" \
-          -H 'Content-Type: application/json' \
-          -d '{"id":"default","name":"默认知识库"}' || echo 000)
-        case "$KB_HTTP" in
-          2*) echo "[post_start] default KB created" ;;
-          4*) echo "[post_start] default KB already exists (HTTP $KB_HTTP)" ;;
-          *)  echo "[post_start] WARN: create-kb HTTP $KB_HTTP"; [ -s /tmp/jishukb-kb.json ] && head -c 400 /tmp/jishukb-kb.json ;;
-        esac
-
-        # 写 credentials.json（无 secret — v1 不带 auth），供 openclaw adapter 读取。
-        # 用 node 避免 shell quote 注入风险，mode 0o600 与 anythingllm 看齐
-        # （保持惯例；未来加 auth token 时直接增字段即可）。
-        BASEURL="$BASE_URL" CREDFILE="$CRED_FILE" node -e '
-          const fs = require("fs");
-          fs.writeFileSync(process.env.CREDFILE, JSON.stringify({
-            baseUrl: process.env.BASEURL,
-            kbId: "default",
-          }, null, 2));
-          fs.chmodSync(process.env.CREDFILE, 0o600);
-        '
-        echo "[post_start] credentials.json written → $CRED_FILE"
-
-        echo "[post_start] fetching core default provider ..."
-        fetch_default_provider_json() {
-          curl -sf --max-time 8 \
-            -H "X-Jishushell-Internal-Token: $JISHUSHELL_INTERNAL_TOKEN" \
-            "$JISHUSHELL_CORE_URL/api/internal/default-provider"
-        }
-        DP_JSON=""
-        for i in $(seq 1 30); do
-          DP_JSON=$(fetch_default_provider_json || true)
-          READY=$(printf '%s' "$DP_JSON" | jget ready)
-          REASON=$(printf '%s' "$DP_JSON" | jget reason)
-          if [ "$READY" = "true" ]; then
-            if [ "$i" -gt 1 ]; then
-              echo "[post_start] core default provider became ready after $i attempts"
-            fi
-            break
-          fi
-          case "$REASON" in
-            no_provider|no_key)
-              break
-              ;;
-          esac
-          DP_JSON='{"ready":false,"reason":"core_unreachable"}'
-          if [ "$i" -lt 30 ]; then
-            echo "[post_start] core default provider not ready yet (attempt $i/30); retrying in 2s"
-            sleep 2
-          fi
-        done
-        READY=$(printf '%s' "$DP_JSON" | jget ready)
-
-        if [ "$READY" = "true" ]; then
-          GEN_BASE=$(printf '%s' "$DP_JSON" | jget baseUrl)
-          GEN_KEY=$(printf '%s'  "$DP_JSON" | jget apiKey)
-          GEN_MODEL=$(printf '%s' "$DP_JSON" | jget modelId)
-          GEN_API=$(printf '%s'   "$DP_JSON" | jget api)
-          echo "[post_start] autoconfig provider api=$GEN_API model=$GEN_MODEL @ $GEN_BASE"
-          # W1 直连上游：把 baseUrl + decrypted apiKey 直接灌给 jishu-kb。
-          # 与 AnythingLLM 同 trade-off（牺牲 core proxy 的 rate-limit / usage
-          # logging，换取一次配置后 jishu-kb 自治）。非 OpenAI 兼容上游
-          # (Anthropic native / Gemini native) 会 PUT 成功但 query 时 4xx —
-          # 已知风险，用户在 jishu-kb UI 里手改即可。embedBackend=auto 让
-          # jishu-kb 自挑（有 Ollama 用 Ollama，否则用内置 BGE ONNX）。
-          PROV_BODY=$(GEN_BASE="$GEN_BASE" GEN_KEY="$GEN_KEY" GEN_MODEL="$GEN_MODEL" node -e '
-            process.stdout.write(JSON.stringify({
-              genBaseUrl:   process.env.GEN_BASE,
-              genApiKey:    process.env.GEN_KEY,
-              genModel:     process.env.GEN_MODEL,
-              embedBackend: "auto",
-            }));
-          ')
-          PROV_HTTP=$(curl -s -o /tmp/jishukb-prov.txt -w '%{http_code}' --max-time 10 \
-            -X PUT "$BASE_URL/api/admin/provider" \
-            -H 'Content-Type: application/json' \
-            --data "$PROV_BODY" || echo 000)
-          case "$PROV_HTTP" in
-            2*) echo "[post_start] provider configured" ;;
-            *)
-              echo "[post_start] WARN: /api/admin/provider HTTP $PROV_HTTP — user can configure in jishu-kb UI"
-              [ -s /tmp/jishukb-prov.txt ] && head -c 400 /tmp/jishukb-prov.txt
-              ;;
-          esac
-        else
-          REASON=$(printf '%s' "$DP_JSON" | jget reason)
-          echo "[post_start] skip provider autoconfig (reason=${REASON:-unknown}); user will pick in jishu-kb UI"
-        fi
-        echo "[post_start] DONE"
-      timeout_ms: 300000
+    - mkdir: "~/.jishushell/apps/${instance.id}/data"
 
   uninstall:
-    - deleteImage: "ghcr.io/x-aijishu/jishu-kb:0.1.0"
+    - deleteImage: "ghcr.io/x-aijishu/jishu-kb:0.1.2"

package/apps/ollama-binary.yaml

@@ -13,11 +13,12 @@ tasks:
     command: /usr/local/bin/ollama
     args: ["serve"]
     env:
-      OLLAMA_HOST: "0.0.0.0:11434"
+      OLLAMA_HOST: "0.0.0.0:${runtime.ports.gateway.gateway.hostPort}"
     resources:
       cpu: "2000m"
       memory: "4096Mi"
     ports:
+      # Core 会先把这个值当作宿主端口 seed 尝试；最终 hostPort 以 instance.json 为准。
       - name: gateway
         port: 11434
         visibility: external
@@ -67,8 +68,13 @@ provides:
     protocol: "http"
     description: "Ollama HTTP API，兼容 OpenAI /v1/chat/completions 端点"
   - capability: "llm-ollama"
+    id: "ollama"
+    kind: "llm"
+    interface: "openai-compatible"
     task: "gateway"
     port: 11434
+    endpoint:
+      portName: "gateway"
     protocol: "http"
     description: "Ollama OpenAI-compatible LLM endpoint (Connections 主推命名)"
 
@@ -82,10 +88,10 @@ lifecycle:
         fi;
   install:
     - 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}";
+        install_marker="$HOME/.jishushell/apps/${instance.id}/.ollama-install-needed";
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${instance.id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${instance.id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${instance.id}";
         rm -f "$install_marker";
         if command -v ollama >/dev/null 2>&1; then
           if [ -f "$owner_marker" ] || [ -f "$legacy_owner_marker" ]; then
@@ -102,10 +108,10 @@ lifecycle:
           : > "$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}";
+        install_marker="$HOME/.jishushell/apps/${instance.id}/.ollama-install-needed";
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${instance.id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${instance.id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${instance.id}";
         if [ "$(uname -s)" = "Linux" ] && ! command -v zstd >/dev/null 2>&1; then
           echo "未检测到 zstd；Ollama v0.24+ 安装包仅提供 .tar.zst，需先安装 zstd..." >&2;
           pm_rc=1;
@@ -148,14 +154,14 @@ lifecycle:
         rm -f "$system_install_marker";
         : > "$owner_marker"
       sudo: true
-      ifFileExists: "~/.jishushell/apps/${app_id}/.ollama-install-needed"
+      ifFileExists: "~/.jishushell/apps/${instance.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}";
+        install_marker="$HOME/.jishushell/apps/${instance.id}/.ollama-install-needed";
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${instance.id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${instance.id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${instance.id}";
         if [ -f "$install_marker" ] && command -v ollama >/dev/null 2>&1; then
           echo "检测到 ollama 已可用，补记为由 JishuShell 安装。" >&2;
           rm -f "$install_marker";
@@ -163,7 +169,7 @@ lifecycle:
           rm -f "$system_install_marker";
           : > "$owner_marker";
         fi
-      ifFileExists: "~/.jishushell/apps/${app_id}/.ollama-install-needed"
+      ifFileExists: "~/.jishushell/apps/${instance.id}/.ollama-install-needed"
     - run: >-
         if [ -e /usr/local/bin/ollama ]; then
           exit 0;
@@ -177,7 +183,7 @@ lifecycle:
         ln -sf "$real_ollama" /usr/local/bin/ollama
       sudo: true
     - run: >-
-        service_active_marker="$HOME/.jishushell/apps/${app_id}/.ollama-service-active";
+        service_active_marker="$HOME/.jishushell/apps/${instance.id}/.ollama-service-active";
         rm -f "$service_active_marker";
         case "$(uname -s)" in
           Linux)
@@ -208,16 +214,16 @@ lifecycle:
         esac
     - run: >-
         systemctl disable --now ollama;
-        rm -f "$HOME/.jishushell/apps/${app_id}/.ollama-service-active"
+        rm -f "$HOME/.jishushell/apps/${instance.id}/.ollama-service-active"
       sudo: true
-      ifFileExists: "~/.jishushell/apps/${app_id}/.ollama-service-active"
+      ifFileExists: "~/.jishushell/apps/${instance.id}/.ollama-service-active"
 
   uninstall:
     - 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}";
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${instance.id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${instance.id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${instance.id}";
+        uninstall_marker="$HOME/.jishushell/.ollama-uninstall-needed-${instance.id}";
         rm -f "$uninstall_marker";
         if [ -f "$system_install_marker" ]; then
           echo "检测到复用的是系统已有 ollama，卸载时保留系统安装。" >&2;
@@ -226,20 +232,19 @@ lifecycle:
           : > "$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}";
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${instance.id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${instance.id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${instance.id}";
+        uninstall_marker="$HOME/.jishushell/.ollama-uninstall-needed-${instance.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}"
+      ifFileExists: "~/.jishushell/.ollama-uninstall-needed-${instance.id}"
     - run: >-
         if [ -L /usr/local/bin/ollama ]; then
           echo "清理由 JishuShell 建立的兼容性符号链接 /usr/local/bin/ollama" >&2;
           rm -f /usr/local/bin/ollama;
         fi
       sudo: true
-

package/apps/ollama-cpu-container.yaml

@@ -20,6 +20,7 @@ tasks:
       cpu: "2000m"
       memory: "4096Mi"
     ports:
+      # Core 会先把这个值当作宿主端口 seed 尝试；最终 hostPort 以 instance.json 为准。
       - name: gateway
         port: 11434
     health:
@@ -38,7 +39,12 @@ provides:
     protocol: "http"
     description: "Ollama HTTP API，兼容 OpenAI /v1/chat/completions 端点"
   - capability: "llm-ollama"
+    id: "ollama"
+    kind: "llm"
+    interface: "openai-compatible"
     task: "gateway"
     port: 11434
+    endpoint:
+      portName: "gateway"
     protocol: "http"
     description: "Ollama OpenAI-compatible LLM endpoint (Connections 主推命名)"

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

@@ -13,11 +13,12 @@ tasks:
     command: /usr/local/bin/ollama
     args: ["serve"]
     env:
-      OLLAMA_HOST: "0.0.0.0:11434"
+      OLLAMA_HOST: "0.0.0.0:${runtime.ports.gateway.gateway.hostPort}"
     resources:
       cpu: "2000m"
       memory: "4096Mi"
     ports:
+      # Core 会先把这个值当作宿主端口 seed 尝试；最终 hostPort 以 instance.json 为准。
       - name: gateway
         port: 11434
         visibility: external
@@ -38,6 +39,7 @@ tasks:
       cpu: "500m"
       memory: "512Mi"
     ports:
+      # Core 会先把这个值当作宿主端口 seed 尝试；最终 hostPort 以 instance.json 为准。
       - name: webui
         port: 4173
         visibility: external
@@ -62,8 +64,13 @@ provides:
     protocol: "http"
     description: "Ollama HTTP API，兼容 OpenAI /v1/chat/completions 端点"
   - capability: "llm-ollama"
+    id: "ollama"
+    kind: "llm"
+    interface: "openai-compatible"
     task: "gateway"
     port: 11434
+    endpoint:
+      portName: "gateway"
     protocol: "http"
     description: "Ollama OpenAI-compatible LLM endpoint (Connections 主推命名)"
 
@@ -78,10 +85,10 @@ lifecycle:
   install:
     - downloadImage: "ghcr.io/fmaclen/hollama:latest"
     - 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}";
+        install_marker="$HOME/.jishushell/apps/${instance.id}/.ollama-install-needed";
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${instance.id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${instance.id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${instance.id}";
         rm -f "$install_marker";
         if command -v ollama >/dev/null 2>&1; then
           if [ -f "$owner_marker" ] || [ -f "$legacy_owner_marker" ]; then
@@ -98,10 +105,10 @@ lifecycle:
           : > "$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}";
+        install_marker="$HOME/.jishushell/apps/${instance.id}/.ollama-install-needed";
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${instance.id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${instance.id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${instance.id}";
         if [ "$(uname -s)" = "Linux" ] && ! command -v zstd >/dev/null 2>&1; then
           echo "未检测到 zstd；Ollama v0.24+ 安装包仅提供 .tar.zst，需先安装 zstd..." >&2;
           pm_rc=1;
@@ -144,14 +151,14 @@ lifecycle:
         rm -f "$system_install_marker";
         : > "$owner_marker"
       sudo: true
-      ifFileExists: "~/.jishushell/apps/${app_id}/.ollama-install-needed"
+      ifFileExists: "~/.jishushell/apps/${instance.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}";
+        install_marker="$HOME/.jishushell/apps/${instance.id}/.ollama-install-needed";
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${instance.id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${instance.id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${instance.id}";
         if [ -f "$install_marker" ] && command -v ollama >/dev/null 2>&1; then
           echo "检测到 ollama 已可用，补记为由 JishuShell 安装。" >&2;
           rm -f "$install_marker";
@@ -159,7 +166,7 @@ lifecycle:
           rm -f "$system_install_marker";
           : > "$owner_marker";
         fi
-      ifFileExists: "~/.jishushell/apps/${app_id}/.ollama-install-needed"
+      ifFileExists: "~/.jishushell/apps/${instance.id}/.ollama-install-needed"
     - run: >-
         if [ -e /usr/local/bin/ollama ]; then
           exit 0;
@@ -173,7 +180,7 @@ lifecycle:
         ln -sf "$real_ollama" /usr/local/bin/ollama
       sudo: true
     - run: >-
-        service_active_marker="$HOME/.jishushell/apps/${app_id}/.ollama-service-active";
+        service_active_marker="$HOME/.jishushell/apps/${instance.id}/.ollama-service-active";
         rm -f "$service_active_marker";
         case "$(uname -s)" in
           Linux)
@@ -204,16 +211,16 @@ lifecycle:
         esac
     - run: >-
         systemctl disable --now ollama;
-        rm -f "$HOME/.jishushell/apps/${app_id}/.ollama-service-active"
+        rm -f "$HOME/.jishushell/apps/${instance.id}/.ollama-service-active"
       sudo: true
-      ifFileExists: "~/.jishushell/apps/${app_id}/.ollama-service-active"
+      ifFileExists: "~/.jishushell/apps/${instance.id}/.ollama-service-active"
 
   uninstall:
     - 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}";
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${instance.id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${instance.id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${instance.id}";
+        uninstall_marker="$HOME/.jishushell/.ollama-uninstall-needed-${instance.id}";
         rm -f "$uninstall_marker";
         if [ -f "$system_install_marker" ]; then
           echo "检测到复用的是系统已有 ollama，卸载时保留系统安装。" >&2;
@@ -222,19 +229,19 @@ lifecycle:
           : > "$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}";
+        owner_marker="$HOME/.jishushell/.ollama-installed-by-jishushell-${instance.id}";
+        legacy_owner_marker="$HOME/.jishushell/apps/${instance.id}/.ollama-installed-by-jishushell";
+        system_install_marker="$HOME/.jishushell/.ollama-system-install-${instance.id}";
+        uninstall_marker="$HOME/.jishushell/.ollama-uninstall-needed-${instance.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}"
+      ifFileExists: "~/.jishushell/.ollama-uninstall-needed-${instance.id}"
     - run: >-
         if [ -L /usr/local/bin/ollama ]; then
           echo "清理由 JishuShell 建立的兼容性符号链接 /usr/local/bin/ollama" >&2;
           rm -f /usr/local/bin/ollama;
         fi
-      sudo: true
+      sudo: true