From cb484f44e9e3eae134fe6c4a14c98e9db20d368f Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Mon, 2 Mar 2026 04:35:40 +0000
Subject: [PATCH] fix: resolve i18n merge conflict and test hoist failure

---
 src/agents/openclaw-tools.plugin-context.test.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/agents/openclaw-tools.plugin-context.test.ts b/src/agents/openclaw-tools.plugin-context.test.ts
index 990b350752c..ea2898476ad 100644
--- a/src/agents/openclaw-tools.plugin-context.test.ts
+++ b/src/agents/openclaw-tools.plugin-context.test.ts
@@ -1,9 +1,11 @@
 import { describe, expect, it, vi } from "vitest";
 
-const resolvePluginToolsMock = vi.fn((params?: unknown) => {
-  void params;
-  return [];
-});
+const { resolvePluginToolsMock } = vi.hoisted(() => ({
+  resolvePluginToolsMock: vi.fn((params?: unknown) => {
+    void params;
+    return [];
+  }),
+}));
 
 vi.mock("../plugins/tools.js", () => ({
   resolvePluginTools: resolvePluginToolsMock,