@hyzyn/dsh-tty 0.18.2 → 0.18.3

package/README.en.md

@@ -31,7 +31,10 @@ After installing, restart `dsh web`; a “Terminal” entry appears in the sideb
   a tab; **double-clicking a tab renames it** (the name is persisted with the tab and survives a reconnect);
   each tab is an independent session (local PTY or SSH channel);
 - **The working directory follows the current DSH session**: new tabs open in the current session’s
-  working directory (the host `cwd` configuration is the fallback);
+  working directory (the host `cwd` configuration is the fallback). Since 0.1.6 the session list
+  snapshot no longer carries `current` (view selection moved to the workspace domain), so the client
+  reads `retainedBy.mainView > 0` to find the current session — trusting only the legacy field leaves
+  the cwd empty and new tabs fall back to the host’s start directory;
 - Supports TUIs such as vim / htop / less (TERM is injected as `xterm-256color`);
 - Panel size changes are resized automatically (xterm fit → native PTY resize);
 - **Ctrl+F searches inside the terminal** (Enter next / Shift+Enter previous / Esc closes only the search
@@ -241,17 +244,25 @@ slot (`ssh2`’s sftp subsystem, host half in `src/sftp.ts`):
 
 ![SFTP dual pane (0.9.0; docked in a drawer below the terminal since 0.16.0): local on the left / remote on the right, with inline ⇨/⇦ server-side direct transfer](https://cdn.jsdelivr.net/gh/hyzyn/dsh-plugin-kit@main/docs/dsh-plugin-kit-tty-sftp-dual.png)
 
-- **Placement (0.16.0)**: when the terminal panel is open and the mount slot is free, the File Browser
+- **Placement (0.16.0)**: when the terminal panel is open and **this tab’s** mount slot is free, the File Browser
   **docks below the terminal** — the path bar / list / transfer progress take the full width (a file list is
   a wide table, so full width below beats a narrow column on the right, and the terminal also keeps its width
   without wrapping; a dual pane side by side needs that width even more), and the terminal stays visible and
   usable. The height is draggable and can collapse into a single title bar (collapsing neither closes the
-  panel nor interrupts browsing); when the mount slot is already taken by another panel (such as the
-  containers panel) or the panel is not open, it falls back to the original centered dialog, **without
-  pushing anyone else’s panel out**. The title / collapse / ✕ come from tty’s mount slot;
+  panel nor interrupts browsing); when another panel (such as the containers panel) already holds the slot on
+  the same tab, or the panel is not open, it falls back to the original centered dialog, **without pushing
+  anyone else’s panel out**. The title / collapse / ✕ come from tty’s mount slot;
+- **Follows the tab (0.18.4)**: the File Browser talks to the host of the tab that opened it, so it belongs to
+  that tab: switching away hides it (in-flight transfers keep running and the scene is restored when you come
+  back), and closing the tab tears it down. **Every entry follows the same rule** — the connection bar’s
+  “SFTP”, the 📂 on a connection-book entry and “File Browser” in the SSH dialog / settings card all become
+  owned by whatever tab was active when they were opened; only “panel open with no tabs at all” counts as
+  owned by no tab (always visible). Before this, the pane stayed put across a tab switch — title reading host
+  A while the active tab was B, worst case uploading to the wrong host;
 - **Entries**: ① connection-book entries in the tab bar “+” menu carry a 📂 (open the File Browser for that
   entry); ② fill in host/authentication in the SSH connection dialog and click “File Browser” (you can
-  browse without saving to the connection book);
+  browse without saving to the connection book); ③ the “SFTP” button in an SSH tab’s connection bar (owned by
+  that tab, see the previous bullet);
 - **Operations**: directory browsing (Enter in the path box to jump, `.. (parent directory)`, a single click
   on a file downloads it), **upload** (multi-select files, XHR streaming + percentage progress; since 0.8.0
   **drag & drop** is supported — files and folders can be dropped straight into the dialog, folders are
@@ -589,8 +600,8 @@ ctx.inject(['ttyTerminal'], (c) => {
 
 ### In-panel mount slots (client service `ttyPanel`, 0.16.0)
 
-> tty’s own SFTP File Browser goes through this channel too (0.16.0): when the mount slot is free it docks on
-> the right, and when another panel has taken it, it falls back to the dialog.
+> tty’s own SFTP File Browser goes through this channel too (0.16.0): when the mount slot is free it docks
+> below, and when another panel on the same tab has taken it, it falls back to the dialog.
 
 `mount` solves “a consumer gives the host and tty puts a terminal in it”; `ttyPanel` is its **mirror** — tty
 gives consumers a slot inside the terminal panel to mount their own UI into. A typical case: dsh-docker opens
@@ -598,6 +609,16 @@ gives consumers a slot inside the terminal panel to mount their own UI into. A t
 which stays visible, clickable and typable instead of being covered by a full-screen modal (which was exactly
 the pain before 0.15).
 
+A mount slot is **connection-scoped**: its credentials / target come from the terminal tab that opened it.
+So since 0.18.4 every pane records its **owner tab** (`options.ownerSid`, defaulting to the active tab at
+mount time): switching to another tab **hides** the pane (`data-dock-hidden`; its DOM and your rendered tree
+survive, in-flight transfers keep running) and switching back restores the scene; closing the owner tab tears
+the pane down. Without this, the pane stayed put across a tab switch — its title read `SFTP · cdc-test-161`
+while the active tab was `192.168.80.248`, leaving **another host**’s file listing on screen (worst case:
+uploading to the wrong host). Passing `ownerSid: null` means “owned by no tab” (always visible); that is what
+happens automatically when the panel is open with no tabs at all, and a consumer can use it to declare “this
+pane has nothing to do with tabs, do not hide it on a switch”.
+
 ```js
 ctx.inject(['ttyPanel'], (c) => {
   // Use your own modal when the panel is not open (or tty < 0.16)
@@ -608,6 +629,7 @@ ctx.inject(['ttyPanel'], (c) => {
     side: 'right',         // 'right' (default, vertical list / list+detail) | 'bottom' (wide horizontal table)
     size: 520,             // initial size in px: right = width (default 460), bottom = height (default 320)
     min: 360,              // minimum size in px (optional, default 280 / 160)
+    ownerSid: tab.sid,     // owner tab (optional): omitted = current active tab, null = owned by no tab
     onClose: () => { /* called when tty tears the panel down: unmount your React root here */ },
   })
   createRoot(pane.element).render(<MyPanel />)
@@ -618,7 +640,7 @@ ctx.inject(['ttyPanel'], (c) => {
 | Member | Description |
 | --- | --- |
 | `isOpen()` | Whether the terminal panel is currently open (minimized does not count). Consumers use it to decide “mount in here” or “use my own modal” |
-| `mountPane(options)` | Mounts a slot on the right / at the bottom of the panel and returns a handle; **only one at a time**, and a later `mountPane` first tears the previous one down (calling its `onClose`). With `side:'bottom'` it spans the full width and is sized by height (drag the top edge), collapsing into a title bar |
+| `mountPane(options)` | Mounts a slot on the right / at the bottom of the panel and returns a handle; **only one at a time**, and a later `mountPane` first tears the previous one down (calling its `onClose`). With `side:'bottom'` it spans the full width and is sized by height (drag the top edge), collapsing into a title bar. `ownerSid` records the owner tab (default: the active one); panes owned by another tab are **hidden** on tab switch (DOM and your React tree survive, restored when you switch back — see “connection-scoped” above) |
 | `handle.element` | The host the consumer renders into (flex column, already `overflow:hidden`, filling the body area) |
 | `handle.setTitle(text)` / `setHint(text)` | Change the title / the grey hint |
 | `handle.expand() / collapse() / toggle() / isCollapsed()` | Collapse into a 32px strip (vertical title + expand/close buttons), and the terminal immediately gets its width back |
@@ -698,7 +720,7 @@ client-side changes.
 
 Styles should not be changed by “refresh the page and take a look”: the script loads `client.js` into a pure
 static fixture page (`scripts/preview/harness.html` + a fake DSH host from `mock-host.js`: module
-loader / fetch / WebSocket) and renders 14 UI states one by one with headless Chrome, screenshotting them to
+loader / fetch / WebSocket) and renders 29 UI states one by one with headless Chrome, screenshotting them to
 `packages/tty/.preview/shots/`:
 
 ```bash
@@ -708,9 +730,20 @@ node scripts/preview.mjs --list          # list scenes
 node scripts/preview.mjs --theme=light   # light theme
 ```
 
-Coverage: local terminal / multi-tab + SSH connection bar / the “+” menu / SSH dialog (new, edit)/
-settings card / SFTP (single pane, dual pane) / minimized badge / exit and error overlays / tunnel popover /
-search box / toast. The fixture also renders the `--dsw-*` skin variables together with the real UI, so it can
+Coverage: local terminal / multi-tab + SSH connection bar / the “+” menu / SSH dialog (new, edit, probe)/
+settings card (also side by side with docker)/ SFTP (single pane, dual pane, placement fallback)/
+**mount slot follows the tab** (`dock-pane-tab`, the 0.18.4 regression)/ minimized badge / exit and error
+overlays / tunnel popover / search box / toast / embedded terminals (alone and alongside the panel)/
+docker panel and “containers → terminal drawer”.
+
+A scene may attach a **function-shaped** assertion to `window.__previewAssert` (returning `null` means pass,
+a string / array means fail); the script runs it and folds the result into `✓/✗`. An assertion that only
+lives in the fixture, seen by nobody unless someone pulls `diag` by hand, is a regression that is not really
+pinned — which is exactly what bit the 0.18.4 “panel does not follow the tab” fix: the assertion was written
+already, but because it was mixed into a `diag` object containing a function, the whole evaluation failed
+silently and everything reported ✓.
+
+The fixture also renders the `--dsw-*` skin variables together with the real UI, so it can
 verify things like “is there still a white panel after switching light/dark themes”. The output directory
 `.preview/` is gitignored.
 

package/README.md

@@ -32,7 +32,9 @@ dsh plugin --profile web add link:$(pwd)/packages/tty   # 仓库开发调试
   **双击标签可重命名**（重命名随标签持久化，断线恢复后保留）；每个标签
   独立会话（本地 PTY 或 SSH channel）；
 - **工作目录跟随当前 DSH 会话**：新标签默认在当前会话工作目录打开
-  （宿主配置 `cwd` 作兜底）；
+  （宿主配置 `cwd` 作兜底）。0.1.6 起会话列表快照不再带 `current`（视图选中项搬到了
+  workspace 域），客户端改看 `retainedBy.mainView > 0` 认当前会话——只认老字段会让
+  cwd 恒为空、新标签回落宿主启动目录；
 - 支持 vim / htop / less 等 TUI（TERM 已注入为 `xterm-256color`）；
 - 面板大小变化自动 resize（xterm fit → PTY 原生 resize）；
 - **Ctrl+F 终端内搜索**（Enter 下一个 / Shift+Enter 上一个 / Esc 只关搜索框），
@@ -220,14 +222,20 @@ subsystem，宿主半体 `src/sftp.ts`）：
 
 ![SFTP 双栏（0.9.0；0.16.0 起挂在终端下方抽屉）：左本机 / 右远程，行内 ⇨/⇦ 服务端直传](https://cdn.jsdelivr.net/gh/hyzyn/dsh-plugin-kit@main/docs/dsh-plugin-kit-tty-sftp-dual.png)
 
-- **落点（0.16.0）**：终端面板开着且挂载位空着时，文件浏览**挂在终端下方**——路径栏 /
+- **落点（0.16.0）**：终端面板开着且**本标签**的挂载位空着时，文件浏览**挂在终端下方**——路径栏 /
   列表 / 传输进度占满整宽（文件列表是横向宽表，下方全宽比右侧窄栏好用，终端也保住
   宽度不会折行；双栏两栏并排更需要这个宽度），终端继续可见可用。高度可拖、可折叠成
-  一条标题栏（折叠不关面板、不中断浏览）；挂载位已被别的面板（如容器面板）占用、或
-  面板没开时，退回原来的居中对话框，**不会把别人的面板挤掉**。标题 / 折叠 / ✕ 由
+  一条标题栏（折叠不关面板、不中断浏览）；同一标签的挂载位已被别的面板（如容器面板）
+  占用、或面板没开时，退回原来的居中对话框，**不会把别人的面板挤掉**。标题 / 折叠 / ✕ 由
   tty 的挂载位提供；
+- **跟着标签切（0.18.4）**：文件浏览连的是**打开它的那个标签**那台主机，所以它归属该标签：
+  切到别的标签时整块收起（在途传输照跑，切回来还在原地），标签关掉时一并收掉。**所有入口
+  用同一条规则**——连接栏「SFTP」、连接簿条目的 📂、SSH 对话框 / 设置卡片的「文件浏览」都
+  归属打开那一刻的活动标签；只有「面板开着但一个标签都没有」才算不隶属任何标签（永远可见）。
+  此前不认归属，切完标签面板还停在原处——标题写着 A 主机、底下活动标签是 B，最坏会往错主机上传；
 - **入口**：① 标签栏「+」菜单的连接簿条目带 📂（按该条目打开文件浏览）；
   ② SSH 连接对话框填好主机/认证后点「文件浏览」（不落连接簿也能浏览）；
+  ③ SSH 标签的连接栏「SFTP」按钮（归属该标签，见上一条）；
 - **操作**：目录浏览（路径框回车跳转、`..（上级目录）`、单击文件即下载）、
   **上传**（多选文件，XHR 流式 + 进度百分比；0.8.0 起支持**拖拽**——文件与
   文件夹直接拖入对话框，文件夹经 `webkitGetAsEntry` 递归展开逐个上传，目录
@@ -548,14 +556,23 @@ ctx.inject(['ttyTerminal'], (c) => {
 
 ### 面板内挂载位（客户端服务 `ttyPanel`，0.16.0）
 
-> tty 自己的 SFTP 文件浏览也走这条通道（0.16.0）：挂载位空着时挂在右侧，
-> 被别的面板占用时退回对话框。
+> tty 自己的 SFTP 文件浏览也走这条通道（0.16.0）：挂载位空着时挂在下方，
+> 被同标签的别的面板占用时退回对话框。
 
 `mount` 解决的是「消费方给宿主，tty 往里塞终端」；`ttyPanel` 是它的**镜像**——tty 在
 终端面板里给消费方一块位置，让消费方把自己的界面挂进来。典型场景：dsh-docker 从 SSH
 连接栏点「容器」，容器面板挂在终端**右侧**，终端继续可见、可点、可输入，而不是被整屏
 弹窗盖住（0.15 之前那正是用户的痛点）。
 
+挂载位是**连接级**的：它的凭证 / 目标来自**打开它的那个终端标签**。所以 0.18.4 起每块
+pane 记一个「归属标签」（`options.ownerSid`，默认 = 挂载那一刻的活动标签）：切到别的
+标签时整块**收起**（`data-dock-hidden`，DOM 与你 render 的树都保活，在途传输继续跑），
+切回来恢复现场；归属标签被关掉时 pane 一并收掉。不这么做的话，切完标签面板还停在原处
+——标题写着 `SFTP · cdc-test-161`、底下活动标签却是 `192.168.80.248`，面板里躺着**另一台
+主机**的文件列表（最坏的情况是往错主机上传）。显式传 `ownerSid: null` 表示「不隶属任何
+标签」（一直可见）——面板开着但一个标签都没有时自动落进这一档；消费方也可以用它声明
+「这块与标签无关，别跟着切」。
+
 ```js
 ctx.inject(['ttyPanel'], (c) => {
   // 面板没开（或 tty < 0.16）时走自己的弹窗
@@ -566,6 +583,7 @@ ctx.inject(['ttyPanel'], (c) => {
     side: 'right',         // 'right'（默认，竖向列表 / 列表+详情）| 'bottom'（横向宽表）
     size: 520,             // 初始尺寸 px：right = 宽度（默认 460）、bottom = 高度（默认 320）
     min: 360,              // 最小尺寸 px（可选，默认 280 / 160）
+    ownerSid: tab.sid,     // 归属标签（可选）：省略 = 当前活动标签，null = 不隶属任何标签
     onClose: () => { /* tty 收掉面板时回调：在这里 unmount 自己的 React root */ },
   })
   createRoot(pane.element).render(<MyPanel />)
@@ -576,7 +594,7 @@ ctx.inject(['ttyPanel'], (c) => {
 | 成员 | 说明 |
 | --- | --- |
 | `isOpen()` | 终端面板是否正开着（最小化不算）。消费方据此决定「挂进来」还是「走自己的弹窗」 |
-| `mountPane(options)` | 在面板右侧 / 下方挂一块位置并返回 handle；**同时只挂一个**，后来的 `mountPane` 会先收掉前一个（并回调它的 `onClose`）。`side:'bottom'` 时占满宽度、由高度定尺寸（拖上边缘），折叠成一条标题栏 |
+| `mountPane(options)` | 在面板右侧 / 下方挂一块位置并返回 handle；**同时只挂一个**，后来的 `mountPane` 会先收掉前一个（并回调它的 `onClose`）。`side:'bottom'` 时占满宽度、由高度定尺寸（拖上边缘），折叠成一条标题栏。`ownerSid` 记归属标签（默认当前活动标签），切换标签时归属别的标签的 pane 会被**收起**（DOM 与你的 React 树保活，切回来恢复；见上文「连接级」那段） |
 | `handle.element` | 消费方 render 的宿主（flex 纵向、已 `overflow:hidden`，撑满正文区） |
 | `handle.setTitle(text)` / `setHint(text)` | 改标题 / 灰字 |
 | `handle.expand() / collapse() / toggle() / isCollapsed()` | 折叠成 32px 窄条（竖排标题 + 展开/关闭按钮），终端立刻拿回宽度 |
@@ -665,7 +683,7 @@ esbuild 的 text loader 内联进 `client.js`）。构建产物 `client.js`（
 
 改样式不该靠「刷新页面看一眼」：脚本把 `client.js` 装进一个纯静态夹具页
 （`scripts/preview/harness.html` + `mock-host.js` 伪造的 DSH 宿主：module
-loader / fetch / WebSocket），用 headless Chrome 把 14 个界面状态逐个渲染并
+loader / fetch / WebSocket），用 headless Chrome 把 29 个界面状态逐个渲染并
 截图到 `packages/tty/.preview/shots/`：
 
 ```bash
@@ -675,9 +693,17 @@ node scripts/preview.mjs --list          # 列出场景
 node scripts/preview.mjs --theme=light   # 浅色主题
 ```
 
-覆盖：本地终端 / 多标签 + SSH 连接栏 / 「+」菜单 / SSH 对话框（新建、编辑）/
-设置卡片 / SFTP（单窗体、双栏）/ 最小化徽标 / 退出与错误遮罩 / 隧道弹层 /
-搜索框 / toast。夹具还会把 `--dsw-*` 皮肤变量与真实界面一并渲染，因此能验
+覆盖：本地终端 / 多标签 + SSH 连接栏 / 「+」菜单 / SSH 对话框（新建、编辑、试连）/
+设置卡片（含与 docker 并排对照）/ SFTP（单窗体、双栏、落点回退）/
+**挂载位跟着标签切**（`dock-pane-tab`，0.18.4 的回归）/ 最小化徽标 / 退出与错误遮罩 /
+隧道弹层 / 搜索框 / toast / 嵌入式终端（单独与面板共存）/ docker 面板与「容器 → 终端抽屉」。
+
+场景可以把**函数形态**的断言挂到 `window.__previewAssert`（返回 `null` = 通过，返回
+字符串 / 数组 = 失败），脚本会跑掉它并把结果计入 `✓/✗`。断言光挂在夹具里、只有手工
+取 `diag` 时才有人看，回归等于没钉——0.18.4 修「面板不跟标签切」时就吃到这个亏：断言
+早写好了，但因为混在带函数的 `diag` 对象里，整条求值静默失败，一路都是 ✓。
+
+夹具还会把 `--dsw-*` 皮肤变量与真实界面一并渲染，因此能验
 「明暗主题切换后是否还有白色面板」这类问题。产物目录 `.preview/` 已 gitignore。
 
 > 夹具里的 `ctx.inject` 与真实 cordis 同语义：**依赖里有一个服务不存在就不触发回调**，