dsh-codinput 0.3.1 → 0.3.5

package/src/client/components/VoiceActivity.tsx

@@ -17,51 +17,21 @@
  * locale 缺席）一律不渲染，绝不半组装。
  */
 
-import { createElement, useCallback, useMemo, useSyncExternalStore, Component } from 'react';
+import { createElement, useMemo, useSyncExternalStore } from 'react';
 import type { HostObservable, SlotEntryLike } from '../host-types';
-import { stash } from '../services';
-import { bindForeign } from '../i18n';
 import { diagError } from '../diag';
+import { EntryBoundary, firstComponentEntry, translatorFor, useSlotEntries } from './slotEntry';
 
 const ACTIVITY_SLOT = 'conversation.input.activity';
 const VOICE_NS_FALLBACK = 'voice-input';
 
-type Translator = (key: string, params?: Record<string, string | number>) => string;
 type ReadinessSelector = (value: unknown) => unknown;
 type ReadinessHook = (selector: ReadinessSelector) => unknown;
 
-const EMPTY_ENTRIES: readonly unknown[] = [];
-
 /** observableHook 同款缓存轴：钩子身份按 readiness store 稳定，不逐渲染重订。 */
 const readinessHookCache = new WeakMap<object, ReadinessHook>();
 /** 官方 renderer 的 inject 缓存轴：条目 × 会话绑定。 */
 const injectCache = new WeakMap<object, Map<string, Record<string, unknown> | null>>();
-const translatorCache = new Map<string, Translator | null>();
-
-/** 槽位条目快照：entries 引用在变更之间稳定（官方契约），直接作 uSES 源。 */
-function useSlotEntries(key: string): readonly unknown[] {
-  const slots = stash.slots;
-  const subscribe = useCallback(
-    (fn: () => void) => {
-      if (typeof slots?.subscribe !== 'function') return () => {};
-      try {
-        return slots.subscribe(key, fn) ?? (() => {});
-      } catch {
-        return () => {};
-      }
-    },
-    [slots, key],
-  );
-  const getSnapshot = useCallback(() => {
-    if (typeof slots?.entries !== 'function') return EMPTY_ENTRIES;
-    try {
-      return slots.entries(key) ?? EMPTY_ENTRIES;
-    } catch {
-      return EMPTY_ENTRIES;
-    }
-  }, [slots, key]);
-  return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
-}
 
 /** 调条目 inject 工厂取 props 面（session 槽位以 sessionId 调用，官方同参）。 */
 function resolveInjected(entry: SlotEntryLike, sessionId: string): Record<string, unknown> | null {
@@ -84,13 +54,6 @@ function resolveInjected(entry: SlotEntryLike, sessionId: string): Record<string
   return perSession.get(sessionId) ?? null;
 }
 
