fix: preserve ClawHub base URL path prefix

ThiagoCAltoe · clawsweeper[bot] · commit 31808d220b35 · 2026-05-19T20:45:40.000Z
diff --git a/src/infra/clawhub.test.ts b/src/infra/clawhub.test.ts
@@ -59,6 +59,7 @@ describe("clawhub helpers", () => {
   const originalHome = process.env.HOME;
 
   afterEach(() => {
+    delete process.env.OPENCLAW_CLAWHUB_URL;
     delete process.env.OPENCLAW_CLAWHUB_TOKEN;
     delete process.env.CLAWHUB_TOKEN;
     delete process.env.CLAWHUB_AUTH_TOKEN;
@@ -275,6 +276,29 @@ describe("clawhub helpers", () => {
     await expect(searchClawHubSkills({ query: "calendar", fetchImpl })).resolves.toStrictEqual([]);
   });
 
+  it("preserves the configured ClawHub base URL path prefix", async () => {
+    process.env.OPENCLAW_CLAWHUB_URL = "https://internal.example.com/clawhub";
+    let requestedUrl = "";
+
+    await expect(
+      searchClawHubSkills({
+        query: "calendar",
+        fetchImpl: async (input) => {
+          requestedUrl = input instanceof Request ? input.url : String(input);
+          return new Response(JSON.stringify({ results: [] }), {
+            status: 200,
+            headers: { "content-type": "application/json" },
+          });
+        },
+      }),
+    ).resolves.toStrictEqual([]);
+
+    const url = new URL(requestedUrl);
+    expect(url.origin).toBe("https://internal.example.com");
+    expect(url.pathname).toBe("/clawhub/api/v1/search");
+    expect(url.searchParams.get("q")).toBe("calendar");
+  });
+
   it("fetches typed package readiness reports", async () => {
     let requestedUrl = "";
     await expect(
diff --git a/src/infra/clawhub.ts b/src/infra/clawhub.ts
@@ -551,7 +551,10 @@ function normalizeCalVerCorrectionForPluginApi(pluginApiVersion: string): string
 }
 
 function buildUrl(params: Pick<ClawHubRequestParams, "baseUrl" | "path" | "search">): URL {
-  const url = new URL(params.path, `${normalizeBaseUrl(params.baseUrl)}/`);
+  const url = new URL(`${normalizeBaseUrl(params.baseUrl)}/`);
+  const basePath = url.pathname.replace(/\/+$/, "");
+  const requestPath = params.path.startsWith("/") ? params.path : `/${params.path}`;
+  url.pathname = `${basePath}${requestPath}`;
   for (const [key, value] of Object.entries(params.search ?? {})) {
     if (!value) {
       continue;
