@deepseek-harness-tui/dsh-tui 0.8.5 → 0.8.7

package/cordis.patch.yml

@@ -41,14 +41,17 @@
 #
 # The model-facing plugin set moves INTO the agent-presets roster: every
 # session composes its tools/prompt sections from one preset directory
-# (standard/code/minimal/cordis) instead of the host rows below. The dsh CLI's
-# profile-boot sees this composition's `agent-presets` row and overlays the
-# shipped `config/agent-presets/` root onto it automatically, so the row here
-# carries no roots; `$DSH_HOME/.agent-presets` (user-authored presets) is
-# appended by the roster itself (`includeUserRoot` default). Mirroring the
-# official dsh-web-app patch: every dsh-base row a preset now owns is
-# disabled here, so a minimal agent does not leak host-layer tools (an agent's
-# registry view resolves agent → preset → global).
+# (standard/code/minimal/cordis) instead of the host rows below. The TUI's
+# roster row uses the scoped `dsh-tui-agent-presets` id and carries the
+# shipped `config/agent-presets/` system root itself (derived from the dsh
+# CLI installation through the launcher-maintained `profiles/node_modules`
+# fallback link), because the official profile-boot root overlay only targets
+# the unscoped `agent-presets` id that surface bundles own. The roster itself
+# appends `$DSH_HOME/.agent-presets` (user-authored presets,
+# `includeUserRoot` default). Mirroring the official dsh-web-app patch: every
+# dsh-base row a preset now owns is disabled here, so a minimal agent does not
+# leak host-layer tools (an agent's registry view resolves agent → preset →
+# global).
 
 - id: agent-instructions
   disabled: true
@@ -162,21 +165,32 @@
     # Workspace grouping is a separate durable ledger, not a cwd-derived
     # projection. Mount the same domain stack and storage root as dsh-web-app
     # so TUI-created sessions can attach to the exact registry Web reads.
-    - id: storage
+    #
+    # The six rows below own host-plane services that the official web-app
+    # bundle may already mount. Loader entry ids are process-global, so these
+    # rows use dsh-tui-* scoped ids and self-disable when an enabled row with
+    # the official id/name is already present in the tree. The disabled check
+    # is evaluated during the same include update that inserts every row, so
+    # it sees the web-app rows regardless of their activation state.
+    - id: dsh-tui-storage
       name: '@deepseek-ai/dsh-storage'
+      disabled: !!js "[...ctx.loader.entries()].some(entry => entry.options.id === 'storage' && entry.options.name === '@deepseek-ai/dsh-storage' && !entry.disabled)"
 
-    - id: storage-json
+    - id: dsh-tui-storage-json
       name: '@deepseek-ai/dsh-storage-json'
+      disabled: !!js "[...ctx.loader.entries()].some(entry => entry.options.id === 'storage-json' && entry.options.name === '@deepseek-ai/dsh-storage-json' && !entry.disabled)"
       config:
         root: !!js dshHomePath('storages')
 
-    - id: storage-domain
+    - id: dsh-tui-storage-domain
       name: '@deepseek-ai/dsh-storage-domain'
+      disabled: !!js "[...ctx.loader.entries()].some(entry => entry.options.id === 'storage-domain' && entry.options.name === '@deepseek-ai/dsh-storage-domain' && !entry.disabled)"
       config:
         backend: json
 
-    - id: workspace
+    - id: dsh-tui-workspace
       name: '@deepseek-ai/dsh-workspace'
+      disabled: !!js "[...ctx.loader.entries()].some(entry => entry.options.id === 'workspace' && entry.options.name === '@deepseek-ai/dsh-workspace' && !entry.disabled)"
 
     # Generic terminal workspace registry. Optional plugins add providers;
     # the TUI itself always supplies LOCAL and has no provider-specific code.
@@ -217,23 +231,35 @@
       name: '@deepseek-harness-tui/dsh-tui/extensions'
 
     # The agent-preset roster (issue #8): `ctx.agentPresets`, the service the
