opencode-gitlab-dap 1.16.3 → 1.16.4

package/dist/index.js

@@ -3848,6 +3848,10 @@ async function listSnippetFiles(instanceUrl, token, projectId, snippetId) {
 }
 
 // src/tools/skill-tools.ts
+import { writeFileSync as writeFileSync2, mkdirSync, chmodSync } from "fs";
+import { join as join3, dirname } from "path";
+
+// src/tools/skill-helpers.ts
 import { execSync } from "child_process";
 import {
   mkdtempSync,
@@ -3856,172 +3860,66 @@ import {
   readdirSync,
   statSync,
   writeFileSync,
-  mkdirSync,
-  existsSync,
-  chmodSync
+  existsSync
 } from "fs";
-import { join as join2, dirname } from "path";
+import { join as join2 } from "path";
 import { tmpdir } from "os";
 import { gzipSync, gunzipSync } from "zlib";
-var z6 = tool6.schema;
 var PREFIX2 = "agents";
 var SKILLS_PREFIX = `${PREFIX2}/skills`;
 var DRAFTS_PREFIX = `${PREFIX2}/skills-drafts`;
-var SKILLS_INDEX = `${SKILLS_PREFIX}/_registry`;
-var DRAFTS_INDEX = `${DRAFTS_PREFIX}/_registry`;
-var PROJECT_ID_DESC2 = "Project path from git remote";
-function resolveScope2(args) {
-  if (args.scope === "groups" && args.group_id) {
-    return { scope: "groups", id: args.group_id };
-  }
-  return { scope: "projects", id: args.project_id };
-}
-function validateProjectId2(projectId) {
-  if (!projectId.includes("/")) {
-    return `Invalid project_id "${projectId}". Must be the full project path containing at least one slash (e.g., "my-group/my-project"), not just the project name.`;
-  }
-  return null;
-}
-function parseIndex(content) {
-  const entries = [];
-  const blocks = content.split(/^## /m).filter(Boolean);
-  for (const block of blocks) {
-    const lines = block.trim().split("\n");
-    const name = lines[0].trim();
-    if (!name) continue;
-    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, snippetId, draft: false });
-  }
-  return entries;
-}
-function formatIndex(entries) {
-  return entries.map((e) => {
-    let block = `## ${e.name}
-${e.description}`;
-    if (e.source) block += `
-Source: ${e.source}`;
-    if (e.snippetId) block += `
-Snippet: ${e.snippetId}`;
-    return block;
-  }).join("\n\n");
-}
-async function readIndex(instanceUrl, token, scope, id, indexSlug) {
-  try {
-    const page = await getWikiPage(instanceUrl, token, scope, id, indexSlug);
-    return parseIndex(page.content);
-  } catch {
-    return [];
-  }
-}
-async function sleep2(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-async function writeIndex(instanceUrl, token, scope, id, indexSlug, entries) {
-  const content = formatIndex(entries) || "# Skills Registry";
-  for (let attempt = 0; attempt < 3; attempt++) {
-    try {
-      await updateWikiPage(instanceUrl, token, scope, id, indexSlug, content);
-      return;
-    } catch (updateErr) {
-      const msg = updateErr.message ?? "";
-      if (msg.includes("not found") || msg.includes("404")) {
-        await createWikiPage(instanceUrl, token, scope, id, indexSlug, content);
-        return;
-      }
-      if (attempt < 2) {
-        await sleep2(1e3 * (attempt + 1));
-        continue;
-      }
-      throw updateErr;
-    }
+var EMPTY_FILE_SENTINEL = "__EMPTY_FILE__";
+function parseFrontmatter(content) {
+  const match = content.match(/^---\s*\n([\s\S]*?)\n---\s*\n([\s\S]*)$/);
+  if (!match) return { meta: {}, body: content };
+  const meta = {};
+  for (const line of match[1].split("\n")) {
+    const [key, ...rest] = line.split(":");
+    const val = rest.join(":").trim();
+    if (!key || !val) continue;
+    const k = key.trim();
+    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] };
 }
-async function upsertIndexEntry(instanceUrl, token, scope, id, indexSlug, entry) {
-  const entries = await readIndex(instanceUrl, token, scope, id, indexSlug);
-  const idx = entries.findIndex((e) => e.name === entry.name);
-  if (idx >= 0) {
-    entries[idx] = entry;
-  } else {
-    entries.push(entry);
-  }
-  await writeIndex(instanceUrl, token, scope, id, indexSlug, entries);
+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;
 }
-async function removeIndexEntry(instanceUrl, token, scope, id, indexSlug, name) {
-  const entries = await readIndex(instanceUrl, token, scope, id, indexSlug);
-  const filtered = entries.filter((e) => e.name !== name);
-  if (filtered.length !== entries.length) {
-    await writeIndex(instanceUrl, token, scope, id, indexSlug, filtered);
-  }
+function extractSkillNameFromSlug(slug, prefix) {
+  if (!slug.startsWith(prefix + "/") || !slug.endsWith("/SKILL")) return null;
+  const middle = slug.slice(prefix.length + 1, -"/SKILL".length);
+  return middle && !middle.includes("/") ? middle : null;
 }
-async function upsertPage(instanceUrl, token, scope, id, slug, content) {
-  for (let attempt = 0; attempt < 3; attempt++) {
-    try {
-      await updateWikiPage(instanceUrl, token, scope, id, slug, content);
-      return;
-    } catch (updateErr) {
-      const msg = updateErr.message ?? "";
-      if (msg.includes("not found") || msg.includes("404")) {
-        try {
-          await createWikiPage(instanceUrl, token, scope, id, slug, content);
-          return;
-        } catch (createErr) {
-          if (attempt < 2 && (createErr.message?.includes("Duplicate") || createErr.message?.includes("reference"))) {
-            await sleep2(1e3 * (attempt + 1));
-            continue;
-          }
-          throw createErr;
-        }
-      }
-      if (attempt < 2) {
-        await sleep2(1e3 * (attempt + 1));
-        continue;
-      }
-      throw updateErr;
-    }
-  }
+function isMarkdownFile(path) {
+  return path === "SKILL.md" || path.endsWith(".md") || path.endsWith(".markdown");
 }
-var EMPTY_FILE_SENTINEL = "__EMPTY_FILE__";
 function packFiles(files) {
   const manifest = files.map((f) => ({
     path: f.path,
     content: f.content.trim() ? f.content : EMPTY_FILE_SENTINEL
   }));
-  const json = JSON.stringify(manifest);
-  return gzipSync(Buffer.from(json, "utf-8")).toString("base64");
+  return gzipSync(Buffer.from(JSON.stringify(manifest), "utf-8")).toString("base64");
 }
 function unpackFiles(packed) {
   const json = gunzipSync(Buffer.from(packed, "base64")).toString("utf-8");
-  const manifest = JSON.parse(json);
-  return manifest.map((f) => ({
+  return JSON.parse(json).map((f) => ({
     path: f.path,
     content: f.content === EMPTY_FILE_SENTINEL ? "" : f.content
   }));
 }
-function isMarkdownFile(path) {
-  return path === "SKILL.md" || path.endsWith(".md") || path.endsWith(".markdown");
-}
-function isAgentsGitignored(dir) {
+function ensureGitignore(dir) {
   try {
     execSync("git check-ignore -q .agents", { cwd: dir, stdio: "pipe" });
-    return true;
+    return;
   } catch {
-    return false;
   }
-}
-function ensureGitignore(dir) {
-  if (isAgentsGitignored(dir)) return;
   const gitignorePath = join2(dir, ".gitignore");
   if (existsSync(gitignorePath)) {
     const content = readFileSync2(gitignorePath, "utf-8");
@@ -4074,10 +3972,9 @@ function downloadSkillFromSkillsSh(identifier) {
     if (dirs.length === 0) return null;
     const skillName = dirs[0];
     const skillDir = join2(agentsDir, skillName);
-    const skillMd = join2(skillDir, "SKILL.md");
     let mainContent;
     try {
-      mainContent = readFileSync2(skillMd, "utf-8");
+      mainContent = readFileSync2(join2(skillDir, "SKILL.md"), "utf-8");
     } catch {
       return null;
     }
@@ -4086,8 +3983,7 @@ function downloadSkillFromSkillsSh(identifier) {
     if (descMatch) {
       description = descMatch[1].trim();
     } else {
-      const firstParagraph = mainContent.replace(/^---[\s\S]*?---\s*\n/, "").replace(/^#[^\n]*\n+/, "").split("\n\n")[0].replace(/\n/g, " ").trim();
-      description = firstParagraph.slice(0, 200);
+      description = mainContent.replace(/^---[\s\S]*?---\s*\n/, "").replace(/^#[^\n]*\n+/, "").split("\n\n")[0].replace(/\n/g, " ").trim().slice(0, 200);
     }
     const files = [];
     const walkStack = [{ dir: skillDir, prefix: "" }];
@@ -4116,6 +4012,50 @@ function downloadSkillFromSkillsSh(identifier) {
     }
   }
 }
+
+// src/tools/skill-tools.ts
+var z6 = tool6.schema;
+var PROJECT_ID_DESC2 = "Project path from git remote";
+function resolveScope2(args) {
+  if (args.scope === "groups" && args.group_id) {
+    return { scope: "groups", id: args.group_id };
+  }
+  return { scope: "projects", id: args.project_id };
+}
+function validateProjectId2(projectId) {
+  if (!projectId.includes("/")) {
+    return `Invalid project_id "${projectId}". Must be the full project path containing at least one slash.`;
+  }
+  return null;
+}
+async function upsertPage(instanceUrl, token, scope, id, slug, content) {
+  try {
+    await updateWikiPage(instanceUrl, token, scope, id, slug, content);
+  } catch (err) {
+    if (err.message?.includes("not found") || err.message?.includes("404")) {
+      await createWikiPage(instanceUrl, token, scope, id, slug, content);
+      return;
+    }
+    throw err;
+  }
+}
+async function listSkills(instanceUrl, token, scope, id, prefix) {
+  const pages = await listWikiPages(instanceUrl, token, scope, id, true);
+  const skills = [];
+  for (const page of pages) {
+    const name = extractSkillNameFromSlug(page.slug, prefix);
+    if (!name || !page.content) continue;
+    const { meta } = parseFrontmatter(page.content);
+    skills.push({
+      name: meta.name ?? name,
+      description: meta.description ?? "",
+      source: meta.source,
+      snippetId: meta.snippetId,
+      draft: prefix === DRAFTS_PREFIX
+    });
+  }
+  return skills;
+}
 function makeSkillTools(ctx) {
   function authAndValidate(projectId) {
     const auth = ctx.ensureAuth();
@@ -4126,7 +4066,7 @@ function makeSkillTools(ctx) {
   }
   return {
     gitlab_skill_list: tool6({
-      description: "List available project skills and optionally draft skills.\nSkills define step-by-step procedures for common tasks (e.g., incident retros, debugging, deployments).",
+      description: "List available project skills and optionally draft skills.\nSkills define step-by-step procedures for common tasks.",
       args: {
         project_id: z6.string().describe(PROJECT_ID_DESC2),
         include_drafts: z6.boolean().optional().describe("Also list draft skills (default: false)"),
@@ -4137,12 +4077,16 @@ function makeSkillTools(ctx) {
         const auth = authAndValidate(args.project_id);
         const { scope, id } = resolveScope2(args);
         try {
-          const published = await readIndex(auth.instanceUrl, auth.token, scope, id, SKILLS_INDEX);
+          const published = await listSkills(
+            auth.instanceUrl,
+            auth.token,
+            scope,
+            id,
+            SKILLS_PREFIX
+          );
           let drafts = [];
           if (args.include_drafts) {
-            drafts = (await readIndex(auth.instanceUrl, auth.token, scope, id, DRAFTS_INDEX)).map(
-              (e) => ({ ...e, draft: true })
-            );
+            drafts = await listSkills(auth.instanceUrl, auth.token, scope, id, DRAFTS_PREFIX);
           }
           const all = [...published, ...drafts];
           if (all.length === 0) return "No skills found. Use gitlab_skill_save to create one.";
@@ -4153,18 +4097,17 @@ function makeSkillTools(ctx) {
       }
     }),
     gitlab_skill_load: tool6({
-      description: "Load a specific skill by name.\nSkills contain step-by-step instructions for common tasks.\nChecks published skills first, then falls back to draft skills.\nReturns the SKILL content and lists available reference pages.",
+      description: "Load a specific skill by name.\nChecks published skills first, then falls back to draft skills.\nReturns the SKILL content and lists available reference pages.",
       args: {
         project_id: z6.string().describe(PROJECT_ID_DESC2),
-        name: z6.string().describe('Skill name (e.g., "incident-retro", "helm-rollback")'),
+        name: z6.string().describe('Skill name (e.g., "incident-retro")'),
         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 prefixes = [SKILLS_PREFIX, DRAFTS_PREFIX];
-        for (const prefix of prefixes) {
+        for (const prefix of [SKILLS_PREFIX, DRAFTS_PREFIX]) {
           try {
             const page = await getWikiPage(
               auth.instanceUrl,
@@ -4173,36 +4116,28 @@ function makeSkillTools(ctx) {
               id,
               `${prefix}/${args.name}/SKILL`
             );
+            const { meta, body } = parseFrontmatter(page.content);
+            const isDraft = prefix === DRAFTS_PREFIX;
             const pages = await listWikiPages(auth.instanceUrl, auth.token, scope, id);
             const skillPrefix = `${prefix}/${args.name}/`;
-            const skillSlug = `${prefix}/${args.name}/SKILL`;
-            const refs = pages.filter((p) => p.slug.startsWith(skillPrefix) && p.slug !== skillSlug).map((p) => p.slug.slice(skillPrefix.length));
-            const isDraft = prefix === DRAFTS_PREFIX;
+            const refs = pages.filter(
+              (p) => p.slug.startsWith(skillPrefix) && p.slug !== `${prefix}/${args.name}/SKILL`
+            ).map((p) => p.slug.slice(skillPrefix.length));
             let result = isDraft ? `[DRAFT SKILL]
 
-${page.content}` : page.content;
+${body}` : body;
             if (refs.length > 0) {
               result += `
 
 ---
 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) {
+            if (meta.snippetId) {
               result += `
 
----
-This skill has executable scripts in snippet #${entry.snippetId}.`;
+This skill has executable scripts in snippet #${meta.snippetId}.`;
               result += `
-Run \`gitlab_skill_setup(name="${args.name}")\` to extract them to .agents/skills/${args.name}/ for execution.`;
+Run \`gitlab_skill_setup(name="${args.name}")\` to extract them locally.`;
             }
             return result;
           } catch {
@@ -4213,13 +4148,13 @@ Run \`gitlab_skill_setup(name="${args.name}")\` to extract them to .agents/skill
       }
     }),
     gitlab_skill_save: tool6({
-      description: "Create or update a skill.\nSkills define step-by-step procedures for common tasks.\nUse draft=true for skills that haven't been proven yet.\nUpdates the skill index with the provided description.",
+      description: "Create or update a skill.\nUse draft=true for skills that haven't been proven yet.",
       args: {
         project_id: z6.string().describe(PROJECT_ID_DESC2),
         name: z6.string().describe('Skill name (e.g., "incident-retro")'),
         content: z6.string().describe("Skill content in markdown"),
-        description: z6.string().describe("Short description for the skill index (1-2 sentences)"),
-        draft: z6.boolean().optional().describe("Save as draft skill (default: false)"),
+        description: z6.string().describe("Short description (1-2 sentences)"),
+        draft: z6.boolean().optional().describe("Save as draft (default: false)"),
         scope: z6.enum(["projects", "groups"]).optional().describe("Scope (default: projects)"),
         group_id: z6.string().optional().describe("Group path (required when scope is groups)")
       },
@@ -4227,31 +4162,25 @@ Run \`gitlab_skill_setup(name="${args.name}")\` to extract them to .agents/skill
         const auth = authAndValidate(args.project_id);
         const { scope, id } = resolveScope2(args);
         const prefix = args.draft ? DRAFTS_PREFIX : SKILLS_PREFIX;
-        const indexSlug = args.draft ? DRAFTS_INDEX : SKILLS_INDEX;
         const slug = `${prefix}/${args.name}/SKILL`;
-        const label = args.draft ? "draft " : "";
+        const body = formatFrontmatter(
+          { name: args.name, description: args.description, source: "project" },
+          args.content
+        );
         try {
-          await upsertPage(auth.instanceUrl, auth.token, scope, id, slug, args.content);
-          await upsertIndexEntry(auth.instanceUrl, auth.token, scope, id, indexSlug, {
-            name: args.name,
-            description: args.description,
-            source: "project",
-            draft: !!args.draft
-          });
-          return `Saved ${label}skill: ${args.name}`;
+          await upsertPage(auth.instanceUrl, auth.token, scope, id, slug, body);
+          return `Saved ${args.draft ? "draft " : ""}skill: ${args.name}`;
         } catch (err) {
           return `Error saving skill: ${err.message}`;
         }
       }
     }),
     gitlab_skill_promote: tool6({
-      description: "Promote a skill.\nDefault (target='published'): moves a draft skill to published within the same scope.\nTarget 'group': copies a published project skill to the group wiki, making it available to all projects in the group.",
+      description: "Promote a skill.\nDefault (target='published'): moves a draft to published.\nTarget 'group': moves a project skill to the group wiki.",
       args: {
         project_id: z6.string().describe(PROJECT_ID_DESC2),
         name: z6.string().describe("Skill name to promote"),
-        target: z6.enum(["published", "group"]).optional().describe(
-          'Promotion target: "published" (default, draft\u2192published) or "group" (project\u2192group wiki)'
-        ),
+        target: z6.enum(["published", "group"]).optional().describe('"published" (default) or "group"'),
         group_id: z6.string().optional().describe("Group path (required when target is group)"),
         scope: z6.enum(["projects", "groups"]).optional().describe("Scope (default: projects)")
       },
@@ -4259,9 +4188,7 @@ Run \`gitlab_skill_setup(name="${args.name}")\` to extract them to .agents/skill
         const auth = authAndValidate(args.project_id);
         const promotionTarget = args.target ?? "published";
         if (promotionTarget === "group") {
-          if (!args.group_id) {
-            return 'Error: group_id is required when target is "group".';
-          }
+          if (!args.group_id) return 'Error: group_id is required when target is "group".';
           const projectScope = resolveScope2(args);
           try {
             const pages = await listWikiPages(
@@ -4272,11 +4199,9 @@ Run \`gitlab_skill_setup(name="${args.name}")\` to extract them to .agents/skill
               true
             );
             const skillPrefix = `${SKILLS_PREFIX}/${args.name}/`;
-            const skillPages = pages.filter(
-              (p) => p.slug.startsWith(skillPrefix) && p.content
-            );
+            const skillPages = pages.filter((p) => p.slug.startsWith(skillPrefix) && p.content);
             if (skillPages.length === 0) {
-              return `Skill "${args.name}" not found in project. Use gitlab_skill_list to see available skills.`;
+              return `Skill "${args.name}" not found in project.`;
             }
             for (const page of skillPages) {
               await upsertPage(
@@ -4288,54 +4213,6 @@ Run \`gitlab_skill_setup(name="${args.name}")\` to extract them to .agents/skill
                 page.content
               );
             }
-            const projectIndex = await readIndex(
-              auth.instanceUrl,
-              auth.token,
-              projectScope.scope,
-              projectScope.id,
-              SKILLS_INDEX
-            );
-            const entry = projectIndex.find((e) => e.name === args.name);
-            const description = entry?.description ?? "(promoted from project)";
-            if (entry?.snippetId) {
-              const bundleFiles = await listSnippetFiles(
-                auth.instanceUrl,
-                auth.token,
-                args.project_id,
-                entry.snippetId
-              );
-              for (const bf of bundleFiles) {
-                const raw = await getSnippetFileRaw(
-                  auth.instanceUrl,
-                  auth.token,
-                  args.project_id,
-                  entry.snippetId,
-                  bf.path
-                );
-                await upsertPage(
-                  auth.instanceUrl,
-                  auth.token,
-                  "groups",
-                  args.group_id,
-                  `${SKILLS_PREFIX}/${args.name}/bundle/${bf.path}`,
-                  raw
-                );
-              }
-            }
-            await upsertIndexEntry(
-              auth.instanceUrl,
-              auth.token,
-              "groups",
-              args.group_id,
-              SKILLS_INDEX,
-              {
-                name: args.name,
-                description,
-                source: `project:${args.project_id}`,
-                snippetId: entry?.snippetId,
-                draft: false
-              }
-            );
             for (const page of skillPages) {
               await deleteWikiPage(
                 auth.instanceUrl,
@@ -4345,55 +4222,30 @@ Run \`gitlab_skill_setup(name="${args.name}")\` to extract them to .agents/skill
                 page.slug
               );
             }
-            if (entry?.snippetId) {
-              try {
-                await deleteProjectSnippet(
-                  auth.instanceUrl,
-                  auth.token,
-                  args.project_id,
-                  entry.snippetId
-                );
-              } catch {
-              }
-            }
-            await removeIndexEntry(
-              auth.instanceUrl,
-              auth.token,
-              projectScope.scope,
-              projectScope.id,
-              SKILLS_INDEX,
-              args.name
-            );
-            return `Promoted skill "${args.name}" to group "${args.group_id}". ${skillPages.length} page(s) moved (removed from project).`;
+            return `Promoted skill "${args.name}" to group "${args.group_id}". ${skillPages.length} page(s) moved.`;
           } catch (err) {
             return `Error promoting skill to group: ${err.message}`;
           }
         }
         const { scope, id } = resolveScope2(args);
         try {
-          const pages = await listWikiPages(auth.instanceUrl, auth.token, scope, id, true);
-          const draftPrefix = `${DRAFTS_PREFIX}/${args.name}/`;
-          const draftPages = pages.filter(
-            (p) => p.slug.startsWith(draftPrefix) && p.content
+          const pages = await listWikiPages(
+            auth.instanceUrl,
+            auth.token,
+            scope,
+            id,
+            true
           );
+          const draftPrefix = `${DRAFTS_PREFIX}/${args.name}/`;
+          const draftPages = pages.filter((p) => p.slug.startsWith(draftPrefix) && p.content);
           if (draftPages.length === 0) {
-            return `Draft skill "${args.name}" not found. Use gitlab_skill_list(include_drafts=true) to see available drafts.`;
+            return `Draft skill "${args.name}" not found.`;
           }
-          const draftIndex = await readIndex(auth.instanceUrl, auth.token, scope, id, DRAFTS_INDEX);
-          const entry = draftIndex.find((e) => e.name === args.name);
-          const description = entry?.description ?? "(promoted from draft)";
           for (const page of draftPages) {
             const newSlug = page.slug.replace(DRAFTS_PREFIX, SKILLS_PREFIX);
             await upsertPage(auth.instanceUrl, auth.token, scope, id, newSlug, page.content);
             await deleteWikiPage(auth.instanceUrl, auth.token, scope, id, page.slug);
           }
-          await removeIndexEntry(auth.instanceUrl, auth.token, scope, id, DRAFTS_INDEX, args.name);
-          await upsertIndexEntry(auth.instanceUrl, auth.token, scope, id, SKILLS_INDEX, {
-            name: args.name,
-            description,
-            source: "project",
-            draft: false
-          });
           return `Promoted skill "${args.name}" from draft to published.`;
         } catch (err) {
           return `Error promoting skill: ${err.message}`;
@@ -4401,11 +4253,11 @@ Run \`gitlab_skill_setup(name="${args.name}")\` to extract them to .agents/skill
       }
     }),
     gitlab_skill_discover: tool6({
-      description: "Search for skills in the skills.sh public registry and optionally a group wiki.\nUse gitlab_skill_install to install a discovered skill into your project.\nIMPORTANT: project_id is only needed when searching a group wiki. For skills.sh only, it is optional.",
+      description: "Search for skills in skills.sh and optionally a group wiki.\nUse gitlab_skill_install to install a discovered skill.",
       args: {
-        query: z6.string().describe("Search query (matches skill name and description)"),
-        project_id: z6.string().optional().describe(PROJECT_ID_DESC2 + " Only needed for group wiki search."),
-        group_id: z6.string().optional().describe("Group path to search for shared skills (optional)")
+        query: z6.string().describe("Search query"),
+        project_id: z6.string().optional().describe(PROJECT_ID_DESC2 + " Only needed for group search."),
+        group_id: z6.string().optional().describe("Group path to search")
       },
       execute: async (args) => {
         let auth = null;
@@ -4417,15 +4269,15 @@ Run \`gitlab_skill_setup(name="${args.name}")\` to extract them to .agents/skill
         const sections = [];
         if (args.group_id && auth) {
           try {
-            const entries = await readIndex(
+            const skills = await listSkills(
               auth.instanceUrl,
               auth.token,
               "groups",
               args.group_id,
-              SKILLS_INDEX
+              SKILLS_PREFIX
             );
             const q = args.query.toLowerCase();
-            const matches = entries.filter(
+            const matches = skills.filter(
               (e) => e.name.toLowerCase().includes(q) || e.description.toLowerCase().includes(q)
             );
             if (matches.length > 0) {
@@ -4454,19 +4306,17 @@ Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
           );
         }
         if (sections.length === 0) {
-          return `No skills found matching "${args.query}" in ${args.group_id ? "group wiki or " : ""}skills.sh.`;
+          return `No skills found matching "${args.query}".`;
         }
         return sections.join("\n\n---\n\n");
       }
     }),
     gitlab_skill_install: tool6({
-      description: "Install a skill from a group wiki or skills.sh into the project wiki.\nFor group: copies all skill pages (SKILL + references) from the group.\nFor skills.sh: downloads via npx, extracts SKILL.md and files, writes to wiki.\nUpdates the project skill index with the installed skill.",
+      description: "Install a skill from group wiki or skills.sh into the project wiki.\nMarkdown files go to wiki pages, scripts are bundled in a project snippet.",
       args: {
         project_id: z6.string().describe(PROJECT_ID_DESC2),
-        name: z6.string().describe(
-          'Skill identifier. For group: skill name (e.g., "incident-retro"). For skills.sh: full identifier (e.g., "vercel-labs/agent-skills@nextjs-developer").'
-        ),
-        source: z6.enum(["group", "skills.sh"]).describe('Where to install from: "group" (group wiki) or "skills.sh" (public registry)'),
+        name: z6.string().describe("Skill identifier"),
+        source: z6.enum(["group", "skills.sh"]).describe("Where to install from"),
         group_id: z6.string().optional().describe("Group path (required when source is group)"),
         draft: z6.boolean().optional().describe("Install as draft (default: false)")
       },
@@ -4474,24 +4324,45 @@ Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
         const auth = authAndValidate(args.project_id);
         const projectScope = resolveScope2(args);
         const targetPrefix = args.draft ? DRAFTS_PREFIX : SKILLS_PREFIX;
-        const targetIndex = args.draft ? DRAFTS_INDEX : SKILLS_INDEX;
         if (args.source === "skills.sh") {
           const downloaded = downloadSkillFromSkillsSh(args.name);
           if (!downloaded) {
-            return `Failed to download skill "${args.name}" from skills.sh. Check that the identifier is correct (e.g., "owner/repo@skill-name").`;
+            return `Failed to download skill "${args.name}" from 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 skillBody = formatFrontmatter(
+              {
+                name: downloaded.name,
+                description: downloaded.description,
+                source: `skills.sh:${args.name}`,
+                snippetId
+              },
+              downloaded.content.replace(/^---[\s\S]*?---\s*\n/, "")
+            );
             await upsertPage(
               auth.instanceUrl,
               auth.token,
               projectScope.scope,
               projectScope.id,
               `${targetPrefix}/${downloaded.name}/SKILL`,
-              downloaded.content
+              skillBody
             );
             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}/${file.path.replace(/\.[^.]+$/, "")}`;
               await upsertPage(
@@ -4504,44 +4375,14 @@ Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
               );
               wikiCount++;
             }
-            let snippetId;
-            if (scriptFiles.length > 0) {
-              const packed = packFiles(scriptFiles);
-              const snippet = await createProjectSnippet(
-                auth.instanceUrl,
-                auth.token,
-                args.project_id,
-                `skill:${downloaded.name}`,
-                `Scripts for skill "${downloaded.name}" (${scriptFiles.length} files, installed from skills.sh:${args.name})`,
-                [{ file_path: `${downloaded.name}.bundle`, content: packed }],
-                "private"
-              );
-              snippetId = snippet.id;
-            }
-            await upsertIndexEntry(
-              auth.instanceUrl,
-              auth.token,
-              projectScope.scope,
-              projectScope.id,
-              targetIndex,
-              {
-                name: downloaded.name,
-                description: downloaded.description,
-                source: `skills.sh:${args.name}`,
-                snippetId,
-                draft: !!args.draft
-              }
-            );
             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.`;
+            return `Installed skill "${downloaded.name}" from skills.sh. ${parts.join(", ")}. Use gitlab_skill_setup to extract scripts.`;
           } catch (err) {
-            return `Error installing skill from skills.sh: ${err.message}`;
+            return `Error installing from skills.sh: ${err.message}`;
           }
         }
-        if (!args.group_id) {
-          return 'Error: group_id is required when source is "group".';
-        }
+        if (!args.group_id) return 'Error: group_id is required when source is "group".';
         try {
           const groupPages = await listWikiPages(
             auth.instanceUrl,
@@ -4551,9 +4392,7 @@ Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
             true
           );
           const sourcePrefix = `${SKILLS_PREFIX}/${args.name}/`;
-          const skillPages = groupPages.filter(
-            (p) => p.slug.startsWith(sourcePrefix) && p.content
-          );
+          const skillPages = groupPages.filter((p) => p.slug.startsWith(sourcePrefix) && p.content);
           if (skillPages.length === 0) {
             return `Skill "${args.name}" not found in group "${args.group_id}" wiki.`;
           }
@@ -4568,39 +4407,17 @@ Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
               page.content
             );
           }
-          const groupIndex = await readIndex(
-            auth.instanceUrl,
-            auth.token,
-            "groups",
-            args.group_id,
-            SKILLS_INDEX
-          );
-          const entry = groupIndex.find((e) => e.name === args.name);
-          const description = entry?.description ?? "(installed from group)";
-          await upsertIndexEntry(
-            auth.instanceUrl,
-            auth.token,
-            projectScope.scope,
-            projectScope.id,
-            targetIndex,
-            {
-              name: args.name,
-              description,
-              source: `group:${args.group_id}`,
-              draft: !!args.draft
-            }
-          );
-          return `Installed skill "${args.name}" from group "${args.group_id}". ${skillPages.length} page(s) copied.`;
+          return `Installed skill "${args.name}" from group "${args.group_id}". ${skillPages.length} page(s).`;
         } catch (err) {
-          return `Error installing skill: ${err.message}`;
+          return `Error installing from group: ${err.message}`;
         }
       }
     }),
     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.",
+      description: "Extract a skill to .agents/skills/ for local execution.\nDownloads SKILL.md from wiki and scripts from the associated snippet.\nOpenCode 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"),
+        name: z6.string().describe("Skill name to set up"),
         scope: z6.enum(["projects", "groups"]).optional().describe("Scope (default: projects)"),
         group_id: z6.string().optional().describe("Group path (required when scope is groups)")
       },
@@ -4608,29 +4425,35 @@ Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
         const auth = authAndValidate(args.project_id);
         const { scope, id } = resolveScope2(args);
         const workDir = ctx.getDirectory();
-        const targetDir = join2(workDir, ".agents", "skills", args.name);
+        const targetDir = join3(workDir, ".agents", "skills", args.name);
         try {
-          let skillContent = null;
+          let skillPage = null;
           for (const prefix of [SKILLS_PREFIX, DRAFTS_PREFIX]) {
             try {
-              const page = await getWikiPage(
+              skillPage = 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.`;
+          if (!skillPage) {
+            return `Skill "${args.name}" not found. Use gitlab_skill_list to see available skills.`;
           }
+          const { meta, body } = parseFrontmatter(skillPage.content);
           mkdirSync(targetDir, { recursive: true });
-          writeFileSync(join2(targetDir, "SKILL.md"), skillContent);
-          const pages = await listWikiPages(auth.instanceUrl, auth.token, scope, id, true);
+          writeFileSync2(join3(targetDir, "SKILL.md"), body);
+          const pages = await listWikiPages(
+            auth.instanceUrl,
+            auth.token,
+            scope,
+            id,
+            true
+          );
           let refCount = 0;
           for (const prefix of [SKILLS_PREFIX, DRAFTS_PREFIX]) {
             const skillPagePrefix = `${prefix}/${args.name}/`;
@@ -4639,59 +4462,36 @@ Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
             );
             for (const page of extraPages) {
               const relPath = page.slug.slice(skillPagePrefix.length);
-              const filePath = join2(targetDir, `${relPath}.md`);
+              const filePath = join3(targetDir, `${relPath}.md`);
               mkdirSync(dirname(filePath), { recursive: true });
-              writeFileSync(filePath, page.content);
+              writeFileSync2(filePath, page.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) {
+          if (meta.snippetId) {
             const bundleFiles = await listSnippetFiles(
               auth.instanceUrl,
               auth.token,
               args.project_id,
-              entry.snippetId
+              meta.snippetId
             );
             for (const bf of bundleFiles) {
               const raw = await getSnippetFileRaw(
                 auth.instanceUrl,
                 auth.token,
                 args.project_id,
-                entry.snippetId,
+                meta.snippetId,
                 bf.path
               );
               if (bf.path.endsWith(".bundle")) {
-                const unpacked = unpackFiles(raw);
-                for (const file of unpacked) {
-                  const filePath = join2(targetDir, file.path);
+                for (const file of unpackFiles(raw)) {
+                  const filePath = join3(targetDir, file.path);
                   mkdirSync(dirname(filePath), { recursive: true });
-                  writeFileSync(filePath, file.content);
-                  if (file.path.endsWith(".sh")) {
-                    chmodSync(filePath, 493);
-                  }
+                  writeFileSync2(filePath, file.content);
+                  if (file.path.endsWith(".sh")) chmodSync(filePath, 493);
                   scriptCount++;
                 }
-              } else {
-                const filePath = join2(targetDir, bf.path);
-                mkdirSync(dirname(filePath), { recursive: true });
-                writeFileSync(filePath, raw);
-                scriptCount++;
               }
             }
           }
@@ -4699,18 +4499,18 @@ Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
           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.`;
+          return `Skill "${args.name}" extracted to ${targetDir} (${parts.join(", ")}).`;
         } 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 wiki pages under the skill directory and any associated snippet.\nWiki and snippet git history preserves deleted content.",
+      description: "Delete a skill and its associated snippet.\nRemoves all wiki pages under the skill directory.",
       args: {
         project_id: z6.string().describe(PROJECT_ID_DESC2),
         name: z6.string().describe("Skill name to delete"),
-        draft: z6.boolean().optional().describe("Delete from drafts instead of published (default: false)"),
+        draft: z6.boolean().optional().describe("Delete from drafts (default: false)"),
         scope: z6.enum(["projects", "groups"]).optional().describe("Scope (default: projects)"),
         group_id: z6.string().optional().describe("Group path (required when scope is groups)")
       },
@@ -4718,36 +4518,36 @@ Install: \`gitlab_skill_install(name="${r.identifier}", source="skills.sh")\``
         const auth = authAndValidate(args.project_id);
         const { scope, id } = resolveScope2(args);
         const prefix = args.draft ? DRAFTS_PREFIX : SKILLS_PREFIX;
-        const indexSlug = args.draft ? DRAFTS_INDEX : SKILLS_INDEX;
         const skillPrefix = `${prefix}/${args.name}/`;
         try {
           const pages = await listWikiPages(auth.instanceUrl, auth.token, scope, id);
           const skillPages = pages.filter((p) => p.slug.startsWith(skillPrefix));
           if (skillPages.length === 0) {
-            return `Skill "${args.name}" not found. Use gitlab_skill_list to see available skills.`;
+            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);
           }
-          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) {
+          if (meta.snippetId) {
             try {
               await deleteProjectSnippet(
                 auth.instanceUrl,
                 auth.token,
                 args.project_id,
-                entry.snippetId
+                meta.snippetId
               );
-              snippetDeleted = true;
             } catch {
             }
           }
-          await removeIndexEntry(auth.instanceUrl, auth.token, scope, id, indexSlug, args.name);
-          const parts = [`${skillPages.length} wiki page(s)`];
-          if (snippetDeleted) parts.push("snippet");
-          return `Deleted skill "${args.name}" (${parts.join(" + ")} removed).`;
+          return `Deleted skill "${args.name}" (${skillPages.length} page(s)${meta.snippetId ? " + snippet" : ""}).`;
         } catch (err) {
           return `Error deleting skill: ${err.message}`;
         }