dsh-vscode-workbench 0.2.0 → 0.2.3

package/lib/types/client/ActivityBar.d.ts

@@ -12,7 +12,11 @@ export declare function normalizeActivityOrder(value: unknown, known: readonly s
 /** Move `id` before `before` (or to the end when absent), leaving unknown ids untouched. */
 export declare function moveActivity(order: readonly string[], id: string, before: string | undefined): string[];
 export declare function toggleActivityHidden(hidden: readonly string[], id: string): string[];
-/** VS Code-style activity bar: pointer drag with a floating ghost and live reordering, right-click hide. */
+/**
+ * VS Code-style activity bar: every view can be dragged into a new slot while `fixed` actions stay pinned on
+ * top and `bottom` actions stay pinned at the foot. Reordering is computed from pointer position so it keeps
+ * working when the DOM shifts under a fast drag.
+ */
 export declare function ActivityBar({ views, fixed, bottom, order, hidden, onOrderChange, onHiddenChange }: {
     views: ActivityView[];
     fixed: ActivityView[];

package/lib/types/client/DshConversationPanel.d.ts

@@ -9,6 +9,6 @@ export declare function DshConversationPanel({ visible, width, statusHeight }: {
 /** Temporarily align the official DSH panel palette with a fixed workbench palette. */
 export declare function DshConversationTheme({ visible, colorScheme, followDsh }: {
     visible: boolean;
-    colorScheme: 'dark' | 'light';
+    colorScheme: 'dark' | 'light' | 'white' | 'eyecare';
     followDsh: boolean;
 }): null;

package/lib/types/client/DshMark.d.ts

@@ -1,3 +1,6 @@
+/** Bundled DSH fish logo — self-contained, no dependence on host DOM. */
+export declare const DSH_MARK_VIEWBOX = "0 0 23.16 17.04";
+export declare const DSH_MARK_PATH = "M22.9168 1.43018C22.6713 1.31018 22.5658 1.53918 22.4223 1.65519C22.3733 1.69269 22.3318 1.74169 22.2903 1.78669C21.9317 2.1697 21.5127 2.42121 20.9657 2.39121C20.1657 2.34621 19.4827 2.59771 18.8787 3.20973C18.7502 2.45521 18.3236 2.0047 17.6746 1.71569C17.3351 1.56568 16.9916 1.41518 16.7536 1.08867C16.5876 0.856163 16.5421 0.597155 16.4591 0.341647C16.4061 0.187643 16.3536 0.0301382 16.1761 0.00363739C15.9836 -0.0263635 15.9081 0.135141 15.8326 0.270145C15.5306 0.822162 15.4136 1.43018 15.4251 2.0462C15.4516 3.43174 16.0366 4.53527 17.1991 5.3203C17.3311 5.4103 17.3651 5.5003 17.3236 5.63181C17.2441 5.90231 17.1501 6.16482 17.0671 6.43533C17.0141 6.60784 16.9351 6.64584 16.7501 6.57033C16.1121 6.30383 15.5611 5.90931 15.074 5.4328C14.2475 4.63328 13.5 3.75075 12.568 3.05973C12.349 2.89822 12.13 2.74822 11.9034 2.60522C10.9524 1.68169 12.028 0.923165 12.277 0.833162C12.5375 0.739159 12.3675 0.41615 11.5259 0.42015C10.6844 0.42365 9.91439 0.705658 8.93286 1.08117C8.78935 1.13767 8.63835 1.17867 8.48384 1.21267C7.59332 1.04367 6.66829 1.00617 5.70226 1.11517C3.88321 1.31768 2.43016 2.1777 1.36213 3.64575C0.0790928 5.4103 -0.222916 7.41536 0.146595 9.50642C0.535106 11.7105 1.66014 13.535 3.38869 14.9616C5.18125 16.4406 7.24581 17.1657 9.60138 17.0266C11.0319 16.9441 12.6245 16.7526 14.421 15.2321C14.874 15.4576 15.3496 15.5476 16.1381 15.6151C16.7456 15.6716 17.3306 15.5851 17.7836 15.4911C18.4931 15.3411 18.4441 14.6841 18.1876 14.5636C16.1081 13.595 16.5646 13.9891 16.1496 13.67C17.2061 12.42 18.8202 10.1979 19.3182 7.17235C19.3672 6.83834 19.4297 6.36783 19.4222 6.09732C19.4182 5.93231 19.4562 5.86831 19.6447 5.84931C20.1657 5.78931 20.6712 5.64681 21.1357 5.3913C22.4833 4.65528 23.0268 3.44624 23.1548 1.9972C23.1738 1.77569 23.1508 1.54668 22.9168 1.43018ZM11.1749 14.4736C9.15936 12.889 8.18184 12.3675 7.77832 12.39C7.40081 12.4125 7.46881 12.8445 7.55182 13.126C7.63882 13.404 7.75182 13.5955 7.91033 13.8396C8.01983 14.0011 8.09533 14.2411 7.80083 14.4216C7.15181 14.8231 6.02327 14.2866 5.97027 14.2601C4.65673 13.4865 3.5587 12.4655 2.78467 11.069C2.03715 9.72493 1.60314 8.28289 1.53164 6.74384C1.51264 6.37233 1.62214 6.24082 1.99215 6.17332C2.47916 6.08332 2.98118 6.06432 3.46769 6.13582C5.52476 6.43633 7.27581 7.35586 8.74385 8.8129C9.58188 9.64243 10.2159 10.634 10.8689 11.6025C11.5634 12.631 12.3105 13.611 13.262 14.4146C13.598 14.6961 13.866 14.9101 14.1225 15.0681C13.349 15.1546 12.058 15.1731 11.1749 14.4746L11.1749 14.4736ZM12.141 8.25988C12.141 8.09488 12.273 7.96338 12.439 7.96338C12.4765 7.96338 12.5105 7.97088 12.541 7.98188C12.5825 7.99688 12.6205 8.01938 12.6505 8.05338C12.7035 8.10588 12.7335 8.18088 12.7335 8.25988C12.7335 8.42489 12.6015 8.55639 12.4355 8.55639C12.2695 8.55639 12.141 8.42489 12.141 8.25988ZM15.1415 9.79893C14.949 9.87793 14.7565 9.94544 14.5715 9.95294C14.2845 9.96794 13.9715 9.85143 13.8015 9.70893C13.5375 9.48742 13.3485 9.36342 13.2695 8.97691C13.2355 8.8119 13.2545 8.55639 13.2845 8.40989C13.3525 8.09438 13.277 7.89187 13.0545 7.70787C12.8735 7.55786 12.643 7.51636 12.39 7.51636C12.2955 7.51636 12.209 7.47486 12.1445 7.44136C12.039 7.38886 11.9519 7.25735 12.035 7.09585C12.0615 7.04335 12.19 6.91584 12.22 6.89334C12.5635 6.69784 12.9595 6.76184 13.326 6.90834C13.6655 7.04735 13.9225 7.30236 14.292 7.66287C14.6695 8.09838 14.7375 8.21838 14.9525 8.54539C15.1225 8.8009 15.277 9.06341 15.3831 9.36392C15.4471 9.55142 15.3641 9.70493 15.1415 9.79893Z";
 export declare function DshMark({ size }: {
     size?: number;
 }): import("react").JSX.Element;

package/lib/types/client/MonacoEditor.d.ts

@@ -42,8 +42,24 @@ export declare const WORKBENCH_EDITOR_CHROME: {
         readonly horizontalScrollbarSize: 10;
     };
 };
+/** macOS reports Control-click as a secondary click, so Monaco only navigates with Cmd-click there. */
+export declare function isMacPlatform(userAgent?: string): boolean;
+/**
+ * Whether a mouse press should jump to the definition. On macOS, Control-click is a common
+ * Windows/Linux habit but arrives as a context-menu gesture (sometimes as a right-button
+ * press); treat it as Cmd-click instead.
+ */
+export declare function isMacDefinitionClick(event: {
+    button: number;
+    ctrlKey: boolean;
+    metaKey: boolean;
+}): boolean;
 /** Monaco theme aligned with the workbench dark palette. */
 export declare const DARK_THEME = "dvw-dark";
+/** Eye-care palette: the editor shares the workbench's warm yellow surface. */
+export declare const EYE_THEME = "dvw-eyecare";
+export type MonacoColorScheme = 'dark' | 'light' | 'white' | 'eyecare';
+export declare function monacoThemeFor(theme: MonacoColorScheme): string;
 /**
  * Bootstrap source for Monaco's AMD web workers. Workers resolve module paths against their own
  * blob URL, so they need an absolute `baseUrl`; without it the TypeScript language worker fails to load.
@@ -55,7 +71,7 @@ export declare function MonacoDiffEditor(props: {
     original: string;
     modified: string;
     mode: 'inline' | 'split';
-    theme: 'dark' | 'light';
+    theme: MonacoColorScheme;
     fontSize?: number;
 }): import("react").JSX.Element;
 /** Start downloading Monaco in the background so the first opened file does not wait for it. */
@@ -65,7 +81,7 @@ export declare function retainEditorModels(uris: string[]): void;
 export declare function MonacoEditor(props: {
     uri: string;
     value: string;
-    theme: 'dark' | 'light';
+    theme: MonacoColorScheme;
     line?: number;
     column?: number;
     fontSize?: number;

package/lib/types/client/Workbench.d.ts

@@ -20,9 +20,18 @@ interface Tab extends FileDocument {
     documentPreview?: DocumentPreviewKind;
     documentUrl?: string;
 }
+export type MarkdownDefaultView = 'preview' | 'source';
+export declare const MARKDOWN_DEFAULT_VIEW_KEY = "dvw:markdown-default-view";
 type ResizeDirection = 1 | -1;
+export declare const DSH_CHAT_MIN_WIDTH = 440;
+export declare const DSH_CHAT_MAX_WIDTH = 720;
+export declare const DSH_CHAT_DEFAULT_WIDTH = 440;
+/** Keep persisted or dragged widths inside the range the DSH composer can lay out cleanly. */
+export declare function clampChatWidth(width: number): number;
 /** Calculate a panel width from a horizontal pointer movement. */
 export declare function resizedPanelWidth(startWidth: number, startX: number, nextX: number, direction: ResizeDirection, min: number, max: number): number;
+/** Read the saved Markdown default without depending on browser storage during unit tests. */
+export declare function markdownDefaultView(): MarkdownDefaultView;
 /** Restore tab headers without reading their file contents. */
 export declare function restoreTabPaths(paths: string[]): Tab[];
 /** Return whether file changes require reloading one visible directory. */

package/lib/types/client/WorkspaceSwitcher.d.ts

@@ -1,13 +1,14 @@
 import type { WorkspaceChoice } from './dshNavigation.ts';
 /** Centered switcher: existing workspaces, their sessions, and a new-workspace action. */
-export declare function WorkspaceSwitcher({ choices, activeSessionId, unavailable, busy, error, onCreate, onSwitch, onOpenWorkspace, onClose }: {
+export declare function WorkspaceSwitcher({ choices, activeSessionId, unavailable, busy, error, theme, onCreate, onSwitch, onOpenWorkspace, onClose }: {
     choices: WorkspaceChoice[];
     activeSessionId?: string;
     unavailable: boolean;
     busy: boolean;
     error?: string;
+    theme?: 'dark' | 'light' | 'white' | 'eyecare';
     onCreate(): void;
     onSwitch(sessionId: string): void;
     onOpenWorkspace(workspaceId: string): void;
     onClose(): void;
-}): import("react").JSX.Element;
+}): import("react").ReactPortal;

package/lib/types/client/api.d.ts

@@ -5,3 +5,5 @@ export declare class ApiError extends Error {
 /** Back off while DSH publishes the current session after startup; every view shares this retry. */
 export declare function sessionRetryDelay(error: unknown, attempt: number): number | undefined;
 export declare function api<T>(method: string, body: Record<string, unknown>, signal?: AbortSignal): Promise<T>;
+/** Retry an operation while DSH is still publishing the selected session. */
+export declare function withSessionRetry<T>(operation: () => Promise<T>, signal?: AbortSignal): Promise<T>;

package/lib/types/client/lsp.d.ts

@@ -7,6 +7,12 @@ export interface LspServerStatus {
     installable: boolean;
     installed: boolean;
     hint?: string;
+    command?: string;
+    /** Manual servers report the language toolchain next to the server so the two are not confused. */
+    language?: {
+        name: string;
+        installed: boolean;
+    };
 }
 /** Normalize definition/reference payloads (Location, LocationLink or arrays) into Monaco locations. */
 export declare function lspLocations(monaco: Monaco, result: unknown): import('monaco-editor').languages.Location[];

package/lib/types/client/service.d.ts

@@ -4,7 +4,7 @@ export interface BottomPanelProps {
     sessionId: string;
     cwd: string;
     visible: boolean;
-    colorScheme: 'dark' | 'light';
+    colorScheme: 'dark' | 'light' | 'white' | 'eyecare';
 }
 export interface BottomPanelContribution {
     id: string;

package/lib/types/client/terminal.d.ts

@@ -17,7 +17,7 @@ export interface TerminalWorkspaceSnapshot {
 }
 /** Browser client for the workbench's local terminal transport. */
 export interface TerminalWorkspace {
-    refresh(): Promise<void>;
+    refresh(): Promise<boolean>;
     create(title?: string): Promise<TerminalInfo>;
     close(id: string): Promise<void>;
     rename(id: string, title: string): Promise<void>;
@@ -33,7 +33,7 @@ export declare class TerminalWorkspaceController implements TerminalWorkspace {
     private snapshot;
     private readonly listeners;
     constructor(sessionId: string);
-    refresh(): Promise<void>;
+    refresh(): Promise<boolean>;
     create(title?: string): Promise<TerminalInfo>;
     close(id: string): Promise<void>;
     rename(id: string, title: string): Promise<void>;

package/lib/types/commit-message.d.ts

@@ -0,0 +1,43 @@
+import type { ConfigureCall, GenerateOptions, LlmCallConfig, PreparedLlmCall, StreamChunk } from '@deepseek-ai/dsh-llm';
+export interface CommitContext {
+    repository: string;
+    branch: string;
+    files: string[];
+    recent: string[];
+    patch: string;
+    truncated: boolean;
+}
+/** The part of DSH's LLM runtime this feature needs; a fake implements it in tests. */
+export interface CommitMessageRuntime {
+    prepareCall?(config: LlmCallConfig, signal?: AbortSignal, configure?: ConfigureCall): Promise<PreparedLlmCall>;
+    stream(options: GenerateOptions): AsyncIterable<StreamChunk>;
+}
+export type CommitDetail = 'concise' | 'standard' | 'detailed';
+export type CommitLanguage = 'auto' | 'zh' | 'en';
+export interface CommitMessagePreferences {
+    detail: CommitDetail;
+    language: CommitLanguage;
+}
+export declare const DEFAULT_COMMIT_PREFERENCES: CommitMessagePreferences;
+export declare function normalizeCommitPreferences(detail: unknown, language: unknown): CommitMessagePreferences;
+export declare const configureCommitCall: ConfigureCall;
+export declare function commitMessageSystemPrompt(preferences?: CommitMessagePreferences): string;
+export declare function buildCommitMessagePrompt(context: CommitContext, preferences?: CommitMessagePreferences): string;
+/**
+ * Keep file headers, hunk headers and changed lines, but drop unchanged context and clip very long minified or JSX
+ * lines. This lets every source file reach the model within a bounded token budget instead of a few early files
+ * consuming the entire patch.
+ */
+export declare function compactCommitPatch(patch: string): string;
+/**
+ * Git prints diffs in path order, so a big README and a lockfile can swallow the whole budget before any source
+ * file is seen. Keep generated lockfiles out, put production source ahead of tests and documentation, and cut the
+ * last section that does not fit instead of bisecting the blob.
+ */
+export declare function prioritizeCommitPatch(patch: string, limit: number): {
+    patch: string;
+    truncated: boolean;
+};
+/** Strip common model wrappers so the result can go straight into the commit box. */
+export declare function cleanCommitMessage(raw: string, detail?: CommitDetail): string;
+export declare function generateCommitMessage(runtime: CommitMessageRuntime, config: LlmCallConfig, context: CommitContext, signal?: AbortSignal, preferences?: CommitMessagePreferences): Promise<string>;

package/lib/types/host.d.ts

@@ -1,4 +1,5 @@
 import type { HostContext } from './context.ts';
+import { type CommitContext } from './commit-message.ts';
 import type { FileDocument, FileEntry, GitStatus, SearchMatch, SearchRequest } from './types.ts';
 export declare function cwdFor(ctx: HostContext, sessionId: string): string;
 /** Resolve a caller-relative path and reject traversal and symlink escape. */
@@ -67,6 +68,8 @@ export declare function searchWorkspace(cwd: string, request: SearchRequest, sig
     limited: boolean;
 }>;
 export declare function gitStatus(cwd: string): Promise<GitStatus>;
+/** Collect the staged (or working-tree) changes and recent subjects used to draft a commit message. */
+export declare function gitCommitContext(cwd: string, limit?: number): Promise<CommitContext>;
 export declare function gitAction(cwd: string, action: string, path?: string, value?: string): Promise<unknown>;
 /** Resolve the official VS Code Codicon font shipped by @vscode/codicons. */
 export declare function codiconAsset(): {

package/lib/types/lsp.d.ts

@@ -1,5 +1,10 @@
 /** Host-side registry and process bridge for language servers exposed to the workbench editor. */
 import { type ChildProcess } from 'node:child_process';
+/** The toolchain a manual language server belongs to, detected separately from the server itself. */
+export type LspLanguage = {
+    name: string;
+    commands: readonly string[];
+};
 export type LspInstall = {
     kind: 'npm';
     package: string;
@@ -16,6 +21,8 @@ export interface LspDefinition {
     languages: string[];
     install: LspInstall;
     args: string[];
+    /** Toolchain checked before the server; servers for pure data formats have nothing to check. */
+    language?: LspLanguage;
 }
 /** The strongest maintained server for each language, installable where the ecosystem allows it. */
 export declare const LSP_SERVERS: readonly LspDefinition[];
@@ -26,9 +33,23 @@ export interface LspStatus {
     installable: boolean;
     installed: boolean;
     hint?: string;
+    /** Executable name for manual servers, so the UI can name what it looked for. */
+    command?: string;
+    /** Present for manual servers: whether the language toolchain itself is on this machine. */
+    language?: {
+        name: string;
+        installed: boolean;
+    };
 }
 /** Private install root so language servers never touch the user's global npm state. */
 export declare function lspRoot(): string;
+/**
+ * GUI-launched apps inherit a trimmed PATH: Homebrew, `go install` and `cargo install` targets routinely sit
+ * outside it, so detection has to look in the usual per-user bin directories too.
+ */
+export declare function lspSearchDirs(env?: NodeJS.ProcessEnv, home?: string): string[];
+/** First executable named `command` found in `dirs`; exposed for tests and for toolchain probing. */
+export declare function findExecutable(command: string, dirs: readonly string[]): Promise<string | undefined>;
 export declare function lspStatuses(): Promise<LspStatus[]>;
 /** Install an npm-distributed server into the plugin's private directory. */
 export declare function installLsp(id: string): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vscode-workbench",
-  "version": "0.2.0",
+  "version": "0.2.3",
   "description": "Explorer, Monaco editor, search and local Git overlay for DSH",
   "type": "module",
   "license": "MIT",
@@ -82,6 +82,7 @@
     "@deepseek-ai/dsh-client-ui-sidebar": "^0.2.1-rc.5 || ^0.2.2-rc.1",
     "@deepseek-ai/dsh-client-ui-slots": "^0.2.1-rc.5 || ^0.2.2-rc.1",
     "@deepseek-ai/dsh-host-webserver": "^0.2.1-rc.5 || ^0.2.2-rc.1",
+    "@deepseek-ai/dsh-llm": "^0.2.1-rc.5 || ^0.2.2-rc.1",
     "@deepseek-ai/dsh-session": "^0.2.1-rc.5 || ^0.2.2-rc.1",
     "@deepseek-ai/dsh-working-directory": "^0.2.1-rc.5 || ^0.2.2-rc.1",
     "react": "^18.2.0",
@@ -102,6 +103,7 @@
     "@deepseek-ai/dsh-client-ui-sidebar": "0.2.2-rc.1",
     "@deepseek-ai/dsh-client-ui-slots": "0.2.2-rc.1",
     "@deepseek-ai/dsh-host-webserver": "0.2.2-rc.1",
+    "@deepseek-ai/dsh-llm": "0.2.2-rc.1",
     "@deepseek-ai/dsh-session": "0.2.2-rc.1",
     "@deepseek-ai/dsh-working-directory": "0.2.2-rc.1",
     "@types/jsdom": "^28.0.3",

package/src/client/ActivityBar.tsx

@@ -29,7 +29,11 @@ export function toggleActivityHidden(hidden: readonly string[], id: string): str
   return hidden.includes(id) ? hidden.filter(value => value !== id) : [...hidden, id]
 }
 
-/** VS Code-style activity bar: pointer drag with a floating ghost and live reordering, right-click hide. */
+/**
+ * VS Code-style activity bar: every view can be dragged into a new slot while `fixed` actions stay pinned on
+ * top and `bottom` actions stay pinned at the foot. Reordering is computed from pointer position so it keeps
+ * working when the DOM shifts under a fast drag.
+ */
 export function ActivityBar({ views, fixed, bottom = [], order, hidden, onOrderChange, onHiddenChange }: {
   views: ActivityView[]
   fixed: ActivityView[]
@@ -41,12 +45,18 @@ export function ActivityBar({ views, fixed, bottom = [], order, hidden, onOrderC
 }) {
   const [menu, setMenu] = useState<{ x: number; y: number; target?: string }>()
   const drag = useRef<{ id: string; x: number; y: number; active: boolean }>()
+  const draggingRef = useRef(false)
   const nodes = useRef(new Map<string, HTMLButtonElement>())
   const flip = useRef<Map<string, number>>()
-  const suppressClick = useRef(false)
+  const didDrag = useRef(false)
   const [draggingId, setDraggingId] = useState<string>()
   const [ghost, setGhost] = useState<{ x: number; y: number }>()
   const [preview, setPreview] = useState<string[]>()
+  const previewRef = useRef<string[]>()
+  const orderRef = useRef(order)
+  const visibleRef = useRef<ActivityView[]>([])
+  previewRef.current = preview
+  orderRef.current = order
 
   useEffect(() => {
     if (menu === undefined) return
@@ -62,6 +72,8 @@ export function ActivityBar({ views, fixed, bottom = [], order, hidden, onOrderC
     const before = flip.current
     flip.current = undefined
     if (before === undefined) return
+    // Reordering mid-drag must not animate: transformed rects would feed back into the next hit test.
+    if (draggingRef.current) return
     for (const [id, element] of nodes.current) {
       const previous = before.get(id)
       if (previous === undefined) continue
@@ -72,49 +84,77 @@ export function ActivityBar({ views, fixed, bottom = [], order, hidden, onOrderC
   })
 
   const visible = views.filter(view => !hidden.includes(view.id))
+  visibleRef.current = visible
   const currentOrder = preview ?? order
   const ordered = currentOrder.flatMap(id => visible.filter(view => view.id === id))
   const toggled = (id: string) => onHiddenChange(toggleActivityHidden(hidden, id))
   const target = menu?.target === undefined ? undefined : views.find(view => view.id === menu.target)
 
   const capturePositions = () => { flip.current = new Map([...nodes.current].map(([id, element]) => [id, element.getBoundingClientRect().top])) }
-  const beginDrag = (event: ReactPointerEvent<HTMLButtonElement>, id: string) => {
-    if (event.button !== 0) return
-    drag.current = { id, x: event.clientX, y: event.clientY, active: false }
-    event.currentTarget.setPointerCapture?.(event.pointerId)
-  }
-  const moveDrag = (event: ReactPointerEvent<HTMLButtonElement>, id: string) => {
+  const moveDrag = (clientX: number, clientY: number) => {
     const state = drag.current
-    if (state === undefined || state.id !== id) return
+    if (state === undefined) return
     if (!state.active) {
-      if (Math.abs(event.clientX - state.x) + Math.abs(event.clientY - state.y) < 5) return
-      state.active = true; setDraggingId(id)
+      if (Math.abs(clientX - state.x) + Math.abs(clientY - state.y) < 5) return
+      state.active = true
+      draggingRef.current = true
+      setDraggingId(state.id)
     }
-    setGhost({ x: event.clientX, y: event.clientY })
-    const element = (document.elementFromPoint(event.clientX, event.clientY) as HTMLElement | null)?.closest<HTMLElement>('[data-act-id]')
-    if (element === null || element === undefined) return
-    const targetId = element.dataset.actId
-    if (targetId === undefined || targetId === id || !visible.some(view => view.id === targetId)) return
-    const rect = element.getBoundingClientRect()
-    const ids = currentOrder.filter(value => visible.some(view => view.id === value))
-    const index = ids.indexOf(targetId)
-    if (index < 0) return
-    const next = moveActivity(currentOrder, id, event.clientY > rect.top + rect.height / 2 ? ids[index + 1] : targetId)
-    if (next.join('|') === currentOrder.join('|')) return
+    setGhost({ x: clientX, y: clientY })
+    const base = previewRef.current ?? orderRef.current
+    const visibleIds = new Set(visibleRef.current.map(view => view.id))
+    const slots = base.filter(id => visibleIds.has(id) && id !== state.id)
+    let index = 0
+    for (const id of slots) {
+      const element = nodes.current.get(id)
+      if (element === undefined) continue
+      const rect = element.getBoundingClientRect()
+      if (clientY > rect.top + rect.height / 2) index += 1
+    }
+    const next = moveActivity(base, state.id, slots[index])
+    if (next.join('|') === base.join('|')) return
     capturePositions()
+    previewRef.current = next
     setPreview(next)
   }
-  const endDrag = (event: ReactPointerEvent<HTMLButtonElement>) => {
-    const state = drag.current; drag.current = undefined
+  const endDrag = () => {
+    const state = drag.current
+    drag.current = undefined
     if (state?.active) {
-      suppressClick.current = true
-      window.setTimeout(() => { suppressClick.current = false }, 0)
-      if (preview !== undefined) onOrderChange(preview)
+      didDrag.current = true
+      const next = previewRef.current
+      if (next !== undefined) onOrderChange(next)
     }
-    event.currentTarget.releasePointerCapture?.(event.pointerId)
+    draggingRef.current = false
+    previewRef.current = undefined
+    setDraggingId(undefined); setGhost(undefined); setPreview(undefined)
+  }
+  const cancelDrag = () => {
+    drag.current = undefined
+    draggingRef.current = false
+    previewRef.current = undefined
     setDraggingId(undefined); setGhost(undefined); setPreview(undefined)
   }
-  const cancelDrag = () => { drag.current = undefined; setDraggingId(undefined); setGhost(undefined); setPreview(undefined) }
+  const handlers = useRef({ moveDrag, endDrag, cancelDrag })
+  handlers.current = { moveDrag, endDrag, cancelDrag }
+  useEffect(() => {
+    const move = (event: PointerEvent) => handlers.current.moveDrag(event.clientX, event.clientY)
+    const up = () => handlers.current.endDrag()
+    const cancel = () => handlers.current.cancelDrag()
+    window.addEventListener('pointermove', move)
+    window.addEventListener('pointerup', up)
+    window.addEventListener('pointercancel', cancel)
+    return () => {
+      window.removeEventListener('pointermove', move)
+      window.removeEventListener('pointerup', up)
+      window.removeEventListener('pointercancel', cancel)
+    }
+  }, [])
+  const beginDrag = (event: ReactPointerEvent<HTMLButtonElement>, id: string) => {
+    if (event.button !== 0) return
+    didDrag.current = false
+    drag.current = { id, x: event.clientX, y: event.clientY, active: false }
+  }
   const renderView = (view: ActivityView) => <button
     key={view.id}
     ref={element => { if (element === null) nodes.current.delete(view.id); else nodes.current.set(view.id, element) }}
@@ -125,17 +165,14 @@ export function ActivityBar({ views, fixed, bottom = [], order, hidden, onOrderC
     disabled={view.disabled}
     title={view.label}
     onPointerDown={event => beginDrag(event, view.id)}
-    onPointerMove={event => moveDrag(event, view.id)}
-    onPointerUp={event => endDrag(event)}
-    onPointerCancel={cancelDrag}
-    onClick={() => { if (!suppressClick.current) view.onActivate() }}
+    onClick={() => { if (didDrag.current) { didDrag.current = false; return } view.onActivate() }}
     onContextMenu={event => { event.preventDefault(); event.stopPropagation(); setMenu({ x: event.clientX, y: event.clientY, target: view.id }) }}
   >{view.icon}</button>
 
   return <>
     <nav className="dvw-activity" onContextMenu={event => { event.preventDefault(); setMenu({ x: event.clientX, y: event.clientY }) }}>
-      {ordered.length === 0 ? <span className="dvw-activity-empty" aria-hidden="true"/> : ordered.map(renderView)}
       {fixed.map(view => <button key={view.id} className="dvw-act" data-act-id={view.id} data-active={view.active} disabled={view.disabled} title={view.label} onClick={view.onActivate}>{view.icon}</button>)}
+      {ordered.length === 0 ? <span className="dvw-activity-empty" aria-hidden="true"/> : ordered.map(renderView)}
       <div className="dvw-activity-bottom">{bottom.map(view => <button key={view.id} className="dvw-act" data-act-id={view.id} data-active={view.active} disabled={view.disabled} title={view.label} onClick={view.onActivate}>{view.icon}</button>)}</div>
     </nav>
     {draggingId !== undefined && ghost !== undefined && <div className="dvw-activity-ghost" style={{ left: ghost.x, top: ghost.y }} aria-hidden="true">{views.find(view => view.id === draggingId)?.icon}</div>}

package/src/client/DshConversationPanel.tsx

@@ -46,7 +46,7 @@ export function DshConversationPanel({ visible, width, statusHeight }: { visible
 }
 
 /** Temporarily align the official DSH panel palette with a fixed workbench palette. */
-export function DshConversationTheme({ visible, colorScheme, followDsh }: { visible: boolean; colorScheme: 'dark' | 'light'; followDsh: boolean }) {
+export function DshConversationTheme({ visible, colorScheme, followDsh }: { visible: boolean; colorScheme: 'dark' | 'light' | 'white' | 'eyecare'; followDsh: boolean }) {
   useLayoutEffect(() => {
     if (!visible) return
     const body = document.body

package/src/client/DshMark.tsx

@@ -1,11 +1,11 @@
 /** Bundled DSH fish logo — self-contained, no dependence on host DOM. */
-const WHALE_VIEWBOX = '0 0 23.16 17.04'
-const WHALE_PATH = 'M22.9168 1.43018C22.6713 1.31018 22.5658 1.53918 22.4223 1.65519C22.3733 1.69269 22.3318 1.74169 22.2903 1.78669C21.9317 2.1697 21.5127 2.42121 20.9657 2.39121C20.1657 2.34621 19.4827 2.59771 18.8787 3.20973C18.7502 2.45521 18.3236 2.0047 17.6746 1.71569C17.3351 1.56568 16.9916 1.41518 16.7536 1.08867C16.5876 0.856163 16.5421 0.597155 16.4591 0.341647C16.4061 0.187643 16.3536 0.0301382 16.1761 0.00363739C15.9836 -0.0263635 15.9081 0.135141 15.8326 0.270145C15.5306 0.822162 15.4136 1.43018 15.4251 2.0462C15.4516 3.43174 16.0366 4.53527 17.1991 5.3203C17.3311 5.4103 17.3651 5.5003 17.3236 5.63181C17.2441 5.90231 17.1501 6.16482 17.0671 6.43533C17.0141 6.60784 16.9351 6.64584 16.7501 6.57033C16.1121 6.30383 15.5611 5.90931 15.074 5.4328C14.2475 4.63328 13.5 3.75075 12.568 3.05973C12.349 2.89822 12.13 2.74822 11.9034 2.60522C10.9524 1.68169 12.028 0.923165 12.277 0.833162C12.5375 0.739159 12.3675 0.41615 11.5259 0.42015C10.6844 0.42365 9.91439 0.705658 8.93286 1.08117C8.78935 1.13767 8.63835 1.17867 8.48384 1.21267C7.59332 1.04367 6.66829 1.00617 5.70226 1.11517C3.88321 1.31768 2.43016 2.1777 1.36213 3.64575C0.0790928 5.4103 -0.222916 7.41536 0.146595 9.50642C0.535106 11.7105 1.66014 13.535 3.38869 14.9616C5.18125 16.4406 7.24581 17.1657 9.60138 17.0266C11.0319 16.9441 12.6245 16.7526 14.421 15.2321C14.874 15.4576 15.3496 15.5476 16.1381 15.6151C16.7456 15.6716 17.3306 15.5851 17.7836 15.4911C18.4931 15.3411 18.4441 14.6841 18.1876 14.5636C16.1081 13.595 16.5646 13.9891 16.1496 13.67C17.2061 12.42 18.8202 10.1979 19.3182 7.17235C19.3672 6.83834 19.4297 6.36783 19.4222 6.09732C19.4182 5.93231 19.4562 5.86831 19.6447 5.84931C20.1657 5.78931 20.6712 5.64681 21.1357 5.3913C22.4833 4.65528 23.0268 3.44624 23.1548 1.9972C23.1738 1.77569 23.1508 1.54668 22.9168 1.43018ZM11.1749 14.4736C9.15936 12.889 8.18184 12.3675 7.77832 12.39C7.40081 12.4125 7.46881 12.8445 7.55182 13.126C7.63882 13.404 7.75182 13.5955 7.91033 13.8396C8.01983 14.0011 8.09533 14.2411 7.80083 14.4216C7.15181 14.8231 6.02327 14.2866 5.97027 14.2601C4.65673 13.4865 3.5587 12.4655 2.78467 11.069C2.03715 9.72493 1.60314 8.28289 1.53164 6.74384C1.51264 6.37233 1.62214 6.24082 1.99215 6.17332C2.47916 6.08332 2.98118 6.06432 3.46769 6.13582C5.52476 6.43633 7.27581 7.35586 8.74385 8.8129C9.58188 9.64243 10.2159 10.634 10.8689 11.6025C11.5634 12.631 12.3105 13.611 13.262 14.4146C13.598 14.6961 13.866 14.9101 14.1225 15.0681C13.349 15.1546 12.058 15.1731 11.1749 14.4746L11.1749 14.4736ZM12.141 8.25988C12.141 8.09488 12.273 7.96338 12.439 7.96338C12.4765 7.96338 12.5105 7.97088 12.541 7.98188C12.5825 7.99688 12.6205 8.01938 12.6505 8.05338C12.7035 8.10588 12.7335 8.18088 12.7335 8.25988C12.7335 8.42489 12.6015 8.55639 12.4355 8.55639C12.2695 8.55639 12.141 8.42489 12.141 8.25988ZM15.1415 9.79893C14.949 9.87793 14.7565 9.94544 14.5715 9.95294C14.2845 9.96794 13.9715 9.85143 13.8015 9.70893C13.5375 9.48742 13.3485 9.36342 13.2695 8.97691C13.2355 8.8119 13.2545 8.55639 13.2845 8.40989C13.3525 8.09438 13.277 7.89187 13.0545 7.70787C12.8735 7.55786 12.643 7.51636 12.39 7.51636C12.2955 7.51636 12.209 7.47486 12.1445 7.44136C12.039 7.38886 11.9519 7.25735 12.035 7.09585C12.0615 7.04335 12.19 6.91584 12.22 6.89334C12.5635 6.69784 12.9595 6.76184 13.326 6.90834C13.6655 7.04735 13.9225 7.30236 14.292 7.66287C14.6695 8.09838 14.7375 8.21838 14.9525 8.54539C15.1225 8.8009 15.277 9.06341 15.3831 9.36392C15.4471 9.55142 15.3641 9.70493 15.1415 9.79893Z'
+export const DSH_MARK_VIEWBOX = '0 0 23.16 17.04'
+export const DSH_MARK_PATH = 'M22.9168 1.43018C22.6713 1.31018 22.5658 1.53918 22.4223 1.65519C22.3733 1.69269 22.3318 1.74169 22.2903 1.78669C21.9317 2.1697 21.5127 2.42121 20.9657 2.39121C20.1657 2.34621 19.4827 2.59771 18.8787 3.20973C18.7502 2.45521 18.3236 2.0047 17.6746 1.71569C17.3351 1.56568 16.9916 1.41518 16.7536 1.08867C16.5876 0.856163 16.5421 0.597155 16.4591 0.341647C16.4061 0.187643 16.3536 0.0301382 16.1761 0.00363739C15.9836 -0.0263635 15.9081 0.135141 15.8326 0.270145C15.5306 0.822162 15.4136 1.43018 15.4251 2.0462C15.4516 3.43174 16.0366 4.53527 17.1991 5.3203C17.3311 5.4103 17.3651 5.5003 17.3236 5.63181C17.2441 5.90231 17.1501 6.16482 17.0671 6.43533C17.0141 6.60784 16.9351 6.64584 16.7501 6.57033C16.1121 6.30383 15.5611 5.90931 15.074 5.4328C14.2475 4.63328 13.5 3.75075 12.568 3.05973C12.349 2.89822 12.13 2.74822 11.9034 2.60522C10.9524 1.68169 12.028 0.923165 12.277 0.833162C12.5375 0.739159 12.3675 0.41615 11.5259 0.42015C10.6844 0.42365 9.91439 0.705658 8.93286 1.08117C8.78935 1.13767 8.63835 1.17867 8.48384 1.21267C7.59332 1.04367 6.66829 1.00617 5.70226 1.11517C3.88321 1.31768 2.43016 2.1777 1.36213 3.64575C0.0790928 5.4103 -0.222916 7.41536 0.146595 9.50642C0.535106 11.7105 1.66014 13.535 3.38869 14.9616C5.18125 16.4406 7.24581 17.1657 9.60138 17.0266C11.0319 16.9441 12.6245 16.7526 14.421 15.2321C14.874 15.4576 15.3496 15.5476 16.1381 15.6151C16.7456 15.6716 17.3306 15.5851 17.7836 15.4911C18.4931 15.3411 18.4441 14.6841 18.1876 14.5636C16.1081 13.595 16.5646 13.9891 16.1496 13.67C17.2061 12.42 18.8202 10.1979 19.3182 7.17235C19.3672 6.83834 19.4297 6.36783 19.4222 6.09732C19.4182 5.93231 19.4562 5.86831 19.6447 5.84931C20.1657 5.78931 20.6712 5.64681 21.1357 5.3913C22.4833 4.65528 23.0268 3.44624 23.1548 1.9972C23.1738 1.77569 23.1508 1.54668 22.9168 1.43018ZM11.1749 14.4736C9.15936 12.889 8.18184 12.3675 7.77832 12.39C7.40081 12.4125 7.46881 12.8445 7.55182 13.126C7.63882 13.404 7.75182 13.5955 7.91033 13.8396C8.01983 14.0011 8.09533 14.2411 7.80083 14.4216C7.15181 14.8231 6.02327 14.2866 5.97027 14.2601C4.65673 13.4865 3.5587 12.4655 2.78467 11.069C2.03715 9.72493 1.60314 8.28289 1.53164 6.74384C1.51264 6.37233 1.62214 6.24082 1.99215 6.17332C2.47916 6.08332 2.98118 6.06432 3.46769 6.13582C5.52476 6.43633 7.27581 7.35586 8.74385 8.8129C9.58188 9.64243 10.2159 10.634 10.8689 11.6025C11.5634 12.631 12.3105 13.611 13.262 14.4146C13.598 14.6961 13.866 14.9101 14.1225 15.0681C13.349 15.1546 12.058 15.1731 11.1749 14.4746L11.1749 14.4736ZM12.141 8.25988C12.141 8.09488 12.273 7.96338 12.439 7.96338C12.4765 7.96338 12.5105 7.97088 12.541 7.98188C12.5825 7.99688 12.6205 8.01938 12.6505 8.05338C12.7035 8.10588 12.7335 8.18088 12.7335 8.25988C12.7335 8.42489 12.6015 8.55639 12.4355 8.55639C12.2695 8.55639 12.141 8.42489 12.141 8.25988ZM15.1415 9.79893C14.949 9.87793 14.7565 9.94544 14.5715 9.95294C14.2845 9.96794 13.9715 9.85143 13.8015 9.70893C13.5375 9.48742 13.3485 9.36342 13.2695 8.97691C13.2355 8.8119 13.2545 8.55639 13.2845 8.40989C13.3525 8.09438 13.277 7.89187 13.0545 7.70787C12.8735 7.55786 12.643 7.51636 12.39 7.51636C12.2955 7.51636 12.209 7.47486 12.1445 7.44136C12.039 7.38886 11.9519 7.25735 12.035 7.09585C12.0615 7.04335 12.19 6.91584 12.22 6.89334C12.5635 6.69784 12.9595 6.76184 13.326 6.90834C13.6655 7.04735 13.9225 7.30236 14.292 7.66287C14.6695 8.09838 14.7375 8.21838 14.9525 8.54539C15.1225 8.8009 15.277 9.06341 15.3831 9.36392C15.4471 9.55142 15.3641 9.70493 15.1415 9.79893Z'
 
 export function DshMark({ size = 18 }: { size?: number }) {
   return (
-    <svg className="dvw-dsh-mark" width={size} height={(size * 17.04) / 23.16} viewBox={WHALE_VIEWBOX} fill="none" aria-hidden="true">
-      <path d={WHALE_PATH} fill="currentColor" />
+    <svg className="dvw-dsh-mark" width={size} height={(size * 17.04) / 23.16} viewBox={DSH_MARK_VIEWBOX} fill="none" aria-hidden="true">
+      <path d={DSH_MARK_PATH} fill="currentColor" />
     </svg>
   )
 }