-    # TUI composes every session's model-facing world from. No `roots` here —
-    # the dsh CLI's profile-boot overlays its shipped `config/agent-presets/`
-    # directory (standard/code/minimal/cordis, system trust) onto this row
-    # whenever a composition carries it, and the roster itself appends the
-    # user-authored `$DSH_HOME/.agent-presets` root. A boot that never reached
-    # profile-boot (bare `dsh --config cordis.yml`) leaves the roster empty;
-    # the TUI then keeps its pre-presets behavior (see presets.ts).
-    - id: agent-presets
+    # TUI composes every session's model-facing world from. The scoped row
+    # carries the official CLI's shipped `config/agent-presets/` directory
+    # (standard/code/minimal/cordis, system trust) through the
+    # launcher-maintained profiles/node_modules fallback link; the roster
+    # itself appends `$DSH_HOME/.agent-presets` (user-authored presets,
+    # `includeUserRoot` default). A boot that never reached profile-boot
+    # leaves the system root empty and the roster finds only user presets.
+    - id: dsh-tui-agent-presets
       name: '@deepseek-ai/dsh-agent-presets'
+      disabled: !!js "[...ctx.loader.entries()].some(entry => entry.options.id === 'agent-presets' && entry.options.name === '@deepseek-ai/dsh-agent-presets' && !entry.disabled)"
       config:
         default: standard
+        roots: !!js >-
+          (() => {
+            const base = ctx.baseUrl
+            if (!base) return undefined
+            const root = new URL('../node_modules/@deepseek-ai/dsh/config/agent-presets/', base)
+            let path = decodeURIComponent(root.pathname)
+            if (/^\/[A-Za-z]:/.test(path)) path = path.slice(1)
+            return [{ path, trust: 'system' }]
+          })()
 
     # Host-plane services the `cordis` preset's plugin-experimentation tool
     # waits on (dynamicCordisRunner/cordisInspect); dsh-base carries no such
-    # row — the official web app inserts it the same way.
-    - id: cordis-host-runner
+    # row — the official web app inserts it the same way, so this copy yields
+    # to it when it is already present.
+    - id: dsh-tui-cordis-host-runner
       name: '@deepseek-ai/dsh-cordis-host-runner'
+      disabled: !!js "[...ctx.loader.entries()].some(entry => entry.options.id === 'cordis-host-runner' && entry.options.name === '@deepseek-ai/dsh-cordis-host-runner' && !entry.disabled)"
 
     # The interactive front door. The plugin creates/resumes its agent at
     # runtime, seeds the startup status line, and disposes the whole app tree

package/dsh-ecosystem-spec/protocols/profile-definitions.d.ts

@@ -1,13 +1,13 @@
-import type { ApiReference, ProtocolCatalog, ProtocolDefinition } from '@dsh-std/core'
-export { registerTuiContributionExtensions } from './tui-contributions.js'
-export * from './tui-channel.js'
-
-export const DECISION_EVENTS: Readonly<ApiReference & {
-  apiVersion: 'tui.dsh/v1alpha1'
-  kind: 'DecisionEvents'
-}>
-
-export const decisionEventsDefinition: ProtocolDefinition
-export const profileDefinitions: readonly ProtocolDefinition[]
-
-export function registerProfileProtocols(catalog: ProtocolCatalog): () => void
+import type { ApiReference, ProtocolCatalog, ProtocolDefinition } from '@dsh-std/core'
+export { registerTuiContributionExtensions } from './tui-contributions.js'
+export * from './tui-channel.js'
+
+export const DECISION_EVENTS: Readonly<ApiReference & {
+  apiVersion: 'tui.dsh/v1alpha1'
+  kind: 'DecisionEvents'
+}>
+
+export const decisionEventsDefinition: ProtocolDefinition
+export const profileDefinitions: readonly ProtocolDefinition[]
+
+export function registerProfileProtocols(catalog: ProtocolCatalog): () => void

package/dsh-ecosystem-spec/protocols/profile-definitions.js