-/** 官方 renderer 的 locale 座位：locale.bind(entry.locale)，按 ns 缓存。 */
-function translatorFor(entry: SlotEntryLike): Translator | null {
-  const ns = entry.locale ?? VOICE_NS_FALLBACK;
-  if (!translatorCache.has(ns)) translatorCache.set(ns, bindForeign(ns));
-  return translatorCache.get(ns) ?? null;
-}
-
 /** hooks.speechReadiness（快照 store）→ use<Name> 选择器钩子（observableHook 同款）。 */
 function readinessHookFor(source: unknown): ReadinessHook | null {
   const face = source as HostObservable<unknown> | undefined;
@@ -108,20 +71,6 @@ function readinessHookFor(source: unknown): ReadinessHook | null {
   return hook;
 }
 
-/** 条目崩溃只丢语音钮，不连坐 Codinput 的 bar 条目（bar 被废黜 = 全部输入消失）。 */
-class VoiceBoundary extends Component<{ children?: React.ReactNode }, { failed: boolean }> {
-  state = { failed: false };
-  static getDerivedStateFromError(): { failed: boolean } {
-    return { failed: true };
-  }
-  componentDidCatch(error: unknown): void {
-    diagError('voice.entry', error);
-  }
-  render(): React.ReactNode {
-    return this.state.failed ? null : this.props.children;
-  }
-}
-
 export interface VoiceActivityProps {
   sessionId: string | undefined;
   /** 官方输入机动作面（bar 槽位 standard props 里的 inputActions 原样透传）。 */
@@ -137,19 +86,13 @@ export function VoiceActivity(props: VoiceActivityProps): JSX.Element | null {
   const entries = useSlotEntries(ACTIVITY_SLOT);
 
   // single 槽位赢家 = 优先级最低者 = entries 首个（register 即按优先级排序）。
-  const entry = useMemo((): SlotEntryLike | null => {
-    for (const candidate of entries) {
-      const record = candidate as SlotEntryLike | null | undefined;
-      if (record && typeof record === 'object' && typeof record.component === 'function') return record;
-    }
-    return null;
-  }, [entries]);
+  const entry = useMemo(() => firstComponentEntry(entries), [entries]);
 
   const injected = useMemo(
     () => (entry && sessionId ? resolveInjected(entry, sessionId) : null),
     [entry, sessionId],
   );
-  const translator = useMemo(() => (entry ? translatorFor(entry) : null), [entry]);
+  const translator = useMemo(() => (entry ? translatorFor(entry, VOICE_NS_FALLBACK) : null), [entry]);
   const readinessSource = (injected?.['hooks'] as { speechReadiness?: unknown } | undefined)?.speechReadiness;
   const useReadiness = useMemo(() => readinessHookFor(readinessSource), [readinessSource]);
 
@@ -158,7 +101,7 @@ export function VoiceActivity(props: VoiceActivityProps): JSX.Element | null {
   // hooks 子表已折成 use* 钩子（bindInjectSources 同款），其余 props 原样下传。
   const { hooks: _hooks, ...actions } = injected;
   void _hooks;
-  return createElement(VoiceBoundary, {
+  return createElement(EntryBoundary, {
     children: createElement(entry.component as React.ComponentType<Record<string, unknown>>, {
       sessionId,
       inputActions,

package/src/client/components/slotEntry.tsx

@@ -0,0 +1,205 @@
+/**
+ * 槽位条目渲染的共享件：检视任意槽位的条目快照（检测即兼容）、按条目 locale
+ * 绑定官方词典、快照 store 的选择器钩子合成、条目崩溃兜底边界，以及宿主 kit
+ * 减去 owner props 的 standard 面（座位镜像 InputSlotSeat 与语音/模型标签
+ * 共用同一套合成公式，抽到这里避免多份漂移）。
+ */
+
+import { useCallback, useSyncExternalStore, Component } from 'react';
+import type { HostObservable, SlotEntryLike } from '../host-types';
+import { bindForeign } from '../i18n';
+import { diagError } from '../diag';
+import { stash } from '../services';
+
+export type Translator = (key: string, params?: Record<string, string | number>) => string;
+
+const EMPTY_ENTRIES: readonly unknown[] = [];
+
+/** 槽位条目快照：entries 引用在变更之间稳定（官方契约），直接作 uSES 源。 */
+export function useSlotEntries(key: string): readonly unknown[] {
+  // 服务缺席时退化为恒空快照；slots 就绪后 deps 变化自动重订。
+  const slots = stash.slots;
+  const subscribe = useCallback(
+    (fn: () => void) => {
+      if (typeof slots?.subscribe !== 'function') return () => {};
+      try {
+        return slots.subscribe(key, fn) ?? (() => {});
+      } catch {
+        return () => {};
+      }
+    },
+    [slots, key],
+  );
+  const getSnapshot = useCallback(() => {
+    if (typeof slots?.entries !== 'function') return EMPTY_ENTRIES;
+    try {
+      return slots.entries(key) ?? EMPTY_ENTRIES;
+    } catch {
+      // 槽位键未声明（如 web 0.1.x 没有 model.label 子槽位）按无条目处理。
+      return EMPTY_ENTRIES;
+    }
+  }, [slots, key]);
+  return useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+}
+
+/** single 槽位赢家 = entries 首个带组件的条目（register 即按优先级排序）。 */
+export function firstComponentEntry(entries: readonly unknown[]): SlotEntryLike | null {
+  for (const candidate of entries) {
+    const record = candidate as SlotEntryLike | null | undefined;
+    if (record && typeof record === 'object' && typeof record.component === 'function') return record;
+  }
+  return null;
+}
+
+/**
+ * 列表槽位行合成：复刻官方 renderer 的 list 分支——
+ * entries 已由 SlotCore 按（priority↑, order↑）排序，同 id 首个占位（去重），
+ * 剩余行再按 order 升序稳定排序（官方 `[...rows].sort(a.order - b.order)`）。
+ * 无组件的条目跳过（官方 deadCell 是废黜兜底，插件侧无法复现其内部状态）。
+ */
+export function listRows(entries: readonly unknown[]): SlotEntryLike[] {
+  const byId = new Map<unknown, SlotEntryLike>();
+  for (const candidate of entries) {
+    const record = candidate as (SlotEntryLike & { options?: { id?: unknown } }) | null | undefined;
+    if (!record || typeof record !== 'object' || typeof record.component !== 'function') continue;
+    const id = (record as { options?: { id?: unknown } }).options?.id;
+    if (byId.has(id)) continue;
+    byId.set(id, record);
+  }
+  const rows = [...byId.values()];
+  rows.sort((a, b) => orderOf(a) - orderOf(b));
+  return rows;
+}
+
+function orderOf(entry: SlotEntryLike): number {
+  const options = (entry as { options?: { order?: number } }).options;
+  return options?.order ?? 0;
+}
+
+/** 条目 options.id（React key 用；官方 renderer 同轴）。 */
+export function entryId(entry: SlotEntryLike, index: number): string {
+  const options = (entry as { options?: { id?: string } }).options;
+  return options?.id ?? `#${index}`;
+}
+
+export type SnapshotSelectorHook = <S>(sel: (s: any) => S, eq?: (a: S, b: S) => boolean) => S;
+
+/** 快照 store → use<Name> 选择器钩子（官方 observableHook 同款，按源缓存）。 */
+const snapshotHookCache = new WeakMap<object, SnapshotSelectorHook>();
+export function snapshotHookFor(source: unknown): SnapshotSelectorHook | null {
+  const face = source as HostObservable<unknown> | undefined;
+  if (!face || typeof face.subscribe !== 'function' || typeof face.getSnapshot !== 'function') return null;
+  let hook = snapshotHookCache.get(face);
+  if (!hook) {
+    hook = <S,>(sel: (s: unknown) => S): S =>
+      useSyncExternalStore(
+        (fn: () => void) => face.subscribe(fn) ?? (() => {}),
+        () => sel(face.getSnapshot()),
+        () => sel(face.getSnapshot()),
+      );
+    snapshotHookCache.set(face, hook);
+  }
+  return hook;
+}
+
+/** 官方 standardHookPropName：name → use<Name>（首字母大写）。 */
+export function standardHookPropName(name: string): string {
+  if (!name) return name;
+  return `use${name.charAt(0).toUpperCase()}${name.slice(1)}`;
+}
+
+/**
+ * 条目自带 inject 的 props 面（官方 runInject + bindInjectSources 的插件侧
+ * 复刻）：以 sessionId 调 inject，把 hooks 子表折成 use<Name> 钩子、其余
+ * 原样下传；keyedHooks 需要官方 keyed resolver 面，插件侧不可复现 → 跳过
+ * （现网条目无键控钩子）。结果按（条目 × 会话）缓存——官方同款缓存轴。
+ */
+const entryInjectCache = new WeakMap<object, Map<string, Record<string, unknown> | null>>();
+export function entryInjectProps(entry: SlotEntryLike, sessionId: string): Record<string, unknown> | null {
+  if (typeof entry.inject !== 'function') return null;
+  let perSession = entryInjectCache.get(entry);
+  if (!perSession) {
+    perSession = new Map();
+    entryInjectCache.set(entry, perSession);
+  }
+  if (!perSession.has(sessionId)) {
+    let bound: Record<string, unknown> | null = null;
+    try {
+      const face = entry.inject(sessionId);
+      if (face && typeof face === 'object') {
+        const { hooks: _hooks, keyedHooks: _keyed, ...rest } = face as Record<string, unknown> & {
+          hooks?: Record<string, unknown>;
+          keyedHooks?: Record<string, unknown>;
+        };
+        void _keyed;
+        for (const [name, source] of Object.entries(_hooks ?? {})) {
+          const hook = snapshotHookFor(source);
+          if (hook) rest[standardHookPropName(name)] = hook;
+        }
+        bound = rest;
+      }
+    } catch (error) {
+      diagError('slot.inject', error);
+      bound = null;
+    }
+    perSession.set(sessionId, bound);
+  }
+  return perSession.get(sessionId) ?? null;
+}
+
+/** 官方 renderer 的 locale 座位：locale.bind(entry.locale)，按 ns 缓存。 */
+export function translatorFor(entry: SlotEntryLike, fallbackNs?: string): Translator | null {
+  const ns = entry.locale ?? fallbackNs;
+  if (!ns) return null;
+  return bindForeign(ns);
+}
+
+/** 条目崩溃只丢本座位，不连坐 Codinput 的 bar 条目（被废黜 = 输入面消失）。 */
+export class EntryBoundary extends Component<
+  { children?: React.ReactNode; fallback?: React.ReactNode },
+  { failed: boolean }
+> {
+  state = { failed: false };
+  static getDerivedStateFromError(): { failed: boolean } {
+    return { failed: true };
+  }
+  componentDidCatch(error: unknown): void {
+    diagError('slot.entry', error);
+  }
+  render(): React.ReactNode {
+    return this.state.failed ? this.props.fallback ?? null : this.props.children;
+  }
+}
+
+/**
+ * 宿主 kit 减去 owner props 的原样面：供槽位条目按官方契约消费
+ * （sessionId + 选择器 hook + inputActions 等）。bar 条目的 kit 里 owner
+ * 专属字段（variant/blocked/disabled/placeholder/…）不该下发给子槽位条目；
+ * 侧栏 body 再额外剔除注入的 useTabInfo。
+ */
+export function kitFromBarProps(
+  props: Record<string, unknown>,
+  extraOmit: readonly string[] = [],
+): Record<string, unknown> {
+  const {
+    variant: _variant,
+    blocked: _blocked,
+    disabled: _disabled,
+    placeholder: _placeholder,
+    workspacePickerOpen: _workspacePickerOpen,
+    onRequestWorkspace: _onRequestWorkspace,
+    accessory: _accessory,
+    hero: _hero,
+    ...kit
+  } = props;
+  void _variant;
+  void _blocked;
+  void _disabled;
+  void _placeholder;
+  void _workspacePickerOpen;
+  void _onRequestWorkspace;
+  void _accessory;
+  void _hero;
+  for (const key of extraOmit) delete kit[key];
+  return kit;
+}

package/src/client/host-types.ts

@@ -345,6 +345,8 @@ export interface SidebarTabInfo {
   readonly tab: {
     readonly visible: boolean;
     readonly id?: string;
+    /** 打开时捕获的标签名（dockkit tab 记录；chip 标题组件显示它）。 */
+    readonly title?: string;
     /** tab 域动作面（occurrence held）：close() 关闭本标签。 */
     readonly actions?: { readonly close?: () => void };
   };

package/src/client/icons.tsx

@@ -7,7 +7,7 @@ interface IconProps {
   className?: string;
 }
 
-function svg(paths: JSX.Element, size: number | undefined, className: string | undefined): JSX.Element {
+function svg(paths: JSX.Element, size: number | undefined, className: string | undefined, stroke = 'currentColor'): JSX.Element {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
@@ -15,7 +15,7 @@ function svg(paths: JSX.Element, size: number | undefined, className: string | u
       height={size ?? 16}
       viewBox="0 0 24 24"
       fill="none"
-      stroke="currentColor"
+      stroke={stroke}
       strokeWidth={2}
       strokeLinecap="round"
       strokeLinejoin="round"
@@ -47,6 +47,15 @@ export function IconBrand({ size, className }: IconProps): JSX.Element {
   return svg(BRAND_MARK, size, className);
 }
 
+/**
+ * 品牌彩色标：同一机型标固定鲸鱼蓝（assets/icon.svg 同源 #3964FE），不随
+ * currentColor——侧栏标签 chip 与指南页条目用（官方在该两处画的是彩色
+ * artwork 同位：FileTypeIcon 文件夹黄、GuideArtworkFiles 彩绘）。
+ */
+export function IconBrandLogo({ size, className }: IconProps): JSX.Element {
+  return svg(BRAND_MARK, size, className, '#3964FE');
+}
+
 export function IconEdit({ size, className }: IconProps): JSX.Element {
   return svg(
     <>

package/src/client/index.tsx

@@ -17,7 +17,7 @@ import { diagError, diagWindow, runGuarded } from './diag';
 import { loadPrefs, subscribePrefs } from './prefs';
 import { isAnySidebarInputCarried, subscribeSidebarInput } from './sideinput';
 import { barRegistration, CodinputBar } from './components/CodinputBar';
-import { sidebarBodyRegistration, sidebarTabDefinition } from './sidebar';
+import { sidebarBodyRegistration, sidebarTabDefinition, sidebarTitleRegistration } from './sidebar';
 import { settingsRegistration } from './settings';
 import { registerCodinputCommand } from './command';
 
@@ -135,6 +135,11 @@ export function apply(ctx: ClientContext): void {
       tryRegister(() => {
         ctx.slots.register(body.options, body.component);
       }, 'sidebar.body');
+      // chip 标题（品牌标 + 标签名）：官方 FilesTitle 同构的 keyed 注册。
+      const title = sidebarTitleRegistration();
+      tryRegister(() => {
+        ctx.slots.register(title.options, title.component);
+      }, 'sidebar.title');
     });
   });
 

package/src/client/modeldir.ts

@@ -19,6 +19,8 @@ export interface DirectorySnapshot {
   failures: readonly { id: string; name: string; message: string }[];
   status: 'idle' | 'loading' | 'ready' | 'selecting' | 'error';
   error: string | null;
+  /** 官方 syncInputs 附带：当前强度折算成的显示名（0.2.x 座位触发器在模型无 reasoning 元数据时显示它）。 */
+  retainedEffort?: string;
 }
 
 export interface SessionDirectory {

package/src/client/sidebar.tsx

@@ -1,8 +1,11 @@
 /**
  * 侧边模式：官方 Sidebar（dockkit）标签页承载，入口与标签芯片同名
- * 「Codinput」。两段式注册——sidebarRightTabs.register（类型定义）+
- * sidebar.right.pane.tab（keyed，key = 定义 id）。停靠、分栏、全屏、
- * 浮动由官方 dockkit 承担；侧栏与主输入读写同一台输入机，草稿天然同源。
+ * 「Codinput」。三段式注册——sidebarRightTabs.register（类型定义，guide
+ * 条目带品牌标）+ sidebar.right.pane.tab（keyed，key = 定义 id，body）+
+ * sidebar.right.pane.tab.title（keyed 同 key，chip 标题：品牌标 + tab.title，
+ * 官方 FilesTitle 同构——不注册时 chip 退化为打开时捕获的纯文本）。
+ * 停靠、分栏、全屏、浮动由官方 dockkit 承担；侧栏与主输入读写同一台
+ * 输入机，草稿天然同源。
  *
  * 唯一输入组件约定：body **挂载**期间经 sideinput 总线声明承载本会话
  * 输入（形态 = side），主输入遮蔽条目随之隐藏——收起侧栏不让位（可见性
@@ -18,6 +21,8 @@ import { claimSidebarInput, subscribeSidebarTabClose, useSidebarCarryOwner, type
 import { loadPrefs, savePrefs, subscribePrefs } from './prefs';
 import { diagError, diagWindow } from './diag';
 import { CodinputSurface } from './components/CodinputSurface';
+import { kitFromBarProps } from './components/slotEntry';
+import { IconBrandLogo } from './icons';
 import { t, useT } from './i18n';
 
 export const SIDEBAR_TAB_ID = 'dsh-codinput';
@@ -39,6 +44,9 @@ export function sidebarTabDefinition(): Record<string, unknown> {
         order: 0,
         title: () => 'Codinput',
         description: () => t('side.guideDesc'),
+        // 指南页条目图标：官方 EntryBox 渲染 <Icon size={22|26}/>，缺席
+        // 退灰色立方体（placeholderInk）——给品牌彩色标。
+        icon: IconBrandLogo,
       },
     ],
   };
@@ -56,6 +64,32 @@ export function sidebarBodyRegistration(): { options: SlotRegisterOptions; compo
   };
 }
 
+/**
+ * 第三段：标签 chip 标题（keyed 同 key）。官方同位组件（FilesTitle/
+ * GuideTitle）= 彩色图标 + useTabInfo().tab.title；title 座位声明了
+ * tabInfo 注入 hook，宿主按 use<Name> 约定下发。缺席时退回静态名。
+ */
+export function sidebarTitleRegistration(): { options: SlotRegisterOptions; component: unknown } {
+  return {
+    options: {
+      name: 'sidebar.right.pane.tab.title',
+      key: SIDEBAR_TAB_ID,
+      registrant: 'dsh-codinput',
+    },
+    component: SidebarCodinputTitle,
+  };
+}
+
+export function SidebarCodinputTitle(props: { useTabInfo?: () => SidebarTabInfo }): JSX.Element {
+  const title = props.useTabInfo?.().tab.title ?? 'Codinput';
+  return (
+    <>
+      <IconBrandLogo size={16} />
+      {title}
+    </>
+  );
+}
+
 /**
  * session 槽位标准 props 直达官方输入机。useTabInfo 是槽位声明的注入
  * hook（宿主按 use<Name> 约定随 props 下发，缺席说明宿主形状漂移——
@@ -65,6 +99,9 @@ export function sidebarBodyRegistration(): { options: SlotRegisterOptions; compo
 export function SidebarCodinputBody(props: SessionStandard & { useTabInfo?: () => SidebarTabInfo }): JSX.Element {
   const { sessionId, useInput, inputActions, useProjection, useSession, useTabInfo } = props;
   const state = useInput((s) => s);
+  // conversation.input.left/.right 第三方条目的 standard props 原样面（本条目
+  // kit 减去注入的 useTabInfo；见 components/InputSlotSeat）。
+  const inputStandard = kitFromBarProps(props as unknown as Record<string, unknown>, ['useTabInfo']);
   // 会话运行中：侧栏形态的主按钮同样变停止（官方同款）。
   const running = useSession ? useSession((s: unknown) => (s as { running?: boolean } | undefined)?.running) === true : false;
   useT();
@@ -165,6 +202,7 @@ export function SidebarCodinputBody(props: SessionStandard & { useTabInfo?: () =
         state={state}
         actions={inputActions}
         useProjection={useProjection}
+        inputStandard={inputStandard}
         running={running}
         side={true}
       />

package/src/client/styles.ts

@@ -3,6 +3,9 @@
  * 工具行/菜单/发送按钮的属性值逐条复刻官方 InputBar.module.css 与
  * PermissionSelect/ModelSelection 的触发器与菜单（含 --dsw-* 主题变量，
  * 随宿主主题自动切换）；编辑器/设置等自有部分用 currentColor 适配。
+ * 主题/皮肤插件兼容约定：官方走 --dsw-* token 的取值这里也走 token（皮肤
+ * 改 token 即全盘跟随）；官方写死的（发送钮前景 #fff、小圈 tools 紫）同样
+ * 写死保持逐值对齐——多跟一分就会在换肤下与官方脱队。
  */
 
 const STYLE_ID = 'dsh-codinput-styles';
@@ -77,7 +80,8 @@ const CSS = `
 .dci-preview blockquote { margin: 0.5em 0; padding: 0.1em 0.9em; border-left: 3px solid color-mix(in srgb, currentColor 22%, transparent); opacity: 0.85; }
 .dci-preview table { border-collapse: collapse; margin: 0.6em 0; }
 .dci-preview th, .dci-preview td { border: 1px solid color-mix(in srgb, currentColor 18%, transparent); padding: 4px 9px; }
-.dci-preview a { color: #4c8dff; } .dci-preview img { max-width: 100%; } .dci-preview hr { border: none;
+/* 预览链接走官方 markdown 同款 alias-link token（官方 _markdown_ a 逐值核对）。 */
+.dci-preview a { color: var(--dsw-alias-link, #4c8dff); } .dci-preview img { max-width: 100%; } .dci-preview hr { border: none;
   border-top: 1px solid color-mix(in srgb, currentColor 14%, transparent); }
 
 /* ===== 工具行（官方 InputBar .row / .tools / .trailing）===== */
@@ -102,10 +106,13 @@ const CSS = `
 .dci-add:hover:not(:disabled) { background: var(--dsw-alias-interactive-bg-hover-solid, color-mix(in srgb, currentColor 14%, transparent)); }
 .dci-add:disabled { opacity: 0.5; cursor: default; }
 
-/* 下拉触发（官方 PermissionSelect / ModelSelection .trigger）*/
+/* 下拉触发（官方 PermissionSelect / ModelSelect .trigger）。radius 官方走
+ * --dsw-radius-sm，无 token 的旧宿主（0.1.5-rc.3）回退原 24px 视觉；
+ * 模型触发器官方 font-weight 400（权限 500），经 [data-model] 区分。*/
 .dci-trigger { min-width: 0; max-width: 220px; height: 28px; color: var(--dsw-alias-label-secondary, currentColor); cursor: pointer;
-  background: transparent; border: none; border-radius: 24px; outline: none; align-items: center; gap: 4px;
+  background: transparent; border: none; border-radius: var(--dsw-radius-sm, 24px); outline: none; align-items: center; gap: 4px;
   padding: 0 4px 0 8px; font-size: 13px; font-weight: 500; line-height: 20px; display: inline-flex; }
+.dci-trigger[data-model] { font-weight: 400; }
 .dci-trigger:hover:not(:disabled) { background: var(--dsw-alias-interactive-bg-hover, color-mix(in srgb, currentColor 8%, transparent)); }
 .dci-trigger:focus-visible { box-shadow: 0 0 0 2px var(--dsw-alias-border-l3, transparent); }
 .dci-trigger:disabled { color: var(--dsw-alias-label-dimmed, currentColor); cursor: default; opacity: 0.5; }
@@ -123,14 +130,19 @@ const CSS = `
 .dci-send:hover:not(:disabled) { background: var(--dsw-alias-button-info-hover, color-mix(in srgb, currentColor 70%, transparent)); }
 .dci-send:disabled { opacity: 0.4; cursor: default; }
 
-/* ===== 菜单（官方 primitives Menu：r20 卡片 / item r10 / side-top 弹出）===== */
+/* ===== 菜单（官方 primitives Menu / ModelSelect .menu 逐值复刻：r20 卡片 / item r10 / 上方弹出）
+   卡片 overflow:hidden + max-height:min(360px,100vh-96px)（官方 .menu 同款），
+   列表在 .dci-viewport 内滚；--dsh-scrollbar-thumb(l2) 由卡片注入（官方同款），
+   宿主全局 ::-webkit-scrollbar-thumb{background:var(--dsh-scrollbar-thumb)} 据此出条。 ===== */
 .dci-menu { position: fixed; z-index: 1100; box-sizing: border-box; padding: 4px; display: flex; flex-direction: column;
-  min-width: 218px; max-width: min(360px, 100vw - 24px); max-height: calc(100vh - 24px); overflow-y: auto;
+  min-width: 218px; max-width: min(360px, 100vw - 24px); max-height: min(360px, calc(100vh - 96px)); overflow: hidden;
+  --dsh-scrollbar-thumb: var(--dsw-alias-scrollbar-bg-l2, color-mix(in srgb, currentColor 18%, transparent));
+  --dsh-scrollbar-thumb-hover: var(--dsw-alias-scrollbar-hover-l2, color-mix(in srgb, currentColor 26%, transparent));
   background: var(--dsw-menu-surface-fill, var(--dsw-specific-menu, rgba(28, 28, 32, 0.98)));
   backdrop-filter: var(--dsw-menu-backdrop-filter, none); color: var(--dsw-alias-label-primary, #ececf1);
   --dsw-elevation-stroke-color: var(--dsw-alias-border-l1, transparent);
   box-shadow: var(--dsw-elevation-prominent, 0 10px 34px rgba(0, 0, 0, 0.35)); border: 0; border-radius: var(--dsw-radius-lg, 20px); font-size: 13px; }
-.dci-viewport { display: flex; flex-direction: column; min-height: 0; }
+.dci-viewport { display: flex; flex-direction: column; min-height: 0; overflow-y: auto; }
 .dci-menuLabel { padding: 8px 10px; font-size: 12px; line-height: 16px; color: var(--dsw-alias-label-tertiary, currentColor);
   user-select: none; text-align: left; }
 .dci-item { display: flex; align-items: center; gap: 8px; width: 100%; min-height: 40px; padding: 8px 10px; border: none;
@@ -207,7 +219,7 @@ const CSS = `
 .dci-search { width: calc(100% - 8px); margin: 2px 4px 4px; padding: 5px 9px; font-size: 13px;
   border-radius: 8px; border: 1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 18%, transparent));
   background: transparent; color: inherit; outline: none; }
-.dci-error { padding: 6px 10px; color: var(--dsw-alias-state-error-primary, #ff6b6b); font-size: 12px; }
+.dci-error { padding: 6px 10px; color: var(--dsw-alias-state-error-primary, #d54941); font-size: 12px; }
 
 /* ===== 模型/推理等级 cell 行（官方 ModelSelection .cell）===== */
 .dci-cell { box-sizing: border-box; width: auto; min-width: 100%; height: 40px; color: var(--dsw-alias-label-primary, inherit);
@@ -222,7 +234,7 @@ const CSS = `
 /* ===== 完全权限确认（官方 RiskConfirmation 语义）===== */
 .dci-confirm-warning { display: flex; align-items: flex-start; gap: 10px; color: var(--dsw-alias-label-secondary, currentColor);
   font-size: 14px; line-height: 22px; padding: 6px 8px 0; }
-.dci-confirm-warning svg { flex: none; margin-top: 2px; color: var(--dsw-alias-state-error-primary, #ff6b6b); }
+.dci-confirm-warning svg { flex: none; margin-top: 2px; color: var(--dsw-alias-state-error-primary, #d54941); }
 .dci-confirm-warning p { margin: 0; }
 .dci-confirm-ack { display: flex; align-items: flex-start; gap: 10px; margin: 14px 8px 0; cursor: pointer;
   color: var(--dsw-alias-label-primary, inherit); font-size: 14px; line-height: 22px; }
@@ -234,7 +246,7 @@ const CSS = `
 .dci-btn { border: 1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 22%, transparent)); border-radius: 10px;
   background: transparent; color: inherit; padding: 6px 14px; cursor: pointer; font-size: 14px; line-height: 20px; }
 .dci-btn[data-primary="true"] { background: var(--dsw-alias-button-primary-fill, color-mix(in srgb, currentColor 85%, transparent));
-  color: #fff; border-color: transparent; }
+  color: var(--dsw-alias-label-primary-foreground, #fff); border-color: transparent; }
 .dci-btn:disabled { opacity: 0.4; cursor: default; }
 
 /* ===== 草稿附件轨（官方 ComposerAttachments/AttachmentRail/FileCard 逐值复刻）=====
@@ -510,7 +522,7 @@ button.dci-attach-body { color: inherit; font: inherit; text-align: left; backgr
 .dci-confirm-warning { display: flex; align-items: flex-start; gap: 10px; color: var(--dsw-alias-label-secondary, inherit);
   font-size: 14px; line-height: 22px; }
 .dci-confirm-warning p { margin: 0; }
-.dci-confirm-warningIcon { flex: none; margin-top: 2px; color: var(--dsw-alias-state-error-primary, #e5484d); }
+.dci-confirm-warningIcon { flex: none; margin-top: 2px; color: var(--dsw-alias-state-error-primary, #d54941); }
 .dci-confirm-ack { display: flex; align-items: flex-start; gap: 10px; margin-top: 20px; cursor: pointer;
   color: var(--dsw-alias-label-primary, inherit); font-size: 14px; line-height: 22px; }
 .dci-confirm-ack input { flex: none; width: 16px; height: 16px; margin: 3px 0 0; cursor: pointer;