dsh-ptc-plus 0.4.10 → 0.5.1

package/src/client-feature-gates.js

@@ -13,10 +13,13 @@ const FEATURE_SETTINGS = Object.freeze({
   bindings: ['userBindingsEnabled'],
   // Enhanced run_code tool rows.
   toolView: ['enhancedToolView'],
+  toolHover: ['enhancedToolView', 'toolHoverPreviewEnabled'],
   // The REPL view tab; the session preset condition is added by its registration.
   replView: ['replViewEnabled'],
   // The composer authoring menu.
   authorButton: ['userBindingsEnabled', 'bindingAuthorButtonVisible'],
+  // Settings and capability refresh do not require Global User Bindings.
+  ptcMenu: ['bindingAuthorButtonVisible'],
 })
 
 /**

package/src/client-indicator-view.js

@@ -22,6 +22,7 @@ export function createIndicatorView(React, deps) {
     normalizeReplMemorySnapshot, unavailableReplMemorySnapshot,
     ReplMemoryCard, replPopoverIsOpen, placeReplPopover,
     catalogOwner, subscribeReset,
+    useObservedReplMemory, observeRepl,
   } = deps
   const h = React.createElement
 
@@ -225,13 +226,10 @@ export function createIndicatorView(React, deps) {
         }
       }
     }, [cancelClose, cancelOpen, schedulePlacement])
+    const memory = useObservedReplMemory({ sessionId, projected: projectionMemory,
+      active: expanded && sessionUsesPtcPreset(preset) && featureEnabled(settings, 'plugin'),
+      elementRef: popoverRef, observeRepl })
     if (!sessionUsesPtcPreset(preset) || !featureEnabled(settings, 'plugin')) return null
-    let memory
-    try {
-      memory = normalizeReplMemorySnapshot(projectionMemory)
-    } catch {
-      memory = unavailableReplMemorySnapshot()
-    }
     const popoverId = `ptc-plus-repl-${String(resolvedSessionId).replace(/[^A-Za-z0-9_-]/g, '-')}`
     const titleId = `${popoverId}-title`
     return h('span', { className: 'ptcPlusActiveShell', ref: shellRef },

package/src/client-primitives.js

@@ -1,4 +1,5 @@
 import { isHostComponent } from './client-host-compat.js'
+import * as RadixSelect from '@radix-ui/react-select'
 
 /**
  * Resolve the Harness Client components this plugin renders against the
@@ -161,7 +162,7 @@ function createFallbackModal(React, createPortal = content => content) {
     const close = React.useRef(onClose)
     close.current = onClose
     const isComposing = useCompositionGuard(React, open)
-    const focusable = 'button:not(:disabled),input:not(:disabled),textarea:not(:disabled),select:not(:disabled),[href],[tabindex]:not([tabindex="-1"])'
+    const focusable = 'button:not(:disabled),input:not(:disabled),textarea:not(:disabled),select:not(:disabled),[href],[tabindex]:not([tabindex="-1"]),[contenteditable=true],summary'
     React.useLayoutEffect(() => {
       if (!open) return undefined
       const previous = document.activeElement
@@ -187,7 +188,7 @@ function createFallbackModal(React, createPortal = content => content) {
         if (!event.repeat) close.current?.()
       } else if (event.key === 'Tab') {
         const controls = [...root.current.querySelectorAll(focusable)]
-          .filter(control => control.getClientRects().length > 0)
+          .filter(control => control.getClientRects().length > 0 && !control.closest('[aria-hidden=true],[hidden]'))
         const target = event.shiftKey ? controls.at(-1) : controls[0]
         const boundary = event.shiftKey ? controls[0] : controls.at(-1)
         if (controls.length === 0 || document.activeElement === boundary || !root.current.contains(document.activeElement)) {
@@ -225,12 +226,42 @@ export function resolvePrimitives(primitives, React, createPortal) {
     DisclosureRow: primitives.DisclosureRow,
     Menu: isHostComponent(primitives.Menu) ? primitives.Menu : createFallbackMenu(React, createPortal),
     MenuFallback: createFallbackMenu(React, createPortal),
+    Select: createSelect(React),
     Modal: isHostComponent(primitives.Modal) ? primitives.Modal : createFallbackModal(React, createPortal),
     Toast: primitives.Toast,
     Tooltip: primitives.Tooltip,
   })
 }
 
+/** Shared themed choice control; Radix owns listbox focus, typeahead, and dismissal. */
+export function createSelect(React) {
+  const h = React.createElement
+  return function Select({ value, options, onChange, label, disabled = false, className = '',
+    placeholder, dataStrategy, autoFocus = false }) {
+    const [open, setOpen] = React.useState(false)
+    React.useEffect(() => { if (disabled) setOpen(false) }, [disabled])
+    const chosen = options.find(option => option.value === value)
+    let emptyToken = '__ptc_plus_empty_choice__'
+    while (options.some(option => option.value === emptyToken)) emptyToken += '_'
+    return h(RadixSelect.Root, { value: value === '' ? emptyToken : value, open, disabled,
+      onOpenChange: setOpen, onValueChange: next => onChange(next === emptyToken ? '' : next) },
+      h(RadixSelect.Trigger, { className: ['ptcPlusSelectTrigger', className].filter(Boolean).join(' '),
+        'aria-label': label, 'data-strategy': dataStrategy, 'data-modal-autofocus': autoFocus || undefined },
+      h(RadixSelect.Value, { placeholder: placeholder ?? chosen?.label ?? '' }),
+      h(RadixSelect.Icon, { className: 'ptcPlusSelectChevron', 'aria-hidden': true },
+        h('svg', { viewBox: '0 0 16 16', width: 16, height: 16, fill: 'none' },
+          h('path', { d: 'm4 6 4 4 4-4', stroke: 'currentColor', strokeWidth: 1.5, strokeLinecap: 'round', strokeLinejoin: 'round' })))),
+      h(RadixSelect.Portal, null,
+        h(RadixSelect.Content, { className: 'ptcPlusSelectMenu', position: 'popper', sideOffset: 4,
+          onEscapeKeyDown: event => event.stopPropagation() },
+        h(RadixSelect.Viewport, { className: 'ptcPlusSelectViewport' },
+          ...options.map(option => h(RadixSelect.Item, { key: option.value, value: option.value === '' ? emptyToken : option.value,
+            disabled: option.disabled === true, className: 'ptcPlusSelectOption' },
+          h(RadixSelect.ItemText, null, option.label),
+          h(RadixSelect.ItemIndicator, { className: 'ptcPlusSelectCheck' }, '✓')))))))
+  }
+}
+
 /** Adapt host action styling, or own it completely when the primitive is absent. */
 export function createActionButton(React, Button) {
   const h = React.createElement

package/src/client-repl-view.js

@@ -7,7 +7,7 @@ import { isHostComponent, isHostIconComponent } from './client-host-compat.js'
  */
 export function createReplView(React, deps) {
   const {
-    CodeBlock, featureEnabled, normalizeReplMemorySnapshot,
+    CodeBlock, Select, featureEnabled, normalizeReplMemorySnapshot,
     unavailableReplMemorySnapshot, useSessionPreset, sessionUsesPtcPreset,
     useWorkbenchController, UserBindingsWorkbench,
     icons: { search: IconSearchOutline16, chevron: IconChevronDownOutline14 },
@@ -16,6 +16,18 @@ export function createReplView(React, deps) {
 
   function ReplComposer() { return null }
 
+  function useObservedReplMemory({ sessionId, projected, active, elementRef, observeRepl }) {
+    const memory = React.useMemo(() => {
+      try { return normalizeReplMemorySnapshot(projected) } catch { return unavailableReplMemorySnapshot() }
+    }, [projected])
+    const [observed, setObserved] = React.useState(null)
+    React.useEffect(() => active && typeof observeRepl === 'function'
+      ? observeRepl(sessionId, elementRef.current, memory,
+        value => setObserved({ sessionId, source: memory, value }))
+      : undefined, [active, observeRepl, sessionId, memory, elementRef])
+    return observed?.sessionId === sessionId && observed.source === memory ? observed.value : memory
+  }
+
   function ReplBindingInspector({ entry, preview, t }) {
     const readable = preview?.status === 'readable'
     return h('aside', { className: 'ptcPlusBindingInspector', 'aria-label': entry.name },
@@ -61,10 +73,9 @@ export function createReplView(React, deps) {
               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),
-              'aria-label': t('console.kind') },
-              ['all', 'variable', 'function', 'class', 'import'].map(value => h('option', { key: value, value },
-                t(value === 'all' ? 'console.allKinds' : `memory.kind.${value}`))))),
+            h(Select, { value: kind, onChange: setKind, label: t('console.kind'),
+              options: ['all', 'variable', 'function', 'class', 'import'].map(value => ({ value,
+                label: t(value === 'all' ? 'console.allKinds' : `memory.kind.${value}`) })) })),
           h('div', { className: 'ptcPlusObservations' },
             h('table', { className: 'ptcPlusObservationTable', 'aria-label': t('console.session') },
               h('thead', null, h('tr', null,
@@ -98,18 +109,14 @@ export function createReplView(React, deps) {
     const globalEnabled = featureEnabled(settings, 'bindings')
     const workbench = useWorkbenchController({ enabled: globalEnabled, active: true, callUserBindings })
     const eligible = featureEnabled(settings, 'replView') && sessionUsesPtcPreset(preset)
-    const memory = React.useMemo(() => {
-      try { return normalizeReplMemorySnapshot(projected) } catch { return unavailableReplMemorySnapshot() }
-    }, [projected])
-    const [observed, setObserved] = React.useState(null)
     const observationRegion = React.useRef(null)
+    const memory = useObservedReplMemory({ sessionId, projected, active: eligible,
+      elementRef: observationRegion, observeRepl })
     React.useEffect(() => eligible ? hideComposer(sessionId) : undefined, [eligible, hideComposer, sessionId])
-    React.useEffect(() => eligible ? observeRepl(sessionId, observationRegion.current, memory,
-      value => setObserved({ sessionId, source: memory, value })) : undefined, [eligible, observeRepl, sessionId, memory])
     if (!eligible) return null
     return h('div', { className: 'ptcPlusConsole', 'data-conversation-composer-overlay': '' },
       h('div', { className: 'ptcPlusConsoleSection', ref: observationRegion }, h(ReplSessionBindings, {
-        key: sessionId, memory: observed?.sessionId === sessionId && observed.source === memory ? observed.value : memory, t })),
+        key: sessionId, memory, t })),
       globalEnabled ? h('div', { className: 'ptcPlusConsoleSection ptcPlusBindingsSurface' },
         h(UserBindingsWorkbench, { controller: workbench, t, headingLabel: t('console.global') })) : null)
   }
@@ -290,5 +297,5 @@ export function createReplView(React, deps) {
         : h('span', { className: 'ptcPlusReplMore' }, t('memory.more', { count: memory.omitted }))))
   }
 
-  return { ReplComposer, ReplConsole, ReplMemoryCard, replPopoverIsOpen, placeReplPopover }
+  return { ReplComposer, ReplConsole, ReplMemoryCard, replPopoverIsOpen, placeReplPopover, useObservedReplMemory }
 }