dsh-generative-ui 0.0.2 → 0.0.4

package/lib/client.js

@@ -20,7 +20,7 @@ var __toESM = (mod, isNodeMode, target) => {
       return cached;
   }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
-  const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
+  const to = isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   if (mod && typeof mod === "object" || typeof mod === "function") {
     for (let key of __getOwnPropNames(mod))
       if (!__hasOwnProp.call(to, key))
@@ -353,8 +353,8 @@ var require_react_dom_server_legacy_browser_production_min = __commonJS(function
   }
   function ua(a) {
     var b = "";
-    aa.Children.forEach(a, function(a2) {
-      a2 != null && (b += a2);
+    aa.Children.forEach(a, function(a) {
+      a != null && (b += a);
     });
     return b;
   }
@@ -696,8 +696,8 @@ var require_react_dom_server_legacy_browser_production_min = __commonJS(function
   }
   var Ca = /[<\u2028\u2029]/g;
   function Da(a) {
-    return JSON.stringify(a).replace(Ca, function(a2) {
-      switch (a2) {
+    return JSON.stringify(a).replace(Ca, function(a) {
+      switch (a) {
         case "<":
           return "\\u003c";
         case "\u2028":
@@ -1065,9 +1065,9 @@ var require_react_dom_server_legacy_browser_production_min = __commonJS(function
     a.allPendingTasks++;
     c === null ? a.pendingRootTasks++ : c.pendingTasks++;
     var k = { node: b, ping: function() {
-      var b2 = a.pingedTasks;
-      b2.push(k);
-      b2.length === 1 && Cb(a);
+      var b = a.pingedTasks;
+      b.push(k);
+      b.length === 1 && Cb(a);
     }, blockedBoundary: c, blockedSegment: d, abortSet: f, legacyContext: e, context: g, treeContext: h };
     f.add(k);
     return k;
@@ -1322,7 +1322,7 @@ var require_react_dom_server_legacy_browser_production_min = __commonJS(function
     }
   }
   function Hb(a, b, c) {
-    var d = b.blockedSegment.formatContext, f = b.legacyContext, e = b.context;
+    var d = b.blockedSegment.formatContext, { legacyContext: f, context: e } = b;
     try {
       return X(a, b, c);
     } catch (k) {
@@ -1350,8 +1350,8 @@ var require_react_dom_server_legacy_browser_production_min = __commonJS(function
   function Lb(a, b, c) {
     var d = a.blockedBoundary;
     a.blockedSegment.status = 3;
-    d === null ? (b.allPendingTasks--, b.status !== 2 && (b.status = 2, b.destination !== null && b.destination.push(null))) : (d.pendingTasks--, d.forceClientRender || (d.forceClientRender = true, a = c === undefined ? Error(l(432)) : c, d.errorDigest = b.onError(a), d.parentFlushed && b.clientRenderedBoundaries.push(d)), d.fallbackAbortableTasks.forEach(function(a2) {
-      return Lb(a2, b, c);
+    d === null ? (b.allPendingTasks--, b.status !== 2 && (b.status = 2, b.destination !== null && b.destination.push(null))) : (d.pendingTasks--, d.forceClientRender || (d.forceClientRender = true, a = c === undefined ? Error(l(432)) : c, d.errorDigest = b.onError(a), d.parentFlushed && b.clientRenderedBoundaries.push(d)), d.fallbackAbortableTasks.forEach(function(a) {
+      return Lb(a, b, c);
     }), d.fallbackAbortableTasks.clear(), b.allPendingTasks--, b.allPendingTasks === 0 && (d = b.onAllReady, d()));
   }
   function Y(a, b) {
@@ -1618,8 +1618,8 @@ var require_react_dom_server_legacy_browser_production_min = __commonJS(function
   function Rb(a, b) {
     try {
       var c = a.abortableTasks;
-      c.forEach(function(c2) {
-        return Lb(c2, a, b);
+      c.forEach(function(c) {
+        return Lb(c, a, b);
       });
       c.clear();
       a.destination !== null && Mb(a, a.destination);
@@ -1629,12 +1629,12 @@ var require_react_dom_server_legacy_browser_production_min = __commonJS(function
   }
   function Sb() {}
   function Tb(a, b, c, d) {
-    var f = false, e = null, g = "", h = { push: function(a2) {
-      a2 !== null && (g += a2);
+    var f = false, e = null, g = "", h = { push: function(a) {
+      a !== null && (g += a);
       return true;
-    }, destroy: function(a2) {
+    }, destroy: function(a) {
       f = true;
-      e = a2;
+      e = a;
     } }, k = false;
     a = Ab(a, Ea(c, b ? b.identifierPrefix : undefined), { insertionMode: 1, selectedValue: null }, Infinity, Sb, undefined, function() {
       k = true;
@@ -2032,8 +2032,8 @@ var require_react_dom_server_browser_production_min = __commonJS(function(export
   }
   function La(a) {
     var b = "";
-    aa.Children.forEach(a, function(a2) {
-      a2 != null && (b += a2);
+    aa.Children.forEach(a, function(a) {
+      a != null && (b += a);
     });
     return b;
   }
@@ -2425,8 +2425,8 @@ var require_react_dom_server_browser_production_min = __commonJS(function(export
   var Qb = w(",");
   var Rb = /[<\u2028\u2029]/g;
   function Sb(a) {
-    return JSON.stringify(a).replace(Rb, function(a2) {
-      switch (a2) {
+    return JSON.stringify(a).replace(Rb, function(a) {
+      switch (a) {
         case "<":
           return "\\u003c";
         case "\u2028":
@@ -2781,9 +2781,9 @@ var require_react_dom_server_browser_production_min = __commonJS(function(export
     a.allPendingTasks++;
     c === null ? a.pendingRootTasks++ : c.pendingTasks++;
     var m = { node: b, ping: function() {
-      var b2 = a.pingedTasks;
-      b2.push(m);
-      b2.length === 1 && Uc(a);
+      var b = a.pingedTasks;
+      b.push(m);
+      b.length === 1 && Uc(a);
     }, blockedBoundary: c, blockedSegment: d, abortSet: f, legacyContext: e, context: g, treeContext: h };
     f.add(m);
     return m;
@@ -3038,7 +3038,7 @@ var require_react_dom_server_browser_production_min = __commonJS(function(export
     }
   }
   function $c(a, b, c) {
-    var d = b.blockedSegment.formatContext, f = b.legacyContext, e = b.context;
+    var d = b.blockedSegment.formatContext, { legacyContext: f, context: e } = b;
     try {
       return Z(a, b, c);
     } catch (m) {
@@ -3066,8 +3066,8 @@ var require_react_dom_server_browser_production_min = __commonJS(function(export
   function ed(a, b, c) {
     var d = a.blockedBoundary;
     a.blockedSegment.status = 3;
-    d === null ? (b.allPendingTasks--, b.status !== 2 && (b.status = 2, b.destination !== null && b.destination.close())) : (d.pendingTasks--, d.forceClientRender || (d.forceClientRender = true, a = c === undefined ? Error(k(432)) : c, d.errorDigest = b.onError(a), d.parentFlushed && b.clientRenderedBoundaries.push(d)), d.fallbackAbortableTasks.forEach(function(a2) {
-      return ed(a2, b, c);
+    d === null ? (b.allPendingTasks--, b.status !== 2 && (b.status = 2, b.destination !== null && b.destination.close())) : (d.pendingTasks--, d.forceClientRender || (d.forceClientRender = true, a = c === undefined ? Error(k(432)) : c, d.errorDigest = b.onError(a), d.parentFlushed && b.clientRenderedBoundaries.push(d)), d.fallbackAbortableTasks.forEach(function(a) {
+      return ed(a, b, c);
     }), d.fallbackAbortableTasks.clear(), b.allPendingTasks--, b.allPendingTasks === 0 && (d = b.onAllReady, d()));
   }
   function ad(a, b) {
@@ -3328,8 +3328,8 @@ var require_react_dom_server_browser_production_min = __commonJS(function(export
   function ld(a, b) {
     try {
       var c = a.abortableTasks;
-      c.forEach(function(c2) {
-        return ed(c2, a, b);
+      c.forEach(function(c) {
+        return ed(c, a, b);
       });
       c.clear();
       a.destination !== null && fd(a, a.destination);
@@ -3339,17 +3339,17 @@ var require_react_dom_server_browser_production_min = __commonJS(function(export
   }
   exports2.renderToReadableStream = function(a, b) {
     return new Promise(function(c, d) {
-      var f, e, g = new Promise(function(a2, b2) {
-        e = a2;
-        f = b2;
+      var f, e, g = new Promise(function(a, b) {
+        e = a;
+        f = b;
       }), h = Rc(a, za(b ? b.identifierPrefix : undefined, b ? b.nonce : undefined, b ? b.bootstrapScriptContent : undefined, b ? b.bootstrapScripts : undefined, b ? b.bootstrapModules : undefined), Aa(b ? b.namespaceURI : undefined), b ? b.progressiveChunkSize : undefined, b ? b.onError : undefined, e, function() {
-        var a2 = new ReadableStream({ type: "bytes", pull: function(a3) {
+        var a = new ReadableStream({ type: "bytes", pull: function(a) {
           if (h.status === 1)
-            h.status = 2, da(a3, h.fatalError);
+            h.status = 2, da(a, h.fatalError);
           else if (h.status !== 2 && h.destination === null) {
-            h.destination = a3;
+            h.destination = a;
             try {
-              fd(h, a3);
+              fd(h, a);
             } catch (A) {
               Y(h, A), Vc(h, A);
             }
@@ -3357,11 +3357,11 @@ var require_react_dom_server_browser_production_min = __commonJS(function(export
         }, cancel: function() {
           ld(h);
         } }, { highWaterMark: 0 });
-        a2.allReady = g;
-        c(a2);
-      }, function(a2) {
+        a.allReady = g;
+        c(a);
+      }, function(a) {
         g.catch(function() {});
-        d(a2);
+        d(a);
       }, f);
       if (b && b.signal) {
         var m = b.signal, q = function() {
@@ -3392,6 +3392,279 @@ var require_server_browser = __commonJS(function(exports2) {
   exports2.renderToReadableStream = s.renderToReadableStream;
 });
 
+// node_modules/scheduler/cjs/scheduler.production.min.js
+var require_scheduler_production_min = __commonJS(function(exports2) {
+  function f(a, b) {
+    var c = a.length;
+    a.push(b);
+    a:
+      for (;0 < c; ) {
+        var d = c - 1 >>> 1, e = a[d];
+        if (0 < g(e, b))
+          a[d] = b, a[c] = e, c = d;
+        else
+          break a;
+      }
+  }
+  function h(a) {
+    return a.length === 0 ? null : a[0];
+  }
+  function k(a) {
+    if (a.length === 0)
+      return null;
+    var b = a[0], c = a.pop();
+    if (c !== b) {
+      a[0] = c;
+      a:
+        for (var d = 0, e = a.length, w = e >>> 1;d < w; ) {
+          var m = 2 * (d + 1) - 1, C = a[m], n = m + 1, x = a[n];
+          if (0 > g(C, c))
+            n < e && 0 > g(x, C) ? (a[d] = x, a[n] = c, d = n) : (a[d] = C, a[m] = c, d = m);
+          else if (n < e && 0 > g(x, c))
+            a[d] = x, a[n] = c, d = n;
+          else
+            break a;
+        }
+    }
+    return b;
+  }
+  function g(a, b) {
+    var c = a.sortIndex - b.sortIndex;
+    return c !== 0 ? c : a.id - b.id;
+  }
+  if (typeof performance === "object" && typeof performance.now === "function") {
+    l = performance;
+    exports2.unstable_now = function() {
+      return l.now();
+    };
+  } else {
+    p = Date, q = p.now();
+    exports2.unstable_now = function() {
+      return p.now() - q;
+    };
+  }
+  var l;
+  var p;
+  var q;
+  var r = [];
+  var t = [];
+  var u = 1;
+  var v = null;
+  var y = 3;
+  var z = false;
+  var A = false;
+  var B = false;
+  var D = typeof setTimeout === "function" ? setTimeout : null;
+  var E = typeof clearTimeout === "function" ? clearTimeout : null;
+  var F = typeof setImmediate !== "undefined" ? setImmediate : null;
+  typeof navigator !== "undefined" && navigator.scheduling !== undefined && navigator.scheduling.isInputPending !== undefined && navigator.scheduling.isInputPending.bind(navigator.scheduling);
+  function G(a) {
+    for (var b = h(t);b !== null; ) {
+      if (b.callback === null)
+        k(t);
+      else if (b.startTime <= a)
+        k(t), b.sortIndex = b.expirationTime, f(r, b);
+      else
+        break;
+      b = h(t);
+    }
+  }
+  function H(a) {
+    B = false;
+    G(a);
+    if (!A)
+      if (h(r) !== null)
+        A = true, I(J);
+      else {
+        var b = h(t);
+        b !== null && K(H, b.startTime - a);
+      }
+  }
+  function J(a, b) {
+    A = false;
+    B && (B = false, E(L), L = -1);
+    z = true;
+    var c = y;
+    try {
+      G(b);
+      for (v = h(r);v !== null && (!(v.expirationTime > b) || a && !M()); ) {
+        var d = v.callback;
+        if (typeof d === "function") {
+          v.callback = null;
+          y = v.priorityLevel;
+          var e = d(v.expirationTime <= b);
+          b = exports2.unstable_now();
+          typeof e === "function" ? v.callback = e : v === h(r) && k(r);
+          G(b);
+        } else
+          k(r);
+        v = h(r);
+      }
+      if (v !== null)
+        var w = true;
+      else {
+        var m = h(t);
+        m !== null && K(H, m.startTime - b);
+        w = false;
+      }
+      return w;
+    } finally {
+      v = null, y = c, z = false;
+    }
+  }
+  var N = false;
+  var O = null;
+  var L = -1;
+  var P = 5;
+  var Q = -1;
+  function M() {
+    return exports2.unstable_now() - Q < P ? false : true;
+  }
+  function R() {
+    if (O !== null) {
+      var a = exports2.unstable_now();
+      Q = a;
+      var b = true;
+      try {
+        b = O(true, a);
+      } finally {
+        b ? S() : (N = false, O = null);
+      }
+    } else
+      N = false;
+  }
+  var S;
+  if (typeof F === "function")
+    S = function() {
+      F(R);
+    };
+  else if (typeof MessageChannel !== "undefined") {
+    T = new MessageChannel, U = T.port2;
+    T.port1.onmessage = R;
+    S = function() {
+      U.postMessage(null);
+    };
+  } else
+    S = function() {
+      D(R, 0);
+    };
+  var T;
+  var U;
+  function I(a) {
+    O = a;
+    N || (N = true, S());
+  }
+  function K(a, b) {
+    L = D(function() {
+      a(exports2.unstable_now());
+    }, b);
+  }
+  exports2.unstable_IdlePriority = 5;
+  exports2.unstable_ImmediatePriority = 1;
+  exports2.unstable_LowPriority = 4;
+  exports2.unstable_NormalPriority = 3;
+  exports2.unstable_Profiling = null;
+  exports2.unstable_UserBlockingPriority = 2;
+  exports2.unstable_cancelCallback = function(a) {
+    a.callback = null;
+  };
+  exports2.unstable_continueExecution = function() {
+    A || z || (A = true, I(J));
+  };
+  exports2.unstable_forceFrameRate = function(a) {
+    0 > a || 125 < a ? console.error("forceFrameRate takes a positive int between 0 and 125, forcing frame rates higher than 125 fps is not supported") : P = 0 < a ? Math.floor(1000 / a) : 5;
+  };
+  exports2.unstable_getCurrentPriorityLevel = function() {
+    return y;
+  };
+  exports2.unstable_getFirstCallbackNode = function() {
+    return h(r);
+  };
+  exports2.unstable_next = function(a) {
+    switch (y) {
+      case 1:
+      case 2:
+      case 3:
+        var b = 3;
+        break;
+      default:
+        b = y;
+    }
+    var c = y;
+    y = b;
+    try {
+      return a();
+    } finally {
+      y = c;
+    }
+  };
+  exports2.unstable_pauseExecution = function() {};
+  exports2.unstable_requestPaint = function() {};
+  exports2.unstable_runWithPriority = function(a, b) {
+    switch (a) {
+      case 1:
+      case 2:
+      case 3:
+      case 4:
+      case 5:
+        break;
+      default:
+        a = 3;
+    }
+    var c = y;
+    y = a;
+    try {
+      return b();
+    } finally {
+      y = c;
+    }
+  };
+  exports2.unstable_scheduleCallback = function(a, b, c) {
+    var d = exports2.unstable_now();
+    typeof c === "object" && c !== null ? (c = c.delay, c = typeof c === "number" && 0 < c ? d + c : d) : c = d;
+    switch (a) {
+      case 1:
+        var e = -1;
+        break;
+      case 2:
+        e = 250;
+        break;
+      case 5:
+        e = 1073741823;
+        break;
+      case 4:
+        e = 1e4;
+        break;
+      default:
+        e = 5000;
+    }
+    e = c + e;
+    a = { id: u++, callback: b, priorityLevel: a, startTime: c, expirationTime: e, sortIndex: -1 };
+    c > d ? (a.sortIndex = c, f(t, a), h(r) === null && a === h(t) && (B ? (E(L), L = -1) : B = true, K(H, c - d))) : (a.sortIndex = e, f(r, a), A || z || (A = true, I(J)));
+    return a;
+  };
+  exports2.unstable_shouldYield = M;
+  exports2.unstable_wrapCallback = function(a) {
+    var b = y;
+    return function() {
+      var c = y;
+      y = b;
+      try {
+        return a.apply(this, arguments);
+      } finally {
+        y = c;
+      }
+    };
+  };
+});
+
+// node_modules/scheduler/index.js
+var require_scheduler = __commonJS(function(exports2, module2) {
+  if (true) {
+    module2.exports = require_scheduler_production_min();
+  }
+});
+
 // src/client/index.ts
 var exports_client = {};
 __export(exports_client, {
@@ -3715,8 +3988,8 @@ var readImportBindings = (code, index) => {
           index = after;
         }
       }
-      const literal2 = readStringLiteral(code, index);
-      const imported = literal2 ? { name: literal2.value, end: literal2.end } : readIdentifierWord(code, index);
+      const literal = readStringLiteral(code, index);
+      const imported = literal ? { name: literal.value, end: literal.end } : readIdentifierWord(code, index);
       if (!imported)
         return null;
       index = skipWhitespaceAndComments(code, imported.end);
@@ -4286,10 +4559,10 @@ function isLikeNone(x) {
 function passStringToWasm0(arg, malloc, realloc) {
   if (realloc === undefined) {
     const buf = cachedTextEncoder.encode(arg);
-    const ptr2 = malloc(buf.length, 1) >>> 0;
-    getUint8ArrayMemory0().subarray(ptr2, ptr2 + buf.length).set(buf);
+    const ptr = malloc(buf.length, 1) >>> 0;
+    getUint8ArrayMemory0().subarray(ptr, ptr + buf.length).set(buf);
     WASM_VECTOR_LEN = buf.length;
-    return ptr2;
+    return ptr;
   }
   let len = arg.length;
   let ptr = malloc(len, 1) >>> 0;
@@ -5761,7 +6034,7 @@ var isJsxShellPreview = (code, scan) => {
     return false;
   if (scan.stack.some((frame) => frame.type === "block" && frame.jsxExpression))
     return false;
-  const allFramesAllowed = (componentArrow2) => scan.stack.every((frame) => frame.type !== "block" || isAllowedJsxShellFrame(code, frame, componentArrow2));
+  const allFramesAllowed = (componentArrow) => scan.stack.every((frame) => frame.type !== "block" || isAllowedJsxShellFrame(code, frame, componentArrow));
   const rootReturnBefore = (end) => {
     const before = code.slice(0, end);
     return /\breturn\s*\(?\s*$/.test(before.slice(Math.max(0, before.lastIndexOf(";"), before.lastIndexOf("{"))));
@@ -5769,12 +6042,12 @@ var isJsxShellPreview = (code, scan) => {
   const arrowFrameActive = scan.stack.some((frame) => frame.type === "block" && frame.kind === "arrow" && isComponentArrowFrame(code, frame));
   if (!jsxFrame) {
     if (scan.incompleteJsxTagStart === null) {
-      const componentArrow2 = isComponentArrowPrefix(code, code.length) || arrowFrameActive;
-      return (isCompleteJsxTail(code, scan) || hasCompletedRenderMethodTail(code, scan)) && allFramesAllowed(componentArrow2);
+      const componentArrow = isComponentArrowPrefix(code, code.length) || arrowFrameActive;
+      return (isCompleteJsxTail(code, scan) || hasCompletedRenderMethodTail(code, scan)) && allFramesAllowed(componentArrow);
     }
-    const jsxStart2 = scan.incompleteJsxTagStart;
-    const incompleteComponentArrow = isComponentArrowPrefix(code, jsxStart2);
-    if (!rootReturnBefore(jsxStart2) && !incompleteComponentArrow && !/^\s*</.test(code))
+    const jsxStart = scan.incompleteJsxTagStart;
+    const incompleteComponentArrow = isComponentArrowPrefix(code, jsxStart);
+    if (!rootReturnBefore(jsxStart) && !incompleteComponentArrow && !/^\s*</.test(code))
       return false;
     return allFramesAllowed(incompleteComponentArrow);
   }
@@ -7002,6 +7275,7 @@ var AI_STREAM_PATH = "/dsh-generative-ui/ai";
 var FS_PATH = "/dsh-generative-ui/fs";
 var EXEC_PATH = "/dsh-generative-ui/exec";
 var WEB_SEARCH_PATH = "/dsh-generative-ui/web-search";
+var CARD_ERROR_PATH = "/dsh-generative-ui/card-error";
 
 // src/client/runtime/compiler.ts
 var initPromise2 = null;
@@ -7022,6 +7296,7 @@ var warmCompiler = () => {
 function disposeCompiler() {
   initPromise2 = null;
 }
+var hasDefaultExport = (source) => /^\s*export\s+default\s/m.test(source.replace(/\/\*[\s\S]*?\*\//g, "").replace(/^\s*\/\/.*$/gm, "")) || /\bexport\s*\{[^}]*\bas\s+default\b/.test(source);
 function createBrowserTsxCompiler() {
   return {
     async compile(code, options = {}) {
@@ -7037,8 +7312,11 @@ function createBrowserTsxCompiler() {
         return build(normalizeGeneratedTsx(code, { mode: "streaming" }));
       try {
         return build(normalizeGeneratedTsx(code, { mode: "final" }));
-      } catch {
-        return build(normalizeGeneratedTsx(code, { mode: "streaming" }));
+      } catch (error) {
+        const cut = normalizeGeneratedTsx(code, { mode: "streaming" });
+        if (!hasDefaultExport(cut))
+          throw error;
+        return build(cut);
       }
     }
   };
@@ -7120,10 +7398,11 @@ function owningCanvasIdOf(path) {
 }
 
 // src/client/runtime/register.ts
-var React = __toESM(require("react"));
-var ReactJsxRuntime = __toESM(require("react/jsx-runtime"));
-var ReactDom = __toESM(require("react-dom"));
-var ReactDomClient = __toESM(require("react-dom/client"));
+var React = __toESM(require("react"), 1);
+var ReactJsxRuntime = __toESM(require("react/jsx-runtime"), 1);
+var ReactDom = __toESM(require("react-dom"), 1);
+var ReactDomClient = __toESM(require("react-dom/client"), 1);
+var Scheduler = __toESM(require_scheduler(), 1);
 var installed = false;
 function installDocumentImportMap() {
   if (installed || typeof document === "undefined")
@@ -7144,13 +7423,14 @@ function registerRuntimeModules() {
     "react/jsx-runtime": ReactJsxRuntime,
     "react/jsx-dev-runtime": ReactJsxRuntime,
     "react-dom": ReactDom,
-    "react-dom/client": ReactDomClient
+    "react-dom/client": ReactDomClient,
+    scheduler: Scheduler
   });
   installDocumentImportMap();
 }
 
 // src/client/runtime/state.ts
-var React2 = __toESM(require("react"));
+var React2 = __toESM(require("react"), 1);
 var scope = (key) => `dsh-genui:${key}`;
 function read(key, initial) {
   const fallback = () => typeof initial === "function" ? initial() : initial;
@@ -7260,7 +7540,7 @@ async function request(method, path, content, extra) {
   const response = await fetch(`${FS_PATH}?${query}`, content === undefined ? { method } : { method, headers: { "content-type": "application/json" }, body: JSON.stringify({ content }) });
   const body = await response.json().catch(() => ({}));
   if (!response.ok)
-    throw new Error(`[dsh-generative-ui] $dsh/fs ${path}: ${body.error ?? response.statusText}`);
+    throw Object.assign(new Error(`[dsh-generative-ui] $dsh/fs ${path}: ${body.error ?? response.statusText}`), { code: body.error, denied: response.status === 403 });
   return body;
 }
 async function execRequest(cwd, sessionId, command, signal) {
@@ -7271,11 +7551,11 @@ async function execRequest(cwd, sessionId, command, signal) {
     throw new Error(`[dsh-generative-ui] $dsh/exec: ${body.error ?? response.statusText}`);
   return body;
 }
-async function* streamFrom(cwd, request2, signal) {
+async function* streamFrom(cwd, request, signal) {
   const response = await fetch(`${AI_STREAM_PATH}?cwd=${encodeURIComponent(cwd)}`, {
     method: "POST",
     headers: { "content-type": "application/json" },
-    body: JSON.stringify(request2),
+    body: JSON.stringify(request),
     signal
   });
   if (!response.ok)
@@ -7831,7 +8111,7 @@ async function resolveConfig(userConfig = {}, defaults = {}) {
   const resolved = {
     mergeSelectors: true,
     warn: true,
-    sortLayers: (layers2) => layers2,
+    sortLayers: (layers) => layers,
     ...config,
     blocklist: getMerged("blocklist"),
     presets: sortedPresets,
@@ -7954,8 +8234,8 @@ var TokenProcessor = class {
     return false;
   }
   getBlocked(raw, blocklist) {
-    const rule = blocklist.find((e2) => {
-      const value = Array.isArray(e2) ? e2[0] : e2;
+    const rule = blocklist.find((e) => {
+      const value = Array.isArray(e) ? e[0] : e;
       return typeof value === "function" ? value(raw) : isString(value) ? value === raw : value.test(raw);
     });
     return rule ? Array.isArray(rule) ? rule : [rule, undefined] : undefined;
@@ -7990,7 +8270,7 @@ var TokenProcessor = class {
     this.blocked.delete(token);
   }
 };
-var UnoGeneratorInternal = class UnoGeneratorInternal2 {
+var UnoGeneratorInternal = class UnoGeneratorInternal {
   userConfig;
   defaults;
   version = version2;
@@ -8002,7 +8282,7 @@ var UnoGeneratorInternal = class UnoGeneratorInternal2 {
     this.defaults = defaults;
   }
   static async create(userConfig = {}, defaults = {}) {
-    const uno = new UnoGeneratorInternal2(userConfig, defaults);
+    const uno = new UnoGeneratorInternal(userConfig, defaults);
     uno.config = await resolveConfig(uno.userConfig, uno.defaults);
     uno.events.emit("config", uno.config);
     return uno;
@@ -8076,7 +8356,7 @@ var UnoGeneratorInternal = class UnoGeneratorInternal2 {
     return this.tokenProcessor.parse(this, raw, alias);
   }
   async generate(input, options = {}) {
-    const { id, scope: scope2, preflights = true, safelist = true, minify = false, extendedInfo = false } = options;
+    const { id, scope, preflights = true, safelist = true, minify = false, extendedInfo = false } = options;
     const tokens = isString(input) ? await this.applyExtractors(input, id, extendedInfo ? new CountableSet : /* @__PURE__ */ new Set) : Array.isArray(input) ? new Set(input) : input;
     if (safelist) {
       const safelistContext = {
@@ -8143,7 +8423,7 @@ var UnoGeneratorInternal = class UnoGeneratorInternal2 {
         return [layer, (await Promise.all(this.config.preflights.filter((i) => (i.layer || "preflights") === layer).map(async (i) => await i.getCSS(preflightContext)))).filter(Boolean).join(nl)];
       })));
     })();
-    const sortLayers = (layers2) => this.config.sortLayers(layers2.sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b)));
+    const sortLayers = (layers) => this.config.sortLayers(layers.sort((a, b) => (this.config.layers[a] ?? 0) - (this.config.layers[b] ?? 0) || a.localeCompare(b)));
     const layers = sortLayers(Array.from(layerSet));
     const layerCache = {};
     const outputCssLayers = this.config.outputToCssLayers;
@@ -8161,7 +8441,7 @@ var UnoGeneratorInternal = class UnoGeneratorInternal2 {
           return a[0] - b[0] || (a[4]?.sort || 0) - (b[4]?.sort || 0) || a[5]?.currentSelector?.localeCompare(b[5]?.currentSelector ?? "") || a[1]?.localeCompare(b[1] || "") || a[2]?.localeCompare(b[2] || "") || 0;
         }).map(([, selector, body, , meta, , variantNoMerge]) => {
           return [
-            [[(selector && !meta?.noScope ? applyScope(selector, scope2) : selector) ?? "", meta?.sort ?? 0]],
+            [[(selector && !meta?.noScope ? applyScope(selector, scope) : selector) ?? "", meta?.sort ?? 0]],
             body,
             !!(variantNoMerge ?? meta?.noMerge)
           ];
@@ -8630,17 +8910,17 @@ var UnoGeneratorInternal = class UnoGeneratorInternal2 {
       }
       const isNoMerge = Object.fromEntries(item[2])[symbols.shortcutsNoMerge];
       const variants = [...item[4], ...!isNoMerge ? parentVariants : []];
-      for (const { selector, entries, parent: parent2, sort, noMerge, layer } of this.applyVariants(item, variants, raw))
-        layerMap.getFallback(layer ?? meta.layer, new TwoKeyMap).getFallback(selector, parent2, [[], item[0]])[0].push([
+      for (const { selector, entries, parent, sort, noMerge, layer } of this.applyVariants(item, variants, raw))
+        layerMap.getFallback(layer ?? meta.layer, new TwoKeyMap).getFallback(selector, parent, [[], item[0]])[0].push([
           entries,
           !!(noMerge ?? item[3]?.noMerge),
           sort ?? 0
         ]);
     }
-    return rawStringifiedUtil.concat(layerMap.flatMap((selectorMap, layer) => selectorMap.map(([e2, index], selector, joinedParents) => {
+    return rawStringifiedUtil.concat(layerMap.flatMap((selectorMap, layer) => selectorMap.map(([e, index], selector, joinedParents) => {
       const stringify = (flatten, noMerge, entrySortPair) => {
-        const maxSort = Math.max(...entrySortPair.map((e3) => e3[1]));
-        const entriesList = entrySortPair.map((e3) => e3[0]);
+        const maxSort = Math.max(...entrySortPair.map((e) => e[1]));
+        const entriesList = entrySortPair.map((e) => e[0]);
         return (flatten ? [entriesList.flat(1)] : entriesList).map((entries) => {
           const body = entriesToCss(entries);
           if (body)
@@ -8660,7 +8940,7 @@ var UnoGeneratorInternal = class UnoGeneratorInternal2 {
             ];
         });
       };
-      return [[e2.filter(([, noMerge]) => noMerge).map(([entries, , sort]) => [entries, sort]), true], [e2.filter(([, noMerge]) => !noMerge).map(([entries, , sort]) => [entries, sort]), false]].map(([e3, noMerge]) => [...stringify(false, noMerge, e3.filter(([entries]) => entries.some((entry) => entry[0] === symbols.shortcutsNoMerge))), ...stringify(true, noMerge, e3.filter(([entries]) => entries.every((entry) => entry[0] !== symbols.shortcutsNoMerge)))]);
+      return [[e.filter(([, noMerge]) => noMerge).map(([entries, , sort]) => [entries, sort]), true], [e.filter(([, noMerge]) => !noMerge).map(([entries, , sort]) => [entries, sort]), false]].map(([e, noMerge]) => [...stringify(false, noMerge, e.filter(([entries]) => entries.some((entry) => entry[0] === symbols.shortcutsNoMerge))), ...stringify(true, noMerge, e.filter(([entries]) => entries.every((entry) => entry[0] !== symbols.shortcutsNoMerge)))]);
     }).flat(2).filter(Boolean)));
   }
   isBlocked(raw) {
@@ -8677,11 +8957,11 @@ var regexScopePlaceholder = /\s\$\$\s+/g;
 function hasScopePlaceholder(css) {
   return regexScopePlaceholder.test(css);
 }
-function applyScope(css, scope2) {
+function applyScope(css, scope) {
   if (hasScopePlaceholder(css))
-    return css.replace(regexScopePlaceholder, scope2 ? ` ${scope2} ` : " ");
+    return css.replace(regexScopePlaceholder, scope ? ` ${scope} ` : " ");
   else
-    return scope2 ? `${scope2} ${css}` : css;
+    return scope ? `${scope} ${css}` : css;
 }
 var attributifyRe = /^\[(.+?)(~?=)"(.*)"\]$/;
 function toEscapedSelector(raw) {
@@ -8835,9 +9115,9 @@ function encode(decoded) {
 }
 
 // node_modules/magic-string/dist/index.mjs
-var BitSet = class BitSet2 {
+var BitSet = class BitSet {
   constructor(arg) {
-    this.bits = arg instanceof BitSet2 ? arg.bits.slice() : [];
+    this.bits = arg instanceof BitSet ? arg.bits.slice() : [];
   }
   add(n) {
     this.bits[n >> 5] |= 1 << (n & 31);
@@ -8846,7 +9126,7 @@ var BitSet = class BitSet2 {
     return !!(this.bits[n >> 5] & 1 << (n & 31));
   }
 };
-var Chunk = class Chunk2 {
+var Chunk = class Chunk {
   constructor(start, end, content) {
     this.start = start;
     this.end = end;
@@ -8866,7 +9146,7 @@ var Chunk = class Chunk2 {
     this.intro = this.intro + content;
   }
   clone() {
-    const chunk = new Chunk2(this.start, this.end, this.original);
+    const chunk = new Chunk(this.start, this.end, this.original);
     chunk.intro = this.intro;
     chunk.outro = this.outro;
     chunk.content = this.content;
@@ -8923,7 +9203,7 @@ var Chunk = class Chunk2 {
     const originalBefore = this.original.slice(0, sliceIndex);
     const originalAfter = this.original.slice(sliceIndex);
     this.original = originalBefore;
-    const newChunk = new Chunk2(index, this.end, originalAfter);
+    const newChunk = new Chunk(index, this.end, originalAfter);
     newChunk.outro = this.outro;
     this.outro = "";
     this.end = index;
@@ -9096,15 +9376,15 @@ var Mappings = class {
 `, 0);
       let previousContentLineEnd = -1;
       while (contentLineEnd >= 0 && contentLengthMinusOne > contentLineEnd) {
-        const segment2 = [
+        const segment = [
           this.generatedCodeColumn,
           sourceIndex,
           loc.line,
           loc.column
         ];
         if (nameIndex >= 0)
-          segment2.push(nameIndex);
-        this.rawSegments.push(segment2);
+          segment.push(nameIndex);
+        this.rawSegments.push(segment);
         this.generatedCodeLine += 1;
         this.raw[this.generatedCodeLine] = this.rawSegments = [];
         this.generatedCodeColumn = 0;
@@ -9195,7 +9475,7 @@ var warned2 = {
   insertRight: false,
   storeName: false
 };
-var MagicString = class MagicString2 {
+var MagicString = class MagicString {
   constructor(string, options = {}) {
     const chunk = new Chunk(0, string.length, string);
     Object.defineProperties(this, {
@@ -9299,7 +9579,7 @@ var MagicString = class MagicString2 {
     return this;
   }
   clone() {
-    const cloned = new MagicString2(this.original, {
+    const cloned = new MagicString(this.original, {
       filename: this.filename,
       ignoreList: this.ignoreList,
       offset: this.offset
@@ -9757,10 +10037,10 @@ var MagicString = class MagicString2 {
     return result;
   }
   snip(start, end) {
-    const clone2 = this.clone();
-    clone2.remove(0, start);
-    clone2.remove(end, clone2.original.length);
-    return clone2;
+    const clone = this.clone();
+    clone.remove(0, start);
+    clone.remove(end, clone.original.length);
+    return clone;
   }
   _split(index) {
     if (this.byStart.get(index) || this.byEnd.get(index))
@@ -9923,17 +10203,17 @@ var MagicString = class MagicString2 {
     if (searchValue.global)
       matchAll(searchValue, this.original).forEach((match) => {
         if (match.index != null) {
-          const replacement2 = getReplacement(match, this.original);
-          if (replacement2 !== match[0])
-            this.overwrite(match.index, match.index + match[0].length, replacement2);
+          const replacement = getReplacement(match, this.original);
+          if (replacement !== match[0])
+            this.overwrite(match.index, match.index + match[0].length, replacement);
         }
       });
     else {
       const match = this.original.match(searchValue);
       if (match && match.index != null) {
-        const replacement2 = getReplacement(match, this.original);
-        if (replacement2 !== match[0])
-          this.overwrite(match.index, match.index + match[0].length, replacement2);
+        const replacement = getReplacement(match, this.original);
+        if (replacement !== match[0])
+          this.overwrite(match.index, match.index + match[0].length, replacement);
       }
     }
     return this;
@@ -10149,7 +10429,7 @@ function parseHexColor(str) {
   switch (body.length) {
     case 3:
     case 4: {
-      const digits = Array.from(body, (s) => Number.parseInt(s, 16)).map((n2) => n2 << 4 | n2);
+      const digits = Array.from(body, (s) => Number.parseInt(s, 16)).map((n) => n << 4 | n);
       return {
         type: "rgb",
         components: digits.slice(0, 3),
@@ -10310,8 +10590,8 @@ function createValueHandler(handlers) {
   const handler = function(str, theme) {
     const s = this.__options?.sequence || [];
     this.__options.sequence = [];
-    for (const n2 of s) {
-      const res = handlers[n2](str, theme);
+    for (const n of s) {
+      const res = handlers[n](str, theme);
       if (res != null)
         return res;
     }
@@ -10483,9 +10763,9 @@ function createTaggedPseudoClassMatcher(tag, parent, combinator, utils) {
       const [_label, matcher, prefix, pseudoName = ""] = result;
       return {
         matcher,
-        handle: (input2, next) => next({
-          ...input2,
-          prefix: `${prefix}${combinator}${input2.prefix}`.replace(rawRE, "$1$2:"),
+        handle: (input, next) => next({
+          ...input,
+          prefix: `${prefix}${combinator}${input.prefix}`.replace(rawRE, "$1$2:"),
           sort: PseudoClassesKeys.indexOf(pseudoName) ?? PseudoClassesColonKeys.indexOf(pseudoName)
         })
       };
@@ -10524,10 +10804,10 @@ function createPseudoClassesAndElements(utils) {
           index = undefined;
         return {
           matcher: input.slice(match[0].length),
-          handle: (input2, next) => {
-            const selectors = pseudo.includes("::") && !excludedPseudo.includes(pseudo) ? { pseudo: `${input2.pseudo}${pseudo}` } : { selector: `${input2.selector}${pseudo}` };
+          handle: (input, next) => {
+            const selectors = pseudo.includes("::") && !excludedPseudo.includes(pseudo) ? { pseudo: `${input.pseudo}${pseudo}` } : { selector: `${input.selector}${pseudo}` };
             return next({
-              ...input2,
+              ...input,
               ...selectors,
               sort: index,
               noMerge: true
@@ -10548,9 +10828,9 @@ function createPseudoClassesAndElements(utils) {
         return PseudoClassesMulti[match[1]].map((pseudo) => {
           return {
             matcher: input.slice(match[0].length),
-            handle: (input2, next) => next({
-              ...input2,
-              pseudo: `${input2.pseudo}${pseudo}`
+            handle: (input, next) => next({
+              ...input,
+              pseudo: `${input.pseudo}${pseudo}`
             })
           };
         });
@@ -10560,7 +10840,7 @@ function createPseudoClassesAndElements(utils) {
   }];
 }
 function createPseudoClassFunctions(utils) {
-  const { getBracket: getBracket2, h } = utils;
+  const { getBracket, h } = utils;
   let PseudoClassFunctionsRE;
   let PseudoClassColonFunctionsRE;
   let PseudoClassVarFunctionRE;
@@ -10574,7 +10854,7 @@ function createPseudoClassFunctions(utils) {
       const match = input.match(PseudoClassFunctionsRE) || input.match(PseudoClassColonFunctionsRE) || input.match(PseudoClassVarFunctionRE);
       if (match) {
         const fn = match[1];
-        const pseudo = getBracket2(match[2], "[", "]") ? h.bracket(match[2]) : PseudoClasses[match[2]] || PseudoClassesColon[match[2]] || `:${match[2]}`;
+        const pseudo = getBracket(match[2], "[", "]") ? h.bracket(match[2]) : PseudoClasses[match[2]] || PseudoClassesColon[match[2]] || `:${match[2]}`;
         return {
           matcher: input.slice(match[0].length),
           selector: (s) => `${s}:${fn}(${pseudo})`
@@ -10623,11 +10903,11 @@ function variantMatcher(name, handler, options = {}) {
       const match = input.match(re);
       if (match) {
         const matcher = input.slice(match[0].length);
-        const handlers = toArray(handler).map((handler2) => ({
+        const handlers = toArray(handler).map((handler) => ({
           matcher,
-          handle: (input2, next) => next({
-            ...input2,
-            ...handler2(input2)
+          handle: (input, next) => next({
+            ...input,
+            ...handler(input)
           }),
           ...options
         }));
@@ -10648,9 +10928,9 @@ function variantParentMatcher(name, parent) {
       if (match)
         return {
           matcher: input.slice(match[0].length),
-          handle: (input2, next) => next({
-            ...input2,
-            parent: `${input2.parent ? `${input2.parent} $$ ` : ""}${parent}`
+          handle: (input, next) => next({
+            ...input,
+            parent: `${input.parent ? `${input.parent} $$ ` : ""}${parent}`
           })
         };
     },
@@ -10919,15 +11199,15 @@ var cssProps = [
   "clip",
   "border-radius"
 ];
-function round(n2) {
-  return +n2.toFixed(10);
+function round(n) {
+  return +n.toFixed(10);
 }
 function numberWithUnit(str) {
   const match = str.match(numberWithUnitRE);
   if (!match)
     return;
-  const [, n2, unit] = match;
-  const num = Number.parseFloat(n2);
+  const [, n, unit] = match;
+  const num = Number.parseFloat(n);
   if (unit && !Number.isNaN(num))
     return `${round(num)}${unit}`;
 }
@@ -10943,8 +11223,8 @@ function rem(str) {
   const match = str.match(numberWithUnitRE);
   if (!match)
     return;
-  const [, n2, unit] = match;
-  const num = Number.parseFloat(n2);
+  const [, n, unit] = match;
+  const num = Number.parseFloat(n);
   if (!Number.isNaN(num)) {
     if (num === 0)
       return "0";
@@ -10957,8 +11237,8 @@ function px(str) {
   const match = str.match(numberWithUnitRE);
   if (!match)
     return;
-  const [, n2, unit] = match;
-  const num = Number.parseFloat(n2);
+  const [, n, unit] = match;
+  const num = Number.parseFloat(n);
   if (!Number.isNaN(num))
     return unit ? `${round(num)}${unit}` : `${round(num)}px`;
 }
@@ -11024,8 +11304,8 @@ function bracketWithType(str, requiredType, theme) {
     if (theme)
       base = transformThemeFn(base, theme);
     const matches = Array.from(base.matchAll(cssVarsRE));
-    for (const match2 of matches) {
-      const [full, varPaths, _value] = match2;
+    for (const match of matches) {
+      const [full, varPaths, _value] = match;
       if (theme) {
         const [key, ...paths] = varPaths.split(".");
         const { val, varKey } = processThemeVariable(theme, key, paths, varPaths);
@@ -11059,11 +11339,11 @@ function bracketWithType(str, requiredType, theme) {
       case "quoted":
         return base.replace(/(^|[^\\])_/g, "$1 ").replace(/\\_/g, "_").replace(/(["\\])/g, "\\$1").replace(/^(.+)$/, '"$1"');
     }
-    return base.replace(/(url\(.*?\))/g, (v) => v.replace(/_/g, "\\_")).replace(/(^|[^\\])_/g, "$1 ").replace(/\\_/g, "_").replace(/(?:calc|clamp|max|min)\((.*)/g, (match2) => {
+    return base.replace(/(url\(.*?\))/g, (v) => v.replace(/_/g, "\\_")).replace(/(^|[^\\])_/g, "$1 ").replace(/\\_/g, "_").replace(/(?:calc|clamp|max|min)\((.*)/g, (match) => {
       const vars = [];
-      return match2.replace(/var\((--.+?)[,)]/g, (match3, g1) => {
+      return match.replace(/var\((--.+?)[,)]/g, (match, g1) => {
         vars.push(g1);
-        return match3.replace(g1, "--un-calc");
+        return match.replace(g1, "--un-calc");
       }).replace(/(-?\d*\.?\d(?!-\d.+[,)](?![^+\-/*])\D)(?:%|[a-z]+)?|\))([+\-/*])/g, "$1 $2 ").replace(/--un-calc/g, () => vars.shift());
     });
   }
@@ -11099,8 +11379,8 @@ function time(str) {
   const match = str.match(/^(-?[0-9.]+)(s|ms)?$/i);
   if (!match)
     return;
-  const [, n2, unit] = match;
-  const num = Number.parseFloat(n2);
+  const [, n, unit] = match;
+  const num = Number.parseFloat(n);
   if (!Number.isNaN(num)) {
     if (num === 0 && !unit)
       return "0s";
@@ -11111,8 +11391,8 @@ function degree(str) {
   const match = str.match(/^(-?[0-9.]+)(deg|rad|grad|turn)?$/i);
   if (!match)
     return;
-  const [, n2, unit] = match;
-  const num = Number.parseFloat(n2);
+  const [, n, unit] = match;
+  const num = Number.parseFloat(n);
   if (!Number.isNaN(num)) {
     if (num === 0)
       return "0deg";
@@ -11202,8 +11482,8 @@ function parseColor2(body, theme) {
   }
   let { no, keys, color } = parsed ?? {};
   if (!color) {
-    const bracket2 = h.bracketOfColor(main, theme);
-    const bracketOrMain = bracket2 || main;
+    const bracket = h.bracketOfColor(main, theme);
+    const bracketOrMain = bracket || main;
     if (h.numberWithUnit(bracketOrMain))
       return;
     if (/^#[\da-f]+$/i.test(bracketOrMain))
@@ -11212,7 +11492,7 @@ function parseColor2(body, theme) {
       color = `#${bracketOrMain.slice(4)}`;
     else if (main.startsWith("$"))
       color = h.cssvar(main);
-    color = color || bracket2;
+    color = color || bracket;
   }
   return {
     opacity,
@@ -11679,19 +11959,19 @@ function resolveModifier(modifier) {
   return interpolationMethod;
 }
 function bgGradientColorResolver() {
-  return function* ([, position2, body], { theme }) {
+  return function* ([, position, body], { theme }) {
     const css = {};
     const data = parseColor2(body, theme);
     if (data) {
       const { color, keys, alpha } = data;
       if (color) {
         if (Object.values(SpecialColorKey).includes(color))
-          css[`--un-gradient-${position2}`] = color;
+          css[`--un-gradient-${position}`] = color;
         else {
-          css[`--un-${position2}-opacity`] = alpha;
+          css[`--un-${position}-opacity`] = alpha;
           const value = keys ? generateThemeVariable("colors", keys) : color;
-          css[`--un-gradient-${position2}`] = `color-mix(in oklab, ${value} var(--un-${position2}-opacity), transparent)`;
-          yield defineProperty(`--un-${position2}-opacity`, {
+          css[`--un-gradient-${position}`] = `color-mix(in oklab, ${value} var(--un-${position}-opacity), transparent)`;
+          yield defineProperty(`--un-${position}-opacity`, {
             syntax: "<percentage>",
             initialValue: "100%"
           });
@@ -11702,9 +11982,9 @@ function bgGradientColorResolver() {
           detectThemeValue(color, theme);
       }
     } else
-      css[`--un-gradient-${position2}`] = h.bracket.cssvar(body, theme);
-    if (css[`--un-gradient-${position2}`]) {
-      switch (position2) {
+      css[`--un-gradient-${position}`] = h.bracket.cssvar(body, theme);
+    if (css[`--un-gradient-${position}`]) {
+      switch (position) {
         case "from":
           yield {
             ...css,
@@ -11762,7 +12042,7 @@ var backgroundStyles = [
     ] }
   ],
   [/^(from|via|to|stops)-(.+)$/, bgGradientColorResolver()],
-  [/^(from|via|to)-op(?:acity)?-?(.+)$/, ([, position2, opacity], { theme }) => ({ [`--un-${position2}-opacity`]: h.bracket.percent(opacity, theme) })],
+  [/^(from|via|to)-op(?:acity)?-?(.+)$/, ([, position, opacity], { theme }) => ({ [`--un-${position}-opacity`]: h.bracket.percent(opacity, theme) })],
   [/^(from|via|to)-([\d.]+%)$/, bgGradientPositionResolver()],
   [
     /^bg-((?:repeating-)?(?:linear|radial|conic))$/,
@@ -11939,12 +12219,12 @@ var listStyles = {
 var listStyle = [
   [
     /^list-(.+?)(?:-(outside|inside))?$/,
-    ([, alias, position2]) => {
+    ([, alias, position]) => {
       const style = listStyles[alias];
       if (style) {
-        if (position2)
+        if (position)
           return {
-            "list-style-position": position2,
+            "list-style-position": position,
             "list-style-type": style
           };
         return { "list-style-type": style };
@@ -12170,10 +12450,10 @@ var bgColors = [[
       };
     const bracketLength = h.bracketOfLength(d, theme);
     if (bgLengthRE.test(d) && bracketLength != null)
-      return { "background-size": bracketLength.split(" ").map((e2) => h.fraction.auto.px.cssvar(e2) ?? e2).join(" ") };
+      return { "background-size": bracketLength.split(" ").map((e) => h.fraction.auto.px.cssvar(e) ?? e).join(" ") };
     const bracketPosition = h.bracketOfPosition(d, theme);
     if ((isSize(d) || bgPositionRE.test(d)) && bracketPosition != null)
-      return { "background-position": bracketPosition.split(" ").map((e2) => h.position.fraction.auto.px.cssvar(e2) ?? e2).join(" ") };
+      return { "background-position": bracketPosition.split(" ").map((e) => h.position.fraction.auto.px.cssvar(e) ?? e).join(" ") };
     if (bgGradientRE.test(d) || bgImageRE.test(d)) {
       const s = h.bracket(d, theme);
       if (s)
@@ -12184,7 +12464,7 @@ var bgColors = [[
   { autocomplete: "bg-$colors" }
 ], [
   /^bg-op(?:acity)?-?(.+)$/,
-  ([, opacity2], { theme }) => ({ "--un-bg-opacity": h.bracket.percent.cssvar(opacity2, theme) }),
+  ([, opacity], { theme }) => ({ "--un-bg-opacity": h.bracket.percent.cssvar(opacity, theme) }),
   { autocomplete: "bg-(op|opacity)-<percent>" }
 ]];
 var colorScheme = [[/^(?:color-)?scheme-(.+)$/, ([, v]) => ({ "color-scheme": v.split("-").join(" ") })]];
@@ -12256,7 +12536,7 @@ var textDecorations = [
   ],
   [
     /^(?:underline|decoration)-op(?:acity)?-?(.+)$/,
-    ([, opacity2], { theme }) => ({ "--un-line-opacity": h.bracket.percent.cssvar(opacity2, theme) }),
+    ([, opacity], { theme }) => ({ "--un-line-opacity": h.bracket.percent.cssvar(opacity, theme) }),
     { autocomplete: "(underline|decoration)-(op|opacity)-<percent>" }
   ],
   [
@@ -12383,10 +12663,10 @@ var divides = [
   ],
   [
     /^divide-op(?:acity)?-?(.+)$/,
-    function* ([match, opacity2], { symbols: symbols2, theme }) {
+    function* ([match, opacity], { symbols: symbols2, theme }) {
       yield {
         [symbols2.variants]: [notLastChildSelectorVariant(match)],
-        "--un-divide-opacity": h.bracket.percent(opacity2, theme)
+        "--un-divide-opacity": h.bracket.percent(opacity, theme)
       };
     },
     { autocomplete: ["divide-(op|opacity)", "divide-(op|opacity)-<percent>"] }
@@ -12560,7 +12840,7 @@ var filters = [
     ] }
   ],
   [/^(?:filter-)?drop-shadow-color-(.+)$/, colorResolver("--un-drop-shadow-color", "drop-shadow")],
-  [/^(?:filter-)?drop-shadow(?:-color)?-op(?:acity)?-?(.+)$/, ([, opacity2], { theme }) => ({ "--un-drop-shadow-opacity": h.bracket.percent(opacity2, theme) })],
+  [/^(?:filter-)?drop-shadow(?:-color)?-op(?:acity)?-?(.+)$/, ([, opacity], { theme }) => ({ "--un-drop-shadow-opacity": h.bracket.percent(opacity, theme) })],
   [
     /^(?:(backdrop-)|filter-)?grayscale(?:-(.+))?$/,
     toFilter("grayscale", percentWithDefault),
@@ -12625,7 +12905,7 @@ var flex = [
   ["flex-inline", { display: "inline-flex" }],
   [/^flex-(.*)$/, ([, d], { theme }) => {
     const value = h.bracket(d, theme);
-    return { flex: value != null ? value.split(" ").map((e2) => h.cssvar.fraction(e2) ?? e2).join(" ") : h.cssvar.fraction(d) };
+    return { flex: value != null ? value.split(" ").map((e) => h.cssvar.fraction(e) ?? e).join(" ") : h.cssvar.fraction(d) };
   }],
   ["flex-1", { flex: "1 1 0%" }],
   ["flex-auto", { flex: "1 1 auto" }],
@@ -12785,10 +13065,10 @@ function handlerRuleSize([, d = "", widthLabel, s = "1"], { theme }) {
   const v = h.bracket.cssvar.px(s, theme);
   if (!v)
     return;
-  const values = splitRuleValues(v).map((s2) => h.cssvar.px(s2) ?? s2);
+  const values = splitRuleValues(v).map((s) => h.cssvar.px(s) ?? s);
   if (!widthLabel && values.some(isRuleCSSVariable))
     return;
-  if (values.every((s2) => isSize(s2) || s2.startsWith("var(")))
+  if (values.every((s) => isSize(s) || s.startsWith("var(")))
     return { [property]: values.join(",") };
 }
 function handlerRule([, d = "", v], { theme }) {
@@ -12880,7 +13160,7 @@ var grids = [
   ],
   [/^grid-area(s)?-(.+)$/, ([, s, v], { theme }) => {
     if (s != null)
-      return { "grid-template-areas": h.cssvar(v) ?? v.split("-").map((s2) => `"${h.bracket(s2, theme)}"`).join(" ") };
+      return { "grid-template-areas": h.cssvar(v) ?? v.split("-").map((s) => `"${h.bracket(s, theme)}"`).join(" ") };
     return { "grid-area": h.bracket.cssvar(v, theme) };
   }],
   ["grid-rows-none", { "grid-template-rows": "none" }],
@@ -13099,7 +13379,7 @@ var placeholders = [[
   { autocomplete: "placeholder-$colors" }
 ], [
   /^\$ placeholder-op(?:acity)?-?(.+)$/,
-  ([, opacity2], { theme }) => ({ "--un-placeholder-opacity": h.bracket.percent(opacity2, theme) }),
+  ([, opacity], { theme }) => ({ "--un-placeholder-opacity": h.bracket.percent(opacity, theme) }),
   { autocomplete: ["placeholder-(op|opacity)", "placeholder-(op|opacity)-<percent>"] }
 ]];
 var positions = [
@@ -13304,7 +13584,7 @@ var boxShadows = [
   ],
   [
     /^shadow-op(?:acity)?-?(.+)$/,
-    ([, opacity2], { theme }) => ({ "--un-shadow-opacity": h.bracket.percent.cssvar(opacity2, theme) }),
+    ([, opacity], { theme }) => ({ "--un-shadow-opacity": h.bracket.percent.cssvar(opacity, theme) }),
     { autocomplete: "shadow-(op|opacity)-<percent>" }
   ],
   [
@@ -13314,7 +13594,7 @@ var boxShadows = [
   ],
   [
     /^inset-shadow-op(?:acity)?-?(.+)$/,
-    ([, opacity2], { theme }) => ({ "--un-inset-shadow-opacity": h.bracket.percent.cssvar(opacity2, theme) }),
+    ([, opacity], { theme }) => ({ "--un-inset-shadow-opacity": h.bracket.percent.cssvar(opacity, theme) }),
     { autocomplete: "shadow-(op|opacity)-<percent>" }
   ]
 ];
@@ -13358,7 +13638,7 @@ var rings = [
   ],
   [
     /^ring-op(?:acity)?-?(.+)$/,
-    ([, opacity2], { theme }) => ({ "--un-ring-opacity": h.bracket.percent.cssvar(opacity2, theme) }),
+    ([, opacity], { theme }) => ({ "--un-ring-opacity": h.bracket.percent.cssvar(opacity, theme) }),
     { autocomplete: "ring-(op|opacity)-<percent>" }
   ],
   [/^inset-ring(?:-(.+))?$/, ([, d], { theme }) => {
@@ -13376,7 +13656,7 @@ var rings = [
   ],
   [
     /^inset-ring-op(?:acity)?-?(.+)$/,
-    ([, opacity2], { theme }) => ({ "--un-inset-ring-opacity": h.bracket.percent.cssvar(opacity2, theme) }),
+    ([, opacity], { theme }) => ({ "--un-inset-ring-opacity": h.bracket.percent.cssvar(opacity, theme) }),
     { autocomplete: "inset-ring-(op|opacity)-<percent>" }
   ],
   [
@@ -13398,7 +13678,7 @@ var rings = [
   ],
   [
     /^ring-offset-op(?:acity)?-?(.+)$/,
-    ([, opacity2], { theme }) => ({ "--un-ring-offset-opacity": h.bracket.percent.cssvar(opacity2, theme) }),
+    ([, opacity], { theme }) => ({ "--un-ring-offset-opacity": h.bracket.percent.cssvar(opacity, theme) }),
     { autocomplete: "ring-offset-(op|opacity)-<percent>" }
   ],
   ["ring-inset", { "--un-ring-inset": "inset" }]
@@ -13599,7 +13879,7 @@ var contains = [
   [/^contain-(.*)$/, ([, d], { theme }) => {
     const value = h.bracket(d, theme);
     if (value != null)
-      return { contain: value.split(" ").map((e2) => h.cssvar.fraction(e2) ?? e2).join(" ") };
+      return { contain: value.split(" ").map((e) => h.cssvar.fraction(e) ?? e).join(" ") };
     return containValues.includes(d) ? [{
       "--un-contain-size": d,
       contain: containValues.map((i) => `var(--un-contain-${i})`).join(" ")
@@ -13805,9 +14085,9 @@ var objectPositions = [
     ([, d], { theme }) => {
       if (positionMap[d])
         return { "object-position": positionMap[d] };
-      const position2 = h.bracketOfPosition(d, theme);
-      if (position2 != null)
-        return { "object-position": position2.split(" ").map((e2) => h.position.fraction.auto.px.cssvar(e2) ?? e2).join(" ") };
+      const position = h.bracketOfPosition(d, theme);
+      if (position != null)
+        return { "object-position": position.split(" ").map((e) => h.position.fraction.auto.px.cssvar(e) ?? e).join(" ") };
     },
     { autocomplete: `object-(${Object.keys(positionMap).join("|")})` }
   ]
@@ -13872,7 +14152,7 @@ var svgUtilities = [
   ],
   [
     /^fill-op(?:acity)?-?(.+)$/,
-    ([, opacity2], { theme }) => ({ "--un-fill-opacity": h.bracket.percent.cssvar(opacity2, theme) }),
+    ([, opacity], { theme }) => ({ "--un-fill-opacity": h.bracket.percent.cssvar(opacity, theme) }),
     { autocomplete: "fill-(op|opacity)-<percent>" }
   ],
   ["fill-none", { fill: "none" }],
@@ -13890,7 +14170,7 @@ var svgUtilities = [
   ],
   [
     /^stroke-op(?:acity)?-?(.+)$/,
-    ([, opacity2], { theme }) => ({ "--un-stroke-opacity": h.bracket.percent.cssvar(opacity2, theme) }),
+    ([, opacity], { theme }) => ({ "--un-stroke-opacity": h.bracket.percent.cssvar(opacity, theme) }),
     { autocomplete: "stroke-(op|opacity)-<percent>" }
   ],
   ["stroke-cap-square", { "stroke-linecap": "square" }],
@@ -13952,8 +14232,8 @@ var tables = [
           [`--un-border-spacing-${d}`]: v,
           "border-spacing": "var(--un-border-spacing-x) var(--un-border-spacing-y)"
         };
-        for (const d2 of ["x", "y"])
-          yield defineProperty(`--un-border-spacing-${d2}`, {
+        for (const d of ["x", "y"])
+          yield defineProperty(`--un-border-spacing-${d}`, {
             syntax: "<length>",
             initialValue: "0"
           });
@@ -14114,7 +14394,7 @@ function handleTranslate([, d, b], { theme }) {
       "x",
       "y",
       "z"
-    ].map((d2) => defineProperty(`--un-translate-${d2}`, { initialValue: 0 }))];
+    ].map((d) => defineProperty(`--un-translate-${d}`, { initialValue: 0 }))];
   }
 }
 function handleScale([, d, b], { theme }) {
@@ -14126,7 +14406,7 @@ function handleScale([, d, b], { theme }) {
       "x",
       "y",
       "z"
-    ].map((d2) => defineProperty(`--un-scale-${d2}`, { initialValue: 1 }))];
+    ].map((d) => defineProperty(`--un-scale-${d}`, { initialValue: 1 }))];
   }
 }
 function handleRotate([, d = "", b], { theme }) {
@@ -14141,8 +14421,8 @@ function handleRotate([, d = "", b], { theme }) {
           "x",
           "y",
           "z"
-        ].map((d2) => defineProperty(`--un-rotate-${d2}`, { initialValue: `rotate${d2.toUpperCase()}(0)` })),
-        ...["x", "y"].map((d2) => defineProperty(`--un-skew-${d2}`, { initialValue: `skew${d2.toUpperCase()}(0)` }))
+        ].map((d) => defineProperty(`--un-rotate-${d}`, { initialValue: `rotate${d.toUpperCase()}(0)` })),
+        ...["x", "y"].map((d) => defineProperty(`--un-skew-${d}`, { initialValue: `skew${d.toUpperCase()}(0)` }))
       ];
     else
       return { rotate: h.bracket.cssvar.degree(b, theme) };
@@ -14158,15 +14438,15 @@ function handleSkew([, d, b], { theme }) {
         "x",
         "y",
         "z"
-      ].map((d2) => defineProperty(`--un-rotate-${d2}`, { initialValue: `rotate${d2.toUpperCase()}(0)` })),
-      ...["x", "y"].map((d2) => defineProperty(`--un-skew-${d2}`, { initialValue: `skew${d2.toUpperCase()}(0)` }))
+      ].map((d) => defineProperty(`--un-rotate-${d}`, { initialValue: `rotate${d.toUpperCase()}(0)` })),
+      ...["x", "y"].map((d) => defineProperty(`--un-skew-${d}`, { initialValue: `skew${d.toUpperCase()}(0)` }))
     ];
 }
 function transformXYZ(d, v, name) {
   const values = v.split(splitComma);
   if (d || !d && values.length === 1)
     return xyzMap[d].map((i) => [`--un-${name}${i}`, v]);
-  return values.map((v2, i) => [`--un-${name}-${xyzArray[i]}`, v2]);
+  return values.map((v, i) => [`--un-${name}-${xyzArray[i]}`, v]);
 }
 function resolveTransitionProperty(prop, theme) {
   let p;
@@ -14175,7 +14455,7 @@ function resolveTransitionProperty(prop, theme) {
   else {
     if (prop.startsWith("[") && prop.endsWith("]"))
       prop = prop.slice(1, -1);
-    const props = prop.split(",").map((p2) => theme.property?.[p2] ?? h.properties(p2));
+    const props = prop.split(",").map((p) => theme.property?.[p] ?? h.properties(p));
     if (props.every(Boolean))
       p = props.join(",");
   }
@@ -14265,7 +14545,7 @@ var fonts = [
   ],
   [
     /^(?:text|color|c)-op(?:acity)?-?(.+)$/,
-    ([, opacity2], { theme }) => ({ "--un-text-opacity": h.bracket.percent.cssvar(opacity2, theme) }),
+    ([, opacity], { theme }) => ({ "--un-text-opacity": h.bracket.percent.cssvar(opacity, theme) }),
     { autocomplete: "(text|color|c)-(op|opacity)-<percent>" }
   ],
   [
@@ -14437,7 +14717,7 @@ var textStrokes = [
   ],
   [
     /^text-stroke-op(?:acity)?-?(.+)$/,
-    ([, opacity2], { theme }) => ({ "--un-text-stroke-opacity": h.bracket.percent.cssvar(opacity2, theme) }),
+    ([, opacity], { theme }) => ({ "--un-text-stroke-opacity": h.bracket.percent.cssvar(opacity, theme) }),
     { autocomplete: "text-stroke-(op|opacity)-<percent>" }
   ]
 ];
@@ -14476,7 +14756,7 @@ var textShadows = [
   ],
   [
     /^text-shadow(?:-color)?-op(?:acity)?-?(.+)$/,
-    ([, opacity2], { theme }) => ({ "--un-text-shadow-opacity": h.bracket.percent.cssvar(opacity2, theme) }),
+    ([, opacity], { theme }) => ({ "--un-text-shadow-opacity": h.bracket.percent.cssvar(opacity, theme) }),
     { autocomplete: "text-shadow(-color)?-(op|opacity)-<percent>" }
   ]
 ];
@@ -15758,11 +16038,11 @@ var variantAria = {
     const variant = variantGetParameter("aria-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
-      const aria2 = h.bracket(match, ctx.theme) ?? ctx.theme.aria?.[match] ?? "";
-      if (aria2)
+      const aria = h.bracket(match, ctx.theme) ?? ctx.theme.aria?.[match] ?? "";
+      if (aria)
         return {
           matcher: rest,
-          selector: (s) => `${s}[aria-${aria2}]`
+          selector: (s) => `${s}[aria-${aria}]`
         };
     }
   },
@@ -15810,7 +16090,7 @@ var variantTaggedAriaAttributes = [
 ];
 var sizePseudo = /(max|min)-\[([^\]]*)\]:/;
 function variantBreakpoints() {
-  const regexCache2 = {};
+  const regexCache = {};
   return {
     name: "breakpoints",
     match(matcher, context) {
@@ -15830,9 +16110,9 @@ function variantBreakpoints() {
         idx
       ]);
       for (const [point, size, idx] of variantEntries) {
-        if (!regexCache2[point])
-          regexCache2[point] = new RegExp(`^((?:([al]t-|[<~]|max-))?${point}(?:${context.generator.config.separators.join("|")}))`);
-        const match = matcher.match(regexCache2[point]);
+        if (!regexCache[point])
+          regexCache[point] = new RegExp(`^((?:([al]t-|[<~]|max-))?${point}(?:${context.generator.config.separators.join("|")}))`);
+        const match = matcher.match(regexCache[point]);
         if (!match)
           continue;
         const [, pre] = match;
@@ -15923,12 +16203,12 @@ var variantContainerQuery = {
     if (variant) {
       const [match, rest, label] = variant;
       const unbracket = h.bracket(match, ctx.theme);
-      let container3;
+      let container;
       if (unbracket)
-        container3 = h.numberWithUnit(unbracket);
+        container = h.numberWithUnit(unbracket);
       else
-        container3 = ctx.theme.container?.[match] ?? "";
-      if (container3) {
+        container = ctx.theme.container?.[match] ?? "";
+      if (container) {
         let order = 1000 + Object.keys(ctx.theme.container ?? {}).indexOf(match);
         if (label)
           order += 1000;
@@ -15936,7 +16216,7 @@ var variantContainerQuery = {
           matcher: rest,
           handle: (input, next) => next({
             ...input,
-            parent: `${input.parent ? `${input.parent} $$ ` : ""}@container${label ? ` ${label} ` : " "}(min-width: ${container3})`,
+            parent: `${input.parent ? `${input.parent} $$ ` : ""}@container${label ? ` ${label} ` : " "}(min-width: ${container})`,
             parentOrder: order
           })
         };
@@ -16077,15 +16357,15 @@ var variantCustomMedia = {
     const variant = variantGetParameter("media-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
-      let media2 = h.bracket(match, ctx.theme) ?? "";
-      if (media2 === "")
-        media2 = ctx.theme.media?.[match] ?? "";
-      if (media2)
+      let media = h.bracket(match, ctx.theme) ?? "";
+      if (media === "")
+        media = ctx.theme.media?.[match] ?? "";
+      if (media)
         return {
           matcher: rest,
           handle: (input, next) => next({
             ...input,
-            parent: `${input.parent ? `${input.parent} $$ ` : ""}@media ${media2}`
+            parent: `${input.parent ? `${input.parent} $$ ` : ""}@media ${media}`
           })
         };
     }
@@ -16151,11 +16431,11 @@ var variantScope = {
     const variant = variantGetBracket("scope-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
-      const scope2 = h.bracket(match, ctx.theme);
-      if (scope2)
+      const scope = h.bracket(match, ctx.theme);
+      if (scope)
         return {
           matcher: rest,
-          selector: (s) => `${scope2} $$ ${s}`
+          selector: (s) => `${scope} $$ ${s}`
         };
     }
   }
@@ -16298,18 +16578,18 @@ var variantNegative = {
     };
   }
 };
-var placeholderModifier = (input, { theme: theme2 }) => {
+var placeholderModifier = (input, { theme }) => {
   const m = input.match(/^(.*)\b(placeholder-)(.+)$/);
   if (m) {
     const [, pre = "", p, body] = m;
-    if (hasParseableColor(body, theme2) || hasOpacityValue(body, theme2))
+    if (hasParseableColor(body, theme) || hasOpacityValue(body, theme))
       return { matcher: `${pre}placeholder-$ ${p}${body}` };
   }
 };
-function hasOpacityValue(body, theme2) {
+function hasOpacityValue(body, theme) {
   const match = body.match(/^op(?:acity)?-?(.+)$/);
   if (match && match[1] != null)
-    return h.bracket.percent(match[1], theme2) != null;
+    return h.bracket.percent(match[1], theme) != null;
   return false;
 }
 function variantPseudoClassesAndElements() {
@@ -16354,20 +16634,20 @@ var variantSupports = {
     const variant = variantGetParameter("supports-", matcher, ctx.generator.config.separators);
     if (variant) {
       const [match, rest] = variant;
-      let supports2 = h.bracket(match, ctx.theme) ?? "";
-      if (supports2 === "")
-        supports2 = ctx.theme.supports?.[match] ?? "";
-      if (supports2) {
-        if (/^[\w-]+$/.test(supports2))
-          supports2 = `(${supports2}: var(--un))`;
-        supports2 = supports2.replace(/\b(and|or|not)\b/gi, " $1 ").replace(/\s+/g, " ").trim();
-        if (!(supports2.startsWith("(") && supports2.endsWith(")")) && !/^not\b/i.test(supports2))
-          supports2 = `(${supports2})`;
+      let supports = h.bracket(match, ctx.theme) ?? "";
+      if (supports === "")
+        supports = ctx.theme.supports?.[match] ?? "";
+      if (supports) {
+        if (/^[\w-]+$/.test(supports))
+          supports = `(${supports}: var(--un))`;
+        supports = supports.replace(/\b(and|or|not)\b/gi, " $1 ").replace(/\s+/g, " ").trim();
+        if (!(supports.startsWith("(") && supports.endsWith(")")) && !/^not\b/i.test(supports))
+          supports = `(${supports})`;
         return {
           matcher: rest,
           handle: (input, next) => next({
             ...input,
-            parent: `${input.parent ? `${input.parent} $$ ` : ""}@supports ${supports2}`
+            parent: `${input.parent ? `${input.parent} $$ ` : ""}@supports ${supports}`
           })
         };
       }
@@ -16497,7 +16777,7 @@ function property2(options) {
     getCSS: () => {
       if (trackedProperties.size === 0)
         return;
-      const css = Array.from(trackedProperties.entries()).sort(([a], [b]) => a.localeCompare(b)).map(([property3, value]) => `${property3.replace(/^--un-/, `--${prefix}`)}:${value};`).join("");
+      const css = Array.from(trackedProperties.entries()).sort(([a], [b]) => a.localeCompare(b)).map(([property, value]) => `${property.replace(/^--un-/, `--${prefix}`)}:${value};`).join("");
       return parentSelector === false ? `${selector}{${css}}` : `${parentSelector}{${selector}{${css}}}`;
     },
     layer: "properties"
@@ -16932,8 +17212,8 @@ var ExcludeCssVarKeys = [
   "supports",
   "containers"
 ];
-function getThemeVarsMap(theme2, keys) {
-  const themeMap = /* @__PURE__ */ new Map([["--spacing", theme2.spacing.DEFAULT]]);
+function getThemeVarsMap(theme, keys) {
+  const themeMap = /* @__PURE__ */ new Map([["--spacing", theme.spacing.DEFAULT]]);
   const normalizeValue = (value) => value.replace(alphaPlaceholdersRE, "1");
   function process(obj, prefix) {
     for (const key in obj)
@@ -16944,10 +17224,10 @@ function getThemeVarsMap(theme2, keys) {
       else
         themeMap.set(`--${prefix}-${key}`, normalizeValue(obj[key]));
   }
-  for (const key in theme2) {
+  for (const key in theme) {
     if (!keys.includes(key))
       continue;
-    process(theme2[key], key);
+    process(theme[key], key);
   }
   return themeMap;
 }
@@ -16959,7 +17239,7 @@ function theme$1(options) {
   return {
     layer: "theme",
     getCSS(ctx) {
-      const { theme: theme2, generator } = ctx;
+      const { theme, generator } = ctx;
       const safelist = uniq(generator.config.safelist.flatMap((s) => typeof s === "function" ? s(ctx) : s));
       const { mode, process } = preflightsTheme;
       if (mode === false)
@@ -16967,22 +17247,22 @@ function theme$1(options) {
       if (safelist.length > 0)
         for (const s of safelist) {
           const [key, ...prop] = s.trim().split(":");
-          if (key in theme2 && prop.length <= 1) {
+          if (key in theme && prop.length <= 1) {
             const props = prop.length === 0 ? ["DEFAULT"] : prop[0].split("-");
-            const v = getThemeByKey(theme2, key, props);
+            const v = getThemeByKey(theme, key, props);
             if (typeof v === "string") {
               themeTracking(key, props);
-              detectThemeValue(v, theme2);
+              detectThemeValue(v, theme);
             }
           }
         }
       let deps;
-      const generateCSS = (deps2) => {
+      const generateCSS = (deps) => {
         if (process)
-          for (const utility of deps2)
+          for (const utility of deps)
             for (const p of toArray(process))
               p(utility, ctx);
-        const resolvedDeps = deps2.map(([key, value]) => key && value ? `${escapeSelector(key)}: ${value};` : undefined).filter(Boolean);
+        const resolvedDeps = deps.map(([key, value]) => key && value ? `${escapeSelector(key)}: ${value};` : undefined).filter(Boolean);
         if (resolvedDeps.length === 0)
           return;
         const depCSS = resolvedDeps.join(`
@@ -16997,13 +17277,13 @@ ${depCSS}
           return;
         deps = Array.from(trackedTheme).map((k) => {
           const [key, prop] = k.split(":");
-          const v = getThemeByKey(theme2, key, prop.split("-"));
+          const v = getThemeByKey(theme, key, prop.split("-"));
           if (typeof v === "string")
             return [`--${key}${`${key === "spacing" && prop === "DEFAULT" ? "" : `-${prop}`}`}`, v];
         }).filter(Boolean);
       } else {
-        const keys = Object.keys(theme2).filter((k) => !ExcludeCssVarKeys.includes(k));
-        deps = Array.from(getThemeVarsMap(theme2, keys));
+        const keys = Object.keys(theme).filter((k) => !ExcludeCssVarKeys.includes(k));
+        deps = Array.from(getThemeVarsMap(theme, keys));
       }
       return generateCSS(deps);
     }
@@ -17061,16 +17341,19 @@ var presetWind4 = definePreset((options = {}) => {
 });
 
 // src/client/runtime/uno-config.ts
-var unoConfig = (scope2) => ({
-  presets: [presetWind4({ important: scope2, preflights: { reset: false } })],
+var unoConfig = (scope) => ({
+  presets: [presetWind4({ important: scope, preflights: { reset: false } })],
   preflights: [
     {
-      getCSS: () => `${scope2} *, ${scope2} *::before, ${scope2} *::after { box-sizing: border-box; }
-      ${scope2} ul, ${scope2} ol { list-style: none; margin: 0; padding: 0; }
-      ${scope2} button, ${scope2} input, ${scope2} select, ${scope2} textarea {
+      getCSS: () => `${scope} *, ${scope} *::before, ${scope} *::after { box-sizing: border-box; }
+      ${scope} ul, ${scope} ol { list-style: none; margin: 0; padding: 0; }
+      ${scope} h1, ${scope} h2, ${scope} h3, ${scope} h4, ${scope} h5, ${scope} h6,
+      ${scope} p, ${scope} blockquote, ${scope} figure, ${scope} figcaption,
+      ${scope} dl, ${scope} dd, ${scope} pre, ${scope} hr { margin: 0; }
+      ${scope} button, ${scope} input, ${scope} select, ${scope} textarea {
         background: transparent; color: inherit; font: inherit; border: 0 solid; cursor: pointer;
       }
-      ${scope2} input, ${scope2} select, ${scope2} textarea { cursor: auto; }`
+      ${scope} input, ${scope} select, ${scope} textarea { cursor: auto; }`
     }
   ],
   theme: {
@@ -17112,13 +17395,13 @@ async function ensureUnoStyles(code, streaming = false) {
   if (streaming) {
     if (!preflighted) {
       preflighted = true;
-      const { css: css3 } = await uno.generate([], { preflights: true });
-      sheet.textContent += splitVendorRules(css3);
+      const { css } = await uno.generate([], { preflights: true });
+      sheet.textContent += splitVendorRules(css);
     }
     if (fresh.length === 0)
       return;
-    const { css: css2 } = await uno.generate(fresh, { preflights: false });
-    sheet.textContent += splitVendorRules(css2);
+    const { css } = await uno.generate(fresh, { preflights: false });
+    sheet.textContent += splitVendorRules(css);
     return;
   }
   preflighted = true;
@@ -17167,10 +17450,8 @@ var compiler = () => {
   }
   return sharedCompiler;
 };
-var TRANSIENT = /No default export found|Unexpected (end of|eof)/i;
 var TRANSIENT_LOAD = /failed to fetch|failed to load|networkerror|load failed/i;
 var MAX_RETRIES = 3;
-var isUnfinishedFrame = (message, phase, streaming) => streaming && phase !== "render" && TRANSIENT.test(message);
 var shouldRetry = (message, phase, streaming, attempts) => phase === "compile" && !streaming && TRANSIENT_LOAD.test(message) && attempts < MAX_RETRIES;
 var deliveryFor = (code, delivered, streaming) => {
   if (!streaming)
@@ -17194,16 +17475,20 @@ var deliver = (renderer, delivery) => {
   return true;
 };
 var importSignature = (code) => [...code.matchAll(/from\s+["']([^"']+)["']/g)].map((match) => match[1]).join(" ");
+var reportStranded = (streaming, stranded, code, reportedFor) => !streaming && stranded !== null && reportedFor !== code;
 var errorAction = (message, phase, streaming, attempts) => {
-  if (isUnfinishedFrame(message, phase, streaming))
+  if (streaming)
     return "ignore";
   return shouldRetry(message, phase, streaming, attempts) ? "retry" : "report";
 };
-var RETRY_BACKOFF_MS = 400;
-var probeOutcome = (signature, current, streaming, delivered) => {
+var RETRY_BACKOFF_MS = 500;
+var RETRY_FACTOR = 4;
+var probeOutcome = (signature, current, streaming, delivered, probed) => {
   if (signature !== current)
     return "stale";
-  return !streaming && delivered !== "" ? "redeliver" : "store";
+  if (delivered === "")
+    return "store";
+  return !streaming || delivered === probed ? "redeliver" : "store";
 };
 var dispatchError = (action, effects) => {
   if (action === "ignore")
@@ -17211,17 +17496,28 @@ var dispatchError = (action, effects) => {
   if (action === "retry") {
     const next = effects.attempts() + 1;
     effects.setAttempts(next);
-    effects.schedule(RETRY_BACKOFF_MS * next);
+    effects.schedule(RETRY_BACKOFF_MS * RETRY_FACTOR ** (next - 1));
     return;
   }
   effects.report();
 };
+var unbundleFetchedImports = (imports) => Object.fromEntries(Object.entries(imports).map(([key, url]) => {
+  if (!url.startsWith("https://esm.sh/"))
+    return [key, url];
+  const parsed = new URL(url);
+  parsed.searchParams.delete("bundle");
+  return [key, parsed.toString()];
+}));
 var bustFetchedImports = (imports, attempt) => Object.fromEntries(Object.entries(imports).map(([key, url]) => [key, url.startsWith("https://esm.sh/") ? `${url}${url.includes("?") ? "&" : "?"}ui4a-retry=${attempt}` : url]));
 function GenUISurface({ code, streaming = false, preserveState = true, onError, onRendered, className }) {
   const hostRef = import_react4.useRef(null);
   const [renderer, setRenderer] = import_react4.useState(null);
   const onErrorRef = useLatest(onError);
   const onRenderedRef = useLatest(onRendered);
+  const threwRef = import_react4.useRef(false);
+  const strandedRef = import_react4.useRef(null);
+  const strandedReportedRef = import_react4.useRef("");
+  const retryTimers = import_react4.useRef(new Set);
   const streamingRef = useLatest(streaming);
   const preserveStateRef = import_react4.useRef(preserveState);
   const retriesRef = import_react4.useRef(0);
@@ -17230,35 +17526,45 @@ function GenUISurface({ code, streaming = false, preserveState = true, onError,
       return;
     const attempt = retriesRef.current;
     mergeFallbackImports(localImports(), code).then((imports) => {
-      renderer.setImportMap({ imports: bustFetchedImports(imports, attempt) });
+      const fresh = attempt > 0 ? unbundleFetchedImports(imports) : imports;
+      renderer.setImportMap({ imports: bustFetchedImports(fresh, attempt) });
       renderer.clear({ preserveVisualState: true });
       renderer.render(code);
     });
   });
   import_react4.useEffect(() => {
-    const host2 = hostRef.current;
-    if (host2 === null)
+    const host = hostRef.current;
+    if (host === null)
       return;
     let disposed = false;
     let attached = null;
-    GenUIRenderer.create(host2, {
+    GenUIRenderer.create(host, {
       compiler: compiler(),
       importmap: { imports: localImports() },
       preserveStateOnUpdate: preserveStateRef.current,
       callbacks: {
         onError: (error, phase) => {
-          dispatchError(errorAction(error.message, phase, streamingRef.current, retriesRef.current), {
+          if (phase === "render")
+            threwRef.current = true;
+          const action = errorAction(error.message, phase, streamingRef.current, retriesRef.current);
+          if (action === "ignore")
+            strandedRef.current = { error, phase };
+          dispatchError(action, {
             attempts: () => retriesRef.current,
-            setAttempts: (n2) => {
-              retriesRef.current = n2;
+            setAttempts: (n) => {
+              retriesRef.current = n;
             },
-            schedule: (ms) => setTimeout(() => retryRef.current(), ms),
+            schedule: (ms) => void retryTimers.current.add(setTimeout(() => retryRef.current(), ms)),
             report: () => onErrorRef.current?.(error, phase)
           });
         },
         onRendered: () => {
           retriesRef.current = 0;
-          onRenderedRef.current?.();
+          const restored = threwRef.current;
+          threwRef.current = false;
+          if (!restored)
+            strandedRef.current = null;
+          onRenderedRef.current?.(restored);
         }
       }
     }).then((created) => {
@@ -17272,6 +17578,9 @@ function GenUISurface({ code, streaming = false, preserveState = true, onError,
       attached?.detach();
       attached = null;
       setRenderer(null);
+      for (const timer of retryTimers.current)
+        clearTimeout(timer);
+      retryTimers.current.clear();
     };
   }, []);
   const importedRef = import_react4.useRef("");
@@ -17283,7 +17592,7 @@ function GenUISurface({ code, streaming = false, preserveState = true, onError,
     if (signature !== importedRef.current) {
       importedRef.current = signature;
       mergeFallbackImports(localImports(), code).then((imports) => {
-        const settle = probeOutcome(signature, importedRef.current, streamingRef.current, deliveredRef.current);
+        const settle = probeOutcome(signature, importedRef.current, streamingRef.current, deliveredRef.current, code);
         if (settle === "stale")
           return;
         renderer.setImportMap({ imports });
@@ -17293,8 +17602,14 @@ function GenUISurface({ code, streaming = false, preserveState = true, onError,
     }
     retriesRef.current = 0;
     ensureUnoStyles(code, streaming);
-    if (!deliver(renderer, deliveryFor(code, deliveredRef.current, streaming)))
+    if (!deliver(renderer, deliveryFor(code, deliveredRef.current, streaming))) {
+      const stranded = strandedRef.current;
+      if (stranded !== null && reportStranded(streaming, stranded, code, strandedReportedRef.current)) {
+        strandedReportedRef.current = code;
+        onErrorRef.current?.(stranded.error, stranded.phase);
+      }
       return;
+    }
     deliveredRef.current = code;
   }, [renderer, code, streaming]);
   return /* @__PURE__ */ jsx_runtime.jsx("div", {
@@ -17305,32 +17620,39 @@ function GenUISurface({ code, streaming = false, preserveState = true, onError,
 }
 
 // src/client/runtime/report-error.ts
-var sent = new Set;
-var reportBody = (message, phase) => `[automatic] The card you just wrote did not render. It failed at the ${phase} step:
-
-${message}
-
-This was sent by the renderer, not by the user — nobody typed it, so do not apologise or address it as a request. If the error names the correct usage (the available exports, for instance), fix the card and send it again. If it does not, look it up before you change anything, and answer in the language the user has been writing in.`;
 var SETTLE_MS = 1000;
 var pending = null;
-function cardRendered() {
+var outstanding = null;
+function cancelPendingReport() {
   if (pending === null)
     return;
-  clearTimeout(pending);
+  clearTimeout(pending.timer);
   pending = null;
 }
-function reportCardError(send, message, phase) {
+function cardRendered(restored = false, current = () => true) {
+  if (restored)
+    return;
+  cancelPendingReport();
+  if (!current())
+    return;
+  const send = outstanding;
+  outstanding = null;
+  send?.(null);
+}
+function reportCardError(send, message, phase, current = () => true) {
   if (send === undefined)
     return;
-  if (sent.has(message))
+  if (!current())
     return;
-  sent.add(message);
   if (pending !== null)
-    clearTimeout(pending);
-  pending = setTimeout(() => {
+    clearTimeout(pending.timer);
+  pending = { timer: setTimeout(() => {
     pending = null;
-    send(reportBody(message, phase));
-  }, SETTLE_MS);
+    if (!current())
+      return;
+    outstanding = send;
+    send({ message, phase });
+  }, SETTLE_MS), message };
 }
 
 // src/client/runtime/inline-fence.ts
@@ -17338,6 +17660,55 @@ var import_client2 = require("react-dom/client");
 var import_react5 = require("react");
 var import_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
 
+// src/client/runtime/segments.ts
+var FENCE = new RegExp(String.raw`(?<!\x60)(\x60{3,})${FENCE_LANG.replace("/", "\\/")}([^\n]*)(\n|$)`);
+function findClose(body, fence) {
+  const anchored = body.indexOf(`
+${fence}`);
+  if (anchored >= 0 && /^[^\S\n]*(?:\n|$)/.test(body.slice(anchored + 1 + fence.length)) && body[anchored + 1 + fence.length] !== "`")
+    return anchored + 1;
+  for (let at = body.indexOf(fence);at >= 0; at = body.indexOf(fence, at + 1)) {
+    if (body[at - 1] === "`" || body[at + fence.length] === "`")
+      continue;
+    if (/^[^\S\n]*(?:\n|$)/.test(body.slice(at + fence.length)))
+      return at;
+  }
+  const short = /(?:^|\n)[^\S\n]*(`{3,})[^\S\n]*(?:\n|$)/.exec(body);
+  return short === undefined || short === null ? -1 : short.index + (short[0].startsWith(`
+`) ? 1 : 0);
+}
+var TOOL_CALL_MARKUP = /\n?(?:<\/(?:antml:|｜｜DSML｜｜)?(?:parameter|invoke|tool_calls)>\s*)+$/;
+var CODE_LINE = /^(import|export|const|function|type|interface|let|\/\/)\b/;
+var FENCE_META = /^[\w-]+=/;
+function parseUi4aSegments(text) {
+  const segments = [];
+  let rest = text;
+  while (true) {
+    const open = FENCE.exec(rest);
+    if (open === null)
+      return segments;
+    const trailing = open[2].trim();
+    const bodyStart = open.index + open[0].length;
+    if (trailing !== "" && !CODE_LINE.test(trailing) && !FENCE_META.test(trailing)) {
+      rest = rest.slice(bodyStart);
+      continue;
+    }
+    if (/^[^\S\n]*`{3,}ui4a\/tsx/.test(rest.slice(bodyStart))) {
+      rest = rest.slice(bodyStart);
+      continue;
+    }
+    const inlineCode = CODE_LINE.test(trailing) ? `${trailing}
+` : "";
+    const closeIndex = findClose(rest.slice(bodyStart), open[1]);
+    if (closeIndex === -1) {
+      segments.push({ code: (inlineCode + rest.slice(bodyStart)).replace(TOOL_CALL_MARKUP, ""), complete: false });
+      return segments;
+    }
+    segments.push({ code: (inlineCode + rest.slice(bodyStart, bodyStart + closeIndex)).replace(TOOL_CALL_MARKUP, ""), complete: true });
+    rest = rest.slice(bodyStart + closeIndex).replace(new RegExp(String.raw`^${open[1]}[^\n]*\n?`), "");
+  }
+}
+
 // src/client/runtime/observe.ts
 var listeners = new Set;
 var observer = null;
@@ -17388,8 +17759,8 @@ var dropPreview = (claim) => {
 };
 var DRAWS = new Set(["SVG", "CANVAS", "IMG", "VIDEO", "IFRAME", "PICTURE"]);
 var BOUNDARY_ERROR = /^ERROR(:|$)/;
-var isPaintedText = (text2) => {
-  const trimmed = text2.trim();
+var isPaintedText = (text) => {
+  const trimmed = text.trim();
   return trimmed !== "" && !BOUNDARY_ERROR.test(trimmed);
 };
 var hasPainted = (mount) => {
@@ -17405,12 +17776,56 @@ var hasPainted = (mount) => {
   }
   return false;
 };
-var codeOf = (block) => block.querySelector("pre")?.textContent ?? "";
+var LEADING_UI4A_FENCE = new RegExp(String.raw`^\s*\x60{3,}${FENCE_LANG.replace("/", "\\/")}(?:[^\n]*)(?:\n|$)`);
+var codeOf = (block) => {
+  const rendered = block.querySelector("pre")?.textContent ?? "";
+  if (!LEADING_UI4A_FENCE.test(rendered))
+    return rendered;
+  return parseUi4aSegments(rendered)[0]?.code ?? rendered;
+};
 var sameCode = (a, b) => a.trimEnd() === b.trimEnd();
 var matchSegment = (segments, rendered) => segments.find((segment) => sameCode(segment.code, rendered) || segment.code.startsWith(rendered));
-function claimInlineFences({ segments, render, scope: scope2 }) {
+var isLastSegment = (segments, code) => {
+  const last = segments.at(-1);
+  return last !== undefined && (sameCode(last.code, code) || last.code.startsWith(code));
+};
+var NEAR_VIEWPORT = "100% 0px";
+function claimInlineFences({ segments, render, t, subscribeLocale, scope }) {
   const claims = new Map;
-  const root = scope2 ?? document.body;
+  const root = scope ?? document.body;
+  const parked = new Set;
+  const woken = new Set;
+  const nearby = typeof IntersectionObserver === "undefined" ? null : new IntersectionObserver((entries) => {
+    let woke = false;
+    for (const entry of entries) {
+      if (!entry.isIntersecting)
+        continue;
+      const block = entry.target;
+      nearby?.unobserve(block);
+      parked.delete(block);
+      woken.add(block);
+      woke = true;
+    }
+    if (woke)
+      sweep();
+  }, { rootMargin: NEAR_VIEWPORT });
+  const defer = (block, segment) => {
+    if (nearby === null || !segment.complete)
+      return false;
+    if (woken.delete(block))
+      return false;
+    if (parked.has(block))
+      return true;
+    const box = block.getBoundingClientRect();
+    const limit = globalThis.innerHeight || 0 || 0;
+    if (limit === 0 || box.height === 0 && box.width === 0)
+      return false;
+    if (box.bottom > -limit && box.top < limit * 2)
+      return false;
+    parked.add(block);
+    nearby.observe(block);
+    return true;
+  };
   const release = (claim, restore) => {
     claim.painted?.disconnect();
     claim.root.unmount();
@@ -17424,13 +17839,22 @@ function claimInlineFences({ segments, render, scope: scope2 }) {
   };
   const sweep = () => {
     const current = segments();
+    for (const claim of claims.values())
+      if (!claim.block.isConnected)
+        release(claim, false);
+    const taken = new Set([...claims.values()].map((claim) => claim.reserved));
     for (const block of root.querySelectorAll(`.md-code-block:not([${CLAIMED}])`)) {
+      if (block.closest(`[${PREVIEW}]`) !== null || block.closest(`[${MOUNT}]`) !== null)
+        continue;
       const code = codeOf(block);
       if (code === "")
         continue;
-      const segment = matchSegment(current, code);
+      const segment = matchSegment(current.filter((candidate) => !taken.has(candidate.code)), code);
       if (segment === undefined)
         continue;
+      taken.add(segment.code);
+      if (defer(block, segment))
+        continue;
       block.setAttribute(CLAIMED, "");
       const mount = document.createElement("div");
       mount.setAttribute(MOUNT, "");
@@ -17439,7 +17863,7 @@ function claimInlineFences({ segments, render, scope: scope2 }) {
       previewHost.setAttribute(PREVIEW, "");
       block.parentElement?.insertBefore(previewHost, block);
       block.style.display = "none";
-      const claim = { block, mount, root: import_client2.createRoot(mount), code: "", complete: false, rendered: "", painted: null, preview: { host: previewHost, root: import_client2.createRoot(previewHost) } };
+      const claim = { block, mount, root: import_client2.createRoot(mount), code: "", reserved: segment.code, complete: false, rendered: "", painted: null, preview: { host: previewHost, root: import_client2.createRoot(previewHost) } };
       let queued = 0;
       claim.painted = new MutationObserver(() => {
         if (queued !== 0)
@@ -17465,7 +17889,7 @@ function claimInlineFences({ segments, render, scope: scope2 }) {
       if (rendered === claim.rendered && claim.code !== "" && claim.complete)
         continue;
       claim.rendered = rendered;
-      const segment = matchSegment(current, rendered);
+      const segment = matchSegment(current.filter((candidate) => candidate.code === claim.reserved || !taken.has(candidate.code)), rendered);
       if (segment === undefined) {
         if (claim.code.startsWith(rendered))
           continue;
@@ -17473,80 +17897,46 @@ function claimInlineFences({ segments, render, scope: scope2 }) {
         continue;
       }
       const { code, complete } = segment;
+      taken.delete(claim.reserved);
+      taken.add(code);
+      claim.reserved = code;
       if (code === claim.code && complete === claim.complete)
         continue;
       claim.code = code;
       claim.complete = complete;
-      claim.root.render(render({ code, streaming: !complete }));
-      claim.preview?.root.render(import_react5.createElement(import_dsh_client_ui_primitives.CodeBlock, { code, lang: "tsx" }));
+      claim.root.render(render({ code, streaming: !complete, last: () => isLastSegment(segments(), code) }));
+      claim.preview?.root.render(import_react5.createElement(import_dsh_client_ui_primitives.CodeBlock, { code, lang: "tsx", copyLabel: t("copy"), copiedLabel: t("copied") }));
     }
   };
   const stop = observeTranscript(sweep);
+  const stopLocale = subscribeLocale(() => {
+    for (const claim of claims.values())
+      claim.preview?.root.render(import_react5.createElement(import_dsh_client_ui_primitives.CodeBlock, { code: claim.code, lang: "tsx", copyLabel: t("copy"), copiedLabel: t("copied") }));
+  });
   return () => {
     stop();
+    stopLocale();
+    nearby?.disconnect();
+    parked.clear();
+    woken.clear();
     for (const claim of claims.values())
       release(claim, true);
   };
 }
 
-// src/client/runtime/segments.ts
-var FENCE = new RegExp(String.raw`(?<!\x60)(\x60{3,})${FENCE_LANG.replace("/", "\\/")}([^\n]*)(\n|$)`);
-function findClose(body, fence) {
-  const anchored = body.indexOf(`
-${fence}`);
-  if (anchored >= 0 && /^[^\S\n]*(?:\n|$)/.test(body.slice(anchored + 1 + fence.length)) && body[anchored + 1 + fence.length] !== "`")
-    return anchored + 1;
-  for (let at = body.indexOf(fence);at >= 0; at = body.indexOf(fence, at + 1)) {
-    if (body[at - 1] === "`" || body[at + fence.length] === "`")
-      continue;
-    if (/^[^\S\n]*(?:\n|$)/.test(body.slice(at + fence.length)))
-      return at;
-  }
-  const short = /(?:^|\n)[^\S\n]*(`{3,})[^\S\n]*(?:\n|$)/.exec(body);
-  return short === undefined || short === null ? -1 : short.index + (short[0].startsWith(`
-`) ? 1 : 0);
-}
-var TOOL_CALL_MARKUP = /\n?(?:<\/(?:antml:|｜｜DSML｜｜)?(?:parameter|invoke|tool_calls)>\s*)+$/;
-var CODE_LINE = /^(import|export|const|function|type|interface|let|\/\/)\b/;
-var FENCE_META = /^[\w-]+=/;
-function parseUi4aSegments(text2) {
-  const segments = [];
-  let rest = text2;
-  while (true) {
-    const open = FENCE.exec(rest);
-    if (open === null)
-      return segments;
-    const trailing = open[2].trim();
-    const bodyStart = open.index + open[0].length;
-    if (trailing !== "" && !CODE_LINE.test(trailing) && !FENCE_META.test(trailing)) {
-      rest = rest.slice(bodyStart);
-      continue;
-    }
-    if (/^[^\S\n]*`{3,}ui4a\/tsx/.test(rest.slice(bodyStart))) {
-      rest = rest.slice(bodyStart);
-      continue;
-    }
-    const inlineCode = CODE_LINE.test(trailing) ? `${trailing}
-` : "";
-    const closeIndex = findClose(rest.slice(bodyStart), open[1]);
-    if (closeIndex === -1) {
-      segments.push({ code: (inlineCode + rest.slice(bodyStart)).replace(TOOL_CALL_MARKUP, ""), complete: false });
-      return segments;
-    }
-    segments.push({ code: (inlineCode + rest.slice(bodyStart, bodyStart + closeIndex)).replace(TOOL_CALL_MARKUP, ""), complete: true });
-    rest = rest.slice(bodyStart + closeIndex).replace(new RegExp(String.raw`^${open[1]}[^\n]*\n?`), "");
-  }
-}
-
 // src/client/session.ts
 function chatNodes(ctx) {
   const sessionId = ctx.sessions.list.getSnapshot().current;
   if (sessionId === undefined)
     return [];
-  const snapshot = ctx.sessions.binding(sessionId)?.session.getSnapshot();
-  if (snapshot === undefined)
+  const binding = ctx.sessions.binding(sessionId);
+  if (binding === undefined)
     return [];
-  return [...snapshot.chat.nodes.values()];
+  const uiConversation = ctx.get("uiConversation");
+  const chat = uiConversation === undefined ? binding.session.getSnapshot()?.chat : uiConversation.binding(binding).target("chat").getSnapshot();
+  if (chat === undefined)
+    return [];
+  return [...chat.nodes.values()];
 }
 function perNode(key, derive) {
   let cache = new Map;
@@ -17608,14 +17998,14 @@ async function readCanvasChild(cwd, id, specifier, from) {
 var SPECIFIER = /(\bfrom\s*|\bimport\s*\(\s*)["'](\.[^"']*)["']/;
 var SPECIFIER_ALL = new RegExp(SPECIFIER, "g");
 var importsSibling = (code) => SPECIFIER.test(code);
-async function inlineSubPages(code, entry, read2, compile, urls2) {
+async function inlineSubPages(code, entry, read, compile, urls) {
   const sources = new Map;
   const missing = new Set;
   const specifiersIn = (source) => new Set([...source.matchAll(SPECIFIER_ALL)].map((match) => match[2]));
   let frontier = [...specifiersIn(code)].map((specifier) => ({ specifier, from: entry }));
   const entryTargets = new Map;
   while (frontier.length > 0) {
-    const bodies = await Promise.all(frontier.map(async (want) => [want, await read2(want.specifier, want.from)]));
+    const bodies = await Promise.all(frontier.map(async (want) => [want, await read(want.specifier, want.from)]));
     const next = [];
     for (const [want, found] of bodies) {
       const targets = want.from === entry ? entryTargets : sources.get(want.from)?.specifiers;
@@ -17646,7 +18036,7 @@ async function inlineSubPages(code, entry, read2, compile, urls2) {
     for (const [filename, compiled] of built) {
       const url = URL.createObjectURL(new Blob([compiled], { type: "text/javascript" }));
       urlFor.set(filename, url);
-      urls2.push(url);
+      urls.push(url);
       progress = true;
     }
   }
@@ -17687,16 +18077,16 @@ function useSubPages(cwd, canvas) {
       return;
     const key = `${id}:${code.length}`;
     let live = true;
-    const urls2 = [];
+    const urls = [];
     const compile = async (filename, source) => (await compiler().compile(source, { filename })).code;
-    inlineSubPages(code, canvasPath(id), (specifier, from) => readCanvasChild(cwd, id, specifier, from), compile, urls2).then((next) => {
+    inlineSubPages(code, canvasPath(id), (specifier, from) => readCanvasChild(cwd, id, specifier, from), compile, urls).then((next) => {
       if (!live)
-        return void revokeAll(urls2);
+        return void revokeAll(urls);
       setResolved({ key, code: next });
     });
     return () => {
       live = false;
-      revokeAll(urls2);
+      revokeAll(urls);
     };
   }, [cwd, id, code, streaming]);
   if (id === undefined || code === undefined)
@@ -17704,9 +18094,9 @@ function useSubPages(cwd, canvas) {
   return resolved !== null && resolved.key === `${id}:${code.length}` ? resolved.code : code;
 }
 var needsResolve = (code, streaming) => !streaming && importsSibling(code);
-var revokeAll = (urls2) => {
-  while (urls2.length > 0)
-    URL.revokeObjectURL(urls2.pop());
+var revokeAll = (urls) => {
+  while (urls.length > 0)
+    URL.revokeObjectURL(urls.pop());
 };
 var MIN_WIDTH = 320;
 var MAX_WIDTH = 720;
@@ -17716,15 +18106,15 @@ var otherCanvases = (canvases, offerable) => offerable.filter((id) => !canvases.
 var widthForPointer = (clientX, viewportWidth) => Math.min(MAX_WIDTH, Math.max(MIN_WIDTH, viewportWidth - clientX));
 function useResize(initial) {
   const [width, setWidth] = import_react7.useState(initial);
-  const frame2 = import_react7.useRef(0);
+  const frame = import_react7.useRef(0);
   const start = (event) => {
     event.currentTarget.setPointerCapture(event.pointerId);
     event.currentTarget.setAttribute("data-dragging", "");
     const move = (moveEvent) => {
-      if (frame2.current !== 0)
+      if (frame.current !== 0)
         return;
-      frame2.current = requestAnimationFrame(() => {
-        frame2.current = 0;
+      frame.current = requestAnimationFrame(() => {
+        frame.current = 0;
         setWidth(widthForPointer(moveEvent.clientX, window.innerWidth));
       });
     };
@@ -17732,9 +18122,9 @@ function useResize(initial) {
       window.removeEventListener("pointermove", move);
       window.removeEventListener("pointerup", stop);
       document.querySelector("[data-dragging]")?.removeAttribute("data-dragging");
-      if (frame2.current !== 0)
-        cancelAnimationFrame(frame2.current);
-      frame2.current = 0;
+      if (frame.current !== 0)
+        cancelAnimationFrame(frame.current);
+      frame.current = 0;
     };
     window.addEventListener("pointermove", move);
     window.addEventListener("pointerup", stop);
@@ -17853,7 +18243,6 @@ function CanvasPanel({ canvases, offerable, cwd, onOpen, onClose, onWidth, onCar
         }) : /* @__PURE__ */ jsx_runtime2.jsx(GenUISurface, {
           code: resolved,
           streaming: active.streaming,
-          preserveState: false,
           onError: (error, phase) => onCardError?.(error.message, phase),
           onRendered: onCardRendered
         }, active.id)
@@ -18288,37 +18677,37 @@ function whenFrameReady(onFound) {
     onFound(found);
     return () => {};
   }
-  const observer2 = new MutationObserver(() => {
-    const frame2 = document.querySelector(FRAME);
-    if (frame2 === null)
+  const observer = new MutationObserver(() => {
+    const frame = document.querySelector(FRAME);
+    if (frame === null)
       return;
-    observer2.disconnect();
+    observer.disconnect();
     window.clearTimeout(timer);
-    onFound(frame2);
+    onFound(frame);
   });
-  observer2.observe(document.body, { subtree: true, childList: true });
+  observer.observe(document.body, { subtree: true, childList: true });
   const timer = window.setTimeout(() => {
-    observer2.disconnect();
+    observer.disconnect();
     console.warn(`[dsh-generative-ui] no AppFrame matched ${FRAME} — canvases cannot mount. The host's layout markup likely changed.`);
   }, 15000);
   return () => {
-    observer2.disconnect();
+    observer.disconnect();
     window.clearTimeout(timer);
   };
 }
-function createColumn(frame2) {
+function createColumn(frame) {
   const element = document.createElement("div");
   element.setAttribute("data-dgu-canvas-column", "");
   document.body.append(element);
-  const previousPadding = frame2.style.paddingRight;
+  const previousPadding = frame.style.paddingRight;
   const setWidth = (width) => {
-    frame2.style.paddingRight = width === 0 ? previousPadding : `${width}px`;
+    frame.style.paddingRight = width === 0 ? previousPadding : `${width}px`;
   };
   return {
     element,
     setWidth,
     remove: () => {
-      frame2.style.paddingRight = previousPadding;
+      frame.style.paddingRight = previousPadding;
       element.remove();
     }
   };
@@ -18377,23 +18766,23 @@ function mountCanvasHost({ calls, cwd, sessionId, onCardError, onCardRendered })
         });
       }
       const canvases = collected.canvases.filter((canvas) => !hidden.has(canvas.id)).map((canvas) => {
-        const version3 = collected.stale.get(canvas.id);
-        if (version3 === undefined)
+        const version = collected.stale.get(canvas.id);
+        if (version === undefined)
           return canvas;
-        const cached2 = fromFile.get(canvas.id);
-        if (cached2?.version === version3)
-          return cached2.code === undefined ? canvas : { ...canvas, code: cached2.code };
+        const cached = fromFile.get(canvas.id);
+        if (cached?.version === version)
+          return cached.code === undefined ? canvas : { ...canvas, code: cached.code };
         if (workspace !== undefined) {
-          fromFile.set(canvas.id, { version: version3 });
+          fromFile.set(canvas.id, { version });
           readCanvasFile(workspace, canvas.id).then((code) => {
             if (code === null)
               return;
-            fromFile.set(canvas.id, { version: version3, code });
+            fromFile.set(canvas.id, { version, code });
             signature = null;
             scheduleSweep();
           });
         }
-        return cached2?.code === undefined ? canvas : { ...canvas, code: cached2.code };
+        return cached?.code === undefined ? canvas : { ...canvas, code: cached.code };
       });
       for (const id of opened.get(session) ?? EMPTY) {
         if (hidden.has(id) || canvases.some((canvas) => canvas.id === id))
@@ -18457,7 +18846,7 @@ function mountCanvasHost({ calls, cwd, sessionId, onCardError, onCardRendered })
 }
 
 // src/client/index.ts
-var inject = ["sessions"];
+var inject = ["sessions", "locale"];
 function apply(ctx) {
   warmCompiler();
   const segmentsOf = perNode((node) => `${node.anchorSeq}:${textOf(node).length}`, (node) => parseUi4aSegments(textOf(node)));
@@ -18465,7 +18854,7 @@ function apply(ctx) {
   const callsOf = perNode((node) => `${node.anchorSeq}:${callsKeyOf(node)}`, (node) => node.kind === "tool-call" ? toolCallsOf(node.data) : []);
   const calls = () => {
     const nodes = chatNodes(ctx);
-    return callsOf(nodes).map((calls2, index) => ({ calls: calls2, seq: nodes[index]?.anchorSeq ?? 0 })).toSorted((a, b) => a.seq - b.seq).flatMap((entry) => entry.calls);
+    return callsOf(nodes).map((calls, index) => ({ calls, seq: nodes[index]?.anchorSeq ?? 0 })).toSorted((a, b) => a.seq - b.seq).flatMap((entry) => entry.calls);
   };
   const cwd = () => {
     const list = ctx.sessions.list.getSnapshot();
@@ -18474,6 +18863,7 @@ function apply(ctx) {
   const currentSession = () => ctx.sessions.list.getSnapshot().current;
   const sessionId = () => currentSession() ?? "";
   ctx.effect(() => disposeRegistry, "dsh-generative-ui: blob module URLs");
+  ctx.effect(() => () => cancelPendingReport(), "dsh-generative-ui: pending error report");
   ctx.effect(() => () => {
     disposeCompiler();
     dropSharedCompiler();
@@ -18483,13 +18873,13 @@ function apply(ctx) {
       const release = registerUi4aHost({
         cwd,
         sessionId,
-        send: (text2) => {
+        send: (text) => {
           const id = currentSession();
           const session = id === undefined ? undefined : scoped.sessions.scope(id);
           if (session === undefined)
             return void console.error("[dsh-generative-ui] $dsh/chat: no session to send into");
           session.inject(["conversation"], (addressed) => {
-            addressed.conversation.send(text2).catch((error) => console.error("[dsh-generative-ui] $dsh/chat send failed", error));
+            addressed.conversation.send(text).catch((error) => console.error("[dsh-generative-ui] $dsh/chat send failed", error));
           });
         }
       });
@@ -18499,22 +18889,23 @@ function apply(ctx) {
       };
     }, "dsh-generative-ui: $dsh host");
   });
-  const sendToModel = (text2) => {
+  const sendToModel = (report) => {
     const id = currentSession();
-    const session = id === undefined ? undefined : ctx.sessions.scope(id);
-    if (session === undefined)
+    if (id === undefined)
       return;
-    session.inject(["conversation"], (addressed) => {
-      addressed.conversation.send(text2).catch((error) => console.error("[dsh-generative-ui] card error report failed", error));
-    });
+    fetch(`${CARD_ERROR_PATH}?session=${encodeURIComponent(id)}`, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify(report ?? {})
+    }).catch((error) => console.error("[dsh-generative-ui] card error report failed", error));
   };
   let showCanvas = null;
   ctx.effect(() => {
-    const host2 = mountCanvasHost({ calls, cwd, sessionId, onCardError: (message, phase) => reportCardError(sendToModel, message, phase), onCardRendered: cardRendered });
-    showCanvas = host2.show;
+    const host = mountCanvasHost({ calls, cwd, sessionId, onCardError: (message, phase) => reportCardError(sendToModel, message, phase), onCardRendered: cardRendered });
+    showCanvas = host.show;
     return () => {
       showCanvas = null;
-      host2.dispose();
+      host.dispose();
     };
   }, "dsh-generative-ui: canvas column");
   ctx.inject(["workspaces"], (scoped) => {
@@ -18536,18 +18927,20 @@ function apply(ctx) {
   });
   ctx.effect(() => claimInlineFences({
     segments,
-    render: ({ code, streaming }) => import_react9.createElement(GenUISurface, { code, streaming, onError: (error, phase) => reportCardError(sendToModel, error.message, phase), onRendered: cardRendered })
+    t: ctx.locale.bind("common"),
+    subscribeLocale: (refresh) => ctx.locale.subscribe(refresh),
+    render: ({ code, streaming, last }) => import_react9.createElement(GenUISurface, { code, streaming, onError: (error, phase) => reportCardError(sendToModel, error.message, phase, last), onRendered: (restored) => cardRendered(restored, last) })
   }), "dsh-generative-ui: inline fences");
 }
 function textOf(node) {
   const blocks = node.data?.blocks;
   if (blocks === undefined)
     return "";
-  let text2 = "";
+  let text = "";
   for (const block of blocks)
     if (block.kind === "text" && block.text !== undefined)
-      text2 += block.text;
-  return text2;
+      text += block.text;
+  return text;
 }
 function callsKeyOf(node) {
   const parts = [];
@@ -18564,5 +18957,5 @@ function callsKeyOf(node) {
 
 return module.exports; } });
 
-//# debugId=86F35A693577D63964756E2164756E21
+//# debugId=29F4BEE313CA37F064756E2164756E21
 //# sourceMappingURL=client.js.map