jishushell 0.6.18 → 0.7.3

package/dist/services/integrations/installable/installers/integration.js

@@ -16,7 +16,7 @@ import { HERMES_RUNTIME_DIR, getCoreConfig, saveCoreConfig, } from "../../../../
 import { listInstances } from "../../../app-common/service.js";
 import { resolveExecutionOwnerFromMetadata } from "../../../app-common/execution-owner.js";
 import { getIntegration, hasIntegration } from "../../index.js";
-import { createTask, emitTask, getRunningTasks, } from "../../../tasks/registry.js";
+import { createTask, emitTask, getRunningTasks, getTask, } from "../../../tasks/registry.js";
 import { resolveIntegrationImage } from "./integration-probes.js";
 const execFileAsync = promisify(execFile);
 export { forceRefreshAllIntegrationUpdates, getUpdateCacheLastCheckedAt, probeIntegrationImageSizeMB, probeIntegrationStatus, probeIntegrationUpdateAvailable, resolveIntegrationImage, } from "./integration-probes.js";
@@ -61,8 +61,20 @@ export async function startIntegrationInstall(integrationKind, options = {}) {
         return { ok: false, error: `Runtime "${integrationKind}" does not implement install` };
     }
     if (result && typeof result === "object") {
+        const ok = result.ok !== false;
+        // A successful update only pulls/re-pins the new runtime image — running
+        // instances keep executing the OLD image until their job is re-submitted.
+        // Restart the running ones so the update actually takes effect; otherwise
+        // the UI reports "latest" while `openclaw --version` still shows the old
+        // build. Scheduled unconditionally (even with zero instances now) so it also
+        // covers an instance created + auto-started while this pull is still running;
+        // the watcher re-evaluates what is running at task completion and no-ops when
+        // nothing is. Detached and best-effort.
+        if (ok && result.taskId) {
+            scheduleApplyImageUpdateByRestart(integrationKind, result.taskId);
+        }
         return {
-            ok: result.ok !== false,
+            ok,
             taskId: result.taskId,
             message: result.message,
             error: result.ok === false ? (result.error || result.message) : undefined,
@@ -160,18 +172,112 @@ export function findRunningIntegrationTask(integrationKind) {
         return { id: uninstall.id, kind: "uninstall" };
     return undefined;
 }
-/** Count live instances bound to this integration kind — used to block uninstall. */
-export function countInstancesUsingIntegrationKind(integrationKind) {
-    let count = 0;
+/** Ids of live instances bound to this integration kind. */
+function instanceIdsUsingIntegrationKind(integrationKind) {
+    const ids = [];
     for (const meta of listInstances()) {
         const instanceId = typeof meta?.id === "string" ? meta.id.trim() : "";
         if (!instanceId)
             continue;
         const owner = resolveExecutionOwnerFromMetadata(instanceId, meta);
         if (owner.type === "integration" && owner.integrationKind === integrationKind) {
-            count += 1;
+            ids.push(instanceId);
+        }
+    }
+    return ids;
+}
+/** Count live instances bound to this integration kind — used to block uninstall. */
+export function countInstancesUsingIntegrationKind(integrationKind) {
+    return instanceIdsUsingIntegrationKind(integrationKind).length;
+}
+/**
+ * After a runtime image update finishes, restart the *running* instances bound
+ * to this integration so the freshly pulled image actually takes effect.
+ * Stopped instances are left alone — they pick up the new image on next start.
+ * Best-effort: a restart failure is logged into the task but never fails the
+ * update itself.
+ */
+async function applyRuntimeImageUpdateByRestart(integrationKind, task) {
+    // Lazy import: pulling the lifecycle stack in at module load would drag in
+    // the whole `service.js` surface, which breaks installer unit tests that mock
+    // `service.js` with only `listInstances`. Matches the lazy-import pattern used
+    // elsewhere (task-service, upgrade-finalize, backup-manager).
+    const { getManagedStatus, restartInstance } = await import("../../../app-common/lifecycle-service.js");
+    const candidates = [];
+    for (const id of instanceIdsUsingIntegrationKind(integrationKind)) {
+        try {
+            const status = await getManagedStatus(id);
+            if (status?.status === "running")
+                candidates.push(id);
+        }
+        catch {
+            // Unknown state → skip, so we never accidentally start a stopped instance.
+        }
+    }
+    if (candidates.length === 0)
+        return;
+    if (task) {
+        emitTask(task, {
+            type: "progress",
+            message: `正在重启 ${candidates.length} 个实例以应用新版本...`,
+            progress: 96,
+        });
+    }
+    for (const id of candidates) {
+        try {
+            // Re-check right before restarting: the update may have taken minutes and
+            // the user could have stopped this instance in the meantime — restarting
+            // it would silently bring it back up against their intent.
+            const status = await getManagedStatus(id);
+            if (status?.status !== "running") {
+                if (task) {
+                    emitTask(task, { type: "log", message: `实例 ${id} 已不在运行，跳过重启` });
+                }
+                continue;
+            }
+            const result = await restartInstance(id);
+            if (task) {
+                emitTask(task, {
+                    type: "log",
+                    message: result.ok
+                        ? `实例 ${id} 已重启，新版本已生效`
+                        : `实例 ${id} 重启失败: ${result.error || "unknown"}（可稍后手动重启）`,
+                });
+            }
+        }
+        catch (e) {
+            if (task) {
+                emitTask(task, { type: "log", message: `实例 ${id} 重启异常: ${e?.message || e}` });
+            }
         }
     }
-    return count;
+}
+/**
+ * Watch a running image-update task and, once it finishes successfully, restart
+ * the running instances bound to this integration. Detached — callers don't
+ * await it. Invoked only from the user-initiated install/update flow (not the
+ * onBeforeStart self-heal path), so it can't recurse into image builds.
+ */
+function scheduleApplyImageUpdateByRestart(integrationKind, taskId) {
+    void (async () => {
+        // Cover the slow path: a failed pull falls back to a local image build
+        // (~30 min timeout), so wait comfortably past that before giving up.
+        const deadline = Date.now() + 40 * 60_000;
+        while (Date.now() < deadline) {
+            const task = getTask(taskId);
+            if (!task || task.status !== "running") {
+                if (task?.status === "done") {
+                    try {
+                        await applyRuntimeImageUpdateByRestart(integrationKind, task);
+                    }
+                    catch {
+                        /* best-effort */
+                    }
+                }
+                return;
+            }
+            await new Promise((resolve) => setTimeout(resolve, 1500));
+        }
+    })();
 }
 //# sourceMappingURL=integration.js.map

package/dist/services/integrations/installable/installers/integration.js.map

@@ -1 +1 @@
-{"version":3,"file":"integration.js","sourceRoot":"","sources":["../../../../../src/services/integrations/installable/installers/integration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"integration.js","sourceRoot":"","sources":["../../../../../src/services/integrations/installable/installers/integration.ts"],"names":[],"mappings":"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"}

package/dist/services/integrations/jishukb/integration.d.ts

@@ -1,5 +1,6 @@
 import type { AppIntegration, AppIntegrationHooks, AppIntegrationManifest, CapabilityProfile, InstanceConfigMeta, ConfigDocument, PairingApproveInput, RuntimeSpec, RuntimeVersionInfo } from "../types.js";
-export declare function ensureDefaultKb(baseUrl: string): Promise<void>;
+import type { RuntimeContribution } from "../../runtime/workload-types.js";
+export declare function ensureDefaultKb(baseUrl: string, authToken?: string): Promise<void>;
 declare class JishuKbIntegration implements AppIntegration {
     readonly kind: "jishukb";
     readonly displayName = "JishuShell KB";
@@ -12,6 +13,7 @@ declare class JishuKbIntegration implements AppIntegration {
     buildRuntime(instanceId: string): Promise<RuntimeSpec>;
     getPersistedRuntimeSpec(instanceId: string): Promise<RuntimeSpec>;
     getRuntimeVersion(_instanceId: string): Promise<RuntimeVersionInfo>;
+    buildRuntimeContribution(instanceId: string): Promise<RuntimeContribution>;
     getConfigMeta(_instanceId: string): Promise<InstanceConfigMeta>;
     readConfig(_instanceId: string): Promise<ConfigDocument>;
     writeConfig(_instanceId: string, _doc: ConfigDocument): Promise<ConfigDocument>;

package/dist/services/integrations/jishukb/integration.js

@@ -1,15 +1,19 @@
-import { chmodSync, mkdirSync, writeFileSync } from "fs";
+import { randomBytes } from "crypto";
+import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { dirname, join } from "path";
 import { JISHUSHELL_HOME } from "../../../config.js";
-import { getHostForAppPort, getInstance, getPrimaryHostPort, updateInstanceMeta, urlHost, } from "../../instances/manager.js";
+import { getHostForAppPort, getInstance, getPrimaryHostPort, parseEnvFile, updateInstanceMeta, updateEnvFile, urlHost, } from "../../instances/manager.js";
 import { buildCanonicalRuntimeFromSpec } from "../../app-common/runtime-facts.js";
 import { readCanonicalSpecForInstance } from "../../app-common/instance-store.js";
 import { resolveAppDir } from "../../app-common/paths.js";
 import { registerIntegration } from "../registry.js";
-const JISHUKB_IMAGE = "ghcr.io/x-aijishu/jishu-kb:0.1.1";
+const JISHUKB_IMAGE = "ghcr.io/x-aijishu/jishu-kb:0.1.2";
 const JISHUKB_FRAME_ANCESTORS = "*";
 const JISHUKB_PROVIDER_ID = "jishu-kb-container";
 const DEFAULT_KB_ID = "default";
+const REMOTE_MCP_SECRET_ENV_FILENAME = "secret.env";
+const REMOTE_MCP_AUTH_ENV = "JISHU_KB_AUTH_TOKEN";
+const REMOTE_MCP_TEMPLATE_DEST = "secrets/jishukb.env";
 const DEFAULT_CAPABILITIES = {
     ui: { http: true, websocket: false, chatPanel: "none" },
     pairing: { list: false, approve: false, revoke: false, clearPending: false },
@@ -31,6 +35,9 @@ function dataDir(instanceId) {
 function providerCredentialsFile() {
     return join(JISHUSHELL_HOME, "provider-credentials", JISHUKB_PROVIDER_ID, "credentials.json");
 }
+function remoteMcpSecretEnvFile(instanceId) {
+    return join(resolveAppDir(instanceId), REMOTE_MCP_SECRET_ENV_FILENAME);
+}
 function ensurePrivateDirs(instanceId) {
     mkdirSync(dataDir(instanceId), { recursive: true });
     mkdirSync(dirname(providerCredentialsFile()), { recursive: true });
@@ -55,6 +62,77 @@ function patchRuntimeFrameAncestors(instanceId) {
         updateInstanceMeta(instanceId, { runtime: { ...runtime, env } });
     }
 }
+function ensureRuntimeEnvFile(runtime, envFile) {
+    if (Array.isArray(runtime.env_files)) {
+        if (runtime.env_files.includes(envFile))
+            return false;
+        runtime.env_files = [envFile, ...runtime.env_files];
+        return true;
+    }
+    if (Array.isArray(runtime.envFiles)) {
+        if (runtime.envFiles.includes(envFile))
+            return false;
+        runtime.envFiles = [envFile, ...runtime.envFiles];
+        return true;
+    }
+    runtime.envFiles = [envFile];
+    return true;
+}
+function remoteMcpRuntimeEnv() {
+    return {
+        JISHU_KB_MCP_HTTP: "1",
+        JISHU_KB_MCP_ENDPOINT: "/mcp",
+        JISHU_KB_MCP_PROFILE: "openclaw",
+        JISHU_KB_MCP_PATH_UPLOAD: "0",
+        JISHU_KB_MCP_MAX_UPLOAD_BYTES: String(30 * 1024 * 1024),
+        JISHU_KB_MCP_MAX_RAW_CHARS: "12000",
+    };
+}
+function ensureRemoteMcpRuntime(instanceId) {
+    ensurePrivateDirs(instanceId);
+    const meta = getInstance(instanceId);
+    const runtime = meta?.runtime && typeof meta.runtime === "object"
+        ? { ...meta.runtime }
+        : {};
+    const env = runtime.env && typeof runtime.env === "object"
+        ? { ...runtime.env }
+        : {};
+    const secretEnv = remoteMcpSecretEnvFile(instanceId);
+    const existingSecret = parseEnvFile(secretEnv);
+    const migratedEnvToken = typeof env[REMOTE_MCP_AUTH_ENV] === "string"
+        ? env[REMOTE_MCP_AUTH_ENV].trim()
+        : "";
+    const token = existingSecret[REMOTE_MCP_AUTH_ENV]?.trim()
+        || migratedEnvToken
+        || randomBytes(32).toString("base64url");
+    updateEnvFile(secretEnv, { [REMOTE_MCP_AUTH_ENV]: token });
+    try {
+        chmodSync(secretEnv, 0o600);
+    }
+    catch { /* best effort; updateEnvFile already writes secret mode */ }
+    let changed = false;
+    const setEnv = (key, value) => {
+        if (env[key] !== value) {
+            env[key] = value;
+            changed = true;
+        }
+    };
+    for (const [key, value] of Object.entries(remoteMcpRuntimeEnv())) {
+        setEnv(key, value);
+    }
+    if (REMOTE_MCP_AUTH_ENV in env) {
+        delete env[REMOTE_MCP_AUTH_ENV];
+        changed = true;
+    }
+    runtime.env = env;
+    if (ensureRuntimeEnvFile(runtime, secretEnv)) {
+        changed = true;
+    }
+    if (changed) {
+        updateInstanceMeta(instanceId, { runtime });
+    }
+    return token;
+}
 async function baseUrlForInstance(instanceId) {
     const port = getPrimaryHostPort(instanceId);
     const host = await getHostForAppPort(instanceId, port);
@@ -86,10 +164,14 @@ async function readResponsePreview(response) {
 function httpErrorDetail(response, detail) {
     return `HTTP ${response.status}${detail ? `: ${detail}` : ""}`;
 }
-export async function ensureDefaultKb(baseUrl) {
+function bearerHeaders(authToken) {
+    const token = authToken.trim();
+    return token ? { authorization: `Bearer ${token}` } : {};
+}
+export async function ensureDefaultKb(baseUrl, authToken = "") {
     const response = await fetch(`${baseUrl}/api/kb`, {
         method: "POST",
-        headers: { "content-type": "application/json" },
+        headers: { "content-type": "application/json", ...bearerHeaders(authToken) },
         body: JSON.stringify({ id: DEFAULT_KB_ID, name: "默认知识库" }),
         signal: AbortSignal.timeout(10_000),
     });
@@ -98,7 +180,7 @@ export async function ensureDefaultKb(baseUrl) {
         throw new Error(`Jishu KB default KB create failed: ${httpErrorDetail(response, createDetail)}`);
     }
     const verifyResponse = await fetch(`${baseUrl}/api/kb/${encodeURIComponent(DEFAULT_KB_ID)}/documents`, {
-        headers: { accept: "application/json" },
+        headers: { accept: "application/json", ...bearerHeaders(authToken) },
         signal: AbortSignal.timeout(10_000),
     });
     if (verifyResponse.ok)
@@ -110,10 +192,16 @@ export async function ensureDefaultKb(baseUrl) {
     throw new Error(`Jishu KB default KB '${DEFAULT_KB_ID}' is not usable after startup: ` +
         `${createSummary}; documents endpoint returned ${httpErrorDetail(verifyResponse, verifyDetail)}`);
 }
-function writeProviderCredentials(baseUrl) {
+function writeProviderCredentials(instanceId, baseUrl, token = "") {
     const path = providerCredentialsFile();
+    const mcpAuthToken = token || ensureRemoteMcpRuntime(instanceId);
     mkdirSync(dirname(path), { recursive: true });
-    writeFileSync(path, JSON.stringify({ baseUrl, kbId: DEFAULT_KB_ID }, null, 2) + "\n", { mode: 0o600 });
+    writeFileSync(path, JSON.stringify({
+        baseUrl,
+        kbId: DEFAULT_KB_ID,
+        dataDir: dataDir(instanceId),
+        mcpAuthToken,
+    }, null, 2) + "\n", { mode: 0o600 });
     chmodSync(path, 0o600);
 }
 class JishuKbIntegration {
@@ -147,11 +235,13 @@ class JishuKbIntegration {
         onBeforeStart: async ({ instanceId }) => {
             ensurePrivateDirs(instanceId);
             patchRuntimeFrameAncestors(instanceId);
+            ensureRemoteMcpRuntime(instanceId);
         },
         onAfterStart: async ({ instanceId }) => {
             const baseUrl = await waitForHealth(() => baseUrlForInstance(instanceId));
-            await ensureDefaultKb(baseUrl);
-            writeProviderCredentials(baseUrl);
+            const token = ensureRemoteMcpRuntime(instanceId);
+            await ensureDefaultKb(baseUrl, token);
+            writeProviderCredentials(instanceId, baseUrl, token);
         },
     };
     async buildRuntime(instanceId) {
@@ -168,6 +258,27 @@ class JishuKbIntegration {
     async getRuntimeVersion(_instanceId) {
         return { integrationKind: "jishukb", ref: JISHUKB_IMAGE, mode: "baseline" };
     }
+    async buildRuntimeContribution(instanceId) {
+        const secretEnv = remoteMcpSecretEnvFile(instanceId);
+        ensureRemoteMcpRuntime(instanceId);
+        const templates = [];
+        if (existsSync(secretEnv)) {
+            templates.push({
+                DestPath: REMOTE_MCP_TEMPLATE_DEST,
+                Envvars: true,
+                EmbeddedTmpl: readFileSync(secretEnv, "utf-8"),
+                ChangeMode: "restart",
+            });
+        }
+        return {
+            tasks: {
+                [this.nomadTaskName]: {
+                    env: remoteMcpRuntimeEnv(),
+                    ...(templates.length > 0 ? { templates } : {}),
+                },
+            },
+        };
+    }
     async getConfigMeta(_instanceId) {
         throw new Error("Jishu KB does not expose a Core-managed config editor");
     }

package/dist/services/integrations/jishukb/integration.js.map

@@ -1 +1 @@
-{"version":3,"file":"integration.js","sourceRoot":"","sources":["../../../../src/services/integrations/jishukb/integration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"integration.js","sourceRoot":"","sources":["../../../../src/services/integrations/jishukb/integration.ts"],"names":[],"mappings":"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"}

package/dist/services/integrations/openclaw/integration.d.ts

@@ -37,7 +37,7 @@
  */
 import type { FastifyInstance } from "fastify";
 import { type InstallResult } from "../../setup/setup-manager.js";
-import type { AppIntegrationHooks, AppIntegrationManifest, AppIntegrationKind, BrowserConsumerActivitySummary, CapabilityProfile, ConfigDocument, InstanceConfigMeta, PairingApproveInput, AppIntegration, IntegrationConnectionApplyArgs, IntegrationConnectionSideEffectArgs, IntegrationConnectionUnapplyArgs, PublicProxyDescriptor, RuntimeSpec, RuntimeVersionInfo } from "../types.js";
+import type { AppIntegrationHooks, AppIntegrationManifest, AppIntegrationKind, BrowserConsumerActivitySummary, CapabilityProfile, ConfigDocument, InstanceConfigMeta, PairingApproveInput, AppIntegration, IntegrationConnectionSideEffectArgs, PublicProxyDescriptor, RuntimeSpec, RuntimeVersionInfo } from "../types.js";
 import type { RuntimeContribution } from "../../runtime/workload-types.js";
 export declare const OPENCLAW_DEFAULT_CONTAINER_PORT = 18789;
 export declare const OPENCLAW_PREFERRED_HOST_PORT = 18789;
@@ -244,7 +244,17 @@ export declare function resolveJishukbDefaultKbIdForOpenClaw(baseUrl: string, co
  * covered by a focused unit test without standing up the full start hook.
  */
 export declare function wipeKbShimDir(integrationHome: string, which: "anythingllm" | "jishukb"): void;
-export declare function patchToolsMdKbHint(workspaceDir: string, mode: "install" | "remove", provider?: Exclude<KbProviderTag, null>, mcporterCommand?: string, instanceId?: string, mediaInboundRoot?: string): void;
+export declare function patchToolsMdKbHint(workspaceDir: string, mode: "install" | "remove" | "unavailable", provider?: Exclude<KbProviderTag, null>, mcporterCommand?: string, instanceId?: string, mediaInboundRoot?: string, unavailableReason?: string): void;
+export declare function patchToolsMdKbUnavailableHint(workspaceDir: string, reason?: string): void;
+/**
+ * Inject or remove the Immich MCP usage contract in TOOLS.md.
+ *
+ * Immich is registered through OpenClaw's native `mcp.servers` config, so the
+ * model receives standard tool schemas and calls them directly. This section
+ * only supplies product behavior and safety guidance; it must not teach the
+ * model to shell out through mcporter.
+ */
+export declare function patchToolsMdImmichHint(workspaceDir: string, mode: "install" | "remove", serverName?: string): void;
 /**
  * Patch the session fence bug in OpenClaw >= 5.19 by replacing the
  * `eventMayReachTranscriptWriters` function in the minified bundle.
@@ -318,9 +328,8 @@ declare class OpenClawIntegration implements AppIntegration {
      * 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 the OpenClaw mcporter helper).
+     * Browser / LLM wiring needs its own config-shape mapping
+     * (browser → tools.browser, llm → models.providers).
      *
      * The write goes through `saveNativeConfig` which preserves relevant fields
      * from the existing canonical on-disk config, so user-managed plugin entries (e.g.
@@ -332,13 +341,18 @@ declare class OpenClawIntegration implements AppIntegration {
      * dist bundle).
      */
     applyConnectionEnv(instanceId: string, env: Record<string, string>): Promise<void>;
-    applyConnectionBinding(args: IntegrationConnectionApplyArgs): Promise<void>;
-    unapplyConnectionBinding(args: IntegrationConnectionUnapplyArgs): Promise<void>;
     listConnectionSideEffectFiles(args: IntegrationConnectionSideEffectArgs): string[];
     resolveBin(): string;
     getSystemVersion(): string;
     resolveAgentHome(instanceId: string): string;
     summarizeRecentBrowserSession(instanceId: string): BrowserConsumerActivitySummary;
+    syncImmichMcpForAllInstances(): Promise<{
+        updated: string[];
+        skipped: Array<{
+            instanceId: string;
+            error: string;
+        }>;
+    }>;
     /** Env vars OpenClaw's CLI needs when backup-manager runs it as a subprocess. */
     buildCliEnv(instanceId: string): Record<string, string>;
     /**