@1agh/maude 0.29.0 → 0.31.0

package/cli/lib/gitignore-block.mjs

@@ -22,19 +22,32 @@ export const END_MARKER = '# maude:end';
  */
 export function buildBlock(designRel = '.design') {
   const root = designRel.replace(/\/+$/, '');
+  // The canonical IGNORED set is the DDR-115 runtime-state taxonomy — kept in
+  // lockstep with `apps/studio/git/service.ts` (isMaudeRuntimeState backstop)
+  // and the repo's own `.gitignore`. VERSIONED content (canvases, `.meta.json`,
+  // `*.annotations.svg`, `system/**`, `config.json`) is deliberately absent.
   const lines = [
     BEGIN_MARKER,
-    '# Maude design plugin runtime — gitignored even in linked mode (DDR-056).',
-    `${root}/_state/`, // binary CRDT logs (regenerable from hub)
+    '# Maude design plugin runtime — gitignored even in linked mode (DDR-056/DDR-115).',
+    // Per-machine runtime JSON.
     `${root}/_server.json`,
     `${root}/_server.log`,
+    `${root}/_server.lock`,
     `${root}/_active.json`,
     `${root}/_sync.json`, // linked-mode offline/sync status (Task 8)
+    `${root}/_preflight.json`,
+    `${root}/_locator.json`, // regenerable slug→path index
+    `${root}/_export-history.json`,
+    // Per-machine / per-user dirs.
+    `${root}/_state/`, // binary CRDT logs (regenerable from hub)
     `${root}/_history/`,
     `${root}/_trash/`, // soft-deleted canvases (recoverable locally — Phase 22 delete)
     `${root}/_draw/`, // draw-agent proof canvases (regenerable — Phase 25)
-    `${root}/_canvas-state/`, // per-machine canvas undo/redo + scratch state
+    `${root}/_smoke/`, // batch-screenshot output (regenerable — DDR-021)
+    `${root}/_canvas-state/`, // per-machine canvas scratch + camera (`*.view.json`, DDR-115)
     `${root}/_chat/`, // ACP transcripts (per-machine)
+    `${root}/_untrusted/`, // hub-synced untrusted file mirror (DDR-054)
+    `${root}/_comments/`, // hub-sync-only collab comments (DDR-102/DDR-115 — never git)
     END_MARKER,
   ];
   return `${lines.join('\n')}\n`;

package/cli/lib/gitignore-block.test.mjs

@@ -31,17 +31,29 @@ test('buildBlock includes the runtime paths and is marker-wrapped', () => {
   for (const p of [
     '.design/_state/',
     '.design/_server.json',
+    '.design/_server.log',
+    '.design/_server.lock',
     '.design/_active.json',
     '.design/_sync.json',
+    '.design/_preflight.json',
+    '.design/_locator.json',
+    '.design/_export-history.json',
     '.design/_history/',
+    '.design/_trash/',
     '.design/_draw/',
+    '.design/_smoke/',
+    '.design/_canvas-state/', // covers the DDR-115 `<slug>.view.json` camera
     '.design/_chat/',
+    '.design/_untrusted/',
+    '.design/_comments/', // hub-sync-only (DDR-115)
   ]) {
     assert.ok(block.includes(p), `missing ${p}`);
   }
-  // Committed artifacts must NOT be ignored.
+  // VERSIONED content must NOT be ignored (DDR-115 taxonomy).
   assert.ok(!block.includes('.design/config.json'));
   assert.ok(!/\.design\/\*\.html/.test(block));
+  // Annotations are versioned — never in the ignore block.
+  assert.ok(!/annotations\.svg/.test(block), 'annotations must stay versioned');
 });
 
 test('buildBlock honors a custom design root', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1agh/maude",
-  "version": "0.29.0",
+  "version": "0.31.0",
   "description": "Marketplace of Claude Code plugins by Michal Dovrtěl: `design` (canvas-first design iteration) + `flow` (generic agentic workflow loop with .ai second brain). Ships the `maude` CLI (with `mdcc` legacy alias) to scaffold workspace, run the design dev server, and manage configs.",
   "type": "module",
   "engines": {
@@ -20,7 +20,9 @@
     "start": "bun run apps/studio/server.ts",
     "dev": "bun run apps/studio/server.ts --port 4555",
     "dev:site": "pnpm --filter @maude/site dev --port 4398",
-    "build": "pnpm -r --if-present run build",
+    "dev:desktop": "PATH=\"$HOME/.cargo/bin:$PATH\" pnpm --filter @maude/desktop tauri dev",
+    "build:desktop": "PATH=\"$HOME/.cargo/bin:$PATH\" pnpm --filter @maude/desktop tauri build",
+    "build": "pnpm -r --if-present --filter '!@maude/desktop' run build",
     "build:binary": "bun run apps/studio/build.ts --release",
     "test": "node --test --test-reporter=spec cli/**/*.test.mjs",
     "test:dev-server": "cd apps/studio && bun test",
@@ -41,13 +43,13 @@
     "prepublishOnly": "bash scripts/check-version-parity.sh && bash apps/studio/bin/check-runtime-bundles.sh"
   },
   "optionalDependencies": {
-    "@1agh/maude-darwin-arm64": "0.29.0",
-    "@1agh/maude-darwin-x64": "0.29.0",
-    "@1agh/maude-linux-arm64": "0.29.0",
-    "@1agh/maude-linux-arm64-musl": "0.29.0",
-    "@1agh/maude-linux-x64": "0.29.0",
-    "@1agh/maude-linux-x64-musl": "0.29.0",
-    "@1agh/maude-win32-x64": "0.29.0"
+    "@1agh/maude-darwin-arm64": "0.31.0",
+    "@1agh/maude-darwin-x64": "0.31.0",
+    "@1agh/maude-linux-arm64": "0.31.0",
+    "@1agh/maude-linux-arm64-musl": "0.31.0",
+    "@1agh/maude-linux-x64": "0.31.0",
+    "@1agh/maude-linux-x64-musl": "0.31.0",
+    "@1agh/maude-win32-x64": "0.31.0"
   },
   "files": [
     "cli",

package/plugins/design/dependencies.json

@@ -170,6 +170,23 @@
       "fallbackBehavior": "Discovery + critic-panel rounds fall back to numbered-prose chat. Slower, fewer options per round, no preview side-pane.",
       "usedBy": ["skills/design-system/SKILL.md", "commands/setup-ds.md", "commands/new.md"],
       "docsUrl": "https://docs.claude.com/en/docs/claude-code"
+    },
+    {
+      "id": "claude",
+      "type": "cli",
+      "hardness": "soft",
+      "check": {
+        "command": "claude --version",
+        "expectExit": 0
+      },
+      "install": {
+        "preferred": "npm i -g @anthropic-ai/claude-code",
+        "darwin": "brew install --cask claude-code"
+      },
+      "autoInstall": false,
+      "fallbackBehavior": "Phase 31 (DDR-123) — the native ACP chat sidepanel drives the user's OWN installed `claude` CLI on their Pro/Max subscription (never API billing). Without it the panel shows the not-connected explainer ('run `claude` in a terminal and `/login`'); every other design surface is unaffected.",
+      "usedBy": ["dev-server/acp/probe.ts", "dev-server/acp/bridge.ts"],
+      "docsUrl": "https://docs.claude.com/en/docs/claude-code"
     }
   ]
 }

