@marimo-team/frontend 0.23.7-dev54 → 0.23.7-dev56

package/dist/assets/{vega-component-BPU1T-x7.js → vega-component-BLse2pH8.js}

@@ -1 +1 @@
-import{s as Z}from"./chunk-LvLJmgfZ.js";import{n as C}from"./useEvent-D91BmmQi.js";import{t as Y}from"./react-Bj1aDYRI.js";import"./react-dom-CSu739Rf.js";import{t as tt}from"./compiler-runtime-B3qBwwSJ.js";import{t as et}from"./debounce-DhnxH9Rh.js";import{_,d as V}from"./useEventListener-DvoEXWke.js";import{n as H}from"./config-DGudsRYK.js";import{t as nt}from"./cn-DCUzRj2J.js";import{t as rt}from"./jsx-runtime-BqBOg78p.js";import"./fullscreen-eipL3i3Y.js";import{t as at}from"./tooltip-DTV9tlSr.js";import{r as it}from"./button-BbCh-29a.js";import{d as N}from"./arrays-DYDL-3-i.js";import{u as ot}from"./toDate-B5A0DFEz.js";import"./session-DGdfs0bJ.js";import{r as lt}from"./useTheme-Kwyx4PvL.js";import{t as ct}from"./isValid-DdlR4-BY.js";import{a as st,r as mt,t as pt}from"./utils-DQRuLEof.js";import{n as ut}from"./vega-loader.browser-xq8miGHn.js";import{t as ft}from"./react-vega-4VQqM03t.js";import"./defaultLocale-DPBdGRrH.js";import"./defaultLocale-Lfi0pexn.js";import{r as dt,t as ht}from"./alert-DrHguQlr.js";import{n as gt}from"./error-banner-CLO6LFll.js";import{n as yt}from"./useAsyncData-C5i0IRVM.js";import{t as vt}from"./formats-CJQ67TPE.js";import{t as F}from"./useDeepCompareMemoize-zUHU--0D.js";import{t as kt}from"./semaphore-X3ApuO41.js";var bt=tt(),S=Z(Y(),1);function wt(t){return t.data&&"url"in t.data&&(t.data.url=H(t.data.url).href),t}const u={arc:"arc",area:"area",bar:"bar",image:"image",line:"line",point:"point",rect:"rect",rule:"rule",text:"text",tick:"tick",trail:"trail",circle:"circle",square:"square",geoshape:"geoshape"};var W=new Set(["boxplot","errorband","errorbar"]);const x={getMarkType(t){let e=typeof t=="string"?t:t.type;if(W.has(e))throw Error("Not supported");return e},isInteractive(t){let e=typeof t=="string"?t:t.type;return!W.has(e)},makeClickable(t){let e=typeof t=="string"?t:t.type;return e in u?typeof t=="string"?{type:t,cursor:"pointer",tooltip:!0}:{...t,type:e,cursor:"pointer",tooltip:!0}:t},getOpacity(t){return typeof t=="string"?null:"opacity"in t&&typeof t.opacity=="number"?t.opacity:null}},v={point(t){return t==null?"select_point":`select_point_${t}`},interval(t){return t==null?"select_interval":`select_interval_${t}`},legendSelection(t){return`legend_selection_${t}`},binColoring(t){return t==null?"bin_coloring":`bin_coloring_${t}`},HIGHLIGHT:"highlight",PAN_ZOOM:"pan_zoom",hasPoint(t){return t.some(e=>e.startsWith("select_point"))},hasInterval(t){return t.some(e=>e.startsWith("select_interval"))},hasLegend(t){return t.some(e=>e.startsWith("legend_selection"))},hasPanZoom(t){return t.some(e=>e.startsWith("pan_zoom"))},isBinColoring(t){return t.startsWith("bin_coloring")}},j={highlight(){return{name:v.HIGHLIGHT,select:{type:"point",on:"mouseover"}}},interval(t,e){return{name:v.interval(e),select:{type:"interval",encodings:D(t),mark:{fill:"#669EFF",fillOpacity:.07,stroke:"#669EFF",strokeOpacity:.4},on:"[mousedown[!event.metaKey], mouseup] > mousemove[!event.metaKey]",translate:"[mousedown[!event.metaKey], mouseup] > mousemove[!event.metaKey]"}}},point(t,e){return{name:v.point(e),select:{type:"point",encodings:D(t),on:"click[!event.metaKey]"}}},binColoring(t){return{name:v.binColoring(t),select:{type:"point",on:"click[!event.metaKey]"}}},legend(t){return{name:v.legendSelection(t),select:{type:"point",fields:[t]},bind:"legend"}},panZoom(){return{name:v.PAN_ZOOM,bind:"scales",select:{type:"interval",on:"[mousedown[event.metaKey], window:mouseup] > window:mousemove!",translate:"[mousedown[event.metaKey], window:mouseup] > window:mousemove!",zoom:"wheel![event.metaKey]"}}}};function D(t){switch(x.getMarkType(t.mark)){case u.image:case u.trail:return;case u.area:case u.arc:return["color"];case u.bar:{let e=St(t);return e==="horizontal"?["y"]:e==="vertical"?["x"]:void 0}case u.circle:case u.geoshape:case u.line:case u.point:case u.rect:case u.rule:case u.square:case u.text:case u.tick:return["x","y"]}}function P(t){return"params"in t&&t.params&&t.params.length>0?N(t.params.filter(e=>e==null?!1:"select"in e&&e.select!==void 0).map(e=>e.name)):"layer"in t?N(t.layer.flatMap(P)):"vconcat"in t?N(t.vconcat.flatMap(P)):"hconcat"in t?N(t.hconcat.flatMap(P)):[]}function St(t){var a,i;if(!t||!("mark"in t))return;let e=(a=t.encoding)==null?void 0:a.x,n=(i=t.encoding)==null?void 0:i.y;if(e&&"type"in e&&e.type==="nominal")return"vertical";if(n&&"type"in n&&n.type==="nominal"||e&&"aggregate"in e)return"horizontal";if(n&&"aggregate"in n)return"vertical"}function xt(t){if(!t.encoding)return[];let e=[];for(let n of Object.values(t.encoding))n&&typeof n=="object"&&"bin"in n&&n.bin&&"field"in n&&typeof n.field=="string"&&e.push(n.field);return e}function G(t){if(!t||!("encoding"in t))return[];let{encoding:e}=t;return e?Object.entries(e).flatMap(n=>{let[a,i]=n;return!i||!At.has(a)?[]:"field"in i&&typeof i.field=="string"?[i.field]:"condition"in i&&i.condition&&typeof i.condition=="object"&&"field"in i.condition&&i.condition.field&&typeof i.condition.field=="string"?[i.condition.field]:[]}):[]}var At=new Set(["color","fill","fillOpacity","opacity","shape","size"]);function $(t,e,n,a){let i=n.filter(o=>v.isBinColoring(o)),r={and:(i.length>0?i:n).map(o=>({param:o}))};if(t==="opacity"){let o=x.getOpacity(a)||1;return{...e,opacity:{condition:{test:r,value:o},value:o/5}}}else return e}function _t(t){if(!("select"in t)||!t.select)return JSON.stringify(t);let e=t.select;if(typeof e=="string")return JSON.stringify({type:e,bind:t.bind});let n={type:e.type,encodings:"encodings"in e&&e.encodings?[...e.encodings].toSorted():void 0,fields:"fields"in e&&e.fields?[...e.fields].toSorted():void 0,bind:t.bind};return JSON.stringify(n)}function q(t){let e=E(t);if(e.length===0)return t;let n=jt(e);return n.length===0?t:{...L(K(t,new Set(n.map(a=>a.name))),n.map(a=>a.name)),params:[...t.params||[],...n]}}function E(t){let e=[];if("vconcat"in t&&Array.isArray(t.vconcat))for(let n of t.vconcat)e.push(...E(n));else if("hconcat"in t&&Array.isArray(t.hconcat))for(let n of t.hconcat)e.push(...E(n));else{if("layer"in t)return[];"mark"in t&&"params"in t&&t.params&&t.params.length>0&&e.push({params:t.params})}return e}function jt(t){if(t.length===0)return[];let e=new Map,n=t.length;for(let{params:i}of t){let r=new Set;for(let o of i){let s=_t(o);r.has(s)||(r.add(s),e.has(s)||e.set(s,{count:0,param:o}),e.get(s).count++)}}let a=[];for(let[,{count:i,param:r}]of e)i===n&&a.push(r);return a}function K(t,e){if("vconcat"in t&&Array.isArray(t.vconcat))return{...t,vconcat:t.vconcat.map(n=>K(n,e))};if("hconcat"in t&&Array.isArray(t.hconcat))return{...t,hconcat:t.hconcat.map(n=>K(n,e))};if("mark"in t&&"params"in t&&t.params){let n=t.params,a=[];for(let i of n){if(!i||typeof i!="object"||!("name"in i)){a.push(i);continue}e.has(i.name)||a.push(i)}if(a.length===0){let{params:i,...r}=t;return r}return{...t,params:a}}return t}function L(t,e){return"vconcat"in t&&Array.isArray(t.vconcat)?{...t,vconcat:t.vconcat.map(n=>L(n,e))}:"hconcat"in t&&Array.isArray(t.hconcat)?{...t,hconcat:t.hconcat.map(n=>L(n,e))}:"layer"in t?t:"mark"in t&&x.isInteractive(t.mark)?{...t,mark:x.makeClickable(t.mark),encoding:$("opacity",t.encoding||{},e,t.mark)}:t}function T(t,e){var s,h;let{chartSelection:n=!0,fieldSelection:a=!0}=e;if(!n&&!a)return t;(s=t.params)!=null&&s.some(l=>l.bind==="legend")&&(a=!1);let i=(h=t.params)==null?void 0:h.some(l=>!l.bind);i&&(n=!1);let r="vconcat"in t||"hconcat"in t;if(i&&r)return t;if("vconcat"in t){let l=t.vconcat.map(m=>"mark"in m?T(m,{chartSelection:n,fieldSelection:a}):m);return q({...t,vconcat:l})}if("hconcat"in t){let l=t.hconcat.map(m=>"mark"in m?T(m,{chartSelection:n,fieldSelection:a}):m);return q({...t,hconcat:l})}if("layer"in t){let l=t.params&&t.params.length>0,m=a!==!1&&!l,k=[];if(m){let p=t.layer.flatMap(f=>"mark"in f?G(f):[]);k=[...new Set(p)],Array.isArray(a)&&(k=k.filter(f=>a.includes(f)))}let w=t.layer.map((p,f)=>{if(!("mark"in p))return p;let g=p;if(f===0&&k.length>0){let O=k.map(M=>j.legend(M));g={...g,params:[...g.params||[],...O]}}return g=z(g,n,f),g=J(g),f===0&&(g=B(g)),g});return{...t,layer:w}}if(!("mark"in t)||!x.isInteractive(t.mark))return t;let o=t;return o=Ot(o,a),o=z(o,n,void 0),o=J(o),o=B(o),o}function Ot(t,e){if(e===!1)return t;let n=G(t);Array.isArray(e)&&(n=n.filter(r=>e.includes(r)));let a=n.map(r=>j.legend(r)),i=[...t.params||[],...a];return{...t,params:i}}function z(t,e,n){if(e===!1)return t;let a;try{a=x.getMarkType(t.mark)}catch{return t}if(a==="geoshape")return t;let i=xt(t),r=e===!0?i.length>0?["point"]:Mt(a):[e];if(!r||r.length===0)return t;let o=r.map(h=>h==="interval"?j.interval(t,n):j.point(t,n)),s=[...t.params||[],...o];return i.length>0&&r.includes("point")&&s.push(j.binColoring(n)),{...t,params:s}}function B(t){let e;try{e=x.getMarkType(t.mark)}catch{}if(e==="geoshape")return t;let n=t.params||[];return n.some(a=>a.bind==="scales")?t:{...t,params:[...n,j.panZoom()]}}function J(t){let e="encoding"in t?t.encoding:void 0,n=t.params||[],a=n.map(i=>i.name);return n.length===0||!x.isInteractive(t.mark)?t:{...t,mark:x.makeClickable(t.mark),encoding:$("opacity",e||{},a,t.mark)}}function Mt(t){switch(t){case"arc":case"area":return["point"];case"text":case"bar":return["point","interval"];case"line":return;default:return["point","interval"]}}var Nt=5;async function Pt(t){if(!t)return t;let e="datasets"in t?{...t.datasets}:{},n=new kt(Nt),a=async r=>{if(!r)return r;if("layer"in r){let l=await Promise.all(r.layer.map(a));r={...r,layer:l}}if("hconcat"in r){let l=await Promise.all(r.hconcat.map(a));r={...r,hconcat:l}}if("vconcat"in r){let l=await Promise.all(r.vconcat.map(a));r={...r,vconcat:l}}if("spec"in r&&(r={...r,spec:await a(r.spec)}),!r.data||!("url"in r.data))return r;let o;try{o=H(r.data.url)}catch{return r}let s=r.data.format,h=await n.run(()=>st(o.href,s));return e[o.pathname]=h,{...r,data:{name:o.pathname}}},i=await a(t);return Object.keys(e).length===0?i:{...i,datasets:e}}var d=Z(rt(),1);ut("arrow",vt);var It=t=>{let e=(0,bt.c)(12),{value:n,setValue:a,chartSelection:i,fieldSelection:r,spec:o,embedOptions:s}=t,h,l;e[0]===o?(h=e[1],l=e[2]):(h=async()=>Pt(o),l=[o],e[0]=o,e[1]=h,e[2]=l);let{data:m,error:k}=yt(h,l);if(k){let p;return e[3]===k?p=e[4]:(p=(0,d.jsx)(gt,{error:k}),e[3]=k,e[4]=p),p}if(!m)return null;let w;return e[5]!==i||e[6]!==s||e[7]!==r||e[8]!==m||e[9]!==a||e[10]!==n?(w=(0,d.jsx)(Ct,{value:n,setValue:a,chartSelection:i,fieldSelection:r,spec:m,embedOptions:s}),e[5]=i,e[6]=s,e[7]=r,e[8]=m,e[9]=a,e[10]=n,e[11]=w):w=e[11],w},Ct=({value:t,setValue:e,chartSelection:n,fieldSelection:a,spec:i,embedOptions:r})=>{let{theme:o}=lt(),s=(0,S.useRef)(null),h=(0,S.useRef)(void 0),[l,m]=(0,S.useState)(),k=(0,S.useMemo)(()=>r&&"actions"in r?r.actions:{source:!1,compiled:!1},[r]),w=F(i),p=(0,S.useMemo)(()=>T(wt(w),{chartSelection:n,fieldSelection:a}),[w,n,a]),f=(0,S.useMemo)(()=>P(p),[p]),g=C(c=>{e({...t,...c})}),O=(0,S.useMemo)(()=>et((c,y)=>{_.debug("[Vega signal]",c,y);let b=V.mapValues(y,Kt);b=V.mapValues(b,Et),g({[c]:b})},100),[g]),M=F(f),I=(0,S.useMemo)(()=>M.reduce((c,y)=>(v.PAN_ZOOM===y||v.isBinColoring(y)||c.push({signalName:y,handler:(b,X)=>O(b,X)}),c),[]),[M,O]),R=C(c=>{_.error(c),_.debug(p),m(c)}),Q=C(c=>{_.debug("[Vega view] created",c),h.current=c,m(void 0)}),U=()=>{let c=[];return v.hasPoint(f)&&c.push(["Point selection","click to select a point; hold shift for multi-select"]),v.hasInterval(f)&&c.push(["Interval selection","click and drag to select an interval"]),v.hasLegend(f)&&c.push(["Legend selection","click to select a legend item; hold shift for multi-select"]),v.hasPanZoom(f)&&c.push(["Pan","hold the meta key and drag"],["Zoom","hold the meta key and scroll"]),c.length===0?null:(0,d.jsx)(at,{delayDuration:300,side:"left",content:(0,d.jsx)("div",{className:"text-xs flex flex-col",children:c.map((y,b)=>(0,d.jsxs)("div",{children:[(0,d.jsxs)("span",{className:"font-bold tracking-wide",children:[y[0],":"]})," ",y[1]]},b))}),children:(0,d.jsx)(ot,{className:"absolute bottom-1 right-0 m-2 h-4 w-4 cursor-help text-muted-foreground hover:text-foreground"})})},A=ft({ref:s,spec:p,options:{theme:o==="dark"?"dark":void 0,actions:k,mode:"vega-lite",tooltip:mt.call,renderer:"canvas"},onError:R,onEmbed:Q});return(0,S.useEffect)(()=>(I.forEach(({signalName:c,handler:y})=>{try{A==null||A.view.addSignalListener(c,y)}catch(b){_.error(b)}}),()=>{I.forEach(({signalName:c,handler:y})=>{try{A==null||A.view.removeSignalListener(c,y)}catch(b){_.error(b)}})}),[A,I]),(0,d.jsxs)(d.Fragment,{children:[l&&(0,d.jsxs)(ht,{variant:"destructive",children:[(0,d.jsx)(dt,{children:l.message}),(0,d.jsx)("div",{className:"text-md",children:l.stack})]}),(0,d.jsxs)("div",{className:nt("relative"),onPointerDown:it.stopPropagation(),children:[(0,d.jsx)("div",{ref:s,"data-container-width":pt(p)}),U()]})]})};function Et(t){return t instanceof Set?[...t]:t}function Kt(t){return Array.isArray(t)?t.map(e=>e instanceof Date&&ct(e)?new Date(e).getTime():e):t}var Lt=It;export{Lt as default};
+import{s as Z}from"./chunk-LvLJmgfZ.js";import{n as C}from"./useEvent-D91BmmQi.js";import{t as Y}from"./react-Bj1aDYRI.js";import"./react-dom-CSu739Rf.js";import{t as tt}from"./compiler-runtime-B3qBwwSJ.js";import{t as et}from"./debounce-DhnxH9Rh.js";import{_,d as V}from"./useEventListener-DvoEXWke.js";import{n as H}from"./config-C2lTvbuU.js";import{t as nt}from"./cn-DCUzRj2J.js";import{t as rt}from"./jsx-runtime-BqBOg78p.js";import"./fullscreen-eipL3i3Y.js";import{t as at}from"./tooltip-DTV9tlSr.js";import{r as it}from"./button-BbCh-29a.js";import{d as N}from"./arrays-DYDL-3-i.js";import{u as ot}from"./toDate-B5A0DFEz.js";import"./session-DGdfs0bJ.js";import{r as lt}from"./useTheme-Kwyx4PvL.js";import{t as ct}from"./isValid-DdlR4-BY.js";import{a as st,r as mt,t as pt}from"./utils-DQRuLEof.js";import{n as ut}from"./vega-loader.browser-xq8miGHn.js";import{t as ft}from"./react-vega-4VQqM03t.js";import"./defaultLocale-DPBdGRrH.js";import"./defaultLocale-Lfi0pexn.js";import{r as dt,t as ht}from"./alert-DrHguQlr.js";import{n as gt}from"./error-banner-CLO6LFll.js";import{n as yt}from"./useAsyncData-C5i0IRVM.js";import{t as vt}from"./formats-CJQ67TPE.js";import{t as F}from"./useDeepCompareMemoize-zUHU--0D.js";import{t as kt}from"./semaphore-X3ApuO41.js";var bt=tt(),S=Z(Y(),1);function wt(t){return t.data&&"url"in t.data&&(t.data.url=H(t.data.url).href),t}const u={arc:"arc",area:"area",bar:"bar",image:"image",line:"line",point:"point",rect:"rect",rule:"rule",text:"text",tick:"tick",trail:"trail",circle:"circle",square:"square",geoshape:"geoshape"};var W=new Set(["boxplot","errorband","errorbar"]);const x={getMarkType(t){let e=typeof t=="string"?t:t.type;if(W.has(e))throw Error("Not supported");return e},isInteractive(t){let e=typeof t=="string"?t:t.type;return!W.has(e)},makeClickable(t){let e=typeof t=="string"?t:t.type;return e in u?typeof t=="string"?{type:t,cursor:"pointer",tooltip:!0}:{...t,type:e,cursor:"pointer",tooltip:!0}:t},getOpacity(t){return typeof t=="string"?null:"opacity"in t&&typeof t.opacity=="number"?t.opacity:null}},v={point(t){return t==null?"select_point":`select_point_${t}`},interval(t){return t==null?"select_interval":`select_interval_${t}`},legendSelection(t){return`legend_selection_${t}`},binColoring(t){return t==null?"bin_coloring":`bin_coloring_${t}`},HIGHLIGHT:"highlight",PAN_ZOOM:"pan_zoom",hasPoint(t){return t.some(e=>e.startsWith("select_point"))},hasInterval(t){return t.some(e=>e.startsWith("select_interval"))},hasLegend(t){return t.some(e=>e.startsWith("legend_selection"))},hasPanZoom(t){return t.some(e=>e.startsWith("pan_zoom"))},isBinColoring(t){return t.startsWith("bin_coloring")}},j={highlight(){return{name:v.HIGHLIGHT,select:{type:"point",on:"mouseover"}}},interval(t,e){return{name:v.interval(e),select:{type:"interval",encodings:D(t),mark:{fill:"#669EFF",fillOpacity:.07,stroke:"#669EFF",strokeOpacity:.4},on:"[mousedown[!event.metaKey], mouseup] > mousemove[!event.metaKey]",translate:"[mousedown[!event.metaKey], mouseup] > mousemove[!event.metaKey]"}}},point(t,e){return{name:v.point(e),select:{type:"point",encodings:D(t),on:"click[!event.metaKey]"}}},binColoring(t){return{name:v.binColoring(t),select:{type:"point",on:"click[!event.metaKey]"}}},legend(t){return{name:v.legendSelection(t),select:{type:"point",fields:[t]},bind:"legend"}},panZoom(){return{name:v.PAN_ZOOM,bind:"scales",select:{type:"interval",on:"[mousedown[event.metaKey], window:mouseup] > window:mousemove!",translate:"[mousedown[event.metaKey], window:mouseup] > window:mousemove!",zoom:"wheel![event.metaKey]"}}}};function D(t){switch(x.getMarkType(t.mark)){case u.image:case u.trail:return;case u.area:case u.arc:return["color"];case u.bar:{let e=St(t);return e==="horizontal"?["y"]:e==="vertical"?["x"]:void 0}case u.circle:case u.geoshape:case u.line:case u.point:case u.rect:case u.rule:case u.square:case u.text:case u.tick:return["x","y"]}}function P(t){return"params"in t&&t.params&&t.params.length>0?N(t.params.filter(e=>e==null?!1:"select"in e&&e.select!==void 0).map(e=>e.name)):"layer"in t?N(t.layer.flatMap(P)):"vconcat"in t?N(t.vconcat.flatMap(P)):"hconcat"in t?N(t.hconcat.flatMap(P)):[]}function St(t){var a,i;if(!t||!("mark"in t))return;let e=(a=t.encoding)==null?void 0:a.x,n=(i=t.encoding)==null?void 0:i.y;if(e&&"type"in e&&e.type==="nominal")return"vertical";if(n&&"type"in n&&n.type==="nominal"||e&&"aggregate"in e)return"horizontal";if(n&&"aggregate"in n)return"vertical"}function xt(t){if(!t.encoding)return[];let e=[];for(let n of Object.values(t.encoding))n&&typeof n=="object"&&"bin"in n&&n.bin&&"field"in n&&typeof n.field=="string"&&e.push(n.field);return e}function G(t){if(!t||!("encoding"in t))return[];let{encoding:e}=t;return e?Object.entries(e).flatMap(n=>{let[a,i]=n;return!i||!At.has(a)?[]:"field"in i&&typeof i.field=="string"?[i.field]:"condition"in i&&i.condition&&typeof i.condition=="object"&&"field"in i.condition&&i.condition.field&&typeof i.condition.field=="string"?[i.condition.field]:[]}):[]}var At=new Set(["color","fill","fillOpacity","opacity","shape","size"]);function $(t,e,n,a){let i=n.filter(o=>v.isBinColoring(o)),r={and:(i.length>0?i:n).map(o=>({param:o}))};if(t==="opacity"){let o=x.getOpacity(a)||1;return{...e,opacity:{condition:{test:r,value:o},value:o/5}}}else return e}function _t(t){if(!("select"in t)||!t.select)return JSON.stringify(t);let e=t.select;if(typeof e=="string")return JSON.stringify({type:e,bind:t.bind});let n={type:e.type,encodings:"encodings"in e&&e.encodings?[...e.encodings].toSorted():void 0,fields:"fields"in e&&e.fields?[...e.fields].toSorted():void 0,bind:t.bind};return JSON.stringify(n)}function q(t){let e=E(t);if(e.length===0)return t;let n=jt(e);return n.length===0?t:{...L(K(t,new Set(n.map(a=>a.name))),n.map(a=>a.name)),params:[...t.params||[],...n]}}function E(t){let e=[];if("vconcat"in t&&Array.isArray(t.vconcat))for(let n of t.vconcat)e.push(...E(n));else if("hconcat"in t&&Array.isArray(t.hconcat))for(let n of t.hconcat)e.push(...E(n));else{if("layer"in t)return[];"mark"in t&&"params"in t&&t.params&&t.params.length>0&&e.push({params:t.params})}return e}function jt(t){if(t.length===0)return[];let e=new Map,n=t.length;for(let{params:i}of t){let r=new Set;for(let o of i){let s=_t(o);r.has(s)||(r.add(s),e.has(s)||e.set(s,{count:0,param:o}),e.get(s).count++)}}let a=[];for(let[,{count:i,param:r}]of e)i===n&&a.push(r);return a}function K(t,e){if("vconcat"in t&&Array.isArray(t.vconcat))return{...t,vconcat:t.vconcat.map(n=>K(n,e))};if("hconcat"in t&&Array.isArray(t.hconcat))return{...t,hconcat:t.hconcat.map(n=>K(n,e))};if("mark"in t&&"params"in t&&t.params){let n=t.params,a=[];for(let i of n){if(!i||typeof i!="object"||!("name"in i)){a.push(i);continue}e.has(i.name)||a.push(i)}if(a.length===0){let{params:i,...r}=t;return r}return{...t,params:a}}return t}function L(t,e){return"vconcat"in t&&Array.isArray(t.vconcat)?{...t,vconcat:t.vconcat.map(n=>L(n,e))}:"hconcat"in t&&Array.isArray(t.hconcat)?{...t,hconcat:t.hconcat.map(n=>L(n,e))}:"layer"in t?t:"mark"in t&&x.isInteractive(t.mark)?{...t,mark:x.makeClickable(t.mark),encoding:$("opacity",t.encoding||{},e,t.mark)}:t}function T(t,e){var s,h;let{chartSelection:n=!0,fieldSelection:a=!0}=e;if(!n&&!a)return t;(s=t.params)!=null&&s.some(l=>l.bind==="legend")&&(a=!1);let i=(h=t.params)==null?void 0:h.some(l=>!l.bind);i&&(n=!1);let r="vconcat"in t||"hconcat"in t;if(i&&r)return t;if("vconcat"in t){let l=t.vconcat.map(m=>"mark"in m?T(m,{chartSelection:n,fieldSelection:a}):m);return q({...t,vconcat:l})}if("hconcat"in t){let l=t.hconcat.map(m=>"mark"in m?T(m,{chartSelection:n,fieldSelection:a}):m);return q({...t,hconcat:l})}if("layer"in t){let l=t.params&&t.params.length>0,m=a!==!1&&!l,k=[];if(m){let p=t.layer.flatMap(f=>"mark"in f?G(f):[]);k=[...new Set(p)],Array.isArray(a)&&(k=k.filter(f=>a.includes(f)))}let w=t.layer.map((p,f)=>{if(!("mark"in p))return p;let g=p;if(f===0&&k.length>0){let O=k.map(M=>j.legend(M));g={...g,params:[...g.params||[],...O]}}return g=z(g,n,f),g=J(g),f===0&&(g=B(g)),g});return{...t,layer:w}}if(!("mark"in t)||!x.isInteractive(t.mark))return t;let o=t;return o=Ot(o,a),o=z(o,n,void 0),o=J(o),o=B(o),o}function Ot(t,e){if(e===!1)return t;let n=G(t);Array.isArray(e)&&(n=n.filter(r=>e.includes(r)));let a=n.map(r=>j.legend(r)),i=[...t.params||[],...a];return{...t,params:i}}function z(t,e,n){if(e===!1)return t;let a;try{a=x.getMarkType(t.mark)}catch{return t}if(a==="geoshape")return t;let i=xt(t),r=e===!0?i.length>0?["point"]:Mt(a):[e];if(!r||r.length===0)return t;let o=r.map(h=>h==="interval"?j.interval(t,n):j.point(t,n)),s=[...t.params||[],...o];return i.length>0&&r.includes("point")&&s.push(j.binColoring(n)),{...t,params:s}}function B(t){let e;try{e=x.getMarkType(t.mark)}catch{}if(e==="geoshape")return t;let n=t.params||[];return n.some(a=>a.bind==="scales")?t:{...t,params:[...n,j.panZoom()]}}function J(t){let e="encoding"in t?t.encoding:void 0,n=t.params||[],a=n.map(i=>i.name);return n.length===0||!x.isInteractive(t.mark)?t:{...t,mark:x.makeClickable(t.mark),encoding:$("opacity",e||{},a,t.mark)}}function Mt(t){switch(t){case"arc":case"area":return["point"];case"text":case"bar":return["point","interval"];case"line":return;default:return["point","interval"]}}var Nt=5;async function Pt(t){if(!t)return t;let e="datasets"in t?{...t.datasets}:{},n=new kt(Nt),a=async r=>{if(!r)return r;if("layer"in r){let l=await Promise.all(r.layer.map(a));r={...r,layer:l}}if("hconcat"in r){let l=await Promise.all(r.hconcat.map(a));r={...r,hconcat:l}}if("vconcat"in r){let l=await Promise.all(r.vconcat.map(a));r={...r,vconcat:l}}if("spec"in r&&(r={...r,spec:await a(r.spec)}),!r.data||!("url"in r.data))return r;let o;try{o=H(r.data.url)}catch{return r}let s=r.data.format,h=await n.run(()=>st(o.href,s));return e[o.pathname]=h,{...r,data:{name:o.pathname}}},i=await a(t);return Object.keys(e).length===0?i:{...i,datasets:e}}var d=Z(rt(),1);ut("arrow",vt);var It=t=>{let e=(0,bt.c)(12),{value:n,setValue:a,chartSelection:i,fieldSelection:r,spec:o,embedOptions:s}=t,h,l;e[0]===o?(h=e[1],l=e[2]):(h=async()=>Pt(o),l=[o],e[0]=o,e[1]=h,e[2]=l);let{data:m,error:k}=yt(h,l);if(k){let p;return e[3]===k?p=e[4]:(p=(0,d.jsx)(gt,{error:k}),e[3]=k,e[4]=p),p}if(!m)return null;let w;return e[5]!==i||e[6]!==s||e[7]!==r||e[8]!==m||e[9]!==a||e[10]!==n?(w=(0,d.jsx)(Ct,{value:n,setValue:a,chartSelection:i,fieldSelection:r,spec:m,embedOptions:s}),e[5]=i,e[6]=s,e[7]=r,e[8]=m,e[9]=a,e[10]=n,e[11]=w):w=e[11],w},Ct=({value:t,setValue:e,chartSelection:n,fieldSelection:a,spec:i,embedOptions:r})=>{let{theme:o}=lt(),s=(0,S.useRef)(null),h=(0,S.useRef)(void 0),[l,m]=(0,S.useState)(),k=(0,S.useMemo)(()=>r&&"actions"in r?r.actions:{source:!1,compiled:!1},[r]),w=F(i),p=(0,S.useMemo)(()=>T(wt(w),{chartSelection:n,fieldSelection:a}),[w,n,a]),f=(0,S.useMemo)(()=>P(p),[p]),g=C(c=>{e({...t,...c})}),O=(0,S.useMemo)(()=>et((c,y)=>{_.debug("[Vega signal]",c,y);let b=V.mapValues(y,Kt);b=V.mapValues(b,Et),g({[c]:b})},100),[g]),M=F(f),I=(0,S.useMemo)(()=>M.reduce((c,y)=>(v.PAN_ZOOM===y||v.isBinColoring(y)||c.push({signalName:y,handler:(b,X)=>O(b,X)}),c),[]),[M,O]),R=C(c=>{_.error(c),_.debug(p),m(c)}),Q=C(c=>{_.debug("[Vega view] created",c),h.current=c,m(void 0)}),U=()=>{let c=[];return v.hasPoint(f)&&c.push(["Point selection","click to select a point; hold shift for multi-select"]),v.hasInterval(f)&&c.push(["Interval selection","click and drag to select an interval"]),v.hasLegend(f)&&c.push(["Legend selection","click to select a legend item; hold shift for multi-select"]),v.hasPanZoom(f)&&c.push(["Pan","hold the meta key and drag"],["Zoom","hold the meta key and scroll"]),c.length===0?null:(0,d.jsx)(at,{delayDuration:300,side:"left",content:(0,d.jsx)("div",{className:"text-xs flex flex-col",children:c.map((y,b)=>(0,d.jsxs)("div",{children:[(0,d.jsxs)("span",{className:"font-bold tracking-wide",children:[y[0],":"]})," ",y[1]]},b))}),children:(0,d.jsx)(ot,{className:"absolute bottom-1 right-0 m-2 h-4 w-4 cursor-help text-muted-foreground hover:text-foreground"})})},A=ft({ref:s,spec:p,options:{theme:o==="dark"?"dark":void 0,actions:k,mode:"vega-lite",tooltip:mt.call,renderer:"canvas"},onError:R,onEmbed:Q});return(0,S.useEffect)(()=>(I.forEach(({signalName:c,handler:y})=>{try{A==null||A.view.addSignalListener(c,y)}catch(b){_.error(b)}}),()=>{I.forEach(({signalName:c,handler:y})=>{try{A==null||A.view.removeSignalListener(c,y)}catch(b){_.error(b)}})}),[A,I]),(0,d.jsxs)(d.Fragment,{children:[l&&(0,d.jsxs)(ht,{variant:"destructive",children:[(0,d.jsx)(dt,{children:l.message}),(0,d.jsx)("div",{className:"text-md",children:l.stack})]}),(0,d.jsxs)("div",{className:nt("relative"),onPointerDown:it.stopPropagation(),children:[(0,d.jsx)("div",{ref:s,"data-container-width":pt(p)}),U()]})]})};function Et(t){return t instanceof Set?[...t]:t}function Kt(t){return Array.isArray(t)?t.map(e=>e instanceof Date&&ct(e)?new Date(e).getTime():e):t}var Lt=It;export{Lt as default};

