fix: extract ref from raw_url to fetch multi-file snippet content

The multi-file content endpoint requires a ref to construct the API URL.
Using default_branch caused 404s on instances where the default branch
is not "main"; fetching raw_url directly also 404s because it is a web
URL, not an API endpoint.

GitLab embeds the correct ref inside each file's raw_url
(.../raw/{ref}/{path}). Parse it out and pass it to the REST API
endpoint (/snippets/{id}/files/{ref}/{path}/raw) instead.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: renanliberato

index.ts

@@ -8380,19 +8380,35 @@ async function getSnippetRawContent(
 }
 
 /**
- * Get the raw content of a specific file inside a (possibly multi-file) snippet.
+ * Get the raw content of a specific file inside a multi-file snippet.
+ * Extracts the ref from the file's raw_url (e.g. .../raw/main/file.md) so we
+ * never have to guess it, then hits the proper REST API endpoint.
  */
 async function getSnippetFileRawContent(
   projectId: string | undefined,
   snippetId: number,
-  ref: string,
+  rawUrl: string,
   filePath: string
 ): Promise<string> {
-  const url = `${getSnippetsEndpoint(projectId)}/${snippetId}/files/${encodeURIComponent(ref)}/${encodeURIComponent(filePath)}/raw`;
+  // Anchor on the unambiguous /snippets/{id}/raw/ segment so branch names and
+  // file paths containing the word "raw" don't confuse the extraction.
+  const rawMarker = `/snippets/${snippetId}/raw/`;
+  const decoded = decodeURIComponent(new URL(rawUrl).pathname);
+  const markerIdx = decoded.indexOf(rawMarker);
+  if (markerIdx === -1) {
+    throw new Error(`Cannot extract ref from snippet file raw_url: ${rawUrl}`);
+  }
+  const afterRaw = decoded.slice(markerIdx + rawMarker.length); // "{ref}/{filePath}"
+  const fileStart = afterRaw.lastIndexOf("/" + filePath);
+  if (fileStart === -1) {
+    throw new Error(`Cannot locate file path "${filePath}" in snippet file raw_url: ${rawUrl}`);
+  }
+  const ref = afterRaw.slice(0, fileStart);
+  const encodedRef = ref.split("/").map(encodeURIComponent).join("/");
+  const encodedPath = filePath.split("/").map(encodeURIComponent).join("/");
+  const url = `${getSnippetsEndpoint(projectId)}/${snippetId}/files/${encodedRef}/${encodedPath}/raw`;
   const response = await fetch(url, { ...getFetchConfig() });
-
   await handleGitLabError(response);
-
   return await response.text();
 }
 
