dsh-ptc-plus 0.5.2 → 0.5.4

package/src/client.js

@@ -3,8 +3,9 @@ import { RPC_CONTRACTS } from '../internal/rpc-contract.js'
 import { CONFIG_DEFAULTS, SETTINGS_NAMESPACE } from '../internal/config-spec.js'
 import { createPtcToolView } from './client-tool-view.js'
 import { createPtcSettingsView } from './client-settings-view.js'
-import { createCapabilityCommandCard, createCapabilityRefreshView, createSessionCapabilityControlsView } from './client-capabilities-view.js'
+import { createCapabilityCommandCard, createCapabilityRefreshView, createCapabilitySurfaceView } from './client-capabilities-view.js'
 import { capabilityProfileConfiguration } from '../internal/runtime-config.js'
+import { capabilityPolicyForConfig } from '../internal/capability-policy.js'
 import { createReplView } from './client-repl-view.js'
 import { createAuthoringView } from './client-authoring-view.js'
 import { bindingToggleConversationDefinition } from './client-binding-toggle.js'
@@ -24,6 +25,7 @@ import {
 } from './client-host-compat.js'
 import {
   normalizeReplMemorySnapshot,
+  normalizeReplMemoryView,
   unavailableReplMemorySnapshot,
 } from '../internal/repl-memory-projection.js'
 import { createBindingReviews } from './client-binding-review.js'
@@ -177,18 +179,28 @@ export function createClientPlugin(require) {
       })
       const { observeRepl } = createReplObserver({ rpc, ctx })
       const capabilityCommands = createCommandAccess(ctx, 'capabilities')
+      // The panel's binding rows write through the same `/binding` command a human
+      // types, so they borrow its availability source instead of a second channel.
+      const bindingCommands = createBindingCommandAvailability(ctx)
       const CapabilityCommandCard = createCapabilityCommandCard(React)
       const CapabilityRefreshButton = createCapabilityRefreshView(React, capabilityCommands)