@@ -1,59 +1,59 @@
-/** dsh-TUI private protocol definitions evaluated by @dsh-std/core. */
-
-export { registerTuiContributionExtensions } from './tui-contributions.js'
-export * from './tui-channel.js'
-import { tuiChannelDefinition } from './tui-channel.js'
-
-export const DECISION_EVENTS = Object.freeze({
-  apiVersion: 'tui.dsh/v1alpha1',
-  kind: 'DecisionEvents',
-})
-
-function featureSupport(value, label) {
-  if (value === undefined) return Object.freeze({ features: Object.freeze([]) })
-  if (typeof value !== 'object' || value === null || Array.isArray(value)) {
-    throw new TypeError(`${label} support spec must be an object`)
-  }
-  const unknown = Object.keys(value).filter(key => key !== 'features' && !key.startsWith('x-'))
-  if (unknown.length > 0) throw new TypeError(`${label} support spec contains unknown field ${JSON.stringify(unknown[0])}`)
-  if (value.features !== undefined && (!Array.isArray(value.features)
-    || value.features.some(feature => typeof feature !== 'string' || feature.trim() === ''))) {
-    throw new TypeError(`${label} support spec.features must be an array of non-empty strings`)
-  }
-  return Object.freeze({ features: Object.freeze([...(value.features ?? [])].sort()) })
-}
-
-function providerDefinition(reference, label) {
-  return Object.freeze({
-    ...reference,
-    validateRequirement(value) {
-      if (value !== undefined) throw new TypeError(`${label} requirement does not accept spec in manifest v0.15`)
-      return undefined
-    },
-    validateSupport(value) { return featureSupport(value, label) },
-    negotiate(input) {
-      const providers = [...new Set(input.supports.map(row => row.participant))].sort()
-      const issues = input.requirements.flatMap(row => providers.length === 0
-        ? [{
-            code: row.requirement.optional === true ? 'optional-support-missing' : 'required-support-missing',
-            severity: row.requirement.optional === true ? 'warning' : 'error',
-            participant: row.participant,
-            message: `${label} has no provider in this negotiation scope`,
-          }]
-        : [])
-      return { agreement: Object.freeze({ providers: Object.freeze(providers) }), issues: Object.freeze(issues) }
-    },
-  })
-}
-
-export const decisionEventsDefinition = providerDefinition(DECISION_EVENTS, 'DecisionEvents')
-
-export const profileDefinitions = Object.freeze([
-  decisionEventsDefinition,
-  tuiChannelDefinition,
-])
-
-export function registerProfileProtocols(catalog) {
-  const disposers = profileDefinitions.map(definition => catalog.register(definition))
-  return () => { for (const dispose of disposers.reverse()) dispose() }
-}
+/** dsh-TUI private protocol definitions evaluated by @dsh-std/core. */
+
+export { registerTuiContributionExtensions } from './tui-contributions.js'
+export * from './tui-channel.js'
+import { tuiChannelDefinition } from './tui-channel.js'
+
+export const DECISION_EVENTS = Object.freeze({
+  apiVersion: 'tui.dsh/v1alpha1',
+  kind: 'DecisionEvents',
+})
+
+function featureSupport(value, label) {
+  if (value === undefined) return Object.freeze({ features: Object.freeze([]) })
+  if (typeof value !== 'object' || value === null || Array.isArray(value)) {
+    throw new TypeError(`${label} support spec must be an object`)
+  }
+  const unknown = Object.keys(value).filter(key => key !== 'features' && !key.startsWith('x-'))
+  if (unknown.length > 0) throw new TypeError(`${label} support spec contains unknown field ${JSON.stringify(unknown[0])}`)
+  if (value.features !== undefined && (!Array.isArray(value.features)
+    || value.features.some(feature => typeof feature !== 'string' || feature.trim() === ''))) {
+    throw new TypeError(`${label} support spec.features must be an array of non-empty strings`)
+  }
+  return Object.freeze({ features: Object.freeze([...(value.features ?? [])].sort()) })
+}
+
+function providerDefinition(reference, label) {
+  return Object.freeze({
+    ...reference,
+    validateRequirement(value) {
+      if (value !== undefined) throw new TypeError(`${label} requirement does not accept spec in manifest v0.15`)
+      return undefined
+    },
+    validateSupport(value) { return featureSupport(value, label) },
+    negotiate(input) {
+      const providers = [...new Set(input.supports.map(row => row.participant))].sort()
+      const issues = input.requirements.flatMap(row => providers.length === 0
+        ? [{
+            code: row.requirement.optional === true ? 'optional-support-missing' : 'required-support-missing',
+            severity: row.requirement.optional === true ? 'warning' : 'error',
+            participant: row.participant,
+            message: `${label} has no provider in this negotiation scope`,
+          }]
+        : [])
+      return { agreement: Object.freeze({ providers: Object.freeze(providers) }), issues: Object.freeze(issues) }
+    },
+  })
+}
+
+export const decisionEventsDefinition = providerDefinition(DECISION_EVENTS, 'DecisionEvents')
+
+export const profileDefinitions = Object.freeze([
+  decisionEventsDefinition,
+  tuiChannelDefinition,
+])
+
+export function registerProfileProtocols(catalog) {
+  const disposers = profileDefinitions.map(definition => catalog.register(definition))
+  return () => { for (const dispose of disposers.reverse()) dispose() }
+}

