@1agh/maude 1.3.0 → 1.3.1

package/plugins/design/templates/_shell.html

@@ -205,7 +205,7 @@
       // module, its tokens, its components CSS and its meta as separate
       // requests. Getting the document through and nothing else is what
       // "refused to connect" looks like from the outside.
-      const cap = params.get('t') || '';
+      let cap = params.get('t') || '';
       // THE BASE THIS DOCUMENT WAS SERVED FROM, not the origin root.
       //
       // The fleet's canvas origin puts the project in the PATH
@@ -223,7 +223,7 @@
         return cap ? abs + (abs.includes('?') ? '&' : '?') + 't=' + encodeURIComponent(cap) : abs;
       };
       const canvasQuery = shaParam ? ('?sha=' + encodeURIComponent(shaParam)) : '';
-      const canvasUrl = canvasRel ? withCap('/' + designRel + '/' + canvasRel + canvasQuery) : null;
+      let canvasUrl = canvasRel ? withCap('/' + 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
@@ -250,6 +250,19 @@
           // The panel just optimistically applied an edit → skip the redundant
           // follow-up module reload (set here, parent-verified).
           lastCssOptimisticAt = Date.now();
+        } else if (m.dgn === 'canvas-cap') {
+          // A re-minted capability (it expires; app.jsx refreshes it). Every
+          // URL built from here on carries it, and asking for this shell
+          // document with it re-plants the origin's cookie — the one module
+          // imports, assets and the live sockets fall back to. Without this an
+          // open canvas stopped loading and updating once its first capability
+          // expired. Only a well-formed token, and only in the cloud (a
+          // desktop canvas never had one).
+          const t = m.t;
+          if (!cap || typeof t !== 'string' || t.length > 4096 || !/^[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+$/.test(t)) return;
+          cap = t;
+          if (canvasRel) canvasUrl = withCap('/' + designRel + '/' + canvasRel + canvasQuery);
+          fetch(withCap('/_canvas-shell.html'), { cache: 'no-store', credentials: 'same-origin' }).catch(() => {});
         }
       });
 
@@ -394,12 +407,22 @@
             if (msg.type !== 'canvas-hmr') return;
             if (msg.mode === 'css') {
               const v = msg.version || Date.now();
-              // Match by exact filename when we have one; otherwise refresh all.
-              const targetFile = (msg.file || '').split('/').pop();
+              // Match by PATH when we have one; otherwise refresh all. By path,
+              // not by file name: every design system has a `tokens.css`, and
+              // a change to one canvas's imported `system/<a>/tokens.css`
+              // "matched" the shell's link to `system/<b>/tokens.css` — which
+              // swapped the wrong sheet and skipped the reload below that the
+              // changed one needed (plan T31/L16).
+              const changed = msg.file ? '/' + msg.file : '';
               let matched = false;
               for (const link of document.querySelectorAll('link[rel="stylesheet"]')) {
                 const href = link.getAttribute('href') || '';
-                if (!targetFile || href.includes(targetFile)) {
+                if (!href) continue;
+                let linkPath = '';
+                try {
+                  linkPath = decodeURIComponent(new URL(href, location.href).pathname);
+                } catch {}
+                if (!changed || linkPath.endsWith(changed)) {
                   const base = href.split('?')[0];
                   link.setAttribute('href', base + '?v=' + v);
                   matched = true;
@@ -416,7 +439,21 @@
               if (!matched && msg.file && canvasRel) {
                 const cssDir = msg.file.replace(/[^/]+$/, '');
                 const canvasDir = canvasRel.replace(/[^/]+$/, '');
-                if (cssDir === canvasDir) location.reload();
+                if (cssDir === canvasDir) {
+                  location.reload();
+                } else {
+                  // …and a stylesheet imported from ANYWHERE else (a design
+                  // system's tokens.css) is inlined the same way. The module's
+                  // style tag names what it inlined; re-import so it re-injects.
+                  // (Canvas script could add names here, but that can only
+                  // FORCE a reload — the safe direction.)
+                  var bundled = document.querySelector('style[data-canvas-css="bundled"]');
+                  var names = bundled && bundled.dataset.canvasCssSources ? bundled.dataset.canvasCssSources.split('|') : [];
+                  if (names.indexOf(msg.file) !== -1) {
+                    if (window.__maudeCanvasRuntime && window.__maudeCanvasRuntime.remount) softReload(v);
+                    else location.reload();
+                  }
+                }
               }
             } else if (msg.mode === 'module' || msg.mode === 'hard') {
               // Only reload when the change touches *this* canvas (or `_lib`).
@@ -443,7 +480,11 @@
                   // direction; it can never suppress one.)
                   var hasComps = false;
                   try { hasComps = !!(window.__maude_comps__ && window.__maude_comps__().length); } catch (err) { hasComps = false; }
-                  if (!hasComps && Date.now() - lastCssOptimisticAt < 1500) return;
+                  // …but NEVER a sync write (`remote`): it can carry a
+                  // teammate's change merged under this person's own edit (a
+                  // lost race re-applied onto theirs), and skipping it left
+                  // their change off this canvas until a manual reload.
+                  if (!hasComps && !msg.remote && 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