@aiwayds/dsh-opentui 0.3.1 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiwayds/dsh-opentui",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "type": "module",
   "bin": {
     "dsh-opentui": "bin/dsh-opentui.mjs"
@@ -27,7 +27,8 @@
     "typecheck": "tsc --noEmit",
     "build:bin": "bun build.ts",
     "postinstall": "node scripts/postinstall.mjs",
-    "smoke": "node scripts/smoke-boot.mjs"
+    "smoke": "node scripts/smoke-boot.mjs",
+    "test:e2e": "node scripts/e2e-live.mjs && node scripts/e2e-fork.mjs"
   },
   "dependencies": {
     "@opentui/core": "0.7.0",
@@ -44,4 +45,4 @@
   "engines": {
     "node": ">=26.4.0"
   }
-}
+}

package/scripts/e2e-fork.mjs

@@ -0,0 +1,44 @@
+#!/usr/bin/env node
+// Fork-context E2E: boot the real profile, plant a fact ("pineapple"),
+// /history-fork at the completed turn, then ask for the fact in English —
+// the fork is correct only if the SEEDED session answers it. Skips like
+// e2e-live.mjs when the environment can't run it.
+import { spawn } from 'node:child_process'
+import { spawnSync } from 'node:child_process'
+import { writeFileSync } from 'node:fs'
+const cwd = `${process.env.HOME}/.dsh/profiles/dsh-opentui`
+
+const SKIP = (() => {
+  const which = spawnSync('which', ['dsh'], { encoding: 'utf8' })
+  if (which.status !== 0 || !which.stdout.trim()) return 'no global dsh on PATH'
+  return null
+})()
+if (SKIP) {
+  console.log(`e2e-fork: skipped (${SKIP})`)
+  process.exit(0)
+}
+const env = { ...process.env, NODE_OPTIONS: '--experimental-ffi' }
+delete env.DSH_HOME
+const child = spawn('dsh', ['--profile', 'dsh-opentui'], { cwd, env, stdio: ['pipe','pipe','pipe'] })
+let out = ''
+child.stdout.on('data', c => out += c); child.stderr.on('data', c => out += c)
+const sleep = ms => new Promise(r => setTimeout(r, ms))
+const send = async (line) => { for (const ch of line) { child.stdin.write(ch); await sleep(70) } child.stdin.write('\r'); await sleep(400) }
+await sleep(15000)
+// turn 1: distinctive fact
+await send('My favorite fruit is pineapple. Just remember it, reply OK only.')
+await sleep(30000)
+// fork at turn 1 (the only completed turn)
+await send('/history')
+await sleep(2500)
+child.stdin.write('\r')
+await sleep(7000)
+// context probe in English → ASCII-safe assertion
+await send('In one short English sentence: what is my favorite fruit?')
+await sleep(40000)
+writeFileSync('/tmp/fork-probe.txt', out)
+child.kill('SIGTERM'); await sleep(600)
+const plain = out.replace(/\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)/g, '')
+const squash = plain.replace(/\s+/g, '')
+console.log('fork rebuilt (no runtime-context leak):', !squash.includes('Currentruntimecontext'))
+console.log('reply mentions pineapple:', squash.toLowerCase().includes('pineapple'))

package/scripts/e2e-live.mjs

