opencode-gitlab-dap 1.16.4 → 1.16.6

package/dist/index.js

@@ -3781,73 +3781,6 @@ ${e.content}`).join("\n\n---\n\n");
 
 // src/tools/skill-tools.ts
 import { tool as tool6 } from "@opencode-ai/plugin";
-
-// src/snippets.ts
-function snippetApi(instanceUrl, token, projectId) {
-  const base = instanceUrl.replace(/\/$/, "");
-  const encoded = typeof projectId === "number" ? projectId : encodeURIComponent(projectId);
-  return {
-    url: `${base}/api/v4/projects/${encoded}/snippets`,
-    headers: {
-      "Content-Type": "application/json",
-      Authorization: `Bearer ${token}`
-    }
-  };
-}
-async function handleResponse2(res) {
-  if (!res.ok) {
-    const text = await res.text();
-    throw new Error(`Snippet API error (${res.status}): ${text}`);
-  }
-  return res.json();
-}
-async function createProjectSnippet(instanceUrl, token, projectId, title, description, files, visibility = "private") {
-  const { url, headers } = snippetApi(instanceUrl, token, projectId);
-  const res = await fetch(url, {
-    method: "POST",
-    headers,
-    body: JSON.stringify({ title, description, visibility, files })
-  });
-  return handleResponse2(res);
-}
-async function deleteProjectSnippet(instanceUrl, token, projectId, snippetId) {
-  const { url, headers } = snippetApi(instanceUrl, token, projectId);
-  const res = await fetch(`${url}/${snippetId}`, { method: "DELETE", headers });
-  if (!res.ok) {
-    const text = await res.text();
-    throw new Error(`Snippet API error (${res.status}): ${text}`);
-  }
-}
-async function getSnippetFileRaw(instanceUrl, token, projectId, snippetId, filePath, ref = "main") {
-  const base = instanceUrl.replace(/\/$/, "");
-  const encoded = typeof projectId === "number" ? projectId : encodeURIComponent(projectId);
-  const encodedPath = encodeURIComponent(filePath);
-  const url = `${base}/api/v4/projects/${encoded}/snippets/${snippetId}/files/${ref}/${encodedPath}/raw`;
-  const res = await fetch(url, { headers: { Authorization: `Bearer ${token}` } });
-  if (!res.ok) {
-    const text = await res.text();
-    throw new Error(`Snippet file API error (${res.status}): ${text}`);
-  }
-  return res.text();
-}
-async function listSnippetFiles(instanceUrl, token, projectId, snippetId) {
-  const base = instanceUrl.replace(/\/$/, "");
-  const encoded = typeof projectId === "number" ? projectId : encodeURIComponent(projectId);
-  const url = `${base}/api/v4/projects/${encoded}/snippets/${snippetId}`;
-  const res = await fetch(url, {
-    headers: { "Content-Type": "application/json", Authorization: `Bearer ${token}` }
-  });
-  const snippet = await handleResponse2(res);
-  if (snippet.files) {
-    return snippet.files.map((f) => ({ path: f.path, raw_url: f.raw_url }));
-  }
-  if (snippet.file_name) {
-    return [{ path: snippet.file_name, raw_url: snippet.raw_url }];
-  }
-  return [];
-}
-
-// src/tools/skill-tools.ts
 import { writeFileSync as writeFileSync2, mkdirSync, chmodSync } from "fs";
 import { join as join3, dirname } from "path";
 
@@ -3881,14 +3814,12 @@ function parseFrontmatter(content) {
     if (k === "name") meta.name = val;
     else if (k === "description") meta.description = val;
     else if (k === "source") meta.source = val;
-    else if (k === "snippet") meta.snippetId = parseInt(val, 10) || void 0;
   }
   return { meta, body: match[2] };
 }
 function formatFrontmatter(meta, body) {
   const lines = ["---", `name: ${meta.name}`, `description: ${meta.description}`];
   if (meta.source) lines.push(`source: ${meta.source}`);
-  if (meta.snippetId) lines.push(`snippet: ${meta.snippetId}`);
   lines.push("---", "");
   return lines.join("\n") + body;
 }
@@ -4046,11 +3977,12 @@ async function listSkills(instanceUrl, token, scope, id, prefix) {
     const name = extractSkillNameFromSlug(page.slug, prefix);
     if (!name || !page.content) continue;
     const { meta } = parseFrontmatter(page.content);
+    const hasBundle = pages.some((p) => p.slug === `${prefix}/${name}/bundle`);
     skills.push({
       name: meta.name ?? name,
       description: meta.description ?? "",
       source: meta.source,
-      snippetId: meta.snippetId,
+      hasScripts: hasBundle,
       draft: prefix === DRAFTS_PREFIX
     });
   }
@@ -4116,7 +4048,7 @@ function makeSkillTools(ctx) {
               id,
               `${prefix}/${args.name}/SKILL`
             );
-            const { meta, body } = parseFrontmatter(page.content);
+            const { body } = parseFrontmatter(page.content);
             const isDraft = prefix === DRAFTS_PREFIX;
             const pages = await listWikiPages(auth.instanceUrl, auth.token, scope, id);
             const skillPrefix = `${prefix}/${args.name}/`;
@@ -4132,10 +4064,11 @@ ${body}` : body;
 ---
 Available references: ${refs.join(", ")}`;
             }
-            if (meta.snippetId) {
+            const hasBundle = refs.some((r) => r === "bundle");
+            if (hasBundle) {
               result += `
 
