dsh-ptc-plus 0.5.2 → 0.5.4

package/internal/user-bindings-owner.js

@@ -1,5 +1,15 @@
 import { PTC_MESSAGE_SOURCE_KIND } from './message-sources.js'
+import { sessionExecutionAvailable } from './host-tool-sdk.js'
 import { bindingToggleMessage } from './binding-toggle-receipt.js'
+import {
+  BINDING_ADOPTION_RECORD,
+  clearedBindingAdoption,
+  declinedBindingEntries,
+  withBindingAdoption,
+} from './binding-adoption.js'
+// Namespace import: the record writer is one public surface of the host, and the module
+// load must not depend on a named export that a future release could rename.
+import * as dshSession from '@deepseek-ai/dsh-session'
 import { RPC_CONTRACTS } from './rpc-contract.js'
 import { randomUUID } from 'node:crypto'
 import { dirname } from 'node:path'
@@ -26,6 +36,7 @@ import {
   createUserBindingsSnapshot,
   normalizeUserBindingEntry,
   normalizeUserBindingsDocument,
+  selectUserBindingsSnapshot,
   storedUserBindingsDocument,
 } from './user-bindings.js'
 
@@ -78,6 +89,40 @@ function parseAuthoringCommand(rawInput) {
   return { kind: 'help' }
 }
 
