dsh-smooth-stream 0.4.3 → 0.6.0

package/src/client/clientStore.ts

@@ -13,29 +13,88 @@
 
 type ClientRuntimeClient = typeof import('@deepseek-ai/dsh-client-runtime/client')
 
+export interface SnapshotStoreLike<T> {
+  getSnapshot(): T
+  subscribe(listener: (state: T) => void): () => void
+  update(mutator: (draft: T) => void): void
+  set(next: T): void
+}
+
+function fallbackSnapshotStore<T extends object>(init: T): SnapshotStoreLike<T> {
+  let state = init
+  const listeners = new Set<(state: T) => void>()
+  return {
+    getSnapshot: () => state,
+    subscribe: listener => {
+      listeners.add(listener)
+      return () => { listeners.delete(listener) }
+    },
+    update: mutator => {
+      const draft = Object.create(
+        Object.getPrototypeOf(state),
+        Object.getOwnPropertyDescriptors(state),
+      ) as T
+      mutator(draft)
+      state = draft
+      for (const listener of [...listeners]) listener(state)
+    },
+    set: next => {
+      state = next
+      for (const listener of [...listeners]) listener(state)
+    },
+  }
+}
+
 /**
  * Runtime require: the module-loader factory scopes its own resolver over the
  * booting kernel's table; under Node (vitest) there is no global require, so
  * fall back to `createRequire`.
  */
