@nextclaw/ui 0.9.1 → 0.9.2

package/dist/assets/{security-config-BcIZ4rpb.js → security-config-DIrf2Z0O.js}

@@ -1 +1 @@
-import{r as c,j as e,e as M}from"./vendor-DKBNiC31.js";import{a6 as O,a7 as R,a8 as I,a9 as B,aa as _,C as u,a3 as h,a4 as x,t as s,a5 as m,z as p,B as j,I as l}from"./index-BiPDnzv0.js";import{L as o}from"./label-D4fGx6Wb.js";import{S as z}from"./switch-DqA6r5XR.js";import{P as G,a as V}from"./page-layout-twy8gmBE.js";const W=8;function A(r){return r.trim().length>=W}function L(r,n){return r!==n?(M.error(s("authPasswordMismatch")),!1):!0}function q(){const r=O(),n=R(),S=I(),g=B(),y=_(),[f,U]=c.useState(""),[i,N]=c.useState(""),[w,b]=c.useState(""),[d,v]=c.useState(""),[P,C]=c.useState(""),t=r.data,E=f.trim().length>0&&A(i)&&i===w&&!n.isPending,D=A(d)&&d===P&&!g.isPending,T=async()=>{if(L(i,w))try{await n.mutateAsync({username:f.trim(),password:i}),N(""),b("")}catch{}},F=async()=>{if(L(d,P))try{await g.mutateAsync({password:d}),v(""),C("")}catch{}},H=async a=>{try{await S.mutateAsync({enabled:a})}catch{}},k=async()=>{try{await y.mutateAsync()}catch{}};return r.isLoading&&!t?e.jsxs(u,{children:[e.jsxs(h,{children:[e.jsx(x,{children:s("authSecurityTitle")}),e.jsx(m,{children:s("authSecurityDescription")})]}),e.jsx(p,{className:"text-sm text-gray-500",children:s("loading")})]}):r.isError||!t?e.jsxs(u,{children:[e.jsxs(h,{children:[e.jsx(x,{children:s("authSecurityTitle")}),e.jsx(m,{children:s("authSecurityDescription")})]}),e.jsxs(p,{className:"space-y-4",children:[e.jsx("p",{className:"text-sm text-gray-500",children:s("authStatusLoadFailed")}),e.jsx(j,{variant:"outline",onClick:()=>{r.refetch()},children:s("authRetryStatus")})]})]}):t.configured?e.jsxs(u,{children:[e.jsxs(h,{children:[e.jsx(x,{children:s("authSecurityTitle")}),e.jsx(m,{children:s("authSecurityDescription")})]}),e.jsxs(p,{className:"space-y-6",children:[e.jsxs("div",{className:"rounded-xl border border-gray-200 p-4",children:[e.jsxs("div",{className:"flex flex-col gap-4 md:flex-row md:items-start md:justify-between",children:[e.jsxs("div",{className:"space-y-1",children:[e.jsx("p",{className:"text-sm font-medium text-gray-900",children:s("authStatusLabel")}),e.jsx("p",{className:"text-sm text-gray-600",children:s("authStatusConfiguredUser").replace("{username}",t.username??"")}),e.jsx("p",{className:"text-xs text-gray-500",children:s("authUsernameFixedHelp")})]}),e.jsx("span",{className:"inline-flex items-center rounded-full bg-gray-100 px-3 py-1 text-xs font-medium text-gray-700",children:t.enabled?s("enabled"):s("disabled")})]}),e.jsxs("div",{className:"mt-4 flex flex-col gap-4 border-t border-gray-200 pt-4 md:flex-row md:items-center md:justify-between",children:[e.jsxs("div",{className:"space-y-1",children:[e.jsx("p",{className:"text-sm font-medium text-gray-900",children:s("authEnableLabel")}),e.jsx("p",{className:"text-xs text-gray-500",children:t.enabled?s("authEnableOnHelp"):s("authEnableOffHelp")})]}),e.jsx(z,{checked:t.enabled,disabled:S.isPending,onCheckedChange:a=>{H(a)}})]})]}),e.jsxs("div",{className:"rounded-xl border border-gray-200 p-4 space-y-4",children:[e.jsxs("div",{className:"space-y-1",children:[e.jsx("p",{className:"text-sm font-medium text-gray-900",children:s("authPasswordSectionTitle")}),e.jsx("p",{className:"text-xs text-gray-500",children:s("authPasswordSectionDescription")})]}),e.jsxs("div",{className:"grid gap-4 md:grid-cols-2",children:[e.jsxs("div",{className:"space-y-2",children:[e.jsx(o,{htmlFor:"auth-password-next",children:s("authPassword")}),e.jsx(l,{id:"auth-password-next",type:"password",value:d,onChange:a=>v(a.target.value),placeholder:s("authPasswordPlaceholder")})]}),e.jsxs("div",{className:"space-y-2",children:[e.jsx(o,{htmlFor:"auth-password-confirm",children:s("authConfirmPassword")}),e.jsx(l,{id:"auth-password-confirm",type:"password",value:P,onChange:a=>C(a.target.value),placeholder:s("authConfirmPasswordPlaceholder")})]})]}),e.jsxs("div",{className:"flex flex-wrap items-center gap-3",children:[e.jsx(j,{type:"button",disabled:!D,onClick:()=>void F(),children:g.isPending?s("authPasswordUpdating"):s("authPasswordAction")}),t.enabled&&t.authenticated?e.jsx(j,{type:"button",variant:"outline",disabled:y.isPending,onClick:()=>void k(),children:y.isPending?s("authLoggingOut"):s("authLogoutAction")}):null]}),e.jsx("p",{className:"text-xs text-gray-500",children:s("authSessionMemoryNotice")})]})]})]}):e.jsxs(u,{children:[e.jsxs(h,{children:[e.jsx(x,{children:s("authSecurityTitle")}),e.jsx(m,{children:s("authSecurityDescription")})]}),e.jsxs(p,{className:"space-y-5",children:[e.jsxs("div",{className:"rounded-xl border border-dashed border-gray-200 bg-gray-50/70 p-4",children:[e.jsx("p",{className:"text-sm font-medium text-gray-900",children:s("authSetupTitle")}),e.jsx("p",{className:"mt-1 text-sm text-gray-500",children:s("authSetupDescription")})]}),e.jsxs("div",{className:"grid gap-4 md:grid-cols-2",children:[e.jsxs("div",{className:"space-y-2",children:[e.jsx(o,{htmlFor:"auth-setup-username",children:s("authUsername")}),e.jsx(l,{id:"auth-setup-username",value:f,onChange:a=>U(a.target.value),placeholder:s("authUsernamePlaceholder")})]}),e.jsxs("div",{className:"space-y-2",children:[e.jsx(o,{htmlFor:"auth-setup-password",children:s("authPassword")}),e.jsx(l,{id:"auth-setup-password",type:"password",value:i,onChange:a=>N(a.target.value),placeholder:s("authPasswordPlaceholder")})]})]}),e.jsxs("div",{className:"space-y-2",children:[e.jsx(o,{htmlFor:"auth-setup-confirm",children:s("authConfirmPassword")}),e.jsx(l,{id:"auth-setup-confirm",type:"password",value:w,onChange:a=>b(a.target.value),placeholder:s("authConfirmPasswordPlaceholder")}),e.jsx("p",{className:"text-xs text-gray-500",children:s("authPasswordMinLengthHint")})]}),e.jsx(j,{type:"button",disabled:!E,onClick:()=>void T(),children:n.isPending?s("authSettingUp"):s("authSetupAction")})]})]})}function Z(){return e.jsxs(G,{className:"space-y-6",children:[e.jsx(V,{title:s("authSecurityTitle"),description:s("authSecurityDescription")}),e.jsx(q,{})]})}export{Z as SecurityConfig};
+import{r as c,j as e,e as M}from"./vendor-DKBNiC31.js";import{a6 as O,a7 as R,a8 as I,a9 as B,aa as _,C as u,a3 as h,a4 as x,t as s,a5 as m,z as p,B as j,I as l}from"./index-BEgClaDH.js";import{L as o}from"./label-DD61y-4v.js";import{S as z}from"./switch-NX5OmUXQ.js";import{P as G,a as V}from"./page-layout-CfnoVycc.js";const W=8;function A(r){return r.trim().length>=W}function L(r,n){return r!==n?(M.error(s("authPasswordMismatch")),!1):!0}function q(){const r=O(),n=R(),S=I(),g=B(),y=_(),[f,U]=c.useState(""),[i,N]=c.useState(""),[w,b]=c.useState(""),[d,v]=c.useState(""),[P,C]=c.useState(""),t=r.data,E=f.trim().length>0&&A(i)&&i===w&&!n.isPending,D=A(d)&&d===P&&!g.isPending,T=async()=>{if(L(i,w))try{await n.mutateAsync({username:f.trim(),password:i}),N(""),b("")}catch{}},F=async()=>{if(L(d,P))try{await g.mutateAsync({password:d}),v(""),C("")}catch{}},H=async a=>{try{await S.mutateAsync({enabled:a})}catch{}},k=async()=>{try{await y.mutateAsync()}catch{}};return r.isLoading&&!t?e.jsxs(u,{children:[e.jsxs(h,{children:[e.jsx(x,{children:s("authSecurityTitle")}),e.jsx(m,{children:s("authSecurityDescription")})]}),e.jsx(p,{className:"text-sm text-gray-500",children:s("loading")})]}):r.isError||!t?e.jsxs(u,{children:[e.jsxs(h,{children:[e.jsx(x,{children:s("authSecurityTitle")}),e.jsx(m,{children:s("authSecurityDescription")})]}),e.jsxs(p,{className:"space-y-4",children:[e.jsx("p",{className:"text-sm text-gray-500",children:s("authStatusLoadFailed")}),e.jsx(j,{variant:"outline",onClick:()=>{r.refetch()},children:s("authRetryStatus")})]})]}):t.configured?e.jsxs(u,{children:[e.jsxs(h,{children:[e.jsx(x,{children:s("authSecurityTitle")}),e.jsx(m,{children:s("authSecurityDescription")})]}),e.jsxs(p,{className:"space-y-6",children:[e.jsxs("div",{className:"rounded-xl border border-gray-200 p-4",children:[e.jsxs("div",{className:"flex flex-col gap-4 md:flex-row md:items-start md:justify-between",children:[e.jsxs("div",{className:"space-y-1",children:[e.jsx("p",{className:"text-sm font-medium text-gray-900",children:s("authStatusLabel")}),e.jsx("p",{className:"text-sm text-gray-600",children:s("authStatusConfiguredUser").replace("{username}",t.username??"")}),e.jsx("p",{className:"text-xs text-gray-500",children:s("authUsernameFixedHelp")})]}),e.jsx("span",{className:"inline-flex items-center rounded-full bg-gray-100 px-3 py-1 text-xs font-medium text-gray-700",children:t.enabled?s("enabled"):s("disabled")})]}),e.jsxs("div",{className:"mt-4 flex flex-col gap-4 border-t border-gray-200 pt-4 md:flex-row md:items-center md:justify-between",children:[e.jsxs("div",{className:"space-y-1",children:[e.jsx("p",{className:"text-sm font-medium text-gray-900",children:s("authEnableLabel")}),e.jsx("p",{className:"text-xs text-gray-500",children:t.enabled?s("authEnableOnHelp"):s("authEnableOffHelp")})]}),e.jsx(z,{checked:t.enabled,disabled:S.isPending,onCheckedChange:a=>{H(a)}})]})]}),e.jsxs("div",{className:"rounded-xl border border-gray-200 p-4 space-y-4",children:[e.jsxs("div",{className:"space-y-1",children:[e.jsx("p",{className:"text-sm font-medium text-gray-900",children:s("authPasswordSectionTitle")}),e.jsx("p",{className:"text-xs text-gray-500",children:s("authPasswordSectionDescription")})]}),e.jsxs("div",{className:"grid gap-4 md:grid-cols-2",children:[e.jsxs("div",{className:"space-y-2",children:[e.jsx(o,{htmlFor:"auth-password-next",children:s("authPassword")}),e.jsx(l,{id:"auth-password-next",type:"password",value:d,onChange:a=>v(a.target.value),placeholder:s("authPasswordPlaceholder")})]}),e.jsxs("div",{className:"space-y-2",children:[e.jsx(o,{htmlFor:"auth-password-confirm",children:s("authConfirmPassword")}),e.jsx(l,{id:"auth-password-confirm",type:"password",value:P,onChange:a=>C(a.target.value),placeholder:s("authConfirmPasswordPlaceholder")})]})]}),e.jsxs("div",{className:"flex flex-wrap items-center gap-3",children:[e.jsx(j,{type:"button",disabled:!D,onClick:()=>void F(),children:g.isPending?s("authPasswordUpdating"):s("authPasswordAction")}),t.enabled&&t.authenticated?e.jsx(j,{type:"button",variant:"outline",disabled:y.isPending,onClick:()=>void k(),children:y.isPending?s("authLoggingOut"):s("authLogoutAction")}):null]}),e.jsx("p",{className:"text-xs text-gray-500",children:s("authSessionMemoryNotice")})]})]})]}):e.jsxs(u,{children:[e.jsxs(h,{children:[e.jsx(x,{children:s("authSecurityTitle")}),e.jsx(m,{children:s("authSecurityDescription")})]}),e.jsxs(p,{className:"space-y-5",children:[e.jsxs("div",{className:"rounded-xl border border-dashed border-gray-200 bg-gray-50/70 p-4",children:[e.jsx("p",{className:"text-sm font-medium text-gray-900",children:s("authSetupTitle")}),e.jsx("p",{className:"mt-1 text-sm text-gray-500",children:s("authSetupDescription")})]}),e.jsxs("div",{className:"grid gap-4 md:grid-cols-2",children:[e.jsxs("div",{className:"space-y-2",children:[e.jsx(o,{htmlFor:"auth-setup-username",children:s("authUsername")}),e.jsx(l,{id:"auth-setup-username",value:f,onChange:a=>U(a.target.value),placeholder:s("authUsernamePlaceholder")})]}),e.jsxs("div",{className:"space-y-2",children:[e.jsx(o,{htmlFor:"auth-setup-password",children:s("authPassword")}),e.jsx(l,{id:"auth-setup-password",type:"password",value:i,onChange:a=>N(a.target.value),placeholder:s("authPasswordPlaceholder")})]})]}),e.jsxs("div",{className:"space-y-2",children:[e.jsx(o,{htmlFor:"auth-setup-confirm",children:s("authConfirmPassword")}),e.jsx(l,{id:"auth-setup-confirm",type:"password",value:w,onChange:a=>b(a.target.value),placeholder:s("authConfirmPasswordPlaceholder")}),e.jsx("p",{className:"text-xs text-gray-500",children:s("authPasswordMinLengthHint")})]}),e.jsx(j,{type:"button",disabled:!E,onClick:()=>void T(),children:n.isPending?s("authSettingUp"):s("authSetupAction")})]})]})}function Z(){return e.jsxs(G,{className:"space-y-6",children:[e.jsx(V,{title:s("authSecurityTitle"),description:s("authSecurityDescription")}),e.jsx(q,{})]})}export{Z as SecurityConfig};