package/plugins/design/templates/_shell.html

@@ -170,32 +170,53 @@
       // Phase 13.1 / DDR-077 — error-resilient HMR while an agent edits. Hoisted
       // here so the HMR client (below) can soft-reload the canvas module instead
       // of location.reload()-ing into a half-saved (broken) build.
-      const canvasUrl = canvasRel ? ('/' + designRel + '/' + canvasRel) : null;
+      // Phase 27 (E2) — DiffView "before" pane. `?sha=<ref>` renders the canvas
+      // AT a past version (the dev-server's serveHistoricalCanvas builds from
+      // `git show <sha>:<path>`). Baked into the module URL so both the initial
+      // import and the HMR soft-reload carry it.
+      const shaParam = params.get('sha');
+      const canvasQuery = shaParam ? ('?sha=' + encodeURIComponent(shaParam)) : '';
+      const canvasUrl = canvasRel ? ('/' + designRel + '/' + canvasRel + canvasQuery) : null;
       const myFileKey = canvasRel ? (designRel + '/' + canvasRel) : null;
       // True while an `ai-activity` entry is live for THIS canvas (an agent is
       // running /design:edit|new on it). Mirrors ai-banner's gate: parent relays
       // ai-activity via postMessage when embedded; the own-WS path (standalone /
       // same-origin inspector socket) is handled in connectHmr below.
       let agentEditing = false;
