dsh-better-display 0.3.0 → 0.3.2

package/src/client/primitive-labels.ts

@@ -14,22 +14,23 @@ export const markdownLabels: MarkdownLabels = {
 };
 
 export const readBlockLabels: ReadBlockLabels = {
+  codeLabel: '代码', wrapLabel: '自动换行', unwrapLabel: '不换行',
   window: (shown, total) => `显示 ${shown} / ${total} 行`,
   copy: '复制', copied: '已复制', collapseAria: '收起文件内容',
   expandAria: hidden => `展开其余 ${hidden} 行`, collapse: '收起', expand: hidden => `展开其余 ${hidden} 行`,
 };
 
 export const terminalBlockLabels: TerminalBlockLabels = {
-  signal: signal => `信号 ${signal}`, exitCode: code => `退出码 ${code}`,
+  signal: signal => `信号 ${signal}`, exitCode: code => `退出码 ${code}`, noExitCode: '无退出码',
   running: '执行中', failed: '失败', done: '已完成', copy: '复制', copied: '已复制',
   noOutput: '没有输出', collapseAria: '收起命令输出', collapse: '收起',
   expandAria: hidden => `展开其余 ${hidden} 行`, expand: hidden => `展开其余 ${hidden} 行`,
 };
 
 export const diffBlockLabels: DiffBlockLabels = {
+  codeLabel: '代码', wrapLabel: '自动换行', unwrapLabel: '不换行',
   copy: '复制', copied: '已复制', collapseAria: '收起差异', collapse: '收起',
   expandAria: hidden => `展开其余 ${hidden} 行`, expand: hidden => `展开其余 ${hidden} 行`,
-  files: count => `${count} 个文件`,
 };
 
 export const searchBlockLabels: SearchBlockLabels = {

package/src/client/tool-activity.ts

@@ -95,13 +95,13 @@ export function toolIdentity(entry: Pick<ToolActivityEntry, 'block' | 'draft'>)
   const block = entry.block;
   return {
     name: block ? 'kind' in block ? block.call?.name ?? entry.draft?.name ?? '工具调用' : block.name : entry.draft?.name ?? '工具调用',
-    raw: block ? 'kind' in block ? block.call?.argsRaw ?? entry.draft?.argsRaw ?? '' : block.argsRaw : entry.draft?.argsRaw ?? '',
+    raw: block ? 'kind' in block ? block.call?.argsRaw ?? entry.draft?.argsRaw ?? '' : ('argsRaw' in block ? block.argsRaw : '') : entry.draft?.argsRaw ?? '',
   };
 }
 
 /** Name and raw arguments of any call block, whether it has landed or is pending. */
 function childIdentity(block: ToolCallBlock): { name?: string; raw: string } {
-  if (!block || !('kind' in block)) return { name: block?.name, raw: block?.argsRaw ?? '' };
+  if (!block || !('kind' in block)) return { name: block?.name, raw: block && 'argsRaw' in block ? block.argsRaw : '' };
   return { name: block.call?.name, raw: block.call?.argsRaw ?? '' };
 }
 

package/tests/browser-auto-fold.tsx