package/dist/assets/{skeleton-DypBy7jp.js → skeleton-DJ-Wen2o.js}

@@ -1 +1 @@
-import{j as t}from"./vendor-DKBNiC31.js";import{c as o}from"./index-BiPDnzv0.js";function m({className:e,...s}){return t.jsx("div",{className:o("animate-pulse rounded-md bg-slate-200",e),...s})}export{m as S};
+import{j as t}from"./vendor-DKBNiC31.js";import{c as o}from"./index-BEgClaDH.js";function m({className:e,...s}){return t.jsx("div",{className:o("animate-pulse rounded-md bg-slate-200",e),...s})}export{m as S};

package/dist/assets/{switch-DqA6r5XR.js → switch-NX5OmUXQ.js}

@@ -1 +1 @@
-import{r as e,j as i}from"./vendor-DKBNiC31.js";import{c as t}from"./index-BiPDnzv0.js";const l=e.forwardRef(({className:o,checked:r=!1,onCheckedChange:s,...a},n)=>i.jsx("button",{type:"button",role:"switch","aria-checked":r,ref:n,className:t("peer inline-flex h-[22px] w-10 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors duration-fast focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-2 focus-visible:ring-offset-white disabled:cursor-not-allowed disabled:opacity-50",r?"bg-primary":"bg-gray-200/80 hover:bg-gray-300/80",o),onClick:()=>s==null?void 0:s(!r),...a,children:i.jsx("span",{className:t("pointer-events-none block h-5 w-5 rounded-full bg-white shadow-md ring-0 transition-transform duration-fast",r?"translate-x-5":"translate-x-0")})}));l.displayName="Switch";export{l as S};
+import{r as e,j as i}from"./vendor-DKBNiC31.js";import{c as t}from"./index-BEgClaDH.js";const l=e.forwardRef(({className:o,checked:r=!1,onCheckedChange:s,...a},n)=>i.jsx("button",{type:"button",role:"switch","aria-checked":r,ref:n,className:t("peer inline-flex h-[22px] w-10 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors duration-fast focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-2 focus-visible:ring-offset-white disabled:cursor-not-allowed disabled:opacity-50",r?"bg-primary":"bg-gray-200/80 hover:bg-gray-300/80",o),onClick:()=>s==null?void 0:s(!r),...a,children:i.jsx("span",{className:t("pointer-events-none block h-5 w-5 rounded-full bg-white shadow-md ring-0 transition-transform duration-fast",r?"translate-x-5":"translate-x-0")})}));l.displayName="Switch";export{l as S};