package/dsh-ecosystem-spec/protocols/tui-channel-http.d.ts

@@ -1,15 +1,15 @@
-export const TUI_CHANNEL_HTTP_API_VERSION: 'tui.dsh/v1alpha1'
-export const TUI_CHANNEL_HTTP_KIND: 'ChannelEndpoint'
-export const TUI_CHANNEL_HTTP_HEALTH_PATH: '/dsh-tui/v1/health'
-export const TUI_CHANNEL_HTTP_DESCRIPTOR_PATH: '/dsh-tui/v1/endpoint'
-export const TUI_CHANNEL_HTTP_WEBSOCKET_PATH: '/dsh-tui/v1/connection'
-
-export interface TuiChannelEndpointDescriptor {
-  readonly apiVersion: typeof TUI_CHANNEL_HTTP_API_VERSION
-  readonly kind: typeof TUI_CHANNEL_HTTP_KIND
-  readonly origin: string
-  readonly connection: typeof TUI_CHANNEL_HTTP_WEBSOCKET_PATH
-}
-
-export function createTuiChannelEndpointDescriptor(origin: string): TuiChannelEndpointDescriptor
-export function validateTuiChannelEndpointDescriptor(value: unknown): TuiChannelEndpointDescriptor
+export const TUI_CHANNEL_HTTP_API_VERSION: 'tui.dsh/v1alpha1'
+export const TUI_CHANNEL_HTTP_KIND: 'ChannelEndpoint'
+export const TUI_CHANNEL_HTTP_HEALTH_PATH: '/dsh-tui/v1/health'
+export const TUI_CHANNEL_HTTP_DESCRIPTOR_PATH: '/dsh-tui/v1/endpoint'
+export const TUI_CHANNEL_HTTP_WEBSOCKET_PATH: '/dsh-tui/v1/connection'
+
+export interface TuiChannelEndpointDescriptor {
+  readonly apiVersion: typeof TUI_CHANNEL_HTTP_API_VERSION
+  readonly kind: typeof TUI_CHANNEL_HTTP_KIND
+  readonly origin: string
+  readonly connection: typeof TUI_CHANNEL_HTTP_WEBSOCKET_PATH
+}
+
+export function createTuiChannelEndpointDescriptor(origin: string): TuiChannelEndpointDescriptor
+export function validateTuiChannelEndpointDescriptor(value: unknown): TuiChannelEndpointDescriptor

package/dsh-ecosystem-spec/protocols/tui-channel-http.js