package/dist/index.html

@@ -66,7 +66,7 @@
     <marimo-server-token data-token="{{ server_token }}" hidden></marimo-server-token>
     <!-- /TODO -->
     <title>{{ title }}</title>
-    <script type="module" crossorigin src="./assets/index-DySiGerD.js"></script>
+    <script type="module" crossorigin src="./assets/index-BhMdGN-p.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/preload-helper-DdZsAcJe.js">
     <link rel="modulepreload" crossorigin href="./assets/chunk-LvLJmgfZ.js">
     <link rel="modulepreload" crossorigin href="./assets/react-Bj1aDYRI.js">
@@ -104,7 +104,7 @@
     <link rel="modulepreload" crossorigin href="./assets/DeferredRequestRegistry-CzVJLtsG.js">
     <link rel="modulepreload" crossorigin href="./assets/constants-DMpttj8Q.js">
     <link rel="modulepreload" crossorigin href="./assets/session-DGdfs0bJ.js">
-    <link rel="modulepreload" crossorigin href="./assets/config-DGudsRYK.js">
+    <link rel="modulepreload" crossorigin href="./assets/config-C2lTvbuU.js">
     <link rel="modulepreload" crossorigin href="./assets/requests-DIwGYs0l.js">
     <link rel="modulepreload" crossorigin href="./assets/useLifecycle-DieWOfXE.js">
     <link rel="modulepreload" crossorigin href="./assets/useNonce-DfoVjkkH.js">