package/dist/assets/{tabs-custom-C6enKKs1.js → tabs-custom-9ihB5Jem.js}

@@ -1 +1 @@
-import{j as e}from"./vendor-DKBNiC31.js";import{ag as m,c as a}from"./index-BiPDnzv0.js";function c({tabs:s,activeTab:i,onChange:o,className:n}){return e.jsx("div",{className:a("flex items-center gap-6 border-b border-gray-200/60 mb-6",n),children:s.map(t=>{const r=i===t.id;return e.jsxs("button",{onClick:()=>o(t.id),className:a("relative pb-3 text-[14px] font-medium transition-all duration-fast flex items-center gap-1.5",r?"text-gray-900":"text-gray-600 hover:text-gray-900"),children:[t.label,t.count!==void 0&&e.jsx("span",{className:a("text-[11px] font-medium","text-gray-500"),children:m(t.count)}),r&&e.jsx("div",{className:"absolute bottom-0 left-0 right-0 h-[2px] bg-primary rounded-full"})]},t.id)})})}export{c as T};
+import{j as e}from"./vendor-DKBNiC31.js";import{ag as m,c as a}from"./index-BEgClaDH.js";function c({tabs:s,activeTab:i,onChange:o,className:n}){return e.jsx("div",{className:a("flex items-center gap-6 border-b border-gray-200/60 mb-6",n),children:s.map(t=>{const r=i===t.id;return e.jsxs("button",{onClick:()=>o(t.id),className:a("relative pb-3 text-[14px] font-medium transition-all duration-fast flex items-center gap-1.5",r?"text-gray-900":"text-gray-600 hover:text-gray-900"),children:[t.label,t.count!==void 0&&e.jsx("span",{className:a("text-[11px] font-medium","text-gray-500"),children:m(t.count)}),r&&e.jsx("div",{className:"absolute bottom-0 left-0 right-0 h-[2px] bg-primary rounded-full"})]},t.id)})})}export{c as T};

