Merge remote-tracking branch 'origin/master' into feat/web-message-feedback-ui

Adapt to two contract changes master introduced:

- The generated Remote face now wraps every business result in
  RemoteResult, folding carrier failures into an ok:false branch instead
  of rejecting. The controller reads that envelope at its three call
  sites and maps a carrier failure onto the same settled shape the
  controls already render; three specs cover the new branch.
- Client packages split their tsconfig into host and client halves, and
  the host aggregate now compiles any test not named *.client.spec.*.
  Rename this package's specs to the client convention and drop the
  ../connection project reference, which pointed at a solution file that
  no longer carries the client sources.

Keep master's mount loop with its rollback-on-failure in api-remotes and
add messageFeedbackRemote to it.

scripts/check-workspace-constraints.ts

@@ -53,7 +53,9 @@ const releaseMemberDirectory = /^(?:packages\/[^/]+\/[^/]+|apps\/[^/]+|vendor\/[
 const localArtifactDirs = new Set(['node_modules'])
 const appPackageFiles: Readonly<Record<string, readonly string[]>> = {
   '@deepseek-ai/dsh': ['lib/*.js', 'config'],
-  '@deepseek-ai/dsh-frontend': ['dist'],
+  // The Web build emits sourcemaps for browser debugging; publishing them is
+  // what the payload policy forbids, so the bundle ships without them.
+  '@deepseek-ai/dsh-frontend': ['dist', '!dist/**/*.map'],
 }
 
 /** The subset of package.json fields this constraint check cares about. */
@@ -152,7 +154,6 @@ function sameStringList(actual: readonly string[] | undefined, expected: readonl
 
 function expectedDshPackageFiles(manifest: PackageManifest): readonly string[] {
   const extras = manifest.name ? packageFileExtras[manifest.name] ?? [] : []
-  const typeRTRemoteNavigation = hasTypeRTRemoteNavigation(manifest)
   return [
     'lib/index.js',
     // Every package publishes its invariant ownership companion as a separate
@@ -185,13 +186,8 @@ function expectedDshPackageFiles(manifest: PackageManifest): readonly string[] {
     ...hasExportPair(manifest, './client/typert', './lib/typert.client.d.ts', './lib/typert.client.js')
       ? ['lib/typert.client.js', 'lib/typert.client.d.ts']
       : [],
-    ...typeRTRemoteNavigation
-      ? [
-        'lib/typert.remote-client.js',
-        'lib/typert.remote-client.d.ts',
-        'lib/typert.remote-client.d.ts.map',
-        'src',
-      ]
+    ...hasTypeRTRemoteNavigation(manifest)
+      ? ['lib/typert.remote-client.js', 'lib/typert.remote-client.d.ts']
       : [],
   ]
 }
@@ -270,9 +266,8 @@ function checkWorkspace({ dir, manifest }: WorkspaceManifest): string[] {
 
   if (manifest.name?.startsWith('@deepseek-ai/')) {
     const allowedSources = publicationSourceAllowlist[manifest.name] ?? []
-    const publicationPolicy = { typeRTRemoteNavigation: hasTypeRTRemoteNavigation(manifest) }
     for (const file of manifest.files ?? []) {
-      if (isForbiddenPublicationFile(file, publicationPolicy) && !allowedSources.includes(file)) {
+      if (isForbiddenPublicationFile(file) && !allowedSources.includes(file)) {
         errors.push(`${label}: package.json files must not publish ${JSON.stringify(file)}`)
       }
     }

scripts/oxlint-contract.spec.ts

@@ -53,7 +53,9 @@ describe('Oxlint executable contract', () => {
       ['host package source', 'packages/fs/fs-policy/src', 'packages/fs/fs-policy/tsconfig.json'],
       ['host package test', 'packages/fs/fs-policy/tests', 'tsconfig.host.json'],
       ['client package source', 'packages/client/ui-primitives/src', 'packages/client/ui-primitives/tsconfig.json'],
-      ['client package test', 'packages/client/ui-trajectory/tests', 'tsconfig.client.json'],
+      // A test under packages/client states its face in the filename, so the
+      // probe carries the Client suffix to reach the Client aggregate.
+      ['client package test', 'packages/client/ui-trajectory/tests', 'tsconfig.client.json', '.client.ts'],
       ['example', 'examples/headless-agent/tests', 'tsconfig.host.json'],
       ['website', 'website', 'tsconfig.host.json'],
     ] as const
@@ -66,8 +68,8 @@ probePromise()
 
     try {
       const paths: Array<readonly [label: string, path: string, tsconfig: string]> = []
-      for (const [label, parent, tsconfig] of probes) {
-        const path = join(repositoryRoot, parent, `oxlint-contract-${suffix}.ts`)
+      for (const [label, parent, tsconfig, extension = '.ts'] of probes) {
+        const path = join(repositoryRoot, parent, `oxlint-contract-${suffix}${extension}`)
         await writeFile(path, source)
         paths.push([label, relative(repositoryRoot, path), tsconfig])
       }
@@ -98,7 +100,8 @@ probePromise()
       expect(output).not.toContain('Unmatched file:')
     } finally {
       await Promise.all([
-        ...probes.map(([, parent]) => rm(join(repositoryRoot, parent, `oxlint-contract-${suffix}.ts`), { force: true })),
+        ...probes.map(([, parent, , extension = '.ts']) =>
+          rm(join(repositoryRoot, parent, `oxlint-contract-${suffix}${extension}`), { force: true })),
         rm(configPath, { force: true }),
       ])
     }

scripts/publication-payload.spec.ts

@@ -29,6 +29,9 @@ describe('publication payload policy', () => {
     String.raw`src\index.ts`,
     'lib/types/index.d.ts.map',
     './lib/types/index.d.ts.map',
+    'lib/typert.remote-client.d.ts.map',
+    'lib/client.js.map',
+    './lib/client.js.map',
   ])('rejects static manifest path %s', (file) => {
     expect(isForbiddenPublicationFile(file)).toBe(true)
   })
@@ -40,11 +43,19 @@ describe('publication payload policy', () => {
     ])).toThrow('fixture.tgz publishes source file package/src/index.ts')
   })
 
-  it('rejects declaration maps in packed tarballs', () => {
+  it('rejects source maps in packed tarballs', () => {
     expect(validateFixtureTarball([
       'package/package.json',
       'package/lib/types/index.d.ts.map',
-    ])).toThrow('fixture.tgz publishes declaration map package/lib/types/index.d.ts.map')
+    ])).toThrow('fixture.tgz publishes source map package/lib/types/index.d.ts.map')
+    expect(validateFixtureTarball([
+      'package/package.json',
+      'package/lib/typert.remote-client.d.ts.map',
+    ])).toThrow('fixture.tgz publishes source map package/lib/typert.remote-client.d.ts.map')
+    expect(validateFixtureTarball([
+      'package/package.json',
+      'package/lib/client.js.map',
+    ])).toThrow('fixture.tgz publishes source map package/lib/client.js.map')
   })
 
   it('accepts a clean packed tarball', () => {
@@ -56,19 +67,6 @@ describe('publication payload policy', () => {
     ])).not.toThrow()
   })
 
-  it('allows only the TypeRT declaration map and its navigable source tree when requested', () => {
-    const policy = { typeRTRemoteNavigation: true }
-    expect(isForbiddenPublicationFile('src/index.ts', policy)).toBe(false)
-    expect(isForbiddenPublicationFile('lib/typert.remote-client.d.ts.map', policy)).toBe(false)
-    expect(isForbiddenPublicationFile('lib/types/index.d.ts.map', policy)).toBe(true)
-    expect(() => {
-      validateTarballPayload([
-        'package/lib/typert.remote-client.d.ts.map',
-        'package/src/index.ts',
-      ], 'fixture.tgz', policy)
-    }).not.toThrow()
-  })
-
   it('recognizes only the canonical Host-for-Client export pair', () => {
     expect(hasTypeRTRemoteNavigation({
       exports: {

scripts/publication-payload.ts

@@ -1,11 +1,10 @@
 /** Publication payload policy shared by static manifests and packed tarballs. */
 
-/** Publication exceptions required for TypeRT declaration-map navigation. */
-export interface PublicationPayloadPolicy {
-  readonly typeRTRemoteNavigation?: boolean
-}
-
-/** Whether a package manifest exports generated Host-for-Client metadata with source navigation. */
+/**
+ * Whether a package manifest exports generated Host-for-Client metadata.
+ * @param manifest - parsed package manifest to inspect.
+ * @returns whether the canonical `./remote` export pair is present.
+ */
 export function hasTypeRTRemoteNavigation(manifest: unknown): boolean {
   if (manifest === null || typeof manifest !== 'object' || Array.isArray(manifest)) return false
   const exportsField = (manifest as Record<string, unknown>).exports
@@ -23,35 +22,34 @@ function payloadPath(file: string): string {
   return normalized.startsWith('package/') ? normalized.slice('package/'.length) : normalized
 }
 
-/** Whether a package payload path exposes source or declaration-map intermediates. */
-export function isForbiddenPublicationFile(
-  file: string,
-  policy: PublicationPayloadPolicy = {},
-): boolean {
+/**
+ * Whether a package payload path exposes source or map intermediates. Maps
+ * serve editor navigation during development, where a workspace consumer
+ * resolves their source through the package link; a published map resolves
+ * nothing, so no payload publishes one.
+ * @param file - manifest path or tarball member to classify.
+ * @returns whether publishing this path is forbidden.
+ */
+export function isForbiddenPublicationFile(file: string): boolean {
   const normalized = payloadPath(file)
-  if (policy.typeRTRemoteNavigation === true
-    && (normalized === 'src'
-      || normalized.startsWith('src/')
-      || normalized === 'lib/typert.remote-client.d.ts.map')) {
-    return false
-  }
   return normalized === 'src'
     || normalized.startsWith('src/')
     || normalized.endsWith('.d.ts.map')
+    || normalized.endsWith('.js.map')
 }
 
-/** Reject source and declaration-map members in a packed npm tarball. */
-export function validateTarballPayload(
-  files: readonly string[],
-  context: string,
-  policy: PublicationPayloadPolicy = {},
-): void {
+/**
+ * Reject source and map members in a packed npm tarball.
+ * @param files - tarball members to validate.
+ * @param context - tarball identity named in the failure.
+ */
+export function validateTarballPayload(files: readonly string[], context: string): void {
   for (const file of files) {
-    if (!isForbiddenPublicationFile(file, policy)) continue
+    if (!isForbiddenPublicationFile(file)) continue
     const normalized = payloadPath(file)
     if (normalized === 'src' || normalized.startsWith('src/')) {
       throw new Error(`${context} publishes source file ${file}`)
     }
-    throw new Error(`${context} publishes declaration map ${file}`)
+    throw new Error(`${context} publishes source map ${file}`)
   }
 }

scripts/publish-npm-baseline.ts

@@ -18,7 +18,7 @@ import { basename, dirname, isAbsolute, join, normalize, relative, resolve, sep
 import { createInterface } from 'node:readline/promises'
 import { pathToFileURL } from 'node:url'
 import { parseArgs } from 'node:util'
-import { hasTypeRTRemoteNavigation, validateTarballPayload } from './publication-payload.ts'
+import { validateTarballPayload } from './publication-payload.ts'
 
 const DEFAULT_REGISTRY = 'https://registry.npm.harnessment.com'
 const DEFAULT_OUTPUT_DIRECTORY = '.artifacts/npm-baseline'
@@ -323,9 +323,7 @@ class ReleaseBundle {
           throw new Error(`unexpected or duplicate packed package: ${artifact.name}`)
         }
         if (expected.origin === 'harness') {
-          validateTarballPayload(artifact.files, tarball, {
-            typeRTRemoteNavigation: hasTypeRTRemoteNavigation(artifact.manifest),
-          })
+          validateTarballPayload(artifact.files, tarball)
         }
         if (artifact.version !== version) {
           throw new Error(`${tarball} has version ${artifact.version}; expected ${version}`)
@@ -401,9 +399,7 @@ class ReleaseBundle {
       }
       const artifact = inspectTarball(path, runner)
       if (pkg.origin === 'harness') {
-        validateTarballPayload(artifact.files, pkg.tarball, {
-          typeRTRemoteNavigation: hasTypeRTRemoteNavigation(artifact.manifest),
-        })
+        validateTarballPayload(artifact.files, pkg.tarball)
       }
       if (artifact.name !== pkg.name || artifact.version !== this.manifest.version) {
         throw new Error(`tarball identity mismatch: ${pkg.tarball}`)

scripts/release/families.ts

@@ -11,7 +11,7 @@
 
 import { globSync, readFileSync } from 'node:fs'
 import { resolve } from 'node:path'
-import { hasTypeRTRemoteNavigation, validateTarballPayload } from '../publication-payload.ts'
+import { validateTarballPayload } from '../publication-payload.ts'
 
 /** Dependency sections that constrain publish order: a consumer must publish after its dependency. */
 const ORDER_SECTIONS = ['dependencies', 'optionalDependencies'] as const
@@ -225,9 +225,7 @@ class DshFamily extends ReleaseFamily {
    * @param files - every path inside its tarball.
    */
   validatePayload(member: ReleaseMember, files: readonly string[]): void {
-    validateTarballPayload(files, member.name, {
-      typeRTRemoteNavigation: hasTypeRTRemoteNavigation(member.manifest),
-    })
+    validateTarballPayload(files, member.name)
   }
 
   readonly installedEntry = { packageName: '@deepseek-ai/dsh', binPath: 'lib/bin.js' }

scripts/rescope-vendor.ts

@@ -89,9 +89,9 @@ const GENERIC_SKIPS: readonly GenericSkip[] = [
   // the creator flow stages and which id the roster reports.
   { file: 'packages/client/ui-agent-preset/src/client/AgentPresetSection.tsx', upstream: ['cordis'] },
   { file: 'packages/client/ui-agent-preset/src/client/index.ts', upstream: ['cordis'] },
-  { file: 'packages/client/ui-agent-preset/tests/apply.spec.ts', upstream: ['cordis'] },
-  { file: 'packages/client/ui-agent-preset/tests/locales.spec.ts', upstream: ['cordis'] },
-  { file: 'packages/client/ui-agent-preset/tests/section.spec.tsx', upstream: ['cordis'] },
+  { file: 'packages/client/ui-agent-preset/tests/apply.client.spec.ts', upstream: ['cordis'] },
+  { file: 'packages/client/ui-agent-preset/tests/locales.client.spec.ts', upstream: ['cordis'] },
+  { file: 'packages/client/ui-agent-preset/tests/section.client.spec.tsx', upstream: ['cordis'] },
   { file: 'apps/cli/tests/web-agent-presets.e2e.ts', upstream: ['cordis'] },
   { file: 'apps/web/tests/agent-preset-authoring.e2e.ts', upstream: ['cordis'] },
   { file: 'packages/preset/agent-presets/tests/session.spec.ts', upstream: ['cordis'] },
@@ -126,7 +126,7 @@ const POSTCONDITIONS: readonly PostCondition[] = [
   { file: 'knip.json', text: '@cordisjs', count: 0 },
   { file: 'pnpm-workspace.yaml', text: 'cordis@4.0.0-rc.7', count: 0 },
   // The preset ids in this table are product data, not package names.
-  { file: 'packages/client/ui-agent-preset/tests/locales.spec.ts', text: '[\'cordis\', \'presetCordisName\'', count: 1 },
+  { file: 'packages/client/ui-agent-preset/tests/locales.client.spec.ts', text: '[\'cordis\', \'presetCordisName\'', count: 1 },
   // The preset id the shipped composition documents to its own model.
   { file: 'apps/cli/config/agent-presets/cordis/agent.cordis.yml', text: 'The `cordis` agent preset', count: 1 },
   { file: 'apps/cli/config/agent-presets/cordis/agent.cordis.yml', text: 'corrupting the `cordis` preset', count: 1 },
@@ -330,7 +330,7 @@ const VENDORED_LIBRARY = /^@deepseek-ai\\/(cosmokit|schemastery)(\\/|$)/
   {
     // The real package references in files whose other `cordis` strings are preset ids.
     id: 'agent-preset-spec-framework-import',
-    file: 'packages/client/ui-agent-preset/tests/apply.spec.ts',
+    file: 'packages/client/ui-agent-preset/tests/apply.client.spec.ts',
     find: "import { Context } from 'cordis'",
     replace: "import { Context } from '@deepseek-ai/cordis'",
     expect: 1,

scripts/type-equiv.manifest.json

@@ -304,7 +304,7 @@
     {
       "doc": "docs/subsystems/commands.md",
       "symbol": "CommandInputDescriptor",
-      "source": "packages/interaction/commands/src/index.ts"
+      "source": "packages/interaction/commands/src/types.ts"
     },
     {
       "doc": "docs/subsystems/commands.md",
@@ -319,12 +319,12 @@
     {
       "doc": "docs/subsystems/commands.md",
       "symbol": "CommandResult",
-      "source": "packages/interaction/commands/src/index.ts"
+      "source": "packages/interaction/commands/src/types.ts"
     },
     {
       "doc": "docs/subsystems/commands.md",
       "symbol": "CommandDescriptor",
-      "source": "packages/interaction/commands/src/index.ts"
+      "source": "packages/interaction/commands/src/types.ts"
     },
     {
       "doc": "docs/subsystems/commands.md",

scripts/verify-cordis-config.ts

@@ -42,14 +42,17 @@ const metadataFields = ['id', 'name', 'group', 'disabled', 'inject', 'intercept'
 const CHOOSER_PACKAGE = '@deepseek-ai/dsh-host-directory-picker-auto'
 
 /**
- * The backends the chooser mounts by runtime string (mirror of its exported
- * `BACKEND_PACKAGES`), invisible to yml-row scanning: a composition mounting
- * the chooser must resolve both, or keyless Linux CI (which only ever
- * resolves `browse`) hides a dropped `-native` dependency until a macOS boot.
+ * The packages the chooser mounts by runtime string (mirror of its exported
+ * `BACKEND_PACKAGES` and `SURFACE_PACKAGES`), invisible to yml-row scanning: a
+ * composition mounting the chooser must resolve every one, or keyless Linux CI
+ * (which only ever resolves `browse`) hides a dropped `-native` dependency
+ * until a macOS boot.
  */
 const CHOOSER_BACKEND_PACKAGES = [
   '@deepseek-ai/dsh-host-directory-picker-native',
   '@deepseek-ai/dsh-host-directory-picker-browse',
+  '@deepseek-ai/dsh-client-ui-directory-picker',
+  '@deepseek-ai/dsh-client-ui-directory-picker-native',
 ]
 const jsExprType = new yaml.Type('tag:yaml.org,2002:js', {
   kind: 'scalar',

scripts/verify-package-readme-model-experience.ts

@@ -86,6 +86,8 @@ const SENTENCE_MODEL_EXPERIENCE: Readonly<Record<string, SentenceContract>> = {
   'packages/client/ui-question': { kind: 'indirect', reason: 'The package mounts dsh-tool-ask-user; that tool owns the model-visible schema and answer rendering.' },
   'packages/client/ui-trajectory': { kind: 'none', reason: 'Browser-side UI plugin layer; registers nothing model-facing.' },
   'packages/client/ui-workspace': { kind: 'none', reason: 'Browser-side UI plugin layer; registers nothing model-facing.' },
+  'packages/client/ui-directory-picker': { kind: 'none', reason: 'Browser-side directory-browsing surface; registers nothing model-facing.' },
+  'packages/client/ui-directory-picker-native': { kind: 'none', reason: 'Browser-side surface driving the host OS chooser; registers nothing model-facing.' },
   'packages/client/ui-theme': { kind: 'none', reason: 'Browser-side UI plugin layer; registers nothing model-facing.' },
   'packages/client/ui-settings': { kind: 'none', reason: 'Browser-side UI plugin layer; registers nothing model-facing.' },
   'packages/client/ui-settings-general': { kind: 'none', reason: 'Browser-side UI plugin layer; registers nothing model-facing.' },