@@ -133,7 +133,7 @@
     <link rel="modulepreload" crossorigin href="./assets/debounce-DhnxH9Rh.js">
     <link rel="modulepreload" crossorigin href="./assets/database-zap-kIkTfzTX.js">
     <link rel="modulepreload" crossorigin href="./assets/main-B0OX4z33.js">
-    <link rel="modulepreload" crossorigin href="./assets/cells-DbE28H1u.js">
+    <link rel="modulepreload" crossorigin href="./assets/cells-Dnu4nDoy.js">
     <link rel="modulepreload" crossorigin href="./assets/ErrorBoundary-DyYDV0HI.js">
     <link rel="modulepreload" crossorigin href="./assets/kbd-BJB2rf7K.js">
     <link rel="modulepreload" crossorigin href="./assets/useInstallPackage-hKfTes-m.js">
@@ -147,34 +147,34 @@
     <link rel="modulepreload" crossorigin href="./assets/usePress-jH2RfcUG.js">
     <link rel="modulepreload" crossorigin href="./assets/input-CVE-gIjt.js">
     <link rel="modulepreload" crossorigin href="./assets/ImperativeModal-DEC1mXgV.js">
-    <link rel="modulepreload" crossorigin href="./assets/cell-link-pRI-YfIp.js">
+    <link rel="modulepreload" crossorigin href="./assets/cell-link-PQYiMZw1.js">
     <link rel="modulepreload" crossorigin href="./assets/multi-map-CUuNtzHt.js">
     <link rel="modulepreload" crossorigin href="./assets/alert-DrHguQlr.js">
     <link rel="modulepreload" crossorigin href="./assets/chevron-right-CG5QYXYk.js">
     <link rel="modulepreload" crossorigin href="./assets/dropdown-menu-CR7cnzLX.js">
     <link rel="modulepreload" crossorigin href="./assets/links-B8WzCnbo.js">
