drafted 1.11.17 → 1.11.19

package/mcp/server.mjs

@@ -766,6 +766,23 @@ async function api(method, path, body, extraHeaders = {}, _retried = false) {
   const scopedPath = pid ? `${path}${sep}projectId=${pid}` : path;
   const url = `${getServerUrl()}${scopedPath}`;
   const headers = { ...getAuthHeaders(), ...extraHeaders };
+  // Bind every data request to the org this MCP session is actually working in
+  // (the active project's org, or the org chosen via get_org switch). Without
+  // this, project-scoped routes that resolve org from the SHARED server-side
+  // session row (notably /api/fs ls + frame read, via effectiveOrgId) break when
+  // a concurrent agent session for the same user flips that row to another org:
+  // the active project then "isn't in the current org", the 404 handler below
+  // clears it, and the agent sees the "active project no longer in the current
+  // org" churn. X-Drafted-Org is validated against the caller's memberships
+  // server-side and never mutates the session, so it scopes resolution
+  // per-request — exactly like the org-less /project/:slug link that already
+  // works. An explicit override in extraHeaders (e.g. the wiki/skill `org` arg)
+  // always wins, and /auth/* is left untouched so it reports true session state.
+  const boundOrg = getSessionState().boundOrgId;
+  const hasExplicitOrg = Object.keys(headers).some((k) => k.toLowerCase() === 'x-drafted-org');
+  if (boundOrg && !hasExplicitOrg && !path.startsWith('/auth/')) {
+    headers['X-Drafted-Org'] = boundOrg;
+  }
   const opts = { method, headers };
 
   if (body !== undefined) {
@@ -964,25 +981,6 @@ function setMcpActiveProject(projectId, meta = null) {
   if (meta?.orgId) sess.boundOrgId = meta.orgId;
 }
 
-// Clear the active project if its orgId no longer matches the current org.
-// Catches the silent drift where org switches (via get_org switch, browser
-// tab, parallel agent, etc.) leave the MCP session pointing at a project
-// the API can no longer see — which surfaces as confusing "Project not
-// found" errors on otherwise-valid tool calls.
-async function ensureProjectMatchesOrg() {
-  const s = getState();
-  const meta = s.projectMeta;
-  if (!s.projectId || !meta?.orgId) return;
-  const currentOrgId = await getCurrentOrgId();
-  if (currentOrgId && currentOrgId !== meta.orgId) {
-    s.projectId = null;
-    s.projectMeta = null;
-    const sess = getSessionState();
-    sess.activeProjectId = null;
-    sess.activeProjectMeta = null;
-  }
-}
-
 // Returns { id, slug, name, orgId } for the project this MCP session most
 // recently opened — what frame mutations will actually target. Echoed on
 // every mutation so silent cross-project drift is visible.
@@ -1084,6 +1082,36 @@ async function getCurrentOrgContext() {
   } catch { return null; }
 }
 
+// Project-less mutations (wiki, skills) have no resource to derive the org from.
+// If the agent never bound an org this session (no project opened, no get_org
+// switch) and passed no explicit org, refuse to GUESS when the user belongs to
+// more than one org — otherwise the write silently lands in whatever org the
+// session happened to inherit (the "wiki write into the wrong org" failure).
+// Single-org users are unambiguous and proceed untouched. (DRAFT-36 Phase 4.)
+async function requireBoundOrgForProjectlessMutation(explicitOrg) {
+  if (explicitOrg) return;
+  const sess = getSessionState();
+  if (sess.boundOrgId) return;            // bound via project open / get_org switch
+  if (getState().projectId) return;        // an active project implies its org
+  let count = sess.cachedOrgCount;
+  if (count == null) {
+    try {
+      const d = await api('GET', '/api/orgs');
+      count = (d.orgs || d || []).length;
+      sess.cachedOrgCount = count;
+    } catch { return; } // can't determine membership — don't block a legit write
+  }
+  if (count > 1) {
+    throw new Error(
+      `Refusing to guess the org: no project is open and no org was bound this ` +
+      `session, but you belong to ${count} orgs — a project-less wiki/skill write ` +
+      `would land in whichever org the session inherited. Call ` +
+      `get_org(action="switch", orgId=...) or project(action="open") first ` +
+      `(skill calls may also pass org=...).`
+    );
+  }
+}
+
 async function getOrgSkills(orgId) {
   if (!orgId) return [];
   // No cache: gate freshness > the ~5ms HTTP roundtrip. Otherwise an attach
@@ -2869,6 +2897,11 @@ tool('skill', 'Manage the Drafted skill library. Skills are reusable prompts/gui
 }, async (args) => {
   try {
     const { action } = args;
+    // Org-creating/editing skill actions on the project-less surface must have a
+    // bound org (or explicit org=) when the user is multi-org. (DRAFT-36 Phase 4.)
+    if (['add', 'update', 'remove', 'push', 'fork'].includes(action)) {
+      await requireBoundOrgForProjectlessMutation(args.org);
+    }
     switch (action) {
       case 'search': {
         const { query, tags, scope = 'all', limit, offset, compact } = args;
@@ -3103,6 +3136,12 @@ tool('wiki', 'Per-org wiki. Markdown pages with paths as hierarchy. You and othe
   try {
     const { action } = args;
 
+    // Project-less wiki mutations must have a bound org when the user is
+    // multi-org, so a write never silently lands in an inherited org. (Ph4.)
+    if (['write', 'edit', 'mv', 'rm', 'bulk-write'].includes(action)) {
+      await requireBoundOrgForProjectlessMutation(undefined);
+    }
+
     // Resolve org context once for the wiki tool. Each MCP session is bound
     // to one org (parallel agents on different orgs is supported by design).
     const orgCtx = await getCurrentOrgContext();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drafted",
-  "version": "1.11.17",
+  "version": "1.11.19",
   "description": "Drafted — visual thinking surface for humans and AI agents. Renders HTML, markdown, images, and code as frames on a zoomable canvas, with MCP tools for AI agents and real-time sync for humans.",
   "type": "module",
   "files": [