jishushell 0.6.5 → 0.6.18

package/apps/openclaw-binary.yaml

@@ -3,7 +3,8 @@ name: OpenClaw Binary
 version: "1.0.0"
 jishushell:
   min_version: "0.4.30"
-agentType: openclaw
+integrations:
+  - kind: openclaw
 description: "将 OpenClaw 安装到应用目录内的 npm prefix，并以 process runtime 运行网关"
 singleInstance: false
 
@@ -11,7 +12,7 @@ tasks:
   - name: gateway
     role: service
     runtime: process
-    command: ~/.jishushell/apps/${app_id}/bin/openclaw
+    command: ~/.jishushell/apps/${instance.id}/bin/openclaw
     args: ["gateway", "run", "--port", "18789", "--allow-unconfigured"]
     env:
       NODE_ENV: production
@@ -38,8 +39,13 @@ provides:
     protocol: "http"
     description: "OpenClaw Dashboard"
   - capability: "llm-agent"
+    id: "openclaw"
+    kind: "llm"
+    interface: "openai-compatible"
     task: "gateway"
     port: 18789
+    endpoint:
+      portName: "http"
     protocol: "http"
     path: "/v1"
     description: "OpenAI-compatible agent endpoint backed by OpenClaw"
@@ -49,37 +55,55 @@ provides:
 
 requires:
   - capability: "llm"
+    slot: "llm"
+    kind: "llm"
+    interface: "openai-compatible"
     inject_as: "LLM_ENDPOINT"
     required: false
     cardinality: "one"
   - capability: "search"
+    slot: "search"
+    kind: "search"
+    interface: "searxng-json"
     inject_as: "SEARCH_API_BASE_URL"
     required: false
     cardinality: "one"
   - capability: "browser"
+    slot: "browser"
+    kind: "browser"
+    interface: "cdp-ws"
     inject_as: "BROWSER_CDP_URL"
     required: false
     cardinality: "one"
   - capability: "mcp"
+    slot: "mcp"
+    kind: "mcp"
+    interface: "mcp-http"
     inject_as: "MCP_SERVERS"
     required: false
     cardinality: "many"
   - capability: "files"
+    slot: "files"
+    kind: "files"
+    interface: "web-file-manager"
     inject_as: "FILES_BROWSER_URL"
     required: false
     cardinality: "one"
   - capability: "knowledge"
+    slot: "knowledge"
+    kind: "knowledge"
+    interface: "kb-search"
     inject_as: "KNOWLEDGE_BASE_URL"
     required: false
     cardinality: "one"
 
 lifecycle:
   install:
-    - mkdir: "~/.jishushell/apps/${app_id}/runtime"
-    - mkdir: "~/.jishushell/apps/${app_id}/bin"
-    - mkdir: "~/.jishushell/apps/${app_id}/openclaw-home"
+    - mkdir: "~/.jishushell/apps/${instance.id}/runtime"
+    - mkdir: "~/.jishushell/apps/${instance.id}/bin"
+    - mkdir: "~/.jishushell/apps/${instance.id}/openclaw-home"
     - run: >-
-        runtime_dir="$HOME/.jishushell/apps/${app_id}/runtime";
+        runtime_dir="$HOME/.jishushell/apps/${instance.id}/runtime";
         pkg_entry="$runtime_dir/lib/node_modules/openclaw/openclaw.mjs";
         if [ -f "$pkg_entry" ]; then
           echo "检测到应用目录中已安装 OpenClaw，跳过 npm 安装。" >&2;
@@ -88,9 +112,9 @@ lifecycle:
         fi
       timeout_ms: 900000
     - run: >-
-        runtime_dir="$HOME/.jishushell/apps/${app_id}/runtime";
-        wrapper_dir="$HOME/.jishushell/apps/${app_id}/bin";
-        openclaw_home="$HOME/.jishushell/apps/${app_id}/openclaw-home";
+        runtime_dir="$HOME/.jishushell/apps/${instance.id}/runtime";
+        wrapper_dir="$HOME/.jishushell/apps/${instance.id}/bin";
+        openclaw_home="$HOME/.jishushell/apps/${instance.id}/openclaw-home";
         pkg_entry="$runtime_dir/lib/node_modules/openclaw/openclaw.mjs";
         wrapper="$wrapper_dir/openclaw";
         node_bin="$(command -v node)";