-    <link rel="modulepreload" crossorigin href="./assets/useRunCells-CfHlqXY6.js">
+    <link rel="modulepreload" crossorigin href="./assets/useRunCells-C0BPo9m1.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-Ch48HVPK.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-BwrPA9zQ.js">
     <link rel="modulepreload" crossorigin href="./assets/copy-icon-BdZPgXgo.js">
-    <link rel="modulepreload" crossorigin href="./assets/RenderHTML-Dz1OIbOh.js">
-    <link rel="modulepreload" crossorigin href="./assets/datasource-Prn_GWOB.js">
-    <link rel="modulepreload" crossorigin href="./assets/state-1SbOXCLX.js">
+    <link rel="modulepreload" crossorigin href="./assets/RenderHTML-B5r25cP5.js">
+    <link rel="modulepreload" crossorigin href="./assets/datasource-I-LOgxeP.js">
+    <link rel="modulepreload" crossorigin href="./assets/state-D9EoHCkz.js">
     <link rel="modulepreload" crossorigin href="./assets/package-B8oXOUM-.js">
     <link rel="modulepreload" crossorigin href="./assets/sparkles-CC9Bko6a.js">
-    <link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-YGhIA85d.js">
+    <link rel="modulepreload" crossorigin href="./assets/MarimoErrorOutput-XWqnhvJ6.js">
     <link rel="modulepreload" crossorigin href="./assets/spinner-UuZAUjoP.js">
