@aiwayds/dsh-opentui 0.4.2 → 0.5.0

package/scripts/e2e-live.mjs

@@ -58,6 +58,29 @@ const check = (name, ok, hint = '') => {
   console.log(`${ok ? 'PASS' : 'FAIL'}  ${name}${ok ? '' : '  ← ' + hint}`)
 }
 
+// Wait for the current turn to END before driving the next phase. Fixed
+// sleeps raced provider latency: a slow counting turn (~5 tok/s that day)
+// ran past the budget and every later keystroke landed mid-turn, where the
+// TUI has no command/picker surface — 5 phantom FAILs with zero markers in
+// the stream. Detection: the live think/tool dock keeps re-painting into
+// the stream tail while a turn runs (its timer ticks every second); after
+// the turn ends only the powerline clock repaints, so a tail window free
+// of 💭/thinking/⚙ means idle. The powerline clock keeps raw length
+// growing forever, so whole-stream length quiescence never fires.
+const waitTurnEnd = async (minMs, maxMs) => {
+  await sleep(minMs)
+  const t0 = Date.now()
+  let idleStreak = 0
+  while (Date.now() - t0 < maxMs) {
+    await sleep(2000)
+    const tail = out.slice(-3000)
+    const busy = tail.includes('💭') || tail.includes('thinking') || tail.includes('⚙')
+    idleStreak = busy ? 0 : idleStreak + 1
+    if (idleStreak >= 3) return true // 6s of clock-only tail = turn over
+  }
+  return false
+}
+
 try {
   await sleep(9000) // boot + welcome + powerline
 
@@ -65,13 +88,13 @@ try {
   await send('用 bash 工具运行 date 命令，然后告诉我今天是几月几号。只回答一句话。')
   await sleep(6000) // mid-turn: TPS segment + thinking + tool active
   const midTurn = out.length
-  await sleep(22000)
+  await waitTurnEnd(10000, 120000)
 
   // --- turn 2: todos + steering
   await send('先用 todo 工具记录两个任务：测试多行、收尾，然后从 1 数到 20，每个数字单独一行。')
   await sleep(5000)
   await send('改一下：只要数到 10 就行。')
-  await sleep(55000)
+  await waitTurnEnd(30000, 300000)
 
   // --- /theme picker opens, esc closes
   await send('/theme')
@@ -91,7 +114,7 @@ try {
 
   // --- subagent turn: dispatch a child, expect panel rows (tree rail)
   await send('派一个子代理去运行 ls 命令看看当前目录有什么，然后把结果告诉我。')
-  await sleep(55000)
+  await waitTurnEnd(30000, 300000)
 
   // --- /history fork at the newest turn boundary + context probe
   await send('/history')
@@ -99,7 +122,7 @@ try {
   child.stdin.write('\r') // pick the highlighted (newest) turn
   await sleep(6000)
   await send('刚才我最后请你做的是什么？一句话回答。')
-  await sleep(45000)
+  await waitTurnEnd(30000, 240000)
 
   child.stdin.end()
   await Promise.race([sleep(4000), new Promise((r) => child.once('exit', r))])

package/scripts/idle-reaper.mjs

@@ -0,0 +1,80 @@
+// Idle-exit reaper (ADR-0005 decision 5, entry-side companion of
+// lifecycle.ts): the lifecycle's idle-exit timer is unref()ed — a
+// refcount-0 manager must stay free to exit — so a cleanly quitting TUI
+// cannot deliver "the host exits after idleExitSec of idleness" with an
+// in-process timer. The quitting client spawns this script DETACHED
+// instead (spawnIdleReaper in src/client-entry.tsx):
+//
+//   bun idle-reaper.mjs <pid> <port> <lockfilePath> <graceSec>
+//
+// After the grace window it shuts the host down — unless:
+// - the lockfile now describes a DIFFERENT pid (a fresh boot replaced the
+//   host): never touch what we do not own;
+// - a client re-attached inside the grace window (established TCP
+//   connections to the host port — the adoption path keeps the host alive
+//   under its new owner; that owner's own quit spawns the next reaper).
+// The probe is `lsof -sTCP:ESTABLISHED`; when the tool is unavailable the
+// reaper falls back to the plain lifecycle semantics (idle exit).
+import { readFileSync, rmSync } from 'node:fs'
+import { spawnSync } from 'node:child_process'
+
+const [pidArg, portArg, lockPath, graceArg] = process.argv.slice(2)
+const pid = Number(pidArg)
+const port = Number(portArg)
+const graceSec = Number(graceArg ?? 60)
+
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
+
+const pidAlive = (target) => {
+  try {
+    process.kill(target, 0)
+    return true
+  } catch {
+    return false
+  }
+}
+
+/** Established TCP connections involving the host port (0 = none, -1 =
+ * the probe tool is unavailable). lsof exits 1 with no output when the
+ * filter matches nothing — that IS the zero case. */
+function establishedTo(targetPort) {
+  const res = spawnSync('lsof', ['-nP', `-iTCP:${targetPort}`, '-sTCP:ESTABLISHED'], { encoding: 'utf8' })
+  if (res.error) return -1
+  if (res.status === 1) return 0
+  const lines = String(res.stdout ?? '').split('\n')
+  return Math.max(0, lines.slice(1).filter((l) => l.trim().length > 0).length)
+}
+
+function readLock() {
+  try {
+    const raw = JSON.parse(readFileSync(lockPath, 'utf8'))
+    return typeof raw?.pid === 'number' ? raw : null
+  } catch {
+    return null
+  }
+}
+
+await sleep(graceSec * 1000)
+
+const lock = readLock()
+if (!lock || lock.pid !== pid) process.exit(0) // replaced by a fresh boot — not ours
+
+const established = establishedTo(port)
+if (established > 0) process.exit(0) // a client re-attached — the host stays under its new owner
+
+try {
+  process.kill(pid, 'SIGTERM')
+} catch {}
+await sleep(2000)
+if (pidAlive(pid)) {
+  try {
+    process.kill(pid, 'SIGKILL')
+  } catch {}
+}
+// Clear the lockfile only if it still describes THIS host (never clobber
+// a newer host's lock — lifecycle parity).
+try {
+  const now = readLock()
+  if (now && now.pid === pid && now.port === port) rmSync(lockPath, { force: true })
+} catch {}
+process.exit(0)

package/scripts/install-profile.mjs

@@ -22,6 +22,7 @@ import { execFileSync, spawnSync } from 'node:child_process'
 import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs'
 import { homedir } from 'node:os'
 import { dirname, join } from 'node:path'
+import { ensureSolidPatch, pinSolidJsExports } from './solid-js-pin.mjs'
 
 const args = process.argv.slice(2)
 const flag = (name) => {
@@ -59,11 +60,15 @@ pkg.dsh = { profile: { bundles: [...bundles] } }
 pkg.dependencies = { ...(pkg.dependencies || {}), '@aiwayds/dsh-opentui': depSpec }
 writeFileSync(pkgPath, JSON.stringify(pkg, null, 2))
 
-// --- cordis.yml (empty root) + workspace ---
+// --- cordis.yml (empty root) + workspace + solid-js patch ---
 const cordisYml = join(profileDir, 'cordis.yml')
 if (!existsSync(cordisYml)) writeFileSync(cordisYml, '# dsh profile root — an empty entry list. The tree is composed as patches.\n[]\n')
-const wsYml = join(profileDir, 'pnpm-workspace.yaml')
-if (!existsSync(wsYml)) writeFileSync(wsYml, 'packages:\n  - .\nnodeLinker: hoisted\nautoInstallPeers: false\n')
+// pnpm-workspace.yaml (created with the hoisted layout when missing) + the
+// solid-js@1.9.12 patchedDependencies entry. This MUST run before the
+// `pnpm install` steps below: with the patch registered, every install
+// itself produces the client-build-pinned solid-js instead of wiping it.
+const { workspaceNote } = ensureSolidPatch(profileDir)
+console.log(`[dsh-opentui] ${workspaceNote}`)
 
 // --- cordis.patch.yml (provider route + model pin + our insert) ---
 const patchPath = join(profileDir, 'cordis.patch.yml')
@@ -121,26 +126,12 @@ const pnpm = (() => {
 run(pnpm[0], [...pnpm.slice(1), 'install'])
 run(pnpm[0], [...pnpm.slice(1), 'install'])
 
-// --- pin solid-js to its CLIENT build ---
-// solid-js's "node" export condition resolves to dist/server.js (SSR): the
-// first frame renders and then the screen goes dead — no reactive updates.
-// Under bun dev the @opentui/solid preload remaps this; under the host's
-// node runtime the fix is rewriting the installed package's exports.
+// --- pin solid-js to its CLIENT build (belt-and-braces; the primary fix is
+// the patchedDependencies patch registered above) ---
 {
-  const solidPkg = join(profileDir, 'node_modules', 'solid-js', 'package.json')
-  try {
-    const pkgJson = JSON.parse(readFileSync(solidPkg, 'utf8'))
-    pkgJson.exports = {
-      '.': { types: './types/index.d.ts', import: './dist/solid.js', require: './dist/solid.cjs' },
-      './dist/solid.js': './dist/solid.js',
-      './dist/solid.cjs': './dist/solid.cjs',
-      './package.json': './package.json',
-    }
-    writeFileSync(solidPkg, JSON.stringify(pkgJson, null, 2))
-    console.log('[dsh-opentui] solid-js pinned to client build (dist/solid.js)')
-  } catch {
-    console.warn('[dsh-opentui] could not pin solid-js — TUI updates may be dead')
-  }
+  const state = pinSolidJsExports(profileDir)
+  if (state === 'missing') console.warn('[dsh-opentui] could not pin solid-js — TUI updates may be dead')
+  else console.log(`[dsh-opentui] solid-js ${state === 'pinned' ? 'pinned to' : 'already pinned to'} client build (dist/solid.js)`)
 }
 
 // --- closure link for the plugin's dsh-llm import (hoisted layout: the

package/scripts/link-dsh-closure.mjs

@@ -2,9 +2,11 @@
 /**
  * Dev/publish closure linker for @aiwayds/dsh-opentui.
  *
- * The plugin imports `@deepseek-ai/dsh-llm` (createUserMessage). Those
- * packages are not consumable from the public npm registry, so they resolve
- * from the global dsh install's own closure:
+ * The plugin imports `@deepseek-ai/dsh-llm` (createUserMessage); the
+ * client-mode transport also imports `@deepseek-ai/dsh-client-connection`
+ * (ConnectionGenerationSource / installConnection). Those packages are not
+ * consumable from the public npm registry, so they resolve from the global
+ * dsh install's own closure:
  *   $(realpath $(which dsh))/node_modules/@deepseek-ai
  * via a plain symlink. ALL @deepseek-ai/* must resolve to that single
  * closure instance (one @deepseek-ai/cordis in the type/runtime graph).
@@ -44,6 +46,9 @@ function findDshClosure() {
   }
 }
 
+/** Closure packages the shell imports but npm cannot provide. */
+const CLOSURE_PACKAGES = ['dsh-llm', 'dsh-client-connection']
+
 const closure = findDshClosure()
 if (!closure) {
   if (process.env.DSH_OPENTUI_DEBUG) console.warn('[dsh-opentui] no global dsh closure found; skipping link')
@@ -56,13 +61,16 @@ const targets = [join(pkgRoot, 'node_modules', '@deepseek-ai'), join(dirname(pkg
 for (const scopeDir of targets) {
   if (!scopeDir.includes('node_modules')) continue
   mkdirSync(scopeDir, { recursive: true })
-  const link = join(scopeDir, 'dsh-llm')
-  try {
-    rmSync(link, { force: true })
-    symlinkSync(join(closure, 'dsh-llm'), link, 'dir')
-  } catch {
-    /* never fail an install over a link */
+  for (const name of CLOSURE_PACKAGES) {
+    if (!existsSync(join(closure, name))) continue // older closure — skip, never throw
+    const link = join(scopeDir, name)
+    try {
+      rmSync(link, { force: true })
+      symlinkSync(join(closure, name), link, 'dir')
+    } catch {
+      /* never fail an install over a link */
+    }
   }
 }
-if (process.env.DSH_OPENTUI_DEBUG) console.log(`[dsh-opentui] linked dsh-llm from ${closure}`)
+if (process.env.DSH_OPENTUI_DEBUG) console.log(`[dsh-opentui] linked ${CLOSURE_PACKAGES.join(', ')} from ${closure}`)
 process.exit(0)

package/scripts/pack-meta.mjs

@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+// `npm pack` runs from this package dir, but LICENSE / NOTICE / README.md /
+// CHANGELOG.md live at the repo ROOT — the files-array entries pointed at
+// paths that do not exist here, so every published tarball (0.1.0-0.4.3)
+// silently shipped without them. prepublishOnly copies the four root files
+// in; they are gitignored and never committed (single source of truth).
+import { copyFileSync } from 'node:fs'
+import { dirname, join, resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const here = dirname(fileURLToPath(import.meta.url))
+const pkgDir = resolve(here, '..')
+const root = resolve(pkgDir, '../..')
+for (const f of ['LICENSE', 'NOTICE', 'README.md', 'CHANGELOG.md']) {
+	copyFileSync(join(root, f), join(pkgDir, f))
+}
+console.log('pack-meta: copied LICENSE NOTICE README.md CHANGELOG.md from repo root')

package/scripts/provision-opentui-profile.mjs

@@ -0,0 +1,212 @@
+#!/usr/bin/env node
+// provision-opentui-profile.mjs — idempotent bootstrap of the fixed `opentui`
+// host profile (ADR-0005 decisions 3 and 5).
+//
+// What it does:
+//   1. resolves $DSH_HOME (env or ~/.dsh)
+//   2. if $DSH_HOME/profiles/opentui already exists → keeps it (idempotent,
+//      never recreates); otherwise recreates it from the shipped `web`
+//      template via `dsh opentui --from-default-profile web --dump-config`
+//      (--dump-config makes dsh compose-and-exit, so the template copy
+//      happens WITHOUT booting the profile; verified against the shipped CLI
+//      whose help documents "dsh rescue --from-default-profile web — recreate
+//      rescue from the shipped web template")
+//   3. writes/merges the model route into the profile's `cordis.patch.yml`
+//      — the shipped web template ships NO provider route, so without this
+//      the profile cannot complete a real model turn (provider auth fails).
+//      Flags: --provider <id> --model <id> --reasoning-effort <id>
+//      (defaults zai-coding-cn / glm-5.3-flash / high — the same defaults as
+//      scripts/install-profile.mjs). Same patch-body shape as
+//      install-profile.mjs: an `llm-pi-ai` provider entry (apiKeyEnv derived
+//      the dsh way — uppercased, non-alnum → underscore, + _API_KEY) plus an
+//      `agent-default-model` row.
+//   4. prints what it did and the plugin-install next step:
+//      `dsh plugin --profile opentui add <pkg>`
+//
+// Route idempotency contract (follows install-profile.mjs): per managed
+// entry (`llm-pi-ai`, `agent-default-model`), an entry already present in the
+// patch layer is left untouched — a re-run never duplicates entries and never
+// clobbers a model/provider the user edited. Missing entries are appended
+// (never rewritten) so the template's own patch entries survive; the file is
+// backed up (*.bak-<ts>) before the first modification.
+//
+// Hard guard: this script only ever touches the ONE profile named `opentui`.
+// It never touches any other profile — in particular the pre-existing
+// `dsh-opentui` dev profile (which install-profile.mjs owns).
+//
+// Requires a global `dsh` on PATH (the real host CLI). The first host boot
+// resolves the profile's bundles (@deepseek-ai/dsh-base + dsh-web-app) from
+// the installed dsh closure; no explicit pnpm install is needed. The provider
+// key is read by the host from the apiKeyEnv environment variable (this
+// script only names it in the patch; it never handles key values).
+
+import { spawnSync } from 'node:child_process'
+import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs'
+import { homedir } from 'node:os'
+import { join } from 'node:path'
+
+const PROFILE = 'opentui'
+const TEMPLATE = 'web'
+
+const args = process.argv.slice(2)
+const flag = (name) => {
+  const i = args.indexOf(`--${name}`)
+  return i >= 0 ? args[i + 1] : undefined
+}
+
+const provider = flag('provider') || 'zai-coding-cn'
+const model = flag('model') || 'glm-5.3-flash'
+const reasoningEffort = flag('reasoning-effort') || 'high'
+// dsh convention: deriveKeyRef — uppercased, non-alnum → underscore, +_API_KEY
+const apiKeyEnv = `${provider.toUpperCase().replace(/[^A-Z0-9]+/g, '_')}_API_KEY`
+
+function fail(message, detail = '') {
+  console.error(`provision-opentui-profile: FAIL — ${message}`)
+  if (detail) console.error(detail.trimEnd())
+  process.exit(1)
+}
+
+// ---------------------------------------------------------------------------
+// 1. Resolve the dsh home.
+// ---------------------------------------------------------------------------
+const dshHome = process.env.DSH_HOME || join(homedir(), '.dsh')
+const profileDir = join(dshHome, 'profiles', PROFILE)
+console.log(`provision-opentui-profile: dsh home ${dshHome}`)
+
+// ---------------------------------------------------------------------------
+// 2. The profile: keep an existing one; otherwise recreate from the shipped
+//    web template, without booting.
+// ---------------------------------------------------------------------------
+if (!existsSync(profileDir)) {
+  const which = spawnSync('which', ['dsh'], { encoding: 'utf8' })
+  if (which.status !== 0 || !which.stdout.trim()) {
+    fail('no global `dsh` on PATH — install the dsh host CLI first')
+  }
+
+  console.log(`provision-opentui-profile: creating ${profileDir} from the shipped '${TEMPLATE}' template`)
+  const run = spawnSync(
+    'dsh',
+    [PROFILE, '--from-default-profile', TEMPLATE, '--dump-config'],
+    {
+      // DSH_HOME is explicit so the profile lands in the resolved home even
+      // when the caller's env was missing or divergent.
+      env: { ...process.env, DSH_HOME: dshHome },
+      encoding: 'utf8',
+      maxBuffer: 64 * 1024 * 1024,
+    },
+  )
+  if (run.error) fail(`failed to run dsh: ${run.error.message}`)
+  if (run.status !== 0) {
+    fail(
+      `\`dsh ${PROFILE} --from-default-profile ${TEMPLATE} --dump-config\` exited ${run.status}`,
+      [run.stderr, run.stdout].filter(Boolean).join('\n').slice(-2000),
+    )
+  }
+  if (!existsSync(profileDir)) {
+    fail(
+      `dsh exited 0 but ${profileDir} was not created — unexpected CLI behavior; refusing to continue`,
+      run.stdout.slice(-2000),
+    )
+  }
+} else {
+  console.log(`provision-opentui-profile: ${profileDir} already provisioned — leaving it untouched`)
+}
+
+// ---------------------------------------------------------------------------
+// 3. Model route: write/merge the provider route into cordis.patch.yml.
+//    Per-entry idempotent append (see the contract in the header).
+// ---------------------------------------------------------------------------
+const patchPath = join(profileDir, 'cordis.patch.yml')
+
+const providerEntry = `- id: llm-pi-ai
+  name: "@deepseek-ai/dsh-llm-pi-ai"
+  config:
+    providers:
+      ${provider}:
+        apiKeyEnv: ${apiKeyEnv}
+        models:
+          - id: ${model}
+            name: ${model}
+            input:
+              - text
+`
+const modelEntry = `- id: agent-default-model
+  name: "@deepseek-ai/dsh-agent-default-model"
+  config:
+    provider: ${provider}
+    model: ${model}
+    reasoningEffort: ${reasoningEffort}
+`
+
+// Top-level entries only: the file is a YAML array of `- id:` entries, and
+// nested plugin ids are indented — the ^ anchor keeps the check off them.
+const hasEntry = (text, id) => new RegExp(`^- id: ${id}\\s*$`, 'm').test(text)
+
+// True when the patch layer carries NO top-level entries at all (missing
+// file, empty, comments only, or a bare `[]` flow document — the shipped web
+// template writes exactly that). Such a file has nothing to merge into: it is
+// replaced rather than appended to, because appending after the `[]` document
+// terminator would produce an invalid two-document YAML stream (the host's
+// single-document parser rejects it at boot).
+const isEmptyListDoc = (text) => {
+  const body = text
+    .split('\n')
+    .filter((line) => { const t = line.trim(); return t !== '' && !t.startsWith('#') })
+    .join('\n')
+    .trim()
+  return body === '' || body === '[]'
+}
+
+let existing = ''
+try {
+  existing = readFileSync(patchPath, 'utf8')
+} catch {
+  /* no patch layer yet — created below */
+}
+
+const missing = [
+  ['llm-pi-ai', providerEntry],
+  ['agent-default-model', modelEntry],
+].filter(([id, body]) => !hasEntry(existing, id))
+
+if (missing.length === 0) {
+  console.log(
+    'provision-opentui-profile: model route already in cordis.patch.yml (llm-pi-ai + agent-default-model) — leaving it untouched',
+  )
+} else {
+  const routeBody = missing.map(([, body]) => body).join('')
+  const banner =
+    `# model route (managed by provision-opentui-profile.mjs — provider ${provider}, ` +
+    `key read by the host from ${apiKeyEnv}):\n`
+  if (existing && !isEmptyListDoc(existing)) {
+    // Append after the existing entries; back up before the first
+    // modification, like install-profile.mjs.
+    const backupPath = `${patchPath}.bak-${Date.now()}`
+    renameSync(patchPath, backupPath)
+    console.log(`provision-opentui-profile: backed up existing patch to ${backupPath}`)
+    writeFileSync(patchPath, `${existing.replace(/\n*$/, '\n\n')}${banner}${routeBody}`)
+    console.log(
+      `provision-opentui-profile: appended route entries [${missing.map(([id]) => id).join(', ')}] to cordis.patch.yml`,
+    )
+  } else {
+    // Missing file or an entry-less document (`[]`): write the list fresh.
+    if (existing) {
+      const backupPath = `${patchPath}.bak-${Date.now()}`
+      renameSync(patchPath, backupPath)
+      console.log(`provision-opentui-profile: backed up existing patch to ${backupPath}`)
+    }
+    mkdirSync(profileDir, { recursive: true })
+    writeFileSync(patchPath, `${banner}${routeBody}`)
+    console.log(
+      `provision-opentui-profile: wrote route entries [${missing.map(([id]) => id).join(', ')}] to cordis.patch.yml`,
+    )
+  }
+}
+
+// ---------------------------------------------------------------------------
+// 4. Report.
+// ---------------------------------------------------------------------------
+console.log(`provision-opentui-profile: model pinned to ${provider}/${model} (effort ${reasoningEffort}, key env ${apiKeyEnv})`)
+console.log('provision-opentui-profile: PASS')
+console.log(`the '${PROFILE}' profile serves the host Remote protocol (web-app template)`)
+console.log(`install plugins with: dsh plugin --profile ${PROFILE} add <package>`)