@nextclaw/ui 0.6.8 → 0.6.10

package/dist/assets/{useConfirmDialog-B5CZ4EDN.js → useConfirmDialog-BaU7nIat.js}

@@ -1,4 +1,4 @@
-import{r as i,aj as b,aU as I,ad as ie,j as s,af as j,ai as le,ak as h,al as D,am as ce,an as de,ao as ue,aq as fe,ar as ge,as as me,ap as pe,aV as ve,ax as xe}from"./vendor-C--HHaLf.js";import{c as N,t as x}from"./index-CTLvVlk8.js";import{B as w}from"./page-layout-CK0vcVmV.js";function Ne(e,t){return i.useReducer((o,a)=>t[o][a]??o,e)}var E=e=>{const{present:t,children:o}=e,a=De(t),r=typeof o=="function"?o({present:a.isPresent}):i.Children.only(o),n=b(a.ref,he(r));return typeof o=="function"||a.isPresent?i.cloneElement(r,{ref:n}):null};E.displayName="Presence";function De(e){const[t,o]=i.useState(),a=i.useRef(null),r=i.useRef(e),n=i.useRef("none"),l=e?"mounted":"unmounted",[c,u]=Ne(l,{mounted:{UNMOUNT:"unmounted",ANIMATION_OUT:"unmountSuspended"},unmountSuspended:{MOUNT:"mounted",ANIMATION_END:"unmounted"},unmounted:{MOUNT:"mounted"}});return i.useEffect(()=>{const d=y(a.current);n.current=c==="mounted"?d:"none"},[c]),I(()=>{const d=a.current,f=r.current;if(f!==e){const C=n.current,p=y(d);e?u("MOUNT"):p==="none"||(d==null?void 0:d.display)==="none"?u("UNMOUNT"):u(f&&C!==p?"ANIMATION_OUT":"UNMOUNT"),r.current=e}},[e,u]),I(()=>{if(t){let d;const f=t.ownerDocument.defaultView??window,m=p=>{const re=y(a.current).includes(CSS.escape(p.animationName));if(p.target===t&&re&&(u("ANIMATION_END"),!r.current)){const se=t.style.animationFillMode;t.style.animationFillMode="forwards",d=f.setTimeout(()=>{t.style.animationFillMode==="forwards"&&(t.style.animationFillMode=se)})}},C=p=>{p.target===t&&(n.current=y(a.current))};return t.addEventListener("animationstart",C),t.addEventListener("animationcancel",m),t.addEventListener("animationend",m),()=>{f.clearTimeout(d),t.removeEventListener("animationstart",C),t.removeEventListener("animationcancel",m),t.removeEventListener("animationend",m)}}else u("ANIMATION_END")},[t,u]),{isPresent:["mounted","unmountSuspended"].includes(c),ref:i.useCallback(d=>{a.current=d?getComputedStyle(d):null,o(d)},[])}}function y(e){return(e==null?void 0:e.animationName)||"none"}function he(e){var a,r;let t=(a=Object.getOwnPropertyDescriptor(e.props,"ref"))==null?void 0:a.get,o=t&&"isReactWarning"in t&&t.isReactWarning;return o?e.ref:(t=(r=Object.getOwnPropertyDescriptor(e,"ref"))==null?void 0:r.get,o=t&&"isReactWarning"in t&&t.isReactWarning,o?e.props.ref:e.props.ref||e.ref)}var O="Dialog",[M]=ce(O),[Ce,g]=M(O),T=e=>{const{__scopeDialog:t,children:o,open:a,defaultOpen:r,onOpenChange:n,modal:l=!0}=e,c=i.useRef(null),u=i.useRef(null),[d,f]=ie({prop:a,defaultProp:r??!1,onChange:n,caller:O});return s.jsx(Ce,{scope:t,triggerRef:c,contentRef:u,contentId:j(),titleId:j(),descriptionId:j(),open:d,onOpenChange:f,onOpenToggle:i.useCallback(()=>f(m=>!m),[f]),modal:l,children:o})};T.displayName=O;var S="DialogTrigger",ye=i.forwardRef((e,t)=>{const{__scopeDialog:o,...a}=e,r=g(S,o),n=b(t,r.triggerRef);return s.jsx(h.button,{type:"button","aria-haspopup":"dialog","aria-expanded":r.open,"aria-controls":r.contentId,"data-state":_(r.open),...a,ref:n,onClick:D(e.onClick,r.onOpenToggle)})});ye.displayName=S;var A="DialogPortal",[Re,F]=M(A,{forceMount:void 0}),L=e=>{const{__scopeDialog:t,forceMount:o,children:a,container:r}=e,n=g(A,t);return s.jsx(Re,{scope:t,forceMount:o,children:i.Children.map(a,l=>s.jsx(E,{present:o||n.open,children:s.jsx(le,{asChild:!0,container:r,children:l})}))})};L.displayName=A;var R="DialogOverlay",k=i.forwardRef((e,t)=>{const o=F(R,e.__scopeDialog),{forceMount:a=o.forceMount,...r}=e,n=g(R,e.__scopeDialog);return n.modal?s.jsx(E,{present:a||n.open,children:s.jsx(Ee,{...r,ref:t})}):null});k.displayName=R;var be=pe("DialogOverlay.RemoveScroll"),Ee=i.forwardRef((e,t)=>{const{__scopeDialog:o,...a}=e,r=g(R,o);return s.jsx(ue,{as:be,allowPinchZoom:!0,shards:[r.contentRef],children:s.jsx(h.div,{"data-state":_(r.open),...a,ref:t,style:{pointerEvents:"auto",...a.style}})})}),v="DialogContent",W=i.forwardRef((e,t)=>{const o=F(v,e.__scopeDialog),{forceMount:a=o.forceMount,...r}=e,n=g(v,e.__scopeDialog);return s.jsx(E,{present:a||n.open,children:n.modal?s.jsx(Oe,{...r,ref:t}):s.jsx(je,{...r,ref:t})})});W.displayName=v;var Oe=i.forwardRef((e,t)=>{const o=g(v,e.__scopeDialog),a=i.useRef(null),r=b(t,o.contentRef,a);return i.useEffect(()=>{const n=a.current;if(n)return de(n)},[]),s.jsx(U,{...e,ref:r,trapFocus:o.open,disableOutsidePointerEvents:!0,onCloseAutoFocus:D(e.onCloseAutoFocus,n=>{var l;n.preventDefault(),(l=o.triggerRef.current)==null||l.focus()}),onPointerDownOutside:D(e.onPointerDownOutside,n=>{const l=n.detail.originalEvent,c=l.button===0&&l.ctrlKey===!0;(l.button===2||c)&&n.preventDefault()}),onFocusOutside:D(e.onFocusOutside,n=>n.preventDefault())})}),je=i.forwardRef((e,t)=>{const o=g(v,e.__scopeDialog),a=i.useRef(!1),r=i.useRef(!1);return s.jsx(U,{...e,ref:t,trapFocus:!1,disableOutsidePointerEvents:!1,onCloseAutoFocus:n=>{var l,c;(l=e.onCloseAutoFocus)==null||l.call(e,n),n.defaultPrevented||(a.current||(c=o.triggerRef.current)==null||c.focus(),n.preventDefault()),a.current=!1,r.current=!1},onInteractOutside:n=>{var u,d;(u=e.onInteractOutside)==null||u.call(e,n),n.defaultPrevented||(a.current=!0,n.detail.originalEvent.type==="pointerdown"&&(r.current=!0));const l=n.target;((d=o.triggerRef.current)==null?void 0:d.contains(l))&&n.preventDefault(),n.detail.originalEvent.type==="focusin"&&r.current&&n.preventDefault()}})}),U=i.forwardRef((e,t)=>{const{__scopeDialog:o,trapFocus:a,onOpenAutoFocus:r,onCloseAutoFocus:n,...l}=e,c=g(v,o),u=i.useRef(null),d=b(t,u);return fe(),s.jsxs(s.Fragment,{children:[s.jsx(ge,{asChild:!0,loop:!0,trapped:a,onMountAutoFocus:r,onUnmountAutoFocus:n,children:s.jsx(me,{role:"dialog",id:c.contentId,"aria-describedby":c.descriptionId,"aria-labelledby":c.titleId,"data-state":_(c.open),...l,ref:d,onDismiss:()=>c.onOpenChange(!1)})}),s.jsxs(s.Fragment,{children:[s.jsx(Ae,{titleId:c.titleId}),s.jsx(_e,{contentRef:u,descriptionId:c.descriptionId})]})]})}),P="DialogTitle",$=i.forwardRef((e,t)=>{const{__scopeDialog:o,...a}=e,r=g(P,o);return s.jsx(h.h2,{id:r.titleId,...a,ref:t})});$.displayName=P;var G="DialogDescription",B=i.forwardRef((e,t)=>{const{__scopeDialog:o,...a}=e,r=g(G,o);return s.jsx(h.p,{id:r.descriptionId,...a,ref:t})});B.displayName=G;var z="DialogClose",H=i.forwardRef((e,t)=>{const{__scopeDialog:o,...a}=e,r=g(z,o);return s.jsx(h.button,{type:"button",...a,ref:t,onClick:D(e.onClick,()=>r.onOpenChange(!1))})});H.displayName=z;function _(e){return e?"open":"closed"}var V="DialogTitleWarning",[$e,q]=ve(V,{contentName:v,titleName:P,docsSlug:"dialog"}),Ae=({titleId:e})=>{const t=q(V),o=`\`${t.contentName}\` requires a \`${t.titleName}\` for the component to be accessible for screen reader users.
+import{r as i,aj as b,aU as I,ad as ie,j as s,af as j,ai as le,ak as h,al as D,am as ce,an as de,ao as ue,aq as fe,ar as ge,as as me,ap as pe,aV as ve,ax as xe}from"./vendor-C--HHaLf.js";import{c as N,t as x}from"./index-D6_5HaDl.js";import{B as w}from"./page-layout-Ch-H9gD-.js";function Ne(e,t){return i.useReducer((o,a)=>t[o][a]??o,e)}var E=e=>{const{present:t,children:o}=e,a=De(t),r=typeof o=="function"?o({present:a.isPresent}):i.Children.only(o),n=b(a.ref,he(r));return typeof o=="function"||a.isPresent?i.cloneElement(r,{ref:n}):null};E.displayName="Presence";function De(e){const[t,o]=i.useState(),a=i.useRef(null),r=i.useRef(e),n=i.useRef("none"),l=e?"mounted":"unmounted",[c,u]=Ne(l,{mounted:{UNMOUNT:"unmounted",ANIMATION_OUT:"unmountSuspended"},unmountSuspended:{MOUNT:"mounted",ANIMATION_END:"unmounted"},unmounted:{MOUNT:"mounted"}});return i.useEffect(()=>{const d=y(a.current);n.current=c==="mounted"?d:"none"},[c]),I(()=>{const d=a.current,f=r.current;if(f!==e){const C=n.current,p=y(d);e?u("MOUNT"):p==="none"||(d==null?void 0:d.display)==="none"?u("UNMOUNT"):u(f&&C!==p?"ANIMATION_OUT":"UNMOUNT"),r.current=e}},[e,u]),I(()=>{if(t){let d;const f=t.ownerDocument.defaultView??window,m=p=>{const re=y(a.current).includes(CSS.escape(p.animationName));if(p.target===t&&re&&(u("ANIMATION_END"),!r.current)){const se=t.style.animationFillMode;t.style.animationFillMode="forwards",d=f.setTimeout(()=>{t.style.animationFillMode==="forwards"&&(t.style.animationFillMode=se)})}},C=p=>{p.target===t&&(n.current=y(a.current))};return t.addEventListener("animationstart",C),t.addEventListener("animationcancel",m),t.addEventListener("animationend",m),()=>{f.clearTimeout(d),t.removeEventListener("animationstart",C),t.removeEventListener("animationcancel",m),t.removeEventListener("animationend",m)}}else u("ANIMATION_END")},[t,u]),{isPresent:["mounted","unmountSuspended"].includes(c),ref:i.useCallback(d=>{a.current=d?getComputedStyle(d):null,o(d)},[])}}function y(e){return(e==null?void 0:e.animationName)||"none"}function he(e){var a,r;let t=(a=Object.getOwnPropertyDescriptor(e.props,"ref"))==null?void 0:a.get,o=t&&"isReactWarning"in t&&t.isReactWarning;return o?e.ref:(t=(r=Object.getOwnPropertyDescriptor(e,"ref"))==null?void 0:r.get,o=t&&"isReactWarning"in t&&t.isReactWarning,o?e.props.ref:e.props.ref||e.ref)}var O="Dialog",[M]=ce(O),[Ce,g]=M(O),T=e=>{const{__scopeDialog:t,children:o,open:a,defaultOpen:r,onOpenChange:n,modal:l=!0}=e,c=i.useRef(null),u=i.useRef(null),[d,f]=ie({prop:a,defaultProp:r??!1,onChange:n,caller:O});return s.jsx(Ce,{scope:t,triggerRef:c,contentRef:u,contentId:j(),titleId:j(),descriptionId:j(),open:d,onOpenChange:f,onOpenToggle:i.useCallback(()=>f(m=>!m),[f]),modal:l,children:o})};T.displayName=O;var S="DialogTrigger",ye=i.forwardRef((e,t)=>{const{__scopeDialog:o,...a}=e,r=g(S,o),n=b(t,r.triggerRef);return s.jsx(h.button,{type:"button","aria-haspopup":"dialog","aria-expanded":r.open,"aria-controls":r.contentId,"data-state":_(r.open),...a,ref:n,onClick:D(e.onClick,r.onOpenToggle)})});ye.displayName=S;var A="DialogPortal",[Re,F]=M(A,{forceMount:void 0}),L=e=>{const{__scopeDialog:t,forceMount:o,children:a,container:r}=e,n=g(A,t);return s.jsx(Re,{scope:t,forceMount:o,children:i.Children.map(a,l=>s.jsx(E,{present:o||n.open,children:s.jsx(le,{asChild:!0,container:r,children:l})}))})};L.displayName=A;var R="DialogOverlay",k=i.forwardRef((e,t)=>{const o=F(R,e.__scopeDialog),{forceMount:a=o.forceMount,...r}=e,n=g(R,e.__scopeDialog);return n.modal?s.jsx(E,{present:a||n.open,children:s.jsx(Ee,{...r,ref:t})}):null});k.displayName=R;var be=pe("DialogOverlay.RemoveScroll"),Ee=i.forwardRef((e,t)=>{const{__scopeDialog:o,...a}=e,r=g(R,o);return s.jsx(ue,{as:be,allowPinchZoom:!0,shards:[r.contentRef],children:s.jsx(h.div,{"data-state":_(r.open),...a,ref:t,style:{pointerEvents:"auto",...a.style}})})}),v="DialogContent",W=i.forwardRef((e,t)=>{const o=F(v,e.__scopeDialog),{forceMount:a=o.forceMount,...r}=e,n=g(v,e.__scopeDialog);return s.jsx(E,{present:a||n.open,children:n.modal?s.jsx(Oe,{...r,ref:t}):s.jsx(je,{...r,ref:t})})});W.displayName=v;var Oe=i.forwardRef((e,t)=>{const o=g(v,e.__scopeDialog),a=i.useRef(null),r=b(t,o.contentRef,a);return i.useEffect(()=>{const n=a.current;if(n)return de(n)},[]),s.jsx(U,{...e,ref:r,trapFocus:o.open,disableOutsidePointerEvents:!0,onCloseAutoFocus:D(e.onCloseAutoFocus,n=>{var l;n.preventDefault(),(l=o.triggerRef.current)==null||l.focus()}),onPointerDownOutside:D(e.onPointerDownOutside,n=>{const l=n.detail.originalEvent,c=l.button===0&&l.ctrlKey===!0;(l.button===2||c)&&n.preventDefault()}),onFocusOutside:D(e.onFocusOutside,n=>n.preventDefault())})}),je=i.forwardRef((e,t)=>{const o=g(v,e.__scopeDialog),a=i.useRef(!1),r=i.useRef(!1);return s.jsx(U,{...e,ref:t,trapFocus:!1,disableOutsidePointerEvents:!1,onCloseAutoFocus:n=>{var l,c;(l=e.onCloseAutoFocus)==null||l.call(e,n),n.defaultPrevented||(a.current||(c=o.triggerRef.current)==null||c.focus(),n.preventDefault()),a.current=!1,r.current=!1},onInteractOutside:n=>{var u,d;(u=e.onInteractOutside)==null||u.call(e,n),n.defaultPrevented||(a.current=!0,n.detail.originalEvent.type==="pointerdown"&&(r.current=!0));const l=n.target;((d=o.triggerRef.current)==null?void 0:d.contains(l))&&n.preventDefault(),n.detail.originalEvent.type==="focusin"&&r.current&&n.preventDefault()}})}),U=i.forwardRef((e,t)=>{const{__scopeDialog:o,trapFocus:a,onOpenAutoFocus:r,onCloseAutoFocus:n,...l}=e,c=g(v,o),u=i.useRef(null),d=b(t,u);return fe(),s.jsxs(s.Fragment,{children:[s.jsx(ge,{asChild:!0,loop:!0,trapped:a,onMountAutoFocus:r,onUnmountAutoFocus:n,children:s.jsx(me,{role:"dialog",id:c.contentId,"aria-describedby":c.descriptionId,"aria-labelledby":c.titleId,"data-state":_(c.open),...l,ref:d,onDismiss:()=>c.onOpenChange(!1)})}),s.jsxs(s.Fragment,{children:[s.jsx(Ae,{titleId:c.titleId}),s.jsx(_e,{contentRef:u,descriptionId:c.descriptionId})]})]})}),P="DialogTitle",$=i.forwardRef((e,t)=>{const{__scopeDialog:o,...a}=e,r=g(P,o);return s.jsx(h.h2,{id:r.titleId,...a,ref:t})});$.displayName=P;var G="DialogDescription",B=i.forwardRef((e,t)=>{const{__scopeDialog:o,...a}=e,r=g(G,o);return s.jsx(h.p,{id:r.descriptionId,...a,ref:t})});B.displayName=G;var z="DialogClose",H=i.forwardRef((e,t)=>{const{__scopeDialog:o,...a}=e,r=g(z,o);return s.jsx(h.button,{type:"button",...a,ref:t,onClick:D(e.onClick,()=>r.onOpenChange(!1))})});H.displayName=z;function _(e){return e?"open":"closed"}var V="DialogTitleWarning",[$e,q]=ve(V,{contentName:v,titleName:P,docsSlug:"dialog"}),Ae=({titleId:e})=>{const t=q(V),o=`\`${t.contentName}\` requires a \`${t.titleName}\` for the component to be accessible for screen reader users.
 
 If you want to hide the \`${t.titleName}\`, you can wrap it with our VisuallyHidden component.
 

package/dist/index.html

@@ -6,9 +6,9 @@
   <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-CTLvVlk8.js"></script>
+  <script type="module" crossorigin src="/assets/index-D6_5HaDl.js"></script>
   <link rel="modulepreload" crossorigin href="/assets/vendor-C--HHaLf.js">
-  <link rel="stylesheet" crossorigin href="/assets/index-DI6BuShn.css">
+  <link rel="stylesheet" crossorigin href="/assets/index-BUiahmWm.css">
 </head>
 
 <body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/ui",
-  "version": "0.6.8",
+  "version": "0.6.10",
   "private": false,
   "type": "module",
   "license": "MIT",

package/src/api/config.ts

@@ -9,6 +9,7 @@ import type {
   ProviderConfigUpdate,
   ProviderConnectionTestRequest,
   ProviderConnectionTestResult,
+  ProviderAuthStartRequest,
   ProviderAuthStartResult,
   ProviderAuthPollRequest,
   ProviderAuthPollResult,
@@ -144,10 +145,13 @@ export async function testProviderConnection(
 }
 
 // POST /api/config/providers/:provider/auth/start
-export async function startProviderAuth(provider: string): Promise<ProviderAuthStartResult> {
+export async function startProviderAuth(
+  provider: string,
+  data: ProviderAuthStartRequest = {}
+): Promise<ProviderAuthStartResult> {
   const response = await api.post<ProviderAuthStartResult>(
     `/api/config/providers/${provider}/auth/start`,
-    {}
+    data
   );
   if (!response.ok) {
     throw new Error(response.error.message);

package/src/api/types.ts

@@ -77,6 +77,7 @@ export type ProviderConnectionTestResult = {
 export type ProviderAuthStartResult = {
   provider: string;
   kind: "device_code";
+  methodId?: string;
   sessionId: string;
   verificationUri: string;
   userCode: string;
@@ -85,6 +86,10 @@ export type ProviderAuthStartResult = {
   note?: string;
 };
 
+export type ProviderAuthStartRequest = {
+  methodId?: string;
+};
+
 export type ProviderAuthPollRequest = {
   sessionId: string;
 };
@@ -208,6 +213,24 @@ export type ChatCapabilitiesView = {
   stopReason?: string;
 };
 
+export type ChatCommandOptionView = {
+  name: string;
+  description: string;
+  type: 'string' | 'boolean' | 'number';
+  required?: boolean;
+};
+
+export type ChatCommandView = {
+  name: string;
+  description: string;
+  options?: ChatCommandOptionView[];
+};
+
+export type ChatCommandsView = {
+  commands: ChatCommandView[];
+  total: number;
+};
+
 export type ChatTurnStopRequest = {
   runId: string;
   sessionKey?: string;
@@ -440,6 +463,18 @@ export type ProviderSpecView = {
       en?: string;
       zh?: string;
     };
+    methods?: Array<{
+      id: string;
+      label?: {
+        en?: string;
+        zh?: string;
+      };
+      hint?: {
+        en?: string;
+        zh?: string;
+      };
+    }>;
+    defaultMethodId?: string;
     supportsCliImport?: boolean;
   };
   defaultModels?: string[];
@@ -541,6 +576,7 @@ export type ConfigActionExecuteResult = {
 export type WsEvent =
   | { type: 'config.updated'; payload: { path: string } }
   | { type: 'run.updated'; payload: { run: ChatRunView } }
+  | { type: 'session.updated'; payload: { sessionKey: string } }
   | { type: 'config.reload.started'; payload?: Record<string, unknown> }
   | { type: 'config.reload.finished'; payload?: Record<string, unknown> }
   | { type: 'error'; payload: { message: string; code?: string } }
@@ -550,7 +586,9 @@ export type MarketplaceItemType = 'plugin' | 'skill';
 
 export type MarketplaceSort = 'relevance' | 'updated';
 
-export type MarketplaceInstallKind = 'npm' | 'clawhub' | 'git' | 'builtin';
+export type MarketplacePluginInstallKind = 'npm';
+export type MarketplaceSkillInstallKind = 'builtin' | 'marketplace';
+export type MarketplaceInstallKind = MarketplacePluginInstallKind | MarketplaceSkillInstallKind;
 
 export type MarketplaceInstallSpec = {
   kind: MarketplaceInstallKind;
@@ -586,7 +624,7 @@ export type MarketplaceSkillContentView = {
   slug: string;
   name: string;
   install: MarketplaceInstallSpec;
-  source: 'workspace' | 'builtin' | 'git' | 'remote';
+  source: 'builtin' | 'marketplace' | 'remote';
   raw: string;
   metadataRaw?: string;
   bodyRaw: string;
@@ -652,8 +690,6 @@ export type MarketplaceInstallRequest = {
   kind?: MarketplaceInstallKind;
   skill?: string;
   installPath?: string;
-  version?: string;
-  registry?: string;
   force?: boolean;
 };
 

package/src/components/chat/useChatStreamController.ts

@@ -178,7 +178,7 @@ type ExecuteStreamRunParams = {
     onReady: (event: { runId?: string; stopSupported?: boolean; stopReason?: string; sessionKey: string }) => void;
     onDelta: (event: { delta: string }) => void;
     onSessionEvent: (event: { data: SessionEventView }) => void;
-  }) => Promise<{ sessionKey: string }>;
+  }) => Promise<{ sessionKey: string; reply: string }>;
   setters: StreamSetters;
 };
 
@@ -226,6 +226,7 @@ async function executeStreamRun(params: ExecuteStreamRunParams): Promise<void> {
   let streamText = '';
   try {
     let hasAssistantSessionEvent = false;
+    let hasUserSessionEvent = false;
     const streamTimestamp = new Date().toISOString();
     setters.setStreamingAssistantTimestamp(streamTimestamp);
 
@@ -269,6 +270,7 @@ async function executeStreamRun(params: ExecuteStreamRunParams): Promise<void> {
           return;
         }
         if (event.data.message?.role === 'user') {
+          hasUserSessionEvent = true;
           setters.setOptimisticUserEvent(null);
         }
         upsertStreamingEvent(setters.setStreamingSessionEvents, event.data);
@@ -288,7 +290,13 @@ async function executeStreamRun(params: ExecuteStreamRunParams): Promise<void> {
       setSelectedSessionKey(result.sessionKey);
     }
 
-    const localAssistantText = !hasAssistantSessionEvent ? streamText.trim() : '';
+    const finalReply = typeof result.reply === 'string' ? result.reply.trim() : '';
+    const localAssistantText = !hasAssistantSessionEvent ? (streamText.trim() || finalReply) : '';
+    const isSlashCommandMessage = typeof sourceMessage === 'string' && sourceMessage.trim().startsWith('/');
+    const shouldKeepLocalUserCommand =
+      !hasUserSessionEvent &&
+      optimisticUserEvent?.message?.role === 'user' &&
+      isSlashCommandMessage;
     await refetchIfSessionVisible({
       selectedSessionKeyRef,
       currentSessionKey: sourceSessionKey,
@@ -297,7 +305,14 @@ async function executeStreamRun(params: ExecuteStreamRunParams): Promise<void> {
       refetchHistory
     });
 
-    setters.setStreamingSessionEvents(localAssistantText ? [buildLocalAssistantEvent(localAssistantText)] : []);
+    const localEvents: SessionEventView[] = [];
+    if (shouldKeepLocalUserCommand && optimisticUserEvent) {
+      localEvents.push(optimisticUserEvent);
+    }
+    if (localAssistantText) {
+      localEvents.push(buildLocalAssistantEvent(localAssistantText));
+    }
+    setters.setStreamingSessionEvents(localEvents);
 
     setters.setStreamingAssistantText('');
     setters.setStreamingAssistantTimestamp(null);

package/src/components/config/ProviderForm.tsx

@@ -32,6 +32,15 @@ type ProviderFormProps = {
   onProviderDeleted?: (providerName: string) => void;
 };
 
+type ProviderAuthMethodOption = {
+  id: string;
+};
+
+type PillSelectOption = {
+  value: string;
+  label: string;
+};
+
 const EMPTY_PROVIDER_CONFIG: ProviderConfigView = {
   displayName: '',
   apiKeySet: false,
@@ -151,6 +160,101 @@ function serializeModelsForSave(models: string[], defaultModels: string[]): stri
   return models;
 }
 
+function resolvePreferredAuthMethodId(params: {
+  providerName?: string;
+  methods: ProviderAuthMethodOption[];
+  defaultMethodId?: string;
+  language: 'zh' | 'en';
+}): string {
+  const { providerName, methods, defaultMethodId, language } = params;
+  if (methods.length === 0) {
+    return '';
+  }
+
+  const methodIdMap = new Map<string, string>();
+  for (const method of methods) {
+    const methodId = method.id.trim();
+    if (methodId) {
+      methodIdMap.set(methodId.toLowerCase(), methodId);
+    }
+  }
+
+  const pick = (...candidates: string[]): string | undefined => {
+    for (const candidate of candidates) {
+      const resolved = methodIdMap.get(candidate.toLowerCase());
+      if (resolved) {
+        return resolved;
+      }
+    }
+    return undefined;
+  };
+
+  const normalizedDefault = defaultMethodId?.trim();
+  if (providerName === 'minimax-portal') {
+    if (language === 'zh') {
+      return pick('cn', 'china-mainland') ?? pick(normalizedDefault ?? '') ?? methods[0]?.id ?? '';
+    }
+    if (language === 'en') {
+      return pick('global', 'intl', 'international') ?? pick(normalizedDefault ?? '') ?? methods[0]?.id ?? '';
+    }
+  }
+
+  if (normalizedDefault) {
+    const matchedDefault = pick(normalizedDefault);
+    if (matchedDefault) {
+      return matchedDefault;
+    }
+  }
+
+  if (language === 'zh') {
+    return pick('cn') ?? methods[0]?.id ?? '';
+  }
+  if (language === 'en') {
+    return pick('global') ?? methods[0]?.id ?? '';
+  }
+
+  return methods[0]?.id ?? '';
+}
+
+function shouldUsePillSelector(params: {
+  required: boolean;
+  hasDefault: boolean;
+  optionCount: number;
+}): boolean {
+  return params.required && params.hasDefault && params.optionCount > 1 && params.optionCount <= 3;
+}
+
+function PillSelector(props: {
+  value: string;
+  onChange: (value: string) => void;
+  options: PillSelectOption[];
+}) {
+  const { value, onChange, options } = props;
+
+  return (
+    <div className="flex flex-wrap gap-2">
+      {options.map((option) => {
+        const selected = option.value === value;
+        return (
+          <button
+            key={option.value}
+            type="button"
+            onClick={() => onChange(option.value)}
+            aria-pressed={selected}
+            className={`rounded-full border px-3 py-1.5 text-xs font-medium transition-colors ${
+              selected
+                ? 'border-primary bg-primary text-white shadow-sm'
+                : 'border-gray-200 bg-white text-gray-700 hover:border-primary/40 hover:text-primary'
+            }`}
+          >
+            {option.label}
+          </button>
+        );
+      })}
+    </div>
+  );
+}
+
 export function ProviderForm({ providerName, onProviderDeleted }: ProviderFormProps) {
   const queryClient = useQueryClient();
   const { data: config } = useConfig();
@@ -174,6 +278,7 @@ export function ProviderForm({ providerName, onProviderDeleted }: ProviderFormPr
   const [showModelInput, setShowModelInput] = useState(false);
   const [authSessionId, setAuthSessionId] = useState<string | null>(null);
   const [authStatusMessage, setAuthStatusMessage] = useState('');
+  const [authMethodId, setAuthMethodId] = useState('');
   const authPollTimerRef = useRef<number | null>(null);
 
   const providerSpec = meta?.providers.find((p) => p.name === providerName);
@@ -225,11 +330,63 @@ export function ProviderForm({ providerName, onProviderDeleted }: ProviderFormPr
     apiBaseHint?.help ||
     t('providerApiBaseHelp');
   const providerAuth = providerSpec?.auth;
+  const providerAuthMethods = useMemo(
+    () => providerAuth?.methods ?? [],
+    [providerAuth?.methods]
+  );
+  const providerAuthMethodOptions = useMemo(
+    () =>
+      providerAuthMethods.map((method) => ({
+        value: method.id,
+        label: method.label?.[language] || method.label?.en || method.id
+      })),
+    [providerAuthMethods, language]
+  );
+  const preferredAuthMethodId = useMemo(
+    () => resolvePreferredAuthMethodId({
+      providerName,
+      methods: providerAuthMethods,
+      defaultMethodId: providerAuth?.defaultMethodId,
+      language
+    }),
+    [providerName, providerAuth?.defaultMethodId, providerAuthMethods, language]
+  );
+  const resolvedAuthMethodId = useMemo(() => {
+    if (!providerAuthMethods.length) {
+      return '';
+    }
+    const normalizedCurrent = authMethodId.trim();
+    if (normalizedCurrent && providerAuthMethods.some((method) => method.id === normalizedCurrent)) {
+      return normalizedCurrent;
+    }
+    return preferredAuthMethodId || providerAuthMethods[0]?.id || '';
+  }, [authMethodId, preferredAuthMethodId, providerAuthMethods]);
+  const selectedAuthMethod = useMemo(
+    () => providerAuthMethods.find((method) => method.id === resolvedAuthMethodId),
+    [providerAuthMethods, resolvedAuthMethodId]
+  );
+  const selectedAuthMethodHint =
+    selectedAuthMethod?.hint?.[language] || selectedAuthMethod?.hint?.en || '';
+  const shouldUseAuthMethodPills = shouldUsePillSelector({
+    required: providerAuth?.kind === 'device_code',
+    hasDefault: Boolean(providerAuth?.defaultMethodId?.trim()),
+    optionCount: providerAuthMethods.length
+  });
   const providerAuthNote =
     providerAuth?.note?.[language] ||
     providerAuth?.note?.en ||
     providerAuth?.displayName ||
     '';
+  const wireApiOptions = providerSpec?.wireApiOptions || ['auto', 'chat', 'responses'];
+  const wireApiSelectOptions: PillSelectOption[] = wireApiOptions.map((option) => ({
+    value: option,
+    label: option === 'chat' ? t('wireApiChat') : option === 'responses' ? t('wireApiResponses') : t('wireApiAuto')
+  }));
+  const shouldUseWireApiPills = shouldUsePillSelector({
+    required: Boolean(providerSpec?.supportsWireApi),
+    hasDefault: typeof providerSpec?.defaultWireApi === 'string' && providerSpec.defaultWireApi.length > 0,
+    optionCount: wireApiSelectOptions.length
+  });
 
   const clearAuthPollTimer = useCallback(() => {
     if (authPollTimerRef.current !== null) {
@@ -290,6 +447,7 @@ export function ProviderForm({ providerName, onProviderDeleted }: ProviderFormPr
       setProviderDisplayName('');
       setAuthSessionId(null);
       setAuthStatusMessage('');
+      setAuthMethodId('');
       clearAuthPollTimer();
       return;
     }
@@ -303,8 +461,18 @@ export function ProviderForm({ providerName, onProviderDeleted }: ProviderFormPr
     setProviderDisplayName(effectiveDisplayName);
     setAuthSessionId(null);
     setAuthStatusMessage('');
+    setAuthMethodId(preferredAuthMethodId);
     clearAuthPollTimer();
-  }, [providerName, currentApiBase, resolvedProviderConfig.extraHeaders, currentWireApi, currentEditableModels, effectiveDisplayName, clearAuthPollTimer]);
+  }, [
+    providerName,
+    currentApiBase,
+    resolvedProviderConfig.extraHeaders,
+    currentWireApi,
+    currentEditableModels,
+    effectiveDisplayName,
+    preferredAuthMethodId,
+    clearAuthPollTimer
+  ]);
 
   useEffect(() => () => clearAuthPollTimer(), [clearAuthPollTimer]);
 
@@ -453,7 +621,10 @@ export function ProviderForm({ providerName, onProviderDeleted }: ProviderFormPr
 
     try {
       setAuthStatusMessage('');
-      const result = await startProviderAuth.mutateAsync({ provider: providerName });
+      const result = await startProviderAuth.mutateAsync({
+        provider: providerName,
+        data: resolvedAuthMethodId ? { methodId: resolvedAuthMethodId } : {}
+      });
       if (!result.sessionId || !result.verificationUri) {
         throw new Error(t('providerAuthStartFailed'));
       }
@@ -567,6 +738,34 @@ export function ProviderForm({ providerName, onProviderDeleted }: ProviderFormPr
               {providerAuthNote ? (
                 <p className="text-xs text-gray-600">{providerAuthNote}</p>
               ) : null}
+              {providerAuthMethods.length > 1 ? (
+                <div className="space-y-2">
+                  <Label className="text-xs font-medium text-gray-700">{t('providerAuthMethodLabel')}</Label>
+                  {shouldUseAuthMethodPills ? (
+                    <PillSelector
+                      value={resolvedAuthMethodId}
+                      onChange={setAuthMethodId}
+                      options={providerAuthMethodOptions}
+                    />
+                  ) : (
+                    <Select value={resolvedAuthMethodId} onValueChange={setAuthMethodId}>
+                      <SelectTrigger className="h-8 rounded-lg bg-white">
+                        <SelectValue placeholder={t('providerAuthMethodPlaceholder')} />
+                      </SelectTrigger>
+                      <SelectContent>
+                        {providerAuthMethodOptions.map((method) => (
+                          <SelectItem key={method.value} value={method.value}>
+                            {method.label}
+                          </SelectItem>
+                        ))}
+                      </SelectContent>
+                    </Select>
+                  )}
+                  {selectedAuthMethodHint ? (
+                    <p className="text-xs text-gray-500">{selectedAuthMethodHint}</p>
+                  ) : null}
+                </div>
+              ) : null}
               <div className="flex flex-wrap items-center gap-2">
                 <Button
                   type="button"
@@ -718,18 +917,26 @@ export function ProviderForm({ providerName, onProviderDeleted }: ProviderFormPr
                     <Label htmlFor="wireApi" className="text-sm font-medium text-gray-900">
                       {wireApiHint?.label ?? t('wireApi')}
                     </Label>
-                    <Select value={wireApi} onValueChange={(v) => setWireApi(v as WireApiType)}>
-                      <SelectTrigger className="rounded-xl">
-                        <SelectValue />
-                      </SelectTrigger>
-                      <SelectContent>
-                        {(providerSpec.wireApiOptions || ['auto', 'chat', 'responses']).map((option) => (
-                          <SelectItem key={option} value={option}>
-                            {option === 'chat' ? t('wireApiChat') : option === 'responses' ? t('wireApiResponses') : t('wireApiAuto')}
-                          </SelectItem>
-                        ))}
-                      </SelectContent>
-                    </Select>
+                    {shouldUseWireApiPills ? (
+                      <PillSelector
+                        value={wireApi}
+                        onChange={(v) => setWireApi(v as WireApiType)}
+                        options={wireApiSelectOptions}
+                      />
+                    ) : (
+                      <Select value={wireApi} onValueChange={(v) => setWireApi(v as WireApiType)}>
+                        <SelectTrigger className="rounded-xl">
+                          <SelectValue />
+                        </SelectTrigger>
+                        <SelectContent>
+                          {wireApiSelectOptions.map((option) => (
+                            <SelectItem key={option.value} value={option.value}>
+                              {option.label}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      </Select>
+                    )}
                   </div>
                 )}
 

package/src/components/marketplace/MarketplacePage.tsx

@@ -824,7 +824,7 @@ export function MarketplacePage(props: MarketplacePageProps = {}) {
   };
 
   return (
-    <PageLayout>
+    <PageLayout className="flex h-full min-h-0 flex-col pb-0">
       <PageHeader title={t(copyKeys.pageTitle)} description={t(copyKeys.pageDescription)} />
 
       <Tabs
@@ -849,7 +849,7 @@ export function MarketplacePage(props: MarketplacePageProps = {}) {
         }}
       />
 
-      <section>
+      <section className="flex min-h-0 flex-1 flex-col">
         <div className="flex items-center justify-between mb-3">
           <h3 className="text-[14px] font-semibold text-gray-900">
             {scope === 'installed' ? t(copyKeys.sectionInstalled) : t(copyKeys.sectionCatalog)}
@@ -868,52 +868,56 @@ export function MarketplacePage(props: MarketplacePageProps = {}) {
           </div>
         )}
 
-        <div className="grid grid-cols-1 lg:grid-cols-2 2xl:grid-cols-3 gap-3">
-          {scope === 'all' && allItems.map((item) => (
-            <MarketplaceListCard
-              key={item.id}
-              item={item}
-              record={findInstalledRecordForItem(item, installedRecordLookup)}
-              localeFallbacks={localeFallbacks}
-              installState={installState}
-              manageState={manageState}
-              onOpen={() => void openItemDetail(item, findInstalledRecordForItem(item, installedRecordLookup))}
-              onInstall={handleInstall}
-              onManage={handleManage}
-            />
-          ))}
-
-          {scope === 'installed' && installedEntries.map((entry) => (
-            <MarketplaceListCard
-              key={entry.key}
-              item={entry.item}
-              record={entry.record}
-              localeFallbacks={localeFallbacks}
-              installState={installState}
-              manageState={manageState}
-              onOpen={() => void openItemDetail(entry.item, entry.record)}
-              onInstall={handleInstall}
-              onManage={handleManage}
-            />
-          ))}
-        </div>
+        <div className="min-h-0 flex-1 overflow-y-auto custom-scrollbar pr-1">
+          <div className="grid grid-cols-1 lg:grid-cols-2 2xl:grid-cols-3 gap-3">
+            {scope === 'all' && allItems.map((item) => (
+              <MarketplaceListCard
+                key={item.id}
+                item={item}
+                record={findInstalledRecordForItem(item, installedRecordLookup)}
+                localeFallbacks={localeFallbacks}
+                installState={installState}
+                manageState={manageState}
+                onOpen={() => void openItemDetail(item, findInstalledRecordForItem(item, installedRecordLookup))}
+                onInstall={handleInstall}
+                onManage={handleManage}
+              />
+            ))}
+
+            {scope === 'installed' && installedEntries.map((entry) => (
+              <MarketplaceListCard
+                key={entry.key}
+                item={entry.item}
+                record={entry.record}
+                localeFallbacks={localeFallbacks}
+                installState={installState}
+                manageState={manageState}
+                onOpen={() => void openItemDetail(entry.item, entry.record)}
+                onInstall={handleInstall}
+                onManage={handleManage}
+              />
+            ))}
+          </div>
 
-        {scope === 'all' && !itemsQuery.isLoading && !itemsQuery.isError && allItems.length === 0 && (
-          <div className="text-[13px] text-gray-500 py-8 text-center">{t(copyKeys.emptyData)}</div>
-        )}
-        {scope === 'installed' && !installedQuery.isLoading && !installedQuery.isError && installedEntries.length === 0 && (
-          <div className="text-[13px] text-gray-500 py-8 text-center">{t(copyKeys.emptyInstalled)}</div>
-        )}
+          {scope === 'all' && !itemsQuery.isLoading && !itemsQuery.isError && allItems.length === 0 && (
+            <div className="text-[13px] text-gray-500 py-8 text-center">{t(copyKeys.emptyData)}</div>
+          )}
+          {scope === 'installed' && !installedQuery.isLoading && !installedQuery.isError && installedEntries.length === 0 && (
+            <div className="text-[13px] text-gray-500 py-8 text-center">{t(copyKeys.emptyInstalled)}</div>
+          )}
+        </div>
       </section>
 
       {scope === 'all' && (
-        <PaginationBar
-          page={page}
-          totalPages={totalPages}
-          busy={itemsQuery.isFetching}
-          onPrev={() => setPage((current) => Math.max(1, current - 1))}
-          onNext={() => setPage((current) => (totalPages > 0 ? Math.min(totalPages, current + 1) : current + 1))}
-        />
+        <div className="shrink-0">
+          <PaginationBar
+            page={page}
+            totalPages={totalPages}
+            busy={itemsQuery.isFetching}
+            onPrev={() => setPage((current) => Math.max(1, current - 1))}
+            onNext={() => setPage((current) => (totalPages > 0 ? Math.min(totalPages, current + 1) : current + 1))}
+          />
+        </div>
       )}
       <ConfirmDialog />
     </PageLayout>

package/src/hooks/useConfig.ts

@@ -139,7 +139,8 @@ export function useTestProviderConnection() {
 
 export function useStartProviderAuth() {
   return useMutation({
-    mutationFn: ({ provider }: { provider: string }) => startProviderAuth(provider)
+    mutationFn: ({ provider, data }: { provider: string; data?: unknown }) =>
+      startProviderAuth(provider, data as Parameters<typeof startProviderAuth>[1])
   });
 }