@yuriai/web 0.1.2-beta.2 → 0.1.3

package/dist/assets/{useWorkerHighlightedLines-BThWzx-h.js → useWorkerHighlightedLines-D8JkeSuf.js}

@@ -1,4 +1,4 @@
-import{r as e}from"./rolldown-runtime-hePW80VL.js";import{it as t,rt as n}from"./vendor-base-ui-CdzJ6My_.js";import{v as r}from"./useUIStore-NMQx_cnG.js";import{n as i}from"./vendor-react-BP2cRVqX.js";import{f as a,r as o,t as s}from"./button-C3292Ee6.js";import{n as c}from"./useThemeSystem-8jhE4Zyk.js";import{n as l}from"./Icon-jsQQXouE.js";import{i as u,n as d,t as f}from"./tooltip-DGUZtHif.js";import{n as p}from"./MarkdownRenderer-QKxUWu_S.js";import{n as m,o as h,s as g,t as _}from"./markdown-worker-CkO3sT4Y.js";import{t as v}from"./vendor-tanstack-react-virtual-B_EO--9t.js";import{n as y}from"./markdownTheme-DHoKvD6O.js";var b=e(t(),1),x=i(),S=n(),C=`w-[min(30rem,calc(100cqw-1rem))] min-w-[280px] max-w-full overflow-hidden rounded-xl shadow-[inset_0_1px_0_0_rgba(255,255,255,0.8),inset_0_0_0_1px_rgba(0,0,0,0.04),0_0_0_1px_rgba(0,0,0,0.10),0_1px_2px_-0.5px_rgba(0,0,0,0.08),0_4px_8px_-2px_rgba(0,0,0,0.08),0_12px_20px_-4px_rgba(0,0,0,0.08)] dark:shadow-[inset_0_1px_0_0_rgba(255,255,255,0.12),inset_0_0_0_1px_rgba(255,255,255,0.08),0_0_0_1px_rgba(0,0,0,0.36),0_1px_1px_-0.5px_rgba(0,0,0,0.22),0_3px_3px_-1.5px_rgba(0,0,0,0.20),0_6px_6px_-3px_rgba(0,0,0,0.16)]`,w={maxWidth:`min(28rem, calc(100cqw - 4ch))`,backgroundColor:`var(--surface-elevated)`,color:`var(--surface-elevated-foreground)`},T=`flex items-center justify-between gap-3 border-b border-[var(--surface-subtle)] px-3 py-2.5`,E=`text-xs font-medium leading-4 text-foreground md:text-[0.8125rem] md:leading-5`,D=`text-xs tabular-nums leading-4 text-muted-foreground md:text-[0.8125rem] md:leading-5`,O=`m-0 list-none divide-y divide-[var(--surface-subtle)] p-0`,k=`${O} max-h-[min(22rem,50vh)] overflow-y-auto`,A=`${O} w-full`,ee={className:`p-0 rounded-none`,maxHeightClass:`max-h-[46vh]`,disableHorizontal:!0},j=`px-2.5 py-1.5 text-xs leading-4 md:py-2 md:text-[0.8125rem] md:leading-5`,M=`flex min-w-0 items-center gap-1 text-xs leading-4 text-muted-foreground md:gap-1.5 md:text-[0.8125rem] md:leading-5`,te=`min-w-0 truncate text-xs leading-4 text-foreground md:text-[0.8125rem] md:leading-5`,ne=`inline-flex shrink-0 items-center gap-1 text-xs leading-4 tabular-nums text-muted-foreground md:text-[0.8125rem] md:leading-5`,re=`h-3 w-3 shrink-0 md:h-3.5 md:w-3.5`,ie={in_progress:`text-foreground`,pending:`text-foreground`,completed:`text-muted-foreground line-through`,cancelled:`text-muted-foreground line-through`},ae={in_progress:`chat.statusRow.todo.status.inProgress`,pending:`chat.statusRow.todo.status.pending`,completed:`chat.statusRow.todo.status.completed`,cancelled:`chat.statusRow.todo.status.cancelled`},N=e=>{let t=(0,x.c)(26),{todo:n,isActive:r,activeRef:i}=e,{t:s}=a(),c=oe.has(n.status)?n.status:`pending`,p=ae[c],m;t[0]!==s||t[1]!==p?(m=s(p),t[0]=s,t[1]=p,t[2]=m):m=t[2];let h=m,g;t[3]===c?g=t[4]:(g=c===`in_progress`?(0,S.jsx)(l,{name:`record-circle`,className:`h-3.5 w-3.5 text-[var(--status-info)]`,"aria-hidden":`true`}):c===`completed`?(0,S.jsx)(l,{name:`checkbox-circle`,className:`h-3.5 w-3.5 text-[var(--status-success)]`,"aria-hidden":`true`}):(0,S.jsx)(l,{name:`time`,className:`h-3.5 w-3.5 text-muted-foreground`,"aria-hidden":`true`}),t[3]=c,t[4]=g);let _=g,v=r?`step`:void 0,y=r&&`bg-[var(--surface-muted)] before:absolute before:inset-y-2 before:left-0 before:w-0.5 before:rounded-full before:bg-[var(--status-info)]`,b;t[5]===y?b=t[6]:(b=o(`group relative grid min-w-0 grid-cols-[1rem_minmax(0,1fr)] items-start gap-2.5`,j,y),t[5]=y,t[6]=b);let C;t[7]!==_||t[8]!==h?(C=(0,S.jsx)(u,{asChild:!0,children:(0,S.jsx)(`span`,{className:`flex size-4 items-center justify-center`,"aria-label":h,children:_})}),t[7]=_,t[8]=h,t[9]=C):C=t[9];let w;t[10]===h?w=t[11]:(w=(0,S.jsx)(d,{side:`left`,sideOffset:6,children:h}),t[10]=h,t[11]=w);let T;t[12]!==C||t[13]!==w?(T=(0,S.jsxs)(f,{children:[C,w]}),t[12]=C,t[13]=w,t[14]=T):T=t[14];let E=ie[c],D;t[15]===E?D=t[16]:(D=o(`block whitespace-normal break-words`,E),t[15]=E,t[16]=D);let O;t[17]!==D||t[18]!==n.content?(O=(0,S.jsx)(`span`,{className:`min-w-0 flex-1`,children:(0,S.jsx)(`span`,{className:D,children:n.content})}),t[17]=D,t[18]=n.content,t[19]=O):O=t[19];let k;return t[20]!==i||t[21]!==O||t[22]!==v||t[23]!==b||t[24]!==T?(k=(0,S.jsxs)(`li`,{ref:i,"aria-current":v,className:b,children:[T,O]}),t[20]=i,t[21]=O,t[22]=v,t[23]=b,t[24]=T,t[25]=k):k=t[25],k},oe=new Set([`in_progress`,`pending`,`completed`,`cancelled`]),P=e=>e.replace(/&/g,`&amp;`).replace(/</g,`&lt;`).replace(/>/g,`&gt;`).replace(/"/g,`&quot;`).replace(/'/g,`&#39;`),F=e=>e?Object.entries(e).map(([e,t])=>t==null?``:`${e.startsWith(`--`)?e:e.replace(/[A-Z]/g,e=>`-${e.toLowerCase()}`)}:${typeof t==`number`?`${t}px`:t};`).join(``):``,I=(e,t,n)=>{let r=e.querySelector(`pre`);r&&(r.style.margin=`0`,r.style.background=`transparent`,r.style.whiteSpace=t?`pre-wrap`:`pre`,t&&(r.style.wordBreak=`break-word`,r.style.overflowWrap=`break-word`));let i=e.querySelector(`code`);if(i){let e=F(n);e&&i.setAttribute(`style`,`${i.getAttribute(`style`)??``}${e}`)}},L=e=>`<pre><code>${P(e)}</code></pre>`,R=e=>{let t=(0,x.c)(21),{code:n,language:r,className:i,style:a,codeStyle:s,wrap:l}=e,u=l!==void 0&&l,{currentTheme:d}=c(),f=b.useRef(null),p;t[0]===d?p=t[1]:(p=y(d),t[0]=d,t[1]=p);let m=p,h,g;t[2]!==n||t[3]!==s||t[4]!==u?(h=()=>{let e=f.current;e&&(e.innerHTML=L(n),I(e,u,s))},g=[n,u,s],t[2]=n,t[3]=s,t[4]=u,t[5]=h,t[6]=g):(h=t[5],g=t[6]),b.useLayoutEffect(h,g);let v,C;t[7]!==n||t[8]!==s||t[9]!==r||t[10]!==u?(v=()=>{let e=f.current;if(!e)return;let t=!0,i=new AbortController;return _(n,(r||`text`).toLowerCase(),{signal:i.signal,priority:`visible`}).then(n=>{!t||!e||!n||(e.innerHTML=n,I(e,u,s))}),()=>{t=!1,i.abort()}},C=[n,r,u,s],t[7]=n,t[8]=s,t[9]=r,t[10]=u,t[11]=v,t[12]=C):(v=t[11],C=t[12]),b.useEffect(v,C);let w;t[13]===i?w=t[14]:(w=o(`typography-code`,i),t[13]=i,t[14]=w);let T=m,E;t[15]!==a||t[16]!==T?(E={...T,...a},t[15]=a,t[16]=T,t[17]=E):E=t[17];let D;return t[18]!==w||t[19]!==E?(D=(0,S.jsx)(`div`,{ref:f,className:w,style:E}),t[18]=w,t[19]=E,t[20]=D):D=t[20],D},z=e=>{let t=e.replace(/^<file>\s*\n?/,``).replace(/\n?<\/file>\s*$/,``);return t=t.replace(/^\s*\d{5}\|\s?/gm,``),t.trim()},B=(e,t=``)=>{if(typeof e==`string`)return e;if(e==null)return t;if(typeof e==`number`||typeof e==`boolean`||typeof e==`bigint`)return String(e);try{return JSON.stringify(e)}catch{return t}},V=e=>e?e.includes(`<diagnostics`)||e.includes(`<file_diagnostics>`)||e.includes(`LSP errors detected`)||e.includes(`This file has errors`):!1,H=e=>e?e.replace(/\n{0,2}LSP errors detected[\s\S]*?<diagnostics[^>]*>[\s\S]*?<\/diagnostics>/g,``).replace(/\n{0,2}This file has errors[\s\S]*?<\/file_diagnostics>/g,``).replace(/<diagnostics[^>]*>[\s\S]*?<\/diagnostics>/g,``).replace(/<file_diagnostics>[\s\S]*?<\/file_diagnostics>/g,``).trim():``,U=(e,t)=>!e||typeof e!=`object`?String(e):g(e,t||``),W=e=>{if(typeof e==`string`){let t=e.trim();return t.length>0?t:void 0}if(e&&typeof e==`object`){let t=e.patch;if(typeof t==`string`){let e=t.trim();return e.length>0?e:void 0}}},G=e=>{if(!e||typeof e!=`object`)return;let t=W(e.patch)??W(e.diff);if(t)return t;let n=Array.isArray(e.files)?e.files:[];for(let e of n){if(!e||typeof e!=`object`)continue;let t=W(e.patch)??W(e.diff);if(t)return t}},K=e=>{if(!e||typeof e!=`string`)return{data:null,isJson:!1};let t=e.trim();if(!t.startsWith(`{`)&&!t.startsWith(`[`)||!t.endsWith(`}`)&&!t.endsWith(`]`)||t.length<2)return{data:null,isJson:!1};try{let e=JSON.parse(t);return typeof e==`object`&&e?{data:e,isJson:!0}:{data:null,isJson:!1}}catch{return{data:null,isJson:!1}}},q=(e,t,n)=>{let r=z(e);if((t===`edit`||t===`multiedit`||t===`write`||t===`apply_patch`)&&V(r)&&(r=H(r)),(t===`edit`||t===`multiedit`||t===`apply_patch`)&&r.trim().length===0){let e=G(n);if(e)return e}return r},se=e=>{let t=e.match(/<type>(file|directory)<\/type>/i)?.[1]?.toLowerCase()??`unknown`,n=(e.match(/<content>([\s\S]*?)<\/content>/i)?.[1]??e).replace(/\r\n/g,`
+import{r as e}from"./rolldown-runtime-hePW80VL.js";import{it as t,rt as n}from"./vendor-base-ui-CdzJ6My_.js";import{v as r}from"./useUIStore-NMQx_cnG.js";import{n as i}from"./vendor-react-BP2cRVqX.js";import{f as a,r as o,t as s}from"./button-C3292Ee6.js";import{n as c}from"./useThemeSystem-8jhE4Zyk.js";import{n as l}from"./Icon-jsQQXouE.js";import{i as u,n as d,t as f}from"./tooltip-DGUZtHif.js";import{n as p}from"./MarkdownRenderer-D4Ba9SUF.js";import{n as m,o as h,s as g,t as _}from"./markdown-worker-CkO3sT4Y.js";import{t as v}from"./vendor-tanstack-react-virtual-B_EO--9t.js";import{n as y}from"./markdownTheme-DHoKvD6O.js";var b=e(t(),1),x=i(),S=n(),C=`w-[min(30rem,calc(100cqw-1rem))] min-w-[280px] max-w-full overflow-hidden rounded-xl shadow-[inset_0_1px_0_0_rgba(255,255,255,0.8),inset_0_0_0_1px_rgba(0,0,0,0.04),0_0_0_1px_rgba(0,0,0,0.10),0_1px_2px_-0.5px_rgba(0,0,0,0.08),0_4px_8px_-2px_rgba(0,0,0,0.08),0_12px_20px_-4px_rgba(0,0,0,0.08)] dark:shadow-[inset_0_1px_0_0_rgba(255,255,255,0.12),inset_0_0_0_1px_rgba(255,255,255,0.08),0_0_0_1px_rgba(0,0,0,0.36),0_1px_1px_-0.5px_rgba(0,0,0,0.22),0_3px_3px_-1.5px_rgba(0,0,0,0.20),0_6px_6px_-3px_rgba(0,0,0,0.16)]`,w={maxWidth:`min(28rem, calc(100cqw - 4ch))`,backgroundColor:`var(--surface-elevated)`,color:`var(--surface-elevated-foreground)`},T=`flex items-center justify-between gap-3 border-b border-[var(--surface-subtle)] px-3 py-2.5`,E=`text-xs font-medium leading-4 text-foreground md:text-[0.8125rem] md:leading-5`,D=`text-xs tabular-nums leading-4 text-muted-foreground md:text-[0.8125rem] md:leading-5`,O=`m-0 list-none divide-y divide-[var(--surface-subtle)] p-0`,k=`${O} max-h-[min(22rem,50vh)] overflow-y-auto`,A=`${O} w-full`,ee={className:`p-0 rounded-none`,maxHeightClass:`max-h-[46vh]`,disableHorizontal:!0},j=`px-2.5 py-1.5 text-xs leading-4 md:py-2 md:text-[0.8125rem] md:leading-5`,M=`flex min-w-0 items-center gap-1 text-xs leading-4 text-muted-foreground md:gap-1.5 md:text-[0.8125rem] md:leading-5`,te=`min-w-0 truncate text-xs leading-4 text-foreground md:text-[0.8125rem] md:leading-5`,ne=`inline-flex shrink-0 items-center gap-1 text-xs leading-4 tabular-nums text-muted-foreground md:text-[0.8125rem] md:leading-5`,re=`h-3 w-3 shrink-0 md:h-3.5 md:w-3.5`,ie={in_progress:`text-foreground`,pending:`text-foreground`,completed:`text-muted-foreground line-through`,cancelled:`text-muted-foreground line-through`},ae={in_progress:`chat.statusRow.todo.status.inProgress`,pending:`chat.statusRow.todo.status.pending`,completed:`chat.statusRow.todo.status.completed`,cancelled:`chat.statusRow.todo.status.cancelled`},N=e=>{let t=(0,x.c)(26),{todo:n,isActive:r,activeRef:i}=e,{t:s}=a(),c=oe.has(n.status)?n.status:`pending`,p=ae[c],m;t[0]!==s||t[1]!==p?(m=s(p),t[0]=s,t[1]=p,t[2]=m):m=t[2];let h=m,g;t[3]===c?g=t[4]:(g=c===`in_progress`?(0,S.jsx)(l,{name:`record-circle`,className:`h-3.5 w-3.5 text-[var(--status-info)]`,"aria-hidden":`true`}):c===`completed`?(0,S.jsx)(l,{name:`checkbox-circle`,className:`h-3.5 w-3.5 text-[var(--status-success)]`,"aria-hidden":`true`}):(0,S.jsx)(l,{name:`time`,className:`h-3.5 w-3.5 text-muted-foreground`,"aria-hidden":`true`}),t[3]=c,t[4]=g);let _=g,v=r?`step`:void 0,y=r&&`bg-[var(--surface-muted)] before:absolute before:inset-y-2 before:left-0 before:w-0.5 before:rounded-full before:bg-[var(--status-info)]`,b;t[5]===y?b=t[6]:(b=o(`group relative grid min-w-0 grid-cols-[1rem_minmax(0,1fr)] items-start gap-2.5`,j,y),t[5]=y,t[6]=b);let C;t[7]!==_||t[8]!==h?(C=(0,S.jsx)(u,{asChild:!0,children:(0,S.jsx)(`span`,{className:`flex size-4 items-center justify-center`,"aria-label":h,children:_})}),t[7]=_,t[8]=h,t[9]=C):C=t[9];let w;t[10]===h?w=t[11]:(w=(0,S.jsx)(d,{side:`left`,sideOffset:6,children:h}),t[10]=h,t[11]=w);let T;t[12]!==C||t[13]!==w?(T=(0,S.jsxs)(f,{children:[C,w]}),t[12]=C,t[13]=w,t[14]=T):T=t[14];let E=ie[c],D;t[15]===E?D=t[16]:(D=o(`block whitespace-normal break-words`,E),t[15]=E,t[16]=D);let O;t[17]!==D||t[18]!==n.content?(O=(0,S.jsx)(`span`,{className:`min-w-0 flex-1`,children:(0,S.jsx)(`span`,{className:D,children:n.content})}),t[17]=D,t[18]=n.content,t[19]=O):O=t[19];let k;return t[20]!==i||t[21]!==O||t[22]!==v||t[23]!==b||t[24]!==T?(k=(0,S.jsxs)(`li`,{ref:i,"aria-current":v,className:b,children:[T,O]}),t[20]=i,t[21]=O,t[22]=v,t[23]=b,t[24]=T,t[25]=k):k=t[25],k},oe=new Set([`in_progress`,`pending`,`completed`,`cancelled`]),P=e=>e.replace(/&/g,`&amp;`).replace(/</g,`&lt;`).replace(/>/g,`&gt;`).replace(/"/g,`&quot;`).replace(/'/g,`&#39;`),F=e=>e?Object.entries(e).map(([e,t])=>t==null?``:`${e.startsWith(`--`)?e:e.replace(/[A-Z]/g,e=>`-${e.toLowerCase()}`)}:${typeof t==`number`?`${t}px`:t};`).join(``):``,I=(e,t,n)=>{let r=e.querySelector(`pre`);r&&(r.style.margin=`0`,r.style.background=`transparent`,r.style.whiteSpace=t?`pre-wrap`:`pre`,t&&(r.style.wordBreak=`break-word`,r.style.overflowWrap=`break-word`));let i=e.querySelector(`code`);if(i){let e=F(n);e&&i.setAttribute(`style`,`${i.getAttribute(`style`)??``}${e}`)}},L=e=>`<pre><code>${P(e)}</code></pre>`,R=e=>{let t=(0,x.c)(21),{code:n,language:r,className:i,style:a,codeStyle:s,wrap:l}=e,u=l!==void 0&&l,{currentTheme:d}=c(),f=b.useRef(null),p;t[0]===d?p=t[1]:(p=y(d),t[0]=d,t[1]=p);let m=p,h,g;t[2]!==n||t[3]!==s||t[4]!==u?(h=()=>{let e=f.current;e&&(e.innerHTML=L(n),I(e,u,s))},g=[n,u,s],t[2]=n,t[3]=s,t[4]=u,t[5]=h,t[6]=g):(h=t[5],g=t[6]),b.useLayoutEffect(h,g);let v,C;t[7]!==n||t[8]!==s||t[9]!==r||t[10]!==u?(v=()=>{let e=f.current;if(!e)return;let t=!0,i=new AbortController;return _(n,(r||`text`).toLowerCase(),{signal:i.signal,priority:`visible`}).then(n=>{!t||!e||!n||(e.innerHTML=n,I(e,u,s))}),()=>{t=!1,i.abort()}},C=[n,r,u,s],t[7]=n,t[8]=s,t[9]=r,t[10]=u,t[11]=v,t[12]=C):(v=t[11],C=t[12]),b.useEffect(v,C);let w;t[13]===i?w=t[14]:(w=o(`typography-code`,i),t[13]=i,t[14]=w);let T=m,E;t[15]!==a||t[16]!==T?(E={...T,...a},t[15]=a,t[16]=T,t[17]=E):E=t[17];let D;return t[18]!==w||t[19]!==E?(D=(0,S.jsx)(`div`,{ref:f,className:w,style:E}),t[18]=w,t[19]=E,t[20]=D):D=t[20],D},z=e=>{let t=e.replace(/^<file>\s*\n?/,``).replace(/\n?<\/file>\s*$/,``);return t=t.replace(/^\s*\d{5}\|\s?/gm,``),t.trim()},B=(e,t=``)=>{if(typeof e==`string`)return e;if(e==null)return t;if(typeof e==`number`||typeof e==`boolean`||typeof e==`bigint`)return String(e);try{return JSON.stringify(e)}catch{return t}},V=e=>e?e.includes(`<diagnostics`)||e.includes(`<file_diagnostics>`)||e.includes(`LSP errors detected`)||e.includes(`This file has errors`):!1,H=e=>e?e.replace(/\n{0,2}LSP errors detected[\s\S]*?<diagnostics[^>]*>[\s\S]*?<\/diagnostics>/g,``).replace(/\n{0,2}This file has errors[\s\S]*?<\/file_diagnostics>/g,``).replace(/<diagnostics[^>]*>[\s\S]*?<\/diagnostics>/g,``).replace(/<file_diagnostics>[\s\S]*?<\/file_diagnostics>/g,``).trim():``,U=(e,t)=>!e||typeof e!=`object`?String(e):g(e,t||``),W=e=>{if(typeof e==`string`){let t=e.trim();return t.length>0?t:void 0}if(e&&typeof e==`object`){let t=e.patch;if(typeof t==`string`){let e=t.trim();return e.length>0?e:void 0}}},G=e=>{if(!e||typeof e!=`object`)return;let t=W(e.patch)??W(e.diff);if(t)return t;let n=Array.isArray(e.files)?e.files:[];for(let e of n){if(!e||typeof e!=`object`)continue;let t=W(e.patch)??W(e.diff);if(t)return t}},K=e=>{if(!e||typeof e!=`string`)return{data:null,isJson:!1};let t=e.trim();if(!t.startsWith(`{`)&&!t.startsWith(`[`)||!t.endsWith(`}`)&&!t.endsWith(`]`)||t.length<2)return{data:null,isJson:!1};try{let e=JSON.parse(t);return typeof e==`object`&&e?{data:e,isJson:!0}:{data:null,isJson:!1}}catch{return{data:null,isJson:!1}}},q=(e,t,n)=>{let r=z(e);if((t===`edit`||t===`multiedit`||t===`write`||t===`apply_patch`)&&V(r)&&(r=H(r)),(t===`edit`||t===`multiedit`||t===`apply_patch`)&&r.trim().length===0){let e=G(n);if(e)return e}return r},se=e=>{let t=e.match(/<type>(file|directory)<\/type>/i)?.[1]?.toLowerCase()??`unknown`,n=(e.match(/<content>([\s\S]*?)<\/content>/i)?.[1]??e).replace(/\r\n/g,`
 `).split(`
 `),r=e=>/\(\s*File has more lines\..*offset.*\)/i.test(e.trim());return{type:t,lines:n.map(e=>{let n=e.trim(),i=n.startsWith(`(`)&&n.endsWith(`)`)||r(n);if(t!==`directory`){let t=e.match(/^(\d+):\s?(.*)$/);if(t){let e=t[2],n=e.trim(),i=n.startsWith(`(`)&&n.endsWith(`)`)||r(n);return{lineNumber:i?null:Number(t[1]),text:e,isInfo:i}}}return{lineNumber:null,text:e,isInfo:i}}).filter((e,t,n)=>{if(e.text.trim().length>0)return!0;let r=n[t-1],i=n[t+1],a=!!(r?.isInfo||i?.isInfo),o=e.lineNumber!==null;return!(a&&o)})}},ce=(e,t)=>{try{let n=e.trim().split(`
 `).filter(Boolean);if(n.length===0)return null;let i=[];return n.forEach(e=>{let t=e.match(/^(\s*)(.+)$/);if(t){let[,e,n]=t,r=Math.floor(e.length/2),a=!n.endsWith(`/`);i.push({name:n.replace(/\/$/,``),depth:r,isFile:a})}}),(0,S.jsx)(`div`,{className:o(`w-full min-w-0 font-mono space-y-0.5`,t?.unstyled?null:`p-3 bg-muted/20 rounded-xl border border-border/30`),style:r.tool.popup,children:i.map((e,t)=>(0,S.jsx)(`div`,{className:`min-w-0`,style:{paddingLeft:`${e.depth*20}px`},children:e.isFile?(0,S.jsx)(`span`,{className:`text-foreground/90 block truncate`,children:e.name}):(0,S.jsxs)(`span`,{className:`font-semibold text-foreground block truncate`,children:[e.name,`/`]})},t))})}catch{return null}},le={backgroundColor:`var(--status-info)`,opacity:.6},ue=(e,t,n)=>{try{let i=e.trim().split(`

package/dist/index.html

@@ -8,7 +8,7 @@
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <link rel="icon" type="image/png" href="/favicon-32.png" sizes="32x32" />
     <link rel="icon" type="image/png" href="/favicon-16.png" sizes="16x16" />
-    <link rel="mask-icon" href="/favicon.svg" color="#edb449" />
+    <link rel="mask-icon" href="/favicon.svg" color="#4c9df3" />
 
     <!-- Apple touch icon - PNG format required for iOS PWA support -->
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon-180x180.png" />
@@ -238,8 +238,8 @@
           display: 'standalone',
           display_override: ['window-controls-overlay'],
           ...(manifestOrientation ? { orientation: manifestOrientation } : {}),
-          background_color: '#151313',
-          theme_color: '#edb449',
+          background_color: '#1a1a1a',
+          theme_color: '#4c9df3',
           icons: [
             { src: `${baseUrl}/pwa-192.png`, sizes: '192x192', type: 'image/png', purpose: 'any' },
             { src: `${baseUrl}/pwa-512.png`, sizes: '512x512', type: 'image/png', purpose: 'any' },
@@ -422,8 +422,8 @@
     </script>
 
     <!-- Theme color - Safari iOS 26+ prioritizes CSS background-color over this, but keep as fallback -->
-    <meta name="theme-color" content="#151313" />
-    <meta name="theme-color" content="#151313" media="(prefers-color-scheme: dark)" />
+    <meta name="theme-color" content="#1a1a1a" />
+    <meta name="theme-color" content="#1a1a1a" media="(prefers-color-scheme: dark)" />
 
     <!-- iOS Safari / installable PWA styling -->
     <meta name="mobile-web-app-capable" content="yes" />
@@ -464,8 +464,8 @@
       }
 
       :root {
-        --splash-background-dark: #151313;
-        --splash-stroke-dark: #CECDC3;
+        --splash-background-dark: #1a1a1a;
+        --splash-stroke-dark: #CCCCCCdd;
         --splash-background-light: #FFFCF0;
         --splash-stroke-light: #100F0F;
 
@@ -552,7 +552,7 @@
         opacity: 0.72;
       }
     </style>
-    <script type="module" crossorigin src="/assets/main-B_h17HmQ.js"></script>
+    <script type="module" crossorigin src="/assets/main-R2wbcT-3.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-hePW80VL.js">
     <link rel="modulepreload" crossorigin href="/assets/runtime-auth-ef9W7A43.js">
     <link rel="modulepreload" crossorigin href="/assets/runtime-switch-CAZiOV2G.js">
@@ -575,10 +575,10 @@
     <link rel="modulepreload" crossorigin href="/assets/platform-7bX6qtBV.js">
     <link rel="modulepreload" crossorigin href="/assets/terminalApi-BHXvha-U.js">
     <link rel="modulepreload" crossorigin href="/assets/runtime-file-download-DAOam_oV.js">
-    <link rel="modulepreload" crossorigin href="/assets/types-BuiqMmh_.js">
-    <link rel="modulepreload" crossorigin href="/assets/capgoAdapter-KNLHDj7G.js">
-    <link rel="modulepreload" crossorigin href="/assets/runtimeConfig-DTzs5NCT.js">
-    <link rel="stylesheet" crossorigin href="/assets/src-BEVRKYT8.css">
+    <link rel="modulepreload" crossorigin href="/assets/types-Q_utERET.js">
+    <link rel="modulepreload" crossorigin href="/assets/capgoAdapter-DLi2tcmI.js">
+    <link rel="modulepreload" crossorigin href="/assets/runtimeConfig-D3moXtPz.js">
+    <link rel="stylesheet" crossorigin href="/assets/src-CmermOKP.css">
   </head>
   <body class="h-full bg-background text-foreground">
     <!-- Keep the startup layer outside #root. React replaces every child of

package/dist/mini-chat.html

@@ -52,7 +52,7 @@
          briefly show a second, differently-sized one before handing off. The
          backdrop matches bg-background, so fading it out is seamless. */
       :root {
-        --splash-background-dark: #151313;
+        --splash-background-dark: #1a1a1a;
         --splash-background-light: #FFFCF0;
         --splash-background: var(--splash-background-dark);
       }
@@ -74,7 +74,7 @@
       }
     </style>
 
-    <script type="module" crossorigin src="/assets/miniChat-B1i0B5Ml.js"></script>
+    <script type="module" crossorigin src="/assets/miniChat-ChGISVuo.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-hePW80VL.js">
     <link rel="modulepreload" crossorigin href="/assets/runtime-auth-ef9W7A43.js">
     <link rel="modulepreload" crossorigin href="/assets/runtime-switch-CAZiOV2G.js">
@@ -97,10 +97,10 @@
     <link rel="modulepreload" crossorigin href="/assets/platform-7bX6qtBV.js">
     <link rel="modulepreload" crossorigin href="/assets/terminalApi-BHXvha-U.js">
     <link rel="modulepreload" crossorigin href="/assets/runtime-file-download-DAOam_oV.js">
-    <link rel="modulepreload" crossorigin href="/assets/types-BuiqMmh_.js">
-    <link rel="modulepreload" crossorigin href="/assets/capgoAdapter-KNLHDj7G.js">
-    <link rel="modulepreload" crossorigin href="/assets/runtimeConfig-DTzs5NCT.js">
-    <link rel="stylesheet" crossorigin href="/assets/src-BEVRKYT8.css">
+    <link rel="modulepreload" crossorigin href="/assets/types-Q_utERET.js">
+    <link rel="modulepreload" crossorigin href="/assets/capgoAdapter-DLi2tcmI.js">
+    <link rel="modulepreload" crossorigin href="/assets/runtimeConfig-D3moXtPz.js">
+    <link rel="stylesheet" crossorigin href="/assets/src-CmermOKP.css">
   </head>
   <body class="h-full bg-background text-foreground">
     <div id="root" class="h-full">

package/dist/mobile.html

@@ -41,16 +41,16 @@
           // splashBg* are the resolved theme surface.background colors persisted by the app
           // theme system (see ThemeSystemContext). When absent (e.g. a fresh install before
           // the theme has been persisted once), fall back to the default theme's
-          // surface.background — carbonfox-light / vitesse-dark-dark (see lib/theme/themes),
+          // surface.background — carbonfox-light / cursor-dark (see lib/theme/themes),
           // which is what the app renders on first launch — so the pre-paint matches instead
           // of flashing a different colour.
-          var bgDark = localStorage.getItem('splashBgDark') || '#121212';
+          var bgDark = localStorage.getItem('splashBgDark') || '#1a1a1a';
           var bgLight = localStorage.getItem('splashBgLight') || '#FFFFFF';
           var bg = isDark ? bgDark : bgLight;
 
           // Set the actual --background CSS variable, not just the element background.
           // `<body class="bg-background">` paints `var(--background)`, and design-system.css
-          // ships a baked default (.dark { --background: ... /* #151313 */ }) that otherwise
+          // ships a baked default (.dark { --background: #1a1a1a }) that otherwise
           // overpaints our html background the moment the stylesheet loads — before React's
           // theme system injects the real (default/custom) vars with !important. Setting the
           // var inline on the root wins over that non-!important default, so body paints the
@@ -63,7 +63,7 @@
       })();
     </script>
 
