dsh-codinput 0.3.0 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codinput",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "DSH WebUI 插件：把聊天输入框变成代码编辑器一样的输入风格（CodeMirror 6 接管 conversation.composer.bar）。",
   "license": "MIT",
   "author": "Witherwithwinter",

package/src/client/components/CodinputSurface.tsx

@@ -73,6 +73,7 @@ export function CodinputSurface(props: CodinputSurfaceProps): JSX.Element {
   const cardRef = useRef<HTMLDivElement | null>(null);
   const viewRef = useRef<EditorView | null>(null);
   const caretRef = useRef<number | null>(null);
+  const previewRef = useRef<HTMLDivElement | null>(null);
 
   // 高度调节：仅顶边把手，1:1 跟手（顶边上移多少、编辑区就高多少），松手持久化。
   // 宽度不做自有调节——沿用官方聊天宽度调节器（wSkVaW_widthHandle）：
@@ -245,6 +246,34 @@ export function CodinputSurface(props: CodinputSurfaceProps): JSX.Element {
     [state?.draft, previewOn],
   );
 
+  // ---- 分屏同步滚动：两侧按滚动比例互随（内容高度不同，比例映射） ----
+  // scroll 不冒泡但走捕获相位，挂在 body 上的 onScrollCapture 能收到两栏的
+  // 滚动，且 CM 视图随会话重建（scrollDOM 换新）也无需重挂监听；epsilon 防
+  // 两侧事件互馈成回环。预览栏不显示滚动条（编辑栏为主），滚轮仍可反向带动。
+  const syncSplitScroll = (event: React.SyntheticEvent<HTMLDivElement>): void => {
+    if (!editOn || !previewOn) return;
+    const src = event.target as HTMLElement;
+    const editorScroll = viewRef.current?.scrollDOM;
+    const previewScroll = previewRef.current;
+    if (!editorScroll || !previewScroll) return;
+    const dst = src === editorScroll ? previewScroll : src === previewScroll ? editorScroll : null;
+    if (!dst) return;
+    const srcMax = src.scrollHeight - src.clientHeight;
+    if (srcMax <= 0) return;
+    const top = (src.scrollTop / srcMax) * (dst.scrollHeight - dst.clientHeight);
+    if (Math.abs(dst.scrollTop - top) > 1) dst.scrollTop = top;
+  };
+  // 进入分屏 / 草稿更新 / 切会话后，预览按编辑器当前比例对齐。
+  useEffect(() => {
+    if (!editOn || !previewOn) return;
+    const editorScroll = viewRef.current?.scrollDOM;
+    const previewScroll = previewRef.current;
+    if (!editorScroll || !previewScroll) return;
+    const editorMax = editorScroll.scrollHeight - editorScroll.clientHeight;
+    if (editorMax <= 0) return;
+    previewScroll.scrollTop = (editorScroll.scrollTop / editorMax) * (previewScroll.scrollHeight - previewScroll.clientHeight);
+  }, [editOn, previewOn, html, sessionId]);
+
   const toggleEdit = (): void => {
     if (!editOn && previewOn) setEditOn(true);
     else if (editOn && previewOn) setEditOn(false);
@@ -329,6 +358,7 @@ export function CodinputSurface(props: CodinputSurfaceProps): JSX.Element {
         <div
           className="dci-body"
           data-split={editOn && previewOn}
+          onScrollCapture={syncSplitScroll}
           style={
             !side && !float && bodyHeight !== null
               ? ({ '--dci-body-h': `${bodyHeight}px`, '--dci-body-max': `${bodyHeight}px` } as React.CSSProperties)
@@ -352,7 +382,7 @@ export function CodinputSurface(props: CodinputSurfaceProps): JSX.Element {
             />
           ) : null}
           {previewOn ? (
-            <div className="dci-preview" data-solo={!editOn}>
+            <div className="dci-preview" data-solo={!editOn} ref={previewRef}>
               {html ? <div dangerouslySetInnerHTML={{ __html: html }} /> : <span style={{ opacity: 0.4 }}>{t("preview.empty")}</span>}
             </div>
           ) : null}

package/src/client/components/ModelLabel.tsx

@@ -0,0 +1,57 @@
+/**
+ * 模型名标签：渲染官方 model-selection 在 `conversation.input.model.label`
+ * 子槽位（0.2.1 起）的条目组件本体——桌面版宿主挂载
+ * dsh-client-ui-deepseek-model-label-1017 后，官方给 deepseek-flash 的
+ * 目录名「DeepSeek-V4.1-Flash」后面追加一枚 info 色发布徽章「1017」
+ * （Tag 原语，官方插件的样式注入自带）。web 宿主（0.1.x）没有该插件、
+ * 槽位键也未声明，条目为空 → 回退纯名，与官方两个宿主的表现各自一致。
+ *
+ * 渲染公式复刻官方 ModelSelect.renderModelLabel：外包
+ * span[data-provider-id][data-model-id]，条目 props = {provider, model,
+ * placement, selected, t = locale.bind(entry.locale)}；无条目或条目崩溃
+ * 一律回退 fallback（官方 renderSlot 的 fallback 同参）。
+ */
+
+import { createElement, useMemo } from 'react';
+import { EntryBoundary, firstComponentEntry, translatorFor, useSlotEntries } from './slotEntry';
+
+const LABEL_SLOT = 'conversation.input.model.label';
+
+export type ModelLabelPlacement = 'trigger' | 'menu' | 'option';
+
+export interface ModelLabelProps {
+  provider: { id: string; name: string };
+  model: { id: string; name: string };
+  placement: ModelLabelPlacement;
+  selected: boolean;
+  /** 无官方条目 / 条目崩溃时的回退显示（通常是目录名）。 */
+  fallback: string;
+}
+
+export function ModelLabel(props: ModelLabelProps): JSX.Element {
+  const { provider, model, placement, selected, fallback } = props;
+  const entries = useSlotEntries(LABEL_SLOT);
+  const entry = useMemo(() => firstComponentEntry(entries), [entries]);
+  // 徽章文案在官方插件自己的词典里（ns = deepseek-model-label-1017）；
+  // 条目没带 locale 就没有可用的 t，按无条目回退。
+  const translator = useMemo(
+    () => (entry && entry.locale ? translatorFor(entry) : null),
+    [entry],
+  );
+
+  let label: React.ReactNode = fallback;
+  if (entry && translator) {
+    label = createElement(entry.component as React.ComponentType<Record<string, unknown>>, {
+      provider,
+      model,
+      placement,
+      selected,
+      t: translator,
+    });
+  }
+  return (
+    <span data-provider-id={provider.id} data-model-id={model.id}>
+      <EntryBoundary fallback={fallback}>{label}</EntryBoundary>
+    </span>
+  );
+}

package/src/client/components/ModelMenu.tsx

@@ -1,15 +1,24 @@
 /**
- * 模型与思考强度菜单：官方 ModelSelection 的触发器与两级 cell 菜单。
+ * 模型与思考强度菜单：官方 ModelSelect 座位（conversation.input.model 槽位）
+ * 的触发器与两级 cell 菜单复刻。
  * 数据来自官方 per-session 目录（ctx.modelDirectories.directoryFor(id).store：
  * { current, groups, status, error }），写入走官方 select（selectModel RPC）。
  * 服务缺席时触发器禁用。
+ *
+ * 0.2.1 同步：模型名的显示名经官方 `conversation.input.model.label` 子槽位
+ * 渲染（ModelLabel）——桌面版宿主的 deepseek-model-label-1017 插件会给
+ * deepseek-flash 追加「1017」发布徽章，web 宿主无条目回退纯名；思考强度
+ * 显示对齐官方公式（selection 未显式指定时回落模型 defaultEffort，模型无
+ * reasoning 元数据时显示会话 retainedEffort，均无才显示 Default），推理
+ * 等级菜单在模型未声明默认强度时补官方的 Default（跟随提供方默认）行。
  */
 
 import { useEffect, useRef, useState } from 'react';
-import type { InputActions, ModelCatalogModel, ModelProviderGroup, ModelSelection } from '../host-types';
+import type { ModelCatalogModel, ModelProviderGroup, ModelSelection } from '../host-types';
 import { getSessionDirectory, type DirectorySnapshot } from '../modeldir';
 import { stash } from '../services';
 import { IconChevronOfficial } from '../icons';
+import { ModelLabel } from './ModelLabel';
 import { MenuCheck, MenuSurface } from './MenuSurface';
 import { useSnapshot } from './useSnapshot';
 import { t } from '../i18n';
@@ -41,13 +50,24 @@ function modelLabel(selection: ModelSelection | null, groups: readonly ModelProv
   return findCurrent(selection, groups)?.model.name ?? selection.model;
 }
 
-/** 推理等级显示名（目录 efforts[].name，如 High；未热时退回首字母大写 id）。 */
-function effortLabel(selection: ModelSelection | null, groups: readonly ModelProviderGroup[]): string {
-  const effortId = selection?.reasoningEffort;
-  if (!effortId) return 'Default';
-  const named = findCurrent(selection, groups)?.model.reasoning?.efforts.find((e) => e.id === effortId);
-  if (named) return named.name;
-  return effortId.charAt(0).toUpperCase() + effortId.slice(1);
+/**
+ * 思考强度显示（官方 ModelSelect 的 effortLabel 公式）：目录里找不到当前
+ * 模型 → 无强度段；模型无 reasoning 元数据 → 会话 retainedEffort（官方
+ * 已折成显示名）；selection 未显式指定 → 模型 defaultEffort 的名字；再
+ * 无才显示 Default（effort.providerDefault，官方中英同为「Default」）。
+ */
+function effortLabel(
+  selection: ModelSelection | null,
+  groups: readonly ModelProviderGroup[],
+  snapshot: DirectorySnapshot | undefined,
+): string | undefined {
+  const found = findCurrent(selection, groups);
+  if (!found) return undefined;
+  const reasoning = found.model.reasoning;
+  if (!reasoning) return snapshot?.retainedEffort;
+  const effective = selection?.reasoningEffort ?? reasoning.defaultEffort;
+  if (effective === undefined) return 'Default';
+  return reasoning.efforts.find((level) => level.id === effective)?.name ?? effective;
 }
 
 export function ModelMenu(props: ModelMenuProps): JSX.Element {
@@ -97,8 +117,20 @@ export function ModelMenu(props: ModelMenuProps): JSX.Element {
 
   const current = snap?.current ?? null;
   const groups = snap?.groups ?? [];
+  const found = findCurrent(current, groups);
   const currentModelName = modelLabel(current, groups);
-  const currentEffort = effortLabel(current, groups);
+  const currentEffort = effortLabel(current, groups, snap);
+  const triggerTitle = currentEffort === undefined ? currentModelName : `${currentModelName} · ${currentEffort}`;
+  /** 官方 renderModelLabel：触发器/根菜单 cell 位置的当前模型显示名。 */
+  const renderCurrentName = (placement: 'trigger' | 'menu', target: NonNullable<typeof found>): JSX.Element => (
+    <ModelLabel
+      provider={{ id: target.group.id, name: target.group.name }}
+      model={target.model}
+      placement={placement}
+      selected={true}
+      fallback={currentModelName}
+    />
+  );
 
   const pick = async (group: ModelProviderGroup, model: ModelCatalogModel, effortId: string | undefined): Promise<void> => {
     if (!directory || busy) return;
@@ -127,15 +159,18 @@ export function ModelMenu(props: ModelMenuProps): JSX.Element {
         ref={triggerRef}
         type="button"
         className="dci-trigger"
+        data-model=""
         style={{ maxWidth: 'min(360px, 45cqw)' }}
         data-open={open}
         onMouseDown={(e) => e.preventDefault()}
         disabled={!directory}
         onClick={() => (open ? close() : openMenu())}
-        aria-label={t("tool.model", { name: `${currentModelName} · ${currentEffort}` })}
-        title={t("tool.model", { name: `${currentModelName} · ${currentEffort}` })}
+        aria-haspopup="menu"
+        aria-expanded={open}
+        aria-label={t("tool.model", { name: triggerTitle })}
+        title={t("tool.model", { name: triggerTitle })}
       >
-        <span className="dci-triggerLabel">{currentModelName}</span>
+        <span className="dci-triggerLabel">{found ? renderCurrentName('trigger', found) : currentModelName}</span>
         {currentEffort ? <span className="dci-triggerEffort">{currentEffort}</span> : null}
         <span className="dci-chev" data-open={open}>
           <IconChevronOfficial size={14} />
@@ -149,18 +184,22 @@ export function ModelMenu(props: ModelMenuProps): JSX.Element {
               <>
                 <button type="button" className="dci-cell" onClick={() => setView('models')}>
                   <span className="dci-cellLabel">{t("menu.model")}</span>
-                  <span className="dci-cellValue">{currentModelName}</span>
-                  <span className="dci-cellChevron" style={{ transform: 'rotate(-90deg)' }} aria-hidden="true">
-                    <IconChevronOfficial size={14} />
+                  <span className="dci-cellValue">
+                    {found ? renderCurrentName('menu', found) : currentModelName}
                   </span>
-                </button>
-                <button type="button" className="dci-cell" onClick={() => setView('efforts')}>
-                  <span className="dci-cellLabel">{t("menu.reasoning")}</span>
-                  <span className="dci-cellValue">{currentEffort}</span>
                   <span className="dci-cellChevron" style={{ transform: 'rotate(-90deg)' }} aria-hidden="true">
                     <IconChevronOfficial size={14} />
                   </span>
                 </button>
+                {found?.model.reasoning ? (
+                  <button type="button" className="dci-cell" onClick={() => setView('efforts')}>
+                    <span className="dci-cellLabel">{t("menu.reasoning")}</span>
+                    <span className="dci-cellValue">{currentEffort}</span>
+                    <span className="dci-cellChevron" style={{ transform: 'rotate(-90deg)' }} aria-hidden="true">
+                      <IconChevronOfficial size={14} />
+                    </span>
+                  </button>
+                ) : null}
               </>
             ) : null}
 
@@ -181,7 +220,15 @@ export function ModelMenu(props: ModelMenuProps): JSX.Element {
                           title={model.description}
                           onClick={() => void pick(group, model, model.reasoning?.defaultEffort)}
                         >
-                          <span className="dci-itemLabel">{model.name}</span>
+                          <span className="dci-itemLabel">
+                            <ModelLabel
+                              provider={{ id: group.id, name: group.name }}
+                              model={model}
+                              placement="option"
+                              selected={active}
+                              fallback={model.name}
+                            />
+                          </span>
                           {active ? (
                             <span className="dci-check" aria-hidden="true">
                               <MenuCheck size={16} />
@@ -200,21 +247,34 @@ export function ModelMenu(props: ModelMenuProps): JSX.Element {
               <>
                 <div className="dci-menuLabel">{t("menu.reasoning")}</div>
                 {(() => {
-                  const found = findCurrent(current, groups);
-                  const efforts = found?.model.reasoning?.efforts ?? [];
-                  if (efforts.length === 0) return <div className="dci-empty">{t("menu.reasoningNone")}</div>;
-                  return efforts.map((eff) => {
-                    const active = current?.reasoningEffort === eff.id;
+                  const reasoning = found?.model.reasoning;
+                  if (!reasoning) return <div className="dci-empty">{t("menu.reasoningNone")}</div>;
+                  const effectiveEffort = current?.reasoningEffort ?? reasoning.defaultEffort;
+                  // 官方 effortChoices：模型未声明默认强度时补一行 Default
+                  // （写回时省略 reasoningEffort = 跟随提供方默认）。
+                  const rows: { key: string; effort: string | undefined; label: string }[] = [
+                    ...(reasoning.defaultEffort === undefined
+                      ? [{ key: 'provider-default', effort: undefined as string | undefined, label: 'Default' }]
+                      : []),
+                    ...reasoning.efforts.map((eff) => ({
+                      key: `effort:${eff.id}`,
+                      effort: eff.id,
+                      label: eff.name,
+                    })),
+                  ];
+                  return rows.map((row) => {
+                    const active = effectiveEffort === row.effort;
+                    const named = row.effort === undefined ? undefined : reasoning.efforts.find((e) => e.id === row.effort);
                     return (
                       <button
-                        key={eff.id}
+                        key={row.key}
                         type="button"
                         className="dci-item"
                         disabled={busy}
-                        title={eff.description}
-                        onClick={() => found && void pick(found.group, found.model, eff.id)}
+                        title={named?.description}
+                        onClick={() => found && void pick(found.group, found.model, row.effort)}
                       >
-                        <span className="dci-itemLabel">{eff.name}</span>
+                        <span className="dci-itemLabel">{row.label}</span>
                         {active ? (
                           <span className="dci-check" aria-hidden="true">
                             <MenuCheck size={16} />

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,75 @@
+/**
+ * 槽位条目渲染的共享件：检视任意槽位的条目快照（检测即兼容）、按条目 locale
+ * 绑定官方词典、以及条目崩溃兜底边界。语音输入（VoiceActivity）与模型名
+ * 标签（ModelLabel）共用同一套合成公式，抽到这里避免两份漂移。
+ */
+
+import { useCallback, useSyncExternalStore, Component } from 'react';
+import type { 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 的 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;
+  }
+}

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,7 @@ import { claimSidebarInput, subscribeSidebarTabClose, useSidebarCarryOwner, type
 import { loadPrefs, savePrefs, subscribePrefs } from './prefs';
 import { diagError, diagWindow } from './diag';
 import { CodinputSurface } from './components/CodinputSurface';
+import { IconBrandLogo } from './icons';
 import { t, useT } from './i18n';
 
 export const SIDEBAR_TAB_ID = 'dsh-codinput';
@@ -39,6 +43,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 +63,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 下发，缺席说明宿主形状漂移——