drafted 1.17.8 → 1.17.10

package/mcp/server.mjs

@@ -2678,7 +2678,11 @@ tool('fs', 'Navigate Drafted like a local filesystem. An org is the top folder:
       }
       case 'read': {
         const canonPath = wikiPath.replace(/\.md$/, '');
-        const page = await api('GET', `/api/wiki/page?path=${encodeURIComponent(canonPath)}&raw=true`, undefined, orgHeader);
+        // hashline-annotated (read → edit stays surgical), like frames; lines
+        // honors partial reads. raw=true keeps it body-only (no synthesized
+        // frontmatter) so ops anchor to the same bytes /edit applies against.
+        const q = `&raw=true&format=hashline${lines ? `&lines=${encodeURIComponent(lines)}` : ''}`;
+        const page = await api('GET', `/api/wiki/page?path=${encodeURIComponent(canonPath)}${q}`, undefined, orgHeader);
         if (!page?.content) return err(new Error(`wiki page not found: ${canonPath}`));
         return ok(page.content);
       }
@@ -2704,20 +2708,37 @@ tool('fs', 'Navigate Drafted like a local filesystem. An org is the top folder:
         return ok(result);
       }
       case 'rm': {
-        // Soft delete: move the page under archive/ (agents never hard-delete;
-        // the web UI offers permanent delete in the archive). mv cascades
-        // inbound refs, so links keep working into the archive.
+        // Live page → soft delete: move it under archive/ (mv cascades inbound
+        // refs, so links keep working into the archive). Already-archived page
+        // → hard purge: it IS the trash (the web UI offers permanent delete
+        // there), and without it an occupied archive slot had no escape hatch
+        // via MCP — the old behavior self-moved (from == to) and reported "as
+        // if nothing happened" while the server renamed the row to its own
+        // collision suffix.
         const canonPath = wikiPath.replace(/\.md$/, '');
-        const archivePath = canonPath.startsWith('archive/') ? canonPath : `archive/${canonPath}`;
         const page = await api('GET', `/api/wiki/page?path=${encodeURIComponent(canonPath)}`, undefined, orgHeader).catch(() => null);
         if (!page?.id) return err(new Error(`wiki page not found: ${canonPath}`));
+        if (canonPath.startsWith('archive/')) {
+          const del = await api('DELETE', `/api/wiki/pages/${page.id}`, undefined, orgHeader);
+          return ok({ deleted: true, path: canonPath, ...(del && del.deleted ? { id: del.deleted } : {}) });
+        }
+        const archivePath = `archive/${canonPath}`;
         const result = await api('PATCH', `/api/wiki/pages/${page.id}/move`, { path: archivePath }, orgHeader);
-        return ok({ archived: true, from: canonPath, to: archivePath, ...(result?.referrersUpdated ? { referrersUpdated: result.referrersUpdated } : {}) });
+        // Report the server-authoritative final path — an occupied archive slot
+        // auto-suffixes (-old), and the response must match the DB, not guess.
+        return ok({ archived: true, from: canonPath, to: result?.path || archivePath, ...(result?.referrersUpdated ? { referrersUpdated: result.referrersUpdated } : {}) });
       }
       case 'search': {
+        // The gate means "consult the wiki before project writes". Only an
+        // actual search with a real query counts — not the call itself.
+        const q = String(query || '').trim();
+        if (!q) return ok('(provide a query — e.g. fs(search, path="/wiki", query="<terms>"))');
+        const pages = await api('GET', `/api/wiki/search?q=${encodeURIComponent(q)}`, undefined, orgHeader);
+        // Server responds { hits: [...] } — earlier code read .pages/.results,
+        // which are never present, so every MCP wiki search reported empty.
+        const hits = pages?.hits || pages?.pages || pages?.results || [];
         markSearched(gs, 'wiki');
-        const pages = await api('GET', `/api/wiki/search?q=${encodeURIComponent(query || '')}`, undefined, orgHeader);
-        return ok(formatWikiIndex(pages?.pages || pages?.results || []));
+        return ok(formatWikiIndex(hits));
       }
       default:
         return err(new Error(`fs ${action} not supported for /wiki`));
@@ -2732,6 +2753,11 @@ tool('fs', 'Navigate Drafted like a local filesystem. An org is the top folder:
     }
     switch (action) {
       case 'ls': {
+        // A specific slug is a targeted ls: just that skill, not the whole root.
+        if (slug) {
+          const s = await api('GET', `/api/skills/slug/${slug}`, undefined, orgHeader).catch(() => null);
+          return ok(s ? [{ slug: s.slug, name: s.name, description: s.description }] : []);
+        }
         const list = await api('GET', '/api/skills', undefined, orgHeader);
         const skills = Array.isArray(list) ? list : (list?.skills || []);
         return ok(skills.map(s => ({ slug: s.slug, name: s.name, description: s.description })));
@@ -2828,6 +2854,25 @@ tool('fs', 'Navigate Drafted like a local filesystem. An org is the top folder:
       projectRef = parts[0]; // /projects/<project>
     }
 
+    // fs grammar: the project comes from the PATH, not the shared session
+    // binding — scope the whole call to the path's project (request-local, per
+    // the DRAFT-36 addressing invariant). Without this, /api/fs falls back to
+    // the session's active project (the user's shared row any browser tab or
+    // parallel agent can rewrite), so ls/read/write silently touched the wrong
+    // project and "fixed itself" when something re-bound — the under-reporting
+    // churn reported from the MJ Directive org.
+    if (projectRef) {
+      const pathProject = await resolveProjectRef(projectRef).catch(() => null);
+      if (!pathProject?.id) return err(new Error(`project not found: ${projectRef}`));
+      // An org-scoped path must name a project of that org — never a same-named
+      // project from another org (the path is both address and guardrail).
+      if (orgFromPath && !(await pathOrgMatches(orgFromPath, pathProject))) {
+        return err(new Error(`project ${projectRef} is not in org ${orgFromPath}`));
+      }
+      getState().projectId = pathProject.id;
+      getState().projectMeta = pathProject;
+    }
+
     const run = async () => {
       const hasFile = layer && filename;
       // Layer-root file (lane null) hits the server's 2-segment route.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drafted",
-  "version": "1.17.8",
+  "version": "1.17.10",
   "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": [