dsh-better-display 0.3.0 → 0.3.4

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>;

package/tests/context-tool-update.test.ts

@@ -0,0 +1,33 @@
+import assert from 'node:assert/strict';
+import { test } from 'node:test';
+import { toolUpdateRows } from '../src/client/native/tool-update.js';
+
+test('a single tool addition is its own closed row', () => {
+  assert.deepEqual(toolUpdateRows([{ type: 'tool-addition', toolName: 'search' }]), {
+    added: ['search'],
+    removed: [],
+    single: { type: 'tool-addition', toolName: 'search' },
+  });
+});
+
+test('mixed tool changes stay one expandable update', () => {
+  assert.deepEqual(toolUpdateRows([
+    { type: 'tool-addition', toolName: 'search' },
+    { type: 'tool-addition', toolName: 'read_file' },
+    { type: 'tool-removal', toolName: 'old_search' },
+  ]), {
+    added: ['search', 'read_file'],
+    removed: ['old_search'],
+    single: null,
+  });
+});
+
+test('text or a missing tool name stays a generic context row', () => {
+  assert.equal(toolUpdateRows([{ type: 'text', toolName: 'search' }]), null);
+  assert.equal(toolUpdateRows([{ type: 'tool-addition' }]), null);
+  assert.equal(toolUpdateRows([]), null);
+  assert.equal(toolUpdateRows([
+    { type: 'tool-addition', toolName: 'search' },
+    { type: 'text' },
+  ]), null);
+});

package/tests/platform-media.test.ts

@@ -14,4 +14,10 @@ test('relative, protocol-relative and non-HTTP page paths are not sent to the Ho
     assert.equal(localPathMediaUrl('http:', 'http://local', path), undefined);
   }
   assert.equal(localPathMediaUrl('file:', 'null', '/tmp/image.png'), undefined);
+  assert.equal(localPathMediaUrl('dsh-app:', 'dsh-app://other', '/tmp/image.png'), undefined);
+});
+test('Desktop file routes use the application file API', () => {
+  const url = localPathMediaUrl('dsh-app:', 'dsh-app://app', '/tmp/a.png')!;
+  assert.equal(url.startsWith('dsh-app://app/api/file?'), true);
+  assert.equal(new URL(url).searchParams.get('path'), '/tmp/a.png');
 });

package/tests/stock-install.test.ts

@@ -3,6 +3,7 @@ import { existsSync, readFileSync } from 'node:fs';
 import { dirname, resolve } from 'node:path';
 import { test } from 'node:test';
 import { fileURLToPath } from 'node:url';
+import semver from 'semver';
 
 const root = resolve(dirname(fileURLToPath(import.meta.url)), '..');
 const pkg = JSON.parse(readFileSync(resolve(root, 'package.json'), 'utf8')) as {
@@ -11,8 +12,24 @@ const pkg = JSON.parse(readFileSync(resolve(root, 'package.json'), 'utf8')) as {
   exports: Record<string, { default?: string } | string>;
   files: string[];
   dsh: { bundle?: { patch?: string } };
+  peerDependencies: Record<string, string>;
 };
 
+const HARNESS_PEER = '>=0.2.0-rc.1 <0.2.1';
+
+test('Harness 0.2.0 peer range accepts the rc.1 and stable releases', () => {
+  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.1.7-rc.2', range), false, name);
+  }
+});
+
 test('declares dsh.bundle.patch so official add joins the profile layer stack', () => {
   assert.equal(pkg.dsh.bundle?.patch, './cordis.patch.yml');
   assert.equal(existsSync(resolve(root, 'cordis.patch.yml')), true);

package/tsdown.config.ts

@@ -1,21 +1,23 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join, resolve } from 'node:path';
-import { pathToFileURL } from 'node:url';
+import { pathToFileURL, fileURLToPath } from 'node:url';
 import type { TsdownPlugin, UserConfig } from 'tsdown';
 
-function resolveHarness(): string {
+const vendored = fileURLToPath(new URL('./tools/client-build.js', import.meta.url));
+
+function resolveHarnessAdapter(): string {
   const configured = process.env.DSHX_HARNESS?.trim();
-  if (configured) return resolve(configured);
+  if (configured) return join(resolve(configured), 'tools/dshx/src/client-build.js');
   const configPath = join(homedir(), '.config/dshx/harness');
   const recorded = existsSync(configPath) ? readFileSync(configPath, 'utf8').trim() : undefined;
   if (!recorded) {
     throw new Error('client rebuild requires a Harness root from DSHX_HARNESS or ~/.config/dshx/harness');
   }
-  return resolve(recorded);
+  return join(resolve(recorded), 'tools/dshx/src/client-build.js');
 }
 
-const adapter = join(resolveHarness(), 'tools/dshx/src/client-build.js');
+const adapter = existsSync(vendored) ? vendored : resolveHarnessAdapter();
 if (!existsSync(adapter)) throw new Error('externalClientBundle adapter is missing.');
 const { externalClientBundle } = await import(pathToFileURL(adapter).href);