-    <link rel="modulepreload" crossorigin href="./assets/html-to-image-CIu-0LbU.js">
-    <link rel="modulepreload" crossorigin href="./assets/focus-0RBjdtZw.js">
+    <link rel="modulepreload" crossorigin href="./assets/html-to-image-CPRGrFLO.js">
+    <link rel="modulepreload" crossorigin href="./assets/focus-lmUjuV78.js">
     <link rel="modulepreload" crossorigin href="./assets/useAsyncData-C5i0IRVM.js">
     <link rel="modulepreload" crossorigin href="./assets/LazyAnyLanguageCodeMirror-B2pl_WA3.js">
     <link rel="modulepreload" crossorigin href="./assets/micromark-factory-space-P--XWZhg.js">
     <link rel="modulepreload" crossorigin href="./assets/chunk-5FQGJX7Z-DILIU9Rm.js">
-    <link rel="modulepreload" crossorigin href="./assets/markdown-renderer-DGqYztXR.js">
+    <link rel="modulepreload" crossorigin href="./assets/markdown-renderer-CKEFGuRo.js">
     <link rel="modulepreload" crossorigin href="./assets/command-2NPJCYDa.js">
     <link rel="modulepreload" crossorigin href="./assets/popover-Bz_0Vkyf.js">
     <link rel="modulepreload" crossorigin href="./assets/errors-iwK4b4VF.js">