+      // SECURITY (ethical-hacker A1) — the CSS-panel optimistic-reload-skip
+      // timestamp lives HERE, in the shell-script closure, NOT a window global:
+      // the canvas module shares this realm, so a window global would let
+      // untrusted canvas JS pin it and suppress reloads to desync view/source.
+      // It's set ONLY from the parent-gated message below (a canvas self-post
+      // can't reach it), and the HMR echo-guard reads this local, not window.*.
+      let lastCssOptimisticAt = 0;
       window.addEventListener('message', (e) => {
         // DDR-078 security follow-up: only the trusted embedding parent relays
-        // ai-activity. Reject canvas self-posts (which could flip the HMR gate)
-        // and any non-parent source. Standalone gets it via its own WS below.
+        // ai-activity / apply-style. Reject canvas self-posts (which could flip
+        // the HMR gate) and any non-parent source. Standalone gets it via its WS.
         if (e.source !== window.parent || window.parent === window) return;
         const m = e && e.data;
-        if (!m || typeof m !== 'object' || m.dgn !== 'ai-activity') return;
-        if (myFileKey && m.file === myFileKey) agentEditing = !!m.entry;
+        if (!m || typeof m !== 'object') return;
+        if (m.dgn === 'ai-activity') {
+          if (myFileKey && m.file === myFileKey) agentEditing = !!m.entry;
+        } else if (m.dgn === 'apply-style') {
+          // The panel just optimistically applied an edit → skip the redundant
+          // follow-up module reload (set here, parent-verified).
+          lastCssOptimisticAt = Date.now();
+        }
       });
 
       // Soft reload — re-import the canvas module (cache-busted) and swap it in
       // via the runtime, holding the last good render on a build/import error
-      // (no white flash). Only used when an agent is editing; manual edits keep
-      // the plain location.reload() below.
+      // (no white flash). Phase 30 (F4): used for EVERY canvas-body change while
+      // the runtime is mounted — agent edits, manual edits, AND cross-peer synced
+      // writes — so presence + in-canvas state survive. Falls back to the plain
+      // location.reload() below only when no runtime is present.
       function softReload(version) {
         if (!canvasUrl) { location.reload(); return; }
         const rt = window.__maudeCanvasRuntime;
         if (!rt || !rt.remount) { location.reload(); return; }
-        import(canvasUrl + '?v=' + (version || Date.now()))
+        import(canvasUrl + (canvasUrl.includes('?') ? '&' : '?') + 'v=' + (version || Date.now()))
           .then((mod) => {
             if (mod && typeof mod.default === 'function') {
               rt.remount(mod.default);
@@ -320,10 +341,35 @@
             } else if (msg.mode === 'module' || msg.mode === 'hard') {
               // Only reload when the change touches *this* canvas (or `_lib`).
               if (msg.mode === 'hard' || !msg.file || (canvasRel && msg.file === canvasRel)) {
-                // Phase 13.1 / DDR-077 — when an agent is live-editing, soft-
-                // reload (hold last good on a broken intermediate). Manual edits
-                // (or no runtime yet) keep the plain, immediate hard reload.
-                if (agentEditing && window.__maudeCanvasRuntime && window.__maudeCanvasRuntime.remount) {
+                // Phase 12.3 — CSS-panel echo guard. The panel applies each
+                // edit optimistically to the live DOM (dgn:'apply-style'), so a
+                // `module` reload for THIS canvas's own edit is redundant churn:
+                // it remounts the canvas, drops the selection halo, and flickers
+                // the iframe. Skip it within a short window of a self-applied
+                // optimistic style. `hard` (_lib rebuild) is global — never
+                // skipped. Mirrors the meta echo-guard below.
+                if (msg.mode === 'module') {
+                  // read the parent-verified local (NOT a canvas-writable global)
+                  if (Date.now() - lastCssOptimisticAt < 1500) return;
+                }
+                // Phase 30 (F4) — prefer an in-place hot-swap for ANY canvas-body
+                // (`module`) change whenever the canvas runtime is mounted: the
+                // soft-reload re-imports the module and remounts only the canvas
+                // content, KEEPING the iframe — and thus the live CollabProvider
+                // + presence cursors/avatars — mounted (the collab session is a
+                // module-level singleton that survives the remount, use-collab.tsx).
+                // This covers cross-peer SYNCED writes, which arrive as a `module`
+                // change with NO `ai-activity` entry: a teammate's edit must update
+                // seamlessly, never blink everyone's presence (and scroll / tool
+                // mode / undo survive too). It also keeps the Phase 13.1 / DDR-077
+                // hold-last-good behaviour for agent edits. (`agentEditing` is still
+                // tracked from ai-activity above but no longer gates the swap — any
+                // module change to the live canvas hot-swaps.) `hard` (_lib rebuild)
+                // is global and ALWAYS full-reloads. With no runtime (gallery
+                // thumbnails / ?comments=0) we full-reload; softReload itself also
+                // falls back to location.reload() when the re-import yields no usable
+                // default export.
+                if (msg.mode === 'module' && window.__maudeCanvasRuntime && window.__maudeCanvasRuntime.remount) {
                   softReload(msg.version);
                 } else {
                   location.reload();