@@ -103,4 +127,4 @@ lifecycle:
           exit 1;
         fi;
         printf '%s\n' '#!/bin/sh' "export OPENCLAW_HOME=\"$openclaw_home\"" "export HOME=\"$openclaw_home\"" "exec \"$node_bin\" \"$pkg_entry\" \"\$@\"" > "$wrapper";
-        chmod +x "$wrapper"
+        chmod +x "$wrapper"

package/apps/openclaw-container.yaml

@@ -3,7 +3,8 @@ name: OpenClaw Container
 version: "1.0.0"
 jishushell:
   min_version: "0.4.30"
-agentType: openclaw
+integrations:
+  - kind: openclaw
 description: "基于 openclaw-runtime 容器运行的 OpenClaw 网关"
 singleInstance: false
 
@@ -39,14 +40,19 @@ provides:
     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.
+  # `gateway.http.endpoints.chatCompletions.enabled = true`. The OpenClaw
+  # integration 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"
+    id: "openclaw"
+    kind: "llm"
+    interface: "openai-compatible"
     task: "gateway"
     port: 18789
+    endpoint:
+      portName: "http"
     protocol: "http"
     path: "/v1"
     description: "OpenAI-compatible agent endpoint backed by OpenClaw"
@@ -56,26 +62,44 @@ provides:
 
 requires:
   - capability: "llm"
+    slot: "llm"
+    kind: "llm"
+    interface: "openai-compatible"
     inject_as: "LLM_ENDPOINT"
     required: false
     cardinality: "one"
   - capability: "search"
+    slot: "search"
+    kind: "search"
+    interface: "searxng-json"
     inject_as: "SEARCH_API_BASE_URL"
     required: false
     cardinality: "one"
   - capability: "browser"
+    slot: "browser"
+    kind: "browser"
+    interface: "cdp-ws"
     inject_as: "BROWSER_CDP_URL"
     required: false
     cardinality: "one"
   - capability: "mcp"
+    slot: "mcp"
+    kind: "mcp"
+    interface: "mcp-http"
     inject_as: "MCP_SERVERS"
     required: false
     cardinality: "many"
   - capability: "files"
+    slot: "files"
+    kind: "files"
+    interface: "web-file-manager"
     inject_as: "FILES_BROWSER_URL"
     required: false
     cardinality: "one"
   - capability: "knowledge"
+    slot: "knowledge"
+    kind: "knowledge"
+    interface: "kb-search"
     inject_as: "KNOWLEDGE_BASE_URL"
     required: false
-    cardinality: "one"
+    cardinality: "one"

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

@@ -3,7 +3,8 @@ name: OpenClaw With Ollama
 version: "1.0.0"
 jishushell:
   min_version: "0.4.30"
-agentType: openclaw
+integrations:
+  - kind: openclaw
 description: "通过 requires 消费 ollama-api 能力，并将解析地址注入 OpenClaw 运行环境"
 singleInstance: false
 
@@ -41,11 +42,16 @@ provides:
     port: 18789
     description: "OpenClaw Dashboard"
   - capability: "llm-agent"
+    id: "openclaw"
+    kind: "llm"
+    interface: "openai-compatible"
     task: "gateway"
     port: 18789
+    endpoint:
+      portName: "http"
     protocol: "http"
     path: "/v1"
     description: "OpenAI-compatible agent endpoint backed by OpenClaw"
     auth:
       kind: "bearer"
-      tokenSource: "instance.config.gateway.auth.token"
+      tokenSource: "instance.config.gateway.auth.token"

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

@@ -3,7 +3,8 @@ name: OpenClaw With SearXNG Container
 version: "1.0.0"
 jishushell:
   min_version: "0.4.30"