-function pickRequire(): NodeRequire {
-  if (typeof require === 'function') return require
+function pickRequire(): NodeRequire | null {
+  if (typeof require === 'function') {
+    try {
+      return require
+    } catch {
+      return null
+    }
+  }
   if (typeof process !== 'undefined' && typeof process.getBuiltinModule === 'function') {
-    const { createRequire } = process.getBuiltinModule('node:module')
-    return createRequire(process.cwd() + '/package.json')
+    try {
+      const { createRequire } = process.getBuiltinModule('node:module')
+      return createRequire(process.cwd() + '/package.json')
+    } catch {
+      return null
+    }
   }
-  throw new TypeError('dsh-smooth-stream: no client module resolver available')
+  return null
 }
 
-let clientStore: ClientRuntimeClient
+let clientStore: Partial<ClientRuntimeClient> | undefined
 
 try {
-  // 0.1.2+ seeds the split store package directly into the module table.
-  clientStore = pickRequire()('@deepseek-ai/dsh-client-store') as ClientRuntimeClient
+  const req = pickRequire()
+  if (req !== null) {
+    try {
+      // 0.1.2+ seeds the split store package directly into the module table.
+      clientStore = req('@deepseek-ai/dsh-client-store') as ClientRuntimeClient
+    } catch {
+      try {
+        // ≤ 0.1.1 owns the store engine on the client-runtime client face.
+        clientStore = req('@deepseek-ai/dsh-client-runtime/client') as ClientRuntimeClient
+      } catch {
+        // Fallback below
+      }
+    }
+  }
 } catch {
-  // ≤ 0.1.1 owns the store engine on the client-runtime client face.
-  clientStore = pickRequire()('@deepseek-ai/dsh-client-runtime/client') as ClientRuntimeClient
+  // Fallback below
+}
+
+export interface SnapshotStore<T> {
+  getSnapshot(): T
+  subscribe(listener: () => void): () => void
+  update(mutator: (draft: T) => void): void
+  set(next: T): void
 }
 
-export const createSnapshotStore = clientStore.createSnapshotStore
-export type { SnapshotStore } from '@deepseek-ai/dsh-client-runtime/client'
+export const createSnapshotStore = (clientStore?.createSnapshotStore ?? fallbackSnapshotStore) as <T extends object>(init: T) => SnapshotStore<T>

package/src/client/index.ts

@@ -7,7 +7,6 @@ import type { ConnectionHandle } from '@deepseek-ai/dsh-client-connection/client
 import type {} from '@deepseek-ai/dsh-client-ui-settings-plugins/client'
 import type { ChatNodeViewProps } from '@deepseek-ai/dsh-client-ui-conversation/client'
 import { TypewriterAssistantNodeView } from './TypewriterAssistantNodeView.tsx'
-import { AutoCollapseController } from './auto-collapse-controller.ts'
 import { wrapFollowNodeView, type FollowWrapProps } from './TypewriterToolNodeView.tsx'
 import { SmoothStreamCard } from './SmoothStreamCard.tsx'
 import { SmoothStreamCardController } from './smooth-stream-card-controller.ts'
@@ -88,7 +87,10 @@ function readBootConfig(): StreamConfig {
  * @param ctx - Browser context carrying the slot registry.
  * @returns Restorer that puts the original components back.
  */
-function wrapAgentChatRows(ctx: ClientContext): () => void {
+function wrapAgentChatRows(
+  ctx: ClientContext,
+  useControlScroll: () => boolean,
+): () => void {
   const restores: Array<() => void> = []
   const wrapped = new WeakSet<object>()
 
@@ -99,7 +101,7 @@ function wrapAgentChatRows(ctx: ClientContext): () => void {
       const current = entry.component
       if (!isWrappableComponent(current) || wrapped.has(current)) continue
       const inner = current as ComponentType<FollowWrapProps>
-      const next = wrapFollowNodeView(inner)
+      const next = wrapFollowNodeView(inner, useControlScroll)
       wrapped.add(next)
       entry.component = next
       restores.push(() => {
@@ -154,8 +156,9 @@ class SettingsCell {
     if (
       pending === this.pending
       && next.enabled === this.value.enabled
+      && next.controlScroll === this.value.controlScroll
+      && next.motionPreference === this.value.motionPreference
       && next.thinkAutoExpand === this.value.thinkAutoExpand
-      && next.autoCollapse === this.value.autoCollapse
       && next.debugEnabled === this.value.debugEnabled
       && next.debugTuning === this.value.debugTuning
     ) return
@@ -169,11 +172,6 @@ class SettingsCell {
     return !this.pending && this.value.enabled
   }
 
-  /** Whether finished turns should fold behind a summary row right now. */
-  autoCollapseActive(): boolean {
-    return !this.pending && this.value.autoCollapse
-  }
-
   readonly getSnapshot = (): StreamSettings => this.value
 
   readonly subscribe = (listener: () => void): () => void => {
@@ -196,25 +194,11 @@ class SettingsCell {
 export function apply(ctx: ClientContext): void {
   const config = readBootConfig()
   const settings = new SettingsCell()
-
-  // Auto-collapse works at the DOM level and is independent of the renderer
-  // takeover: it also folds finished turns when the built-in Harness renderer
-  // owns the conversation. The lifecycle rides the guaranteed `slots` service
-  // (this entry's own inject list) and follows the same live settings cell, so
-  // flipping the preference restores every folded row immediately.
-  ctx.inject(['slots'], () => {
-    const autoCollapse = new AutoCollapseController()
-    const syncAutoCollapse = (): void => {
-      if (settings.autoCollapseActive()) autoCollapse.start()
-      else autoCollapse.stop()
-    }
-    const unsubscribe = settings.subscribe(syncAutoCollapse)
-    syncAutoCollapse()
-    return () => {
-      unsubscribe()
-      autoCollapse.stop()
-    }
-  })
+  const useControlScroll = (): boolean => useSyncExternalStore(
+    settings.subscribe,
+    () => settings.getSnapshot().controlScroll,
+    () => settings.getSnapshot().controlScroll,
+  )
 
   // The card talks to the plugin-owned loopback RPC, so the core settings
   // namespace allowlist cannot make it disappear. The stream still applies
@@ -286,6 +270,8 @@ export function apply(ctx: ClientContext): void {
       scrollSpeedPxPerSec: config.scrollSpeedPxPerSec,
       maxScrollSpeedPxPerSec: config.maxScrollSpeedPxPerSec,
       thinkAutoExpand: preferences.thinkAutoExpand,
+      controlScroll: preferences.controlScroll,
+      motionPreference: preferences.motionPreference,
     })
   }
   ctx.slots.inject('conversation.chat.node', () => {
@@ -298,7 +284,7 @@ export function apply(ctx: ClientContext): void {
         return
       }
       if (releaseTakeover !== undefined) return
-      const unwrap = wrapAgentChatRows(ctx)
+      const unwrap = wrapAgentChatRows(ctx, useControlScroll)
       const unshadow = ctx.slots.register({
         name: 'conversation.chat.node',
         key: 'assistant-step',

package/src/client/locales.ts

@@ -7,8 +7,12 @@ export const NS = 'settings.smoothStream'
 export type SmoothStreamLocaleKey =
   | 'title' | 'description'
   | 'enabled' | 'enabledHint'
+  | 'controlScroll' | 'controlScrollHint'
+  | 'motionPreference' | 'motionPreferenceHint'
+  | 'motionAuto' | 'motionAutoHint'
+  | 'motionForceSmooth' | 'motionForceSmoothHint'
+  | 'motionForceReduced' | 'motionForceReducedHint'
   | 'thinkAutoExpand' | 'thinkAutoExpandHint'
-  | 'autoCollapse' | 'autoCollapseHint'
   | 'debugEnabled' | 'debugEnabledHint' | 'debugUnavailable'
   | 'debugPanelTitle' | 'debugPanelToggle' | 'debugPanelClose' | 'debugGuide'
   | 'debugLive' | 'debugIdle' | 'debugUnsaved'
@@ -35,10 +39,18 @@ export const en: Record<SmoothStreamLocaleKey, string> = {
   description: 'How replies are revealed while they stream.',
   enabled: 'Enable smooth streaming',
   enabledHint: 'Let this plugin render and follow streaming replies. Turn off to use the built-in Harness renderer.',
+  controlScroll: 'Take over scrolling',
+  controlScrollHint: 'On by default; smooth-stream writes the conversation scroll position. Turn off to leave bottom-follow to Harness.',
+  motionPreference: 'Motion',
+  motionPreferenceHint: 'How streaming responds to the system reduce-motion setting.',
+  motionAuto: 'Follow system',
+  motionAutoHint: 'Reduced-motion systems get raw text (accessibility first).',
+  motionForceSmooth: 'Always smooth',
+  motionForceSmoothHint: 'Keep the smoothing engine even when the system asks for reduced motion.',
+  motionForceReduced: 'Always raw',
+  motionForceReducedHint: 'Render raw text even when the system allows motion.',
   thinkAutoExpand: 'Auto-expand thinking',
   thinkAutoExpandHint: 'Open the thinking block while it streams. Turn off to keep it collapsed.',
-  autoCollapse: 'Collapse finished work',
-  autoCollapseHint: 'When a reply finishes, fold its thinking, tools, and intermediate output behind one “Processed” summary so only the final answer shows. Click the summary to expand again; works with streaming on or off.',
   debugEnabled: 'Show render diagnostics',
   debugEnabledHint: 'Show live streaming and scroll metrics on the right side of the chat. Tune values there, then save them here.',
   debugUnavailable: 'Live diagnostics require a newer plugin Host.',
@@ -115,10 +127,18 @@ export const zh: Record<SmoothStreamLocaleKey, string> = {
   description: '回复在流式输出时如何逐字展现。',
   enabled: '启用丝滑流式渲染',
   enabledHint: '由本插件渲染并跟随流式回复；关闭后使用 Harness 内置渲染。',
+  controlScroll: '接管滚动',
+  controlScrollHint: '默认开启，由丝滑流式写入会话滚动位置；关闭后贴底滚动交给 Harness。',
+  motionPreference: '动效偏好',
+  motionPreferenceHint: '流式渲染如何响应系统的「减少动态效果」设置。',
+  motionAuto: '跟随系统',
+  motionAutoHint: '系统开启减少动态效果时直接呈现原始文本（优先无障碍）。',
+  motionForceSmooth: '始终平滑',
+  motionForceSmoothHint: '即使系统要求减少动态效果，仍保持平滑流式渲染。',
+  motionForceReduced: '始终原始',
+  motionForceReducedHint: '即使系统允许动效，也直接呈现原始文本。',
   thinkAutoExpand: '自动展开思考',
   thinkAutoExpandHint: '思考块在流式时自动展开；关闭后保持折叠，可手动展开。',
-  autoCollapse: '完成后自动折叠',
-  autoCollapseHint: '回复处理完成后，把思考、工具与过程输出折叠为一行“已处理”摘要，只展示最终回复；点击摘要可再次展开。开启或关闭流式渲染均可用，默认开启。',
   debugEnabled: '显示渲染调试面板',
   debugEnabledHint: '在聊天右侧显示流式渲染和滚动的实时参数，可在面板中调节并在这里保存。',
   debugUnavailable: '当前 Host 版本不支持实时调试，请先更新插件 Host。',

package/src/client/smooth-stream-card-controller.ts

@@ -5,6 +5,7 @@ import {
   DEFAULT_STREAM_DEBUG_TUNING,
   DEFAULT_STREAM_SETTINGS,
   type StreamDebugTuning,
+  type StreamMotionPreference,
   type StreamSettings,
 } from '../settings.ts'
 import type {
@@ -22,8 +23,9 @@ export interface SmoothStreamCardState {
   saving: boolean
   failed: boolean
   enabled: boolean
+  controlScroll: boolean
+  motionPreference: StreamMotionPreference
   thinkAutoExpand: boolean
-  autoCollapse: boolean
   debugEnabled: boolean
   debugTuning: StreamDebugTuning
   debugAvailable: boolean
@@ -52,7 +54,7 @@ export class SmoothStreamCardController {
   private readonly store = createSnapshotStore<SmoothStreamCardState>(this.projection())
   private loaded: StreamSettingsView | undefined
   private loadedDebug: StreamDebugSettingsView | undefined
-  private stagedBase: Pick<StreamSettings, 'enabled' | 'thinkAutoExpand' | 'autoCollapse'> | undefined
+  private stagedBase: Pick<StreamSettings, 'enabled' | 'controlScroll' | 'motionPreference' | 'thinkAutoExpand'> | undefined
   private stagedDebug: Pick<StreamSettings, 'debugEnabled' | 'debugTuning'> | undefined
   private saving = false
   private failed = false
@@ -90,12 +92,13 @@ export class SmoothStreamCardController {
       hooks: { smoothStreamCard: this.store },
       edit: (patch) => {
         if (this.saving) return
-        if (patch.enabled !== undefined || patch.thinkAutoExpand !== undefined || patch.autoCollapse !== undefined) {
+        if (patch.enabled !== undefined || patch.controlScroll !== undefined || patch.motionPreference !== undefined || patch.thinkAutoExpand !== undefined) {
           this.stagedBase = {
             ...this.baseValues(),
             ...(patch.enabled === undefined ? {} : { enabled: patch.enabled }),
+            ...(patch.controlScroll === undefined ? {} : { controlScroll: patch.controlScroll }),
+            ...(patch.motionPreference === undefined ? {} : { motionPreference: patch.motionPreference }),
             ...(patch.thinkAutoExpand === undefined ? {} : { thinkAutoExpand: patch.thinkAutoExpand }),
-            ...(patch.autoCollapse === undefined ? {} : { autoCollapse: patch.autoCollapse }),
           }
         }
         if (this.loadedDebug !== undefined && (patch.debugEnabled !== undefined || patch.debugTuning !== undefined)) {
@@ -140,11 +143,12 @@ export class SmoothStreamCardController {
     }
   }
 
-  private baseValues(): Pick<StreamSettings, 'enabled' | 'thinkAutoExpand' | 'autoCollapse'> {
+  private baseValues(): Pick<StreamSettings, 'enabled' | 'controlScroll' | 'motionPreference' | 'thinkAutoExpand'> {
     return this.stagedBase ?? {
       enabled: this.loaded?.enabled ?? DEFAULT_STREAM_SETTINGS.enabled,
+      controlScroll: this.loaded?.controlScroll ?? DEFAULT_STREAM_SETTINGS.controlScroll,
+      motionPreference: this.loaded?.motionPreference ?? DEFAULT_STREAM_SETTINGS.motionPreference,
       thinkAutoExpand: this.loaded?.thinkAutoExpand ?? DEFAULT_STREAM_SETTINGS.thinkAutoExpand,
-      autoCollapse: this.loaded?.autoCollapse ?? DEFAULT_STREAM_SETTINGS.autoCollapse,
     }
   }
 

package/src/client/smooth-stream-settings-api.ts

@@ -23,8 +23,9 @@ function settingsView(value: unknown): StreamSettingsView {
     || !['npm', 'development', 'unmanaged'].includes(data.installation as string)
     || typeof data.writable !== 'boolean'
     || typeof data.enabled !== 'boolean'
+    || typeof data.controlScroll !== 'boolean'
+    || !['auto', 'force-smooth', 'force-reduced'].includes(data.motionPreference as string)
     || typeof data.thinkAutoExpand !== 'boolean'
-    || typeof data.autoCollapse !== 'boolean'
     || typeof data.canUpgrade !== 'boolean') {
     throw new Error('dsh-smooth-stream: malformed settings response')
   }
@@ -68,7 +69,7 @@ function accepted(result: Awaited<ReturnType<ConnectionHandle['rpc']['call']>>):
 /** Narrow client contract consumed by the staged settings-card controller. */
 export interface SmoothStreamSettingsApi {
   read(): Promise<StreamSettingsView>
-  write(settings: Pick<StreamSettings, 'enabled' | 'thinkAutoExpand' | 'autoCollapse'> & Partial<Pick<StreamSettings, 'debugEnabled' | 'debugTuning'>>): Promise<StreamSettingsView>
+  write(settings: Pick<StreamSettings, 'enabled' | 'controlScroll' | 'motionPreference' | 'thinkAutoExpand'> & Partial<Pick<StreamSettings, 'debugEnabled' | 'debugTuning'>>): Promise<StreamSettingsView>
   readDebug(): Promise<StreamDebugSettingsView>
   writeDebug(settings: Pick<StreamSettings, 'debugEnabled' | 'debugTuning'>): Promise<StreamDebugSettingsView>
   upgrade(): Promise<StreamUpgradeView>
@@ -80,14 +81,15 @@ export function createSmoothStreamSettingsApi(connection: ConnectionHandle): Smo
     async read(): Promise<StreamSettingsView> {
       return settingsView(accepted(await connection.rpc.call(STREAM_SETTINGS_RPC_CHANNEL, STREAM_SETTINGS_RPC.read, {})))
     },
-    async write(settings: Pick<StreamSettings, 'enabled' | 'thinkAutoExpand' | 'autoCollapse'> & Partial<Pick<StreamSettings, 'debugEnabled' | 'debugTuning'>>): Promise<StreamSettingsView> {
+    async write(settings: Pick<StreamSettings, 'enabled' | 'controlScroll' | 'motionPreference' | 'thinkAutoExpand'> & Partial<Pick<StreamSettings, 'debugEnabled' | 'debugTuning'>>): Promise<StreamSettingsView> {
       return settingsView(accepted(await connection.rpc.call(
         STREAM_SETTINGS_RPC_CHANNEL,
         STREAM_SETTINGS_RPC.write,
         {
           enabled: settings.enabled,
+          controlScroll: settings.controlScroll,
+          motionPreference: settings.motionPreference,
           thinkAutoExpand: settings.thinkAutoExpand,
-          autoCollapse: settings.autoCollapse,
           ...(settings.debugEnabled === undefined || settings.debugTuning === undefined
             ? {}
             : { debugEnabled: settings.debugEnabled, debugTuning: settings.debugTuning }),