dsh-ptc-plus 0.4.2 → 0.4.3

package/src/client-authoring-view.js

@@ -1,6 +1,11 @@
 import { bindingDraftProjection, bindingReviewStatus } from './client-binding-review.js'
 import { bindingModelPreferences } from '../internal/user-binding-model-context.js'
 import { featureEnabled } from './client-feature-gates.js'
+import {
+  MENU_CHILDREN_PROBE_SENTINEL,
+  isHostIconComponent,
+  readMenuChildrenProbe,
+} from './client-host-compat.js'
 
 /**
  * Hover dwell before the composer entry opens its menu. The entry sits inside the
@@ -19,7 +24,7 @@ export function createAuthoringView(React, deps) {
   const {
     ActionButton, IconButton, Menu, Toast, Tooltip, CodeBlock, BindingsDialog, PTCPlusSettingsDialog,
     useWorkbenchController, useBindingReview, catalogOwner, callUserBindings, subscribeReset,
-    settingsCardSeat, updateSetting,
+    settingsCardSeat, updateSetting, menuChildren,
     icons: {
       sparkle: IconSparkle16, chevron: IconChevronDownOutline14,
       close: IconCloseOutline16, check: IconCheckOutline14,
@@ -31,12 +36,13 @@ export function createAuthoringView(React, deps) {
    * Where the settings card lives on the installed generation.
    *
    * The compat module reports the seat the host declared rather than the
-   * generation, so this copy names the place a user can open now. Before either
-   * seat mounts it reports the current one, which is what an up-to-date install
-   * offers; the preceding generation's own seat replaces it once it registers.
+   * generation, so this copy names the place a user can open now. An undeclared
+   * seat carries no location evidence and keeps the generic settings label.
    */
-  const settingsPath = t => t(settingsCardSeat?.() === 'settings.plugin.item'
-    ? 'settings.pathSettings' : 'settings.pathPlugins')
+  const settingsPath = t => t({
+    'settings.plugin.item': 'settings.pathSettings',
+    'plugins.row.config': 'settings.pathPlugins',
+  }[settingsCardSeat?.()] ?? 'settings.menuEntry')
 
   function BindingAuthorButton({
     sessionId, t, useInput, inputActions, usePtcSettings, useBindingCommand,
@@ -60,6 +66,13 @@ export function createAuthoringView(React, deps) {
     const [menu, setMenu] = React.useState(null)
     const [managing, setManaging] = React.useState(false)
     const [settingsOpen, setSettingsOpen] = React.useState(false)
+    // The composer entry's four actions live in the host Menu's `children`
+    // region. Preceding Clients accept that prop and mount nothing, so the entry
+    // probes the installed primitive once and, when it renders no such region,
+    // keeps the same actions reachable through the Menu's pinned rows.
+    const probeRef = React.useRef(null)
+    const [probing, setProbing] = React.useState(() => menuChildren.supported() === undefined)
+    const menuChildrenRegion = menuChildren.supported() !== false
     // The menu catalog and the workbench catalog are independent sources: a
     // read or write in one never invalidates the other's in-flight request.
     const catalogSource = React.useMemo(() => catalogOwner.claim(), [catalogOwner])
@@ -193,6 +206,16 @@ export function createAuthoringView(React, deps) {
       })
       return () => { cancelled = true }
     }, [menuOpen, menu?.mode, menu?.step])
