opencode-gitlab-dap 1.14.2 → 1.15.1

package/dist/index.js

@@ -3778,9 +3778,86 @@ ${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 { execSync } from "child_process";
-import { mkdtempSync, readFileSync as readFileSync2, rmSync, readdirSync, statSync } from "fs";
-import { join as join2 } from "path";
+import {
+  mkdtempSync,
+  readFileSync as readFileSync2,
+  rmSync,
+  readdirSync,
+  statSync,
+  writeFileSync,
+  mkdirSync,
+  existsSync,
+  chmodSync
+} from "fs";
+import { join as join2, dirname } from "path";
 import { tmpdir } from "os";
 var z6 = tool6.schema;
 var PREFIX2 = "agents";
@@ -3811,14 +3888,17 @@ function parseIndex(content) {
     const rest = lines.slice(1).join("\n").trim();
     const descLines = [];
     let source;
+    let snippetId;
     for (const line of rest.split("\n")) {
       if (line.startsWith("Source:")) {
         source = line.slice(7).trim();
+      } else if (line.startsWith("Snippet:")) {
+        snippetId = parseInt(line.slice(8).trim(), 10) || void 0;
       } else if (line.trim()) {
         descLines.push(line);
       }
     }
-    entries.push({ name, description: descLines.join("\n"), source, draft: false });
+    entries.push({ name, description: descLines.join("\n"), source, snippetId, draft: false });
   }
   return entries;
 }
@@ -3828,6 +3908,8 @@ function formatIndex(entries) {
 ${e.description}`;
     if (e.source) block += `
 Source: ${e.source}`;
+    if (e.snippetId) block += `
+Snippet: ${e.snippetId}`;
     return block;
   }).join("\n\n");
 }
@@ -3948,6 +4030,33 @@ async function upsertPage(instanceUrl, token, scope, id, slug, content) {
     await createWikiPage(instanceUrl, token, scope, id, slug, content);
   }
 }
+function isMarkdownFile(path) {
+  return path === "SKILL.md" || path.endsWith(".md") || path.endsWith(".markdown");
+}
+function isAgentsGitignored(dir) {
+  try {
+    execSync("git check-ignore -q .agents", { cwd: dir, stdio: "pipe" });
+    return true;
+  } catch {
+    return false;
+  }
+}
+function ensureGitignore(dir) {
+  if (isAgentsGitignored(dir)) return;
+  const gitignorePath = join2(dir, ".gitignore");
+  if (existsSync(gitignorePath)) {
+    const content = readFileSync2(gitignorePath, "utf-8");
+    writeFileSync(
+      gitignorePath,
+      content.trimEnd() + "\n\n# Agent skills cache (managed by opencode-gitlab-dap)\n.agents/\n"
+    );
+  } else {
+    writeFileSync(
+      gitignorePath,
+      "# Agent skills cache (managed by opencode-gitlab-dap)\n.agents/\n"
+    );
+  }
+}
 function searchSkillsSh(query) {
   try {
     const raw = execSync(`npx skills find ${JSON.stringify(query)}`, {
@@ -4107,8 +4216,23 @@ ${page.content}` : page.content;
 
 ---
 Available references: ${refs.join(", ")}`;
+            }
+            const indexSlug = isDraft ? DRAFTS_INDEX : SKILLS_INDEX;
+            const indexEntries = await readIndex(
+              auth.instanceUrl,
+              auth.token,
+              scope,
+              id,
+              indexSlug
+            );
+            const entry = indexEntries.find((e) => e.name === args.name);
+            if (entry?.snippetId) {
+              result += `
+
+---
+This skill has executable scripts in snippet #${entry.snippetId}.`;
               result += `
-Load with: gitlab_skill_load_reference(name="${args.name}", reference="<name>")`;
+Run \`gitlab_skill_setup(name="${args.name}")\` to extract them to .agents/skills/${args.name}/ for execution.`;
             }
             return result;
           } catch {
@@ -4266,29 +4390,42 @@ Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
           if (!downloaded) {
             return `Failed to download skill "${args.name}" from skills.sh. Check that the identifier is correct (e.g., "owner/repo@skill-name").`;
           }
-          const skillSlug = `${targetPrefix}/${downloaded.name}/SKILL`;
           try {
             await upsertPage(
               auth.instanceUrl,
               auth.token,
               projectScope.scope,
               projectScope.id,
-              skillSlug,
+              `${targetPrefix}/${downloaded.name}/SKILL`,
               downloaded.content
             );
-            let fileCount = 1;
-            for (const file of downloaded.files) {
-              const ext = file.path.replace(/\.[^.]+$/, "");
-              const refSlug = `${targetPrefix}/${downloaded.name}/${ext}`;
+            let wikiCount = 1;
+            const mdFiles = downloaded.files.filter((f) => isMarkdownFile(f.path));
+            const scriptFiles = downloaded.files.filter((f) => !isMarkdownFile(f.path));
+            for (const file of mdFiles) {
+              const slug = `${targetPrefix}/${downloaded.name}/references/${file.path.replace(/\.[^.]+$/, "")}`;
               await upsertPage(
                 auth.instanceUrl,
                 auth.token,
                 projectScope.scope,
                 projectScope.id,
-                refSlug,
+                slug,
                 file.content
               );
-              fileCount++;
+              wikiCount++;
+            }
+            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}" (installed from skills.sh:${args.name})`,
+                scriptFiles.map((f) => ({ file_path: f.path, content: f.content })),
+                "private"
+              );
+              snippetId = snippet.id;
             }
             await upsertIndexEntry(
               auth.instanceUrl,
@@ -4300,10 +4437,13 @@ Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
                 name: downloaded.name,
                 description: downloaded.description,
                 source: `skills.sh:${args.name}`,
+                snippetId,
                 draft: !!args.draft
               }
             );