-    <link rel="modulepreload" crossorigin href="./assets/download-DEJbA1IY.js">
+    <link rel="modulepreload" crossorigin href="./assets/download-7bMr0q_N.js">
     <link rel="modulepreload" crossorigin href="./assets/table-DUSsaCYD.js">
     <link rel="modulepreload" crossorigin href="./assets/useIframeCapabilities-DPVTppnD.js">
     <link rel="modulepreload" crossorigin href="./assets/error-banner-CLO6LFll.js">
@@ -193,44 +193,44 @@
     <link rel="modulepreload" crossorigin href="./assets/message-circle-1YLdnr8A.js">
     <link rel="modulepreload" crossorigin href="./assets/trash-2-BJLYnZpG.js">
     <link rel="modulepreload" crossorigin href="./assets/react-resizable-panels.browser.esm-CgWOEYeG.js">
-    <link rel="modulepreload" crossorigin href="./assets/JsonOutput-Dxol3ZtH.js">
+    <link rel="modulepreload" crossorigin href="./assets/JsonOutput-BPqXvbC7.js">
     <link rel="modulepreload" crossorigin href="./assets/chart-no-axes-column-nqk474t8.js">
     <link rel="modulepreload" crossorigin href="./assets/square-function-blYaQso8.js">
     <link rel="modulepreload" crossorigin href="./assets/spec-D1ptWKg6.js">
     <link rel="modulepreload" crossorigin href="./assets/ellipsis-vertical-CkwWkOQL.js">
     <link rel="modulepreload" crossorigin href="./assets/refresh-cw-a_9k9BK7.js">
     <link rel="modulepreload" crossorigin href="./assets/tree-actions-D9i3o3Zk.js">
-    <link rel="modulepreload" crossorigin href="./assets/components-Cj3Al1Y6.js">
-    <link rel="modulepreload" crossorigin href="./assets/column-preview-CNeXQtKn.js">
+    <link rel="modulepreload" crossorigin href="./assets/components-DDdymb5T.js">
+    <link rel="modulepreload" crossorigin href="./assets/column-preview-D_CJGSJp.js">
     <link rel="modulepreload" crossorigin href="./assets/icons-Ol38nIbL.js">
-    <link rel="modulepreload" crossorigin href="./assets/radio-group-BS2PIEzV.js">
-    <link rel="modulepreload" crossorigin href="./assets/floating-outline-uy6dAsIe.js">
+    <link rel="modulepreload" crossorigin href="./assets/radio-group-CrX1YUJ8.js">
+    <link rel="modulepreload" crossorigin href="./assets/floating-outline-DbOtUfo-.js">
     <link rel="modulepreload" crossorigin href="./assets/objectWithoutPropertiesLoose-DoKw85w0.js">
     <link rel="modulepreload" crossorigin href="./assets/esm-DLYpPRvw.js">
     <link rel="modulepreload" crossorigin href="./assets/eye-off-BT-KOYV5.js">
     <link rel="modulepreload" crossorigin href="./assets/plus-CxkHs8QM.js">