-      const SessionCapabilityControls = createSessionCapabilityControlsView(React, {
-        commands: capabilityCommands, Modal, Select,
-        async inspectSessionCatalog(sessionId, signal) {
-          const result = await rpc.call(RPC_CONTRACTS.capabilities, 'session-catalog', { sessionId }, signal)
-          if (result?.ok !== true) throw new Error(result?.error?.message ?? 'Session capability catalog unavailable')
-          return result.value
-        },
+      // One read serves both entrances. A request that names a session states that
+      // session's declared face; a request that names none states the Host's own
+      // declaration, which is the process-scope object set this entrance can state — a
+      // preset's agent-scope entries exist only in a session's declared face.
+      async function inspectSessionCatalog(sessionId, signal) {
+        const result = await rpc.call(RPC_CONTRACTS.capabilities, 'session-catalog',
+          typeof sessionId === 'string' && sessionId ? { sessionId } : {}, signal)
+        if (result?.ok !== true) throw new Error(result?.error?.message ?? 'Session capability catalog unavailable')
+        return result.value
+      }
+      // The capability page has one renderer. The session entry and the settings entry
+      // both mount it; neither adds a column, a word, a control or a receipt of its own.
+      const CapabilitySurface = createCapabilitySurfaceView(React, {
+        commands: capabilityCommands, bindingCommands, Modal, Select, inspectSessionCatalog,
       })
       const { PTCPlusSettingsCard, PTCPlusSettingsDialog } = createPtcSettingsView(React, {
-        ActionButton, BindingsDialog, Modal, Select, useWorkbenchController, CapabilityRefreshButton,
+        ActionButton, BindingsDialog, Modal, Select, useWorkbenchController, CapabilityRefreshButton, CapabilitySurface,
         async inspectCapabilityTargets(signal) {
           const result = await rpc.call(RPC_CONTRACTS.capabilities, 'targets', {}, signal)
           if (result?.ok !== true) throw new Error(result?.error?.message ?? 'Capability refresh targets unavailable')
@@ -199,20 +211,18 @@ export function createClientPlugin(require) {
           if (result?.ok !== true) throw new Error(result?.error?.message ?? 'Capability plans unavailable')
           return result.value
         },
-        async inspectCapabilityCatalog(signal) {
-          const result = await rpc.call(RPC_CONTRACTS.capabilities, 'catalog', {}, signal)
-          if (result?.ok !== true) throw new Error(result?.error?.message ?? 'Capability catalog unavailable')
-          return result.value
-        },
         async inspectCapabilityAllocation(payload, signal) {
           const result = await rpc.call(RPC_CONTRACTS.capabilities, 'allocation', payload, signal)
           if (result?.ok !== true) throw new Error(result?.error?.message ?? 'Capability allocation unavailable')
           return result.value
         },
-        icons: { search: IconSearchOutline16, chevron: IconChevronDownOutline14 },
+        // The settings page reads one icon: its navigation chevron. The search icon belonged to
+        // the second renderer's toolbar row, which this page no longer has.
+        icons: { chevron: IconChevronDownOutline14 },
       })
       const { ReplComposer, ReplConsole, ReplMemoryCard, replPopoverIsOpen, placeReplPopover, useObservedReplMemory } = createReplView(React, {
-        CodeBlock, Select, featureEnabled, normalizeReplMemorySnapshot, unavailableReplMemorySnapshot,
+        CodeBlock, Select, featureEnabled, normalizeReplMemorySnapshot, normalizeReplMemoryView,
+        unavailableReplMemorySnapshot,
         useSessionPreset, sessionUsesPtcPreset, useWorkbenchController, UserBindingsWorkbench,
         icons: { search: IconSearchOutline16, chevron: IconChevronDownOutline14 },
       })
@@ -239,9 +249,24 @@ export function createClientPlugin(require) {
         const before = preferenceScope.getSnapshot()
         if (before.status !== 'ready' || before.writable !== true || !featureEnabled(before, 'plugin')) throw new Error('Capability settings are not writable')
         const validated = capabilityProfileConfiguration(configuration)
-        await preferenceScope.mutate(Object.entries(validated).map(([key, value]) => ({ op: 'set', path: [key], value })))
+        const synthesized = JSON.stringify(capabilityPolicyForConfig({ ...validated, capabilityPolicy: undefined }))
+        const ops = Object.entries(validated)
+          .filter(([key]) => key !== 'capabilityPolicy')
+          .map(([key, value]) => ({ op: 'set', path: [key], value }))
+        // A policy the rest of this configuration would synthesize belongs to no record: writing it
+        // would freeze a synthesized bottom layer into the record and let the management switch
+        // reach cells that must read 自动 (capability-surface §8.1c). The record may still hold one
+        // from an earlier apply, so remove it with the service's own unset op instead of leaving it.
+        const policyWritten = validated.capabilityPolicy !== undefined && validated.capabilityPolicy !== synthesized
+        ops.push(policyWritten
+          ? { op: 'set', path: ['capabilityPolicy'], value: validated.capabilityPolicy }
+          : { op: 'unset', path: ['capabilityPolicy'] })
+        await preferenceScope.mutate(ops)
         const after = preferenceScope.getSnapshot()
-        if (after.status !== 'ready' || Object.entries(validated).some(([key, value]) => after.value?.[key] !== value)) throw new Error('Capability configuration was not applied')
+        const unchanged = Object.entries(validated).every(([key, value]) => key === 'capabilityPolicy'
+          ? (policyWritten ? after.value?.capabilityPolicy === value : after.value?.capabilityPolicy === undefined)
+          : after.value?.[key] === value)
+        if (after.status !== 'ready' || !unchanged) throw new Error('Capability configuration was not applied')
         return 'status.applied'
       }
       // One gated-registration shape for every settings-driven contribution.
@@ -305,7 +330,10 @@ export function createClientPlugin(require) {
             isEnabled: () => featureEnabled(preferenceScope.getSnapshot(), 'replView')
               && sessionUsesPtcPreset(preset),
             register: () => viewScope.slots.register({
-              name: 'conversation.view', id: 'ptc-plus-repl', label: 'REPL', order: 20,
+              // A plugin contribution trails the Host's own tabs: chat is 0 and the
+              // experimental statistics tab is 40, and a REPL tab that sorts before them
+              // pushes a Host tab to the right of a plugin's.
+              name: 'conversation.view', id: 'ptc-plus-repl', label: 'REPL', order: 50,
               locale: LOCALE_NS, inject: () => ({ ...settingsProps(), hideComposer, observeRepl }),
             }, props => typeof props.useProjection === 'function' ? h(ReplConsole, props) : null),
           })
@@ -328,7 +356,7 @@ export function createClientPlugin(require) {
       const { BindingAuthorButton, BindingReviewDock, BindingCommandCard } = createAuthoringView(React, {
         ActionButton, IconButton, Menu, MenuFallback, Toast, Tooltip, CodeBlock, Modal, createPortal, BindingsDialog, PTCPlusSettingsDialog,
         useWorkbenchController, useBindingReview, catalogOwner, callUserBindings, subscribeReset,
-        settingsCardSeat: settingsCard.seat, updateSetting, updateCapabilityConfiguration, menuChildren, SessionCapabilityControls,
+        settingsCardSeat: settingsCard.seat, updateSetting, updateCapabilityConfiguration, menuChildren, SessionCapabilityControls: CapabilitySurface,
         icons: {
           sparkle: IconSparkle16, chevron: IconChevronDownOutline14,
           close: IconCloseOutline16, check: IconCheckOutline14,
@@ -364,7 +392,6 @@ export function createClientPlugin(require) {
           name: 'conversation.input.dock', id: 'ptc-plus-binding-review', order: -30, locale: LOCALE_NS,
         }, props => typeof props.useProjection === 'function' && props.sessionId !== undefined
           ? h(BindingReviewDock, { ...props, key: props.sessionId }) : null)))))
-      const availability = createBindingCommandAvailability(ctx)
       // The composer binding entry belongs to the PTC surface, exactly like the
       // header indicator and the REPL tab. A non-PTC session keeps plugin
       // settings and `/binding` command cards, but shows no binding shortcut and
@@ -385,7 +412,7 @@ export function createClientPlugin(require) {
           register: () => ctx.slots.register({
             name: 'conversation.input.left', id: 'ptc-plus-binding-author', order: 20, locale: LOCALE_NS,
             inject: sessionId => ({
-              hooks: { ptcSettings: preferenceScope, bindingCommand: availability.source(sessionId),
+              hooks: { ptcSettings: preferenceScope, bindingCommand: bindingCommands.source(sessionId),
                 capabilityCommand: capabilityCommands.source(sessionId) },
             }),
           }, props => props.sessionId === undefined ? null : h(BindingAuthorButton, { ...props, key: props.sessionId })),