jishushell 0.4.24 → 0.4.30

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,37 @@ 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"
 
 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,40 @@ 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"

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"

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

@@ -2,7 +2,7 @@ id: openclaw-with-searxng-container
 name: OpenClaw With SearXNG Container
 version: "1.0.0"
 jishushell:
-  min_version: "0.4.24"
+  min_version: "0.4.30"
 agentType: openclaw
 description: "将 SearXNG 作为 sidecar 子 task 安装并运行，并注入 OpenClaw 搜索环境"
 singleInstance: false
@@ -46,7 +46,11 @@ tasks:
     args: ["gateway", "run", "--port", "18789", "--allow-unconfigured"]
     env:
       NODE_ENV: production
-      SEARCH_API_BASE_URL: "http://127.0.0.1:8080/search"
+      # SEARCH_API_BASE_URL injected by Connection apply hook (search category, §13).
+      # Single-candidate fallback (`requires: search-searxng`) auto-binds the
+      # sidecar SearXNG below on first start, so meta-app UX stays "open the
+      # box and it works".
+      SEARCH_API_BASE_URL: "${requires.SEARCH_API_BASE_URL}"
     resources:
       cpu: "1000m"
       memory: "1024Mi"
@@ -65,8 +69,24 @@ 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: "search-searxng"
+    inject_as: "SEARCH_API_BASE_URL"
+    required: false
 
 lifecycle:
   install:

package/apps/openwebui-container.yaml

@@ -2,7 +2,7 @@ id: openwebui-container
 name: Open WebUI
 version: "1.0.0"
 jishushell:
-  min_version: "0.4.24"
+  min_version: "0.4.30"
 description: "使用 Open WebUI 提供自托管的大模型 Web 界面，容器模式由 Nomad 管理生命周期"
 singleInstance: false
 
@@ -11,6 +11,11 @@ tasks:
     role: service
     runtime: container
     image: "ghcr.io/open-webui/open-webui:main"
+    # Run as the panel user's uid:gid (typically pi=1000:1000). Bind-mount
+    # source `~/.jishushell/apps/${app_id}/data` is owned by the panel user,
+    # so the container can read/write it directly — no chown, no
+    # CAP_DAC_OVERRIDE, no DB readonly errors. Mirrors hermes / openclaw.
+    user: "host"
     env:
       HOME: "/app/backend/data"
       PORT: "8080"
@@ -19,6 +24,32 @@ tasks:
       HF_HOME: "/app/backend/data/.cache/huggingface"
       TRANSFORMERS_CACHE: "/app/backend/data/.cache/huggingface/transformers"
       SENTENCE_TRANSFORMERS_HOME: "/app/backend/data/.cache/sentence-transformers"
+      # OpenWebUI's start.sh writes a generated WEBUI_SECRET_KEY to a key
+      # file. The default path is `.webui_secret_key` in the image's
+      # /app/backend WORKDIR, which is owned by root and unwritable when
+      # running as uid 1000. Redirect to the bind-mounted (and writable)
+      # data dir so the key persists across restarts and survives image
+      # upgrades.
+      WEBUI_SECRET_KEY_FILE: "/app/backend/data/.webui_secret_key"
+      # Open WebUI marks OPENAI_API_BASE_URL / OPENAI_API_KEY as PersistentConfig:
+      # without this flag, the first start writes them to the internal DB and
+      # subsequent restarts ignore env, defeating Connections "Save & Restart"
+      # rebinds. Disabling persistent config means the Admin UI's manual
+      # OpenAI config doesn't survive restarts — that's the trade-off
+      # JishuShell takes to own LLM configuration via Connections (§13.3.2.1).
+      ENABLE_PERSISTENT_CONFIG: "False"
+      # JishuShell ships Open WebUI as a chat front-end only — RAG /
+      # reranker / Whisper STT all need ML model downloads from
+      # HuggingFace at first boot (~500 MB – 1.5 GB). On slow outbound
+      # networks (Raspberry Pi behind throttled NAT) this blocks
+      # health checks for hours. Bypassing them keeps the boot path
+      # to "FastAPI up in <30s". Users who want RAG/STT can flip these
+      # back from Admin UI and accept the one-time download.
+      BYPASS_EMBEDDING_AND_RETRIEVAL: "True"
+      RAG_EMBEDDING_MODEL: ""
+      RAG_RERANKING_MODEL: ""
+      WHISPER_MODEL: ""
+      AUDIO_STT_ENGINE: ""
     resources:
       cpu: "1000m"
       memory: "1024Mi"
@@ -41,10 +72,23 @@ tasks:
 
 provides:
   - capability: "openwebui-web"
+    task: "openwebui"
+    port: 3000
+    protocol: "http"
+    description: "Open WebUI Web 界面（legacy capability，请改用 web-openwebui）"
+  - capability: "web-openwebui"
+    task: "openwebui"
     port: 3000
     protocol: "http"
     description: "Open WebUI Web 界面"
 
+requires:
+  - capability: "llm"
+    inject_as: "OPENAI_API_BASE_URL"
+    apply: "openai-env"
+    cardinality: "one"
+    required: false
+
 lifecycle:
   install:
     - downloadImage: "ghcr.io/open-webui/open-webui:main"

package/apps/playwright-container.yaml

@@ -2,7 +2,7 @@ id: playwright-container
 name: Playwright
 version: "1.0.0"
 jishushell:
-  min_version: "0.4.24"
+  min_version: "0.4.30"
 description: "在容器中启动 Playwright UI，通过浏览器查看和管理测试运行"
 singleInstance: false
 
@@ -52,9 +52,15 @@ tasks:
 
 provides:
   - capability: "playwright-ui"
+    task: "playwright-ui"
     port: 14567
     protocol: "http"
     description: "Playwright UI Web 界面"
+  # browser-playwright (CDP endpoint) is TODO — needs a sidecar task that runs
+  # `npx playwright launch-server --browser chromium --hostname 0.0.0.0`,
+  # captures the token-bearing ws URL into a file/env, and registers it as a
+  # capability with protocol=ws. Until the sidecar lands, OpenClaw / Hermes
+  # browser slots cannot bind to this app via the Connections UI.
 
 lifecycle:
   install:

package/apps/searxng-container.yaml

@@ -2,9 +2,9 @@ id: searxng-container
 name: SearXNG
 version: "1.0.0"
 jishushell:
-  min_version: "0.4.24"
-description: "隐私优先的元搜索引擎，Docker 容器模式由 Nomad 管理生命周期"
-singleInstance: false
+  min_version: "0.4.30"
+description: "隐私优先的元搜索引擎"
+singleInstance: true
 
 tasks:
   - name: searxng
@@ -40,12 +40,62 @@ tasks:
 
 provides:
   - capability: "web-ui"
+    task: "searxng"
     port: 8080
+    protocol: "http"
+    description: "SearXNG Web UI（legacy capability，请改用 web-searxng）"
+  - capability: "web-searxng"
+    task: "searxng"
+    port: 8080
+    protocol: "http"
     description: "SearXNG Web UI"
-  - capability: "search-api"
+  - capability: "search-searxng"
+    task: "searxng"
     port: 8080
     path: "/search"
+    protocol: "http"
     description: "SearXNG 搜索 API，支持 JSON 格式 (/search?q=xxx&format=json)"
+    # PR 8 / docs §17 — canonical MCP surface that LLM-binding adapters
+    # (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
+    # dates / translating queries / auto-filling time_range filters.
+    # Mirrors OpenClaw's built-in searxng plugin description verbatim.
+    tool_schema:
+      name: "searxng_web_search"
+      description: "Search the web using a self-hosted SearXNG instance. Returns titles, URLs, and snippets."
+      parameters:
+        type: object
+        properties:
+          query:
+            type: string
+            description: "Search query string."
+          count:
+            type: number
+            description: "Number of results to return (1-10)."
+            minimum: 1
+            maximum: 10
+          categories:
+            type: string
+            description: "Optional comma-separated categories such as general, news, or science."
+          language:
+            type: string
+            description: "Optional language code such as en, de, or fr."
+        required:
+          - query
+      upstream:
+        command: npx
+        args:
+          - "-y"
+          - "mcp-searxng"
+        env_template:
+          # ${SEARCH_API_BASE_URL_ORIGIN} = parsed URL with /search stripped.
+          # The URL stays at the registry-resolved host:port at PUT
+          # /connections time; on host IP changes, the framework re-renders
+          # this env on next instance start (PR 9 phaseRefreshConnections),
+          # so users only need to restart the consuming agent — no re-bind.
+          SEARXNG_URL: "${SEARCH_API_BASE_URL_ORIGIN}"
+      wrap_outputs: true
 
 lifecycle:
   install:

package/dist/cli/app.js

@@ -1,4 +1,5 @@
 import { existsSync, readFileSync } from "fs";
+import { basename, extname } from "path";
 import { stringify } from "yaml";
 import { parseFlag } from "./helpers.js";
 import { loadManagedListEntries, printManagedList } from "./managed-list.js";
@@ -328,6 +329,30 @@ function parseRemoteYamlUrl(value) {
         throw e;
     }
 }
+const BUILTIN_INSTALL_ALIASES = {
+    ollama: "ollama-binary.yaml",
+};
+async function loadBuiltinInstallYaml(source) {
+    const normalizedSource = source.trim();
+    if (!normalizedSource)
+        return null;
+    const { listBuiltinAppSpecs } = await import("../services/app/app-manager.js");
+    const templates = listBuiltinAppSpecs();
+    const normalizedWithoutExt = normalizedSource.replace(/\.ya?ml$/i, "");
+    const aliasTarget = BUILTIN_INSTALL_ALIASES[normalizedWithoutExt] ?? BUILTIN_INSTALL_ALIASES[normalizedSource];
+    const template = templates.find((entry) => {
+        if (aliasTarget && entry.fileName === aliasTarget)
+            return true;
+        if (entry.fileName === normalizedSource)
+            return true;
+        if (basename(entry.fileName, extname(entry.fileName)) === normalizedWithoutExt)
+            return true;
+        if (entry.id === normalizedWithoutExt || entry.id === normalizedSource)
+            return true;
+        return false;
+    });
+    return template?.yaml ?? null;
+}
 async function loadInstallYaml(source) {
     const remoteUrl = parseRemoteYamlUrl(source);
     if (remoteUrl) {
@@ -347,6 +372,10 @@ async function loadInstallYaml(source) {
         }
         return body;
     }
+    const builtinYaml = await loadBuiltinInstallYaml(source);
+    if (builtinYaml) {
+        return builtinYaml;
+    }
     if (!existsSync(source)) {
         throw new Error(`File not found: ${source}`);
     }
@@ -377,12 +406,41 @@ async function cmdShow(id) {
     }
     console.log(JSON.stringify(instance, null, 2));
 }
-async function cmdInstall(yamlPath, requestedAppId) {
-    const yamlText = await loadInstallYaml(yamlPath);
+async function cmdInstall(args) {
+    const installSource = args[0];
+    let requestedAppId;
+    for (let index = 1; index < args.length; index += 1) {
+        const value = args[index];
+        if (value === "--sudo-password") {
+            index += 1;
+            continue;
+        }
+        if (value.startsWith("--"))
+            continue;
+        requestedAppId = value;
+        break;
+    }
+    const yamlText = await loadInstallYaml(installSource);
     const { installApp } = await import("../services/app/app-manager.js");
-    const result = await installApp(yamlText, requestedAppId);
-    const installModeLabel = result.manifest.install_mode === "instance-dir" ? "instance" : "app";
-    log(c.green(`  ✓  Installed: ${result.manifest.id}  (${result.spec.name || ""} v${result.spec.version || "?"}, ${installModeLabel})`));
+    const sudoState = getCliSudoState(args);
+    while (true) {
+        try {
+            const installOptions = sudoState.password ? { exec: { sudoPassword: sudoState.password } } : undefined;
+            const result = installOptions
+                ? await installApp(yamlText, requestedAppId, installOptions)
+                : await installApp(yamlText, requestedAppId);
+            const installModeLabel = result.manifest.install_mode === "instance-dir" ? "instance" : "app";
+            log(c.green(`  ✓  Installed: ${result.manifest.id}  (${result.spec.name || ""} v${result.spec.version || "?"}, ${installModeLabel})`));
+            return;
+        }
+        catch (err) {
+            const message = err?.message || "Install failed";
+            if (isSudoPasswordError(message) && await promptForCliSudoPassword(sudoState)) {
+                continue;
+            }
+            throw err;
+        }
+    }
 }
 async function cmdProvides(args) {
     const { listProvidedCapabilities } = await import("../services/app/app-manager.js");
@@ -504,16 +562,26 @@ async function cmdUninstallAll(args = []) {
     }
 }
 async function cmdCreateInstance(appId, instanceId, name) {
-    const { getApp, installApp, resolveRequires, updateInstance } = await import("../services/app/app-manager.js");
+    const { getApp, installApp, updateInstance } = await import("../services/app/app-manager.js");
+    const { resolveConnections, resolvedToLegacyEnv } = await import("../services/connection-resolver.js");
     const appData = getApp(appId);
     if (!appData) {
         log(c.red(`  ✗  App "${appId}" not found.`));
         process.exitCode = 1;
         return;
     }
+    // PR 3 sub-step 3e: switch CLI to resolveConnections (preCreate). Pending
+    // requires are printed so the user can see what still needs binding.
     let resolvedEnv = {};
     try {
-        resolvedEnv = resolveRequires(appData.spec);
+        const { resolved, pending } = resolveConnections(appData.spec, { connections: {} }, "preCreate");
+        resolvedEnv = resolvedToLegacyEnv(resolved);
+        if (pending.length > 0) {
+            log(c.yellow(`  ⚠  ${pending.length} pending connection(s):`));
+            for (const p of pending) {
+                log(c.yellow(`     - ${p.slot} (${p.capability}): ${p.reason}`));
+            }
+        }
     }
     catch (e) {
         log(c.red(`  ✗  ${e.message}`));
@@ -705,7 +773,7 @@ export async function run(rest) {
             await cmdShow(rest[1]);
         }
         else if (appCmd === "install" && rest[1]) {
-            await cmdInstall(rest[1], rest[2]);
+            await cmdInstall(rest.slice(1));
         }
         else if (appCmd === "uninstall" && rest[1] === "--all") {
             await cmdUninstallAll(rest.slice(2));
@@ -781,7 +849,8 @@ Commands:
   list [--json]                                     列出统一受管列表（apps 下已安装应用 + instances 下遗留实例）
   provides [--json]                                 列出已安装 App 声明/注册的能力
   show <id>                                         查看 App 或实例详情（JSON）
-  install <yaml-file|https-url> [app-id]            从本地或 HTTPS YAML 安装 App，可选指定安装 id
+  install <yaml-file|https-url|builtin-id> [app-id] [--sudo-password <password>]
+                                                    从本地、HTTPS 或内置模板安装 App，可选指定安装 id
   uninstall <app-id> [--sudo-password <password>]   卸载单个 App 或实例（停止 + 删除目录）
   uninstall --all [--sudo-password <password>]      卸载全部 App 与实例
   create-instance <app-id> <inst-id> [name]         从 App 创建实例（Agent 通道由 spec.agentType 决定）
@@ -798,6 +867,7 @@ Examples:
   jishushell app install ./apps/ollama-with-hollama-binary.yaml
   jishushell app install ./apps/ollama-with-hollama-binary.yaml ollama-local
   jishushell app install https://example.com/apps/ollama-with-hollama-binary.yaml
+  jishushell app install ollama
   jishushell app list
   jishushell app provides
   jishushell app copy ollama-1