dsh-better-display 0.3.9 → 0.3.10

package/lib/types/client/primitive-labels.js.map

@@ -1 +1 @@
-{"version":3,"file":"primitive-labels.js","sourceRoot":"","sources":["../../../src/client/primitive-labels.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"primitive-labels.js","sourceRoot":"","sources":["../../../src/client/primitive-labels.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-better-display",
-  "version": "0.3.9",
+  "version": "0.3.10",
   "description": "A calmer reading view for DeepSeek Harness: native process details, live reasoning, and clean final answers.",
   "type": "module",
   "license": "MIT",
@@ -56,30 +56,30 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "~4.0.4",
-    "@deepseek-ai/dsh-api-session-controller": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-attachment": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-client-store": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-client-ui-chat": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-client-ui-conversation": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-client-ui-primitives": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-client-ui-renderer": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-client-ui-session": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-client-ui-slots": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-client-ui-tool": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-session": ">=0.2.0-rc.1 <0.2.1",
-    "@deepseek-ai/dsh-util-workspace-path": ">=0.2.0-rc.1 <0.2.1",
+    "@deepseek-ai/dsh-api-session-controller": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-attachment": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-client-store": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-client-ui-chat": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-client-ui-conversation": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-client-ui-primitives": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-client-ui-renderer": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-client-ui-session": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-client-ui-slots": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-client-ui-tool": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-session": ">=0.2.1-rc.1 <0.2.2",
+    "@deepseek-ai/dsh-util-workspace-path": ">=0.2.1-rc.1 <0.2.2",
     "react": "^18.2.0"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-api-remotes": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-api-session-controller": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-client-connection": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-session-turn-outline": "0.2.0-rc.2",
+    "@deepseek-ai/dsh-api-remotes": "0.2.1-rc.5",
+    "@deepseek-ai/dsh-api-session-controller": "0.2.1-rc.5",
+    "@deepseek-ai/dsh-client-connection": "0.2.1-rc.5",
+    "@deepseek-ai/dsh-session-turn-outline": "0.2.1-rc.5",
     "@types/mdast": "^4.0.4",
     "@types/node": "^22.20.0",
     "@types/react": "~18.3.1",
     "lightningcss": "^1.33.0",
-    "tsdown": "^0.22.2",
+    "tsdown": "^0.23.2",
     "tsx": "^4.22.4",
     "typescript": "^6.0.3",
     "semver": "^7.7.2",
@@ -131,7 +131,8 @@
     "docs"
   ],
   "engines": {
-    "node": "^22.19.0 || >=24.0.0"
+    "node": "^22.19.0 || >=24.0.0",
+    "dsh": ">=0.2.1-rc.1 <0.2.2"
   },
   "repository": {
     "type": "git",

package/scripts/check-harness-compat.mjs

@@ -51,8 +51,10 @@ for (const path of execFileSync('rg', ['--files', 'packages/client', '-g', '*.ts
   visit(file);
 }
 registrations.sort();
+const harnessCommit = execFileSync('git', ['-C', harness, 'rev-parse', 'HEAD'], { encoding: 'utf8' }).trim();
 const current = {
   harnessVersion: JSON.parse(readFileSync(join(harness, 'packages/client/ui-chat/package.json'), 'utf8')).version,
+  harnessCommit,
   hashes, registrations,
 };
 if (process.argv.includes('--record')) {
@@ -63,8 +65,8 @@ if (process.argv.includes('--record')) {
   const changed = files.filter(file => current.hashes[file] !== baseline.hashes[file]);
   const added = registrations.filter(row => !baseline.registrations.includes(row));
   const removed = baseline.registrations.filter(row => !registrations.includes(row));
-  if (current.harnessVersion !== baseline.harnessVersion || changed.length || added.length || removed.length) {
-    console.error(JSON.stringify({ compatible: 'review-required', target: current.harnessVersion, changedContractsOrForkSources: changed, addedRegistrations: added, removedRegistrations: removed }, null, 2));
+  if (current.harnessVersion !== baseline.harnessVersion || current.harnessCommit !== baseline.harnessCommit || changed.length || added.length || removed.length) {
+    console.error(JSON.stringify({ compatible: 'review-required', target: current.harnessVersion, commit: current.harnessCommit, baselineCommit: baseline.harnessCommit, changedContractsOrForkSources: changed, addedRegistrations: added, removedRegistrations: removed }, null, 2));
     console.error('Review the differences and run the official bridge/visual tests. --record alone is not compatibility proof.');
     process.exitCode = 1;
   } else console.log(`Harness compatibility baseline passed (${current.harnessVersion}; ${registrations.length} official registrations).`);

package/scripts/link-harness-dependencies.mjs

@@ -1,9 +1,9 @@
-import { existsSync, mkdirSync, symlinkSync, realpathSync, readFileSync } from 'node:fs';
+import { existsSync, lstatSync, mkdirSync, readdirSync, readFileSync, realpathSync, rmSync, symlinkSync, unlinkSync } from 'node:fs';
 import { dirname, join, resolve } from 'node:path';
 import { createRequire } from 'node:module';
 
-const root = resolve(process.argv[2] || '');
-if (!process.argv[2] || !existsSync(join(root, 'tools/dshx/src/client-build.js'))) throw new Error('Pass a prepared Harness checkout.');
+const root = resolve(process.argv[2] || process.env.DSH_REPO || '');
+if (!root || !existsSync(join(root, 'tools/dshx/src/client-build.js'))) throw new Error('Pass a prepared Harness checkout, or set DSH_REPO.');
 const local = resolve('node_modules');
 mkdirSync(local, { recursive: true });
 const shared = {
@@ -24,23 +24,60 @@ const shared = {
   '@deepseek-ai/dsh-session': 'packages/core/session',
   '@deepseek-ai/dsh-util-workspace-path': 'packages/util/workspace-path',
 };
-function link(name, target) {
+function link(name, target, replace = false) {
   if (!existsSync(target)) throw new Error(`Missing Harness dependency target: ${name} (${target})`);
   const destination = join(local, name);
   mkdirSync(dirname(destination), { recursive: true });
-  if (existsSync(destination)) {
-    if (realpathSync(destination) !== realpathSync(target)) throw new Error(`Dependency mismatch: ${name}`);
-    return;
+  const stat = lstatSync(destination, { throwIfNoEntry: false });
+  if (stat) {
+    if (!replace && !stat.isSymbolicLink() && existsSync(destination)) return;
+    if (existsSync(destination) && realpathSync(destination) === realpathSync(target)) return;
+    rmSync(destination, { recursive: true, force: true });
   }
   symlinkSync(target, destination);
 }
-for (const [name, path] of Object.entries(shared)) link(name, join(root, path));
+function packageDir(resolver, name) {
+  try { return dirname(resolver.resolve(`${name}/package.json`)); }
+  catch { /* pnpm may leave the package only in the store. */ }
+  const store = join(root, 'node_modules/.pnpm');
+  const prefix = name.startsWith('@') ? `${name.slice(1).replace('/', '+')}@` : `${name}@`;
+  const scoped = name.startsWith('@');
+  const match = existsSync(store) ? readdirSync(store).find(entry => entry.startsWith(prefix) || (scoped && entry.startsWith(name.replace('/', '+') + '@'))) : undefined;
+  if (!match) throw new Error(`Missing Harness dependency: ${name}`);
+  const nested = join(store, match, 'node_modules', name);
+  if (!existsSync(join(nested, 'package.json'))) throw new Error(`Missing Harness dependency: ${name} (${nested})`);
+  return nested;
+}
+function declaredTypesExist(pkgDir) {
+  const manifest = JSON.parse(readFileSync(join(pkgDir, 'package.json'), 'utf8'));
+  const types = typeof manifest.types === 'string'
+    ? manifest.types
+    : manifest.exports?.['.']?.types;
+  return typeof types !== 'string' || existsSync(join(pkgDir, types));
+}
+function builtPackage(name) {
+  const runtime = process.env.DSH_RUNTIME || join(dirname(root), 'runtime-rc5');
+  const store = join(runtime, 'node_modules/.pnpm');
+  if (!existsSync(store)) return undefined;
+  const slug = `${name.replace('/', '+')}@`;
+  const match = readdirSync(store).find(entry => entry.startsWith(slug));
+  if (!match) return undefined;
+  const pkgDir = join(store, match, 'node_modules', name);
+  return existsSync(join(pkgDir, 'package.json')) && declaredTypesExist(pkgDir) ? pkgDir : undefined;
+}
+for (const [name, path] of Object.entries(shared)) {
+  const source = join(root, path);
+  const target = (name === '@deepseek-ai/cordis' || !declaredTypesExist(source)) ? (builtPackage(name) ?? source) : source;
+  link(name, target, true);
+}
 const require = createRequire(join(root, 'packages/client/ui-conversation/package.json'));
 const rootRequire = createRequire(join(root, 'package.json'));
-for (const name of ['react', '@types/react']) link(name, dirname(require.resolve(`${name}/package.json`)));
-for (const name of ['@types/node', 'typescript', 'tsdown', 'tsx']) link(name, dirname(rootRequire.resolve(`${name}/package.json`)));
+for (const name of ['react', '@types/react']) link(name, packageDir(require, name));
+for (const name of ['@types/node', 'typescript', 'tsdown', 'tsx']) link(name, packageDir(rootRequire, name));
 for (const name of ['@types/mdast', 'clsx', 'katex', 'mdast-util-from-markdown', 'mdast-util-gfm', 'mdast-util-math', 'micromark-core-commonmark', 'micromark-extension-gfm', 'micromark-extension-math', 'micromark-factory-space', 'micromark-util-character', 'micromark-util-classify-character', 'micromark-util-sanitize-uri', 'micromark-util-symbol', 'micromark-util-types']) {
-  link(name, join(root, 'packages/client/ui-primitives/node_modules', name));
+  const target = join(root, 'packages/client/ui-primitives/node_modules', name);
+  if (!existsSync(target)) continue;
+  link(name, target);
 }
 mkdirSync(join(local, '.bin'), { recursive: true });
 for (const name of ['typescript', 'tsdown']) {

package/src/client/OfficialContent.tsx

@@ -3,7 +3,7 @@ import type { AssistantActionOwnerProps, ChatConversationViewNode, ChatNode, Cha
 import { createSnapshotStore } from '@deepseek-ai/dsh-client-store';
 import type { AssistantBlock, ToolCallBlock } from '@deepseek-ai/dsh-client-ui-conversation/client';
 type MessageId = AssistantActionOwnerProps['messageId'];
-import { OFFICIAL_SEATS } from './official-slots.js';
+import { OFFICIAL_SEATS, readerGroupAction } from './official-slots.js';
 import type { BlockRenderProps } from './types.js';
 import { chatSeatProps } from './chat-seat.js';
 import { Blocks } from './Blocks.js';
@@ -42,17 +42,17 @@ function chatNodeOwner(render: BlockRenderProps, official: NonNullable<BlockRend
   return {
     cwd: render.cwd,
     openFile: render.openFile ?? (() => {}),
-    openSkill: () => {},
     forkAt: render.forkAt ?? (() => {}),
     inspectCall: callId => official.openView('trajectory', callId),
     loadImage: official.officialImageLoader,
-    renderMessageImages: images => official.renderSlot(OFFICIAL_SEATS.images, {
-      ...images, loadImage: official.officialImageLoader,
-    }),
     fileMentions: official.officialFileMentions,
   };
 }
 
+function nodeHookContext(turnData: unknown, disclosureReset: ReturnType<typeof createSnapshotStore<number>>) {
+  return { turnData, disclosureReset, useGroupAction: readerGroupAction };
+}
+
 export function OfficialNode({ node, fallback, ...render }: BlockRenderProps & { node: ChatConversationViewNode; fallback: ReactNode }) {
   const official = render.official;
   const [disclosureReset] = useState(() => createSnapshotStore(0));
@@ -61,7 +61,7 @@ export function OfficialNode({ node, fallback, ...render }: BlockRenderProps & {
   // The runtime node domain is open; the public SlotMap enumerates the known kinds.
   const renderNode = official.renderSlot as unknown as (key: string, owner: object, options: object) => ReactNode;
   return <div data-reader-official-node={node.kind} {...(node.kind === 'user' || node.kind === 'steering' ? chatSeatProps(node.kind, node.key) : {})}>
-    {renderNode(OFFICIAL_SEATS.nodes, { ...chatNodeOwner(render, official), node }, { entryKey: node.kind, hookContext: { turnData: turn?.data, disclosureReset }, fallback })}
+    {renderNode(OFFICIAL_SEATS.nodes, { ...chatNodeOwner(render, official), node }, { entryKey: node.kind, hookContext: nodeHookContext(turn?.data, disclosureReset), fallback })}
   </div>;
 }
 
@@ -95,7 +95,7 @@ export function OfficialAssistantBody({
   // slice is what a replacement that ignores groupPart actually receives.
   return renderNode(OFFICIAL_SEATS.nodes, { ...chatNodeOwner(render, official), node: view, groupPart: 'response' }, {
     entryKey: 'assistant-step',
-    hookContext: { turnData: turn?.data, disclosureReset },
+    hookContext: nodeHookContext(turn?.data, disclosureReset),
     fallback,
   });
 }

package/src/client/Reader.tsx

@@ -9,7 +9,7 @@ import { BlockBoundary, Blocks, contentBlocks, UserMessageActions } from './Bloc
 import { AssistantNode } from './AssistantNode.js';
 import { ToolActivity, ToolMedia } from './ToolActivity.js';
 import { OfficialNode, OfficialTail } from './OfficialContent.js';
-import { OFFICIAL_SEATS } from './official-slots.js';
+import { OFFICIAL_SEATS, readerGroupAction } from './official-slots.js';
 import { preparingLabel, readerFlow } from './tool-activity.js';
 import { Disclosure, ProcessFragment, RetiringTurns, StatusText, useMotionAllowed, usePinnedSelection, useReadingScroll } from './motion.js';
 import { StreamMotionContext } from './streaming.js';
@@ -198,17 +198,13 @@ const MainNode = memo(function MainNode({ useChat, nodeKey, boundary, pinned, pr
       const owner: ChatNodeOwnerProps & Pick<ReaderProps, 'sessionId'> = {
         cwd: render.cwd,
         openFile: render.openFile ?? (() => {}),
-        openSkill: () => {},
         forkAt: render.forkAt ?? (() => {}),
         inspectCall: callId => official.openView('trajectory', callId),
         loadImage: official.officialImageLoader,
-        renderMessageImages: images => official.renderSlot(OFFICIAL_SEATS.images, {
-          ...images, loadImage: official.officialImageLoader,
-        }),
         fileMentions: official.officialFileMentions,
         sessionId: render.sessionId,
       };
-      const options = { hookContext: { turnData: turn?.data, disclosureReset }, fallback };
+      const options = { hookContext: { turnData: turn?.data, disclosureReset, useGroupAction: readerGroupAction }, fallback };
       rendered = node.kind === 'user'
         ? official.renderSlot(OFFICIAL_SEATS.nodes, { ...owner, node }, { ...options, entryKey: 'user' })
         : official.renderSlot(OFFICIAL_SEATS.nodes, { ...owner, node }, { ...options, entryKey: 'steering' });

package/src/client/official-slots.tsx

@@ -1,5 +1,6 @@
-import { createElement, memo, useMemo, type ComponentType, type ReactNode } from 'react';
+import { createElement, memo, useEffect, useLayoutEffect, useMemo, useRef, type ComponentType, type ReactNode, type RefObject } from 'react';
 import type { Context } from '@deepseek-ai/cordis';
+import type { UseGroupAction } from '@deepseek-ai/dsh-client-ui-chat/client';
 import type { SlotEntryDef, SlotMap, SlotSpec, StoredEntry } from '@deepseek-ai/dsh-client-ui-slots';
 import type {} from '@deepseek-ai/dsh-client-ui-renderer/client';
 
@@ -18,7 +19,8 @@ export const OFFICIAL_SLOTS = {
   tools: 'tool.call.toolview',
   tail: 'conversation.chat.turnTail',
   nodes: 'conversation.chat.node',
-  images: 'conversation.message.images',
+  messageImages: 'conversation.chat.message.images',
+  userImages: 'conversation.chat.user.images',
 } as const;
 export type OfficialFamily = keyof typeof OFFICIAL_SLOTS;
 export const OFFICIAL_SEATS = {
@@ -26,7 +28,8 @@ export const OFFICIAL_SEATS = {
   tools: 'dsh-better-display.official.tools/tool.call.toolview',
   tail: 'dsh-better-display.official.tail/conversation.chat.turnTail',
   nodes: 'dsh-better-display.official.nodes/conversation.chat.node',
-  images: 'dsh-better-display.official.images/conversation.message.images',
+  messageImages: 'dsh-better-display.official.messageImages/conversation.chat.message.images',
+  userImages: 'dsh-better-display.official.userImages/conversation.chat.user.images',
 } as const;
 export type OfficialSeat = typeof OFFICIAL_SEATS[OfficialFamily];
 export const officialSeat = (family: OfficialFamily, source: string = OFFICIAL_SLOTS[family]) =>
@@ -52,10 +55,39 @@ declare module '@deepseek-ai/dsh-client-ui-slots' {
     'dsh-better-display.official.tools/tool.call.toolview': SlotMap['tool.call.toolview'];
     'dsh-better-display.official.tail/conversation.chat.turnTail': SlotMap['conversation.chat.turnTail'];
     'dsh-better-display.official.nodes/conversation.chat.node': SlotMap['conversation.chat.node'];
-    'dsh-better-display.official.images/conversation.message.images': SlotMap['conversation.message.images'];
+    'dsh-better-display.official.messageImages/conversation.chat.message.images': SlotMap['conversation.chat.message.images'];
+    'dsh-better-display.official.userImages/conversation.chat.user.images': SlotMap['conversation.chat.user.images'];
   }
 }
 
+/**
+ * Searchable hide for official nodes drawn outside the Chat flow viewport.
+ * The flow's own `useGroupAction` is not in scope here; this keeps the same
+ * `hidden="until-found"` contract so browser find can still reveal the row.
+ */
+export function useReaderGroupAction(hidden: boolean, reveal: () => void): RefObject<HTMLDivElement> {
+  const ref = useRef<HTMLDivElement>(null);
+  useLayoutEffect(() => {
+    const element = ref.current;
+    if (element === null) return;
+    if (hidden && element.contains(element.ownerDocument.activeElement)) {
+      reveal();
+      return;
+    }
+    if (hidden) element.setAttribute('hidden', 'until-found');
+    else element.removeAttribute('hidden');
+  }, [hidden, reveal]);
+  useEffect(() => {
+    const element = ref.current;
+    if (element === null) return;
+    element.addEventListener('beforematch', reveal);
+    return () => { element.removeEventListener('beforematch', reveal); };
+  }, [reveal]);
+  return ref;
+}
+
+export const readerGroupAction: UseGroupAction = useReaderGroupAction;
+
 // Reader draws these rows itself. Everything else, including future kinds, is
 // mirrored so the official renderer still runs inside the reading view.
 // 'user' and 'steering' stay mirrored (message-recall buttons and the like).
@@ -83,7 +115,8 @@ const EXPECTED: Record<OfficialFamily, Spec> = {
   tools: { kind: 'keyed', scope: 'session' },
   tail: { kind: 'list', scope: 'session' },
   nodes: { kind: 'keyed', scope: 'session' },
-  images: { kind: 'single', scope: 'session' },
+  messageImages: { kind: 'single', scope: 'session' },
+  userImages: { kind: 'single', scope: 'session' },
 };
 
 /**

package/src/client/primitive-labels.ts

@@ -21,6 +21,7 @@ export const readBlockLabels: ReadBlockLabels = {
 };
 
 export const terminalBlockLabels: TerminalBlockLabels = {
+  commandLine: line => `命令第 ${line} 行`,
   signal: signal => `信号 ${signal}`, exitCode: code => `退出码 ${code}`, noExitCode: '无退出码',
   running: '执行中', failed: '失败', done: '已完成', copy: '复制', copied: '已复制',
   noOutput: '没有输出', collapseAria: '收起命令输出', collapse: '收起',

package/tests/browser-official-bridge.tsx

@@ -78,7 +78,8 @@ slots.register({ name: 'root', children: {
   'tool.call.toolview': { kind: 'keyed', scope: 'session' },
   'conversation.chat.turnTail': { kind: 'list', scope: 'session' },
   'conversation.chat.node': { kind: 'keyed', scope: 'session', inject: { hooks: { turnData: (_s: any, value: any) => () => value } } },
-  'conversation.message.images': { kind: 'single', scope: 'session' },
+  'conversation.chat.message.images': { kind: 'single', scope: 'session' },
+  'conversation.chat.user.images': { kind: 'single', scope: 'session' },
   'conversation.input.overlay': { kind: 'list', scope: 'session' },
   'fixture.reader': { kind: 'single', scope: 'session' },
 } }, ({ SessionProvider, renderSlot }: any) => <SessionProvider>

package/tests/fixtures/reader-user-bubble.tsx

@@ -4,6 +4,7 @@ import { flushSync } from 'react-dom';
 import { SlotRegistry } from '@fixture/registry';
 import { createSlotRenderer } from '@fixture/renderer';
 import { UserMessageNodeView } from '@fixture/user-message';
+import { UserContent } from '@fixture/user-content';
 import { Reader } from '../../src/client/Reader.js';
 import { createReaderStore } from '../../src/client/store.js';
 import { OFFICIAL_SEATS, OFFICIAL_SLOTS, installOfficialSlots, officialChildren } from '../../src/client/official-slots.js';
@@ -81,16 +82,20 @@ function NativeColumn({ renderSlot, kind, text }: {
 }) {
   const node = messageNode(kind, text);
   const owner = {
-    cwd: '/fixture', openFile: () => {}, openSkill: () => {}, forkAt: () => {},
+    cwd: '/fixture', openFile: () => {}, forkAt: () => {},
     inspectCall: () => {}, loadImage: async () => null,
-    renderMessageImages: () => null, fileMentions: () => undefined, node,
+    fileMentions: () => undefined, node,
   };
   return (
     <div data-native={kind} style={{ width: '100%', maxWidth: 'var(--dsh-chat-content-width, 748px)', display: 'flex', flexDirection: 'column' }}>
       <div style={{ minWidth: 0 }}>
         {renderSlot(OFFICIAL_SLOTS.nodes, owner, {
           entryKey: kind,
-          hookContext: { turnData: node.location.turn.data, disclosureReset: { getSnapshot: () => 0, subscribe: () => () => {}, set: () => {} } },
+          hookContext: {
+            turnData: node.location.turn.data,
+            disclosureReset: { getSnapshot: () => 0, subscribe: () => () => {}, set: () => {} },
+            useGroupAction: () => ({ current: null }),
+          },
           fallback: null,
         })}
       </div>
@@ -98,22 +103,33 @@ function NativeColumn({ renderSlot, kind, text }: {
   );
 }
 
+function paddedTextBox(scope: ParentNode | null): Element | null {
+  if (!scope) return null;
+  const walker = document.createTreeWalker(scope, NodeFilter.SHOW_TEXT);
+  let node: Node | null;
+  while ((node = walker.nextNode())) {
+    if (!node.textContent?.trim()) continue;
+    const parent = node.parentElement;
+    if (!parent || parent.closest('button')) continue;
+    let element: HTMLElement | null = parent;
+    while (element && element !== scope) {
+      if (parseFloat(getComputedStyle(element).paddingTop) > 0) return element;
+      element = element.parentElement;
+    }
+    return parent;
+  }
+  return null;
+}
+
 function boxOf(root: ParentNode | null, kind: 'user' | 'steering' | 'pending') {
   const scope = kind === 'pending'
     ? root?.querySelector('[data-reader-pending-submission]')
     : root?.querySelector(`[data-reader-key="${kind}-key"]`);
-  if (!scope) return null;
-  if (kind === 'pending') {
-    return [...scope.children].find(element => element instanceof HTMLElement && element.querySelector('button') === null) ?? null;
-  }
-  const slot = scope.querySelector('[data-slot]');
-  return slot?.firstElementChild?.firstElementChild?.firstElementChild ?? null;
+  return paddedTextBox(scope ?? null);
 }
 
 function nativeBox(frame: ParentNode, kind: 'user' | 'steering') {
-  const column = frame.querySelector(`[data-native="${kind}"]`);
-  const slot = column?.querySelector('[data-slot]');
-  return slot?.firstElementChild?.firstElementChild?.firstElementChild ?? null;
+  return paddedTextBox(frame.querySelector(`[data-native="${kind}"]`));
 }
 
 function measure(element: Element | null) {
@@ -146,16 +162,15 @@ async function verify() {
         {...props as never}
         t={(props.t as ((key: string) => string) | undefined) ?? ((key: string) => key)}
         openFile={(props.openFile as (() => void) | undefined) ?? (() => {})}
-        openSkill={(props.openSkill as (() => void) | undefined) ?? (() => {})}
-        renderMessageImages={(props.renderMessageImages as (() => null) | undefined) ?? (() => null)}
       />
     );
     slots.register({ name: 'root', children: {
       'conversation.chat.node': { kind: 'keyed', scope: 'session', inject: { hooks: {
         turnData: (_: unknown, context: { turnData?: unknown }) => () => context.turnData,
         disclosure: (_: unknown, context: { disclosureReset?: { getSnapshot(): number } }) => () => context.disclosureReset,
+        groupAction: (_: unknown, context: { useGroupAction?: unknown }) => context.useGroupAction,
       } } },
-      'conversation.message.images': { kind: 'single', scope: 'session' },
+      'conversation.chat.message.images': { kind: 'single', scope: 'session' },
       'fixture.reader': { kind: 'single', scope: 'session' },
     } }, ({ SessionProvider, renderSlot }: any) => (
       <SessionProvider>
@@ -182,6 +197,13 @@ async function verify() {
         ))}
       </>
     ));
+    slots.registerFactory({
+      name: 'conversation.chat.user.content', scope: 'session', locale: 'chat',
+      children: { 'conversation.chat.user.images': { kind: 'single', scope: 'session' } },
+    }, UserContent);
+    slots.registerFactory({
+      name: 'conversation.user.text', scope: 'session', locale: 'chat',
+    }, ({ text }: { text: string }) => <>{text}</>);
     slots.register({ name: 'conversation.chat.node', key: 'user', locale: 'chat' }, HostUser);
     slots.register({ name: 'conversation.chat.node', key: 'steering', locale: 'chat' }, HostUser);
     const stopMirror = installOfficialSlots(ctx);

package/tests/reader-user-bubble.test.ts

@@ -48,6 +48,7 @@ test('reader user and steering bubbles match the host column cap', { skip, timeo
         '@fixture/registry': join(harness, 'packages/client/ui-renderer/src/client/registry.ts'),
         '@fixture/renderer': join(harness, 'packages/client/ui-renderer/src/client/scoped-slots.tsx'),
         '@fixture/user-message': join(harness, 'packages/client/ui-chat/src/client/chat/MessageItem.tsx'),
+        '@fixture/user-content': join(harness, 'packages/client/ui-chat/src/client/chat/UserContent.tsx'),
         '@deepseek-ai/dsh-client-ui-primitives': join(harness, 'packages/client/ui-primitives/src/index.ts'),
         '@deepseek-ai/dsh-client-ui-slots': join(harness, 'packages/client/ui-slots/src/index.ts'),
         '@deepseek-ai/dsh-client-store': join(harness, 'packages/client/store/src/index.ts'),

package/tests/stock-install.test.ts

@@ -16,19 +16,23 @@ const pkg = JSON.parse(readFileSync(resolve(root, 'package.json'), 'utf8')) as {
   peerDependencies: Record<string, string>;
 };
 
-const HARNESS_PEER = '>=0.2.0-rc.1 <0.2.1';
+const HARNESS_PEER = '>=0.2.1-rc.1 <0.2.2';
 
-test('Harness 0.2.0 peer range accepts the rc.1 and stable releases', () => {
+test('Harness 0.2.1 peer range accepts rc.5 and rejects the 0.2.0 series', () => {
   const peers = Object.entries(pkg.peerDependencies).filter(([name]) => name.startsWith('@deepseek-ai/dsh-'));
   assert.ok(peers.length >= 12);
   for (const [name, range] of peers) {
     assert.equal(range, HARNESS_PEER, name);
-    assert.equal(semver.satisfies('0.2.0-rc.2', range), true, name);
-    assert.equal(semver.satisfies('0.2.0', range), true, name);
-    assert.equal(semver.satisfies('0.2.0-alpha.1', range), false, name);
-    assert.equal(semver.satisfies('0.2.0-alpha', range), false, name);
+    assert.equal(semver.satisfies('0.2.1-rc.5', range), true, name);
+    assert.equal(semver.satisfies('0.2.1-rc.1', range), true, name);
+    assert.equal(semver.satisfies('0.2.1', range), true, name);
+    assert.equal(semver.satisfies('0.2.1-alpha.1', range), false, name);
+    assert.equal(semver.satisfies('0.2.0-rc.2', range), false, name);
+    assert.equal(semver.satisfies('0.2.0', range), false, name);
     assert.equal(semver.satisfies('0.1.7-rc.2', range), false, name);
   }
+  const manifest = JSON.parse(readFileSync(resolve(root, 'package.json'), 'utf8')) as { engines?: { dsh?: string } };
+  assert.equal(manifest.engines?.dsh, HARNESS_PEER);
 });
 
 test('declares dsh.bundle.patch so official add joins the profile layer stack', () => {