@hachej/boring-workspace 0.1.58 → 0.1.60

package/dist/{WorkspaceLoadingState-BYTO4wdt.js → WorkspaceLoadingState-D9v0oLDq.js}

@@ -1,11 +1,11 @@
-import { jsxs as h, jsx as a, Fragment as le } from "react/jsx-runtime";
-import { useState as X, useMemo as W, useCallback as v, useEffect as y, useRef as J, useSyncExternalStore as xe, Suspense as ke } from "react";
-import { IconButton as V, LoadingState as Ce, ResizeHandle as ye, Button as Se, Kbd as Pe } from "@hachej/boring-ui-kit";
-import { ChevronLeft as Ne, MessageSquare as _e, Search as We, Plus as Ie } from "lucide-react";
-import { c as m } from "./utils-B6yFEsav.js";
-import { av as Oe, aC as Be, ac as ze, an as Re, Q as Ae, aF as ue, aR as De, ah as Le, aW as Me, aX as ee, u as Ee, ay as Ke } from "./WorkspaceProvider-Bp1Sm40K.js";
-function Ze(e, t, o = !0) {
-  if (!o || typeof window > "u") return t;
+import { jsx as a, jsxs as h, Fragment as Pe } from "react/jsx-runtime";
+import { useState as j, useMemo as R, useCallback as k, useRef as H, useEffect as y, useSyncExternalStore as _e, Suspense as Ne } from "react";
+import { IconButton as te, LoadingState as We, ResizeHandle as Oe, Button as Ie, Kbd as ze } from "@hachej/boring-ui-kit";
+import { Minimize2 as Re, Maximize2 as Be, PanelRightClose as Le, PanelRightOpen as Me, MessageSquare as Ae, Search as De, Plus as Ee } from "lucide-react";
+import { c as b } from "./utils-B6yFEsav.js";
+import { b3 as pe, az as Te, aI as Ke, ag as He, ar as je, Z as Fe, aL as ge, a$ as Ve, al as $e, b4 as qe, u as Ue, aC as Xe } from "./WorkspaceProvider-Dxvh_Faj.js";
+function lt(e, t, r = !0) {
+  if (!r || typeof window > "u") return t;
   try {
     const n = window.localStorage.getItem(e);
     if (n === "1") return !0;
@@ -14,235 +14,285 @@ function Ze(e, t, o = !0) {
   }
   return t;
 }
-function Ge(e, t, o = !0) {
-  if (!(!o || typeof window > "u"))
+function dt(e, t, r = !0) {
+  if (!(!r || typeof window > "u"))
     try {
       window.localStorage.setItem(e, t ? "1" : "0");
     } catch {
     }
 }
-function he(e, t, o = !0) {
-  if (!o || typeof window > "u") return t;
+function me(e, t, r = !0) {
+  if (!r || typeof window > "u") return t;
   try {
     const n = window.localStorage.getItem(e);
     if (n === null) return t;
-    const d = Number(n);
-    return Number.isFinite(d) ? d : t;
+    const l = Number(n);
+    return Number.isFinite(l) ? l : t;
   } catch {
   }
   return t;
 }
-function Fe(e, t, o = !0) {
-  if (!(!o || typeof window > "u"))
+function Ze(e, t, r = !0) {
+  if (!(!r || typeof window > "u"))
     try {
       window.localStorage.setItem(e, String(Math.round(t)));
     } catch {
     }
 }
-function Je(e = {}) {
+const Ye = "pointer-events-auto relative border border-border/70 bg-muted text-muted-foreground transition-colors hover:bg-foreground/[0.06] hover:text-foreground", Ge = "border-border bg-foreground/[0.09] text-foreground";
+function be({
+  label: e,
+  hint: t,
+  side: r = "bottom",
+  onClick: n,
+  pressed: l,
+  pulse: s = !1,
+  children: d
+}) {
+  return /* @__PURE__ */ a(pe, { label: e, hint: t, side: r, children: /* @__PURE__ */ h(
+    te,
+    {
+      type: "button",
+      variant: "ghost",
+      size: "icon-xs",
+      onClick: n,
+      "aria-label": e,
+      "aria-pressed": l,
+      title: e,
+      className: b(
+        Ye,
+        l && Ge
+      ),
+      children: [
+        d,
+        s ? /* @__PURE__ */ a(
+          "span",
+          {
+            className: "absolute right-1 top-1 h-1.5 w-1.5 rounded-full bg-[color:var(--accent)] ring-1 ring-background",
+            "aria-hidden": "true"
+          }
+        ) : null
+      ]
+    }
+  ) });
+}
+function ut(e = {}) {
   const {
     nav: t = "session-list",
-    navParams: o,
+    navParams: r,
     center: n = "chat",
-    centerParams: d,
-    surface: i,
-    surfaceParams: u,
-    sidebar: s,
-    sidebarParams: x
-  } = e, p = [];
-  return t && p.push({
+    centerParams: l,
+    surface: s,
+    surfaceParams: d,
+    sidebar: i,
+    sidebarParams: f
+  } = e, w = [];
+  return t && w.push({
     id: "nav",
     position: "left",
     panel: t,
-    params: o,
+    params: r,
     locked: !0,
     hideHeader: !0,
     constraints: { minWidth: 60, maxWidth: 60 }
-  }), p.push({
+  }), w.push({
     id: "center",
     position: "center",
     panel: n,
-    params: d,
+    params: l,
     hideHeader: !0
-  }), s && p.push({
+  }), i && w.push({
     id: "sidebar",
     position: "left",
-    panel: s,
-    params: x,
+    panel: i,
+    params: f,
     hideHeader: !0,
     collapsible: !0,
     collapsedWidth: 40,
     constraints: { minWidth: 200, maxWidthViewportRatio: 0.5 }
-  }), i && p.push({
+  }), s && w.push({
     id: "surface",
     position: "right",
-    panel: i,
-    params: u,
+    panel: s,
+    params: d,
     hideHeader: !0,
     dynamic: !0,
     placeholder: "empty"
-  }), { version: "2.0", groups: p };
+  }), { version: "2.0", groups: w };
 }
-function et(e) {
-  var ce, de;
-  const t = e.nav !== null, o = e.surface !== void 0, n = !!e.surface, d = e.nav || "session-list", i = e.center ?? "chat", u = e.surface || "artifact-surface", s = He(), [x, p] = fe(
+function ht(e) {
+  var ue, he;
+  const t = e.nav !== null, r = e.surface !== void 0, n = !!e.surface, l = e.nav || "session-list", s = e.center ?? "chat", d = e.surface || "artifact-surface", i = Qe(), [f, w] = J(
     e.storageKey ? `${e.storageKey}:drawerWidth` : void 0,
     260
-  ), [be, we] = fe(
+  ), [ne, xe] = J(
     e.storageKey ? `${e.storageKey}:surfaceWidth` : void 0,
     680
-  ), [c, g] = je(
+  ), [ye, ke] = J(
+    e.storageKey ? `${e.storageKey}:sidebarWidth` : void 0,
+    280
+  ), [c, m] = Je(
     e.storageKey ? `${e.storageKey}:chatCollapsed` : void 0,
     !1
-  ), [ve, I] = X(!1), { blockers: O } = Oe(), k = e.activeChatPaneId ?? ((ce = e.centerParams) == null ? void 0 : ce.sessionId), $ = W(
-    () => O.filter((r) => !r.sessionId || !k || r.sessionId === k),
-    [k, O]
-  ), pe = W(
-    () => O.some((r) => !!r.sessionId && !!Be(r)),
-    [O]
-  ), b = ze(), q = K(x, 200, 360), ne = Math.max(480, Math.floor(s * 0.72)), U = K(be, 480, ne), T = N(e.centerParams, "getSurface"), Q = N(e.centerParams, "isWorkbenchOpen"), Y = N(e.centerParams, "openWorkbench"), ae = N(e.centerParams, "openWorkbenchSources"), re = N(e.centerParams, "closeWorkbench"), oe = Ve(e.centerParams, "surfaceDispatch"), w = F(e.navParams, "onClose"), f = F(e.surfaceParams, "onClose"), S = F(e.sidebarParams, "onClose"), Z = F(e.navParams, "onCreate"), _ = ((de = e.chatPanes) == null ? void 0 : de.filter((r) => r.id.length > 0)) ?? [], G = _.length > 0, P = !!e.sidebar, B = t ? !!w : !!e.onOpenNav, z = n ? !!f : !!e.onOpenSurface, R = P ? !!S : !!e.onOpenSidebar, A = v(() => {
-    var r;
+  ), [Ce, B] = j(!1), { blockers: W } = Te(), C = e.activeChatPaneId ?? ((ue = e.centerParams) == null ? void 0 : ue.sessionId), ae = R(
+    () => W.filter((o) => !o.sessionId || !C || o.sessionId === C),
+    [C, W]
+  ), Se = R(
+    () => W.some((o) => !!o.sessionId && !!Ke(o)),
+    [W]
+  ), v = He(), F = _(f, 200, 360), V = _(ye, 200, Math.max(240, Math.floor(i * 0.5))), re = Math.max(480, Math.floor(i * 0.72)), $ = _(ne, 480, re), q = N(e.centerParams, "getSurface"), U = N(e.centerParams, "isWorkbenchOpen"), X = N(e.centerParams, "openWorkbench"), oe = N(e.centerParams, "openWorkbenchSources"), ie = N(e.centerParams, "closeWorkbench"), se = et(e.centerParams, "surfaceDispatch"), p = K(e.navParams, "onClose"), x = K(e.surfaceParams, "onClose"), P = K(e.sidebarParams, "onClose"), Z = K(e.navParams, "onCreate"), L = ((he = e.chatPanes) == null ? void 0 : he.filter((o) => o.id.length > 0)) ?? [], ce = L.length > 0, g = !!e.sidebar, M = t ? !!p : !!e.onOpenNav, O = n ? !!x : !!e.onOpenSurface, A = g ? !!P : !!e.onOpenSidebar, D = k(() => {
+    var o;
     if (t) {
-      w == null || w();
+      p == null || p();
       return;
     }
-    (r = e.onOpenNav) == null || r.call(e);
-  }, [w, t, e.onOpenNav]), D = v(() => {
-    var r;
+    (o = e.onOpenNav) == null || o.call(e);
+  }, [p, t, e.onOpenNav]), I = k(() => {
+    var o;
     if (n) {
-      f == null || f();
+      x == null || x();
       return;
     }
-    (r = e.onOpenSurface) == null || r.call(e);
-  }, [f, e.onOpenSurface, n]), L = v(() => {
-    var r;
-    if (P) {
-      S == null || S();
+    (o = e.onOpenSurface) == null || o.call(e);
+  }, [x, e.onOpenSurface, n]), E = k(() => {
+    var o;
+    if (g) {
+      P == null || P();
       return;
     }
-    (r = e.onOpenSidebar) == null || r.call(e);
-  }, [S, e.onOpenSidebar, P]), M = v(() => {
-    c && g(!1), t && (w == null || w()), n && (f == null || f()), te(), ge();
-  }, [c, w, f, t, g, n]), E = v(() => {
-    g((r) => {
-      var C;
-      const l = !r;
-      return l && !n && ((C = e.onOpenSurface) == null || C.call(e)), l;
-    }), I(!1);
-  }, [g, n, e.onOpenSurface]);
-  Re({
-    shortcuts: W(() => {
-      const r = [];
-      return B && r.push({ key: "1", mod: !0, handler: A }), z && r.push({ key: "2", mod: !0, handler: D }), R && r.push({ key: "3", mod: !0, allowInEditable: !0, handler: L }), i === "chat" && (r.push({ key: "Escape", allowInEditable: !0, handler: M }), r.push({ key: "\\", mod: !0, allowInEditable: !0, handler: E })), r;
-    }, [B, R, z, i, M, E, A, L, D])
+    (o = e.onOpenSidebar) == null || o.call(e);
+  }, [P, e.onOpenSidebar, g]), T = k(() => {
+    c && m(!1), t && (p == null || p()), n && (x == null || x()), ee(), we();
+  }, [c, p, x, t, m, n]), Y = H(!1), G = k(() => {
+    !c && e.chatOverlay && (Y.current = !0), m((u) => {
+      var fe;
+      const S = !u;
+      return S && !n && ((fe = e.onOpenSurface) == null || fe.call(e)), S;
+    }), B(!1);
+  }, [c, e.chatOverlay, e.onOpenSurface, m, n]);
+  je({
+    shortcuts: R(() => {
+      const o = [];
+      return M && o.push({ key: "1", mod: !0, handler: D }), O && o.push({ key: "2", mod: !0, handler: I }), A && o.push({ key: "3", mod: !0, allowInEditable: !0, handler: E }), s === "chat" && (o.push({ key: "Escape", allowInEditable: !0, handler: T }), o.push({ key: "\\", mod: !0, allowInEditable: !0, handler: G })), o;
+    }, [M, A, O, s, T, G, D, E, I])
   }), y(() => {
-    const r = "workspace:chat-layout", l = "agent:chat-layout";
-    return b.unregisterByPluginId(r), b.unregisterByPluginId(l), b.registerCommand({
+    const o = "workspace:chat-layout", u = "agent:chat-layout";
+    return v.unregisterByPluginId(o), v.unregisterByPluginId(u), v.registerCommand({
       id: "workspace:open-session-history",
       title: t ? "Close Session History" : "Open Session History",
       keywords: ["sessions", "history", "drawer", t ? "close" : "open"],
       shortcut: "⌘1",
-      pluginId: r,
-      when: () => B,
-      run: A
-    }), b.registerCommand({
+      pluginId: o,
+      when: () => M,
+      run: D
+    }), v.registerCommand({
       id: "workspace:open-workbench",
       title: n ? "Close Workbench" : "Open Workbench",
       keywords: ["surface", "artifacts", "sources", "workbench", n ? "close" : "open"],
       shortcut: "⌘2",
-      pluginId: r,
-      when: () => z,
-      run: D
-    }), b.registerCommand({
+      pluginId: o,
+      when: () => O,
+      run: I
+    }), v.registerCommand({
       id: "workspace:toggle-workbench-left-panel",
-      title: P ? "Close Workbench Left Panel" : "Open Workbench Left Panel",
-      keywords: ["left", "sidebar", "tabs", "workbench", P ? "close" : "open"],
+      title: g ? "Close Workbench Left Panel" : "Open Workbench Left Panel",
+      keywords: ["left", "sidebar", "tabs", "workbench", g ? "close" : "open"],
       shortcut: "⌘3",
-      pluginId: r,
-      when: () => R,
-      run: L
-    }), i === "chat" && b.registerCommand({
+      pluginId: o,
+      when: () => A,
+      run: E
+    }), s === "chat" && v.registerCommand({
       id: "agent:focus-chat",
       title: "Focus Chat",
       keywords: ["agent", "chat", "prompt", "composer", "input", "focus"],
-      pluginId: l,
-      run: M
-    }), Z && b.registerCommand({
+      pluginId: u,
+      run: T
+    }), Z && v.registerCommand({
       id: "agent:new-chat",
       title: "New Chat",
       keywords: ["agent", "chat", "session", "new"],
-      pluginId: l,
+      pluginId: u,
       run: Z
     }), () => {
-      b.unregisterByPluginId(r), b.unregisterByPluginId(l);
+      v.unregisterByPluginId(o), v.unregisterByPluginId(u);
     };
   }, [
-    b,
+    v,
     t,
-    i,
-    o,
+    s,
+    r,
     n,
     e.navParams,
     e.surfaceParams,
     e.onOpenNav,
     e.onOpenSurface,
     e.onOpenSidebar,
-    B,
-    z,
-    R,
-    w,
-    f,
-    S,
-    Z,
     M,
-    P,
+    O,
     A,
+    p,
+    x,
+    P,
+    Z,
+    T,
+    g,
     D,
-    L
+    I,
+    E
   ]), y(() => {
-    const r = oe ?? (T && Q && Y ? {
-      surface: T,
-      isWorkbenchOpen: Q,
-      openWorkbench: Y,
-      openWorkbenchSources: ae,
-      closeWorkbench: re,
+    const o = se ?? (q && U && X ? {
+      surface: q,
+      isWorkbenchOpen: U,
+      openWorkbench: X,
+      openWorkbenchSources: oe,
+      closeWorkbench: ie,
       // Fallback dispatch has no host-owned open-session set. Treat
       // session-gated requests as closed instead of accidentally opening
       // UI for a background session. Full shells should pass
       // `surfaceDispatch.shouldOpenSurface` to make this gate precise.
-      shouldOpenSurface: (l) => {
-        var C;
-        return ((C = l.meta) == null ? void 0 : C.openOnlyWhenSessionOpen) !== !0;
+      shouldOpenSurface: (u) => {
+        var S;
+        return ((S = u.meta) == null ? void 0 : S.openOnlyWhenSessionOpen) !== !0;
       }
     } : void 0);
-    if (r)
-      return Ae.on(ue.uiCommand, ({ command: l }) => {
-        De(l, r);
+    if (o)
+      return Fe.on(ge.uiCommand, ({ command: u }) => {
+        Ve(u, o);
       });
-  }, [oe, T, Q, Y, ae, re]), Le(ue.agentData, () => {
-    c && I(!0);
+  }, [se, q, U, X, oe, ie]), $e(ge.agentData, () => {
+    c && B(!0);
   }), y(() => {
     if (!c) {
-      I(!1);
+      B(!1);
       return;
     }
-    $.length > 0 && (g(!1), I(!1), ge());
-  }, [$.length, c, g]);
-  const ie = J(k);
+    ae.length > 0 && (m(!1), B(!1), we());
+  }, [ae.length, c, m]);
+  const le = H(C);
   y(() => {
-    const r = ie.current;
-    ie.current = k, r !== void 0 && k !== void 0 && k !== r && c && g(!1);
-  }, [k, c, g]);
-  const se = J(n);
+    const o = le.current;
+    le.current = C, o !== void 0 && C !== void 0 && C !== o && c && m(!1);
+  }, [C, c, m]), y(() => {
+    !n || c || e.chatOverlay || i < 1180 && m(!0);
+  }, [c, e.chatOverlay, m, n, i]), y(() => {
+    if (!(!e.chatOverlay || !c)) {
+      if (Y.current) {
+        Y.current = !1;
+        return;
+      }
+      m(!1);
+    }
+  }, [c, e.chatOverlay, m]);
+  const de = H(n);
   return y(() => {
-    const r = se.current;
-    se.current = n, r && !n && c && g(!1);
-  }, [n, c, g]), /* @__PURE__ */ h(
+    const o = de.current;
+    de.current = n, o && !n && c && m(!1);
+  }, [n, c, m]), /* @__PURE__ */ h(
     "div",
     {
       "data-boring-workspace": "",
       "data-boring-workspace-part": "shell",
-      className: m("relative flex h-full min-h-0 w-full overflow-hidden bg-background", e.className),
+      className: b("relative flex h-full min-h-0 w-full overflow-hidden bg-background", e.className),
       children: [
         /* @__PURE__ */ h(
           "aside",
@@ -251,35 +301,76 @@ function et(e) {
             "data-boring-state": t ? "expanded" : "collapsed",
             "aria-label": "Session browser",
             "aria-hidden": !t,
-            className: m(
+            className: b(
               "relative h-full min-h-0 shrink-0 overflow-hidden bg-background",
               "transition-[width,min-width,max-width] duration-[280ms] ease-[cubic-bezier(0.22,1,0.36,1)]",
               t && "border-r border-[color:oklch(from_var(--border)_l_c_h/0.6)]"
             ),
             style: {
-              width: t ? q : 0,
-              minWidth: t ? q : 0,
-              maxWidth: t ? q : 0,
+              width: t ? F : 0,
+              minWidth: t ? F : 0,
+              maxWidth: t ? F : 0,
               willChange: "width"
             },
             children: [
               /* @__PURE__ */ a(
                 "div",
                 {
-                  className: m(
+                  className: b(
                     "h-full min-h-0 overflow-hidden",
                     "transition-opacity duration-[200ms] ease-[cubic-bezier(0.22,1,0.36,1)]",
                     t ? "opacity-100" : "opacity-0"
                   ),
-                  children: /* @__PURE__ */ a(j, { id: d, params: e.navParams })
+                  children: /* @__PURE__ */ a(z, { id: l, params: e.navParams })
                 }
               ),
               t ? /* @__PURE__ */ a(
-                me,
+                Q,
                 {
                   side: "drawer-right",
                   ariaLabel: "Resize sessions drawer",
-                  onResize: (r) => p((l) => K(l + r, 200, 360))
+                  onResize: (o) => w((u) => _(u + o, 200, 360))
+                }
+              ) : null
+            ]
+          }
+        ),
+        /* @__PURE__ */ h(
+          "aside",
+          {
+            "data-boring-workspace-part": "workbench-left-shell",
+            "data-boring-state": g ? "expanded" : "collapsed",
+            "aria-label": g ? "Workbench left panel" : void 0,
+            "aria-hidden": !g,
+            className: b(
+              "relative h-full min-h-0 shrink-0 overflow-hidden bg-background",
+              "transition-[width,min-width,max-width] duration-[280ms] ease-[cubic-bezier(0.22,1,0.36,1)]",
+              g && "border-r border-[color:oklch(from_var(--border)_l_c_h/0.6)]"
+            ),
+            style: {
+              width: g ? V : 0,
+              minWidth: g ? V : 0,
+              maxWidth: g ? V : 0,
+              willChange: "width"
+            },
+            children: [
+              /* @__PURE__ */ a(
+                "div",
+                {
+                  className: b(
+                    "h-full min-h-0 overflow-hidden",
+                    "transition-opacity duration-[200ms] ease-[cubic-bezier(0.22,1,0.36,1)]",
+                    g ? "opacity-100" : "opacity-0"
+                  ),
+                  children: g ? /* @__PURE__ */ a(z, { id: e.sidebar ?? "workbench-left", params: e.sidebarParams }) : null
+                }
+              ),
+              g ? /* @__PURE__ */ a(
+                Q,
+                {
+                  side: "drawer-right",
+                  ariaLabel: "Resize workbench left panel",
+                  onResize: (o) => ke((u) => _(u + o, 200, Math.max(240, Math.floor(i * 0.5))))
                 }
               ) : null
             ]
@@ -293,7 +384,7 @@ function et(e) {
               "data-boring-state": c ? "collapsed" : "expanded",
               "aria-label": c ? "Collapsed chat" : "Chat",
               "aria-hidden": c,
-              className: m(
+              className: b(
                 "relative h-full min-h-0 min-w-0 overflow-hidden bg-background",
                 // Animate flex-grow (not just width) so the chat slides open/closed
                 // like the fixed-width nav/workbench panes instead of snapping.
@@ -304,58 +395,52 @@ function et(e) {
                 /* @__PURE__ */ a(
                   "div",
                   {
-                    className: m(
+                    className: b(
                       "h-full min-h-0 overflow-hidden",
                       "transition-opacity duration-[200ms] ease-[cubic-bezier(0.22,1,0.36,1)]",
                       c ? "opacity-0" : "opacity-100"
                     ),
-                    children: G ? /* @__PURE__ */ a(
-                      Me,
+                    children: ce ? /* @__PURE__ */ a(
+                      qe,
                       {
-                        panes: _,
+                        panes: L,
                         activePaneId: e.activeChatPaneId,
                         onActivePaneChange: e.onActiveChatPaneChange,
                         onClosePane: e.onCloseChatPane,
                         flashPaneId: e.flashChatPaneId,
                         storageKey: e.storageKey,
                         onDropSession: e.onDropChatSession,
-                        renderPane: (r) => /* @__PURE__ */ a(
-                          j,
+                        renderPane: (o) => /* @__PURE__ */ a(
+                          z,
                           {
-                            id: r.panel ?? i,
-                            params: r.params ?? e.centerParams
+                            id: o.panel ?? s,
+                            params: o.params ?? e.centerParams
                           }
                         )
                       }
-                    ) : /* @__PURE__ */ a(j, { id: i, params: e.centerParams })
+                    ) : /* @__PURE__ */ a(z, { id: s, params: e.centerParams })
                   }
                 ),
-                c ? null : /* @__PURE__ */ a(ee, { label: "Collapse chat", hint: "⌘\\", side: "bottom", children: /* @__PURE__ */ a(
-                  V,
+                e.chatOverlay ? /* @__PURE__ */ a(
+                  "div",
                   {
-                    type: "button",
-                    variant: "ghost",
-                    size: "icon-xs",
-                    onClick: E,
-                    className: m(
-                      "absolute right-2 z-30 rounded-full bg-background/80 text-muted-foreground shadow-sm backdrop-blur hover:bg-muted hover:text-foreground",
-                      G && _.length > 1 ? "bottom-2" : "top-2"
-                    ),
-                    "aria-label": "Collapse chat",
-                    children: /* @__PURE__ */ a(Ne, { className: "h-4 w-4", strokeWidth: 1.75 })
+                    "data-boring-workspace-part": "chat-left-overlay",
+                    "aria-hidden": c,
+                    className: "absolute inset-0 z-40 flex bg-background",
+                    children: /* @__PURE__ */ a("div", { className: "flex h-full w-full flex-col border-r border-border bg-background", children: e.chatOverlay })
                   }
-                ) })
+                ) : null
               ]
             }
           ),
-          o ? /* @__PURE__ */ h(
+          r ? /* @__PURE__ */ h(
             "aside",
             {
               "data-boring-workspace-part": "workbench",
               "data-boring-state": n ? "expanded" : "collapsed",
               "aria-label": n ? "Surface" : void 0,
               "aria-hidden": !n,
-              className: m(
+              className: b(
                 "relative h-full min-h-0 overflow-hidden bg-background",
                 // When chat is collapsed the workbench grows to fill the freed
                 // space (full width); otherwise it's a fixed-width side panel.
@@ -364,174 +449,146 @@ function et(e) {
                 n && "border-l border-[color:oklch(from_var(--border)_l_c_h/0.6)]"
               ),
               style: c && n ? { willChange: "width" } : {
-                width: n ? U : 0,
-                minWidth: n ? U : 0,
-                maxWidth: n ? U : 0,
+                width: n ? $ : 0,
+                minWidth: n ? $ : 0,
+                maxWidth: n ? $ : 0,
                 willChange: "width"
               },
               children: [
                 /* @__PURE__ */ a(
                   "div",
                   {
-                    className: m(
+                    className: b(
                       "h-full min-h-0 overflow-hidden",
                       "transition-[opacity,padding] duration-[200ms] ease-[cubic-bezier(0.22,1,0.36,1)]",
-                      n ? "opacity-100" : "opacity-0",
-                      // When the chat is collapsed the workbench fills the full width
-                      // and the left-edge "expand chat" float button would sit on top
-                      // of the filetree — inset the content to leave a clear gutter.
-                      c && n && !t && "pl-14"
+                      n ? "opacity-100" : "opacity-0"
                     ),
-                    children: e.surfaceOverlay ? /* @__PURE__ */ h("div", { className: "relative h-full min-h-0", children: [
-                      e.surfaceOverlay,
-                      f ? /* @__PURE__ */ a(ee, { label: "Close workbench", hint: "⌘2", side: "left", children: /* @__PURE__ */ a(
-                        V,
-                        {
-                          type: "button",
-                          variant: "ghost",
-                          size: "icon-sm",
-                          onClick: f,
-                          className: "absolute right-3 top-3 z-20 rounded-full bg-background/80 text-muted-foreground shadow-sm backdrop-blur hover:bg-muted hover:text-foreground",
-                          "aria-label": "Close workbench",
-                          children: /* @__PURE__ */ a("span", { "aria-hidden": "true", children: "›" })
-                        }
-                      ) }) : null
-                    ] }) : /* @__PURE__ */ a(j, { id: u, params: e.surfaceParams })
+                    children: e.surfaceOverlay ? /* @__PURE__ */ a("div", { className: "relative h-full min-h-0", children: e.surfaceOverlay }) : /* @__PURE__ */ a(z, { id: d, params: e.surfaceParams })
                   }
                 ),
                 n && !c ? /* @__PURE__ */ a(
-                  me,
+                  Q,
                   {
                     side: "surface-left",
                     ariaLabel: "Resize workbench",
-                    onResize: (r) => we((l) => K(l - r, 480, ne))
+                    onResize: (o) => xe((u) => _(u - o, 480, re))
                   }
                 ) : null
               ]
             }
           ) : null
         ] }),
+        e.chatOverlay ? null : /* @__PURE__ */ a(
+          nt,
+          {
+            surfaceOpen: n,
+            canToggleSurface: O,
+            onToggleSurface: I,
+            chatCollapsed: c,
+            canToggleChat: s === "chat" && (!r || n && !c),
+            onToggleChat: G,
+            chatPulse: Ce || W.length > 0,
+            surfaceConfigured: r
+          }
+        ),
         !t && e.onOpenNav ? /* @__PURE__ */ a(
-          H,
+          ve,
           {
             side: "left",
             icon: "sessions",
             onClick: e.onOpenNav,
             label: "Sessions",
             hint: "⌘1",
-            pulse: pe
+            pulse: Se
           }
         ) : null,
-        !c && !t && G && e.onCreateChatPaneAfter ? /* @__PURE__ */ a(
-          H,
+        !c && !t && ce && e.onCreateChatPaneAfter ? /* @__PURE__ */ a(
+          ve,
           {
             side: "left",
             icon: "plus",
             onClick: () => {
-              var l, C;
-              const r = e.activeChatPaneId ?? ((l = _[_.length - 1]) == null ? void 0 : l.id);
-              r && ((C = e.onCreateChatPaneAfter) == null || C.call(e, r));
+              var u, S;
+              const o = e.activeChatPaneId ?? ((u = L[L.length - 1]) == null ? void 0 : u.id);
+              o && ((S = e.onCreateChatPaneAfter) == null || S.call(e, o));
             },
             label: "New chat",
             stackIndex: e.onOpenNav ? 1 : 0
           }
-        ) : null,
-        c ? /* @__PURE__ */ a(
-          H,
-          {
-            side: "left",
-            icon: "chat",
-            onClick: E,
-            label: "Expand chat",
-            hint: "⌘\\\\",
-            stackIndex: 1,
-            pulse: ve || $.length > 0
-          }
-        ) : null,
-        !n && e.onOpenSurface ? /* @__PURE__ */ a(
-          H,
-          {
-            side: "right",
-            icon: "workbench",
-            onClick: e.onOpenSurface,
-            label: "Workbench",
-            hint: "⌘2",
-            bottomOffset: e.surfaceButtonBottomOffset
-          }
         ) : null
       ]
     }
   );
 }
-function K(e, t, o) {
-  return Math.max(t, Math.min(o, e));
+function _(e, t, r) {
+  return Math.max(t, Math.min(r, e));
 }
-function fe(e, t) {
-  const [o, n] = X(
-    () => e ? he(e, t) : t
+function J(e, t) {
+  const [r, n] = j(
+    () => e ? me(e, t) : t
   );
   y(() => {
-    n(e ? he(e, t) : t);
+    n(e ? me(e, t) : t);
   }, [e, t]);
-  const d = v(
-    (i) => {
-      n((u) => {
-        const s = typeof i == "function" ? i(u) : i;
-        return e && Fe(e, s), s;
+  const l = k(
+    (s) => {
+      n((d) => {
+        const i = typeof s == "function" ? s(d) : s;
+        return e && Ze(e, i), i;
       });
     },
     [e]
   );
-  return [o, d];
+  return [r, l];
 }
-function je(e, t) {
-  const [o, n] = X(() => !e || typeof window > "u" ? t : window.localStorage.getItem(e) === "1");
+function Je(e, t) {
+  const [r, n] = j(() => !e || typeof window > "u" ? t : window.localStorage.getItem(e) === "1");
   y(() => {
     if (!e || typeof window > "u") {
       n(t);
       return;
     }
-    const i = window.localStorage.getItem(e);
-    n(i == null ? t : i === "1");
+    const s = window.localStorage.getItem(e);
+    n(s == null ? t : s === "1");
   }, [e, t]);
-  const d = v(
-    (i) => {
-      n((u) => {
-        const s = typeof i == "function" ? i(u) : i;
-        return e && typeof window < "u" && window.localStorage.setItem(e, s ? "1" : "0"), s;
+  const l = k(
+    (s) => {
+      n((d) => {
+        const i = typeof s == "function" ? s(d) : s;
+        return e && typeof window < "u" && window.localStorage.setItem(e, i ? "1" : "0"), i;
       });
     },
     [e]
   );
-  return [o, d];
+  return [r, l];
 }
-function He() {
-  const [e, t] = X(() => typeof window < "u" ? window.innerWidth : 1200);
+function Qe() {
+  const [e, t] = j(() => typeof window < "u" ? window.innerWidth : 1200);
   return y(() => {
-    const o = () => t(window.innerWidth);
-    return window.addEventListener("resize", o), () => window.removeEventListener("resize", o);
+    const r = () => t(window.innerWidth);
+    return window.addEventListener("resize", r), () => window.removeEventListener("resize", r);
   }, []), e;
 }
-function me({ side: e, ariaLabel: t, onResize: o }) {
-  const n = J(null), d = v((s) => {
-    s.preventDefault(), n.current = s.clientX, s.currentTarget.setPointerCapture(s.pointerId), document.body.style.cursor = "col-resize", document.body.style.userSelect = "none";
-  }, []), i = v((s) => {
+function Q({ side: e, ariaLabel: t, onResize: r }) {
+  const n = H(null), l = k((i) => {
+    i.preventDefault(), n.current = i.clientX, i.currentTarget.setPointerCapture(i.pointerId), document.body.style.cursor = "col-resize", document.body.style.userSelect = "none";
+  }, []), s = k((i) => {
     if (n.current === null) return;
-    const x = s.clientX - n.current;
-    n.current = s.clientX, o(x);
-  }, [o]), u = v((s) => {
-    n.current !== null && (n.current = null, s.currentTarget.releasePointerCapture(s.pointerId), document.body.style.cursor = "", document.body.style.userSelect = "");
+    const f = i.clientX - n.current;
+    n.current = i.clientX, r(f);
+  }, [r]), d = k((i) => {
+    n.current !== null && (n.current = null, i.currentTarget.releasePointerCapture(i.pointerId), document.body.style.cursor = "", document.body.style.userSelect = "");
   }, []);
   return /* @__PURE__ */ a(
-    ye,
+    Oe,
     {
       "aria-label": t,
       orientation: "vertical",
-      onResizeStart: d,
-      onPointerMove: i,
-      onPointerUp: u,
-      onPointerCancel: u,
-      className: m(
+      onResizeStart: l,
+      onPointerMove: s,
+      onPointerUp: d,
+      onPointerCancel: d,
+      className: b(
         "absolute -top-px -bottom-px z-20 w-3 bg-transparent hover:!bg-transparent active:!bg-transparent",
         "after:absolute after:inset-y-2 after:left-1/2 after:w-px after:-translate-x-1/2 after:rounded-full after:bg-border/55",
         "after:transition-[width,background-color] after:duration-150 hover:after:w-1 hover:after:bg-foreground/35 active:after:w-1 active:after:bg-foreground/50",
@@ -540,49 +597,49 @@ function me({ side: e, ariaLabel: t, onResize: o }) {
     }
   );
 }
-function Ve(e, t) {
-  const o = e == null ? void 0 : e[t];
-  if (!o || typeof o != "object") return;
-  const n = o;
+function et(e, t) {
+  const r = e == null ? void 0 : e[t];
+  if (!r || typeof r != "object") return;
+  const n = r;
   return typeof n.surface == "function" && typeof n.isWorkbenchOpen == "function" && typeof n.openWorkbench == "function" ? n : void 0;
 }
 function N(e, t) {
-  const o = e == null ? void 0 : e[t];
-  return typeof o == "function" ? o : void 0;
+  const r = e == null ? void 0 : e[t];
+  return typeof r == "function" ? r : void 0;
 }
-function F(e, t) {
+function K(e, t) {
   return N(e, t);
 }
-function te() {
+function ee() {
   if (typeof document > "u") return;
-  const o = (document.querySelector(
+  const r = (document.querySelector(
     '[data-boring-workspace-part="chat-pane"][data-boring-state="active"]'
   ) ?? document).querySelector(
     '[data-boring-agent] textarea[name="message"], textarea[name="message"]'
   );
-  o == null || o.focus();
+  r == null || r.focus();
 }
-function ge() {
+function we() {
   typeof window > "u" || window.requestAnimationFrame(() => {
-    te(), window.setTimeout(te, 320);
+    ee(), window.setTimeout(ee, 320);
   });
 }
-function j({ id: e, params: t }) {
-  const o = Ee(), { debug: n } = Ke(), d = xe(
-    o.subscribe,
-    o.getSnapshot,
-    o.getSnapshot
-  ), u = W(() => o.getComponents(), [o, d])[e], s = W(() => Xe(e), [e]);
-  return u ? /* @__PURE__ */ a(ke, { fallback: /* @__PURE__ */ a(Ce, { centered: !0 }), children: /* @__PURE__ */ a(
-    u,
+function z({ id: e, params: t }) {
+  const r = Ue(), { debug: n } = Xe(), l = _e(
+    r.subscribe,
+    r.getSnapshot,
+    r.getSnapshot
+  ), d = R(() => r.getComponents(), [r, l])[e], i = R(() => tt(e), [e]);
+  return d ? /* @__PURE__ */ a(Ne, { fallback: /* @__PURE__ */ a(We, { centered: !0 }), children: /* @__PURE__ */ a(
+    d,
     {
       params: { ...t, debug: n },
-      api: s,
+      api: i,
       containerApi: {}
     }
   ) }) : null;
 }
-function Xe(e) {
+function tt(e) {
   return {
     id: e,
     title: e,
@@ -618,103 +675,134 @@ function Xe(e) {
     } })
   };
 }
-function H({
+function nt({
+  surfaceOpen: e,
+  canToggleSurface: t,
+  onToggleSurface: r,
+  chatCollapsed: n,
+  canToggleChat: l,
+  onToggleChat: s,
+  chatPulse: d,
+  surfaceConfigured: i
+}) {
+  const f = t, w = l;
+  return !f && !w ? null : /* @__PURE__ */ h("div", { className: "pointer-events-none absolute right-3 top-2.5 z-[70] flex items-center gap-1", children: [
+    w ? /* @__PURE__ */ a(
+      be,
+      {
+        label: n ? "Show chat" : i ? "Expand workbench" : "Collapse chat",
+        hint: "⌘\\\\",
+        onClick: s,
+        pressed: n,
+        pulse: d,
+        children: n ? /* @__PURE__ */ a(Re, { className: "size-3", strokeWidth: 1.75 }) : /* @__PURE__ */ a(Be, { className: "size-3", strokeWidth: 1.75 })
+      }
+    ) : null,
+    f ? /* @__PURE__ */ a(
+      be,
+      {
+        label: e ? "Close workbench" : "Open workbench",
+        hint: "⌘2",
+        onClick: r,
+        pressed: e,
+        children: e ? /* @__PURE__ */ a(Le, { className: "size-3", strokeWidth: 1.75 }) : /* @__PURE__ */ a(Me, { className: "size-3", strokeWidth: 1.75 })
+      }
+    ) : null
+  ] });
+}
+function ve({
   side: e,
   icon: t,
-  onClick: o,
+  onClick: r,
   label: n,
-  hint: d,
-  bottomOffset: i,
-  stackIndex: u = 0,
-  pulse: s = !1
+  hint: l,
+  bottomOffset: s,
+  stackIndex: d = 0,
+  pulse: i = !1
 }) {
-  const x = e === "right" && i !== void 0, p = u * 44;
-  return /* @__PURE__ */ a(ee, { label: n, hint: d, side: e === "left" ? "right" : "left", children: /* @__PURE__ */ a(
-    V,
+  const f = e === "right" && s !== void 0, w = d * 44;
+  return /* @__PURE__ */ a(pe, { label: n, hint: l, side: e === "left" ? "right" : "left", children: /* @__PURE__ */ a(
+    te,
     {
       type: "button",
       variant: "ghost",
       size: "icon-sm",
-      onClick: o,
+      onClick: r,
       "aria-label": n,
-      className: m(
+      className: b(
         "absolute z-30 h-9 w-9 gap-0.5 rounded-lg bg-background text-muted-foreground",
         e === "left" ? "left-2" : "right-2",
-        x ? "hover:-translate-y-0.5" : "top-1/2 hover:-translate-y-[1px]",
+        f ? "hover:-translate-y-0.5" : "top-1/2 hover:-translate-y-[1px]",
         "shadow-[0_1px_2px_-1px_oklch(0_0_0/0.08),0_2px_8px_-4px_oklch(0_0_0/0.10),inset_0_0_0_1px_oklch(from_var(--border)_l_c_h/0.7)]",
         "hover:bg-muted/60 hover:text-foreground hover:shadow-[0_2px_4px_-1px_oklch(0_0_0/0.08),0_4px_12px_-4px_oklch(0_0_0/0.10),inset_0_0_0_1px_oklch(from_var(--border)_l_c_h/0.9)]",
         "focus-visible:ring-ring/40"
       ),
-      style: x ? { bottom: i } : { transform: `translateY(calc(-50% - ${p}px))` },
+      style: f ? { bottom: s } : { transform: `translateY(calc(-50% - ${w}px))` },
       children: t === "sessions" ? /* @__PURE__ */ h("span", { className: "relative flex items-center justify-center", children: [
         /* @__PURE__ */ h("svg", { width: "15", height: "15", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: [
           /* @__PURE__ */ a("circle", { cx: "12", cy: "12", r: "9", stroke: "currentColor", strokeWidth: "1.8" }),
           /* @__PURE__ */ a("path", { d: "M12 7v5l3.2 2", stroke: "currentColor", strokeWidth: "1.8", strokeLinecap: "round" })
         ] }),
-        s ? /* @__PURE__ */ a("span", { className: "absolute -right-1.5 -top-1.5 h-2 w-2 rounded-full bg-[color:var(--accent)]", "aria-hidden": "true", "data-boring-workspace-part": "edge-attention-dot" }) : null
+        i ? /* @__PURE__ */ a("span", { className: "absolute -right-1.5 -top-1.5 h-2 w-2 rounded-full bg-[color:var(--accent)]", "aria-hidden": "true", "data-boring-workspace-part": "edge-attention-dot" }) : null
       ] }) : t === "chat" ? /* @__PURE__ */ h("span", { className: "relative flex items-center justify-center", children: [
-        /* @__PURE__ */ a(_e, { className: "h-[15px] w-[15px]", strokeWidth: 1.8, "aria-hidden": "true" }),
-        s ? /* @__PURE__ */ a("span", { className: "absolute -right-1.5 -top-1.5 h-2 w-2 rounded-full bg-[color:var(--accent)]", "aria-hidden": "true" }) : null
+        /* @__PURE__ */ a(Ae, { className: "h-[15px] w-[15px]", strokeWidth: 1.8, "aria-hidden": "true" }),
+        i ? /* @__PURE__ */ a("span", { className: "absolute -right-1.5 -top-1.5 h-2 w-2 rounded-full bg-[color:var(--accent)]", "aria-hidden": "true" }) : null
       ] }) : t === "plus" ? /* @__PURE__ */ a("svg", { width: "15", height: "15", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: /* @__PURE__ */ a("path", { d: "M12 5v14M5 12h14", stroke: "currentColor", strokeWidth: "1.8", strokeLinecap: "round" }) }) : /* @__PURE__ */ a("svg", { width: "15", height: "15", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: /* @__PURE__ */ a("path", { d: "M3 7.5 A1.5 1.5 0 0 1 4.5 6 h4 l2 2 h9 A1.5 1.5 0 0 1 21 9.5 V17.5 A1.5 1.5 0 0 1 19.5 19 H4.5 A1.5 1.5 0 0 1 3 17.5 Z", stroke: "currentColor", strokeWidth: "1.8", strokeLinejoin: "round" }) })
     }
   ) });
 }
-function tt({
+function ft({
   appTitle: e = "Boring",
   sessionTitle: t,
-  onCommandPalette: o,
+  onCommandPalette: r,
   onNewChat: n,
-  topBarLeft: d,
-  topBarRight: i,
-  className: u
+  topBarLeft: l,
+  topBarRight: s,
+  className: d
 }) {
-  const s = i ?? null;
+  const i = s ?? null, f = t || e;
   return /* @__PURE__ */ h(
     "header",
     {
       "data-boring-workspace-part": "topbar",
-      className: m(
+      className: b(
         "relative flex h-11 items-center justify-between gap-2 px-3",
         "bg-background border-b border-border",
-        u
+        d
       ),
       "aria-label": "App top bar",
       children: [
-        /* @__PURE__ */ a("div", { className: "flex min-w-0 flex-1 items-center gap-2.5 leading-none", children: d ?? /* @__PURE__ */ h(le, { children: [
+        /* @__PURE__ */ a("div", { className: "flex min-w-0 flex-1 items-center gap-2.5 leading-none", children: l ?? /* @__PURE__ */ h(Pe, { children: [
           /* @__PURE__ */ a(
             "span",
             {
               "aria-hidden": "true",
               className: "grid size-[22px] shrink-0 place-items-center rounded-sm bg-foreground text-[11px] font-semibold leading-none tracking-tight text-background",
-              children: ((e == null ? void 0 : e[0]) ?? "B").toUpperCase()
+              children: ((f == null ? void 0 : f[0]) ?? "B").toUpperCase()
             }
           ),
-          t ? /* @__PURE__ */ h(le, { children: [
-            /* @__PURE__ */ a("span", { className: "shrink-0 text-[13px] font-medium leading-none tracking-tight text-foreground/65", children: e }),
-            /* @__PURE__ */ a("span", { "aria-hidden": "true", className: "text-[13px] leading-none text-muted-foreground/45", children: "·" }),
-            /* @__PURE__ */ a("span", { className: "truncate text-[13px] font-medium leading-none tracking-tight text-foreground", children: t })
-          ] }) : /* @__PURE__ */ a("span", { className: "truncate text-[13px] font-medium leading-none tracking-tight text-foreground", children: e })
+          /* @__PURE__ */ a("span", { className: "truncate text-[13px] font-medium leading-none tracking-tight text-foreground", children: f })
         ] }) }),
         /* @__PURE__ */ h(
-          Se,
+          Ie,
           {
             type: "button",
             variant: "ghost",
             size: "sm",
-            onClick: o,
+            onClick: r,
             className: "group h-7 gap-1.5 px-2 text-[13px] leading-none text-muted-foreground/75 hover:bg-muted/70 hover:text-foreground focus-visible:text-foreground",
             "aria-label": "Search catalogs and commands",
             title: "Command palette (⌘K)",
             children: [
-              /* @__PURE__ */ a(We, { className: "h-3.5 w-3.5 shrink-0 opacity-80", strokeWidth: 1.75 }),
+              /* @__PURE__ */ a(De, { className: "h-3.5 w-3.5 shrink-0 opacity-80", strokeWidth: 1.75 }),
               /* @__PURE__ */ a("span", { className: "font-normal tracking-tight", children: "Search" }),
-              /* @__PURE__ */ a(Pe, { className: "ml-0.5 bg-muted/40 leading-none shadow-none", children: "⌘K" })
+              /* @__PURE__ */ a(ze, { className: "ml-0.5 bg-muted/40 leading-none shadow-none", children: "⌘K" })
             ]
           }
         ),
         /* @__PURE__ */ h("div", { className: "flex flex-1 shrink-0 items-center justify-end gap-1", children: [
           n && /* @__PURE__ */ a(
-            V,
+            te,
             {
               type: "button",
               variant: "ghost",
@@ -722,21 +810,21 @@ function tt({
               onClick: n,
               "aria-label": "New chat",
               title: "New chat",
-              children: /* @__PURE__ */ a(Ie, { className: "h-4 w-4" })
+              children: /* @__PURE__ */ a(Ee, { className: "h-4 w-4" })
             }
           ),
-          s
+          i
         ] })
       ]
     }
   );
 }
-function nt({
+function gt({
   title: e = "Loading workspace",
   description: t = "Preparing the workspace context.",
-  status: o = "Loading",
+  status: r = "Loading",
   fullscreen: n = !0,
-  className: d
+  className: l
 }) {
   return /* @__PURE__ */ a(
     "section",
@@ -744,10 +832,10 @@ function nt({
       role: "status",
       "aria-live": "polite",
       "aria-busy": "true",
-      className: m(
+      className: b(
         "flex h-full w-full items-center justify-center bg-background px-6 text-foreground",
         n ? "min-h-screen" : "min-h-[240px]",
-        d
+        l
       ),
       children: /* @__PURE__ */ h("div", { className: "flex w-full max-w-sm flex-col items-center gap-5 text-center", children: [
         /* @__PURE__ */ a("div", { className: "flex h-11 w-11 items-center justify-center rounded-lg border border-border bg-card text-foreground", children: /* @__PURE__ */ a(
@@ -761,16 +849,18 @@ function nt({
           /* @__PURE__ */ a("h2", { className: "text-base font-medium text-foreground", children: e }),
           t ? /* @__PURE__ */ a("p", { className: "text-sm leading-6 text-muted-foreground", children: t }) : null
         ] }),
-        o ? /* @__PURE__ */ a("p", { className: "text-xs font-medium text-muted-foreground/80", children: o }) : null
+        r ? /* @__PURE__ */ a("p", { className: "text-xs font-medium text-muted-foreground/80", children: r }) : null
       ] })
     }
   );
 }
 export {
-  et as C,
-  tt as T,
-  nt as W,
-  Je as b,
-  Ze as r,
-  Ge as w
+  ht as C,
+  ft as T,
+  gt as W,
+  me as a,
+  ut as b,
+  Ze as c,
+  lt as r,
+  dt as w
 };