drafted 1.17.7 → 1.17.9

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,15 +2708,25 @@ 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': {
         markSearched(gs, 'wiki');

package/package.json

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

package/src/shared/excalidraw.mjs

@@ -1,5 +1,24 @@
 export const EXCALIDRAW_MIME = 'application/vnd.excalidraw+json';
 
+// Linear elements (arrow/line/freedraw) REQUIRE a `points` array — Excalidraw's scene
+// restore reads points.length and crashes ("Cannot read properties of undefined (reading
+// 'length')") → eternal "Loading scene" spinner. Hand-authored/agent-written scenes
+// routinely omit it (source: "https://excalidraw.com", ids like "el1"), so repair it
+// here: every read (serve) and write path funnels through normalizeExcalidrawScene, so
+// existing broken frames open and new bad writes are fixed before they land.
+const LINEAR_ELEMENT_TYPES = new Set(['arrow', 'line', 'freedraw']);
+
+function repairLinearElement(el) {
+  if (!LINEAR_ELEMENT_TYPES.has(el.type)) return el;
+  const pts = el.points;
+  const valid = Array.isArray(pts) && pts.length > 0 &&
+    pts.every((p) => Array.isArray(p) && p.length >= 2 && typeof p[0] === 'number' && typeof p[1] === 'number');
+  if (valid) return el;
+  const w = typeof el.width === 'number' && el.width > 0 ? el.width : 1;
+  const h = typeof el.height === 'number' && el.height > 0 ? el.height : 0;
+  return { ...el, points: [[0, 0], [w, h]] };
+}
+
 export function emptyExcalidrawScene() {
   return {
     type: 'excalidraw',
@@ -29,7 +48,7 @@ export function normalizeExcalidrawScene(input) {
     type: scene.type || 'excalidraw',
     version: scene.version || 2,
     source: scene.source || 'https://drafted.live',
-    elements: scene.elements,
+    elements: scene.elements.map(repairLinearElement).filter(Boolean),
     appState,
     files,
   };

package/src/shared/test-excalidraw-merge.mjs

@@ -34,6 +34,19 @@ assert.deepStrictEqual(r.elements.map(e => e.id), ['b', 'c'], 'remove beats upse
 r = mergeExcalidrawElements(JSON.stringify(base), [{ id: 'e', type: 'text', x: 0 }]);
 assert.strictEqual(r.elements.length, 4, 'parses stored string content');
 
+// linear elements without points are repaired (Excalidraw crashes on restore otherwise)
+r = mergeExcalidrawElements({
+  ...base,
+  elements: [
+    { id: 'a1', type: 'arrow', x: 0, y: 0, width: 60, height: 0 },
+    { id: 'l1', type: 'line', x: 0, y: 0, width: 0, height: 0 },
+    { id: 'ok', type: 'arrow', x: 0, y: 0, width: 10, height: 10, points: [[0, 0], [10, 10]] },
+  ],
+}, []);
+assert.deepStrictEqual(r.elements[0].points, [[0, 0], [60, 0]], 'arrow points synthesized from width');
+assert.deepStrictEqual(r.elements[1].points, [[0, 0], [1, 0]], 'degenerate line gets a fallback line');
+assert.deepStrictEqual(r.elements[2].points, [[0, 0], [10, 10]], 'valid points untouched');
+
 // upsert without id is rejected
 assert.throws(() => mergeExcalidrawElements(base, [{ x: 1 }]), /must be an object with an id/);