@@ -0,0 +1,137 @@
+#!/usr/bin/env node
+// Live interactive E2E for @aiwayds/dsh-opentui against the REAL installed
+// profile (real dsh host, real model turns, slow-typed piped keys).
+//
+// Skips (exit 0) when the environment can't run it: no global dsh on PATH
+// or no provider key in the environment — CI runs skip; a developer
+// machine with the profile installed runs the full 19-check suite.
+// Drive mechanics notes:
+// - alt-screen repaints in place: every check is presence-over-time on the
+//   whole stream, never window offsets (they mis-slice);
+// - piped stdin DROPS burst-written keys in OpenTUI's input parser — all
+//   typing is fed char-by-char with a ~60ms inter-key gap;
+// - OSC sequences end in BEL or ST; a BEL-only strip regex eats across
+//   frames and fakes negatives.
+// Boots the real `dsh --profile dsh-opentui`, drives it through piped
+// stdin, and asserts on cumulative output (alt-screen repaints in place —
+// presence-over-time, never window offsets).
+import { spawn } from 'node:child_process'
+import { writeFileSync } from 'node:fs'
+
+import { spawnSync } from 'node:child_process'
+
+const PROFILE = 'dsh-opentui'
+const SKIP = (() => {
+  const which = spawnSync('which', ['dsh'], { encoding: 'utf8' })
+  if (which.status !== 0 || !which.stdout.trim()) return 'no global dsh on PATH'
+  return null
+})()
+if (SKIP) {
+  console.log(`e2e-live: skipped (${SKIP})`)
+  process.exit(0)
+}
+const cwd = `${process.env.HOME}/.dsh/profiles/${PROFILE}`
+const RAW = '/tmp/opentui-e2e.raw.txt'
+const sleep = (ms) => new Promise((r) => setTimeout(r, ms))
+
+const env = { ...process.env, NODE_OPTIONS: '--experimental-ffi' }
+delete env.DSH_HOME
+env.PATH = env.PATH.split(':')
+  .filter((s) => s && !s.includes('dsh-opentui/node_modules/.bin'))
+  .join(':')
+for (const k of Object.keys(env)) if (k.startsWith('npm_config_')) delete env[k]
+
+const child = spawn('dsh', ['--profile', PROFILE], { cwd, env, stdio: ['pipe', 'pipe', 'pipe'] })
+let out = ''
+child.stdout.on('data', (c) => { out += c })
+child.stderr.on('data', (c) => { out += c })
+
+// OpenTUI's stdin parser drops keys from burst writes under piped stdin —
+// feed char-by-char with a real inter-key gap (a real terminal always does).
+const send = async (line) => {
+  for (const ch of line) { child.stdin.write(ch); await sleep(60) }
+  child.stdin.write('\r')
+}
+const results = []
+const check = (name, ok, hint = '') => {
+  results.push({ name, ok })
+  console.log(`${ok ? 'PASS' : 'FAIL'}  ${name}${ok ? '' : '  ← ' + hint}`)
+}
+
+try {
+  await sleep(9000) // boot + welcome + powerline
+
+  // --- turn 1: tool use → ToolWidget ⚙, ⚒ counter, live TPS, answer
+  await send('用 bash 工具运行 date 命令，然后告诉我今天是几月几号。只回答一句话。')
+  await sleep(6000) // mid-turn: TPS segment + thinking + tool active
+  const midTurn = out.length
+  await sleep(22000)
+
+  // --- turn 2: todos + steering
+  await send('先用 todo 工具记录两个任务：测试多行、收尾，然后从 1 数到 20，每个数字单独一行。')
+  await sleep(5000)
+  await send('改一下：只要数到 10 就行。')
+  await sleep(55000)
+
+  // --- /theme picker opens, esc closes
+  await send('/theme')
+  await sleep(2000)
+  const themeOpen = out.length
+  child.stdin.write('\x1b') // esc closes the overlay
+  await sleep(1500)
+
+  // --- multi-line submit: alt+enter (= ESC CR) inserts a newline
+  for (const ch of '第一行') { child.stdin.write(ch); await sleep(60) }
+  child.stdin.write('\x1b\r')
+  await sleep(300)
+  for (const ch of '第二行') { child.stdin.write(ch); await sleep(60) }
+  await sleep(600)
+  child.stdin.write('\r') // Enter submits the buffer
+  await sleep(8000)
+
+  // --- subagent turn: dispatch a child, expect panel rows (tree rail)
+  await send('派一个子代理去运行 ls 命令看看当前目录有什么，然后把结果告诉我。')
+  await sleep(55000)
+
+  // --- /history fork at the newest turn boundary + context probe
+  await send('/history')
+  await sleep(2000)
+  child.stdin.write('\r') // pick the highlighted (newest) turn
+  await sleep(6000)
+  await send('刚才我最后请你做的是什么？一句话回答。')
+  await sleep(45000)
+
+  child.stdin.end()
+  await Promise.race([sleep(4000), new Promise((r) => child.once('exit', r))])
+} finally {
+  child.kill('SIGTERM')
+  writeFileSync(RAW, out)
+}
+
+const plain = out.replace(/\x1b\][^\x07\x1b]*(?:\x07|\x1b\\\\)/g, '').replace(/\x1b\[[0-9;?]*[a-zA-Z]/g, '')
+const full = plain
+const themeWin = plain.slice(0) // whole stream; markers are phase-specific
+
+check('welcome banner (block DSH)', /D\s*S\s*H|█|▄|▀/.test(full) || full.includes('dsh ·'), 'no ascii DSH')
+check('daily quote 「…」', full.includes('「') && full.includes('」'), 'no quote')
+check('powerline clock ticks', /\d{1,2}:\d{2}:\d{2}/.test(full), 'no clock')
+check('ThinkWidget appears', full.includes('💭') || full.includes('thinking ·'), 'no think dock')
+check('ToolWidget ⚙ running state', full.includes('⚙'), 'no ⚙')
+check('tool counter ⚒', full.includes('⚒'), 'no ⚒')
+check('live TPS segment (tok/s)', full.includes('tok/s'), 'no tok/s anywhere')
+check('answer delivered (Chinese date phrase)', /\d{1,2}月\d{1,2}日/.test(full), 'no rendered 中文日期 in reply')
+check('steer ⚡ line', full.includes('⚡'), 'no ⚡')
+check('todo panel 📋 or ▶/☐ rows', full.includes('📋') || full.includes('☐') || full.includes('▶'), 'no todo widget rows')
+check('theme picker opened (dark/light group headers)', themeWin.includes('dark') && themeWin.includes('light'), 'no group headers')
+check('theme picker lists themes (dracula)', themeWin.includes('dracula'), 'no dracula in stream')
+check('multi-line submit (第一行+第二行 as user row)', full.includes('第一行') && full.includes('第二行'), 'multi-line rows missing')
+check('subagent panel rows (tree rail)', full.includes('├─') || full.includes('└─'), 'no subagent rail rows')
+check('history picker items (fork before this turn)', full.includes('fork before this turn'), 'no picker item rows')
+check('fork transcript rebuild without internal leak', !out.replace(/\s+/g, '').includes('Currentruntimecontext'), 'runtime-context leaked into rebuild')
+check('no loader failure markers', !full.includes('did not activate') && !full.includes('failed to import'), '')
+check('no SSR leak (dist/server.js)', !out.includes('dist/server.js'), '')
+check('alt-screen entered', out.includes('\x1b[?1049h'), '')
+
+const fails = results.filter((r) => !r.ok)
+console.log(`\n${results.length - fails.length}/${results.length} passed — raw: ${RAW} (${out.length} bytes)`)
+process.exit(fails.length ? 1 : 0)

package/scripts/install-profile.mjs

@@ -86,6 +86,12 @@ const patchBody = `# dsh-opentui profile patch (managed by @aiwayds/dsh-opentui
     model: ${model}
     reasoningEffort: ${reasoningEffort}
 - insert:
+    - id: tool-ask-user
+      name: "@deepseek-ai/dsh-tool-ask-user"
+    - id: tool-todo
+      name: "@deepseek-ai/dsh-tool-todo"
+      config:
+        allowParallelInProgress: false
     - id: dsh-opentui
       name: "@aiwayds/dsh-opentui"
       config: