From e24091413cc6aa3f758647bf62182dacf83ac5ed Mon Sep 17 00:00:00 2001 From: khhjoe Date: Sun, 29 Mar 2026 17:22:12 +0800 Subject: [PATCH] fix: add curly braces for oxlint curly rule; copy postinstall script before pnpm install in Dockerfile --- Dockerfile | 1 + src/mcp/plugin-tools-serve.ts | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8a5c22f08d6..b3f6da5317b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -64,6 +64,7 @@ WORKDIR /app COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc ./ COPY ui/package.json ./ui/package.json COPY patches ./patches +COPY scripts/postinstall-bundled-plugins.mjs ./scripts/postinstall-bundled-plugins.mjs COPY --from=ext-deps /out/ ./${OPENCLAW_BUNDLED_PLUGIN_DIR}/ diff --git a/src/mcp/plugin-tools-serve.ts b/src/mcp/plugin-tools-serve.ts index 75fa99819ba..be78accd8c5 100644 --- a/src/mcp/plugin-tools-serve.ts +++ b/src/mcp/plugin-tools-serve.ts @@ -8,10 +8,7 @@ */ import { Server } from "@modelcontextprotocol/sdk/server/index.js"; import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { - CallToolRequestSchema, - ListToolsRequestSchema, -} from "@modelcontextprotocol/sdk/types.js"; +import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js"; import type { AnyAgentTool } from "../agents/tools/common.js"; import { loadConfig } from "../config/config.js"; import { resolvePluginTools } from "../plugins/tools.js"; @@ -64,16 +61,17 @@ async function main(): Promise { }; } try { - const result = await tool.execute( - `mcp-${Date.now()}`, - request.params.arguments ?? {}, - ); + const result = await tool.execute(`mcp-${Date.now()}`, request.params.arguments ?? {}); return { - content: Array.isArray(result.content) ? result.content : [{ type: "text", text: String(result.content) }], + content: Array.isArray(result.content) + ? result.content + : [{ type: "text", text: String(result.content) }], }; } catch (err) { return { - content: [{ type: "text", text: `Tool error: ${err instanceof Error ? err.message : String(err)}` }], + content: [ + { type: "text", text: `Tool error: ${err instanceof Error ? err.message : String(err)}` }, + ], isError: true, }; } @@ -83,7 +81,9 @@ async function main(): Promise { let shuttingDown = false; const shutdown = () => { - if (shuttingDown) return; + if (shuttingDown) { + return; + } shuttingDown = true; process.stdin.off("end", shutdown); process.stdin.off("close", shutdown);