drafted 1.1.1 → 1.1.2

package/mcp/server.mjs

@@ -27,6 +27,8 @@ An org contains projects. Each project has a zoomable canvas with frames (HTML f
 
 WORKFLOW: list_projects → open_project → ls / → read/write/edit. Projects span all orgs -- open_project auto-switches org context. Every response includes a "project" field showing which project you're operating on -- always verify it matches your intent before writing.
 
+SKILLS: Drafted has a skill library -- reusable agent instructions stored as SKILL.md files. When a user says "use the X skill", use search_skills to find it, then load_skill to get its instructions. Skills can cover anything: UX guidelines, copywriting rules, brand voice, coding standards, review checklists, etc.
+
 IMPORTANT: Any URL containing /f/{uuid} is a Drafted frame link — ALWAYS use read(path=URL) to get frame content, focus(target=URL) to pan the canvas to it. Never curl or WebFetch Drafted URLs.`,
 });
 
@@ -190,7 +192,11 @@ async function connectAgentWs() {
   });
 }
 
-function joinAgentWsRoom(projectId) {
+async function joinAgentWsRoom(projectId) {
+  // Ensure WS is connected (may not be after restart/session re-clone)
+  if (!agentWs || agentWs.readyState > WebSocket.OPEN) {
+    await connectAgentWs();
+  }
   if (!agentWs) return;
   const msg = JSON.stringify({ type: 'join', projectId, agent: true });
   if (agentWs.readyState === WebSocket.OPEN) {
@@ -384,6 +390,20 @@ server.tool('list_projects', 'START HERE. Lists all projects across all orgs. Us
   try {
     const data = await api('GET', '/api/projects');
     data.agentProject = agentActiveProjectId || null;
+    // Inject favorited skills so the agent knows about them from the first call
+    try {
+      const favData = await api('GET', '/api/skills/favorites');
+      const favs = favData.skills || [];
+      if (favs.length > 0) {
+        data.favoritedSkills = favs.map(s => ({
+          id: s.id,
+          name: s.name,
+          slug: s.slug,
+          description: s.description,
+          tags: s.tags,
+        }));
+      }
+    } catch { /* skills not available */ }
     return ok(data);
   } catch (error) { return err(error); }
 });
@@ -456,7 +476,8 @@ server.tool('fork_template', {
 
 server.tool('open_project', 'Switch active project. REQUIRED before reading or writing — all fs tools (ls, read, write, edit, rm, mv, batch) operate on the active project. Get project IDs from list_projects.', {
   projectId: z.string().describe('Project ID to switch to and open in browser'),
-}, async ({ projectId }) => {
+  skipBrowser: z.boolean().optional().describe('Skip opening/navigating a browser tab (use when the user already has the project open, e.g. from an invite snippet)'),
+}, async ({ projectId, skipBrowser }) => {
   try {
     const result = await api('POST', '/api/project/switch', { projectId });
     setMcpActiveProject(projectId);
@@ -470,19 +491,39 @@ server.tool('open_project', 'Switch active project. REQUIRED before reading or w
       if (proj?.slug) projectSlug = proj.slug;
     } catch { /* fall back to projectId */ }
     const url = `${base}/project/${projectSlug}`;
-    // Navigate existing browser tabs instead of opening new ones
     let navigated = 0;
+    if (!skipBrowser) {
+      // Navigate existing browser tabs instead of opening new ones
+      try {
+        const nav = await api('POST', '/api/project/navigate', { projectId });
+        navigated = nav.navigated || 0;
+      } catch { /* server may not support navigate yet */ }
+      // Only open a new tab if no browser tabs were reached
+      if (navigated === 0) {
+        const { exec } = await import('child_process');
+        const cmd = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'start' : 'xdg-open';
+        exec(`${cmd} ${JSON.stringify(url)}`);
+      }
+    }
+    // Fetch attached skills (metadata only)
+    let projectSkillsList = [];
     try {
-      const nav = await api('POST', '/api/project/navigate', { projectId });
-      navigated = nav.navigated || 0;
-    } catch { /* server may not support navigate yet */ }
-    // Only open a new tab if no browser tabs were reached
-    if (navigated === 0) {
-      const { exec } = await import('child_process');
-      const cmd = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'start' : 'xdg-open';
-      exec(`${cmd} ${JSON.stringify(url)}`);
+      const skillData = await api('GET', `/api/projects/${projectId}/skills`);
+      projectSkillsList = skillData.skills || [];
+    } catch { /* skills not available yet */ }
+
+    // Auto-load content for projects with <= 3 attached skills
+    if (projectSkillsList.length > 0 && projectSkillsList.length <= 3) {
+      for (const s of projectSkillsList) {
+        try {
+          const full = await api('GET', `/api/skills/${s.id}`);
+          s.content = full.content;
+          s.files = full.files || [];
+        } catch { /* skip */ }
+      }
     }
-    return ok({ ...result, url, opened: true, navigated });
+
+    return ok({ ...result, url, opened: true, navigated, skills: projectSkillsList });
   } catch (error) { return err(error); }
 });
 
@@ -604,8 +645,8 @@ server.tool('remove_layer', {
       const listing = await api('GET', `/api/fs?path=/${key}&projectId=${projectId}&recursive=true`);
       const entries = listing.entries || [];
       const frames = entries.filter(e => e.type === 'frame');
-      // Don't count the auto-generated _context.md as real content
-      const realFrames = frames.filter(f => !f.path.endsWith('/_meta/_context.md'));
+      // Don't count the auto-generated context frame as real content
+      const realFrames = frames.filter(f => !f.path.endsWith('/_meta/_context.md') && !f.path.endsWith('/instructions/context.md'));
       const frameCount = realFrames.length;
       if (frameCount > 0) {
         throw new Error(`Layer "${key}" contains ${frameCount} frame(s). Use force: true to confirm deletion.`);
@@ -1029,6 +1070,24 @@ server.tool('list_assets', 'List all assets in the ACTIVE PROJECT, optionally fi
   } catch (error) { return err(error); }
 });
 
+// ── Shape tool ───────────────────────────────────────────────────────
+
+server.tool('shape', 'Create a flowchart shape on the surface. Shapes are lightweight text nodes — use them for flowcharts, process diagrams, and decision trees. Connect shapes with the connect tool, then call layout to auto-arrange.', {
+  text: z.string().describe('Text to display inside the shape'),
+  shape: z.enum(['rectangle', 'diamond', 'oval', 'pill']).optional().default('rectangle').describe('Shape type: rectangle (process/action), diamond (decision), oval (start/end), pill (rounded step)'),
+  layer: z.string().optional().describe('Layer to place the shape in (default: plans)'),
+  lane: z.string().optional().describe('Lane within the layer (default: default)'),
+  color: z.string().optional().describe('Border color (CSS color string)'),
+}, async ({ text, shape, layer, lane, color }) => {
+  try {
+    const body = { text, shape };
+    if (layer) body.layer = layer;
+    if (lane) body.lane = lane;
+    if (color) body.color = color;
+    const result = await api('POST', '/api/fs/shape', body);
+    return ok(result);
+  } catch (error) { return err(error); }
+});
 // ── Connector tools ───────────────────────────────────────────────
 
 server.tool('connect', 'Create a connector (arrow) between two frames on the surface.', {
@@ -1089,6 +1148,149 @@ server.tool('layout', 'Auto-arrange frames using graph layout algorithm. Positio
   } catch (error) { return err(error); }
 });
 
+// ── Skill library tools ──────────────────────────────────────────
+
+server.tool('search_skills', 'Search the Drafted skill library for reusable agent skills (e.g. "UX", "copywriting", "brand"). Skills are stored prompts, guidelines, and instructions that agents can load and follow. When a user says "use the X skill", search here first.', {
+  query: z.string().optional().describe('Search term (matches name, description, content)'),
+  tags: z.array(z.string()).optional().describe('Filter by tags'),
+  scope: z.enum(['all', 'org', 'global']).optional().default('all').describe('Scope: all (default), org, or global'),
+}, async ({ query, tags, scope }) => {
+  try {
+    const params = new URLSearchParams();
+    if (query) params.set('q', query);
+    if (tags?.length) params.set('tags', tags.join(','));
+    if (scope) params.set('scope', scope);
+    const qs = params.toString();
+    const endpoint = query ? '/api/skills/search' : '/api/skills';
+    const result = await api('GET', `${endpoint}${qs ? '?' + qs : ''}`);
+    return ok(result);
+  } catch (error) { return err(error); }
+});
+
+server.tool('load_skill', 'Load a skill to get its full instructions. Returns the SKILL.md content plus any supporting files. Use search_skills to find skills by keyword first.', {
+  skill: z.string().describe('Skill ID (UUID) or slug'),
+}, async ({ skill }) => {
+  try {
+    const isUuid = /^[a-f0-9-]{36}$/.test(skill);
+    const endpoint = isUuid ? `/api/skills/${skill}` : `/api/skills/slug/${skill}`;
+    const result = await api('GET', endpoint);
+    return ok(result);
+  } catch (error) { return err(error); }
+});
+
+server.tool('read_skill_file', 'Read a supporting file from a skill directory (e.g. an example, template, or config). Use load_skill first to see available files.', {
+  skillId: z.string().describe('Skill ID'),
+  path: z.string().describe('Relative file path within the skill (e.g. "examples/react.md")'),
+}, async ({ skillId, path }) => {
+  try {
+    const result = await api('GET', `/api/skills/${skillId}/files/${path}`);
+    return ok(result);
+  } catch (error) { return err(error); }
+});
+
+server.tool('add_skill', 'Create a new skill in the org skill library. Creates a skill directory with a root SKILL.md. Use update_skill_file to add supporting files afterward.', {
+  name: z.string().describe('Skill name'),
+  description: z.string().describe('One-line description of what the skill does'),
+  content: z.string().describe('Root SKILL.md content (markdown with instructions/prompts)'),
+  tags: z.array(z.string()).optional().describe('Tags for discovery'),
+  triggerPatterns: z.array(z.string()).optional().describe('Patterns that suggest this skill (e.g. "designing a landing page", "writing tests")'),
+}, async ({ name, description, content, tags, triggerPatterns }) => {
+  try {
+    const body = { name, description, content };
+    if (tags) body.tags = tags;
+    if (triggerPatterns) body.triggerPatterns = triggerPatterns;
+    const result = await api('POST', '/api/skills', body);
+    return ok(result);
+  } catch (error) { return err(error); }
+});
+
+server.tool('update_skill', 'Update an existing org skill. Can change name, description, content (SKILL.md), tags, or trigger patterns. Cannot edit global skills.', {
+  skillId: z.string().describe('Skill ID to update'),
+  name: z.string().optional().describe('New skill name'),
+  description: z.string().optional().describe('New description'),
+  content: z.string().optional().describe('New root SKILL.md content'),
+  tags: z.array(z.string()).optional().describe('Replace tags'),
+  triggerPatterns: z.array(z.string()).optional().describe('Replace trigger patterns'),
+}, async ({ skillId, name, description, content, tags, triggerPatterns }) => {
+  try {
+    const body = {};
+    if (name !== undefined) body.name = name;
+    if (description !== undefined) body.description = description;
+    if (content !== undefined) body.content = content;
+    if (tags !== undefined) body.tags = tags;
+    if (triggerPatterns !== undefined) body.triggerPatterns = triggerPatterns;
+    if (Object.keys(body).length === 0) throw new Error('At least one field is required');
+    const result = await api('PUT', `/api/skills/${skillId}`, body);
+    return ok(result);
+  } catch (error) { return err(error); }
+});
+
+server.tool('update_skill_file', 'Add or update a supporting file in a skill directory. Use for examples, templates, configs -- anything beyond the root SKILL.md.', {
+  skillId: z.string().describe('Skill ID'),
+  path: z.string().describe('Relative file path (e.g. "examples/react.md", "templates/component.html")'),
+  content: z.string().describe('File content'),
+}, async ({ skillId, path, content }) => {
+  try {
+    const result = await api('PUT', `/api/skills/${skillId}/files/${path}`, { content });
+    return ok(result);
+  } catch (error) { return err(error); }
+});
+
+server.tool('remove_skill', 'Delete a skill from the org library. Also detaches it from all projects. Cannot delete global skills.', {
+  skillId: z.string().describe('Skill ID to delete'),
+}, async ({ skillId }) => {
+  try {
+    const result = await api('DELETE', `/api/skills/${skillId}`);
+    return ok(result);
+  } catch (error) { return err(error); }
+});
+
+server.tool('list_project_skills', 'List skills attached to the active project. These are the skills recommended for this project context.', {}, async () => {
+  try {
+    if (!agentActiveProjectId) throw new Error('No active project. Call open_project first.');
+    const result = await api('GET', `/api/projects/${agentActiveProjectId}/skills`);
+    return ok(result);
+  } catch (error) { return err(error); }
+});
+
+server.tool('attach_skill', 'Attach a skill to the active project. Attached skills are auto-loaded when agents open this project.', {
+  skillId: z.string().describe('Skill ID to attach'),
+}, async ({ skillId }) => {
+  try {
+    if (!agentActiveProjectId) throw new Error('No active project. Call open_project first.');
+    const result = await api('POST', `/api/projects/${agentActiveProjectId}/skills`, { skillId });
+    return ok(result);
+  } catch (error) { return err(error); }
+});
+
+server.tool('detach_skill', 'Remove a skill from the active project.', {
+  skillId: z.string().describe('Skill ID to detach'),
+}, async ({ skillId }) => {
+  try {
+    if (!agentActiveProjectId) throw new Error('No active project. Call open_project first.');
+    const result = await api('DELETE', `/api/projects/${agentActiveProjectId}/skills/${skillId}`);
+    return ok(result);
+  } catch (error) { return err(error); }
+});
+
+server.tool('favorite_skill', 'Add a skill to your favorites (max 12). Favorited skills appear in list_projects so agents always know about them.', {
+  skillId: z.string().describe('Skill ID to favorite'),
+}, async ({ skillId }) => {
+  try {
+    const result = await api('POST', `/api/skills/favorites/${skillId}`);
+    return ok(result);
+  } catch (error) { return err(error); }
+});
+
+server.tool('unfavorite_skill', 'Remove a skill from your favorites.', {
+  skillId: z.string().describe('Skill ID to unfavorite'),
+}, async ({ skillId }) => {
+  try {
+    const result = await api('DELETE', `/api/skills/favorites/${skillId}`);
+    return ok(result);
+  } catch (error) { return err(error); }
+});
+
 // ── Resource: canvas info ─────────────────────────────────────────
 
 server.resource('info', 'drafted://info', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drafted",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Drafted CLI - Design preview server for Claude agents",
   "type": "module",
   "files": [