@gethmy/mcp 2.5.1 → 2.5.4

package/dist/cli.js

@@ -1315,6 +1315,17 @@ class HarmonyApiClient {
     }
     throw lastError || new Error("Request failed after retries");
   }
+  async fetchSkillsVersion() {
+    return this.request("GET", "/skills/version");
+  }
+  async fetchSkill(name) {
+    return this.request("GET", `/skills/${encodeURIComponent(name)}`);
+  }
+  async recordSkillInvocation(name) {
+    try {
+      await this.request("POST", "/skills/telemetry", { name });
+    } catch {}
+  }
   async listWorkspaces() {
     return this.request("GET", "/workspaces");
   }
@@ -3546,6 +3557,22 @@ var RESOURCES = [
     mimeType: "application/json"
   }
 ];
+async function listResourcesDynamic(deps) {
+  if (!deps.isConfigured())
+    return RESOURCES;
+  try {
+    const versionInfo = await deps.getClient().fetchSkillsVersion();
+    const skillResources = versionInfo.skills.filter((name) => name !== "hmy-update-check").map((name) => ({
+      uri: `harmony://skills/${name}`,
+      name: `Skill: ${name}`,
+      description: `Harmony skill (SKILL.md) — version ${versionInfo.version}`,
+      mimeType: "text/markdown"
+    }));
+    return [...RESOURCES, ...skillResources];
+  } catch {
+    return RESOURCES;
+  }
+}
 async function runEndSessionPipeline(client3, _deps, cardId, sessionStatus) {
   try {
     const { card } = await client3.getCard(cardId);
@@ -3613,7 +3640,7 @@ function registerHandlers(server, deps) {
     }
   });
   server.setRequestHandler(ListResourcesRequestSchema, async () => ({
-    resources: RESOURCES
+    resources: await listResourcesDynamic(deps)
   }));
   server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
     const { uri } = request.params;
@@ -3632,6 +3659,26 @@ function registerHandlers(server, deps) {
         ]
       };
     }
+    const SKILL_URI_RE = /^harmony:\/\/skills\/([a-z0-9][a-z0-9-]*[a-z0-9])$/;
+    const skillMatch = uri.match(SKILL_URI_RE);
+    if (skillMatch) {
+      const name = skillMatch[1];
+      if (!deps.isConfigured()) {
+        throw new Error(`Cannot read skill "${name}": Harmony MCP server is not configured. Run \`hmy-mcp setup\`.`);
+      }
+      const client3 = deps.getClient();
+      client3.recordSkillInvocation(name);
+      const fetched = await client3.fetchSkill(name);
+      return {
+        contents: [
+          {
+            uri,
+            mimeType: "text/markdown",
+            text: fetched.content
+          }
+        ]
+      };
+    }
     throw new Error(`Unknown resource: ${uri}`);
   });
 }