@@ -43,7 +43,7 @@ const useReaderStore: ReaderProps['useStore'] = selector => selector(useSyncExte
 const props = {
   sessionId: 'auto-fold-fixture', useChat: selector => selector(chat),
   useSession: selector => selector(sessionSnapshot), useSessions: selector => selector(sessionsSnapshot),
-  useSessionPendingInteraction: selector => selector(pending),
+  useSessionStatus: selector => selector(new Map([['auto-fold-fixture', { running: true, pendingInteraction: pending.get('auto-fold-fixture'), completionUnread: false }]])),
   useStore: useReaderStore, actions: session.actions, openPrefs: prefs,
   t: key => key, renderSlot: (_name, _owner, options) => options?.fallback ?? null,
   renderSlotChain: (_name, _owner, options) => options?.fallback ?? null,

package/tests/browser-official-bridge.tsx

@@ -10,8 +10,10 @@ import { readImageToolview } from '@fixture/read-image-row';
 import { en as conversationEn } from '@fixture/tool-locale';
 import { officialChildren, installOfficialSlots, OFFICIAL_SEATS } from '../src/client/official-slots.js';
 import { OfficialActions, OfficialTool } from '../src/client/OfficialContent.js';
-import { Deliverables } from '@fixture/deliverables';
+import { DeliverablesTail } from '@fixture/deliverables';
 import { zh as deliverablesZh, en as deliverablesEn } from '@fixture/deliverables-locale';
+import { FileRouteAction } from '@fixture/open-in-app-action';
+import { zh as openInAppZh, en as openInAppEn } from '@fixture/open-in-app-locale';
 import { CopyAnswer } from '../src/client/Blocks.js';
 import { MotionMarkdown } from '../src/client/word-motion.js';
 import css from '../src/client/Reader.module.css';
@@ -32,7 +34,7 @@ const source = <T,>(initial: T) => {
 };
 const localeSource = source({ revision: 0 });
 let language = 'zh';
-const dictionaries: Record<string, any> = { deliverables: { zh: deliverablesZh, en: deliverablesEn }, conversation: { zh: conversationEn, en: conversationEn } };
+const dictionaries: Record<string, any> = { deliverables: { zh: deliverablesZh, en: deliverablesEn }, 'open-in-app': { zh: openInAppZh, en: openInAppEn }, conversation: { zh: conversationEn, en: conversationEn } };
 const locale = {
   ...localeSource,
   register(ns: string, dictionary: any) { dictionaries[ns] = dictionary; return () => { delete dictionaries[ns]; }; },
@@ -60,7 +62,7 @@ ctx.provide('remote', {
 });
 const binding = { key: 'session-a', ctx: new Context(), hooks: {}, keyedHooks: {}, props: { sessionId: 'session-a' } };
 const current = source(binding);
-slots.installScope('session', { current, resolve: (id: string) => id === binding.key ? binding : undefined, renderArea: (_b: any, props: any) => props.children });
+slots.installScope('session', { current, bindingSource: (target: any) => source(target === binding.key ? binding : undefined), renderArea: (_b: any, props: any) => props.children });
 const toolBlock = {
   kind: 'tool-result', callId: 'read-1', call: { name: 'read', args: { file_path: '/fixture/sample.ts', offset: 12 }, argsRaw: '{"file_path":"/fixture/sample.ts","offset":12}' },
   content: [{ type: 'text', text: '<path>/fixture/sample.ts</path>\n<type>file</type>\n<content>\n12: export const value = 1;\n</content>' }], isError: false, subCalls: [], time: 100, callTime: 10,
@@ -74,7 +76,7 @@ let stopMirror = () => {};
 slots.register({ name: 'root', children: {
   'conversation.chat.assistant-actions': { kind: 'list', scope: 'session' },
   'tool.call.toolview': { kind: 'keyed', scope: 'session' },
-  'conversation.chat.turnTail': { kind: 'chain', 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.input.overlay': { kind: 'list', scope: 'session' },
@@ -90,12 +92,18 @@ slots.provideRoot({ hooks: { sessions: source({ byId: { 'session-a': { cwd: '/fi
 const artifact = { path: '/fixture/report.pdf', description: '演示报告', seq: 42, index: 0 };
 const presentedOpen = source({});
 const presentedHost = source({ available: true, fileManager: 'finder' });
-slots.register({ name: 'conversation.chat.turnTail', locale: 'deliverables',
-  select: () => ({ produced: ['/fixture/sample.ts'], presented: [artifact] }),
-  inject: () => ({ hooks: { presentedOpen, presentedHost }, reloadPresentedHost: async () => {},
+const changesDiff = source({});
+const changesSummary = source({});
+const showCodeDiff = source(false);
+slots.register({ name: 'conversation.chat.turnTail', id: '@deepseek-ai/dsh-client-ui-deliverables', locale: 'deliverables',
+  children: { 'deliverables.file.actions': { kind: 'list', scope: 'session' } },
+  inject: () => ({ hooks: { changesDiff, showCodeDiff, presentedOpen, presentedHost, changesSummary },
+    loadChangesDiff: async () => {}, reloadPresentedHost: async () => {}, loadChangesSummary: async () => {},
     openPresented: async (...args: any[]) => { observations.opens.push(['presented', ...args]); },
+    openChanged: async () => {}, openChangesReview: () => {},
   }),
-}, Deliverables);
+}, DeliverablesTail);
+slots.register({ name: 'deliverables.file.actions', id: 'open-in-app', locale: 'open-in-app' }, FileRouteAction);
 let liveDetail = source('initial');
 const storeHandle = { create: () => {
   observations.mounts++;
@@ -122,7 +130,7 @@ function ReaderFixture({ renderSlot, renderSlotChain }: any) {
       <CopyAnswer blocks={[{ kind: 'text', text }]} extraActions={<OfficialActions official={official} messageId={'message-1' as any} />} />
     </article>
     <div data-reader-tool><OfficialTool {...blockProps} official={official} renderSlotChain={renderSlotChain} block={toolBlock as any} toolName="read" fallback={<span>fallback</span>} /></div>
-    {renderSlotChain(OFFICIAL_SEATS.tail, { openFile: blockProps.openFile, readerProducedPaths: ['/fixture/sample.ts'] })}
+    {renderSlot(OFFICIAL_SEATS.tail, { turn: { data: new Map([['deliverables', { changes: null, presented: [artifact] }]]) }, seq: 43, openFile: blockProps.openFile, readerProducedPaths: ['/fixture/sample.ts'] })}
     {renderSlot(OFFICIAL_SEATS.nodes, {}, { entryKey: 'future-widget', hookContext: 'turn-context' })}
     <button onClick={() => setText(text + '\n\n继续输出。')}>Append text</button>
   </div></main>;