+    React.useLayoutEffect(() => {
+      // The probe mounts in the same commit as this effect, so the answer comes
+      // from Client output rather than from the props the plugin passed. A probe
+      // that never mounted records nothing: the entry keeps rendering the region
+      // instead of turning a missing container into a compatibility verdict.
+      if (!probing) return
+      const mounted = probeRef.current
+      if (mounted !== null) menuChildren.record(readMenuChildrenProbe(mounted))
+      setProbing(false)
+    }, [probing, menuChildren])
     React.useEffect(() => {
       if (toast === null || typeof Toast === 'function') return undefined
       const timer = setTimeout(() => setToast(null), 2_500)
@@ -218,7 +241,7 @@ export function createAuthoringView(React, deps) {
     const starButton = h('button', {
       type: 'button', className: 'ptcPlusAuthorButton', 'aria-label': label,
       // Older UI-kit lines ship no Tooltip primitive; the native title carries the hint there.
-      title: typeof Tooltip === 'function' ? undefined : hint,
+      title: typeof Tooltip === 'function' || menuOpen || managing || settingsOpen ? undefined : hint,
       'aria-haspopup': 'menu', 'aria-expanded': menuOpen,
       onPointerEnter: hoverMenu,
       onPointerLeave: cancelHoverOpen,
@@ -229,15 +252,19 @@ export function createAuthoringView(React, deps) {
         if (menuOpen && menu.mode !== 'hover') hideMenu()
         else showMenu('click')
       },
-    }, typeof IconSparkle16 === 'function'
+    }, isHostIconComponent(IconSparkle16)
       ? h(IconSparkle16, { size: 16, 'aria-hidden': true })
       : h('span', { className: 'ptcPlusAuthorButtonLabel', 'aria-hidden': true }, t('bindings.open')),
       hasDraft ? h('span', { className: 'ptcPlusDraftBadge', 'aria-hidden': true,
         'data-attention': view.message !== null }, '1') : null)
+    // A write in flight keeps the list interactive. The source serializes writes
+    // and drops a duplicate, while disabling rows would dim every row and add a
+    // pending row for the duration of the request: both read as the popover
+    // flickering when the user toggles an entry.
     const catalogItems = !quickAccess ? [] : [
       { id: 'global-heading', type: 'label', text: t('bindings.quickHeading') },
       ...(catalog?.entries ?? []).map(entry => ({ id: `global:${entry.id}`,
-        disabled: !catalogReady,
+        disabled: catalog === null,
         label: h('span', { className: 'ptcPlusBindingQuickRow', 'data-enabled': entry.enabled },
           h('span', { className: 'ptcPlusBindingQuickName' }, h('strong', { title: entry.name }, entry.name),
             h('span', { className: 'ptcPlusBindingQuickState' }, t(entry.enabled ? 'bindings.enabled' : 'bindings.disabledEntry'))),
@@ -245,7 +272,7 @@ export function createAuthoringView(React, deps) {
       })),
       ...(catalog !== null && catalog.entries.length === 0
         ? [{ id: 'empty', type: 'label', text: t('memory.globalEmpty') }] : []),
-      ...(catalogStatus === 'writing' || (catalog === null && catalogStatus === 'loading')
+      ...(catalog === null && catalogStatus !== 'error'
         ? [{ id: 'pending', type: 'label', text: t(catalogStatus === 'writing' ? 'bindings.quickSaving' : 'bindings.quickLoading') }] : []),
       ...(catalogError === null ? [] : [{ id: 'error', type: 'label', text: t('bindings.failed', { error: catalogError }) }]),
     ]
@@ -256,7 +283,7 @@ export function createAuthoringView(React, deps) {
       { id: 'edit-heading', type: 'label', text: t('bindings.quickEditHeading') },
       ...(catalog?.entries ?? []).map(entry => ({
         id: `edit:${entry.id}`,
-        disabled: !catalogReady,
+        disabled: catalog === null,
         label: h('span', { className: 'ptcPlusBindingQuickRow' },
           h('span', { className: 'ptcPlusBindingQuickName' }, h('strong', { title: entry.name }, entry.name),
             h('span', { className: 'ptcPlusBindingQuickState' }, t(entry.enabled ? 'bindings.enabled' : 'bindings.disabledEntry'))),
@@ -266,79 +293,111 @@ export function createAuthoringView(React, deps) {
       // when the catalog is momentarily empty.
       { id: 'edit-back', label: h('span', { className: 'ptcPlusBindingMenuAction', ref: firstItemRef }, t('bindings.back')) },
     ]
+    const selectMenuItem = id => {
+      if (!anchorRef.current?.getClientRects().length) return
+      if (id === 'edit') {
+        setMenu(current => current === null ? current : { ...current, step: 'edit' })
+        return
+      }
+      if (id === 'edit-back') {
+        setMenu(current => current === null ? current : { ...current, step: 'root' })
+        return
+      }
+      if (id.startsWith('edit:')) {
+        const entry = catalog?.entries.find(entry => `edit:${entry.id}` === id)
+        if (entry) openAuthoringEdit(entry)
+        return
+      }
+      if (id.startsWith('global:')) {
+        const entry = catalog?.entries.find(entry => `global:${entry.id}` === id)
+        if (entry) void toggleBinding(entry)
+        return
+      }
+      if (id === 'reload') { void refreshCatalog(true); return }
+      if (id === 'settings') {
+        hideMenu()
+        setSettingsOpen(true)
+        return
+      }
+      hideMenu()
+      if (id === 'new') openAuthoring()
+      else if (id === 'manage') {
+        dialogReturnFocus.current = null
+        setManaging(true)
+      }
+      else if (id === view.candidateKey) openBindingReview(review, view.candidate)
+    }
+    // One copy of each action label serves the grid the plugin renders itself,
+    // in whichever carrier the installed Menu publishes for it.
+    const actionCopy = (id, copy, ref) => h('span', {
+      ref, className: 'ptcPlusBindingMenuAction',
+      title: id === 'settings' ? settingsPath(t) : undefined,
+    }, t(copy))
+    const actionButton = (id, copy, ref) => h('button', {
+      type: 'button', role: 'menuitem', className: 'ptcPlusMenuButton',
+      onClick: () => selectMenuItem(id),
+    }, actionCopy(id, copy, ref))
+    const actionSections = [
+      canAuthor ? h('div', { key: 'authoring', className: 'ptcPlusMenuAuthoring', role: 'group', 'aria-label': t('bindings.authorGroup') },
+        h('div', { className: 'ptcPlusMenuGroupLabel' }, t('bindings.authorGroup')),
+        h('div', { className: 'ptcPlusMenuActionGrid' },
+          actionButton('new', 'bindings.authorNewDraft'),
+          (catalog?.entries?.length ?? 0) > 0 ? actionButton('edit', 'bindings.authorEdit') : null)) : null,
+      h('div', { key: 'utilities', className: 'ptcPlusMenuUtilities' },
+        quickAccess ? actionButton('manage', 'bindings.manage', manageItemRef) : null,
+        actionButton('settings', 'settings.menuEntry', settingsItemRef)),
+    ]
+    const actionsInRegion = menu?.step === 'edit'
+      ? null : h('div', { className: 'ptcPlusMenuActions' }, actionSections)
+    // The plugin's own action area, never a row list. A Client that mounts no
+    // `children` region still renders the pinned entry area, which carries the
+    // same grouped grid; the published `text` type names a string while the
+    // implementation renders the value, so this stays the plugin's own markup
+    // rather than a set of host-styled rows. Neither carrier enters the draft
+    // menu's second step, which owns its own rows.
+    const actionsPinned = menuChildrenRegion || menu?.step === 'edit' ? [] : [{
+      id: 'ptc-plus-actions',
+      type: 'label',
+      text: h('div', { className: 'ptcPlusMenuActions ptcPlusMenuActionsPinned' }, actionSections),
+    }]
     return h('span', {
       className: 'ptcPlusComposerBindingAnchor', tabIndex: -1,
       onFocusCapture: () => { focused.current = true }, onBlurCapture: () => { focused.current = false },
-      'data-text': typeof IconSparkle16 === 'function' ? undefined : true,
+      'data-text': isHostIconComponent(IconSparkle16) ? undefined : true,
       ref: attachAnchor,
     },
       !hasDraft && !quickAccess ? null : h(Menu, {
         className: 'ptcPlusAuthorButtonShell', open: menuOpen,
         anchor: typeof Tooltip === 'function'
-          ? h(Tooltip, { label: hint, delayMs: 400 }, starButton) : starButton,
+          ? h(Tooltip, { label: hint, delayMs: 700, disabled: menuOpen || managing || settingsOpen }, starButton) : starButton,
         portal: true, side: 'top', dense: true,
         // A hovered menu leaves with the pointer once it leaves the trigger and the
         // list for the published grace, which re-entering either cancels; click and
         // keyboard menus stay until dismissed.
         closeOnPointerLeave: menu !== null && menu.mode === 'hover',
         getAnchorRect: menuAnchorRect,
-        selectedIds: (catalog?.entries ?? []).filter(entry => entry.enabled).map(entry => `global:${entry.id}`),
         onClose: hideMenu,
         items: menu?.step === 'edit' ? editItems : [...(hasDraft ? [{ id: 'draft-heading', type: 'label', text: t('bindings.quickDrafts') }, { id: view.candidateKey,
           label: h('span', { className: 'ptcPlusDraftMenuItem', ref: firstItemRef },
             h('strong', null, view.candidate.entry.name),
             h('span', null, t(bindingReviewStatus(view)))) },
             ...(quickAccess ? [{ id: 'draft-separator', type: 'separator' }] : [])] : []), ...catalogItems,
-          ...(quickAccess ? [{ id: 'actions-separator', type: 'separator' }] : []),
-          ...(canAuthor ? [{ id: 'new', label: h('span', { className: 'ptcPlusBindingMenuAction' }, t('bindings.authorNewDraft')) }] : []),
-          ...(canAuthor && (catalog?.entries?.length ?? 0) > 0
-            ? [{ id: 'edit', label: h('span', { className: 'ptcPlusBindingMenuAction' }, t('bindings.authorEdit')) }] : []),
-          ...(quickAccess ? [
-            ...(catalogError === null ? [] : [{ id: 'reload', label: h('span', { ref: reloadItemRef }, t('bindings.reload')) }]),
-            { id: 'manage', label: h('span', { ref: manageItemRef, className: 'ptcPlusBindingMenuAction' }, t('bindings.manage')) },
-          ] : []),
-          // The entry is also the shortcut to this plugin's own settings, so the
-          // row names the seat the installed generation declared and its hint
-          // carries the full path that opens it.
-          { id: 'settings', label: h('span', {
-            ref: settingsItemRef, className: 'ptcPlusBindingMenuAction', title: settingsPath(t),
-          }, t('settings.menuEntry')) },
+          ...(quickAccess && catalogError !== null
+            ? [{ id: 'reload', label: h('span', { ref: reloadItemRef }, t('bindings.reload')) }] : []),
         ],
-        onSelect: id => {
-          if (!anchorRef.current?.getClientRects().length) return
-          if (id === 'edit') {
-            setMenu(current => current === null ? current : { ...current, step: 'edit' })
-            return
-          }
-          if (id === 'edit-back') {
-            setMenu(current => current === null ? current : { ...current, step: 'root' })
-            return
-          }
-          if (id.startsWith('edit:')) {
-            const entry = catalog?.entries.find(entry => `edit:${entry.id}` === id)
-            if (entry) openAuthoringEdit(entry)
-            return
-          }
-          if (id.startsWith('global:')) {
-            const entry = catalog?.entries.find(entry => `global:${entry.id}` === id)
-            if (entry) void toggleBinding(entry)
-            return
-          }
-          if (id === 'reload') { void refreshCatalog(true); return }
-          if (id === 'settings') {
-            hideMenu()
-            setSettingsOpen(true)
-            return
-          }
-          hideMenu()
-          if (id === 'new') openAuthoring()
-          else if (id === 'manage') {
-            dialogReturnFocus.current = null
-            setManaging(true)
-          }
-          else if (id === view.candidateKey) openBindingReview(review, view.candidate)
-        },
+        children: actionsInRegion,
+        ...(actionsPinned.length === 0 ? {} : { footer: actionsPinned }),
+        onSelect: selectMenuItem,
       }),
+      // The probe mounts the host Menu's own `children` region inside a hidden
+      // non-portal list and is dropped in the same commit as the effect that
+      // reads it, so no Client ever paints it and the entry's own menu keeps the
+      // only interactive surface.
+      probing ? h('span', { className: 'ptcPlusMenuProbe', ref: probeRef, 'aria-hidden': 'true' },
+        h(Menu, {
+          open: true, items: [], anchor: h('span', null), onSelect: selectMenuItem, onClose: hideMenu,
+          children: h('span', { className: MENU_CHILDREN_PROBE_SENTINEL }),
+        })) : null,
       // Hiding the composer unmounts the dialog, not the controller: the draft survives.
       managing && quickAccess && view.reachable
         ? h(BindingsDialog, {

package/src/client-console.js

@@ -1,3 +1,5 @@
+import { isHostIconComponent } from './client-host-compat.js'
+
 const MAX_HISTORY_ENTRIES = 40
 const MAX_HISTORY_CHARACTERS = 128 * 1024
 const MAX_RECORD_CHARACTERS = MAX_HISTORY_CHARACTERS / 2
@@ -89,9 +91,9 @@ export function createBindingConsole(React, { TypeScriptEditor, IconButton, Acti
         h('span', { className: 'ptcPlusExecutionState', role: 'status' }, t(`execution.${state}`)),
         h('div', { className: 'ptcPlusExecutionActions' },
           running
-            ? h(ActionButton, { onClick: () => { release(); setState('released') } }, typeof icons.stop === 'function' ? h(icons.stop, { size: 14 }) : null, t('execution.stop'))
+            ? h(ActionButton, { onClick: () => { release(); setState('released') } }, isHostIconComponent(icons.stop) ? h(icons.stop, { size: 14 }) : null, t('execution.stop'))
             : h(ActionButton, { 'data-kind': 'primary', onClick: run, disabled: !code.trim() || !source.trim() },
-              typeof icons.play === 'function' ? h(icons.play, { size: 14 }) : null, t('bindings.run')),
+              isHostIconComponent(icons.play) ? h(icons.play, { size: 14 }) : null, t('bindings.run')),
           h(IconButton, { icon: icons.reset, label: t('execution.reset'), onClick: () => { release(); setState('ready') } }),
           h(IconButton, { icon: icons.clear, label: t('execution.clear'), onClick: () => setRecords([]) }))),
       h('div', { className: 'ptcPlusExecutionHistory', ref: history, 'aria-label': t('execution.history') },

package/src/client-copy.js

@@ -103,12 +103,13 @@ const CHROME_COPY = Object.freeze({
     'bindings.failed': '全局用户绑定操作失败：{error}',
     'bindings.authorEdit': '修改绑定',
     'bindings.open': '全局绑定',
-    'bindings.openHint': 'PTC Plus 插件 · 打开全局用户绑定菜单，可编写、启停或管理',
+    'bindings.openHint': 'PTC Plus · 全局绑定与设置',
     'bindings.draftHint': 'PTC Plus 插件 · 绑定草稿待处理，点击查看',
     'bindings.quickHeading': '全局用户绑定 · 对所有会话生效',
     'bindings.quickDrafts': '待处理草稿',
     'bindings.quickLoading': '正在读取绑定…',
     'bindings.quickSaving': '正在保存…',
+    'bindings.authorGroup': 'Agent 编写',
     'bindings.authorNewDraft': '编写新绑定',
     'bindings.quickEditHeading': '选择要修改的绑定',
     'bindings.back': '返回',
@@ -273,12 +274,13 @@ const CHROME_COPY = Object.freeze({
     'bindings.failed': 'Global User Binding operation failed: {error}',
     'bindings.authorEdit': 'Revise a binding',
     'bindings.open': 'Global bindings',
-    'bindings.openHint': 'PTC Plus plugin · Open the Global User Binding menu to author, toggle, or manage',
+    'bindings.openHint': 'PTC Plus · Global bindings and settings',
     'bindings.draftHint': 'PTC Plus plugin · Binding draft pending; click to review',
     'bindings.quickHeading': 'Global bindings · Applies to all sessions',
     'bindings.quickDrafts': 'Pending drafts',
     'bindings.quickLoading': 'Loading bindings…',
     'bindings.quickSaving': 'Saving…',
+    'bindings.authorGroup': 'Author with Agent',
     'bindings.authorNewDraft': 'Write a new binding',
     'bindings.quickEditHeading': 'Choose a binding to revise',
     'bindings.back': 'Back',

package/src/client-feature-gates.js

@@ -6,21 +6,20 @@
  */
 const FEATURE_SETTINGS = Object.freeze({
   // The plugin master switch plus every contribution that only needs it.
-  plugin: { required: [], defaultOn: [] },
+  plugin: [],
   // Global User Bindings: the workbench, its command renderer and the author menu.
-  bindings: { required: ['userBindingsEnabled'], defaultOn: [] },
+  bindings: ['userBindingsEnabled'],
   // Enhanced run_code tool rows.
-  toolView: { required: [], defaultOn: ['enhancedToolView'] },
+  toolView: ['enhancedToolView'],
   // The REPL view tab; the session preset condition is added by its registration.
-  replView: { required: [], defaultOn: ['replViewEnabled'] },
+  replView: ['replViewEnabled'],
   // The composer authoring menu.
-  authorButton: { required: ['userBindingsEnabled'], defaultOn: ['bindingAuthorButtonVisible'] },
+  authorButton: ['userBindingsEnabled', 'bindingAuthorButtonVisible'],
 })
 
 /**
  * Pure settings projection: a feature is eligible only from a ready snapshot
- * with the master switch on and every feature-specific setting met. Required
- * settings must be explicitly true; default-on settings are on unless the user
+ * with the master switch on. These features default to on unless the user
  * turned them off. Writability gates setting writes, not contribution presence.
  */
 export function featureEnabled(snapshot, feature) {
@@ -28,8 +27,7 @@ export function featureEnabled(snapshot, feature) {
   if (rule === undefined) throw new Error(`Unknown client feature: ${feature}`)
   if (snapshot?.status !== 'ready' || snapshot.value?.enabled !== true) return false
   const value = snapshot.value
-  return rule.required.every(key => value[key] === true)
-    && rule.defaultOn.every(key => value[key] !== false)
+  return rule.every(key => value[key] !== false)
 }
 
 /**

package/src/client-host-compat.js

@@ -1,5 +1,102 @@
 import { SETTINGS_NAMESPACE } from '../internal/config-spec.js'
 
+const HOST_ICON_EXPORTS = Object.freeze({
+  check: ['IconCheckOutlineRegular', 'IconCheckOutline14'],
+  chevron: ['IconChevronDownOutlineRegular', 'IconChevronDownOutline14'],
+  inspect: ['IconInspectOutlineRegular', 'IconInspectOutline12'],
+  sparkle: ['IconSparkleRegular', 'IconSparkle16'],
+  close: ['IconCloseOutlineRegular', 'IconCloseOutline16'],
+  search: ['IconSearchOutlineRegular', 'IconSearchOutline16'],
+  plus: ['IconPlusOutlineRegular', 'IconPlusOutline16'],
+  refresh: ['IconRefreshOutlineRegular', 'IconRefreshOutline16'],
+  trash: ['IconTrashOutlineRegular', 'IconTrashOutline16'],
+  edit: ['IconEditOutlineRegular', 'IconEditOutline16'],
+  play: ['IconPlayOutlineRegular', 'IconPlayOutline16'],
+  stop: ['IconStopFillRegular', 'IconStopFill16'],
+})
+
+/**
+ * The one component that stands in for a glyph the host did not publish.
+ *
+ * Call sites render `icons.<key>` as a glyph, so an omitted, renamed, or
+ * malformed export must still resolve to a renderable element type. The marker
+ * stays readable so a control that can show its own text label instead
+ * (`IconButton`) keeps that fallback rather than rendering an empty button.
+ */
+const ABSENT_HOST_ICON = () => null
+ABSENT_HOST_ICON.absentHostIcon = true
+
+/** Whether a normalized icon entry is a glyph the host actually published. */
+export function isHostIconComponent(icon) {
+  return typeof icon === 'function' && icon.absentHostIcon !== true
+}
+
+/**
+ * Normalize the public icon export shape used by current and preceding Clients.
+ *
+ * The mapping is total: every key resolves to a render-safe component, so a
+ * host generation that renames or omits an icon never turns a missing glyph
+ * into a render-time throw of the whole plugin surface.
+ */
+export function hostIconComponents(primitives) {
+  return Object.fromEntries(Object.entries(HOST_ICON_EXPORTS).map(([name, candidates]) => [
+    name,
+    candidates.map(candidate => primitives?.[candidate])
+      .find(value => typeof value === 'function') ?? ABSENT_HOST_ICON,
+  ]))
+}
+
+/**
+ * The class the composer entry mounts as the probe's sentinel child.
+ *
+ * `src/client-authoring-view.js` renders it inside the host `Menu`'s own
+ * `children` region; this module owns the selector that reads it back.
+ */
+export const MENU_CHILDREN_PROBE_SENTINEL = 'ptcPlusMenuChildrenProbe'
+
+/**
+ * Whether the installed `Menu` primitive mounts the caller's own action area.
+ *
+ * The published `@deepseek-ai/dsh-client-ui-primitives` Menu gained its
+ * `children` region with the 0.1.7 generation. Preceding Clients accept the
+ * prop and mount nothing, so the prop name proves no more than the call the
+ * plugin already makes. The entry therefore mounts that region once inside a
+ * hidden non-portal Menu and reads what the Client actually rendered — the
+ * consumed contract is observed behavior, never a version comparison
+ * ([ADR 0017](../docs/adr/0017-track-the-latest-dsh-public-surface.md)).
+ *
+ * @param container - the probe's mounted wrapper, or nothing when it never
+ *   mounted.
+ * @returns whether the sentinel is part of the mounted Client output. A
+ *   container that never mounted proves no region, and its caller records that
+ *   answer only for a probe that did mount.
+ */
+export function readMenuChildrenProbe(container) {
+  if (container === null || container === undefined) return false
+  return container.querySelector(`.${MENU_CHILDREN_PROBE_SENTINEL}`) !== null
+}
+
+/**
+ * The probe's answer for one loaded Client.
+ *
+ * Composer entries are mounted per session, so the first observation owns the
+ * answer for the whole Client lifetime: a later mount reuses it instead of
+ * rendering a second probe, and a partially applied answer cannot contradict
+ * the rendering path already chosen. `undefined` means no probe has run yet,
+ * which callers must treat as the current rendering path, not as a verdict.
+ *
+ * @returns `supported()` reporting the recorded answer, and `record()` taking
+ *   the first one. A record that throws or never runs leaves the question open
+ *   and keeps the entry on the path it already renders.
+ */
+export function createMenuChildrenEvidence() {
+  let supported
+  return {
+    supported: () => supported,
+    record(value) { supported ??= value === true },
+  }
+}
+
 /** The preset a session publishes, preferring the projection reader's evidence. */
 function sessionPresetValue(projected, summary) {
   if (projected !== undefined) return projected
@@ -89,29 +186,13 @@ export function isIdleSessionComposer(owner, sessionId) {
 const BUNDLE_PATCH_ROW_ID = 'ptc-plus'
 
 /**
- * The slot seats one generation of DSH offers for a plugin's own settings card,
- * oldest generation first:
- *
- * - DSH 0.1.5 and earlier: the Settings panel's Plugins section declares
- *   `settings.plugin.item` (keyed, root) as the child slot of its configurable
- *   tab and renders one card per settings namespace the Host serves, so this
- *   plugin's key is its namespace.
- * - DSH 0.1.6-alpha.2 and later: that section is a read-only inventory, and a
- *   bundle's own configuration belongs to the side bar Plugins page, which
- *   declares `plugins.row.config` (keyed, root) and renders the entry's summary
- *   on the row's page with the entry's form below it. The key is
- *   `<bundle package name>#<row id>`. The same page's `plugins.item` list is its
- *   Official group, occupied by the host-plane configuration pages DSH itself
- *   ships, so it is not a seat for a third-party bundle.
- *
- * No generation declares both keys, and `ctx.slots.inject` waits rather than
- * failing while a key is undeclared: the callback runs only after the declaring
- * entry mounts, and nothing is registered until then. One publication therefore
- * serves every generation without probing a version, and no card renders twice
- * on a generation that exists.
+ * Plugin-owned configuration seats. Current Hosts use the bundle's row page;
+ * preceding Hosts use the settings namespace card. General settings may coexist
+ * with either surface and is not a destination for this plugin's configuration.
+ * Undeclared slots stay pending until their owning page mounts.
  *
  * @param bundleName - this bundle's package name, as the profile installs it.
- * @returns one `{ slot, identity }` per generation.
+ * @returns one `{ slot, identity }` per supported plugin configuration surface.
  */
 export function settingsCardSeats(bundleName) {
   return [
@@ -121,12 +202,8 @@ export function settingsCardSeats(bundleName) {
 }
 
 /**
- * Publish one settings card to every seat above and report which seat the
- * installed generation declared.
- *
- * Only the declaring generation runs a seat's callback, so the card's location
- * is observed rather than inferred: the seat that registered is where a user
- * finds the card now, and that is what any copy pointing at it must say.
+ * Publish the settings card when a plugin configuration surface is declared.
+ * The observed seat supplies the native-location hint for the composer shortcut.
  *
  * @param ctx - browser plugin context carrying `slots`.
  * @param options.bundleName - this bundle's package name, as the profile installs it.

package/src/client-repl-view.js

@@ -1,3 +1,5 @@
+import { isHostIconComponent } from './client-host-compat.js'
+
 /**
  * REPL surface views: the conversation tab (session bindings + global workbench)
  * and the header memory card. Every piece here is a pure projection of props,
@@ -56,7 +58,7 @@ export function createReplView(React, deps) {
         h('div', { className: 'ptcPlusObservationCatalog' },
           h('div', { className: 'ptcPlusObservationFilters' },
             h('label', { className: 'ptcPlusSearch' },
-              typeof IconSearchOutline16 === 'function' ? h(IconSearchOutline16, { size: 16 }) : null,
+              isHostIconComponent(IconSearchOutline16) ? h(IconSearchOutline16, { size: 16 }) : null,
               h('input', { value: query, onChange: event => setQuery(event.target.value),
                 placeholder: t('console.search'), 'aria-label': t('console.search') })),
             h('select', { className: 'ptcPlusSelect', value: kind, onChange: event => setKind(event.target.value),

package/src/client-styles.js

@@ -39,7 +39,18 @@ const CLIENT_CSS = `
 /* Keep the session-header action on the same compact 32px rhythm as DSH chrome. */
 .ptcPlusActiveShell{display:inline-flex;height:28px;align-items:center;justify-content:center;line-height:0;vertical-align:middle}.ptcPlusActive{box-sizing:border-box;height:28px;justify-content:center;gap:6px;padding:0 6px;border:0;background:transparent;font-family:inherit;font-size:13px;font-weight:500;line-height:18px}.ptcPlusActive::before{width:6px;height:6px;flex:none;border-radius:50%;background:currentColor;box-shadow:0 0 0 2px color-mix(in srgb,currentColor 18%,transparent);content:''}.ptcPlusActive:hover,.ptcPlusActive[aria-expanded=true]{background:var(--dsw-alias-interactive-bg-hover,rgba(38,49,72,.06))}.ptcPlusActiveLabel{display:inline-flex;height:18px;align-items:center;line-height:18px}
 @media(max-width:560px){.ptcPlusActiveShell{display:none}}
-[role=menu]:has(.ptcPlusBindingMenuAction,.ptcPlusDraftMenuItem){width:min(320px,calc(100vw - 24px));min-width:0;max-height:min(440px,60dvh,var(--ptc-plus-menu-space,100dvh));border-radius:12px}.ptcPlusBindingQuickRow{display:flex;min-width:0;flex-direction:column;gap:3px;white-space:normal}.ptcPlusBindingQuickName{display:flex;align-items:center;justify-content:space-between;gap:12px;font-size:13px}.ptcPlusBindingQuickName strong{min-width:0;overflow:hidden;text-overflow:ellipsis;font-weight:500;white-space:nowrap}.ptcPlusBindingQuickState{flex:none;font-size:11px;color:var(--dsw-alias-label-tertiary)}.ptcPlusBindingQuickRow[data-enabled=true] .ptcPlusBindingQuickState{color:var(--dsw-alias-state-success-primary)}.ptcPlusBindingQuickPurpose{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--dsw-alias-label-tertiary);font-size:12px}.ptcPlusBindingMenuAction{font-size:13px}
+/* The compatibility probe never paints: it exists so the entry can read whether
+   the installed Menu mounted the region it was given. */
+.ptcPlusMenuProbe{display:none}
+/* The pinned carrier is a Client-owned label cell: the host already draws the
+   hairline above it, and the cell's own type must not leak into the grid. The
+   compound selector is load-bearing: the base .ptcPlusMenuActions rule is
+   declared later in this sheet, so an equal-specificity override loses and the
+   grid would draw a second hairline under the host's. */
+.ptcPlusMenuActions.ptcPlusMenuActionsPinned{margin-top:0;border-top:0;font-size:13px;line-height:18px;color:var(--dsw-alias-label-primary)}
+[role=menu]:has(.ptcPlusBindingMenuAction,.ptcPlusDraftMenuItem){width:min(320px,calc(100vw - 24px));min-width:0;max-height:min(440px,60dvh,var(--ptc-plus-menu-space,100dvh));border-radius:12px}.ptcPlusBindingQuickRow{display:flex;min-width:0;flex-direction:column;gap:3px;white-space:normal}.ptcPlusBindingQuickName{display:flex;align-items:center;justify-content:space-between;gap:12px;font-size:13px}.ptcPlusBindingQuickName strong{min-width:0;overflow:hidden;text-overflow:ellipsis;font-weight:500;white-space:nowrap}.ptcPlusBindingQuickState{flex:none;min-width:5em;text-align:end;font-size:11px;color:var(--dsw-alias-label-tertiary)}.ptcPlusBindingQuickRow[data-enabled=true] .ptcPlusBindingQuickState{color:var(--dsw-alias-state-success-primary)}.ptcPlusBindingQuickPurpose{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--dsw-alias-label-tertiary);font-size:12px}.ptcPlusBindingMenuAction{font-size:13px}
+.ptcPlusMenuActions{margin-top:6px;border-top:1px solid var(--dsw-alias-border-l3,rgba(0,0,0,.1))}.ptcPlusMenuAuthoring{padding:8px 4px}.ptcPlusMenuGroupLabel{padding:0 4px 6px;color:var(--dsw-alias-label-tertiary);font-size:11px;line-height:16px}.ptcPlusMenuActionGrid,.ptcPlusMenuUtilities{display:flex;gap:6px;min-width:0}.ptcPlusMenuUtilities{padding:6px 4px}.ptcPlusMenuAuthoring+.ptcPlusMenuUtilities{border-top:1px solid var(--dsw-alias-border-l3,rgba(0,0,0,.1))}.ptcPlusMenuButton{appearance:none;display:flex;flex:1;align-items:center;justify-content:center;min-width:0;min-height:34px;padding:6px 8px;border:1px solid var(--dsw-alias-border-l3,rgba(0,0,0,.1));border-radius:7px;background:transparent;color:var(--dsw-alias-label-primary);font:inherit;text-align:center;cursor:pointer}.ptcPlusMenuButton:hover{background:var(--dsw-alias-interactive-bg-hover,rgba(38,49,72,.06))}.ptcPlusMenuButton:focus-visible{outline:2px solid var(--dsw-alias-interactive-primary,#4d6bfe);outline-offset:-2px}.ptcPlusMenuButton .ptcPlusBindingMenuAction{white-space:normal;overflow-wrap:anywhere;line-height:18px}.ptcPlusMenuUtilities .ptcPlusMenuButton{border-color:transparent;color:var(--dsw-alias-label-secondary)}.ptcPlusMenuUtilities .ptcPlusBindingMenuAction{font-size:12px}
+
 `
 
 const BINDING_WORKBENCH_CSS = `

package/src/client-tool-view.js

@@ -8,6 +8,8 @@ import { derivePtcToolView } from './client-activity.js'
 export function createPtcToolView(React, deps) {
   const { CodeBlock, DisclosureRow, icons } = deps
   const h = React.createElement
+  const hasDisclosureRow = typeof DisclosureRow === 'function'
+    || (typeof DisclosureRow === 'object' && DisclosureRow !== null)
 
   function PTCPlusToolRow({ toolName, block, inspect, t }) {
     const [open, setOpen] = React.useState(false)
@@ -60,7 +62,7 @@ export function createPtcToolView(React, deps) {
       feature.detail === '' ? null
         : h('span', { className: 'ptcPlusFeatureDetail', title: feature.detail }, feature.detail))))
     const collapsedContent = h('div', { className: 'ptcPlusToolPreview' }, summaryLine, features)
-    if (typeof DisclosureRow === 'function') {
+    if (hasDisclosureRow) {
       return h('div', { className: 'ptcPlusTool' },
         h(DisclosureRow, {
           icon: expandable

package/src/client-transport.js

@@ -116,7 +116,7 @@ export function createBindingCommandAvailability(scope) {
     const epoch = ++entry.epoch
     let available = false
     try {
-      const result = await commandRemote?.commands.list(String(sessionId))
+      const result = await commandRemote?.list(String(sessionId))
       available = result?.ok === true
         && Array.isArray(result.value)
         && result.value.some(command => command?.name === 'binding')
@@ -132,7 +132,7 @@ export function createBindingCommandAvailability(scope) {
     void refresh(sessionId)
   }
   scope.inject(['remote', 'remote.commands'], commandScope => {
-    commandRemote = commandScope.remote
+    commandRemote = commandScope.get('remote.commands')
     commandScope.effect(() => commandScope.remote.$on('commands/change', () => {
       for (const sessionId of entries.keys()) void refresh(sessionId)
     }))

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,