drafted 1.24.1 → 1.24.2

package/mcp/server.mjs

@@ -1616,21 +1616,47 @@ async function pathOrgMatches(orgSegment, meta) {
   return !!hit && meta?.orgId === hit.id;
 }
 
-async function resolveProjectRef(ref) {
+/**
+ * Fetch /api/projects with NO org scope.
+ *
+ * api() otherwise stamps the session's working org on every request, so a
+ * listing meant to answer "which projects exist in the org this PATH names"
+ * came back scoped to the org the session happened to be working in, and the
+ * org filter then removed all of it. An empty header is how the server is told
+ * "unaddressed" (req.get('x-drafted-org') is falsy) without a server change.
+ */
+const NO_ORG_SCOPE = { 'X-Drafted-Org': '' };
+
+async function resolveProjectRef(ref, orgHint = null) {
   if (!ref) return null;
-  const hit = projectRefCache.get(ref);
+  const cacheKey = orgHint ? `${orgHint}|${ref}` : ref;
+  const hit = projectRefCache.get(cacheKey) || (!orgHint && projectRefCache.get(ref));
   if (hit) return hit;
-  const data = await api('GET', '/api/projects');
-  const list = Array.isArray(data?.projects) ? data.projects : [];
+  // Scope the lookup to the org the path named. Without a hint the session's
+  // org applies — which is right for `fs ls /projects` but WRONG for a path
+  // that addressed another org, and that mismatch is what made a project
+  // created in org B unresolvable from a session working in org A.
+  const scoped = orgHint ? await api('GET', '/api/projects', undefined, { 'X-Drafted-Org': orgHint }) : await api('GET', '/api/projects');
+  let list = Array.isArray(scoped?.projects) ? scoped.projects : [];
   const want = String(ref).toLowerCase();
-  const p =
-    list.find(x => x.id === ref) ||
-    list.find(x => String(x.slug || '').toLowerCase() === want) ||
-    list.find(x => String(x.name || '').toLowerCase() === want);
+  const pick = (rows) =>
+    rows.find(x => x.id === ref) ||
+    rows.find(x => String(x.slug || '').toLowerCase() === want) ||
+    rows.find(x => String(x.name || '').toLowerCase() === want);
+  let p = pick(list);
+  // A miss is worth one unscoped look before "not found": the hint may be stale
+  // (a project that moved org), and an id passed as projectId= carries no org at
+  // all — only a UUID can name a project in an org the session is not inside.
+  if (!p && (orgHint || /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(String(ref)))) {
+    const all = await api('GET', '/api/projects', undefined, NO_ORG_SCOPE);
+    list = Array.isArray(all?.projects) ? all.projects : [];
+    p = pick(list);
+  }
   if (!p) return null;
   // `folder` rides along so a caller can rebuild the project's printed address
   // (/o/<org>/projects/<folder>/<slug>) without a second lookup.
   const meta = { id: p.id, slug: p.slug || null, name: p.name || null, orgId: p.orgId || null, orgSlug: p.orgSlug || null, folder: p.folder || '' };
+  projectRefCache.set(cacheKey, meta);
   projectRefCache.set(ref, meta);
   projectRefCache.set(p.id, meta);
   return meta;
@@ -1645,13 +1671,15 @@ async function resolveProjectRef(ref) {
  *
  * One /api/projects fetch for the whole scan, not one per candidate.
  */
-async function resolveFolderQualifiedProject(parts) {
+async function resolveFolderQualifiedProject(parts, orgHint = null) {
   // NOT `.catch(() => null)`. Swallowing the fetch turns "the session is gated"
   // or "the server is down" into "project not found", which is a wrong DIAGNOSIS,
   // not just a lost detail — it sends you hunting for a project instead of
   // reading the gate. Observed once for real: an unnamed session after an MCP
   // restart reported `project not found: Marketing/beoflow-marketing`.
-  const data = await api('GET', '/api/projects');
+  // Same org rule as resolveProjectRef: a folder-qualified address names an org,
+  // so the lookup has to be made in it rather than in the working org.
+  const data = await api('GET', '/api/projects', undefined, orgHint ? { 'X-Drafted-Org': orgHint } : NO_ORG_SCOPE);
   const list = Array.isArray(data?.projects) ? data.projects : [];
   const norm = (s) => String(s || '').toLowerCase();
   for (let i = 1; i < parts.length; i++) {
@@ -3342,6 +3370,7 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
   title: z.string().optional().describe('[write + googleType] title for a new native file'),
   ops: z.array(z.any()).optional().describe('[edit] hashline ops for text frames. Apply ONLY against a fresh fs(read) of the frame: each op = {type, lineHash, newContent} where type is one of replace | delete | insertAfter | insertBefore, and lineHash is the FULL anchor from the read output (line number + hash, e.g. the token left of the |, like 42srt) — NOT a bare hash. delete/replace consume the target line; at most one replace/delete per line per edit (combine into one replace). If an op targets a line that changed since read it is rejected — re-read and retry. Element ops for excalidraw ({id,x,y,...}), or structured ops for office'),
   state: z.any().optional().describe('[write] app-frame state (JSON) to persist for a deployed windowType:"app" frame; the canvas hydrates the app from it on load. Max 64KB.'),
+  expectedUpdatedAt: z.string().optional().describe('[write] optimistic concurrency: the frame\'s updatedAt as you last read it. If somebody else wrote since, the write is refused with code "conflict" and the current version, instead of silently overwriting their change. Omit for a blind write.'),
   metadata: z.any().optional().describe('[write] JSON metadata to attach to the written frame (e.g. {"tour": {title, auto?, steps}} to define a guided tour on this frame). Max 64KB.'),
   readme: z.string().optional().describe('[write] README.md markdown for a skill at /o/<org>/skills/<slug> — optional on both create and update. Stored as a supporting skill file so the skill directory renders a landing page on GitHub when exported; a skill created without one is returned with a warning, never rejected. Equivalent to a later fs(write, path="/o/<org>/skills/<slug>/README.md").'),
   position: z.number().int().min(0).optional().describe('[mv] on a LAYER path, no `to`: move the layer to this 0-based index in the project\'s layer order (0 = first; `ls` of the project shows the order). A layer born from a first write is appended last, so use this to pin one first.'),
@@ -3353,7 +3382,7 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
   org: z.string().optional().describe('Org (id or name) for bare /wiki and /skills paths (org-scoped /o/<org>/... paths don\'t need it). Per-request only; project paths self-derive org from the project row.'),
   projectId: PROJECT_OVERRIDE_PARAM,
 }, async (args) => {
-  const { action, path: rawPath, to: rawTo, query, content, file_path, base64, googleType, title, ops, state, metadata, readme, recursive, pattern, lines, org } = args;
+  const { action, path: rawPath, to: rawTo, query, content, file_path, base64, googleType, title, ops, state, metadata, expectedUpdatedAt, readme, recursive, pattern, lines, org } = args;
   // Org-scoped path (Shape A): /o/<org>/<root>/... — strip the org segment here,
   // carry it as the per-request org scope (orgHeader), validate per-root below.
   // The PATH is the address; the org= param is legacy for bare roots only, and a
@@ -3631,7 +3660,7 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
     // (/o/<org>/projects/eng/x). The chain wins when both are given.
     const projectFolder = folder || (parts.length === 2 ? parts[0] : null);
     const projectRef = parts[parts.length - 1];
-    const existing = await resolveProjectRef(projectRef).catch(() => null);
+    const existing = await resolveProjectRef(projectRef, orgFromPath || org || null).catch(() => null);
     if (existing) return err(new Error(`project already exists: ${projectRef}`));
     const projectName = projectRef.replace(/[-_]/g, ' ').replace(/\b\w/g, c => c.toUpperCase());
     const created = await api('POST', '/api/projects', { name: projectName, ...(projectFolder ? { folder: projectFolder } : {}) }, orgHeader);
@@ -3925,7 +3954,14 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
       // Archived projects live in the Archive bin and are hidden from the agent's
       // active list — mirroring the web UI. An org-scoped root lists ONLY that
       // org's projects (Shape A).
-      const listing = await api('GET', '/api/projects');
+      //
+      // Fetch in the org the PATH names, not the one this session happens to be
+      // working in. api() stamps the working org on every request, so the
+      // unfiltered call came back as the working org's projects and the org
+      // filter below then removed every one of them: `ls /o/<other-org>/projects`
+      // answered "no projects" for an org with 265. Unscoped when the path names
+      // no org, which is what makes `/projects` the whole inventory again.
+      const listing = await api('GET', '/api/projects', undefined, orgFromPath ? { 'X-Drafted-Org': orgFromPath } : NO_ORG_SCOPE);
       let rows = (Array.isArray(listing?.projects) ? listing.projects : []).filter(x => !isTrashedRow(x));
       if (orgFromPath) {
         const kept = [];
@@ -4014,9 +4050,11 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
     // every failure as "project not found", so a gated session or an unreachable
     // server reads as a missing project.
     let lookupError = null;
-    let pathProject = await resolveProjectRef(projectRef).catch((e) => { lookupError = e; return null; });
+    // The org from the path rides the lookup: without it a project in another
+    // org was invisible and every write to it answered "project not found".
+    let pathProject = await resolveProjectRef(projectRef, orgFromPath || org || null).catch((e) => { lookupError = e; return null; });
     if (!pathProject?.id && parts.length > 1) {
-      const found = await resolveFolderQualifiedProject(parts);
+      const found = await resolveFolderQualifiedProject(parts, orgFromPath || org || null);
       if (found) { projectRef = parts[found.index]; tail = parts.slice(found.index + 1); pathProject = found.meta; }
     }
     if (!pathProject?.id && lookupError) return err(lookupError);
@@ -4057,9 +4095,9 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
       const segs = clean.replace(/^projects\/?/, '').split('/').filter(Boolean);
       if (!segs.length) throw new Error('destination needs a project: /o/<org>/projects/<project>/...');
       let idx = 0;
-      let meta = await resolveProjectRef(segs[0]).catch(() => null);
+      let meta = await resolveProjectRef(segs[0], orgFromPath || org || null).catch(() => null);
       if (!meta?.id && segs.length > 1) {
-        const found = await resolveFolderQualifiedProject(segs);
+        const found = await resolveFolderQualifiedProject(segs, orgFromPath || org || null);
         if (found) { idx = found.index; meta = found.meta; }
       }
       if (!meta?.id) throw new Error(`destination project not found: ${segs.join('/')} — list projects with fs(ls, path="/o/<org>/projects")`);
@@ -4215,6 +4253,7 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
           else if (base64) body.base64 = base64;
           else return err(new Error('write requires one of content / file_path / base64 / googleType / state'));
           if (metadata !== undefined) body.metadata = metadata;
+          if (expectedUpdatedAt) body.expectedUpdatedAt = expectedUpdatedAt;
           const result = await api('PUT', `/api/fs/${filePath}`, body, orgHeader);
           if (state !== undefined && result?.id) {
             try { await api('POST', `/api/file/${result.id}/state`, { state }); } catch { /* state best-effort */ }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drafted",
-  "version": "1.24.1",
+  "version": "1.24.2",
   "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",
   "bin": {