dsh-ptc-plus 0.3.1 → 0.4.1

package/internal/value-wire.js

@@ -1,22 +1,17 @@
 import { assertFields, isRecord } from './record-utils.js'
+import {
+  VALUE_CODEC,
+  DEFAULT_VALUE_LIMITS,
+  VALUE_ENVELOPE_FIELDS as ENVELOPE_FIELDS,
+  VALUE_OBJECT_FIELDS as OBJECT_NODE_FIELDS,
+  VALUE_ARRAY_FIELDS as ARRAY_NODE_FIELDS,
+  VALUE_UNDEFINED_FIELDS as UNDEFINED_FIELDS,
+  VALUE_NUMBER_FIELDS as NUMBER_FIELDS,
+  VALUE_BIGINT_FIELDS as BIGINT_FIELDS,
+  VALUE_REFERENCE_FIELDS as REFERENCE_FIELDS,
+} from './value-wire-schema.js'
 
-export const VALUE_CODEC = 'ptc-value-graph/v1'
-
-export const DEFAULT_VALUE_LIMITS = Object.freeze({
-  maxNodes: 100_000,
-  maxEdges: 1_000_000,
-  maxArrayLength: 1_000_000,
-  maxBigIntDigits: 100_000,
-  maxStringBytes: 64 * 1024 * 1024,
-})
-
-const ENVELOPE_FIELDS = new Set(['codec', 'root', 'nodes'])
-const OBJECT_NODE_FIELDS = new Set(['type', 'prototype', 'entries'])
-const ARRAY_NODE_FIELDS = new Set(['type', 'length', 'entries'])
-const UNDEFINED_FIELDS = new Set(['tag'])
-const NUMBER_FIELDS = new Set(['tag', 'value'])
-const BIGINT_FIELDS = new Set(['tag', 'value'])
-const REFERENCE_FIELDS = new Set(['tag', 'index'])
+export { VALUE_CODEC, DEFAULT_VALUE_LIMITS } from './value-wire-schema.js'
 const IDENTIFIER = /^[A-Za-z_$][A-Za-z0-9_$]*$/
 
 function limitsOf(options = {}) {
@@ -338,7 +333,10 @@ function atomText(atom) {
 /** Deterministic bounded TS-like presentation. It is never a decode format. */
 export function renderValueWire(wire, options = {}) {
   const limits = limitsOf(options)
-  const normalized = normalizeValueWire(wire, limits)
+  return renderCanonicalValue(decodeCanonicalValue(wire, limits).wire, limits)
+}
+
+function renderCanonicalValue(normalized, limits) {
   const references = new Array(normalized.nodes.length).fill(0)
   const count = (atom) => {
     if (isRecord(atom) && atom.tag === 'reference') references[atom.index] += 1
@@ -416,6 +414,17 @@ export function renderValueWire(wire, options = {}) {
  * text. The untagged ranges overlap because a plain JSON root may itself be a string.
  */
 export function projectValueWire(wire, options = {}) {
-  const value = decodeValue(wire, options)
-  return isPlainJsonTree(value) ? value : renderValueWire(wire, options)
+  return prepareValueWire(wire, options).projectedValue
+}
+
+/** Validate once when canonical storage and outer presentation are both required. */
+export function prepareValueWire(wire, options = {}) {
+  const limits = limitsOf(options)
+  const canonical = decodeCanonicalValue(wire, limits)
+  return {
+    wire: canonical.wire,
+    projectedValue: isPlainJsonTree(canonical.value)
+      ? canonical.value
+      : renderCanonicalValue(canonical.wire, limits),
+  }
 }

package/internal/worker-client.js

@@ -1,65 +1,32 @@
 import { mkdtemp, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { isAbsolute, join } from 'node:path'
-import { Worker } from 'node:worker_threads'
-import { messageOf } from './failure-reporting.js'
+import { messageOf, processExitDescription } from './failure-reporting.js'
+import { IsolatedOwner } from './isolated-worker.js'
+import { normalizeWorkerEnvironment } from './worker-environment.js'
 
-const WINDOWS_ENVIRONMENT_NAMES = new Map([
-  ['appdata', 'APPDATA'],
-  ['comspec', 'ComSpec'],
-  ['home', 'HOME'],
-  ['homedrive', 'HOMEDRIVE'],
-  ['homepath', 'HOMEPATH'],
-  ['localappdata', 'LOCALAPPDATA'],
-  ['path', 'PATH'],
-  ['pathext', 'PATHEXT'],
-  ['programdata', 'ProgramData'],
-  ['programfiles', 'ProgramFiles'],
-  ['programfiles(x86)', 'ProgramFiles(x86)'],
-  ['systemdrive', 'SystemDrive'],
-  ['systemroot', 'SystemRoot'],
-  ['temp', 'TEMP'],
-  ['tmp', 'TMP'],
-  ['userprofile', 'USERPROFILE'],
-  ['windir', 'windir'],
-])
-const HOST_ONLY_ENVIRONMENT_NAMES = new Set(['node_test_context', 'node_v8_coverage'])
+export { normalizeWorkerEnvironment }
 
-/** Project the host environment once without losing Windows case variants. */
-export function normalizeWorkerEnvironment(source, platform = process.platform) {
-  if (platform !== 'win32') {
-    return Object.fromEntries(Object.entries(source).filter(([name, value]) => (
-      value !== undefined && !HOST_ONLY_ENVIRONMENT_NAMES.has(name.toLowerCase())
-    )))
-  }
-  const normalized = new Map()
-  for (const [name, value] of Object.entries(source)) {
-    if (value === undefined) continue
-    const key = name.toLowerCase()
-    if (HOST_ONLY_ENVIRONMENT_NAMES.has(key)) continue
-    const canonicalName = WINDOWS_ENVIRONMENT_NAMES.get(key) ?? name
-    const current = normalized.get(key)
-    if (current === undefined || name === canonicalName) {
-      normalized.set(key, [canonicalName, value])
-    }
-  }
-  return Object.fromEntries(normalized.values())
-}
+const KERNEL_HELPER = new URL('./kernel-child.js', import.meta.url)
 
 /** Owns one session kernel's worker process, private port, and scratch directory. */
 export class WorkerClient {
-  constructor({ workerUrl, cwd, onMessage, onFailure }) {
+  constructor({ workerUrl, cwd, onMessage, onFailure, compilerCache }) {
     this.workerUrl = workerUrl
     this.cwd = cwd
     this.onMessage = onMessage
     this.onFailure = onFailure
+    this.compilerCache = compilerCache
     this.worker = undefined
     this.workerLimit = undefined
     this.workerReady = undefined
     this.port = undefined
     this.scratchReady = undefined
     this.stderrTails = new WeakMap()
-    this.terminations = new Set()
+    // One owner keeps every started kernel transport, including startup failures
+    // and closes that were refused, until its real exit is observed.
+    this.owner = new IsolatedOwner()
+    this.hostIds = new WeakMap()
     this.disposed = false
   }
 
@@ -101,19 +68,20 @@ export class WorkerClient {
     const environment = normalizeWorkerEnvironment(process.env)
     let worker
     try {
-      worker = new Worker(this.workerUrl, {
+      const started = this.owner.start({
+        helper: KERNEL_HELPER,
+        entry: this.workerUrl,
+        workerData: { cwd: this.cwd, compilerCache: this.compilerCache?.() },
+        resourceLimits: { maxOldGenerationSizeMb: this.workerLimit },
         env: {
           ...environment,
           TEMP: scratchDirectory,
           TMP: scratchDirectory,
           TMPDIR: scratchDirectory,
         },
-        execArgv: [],
-        workerData: this.cwd === undefined ? {} : { cwd: this.cwd },
-        resourceLimits: { maxOldGenerationSizeMb: this.workerLimit },
-        stdout: true,
-        stderr: true,
       })
+      worker = started.transport
+      this.hostIds.set(worker, started.id)
     } catch (error) {
       this.workerLimit = undefined
       throw error
@@ -129,15 +97,23 @@ export class WorkerClient {
     })
     this.stderrTails.set(worker, stderrTail)
     worker.on('error', error => this.fail(worker, `worker error: ${messageOf(error)}`))
-    worker.on('exit', code => this.fail(worker, `worker exited with code ${code}`))
+    worker.on('exit', (code, signal) => {
+      this.fail(worker, `worker exited with ${processExitDescription(code, signal)}`)
+    })
     this.worker = worker
     this.workerReady = new Promise((resolve, reject) => {
-      const onError = error => reject(error)
-      const onExit = (code) => {
+      const onError = error => {
         const detail = this.stderrDetail(worker)
+        reject(detail === undefined
+          ? error
+          : new Error(`${messageOf(error)}; last stderr: ${detail}`, { cause: error }))
+      }
+      const onExit = (code, signal) => {
+        const detail = this.stderrDetail(worker)
+        const exit = processExitDescription(code, signal)
         reject(new Error(detail === undefined
-          ? `worker exited with code ${code} before opening its private channel`
-          : `worker exited with code ${code} before opening its private channel; last stderr: ${detail}`))
+          ? `worker exited with ${exit} before opening its private channel`
+          : `worker exited with ${exit} before opening its private channel; last stderr: ${detail}`))
       }
       worker.once('error', onError)
       worker.once('exit', onExit)
@@ -146,12 +122,16 @@ export class WorkerClient {
         worker.removeListener('exit', onExit)
         if (message?.type === 'startup-error' && typeof message.error === 'string') {
           reject(new Error(message.error))
-          void this.reset(worker)
+          // The owner keeps a refused reclamation, so this must not surface as an
+          // unhandled rejection after the caller already handled the startup error.
+          void this.reset(worker).catch(() => {})
           return
         }
         if (message?.type !== 'ready' || typeof message.port?.postMessage !== 'function') {
           reject(new Error('kernel worker returned an invalid private channel'))
-          void this.reset(worker)
+          // The owner keeps a refused reclamation, so this must not surface as an
+          // unhandled rejection after the caller already handled the startup error.
+          void this.reset(worker).catch(() => {})
           return
         }
         this.port = message.port
@@ -185,27 +165,37 @@ export class WorkerClient {
   }
 
   async reset(worker) {
+    const port = this.worker === worker ? this.port : undefined
     if (this.worker === worker) {
       this.worker = undefined
       this.workerLimit = undefined
       this.workerReady = undefined
-      this.port?.close()
       this.port = undefined
     }
-    const termination = worker.terminate()
-    this.terminations.add(termination)
-    try {
-      await termination
-    } finally {
-      this.terminations.delete(termination)
-    }
+    await this.owner.stop(this.hostIds.get(worker))
+    this.hostIds.delete(worker)
+    port?.close()
   }
 
   async dispose() {
     this.disposed = true
     const worker = this.worker
-    if (worker !== undefined) await this.reset(worker)
-    await Promise.all([...this.terminations])
+    const port = this.port
+    this.worker = undefined
+    this.workerLimit = undefined
+    this.workerReady = undefined
+    this.port = undefined
+    if (worker !== undefined) this.hostIds.delete(worker)
+    const failures = []
+    try {
+      port?.close()
+    } catch (error) {
+      failures.push(error)
+    }
+    failures.push(...await this.owner.dispose())
+    if (failures.length > 0) {
+      throw new AggregateError(failures, 'ptc-plus kernel worker disposal failed')
+    }
     if (this.scratchReady !== undefined) {
       try {
         const scratchDirectory = await this.scratchReady

package/internal/worker-environment.js

@@ -0,0 +1,45 @@
+const WINDOWS_ENVIRONMENT_NAMES = new Map([
+  ['appdata', 'APPDATA'],
+  ['comspec', 'ComSpec'],
+  ['home', 'HOME'],
+  ['homedrive', 'HOMEDRIVE'],
+  ['homepath', 'HOMEPATH'],
+  ['localappdata', 'LOCALAPPDATA'],
+  ['path', 'PATH'],
+  ['pathext', 'PATHEXT'],
+  ['programdata', 'ProgramData'],
+  ['programfiles', 'ProgramFiles'],
+  ['programfiles(x86)', 'ProgramFiles(x86)'],
+  ['systemdrive', 'SystemDrive'],
+  ['systemroot', 'SystemRoot'],
+  ['temp', 'TEMP'],
+  ['tmp', 'TMP'],
+  ['userprofile', 'USERPROFILE'],
+  ['windir', 'windir'],
+])
+export const HOST_ONLY_ENVIRONMENT_NAMES = new Set([
+  'node_test_context',
+  'node_v8_coverage',
+  'dsh_ptc_compiler_bytecode',
+])
+
+/** Project the host environment once without losing Windows case variants. */
+export function normalizeWorkerEnvironment(source, platform = process.platform) {
+  if (platform !== 'win32') {
+    return Object.fromEntries(Object.entries(source).filter(([name, value]) => (
+      value !== undefined && !HOST_ONLY_ENVIRONMENT_NAMES.has(name.toLowerCase())
+    )))
+  }
+  const normalized = new Map()
+  for (const [name, value] of Object.entries(source)) {
+    if (value === undefined) continue
+    const key = name.toLowerCase()
+    if (HOST_ONLY_ENVIRONMENT_NAMES.has(key)) continue
+    const canonicalName = WINDOWS_ENVIRONMENT_NAMES.get(key) ?? name
+    const current = normalized.get(key)
+    if (current === undefined || name === canonicalName) {
+      normalized.set(key, [canonicalName, value])
+    }
+  }
+  return Object.fromEntries(normalized.values())
+}

package/internal/worker-output-relay.js

@@ -0,0 +1,29 @@
+/** Forward one worker output stream while honoring destination backpressure. */
+export function relayWorkerOutput(source, destination) {
+  if (source === null || source === undefined) return Promise.resolve()
+  return new Promise((resolve, reject) => {
+    let ended = false
+    let pending = 0
+    let settled = false
+    let failure
+    const finish = error => {
+      if (error !== undefined) failure ??= error
+      if (settled || (!ended && failure === undefined) || pending > 0) return
+      settled = true
+      if (failure === undefined) resolve()
+      else reject(failure)
+    }
+    source.on('data', chunk => {
+      source.pause()
+      pending += 1
+      destination.write(chunk, error => {
+        pending -= 1
+        if (error !== null && error !== undefined) { finish(error); return }
+        if (failure === undefined) source.resume()
+        finish()
+      })
+    })
+    source.once('end', () => { ended = true; finish() })
+    source.once('error', error => { ended = true; finish(error) })
+  })
+}

package/internal/worker-shutdown.js

@@ -0,0 +1,14 @@
+/**
+ * Shutdown protocol shared by the plugin's worker entries.
+ *
+ * Each worker entry releases the machinery it owns when it receives the request
+ * and reports that release with the acknowledgement. The release, the real exit
+ * and the kill bound belong to the helper process boundary in
+ * isolated-worker.js; these two constants are the only part the worker entries
+ * themselves need.
+ */
+
+/** Request that asks one worker to release everything it owns and stop. */
+export const WORKER_SHUTDOWN_REQUEST = 'shutdown'
+/** Reply a worker posts after releasing its own machinery, before it exits. */
+export const WORKER_SHUTDOWN_ACKNOWLEDGEMENT = 'shutdown-released'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ptc-plus",
-  "version": "0.3.1",
+  "version": "0.4.1",
   "description": "A session-bound agent-native REPL for DeepSeek Harness PTC mode.",
   "type": "module",
   "main": "./index.js",
@@ -12,13 +12,27 @@
   "files": [
     "index.js",
     "client.js",
+    "compiler-core.cjs",
+    "compiler-core.cjs.map",
+    "compiler-platform.cjs",
+    "compiler-platform.cjs.map",
+    "compiler-typescript.cjs",
+    "compiler-typescript.cjs.map",
+    "compiler-amaro.cjs",
+    "compiler-amaro.cjs.map",
+    "compiler-assets.json",
+    "compiler-asset-*.txt",
     "src",
     "internal",
     "docs",
     "assets/dsh-ptc-plus-banner-en.webp",
     "assets/dsh-ptc-plus-banner-zh.webp",
+    "assets/ptc-plus-bindings-en.png",
+    "assets/ptc-plus-bindings-zh.png",
     "assets/ptc-plus-repair-zh.png",
     "assets/ptc-plus-repair-en.png",
+    "assets/ptc-plus-repl-workspace-en.png",
+    "assets/ptc-plus-repl-workspace-zh.png",
     "assets/ptc-plus-settings-en.png",
     "assets/ptc-plus-settings-zh.png",
     "cordis.patch.yml",
@@ -34,28 +48,55 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.29.7",
+    "@babel/core": "^7.29.7",
+    "@babel/generator": "^7.29.8",
+    "@babel/helper-create-class-features-plugin": "^7.29.7",
     "@babel/parser": "^7.29.0",
+    "@babel/plugin-proposal-decorators": "^7.29.7",
+    "@babel/plugin-transform-explicit-resource-management": "^7.29.7",
+    "@babel/plugin-transform-optional-chaining": "^7.29.7",
+    "@babel/plugin-transform-typescript": "^7.29.7",
     "@babel/traverse": "^7.29.0",
+    "@codemirror/lang-javascript": "^6.2.5",
+    "@codemirror/language": "^6.12.4",
+    "@codemirror/state": "^6.7.4",
+    "@codemirror/view": "^6.43.11",
     "@deepseek-ai/schemastery": "^3.18.1",
-    "acorn": "^8.15.0"
+    "@jridgewell/trace-mapping": "^0.3.31",
+    "@lezer/highlight": "^1.2.3",
+    "acorn": "^8.15.0",
+    "amaro": "1.1.11",
+    "codemirror": "^6.0.2",
+    "fflate": "^0.8.3",
+    "pathe": "^2.0.3",
+    "tslib": "^2.8.1",
+    "typescript": "^6.0.3"
   },
   "peerDependencies": {
+    "@deepseek-ai/dsh-atomic-write": "*",
+    "@deepseek-ai/dsh-home-paths": "*",
+    "@deepseek-ai/dsh-llm": "*",
     "@deepseek-ai/dsh-settings": "*",
     "@deepseek-ai/dsh-skill-filesystem": "*",
     "@deepseek-ai/dsh-tool-cordis": "*",
-    "@deepseek-ai/dsh-tools": "*"
+    "@deepseek-ai/dsh-tools": "*",
+    "@deepseek-ai/dsh-typert-protocol": "*"
   },
   "scripts": {
-    "build": "node scripts/client-bundle.mjs build",
-    "build:check": "node scripts/client-bundle.mjs check",
+    "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",
+    "test:client": "vitest run --config scripts/client-test.config.mjs",
+    "test:semantics": "node --test --test-concurrency=1 test/semantic-test262.test.js test/semantic-dialect.test.js test/semantic-boundaries.test.js",
+    "test:client:web": "node scripts/client-web-smoke.mjs",
+    "test:client:layout": "node scripts/client-binding-layout.mjs",
     "prepack": "npm run build:check",
     "hooks:install": "node scripts/review-findings.mjs install-hook",
     "review:new": "node scripts/review-findings.mjs create",
     "review:validate": "node scripts/review-findings.mjs validate",
     "review:gate": "node scripts/review-findings.mjs gate",
     "session:migrate": "node scripts/migrate-session-log.mjs",
-    "coverage": "node --test --experimental-test-module-mocks --experimental-test-coverage --test-concurrency=1 --test-coverage-include=\"index.js\" --test-coverage-include=\"internal/*.js\" --test-coverage-lines=100 --test-coverage-branches=95 --test-coverage-functions=100 \"test/*.test.js\"",
-    "verify": "npm run review:validate && 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 && npm run coverage",
+    "coverage": "node scripts/coverage.mjs",
+    "verify": "npm run review:validate && 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 && npm run test:client && npm run coverage",
     "check": "node scripts/review-findings.mjs check",
     "test:expensive": "node scripts/expensive-headless-acceptance.mjs",
     "test:ab": "node scripts/ab-headless-trajectories.mjs"
@@ -87,21 +128,50 @@
         "react"
       ],
       "inject": [
+        "@deepseek-ai/dsh-api-gateway",
+        "@deepseek-ai/dsh-api-remotes",
         "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-ui-settings",
         "@deepseek-ai/dsh-client-ui-settings-plugins",
+        "@deepseek-ai/dsh-client-ui-conversation",
         "@deepseek-ai/dsh-client-connection",
         "@deepseek-ai/dsh-client-ui-primitives"
       ]
     }
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-settings": "alpha",
-    "@deepseek-ai/dsh-skill-filesystem": "alpha",
-    "@deepseek-ai/dsh-tool-cordis": "alpha",
-    "@deepseek-ai/dsh-tools": "alpha",
+    "@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-home-paths": "next",
+    "@deepseek-ai/dsh-llm": "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",
+    "@testing-library/react": "^16.3.3",
+    "c8": "^12.0.0",
+    "convert-source-map": "^2.0.0",
     "esbuild": "0.28.2",
+    "jsdom": "^29.1.1",
+    "playwright": "^1.63.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "vitest": "^5.0.0",
     "yaml": "^2.9.0"
   }
 }