@@ -4739,8 +4786,6 @@ class HarmonyMCPServer {
 // src/skills.ts
 import { existsSync as existsSync3, mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "node:fs";
 import { dirname } from "node:path";
-var SKILLS_VERSION = "4";
-var VERSION_MARKER_PREFIX = "<!-- skills-version:";
 var HARMONY_WORKFLOW_PROMPT = `# Harmony Card Workflow
 
 Start work on a Harmony card. Card reference: $ARGUMENTS
@@ -4816,421 +4861,44 @@ If pausing: \`harmony_end_agent_session\` with \`status: "paused"\`
 
 **AI:** \`harmony_generate_prompt\`, \`harmony_process_command\`
 `;
-var HMY_SKILL_CONTENT = `# Harmony Card Workflow
-
-User input: $ARGUMENTS
-
-## 0. Detect Intent
-
-Parse \`$ARGUMENTS\` to determine what the user wants:
-
-| Pattern | Intent | Go to |
-|---|---|---|
-| \`create ...\` or \`new ...\` | **Create** a new card | Step A |
-| \`#42\`, \`42\`, UUID, or card name (no action verb) | **Work on** an existing card | Step B |
-| \`move #42 to Done\`, \`update #42 ...\`, \`assign #42 ...\` | **Quick action** on a card | Step C |
-| \`show #42\`, \`view #42\`, \`status #42\` | **View** card details | Step D |
-
-If ambiguous, ask the user what they'd like to do.
-
----
-
-## Step A: Create Card
-
-Create a card without starting work on it.
-
-1. Parse the title and any details from the arguments (e.g., \`create Add dark mode toggle\` → title: "Add dark mode toggle")
-2. Call \`harmony_create_card\` with:
-   - \`title\`: extracted title
-   - \`description\`: if the user provided details beyond the title
-   - \`priority\`, \`columnId\`, \`assigneeId\`: only if explicitly specified
-3. Show the created card: title, short ID, column, and a link if available.
-4. **Stop here.** Do not start an agent session or begin implementation.
-
----
-
-## Step B: Work on Existing Card
-
-Start work on a Harmony card.
-
-### B1. Find & Fetch Card
-
-Parse the reference and fetch the card:
-- \`#42\` or \`42\` → \`harmony_get_card_by_short_id\` with \`shortId: 42\`
-- UUID → \`harmony_get_card\` with \`cardId\`
-- Name/text → \`harmony_search_cards\` with \`query\`
-
-### B2. Start Agent Session
-
-Call \`harmony_start_agent_session\` with:
-- \`cardId\`: Card UUID
-- \`agentIdentifier\`: Your agent identifier
-- \`agentName\`: Your agent name
-- \`currentTask\`: A specific description of the first thing you'll do (e.g., "Exploring codebase to understand auth flow"), NOT a generic phrase like "Analyzing card requirements"
-- \`moveToColumn\`: "In Progress"
-- \`addLabels\`: ["agent"]
-
-This single call moves the card, adds the label, auto-assigns, and starts the session.
-
-### B3. Generate Work Prompt
-
-Call \`harmony_generate_prompt\` with:
-- \`cardId\` or \`shortId\` (+ \`projectId\` if using shortId)
-- \`variant\`: Select based on task:
-  - \`"execute"\` (default) → Clear tasks, bug fixes, well-defined work
-  - \`"analysis"\` → Complex features, unclear requirements
-  - \`"draft"\` → Medium complexity, want feedback first
-
-The generated prompt provides role framing, focus areas, subtasks, linked cards, and suggested outputs.
-
-### B4. Display Card Summary
-
-Show the user: Card title, short ID, role, priority, labels, due date, description, and subtasks.
-
-### B5. Implement Solution
-
-Work on the card following the generated prompt's guidance.
-
-**REQUIRED: Update progress at each milestone** by calling \`harmony_update_agent_progress\`. This is not optional — the card's live status badge depends on these updates.
-
-| Milestone | \`progressPercent\` | Example \`currentTask\` |
-|---|---|---|
-| After exploring codebase & understanding requirements | 20 | "Reading auth middleware and identifying affected routes" |
-| When starting implementation | 50 | "Refactoring token validation in auth.ts" |
-| When moving to testing/verification | 80 | "Running build and verifying changes compile" |
-| When done, before ending session | 100 | "All changes complete, ready for review" |
-
-Always set \`currentTask\` to a specific description of what you're actually doing — never leave it as "Analyzing card requirements" or other generic text.
-
-### B6. Complete Work
-
-When finished:
-1. \`harmony_end_agent_session\` with \`status: "completed"\`, \`progressPercent: 100\`, \`moveToColumn: "Review"\`
-2. Summarize accomplishments
-
-If pausing: \`harmony_end_agent_session\` with \`status: "paused"\`
-
----
-
-## Step C: Quick Action
-
-Fetch the card first (same as B1), then perform the requested action:
-- **Move:** \`harmony_move_card\` with target column
-- **Update:** \`harmony_update_card\` with changed fields
-- **Assign:** \`harmony_assign_card\`
-- **Label:** \`harmony_add_label_to_card\` / \`harmony_remove_label_from_card\`
-- **Archive:** \`harmony_archive_card\`
-
-Show confirmation and stop. Do not start an agent session.
-
----
-
-## Step D: View Card
-
-Fetch the card (same as B1) and display: title, short ID, column, priority, labels, assignee, due date, description, subtasks, and links.
-
-Do not start an agent session.
-
----
-
-## Step E: Auto-Detect Card for Implementation Tasks
-
-**IMPORTANT:** This step applies when you are about to implement a plan, feature, or fix
-that was NOT started via /hmy. Before writing any code, check if the work maps to an
-existing Harmony card.
-
-### When to run this check
-- User says "implement this plan", "build this feature", "fix this bug" (without /hmy)
-- You are about to execute a plan file
-- Skip if: the user already started with /hmy, or no Harmony MCP tools are available
-
-### Detection steps
-1. Call \`harmony_search_cards\` with keywords from the plan title or task description
-2. If a card matches (same feature/fix described), tell the user:
-   "This maps to card #N — starting a session to track progress."
-3. Call \`harmony_start_agent_session\` with \`moveToColumn: "In Progress"\`, \`addLabels: ["agent"]\`
-4. Track progress with \`harmony_update_agent_progress\` at milestones
-5. When done, call \`harmony_end_agent_session\` with \`status: "completed"\`, \`moveToColumn: "Review"\`
-
-### If no match
-Proceed normally without a session. No action needed.
-
----
-
-## Key Tools Reference
-
-**Cards:** \`harmony_get_card\`, \`harmony_get_card_by_short_id\`, \`harmony_search_cards\`, \`harmony_create_card\`, \`harmony_update_card\`, \`harmony_move_card\`, \`harmony_delete_card\`, \`harmony_assign_card\`
-
-**Subtasks:** \`harmony_create_subtask\`, \`harmony_toggle_subtask\`, \`harmony_delete_subtask\`
-
-**Labels:** \`harmony_add_label_to_card\`, \`harmony_remove_label_from_card\`, \`harmony_create_label\`
-
-**Links:** \`harmony_add_link_to_card\`, \`harmony_remove_link_from_card\`, \`harmony_get_card_links\`
-
-**Board:** \`harmony_get_board\`, \`harmony_list_projects\`, \`harmony_get_context\`, \`harmony_set_project_context\`
-
-**Sessions:** \`harmony_start_agent_session\`, \`harmony_update_agent_progress\`, \`harmony_end_agent_session\`, \`harmony_get_agent_session\`
-
-**AI:** \`harmony_generate_prompt\`, \`harmony_process_command\`
+function buildSkillFile(skill) {
+  if (skill.skillVersion !== undefined && !hasMetadataVersion(skill.content)) {
+    return injectMetadataVersion(skill.content, skill.skillVersion);
+  }
+  return skill.content;
+}
+function hasMetadataVersion(content) {
+  return parseSkillVersion(content) !== null;
+}
+function injectMetadataVersion(content, version) {
+  const fmMatch = content.match(/^(---\n[\s\S]*?\n)(---\n)([\s\S]*)$/);
+  if (!fmMatch)
+    return content;
+  const [, head, close, body] = fmMatch;
+  const block = `metadata:
+  version: "${version}"
 `;
-var HMY_PLAN_CONTENT = `# Harmony Plan Workflow
-
-Create a new plan or work on an existing one. Argument: $ARGUMENTS
-
-## Step 1 — Detect Intent
-
-Parse \`$ARGUMENTS\` to determine the workflow:
-
-- **UUID** (contains dashes, 36 chars) → call \`harmony_get_plan\` with \`planId\` directly → **Step 2A**
-- **\`#N\`** (short ID) → call \`harmony_get_card_by_short_id\` to get the card, then \`harmony_get_plan\` with \`cardId\` → **Step 2A**
-- **Text** (anything else) → call \`harmony_list_plans\` with \`search\` set to the text
-  - If **one match** → use it → **Step 2A**
-  - If **multiple matches** → list them with title, status, phase, and updated date. Ask the user to pick one using \`AskUserQuestion\` → **Step 2A**
-  - If **no matches** → ask user: "No existing plans found for '$ARGUMENTS'. Would you like to create a new plan on this topic?" → **Step 2B**
-- **Empty / vague topic** → **Step 2B** (create new plan)
-
----
-
-## Step 2A — Work on Existing Plan
-
-### 2A.1 — Analyze & Display
-
-Once you have the plan ID, call \`harmony_get_plan\` to fetch the full plan with tasks. Show a structured summary:
-
-\\\`\\\`\\\`
-## [Plan Title]
-**Status:** draft/active/archived | **Phase:** plan/execute/verify/done
-**Tasks:** N total (X pending, Y in_progress, Z completed)
-**URL:** https://app.gethmy.com/plans/{id}
-\\\`\\\`\\\`
-
-If plan is in execute phase and tasks already have linked cards, note which tasks have cards and which don't.
-
-### 2A.2 — Recall Context
-
-Call \`harmony_memory_search\` with the plan title to find related knowledge, patterns, or decisions that may inform execution.
-
-### 2A.3 — Present Options
-
-Use \`AskUserQuestion\` to offer execution choices. Adapt options based on plan state:
-
-#### Default options (plan in \`plan\` phase):
-
-**(A) Single card** — Create one card with plan summary + link to plan. Best for simple plans.
-**(B) Multiple cards** — Create one card per task via \`harmony_advance_plan\`. Best for complex plans with independent tasks.
-**(C) Analyze only** — Review the plan and design an implementation approach. Create cards later.
-**(D) Skip** — Do nothing.
-
-#### If plan has no tasks:
-Only offer **(A) Single card**, **(C) Analyze only**, or **(D) Skip**.
-
-#### If plan is already in \`execute\` phase with existing cards:
-**(A) Work on existing cards** — List cards with short IDs, suggest \`/hmy #N\` to start
-**(B) Create cards for remaining tasks** — Only create cards for tasks without linked cards
-**(C) Analyze progress** — Review what's done vs remaining
-**(D) Skip**
-
-### 2A.4 — Execute Choice
-
-#### Option A — Single card
-1. Call \`harmony_create_card\` with:
-   - \`title\`: Plan title
-   - \`description\`: Brief 2-3 sentence summary of the plan + \`\\n\\n[View plan](https://app.gethmy.com/plans/{planId})\`
-   - \`priority\`: based on plan task priorities (use highest)
-2. Call \`harmony_update_plan\` to set \`status: "active"\`, \`workflowPhase: "execute"\`
-
-#### Option B — Multiple cards (advance plan)
-1. Call \`harmony_advance_plan\` with:
-   - \`planId\`: the plan ID
-   - \`phase\`: \`"execute"\`
-   - \`summary\`: Brief summary of the plan scope
-2. Display the created cards with their short IDs
-
-#### Option C — Analyze only
-1. Present a structured implementation analysis:
-   - Suggested order of tasks
-   - Dependencies between tasks
-   - Key technical considerations from memory search
-   - Estimated complexity
-2. Suggest creating cards when ready
-
-#### Option D — Skip
-Acknowledge and stop.
-
-### 2A.5 — Summary
-
-After execution, show:
-- Created card(s) with short IDs
-- Current plan phase
-- Suggest next step: \`/hmy #N\` to start working on a card
-
----
-
-## Step 2B — Create New Plan
-
-### 2B.1 — Context Gathering
-
-Before interviewing, gather existing context:
-
-1. Call \`harmony_get_board\` for board state (columns, cards, labels)
-2. Call \`harmony_recall\` with relevant tags to find existing knowledge on the topic
-3. Call \`harmony_memory_search\` with the topic to find related patterns/decisions/lessons
-
-Note what you learn — reference it during the interview to ask smarter questions.
-
-### 2B.2 — Structured Interview (3-5 questions)
-
-Interview the user with **3-5 focused questions** using AskUserQuestion. Adapt based on complexity.
-
-#### Core Questions
-1. **Problem & Audience**: What problem are we solving? Who benefits?
-2. **Scope**: What's in v1, what's deferred?
-3. **Technical Constraints**: Any technical preferences, constraints, or existing patterns to follow?
-
-#### Adaptive Follow-ups (if needed)
-- Key user flows or interactions?
-- Integration points with existing systems?
-- Performance, security, or accessibility requirements?
-
-#### Interview Rules
-- Reference what you found in Step 2B.1 (board state, memories) to ask informed questions
-- Skip questions that aren't relevant — simple features need fewer questions
-- Tell the user when you have enough information to draft
-
-### 2B.3 — Plan Document
-
-Create a structured markdown document:
-
-\\\`\\\`\\\`markdown
-# [Title]
-
-## Problem
-[What problem we're solving and why]
-
-## Scope
-
-### In Scope
-- [Feature/capability 1]
-- [Feature/capability 2]
-
-### Out of Scope
-- [Deferred items]
-
-## Approach
-[Technical design, architecture decisions, key patterns]
-
-### Key Decisions
-| Decision | Choice | Rationale |
-|----------|--------|-----------|
-| ... | ... | ... |
-
-## Tasks
-1. **[Task title]** — priority: high
-   [Brief description]
-
-2. **[Task title]** — priority: medium
-   [Brief description]
-
-[Continue for all tasks...]
-
-## Risks & Mitigations
-| Risk | Mitigation |
-|------|------------|
-| ... | ... |
-
-## Success Criteria
-- [ ] [Measurable criterion]
-\\\`\\\`\\\`
-
-### 2B.4 — Create Plan
-
-Call \`harmony_create_plan\` with:
-- \`title\`: The plan title
-- \`content\`: Full markdown document from Step 2B.3
-- \`source\`: \`"agent"\`
-- \`workflowPhase\`: \`"plan"\`
-- \`tasks\`: Array of tasks from the Tasks section, each with:
-  - \`content\`: Task title + brief description
-  - \`priority\`: \`"high"\`, \`"medium"\`, or \`"low"\`
-  - \`status\`: \`"pending"\`
-
-### 2B.5 — User Approval
-
-Show the user:
-- Plan URL: \`https://app.gethmy.com/plans/{id}\`
-- Number of tasks created
-- Brief summary
-
-Then ask: **"Ready to execute? I'll create board cards from these tasks and start the execution phase."**
-
-Options:
-1. **Yes, advance to Execute** — proceed to Step 2B.6
-2. **Let me review first** — end here, they can advance later from the UI
-3. **Make changes** — iterate on the plan
-
-### 2B.6 — Advance to Execute
-
-Call \`harmony_advance_plan\` with:
-- \`planId\`: The plan ID from Step 2B.4
-- \`phase\`: \`"execute"\`
-- \`summary\`: A 2-3 sentence summary of the key decisions made during planning
-
-Report the result:
-- "Created N cards in 'To Do'. Use \`/hmy #<id>\` to start working on any card."
-- List the created cards with their short IDs
-
-## Key Tools Reference
-
-**Discovery:** \`harmony_list_plans\`, \`harmony_get_plan\`, \`harmony_get_card_by_short_id\`
-**Context:** \`harmony_get_board\`, \`harmony_recall\`, \`harmony_memory_search\`
-**Planning:** \`harmony_create_plan\`, \`harmony_advance_plan\`, \`harmony_update_plan\`
-**Execution:** \`harmony_create_card\`, \`harmony_update_card\`
-`;
-var SKILL_DEFINITIONS = {
-  hmy: {
-    name: "hmy",
-    description: "Work with Harmony cards — create, view, update, or start working on them. Use when given a card reference like #42, or commands like create, move, update.",
-    argumentHint: "<command or card-reference>",
-    content: HMY_SKILL_CONTENT
-  },
-  "hmy-plan": {
-    name: "hmy-plan",
-    description: "Create a new plan or work on an existing one. Use when asked to plan a feature, execute a plan, review a plan, or given a plan reference.",
-    argumentHint: "[plan name, ID, or topic to plan]",
-    content: HMY_PLAN_CONTENT
-  }
-};
-function buildSkillFile(skillId, agentId) {
-  const skill = SKILL_DEFINITIONS[skillId];
-  if (!skill) {
-    throw new Error(`Unknown skill: ${skillId}`);
-  }
-  let content = skill.content;
-  if (agentId === "claude") {
-    content = content.replace("Your agent identifier", "claude-code").replace("Your agent name", "Claude Code");
-  }
-  const frontmatter = `---
-name: ${skill.name}
-description: ${skill.description}
-argument-hint: ${skill.argumentHint}
----`;
-  return `${frontmatter}
-
-${content}
-${VERSION_MARKER_PREFIX}${SKILLS_VERSION} -->`;
+  return `${head}${block}${close}${body}`;
 }
 function parseSkillVersion(content) {
-  const match = content.match(/<!-- skills-version:(\d+) -->/);
-  return match ? match[1] : null;
+  const fmMatch = content.match(/^---\n([\s\S]*?)\n---/);
+  if (fmMatch) {
+    const fm = fmMatch[1];
+    const verMatch = fm.match(/^metadata:[\s\S]*?\n[ \t]+version:[ \t]*["']?(\d+)["']?\s*$/m);
+    if (verMatch)
+      return verMatch[1];
+  }
+  const legacy = content.match(/<!-- skills-version:(\d+) -->/);
+  return legacy ? legacy[1] : null;
 }
-function findSkillFiles(paths) {
+function findSkillFiles(paths, knownNames) {
   const results = [];
   for (const filePath of paths) {
     if (!existsSync3(filePath))
       continue;
-    for (const skillId of Object.keys(SKILL_DEFINITIONS)) {
-      if (filePath.includes(`/${skillId}/`) || filePath.includes(`/${skillId}.md`)) {
-        results.push({ skillId, filePath });
+    for (const name of knownNames) {
+      if (filePath.includes(`/${name}/`) || filePath.includes(`/${name}.md`)) {
+        results.push({ name, filePath });
         break;
       }
     }
@@ -5239,51 +4907,57 @@ function findSkillFiles(paths) {
 }
 async function refreshSkills() {
   try {
+    if (!isConfigured())
+      return;
     const status = areSkillsInstalled();
-    if (!status.installed) {
+    if (!status.installed)
       return;
-    }
-    const skillFiles = findSkillFiles(status.paths);
+    const client3 = new HarmonyApiClient;
+    const versionInfo = await client3.fetchSkillsVersion();
+    const skillFiles = findSkillFiles(status.paths, versionInfo.skills);
     if (skillFiles.length > 0) {
       const samplePath = skillFiles[0].filePath;
-      for (const skillId of Object.keys(SKILL_DEFINITIONS)) {
-        const alreadyFound = skillFiles.some((sf) => sf.skillId === skillId);
-        if (alreadyFound)
+      for (const name of versionInfo.skills) {
+        if (skillFiles.some((sf) => sf.name === name))
           continue;
         let siblingPath;
         if (samplePath.endsWith("SKILL.md")) {
           const parentDir = dirname(dirname(samplePath));
-          siblingPath = `${parentDir}/${skillId}/SKILL.md`;
+          siblingPath = `${parentDir}/${name}/SKILL.md`;
         } else {
           const parentDir = dirname(samplePath);
-          siblingPath = `${parentDir}/${skillId}.md`;
+          siblingPath = `${parentDir}/${name}.md`;
         }
         if (existsSync3(siblingPath)) {
-          skillFiles.push({ skillId, filePath: siblingPath });
+          skillFiles.push({ name, filePath: siblingPath });
         }
       }
     }
-    if (skillFiles.length === 0) {
+    if (skillFiles.length === 0)
       return;
-    }
     let updated = false;
-    for (const { skillId, filePath } of skillFiles) {
+    for (const { name, filePath } of skillFiles) {
       try {
         const currentContent = readFileSync3(filePath, "utf-8");
-        const currentVersion = parseSkillVersion(currentContent);
-        if (currentVersion === null || Number(currentVersion) < Number(SKILLS_VERSION)) {
-          const newContent = buildSkillFile(skillId, "claude");
-          const dir = dirname(filePath);
-          if (!existsSync3(dir)) {
-            mkdirSync3(dir, { recursive: true });
-          }
-          writeFileSync3(filePath, newContent);
-          updated = true;
+        const localVersion = parseSkillVersion(currentContent);
+        const fetched = await client3.fetchSkill(name);
+        const remoteVersion = fetched.skillVersion;
+        if (remoteVersion !== undefined && localVersion !== null && Number(localVersion) >= remoteVersion) {
+          continue;
         }
-      } catch {}
+        const newContent = buildSkillFile(fetched);
+        const dir = dirname(filePath);
+        if (!existsSync3(dir))
+          mkdirSync3(dir, { recursive: true });
+        writeFileSync3(filePath, newContent);
+        updated = true;
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        console.error(`Harmony: skill "${name}" refresh failed: ${msg}`);
+      }
     }
     if (updated) {
-      console.error(`Harmony: Updated skills to v${SKILLS_VERSION}`);
+      console.error("Harmony: Refreshed skills from server");
     }
   } catch {}
 }
@@ -6325,44 +5999,47 @@ async function fetchProjects(apiKey, workspaceId) {
   const data = await response.json();
   return data.projects || [];
 }
-function getAgentFiles(agentId, cwd, installMode = "global") {
+async function getAgentFiles(agentId, cwd, installMode = "global") {
   const home = homedir4();
   const files = [];
   const symlinks = [];
   switch (agentId) {
     case "claude": {
-      const skillContent = buildSkillFile("hmy", "claude");
-      const planSkillContent = buildSkillFile("hmy-plan", "claude");
-      if (installMode === "global") {
-        files.push({
-          path: join5(GLOBAL_SKILLS_DIR, "hmy", "SKILL.md"),
-          content: skillContent,
-          type: "text"
-        });
-        symlinks.push({
-          target: join5(GLOBAL_SKILLS_DIR, "hmy"),
-          link: join5(home, ".claude", "skills", "hmy")
-        });
-        files.push({
-          path: join5(GLOBAL_SKILLS_DIR, "hmy-plan", "SKILL.md"),
-          content: planSkillContent,
-          type: "text"
-        });
-        symlinks.push({
-          target: join5(GLOBAL_SKILLS_DIR, "hmy-plan"),
-          link: join5(home, ".claude", "skills", "hmy-plan")
-        });
-      } else {
-        files.push({
-          path: join5(cwd, ".claude", "skills", "hmy", "SKILL.md"),
-          content: skillContent,
-          type: "text"
-        });
-        files.push({
-          path: join5(cwd, ".claude", "skills", "hmy-plan", "SKILL.md"),
-          content: planSkillContent,
-          type: "text"
-        });
+      const client3 = new HarmonyApiClient;
+      const versionInfo = await client3.fetchSkillsVersion();
+      const installableNames = versionInfo.skills.filter((name) => name !== "hmy-update-check");
+      const skillFailures = [];
+      for (const name of installableNames) {
+        try {
+          const fetched = await client3.fetchSkill(name);
+          const content = buildSkillFile(fetched);
+          if (installMode === "global") {
+            files.push({
+              path: join5(GLOBAL_SKILLS_DIR, name, "SKILL.md"),
+              content,
+              type: "text"
+            });
+            symlinks.push({
+              target: join5(GLOBAL_SKILLS_DIR, name),
+              link: join5(home, ".claude", "skills", name)
+            });
+          } else {
+            files.push({
+              path: join5(cwd, ".claude", "skills", name, "SKILL.md"),
+              content,
+              type: "text"
+            });
+          }
+        } catch (err) {
+          const msg = err instanceof Error ? err.message : String(err);
+          skillFailures.push({ name, error: msg });
+        }
+      }
+      if (skillFailures.length > 0) {
+        const summary = skillFailures.map((f) => `  - ${f.name}: ${f.error}`).join(`
+`);
+        throw new Error(`Failed to fetch ${skillFailures.length}/${installableNames.length} skill(s) from /v1/skills:
+${summary}`);
       }
       break;
     }
@@ -6862,7 +6539,7 @@ async function runSetup(options = {}) {
   }
   if (needsSkills && selectedAgents.length > 0) {
     for (const agentId of selectedAgents) {
-      const { files, symlinks } = getAgentFiles(agentId, cwd, installMode);
+      const { files, symlinks } = await getAgentFiles(agentId, cwd, installMode);
       allFiles.push(...files);
       allSymlinks.push(...symlinks);
     }