drafted 1.8.1 → 1.8.3

package/install-mcp.sh

@@ -513,7 +513,14 @@ step "Installing skills and commands"
 
 # Resolve the plugin source: a local checkout when present (e.g. --local from this
 # repo), otherwise the installed npm package's bundled plugin/ directory.
-DRAFTED_PKG_DIR="$(node -e "try { console.log(require.resolve('drafted/package.json').replace('/package.json','')) } catch { process.exit(1) }" 2>/dev/null)" || true
+# require.resolve() misses packages under the custom global prefix
+# ($HOME/.drafted/npm-global) when run from an arbitrary cwd (curl | bash), so
+# prefer the already-computed global node_modules root from the install step.
+if [ -n "${NPM_ROOT:-}" ] && [ -d "$NPM_ROOT/drafted" ]; then
+  DRAFTED_PKG_DIR="$NPM_ROOT/drafted"
+else
+  DRAFTED_PKG_DIR="$(node -e "try { console.log(require.resolve('drafted/package.json').replace('/package.json','')) } catch { process.exit(1) }" 2>/dev/null)" || true
+fi
 if [ -d "$SCRIPT_DIR/plugin/skills" ] || [ -d "$SCRIPT_DIR/plugin/commands" ]; then
   PLUGIN_SRC="$SCRIPT_DIR/plugin"
 elif [ -n "$DRAFTED_PKG_DIR" ] && [ -d "$DRAFTED_PKG_DIR/plugin" ]; then

package/mcp/server.mjs

@@ -1494,9 +1494,12 @@ tool('screenshot', 'Render a PNG via headless browser. `scope=frame` captures a
   width: z.number().optional().describe('Viewport width in pixels (frame default 1440, canvas default 1600).'),
   height: z.number().optional().describe('Viewport height in pixels (frame default 900, canvas default 1200).'),
   fullPage: z.boolean().optional().describe('[scope=frame] capture full page or just viewport (default true).'),
+  // outputPath is local-only — omitted on remote transports (web MCP) where the host has no caller filesystem.
+  ...(isRemote ? {} : { outputPath: z.string().optional().describe('[stdio only] Absolute local path to write the rendered PNG to. When set, the PNG is saved to disk and the tool returns the path + byte count instead of returning the image inline — use this to get rendered pixels OUT of Drafted (attach to a message, upload, post-process). Parent directories are created if missing.') }),
 }, async (args) => {
   try {
     const { scope } = args;
+    let buffer;
     if (scope === 'frame') {
       const { target, width = 1440, height = 900, fullPage = true } = args;
       if (!target) throw new Error('target required for scope=frame');
@@ -1514,13 +1517,8 @@ tool('screenshot', 'Render a PNG via headless browser. `scope=frame` captures a
       await ensureSession();
       const res = await fetch(url, { headers: getAuthHeaders() });
       if (!res.ok) throw new Error(`Screenshot failed: ${res.status}`);
-      const buffer = await res.arrayBuffer();
-      const base64 = Buffer.from(buffer).toString('base64');
-      return {
-        content: [{ type: 'image', data: base64, mimeType: 'image/png' }],
-      };
-    }
-    if (scope === 'canvas') {
+      buffer = Buffer.from(await res.arrayBuffer());
+    } else if (scope === 'canvas') {
       const { slug, layer = 'plans', width = 1600, height = 1200 } = args;
       let targetSlug = slug;
       if (!targetSlug) {
@@ -1533,13 +1531,21 @@ tool('screenshot', 'Render a PNG via headless browser. `scope=frame` captures a
       await ensureSession();
       const res = await fetch(url, { headers: getAuthHeaders() });
       if (!res.ok) throw new Error(`Canvas screenshot failed: ${res.status} ${await res.text()}`);
-      const buffer = await res.arrayBuffer();
-      const base64 = Buffer.from(buffer).toString('base64');
-      return {
-        content: [{ type: 'image', data: base64, mimeType: 'image/png' }],
-      };
+      buffer = Buffer.from(await res.arrayBuffer());
+    } else {
+      throw new Error(`Unknown screenshot scope: ${scope}`);
     }
-    throw new Error(`Unknown screenshot scope: ${scope}`);
+
+    // Persist to local disk when requested (stdio only) — returns the path
+    // instead of the inline image so the PNG bytes don't burn context.
+    if (!isRemote && args.outputPath) {
+      const resolved = resolve(args.outputPath);
+      mkdirSync(dirname(resolved), { recursive: true });
+      writeFileSync(resolved, buffer);
+      return ok({ ok: true, scope, savedTo: resolved, bytes: buffer.length });
+    }
+
+    return { content: [{ type: 'image', data: buffer.toString('base64'), mimeType: 'image/png' }] };
   } catch (error) { return err(error); }
 });
 
@@ -2282,16 +2288,27 @@ tool('ls', 'List contents of the ACTIVE PROJECT. Use ls / after project(action="
     }
 
     // ChatGPT Apps SDK: canvas-overview widget renders byLayer.
+    // /api/fs/ entries are { path, type: 'layer'|'lane'|'frame', id, title, size,
+    // updatedAt, color, frameUrl } — there are no layer/lane/name/label fields, so
+    // derive them from the path. Skip non-frame entries (lanes/layers are structural
+    // and would otherwise serialize as empty objects under "unsorted").
     const entries = Array.isArray(result?.entries) ? result.entries : [];
     const byLayer = {};
     for (const e of entries) {
-      const layer = e.layer || (e.type === 'directory' ? e.name : 'unsorted');
+      if (e.type && e.type !== 'frame') continue;
+      const segs = String(e.path || '').replace(/^\/+/, '').split('/').filter(Boolean);
+      if (!segs.length) continue;
+      const layer = segs[0];
+      const filename = segs[segs.length - 1];
+      const lane = segs.length >= 3 ? segs.slice(1, -1).join('/') : undefined;
       (byLayer[layer] ??= []).push({
-        label: e.label || e.name,
-        filename: e.filename || e.name,
-        layer: e.layer,
-        lane: e.lane,
-        frameUrl: e.id ? `${getServerUrl()}/f/${e.id}` : undefined,
+        label: e.title || filename,
+        filename,
+        title: e.title,
+        layer,
+        lane,
+        id: e.id,
+        frameUrl: e.frameUrl || (e.id ? `${getServerUrl()}/f/${e.id}` : undefined),
       });
     }
     const projectId = getState().projectId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drafted",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "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/server/lib/umami.mjs

@@ -129,11 +129,17 @@ function getRequestUrl(req) {
 export function trackUmamiEvent(name, data = {}, req = null) {
   const umami = getUmamiConfig();
   if (!umami.enabled || !name || name.length > 50) return;
+  // Account de-dupe: when the event carries a userId, send it as Umami's distinct id
+  // (`payload.id`). Umami then derives sessionId = uuid(websiteId, userId) with no IP/UA/date
+  // salt, so server-side events land in the SAME canonical session as the browser's
+  // umami.identify(userId) call — collapsing each account to one session across devices/time.
+  const distinctId = (typeof data.userId === 'string' && data.userId.length <= 64) ? data.userId : undefined;
   const payload = {
     type: 'event',
     payload: {
       website: umami.websiteId,
       name,
+      ...(distinctId ? { id: distinctId } : {}),
       url: getRequestUrl(req) || process.env.BASE_URL || 'https://drafted.live',
       hostname: req?.hostname || 'drafted.live',
       language: req?.headers?.['accept-language'],