-    <script type="module" crossorigin src="/assets/mobile-C-PKN6lA.js"></script>
+    <script type="module" crossorigin src="/assets/mobile-Dv3wbcd9.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-hePW80VL.js">
     <link rel="modulepreload" crossorigin href="/assets/runtime-auth-ef9W7A43.js">
     <link rel="modulepreload" crossorigin href="/assets/runtime-switch-CAZiOV2G.js">
@@ -86,10 +86,10 @@
     <link rel="modulepreload" crossorigin href="/assets/platform-7bX6qtBV.js">
     <link rel="modulepreload" crossorigin href="/assets/terminalApi-BHXvha-U.js">
     <link rel="modulepreload" crossorigin href="/assets/runtime-file-download-DAOam_oV.js">
-    <link rel="modulepreload" crossorigin href="/assets/types-BuiqMmh_.js">
-    <link rel="modulepreload" crossorigin href="/assets/capgoAdapter-KNLHDj7G.js">
-    <link rel="modulepreload" crossorigin href="/assets/runtimeConfig-DTzs5NCT.js">
-    <link rel="stylesheet" crossorigin href="/assets/src-BEVRKYT8.css">
+    <link rel="modulepreload" crossorigin href="/assets/types-Q_utERET.js">
+    <link rel="modulepreload" crossorigin href="/assets/capgoAdapter-DLi2tcmI.js">
+    <link rel="modulepreload" crossorigin href="/assets/runtimeConfig-D3moXtPz.js">
+    <link rel="stylesheet" crossorigin href="/assets/src-CmermOKP.css">
   </head>
   <body class="h-full bg-background text-foreground">
     <div id="root" class="h-full"></div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuriai/web",