@@ -1,32 +1,32 @@
-export const TUI_CHANNEL_HTTP_API_VERSION = 'tui.dsh/v1alpha1'
-export const TUI_CHANNEL_HTTP_KIND = 'ChannelEndpoint'
-export const TUI_CHANNEL_HTTP_HEALTH_PATH = '/dsh-tui/v1/health'
-export const TUI_CHANNEL_HTTP_DESCRIPTOR_PATH = '/dsh-tui/v1/endpoint'
-export const TUI_CHANNEL_HTTP_WEBSOCKET_PATH = '/dsh-tui/v1/connection'
-
-export function createTuiChannelEndpointDescriptor(origin) {
-  const normalized = new URL(origin)
-  if (normalized.protocol !== 'http:' && normalized.protocol !== 'https:') {
-    throw new TypeError('TUI Channel endpoint origin must use http or https')
-  }
-  normalized.pathname = '/'
-  normalized.search = ''
-  normalized.hash = ''
-  return Object.freeze({
-    apiVersion: TUI_CHANNEL_HTTP_API_VERSION,
-    kind: TUI_CHANNEL_HTTP_KIND,
-    origin: normalized.toString().replace(/\/$/u, ''),
-    connection: TUI_CHANNEL_HTTP_WEBSOCKET_PATH,
-  })
-}
-
-export function validateTuiChannelEndpointDescriptor(value) {
-  if (typeof value !== 'object' || value === null || Array.isArray(value)) throw new TypeError('TUI Channel endpoint descriptor must be an object')
-  if (value.apiVersion !== TUI_CHANNEL_HTTP_API_VERSION || value.kind !== TUI_CHANNEL_HTTP_KIND) {
-    throw new TypeError('TUI Channel endpoint descriptor version or kind is unsupported')
-  }
-  if (typeof value.origin !== 'string') throw new TypeError('TUI Channel endpoint origin must be a string')
-  createTuiChannelEndpointDescriptor(value.origin)
-  if (value.connection !== TUI_CHANNEL_HTTP_WEBSOCKET_PATH) throw new TypeError('TUI Channel endpoint connection path is unsupported')
-  return value
-}
+export const TUI_CHANNEL_HTTP_API_VERSION = 'tui.dsh/v1alpha1'
+export const TUI_CHANNEL_HTTP_KIND = 'ChannelEndpoint'
+export const TUI_CHANNEL_HTTP_HEALTH_PATH = '/dsh-tui/v1/health'
+export const TUI_CHANNEL_HTTP_DESCRIPTOR_PATH = '/dsh-tui/v1/endpoint'
+export const TUI_CHANNEL_HTTP_WEBSOCKET_PATH = '/dsh-tui/v1/connection'
+
+export function createTuiChannelEndpointDescriptor(origin) {
+  const normalized = new URL(origin)
+  if (normalized.protocol !== 'http:' && normalized.protocol !== 'https:') {
+    throw new TypeError('TUI Channel endpoint origin must use http or https')
+  }
+  normalized.pathname = '/'
+  normalized.search = ''
+  normalized.hash = ''
+  return Object.freeze({
+    apiVersion: TUI_CHANNEL_HTTP_API_VERSION,
+    kind: TUI_CHANNEL_HTTP_KIND,
+    origin: normalized.toString().replace(/\/$/u, ''),
+    connection: TUI_CHANNEL_HTTP_WEBSOCKET_PATH,
+  })
+}
+
+export function validateTuiChannelEndpointDescriptor(value) {
+  if (typeof value !== 'object' || value === null || Array.isArray(value)) throw new TypeError('TUI Channel endpoint descriptor must be an object')
+  if (value.apiVersion !== TUI_CHANNEL_HTTP_API_VERSION || value.kind !== TUI_CHANNEL_HTTP_KIND) {
+    throw new TypeError('TUI Channel endpoint descriptor version or kind is unsupported')
+  }
+  if (typeof value.origin !== 'string') throw new TypeError('TUI Channel endpoint origin must be a string')
+  createTuiChannelEndpointDescriptor(value.origin)
+  if (value.connection !== TUI_CHANNEL_HTTP_WEBSOCKET_PATH) throw new TypeError('TUI Channel endpoint connection path is unsupported')
+  return value
+}

package/dsh-ecosystem-spec/protocols/tui-channel.d.ts

