@deepseek-harness-tui/dsh-tui 0.12.0 → 0.14.0

package/assets/whaleGirl/img/timings.json

@@ -0,0 +1 @@
+{"idle":[{"dur":700,"file":"00.png"},{"dur":280,"file":"01.png"},{"dur":280,"file":"02.png"},{"dur":240,"file":"03.png"},{"dur":360,"file":"04.png"},{"dur":60,"file":"05.png"},{"dur":90,"file":"06.png"},{"dur":60,"file":"07.png"},{"dur":650,"file":"08.png"},{"dur":280,"file":"09.png"},{"dur":280,"file":"10.png"},{"dur":240,"file":"11.png"},{"dur":420,"file":"12.png"},{"dur":60,"file":"13.png"},{"dur":80,"file":"14.png"},{"dur":60,"file":"15.png"},{"dur":140,"file":"16.png"},{"dur":60,"file":"17.png"},{"dur":80,"file":"18.png"},{"dur":60,"file":"19.png"},{"dur":800,"file":"20.png"}],"idle-look":[{"dur":500,"file":"00.png"},{"dur":420,"file":"01.png"},{"dur":70,"file":"02.png"},{"dur":80,"file":"03.png"},{"dur":70,"file":"04.png"},{"dur":380,"file":"05.png"},{"dur":420,"file":"06.png"},{"dur":110,"file":"07.png"},{"dur":420,"file":"08.png"},{"dur":140,"file":"09.png"},{"dur":140,"file":"10.png"},{"dur":140,"file":"11.png"},{"dur":400,"file":"12.png"}],"idle-spout":[{"dur":450,"file":"00.png"},{"dur":260,"file":"01.png"},{"dur":110,"file":"02.png"},{"dur":110,"file":"03.png"},{"dur":130,"file":"04.png"},{"dur":150,"file":"05.png"},{"dur":170,"file":"06.png"},{"dur":170,"file":"07.png"},{"dur":170,"file":"08.png"},{"dur":350,"file":"09.png"},{"dur":400,"file":"10.png"}],"thinking":[{"dur":220,"file":"00.png"},{"dur":220,"file":"01.png"},{"dur":260,"file":"02.png"},{"dur":260,"file":"03.png"},{"dur":260,"file":"04.png"},{"dur":300,"file":"05.png"},{"dur":170,"file":"06.png"},{"dur":170,"file":"07.png"},{"dur":170,"file":"08.png"},{"dur":170,"file":"09.png"},{"dur":170,"file":"10.png"},{"dur":170,"file":"11.png"},{"dur":90,"file":"12.png"},{"dur":110,"file":"13.png"},{"dur":200,"file":"14.png"},{"dur":200,"file":"15.png"},{"dur":260,"file":"16.png"}],"typing":[{"dur":150,"file":"00.png"},{"dur":170,"file":"01.png"},{"dur":150,"file":"02.png"},{"dur":170,"file":"03.png"},{"dur":150,"file":"04.png"},{"dur":170,"file":"05.png"},{"dur":210,"file":"06.png"},{"dur":150,"file":"07.png"},{"dur":170,"file":"08.png"},{"dur":150,"file":"09.png"},{"dur":170,"file":"10.png"},{"dur":150,"file":"11.png"},{"dur":170,"file":"12.png"},{"dur":210,"file":"13.png"}],"music":[{"dur":150,"file":"00.png"},{"dur":150,"file":"01.png"},{"dur":150,"file":"02.png"},{"dur":150,"file":"03.png"},{"dur":150,"file":"04.png"},{"dur":150,"file":"05.png"},{"dur":150,"file":"06.png"},{"dur":150,"file":"07.png"}],"conducting":[{"dur":150,"file":"00.png"},{"dur":150,"file":"01.png"},{"dur":150,"file":"02.png"},{"dur":150,"file":"03.png"},{"dur":150,"file":"04.png"},{"dur":150,"file":"05.png"},{"dur":150,"file":"06.png"},{"dur":150,"file":"07.png"},{"dur":150,"file":"08.png"},{"dur":150,"file":"09.png"},{"dur":150,"file":"10.png"},{"dur":150,"file":"11.png"}],"building":[{"dur":130,"file":"00.png"},{"dur":100,"file":"01.png"},{"dur":80,"file":"02.png"},{"dur":90,"file":"03.png"},{"dur":100,"file":"04.png"},{"dur":120,"file":"05.png"},{"dur":90,"file":"06.png"},{"dur":130,"file":"07.png"},{"dur":130,"file":"08.png"},{"dur":100,"file":"09.png"},{"dur":80,"file":"10.png"},{"dur":90,"file":"11.png"},{"dur":100,"file":"12.png"},{"dur":120,"file":"13.png"},{"dur":90,"file":"14.png"},{"dur":130,"file":"15.png"},{"dur":130,"file":"16.png"},{"dur":100,"file":"17.png"},{"dur":80,"file":"18.png"},{"dur":90,"file":"19.png"},{"dur":100,"file":"20.png"},{"dur":120,"file":"21.png"},{"dur":90,"file":"22.png"},{"dur":130,"file":"23.png"}],"error":[{"dur":90,"file":"00.png"},{"dur":80,"file":"01.png"},{"dur":80,"file":"02.png"},{"dur":80,"file":"03.png"},{"dur":90,"file":"04.png"},{"dur":200,"file":"05.png"},{"dur":200,"file":"06.png"},{"dur":160,"file":"07.png"},{"dur":200,"file":"08.png"},{"dur":300,"file":"09.png"}],"happy":[{"dur":200,"file":"00.png"},{"dur":90,"file":"01.png"},{"dur":90,"file":"02.png"},{"dur":100,"file":"03.png"},{"dur":100,"file":"04.png"},{"dur":100,"file":"05.png"},{"dur":100,"file":"06.png"},{"dur":110,"file":"07.png"},{"dur":110,"file":"08.png"},{"dur":120,"file":"09.png"},{"dur":400,"file":"10.png"}],"notification":[{"dur":110,"file":"00.png"},{"dur":110,"file":"01.png"},{"dur":110,"file":"02.png"},{"dur":110,"file":"03.png"},{"dur":110,"file":"04.png"},{"dur":110,"file":"05.png"},{"dur":110,"file":"06.png"},{"dur":110,"file":"07.png"}],"compacting":[{"dur":300,"file":"00.png"},{"dur":130,"file":"01.png"},{"dur":130,"file":"02.png"},{"dur":130,"file":"03.png"},{"dur":130,"file":"04.png"},{"dur":200,"file":"05.png"},{"dur":100,"file":"06.png"},{"dur":160,"file":"07.png"},{"dur":220,"file":"08.png"},{"dur":240,"file":"09.png"}],"carrying":[{"dur":140,"file":"00.png"},{"dur":140,"file":"01.png"},{"dur":140,"file":"02.png"},{"dur":140,"file":"03.png"},{"dur":140,"file":"04.png"},{"dur":140,"file":"05.png"},{"dur":140,"file":"06.png"},{"dur":140,"file":"07.png"}],"sleeping":[{"dur":330,"file":"00.png"},{"dur":330,"file":"01.png"},{"dur":330,"file":"02.png"},{"dur":330,"file":"03.png"},{"dur":330,"file":"04.png"},{"dur":330,"file":"05.png"}],"waking":[{"dur":420,"file":"00.png"},{"dur":110,"file":"01.png"},{"dur":120,"file":"02.png"},{"dur":100,"file":"03.png"},{"dur":100,"file":"04.png"},{"dur":110,"file":"05.png"},{"dur":200,"file":"06.png"},{"dur":70,"file":"07.png"},{"dur":80,"file":"08.png"},{"dur":70,"file":"09.png"},{"dur":500,"file":"10.png"}],"poke-left":[{"dur":300,"file":"00.png"},{"dur":110,"file":"01.png"},{"dur":90,"file":"02.png"},{"dur":90,"file":"03.png"},{"dur":200,"file":"04.png"},{"dur":140,"file":"05.png"},{"dur":140,"file":"06.png"},{"dur":240,"file":"07.png"},{"dur":200,"file":"08.png"},{"dur":200,"file":"09.png"},{"dur":400,"file":"10.png"}],"poke-right":[{"dur":300,"file":"00.png"},{"dur":110,"file":"01.png"},{"dur":90,"file":"02.png"},{"dur":90,"file":"03.png"},{"dur":200,"file":"04.png"},{"dur":140,"file":"05.png"},{"dur":140,"file":"06.png"},{"dur":240,"file":"07.png"},{"dur":200,"file":"08.png"},{"dur":200,"file":"09.png"},{"dur":400,"file":"10.png"}],"tickle":[{"dur":90,"file":"00.png"},{"dur":90,"file":"01.png"},{"dur":90,"file":"02.png"},{"dur":90,"file":"03.png"},{"dur":90,"file":"04.png"},{"dur":90,"file":"05.png"},{"dur":90,"file":"06.png"},{"dur":90,"file":"07.png"},{"dur":90,"file":"08.png"},{"dur":90,"file":"09.png"},{"dur":90,"file":"10.png"},{"dur":90,"file":"11.png"},{"dur":200,"file":"12.png"},{"dur":400,"file":"13.png"}],"drag":[{"dur":90,"file":"00.png"},{"dur":90,"file":"01.png"},{"dur":90,"file":"02.png"},{"dur":90,"file":"03.png"},{"dur":90,"file":"04.png"},{"dur":90,"file":"05.png"},{"dur":90,"file":"06.png"},{"dur":90,"file":"07.png"},{"dur":90,"file":"08.png"},{"dur":90,"file":"09.png"}],"swim":[{"dur":150,"file":"00.png"},{"dur":150,"file":"01.png"},{"dur":150,"file":"02.png"},{"dur":150,"file":"03.png"},{"dur":150,"file":"04.png"},{"dur":150,"file":"05.png"},{"dur":150,"file":"06.png"},{"dur":150,"file":"07.png"}],"smile-hearts":[{"dur":100,"file":"00.png"},{"dur":100,"file":"01.png"},{"dur":100,"file":"02.png"},{"dur":100,"file":"03.png"},{"dur":100,"file":"04.png"},{"dur":100,"file":"05.png"},{"dur":100,"file":"06.png"},{"dur":100,"file":"07.png"},{"dur":100,"file":"08.png"},{"dur":100,"file":"09.png"},{"dur":100,"file":"10.png"},{"dur":100,"file":"11.png"},{"dur":100,"file":"12.png"},{"dur":100,"file":"13.png"},{"dur":100,"file":"14.png"},{"dur":100,"file":"15.png"}],"thumbs-up":[{"dur":160,"file":"00.png"},{"dur":120,"file":"01.png"},{"dur":90,"file":"02.png"},{"dur":80,"file":"03.png"},{"dur":80,"file":"04.png"},{"dur":100,"file":"05.png"},{"dur":110,"file":"06.png"},{"dur":110,"file":"07.png"},{"dur":90,"file":"08.png"},{"dur":430,"file":"09.png"},{"dur":100,"file":"10.png"},{"dur":100,"file":"11.png"},{"dur":400,"file":"12.png"}]}