-            return `Installed skill "${downloaded.name}" from skills.sh. ${fileCount} page(s) written.`;
+            const parts = [`${wikiCount} wiki page(s)`];
+            if (snippetId) parts.push(`snippet #${snippetId} with ${scriptFiles.length} script(s)`);
+            return `Installed skill "${downloaded.name}" from skills.sh. ${parts.join(", ")}. Use gitlab_skill_setup to extract scripts to disk.`;
           } catch (err) {
             return `Error installing skill from skills.sh: ${err.message}`;
           }
@@ -4365,8 +4505,106 @@ Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
         }
       }
     }),
+    gitlab_skill_setup: tool6({
+      description: "Extract a skill to the local .agents/skills/ directory for execution.\nDownloads SKILL.md from wiki and script files from the associated snippet.\nWrites to .agents/skills/<name>/ and ensures .agents/ is in .gitignore.\nAfter setup, OpenCode will auto-discover the skill from the local directory.",
+      args: {
+        project_id: z6.string().describe(PROJECT_ID_DESC2),
+        name: z6.string().describe("Skill name to set up locally"),
+        scope: z6.enum(["projects", "groups"]).optional().describe("Scope (default: projects)"),
+        group_id: z6.string().optional().describe("Group path (required when scope is groups)")
+      },
+      execute: async (args) => {
+        const auth = authAndValidate(args.project_id);
+        const { scope, id } = resolveScope2(args);
+        const targetDir = join2(process.cwd(), ".agents", "skills", args.name);
+        try {
+          let skillContent = null;
+          for (const prefix of [SKILLS_PREFIX, DRAFTS_PREFIX]) {
+            try {
+              const page = await getWikiPage(
+                auth.instanceUrl,
+                auth.token,
+                scope,
+                id,
+                `${prefix}/${args.name}/SKILL`
+              );
+              skillContent = page.content;
+              break;
+            } catch {
+            }
+          }
+          if (!skillContent) {
+            return `Skill "${args.name}" not found in wiki. Use gitlab_skill_list to see available skills.`;
+          }
+          mkdirSync(targetDir, { recursive: true });
+          writeFileSync(join2(targetDir, "SKILL.md"), skillContent);
+          const pages = await listWikiPages(auth.instanceUrl, auth.token, scope, id, true);
+          let refCount = 0;
+          for (const prefix of [SKILLS_PREFIX, DRAFTS_PREFIX]) {
+            const refPrefix = `${prefix}/${args.name}/references/`;
+            const refPages = pages.filter(
+              (p) => p.slug.startsWith(refPrefix) && p.content
+            );
+            for (const ref of refPages) {
+              const refName = ref.slug.slice(refPrefix.length);
+              const refDir = join2(targetDir, "references");
+              mkdirSync(refDir, { recursive: true });
+              writeFileSync(join2(refDir, `${refName}.md`), ref.content);
+              refCount++;
+            }
+          }
+          let scriptCount = 0;
+          const indexEntries = await readIndex(
+            auth.instanceUrl,
+            auth.token,
+            scope,
+            id,
+            SKILLS_INDEX
+          );
+          const draftsEntries = await readIndex(
+            auth.instanceUrl,
+            auth.token,
+            scope,
+            id,
+            DRAFTS_INDEX
+          );
+          const entry = [...indexEntries, ...draftsEntries].find((e) => e.name === args.name);
+          if (entry?.snippetId) {
+            const files = await listSnippetFiles(
+              auth.instanceUrl,
+              auth.token,
+              args.project_id,
+              entry.snippetId
+            );
+            for (const file of files) {
+              const filePath = join2(targetDir, file.path);
+              mkdirSync(dirname(filePath), { recursive: true });
+              const content = await getSnippetFileRaw(
+                auth.instanceUrl,
+                auth.token,
+                args.project_id,
+                entry.snippetId,
+                file.path
+              );
+              writeFileSync(filePath, content);
+              if (file.path.endsWith(".sh")) {
+                chmodSync(filePath, 493);
+              }
+              scriptCount++;
+            }
+          }
+          ensureGitignore(process.cwd());
+          const parts = ["SKILL.md"];
+          if (refCount > 0) parts.push(`${refCount} reference(s)`);
+          if (scriptCount > 0) parts.push(`${scriptCount} script(s)`);
+          return `Skill "${args.name}" extracted to ${targetDir} (${parts.join(", ")}). OpenCode will auto-discover it on next session.`;
+        } catch (err) {
+          return `Error setting up skill: ${err.message}`;
+        }
+      }
+    }),
     gitlab_skill_delete: tool6({
-      description: "Delete a skill and remove it from the index.\nRemoves all pages under the skill directory (SKILL + references).\nWiki git history preserves deleted content.",
+      description: "Delete a skill and remove it from the index.\nRemoves all wiki pages under the skill directory and any associated snippet.\nWiki and snippet git history preserves deleted content.",
       args: {
         project_id: z6.string().describe(PROJECT_ID_DESC2),
         name: z6.string().describe("Skill name to delete"),
@@ -4389,8 +4627,25 @@ Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
           for (const page of skillPages) {
             await deleteWikiPage(auth.instanceUrl, auth.token, scope, id, page.slug);
           }
+          const indexEntries = await readIndex(auth.instanceUrl, auth.token, scope, id, indexSlug);
+          const entry = indexEntries.find((e) => e.name === args.name);
+          let snippetDeleted = false;
+          if (entry?.snippetId) {
+            try {
+              await deleteProjectSnippet(
+                auth.instanceUrl,
+                auth.token,
+                args.project_id,
+                entry.snippetId
+              );
+              snippetDeleted = true;
+            } catch {
+            }
+          }
           await removeIndexEntry(auth.instanceUrl, auth.token, scope, id, indexSlug, args.name);
-          return `Deleted skill "${args.name}" (${skillPages.length} page(s) removed).`;
+          const parts = [`${skillPages.length} wiki page(s)`];
+          if (snippetDeleted) parts.push("snippet");
+          return `Deleted skill "${args.name}" (${parts.join(" + ")} removed).`;
         } catch (err) {
           return `Error deleting skill: ${err.message}`;
         }