@@ -1,59 +1,59 @@
-import type { ApiReference, ProtocolDefinition } from '@dsh-std/core'
-
-export type JsonValue = null | boolean | number | string | readonly JsonValue[] | { readonly [key: string]: JsonValue }
-
-export const TUI_CHANNEL: Readonly<ApiReference & {
-  apiVersion: 'tui.dsh/v1alpha1'
-  kind: 'Channel'
-}>
-export const TUI_CHANNEL_WIRE_REVISION: 6
-export const TUI_CHANNEL_FEATURES: readonly string[]
-
-export interface TuiChannelRequirementSpec {
-  readonly wireRevision: number
-  readonly features: readonly string[]
-}
-export interface TuiChannelSupportSpec extends TuiChannelRequirementSpec {}
-
-export interface TuiChannelSnapshot {
-  readonly wireRevision: number
-  readonly channelId: string
-  readonly version: number
-  readonly state: Readonly<Record<string, JsonValue>>
-}
-
-export interface TuiChannelWorkspaceFlowChoice {
-  readonly id: string
-  readonly label: string
-  readonly description?: string
-  readonly badge?: string
-  readonly action: string
-  readonly input?: {
-    readonly action: string
-    readonly initialValue?: string
-    readonly placeholder?: string
-  }
-}
-
-export type TuiChannelWorkspaceFlowResult =
-  | { readonly kind: 'target'; readonly target: import('./tui-contributions.js').WorkspaceTarget }
-  | { readonly kind: 'choices'; readonly title: string; readonly choices: readonly TuiChannelWorkspaceFlowChoice[] }
-
-export type TuiChannelInput =
-  | { readonly operation: 'open'; readonly value: { readonly workspace?: string; readonly sessionId?: string; readonly options?: JsonValue } }
-  | { readonly operation: 'subscribe'; readonly value: { readonly channelId: string; readonly afterVersion: number } }
-  | { readonly operation: 'invoke'; readonly value: { readonly channelId: string; readonly method: string; readonly arguments: readonly JsonValue[] } }
-  | { readonly operation: 'close'; readonly value: { readonly channelId: string } }
-
-export interface TuiChannelInvokeOutput {
-  readonly value: JsonValue
-  readonly valueDefined?: boolean
-  readonly snapshot?: TuiChannelSnapshot
-}
-
-export const tuiChannelDefinition: ProtocolDefinition
-export function validateTuiChannelRequirement(value: unknown): TuiChannelRequirementSpec
-export function validateTuiChannelSupport(value: unknown): TuiChannelSupportSpec
-export function validateTuiChannelInput(operation: string, value: unknown): object
-export function validateTuiChannelSnapshot(value: unknown): TuiChannelSnapshot
-export function validateTuiChannelOutput(operation: string, value: unknown): object
+import type { ApiReference, ProtocolDefinition } from '@dsh-std/core'
+
+export type JsonValue = null | boolean | number | string | readonly JsonValue[] | { readonly [key: string]: JsonValue }
+
+export const TUI_CHANNEL: Readonly<ApiReference & {
+  apiVersion: 'tui.dsh/v1alpha1'
+  kind: 'Channel'
+}>
+export const TUI_CHANNEL_WIRE_REVISION: 6
+export const TUI_CHANNEL_FEATURES: readonly string[]
+
+export interface TuiChannelRequirementSpec {
+  readonly wireRevision: number
+  readonly features: readonly string[]
+}
+export interface TuiChannelSupportSpec extends TuiChannelRequirementSpec {}
+
+export interface TuiChannelSnapshot {
+  readonly wireRevision: number
+  readonly channelId: string
+  readonly version: number
+  readonly state: Readonly<Record<string, JsonValue>>
+}
+
+export interface TuiChannelWorkspaceFlowChoice {
+  readonly id: string
+  readonly label: string
+  readonly description?: string
+  readonly badge?: string
+  readonly action: string
+  readonly input?: {
+    readonly action: string
+    readonly initialValue?: string
+    readonly placeholder?: string
+  }
+}
+
+export type TuiChannelWorkspaceFlowResult =
+  | { readonly kind: 'target'; readonly target: import('./tui-contributions.js').WorkspaceTarget }
+  | { readonly kind: 'choices'; readonly title: string; readonly choices: readonly TuiChannelWorkspaceFlowChoice[] }
+
+export type TuiChannelInput =
+  | { readonly operation: 'open'; readonly value: { readonly workspace?: string; readonly sessionId?: string; readonly options?: JsonValue } }
+  | { readonly operation: 'subscribe'; readonly value: { readonly channelId: string; readonly afterVersion: number } }
+  | { readonly operation: 'invoke'; readonly value: { readonly channelId: string; readonly method: string; readonly arguments: readonly JsonValue[] } }
+  | { readonly operation: 'close'; readonly value: { readonly channelId: string } }
+
+export interface TuiChannelInvokeOutput {
+  readonly value: JsonValue
+  readonly valueDefined?: boolean
+  readonly snapshot?: TuiChannelSnapshot
+}
+
+export const tuiChannelDefinition: ProtocolDefinition
+export function validateTuiChannelRequirement(value: unknown): TuiChannelRequirementSpec
+export function validateTuiChannelSupport(value: unknown): TuiChannelSupportSpec
+export function validateTuiChannelInput(operation: string, value: unknown): object
+export function validateTuiChannelSnapshot(value: unknown): TuiChannelSnapshot
+export function validateTuiChannelOutput(operation: string, value: unknown): object