dsh-remote 0.8.74 → 0.8.75

package/README.en.md

@@ -333,6 +333,7 @@ Deploying to a product profile is a separate, explicit action (`./sync.sh`) for
 | `webAttachDshHome` | string | `''` | `DSH_HOME` exported on the remote when attaching; empty reuses the remote user's own harness home |
 | `webAttachWaitSeconds` | int | `45` | how long to wait for a freshly started remote `dsh web` to print its launch token |
 | `localTools` | string | `bootstrap` | which `rw_*` tools a LOCAL session (cwd outside every remote mirror) sees (issue #63): `bootstrap` keeps only the configuration loop `rw_machines`/`rw_connect`/`rw_pick_workspace` (the other 19 refuse a local session with "this session is LOCAL", so exposing them just wastes schema budget); `none` hides all `rw_*` (remote setup happens via the settings page only); `all` restores the legacy full surface. REMOTE sessions (cwd inside a mirror) always see everything; an invalid value degrades to `bootstrap` |
+| `remoteTerminalDefault` | bool | `true` | make the shell menu's "remote ssh" launcher the terminal's DEFAULT shell when neither the host (`config.shell`) nor the user (a remembered menu choice) has picked one: a session rooted in a remote mirror opens a terminal already sshed into the remote workspace, any other session transparently falls back to a local shell (issue #55); `false` keeps it menu-only |
 | `tui` | bool | `true` | master switch for the TUI (dsh-tui) layer; `false` registers no `/dsh-remote` page, workspace provider or status field |
 | `tuiProviderListRecent` | bool | `true` | list each machine's recent remote projects in the TUI workspace picker |
 | `tuiProviderRecentLimit` | int | `5` | recent remote projects listed per machine (1–20) |
@@ -348,6 +349,9 @@ Deploying to a product profile is a separate, explicit action (`./sync.sh`) for
 **`@` lists remote files but the built-in read tool cannot open them** — the harness's own file tools see the **local mirror**, which stays empty until `rw_sync` downloads it. Read remote files with `rw_read_file` or the sidebar remote tab.
 
 **A file link in a remote Session does not open** (issue #55) — fixed. When a link is clicked the harness turns it into `dsh-resource://file/session/<session>/<path>` and hands it to the built-in text preview, which reads the **local** filesystem; a remote Session's cwd is a **local mirror directory** (empty until `rw_sync`), so the open simply failed. The plugin now registers a higher-priority handler for that address and opens it over SFTP through the same editor as the sidebar "Remote Files" tab. The safety rule is deliberately conservative: it takes over only when the Session's cwd is **provably inside a mirror** and the mirror registry has loaded, so local Sessions — and the instant right after a page load — keep the built-in preview and no local file is ever mistaken for a remote one. The two cases that still cannot be mapped say so instead of showing a blank page: an address with no mirror mapping, and a Session whose workspace is not a remote mirror directory.
+
+**The sidebar terminal in a remote Session is a LOCAL one** (issue #55, the terminal half) — solved in 0.8.75, no clicks needed. The shell menu has long carried the plugin's **remote ssh** entry: a cwd-aware launcher that ssh'es into the remote workspace when the session sits in a remote mirror and falls back to a local shell otherwise. As of 0.8.75 it also becomes the **default shell**: unless the host administrator configured a default (`config.shell`) or you picked a shell from the menu yourself, "open terminal" in a remote session lands on the remote host directly, while local sessions keep opening a local shell (the launcher routes by cwd). Two safeguards: a shell you picked manually from the menu always wins, and `remoteTerminalDefault: false` restores menu-only behaviour. For a heavier-weight answer there is still the "remote DSH UI" above — your browser opens the remote machine's OWN harness, whose terminals natively run on the far side. To just run one remote command, `rw_exec` (add `pty: true` for an interactive pty).
+
 `.md`/`.markdown` links in a remote session take the same SFTP path and preview in the tab (issue #74). They used to be handed back to the built-in Markdown renderer (issue #64), which reads the local mirror and fails with `ENOENT` until `rw_sync`. The preview is now the remote bytes, rendered with the host Markdown component; builds without that component show the source. Local sessions still use the built-in preview. Images render inline in the sidebar remote tree for png/jpg/gif/webp/svg/bmp (issue #66; files over 2MB fall back to the download button).
 
 **One SFTP timeout wedged every SFTP tool on that machine** (issue #65) — fixed (0.8.52+). A single operation hitting the 20s timeout used to poison the whole process for that machine (every later SFTP call paid its own 20s, while `rw_exec` stayed fine) until a disconnect/reconnect. Now a timeout kills the channel so later requests fail fast; the native backend tears the connection down and re-handshakes after two consecutive timeouts, and the openssh backend rebuilds its sftp child — a transient network blip no longer ends with "disconnect and reconnect". As a bonus, `rw_edit` now writes atomically (temp file + rename), so an interrupted write can no longer truncate the remote file to zero bytes, and the original permission bits are preserved.

package/README.md

@@ -308,6 +308,7 @@ scripts/dev-run.sh --status    # 是否在运行
 | `webAttachDshHome` | string | `''` | 远端启动时导出的 `DSH_HOME`；留空则复用远端用户自己的 harness home |
 | `webAttachWaitSeconds` | int | `45` | 等待远端 `dsh web` 打印启动令牌的秒数 |
 | `localTools` | string | `bootstrap` | 本地 session（cwd 不在远程镜像里）暴露哪些 `rw_*` 工具（issue #63）：`bootstrap`=只暴露配置闭环 `rw_machines`/`rw_connect`/`rw_pick_workspace`（其余 19 个在本地 session 必然报 "this session is LOCAL"，暴露只是白占 schema）；`none`=完全不暴露 `rw_*`（远程配置只能走设置页）；`all`=旧的 full 暴露。远程 session（cwd 在镜像里）不受影响，始终全量；非法值按 `bootstrap` 处理 |
+| `remoteTerminalDefault` | bool | `true` | 让 shell 菜单里的「remote ssh」启动器成为终端**默认 shell**（宿主未配置、用户未手动选择时）：远程会话开终端即落到远端工作目录，本地会话自动回落本地 shell（issue #55）；`false` 则只保留菜单项 |
 | `tui` | bool | `true` | TUI 适配层（dsh-tui）总开关；`false` 时不注册 `/dsh-remote` 页面、工作区 provider 与状态行字段 |
 | `tuiProviderListRecent` | bool | `true` | TUI 工作区选择器里是否列出每台机器最近的远程项目 |
 | `tuiProviderRecentLimit` | int | `5` | 每台机器列出的最近远程项目数（1–20） |
@@ -422,11 +423,14 @@ system prompt，提示模型编辑前用 `rw_read_file` 阅读嵌套层的指令
 `jobs` 服务；没有该服务的组合（最小嵌入、测试替身）自动退化为只有前台执行——即 0.8.52 的行为，
 不会因此加载失败。
 
-**远程会话里的终端还是本机的**（issue #55）—— 这是**设计如此，插件改不了**，但有等效方案。
-DSH 的侧栏终端是核心功能：它的 PTY 来自**全局唯一**的 `subprocess` 服务，cwd 取会话自己的
-工作区目录（远程会话就是本地镜像），插件既不能替换那个服务、也不能把核心终端重定向到 SSH。
-想要「真正的远程终端」，用**「远程 DSH 界面」**（见上文）：它在本机浏览器里打开**远端机器自己**的
-DSH，那个界面里的终端就跑在远端主机上，零额外配置。只想偶尔跑一条远程命令则用 `rw_exec`
+**远程会话里的终端还是本机的**（issue #55）—— 已解决（0.8.75+），什么都不用点。
+侧栏终端的 shell 菜单里一直有插件贡献的 **remote ssh**：那是一个按 cwd 智能路由的启动器——
+会话落在远程镜像里就 `ssh` 进远端工作目录，否则自动回落成本地 shell。0.8.75 起它进一步成为
+**默认 shell**：只要宿主没另外配置默认终端、你也没在 shell 菜单里手动选过别的，点「打开终端」
+在远程会话里就直接落进远端（本地会话照旧开本地终端，启动器会替你分流）。两个保险：菜单里手动
+选过其他 shell 的话你的选择永远优先；想回到纯手动就在配置里设 `remoteTerminalDefault: false`
+（remote ssh 仍会留在菜单里）。想要更重度的方案还有**「远程 DSH 界面」**（见上文）：本机浏览器里
+打开**远端机器自己**的 DSH，那里的终端原生跑在远端。只想偶尔跑一条远程命令用 `rw_exec`
 （要交互式 PTY 就加 `pty: true`）。
 
 **主机指纹变了** —— `/remote forget-key`（或设置页 → 机器 → 重新信任）。

package/lib/index.js

@@ -284,6 +284,13 @@ export const Config = z.object({
    *  plaintext is the one outcome you did not ask for.
    *  `plain`: the pre-0.8.54 fallback (write it and warn). */
   credentialFallback: z.string().default('refuse'),
+  /** Make the "remote ssh" launcher the terminal's DEFAULT shell when neither
+   *  the host admin (config.shell) nor the user (remembered menu choice) has
+   *  picked one. The launcher is cwd-aware: a session rooted in a remote mirror
+   *  gets a terminal already sshed into the remote workspace; any other session
+   *  transparently falls back to a local shell. `false` keeps "remote ssh"
+   *  menu-only. */
+  remoteTerminalDefault: z.boolean().default(true),
   /** TUI integration layer (docs/tui.md): register the `/dsh-remote` scene,
    *  the workspace provider and the `/dsh-remote` slash command when a
    *  dsh-tui profile is present. `false` disables the whole layer — on a Web or
@@ -4802,7 +4809,10 @@ export async function apply(ctx, config) {
   // service off it (as if it were the controller) is a silent no-op, because a
   // context has no `config.shellCandidates`.
   ctx.inject(['terminalController'], (inner) => {
-    installTerminalShell(ctx, inner.get('terminalController'), remoteShellSpec())
+    installTerminalShell(ctx, inner.get('terminalController'), {
+      ...remoteShellSpec(),
+      claimDefault: config.remoteTerminalDefault !== false,
+    })
   })
 
   // ── auto-update: check on load + on an interval; apply silently ───────────

package/lib/remote-shell.js

@@ -401,6 +401,35 @@ function envValue(env, name) {
   return match === undefined ? undefined : env[match]
 }
 
+/**
+ * Claim the terminal's default shell slot when nobody else holds it.
+ *
+ * `config.shell` is what `discoverShells` puts FIRST and what a terminal spawn
+ * without an explicit shellPath resolves to — i.e. where a bare "open
+ * terminal" click lands. Pointing it at our launcher makes the default
+ * terminal SMART: the child script ssh'es into the remote workspace when the
+ * session cwd is a mirror and falls back to a local shell when it is not.
+ * A user-configured shell (config.shell already set) is never touched, and an
+ * explicit pick from the shell menu still wins (the client's remembered
+ * preference beats the first list entry).
+ *
+ * @param {object} controller - the terminalController service
+ * @param {string} launcherPath - absolute launcher path
+ * @returns {(() => void) | undefined} undo that only fires while the claim is still ours
+ */
+function claimDefaultShell(controller, launcherPath) {
+  const config = controller && controller.config
+  if (!config || typeof config !== 'object') return undefined
+  if (config.shell !== undefined) return undefined
+  const ours = { path: launcherPath, name: SHELL_OPTION_NAME, args: [] }
+  config.shell = ours
+  return () => {
+    // Someone else (host settings, another plugin) took the slot since:
+    // restoring `undefined` would clobber THEIR choice.
+    if (config.shell === ours) config.shell = undefined
+  }
+}
+
 /**
  * Write the launcher and put it in the terminal's shell menu.
  *
@@ -414,7 +443,9 @@ function envValue(env, name) {
  * @param {object} controller - the resolved `terminalController` *service*
  * @param {{ dir: string, childPath: string, machinesFile: string, platform?: string,
  *           nodePath?: string, electronPath?: string, electron?: boolean, logger?: object,
- *           env?: object, fs?: { existsSync: (p: string) => boolean } }} spec
+ *           env?: object, fs?: { existsSync: (p: string) => boolean },
+ *           claimDefault?: boolean }} spec - `claimDefault: false` keeps the
+ *           launcher menu-only (never touches `config.shell`)
  * @returns {boolean} whether the option is (or already was) in the menu
  */
 export function installTerminalShell(ctx, controller, spec = {}) {
@@ -494,6 +525,11 @@ export function installTerminalShell(ctx, controller, spec = {}) {
     // pairs cannot strand a live registration without PATH.
     let restorePath
     let candidate = launcher.path
+    // The default-shell claim uses the ABSOLUTE launcher path, never the bare
+    // menu name: it must keep resolving even while the PATH entry is gone.
+    const releaseDefault = spec.claimDefault === false
+      ? undefined
+      : claimDefaultShell(controller, launcher.path)
     if (needsPath) {
       try {
         restorePath = appendPathEntry(path.dirname(launcher.path), env)
@@ -524,10 +560,12 @@ export function installTerminalShell(ctx, controller, spec = {}) {
       return () => {
         if (undo) undo()
         if (restorePath) restorePath()
+        if (releaseDefault) releaseDefault()
       }
     } catch (err) {
       // The host advertises a shell list but will not take a write.
       if (restorePath) restorePath()
+      if (releaseDefault) releaseDefault()
       warn(`the terminal shell list rejected the remote shell (${reason(err)}); the remote ssh option is unavailable`)
       return undefined
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote",
-  "version": "0.8.74",
+  "version": "0.8.75",
   "description": "Remote-work assistant for DeepSeek Harness: connect SSH (password/key/agent/keyboard-interactive, multi-hop ProxyJump), list hosts from ~/.ssh/config, pick a remote workspace, operate on it with 21 rw_* tools, conflict-aware mirror sync, an embedded PTY terminal, remote DSH web UI attach, port forwarding, host grouping, remote sandbox fencing, audit log, keychain passwords.",
   "license": "MIT",
   "author": "flymysql <flyphp@outlook.com>",