dsh-better-display 0.3.2 → 0.3.4

package/src/client/native/tool-update.ts

@@ -0,0 +1,32 @@
+/** One developer tool-change block the 0.1.7-rc.2 context row names in place. */
+export interface ToolChangeBlock {
+  type: 'tool-addition' | 'tool-removal'
+  toolName: string
+}
+
+/** Names collected from a context whose every block is a tool change. */
+export interface ToolUpdateRows {
+  added: readonly string[]
+  removed: readonly string[]
+  /** The only block, when the row is a single add or removal. */
+  single: ToolChangeBlock | null
+}
+
+/**
+ * Classify a context as the rc.2 tool-update row.
+ * Mixed or empty content stays on the generic injection presentation.
+ * @param content - durable context blocks.
+ * @returns collected names, or null when any block is not a tool change.
+ */
+export function toolUpdateRows(content: readonly { readonly type: string; readonly toolName?: string }[]): ToolUpdateRows | null {
+  if (content.length === 0) return null
+  const rows: ToolChangeBlock[] = []
+  for (const block of content) {
+    if (block.type !== 'tool-addition' && block.type !== 'tool-removal') return null
+    if (typeof block.toolName !== 'string') return null
+    rows.push({ type: block.type, toolName: block.toolName })
+  }
+  const added = rows.flatMap(row => row.type === 'tool-addition' ? [row.toolName] : [])
+  const removed = rows.flatMap(row => row.type === 'tool-removal' ? [row.toolName] : [])
+  return { added, removed, single: rows.length === 1 ? rows[0]! : null }
+}

package/src/client/platform-media.ts

@@ -1,8 +1,14 @@
-/** RC2 Chat's same-origin local media contract. Authorization stays Host-side. */
+/** Web or Desktop file route. Authorization stays Host-side. */
 export function localPathMediaUrl(protocol: string, origin: string, value: string): string | undefined {
-  if (protocol !== 'http:' && protocol !== 'https:') return undefined;
   if (!value.startsWith('/') || value.startsWith('//')) return undefined;
-  return `${origin}/api/file?path=${encodeURIComponent(value)}`;
+  if (protocol === 'http:' || protocol === 'https:') {
+    return `${origin}/api/file?path=${encodeURIComponent(value)}`;
+  }
+  // Official fileMediaUrl accepts the Desktop application base dsh-app://app/.
+  if (protocol === 'dsh-app:' && origin === 'dsh-app://app') {
+    return `dsh-app://app/api/file?path=${encodeURIComponent(value)}`;
+  }
+  return undefined;
 }
 
 export const readerPathImages = {

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