+/**
+ * The adoption subcommands of `/binding`. They state which supplied entries this
+ * session uses; authoring and adoption share one command because both answer
+ * questions about the same global catalog, and a second command would suggest
+ * they were separate features.
+ */
+function parseAdoptionCommand(rawInput) {
+  const input = typeof rawInput === 'string' ? rawInput.trim() : ''
+  if (input === 'status') return { kind: 'status' }
+  if (input === 'reset') return { kind: 'reset' }
+  const decision = /^(use|skip)\s+(\S+)$/.exec(input)
+  if (decision === null) return undefined
+  return { kind: decision[1] === 'use' ? 'use' : 'skip', id: decision[2] }
+}
+
+function adoptionStatusText(catalog, adoption) {
+  const declined = declinedBindingEntries(adoption)
+  const supplied = catalog.entries
+  const listed = supplied.map(entry => `${entry.id} (${entry.name}): ${declined.has(entry.id)
+    ? 'not used by this session' : 'used by this session'}`)
+  const unavailable = [...declined].filter(id => !supplied.some(entry => entry.id === id))
+  return [
+    'Global binding catalog supply and this session\'s adoption of it. Adoption decides which supplied entries this session uses; it does not report whether the worker installed them.',
+    ...(listed.length === 0 ? ['The global catalog supplies no enabled entries.'] : listed),
+    ...(unavailable.length === 0 ? [] : [`Declined but not supplied by the global catalog, therefore not used and not revivable here: ${JSON.stringify(unavailable)}`]),
+  ].join('\n')
+}
+
+function adoptionReceipt(adoption) {
+  return `Session binding adoption recorded. This session declines ${JSON.stringify([...declinedBindingEntries(adoption)])}. `
+    + 'The global catalog and other sessions are unchanged, and adoption can only withdraw a supplied entry. '
+    + 'Whether the worker installed the entries this session still uses is reported with the next accepted cell, not by this receipt.'
+}
+
 function authoringTask(command, current) {
   if (command.kind === 'new') {
     return `Create a Global User Binding draft for this requirement:\n\n${command.requirement}`
@@ -190,6 +235,11 @@ export function createUserBindingsOwner(ctx, options = {}) {
   let disposed = false
   const codeConsole = new UserBindingConsole(currentOptions)
   const commandRegistrations = new Map()
+  // The host's writer for a fact that belongs in the log but not on the model-visible
+  // surface. Every supported release publishes it, so an adoption decision is taken when
+  // it is made instead of waiting for a step to carry a message.
+  const appendRecord = typeof options.appendRecord === 'function' ? options.appendRecord
+    : typeof dshSession.appendPluginRecord === 'function' ? dshSession.appendPluginRecord : undefined
   const sessionAgents = new Map()
   const sessionGenerations = new Map()
   const agentLifecycles = new WeakMap()
@@ -265,6 +315,57 @@ export function createUserBindingsOwner(ctx, options = {}) {
   const requireEnabled = () => {
     if (!enabled) throw new Error('Global User Bindings are disabled')
   }
+  // Adoption is read from the session's own recorded decision, never from a
+  // second in-memory map: the log is the owner, so a restart reconstructs the
+  // same environment without a migration step.
+  const adoptionForAgent = (agent) => {
+    if (typeof options.bindingAdoptionForAgent !== 'function' || agent === undefined || agent === null) return undefined
+    return options.bindingAdoptionForAgent(agent)
+  }
+  /**
+   * Supply minus this session's declines. The catalog decides which entries
+   * exist; adoption only withdraws one, so no entry can appear here that the
+   * global configuration did not supply.
+   */
+  const adoptedCatalog = (snapshot, adoption) => {
+    const declined = declinedBindingEntries(adoption)
+    if (declined.size === 0) return snapshot
+    const kept = snapshot.entries.filter(entry => !declined.has(entry.id))
+    if (kept.length === snapshot.entries.length) return snapshot
+    return selectUserBindingsSnapshot(snapshot, kept.map(entry => entry.id))
+  }
+  const recordAdoption = (agent, adoption) => {
+    const session = agent?.session
+    if (session === undefined || typeof session.append !== 'function') {
+      throw new Error('binding adoption requires a live session')
+    }
+    if (appendRecord === undefined) {
+      throw new Error('ptc-plus: this DSH release publishes no plugin-record writer, so a binding adoption decision cannot be recorded')
+    }
+    // Adoption is this session's own statement and the catalog the model reads already
+    // reflects it, so it is taken the moment the control is used: durable through the log,
+    // outside the model-visible surface, and requiring no prior step. A session that cannot
+    // take the record reports that instead of a decision nothing stored.
+    try {
+      appendRecord(session, BINDING_ADOPTION_RECORD, adoption)
+    } catch (error) {
+      throw new Error(`the session did not record the binding adoption decision: ${error?.message ?? String(error)}`)
+    }
+    return { kind: 'success', text: adoptionReceipt(adoption) }
+  }
+  const stateAdoption = async (agent, command) => {
+    requireEnabled()
+    // Status and validation read the full supplied catalog: an adopted subset
+    // cannot prove what it was derived from.
+    const catalog = await store.snapshot()
+    const current = adoptionForAgent(agent)
+    if (command.kind === 'status') return { kind: 'success', text: adoptionStatusText(catalog, current) }
+    if (command.kind === 'reset') return recordAdoption(agent, clearedBindingAdoption())
+    if (!catalog.entries.some(entry => entry.id === command.id)) {
+      throw new Error(`the global binding catalog does not supply entry ${JSON.stringify(command.id)}; this session can decline a supplied entry but cannot add or revive one`)
+    }
+    return recordAdoption(agent, withBindingAdoption(current, command.id, command.kind === 'use'))
+  }
   const draftFor = (capability) => {
     if (typeof capability !== 'string' || capability === '') {
       throw new TypeError('draft capability must be a non-empty string')
@@ -482,7 +583,7 @@ export function createUserBindingsOwner(ctx, options = {}) {
     const requireCurrentAgent = () => {
       if (!agentIsCurrent(agent, sessionId, agentGeneration)
         || commandRegistrations.get(sessionId)?.agent !== agent
-        || ctx.tools.get('run_code', agent) === undefined) {
+        || !sessionExecutionAvailable(ctx.tools, agent)) {
         throw new Error('this binding authoring Agent is no longer active')
       }
     }
@@ -617,6 +718,14 @@ export function createUserBindingsOwner(ctx, options = {}) {
 
   const commandHandler = async ({ agent, rawInput, signal, commandId }) => {
     signal?.throwIfAborted?.()
+    const adoption = parseAdoptionCommand(rawInput)
+    if (adoption !== undefined) {
+      try {
+        return await stateAdoption(agent, adoption)
+      } catch (error) {
+        return { kind: 'error', text: error instanceof Error ? error.message : String(error) }
+      }
+    }
     const command = parseAuthoringCommand(rawInput)
     if (command.kind === 'help') return { kind: 'error', text: `Usage: ${COMMAND_USAGE}` }
     try {
@@ -660,14 +769,14 @@ export function createUserBindingsOwner(ctx, options = {}) {
         // still claiming one.
         if (disposed || !enabled || lifecycleGeneration !== registration.generation
           || !agentIsCurrent(agent, sessionId, agentGeneration)
-          || ctx.tools.get('run_code', agent) === undefined
+          || !sessionExecutionAvailable(ctx.tools, agent)
           || commandRegistrations.get(sessionId) !== registration) {
           throw new Error('Global User Bindings binding command registration is no longer eligible')
         }
         registerOwned(commandCtx, commandCtx.commands, {
           name: 'binding',
-          description: 'Create or revise a Global User Binding draft with the current agent',
-          input: { hint: 'new <requirement> | edit <id> <requirement>' },
+          description: 'Author a Global User Binding draft, or state which supplied entries this session uses',
+          input: { hint: 'new <requirement> | edit <id> <requirement> | status | use <id> | skip <id> | reset' },
           handler: commandHandler,
         }, 'binding command')
       })
@@ -712,13 +821,13 @@ export function createUserBindingsOwner(ctx, options = {}) {
     }
     if (!agentIsCurrent(agent, sessionId, agentGeneration)) return
     const eligible = enabled && draftProjectionAvailable && !disposed
-      && ctx.tools.get('run_code', agent) !== undefined
+      && sessionExecutionAvailable(ctx.tools, agent)
     const current = commandRegistrations.get(sessionId)
     if (eligible && current?.agent === agent) return
     if (current !== undefined) await removeCommandFor(sessionId, current)
     if (!agentIsCurrent(agent, sessionId, agentGeneration)) return
     const stillEligible = enabled && draftProjectionAvailable && !disposed
-      && ctx.tools.get('run_code', agent) !== undefined
+      && sessionExecutionAvailable(ctx.tools, agent)
     if (stillEligible) {
       registerCommandFor(agent)
       return
@@ -918,6 +1027,17 @@ export function createUserBindingsOwner(ctx, options = {}) {
     async snapshot() {
       return enabled ? store.snapshot() : undefined
     },
+    /**
+     * The catalog entries one session's worker should receive. Without a stated
+     * adoption this is exactly the supplied catalog, so 0.5.2 behavior is
+     * unchanged for every session that never declines an entry.
+     */
+    async snapshotForAgent(agent) {
+      if (!enabled) return undefined
+      const snapshot = await store.snapshot()
+      const adoption = adoptionForAgent(agent)
+      return adoption === undefined ? snapshot : adoptedCatalog(snapshot, adoption)
+    },
     async list() {
       requireEnabled()
       return store.list()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ptc-plus",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "icon": "assets/ptc-plus-icon.svg",
   "description": "A session-bound agent-native REPL for DeepSeek Harness PTC mode.",
   "type": "module",
@@ -43,7 +43,7 @@
   ],
   "engines": {
     "node": "^22.19.0 || >=24.0.0",
-    "dsh": "*"
+    "dsh": ">=0.2.1-0 <0.2.3"
   },
   "allowScripts": {
     "esbuild": false
@@ -51,8 +51,8 @@
   "dependencies": {
     "@babel/code-frame": "^7.29.7",
     "@babel/parser": "^7.29.0",
-    "@deepseek-ai/dsh-util-values": "^0.2.0-rc.2 || ^0.2.1-alpha.1",
-    "@deepseek-ai/schemastery": "^3.18.3",
+    "@deepseek-ai/dsh-util-values": "^0.2.2-alpha.2",
+    "@deepseek-ai/schemastery": "~3.18.6-alpha.1",
     "@jridgewell/trace-mapping": "^0.3.31",
     "acorn": "^8.15.0"
   },
@@ -69,9 +69,15 @@
     "@deepseek-ai/dsh-skill-filesystem": "*",
     "@deepseek-ai/dsh-spill-policy": "*",
     "@deepseek-ai/dsh-tool-cordis": "*",
+    "@deepseek-ai/dsh-tool-executor-ptc": "*",
     "@deepseek-ai/dsh-tools": "*",
     "@deepseek-ai/dsh-typert-protocol": "*"
   },
+  "peerDependenciesMeta": {
+    "@deepseek-ai/dsh-tool-executor-ptc": {
+      "optional": true
+    }
+  },
   "scripts": {
     "build": "node scripts/client-bundle.mjs build && node scripts/compiler-bundle.mjs build",
     "build:check": "node scripts/client-bundle.mjs check && node scripts/compiler-bundle.mjs check",
@@ -88,8 +94,9 @@
     "test:client:fallback": "node scripts/client-fallback-smoke.mjs",
     "test:client:layout": "node scripts/client-binding-layout.mjs",
     "readme:screenshots": "node scripts/readme-screenshots.mjs",
-    "host:baseline:update": "node scripts/dsh-dependency-baseline.mjs update",
-    "host:baseline:verify": "node scripts/dsh-dependency-baseline.mjs verify",
+    "host:channels:update": "node scripts/host-channel-manifest.mjs update",
+    "host:channels:graph": "node scripts/host-channel-manifest.mjs graph",
+    "host:channels:verify": "node scripts/host-channel-manifest.mjs verify",
     "test:host-contract": "node scripts/dsh-host-contract-suite.mjs",
     "prepack": "npm run build:check",
     "hooks:install": "node scripts/review-findings.mjs install-hook",
@@ -109,14 +116,15 @@
     "test:backend": "node scripts/test-suite-files.mjs",
     "test:backend:fast": "node scripts/test-suite-files.mjs --fast",
     "test:ci:runtime": "node --test --test-concurrency=1 test/package-contract.test.js test/compiler-platform.test.js test/direct-surface-policy.test.js test/isolated-entrance.test.js test/plugin-native-call-transport.test.js",
-    "verify": "npm run review:validate && npm run host:baseline:verify && npm run semantic:check && npm run build:check && node --check index.js && node --check internal/kernel-worker.js && node --check scripts/migrate-session-log.mjs && node --check scripts/expensive-headless-acceptance.mjs && node --check scripts/ab-headless-trajectories.mjs && node scripts/deterministic-test-groups.mjs",
-    "verify:check": "npm run review:validate && npm run host:baseline:verify && npm run semantic:check && npm run build:check && node --check index.js && node --check internal/kernel-worker.js && node scripts/deterministic-test-groups.mjs --check",
-    "verify:ci": "npm run review:validate && npm run host:baseline:verify && npm run semantic:check && npm run build:check && node --check index.js && node --check internal/kernel-worker.js && node --check scripts/migrate-session-log.mjs && node scripts/deterministic-test-groups.mjs --ci",
+    "verify": "npm run review:validate && npm run host:channels:verify && npm run host:shape-check && npm run semantic:check && npm run build:check && node --check index.js && node --check internal/kernel-worker.js && node --check scripts/migrate-session-log.mjs && node --check scripts/expensive-headless-acceptance.mjs && node --check scripts/ab-headless-trajectories.mjs && node scripts/deterministic-test-groups.mjs",
+    "verify:check": "npm run review:validate && npm run host:channels:verify && npm run host:shape-check && npm run semantic:check && npm run build:check && node --check index.js && node --check internal/kernel-worker.js && node scripts/deterministic-test-groups.mjs --check",
+    "verify:ci": "npm run review:validate && npm run host:channels:verify && npm run host:shape-check && npm run semantic:check && npm run build:check && node --check index.js && node --check internal/kernel-worker.js && node --check scripts/migrate-session-log.mjs && node scripts/deterministic-test-groups.mjs --ci",
     "check": "node scripts/review-findings.mjs check",
     "verify:docs": "node scripts/review-findings.mjs docs",
     "test:expensive": "node scripts/expensive-headless-acceptance.mjs",
     "test:ab": "node scripts/ab-headless-trajectories.mjs",
-    "test:package:consumer": "node scripts/npm-consumer-smoke.mjs"
+    "test:package:consumer": "node scripts/npm-consumer-smoke.mjs",
+    "host:shape-check": "node scripts/check-host-version-literals.mjs"
   },
   "keywords": [
     "deepseek-harness",
@@ -166,36 +174,50 @@
     "@codemirror/language": "^6.12.4",
     "@codemirror/state": "^6.7.4",
     "@codemirror/view": "^6.43.11",
-    "@deepseek-ai/dsh": "next",
-    "@deepseek-ai/dsh-agent-loop": "next",
-    "@deepseek-ai/dsh-api-gateway": "next",
-    "@deepseek-ai/dsh-api-remotes": "next",
-    "@deepseek-ai/dsh-atomic-write": "next",
-    "@deepseek-ai/dsh-client-locale": "next",
-    "@deepseek-ai/dsh-client-store": "next",
-    "@deepseek-ai/dsh-client-test-runtime": "next",
-    "@deepseek-ai/dsh-client-ui-conversation": "next",
-    "@deepseek-ai/dsh-client-ui-primitives": "next",
-    "@deepseek-ai/dsh-client-ui-renderer": "next",
-    "@deepseek-ai/dsh-client-ui-session": "next",
-    "@deepseek-ai/dsh-client-ui-slots": "next",
-    "@deepseek-ai/dsh-commands": "next",
-    "@deepseek-ai/dsh-compaction-image-offload": "next",
-    "@deepseek-ai/dsh-home-paths": "next",
-    "@deepseek-ai/dsh-llm": "next",
-    "@deepseek-ai/dsh-session-format-catalog": "next",
-    "@deepseek-ai/dsh-session-format-v0-to-v1": "next",
-    "@deepseek-ai/dsh-session-persistence-jsonl": "next",
-    "@deepseek-ai/dsh-settings": "next",
-    "@deepseek-ai/dsh-skill-filesystem": "next",
-    "@deepseek-ai/dsh-tool-cordis": "next",
-    "@deepseek-ai/dsh-tools": "next",
-    "@deepseek-ai/dsh-typert-protocol": "next",
-    "@deepseek-ai/dsh-typert-registry": "next",
-    "@deepseek-ai/dsh-util-workspace-path": "next",
+    "@deepseek-ai/cordis": "4.0.6-alpha.1",
+    "@deepseek-ai/cordis-plugin-group": "1.0.6-alpha.1",
+    "@deepseek-ai/cordis-plugin-include": "1.0.11-alpha.1",
+    "@deepseek-ai/cordis-plugin-loader": "1.0.7-alpha.1",
+    "@deepseek-ai/cordis-plugin-timer": "1.1.8-alpha.1",
+    "@deepseek-ai/cosmokit": "1.8.7-alpha.1",
+    "@deepseek-ai/dsh": "alpha",
+    "@deepseek-ai/dsh-agent-loop": "alpha",
+    "@deepseek-ai/dsh-agent-loop-testkit": "alpha",
+    "@deepseek-ai/dsh-api-gateway": "alpha",
+    "@deepseek-ai/dsh-api-remotes": "alpha",
+    "@deepseek-ai/dsh-atomic-write": "alpha",
+    "@deepseek-ai/dsh-client-locale": "alpha",
+    "@deepseek-ai/dsh-client-store": "alpha",
+    "@deepseek-ai/dsh-client-test-runtime": "alpha",
+    "@deepseek-ai/dsh-client-ui-conversation": "alpha",
+    "@deepseek-ai/dsh-client-ui-primitives": "alpha",
+    "@deepseek-ai/dsh-client-ui-renderer": "alpha",
+    "@deepseek-ai/dsh-client-ui-session": "alpha",
+    "@deepseek-ai/dsh-client-ui-slots": "alpha",
+    "@deepseek-ai/dsh-commands": "alpha",
+    "@deepseek-ai/dsh-compaction-image-offload": "alpha",
+    "@deepseek-ai/dsh-home-paths": "alpha",
+    "@deepseek-ai/dsh-llm": "alpha",
+    "@deepseek-ai/dsh-scope": "alpha",
+    "@deepseek-ai/dsh-session": "alpha",
+    "@deepseek-ai/dsh-session-format-catalog": "alpha",
+    "@deepseek-ai/dsh-session-format-v0-to-v1": "alpha",
+    "@deepseek-ai/dsh-session-persistence-jsonl": "alpha",
+    "@deepseek-ai/dsh-settings": "alpha",
+    "@deepseek-ai/dsh-skill": "alpha",
+    "@deepseek-ai/dsh-skill-filesystem": "alpha",
+    "@deepseek-ai/dsh-spill-policy": "alpha",
+    "@deepseek-ai/dsh-tool-cordis": "alpha",
+    "@deepseek-ai/dsh-tool-executor-native": "alpha",
+    "@deepseek-ai/dsh-tool-executor-ptc": "alpha",
+    "@deepseek-ai/dsh-tools": "alpha",
+    "@deepseek-ai/dsh-typert-protocol": "alpha",
+    "@deepseek-ai/dsh-typert-registry": "alpha",
+    "@deepseek-ai/dsh-util-workspace-path": "alpha",
     "@lezer/highlight": "^1.2.3",
     "@radix-ui/react-select": "^2.2.6",
     "@shikijs/langs": "^4.3.1",
+    "@tanstack/react-virtual": "^3.14.24",
     "@testing-library/react": "^16.3.3",
     "amaro": "1.1.11",
     "anser": "^2.3.5",

package/src/client-authoring-view.js

@@ -69,7 +69,11 @@ export function createAuthoringView(React, deps) {
   }) {
     const input = useInput?.(snapshot => snapshot)
     const available = useBindingCommand(snapshot => snapshot)
-    const capabilityAvailable = useCapabilityCommand?.(snapshot => snapshot) === true
+    // The capability command source publishes nothing until a session observes it, and
+    // this entry is the surface that keeps it observed while mounted. Its value decides
+    // no branch here: whether `/capabilities` is listed is the command's own answer when
+    // it runs, so the refresh shortcut stays usable and the refusal carries its reason.
+    useCapabilityCommand?.(() => undefined)
     const settings = usePtcSettings(snapshot => snapshot)
     const [review, view] = useBindingReview(sessionId)
     const anchorRef = React.useRef(null)
@@ -113,8 +117,7 @@ export function createAuthoringView(React, deps) {
     const pluginEnabled = featureEnabled(settings, 'plugin') && (hasDraft || featureEnabled(settings, 'ptcMenu'))
     const canPrefill = typeof useInput === 'function' && typeof inputActions?.setDraft === 'function'
     const canAuthor = quickAccess && available && canPrefill
-    const canRefresh = pluginEnabled && settings.status === 'ready' && settings.writable === true
-      && capabilityAvailable && canPrefill
+    const canRefresh = pluginEnabled && settings.status === 'ready' && settings.writable === true && canPrefill
     const menuOpen = pluginEnabled && view.reachable && !managing && !capabilitiesOpen && !settingsOpen
       && menu !== null && menu.key === view.candidateKey
     // The dialog owns the management session; losing the input surface only
@@ -411,8 +414,7 @@ export function createAuthoringView(React, deps) {
     const actionButton = (id, copy) => h('button', {
       type: 'button', role: 'menuitem', className: 'ptcPlusMenuButton',
       disabled: id === 'refresh' && !canRefresh,
-      title: id === 'refresh' && !capabilityAvailable ? t('capabilities.refreshUnavailable')
-        : id === 'settings' ? settingsPath(t) : t(copy),
+      title: id === 'settings' ? settingsPath(t) : t(copy),
       onClick: () => selectMenuItem(id),
     }, actionCopy(id, copy))
     const actionSections = [
@@ -496,7 +498,6 @@ export function createAuthoringView(React, deps) {
         }) : null,
       SessionCapabilityControls && capabilitiesOpen && view.reachable
         ? h(SessionCapabilityControls, { sessionId, open: true, t,
-          enabled: pluginEnabled && settings.status === 'ready' && settings.writable === true,
           onClose: () => {
             setCapabilitiesOpen(false)
             queueMicrotask(() => anchorRef.current?.querySelector('.ptcPlusAuthorButton')
@@ -747,8 +748,6 @@ export function createAuthoringView(React, deps) {
       node.outcome?.kind !== 'error' ? null : h('p', { className: 'ptcPlusMessage ptcPlusDanger' },
         node.outcome.text ?? t('bindings.commandFailed')),
       canOpen ? h(ActionButton, { onClick: () => openBindingReview(review) }, t('bindings.reviewOpen')) : null,
-      !current.mounted && (candidate !== null || matches && projection.phase === 'ready')
-        ? h('p', { className: 'ptcPlusMessage' }, t('bindings.reviewUnavailable')) : null,
       candidate === null ? null : h('details', { className: 'ptcPlusBindingSourceDetails' },
         h('summary', null, t('tool.source')), h(BindingCandidateContent, { candidate, t })))
   }