refactor(plugins): log rejected bundle commands

steipete · cxbAsDev · web-flow · commit aa9a4856d44e · 2026-07-18T21:38:32.000+01:00
Co-authored-by: 陈宪彪0668000387 &lt;chen.xianbiao@xydigit.com&gt;
diff --git a/src/plugins/bundle-commands.test.ts b/src/plugins/bundle-commands.test.ts
@@ -8,6 +8,11 @@ import type { PluginManifestRecord } from "./manifest-registry.js";
 
 const mocks = vi.hoisted(() => ({
   plugins: [] as PluginManifestRecord[],
+  warn: vi.fn(),
+}));
+
+vi.mock("../logging/subsystem.js", () => ({
+  createSubsystemLogger: () => ({ warn: mocks.warn }),
 }));
 
 vi.mock("./manifest-registry.js", () => ({
@@ -36,6 +41,7 @@ const tempDirs: string[] = [];
 
 afterEach(async () => {
   mocks.plugins = [];
+  mocks.warn.mockReset();
   await Promise.all(tempDirs.splice(0).map((dir) => fs.rm(dir, { recursive: true, force: true })));
 });
 
@@ -225,11 +231,10 @@ describe("loadEnabledClaudeBundleCommands", () => {
     );
   });
 
-  it("skips oversized bundle command markdown files exceeding 1 MB and continues loading siblings", async () => {
+  it("warns and skips oversized bundle commands without dropping siblings", async () => {
     const homeDir = await createTempDir("openclaw-bundle-commands-oversized-");
     const workspaceDir = await createTempDir("openclaw-bundle-commands-oversized-ws-");
 
-    // Write a normal command file alongside an oversized one
     await writeClaudeBundleCommandFixture({
       homeDir,
       pluginId: "oversized-test",
@@ -246,38 +251,25 @@ describe("loadEnabledClaudeBundleCommands", () => {
       ],
     });
 
-    // Create the oversized command file (> 1 MB) alongside the normal one
     const pluginRoot = resolveBundlePluginRoot(homeDir, "oversized-test");
     const oversizedFilePath = path.join(pluginRoot, "commands", "oversized.md");
     await fs.mkdir(path.dirname(oversizedFilePath), { recursive: true });
     const oversizedContent = Buffer.alloc(1 * 1024 * 1024 + 1, "x");
     await fs.writeFile(oversizedFilePath, oversizedContent);
 
-    // Suppress console.warn for this test
-    const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
-
-    try {
-      const commands = loadEnabledClaudeBundleCommands({
-        workspaceDir,
-        cfg: {
-          plugins: {
-            entries: { "oversized-test": { enabled: true } },
-          },
+    const commands = loadEnabledClaudeBundleCommands({
+      workspaceDir,
+      cfg: {
+        plugins: {
+          entries: { "oversized-test": { enabled: true } },
         },
-      });
-
-      // Normal command still loads
-      const names = commands.map((entry) => entry.rawName);
-      expect(names).toContain("normal");
-      expect(names).not.toContain("oversized");
+      },
+    });
 
-      // console.warn was called with the oversized file path
-      expect(warnSpy).toHaveBeenCalledWith(
-        expect.stringContaining("[bundle-commands]"),
-        expect.any(String),
-      );
-    } finally {
-      warnSpy.mockRestore();
-    }
+    expect(commands.map((entry) => entry.rawName)).toEqual(["normal"]);
+    expect(mocks.warn).toHaveBeenCalledOnce();
+    const warning = String(mocks.warn.mock.calls[0]?.[0]);
+    expect(warning).toContain(oversizedFilePath);
+    expect(warning).toContain("1048576");
   });
 });
diff --git a/src/plugins/bundle-commands.ts b/src/plugins/bundle-commands.ts
@@ -10,8 +10,10 @@ import {
   stripFrontmatterBlock,
 } from "../../packages/markdown-core/src/frontmatter.js";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
+import { formatErrorMessage } from "../infra/errors.js";
 import { readRootJsonObjectSync } from "../infra/json-files.js";
 import { readRegularFileSync } from "../infra/regular-file.js";
+import { createSubsystemLogger } from "../logging/subsystem.js";
 import { isPathInsideWithRealpath } from "../security/scan-paths.js";
 import { parseFrontmatterBool } from "../shared/frontmatter.js";
 import {
@@ -35,6 +37,7 @@ type ClaudeBundleCommandSpec = {
 };
 
 const BUNDLE_COMMAND_MAX_BYTES = 1 * 1024 * 1024;
+const log = createSubsystemLogger("plugins/bundle-commands");
 
 function readClaudeBundleManifest(rootDir: string): Record<string, unknown> {
   const result = readRootJsonObjectSync({
@@ -110,11 +113,8 @@ function loadBundleCommandsFromRoot(params: {
         "utf-8",
       );
     } catch (error) {
-      // Log oversized or unreadable command files so upgrades do not
-      // silently remove installed commands; still skip and continue.
-      console.warn(
-        `[bundle-commands] skipping unreadable command file: ${filePath}`,
-        error instanceof Error ? error.message : String(error),
+      log.warn(
+        `skipping unreadable bundle command file ${filePath}: ${formatErrorMessage(error)}`,
       );
       continue;
     }