-    <link rel="modulepreload" crossorigin href="./assets/readonly-python-code-C5JNX2fu.js">
+    <link rel="modulepreload" crossorigin href="./assets/readonly-python-code-DqYAw8-1.js">
     <link rel="modulepreload" crossorigin href="./assets/file-headphone-B3fuktN0.js">
     <link rel="modulepreload" crossorigin href="./assets/file-HTLbeC2b.js">
     <link rel="modulepreload" crossorigin href="./assets/image-BIibSXT6.js">
-    <link rel="modulepreload" crossorigin href="./assets/file-icons-BjTIuMQg.js">
-    <link rel="modulepreload" crossorigin href="./assets/switch-CTn-kJzM.js">
+    <link rel="modulepreload" crossorigin href="./assets/file-icons-B6DaZdP0.js">
+    <link rel="modulepreload" crossorigin href="./assets/switch-BtkQp293.js">
     <link rel="modulepreload" crossorigin href="./assets/events-CBm-hwqS.js">
-    <link rel="modulepreload" crossorigin href="./assets/globals-DI5QlXvl.js">
+    <link rel="modulepreload" crossorigin href="./assets/globals-CpVAcN9Z.js">
     <link rel="modulepreload" crossorigin href="./assets/share-oorMPghT.js">
     <link rel="modulepreload" crossorigin href="./assets/blob-3_FN0u9S.js">
     <link rel="modulepreload" crossorigin href="./assets/memoize-Tp7rARFe.js">
     <link rel="modulepreload" crossorigin href="./assets/get-C-qh_et5.js">
     <link rel="modulepreload" crossorigin href="./assets/_baseSet-CxV9N1bc.js">
-    <link rel="modulepreload" crossorigin href="./assets/state-Fa6RzVTL.js">
+    <link rel="modulepreload" crossorigin href="./assets/state-NEwDS-mc.js">
     <link rel="modulepreload" crossorigin href="./assets/label-xHqFtfdz.js">
-    <link rel="modulepreload" crossorigin href="./assets/textarea-wgoQLrBS.js">
+    <link rel="modulepreload" crossorigin href="./assets/textarea-BBTcSr-i.js">
     <link rel="modulepreload" crossorigin href="./assets/refresh-ccw-DLc784Sj.js">
-    <link rel="modulepreload" crossorigin href="./assets/form-DNa2VnwU.js">
+    <link rel="modulepreload" crossorigin href="./assets/form-D4sbBaU7.js">
     <link rel="modulepreload" crossorigin href="./assets/renderShortcut-D7FYCtYQ.js">
     <link rel="modulepreload" crossorigin href="./assets/field-CQGpbXj3.js">
     <link rel="modulepreload" crossorigin href="./assets/RSPContexts-Bk1r00gJ.js">
-    <link rel="modulepreload" crossorigin href="./assets/useBoolean-DP3412N2.js">
+    <link rel="modulepreload" crossorigin href="./assets/useBoolean-DamyMuo_.js">
     <link rel="modulepreload" crossorigin href="./assets/useDeepCompareMemoize-zUHU--0D.js">
     <link rel="modulepreload" crossorigin href="./assets/types-BYwxXaSY.js">
     <link rel="modulepreload" crossorigin href="./assets/semaphore-X3ApuO41.js">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/frontend",
-  "version": "0.23.7-dev54",
+  "version": "0.23.7-dev56",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/components/editor/chrome/wrapper/footer-items/backend-status.tsx

@@ -57,7 +57,7 @@ export const BackendConnectionStatus: React.FC = () => {
     }
 
     try {
-      const isHealthy = await runtime.isHealthy();
+      const isHealthy = await runtime.probeHealth();
       setConnectionStatus(isHealthy ? "healthy" : "unhealthy");
       return {
         isHealthy,

package/src/core/runtime/__tests__/runtime.test.ts

@@ -275,14 +275,14 @@ describe("RuntimeManager", () => {
     });
   });
 
