drafted 1.5.0 → 1.7.0

package/mcp/server.mjs

@@ -97,7 +97,7 @@ const server = new McpServer({
 
 An org contains projects. Each project has a zoomable canvas with frames (HTML files) organized as /{layer}/{lane}/{filename}. Layers are predefined categories (wireframes, designs, brand-assets, etc.), lanes are groups within a layer, and frames are the individual design files.
 
-WORKFLOW: project(action="list") → project(action="open") → ls / → read/write/edit. Projects span all orgs -- opening a 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.
+WORKFLOW: project(action="list") → project(action="open") → ls / → read/write/edit. Projects span all orgs -- opening a 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. To switch orgs without opening a project (for wiki/skill work in an org with no projects), call get_org(action="switch", orgId=...).
 
 SKILLS: Drafted has a skill library -- reusable agent instructions stored as SKILL.md files. When a user says "use the X skill", call skill(action="search") to find it, then skill(action="load") to get its instructions. Skills can cover anything: UX guidelines, copywriting rules, brand voice, coding standards, review checklists, etc.
 
@@ -793,7 +793,7 @@ tool('auth', 'Sign in to Drafted. `action=get_link` returns a verification URL i
 
 // ── Project management tools (direct HTTP) ────────────────────────
 
-tool('project', 'START HERE for project management. Dispatch by `action`: list (lists all projects across all orgs — always call first), open (switch the active project; required before reading/writing frames), create (new project, optionally from a template), update (change name/folder/description/layers), move (transfer to another org). The org switches automatically when you open a project. **Skill gate:** projects with attached skills will REJECT all mutations (write, edit, mv, rm, shape, group, connector, layout, layer, asset upload) until you have loaded each attached skill via skill(action="load"). Skills tell you HOW to do the work — they\'re not optional. Open returns the attached skill list and auto-inlines content for projects with ≤3 skills.', {
+tool('project', 'START HERE for project management. Dispatch by `action`: list (lists all projects across all orgs — always call first), open (switch the active project; required before reading/writing frames), create (new project, optionally from a template), update (change name/folder/description/layers), move (transfer to another org). Opening a project auto-switches the org. To change orgs WITHOUT a project (for wiki/skill work in an empty org), use get_org(action="switch", orgId=...). **Skill gate:** projects with attached skills will REJECT all mutations (write, edit, mv, rm, shape, group, connector, layout, layer, asset upload) until you have loaded each attached skill via skill(action="load"). Skills tell you HOW to do the work — they\'re not optional. Open returns the attached skill list and auto-inlines content for projects with ≤3 skills.', {
   action: z.enum(['list', 'open', 'create', 'update', 'move']).describe('Operation to perform.'),
   projectId: z.string().optional().describe('[open|update|move] project ID. Get IDs from action=list.'),
   name: z.string().optional().describe('[create|update] project name'),
@@ -1157,8 +1157,29 @@ tool('layer', 'Manage layers in a project. Dispatch by `action`: add/update/remo
   } catch (error) { return err(error); }
 });
 
-tool('get_org', {}, async () => {
+tool('get_org', {
+  action: z.enum(['get', 'switch']).optional().describe('Default: "get" returns active org and member info. Use "switch" with orgId to change the active org without opening a project.'),
+  orgId: z.string().optional().describe('[switch] target org ID to switch to. Must be one of the orgs the user is a member of.'),
+}, async (args = {}) => {
   try {
+    const action = args.action || 'get';
+
+    if (action === 'switch') {
+      if (!args.orgId) throw new Error('orgId is required for action=switch');
+      await api('POST', '/auth/switch-org', { orgId: args.orgId });
+      // Bust the per-session org cache so subsequent calls re-fetch /auth/me.
+      const sess = getSessionState();
+      sess.cachedOrgId = null;
+      sess.cachedOrgIdTime = 0;
+      // Clear active project too — projects are scoped to orgs, so the
+      // previous one isn't valid in the new org.
+      setMcpActiveProject(null, null);
+      const me = await api('GET', '/auth/me');
+      const orgs = (await api('GET', '/api/orgs')).orgs || [];
+      const activeOrg = (orgs || []).map(o => ({ id: o.orgId || o.id, name: o.orgName || o.name })).find(o => o.id === me?.orgId) || null;
+      return ok({ switched: true, activeOrg, note: 'Active org switched. Wiki and skill calls now target this org. Active project cleared — open a project (or stay org-scoped for wiki/skill).' });
+    }
+
     // Source of truth = THIS MCP session's bound org (what mutations will actually
     // hit). Each session is independent on purpose — multiple agents can run in
     // parallel against different orgs. /auth/me reads sessions.org_id directly.
@@ -1180,7 +1201,7 @@ tool('get_org', {}, async () => {
       activeOrg,
       orgs,
       members: members.map(m => ({ id: m.userId, name: m.username, email: m.email, role: m.role })),
-      note: "activeOrg is the org bound to THIS MCP session — what mutations will actually target. Browser tabs and other MCP sessions for the same user can be on different orgs.",
+      note: "activeOrg is the org bound to THIS MCP session — what mutations will actually target. To switch orgs without creating a project, call get_org(action=\"switch\", orgId=\"...\"). Browser tabs and other MCP sessions for the same user can be on different orgs.",
     });
   } catch (error) { return err(error); }
 });
@@ -1545,8 +1566,8 @@ tool('batch', 'Batch operations on the ACTIVE PROJECT. Response includes "projec
 
 // ── Asset tools ──────────────────────────────────────────────────
 
-tool('asset', 'Manage supporting files (CSS, JS, images, fonts) in the ACTIVE PROJECT. Assets are referenced by frames via relative paths — e.g., if your HTML has <link href="css/styles.css">, upload with asset_path="css/styles.css". Assets are NOT frames — they don\'t appear on the canvas. `action=upload` to add/replace, `action=list` to browse.', {
-  action: z.enum(['upload', 'list']).describe('Operation to perform.'),
+tool('asset', 'Manage supporting files (CSS, JS, images, fonts) in the ACTIVE PROJECT. Assets are referenced by frames via relative paths — e.g., if your HTML has <link href="css/styles.css">, upload with asset_path="css/styles.css". Assets are NOT frames — they don\'t appear on the canvas. `action=upload` to add/replace, `action=list` to browse, `action=rm` to delete.', {
+  action: z.enum(['upload', 'list', 'rm']).describe('Operation to perform.'),
   asset_path: z.string().optional().describe('[upload] relative asset path (e.g. "css/styles.css"). Must match the path used in HTML references.'),
   file_path: z.string().optional().describe('[upload] absolute path to a local file. Mutually exclusive with content/base64.'),
   content: z.string().optional().describe('[upload] text content (for CSS/JS). Mutually exclusive with file_path/base64.'),
@@ -1589,6 +1610,14 @@ tool('asset', 'Manage supporting files (CSS, JS, images, fonts) in the ACTIVE PR
       const query = frame_id ? `?frameId=${frame_id}` : '';
       return ok(await api('GET', `/api/projects/${projectId}/assets${query}`));
     }
+    if (action === 'rm') {
+      const skillErr = await checkProjectSkills(projectId);
+      if (skillErr) return err(new Error(skillErr));
+      const { asset_path } = args;
+      if (!asset_path) throw new Error('asset_path is required for action=rm');
+      if (asset_path.includes('..')) throw new Error('asset_path must not contain ".."');
+      return ok(await api('DELETE', `/api/projects/${projectId}/assets/${asset_path}`));
+    }
     throw new Error(`Unknown asset action: ${action}`);
   } catch (error) { return err(error); }
 });
@@ -1960,20 +1989,18 @@ tool('wiki', 'Per-org wiki. Markdown pages with paths as hierarchy. You and othe
       }
 
       // ── read ────────────────────────────────────────────────────
+      // Returns content in hashline format (`lineNum:hash|content`) so the
+      // agent can produce hashline edit operations. Mirrors frame.read.
       case 'read': {
         const { path: readPath, lines: readLines } = args;
         if (!readPath) throw new Error('path required for action=read');
         const normalized = normalizeWikiPath(readPath);
-        const page = await api('GET', `/api/wiki/page?path=${encodeURIComponent(normalized)}`);
-        // Client-side line slice — server returns full content; we trim if `lines` was passed.
-        let outContent = page.content;
-        if (readLines && typeof outContent === 'string') {
-          const m = readLines.match(/^(\d+)-(\d+)$/);
-          if (!m) throw new Error(`lines must be "N-M" (e.g. "10-50"), got: ${readLines}`);
-          const [start, end] = [parseInt(m[1]), parseInt(m[2])];
-          const allLines = outContent.split('\n');
-          outContent = allLines.slice(Math.max(0, start - 1), end).join('\n');
+        const params = new URLSearchParams({ path: normalized, format: 'hashline' });
+        if (readLines) {
+          if (!/^\d+-\d+$/.test(readLines)) throw new Error(`lines must be "N-M" (e.g. "10-50"), got: ${readLines}`);
+          params.set('lines', readLines);
         }
+        const page = await api('GET', `/api/wiki/page?${params.toString()}`);
         // Get backlink count via search (approximate)
         let backlinkCount = 0;
         try {
@@ -1985,7 +2012,8 @@ tool('wiki', 'Per-org wiki. Markdown pages with paths as hierarchy. You and othe
           title: page.title,
           type: page.type,
           frontmatter: page.frontmatter,
-          content: outContent,
+          content: page.content,
+          totalLines: page.totalLines,
           lastEditedBy: page.updatedBy,
           lastEditedAt: page.updatedAt,
           backlinkCount,
@@ -2069,15 +2097,17 @@ tool('wiki', 'Per-org wiki. Markdown pages with paths as hierarchy. You and othe
       }
 
       // ── edit ────────────────────────────────────────────────────
+      // Hashlines come from `read` (which now formats content as
+      // `lineNum:hash|content`). The server applies the ops via the same
+      // hashline algorithm — no client-side re-hashing, no algorithm drift.
       case 'edit': {
         const { path: editPath, operations: editOps } = args;
         if (!editPath) throw new Error('path required for action=edit');
         if (!Array.isArray(editOps) || editOps.length === 0) throw new Error('operations (array) required for action=edit');
         const normalized = normalizeWikiPath(editPath);
         const page = await api('GET', `/api/wiki/page?path=${encodeURIComponent(normalized)}`);
-        const newContent = applyHashlineOps(page.content || '', editOps);
-        const result = await api('PATCH', `/api/wiki/pages/${page.id}`, { content: newContent });
-        return ok(withOrg({ path: result.path, id: result.id, updated: true }));
+        const result = await api('POST', `/api/wiki/pages/${page.id}/edit`, { operations: editOps });
+        return ok(withOrg({ path: result.path, id: result.id, updated: true, applied: result.applied }));
       }
 
       // ── mv ──────────────────────────────────────────────────────

package/package.json

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