-This skill has executable scripts in snippet #${meta.snippetId}.`;
+This skill has executable scripts.`;
               result += `
 Run \`gitlab_skill_setup(name="${args.name}")\` to extract them locally.`;
             }
@@ -4332,25 +4265,12 @@ Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
           try {
             const mdFiles = downloaded.files.filter((f) => isMarkdownFile(f.path));
             const scriptFiles = downloaded.files.filter((f) => !isMarkdownFile(f.path));
-            let snippetId;
-            if (scriptFiles.length > 0) {
-              const snippet = await createProjectSnippet(
-                auth.instanceUrl,
-                auth.token,
-                args.project_id,
-                `skill:${downloaded.name}`,
-                `Scripts for skill "${downloaded.name}"`,
-                [{ file_path: `${downloaded.name}.bundle`, content: packFiles(scriptFiles) }],
-                "private"
-              );
-              snippetId = snippet.id;
-            }
+            const hasBundle = scriptFiles.length > 0;
             const skillBody = formatFrontmatter(
               {
                 name: downloaded.name,
                 description: downloaded.description,
-                source: `skills.sh:${args.name}`,
-                snippetId
+                source: `skills.sh:${args.name}`
               },
               downloaded.content.replace(/^---[\s\S]*?---\s*\n/, "")
             );
@@ -4375,8 +4295,20 @@ Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
               );
               wikiCount++;
             }
+            if (hasBundle) {
+              const bundleSlug = `${targetPrefix}/${downloaded.name}/bundle`;
+              await upsertPage(
+                auth.instanceUrl,
+                auth.token,
+                projectScope.scope,
+                projectScope.id,
+                bundleSlug,
+                packFiles(scriptFiles)
+              );
+              wikiCount++;
+            }
             const parts = [`${wikiCount} wiki page(s)`];
-            if (snippetId) parts.push(`snippet #${snippetId} with ${scriptFiles.length} script(s)`);
+            if (hasBundle) parts.push(`${scriptFiles.length} bundled script(s)`);
             return `Installed skill "${downloaded.name}" from skills.sh. ${parts.join(", ")}. Use gitlab_skill_setup to extract scripts.`;
           } catch (err) {
             return `Error installing from skills.sh: ${err.message}`;
@@ -4444,7 +4376,7 @@ Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
           if (!skillPage) {
             return `Skill "${args.name}" not found. Use gitlab_skill_list to see available skills.`;
           }
-          const { meta, body } = parseFrontmatter(skillPage.content);
+          const { body } = parseFrontmatter(skillPage.content);
           mkdirSync(targetDir, { recursive: true });
           writeFileSync2(join3(targetDir, "SKILL.md"), body);
           const pages = await listWikiPages(
@@ -4469,23 +4401,17 @@ Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
             }
           }
           let scriptCount = 0;
-          if (meta.snippetId) {
-            const bundleFiles = await listSnippetFiles(
-              auth.instanceUrl,
-              auth.token,
-              args.project_id,
-              meta.snippetId
-            );
-            for (const bf of bundleFiles) {
-              const raw = await getSnippetFileRaw(
+          for (const prefix of [SKILLS_PREFIX, DRAFTS_PREFIX]) {
+            try {
+              const bundlePage = await getWikiPage(
                 auth.instanceUrl,
                 auth.token,
-                args.project_id,
-                meta.snippetId,
-                bf.path
+                scope,
+                id,
+                `${prefix}/${args.name}/bundle`
               );
-              if (bf.path.endsWith(".bundle")) {
-                for (const file of unpackFiles(raw)) {
+              if (bundlePage.content) {
+                for (const file of unpackFiles(bundlePage.content)) {
                   const filePath = join3(targetDir, file.path);
                   mkdirSync(dirname(filePath), { recursive: true });
                   writeFileSync2(filePath, file.content);
@@ -4493,6 +4419,8 @@ Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
                   scriptCount++;
                 }
               }
+              break;
+            } catch {
             }
           }
           ensureGitignore(workDir);
@@ -4525,29 +4453,10 @@ Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
           if (skillPages.length === 0) {
             return `Skill "${args.name}" not found.`;
           }
-          const skillPage = await getWikiPage(
-            auth.instanceUrl,
-            auth.token,
-            scope,
-            id,
-            `${prefix}/${args.name}/SKILL`
-          );
-          const { meta } = parseFrontmatter(skillPage.content);
           for (const page of skillPages) {
             await deleteWikiPage(auth.instanceUrl, auth.token, scope, id, page.slug);
           }
-          if (meta.snippetId) {
-            try {
-              await deleteProjectSnippet(
-                auth.instanceUrl,
-                auth.token,
-                args.project_id,
-                meta.snippetId
-              );
-            } catch {
-            }
-          }
-          return `Deleted skill "${args.name}" (${skillPages.length} page(s)${meta.snippetId ? " + snippet" : ""}).`;
+          return `Deleted skill "${args.name}" (${skillPages.length} page(s) removed).`;
         } catch (err) {
           return `Error deleting skill: ${err.message}`;
         }