dsh-ptc-plus 0.4.2 → 0.4.8

package/src/client-workbench.js

@@ -1,4 +1,5 @@
 import { blankBinding, editableBinding, bindingPayload } from './client-bindings-data.js'
+import { isHostIconComponent } from './client-host-compat.js'
 
 /**
  * User Bindings workbench. The controller owns every piece of edit state in one
@@ -320,7 +321,7 @@ export function createUserBindingsWorkbench(React, deps) {
           h(ActionButton, {
             type: 'button', className: 'ptcPlusButton', 'data-kind': 'primary', disabled: !canCreate,
             onClick: create,
-          }, typeof icons.plus === 'function' ? h(icons.plus, { size: 16 }) : null, t('bindings.new')))),
+          }, isHostIconComponent(icons.plus) ? h(icons.plus, { size: 16 }) : null, t('bindings.new')))),
       state.catalog === null
         ? h('p', {
             // A failed read publishes its error on the shared source; without it
@@ -333,7 +334,7 @@ export function createUserBindingsWorkbench(React, deps) {
         : h('div', { className: 'ptcPlusBindingsGrid' },
             h('div', { className: 'ptcPlusBindingPane' },
               h('label', { className: 'ptcPlusSearch' },
-                typeof icons.search === 'function' ? h(icons.search, { size: 16 }) : null,
+                isHostIconComponent(icons.search) ? h(icons.search, { size: 16 }) : null,
                 h('input', { value: state.query, onChange: event => patch({ query: event.target.value }),
                   placeholder: t('bindings.search'), 'aria-label': t('bindings.search') })),
               state.catalog.error === undefined
@@ -414,7 +415,7 @@ export function createUserBindingsWorkbench(React, deps) {
                   h('span', { className: 'ptcPlusSourceFilename' }, state.draft.name ? `${state.draft.name}.ts` : '')),
                 h('div', { className: 'ptcPlusSourceActions' }, state.editing ? null
                   : h(ActionButton, { disabled: state.busy, onClick: () => patch({ editing: true, sourceOpen: true }) },
-                    typeof icons.edit === 'function' ? h(icons.edit, { size: 14 }) : null, t('bindings.edit'))),
+                    isHostIconComponent(icons.edit) ? h(icons.edit, { size: 14 }) : null, t('bindings.edit'))),
                 h('div', { className: 'ptcPlusSourceBody', hidden: !state.sourceOpen },
                   state.editing
                     ? h(TypeScriptEditor, { documentId: state.documentId, value: state.draft.source, disabled: state.busy,
@@ -483,11 +484,13 @@ export function createUserBindingsWorkbench(React, deps) {
     const content = React.useRef(null)
     const localReturnFocus = React.useRef(null)
     const returnFocus = returnFocusRef ?? localReturnFocus
-    React.useEffect(() => {
+    const attachContent = React.useCallback(element => {
+      content.current = element
+      if (element === null) return
       const previous = document.activeElement
       // A resumed mount may have no focused control; keep the last valid entry.
-      if (!content.current.contains(previous) && canReturnFocus(previous)) returnFocus.current = previous
-      content.current.querySelector('button')?.focus()
+      if (!element.contains(previous) && canReturnFocus(previous)) returnFocus.current = previous
+      element.querySelector('button')?.focus()
     }, [returnFocus])
     const close = () => {
       const target = canReturnFocus(returnFocus.current) ? returnFocus.current : getReturnFocus?.()
@@ -508,7 +511,7 @@ export function createUserBindingsWorkbench(React, deps) {
       }
     }
     return h(Modal, { open: true, onClose: close, title: t('bindings.title'), headless: true, className: 'ptcPlusBindingsModal' },
-      h('div', { className: 'ptcPlusBindingsDialog', ref: content, onKeyDown: trapFocus },
+      h('div', { className: 'ptcPlusBindingsDialog', ref: attachContent, onKeyDown: trapFocus },
         h('div', { className: 'ptcPlusBindingsDialogHead' },
           h('h2', null, t('bindings.title')),
           h('button', { type: 'button', className: 'ptcPlusDialogClose', onClick: close,

package/src/client.js

@@ -9,6 +9,9 @@ import { createIndicatorView } from './client-indicator-view.js'
 import { createTypeScriptEditor } from './client-code-editor.js'
 import { createBindingConsole } from './client-console.js'
 import {
+  createMenuChildrenEvidence,
+  hostIconComponents,
+  isHostIconComponent,
   isIdleSessionComposer,
   publishSettingsCard,
   sessionUsesPtcPreset,
@@ -32,34 +35,37 @@ window.__ModuleLoader__.load({
   id: __PTC_PLUS_CLIENT_MODULE_ID__,
   factory: (require) => {
     const React = require('react')
+    const primitives = require('@deepseek-ai/dsh-client-ui-primitives')
     const {
       Button,
       CodeBlock,
       DisclosureRow,
-      IconCheckOutline14,
-      IconChevronDownOutline14,
-      IconInspectOutline12,
-      IconSparkle16,
-      IconCloseOutline16,
-      IconSearchOutline16,
-      IconPlusOutline16,
-      IconRefreshOutline16,
-      IconTrashOutline16,
-      IconEditOutline16,
-      IconPlayOutline16,
-      IconStopFill16,
       Menu,
       Modal,
       Toast,
       Tooltip,
-    } = require('@deepseek-ai/dsh-client-ui-primitives')
+    } = primitives
+    const {
+      check: IconCheckOutline14,
+      chevron: IconChevronDownOutline14,
+      inspect: IconInspectOutline12,
+      sparkle: IconSparkle16,
+      close: IconCloseOutline16,
+      search: IconSearchOutline16,
+      plus: IconPlusOutline16,
+      refresh: IconRefreshOutline16,
+      trash: IconTrashOutline16,
+      edit: IconEditOutline16,
+      play: IconPlayOutline16,
+      stop: IconStopFill16,
+    } = hostIconComponents(primitives)
     const module = { exports: {} }
     const h = React.createElement
     const TypeScriptEditor = createTypeScriptEditor(React)
 
     function IconButton({ icon: Icon, label, ...props }) {
       const button = h('button', { ...props, type: 'button', className: 'ptcPlusIconButton',
-        'aria-label': label, title: label }, typeof Icon === 'function' ? h(Icon, { size: 16 }) : label)
+        'aria-label': label, title: label }, isHostIconComponent(Icon) ? h(Icon, { size: 16 }) : label)
       return typeof Tooltip === 'function' ? h(Tooltip, { label, delayMs: 400 }, button) : button
     }
 
@@ -79,9 +85,40 @@ window.__ModuleLoader__.load({
       icons: { chevron: IconChevronDownOutline14, check: IconCheckOutline14, inspect: IconInspectOutline12 },
     })
 
+    /**
+     * Resolve the settings transport of the running generation. The current
+     * release publishes `configForms`; the preceding one published
+     * `settingsScope`. Both are optional child injections so the client entry
+     * does not stay pending on the name the installed generation does not use.
+     */
+    function settingsPreferenceScope(ctx) {
+      return new Promise((resolve, reject) => {
+        let settled = false
+        let configFormsWatcher
+        let settingsScopeWatcher
+        const take = (name, scope) => {
+          if (settled) return
+          settled = true
+          if (name !== 'configForms' && typeof configFormsWatcher === 'function') configFormsWatcher()
+          if (name !== 'settingsScope' && typeof settingsScopeWatcher === 'function') settingsScopeWatcher()
+          resolve(name === 'configForms'
+            ? scope.configForms.get(SETTINGS_NAMESPACE)
+            : scope.settingsScope.bind({ namespace: SETTINGS_NAMESPACE }))
+        }
+        try {
+          configFormsWatcher = ctx.inject(['configForms'], scope => take('configForms', scope))
+          if (!settled) {
+            settingsScopeWatcher = ctx.inject(['settingsScope'], scope => take('settingsScope', scope))
+          }
+        } catch (error) {
+          reject(error)
+        }
+      })
+    }
+
     async function apply(ctx) {
       const rpc = await createClientRpc(ctx)
-      const preferenceScope = ctx.settingsScope.bind({ namespace: SETTINGS_NAMESPACE })
+      const preferenceScope = await settingsPreferenceScope(ctx)
       ctx.effect(() => ctx.locale.register(LOCALE_NS, SETTINGS_COPY), 'ptc-plus: settings dictionaries')
       ctx.effect(installStyles, 'ptc-plus: client styles')
 
@@ -215,10 +252,12 @@ window.__ModuleLoader__.load({
       }
 
       const subscribeReset = listener => ctx.on('connection/reset', listener)
+      // One probe answer serves every session's composer entry for this Client.
+      const menuChildren = createMenuChildrenEvidence()
       const { BindingAuthorButton, BindingReviewDock, BindingCommandCard } = createAuthoringView(React, {
         ActionButton, IconButton, Menu, Toast, Tooltip, CodeBlock, BindingsDialog, PTCPlusSettingsDialog,
         useWorkbenchController, useBindingReview, catalogOwner, callUserBindings, subscribeReset,
-        settingsCardSeat: settingsCard.seat, updateSetting,
+        settingsCardSeat: settingsCard.seat, updateSetting, menuChildren,
         icons: {
           sparkle: IconSparkle16, chevron: IconChevronDownOutline14,
           close: IconCloseOutline16, check: IconCheckOutline14,
@@ -274,7 +313,7 @@ window.__ModuleLoader__.load({
 
     module.exports = {
       apply,
-      inject: ['settingsScope', 'slots', 'locale', 'connection', 'remote'],
+      inject: ['slots', 'locale', 'connection', 'remote'],
     }
     return module.exports
   },