-agentType: openclaw
+integrations:
+  - kind: openclaw
 description: "将 SearXNG 作为 sidecar 子 task 安装并运行，并注入 OpenClaw 搜索环境"
 singleInstance: false
 
@@ -24,10 +25,10 @@ tasks:
         port: 8080
         visibility: internal
     volumes:
-      - source: "~/.jishushell/apps/${app_id}/settings/settings.yml"
+      - source: "~/.jishushell/apps/${instance.id}/settings/settings.yml"
         target: "/etc/searxng/settings.yml"
         readonly: true
-      - source: "~/.jishushell/apps/${app_id}/settings/limiter.toml"
+      - source: "~/.jishushell/apps/${instance.id}/settings/limiter.toml"
         target: "/etc/searxng/limiter.toml"
         readonly: true
     health:
@@ -74,8 +75,13 @@ provides:
     protocol: "http"
     description: "OpenClaw Dashboard"
   - capability: "llm-agent"
+    id: "openclaw"
+    kind: "llm"
+    interface: "openai-compatible"
     task: "gateway"
     port: 18789
+    endpoint:
+      portName: "http"
     protocol: "http"
     path: "/v1"
     description: "OpenAI-compatible agent endpoint backed by OpenClaw"
@@ -85,9 +91,15 @@ provides:
 
 requires:
   - capability: "search-searxng"
+    slot: "search"
+    kind: "search"
+    interface: "searxng-json"
     inject_as: "SEARCH_API_BASE_URL"
     required: false
   - capability: "files"
+    slot: "files"
+    kind: "files"
+    interface: "web-file-manager"
     inject_as: "FILES_BROWSER_URL"
     required: false
     cardinality: "one"
@@ -95,9 +107,9 @@ requires:
 lifecycle:
   install:
     - downloadImage: "searxng/searxng:latest"
-    - mkdir: "~/.jishushell/apps/${app_id}/settings"
+    - mkdir: "~/.jishushell/apps/${instance.id}/settings"
     - run: |
-        SETTINGS_DIR="$HOME/.jishushell/apps/${app_id}/settings"
+        SETTINGS_DIR="$HOME/.jishushell/apps/${instance.id}/settings"
         SECRET_KEY="$(head -c 48 /dev/urandom | base64 | tr -dc 'A-Za-z0-9' | head -c 32)"
 
         export SETTINGS_DIR SECRET_KEY
@@ -157,4 +169,4 @@ lifecycle:
         )
         PY
 
-        chmod 644 "$SETTINGS_DIR/settings.yml" "$SETTINGS_DIR/limiter.toml"
+        chmod 644 "$SETTINGS_DIR/settings.yml" "$SETTINGS_DIR/limiter.toml"

package/apps/searxng-container.yaml

@@ -24,10 +24,10 @@ tasks:
         container_port: 8080
         visibility: external
     volumes:
-      - source: "~/.jishushell/apps/${app_id}/settings/settings.yml"
+      - source: "~/.jishushell/apps/${instance.id}/settings/settings.yml"
         target: "/etc/searxng/settings.yml"
         readonly: true
-      - source: "~/.jishushell/apps/${app_id}/settings/limiter.toml"
+      - source: "~/.jishushell/apps/${instance.id}/settings/limiter.toml"
         target: "/etc/searxng/limiter.toml"
         readonly: true
     health:
@@ -51,12 +51,17 @@ provides:
     protocol: "http"
     description: "SearXNG Web UI"
   - capability: "search-searxng"
+    id: "searxng"
+    kind: "search"
+    interface: "searxng-json"
     task: "searxng"
     port: 18080
+    endpoint:
+      portName: "http"
     path: "/search"
     protocol: "http"
     description: "SearXNG 搜索 API，支持 JSON 格式 (/search?q=xxx&format=json)"
