drafted 1.6.0 → 1.7.1

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); }
 });
@@ -1735,6 +1756,7 @@ tool('skill', 'Manage the Drafted skill library. Skills are reusable prompts/gui
   limit: z.number().optional().describe('[search] max results (default 25, max 100)'),
   skill: z.string().optional().describe('[load] skill ID (UUID) or slug'),
   skillId: z.string().optional().describe('[update|remove|attach|detach|favorite|unfavorite|read_file|update_file] skill ID'),
+  projectId: z.string().optional().describe('[list] project to list skills for (defaults to active project; falls back to org-attached skills if no project)'),
   name: z.string().optional().describe('[add|update] skill name'),
   description: z.string().optional().describe('[add|update] one-line description'),
   content: z.string().optional().describe('[add|update] root SKILL.md content; [update_file] file content'),
@@ -1771,8 +1793,18 @@ tool('skill', 'Manage the Drafted skill library. Skills are reusable prompts/gui
         return ok(result);
       }
       case 'list': {
-        if (!getState().projectId) throw new Error('No active project. Call project(action="open") first.');
-        return ok(await api('GET', `/api/projects/${getState().projectId}/skills`));
+        // Prefer the explicit projectId param; otherwise the active project;
+        // otherwise fall back to org-attached skills so list works in
+        // empty-org / wiki-only sessions where there's no project to bind to.
+        const explicit = args.projectId;
+        const active = getState().projectId;
+        if (explicit || active) {
+          const pid = explicit || active;
+          return ok(await api('GET', `/api/projects/${pid}/skills`));
+        }
+        const orgId = await getCurrentOrgId();
+        if (!orgId) throw new Error('No active org. Call get_org first or pass projectId.');
+        return ok(await api('GET', `/api/orgs/${orgId}/skills`));
       }
       case 'add': {
         const { name, description, content, tags, triggerPatterns } = args;

package/package.json

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