dsh-ssh-manage 0.3.6 → 0.3.7

package/README.en.md

@@ -22,7 +22,7 @@
 
 `dsh-ssh-manage` is a Web plugin for [DeepSeek Harness (DSH)](https://github.com/deepseek-ai/deepseek-harness). It turns the hosts in `~/.ssh/config` into manageable objects in the DSH sidebar:
 
-- **Host management** — scan the config, groups, tags, favorites, notes, latency and host inspection;
+- **Host management** — scan the config, groups, tags, favorites, notes, latency and host inspection; SSH aliases are globally unique, so use the repeatable Display name for same names across groups;
 - **Interactive terminal** — ssh2 allocates a PTY, xterm.js renders it, with colors, arrow keys, full-screen programs such as `vim`/`top`, and window resizing;
 - **Backup and migration** — export/import hosts, groups, tags, notes, favorites and passwords from Settings; exports are re-encrypted with a passphrase (scrypt + AES-256-GCM) and imports merge by alias;
 - **Day-to-day operations** — batch commands, SFTP browse/mkdir/rename/delete/upload/download, connection tests;
@@ -97,16 +97,16 @@ Creating a host requires alias, hostname and password. The password is not writt
 
 ### From npm (recommended)
 
-npm package: [`dsh-ssh-manage`](https://www.npmjs.com/package/dsh-ssh-manage) (current version `0.3.6`).
+npm package: [`dsh-ssh-manage`](https://www.npmjs.com/package/dsh-ssh-manage) (current version `0.3.7`).
 
 ```text
-plugin_manager action=install_bundle target=dsh-ssh-manage@0.3.6
+plugin_manager action=install_bundle target=dsh-ssh-manage@0.3.7
 ```
 
 Or with the DSH CLI:
 
 ```bash
-dsh plugin add dsh-ssh-manage@0.3.6
+dsh plugin add dsh-ssh-manage@0.3.7
 ```
 
 After installation, refresh the Web page; the sidebar shows an "SSH Hosts" entry with id `dsh-ssh-manage`.

package/README.md

@@ -22,7 +22,7 @@
 
 `dsh-ssh-manage` 是 [DeepSeek Harness (DSH)](https://github.com/deepseek-ai/deepseek-harness) 的 Web 插件。它把 `~/.ssh/config` 里的主机变成 DSH 侧边栏里可管理、可连接、可运维的对象：
 
-- **主机管理**：扫描配置、分组、标签、收藏、备注、连接延迟、主机巡检；
+- **主机管理**：扫描配置、分组、标签、收藏、备注、连接延迟、主机巡检；SSH 别名全局唯一，不同分组如需同名请使用可重复的“显示名称”；
 - **交互式终端**：ssh2 分配 PTY，xterm.js 渲染，支持彩色输出、方向键、`vim`/`top` 等全屏程序和窗口自适应；
 - **备份迁移**：设置页可导出/导入主机、分组、标签、备注、收藏和密码；导出文件用自定义口令二次加密（scrypt + AES-256-GCM），导入按别名合并；
 - **日常运维**：批量命令、SFTP 目录浏览 / 新建 / 重命名 / 删除 / 上传 / 下载、测试连接；
@@ -99,16 +99,16 @@
 
 ### 从 npm 安装（推荐）
 
-npm 包：[`dsh-ssh-manage`](https://www.npmjs.com/package/dsh-ssh-manage)（当前版本 `0.3.6`）。
+npm 包：[`dsh-ssh-manage`](https://www.npmjs.com/package/dsh-ssh-manage)（当前版本 `0.3.7`）。
 
 ```text
-plugin_manager action=install_bundle target=dsh-ssh-manage@0.3.6
+plugin_manager action=install_bundle target=dsh-ssh-manage@0.3.7
 ```
 
 或使用 DSH CLI：
 
 ```bash
-dsh plugin add dsh-ssh-manage@0.3.6
+dsh plugin add dsh-ssh-manage@0.3.7
 ```
 
 安装后刷新 Web 页面，左侧栏会出现「SSH 主机」入口，入口 id 为 `dsh-ssh-manage`。

package/client.js

@@ -126,7 +126,7 @@ window.__ModuleLoader__.load({
       'editor.editTitle': ['编辑 SSH 主机', 'Edit SSH host'],
       'editor.alias': ['别名', 'Alias'],
       'editor.aliasPlaceholder': ['prod', 'prod'],
-      'editor.aliasHint': ['~/.ssh/config 中的 Host 名称，作为主机的唯一标识。', 'Host name in ~/.ssh/config; the unique identifier.'],
+      'editor.aliasHint': ['~/.ssh/config 中的 Host 别名，必须全局唯一；不同分组要显示同名，请使用“显示名称”。', 'The Host alias in ~/.ssh/config must be globally unique. To show the same name in different groups, use Display name.'],
       'editor.hostname': ['服务器地址', 'Hostname'],
       'editor.hostnamePlaceholder': ['203.0.113.10 或 example.com', '203.0.113.10 or example.com'],
       'editor.user': ['用户', 'User'],
@@ -141,6 +141,9 @@ window.__ModuleLoader__.load({
       'editor.tagsPlaceholder': ['web, critical（逗号分隔）', 'web, critical (comma separated)'],
       'editor.label': ['显示名称', 'Display name'],
       'editor.labelPlaceholder': ['例如 生产 API', 'e.g. Production API'],
+      'editor.labelHint': ['显示名称可以重复，列表和终端标签优先显示它；SSH 别名仍需唯一。', 'Display names may repeat; lists and terminal tabs prefer it. The SSH alias must still be unique.'],
+      'editor.aliasExists': ['SSH 别名“{alias}”已被主机“{host}”使用（分组：{group}）。SSH 要求别名全局唯一；如果只是想在另一个分组显示同名，请改用建议别名，并把“显示名称”设为 {alias}。', 'SSH alias "{alias}" is already used by "{host}" (group: {group}). SSH aliases must be globally unique. To show the same name in another group, use the suggested alias and set Display name to {alias}.'],
+      'editor.useSuggestedAlias': ['使用建议别名 {alias}', 'Use suggested alias {alias}'],
       'editor.note': ['备注', 'Notes'],
       'editor.notePlaceholder': ['给这台主机的说明，会显示在列表里', 'A short note shown in the list'],
       'editor.passwordSection': ['服务器密码', 'Server password'],
@@ -4729,6 +4732,7 @@ window.__ModuleLoader__.load({
       const [password, setPassword] = React.useState('')
       const [passwordError, setPasswordError] = React.useState('')
       const [formError, setFormError] = React.useState('')
+      const [aliasSuggestion, setAliasSuggestion] = React.useState('')
       const [groupMenuOpen, setGroupMenuOpen] = React.useState(false)
       const groupMenuRef = React.useRef(null)
       const groupOptions = (model.allGroups ?? []).filter((group) => group.key !== '').map((group) => group.key)
@@ -4798,6 +4802,28 @@ window.__ModuleLoader__.load({
           setFormError('')
           return
         }
+        const collision = hosts.find((host) =>
+          host.host !== state.original
+          && (host.host === alias || (Array.isArray(host.aliases) && host.aliases.includes(alias))),
+        )
+        if (collision) {
+          const groupPart = draft.group.trim().replace(/[^A-Za-z0-9_.@-]+/g, '-').replace(/^-+|-+$/g, '').slice(0, 20)
+          let suggested = groupPart ? `${alias}-${groupPart}` : `${alias}-2`
+          let counter = 2
+          while (hosts.some((host) => host.host === suggested || (Array.isArray(host.aliases) && host.aliases.includes(suggested)))) {
+            suggested = `${alias}-${counter}`
+            counter += 1
+          }
+          suggested = suggested.slice(0, 64)
+          setAliasSuggestion(suggested)
+          setFormError(t('editor.aliasExists', {
+            alias,
+            host: hostName(collision),
+            group: collision.group || t('tree.ungrouped'),
+          }))
+          return
+        }
+        setAliasSuggestion('')
         setPasswordError('')
         setFormError('')
         const saved = await saveEditor({
@@ -4860,13 +4886,36 @@ window.__ModuleLoader__.load({
         h(
           'div',
           { className: 'ssh-formSection' },
-          formError ? h('div', { className: 'ssh-formError' }, h(IconAlert, { size: 13 }), h('span', null, formError)) : null,
+          formError
+            ? h(
+                'div',
+                { className: 'ssh-formError' },
+                h(IconAlert, { size: 13 }),
+                h('span', null, formError),
+                aliasSuggestion
+                  ? h(
+                      Button,
+                      {
+                        size: 'sm',
+                        variant: 'ghost',
+                        onClick: () => {
+                          if (!draft.label.trim()) update('label', alias)
+                          update('host', aliasSuggestion)
+                          setAliasSuggestion('')
+                          setFormError('')
+                        },
+                      },
+                      t('editor.useSuggestedAlias', { alias: aliasSuggestion }),
+                    )
+                  : null,
+              )
+            : null,
           h(
             'div',
             { className: 'ssh-formGrid' },
             h(
               Field,
-              { label: t('editor.alias') },
+              { label: t('editor.alias'), hint: t('editor.aliasHint') },
               h(TextInput, {
                 value: draft.host,
                 onChange: (value) => update('host', value),
@@ -4964,7 +5013,7 @@ window.__ModuleLoader__.load({
             ),
             h(
               Field,
-              { label: t('editor.label') },
+              { label: t('editor.label'), hint: t('editor.labelHint') },
               h(TextInput, {
                 value: draft.label,
                 onChange: (value) => update('label', value),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ssh-manage",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "A DSH sidebar plugin for managing SSH host profiles with a real interactive PTY terminal.",
   "license": "MIT",
   "private": false,