-    # PR 8 / docs §17 — canonical MCP surface that LLM-binding adapters
+    # PR 8 / docs §17 — canonical MCP surface that LLM-binding integration logic
     # (Hermes, future MCP-capable runtimes) expose via the in-tree MCP
     # firewall. Description is deliberately minimal so MiniMax-class
     # models don't get prompt-injected by upstream wording into adding
@@ -101,9 +106,9 @@ provides:
 lifecycle:
   install:
     - downloadImage: "searxng/searxng:latest"
-    - mkdir: "~/.jishushell/apps/${app_id}/settings"
+    - mkdir: "~/.jishushell/apps/${instance.id}/settings"
     - run: |
-        SETTINGS_DIR="$HOME/.jishushell/apps/${app_id}/settings"
+        SETTINGS_DIR="$HOME/.jishushell/apps/${instance.id}/settings"
         SECRET_KEY="$(head -c 48 /dev/urandom | base64 | tr -dc 'A-Za-z0-9' | head -c 32)"
 
         export SETTINGS_DIR SECRET_KEY
@@ -163,4 +168,4 @@ lifecycle:
         )
         PY
 
-        chmod 644 "$SETTINGS_DIR/settings.yml" "$SETTINGS_DIR/limiter.toml"
+        chmod 644 "$SETTINGS_DIR/settings.yml" "$SETTINGS_DIR/limiter.toml"

package/apps/weknora-container.yaml

@@ -62,7 +62,7 @@ tasks:
         visibility: external
         host_network: docker_bridge
     volumes:
-      - source: "~/.jishushell/apps/${app_id}/postgres"
+      - source: "~/.jishushell/apps/${instance.id}/postgres"
         target: "/var/lib/postgresql/data"
 
   # ────────────────────────────────────────────────────────────────
@@ -89,7 +89,7 @@ tasks:
         visibility: external
         host_network: docker_bridge
     volumes:
-      - source: "~/.jishushell/apps/${app_id}/redis"
+      - source: "~/.jishushell/apps/${instance.id}/redis"
         target: "/data"
 
   # ────────────────────────────────────────────────────────────────
@@ -125,7 +125,7 @@ tasks:
         host_network: docker_bridge
     volumes:
       # tmp 目录与 weknora-app 共享，docreader 写 / app 读（图片提取场景）。
-      - source: "~/.jishushell/apps/${app_id}/docreader-tmp"
+      - source: "~/.jishushell/apps/${instance.id}/docreader-tmp"
         target: "/tmp/docreader"
 
   # ────────────────────────────────────────────────────────────────
@@ -156,7 +156,7 @@ tasks:
       #       host.docker.internal=172.17.0.1 容器内可达） ──
       DB_DRIVER: "postgres"
       DB_HOST: "host.docker.internal"
-      DB_PORT: "18093"
+      DB_PORT: "${runtime.ports.paradedb.pg.hostPort}"
       DB_USER: "weknora"
       DB_PASSWORD: "weknora-dev-pg-pw"
       DB_NAME: "WeKnora"
@@ -165,13 +165,13 @@ tasks:
       RETRIEVE_DRIVER: "postgres"
 
       # ── Redis ──
-      REDIS_ADDR: "host.docker.internal:18094"
+      REDIS_ADDR: "host.docker.internal:${runtime.ports.redis.redis.hostPort}"
       REDIS_DB: "0"
       REDIS_PREFIX: "stream:"
       STREAM_MANAGER_TYPE: "redis"
 
       # ── docreader gRPC ──
-      DOCREADER_ADDR: "host.docker.internal:18095"
+      DOCREADER_ADDR: "host.docker.internal:${runtime.ports.docreader.grpc.hostPort}"
       DOCREADER_TRANSPORT: "grpc"
 
       # ── 文件存储：local 模式，写到 bind-mounted /data/files ──
@@ -231,7 +231,7 @@ tasks:
     volumes:
       # 知识库附件落盘。与 ~/.jishushell/files/ 故意分离 ——
       # WeKnora 自己管文件元数据 / RAG 索引，避免与 panel W3 FTS5 打架。