-  "version": "0.1.2-beta.2",
+  "version": "0.1.3",
   "private": false,
   "type": "module",
   "main": "./server/index.js",

package/server/lib/content-search/DOCUMENTATION.md

@@ -4,7 +4,11 @@ The Host owns `content-search.sqlite` alongside the session index. This index is
 independent of browser transcript caches and includes all projects exposed by the
 active OpenCode runtime. `session.list` is called without a project/directory
 filter; opaque cursors are followed until exhausted. The default coverage is
-messages created in the last thirty days in recently updated sessions.
+messages created in the last thirty days in recently updated root sessions.
+Sessions with a non-empty `parentID` (subagents) are excluded before message
+fetching and progress counting. Only root IDs enter the authoritative pruning
+set, so a successful catalog scan also removes previously indexed subagent
+messages, FTS entries and checkpoints. Failed catalog reads preserve the old index.
 
 Two workers page native `message.list` directly, normalize via the shared server
 projection, and retain only user text and settled assistant text. Synthetic,

package/server/lib/content-search/runtime.js

@@ -43,6 +43,7 @@ export function createContentSearchRuntime({ service, getRuntimeKey, listSession
         if (!Array.isArray(page?.data)) throw new Error('Invalid global session page');
         for (const session of page.data) {
           if (typeof session?.id !== 'string' || !session.id || !Number.isFinite(session.time?.updated)) throw new Error('Invalid global session checkpoint');
+          if (typeof session.parentID === 'string' && session.parentID) continue;
           if (ids.has(session.id)) continue;
           ids.add(session.id);
           if (Number(session.time?.updated) >= state.since && !deleted.has(session.id)) sessions.push(session);

package/server/lib/content-search/runtime.test.js

@@ -2,6 +2,49 @@ import { expect, test } from 'vitest';
 import { createContentSearchService } from './service.js';
 import { createContentSearchRuntime } from './runtime.js';
 
+test('indexes only roots and prunes legacy subagents after a complete catalog, including dirty children', async () => {
+  const service = createContentSearchService({ dbPath: ':memory:' });
+  const root = { id: 'root', time: { updated: 10 } };
+  const child = { id: 'child', parentID: 'root', time: { updated: 10 } };
+  const nested = { id: 'nested', parentID: 'child', time: { updated: 10 } };
+  const record = { info: { id: 'old', role: 'user', time: { created: 10 } }, parts: [{ type: 'text', text: 'legacy needle' }] };
+  service.replaceSession('host', child, [record], 0);
+  service.replaceSession('other', child, [record], 0);
+  let fail = true;
+  const reads = [];
+  const runtime = createContentSearchRuntime({ service, getRuntimeKey: () => 'host', now: () => 100,
+    listSessions: async ({ cursor }) => {
+      if (!cursor) return { data: [child, nested], cursor: { next: 'roots' } };
+      if (fail) throw new Error('offline');
+      return { data: [root] };
+    },
+    listMessages: async ({ sessionID }) => {
+      reads.push(sessionID);
+      return { data: [{ type: 'user', id: 'new', sessionID, time: { created: 10 }, text: 'root needle' }] };
+    },
+  });
+  try {
+    await runtime.sync();
+    expect(runtime.status().phase).toBe('error');
+    expect(service.search('host', 'legacy')).toHaveLength(1);
+    fail = false;
+    runtime.observe({ payload: { type: 'session.updated', properties: { id: 'child' } } });
+    await runtime.sync();
+    expect(reads).toEqual(['root']);
+    expect(runtime.status()).toMatchObject({ phase: 'ready', total: 1, completed: 1, sessions: 1, initializationRequired: false });
+    expect(service.search('host', 'needle').map((hit) => hit.sessionID)).toEqual(['root']);
+    expect(service.updated('host', 'child')).toBeUndefined();
+    expect(service.search('other', 'legacy')).toHaveLength(1);
+    runtime.observe({ payload: { type: 'session.updated', properties: { id: 'nested' } } });
+    await runtime.sync();
+    expect(reads).toEqual(['root']);
+    expect(runtime.status().initializationRequired).toBe(false);
+  } finally {
+    await runtime.stop();
+    service.close();
+  }
+});
+
 test('persists initialization times only after all thirty-day history is covered and resumes partial work', async () => {
   const service = createContentSearchService({ dbPath: ':memory:' });
   const day = 86400000;

package/server/lib/notifications/APNS.md

@@ -7,6 +7,19 @@ registered them — so a leaked device token alone can't be used to push.
 
 ## How it works
 
+Native registration now includes the installed shell's `bundleId`, obtained via
+Capacitor App metadata, not the connected Host or web bundle version. The Host
+validates and persists this optional field with alert and Live Activity tokens.
+It appends `.${bundleId}` to the existing Relay registration signature when present,
+and checks app identity in registration caches. Re-registration after restart
+or Relay switching preserves it. The Relay owns the allowlist and app-to-APNs-key
+mapping; the mobile client never supplies credentials or an arbitrary APNs topic.
+Existing tokens without identity retain the default-app behavior; missing fields
+must not overwrite an identity already stored. Upgrade Relay before Host/client.
+Direct APNs remains single-app and skips explicit tokens for other apps without
+deleting them. Browser/desktop/VS Code do not acquire a native app identity; Android
+notification-stream behavior is unchanged.
+
 1. The app registers its APNs device token with **its own server** (`POST /api/push/apns-token`,
    `useNativePushRegistration`). PWA/desktop never register — only the native Capacitor app.
 2. The server **binds the token on the relay**: it POSTs `{ token, publicKeyJwk, ts, sig }` to

package/server/lib/notifications/DOCUMENTATION.md

@@ -5,6 +5,10 @@ This module provides notification message preparation utilities for the web serv
 
 ## Entrypoints and structure
 
+Native push registration accepts optional `bundleId` and carries it through Host
+persistence and signed Relay binding for alert and Live Activity delivery. See
+`APNS.md` for the multi-app compatibility contract and deployment ordering.
+
 Android notification-only subscriptions send the App locale in `Accept-Language`. `native-stream.js` localizes built-in English scenario titles per response using `apns-titles.js`, for both live delivery and replay, without mutating shared history. Custom titles, contact names and bodies are preserved. Missing/unsupported locales use the existing English fallback. The UI reconnects with its current locale when language changes; direct and encrypted relay requests carry the same header.
 - `native-stream.js`: bounded in-memory Android notification-only SSE/replay runtime, instantiated by the emitter and published by trigger fanout. `GET /api/notifications/native-stream` uses normal API/client authentication. It emits only `{type: 'notification', title, body, kind?, tag?, sessionId?, assistantID?, directory?, requireHidden}` and `{type: 'ready', gap}` with opaque SSE IDs; no session-status/transcript traffic. Initial connections receive only future events, reconnects use `Last-Event-ID`. Retention is 128 events / 15 minutes, no disk writes. Unknown/expired cursors explicitly signal a gap; backpressured clients disconnect and recover using the last processed ID. Heartbeat is 60 seconds and timers are removed on response close/error. Android owns foreground-service lifetime, native visibility and local system notification display; this channel is independent of APNs/FCM and the WebView.
 - `packages/web/server/lib/notifications/index.js`: public entrypoint imported by `packages/web/server/index.js`.

package/server/lib/notifications/apns-runtime.js

@@ -28,6 +28,11 @@ const APNS_HOST_SANDBOX = 'https://api.sandbox.push.apple.com';
 // APNs rejects auth tokens older than 1h; refresh well inside that window.
 const JWT_TTL_MS = 50 * 60 * 1000;
 const DEFAULT_BUNDLE_ID = 'com.yee94.yuri';
+const parseBundleId = (value) => {
+  if (value === undefined) return undefined;
+  if (typeof value !== 'string' || value.length > 255 || !/^[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)+$/.test(value)) throw new Error('Invalid push bundleId');
+  return value;
+};
 const MAX_TOKENS_PER_SESSION = 10;
 const MAX_LIVE_ACTIVITY_TOKENS_PER_SESSION = 8;
 const MAX_LIVE_ACTIVITY_TOKEN_CHARS = 512;
@@ -187,8 +192,8 @@ export const createApnsRuntime = (deps) => {
     y: publicJwk.y,
   });
 
-  const registrationCacheKey = (registerUrl, token, platform) =>
-    `${registerUrl}\0${token}\0${platform}`;
+  const registrationCacheKey = (registerUrl, token, platform, bundleId) =>
+    `${registerUrl}\0${token}\0${platform}\0${bundleId ?? ''}`;
 
   const rememberRelayRegisterUrl = (registerUrl) => {
     if (registrationCacheRegisterUrl === registerUrl) return;
@@ -211,28 +216,28 @@ export const createApnsRuntime = (deps) => {
   const boundRegistrationCache = (registerUrl, entries) => {
     rememberRelayRegisterUrl(registerUrl);
     const allowed = new Set(
-      entries.map((entry) => registrationCacheKey(registerUrl, entry.deviceToken, entry.platform)),
+      entries.map((entry) => registrationCacheKey(registerUrl, entry.deviceToken, entry.platform, entry.bundleId)),
     );
     for (const key of registrationSuccessCache.keys()) {
       if (!allowed.has(key)) registrationSuccessCache.delete(key);
     }
   };
 
-  const registerTokenWithRelay = async (token, platform = 'ios', relayOverride) => {
+  const registerTokenWithRelay = async (token, platform = 'ios', relayOverride, bundleId) => {
     const relay = relayOverride ?? (await resolveRelayConfig());
     if (!relay) return true; // direct mode — no relay binding needed
     rememberRelayRegisterUrl(relay.registerUrl);
-    const cacheKey = registrationCacheKey(relay.registerUrl, token, platform);
+    const cacheKey = registrationCacheKey(relay.registerUrl, token, platform, bundleId);
     if (registrationSuccessCache.has(cacheKey)) return true;
     try {
       const { privateKey, publicJwk } = await getOrCreateRelayKeypair();
       const ts = Date.now();
       // platform is part of the signed message so it can't be tampered en route.
-      const sig = signRelayMessage(privateKey, `${ts}.${token}.${platform}`);
+      const sig = signRelayMessage(privateKey, `${ts}.${token}.${platform}${bundleId ? `.${bundleId}` : ''}`);
       const res = await fetch(relay.registerUrl, {
         method: 'POST',
         headers: { 'content-type': 'application/json' },
-        body: JSON.stringify({ token, platform, publicKeyJwk: relayPublicJwk(publicJwk), ts, sig }),
+        body: JSON.stringify({ token, platform, bundleId, publicKeyJwk: relayPublicJwk(publicJwk), ts, sig }),
       });
       if (!res.ok) {
         console.warn(`[Push relay] register-token failed status=${res.status}`);
@@ -246,18 +251,18 @@ export const createApnsRuntime = (deps) => {
     }
   };
 
-  const registerLiveActivityTokenWithRelay = async (token, relayOverride) => {
+  const registerLiveActivityTokenWithRelay = async (token, relayOverride, bundleId) => {
     const relay = relayOverride ?? (await resolveRelayConfig());
     if (!relay) return true;
     rememberLiveActivityRelayRegisterUrl(relay.liveActivityRegisterUrl);
     const cacheKey = liveActivityRegistrationCacheKey(relay.liveActivityRegisterUrl, token);
-    if (liveActivityRegistrationSuccessCache.has(cacheKey)) return true;
+    if (liveActivityRegistrationSuccessCache.get(cacheKey) === (bundleId ?? '')) return true;
     try {
       const { privateKey, publicJwk } = await getOrCreateRelayKeypair();
       const ts = Date.now();
       const sig = signRelayMessage(
         privateKey,
-        `${ts}.${token}.${LIVE_ACTIVITY_PLATFORM}.${LIVE_ACTIVITY_KIND}`,
+        `${ts}.${token}.${LIVE_ACTIVITY_PLATFORM}.${LIVE_ACTIVITY_KIND}${bundleId ? `.${bundleId}` : ''}`,
       );
       const res = await fetch(relay.liveActivityRegisterUrl, {
         method: 'POST',
@@ -266,6 +271,7 @@ export const createApnsRuntime = (deps) => {
           token,
           platform: LIVE_ACTIVITY_PLATFORM,
           kind: LIVE_ACTIVITY_KIND,
+          bundleId,
           publicKeyJwk: relayPublicJwk(publicJwk),
           ts,
           sig,
@@ -275,7 +281,7 @@ export const createApnsRuntime = (deps) => {
         console.warn(`[Push relay] register-live-activity-token failed status=${res.status}`);
         return false;
       }
-      liveActivityRegistrationSuccessCache.set(cacheKey, true);
+      liveActivityRegistrationSuccessCache.set(cacheKey, bundleId ?? '');
       return true;
     } catch (error) {
       console.warn('[Push relay] register-live-activity-token request failed:', error?.message ?? error);
@@ -394,6 +400,7 @@ export const createApnsRuntime = (deps) => {
         if (!entry || typeof entry !== 'object') return null;
         const deviceToken = entry.deviceToken;
         if (typeof deviceToken !== 'string' || deviceToken.trim().length === 0) return null;
+        try { parseBundleId(entry.bundleId); } catch { return null; }
         return {
           deviceToken: deviceToken.trim(),
           createdAt: typeof entry.createdAt === 'number' ? entry.createdAt : null,
@@ -403,6 +410,7 @@ export const createApnsRuntime = (deps) => {
           platform: entry.platform === 'android' ? 'android' : 'ios',
           // App UI locale at last registration; missing → English titles (legacy tokens).
           locale: normalizeApnsLocale(entry.locale),
+          bundleId: entry.bundleId,
         };
       })
       .filter(Boolean);
@@ -419,11 +427,12 @@ export const createApnsRuntime = (deps) => {
         if (!isLimitedId(token, MAX_LIVE_ACTIVITY_TOKEN_CHARS)) return null;
         if (!isLimitedId(activityId, MAX_LIVE_ACTIVITY_ID_CHARS)) return null;
         if (!isLimitedId(sessionId, MAX_LIVE_ACTIVITY_ID_CHARS)) return null;
+        try { parseBundleId(entry.bundleId); } catch { return null; }
         const createdAt = typeof entry.createdAt === 'number' ? entry.createdAt : null;
         const lastSeenAt = typeof entry.lastSeenAt === 'number' ? entry.lastSeenAt : createdAt;
         if (typeof lastSeenAt === 'number' && now - lastSeenAt > LIVE_ACTIVITY_TOKEN_TTL_MS) return null;
         const snapshot = parseLiveActivitySnapshot(entry.snapshot);
-        return { token, activityId, sessionId, snapshot, createdAt, lastSeenAt };
+        return { token, activityId, sessionId, snapshot, createdAt, lastSeenAt, bundleId: entry.bundleId };
       })
       .filter(Boolean);
   };
@@ -473,17 +482,20 @@ export const createApnsRuntime = (deps) => {
     return unique;
   };
 
-  const addOrUpdateApnsToken = async (uiSessionToken, deviceToken, userAgent, platform, locale) => {
+  const addOrUpdateApnsToken = async (uiSessionToken, deviceToken, userAgent, platform, locale, bundleId) => {
+    parseBundleId(bundleId);
     if (!uiSessionToken || typeof deviceToken !== 'string' || deviceToken.trim().length === 0) return;
     const token = deviceToken.trim();
     const tokenPlatform = normalizePlatform(platform);
     const tokenLocale = normalizeApnsLocale(locale);
+    let tokenBundleId = bundleId;
     const now = Date.now();
 
     await persistTokenUpdate((current) => {
       const tokensBySession = { ...(current.tokensBySession || {}) };
       const existing = normalizeTokens(tokensBySession[uiSessionToken]);
       const prior = existing.find((entry) => entry.deviceToken === token);
+      tokenBundleId ??= prior?.bundleId;
       const filtered = existing.filter((entry) => entry.deviceToken !== token);
       filtered.unshift({
         deviceToken: token,
@@ -492,6 +504,7 @@ export const createApnsRuntime = (deps) => {
         userAgent: typeof userAgent === 'string' && userAgent.length > 0 ? userAgent : undefined,
         platform: tokenPlatform,
         locale: tokenLocale,
+        bundleId: tokenBundleId,
       });
       tokensBySession[uiSessionToken] = filtered.slice(0, MAX_TOKENS_PER_SESSION);
       return { version: APNS_TOKENS_VERSION, tokensBySession };
@@ -502,7 +515,7 @@ export const createApnsRuntime = (deps) => {
     // every time (not just for new tokens) keeps existing tokens bound after a relay/server
     // upgrade rather than silently going unbound. Platform is bound too so the relay routes
     // it to APNs vs FCM.
-    await registerTokenWithRelay(token, tokenPlatform);
+    await registerTokenWithRelay(token, tokenPlatform, undefined, tokenBundleId);
   };
 
   const removeApnsToken = async (uiSessionToken, deviceToken) => {
@@ -531,7 +544,9 @@ export const createApnsRuntime = (deps) => {
     });
   };
 
-  const addOrUpdateLiveActivityToken = async (uiSessionToken, token, activityId, sessionId, snapshot) => {
+  const addOrUpdateLiveActivityToken = async (uiSessionToken, token, activityId, sessionId, snapshot, bundleId) => {
+    parseBundleId(bundleId);
+    let tokenBundleId = bundleId;
     if (!uiSessionToken) return;
     const trimmedToken = typeof token === 'string' ? token.trim() : '';
     const trimmedActivityId = typeof activityId === 'string' ? activityId.trim() : '';
@@ -549,6 +564,7 @@ export const createApnsRuntime = (deps) => {
       );
       const existing = liveActivityTokensBySession[uiSessionToken] || [];
       const replaced = existing.find((entry) => entry.activityId === trimmedActivityId);
+      tokenBundleId ??= replaced?.bundleId;
       if (replaced && replaced.token !== trimmedToken) replacedToken = replaced.token;
       const filtered = existing.filter(
         (entry) => entry.activityId !== trimmedActivityId && entry.token !== trimmedToken,
@@ -559,6 +575,7 @@ export const createApnsRuntime = (deps) => {
         activityId: trimmedActivityId,
         sessionId: trimmedSessionId,
         snapshot: nextSnapshot,
+        bundleId: tokenBundleId,
         createdAt: typeof replaced?.createdAt === 'number' ? replaced.createdAt : now,
         lastSeenAt: now,
       });
@@ -566,7 +583,7 @@ export const createApnsRuntime = (deps) => {
       return { ...current, liveActivityTokensBySession };
     });
 
-    await registerLiveActivityTokenWithRelay(trimmedToken);
+    await registerLiveActivityTokenWithRelay(trimmedToken, undefined, tokenBundleId);
     if (replacedToken) {
       const store = await readTokensFromDisk();
       if (countLiveActivityTokenCopies(store.liveActivityTokensBySession, replacedToken) === 0) {
@@ -1122,7 +1139,7 @@ export const createApnsRuntime = (deps) => {
 
   // Shared Live Activity delivery path (relay register-then-send, or direct APNs).
   // Returns the tokens APNs accepted; callers decide what an accepted `end` means.
-  const deliverLiveActivityPayload = async (tokens, payload) => {
+  const deliverLiveActivityPayload = async (tokens, payload, bundleIds) => {
     const accepted = [];
     const relay = await resolveRelayConfig();
     if (relay) {
@@ -1131,7 +1148,7 @@ export const createApnsRuntime = (deps) => {
         tokens,
         RELAY_REGISTER_CONCURRENCY,
         async (token) => {
-          const registered = await registerLiveActivityTokenWithRelay(token, relay);
+          const registered = await registerLiveActivityTokenWithRelay(token, relay, bundleIds.get(token));
           return registered ? token : null;
         },
       );
@@ -1140,7 +1157,9 @@ export const createApnsRuntime = (deps) => {
         accepted.push(...await sendLiveActivityViaRelay(readyTokens, payload, relay));
       }
     } else {
-      accepted.push(...await sendLiveActivityViaDirectApns(tokens, payload));
+      const config = await resolveApnsConfig();
+      const compatible = tokens.filter((token) => !bundleIds.get(token) || bundleIds.get(token) === config?.bundleId);
+      accepted.push(...await sendLiveActivityViaDirectApns(compatible, payload));
     }
     return accepted;
   };
@@ -1224,6 +1243,7 @@ export const createApnsRuntime = (deps) => {
     }
 
     const updatedAtSeconds = now / 1000;
+    const bundleIds = new Map(entries.map((entry) => [entry.token, entry.bundleId]));
     const tokensToEnd = [];
     for (const group of groups.values()) {
       const working = group.items.filter((item) => liveActivityItemIsWorking(item.status));
@@ -1244,7 +1264,7 @@ export const createApnsRuntime = (deps) => {
       };
       let accepted = [];
       try {
-        accepted = await deliverLiveActivityPayload(group.tokens, payload);
+        accepted = await deliverLiveActivityPayload(group.tokens, payload, bundleIds);
       } catch (error) {
         console.warn('[Live Activity] refresh failed:', error?.message ?? error);
         continue;
@@ -1351,7 +1371,7 @@ export const createApnsRuntime = (deps) => {
     const tokens = pendingEntries.map((entry) => entry.token);
     let accepted = [];
     try {
-      accepted = await deliverLiveActivityPayload(tokens, payload);
+      accepted = await deliverLiveActivityPayload(tokens, payload, new Map(pendingEntries.map((entry) => [entry.token, entry.bundleId])));
     } catch (error) {
       console.warn('[Live Activity] end failed:', error?.message ?? error);
       return;
@@ -1378,7 +1398,7 @@ export const createApnsRuntime = (deps) => {
     const outcomes = await mapWithBoundedConcurrency(
       entries,
       RELAY_REGISTER_CONCURRENCY,
-      (entry) => registerTokenWithRelay(entry.deviceToken, entry.platform, relay),
+      (entry) => registerTokenWithRelay(entry.deviceToken, entry.platform, relay, entry.bundleId),
     );
     let succeeded = 0;
     let failed = 0;
@@ -1419,7 +1439,7 @@ export const createApnsRuntime = (deps) => {
         uniqueEntries,
         RELAY_REGISTER_CONCURRENCY,
         async (entry) => {
-          const registered = await registerTokenWithRelay(entry.deviceToken, entry.platform, relay);
+          const registered = await registerTokenWithRelay(entry.deviceToken, entry.platform, relay, entry.bundleId);
           return registered ? entry : null;
         },
       );
@@ -1436,7 +1456,8 @@ export const createApnsRuntime = (deps) => {
       }
       return;
     }
-    const byLocale = groupTokensByLocale(uniqueEntries);
+    const config = await resolveApnsConfig();
+    const byLocale = groupTokensByLocale(uniqueEntries.filter((entry) => !entry.bundleId || entry.bundleId === config?.bundleId));
     for (const [locale, deviceTokens] of byLocale) {
       await sendViaDirectApns(deviceTokens, localizeApnsPayload(payload, locale));
     }