@1agh/maude 0.16.0 → 0.17.2

package/plugins/design/dev-server/build.ts

@@ -15,8 +15,8 @@
 //
 // Per DDR-009 (Bun runtime authoritative) + DDR-012 (React 19 unified) + DDR-014 (Lightning CSS).
 
-import { existsSync, mkdirSync } from 'node:fs';
-import { dirname, join, resolve } from 'node:path';
+import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs';
+import { dirname, join, relative, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 import { browserslistToTargets, bundle as lcssBundle } from 'lightningcss';
@@ -122,14 +122,117 @@ async function buildCss(): Promise<{ outBytes: number; outPath: string }> {
 
 // ---------- (c) Server binary (bun build --compile, per-platform) ----------
 
+// Per-target oxc-parser binding embed. Bun 1.3.4+ regressed `--compile` NAPI
+// native-binding embedding (see DDR-042-oxc-parser-bun-compile-workaround.md).
+// `with { type: 'file' }` requires a literal string path, so we generate one
+// thin entry file per --target whose only purpose is to (1) embed the matching
+// platform binding as an asset, (2) set NAPI_RS_NATIVE_LIBRARY_PATH from the
+// runtime virtual path, then (3) hand off to the real server.ts. ESM
+// evaluation order guarantees the env var is set before any downstream module
+// touches oxc-parser.
+
+// oxc-parser's NAPI-RS binding packages use a richer slug than our build
+// target slug — Linux needs the libc kind suffix, Windows needs the toolchain
+// suffix. Mirrored from oxc-parser/src-js/bindings.js loader cases.
+function oxcBindingSlug(slug: string): string {
+  if (slug === 'linux-x64') return 'linux-x64-gnu';
+  if (slug === 'linux-arm64') return 'linux-arm64-gnu';
+  if (slug === 'win32-x64') return 'win32-x64-msvc';
+  // darwin-arm64 / darwin-x64 / linux-x64-musl / linux-arm64-musl already match.
+  return slug;
+}
+
+// npm/bun's installer respects each package's `os`/`cpu` fields and skips
+// platform sub-packages whose filter doesn't match the host (the bindings
+// declare e.g. `"cpu": ["x64"]`). For cross-compile targets — most notably
+// darwin-x64 built on a darwin-arm64 CI runner — this means the matching
+// `@oxc-parser/binding-<oxcSlug>` is NOT in node_modules even though it's
+// listed as a direct devDependency. Fetch + extract the tarball manually so
+// `with { type: 'file' }` resolution succeeds during `bun build --compile`.
+async function ensureBindingForTarget(oxcSlug: string): Promise<void> {
+  const bindingDir = join(ROOT, 'node_modules', '@oxc-parser', `binding-${oxcSlug}`);
+  const bindingFile = join(bindingDir, `parser.${oxcSlug}.node`);
+  if (existsSync(bindingFile)) return; // host install already placed it
+
+  // Read the installed oxc-parser version so the tarball URL stays in sync.
+  // Walk up from build.ts to find the workspace-visible oxc-parser package.json
+  // (pnpm hoists it under node_modules/.pnpm, then symlinks at workspace level).
+  let oxcVersion = '0.131.0';
+  const candidates = [
+    join(ROOT, 'node_modules', 'oxc-parser', 'package.json'),
+    join(ROOT, '..', '..', '..', 'node_modules', 'oxc-parser', 'package.json'),
+  ];
+  for (const c of candidates) {
+    if (existsSync(c)) {
+      oxcVersion = JSON.parse(readFileSync(c, 'utf8')).version;
+      break;
+    }
+  }
+
+  console.log(`[build] cross-compile: fetching @oxc-parser/binding-${oxcSlug}@${oxcVersion}`);
+  const tarballUrl = `https://registry.npmjs.org/@oxc-parser/binding-${oxcSlug}/-/binding-${oxcSlug}-${oxcVersion}.tgz`;
+  const response = await fetch(tarballUrl);
+  if (!response.ok) {
+    throw new Error(`failed to fetch ${tarballUrl}: HTTP ${response.status}`);
+  }
+  const tmpTgz = join(ROOT, `.binding-${oxcSlug}.tgz`);
+  await Bun.write(tmpTgz, await response.arrayBuffer());
+  mkdirSync(bindingDir, { recursive: true });
+  // npm pack output: `package/parser.<oxcSlug>.node` + `package/package.json`.
+  // --strip-components=1 drops the leading `package/` so files land in bindingDir.
+  const tarProc = Bun.spawn(['tar', 'xf', tmpTgz, '-C', bindingDir, '--strip-components=1'], {
+    stdout: 'inherit',
+    stderr: 'inherit',
+  });
+  const tarCode = await tarProc.exited;
+  if (tarCode !== 0)
+    throw new Error(`tar extraction failed for binding-${oxcSlug} (exit ${tarCode})`);
+  unlinkSync(tmpTgz);
+}
+
+export function writeCompileEntry(target: PlatformTarget): string {
+  const slug = platformSlug(target);
+  const oxcSlug = oxcBindingSlug(slug);
+  const entryDir = join(DIST, '.compile-entries');
+  mkdirSync(entryDir, { recursive: true });
+
+  // ESM hoists `import` statements above top-level code, so the env-var
+  // assignment MUST live in a separate leaf module that's imported BEFORE
+  // server.ts — otherwise server.ts (and transitively oxc-parser) evaluates
+  // first and reads NAPI_RS_NATIVE_LIBRARY_PATH before we set it.
+  const initPath = join(entryDir, `init-oxc-${slug}.ts`);
+  const entryPath = join(entryDir, `server-${slug}.ts`);
+  const bindingSpec = `@oxc-parser/binding-${oxcSlug}/parser.${oxcSlug}.node`;
+  const initContent = `// AUTO-GENERATED by build.ts — do not edit by hand.
+// Per-target oxc-parser binding embed (Bun 1.3.4+ --compile NAPI regression
+// workaround — see .ai/decisions/DDR-042-oxc-parser-bun-compile-workaround.md).
+// Side-effect module: must be imported BEFORE any oxc-parser usage.
+import bindingPath from ${JSON.stringify(bindingSpec)} with { type: 'file' };
+process.env.NAPI_RS_NATIVE_LIBRARY_PATH = bindingPath;
+`;
+  writeFileSync(initPath, initContent);
+
+  // Forward slashes for the import specifier even on Windows hosts — ESM uses
+  // POSIX-style paths, not the host's filesystem separator.
+  const realServerRel = relative(entryDir, join(ROOT, 'server.ts')).split('\\').join('/');
+  const entryContent = `// AUTO-GENERATED by build.ts — do not edit by hand.
+// Per-target compile entry — see DDR-042-oxc-parser-bun-compile-workaround.md.
+import './init-oxc-${slug}.ts';
+import ${JSON.stringify(realServerRel)};
+`;
+  writeFileSync(entryPath, entryContent);
+  return entryPath;
+}
+
 async function buildServerBinary(target: PlatformTarget): Promise<{ outPath: string }> {
   ensureDist();
   const slug = platformSlug(target);
   const ext = slug.startsWith('win32') ? '.exe' : '';
   const outPath = join(DIST, `maude-${slug}${ext}`);
-  const entry = join(ROOT, 'server.ts');
-  if (!existsSync(entry)) {
-    // T7 not landed yet — fall back to the .mjs entry so this script remains runnable mid-migration.
+  const realEntry = join(ROOT, 'server.ts');
+  if (!existsSync(realEntry)) {
+    // Legacy fallback — pre-DDR-009 .mjs path. Doesn't use oxc-parser, so the
+    // 1.3.4+ regression doesn't apply; entry stub generator is skipped.
     const legacy = join(ROOT, 'server.mjs');
     if (!existsSync(legacy)) throw new Error(`Neither server.ts nor server.mjs exists in ${ROOT}`);
     const proc = Bun.spawn(
@@ -150,6 +253,10 @@ async function buildServerBinary(target: PlatformTarget): Promise<{ outPath: str
       throw new Error(`bun build --compile (legacy) failed for ${target} (exit ${code})`);
     return { outPath };
   }
+  // Make sure the target's NAPI binding is on disk even if bun/npm's os/cpu
+  // filter skipped it (cross-compile case — see ensureBindingForTarget docs).
+  await ensureBindingForTarget(oxcBindingSlug(slug));
+  const entry = writeCompileEntry(target);
   const proc = Bun.spawn(
     [
       'bun',
@@ -262,6 +369,11 @@ async function main() {
   }
 }
 
-await main();
+// Only run the build when invoked directly — importers (e.g. the test suite,
+// which calls `writeCompileEntry` from build.ts) should not trigger a dev
+// build as a side effect.
+if (import.meta.main) {
+  await main();
+}
 
 export { buildClient, buildCss, buildServerBinary, PLATFORM_MATRIX, type PlatformTarget };

package/plugins/design/dev-server/canvas-lib.tsx

@@ -1182,7 +1182,6 @@ function DesignCanvasInner({ children, controls }: DesignCanvasProps) {
   );
 
   const showMiniMap = controls?.minimap !== false;
-  const showToolbar = controls?.toolbar !== false;
 
   // Drag-state bus (Phase 4.2). Single source of truth: only one artboard
   // drag is active at a time. DCArtboards write here when their local drag
@@ -1492,15 +1491,15 @@ const OVERLAY_CSS = `
   bottom: 16px;
   width: 196px;
   height: 132px;
-  background: var(--bg-1, rgba(255,255,255,0.98));
-  border: 1px solid var(--u-border-2, rgba(0,0,0,0.08));
-  border-radius: 8px;
-  font-family: ui-monospace, SFMono-Regular, Menlo, monospace;
+  background: var(--bg-2, var(--bg-1, rgba(255,255,255,0.98)));
+  border: 1px solid var(--fg-0, #1c1917);
+  border-radius: 0;
+  font-family: var(--font-mono, ui-monospace, SFMono-Regular, Menlo, monospace);
   font-size: 10px;
-  color: rgba(40,30,20,0.7);
+  color: var(--fg-1, rgba(40,30,20,0.7));
   z-index: 6;
   user-select: none;
-  box-shadow: 0 6px 24px rgba(0,0,0,0.08);
+  box-shadow: 4px 4px 0 var(--fg-0, #1c1917);
   overflow: hidden;
 }
 .dc-mm-hd {
@@ -1534,15 +1533,15 @@ const OVERLAY_CSS = `
   transform: translateX(-50%);
   display: flex;
   align-items: stretch;
-  background: rgba(255,255,255,0.94);
-  border: 1px solid rgba(0,0,0,0.12);
-  border-radius: 6px;
+  background: var(--bg-2, rgba(255,255,255,0.94));
+  border: 1px solid var(--fg-0, #1c1917);
+  border-radius: 0;
   overflow: hidden;
-  font-family: ui-monospace, SFMono-Regular, Menlo, monospace;
+  font-family: var(--font-mono, ui-monospace, SFMono-Regular, Menlo, monospace);
   font-size: 11px;
-  color: rgba(40,30,20,0.85);
+  color: var(--fg-1, rgba(40,30,20,0.85));
   z-index: 6;
-  box-shadow: 0 4px 16px rgba(0,0,0,0.06);
+  box-shadow: 4px 4px 0 var(--fg-0, #1c1917);
 }
 .dc-zoom-tb button {
   appearance: none;

package/plugins/design/dev-server/canvas-pipeline.ts

@@ -16,6 +16,11 @@
 // Toolchain matches scripts/migrate-canvases.ts (codemod) and canvas-edit.ts
 // (AST-aware /design:edit element edits) — same oxc-parser + magic-string pair
 // in three call sites, one mental model.
+//
+// `bun build --compile` requires a per-target entry stub that sets
+// NAPI_RS_NATIVE_LIBRARY_PATH before this file's transitive imports load
+// oxc-parser. The pipeline itself is unaware of the workaround — it's a
+// build-layer concern. See DDR-042-oxc-parser-bun-compile-workaround.md.
 
 import MagicString from 'magic-string';
 import { parseSync } from 'oxc-parser';

package/plugins/design/dev-server/canvas-shell.tsx

@@ -51,6 +51,7 @@ import {
   type MenuItem,
   useContextMenu,
 } from './context-menu.tsx';
+import { ExportDialogProvider } from './export-dialog.tsx';
 import { type HoverTarget, resolveHoverTarget, useInputRouter } from './input-router.tsx';
 import { ToolPalette } from './tool-palette.tsx';
 import {
@@ -203,9 +204,11 @@ function CanvasCore({
   );
 
   return (
-    <ContextMenuProvider registry={registry}>
-      <CanvasRouter hostRef={hostRef}>{children}</CanvasRouter>
-    </ContextMenuProvider>
+    <ExportDialogProvider>
+      <ContextMenuProvider registry={registry}>
+        <CanvasRouter hostRef={hostRef}>{children}</CanvasRouter>
+      </ContextMenuProvider>
+    </ExportDialogProvider>
   );
 }
 
@@ -263,6 +266,23 @@ function buildRegistry(deps: {
     onSelect: () => controller?.reset(),
   };
 
+  // Phase 6.5 — context-menu → ExportDialog. Each entry dispatches a custom
+  // event the dialog provider listens for; this avoids prop-drilling the
+  // dialog handle through every menu callback. The scope arg prefills the
+  // dialog's scope dropdown so the user lands on the right resolution.
+  const exportItem = (id: string, label: string, scope: string, shortcut?: string): MenuItem => ({
+    id,
+    label,
+    shortcut,
+    onSelect: () => {
+      try {
+        window.dispatchEvent(new CustomEvent('maude:open-export', { detail: { scope } }));
+      } catch {
+        /* non-window environments */
+      }
+    },
+  });
+
   return {
     element: [
       [
@@ -298,6 +318,7 @@ function buildRegistry(deps: {
           },
         },
       ],
+      [exportItem('export-selection', 'Export selection…', 'selection', '⌘E')],
       [
         {
           id: 'hide',
@@ -334,8 +355,15 @@ function buildRegistry(deps: {
         fitItem,
         resetItem,
       ],
+      [exportItem('export-artboard', 'Export this artboard…', 'artboard')],
+    ],
+    world: [
+      [fitItem, resetItem],
+      [
+        exportItem('export-canvas', 'Export canvas as separate…', 'canvas-as-separate'),
+        exportItem('export-project', 'Export project (ZIP)…', 'project-raw'),
+      ],
     ],
-    world: [[fitItem, resetItem]],
     overlay: [],
   };
 }

package/plugins/design/dev-server/client/app.jsx

@@ -1861,8 +1861,25 @@ function App() {
   const activeFileComments = (activePath && activePath !== SYSTEM_TAB) ? (commentsByFile[activePath] || []) : [];
   const totalOpen = totalCounts(commentsByFile).open;
 
+  // Suppress the native browser context menu across the shell — the canvas
+  // input-router already handles right-click inside the canvas host, but
+  // sidebar / menubar / statusbar / floating chrome would otherwise leak the
+  // native menu on top of our `.dc-context-menu` (or alone, outside canvas).
+  // Editable fields (search box, future text inputs) keep the native menu so
+  // copy/paste still works.
+  const onShellContextMenu = useCallback((e) => {
+    const t = e.target;
+    if (t && (t.tagName === 'INPUT' || t.tagName === 'TEXTAREA' || (t.isContentEditable))) {
+      return;
+    }
+    e.preventDefault();
+  }, []);
+
   return (
-    <div className={'app' + (commentsPanelOpen ? ' with-rsidebar' : '') + (sidebarOpen ? '' : ' no-sidebar')}>
+    <div
+      className={'app' + (commentsPanelOpen ? ' with-rsidebar' : '') + (sidebarOpen ? '' : ' no-sidebar')}
+      onContextMenu={onShellContextMenu}
+    >
       <Sidebar
         groups={groups}
         activePath={activePath}

package/plugins/design/dev-server/context-menu.tsx

@@ -74,6 +74,27 @@ function noop(name: string) {
   };
 }
 
+// Phase 6.5 T9 — export hooks. The default registry items use noop() so the
+// menu still renders when the dialog provider isn't mounted; consumers wire
+// real `openExport(scope)` callbacks by passing a custom registry to
+// <ContextMenuProvider extra>. Pattern matches the existing Phase 5 noop
+// affordances.
+function defaultExportItem(label: string, scopeHint: string): MenuItem {
+  return {
+    id: `export-${scopeHint}`,
+    label,
+    shortcut: scopeHint === 'selection' ? '⌘E' : undefined,
+    onSelect: () => {
+      const detail = { scope: scopeHint };
+      try {
+        window.dispatchEvent(new CustomEvent('maude:open-export', { detail }));
+      } catch {
+        /* SSR / non-window environments */
+      }
+    },
+  };
+}
+
 const DEFAULT_REGISTRY: ContextRegistry = {
   element: [
     [
@@ -82,6 +103,7 @@ const DEFAULT_REGISTRY: ContextRegistry = {
       { id: 'copy-id', label: 'Copy data-cd-id', onSelect: noop('copy-id') },
       { id: 'inspect', label: 'Inspect', shortcut: '⌥I', onSelect: noop('inspect') },
     ],
+    [defaultExportItem('Export selection…', 'selection')],
     [
       { id: 'hide', label: 'Hide', shortcut: '⌘⇧H', onSelect: noop('hide') },
       { id: 'lock', label: 'Lock', shortcut: '⌘⇧L', onSelect: noop('lock') },
@@ -92,6 +114,7 @@ const DEFAULT_REGISTRY: ContextRegistry = {
       { id: 'rename', label: 'Rename', shortcut: '↵', onSelect: noop('rename-artboard') },
       { id: 'duplicate', label: 'Duplicate', shortcut: '⌘D', onSelect: noop('duplicate-artboard') },
     ],
+    [defaultExportItem('Export this artboard…', 'artboard')],
     [
       { id: 'fit-one', label: 'Fit just this artboard', onSelect: noop('fit-one') },
       { id: 'reset-pos', label: 'Reset position', onSelect: noop('reset-artboard-pos') },
@@ -108,6 +131,10 @@ const DEFAULT_REGISTRY: ContextRegistry = {
       { id: 'fit-view', label: 'Fit to view', shortcut: '1', onSelect: noop('fit-view') },
       { id: 'reset-view', label: 'Reset view', shortcut: '⌘0', onSelect: noop('reset-view') },
     ],
+    [
+      defaultExportItem('Export project (ZIP)…', 'project-raw'),
+      defaultExportItem('Export canvas as separate…', 'canvas-as-separate'),
+    ],
   ],
   overlay: [],
 };
@@ -131,15 +158,15 @@ const MENU_CSS = `
 .dc-context-menu {
   position: fixed;
   z-index: 7;
-  background: var(--bg-1, #fff);
-  border: 1px solid var(--border-default, rgba(0,0,0,0.12));
-  border-radius: var(--radius-md, 6px);
-  box-shadow: var(--shadow-md, 0 8px 24px rgba(0,0,0,0.12));
+  background: var(--u-bg-2, var(--bg-1, #fff));
+  border: 1px solid var(--u-fg-0, #1c1917);
+  border-radius: 0;
+  box-shadow: 4px 4px 0 var(--u-fg-0, #1c1917);
   padding: 4px;
   min-width: 220px;
-  font: inherit;
+  font-family: var(--u-font-mono, ui-monospace, SFMono-Regular, Menlo, monospace);
   font-size: 12px;
-  color: var(--fg-0, rgba(20,15,10,0.92));
+  color: var(--u-fg-0, var(--fg-0, rgba(20,15,10,0.92)));
   user-select: none;
 }
 .dc-context-menu .dc-menu-sep {
@@ -152,8 +179,8 @@ const MENU_CSS = `
   justify-content: space-between;
   align-items: center;
   gap: 16px;
-  padding: 6px 10px;
-  border-radius: var(--radius-sm, 4px);
+  padding: 5px 12px;
+  border-radius: 0;
   cursor: pointer;
   background: transparent;
   border: 0;
@@ -164,7 +191,7 @@ const MENU_CSS = `
 }
 .dc-context-menu .dc-menu-item:hover,
 .dc-context-menu .dc-menu-item:focus-visible {
-  background: var(--bg-3, rgba(0,0,0,0.05));
+  background: var(--u-bg-3, var(--bg-3, rgba(0,0,0,0.05)));
   outline: none;
 }
 .dc-context-menu .dc-menu-item[disabled] {