-  describe("isHealthy", () => {
+  describe("probeHealth", () => {
     it("should return true for successful health check", async () => {
       global.fetch = vi.fn().mockResolvedValue({
         ok: true,
       });
 
       const runtime = new RuntimeManager(mockConfig);
-      const result = await runtime.isHealthy();
+      const result = await runtime.probeHealth();
 
       expect(result).toBe(true);
       expect(fetch).toHaveBeenCalledWith("https://example.com/health");
@@ -294,7 +294,7 @@ describe("RuntimeManager", () => {
       });
 
       const runtime = new RuntimeManager(mockConfig);
-      const result = await runtime.isHealthy();
+      const result = await runtime.probeHealth();
 
       expect(result).toBe(false);
     });
@@ -304,11 +304,32 @@ describe("RuntimeManager", () => {
       global.fetch = vi.fn().mockRejectedValue(error);
 
       const runtime = new RuntimeManager(mockConfig);
-      const result = await runtime.isHealthy();
+      const result = await runtime.probeHealth();
 
       expect(result).toBe(false);
     });
 
+    it("should not mutate config.url on redirect", async () => {
+      global.fetch = vi.fn().mockResolvedValue({
+        ok: true,
+        redirected: true,
+        url: "https://sandbox.example.com/health?some_value=abc123",
+      });
+
+      const runtime = new RuntimeManager(
+        {
+          ...mockConfig,
+          url: "https://backend.example.com/lazy?some_value=abc123",
+        },
+        true,
+      );
+      const result = await runtime.probeHealth();
+      expect(result).toBe(true);
+      expect(runtime.httpURL.hostname).toBe("backend.example.com");
+    });
+  });
+
+  describe("reconcileFromHealth", () => {
     it("should update config.url on redirect, stripping /health from pathname", async () => {
       global.fetch = vi.fn().mockResolvedValue({
         ok: true,
@@ -323,7 +344,7 @@ describe("RuntimeManager", () => {
         },
         true, // lazy — don't call init() in constructor
       );
-      const result = await runtime.isHealthy();
+      const result = await runtime.reconcileFromHealth();
 
       expect(result).toBe(true);
       // Should strip /health from pathname but preserve query params
@@ -342,7 +363,7 @@ describe("RuntimeManager", () => {
     it("should resolve immediately if healthy", async () => {
       const runtime = new RuntimeManager(mockConfig, true);
 
-      vi.spyOn(runtime, "isHealthy").mockResolvedValue(true);
+      vi.spyOn(runtime, "reconcileFromHealth").mockResolvedValue(true);
       runtime.init();
 
       await expect(runtime.waitForHealthy()).resolves.toBeUndefined();
@@ -351,7 +372,7 @@ describe("RuntimeManager", () => {
     it("should retry and eventually succeed", async () => {
       const runtime = new RuntimeManager(mockConfig, true);
       const healthySpy = vi
-        .spyOn(runtime, "isHealthy")
+        .spyOn(runtime, "reconcileFromHealth")
         .mockResolvedValueOnce(false)
         .mockResolvedValueOnce(false)
         .mockResolvedValueOnce(true);
@@ -364,7 +385,7 @@ describe("RuntimeManager", () => {
 
     it("should throw after max retries", async () => {
       const runtime = new RuntimeManager(mockConfig, true);
-      vi.spyOn(runtime, "isHealthy").mockResolvedValue(false);
+      vi.spyOn(runtime, "reconcileFromHealth").mockResolvedValue(false);
       runtime.init({ disableRetryDelay: true });
 
       await expect(runtime.waitForHealthy()).rejects.toThrow(
@@ -431,7 +452,7 @@ describe("RuntimeManager", () => {
       // Mock failed health check
       global.fetch = vi.fn().mockResolvedValue({ ok: false });
 
-      await runtime.isHealthy();
+      await runtime.reconcileFromHealth();
 
       baseElement = document.querySelector("base");
       expect(baseElement).toBeNull();
@@ -443,7 +464,7 @@ describe("RuntimeManager", () => {
       // Mock successful health check
       global.fetch = vi.fn().mockResolvedValue({ ok: true });
 
-      await runtime.isHealthy();
+      await runtime.reconcileFromHealth();
 
       const baseElement = document.querySelector("base");
       expect(baseElement).toBeTruthy();
@@ -461,7 +482,7 @@ describe("RuntimeManager", () => {
       // Mock successful health check
       global.fetch = vi.fn().mockResolvedValue({ ok: true });
 
-      await runtime.isHealthy();
+      await runtime.reconcileFromHealth();
 
       const baseElement = document.querySelector("base");
       expect(baseElement).toBe(existingBase); // Should be the same element
@@ -483,7 +504,7 @@ describe("RuntimeManager", () => {
       // Mock successful health check
       global.fetch = vi.fn().mockResolvedValue({ ok: true });
 
-      await runtime.isHealthy();
+      await runtime.reconcileFromHealth();
 
       const baseElement = document.querySelector("base");
       expect(baseElement).toBeTruthy();
@@ -524,11 +545,11 @@ describe("RuntimeManager", () => {
       });
 
       const wsUrl = runtime.getWsURL("test" as SessionId);
-      const httpUrl = runtime.formatHttpURL(
-        "api/test",
-        new URLSearchParams(),
-        false,
-      );
+      const httpUrl = runtime.formatHttpURL({
+        path: "api/test",
+        searchParams: new URLSearchParams(),
+        restrictToKnownQueryParams: false,
+      });
 
       // Should preserve base URL query params
       expect(wsUrl.searchParams.get("base_param")).toBe("existing");

package/src/core/runtime/runtime.ts

@@ -44,17 +44,22 @@ export class RuntimeManager {
     return this.httpURL.origin === window.location.origin;
   }
 
+  private get isServerless(): boolean {
+    return isWasm() || isIslands() || isStaticNotebook();
+  }
+
   /**
    * The base URL of the runtime.
    */
-  formatHttpURL(
-    path?: string,
-    searchParams?: URLSearchParams,
+  formatHttpURL({
+    path = "",
+    searchParams,
     restrictToKnownQueryParams = true,
-  ): URL {
-    if (!path) {
-      path = "";
-    }
+  }: {
+    path?: string;
+    searchParams?: URLSearchParams;
+    restrictToKnownQueryParams?: boolean;
+  }): URL {
     // URL may be something like "http://localhost:8000?auth=123"
     const baseUrl = this.httpURL;
     const currentParams = new URLSearchParams(window.location.search);
@@ -84,11 +89,11 @@ export class RuntimeManager {
   formatWsURL(path: string, searchParams?: URLSearchParams): URL {
     // We don't restrict to known query parameters, since mo.query_params()
     // can accept arbitrary parameters.
-    const url = this.formatHttpURL(
+    const url = this.formatHttpURL({
       path,
       searchParams,
-      /* restrictToKnownQueryParams =*/ false,
-    );
+      restrictToKnownQueryParams: false,
+    });
 
     // For cross-origin runtimes, pass the auth token as a query parameter.
     // WebSocket connections cannot send custom headers (no Authorization
@@ -168,45 +173,63 @@ export class RuntimeManager {
   }
 
   getAiURL(path: "completion" | "chat"): URL {
-    return this.formatHttpURL(`/api/ai/${path}`);
+    return this.formatHttpURL({ path: `/api/ai/${path}` });
   }
 
   /**
    * The URL of the health check endpoint.
    */
   healthURL(): URL {
-    return this.formatHttpURL("/health");
+    return this.formatHttpURL({ path: "/health" });
   }
 
-  async isHealthy(): Promise<boolean> {
-    // Always healthy if WASM, Islands, or a static notebook (no server)
-    if (isWasm() || isIslands() || isStaticNotebook()) {
-      return true;
-    }
-
+  private async fetchHealth(): Promise<Response | null> {
     try {
-      const response = await fetch(this.healthURL().toString());
-      // If there is a redirect, update the URL in the config
-      if (response.redirected) {
-        Logger.debug(`Runtime redirected to ${response.url}`);
-        // strip /health from the URL, using URL parsing to handle query params
-        const redirected = new URL(response.url);
-        redirected.pathname = redirected.pathname.replace(/\/health$/, "");
-        this.config.url = redirected.toString();
-      }
-
-      const success = response.ok;
-      if (success) {
-        this.setDOMBaseUri(this.config.url);
-      }
-      return success;
+      return await fetch(this.healthURL().toString());
     } catch (error) {
       Logger.error(
         `Failed to check health: ${error instanceof Error ? error.message : "Unknown error"}`,
         { cause: error },
       );
+      return null;
+    }
+  }
+
+  async reconcileFromHealth(): Promise<boolean> {
+    // Always healthy if WASM, Islands, or a static notebook (no server)
+    if (this.isServerless) {
+      return true;
+    }
+
+    const response = await this.fetchHealth();
+
+    if (!response) {
       return false;
     }
+
+    if (response.redirected) {
+      Logger.debug(`Runtime redirected to ${response.url}`);
+      // strip /health from the URL, using URL parsing to handle query params
+      const redirected = new URL(response.url);
+      redirected.pathname = redirected.pathname.replace(/\/health$/, "");
+      this.config.url = redirected.toString();
+    }
+
+    if (response.ok) {
+      this.setDOMBaseUri(this.config.url);
+    }
+
+    return response.ok;
+  }
+
+  async probeHealth(): Promise<boolean> {
+    // Always healthy if WASM, Islands, or a static notebook (no server)
+    if (this.isServerless) {
+      return true;
+    }
+
+    const response = await this.fetchHealth();
+    return response?.ok ?? false;
   }
 
   /**
@@ -251,7 +274,7 @@ export class RuntimeManager {
     const growthFactor = 1.2;
     const maxDelay = 2000;
 
-    while (!(await this.isHealthy())) {
+    while (!(await this.reconcileFromHealth())) {
       if (retries >= maxRetries) {
         Logger.error(`Failed to connect after ${maxRetries} retries`);
         this.initialHealthyCheck.reject(

package/src/core/websocket/__tests__/useMarimoKernelConnection.hook.test.tsx

@@ -35,7 +35,6 @@ import { useConnectionTransport } from "../useWebSocket";
 
 interface MockTransport {
   readyState: 0 | 1 | 2 | 3;
-  retryCount: number;
   reconnect: ReturnType<typeof vi.fn>;
   close: ReturnType<typeof vi.fn>;
   send: ReturnType<typeof vi.fn>;
@@ -48,7 +47,6 @@ function makeTransport(
 ): MockTransport {
   return {
     readyState,
-    retryCount: 0,
     reconnect: vi.fn(),
     close: vi.fn(),
     send: vi.fn(),
@@ -57,9 +55,12 @@ function makeTransport(
   };
 }
 
-function makeRuntimeManager(isHealthy = vi.fn().mockResolvedValue(true)) {
+function makeRuntimeManager(
+  reconcileFromHealth = vi.fn().mockResolvedValue(true),
+) {
   return {
-    isHealthy,
+    reconcileFromHealth,
+    probeHealth: vi.fn().mockResolvedValue(true),
     getWsURL: () => new URL("ws://localhost/ws"),
     waitForHealthy: vi.fn().mockResolvedValue(undefined),
     isSameOrigin: true,