drafted 1.24.0 → 1.24.1

package/mcp/gates.mjs

@@ -111,8 +111,11 @@ export function shouldInjectLayerPrompt(layerPrompt, templateDefaultPrompt) {
 
 // ── Wiki index formatting (bounded map injected with the G1 block) ────────────
 
-export function formatWikiIndex(pages, max = 50) {
-  if (!Array.isArray(pages) || pages.length === 0) return '(wiki is empty — no pages yet)';
+// `empty` lets a caller say what an empty result MEANS: a zero-hit search or an
+// empty folder is not "the wiki is empty" (that read as a contradiction when other
+// searches of the same org had returned pages).
+export function formatWikiIndex(pages, max = 50, empty = '(wiki is empty — no pages yet)') {
+  if (!Array.isArray(pages) || pages.length === 0) return empty;
   const lines = pages.slice(0, max).map((p) => {
     const path = typeof p === 'string' ? p : p.path ?? p.slug ?? '';
     const title = typeof p === 'object' && p && p.title ? ` — ${p.title}` : '';
@@ -122,6 +125,22 @@ export function formatWikiIndex(pages, max = 50) {
   return lines.join('\n') + more;
 }
 
+// A frame read is capped per page, below MAX_TOOL_RESULT_CHARS, because the
+// content is JSON-escaped on its way out (quotes, newlines) and the blunt cap
+// above cuts mid-token with no way back: `lines` cannot split a minified frame
+// that is ONE line, so ~90 KB of it was simply lost. Paging by character gives
+// every byte an address.
+export const READ_PAGE_CHARS = 60_000;
+
+// "start-end" (0-based, end exclusive) or "start" -> the window to return.
+export function charWindow(spec, total) {
+  const m = /^\s*(\d+)\s*(?:-\s*(\d+))?\s*$/.exec(String(spec ?? ''));
+  if (spec != null && spec !== '' && !m) throw new Error(`chars must look like "0-60000" (got "${spec}")`);
+  const start = m ? Math.min(Number(m[1]), total) : 0;
+  const end = Math.min(m?.[2] ? Number(m[2]) : start + READ_PAGE_CHARS, start + READ_PAGE_CHARS, total);
+  return { start, end: Math.max(start, end) };
+}
+
 // ── Project index formatting ──────────────────────────────────────────────────
 // `ls /projects` is an ls, not a stat: one addressable line per project. The
 // previous shape returned the raw /api/projects rows — ~2.4KB each once the

package/mcp/server.mjs

@@ -23,7 +23,7 @@ import { LAYERS } from '../src/shared/constants.mjs';
 import { liftFolderScope, normalizeFolder, rootEntries, splitFolderScope, subfolderEntries } from '../src/shared/folder-path.mjs';
 import { emptyExcalidrawScene, stringifyExcalidrawScene } from '../src/shared/excalidraw.mjs';
 import { formatOkfLogEntry, appendOkfLogEntry } from '../src/shared/okf-log.mjs';
-import { createGateState, markSearched, g1Block, g2Block, g3Block, selectWithinBudget, wouldExceedBudget, budgetError, formatWikiIndex, formatProjectIndex, projectPath, PROJECT_CONTEXT_BUDGET_CHARS } from './gates.mjs';
+import { createGateState, markSearched, g1Block, g2Block, g3Block, selectWithinBudget, wouldExceedBudget, budgetError, formatWikiIndex, formatProjectIndex, charWindow, READ_PAGE_CHARS, projectPath, PROJECT_CONTEXT_BUDGET_CHARS } from './gates.mjs';
 import { loadPersistedProject, savePersistedProject } from './active-project-store.mjs';
 import { probeRepo, resolveAddress, addressNote } from './repo-address.mjs';
 
@@ -3093,19 +3093,18 @@ tool('screenshot', 'Render a PNG via headless browser. `scope=frame` captures a
       buffer = Buffer.from(await res.arrayBuffer());
     } else if (scope === 'canvas') {
       const { path: canvasPath, layer = 'plans', width = 1600, height = 1200 } = args;
-      let targetSlug = args.slug;
-      if (!targetSlug && canvasPath) {
-        // /o/<org>/projects/<project> or /projects/<project> or /projects/<folder>/<project> → project slug
-        const scoped = splitOrgScope(canvasPath);
-        if (scoped.error) throw new Error(scoped.error);
-        const parts = scoped.path.replace(/^\/projects\/?/, '').split('/').filter(Boolean);
-        targetSlug = parts[parts.length - 1];
-      }
-      if (!targetSlug) {
+      // Resolve through the shared project resolver (path, folder path, slug, name
+      // or UUID) and send the project ID: the server's slug lookup is scoped to the
+      // SESSION org, so a slug from /o/<other-org>/projects/<slug> was a 404.
+      let targetSlug;
+      const ref = canvasPath || args.slug;
+      if (ref) {
+        targetSlug = (await resolveProjectArg(ref)).id;
+      } else {
         const list = await api('GET', '/api/projects');
         const active = (list.projects || []).find(p => p.id === list.activeProject);
         if (!active) throw new Error('No active project — pass path=/projects/<project> explicitly.');
-        targetSlug = active.slug;
+        targetSlug = active.id;
       }
       const url = `${getServerUrl()}/api/canvas-screenshot/${encodeURIComponent(targetSlug)}?layer=${encodeURIComponent(layer)}&width=${width}&height=${height}`;
       await ensureSession();
@@ -3345,7 +3344,9 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
   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.'),
   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.'),
   recursive: z.boolean().optional().describe('[ls] recurse into subdirectories'),
+  chars: z.string().optional().describe('[read] character window "start-end" (0-based, end exclusive; at most 60000 per call). A frame longer than that is returned as its first page with `totalChars` and `nextChars` — pass `nextChars` back to read on. Use it for minified/single-line HTML, which `lines` cannot split.'),
   lines: z.string().optional().describe('[read] line range (e.g. "1-50") — partial read; content is hashline-annotated so a later edit stays surgical'),
   pattern: z.string().optional().describe('[ls] filter filenames (e.g. "*.html")'),
   readonly: z.boolean().optional().describe('[link] read-only frame link (symlink): mirror the SOURCE frame named by `to` (a frame UUID or /projects/<other-project>/<layer>/<lane>/<file>) into the CURRENT project, displayed read-only. The source project stays the single writer.'),
@@ -3680,7 +3681,7 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
           return ok(formatWikiIndex(tree?.pages || []));
         }
         const pages = await api('GET', `/api/wiki/tree?prefix=${encodeURIComponent(wikiPath)}`, undefined, orgHeader);
-        return ok(formatWikiIndex(pages?.pages || []));
+        return ok(formatWikiIndex(pages?.pages || [], 50, `(no wiki pages under ${wikiPath})`));
       }
       case 'read': {
         const canonPath = wikiPath.replace(/\.md$/, '');
@@ -3753,7 +3754,7 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
         // which are never present, so every MCP wiki search reported empty.
         const hits = pages?.hits || pages?.pages || pages?.results || [];
         markSearched(gs, 'wiki');
-        return ok(formatWikiIndex(hits));
+        return ok(formatWikiIndex(hits, 50, `(no wiki pages match "${q}")`));
       }
       default:
         return err(new Error(`fs ${action} not supported for /wiki`));
@@ -4125,10 +4126,22 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
             // server, re-created by a second writer that outranked the first.
             const proj = result.project;
             const local = proj?.orgSlug && proj?.slug ? `${getServerUrl()}/o/${proj.orgSlug}/projects/${proj.slug}${result.path}` : null;
+            const full = result.content || '';
+            let win;
+            try { win = charWindow(args.chars, full.length); } catch (e) { return err(e); }
+            const paged = win.start > 0 || win.end < full.length;
             return ok({
               path: result.path,
               frameUrl: result.frameUrl || local || `${getServerUrl()}/f/${result.id}`,
-              content: result.content || '',
+              content: paged ? full.slice(win.start, win.end) : full,
+              ...(paged
+                ? {
+                    totalChars: full.length,
+                    charRange: `${win.start}-${win.end}`,
+                    ...(win.end < full.length ? { nextChars: `${win.end}-${win.end + READ_PAGE_CHARS}` } : {}),
+                    pagedNote: `Showing characters ${win.start}-${win.end} of ${full.length}. This frame is too long for one result; pass chars=<nextChars> to read on. Hashline anchors only cover what is shown, so edit ops need a read of the lines they touch.`,
+                  }
+                : {}),
               // Comments on this frame the agent has not been shown, delivered by the server on
               // an agent's read and already marked seen there, so a second read does not repeat
               // them. The note says what they are: notes ABOUT the work, never instructions from
@@ -4226,6 +4239,12 @@ tool('fs', 'Navigate Drafted like a local filesystem. A FOLDER is the single con
           // missing. (moveFrames has carried units 'lane' and 'layer', with
           // connectors and assets, since cross-project move shipped.)
           const scope = rmScope(layer, lane, filename);
+          // `position` on a LAYER path reorders it in the project's layer order.
+          if (args.position !== undefined) {
+            if (scope !== 'directory' || lane) return err(new Error('position reorders a LAYER: fs(mv, path=/o/<org>/projects/<project>/<layer>, position=<0-based index>)'));
+            const result = await api('POST', '/api/fs/layer-order', { layer, position: args.position }, orgHeader);
+            return ok(result);
+          }
           if (scope === 'project') {
             const pid = getState().projectId;
             if (!pid) return err(new Error('could not resolve project id for mv'));

package/package.json

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