-      - source: "~/.jishushell/apps/${app_id}/files"
+      - source: "~/.jishushell/apps/${instance.id}/files"
         target: "/data/files"
 
   # ────────────────────────────────────────────────────────────────
@@ -254,7 +254,7 @@ tasks:
     env:
       MAX_FILE_SIZE_MB: "50"
       APP_HOST: "host.docker.internal"
-      APP_PORT: "18096"
+      APP_PORT: "${runtime.ports.app.app-http.hostPort}"
       APP_SCHEME: "http"
     resources:
       cpu: "100m"
@@ -274,7 +274,7 @@ tasks:
       # 照搬上游 location 块，只去掉 X-Frame-Options/CSP 限制，保留
       # ${APP_HOST}/${APP_PORT}/${APP_SCHEME}/${MAX_FILE_SIZE} 由镜像
       # docker-entrypoint.sh envsubst。
-      - source: "~/.jishushell/apps/${app_id}/nginx/default.conf.template"
+      - source: "~/.jishushell/apps/${instance.id}/nginx/default.conf.template"
         target: "/etc/nginx/templates/default.conf.template"
         readonly: true
     health:
@@ -339,17 +339,17 @@ lifecycle:
       timeout_ms: 1800000
       idle_timeout_ms: 1800000
 
-    - mkdir: "~/.jishushell/apps/${app_id}/postgres"
-    - mkdir: "~/.jishushell/apps/${app_id}/redis"
-    - mkdir: "~/.jishushell/apps/${app_id}/docreader-tmp"
-    - mkdir: "~/.jishushell/apps/${app_id}/files"
-    - mkdir: "~/.jishushell/apps/${app_id}/nginx"
+    - mkdir: "~/.jishushell/apps/${instance.id}/postgres"
+    - mkdir: "~/.jishushell/apps/${instance.id}/redis"
+    - mkdir: "~/.jishushell/apps/${instance.id}/docreader-tmp"
+    - mkdir: "~/.jishushell/apps/${instance.id}/files"
+    - mkdir: "~/.jishushell/apps/${instance.id}/nginx"
     # 写自定义 nginx 模板（去掉 X-Frame-Options 让 panel 实例详情页能
     # iframe 嵌入）。单引号 heredoc 关掉 shell 展开，保留 ${APP_HOST}/
     # ${APP_PORT}/${APP_SCHEME}/${MAX_FILE_SIZE} 由镜像 envsubst 替换。
     - run: |
         set -e
-        TPL="$HOME/.jishushell/apps/${app_id}/nginx/default.conf.template"
+        TPL="$HOME/.jishushell/apps/${instance.id}/nginx/default.conf.template"
         cat > "$TPL" <<'NGX'
         server {
             listen 80;
@@ -411,14 +411,14 @@ lifecycle:
 
   pre_start:
     # 幂等：start/restart 都过这条路径，目录被误删可自愈。
-    - mkdir: "~/.jishushell/apps/${app_id}/postgres"
-    - mkdir: "~/.jishushell/apps/${app_id}/redis"
-    - mkdir: "~/.jishushell/apps/${app_id}/docreader-tmp"
-    - mkdir: "~/.jishushell/apps/${app_id}/files"
-    - mkdir: "~/.jishushell/apps/${app_id}/nginx"
+    - mkdir: "~/.jishushell/apps/${instance.id}/postgres"
+    - mkdir: "~/.jishushell/apps/${instance.id}/redis"
+    - mkdir: "~/.jishushell/apps/${instance.id}/docreader-tmp"
+    - mkdir: "~/.jishushell/apps/${instance.id}/files"
+    - mkdir: "~/.jishushell/apps/${instance.id}/nginx"
     - run: |
         set -e
-        TPL="$HOME/.jishushell/apps/${app_id}/nginx/default.conf.template"
+        TPL="$HOME/.jishushell/apps/${instance.id}/nginx/default.conf.template"
         if [ ! -f "$TPL" ]; then
           cat > "$TPL" <<'NGX'
         server {