package/bin/dsh-tui.js

@@ -62,6 +62,8 @@ const ownPackage = readJson(join(ownDir, 'package.json'))
 const ownVersion = ownPackage?.name === '@deepseek-harness-tui/dsh-tui' ? ownPackage.version : undefined
 const PACKAGE = '@deepseek-harness-tui/dsh-tui'
 const PROFILE = 'dsh-tui'
+// Kept local so the launcher also works without compiled modules.
+const KERNEL_IDS = ['dsh', 'claude', 'codex']
 
 // 随包用户手册（guide/，见 scripts/build-guide.mjs）：交给 dsh 当内核
 // dsh-skill-filesystem 的随包技能根（rank 600 的 bundledSkillDir 默认取这个
@@ -464,6 +466,7 @@ const MSG = {
       `Options:\n` +
       `  --resume [id]          Resume the last (or the given) session\n` +
       `  -c, --continue         Same as --resume\n` +
+      `  --backend <id>         Agent backend: dsh | claude | codex (claude, codex: experimental)\n` +
       `  -- <prompt...>        Treat the remaining arguments as literal prompt text\n` +
       `  <path|url>             Open with the given workspace target\n\n` +
       `Leading DSH options (e.g. --dump-config, --patch <path>) are forwarded unchanged.\n` +
@@ -481,6 +484,7 @@ const MSG = {
       `选项：\n` +
       `  --resume [id]          恢复上次（或指定 id 的）会话\n` +
       `  -c, --continue         同 --resume\n` +
+      `  --backend <id>         Agent 后端：dsh | claude | codex（claude、codex 为实验性）\n` +
       `  -- <提示词...>         将剩余参数作为字面提示词\n` +
       `  <路径|URL>             以指定工作区目标启动\n\n` +
       `前置 DSH 选项（如 --dump-config、--patch <路径>）原样转发。\n` +
@@ -635,14 +639,18 @@ const runDoctorChecks = () => {
     'DEEPSEEK_API_KEY',
     keyFromEnv ? L.keySetEnv : keyFromStore ? L.keySetStore : L.keyMissing,
   )
-  for (const candidate of [join(homedir(), '.dsh-tui', 'cordis.yml'), join(profileDir, 'cordis.patch.yml')]) {
-    report(existsSync(candidate), 'config', `${candidate}${existsSync(candidate) ? '' : `  ${L.missing}`}`)
-  }
+  // `~/.dsh-tui/cordis.yml` 是裸组合（`dsh --config cordis.yml`）时代的用户根
+  // 配置：profile 安装不使用它，全包也没有任何代码读它——缺席是常态，不是故障。
+  // 恒报 ✗ 会把旁边唯一有意义的 profile 补丁一起变成噪音（用户会去创建这个对
+  // 功能毫无影响的文件）。只在用户确实留了它时列出。
+  const legacyConfig = join(homedir(), '.dsh-tui', 'cordis.yml')
+  if (existsSync(legacyConfig)) report(true, 'config', legacyConfig)
+  const profileConfig = join(profileDir, 'cordis.patch.yml')
+  report(existsSync(profileConfig), 'config', `${profileConfig}${existsSync(profileConfig) ? '' : `  ${L.missing}`}`)
   return { hardFailure, lines }
 }
 // ─── safe 会话支撑（清单解析与报告渲染，交互/非交互共用）──────────────────────
-// 保护包：组合层模板与 TUI 本体，不进入卸载候选。两维度分类是 PR② 卸载
-// 功能将复用的唯一分类规则，不得合并简化（spec §6.1）。
+// Packages that profile repair and rescue must never remove.
 const PROTECTED_PLUGINS = new Set(['@deepseek-ai/dsh-base', PACKAGE])
 // dir 参数供救援 profile 复用同一套解析规则（两处 manifest 契约不许分叉）。
 const readProfileInventory = (dir = profileDir) => {
@@ -733,7 +741,7 @@ const forwardExit = child => {
 // 统一表示子进程结局；不在此处做任何退出决定——退出权在调用者（首启结算
 // 或 safe 菜单）。Windows 经 cmd()/shell:true 启动（见 cmd 注释），壳层
 // 观察到的 signal 不保证等同内部 dsh 的中断语义：判定一律只看数值 code，
-// 不从数值反推信号（spec §5.1）。
+// Do not infer a signal from the numeric exit code.
 const startDshSession = (dshArgs, profile = PROFILE, env = process.env) =>
   new Promise(resolve => {
     const child = spawn(...cmd('dsh', ['--profile', profile, ...dshArgs]), {
@@ -761,19 +769,76 @@ const rescueEnv = () => {
   return env
 }
 
+// ─── 最后运行记录 ────────────────────────────────────────────────────────────
+// TUI 把 {backendId,sessionId,cwd,attemptId} 写进 ~/.dsh-tui/last-run.json
+// （boot 写一次，退出时刷新，见 src/update.ts 的 writeLastRunRecord）。
+// 内核切换后本进程的 env 仍是原内核，安全模式重试若按 env 去读 resume.txt
+// 或其他后端偏好，会回到原内核，甚至拿 DSH 的会话 id 跨后端恢复；所以
+// 本次启动之后写下的记录优先。
+const readLastRunRecord = () => {
+  try {
+    const parsed = JSON.parse(readFileSync(join(homedir(), '.dsh-tui', 'last-run.json'), 'utf8'))
+    if (parsed === null || typeof parsed !== 'object') return undefined
+    if (!KERNEL_IDS.includes(parsed.backendId)) return undefined
+    if (typeof parsed.sessionId !== 'string' || typeof parsed.cwd !== 'string' || typeof parsed.attemptId !== 'string') return undefined
+    if (typeof parsed.updatedAt !== 'number' || !Number.isFinite(parsed.updatedAt)) return undefined
+    return parsed
+  } catch {
+    return undefined
+  }
+}
+// 记录 → 重试 env：DSH_TUI_BACKEND 与一次性的 DSH_TUI_BACKEND_HANDOFF（后者
+// 压过 Config 行）都设成记录里的内核；记录有可恢复的会话 id 才设
+// DSH_TUI_RESUME_SESSION，否则删掉继承来的值，在该内核上冷启动。
+const envFromLastRun = record => {
+  const env = { ...process.env }
+  env.DSH_TUI_BACKEND = record.backendId
+  env.DSH_TUI_BACKEND_HANDOFF = record.backendId
+  if (typeof record.sessionId === 'string' && record.sessionId.trim() !== '') {
+    env.DSH_TUI_RESUME_SESSION = record.sessionId
+  } else {
+    delete env.DSH_TUI_RESUME_SESSION
+  }
+  return env
+}
+// 首次 spawn 前记下的时刻：updatedAt 不早于它的记录是本次启动的 TUI 写的，
+// 更早的是上一次启动留下的。
+let launchChain = null
+const noteLaunchChain = () => {
+  launchChain = { startedAt: Date.now() }
+}
+
+// 非 DSH 内核的上次会话来自各自 backends/<id>/prefs.json 的 lastSession。
+const readBackendLastSession = backendId => {
+  try {
+    const prefs = JSON.parse(readFileSync(join(homedir(), '.dsh-tui', 'backends', backendId, 'prefs.json'), 'utf8'))
+    return typeof prefs?.lastSession === 'string' ? prefs.lastSession.trim() : ''
+  } catch {
+    return ''
+  }
+}
 // 安全模式「重试正常启动」的环境（菜单选项 1，首启 fallback 与 `safe` 共用）：
-// 崩溃往往发生在 TUI 的退出漏斗之前，此时 `~/.dsh-tui/resume.txt` 是"用户上
-// 一刻在哪个会话"的唯一线索（TUI 侧崩溃分支也会写它，见
-// src/dsh-adapter/plugin.ts 的退出漏斗）。不带这个变量重试等于开一个新的空会话
-// ——正是「会话丢了」的观感。已经显式设了该变量（用户自己 `--resume`）则不覆盖；
-// 指针缺失/不可读时保持冷启动语义。
+//   1. 本次启动之后写下的最后运行记录：崩溃时实际在跑的内核与会话，压过
+//      env 里的 --resume（内核切换是用户更新的选择）。
+//   2. 没有这样的记录（崩得太早，或旧版本不写）：env 里已有
+//      DSH_TUI_RESUME_SESSION 就照用；否则按 env 的后端读它的上次会话
+//      （resume.txt 或对应后端偏好文件），读不到就冷启动。
 const resumeEnvForRetry = () => {
+  const chain = launchChain
+  const record = readLastRunRecord()
+  if (record !== undefined && chain !== null && record.updatedAt >= chain.startedAt) {
+    return envFromLastRun(record)
+  }
   if (process.env.DSH_TUI_RESUME_SESSION !== undefined) return process.env
   let target = ''
-  try {
-    target = readFileSync(join(homedir(), '.dsh-tui', 'resume.txt'), 'utf8').trim()
-  } catch {
-    // 没有历史会话可恢复——静默冷启动。
+  if (KERNEL_IDS.includes(process.env.DSH_TUI_BACKEND) && process.env.DSH_TUI_BACKEND !== 'dsh') {
+    target = readBackendLastSession(process.env.DSH_TUI_BACKEND)
+  } else {
+    try {
+      target = readFileSync(join(homedir(), '.dsh-tui', 'resume.txt'), 'utf8').trim()
+    } catch {
+      // 没有历史会话可恢复——静默冷启动。
+    }
   }
   return target === '' ? process.env : { ...process.env, DSH_TUI_RESUME_SESSION: target }
 }
@@ -784,7 +849,7 @@ const isInteractive = () => Boolean(process.stdin.isTTY && process.stdout.isTTY)
 
 // 子进程异常退出后终端可能停在脏状态（alt-screen/鼠标/隐藏光标——清理
 // 责任在 TUI 的 ink 退出路径，不保证完成）。进入询问/菜单前做最小恢复，
-// 仅为让后续界面可读，不承诺完整复原（spec §6.2）。
+// Reset the screen and mouse modes before prompting after a child exit.
 const restoreTerminalMinimal = () => {
   process.stdout.write('\x1b[?1049l\x1b[?1000l\x1b[?1006l\x1b[?25h')
 }
@@ -798,7 +863,7 @@ const askSafeEntry = async pendingExitCode => {
   // 与 runSafeSession.askChoice 同款 close 竞速：接口 close（上方 SIGINT
   // 处理器主动 close，或 TTY 的 Ctrl+D/EOF）时 question 可能永不结算——
   // 裸 await 会让 fallback 询问挂死（PTY 实测 Ctrl+C 下顶层 await 以退出
-  // 码 13 异常中止）。close 一律按取消，对齐 spec §6.2：Ctrl+C/Ctrl+D/EOF
+  // 码 13 异常中止）。close 一律按取消：Ctrl+C/Ctrl+D/EOF
   // 等价拒绝（按原退出码收束）。
   let answer
   try {
@@ -902,7 +967,7 @@ const runSafeSession = async ({ pendingExitCode = 0, retryDsh, extraLines, rescu
       // cold start = 手动入口无已规范化 args，按空参数冷启动。
       const replay = typeof retryDsh === 'function'
       console.log(L.retry + (replay ? L.replaySource : L.coldStartSource))
-      // 两来源共用 profileReady 前置（spec §4：重试不得隐式自举）。
+      // Both retry paths require a ready profile; neither bootstraps it.
       if (!profileReady()) { console.error(msg('safeListUnreadable')(msg('safeGuideLabels').notReadyReason)); continue }
       state.handingOff = true // 主动交接：此刻起的中断不算用户取消
       const settled = settleRetry(replay ? await retryDsh() : await startDshSession([]))
@@ -1218,7 +1283,7 @@ const checkProfileAlignment = installedVersion => {
 // ─── 子命令：safe（安全模式入口，两种角色同一段代码）──────────────────────────
 // 零 lib 依赖、不委托、不自举（对齐 doctor 的依赖边界，而非 update 的
 // profile-lib 路径）：profile 损坏时它必须仍可达。控制面只读；重试与
-// 修复动作语义见 safe 会话实现（spec §4/§5）。
+// Recovery and retry behavior lives in runSafeSession.
 // `safe --rescue` 是同一个救援动作的显式入口（不是新动作）：交互终端里
 // 等价于菜单选项 5（门禁 → 创建/复用 → 干净启动），非交互终端里只做
 // 门禁 + 创建/复用并报告结论（没有终端可交接时不启动 TUI），以便脚本与
@@ -1371,6 +1436,11 @@ if (!runningInsideProfile && ownVersion !== undefined && process.env.DSH_TUI_NO_
   const hostArgs = []
   const args = []
   const argv = process.argv.slice(2)
+  // Resume flags in command-line order: an explicit id, or `null` for a bare
+  // flag. Replayed after the whole line is read, with the original
+  // "each flag sets it, the last one wins" semantics — only a bare flag's
+  // source depends on the backend, which may be named after it.
+  const resumeFlags = []
   for (let i = 0; i < argv.length; i++) {
     const a = argv[i]
     if (a === '--') {
@@ -1391,6 +1461,18 @@ if (!runningInsideProfile && ownVersion !== undefined && process.env.DSH_TUI_NO_
         continue
       }
     }
+    // `--backend <id>`: which agent backend the app opens its session with
+    // (the row reads DSH_TUI_BACKEND; absent falls back to kernel.json, then dsh).
+    if (a === '--backend' || a.startsWith('--backend=')) {
+      const backend = a.startsWith('--backend=') ? a.slice('--backend='.length).trim() : (argv[i + 1] ?? '').trim()
+      if (a === '--backend' && argv[i + 1] !== undefined) i += 1
+      if (!KERNEL_IDS.includes(backend)) {
+        console.error(lang === 'zh' ? `未知的 --backend：${backend}（可选 ${KERNEL_IDS.join(' / ')}）` : `Unknown --backend: ${backend} (expected ${KERNEL_IDS.join(' or ')})`)
+        process.exit(2)
+      }
+      process.env.DSH_TUI_BACKEND = backend
+      continue
+    }
     if (a === '--resume' || a === '-c' || a === '--continue' || a.startsWith('--resume=')) {
       let sessionId = ''
       if (a.startsWith('--resume=')) {
@@ -1398,8 +1480,8 @@ if (!runningInsideProfile && ownVersion !== undefined && process.env.DSH_TUI_NO_
       } else if (a === '--resume' && argv[i + 1] !== undefined && !argv[i + 1].startsWith('-')) {
         sessionId = argv[++i].trim()
       }
-      if (!sessionId) sessionId = readLastResumeTarget()
-      if (sessionId) setResumeEnv(sessionId)
+      // 裸 --resume：等整条命令行读完再决定（`--backend` 可能在它后面）。
+      resumeFlags.push(sessionId || null)
     } else if (
       process.env.DSH_TUI_WORKSPACE_TARGET === undefined
       && !a.startsWith('-')
@@ -1411,6 +1493,13 @@ if (!runningInsideProfile && ownVersion !== undefined && process.env.DSH_TUI_NO_
     }
   }
 
+  // 按出现顺序重放 --resume：裸 --resume 时 DSH 读 resume.txt（契约不变），
+  // 其他内核读各自的上次会话。
+  for (const flag of resumeFlags) {
+    const sessionId = flag ?? (KERNEL_IDS.includes(process.env.DSH_TUI_BACKEND) && process.env.DSH_TUI_BACKEND !== 'dsh' ? readBackendLastSession(process.env.DSH_TUI_BACKEND) : readLastResumeTarget())
+    if (sessionId) setResumeEnv(sessionId)
+  }
+
   // 启动：被委托场景下本副本自己的版本即对齐诊断所见的启动器代际。
   if (process.env.DSH_TUI_LAUNCHER_VERSION === undefined && ownVersion !== undefined) {
     process.env.DSH_TUI_LAUNCHER_VERSION = ownVersion
@@ -1419,5 +1508,7 @@ if (!runningInsideProfile && ownVersion !== undefined && process.env.DSH_TUI_NO_
   // DSH consumes its own --; only the app tail belongs behind it. Preserve
   // the app-level separator too, and replay this same argv on a safe retry.
   const firstArgs = [...hostArgs, ...(args.length > 0 ? ['--', ...args] : [])]
+  // 必须在首次 spawn 之前：本次启动的 TUI 写的记录都晚于这个时刻。
+  noteLaunchChain()
   settleFirstResult(await startDshSession(firstArgs), firstArgs)
 }

package/cordis.patch.yml

@@ -333,6 +333,12 @@
     - id: dsh-tui-scenes
       name: '@deepseek-harness-tui/dsh-tui/scenes'
 
+    # Optional plugins register side-panel surfaces (sidebar Panel +
+    # compact row, experimental §18) here; admission, budgets and crash
+    # isolation remain owned by the tuiPanels runtime + PanelStore.
+    - id: dsh-tui-panels
+      name: '@deepseek-harness-tui/dsh-tui/panels'
+
     # Plugin-interop anchor (Community Consensus v0.15): the unified grant
     # store, runtime generation id, and Host Descriptor live here; later
     # contract surfaces (plugin storage, message observation, effect
@@ -447,7 +453,7 @@
       name: '@deepseek-harness-tui/dsh-tui'
       # The entry-level dependency augments the plugin's `agents` inject and
       # prevents startup Session creation from racing WorkspaceRegistry init.
-      inject: [workspaceRegistry, agents, tuiWorkspaces, tuiScenes, tuiDialogs, tuiStatus, tuiShortcuts, tuiRenderers, tuiThemes]
+      inject: [workspaceRegistry, agents, tuiWorkspaces, tuiScenes, tuiPanels, tuiDialogs, tuiStatus, tuiShortcuts, tuiRenderers, tuiThemes]
       # `tuiWorkspaces`/`tuiScenes` (and the dsh-tui-extensions services,
       # including `tuiThemes`)
       # live in the entry-level inject ONLY as an ordering (and reload-rebind)
@@ -503,6 +509,8 @@
         preset: !!js process.env.DSH_TUI_PRESET ?? undefined
         workspace: !!js process.env.DSH_TUI_WORKSPACE_TARGET ?? undefined
         sessionId: !!js process.env.DSH_TUI_RESUME_SESSION ?? undefined
+        # Agent backend (`dsh-tui --backend claude` → DSH_TUI_BACKEND); unset → /kernel's remembered pick, else dsh.
+        backend: !!js process.env.DSH_TUI_BACKEND || undefined
 
     # Live working-line data source (thinking copy / running tool / turn
     # summary). Mounted through @deepseek-harness-tui/dsh-tui's own

package/cordis.yml

@@ -91,6 +91,8 @@
     #  feeds the chosen session id through this env var (see
     #  src/sessionHistory.ts for the launcher contract).
     sessionId: !!js process.env.DSH_TUI_RESUME_SESSION ?? undefined
+    # Agent backend (`dsh-tui --backend claude` → DSH_TUI_BACKEND); unset → /kernel's remembered pick, else dsh.
+    backend: !!js process.env.DSH_TUI_BACKEND || undefined
     workspace: !!js process.env.DSH_TUI_WORKSPACE_TARGET ?? undefined
 
 # The DeepSeek adapter. Shipped default: full thinking at max effort.

package/guide/dsh-tui-guide/SKILL.md

@@ -5,14 +5,14 @@ description: Use when the user asks about dsh-tui itself (usage, shortcuts, conf
 
 # dsh-tui 用户手册（索引）
 
-用户手册全文就在**本文件所在目录**——`skill` 工具返回的 `resourceBase`。共 8 篇，
+用户手册全文就在**本文件所在目录**——`skill` 工具返回的 `resourceBase`。共 10 篇，
 每篇中英各一份：中文文件名无后缀，英文加 `.en.md`。拿不到绝对路径时，用
 `glob` 在 dsh-tui 包里搜 `guide/dsh-tui-guide`。
 
 ## 怎么用
 
 1. **跟用户同语言**：中文提问读无后缀文件，英文提问读加后缀的那份；回答也用同一种语言。
-2. **先定位再读**：16 个文件合计约 290 KB，整篇读既慢又挤上下文。先 `grep` 关键词拿到命中行，
+2. **先定位再读**：20 个文件按主题分篇，整篇读既慢又挤上下文。先 `grep` 关键词拿到命中行，
    再用 `read` 带 `offset`/`limit` 只展开需要的那几段。
 3. **一次一到两篇**：按下面的路由表挑最贴近的；跨主题时再补第二篇。
 4. **给出处**：回答末尾写清来源（文件名 + 小节标题），用户能直接翻回去核对。
@@ -26,6 +26,8 @@ description: Use when the user asks about dsh-tui itself (usage, shortcuts, conf
 | 日常使用、键位、斜杠命令、会话与工作流、设置 | `user-guide.md` |
 | 输入框、鼠标、选中复制、粘贴、图片、问卷与审批 | `interaction.md` |
 | 配置覆盖层、TUI 开关、agent preset、模型路由、MCP | `configuration.md` |
+| Claude 后端：启用、登录、与 DSH 的差异、已知限制 | `claude-backend.md` |
+| Codex 后端：安装、登录、渠道、Plan、会话与原生能力 | `codex-backend.md` |
 | 主题、配色、自动检测、自定义主题 | `themes.md` |
 | 从 Claude Code / Codex / OMP / zcode / Grok 迁移会话 | `migrate.md` |
 | VS Code 集成、扩展、IDE 选区 | `vscode.md` |