jishushell 0.4.24 → 0.4.30

package/dist/services/runtime/adapters/openclaw-mcporter.d.ts

@@ -0,0 +1,45 @@
+export type McporterSource = {
+    kind: "user";
+} | {
+    kind: "connection";
+    slot: string;
+    consumerInstanceId: string;
+};
+export interface McporterServerEntry {
+    command?: string;
+    args?: string[];
+    url?: string;
+    transport?: "sse" | "http" | "stdio";
+    env?: Record<string, string>;
+    __source?: McporterSource;
+    [key: string]: unknown;
+}
+interface McporterConfig {
+    mcpServers: Record<string, McporterServerEntry>;
+    imports?: any[];
+    [key: string]: unknown;
+}
+export declare function readMcporterConfig(instanceId: string): McporterConfig;
+export declare function writeMcporterConfig(instanceId: string, cfg: McporterConfig): void;
+/**
+ * Merge `servers` into the consumer's mcporter.json. Existing entries with
+ * the same name and matching `__source` get overwritten; entries with a
+ * different source (e.g. user-managed) are preserved untouched and the new
+ * entry's name is suffixed with a numeric tag (`-2`, `-3`, …) so the merge
+ * never silently overwrites user-managed servers.
+ *
+ * When user-managed and connection-managed entries collide on name, the
+ * conflict surfaces by having the connection-managed entry land under a
+ * suffixed key. Routes that later inspect the file can detect the
+ * suffix and surface a UI warning if needed.
+ */
+export declare function mergeMcporterServers(instanceId: string, servers: Record<string, McporterServerEntry>): void;
+/**
+ * Remove all entries whose `__source` matches the given filter. If
+ * filter.source is omitted, removes every connection-managed entry
+ * (everything except `kind: "user"` / no marker).
+ */
+export declare function removeMcporterServers(instanceId: string, filter?: {
+    source?: McporterSource;
+}): void;
+export {};

package/dist/services/runtime/adapters/openclaw-mcporter.js

@@ -0,0 +1,108 @@
+/**
+ * Mcporter helper — extracted from `openclaw-routes.ts` so connection
+ * apply hooks (PR 5) and the existing /mcporter/add route share a single
+ * read/merge/write code path.
+ *
+ * Connection-merged servers carry a `__source` object so we can later
+ * (un)bind precisely without touching user-managed entries:
+ *
+ *   { __source: { kind: "connection", slot, consumerInstanceId } }
+ *
+ * `__source: { kind: "user" }` (or no marker) means "user-managed via
+ * Mcporter UI"; never touched by connection apply hooks.
+ */
+import { existsSync, readFileSync } from "fs";
+import { join } from "path";
+import * as instanceManager from "../../instance-manager.js";
+import { ensureDirHost } from "../../../utils/fs.js";
+import { safeWriteJson } from "../../../utils/safe-json.js";
+const PROTO_KEYS = new Set(["__proto__", "constructor", "prototype"]);
+function mcporterPath(instanceId) {
+    const home = instanceManager.getOpenclawHome(instanceId);
+    return join(home, ".openclaw", "workspace", "config", "mcporter.json");
+}
+export function readMcporterConfig(instanceId) {
+    const path = mcporterPath(instanceId);
+    if (!existsSync(path))
+        return { mcpServers: {}, imports: [] };
+    try {
+        const raw = JSON.parse(readFileSync(path, "utf-8"));
+        if (!raw || typeof raw !== "object")
+            return { mcpServers: {}, imports: [] };
+        if (!raw.mcpServers || typeof raw.mcpServers !== "object") {
+            raw.mcpServers = {};
+        }
+        return raw;
+    }
+    catch {
+        return { mcpServers: {}, imports: [] };
+    }
+}
+export function writeMcporterConfig(instanceId, cfg) {
+    const path = mcporterPath(instanceId);
+    ensureDirHost(join(path, ".."));
+    safeWriteJson(path, cfg);
+}
+/**
+ * Merge `servers` into the consumer's mcporter.json. Existing entries with
+ * the same name and matching `__source` get overwritten; entries with a
+ * different source (e.g. user-managed) are preserved untouched and the new
+ * entry's name is suffixed with a numeric tag (`-2`, `-3`, …) so the merge
+ * never silently overwrites user-managed servers.
+ *
+ * When user-managed and connection-managed entries collide on name, the
+ * conflict surfaces by having the connection-managed entry land under a
+ * suffixed key. Routes that later inspect the file can detect the
+ * suffix and surface a UI warning if needed.
+ */
+export function mergeMcporterServers(instanceId, servers) {
+    const cfg = readMcporterConfig(instanceId);
+    cfg.mcpServers = cfg.mcpServers ?? {};
+    for (const [rawName, entry] of Object.entries(servers)) {
+        if (PROTO_KEYS.has(rawName))
+            continue;
+        let name = rawName;
+        const existing = cfg.mcpServers[name];
+        if (existing && !sourceMatches(existing.__source, entry.__source)) {
+            // user-managed vs connection-managed collision — pick a suffixed key.
+            let i = 2;
+            while (cfg.mcpServers[`${rawName}-${i}`])
+                i++;
+            name = `${rawName}-${i}`;
+        }
+        cfg.mcpServers[name] = entry;
+    }
+    writeMcporterConfig(instanceId, cfg);
+}
+/**
+ * Remove all entries whose `__source` matches the given filter. If
+ * filter.source is omitted, removes every connection-managed entry
+ * (everything except `kind: "user"` / no marker).
+ */
+export function removeMcporterServers(instanceId, filter = {}) {
+    const cfg = readMcporterConfig(instanceId);
+    if (!cfg.mcpServers)
+        return;
+    const keep = {};
+    for (const [name, entry] of Object.entries(cfg.mcpServers)) {
+        const src = entry.__source;
+        const matches = filter.source
+            ? sourceMatches(src, filter.source)
+            : src && src.kind === "connection";
+        if (!matches)
+            keep[name] = entry;
+    }
+    cfg.mcpServers = keep;
+    writeMcporterConfig(instanceId, cfg);
+}
+function sourceMatches(a, b) {
+    if (!a || !b)
+        return false;
+    if (a.kind !== b.kind)
+        return false;
+    if (a.kind === "connection" && b.kind === "connection") {
+        return a.slot === b.slot && a.consumerInstanceId === b.consumerInstanceId;
+    }
+    return true;
+}
+//# sourceMappingURL=openclaw-mcporter.js.map

package/dist/services/runtime/adapters/openclaw-mcporter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"openclaw-mcporter.js","sourceRoot":"","sources":["../../../../src/services/runtime/adapters/openclaw-mcporter.ts"],"names":[],"mappings":"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"}

package/dist/services/runtime/adapters/openclaw.d.ts

@@ -36,6 +36,63 @@
 import { type InstallResult } from "../../setup-manager.js";
 import type { AdapterHooks, AdapterManifest, AgentType, CapabilityProfile, ConfigDocument, CreateInstanceArgs, CreateInstanceContext, InstanceConfigMeta, InstancePaths, PairingApproveInput, RuntimeAdapter, RuntimeSpec, RuntimeVersionInfo } from "../types.js";
 export declare const OPENCLAW_DEFAULT_GATEWAY_PORT = 18789;
+/**
+ * Ensure the `llm-agent` capability advertised by openclaw-*.yaml works for
+ * every instance, including ones created before this code shipped: enable
+ * OpenClaw's OpenAI-compatible endpoints in `openclaw.json` on every start.
+ *
+ * Runs idempotently next to `patchDockerBridgeGatewayBind`. The OpenAI
+ * routes (`/v1/chat/completions`, `/v1/responses`, `/v1/models`,
+ * `/v1/embeddings`) live in openclaw's bundled server.impl and are gated
+ * behind `gateway.http.endpoints.{chatCompletions,responses}.enabled` —
+ * default false, so a fresh OpenClaw install would 404 those paths even
+ * though OpenWebUI binds it through the connections page.
+ */
+export declare function patchOpenAIEndpointsEnabled(configPath: string): void;
+/**
+ * Deep-merge a SearXNG connection into an OpenClaw config file at `configPath`.
+ *
+ * Writes both halves of the wiring required for the `web_search` tool to use
+ * the registry-resolved SearXNG instance:
+ *
+ *   plugins.entries.searxng.enabled                       = true
+ *   plugins.entries.searxng.config.webSearch.baseUrl      = baseUrl
+ *   tools.web.search.provider                             = "searxng"
+ *
+ * The provider selector is required because OpenClaw's built-in default is
+ * `"brave"`; without it the tool fails with `missing_brave_api_key` even when
+ * the searxng plugin is otherwise correctly configured (verified on Pi
+ * 2026-04-29: claw11 had the plugin block right but the selector unset).
+ *
+ * Why a partial deep-merge instead of `saveNativeConfig`: the latter is
+ * destructive — it replaces top-level keys wholesale and only preserves a
+ * hardcoded subset (`plugins.installs`, `plugins.entries` per-key, partial
+ * `channels` merge). A partial patch through it would wipe `models.providers`
+ * / `agents.defaults` / etc., bricking the instance with `No API key found
+ * for provider "openai"` on the next chat. So we read, merge, write back.
+ *
+ * No-op when the config file is absent (instance not yet started).
+ */
+export declare function applySearxngConnectionToConfig(configPath: string, baseUrl: string): void;
+/**
+ * Counterpart to `applySearxngConnectionToConfig` — invoked when the user
+ * unbinds the SEARCH slot in the Connections tab. Without this, unbinding
+ * left the plugin entry enabled with a baseUrl pointing at the now-gone
+ * searxng provider, and `tools.web.search.provider="searxng"` kept routing
+ * the agent's `web_search` tool through that dead URL on every chat.
+ *
+ * Conservative cleanup so a future re-bind (or user-customized plugin
+ * settings) survives:
+ *   - flip the searxng plugin to enabled:false (don't delete the entry —
+ *     user may have hand-tuned it and we want re-bind to re-enable cheaply)
+ *   - drop the stale `webSearch.baseUrl` so nothing reads it as still-live
+ *   - clear `tools.web.search.provider` so the runtime falls back to its
+ *     built-in default (which today errors out with `missing_brave_api_key`
+ *     — the right outcome: search was unbound, web_search shouldn't work)
+ *
+ * No-op when the config file is absent.
+ */
+export declare function clearSearxngConnectionFromConfig(configPath: string): void;
 declare class OpenClawAdapter implements RuntimeAdapter {
     readonly agentType: AgentType;
     readonly displayName = "OpenClaw";
@@ -95,6 +152,36 @@ declare class OpenClawAdapter implements RuntimeAdapter {
     isChannelPluginInstalled(instanceId: string, channelId: string): boolean;
     installChannelPlugin(instanceId: string, channelId: string): Promise<void>;
     saveNativeConfig(instanceId: string, config: Record<string, any>): boolean;
+    /**
+     * Connection-apply hook (§7 of app-interconnect-design): translate
+     * resolved `inject_as` env vars into OpenClaw-native plugin config and
+     * persist them into `openclaw.json`. Without this, the runtime env
+     * injected by `nomad-manager.injectConnectionsRuntimeEnv` (PR 8) sits
+     * in the container unused — the OpenClaw agent reads tool config from
+     * `openclaw.json`, not from environment variables.
+     *
+     * Currently wired:
+     *   SEARCH_API_BASE_URL → plugins.entries.searxng.config.webSearch.baseUrl
+     *   SEARCH_API_BASE_URL → tools.web.search.provider = "searxng"
+     *
+     * The provider selector at `tools.web.search.provider` is required: without
+     * it the `web_search` tool defaults to Brave and fails with
+     * `missing_brave_api_key` even when the searxng plugin is fully configured.
+     *
+     * Browser / LLM / MCP wiring lands in PR 9b — they need their own
+     * config-shape mapping (browser → tools.browser, llm → models.providers,
+     * mcp already wired via openclaw-mcporter).
+     *
+     * The write goes through `saveNativeConfig` which deep-merges with the
+     * existing on-disk config, so user-managed plugin entries (e.g.
+     * openclaw-lark) are preserved. Plugin auto-enable then promotes the
+     * searxng entry into `plugins.allow` automatically on next start
+     * because we set `enabled:true` and provide config (the openclaw
+     * runtime treats the presence of `config.webSearch.baseUrl` as a
+     * "configured" signal — see `plugin-auto-enable` in the openclaw
+     * dist bundle).
+     */
+    applyConnectionEnv(instanceId: string, env: Record<string, string>): Promise<void>;
     resolveBin(): string;
     resolveAgentHome(instanceId: string): string;
     /** Env vars OpenClaw's CLI needs when backup-manager runs it as a subprocess. */

package/dist/services/runtime/adapters/openclaw.js

@@ -265,6 +265,20 @@ function patchJsproxyBaseUrl(configPath) {
  * container loopback. Normalize default/loopback gateway binds to `lan` so
  * Nomad's published host port can reach the gateway.
  */
+// Mirrors hermes.ts:nomadHasExternalHostNetwork. When the host nomad.hcl
+// declares `host_network "external" { ... }`, the legacy openclaw job
+// attaches it to its ReservedPorts so docker publishes the gateway to
+// the LAN address instead of 127.0.0.1. Without this, OpenWebUI in a
+// sibling container can't reach openclaw at all.
+function nomadHasExternalHostNetwork() {
+    const path = join(JISHUSHELL_HOME, "nomad", "nomad.hcl");
+    try {
+        return /host_network\s+"external"\s*\{/.test(readFileSync(path, "utf-8"));
+    }
+    catch {
+        return false;
+    }
+}
 function patchDockerBridgeGatewayBind(configPath) {
     try {
         const raw = readFileSync(configPath, "utf-8");
@@ -290,6 +304,137 @@ function patchDockerBridgeGatewayBind(configPath) {
         console.warn(`[openclaw] Failed to patch gateway.bind in ${configPath}: ${e.message}`);
     }
 }
+/**
+ * Ensure the `llm-agent` capability advertised by openclaw-*.yaml works for
+ * every instance, including ones created before this code shipped: enable
+ * OpenClaw's OpenAI-compatible endpoints in `openclaw.json` on every start.
+ *
+ * Runs idempotently next to `patchDockerBridgeGatewayBind`. The OpenAI
+ * routes (`/v1/chat/completions`, `/v1/responses`, `/v1/models`,
+ * `/v1/embeddings`) live in openclaw's bundled server.impl and are gated
+ * behind `gateway.http.endpoints.{chatCompletions,responses}.enabled` —
+ * default false, so a fresh OpenClaw install would 404 those paths even
+ * though OpenWebUI binds it through the connections page.
+ */
+export function patchOpenAIEndpointsEnabled(configPath) {
+    try {
+        const raw = readFileSync(configPath, "utf-8");
+        const parsed = JSON.parse(raw);
+        if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
+            return;
+        const root = parsed;
+        const gateway = root.gateway && typeof root.gateway === "object" && !Array.isArray(root.gateway)
+            ? root.gateway
+            : (root.gateway = {});
+        const http = gateway.http && typeof gateway.http === "object" && !Array.isArray(gateway.http)
+            ? gateway.http
+            : (gateway.http = {});
+        const endpoints = http.endpoints && typeof http.endpoints === "object" && !Array.isArray(http.endpoints)
+            ? http.endpoints
+            : (http.endpoints = {});
+        let changed = false;
+        for (const key of ["chatCompletions", "responses"]) {
+            const ep = endpoints[key] && typeof endpoints[key] === "object" && !Array.isArray(endpoints[key])
+                ? endpoints[key]
+                : (endpoints[key] = {});
+            if (ep.enabled !== true) {
+                ep.enabled = true;
+                changed = true;
+            }
+        }
+        if (!changed)
+            return;
+        const next = JSON.stringify(parsed, null, 2);
+        const output = raw.endsWith("\n") ? `${next}\n` : next;
+        writeConfigFile(configPath, output);
+        console.log(`[openclaw] Enabled gateway.http.endpoints.{chatCompletions,responses} in ${configPath} for llm-agent capability`);
+    }
+    catch (e) {
+        console.warn(`[openclaw] Failed to patch OpenAI endpoints in ${configPath}: ${e.message}`);
+    }
+}
+/**
+ * Deep-merge a SearXNG connection into an OpenClaw config file at `configPath`.
+ *
+ * Writes both halves of the wiring required for the `web_search` tool to use
+ * the registry-resolved SearXNG instance:
+ *
+ *   plugins.entries.searxng.enabled                       = true
+ *   plugins.entries.searxng.config.webSearch.baseUrl      = baseUrl
+ *   tools.web.search.provider                             = "searxng"
+ *
+ * The provider selector is required because OpenClaw's built-in default is
+ * `"brave"`; without it the tool fails with `missing_brave_api_key` even when
+ * the searxng plugin is otherwise correctly configured (verified on Pi
+ * 2026-04-29: claw11 had the plugin block right but the selector unset).
+ *
+ * Why a partial deep-merge instead of `saveNativeConfig`: the latter is
+ * destructive — it replaces top-level keys wholesale and only preserves a
+ * hardcoded subset (`plugins.installs`, `plugins.entries` per-key, partial
+ * `channels` merge). A partial patch through it would wipe `models.providers`
+ * / `agents.defaults` / etc., bricking the instance with `No API key found
+ * for provider "openai"` on the next chat. So we read, merge, write back.
+ *
+ * No-op when the config file is absent (instance not yet started).
+ */
+export function applySearxngConnectionToConfig(configPath, baseUrl) {
+    if (!existsSync(configPath))
+        return;
+    const existing = JSON.parse(readFileSync(configPath, "utf-8"));
+    existing.plugins = existing.plugins ?? {};
+    existing.plugins.entries = existing.plugins.entries ?? {};
+    const prior = existing.plugins.entries.searxng ?? {};
+    existing.plugins.entries.searxng = {
+        ...prior,
+        enabled: true,
+        config: {
+            ...(prior.config ?? {}),
+            webSearch: {
+                ...((prior.config ?? {}).webSearch ?? {}),
+                baseUrl,
+            },
+        },
+    };
+    existing.tools = existing.tools ?? {};
+    existing.tools.web = existing.tools.web ?? {};
+    existing.tools.web.search = existing.tools.web.search ?? {};
+    existing.tools.web.search.provider = "searxng";
+    safeWriteJson(configPath, existing);
+}
+/**
+ * Counterpart to `applySearxngConnectionToConfig` — invoked when the user
+ * unbinds the SEARCH slot in the Connections tab. Without this, unbinding
+ * left the plugin entry enabled with a baseUrl pointing at the now-gone
+ * searxng provider, and `tools.web.search.provider="searxng"` kept routing
+ * the agent's `web_search` tool through that dead URL on every chat.
+ *
+ * Conservative cleanup so a future re-bind (or user-customized plugin
+ * settings) survives:
+ *   - flip the searxng plugin to enabled:false (don't delete the entry —
+ *     user may have hand-tuned it and we want re-bind to re-enable cheaply)
+ *   - drop the stale `webSearch.baseUrl` so nothing reads it as still-live
+ *   - clear `tools.web.search.provider` so the runtime falls back to its
+ *     built-in default (which today errors out with `missing_brave_api_key`
+ *     — the right outcome: search was unbound, web_search shouldn't work)
+ *
+ * No-op when the config file is absent.
+ */
+export function clearSearxngConnectionFromConfig(configPath) {
+    if (!existsSync(configPath))
+        return;
+    const existing = JSON.parse(readFileSync(configPath, "utf-8"));
+    const sx = existing?.plugins?.entries?.searxng;
+    if (sx && typeof sx === "object") {
+        sx.enabled = false;
+        if (sx.config?.webSearch && typeof sx.config.webSearch === "object") {
+            delete sx.config.webSearch.baseUrl;
+        }
+    }
+    if (existing?.tools?.web?.search && typeof existing.tools.web.search === "object") {
+        delete existing.tools.web.search.provider;
+    }
+    safeWriteJson(configPath, existing);
+}
 /**
  * Pre-seed the per-instance npm global prefix with a symlink to the image's
  * baked openclaw package so OpenClaw's in-gateway "Update now" handler can
@@ -513,7 +658,7 @@ async function pullOrBuildOpenclawImageWithTask(task, tag) {
         const invocation = resolveDockerInvocation();
         // Always attempt pull — when the image is already local and in sync
         // with upstream, docker returns within seconds after a digest check.
-        // The "skip if image present" early exit was making "重新安装" feel
+        // The "skip if image present" early exit was making "reinstall" feel
         // like a no-op; explicit re-pull matches user intent better. On pull
         // failure we still fall back to local build below.
         emitTask(task, { type: "progress", message: `正在拉取镜像: ${targetTag} ...`, progress: 10 });
@@ -683,6 +828,11 @@ class OpenClawAdapter {
                 patchDockerBridgeGatewayBind(configPath);
                 patchJsproxyBaseUrl(configPath);
             }
+            // Driver-agnostic: enable the OpenAI-compatible endpoints on every
+            // start so the `llm-agent` capability advertised by openclaw-*.yaml
+            // works for both fresh installs and instances created before this
+            // patcher shipped. Idempotent — bails out fast if already enabled.
+            patchOpenAIEndpointsEnabled(configPath);
             // 4. npm update-seed — use local resolver
             try {
                 const home = openclawAdapter.resolveAgentHome(instanceId);
@@ -1220,6 +1370,12 @@ class OpenClawAdapter {
         const safeJobId = `${this.nomadJobPrefix}${instanceId}`;
         assertSafeTemplateId(safeJobId);
         const normalizedResources = normalizeDockerResources(instanceId, rawResources);
+        // Same rationale as hermes.ts:nomadHasExternalHostNetwork — without
+        // HostNetwork, Nomad's docker driver publishes the gateway port to
+        // 127.0.0.1, breaking cross-container consumers (e.g. OpenWebUI
+        // binding openclaw via the llm-agent capability). Bring the legacy
+        // openclaw job in line with the unified app-spec path.
+        const hostNetwork = nomadHasExternalHostNetwork() ? "external" : undefined;
         return {
             Name: "gateway",
             Driver: "docker",
@@ -1227,9 +1383,17 @@ class OpenClawAdapter {
             Config: {
                 image,
                 force_pull: false,
+                // Match nomad-manager.ts:buildAppTask — default 5-minute pull
+                // timeout is too short for Pi-class networks pulling a 1+ GiB
+                // openclaw runtime image; bump to 15 minutes.
+                image_pull_timeout: "15m",
                 args,
                 work_dir: openclawHome,
                 volumes: [`${openclawHome}:${openclawHome}:rw`],
+                // Tell the docker driver to publish the labeled "gateway" port so
+                // it routes via the host_network IP rather than the 127.0.0.1
+                // default.
+                ports: ["gateway"],
                 extra_hosts: ["host.docker.internal:host-gateway"],
                 cap_drop: ["ALL"],
                 security_opt: ["no-new-privileges"],
@@ -1244,7 +1408,18 @@ class OpenClawAdapter {
             Env: containerEnv,
             Resources: {
                 ...normalizedResources,
-                Networks: [{ ReservedPorts: [{ Label: "gateway", Value: gatewayPort }] }],
+                Networks: [
+                    {
+                        ReservedPorts: [
+                            {
+                                Label: "gateway",
+                                Value: gatewayPort,
+                                To: gatewayPort,
+                                ...(hostNetwork ? { HostNetwork: hostNetwork } : {}),
+                            },
+                        ],
+                    },
+                ],
             },
             LogConfig: { MaxFiles: 3, MaxFileSizeMB: 10 },
             Templates: [
@@ -1378,6 +1553,79 @@ class OpenClawAdapter {
     saveNativeConfig(instanceId, config) {
         return saveNativeConfigImpl(instanceId, config);
     }
+    /**
+     * Connection-apply hook (§7 of app-interconnect-design): translate
+     * resolved `inject_as` env vars into OpenClaw-native plugin config and
+     * persist them into `openclaw.json`. Without this, the runtime env
+     * injected by `nomad-manager.injectConnectionsRuntimeEnv` (PR 8) sits
+     * in the container unused — the OpenClaw agent reads tool config from
+     * `openclaw.json`, not from environment variables.
+     *
+     * Currently wired:
+     *   SEARCH_API_BASE_URL → plugins.entries.searxng.config.webSearch.baseUrl
+     *   SEARCH_API_BASE_URL → tools.web.search.provider = "searxng"
+     *
+     * The provider selector at `tools.web.search.provider` is required: without
+     * it the `web_search` tool defaults to Brave and fails with
+     * `missing_brave_api_key` even when the searxng plugin is fully configured.
+     *
+     * Browser / LLM / MCP wiring lands in PR 9b — they need their own
+     * config-shape mapping (browser → tools.browser, llm → models.providers,
+     * mcp already wired via openclaw-mcporter).
+     *
+     * The write goes through `saveNativeConfig` which deep-merges with the
+     * existing on-disk config, so user-managed plugin entries (e.g.
+     * openclaw-lark) are preserved. Plugin auto-enable then promotes the
+     * searxng entry into `plugins.allow` automatically on next start
+     * because we set `enabled:true` and provide config (the openclaw
+     * runtime treats the presence of `config.webSearch.baseUrl` as a
+     * "configured" signal — see `plugin-auto-enable` in the openclaw
+     * dist bundle).
+     */
+    async applyConnectionEnv(instanceId, env) {
+        const searchUrl = env.SEARCH_API_BASE_URL;
+        if (typeof searchUrl !== "string")
+            return;
+        if (searchUrl === "") {
+            // Empty value — connection-transactor's UNPERSIST_HOOKS uses this as
+            // the "unbind" signal. Clear the searxng plugin config so the next
+            // start doesn't keep routing web_search through a now-disconnected
+            // provider.
+            try {
+                clearSearxngConnectionFromConfig(openclawConfigPath(instanceId));
+            }
+            catch (e) {
+                console.warn(`[openclaw] applyConnectionEnv unbind failed for ${instanceId}: ${e.message}`);
+            }
+            return;
+        }
+        // SEARCH_API_BASE_URL points at "<base>/search" (the SearXNG search
+        // endpoint). The plugin's webSearch.baseUrl wants the bare origin —
+        // strip the trailing "/search" path segment if present.
+        // baseUrl stays at the registry-resolved host:port snapshot from
+        // when the user PUT /connections; the framework re-runs this hook
+        // on every instance start (PR 9 phaseRefreshConnections), so host
+        // IP changes propagate automatically on next agent restart.
+        let baseUrl = searchUrl;
+        try {
+            const u = new URL(searchUrl);
+            if (u.pathname === "/search" || u.pathname === "/search/") {
+                u.pathname = "";
+                baseUrl = u.toString().replace(/\/$/, "");
+            }
+        }
+        catch {
+            // not a URL — abort, the openclaw plugin would silently break with
+            // a non-URL baseUrl and the instance still starts but search fails.
+            return;
+        }
+        try {
+            applySearxngConnectionToConfig(openclawConfigPath(instanceId), baseUrl);
+        }
+        catch (e) {
+            console.warn(`[openclaw] applyConnectionEnv merge failed for ${instanceId}: ${e.message}`);
+        }
+    }
     // ── Path resolvers (physically migrated) ───────────────────────────
     resolveBin() {
         return resolveOpenclawBin();