@@ -10554,17 +10570,11 @@ async function handleToolCall(params: any) {
         if (args.include_content) {
           const files = snippet.files ?? [];
           if (files.length > 1) {
-            const ref = snippet.default_branch ?? "main";
             result.files = await Promise.all(
-              files.map(async f => ({
-                ...f,
-                content: await getSnippetFileRawContent(
-                  args.project_id,
-                  args.snippet_id,
-                  ref,
-                  f.path
-                ),
-              }))
+              files.map(async f => {
+                if (!f.raw_url) throw new Error(`Snippet file "${f.path}" has no raw_url`);
+                return { ...f, content: await getSnippetFileRawContent(args.project_id, args.snippet_id, f.raw_url, f.path) };
+              })
             );
           } else {
             result.content = await getSnippetRawContent(

schemas.ts

@@ -3492,7 +3492,6 @@ export const GitLabSnippetSchema = z
     file_name: z.string().nullable().optional(),
     files: z.array(GitLabSnippetFileSchema).optional(),
     project_id: z.number().nullable().optional(),
-    default_branch: z.string().optional(),
   })
   .passthrough();
 

test/test-snippets.ts

@@ -8,6 +8,7 @@ const TEST_PROJECT_ID = "456";
 const TEST_PROJECT_SNIPPET_ID = 42;
 const TEST_PERSONAL_SNIPPET_ID = 99;
 const TEST_MULTIFILE_SNIPPET_ID = 77;
+const TEST_MASTER_SNIPPET_ID = 88;
 const RAW_CONTENT = "console.log('hello world');\n";
 const MULTIFILE_A_CONTENT = "# policy\nbody A\n";
 const MULTIFILE_B_CONTENT = "# instructions\nbody B\n";
@@ -191,10 +192,15 @@ describe("snippet tools", () => {
             id: TEST_MULTIFILE_SNIPPET_ID,
             title: "Multi-file snippet",
             file_name: null,
-            default_branch: "main",
             files: [
-              { path: "policy.md", raw_url: "https://gitlab.example.com/raw/policy" },
-              { path: "instructions.md", raw_url: "https://gitlab.example.com/raw/instructions" },
+              {
+                path: "policy.md",
+                raw_url: `${mockGitLabUrl}/-/snippets/${TEST_MULTIFILE_SNIPPET_ID}/raw/main/policy.md`,
+              },
+              {
+                path: "instructions.md",
+                raw_url: `${mockGitLabUrl}/-/snippets/${TEST_MULTIFILE_SNIPPET_ID}/raw/main/instructions.md`,
+              },
             ],
           })
         );
@@ -204,19 +210,53 @@ describe("snippet tools", () => {
     mockGitLab.addMockHandler(
       "get",
       `/projects/${TEST_PROJECT_ID}/snippets/${TEST_MULTIFILE_SNIPPET_ID}/files/main/policy.md/raw`,
-      (_req, res) => {
-        res.type("text/plain").send(MULTIFILE_A_CONTENT);
-      }
+      (_req, res) => { res.type("text/plain").send(MULTIFILE_A_CONTENT); }
     );
 
     mockGitLab.addMockHandler(
       "get",
       `/projects/${TEST_PROJECT_ID}/snippets/${TEST_MULTIFILE_SNIPPET_ID}/files/main/instructions.md/raw`,
+      (_req, res) => { res.type("text/plain").send(MULTIFILE_B_CONTENT); }
+    );
+
+    // --- Snippet with master default branch (raw_url contains "master") ---
+    mockGitLab.addMockHandler(
+      "get",
+      `/projects/${TEST_PROJECT_ID}/snippets/${TEST_MASTER_SNIPPET_ID}`,
       (_req, res) => {
-        res.type("text/plain").send(MULTIFILE_B_CONTENT);
+        // No default_branch field — simulates an instance where it's absent
+        res.json(
+          buildSnippet({
+            id: TEST_MASTER_SNIPPET_ID,
+            title: "Master branch snippet",
+            file_name: null,
+            files: [
+              {
+                path: "policy.md",
+                raw_url: `${mockGitLabUrl}/-/snippets/${TEST_MASTER_SNIPPET_ID}/raw/master/policy.md`,
+              },
+              {
+                path: "instructions.md",
+                raw_url: `${mockGitLabUrl}/-/snippets/${TEST_MASTER_SNIPPET_ID}/raw/master/instructions.md`,
+              },
+            ],
+          })
+        );
       }
     );
 
+    mockGitLab.addMockHandler(
+      "get",
+      `/projects/${TEST_PROJECT_ID}/snippets/${TEST_MASTER_SNIPPET_ID}/files/master/policy.md/raw`,
+      (_req, res) => { res.type("text/plain").send(MULTIFILE_A_CONTENT); }
+    );
+
+    mockGitLab.addMockHandler(
+      "get",
+      `/projects/${TEST_PROJECT_ID}/snippets/${TEST_MASTER_SNIPPET_ID}/files/master/instructions.md/raw`,
+      (_req, res) => { res.type("text/plain").send(MULTIFILE_B_CONTENT); }
+    );
+
     // --- Personal snippet handlers ---
     mockGitLab.addMockHandler("get", "/snippets", (_req, res) => {
       res.json([
@@ -431,6 +471,26 @@ describe("snippet tools", () => {
     });
   });
 
+  test("get_snippet fetches multi-file content from raw_url regardless of branch name", async () => {
+    const result = await callTool(
+      "get_snippet",
+      {
+        project_id: TEST_PROJECT_ID,
+        snippet_id: TEST_MASTER_SNIPPET_ID,
+        include_content: true,
+      },
+      env()
+    );
+
+    assert.strictEqual(result.id, TEST_MASTER_SNIPPET_ID);
+    assert.ok(Array.isArray(result.files));
+    assert.strictEqual(result.files.length, 2);
+    assert.strictEqual(result.files[0].path, "policy.md");
+    assert.strictEqual(result.files[0].content, MULTIFILE_A_CONTENT);
+    assert.strictEqual(result.files[1].path, "instructions.md");
+    assert.strictEqual(result.files[1].content, MULTIFILE_B_CONTENT);
+  });
+
   test("create_snippet supports multi-file snippets via files[]", async () => {
     const result = await callTool(
       "create_snippet",