package/dist/assets/{useConfirmDialog-CHBf5Of7.js → useConfirmDialog-BuQnVTeR.js}

@@ -1,4 +1,4 @@
-import{r as i,az as ee,j as a,aB as N,aH as te,aD as D,aE as v,aI as oe,aC as b,aJ as ae,aK as ne,aM as re,aN as se,aO as ie,aL as le,a_ as ce,aw as de}from"./vendor-DKBNiC31.js";import{P as R}from"./index-CPDASUXh.js";import{c as m,B as P,t as p}from"./index-BiPDnzv0.js";var C="Dialog",[O]=oe(C),[ue,u]=O(C),I=e=>{const{__scopeDialog:o,children:n,open:r,defaultOpen:s,onOpenChange:t,modal:l=!0}=e,c=i.useRef(null),d=i.useRef(null),[f,x]=ee({prop:r,defaultProp:s??!1,onChange:t,caller:C});return a.jsx(ue,{scope:o,triggerRef:c,contentRef:d,contentId:N(),titleId:N(),descriptionId:N(),open:f,onOpenChange:x,onOpenToggle:i.useCallback(()=>x(y=>!y),[x]),modal:l,children:n})};I.displayName=C;var w="DialogTrigger",fe=i.forwardRef((e,o)=>{const{__scopeDialog:n,...r}=e,s=u(w,n),t=b(o,s.triggerRef);return a.jsx(D.button,{type:"button","aria-haspopup":"dialog","aria-expanded":s.open,"aria-controls":s.contentId,"data-state":E(s.open),...r,ref:t,onClick:v(e.onClick,s.onOpenToggle)})});fe.displayName=w;var j="DialogPortal",[ge,A]=O(j,{forceMount:void 0}),T=e=>{const{__scopeDialog:o,forceMount:n,children:r,container:s}=e,t=u(j,o);return a.jsx(ge,{scope:o,forceMount:n,children:i.Children.map(r,l=>a.jsx(R,{present:n||t.open,children:a.jsx(te,{asChild:!0,container:s,children:l})}))})};T.displayName=j;var h="DialogOverlay",M=i.forwardRef((e,o)=>{const n=A(h,e.__scopeDialog),{forceMount:r=n.forceMount,...s}=e,t=u(h,e.__scopeDialog);return t.modal?a.jsx(R,{present:r||t.open,children:a.jsx(me,{...s,ref:o})}):null});M.displayName=h;var pe=le("DialogOverlay.RemoveScroll"),me=i.forwardRef((e,o)=>{const{__scopeDialog:n,...r}=e,s=u(h,n);return a.jsx(ne,{as:pe,allowPinchZoom:!0,shards:[s.contentRef],children:a.jsx(D.div,{"data-state":E(s.open),...r,ref:o,style:{pointerEvents:"auto",...r.style}})})}),g="DialogContent",F=i.forwardRef((e,o)=>{const n=A(g,e.__scopeDialog),{forceMount:r=n.forceMount,...s}=e,t=u(g,e.__scopeDialog);return a.jsx(R,{present:r||t.open,children:t.modal?a.jsx(xe,{...s,ref:o}):a.jsx(ve,{...s,ref:o})})});F.displayName=g;var xe=i.forwardRef((e,o)=>{const n=u(g,e.__scopeDialog),r=i.useRef(null),s=b(o,n.contentRef,r);return i.useEffect(()=>{const t=r.current;if(t)return ae(t)},[]),a.jsx(L,{...e,ref:s,trapFocus:n.open,disableOutsidePointerEvents:!0,onCloseAutoFocus:v(e.onCloseAutoFocus,t=>{var l;t.preventDefault(),(l=n.triggerRef.current)==null||l.focus()}),onPointerDownOutside:v(e.onPointerDownOutside,t=>{const l=t.detail.originalEvent,c=l.button===0&&l.ctrlKey===!0;(l.button===2||c)&&t.preventDefault()}),onFocusOutside:v(e.onFocusOutside,t=>t.preventDefault())})}),ve=i.forwardRef((e,o)=>{const n=u(g,e.__scopeDialog),r=i.useRef(!1),s=i.useRef(!1);return a.jsx(L,{...e,ref:o,trapFocus:!1,disableOutsidePointerEvents:!1,onCloseAutoFocus:t=>{var l,c;(l=e.onCloseAutoFocus)==null||l.call(e,t),t.defaultPrevented||(r.current||(c=n.triggerRef.current)==null||c.focus(),t.preventDefault()),r.current=!1,s.current=!1},onInteractOutside:t=>{var d,f;(d=e.onInteractOutside)==null||d.call(e,t),t.defaultPrevented||(r.current=!0,t.detail.originalEvent.type==="pointerdown"&&(s.current=!0));const l=t.target;((f=n.triggerRef.current)==null?void 0:f.contains(l))&&t.preventDefault(),t.detail.originalEvent.type==="focusin"&&s.current&&t.preventDefault()}})}),L=i.forwardRef((e,o)=>{const{__scopeDialog:n,trapFocus:r,onOpenAutoFocus:s,onCloseAutoFocus:t,...l}=e,c=u(g,n),d=i.useRef(null),f=b(o,d);return re(),a.jsxs(a.Fragment,{children:[a.jsx(se,{asChild:!0,loop:!0,trapped:r,onMountAutoFocus:s,onUnmountAutoFocus:t,children:a.jsx(ie,{role:"dialog",id:c.contentId,"aria-describedby":c.descriptionId,"aria-labelledby":c.titleId,"data-state":E(c.open),...l,ref:f,onDismiss:()=>c.onOpenChange(!1)})}),a.jsxs(a.Fragment,{children:[a.jsx(De,{titleId:c.titleId}),a.jsx(Ce,{contentRef:d,descriptionId:c.descriptionId})]})]})}),_="DialogTitle",S=i.forwardRef((e,o)=>{const{__scopeDialog:n,...r}=e,s=u(_,n);return a.jsx(D.h2,{id:s.titleId,...r,ref:o})});S.displayName=_;var k="DialogDescription",W=i.forwardRef((e,o)=>{const{__scopeDialog:n,...r}=e,s=u(k,n);return a.jsx(D.p,{id:s.descriptionId,...r,ref:o})});W.displayName=k;var $="DialogClose",G=i.forwardRef((e,o)=>{const{__scopeDialog:n,...r}=e,s=u($,n);return a.jsx(D.button,{type:"button",...r,ref:o,onClick:v(e.onClick,()=>s.onOpenChange(!1))})});G.displayName=$;function E(e){return e?"open":"closed"}var B="DialogTitleWarning",[we,z]=ce(B,{contentName:g,titleName:_,docsSlug:"dialog"}),De=({titleId:e})=>{const o=z(B),n=`\`${o.contentName}\` requires a \`${o.titleName}\` for the component to be accessible for screen reader users.
+import{r as i,az as ee,j as a,aB as N,aH as te,aD as D,aE as v,aI as oe,aC as b,aJ as ae,aK as ne,aM as re,aN as se,aO as ie,aL as le,a_ as ce,aw as de}from"./vendor-DKBNiC31.js";import{P as R}from"./index-CPDASUXh.js";import{c as m,B as P,t as p}from"./index-BEgClaDH.js";var C="Dialog",[O]=oe(C),[ue,u]=O(C),I=e=>{const{__scopeDialog:o,children:n,open:r,defaultOpen:s,onOpenChange:t,modal:l=!0}=e,c=i.useRef(null),d=i.useRef(null),[f,x]=ee({prop:r,defaultProp:s??!1,onChange:t,caller:C});return a.jsx(ue,{scope:o,triggerRef:c,contentRef:d,contentId:N(),titleId:N(),descriptionId:N(),open:f,onOpenChange:x,onOpenToggle:i.useCallback(()=>x(y=>!y),[x]),modal:l,children:n})};I.displayName=C;var w="DialogTrigger",fe=i.forwardRef((e,o)=>{const{__scopeDialog:n,...r}=e,s=u(w,n),t=b(o,s.triggerRef);return a.jsx(D.button,{type:"button","aria-haspopup":"dialog","aria-expanded":s.open,"aria-controls":s.contentId,"data-state":E(s.open),...r,ref:t,onClick:v(e.onClick,s.onOpenToggle)})});fe.displayName=w;var j="DialogPortal",[ge,A]=O(j,{forceMount:void 0}),T=e=>{const{__scopeDialog:o,forceMount:n,children:r,container:s}=e,t=u(j,o);return a.jsx(ge,{scope:o,forceMount:n,children:i.Children.map(r,l=>a.jsx(R,{present:n||t.open,children:a.jsx(te,{asChild:!0,container:s,children:l})}))})};T.displayName=j;var h="DialogOverlay",M=i.forwardRef((e,o)=>{const n=A(h,e.__scopeDialog),{forceMount:r=n.forceMount,...s}=e,t=u(h,e.__scopeDialog);return t.modal?a.jsx(R,{present:r||t.open,children:a.jsx(me,{...s,ref:o})}):null});M.displayName=h;var pe=le("DialogOverlay.RemoveScroll"),me=i.forwardRef((e,o)=>{const{__scopeDialog:n,...r}=e,s=u(h,n);return a.jsx(ne,{as:pe,allowPinchZoom:!0,shards:[s.contentRef],children:a.jsx(D.div,{"data-state":E(s.open),...r,ref:o,style:{pointerEvents:"auto",...r.style}})})}),g="DialogContent",F=i.forwardRef((e,o)=>{const n=A(g,e.__scopeDialog),{forceMount:r=n.forceMount,...s}=e,t=u(g,e.__scopeDialog);return a.jsx(R,{present:r||t.open,children:t.modal?a.jsx(xe,{...s,ref:o}):a.jsx(ve,{...s,ref:o})})});F.displayName=g;var xe=i.forwardRef((e,o)=>{const n=u(g,e.__scopeDialog),r=i.useRef(null),s=b(o,n.contentRef,r);return i.useEffect(()=>{const t=r.current;if(t)return ae(t)},[]),a.jsx(L,{...e,ref:s,trapFocus:n.open,disableOutsidePointerEvents:!0,onCloseAutoFocus:v(e.onCloseAutoFocus,t=>{var l;t.preventDefault(),(l=n.triggerRef.current)==null||l.focus()}),onPointerDownOutside:v(e.onPointerDownOutside,t=>{const l=t.detail.originalEvent,c=l.button===0&&l.ctrlKey===!0;(l.button===2||c)&&t.preventDefault()}),onFocusOutside:v(e.onFocusOutside,t=>t.preventDefault())})}),ve=i.forwardRef((e,o)=>{const n=u(g,e.__scopeDialog),r=i.useRef(!1),s=i.useRef(!1);return a.jsx(L,{...e,ref:o,trapFocus:!1,disableOutsidePointerEvents:!1,onCloseAutoFocus:t=>{var l,c;(l=e.onCloseAutoFocus)==null||l.call(e,t),t.defaultPrevented||(r.current||(c=n.triggerRef.current)==null||c.focus(),t.preventDefault()),r.current=!1,s.current=!1},onInteractOutside:t=>{var d,f;(d=e.onInteractOutside)==null||d.call(e,t),t.defaultPrevented||(r.current=!0,t.detail.originalEvent.type==="pointerdown"&&(s.current=!0));const l=t.target;((f=n.triggerRef.current)==null?void 0:f.contains(l))&&t.preventDefault(),t.detail.originalEvent.type==="focusin"&&s.current&&t.preventDefault()}})}),L=i.forwardRef((e,o)=>{const{__scopeDialog:n,trapFocus:r,onOpenAutoFocus:s,onCloseAutoFocus:t,...l}=e,c=u(g,n),d=i.useRef(null),f=b(o,d);return re(),a.jsxs(a.Fragment,{children:[a.jsx(se,{asChild:!0,loop:!0,trapped:r,onMountAutoFocus:s,onUnmountAutoFocus:t,children:a.jsx(ie,{role:"dialog",id:c.contentId,"aria-describedby":c.descriptionId,"aria-labelledby":c.titleId,"data-state":E(c.open),...l,ref:f,onDismiss:()=>c.onOpenChange(!1)})}),a.jsxs(a.Fragment,{children:[a.jsx(De,{titleId:c.titleId}),a.jsx(Ce,{contentRef:d,descriptionId:c.descriptionId})]})]})}),_="DialogTitle",S=i.forwardRef((e,o)=>{const{__scopeDialog:n,...r}=e,s=u(_,n);return a.jsx(D.h2,{id:s.titleId,...r,ref:o})});S.displayName=_;var k="DialogDescription",W=i.forwardRef((e,o)=>{const{__scopeDialog:n,...r}=e,s=u(k,n);return a.jsx(D.p,{id:s.descriptionId,...r,ref:o})});W.displayName=k;var $="DialogClose",G=i.forwardRef((e,o)=>{const{__scopeDialog:n,...r}=e,s=u($,n);return a.jsx(D.button,{type:"button",...r,ref:o,onClick:v(e.onClick,()=>s.onOpenChange(!1))})});G.displayName=$;function E(e){return e?"open":"closed"}var B="DialogTitleWarning",[we,z]=ce(B,{contentName:g,titleName:_,docsSlug:"dialog"}),De=({titleId:e})=>{const o=z(B),n=`\`${o.contentName}\` requires a \`${o.titleName}\` for the component to be accessible for screen reader users.
 
 If you want to hide the \`${o.titleName}\`, you can wrap it with our VisuallyHidden component.
 

package/dist/index.html

@@ -6,7 +6,7 @@
   <link rel="icon" type="image/svg+xml" href="/logo.svg" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>NextClaw - 系统配置</title>
-  <script type="module" crossorigin src="/assets/index-BiPDnzv0.js"></script>
+  <script type="module" crossorigin src="/assets/index-BEgClaDH.js"></script>
   <link rel="modulepreload" crossorigin href="/assets/vendor-DKBNiC31.js">
   <link rel="stylesheet" crossorigin href="/assets/index-C8GsgIUn.css">
 </head>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/ui",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "private": false,
   "type": "module",
   "license": "MIT",
@@ -27,11 +27,11 @@
     "tailwind-merge": "^2.5.4",
     "zod": "^3.23.8",
     "zustand": "^5.0.2",
-    "@nextclaw/agent-chat": "0.1.1",
     "@nextclaw/agent-chat-ui": "0.2.1",
     "@nextclaw/ncp": "0.3.1",
-    "@nextclaw/ncp-http-agent-client": "0.3.1",
-    "@nextclaw/ncp-react": "0.3.2"
+    "@nextclaw/ncp-react": "0.3.2",
+    "@nextclaw/agent-chat": "0.1.1",
+    "@nextclaw/ncp-http-agent-client": "0.3.1"
   },
   "devDependencies": {
     "@testing-library/react": "^16.3.0",

package/src/api/types.ts

@@ -703,13 +703,14 @@ export type WsEvent =
   | { type: 'connection.close'; payload?: Record<string, unknown> }
   | { type: 'connection.error'; payload?: { message?: string } };
 
-export type MarketplaceItemType = 'plugin' | 'skill';
+export type MarketplaceItemType = 'plugin' | 'skill' | 'mcp';
 
 export type MarketplaceSort = 'relevance' | 'updated';
 
 export type MarketplacePluginInstallKind = 'npm';
 export type MarketplaceSkillInstallKind = 'builtin' | 'marketplace';
-export type MarketplaceInstallKind = MarketplacePluginInstallKind | MarketplaceSkillInstallKind;
+export type MarketplaceMcpInstallKind = 'template';
+export type MarketplaceInstallKind = MarketplacePluginInstallKind | MarketplaceSkillInstallKind | MarketplaceMcpInstallKind;
 
 export type MarketplaceInstallSpec = {
   kind: MarketplaceInstallKind;
@@ -717,6 +718,23 @@ export type MarketplaceInstallSpec = {
   command: string;
 };
 
+export type MarketplaceMcpTemplateInput = {
+  id: string;
+  label: string;
+  description?: string;
+  required?: boolean;
+  secret?: boolean;
+  defaultValue?: string;
+};
+
+export type MarketplaceMcpInstallSpec = MarketplaceInstallSpec & {
+  kind: 'template';
+  defaultName: string;
+  transportTypes: Array<'stdio' | 'http' | 'sse'>;
+  template: Record<string, unknown>;
+  inputs: MarketplaceMcpTemplateInput[];
+};
+
 export type MarketplaceLocalizedTextMap = Record<string, string>;
 
 export type MarketplaceItemSummary = {
@@ -764,6 +782,18 @@ export type MarketplacePluginContentView = {
   sourceUrl?: string;
 };
 
+export type MarketplaceMcpContentView = {
+  type: 'mcp';
+  slug: string;
+  name: string;
+  install: MarketplaceMcpInstallSpec;
+  source: 'marketplace' | 'remote';
+  raw: string;
+  metadataRaw?: string;
+  bodyRaw: string;
+  sourceUrl?: string;
+};
+
 export type MarketplaceListView = {
   total: number;
   page: number;
@@ -796,6 +826,21 @@ export type MarketplaceInstalledRecord = {
   runtimeStatus?: string;
   origin?: string;
   installPath?: string;
+  transport?: 'stdio' | 'http' | 'sse';
+  scope?: {
+    allAgents: boolean;
+    agents: string[];
+  };
+  catalogSlug?: string;
+  vendor?: string;
+  docsUrl?: string;
+  homepage?: string;
+  trustLevel?: 'official' | 'verified' | 'community';
+  toolCount?: number;
+  accessible?: boolean;
+  lastReadyAt?: string;
+  lastDoctorAt?: string;
+  lastError?: string;
 };
 
 export type MarketplaceInstalledView = {
@@ -812,6 +857,11 @@ export type MarketplaceInstallRequest = {
   skill?: string;
   installPath?: string;
   force?: boolean;
+  name?: string;
+  enabled?: boolean;
+  allAgents?: boolean;
+  agents?: string[];
+  inputs?: Record<string, string>;
 };
 
 export type MarketplaceInstallResult = {
@@ -819,9 +869,10 @@ export type MarketplaceInstallResult = {
   spec: string;
   message: string;
   output?: string;
+  name?: string;
 };
 
-export type MarketplaceManageAction = 'enable' | 'disable' | 'uninstall';
+export type MarketplaceManageAction = 'enable' | 'disable' | 'uninstall' | 'remove';
 
 export type MarketplaceManageRequest = {
   type: MarketplaceItemType;
@@ -837,3 +888,12 @@ export type MarketplaceManageResult = {
   message: string;
   output?: string;
 };
+
+export type MarketplaceMcpDoctorResult = {
+  name: string;
+  enabled: boolean;
+  transport: 'stdio' | 'http' | 'sse';
+  accessible: boolean;
+  toolCount: number;
+  error?: string;
+};

package/src/components/chat/chat-page-data.ts

@@ -4,7 +4,6 @@ import type { SessionEntryView, ThinkingLevel } from '@/api/types';
 import type { ChatModelOption } from '@/components/chat/chat-input.types';
 import { useChatSessionTypeState } from '@/components/chat/useChatSessionTypeState';
 import {
-  resolveSelectedModelValue,
   resolveRecentSessionPreferredModel,
   useSyncSelectedModel
 } from '@/components/chat/chat-page-runtime';
@@ -115,25 +114,13 @@ export function useChatPageData(params: UseChatPageDataParams) {
   useSyncSelectedModel({
     modelOptions,
     selectedSessionKey: params.selectedSessionKey,
+    selectedSessionExists: Boolean(selectedSession),
     selectedSessionPreferredModel: selectedSession?.preferredModel,
     fallbackPreferredModel: recentSessionPreferredModel,
     defaultModel: configQuery.data?.agents.defaults.model,
     setSelectedModel: params.setSelectedModel
   });
 
-  const hydratedSessionModel = useMemo(
-    () =>
-      resolveSelectedModelValue({
-        currentSelectedModel: '',
-        modelOptions,
-        selectedSessionPreferredModel: selectedSession?.preferredModel,
-        fallbackPreferredModel: recentSessionPreferredModel,
-        defaultModel: configQuery.data?.agents.defaults.model,
-        preferSessionPreferredModel: true
-      }),
-    [configQuery.data?.agents.defaults.model, modelOptions, recentSessionPreferredModel, selectedSession?.preferredModel]
-  );
-
   const historyMessages = useMemo(() => historyQuery.data?.messages ?? [], [historyQuery.data?.messages]);
   const selectedSessionThinkingLevel = useMemo(() => {
     if (!params.selectedSessionKey) {
@@ -171,7 +158,6 @@ export function useChatPageData(params: UseChatPageDataParams) {
     sessions,
     skillRecords,
     selectedSession,
-    hydratedSessionModel,
     historyMessages,
     selectedSessionThinkingLevel,
     ...sessionTypeState

package/src/components/chat/chat-page-runtime.test.ts

@@ -82,6 +82,32 @@ describe('resolveSelectedModelValue', () => {
     ).toBe('openai/gpt-5');
   });
 
+  it('preserves the current valid model when a draft session materializes before the new session metadata exists', () => {
+    expect(
+      resolveSelectedModelValue({
+        currentSelectedModel: 'openai/gpt-5',
+        modelOptions,
+        fallbackPreferredModel: 'anthropic/claude-sonnet-4',
+        defaultModel: 'anthropic/claude-sonnet-4',
+        preferSessionPreferredModel: true,
+        preserveCurrentSelectedModelOnSessionChange: true
+      })
+    ).toBe('openai/gpt-5');
+  });
+
+  it('still falls back when the current model is no longer valid during draft session materialization', () => {
+    expect(
+      resolveSelectedModelValue({
+        currentSelectedModel: 'missing/model',
+        modelOptions,
+        fallbackPreferredModel: 'openai/gpt-5',
+        defaultModel: 'anthropic/claude-sonnet-4',
+        preferSessionPreferredModel: true,
+        preserveCurrentSelectedModelOnSessionChange: true
+      })
+    ).toBe('openai/gpt-5');
+  });
+
   it('uses the recent same-runtime model when the current session has no valid preferred model', () => {
     expect(
       resolveSelectedModelValue({

package/src/components/chat/chat-page-runtime.ts

@@ -27,6 +27,7 @@ export function resolveSelectedModelValue(params: {
   fallbackPreferredModel?: string;
   defaultModel?: string;
   preferSessionPreferredModel?: boolean;
+  preserveCurrentSelectedModelOnSessionChange?: boolean;
 }): string {
   const {
     currentSelectedModel,
@@ -34,12 +35,16 @@ export function resolveSelectedModelValue(params: {
     selectedSessionPreferredModel,
     fallbackPreferredModel,
     defaultModel,
-    preferSessionPreferredModel = false
+    preferSessionPreferredModel = false,
+    preserveCurrentSelectedModelOnSessionChange = false
   } = params;
   if (modelOptions.length === 0) {
     return '';
   }
-  if (!preferSessionPreferredModel && hasModelOption(modelOptions, currentSelectedModel)) {
+  if (
+    hasModelOption(modelOptions, currentSelectedModel) &&
+    (!preferSessionPreferredModel || preserveCurrentSelectedModelOnSessionChange)
+  ) {
     return currentSelectedModel.trim();
   }
   if (hasModelOption(modelOptions, selectedSessionPreferredModel)) {
@@ -86,6 +91,7 @@ export function resolveRecentSessionPreferredModel(params: {
 export function useSyncSelectedModel(params: {
   modelOptions: ChatModelOption[];
   selectedSessionKey?: string | null;
+  selectedSessionExists?: boolean;
   selectedSessionPreferredModel?: string;
   fallbackPreferredModel?: string;
   defaultModel?: string;
@@ -94,6 +100,7 @@ export function useSyncSelectedModel(params: {
   const {
     modelOptions,
     selectedSessionKey,
+    selectedSessionExists = false,
     selectedSessionPreferredModel,
     fallbackPreferredModel,
     defaultModel,
@@ -115,11 +122,21 @@ export function useSyncSelectedModel(params: {
         selectedSessionPreferredModel,
         fallbackPreferredModel,
         defaultModel,
-        preferSessionPreferredModel: sessionChanged
+        preferSessionPreferredModel: sessionChanged,
+        preserveCurrentSelectedModelOnSessionChange:
+          sessionChanged && Boolean(selectedSessionKey) && !selectedSessionExists
       });
     });
     previousSessionKeyRef.current = selectedSessionKey;
-  }, [defaultModel, fallbackPreferredModel, modelOptions, selectedSessionKey, selectedSessionPreferredModel, setSelectedModel]);
+  }, [
+    defaultModel,
+    fallbackPreferredModel,
+    modelOptions,
+    selectedSessionExists,
+    selectedSessionKey,
+    selectedSessionPreferredModel,
+    setSelectedModel
+  ]);
 }
 
 export function useSessionRunStatus(params: {

package/src/components/chat/legacy/LegacyChatPage.tsx

@@ -24,7 +24,6 @@ export function LegacyChatPage({ view }: ChatPageProps) {
   const { sessionId: routeSessionIdParam } = useParams<{ sessionId?: string }>();
   const threadRef = useRef<HTMLDivElement | null>(null);
   const selectedSessionKeyRef = useRef<string | null>(selectedSessionKey);
-  const modelHydratedSessionKeyRef = useRef<string | null>(null);
   const thinkingHydratedSessionKeyRef = useRef<string | null>(null);
   const routeSessionKey = useMemo(
     () => parseSessionKeyFromRoute(routeSessionIdParam),
@@ -40,7 +39,6 @@ export function LegacyChatPage({ view }: ChatPageProps) {
     sessions,
     skillRecords,
     selectedSession,
-    hydratedSessionModel,
     historyMessages,
     selectedSessionThinkingLevel,
     sessionTypeOptions,
@@ -140,13 +138,6 @@ export function LegacyChatPage({ view }: ChatPageProps) {
   }, [presenter, sessionsQuery.refetch]);
 
   useEffect(() => {
-    const shouldHydrateModelFromSession =
-      !isSending &&
-      !isAwaitingAssistantOutput &&
-      !sessionsQuery.isLoading &&
-      isProviderStateResolved &&
-      modelOptions.length > 0 &&
-      selectedSessionKey !== modelHydratedSessionKeyRef.current;
     const shouldHydrateThinkingFromHistory =
       !isSending &&
       !isAwaitingAssistantOutput &&
@@ -165,7 +156,6 @@ export function LegacyChatPage({ view }: ChatPageProps) {
       sendError: lastSendError,
       isSending,
       modelOptions,
-      ...(shouldHydrateModelFromSession ? { selectedModel: hydratedSessionModel } : {}),
       sessionTypeOptions,
       selectedSessionType,
       ...(shouldHydrateThinkingFromHistory ? { selectedThinkingLevel: selectedSessionThinkingLevel } : {}),
@@ -174,14 +164,10 @@ export function LegacyChatPage({ view }: ChatPageProps) {
       skillRecords,
       isSkillsLoading: installedSkillsQuery.isLoading
     });
-    if (shouldHydrateModelFromSession) {
-      modelHydratedSessionKeyRef.current = selectedSessionKey;
-    }
     if (shouldHydrateThinkingFromHistory) {
       thinkingHydratedSessionKeyRef.current = selectedSessionKey;
     }
     if (!selectedSessionKey) {
-      modelHydratedSessionKeyRef.current = null;
       thinkingHydratedSessionKeyRef.current = null;
     }
     presenter.chatSessionListManager.syncSnapshot({
@@ -221,7 +207,6 @@ export function LegacyChatPage({ view }: ChatPageProps) {
     historyQuery.isLoading,
     installedSkillsQuery.isLoading,
     isAwaitingAssistantOutput,
-    hydratedSessionModel,
     isProviderStateResolved,
     isSending,
     lastSendError,

package/src/components/chat/ncp/NcpChatPage.tsx

@@ -71,7 +71,6 @@ export function NcpChatPage({ view }: ChatPageProps) {
   const { sessionId: routeSessionIdParam } = useParams<{ sessionId?: string }>();
   const threadRef = useRef<HTMLDivElement | null>(null);
   const selectedSessionKeyRef = useRef<string | null>(selectedSessionKey);
-  const modelHydratedSessionKeyRef = useRef<string | null>(null);
   const thinkingHydratedSessionKeyRef = useRef<string | null>(null);
   const routeSessionKey = useMemo(
     () => parseSessionKeyFromRoute(routeSessionIdParam),
@@ -86,7 +85,6 @@ export function NcpChatPage({ view }: ChatPageProps) {
     sessions,
     skillRecords,
     selectedSession,
-    hydratedSessionModel,
     selectedSessionThinkingLevel,
     sessionTypeOptions,
     defaultSessionType,
@@ -278,13 +276,6 @@ export function NcpChatPage({ view }: ChatPageProps) {
   }, [presenter, sessionsQuery.refetch]);
 
   useEffect(() => {
-    const shouldHydrateModelFromSession =
-      !isSending &&
-      !isAwaitingAssistantOutput &&
-      !sessionsQuery.isLoading &&
-      isProviderStateResolved &&
-      modelOptions.length > 0 &&
-      selectedSessionKey !== modelHydratedSessionKeyRef.current;
     const shouldHydrateThinkingFromSession =
       !isSending &&
       !isAwaitingAssistantOutput &&
@@ -303,7 +294,6 @@ export function NcpChatPage({ view }: ChatPageProps) {
       sendError: lastSendError,
       isSending,
       modelOptions,
-      ...(shouldHydrateModelFromSession ? { selectedModel: hydratedSessionModel } : {}),
       sessionTypeOptions,
       selectedSessionType,
       ...(shouldHydrateThinkingFromSession ? { selectedThinkingLevel: selectedSessionThinkingLevel } : {}),
@@ -312,14 +302,10 @@ export function NcpChatPage({ view }: ChatPageProps) {
       skillRecords,
       isSkillsLoading: installedSkillsQuery.isLoading
     });
-    if (shouldHydrateModelFromSession) {
-      modelHydratedSessionKeyRef.current = selectedSessionKey;
-    }
     if (shouldHydrateThinkingFromSession) {
       thinkingHydratedSessionKeyRef.current = selectedSessionKey;
     }
     if (!selectedSessionKey) {
-      modelHydratedSessionKeyRef.current = null;
       thinkingHydratedSessionKeyRef.current = null;
     }
     presenter.chatSessionListManager.syncSnapshot({
@@ -357,7 +343,6 @@ export function NcpChatPage({ view }: ChatPageProps) {
     defaultSessionType,
     installedSkillsQuery.isLoading,
     isAwaitingAssistantOutput,
-    hydratedSessionModel,
     isProviderStateResolved,
     isSending,
     lastSendError,

package/src/components/chat/ncp/ncp-chat-page-data.ts

@@ -8,7 +8,6 @@ import {
 } from '@/components/chat/ncp/ncp-session-adapter';
 import { useChatSessionTypeState } from '@/components/chat/useChatSessionTypeState';
 import {
-  resolveSelectedModelValue,
   resolveRecentSessionPreferredModel,
   useSyncSelectedModel
 } from '@/components/chat/chat-page-runtime';
@@ -128,25 +127,13 @@ export function useNcpChatPageData(params: UseNcpChatPageDataParams) {
   useSyncSelectedModel({
     modelOptions,
     selectedSessionKey: params.selectedSessionKey,
+    selectedSessionExists: Boolean(selectedSession),
     selectedSessionPreferredModel: selectedSession?.preferredModel,
     fallbackPreferredModel: recentSessionPreferredModel,
     defaultModel: configQuery.data?.agents.defaults.model,
     setSelectedModel: params.setSelectedModel
   });
 
-  const hydratedSessionModel = useMemo(
-    () =>
-      resolveSelectedModelValue({
-        currentSelectedModel: '',
-        modelOptions,
-        selectedSessionPreferredModel: selectedSession?.preferredModel,
-        fallbackPreferredModel: recentSessionPreferredModel,
-        defaultModel: configQuery.data?.agents.defaults.model,
-        preferSessionPreferredModel: true
-      }),
-    [configQuery.data?.agents.defaults.model, modelOptions, recentSessionPreferredModel, selectedSession?.preferredModel]
-  );
-
   return {
     configQuery,
     configMetaQuery,
@@ -159,7 +146,6 @@ export function useNcpChatPageData(params: UseNcpChatPageDataParams) {
     sessions,
     skillRecords,
     selectedSession,
-    hydratedSessionModel,
     selectedSessionThinkingLevel,
     ...sessionTypeState
   };