dsh-ssh-manage 0.3.6 → 0.3.8

package/README.en.md

@@ -22,7 +22,8 @@
 
 `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;
+- **DSH Agent integration** — the host catalog is injected into the DSH system prompt so the Agent can use `ssh_manager` directly for exec, batch commands, inspection and SFTP on recorded servers;
 - **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 +98,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.8`).
 
 ```text
-plugin_manager action=install_bundle target=dsh-ssh-manage@0.3.6
+plugin_manager action=install_bundle target=dsh-ssh-manage@0.3.8
 ```
 
 Or with the DSH CLI:
 
 ```bash
-dsh plugin add dsh-ssh-manage@0.3.6
+dsh plugin add dsh-ssh-manage@0.3.8
 ```
 
 After installation, refresh the Web page; the sidebar shows an "SSH Hosts" entry with id `dsh-ssh-manage`.

package/README.md

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

@@ -78,6 +78,54 @@ function errorMessage(error) {
   return error instanceof Error ? error.message : String(error)
 }
 
+let sshHostCatalogText = ''
+let sshHostCatalogRefresh = null
+
+function sshCatalogLine(host, metadata, passwordSet) {
+  const user = host.user ? `${host.user}@` : ''
+  const address = `${host.hostname || host.host}${host.port ? `:${host.port}` : ''}`
+  const group = String(metadata?.group || '').replace(/[\r\n]+/g, ' ').trim() || 'ungrouped'
+  const label = String(metadata?.label || '').replace(/[\r\n]+/g, ' ').trim()
+  const tags = Array.isArray(metadata?.tags) ? metadata.tags.map((tag) => String(tag).replace(/[\r\n]+/g, ' ')).filter(Boolean) : []
+  const parts = [
+    `alias=${host.host}`,
+    `target=${user}${address}`,
+    `group=${group}`,
+  ]
+  if (label && label !== host.host) parts.push(`display=${label}`)
+  if (tags.length) parts.push(`tags=${tags.slice(0, 4).join(',')}`)
+  parts.push(`password=${passwordSet.has(host.host) ? 'stored' : 'missing'}`)
+  return `- ${parts.join(' | ')}`
+}
+
+/** Refresh the host catalog injected into the DSH system prompt. */
+export async function refreshSshHostCatalog(paths) {
+  if (sshHostCatalogRefresh) return sshHostCatalogRefresh
+  sshHostCatalogRefresh = (async () => {
+    try {
+      const [{ hosts }, metadata, passwords] = await Promise.all([
+        listSshHosts(paths),
+        loadMetadata(paths).catch(() => ({ entries: {} })),
+        listPasswordAliases(paths).catch(() => []),
+      ])
+      const passwordSet = new Set(passwords)
+      const lines = hosts.slice(0, 40).map((host) => sshCatalogLine(host, metadata.entries[host.host], passwordSet))
+      if (hosts.length > 40) lines.push(`- ... ${hosts.length - 40} more hosts; call list_hosts for the full list`)
+      sshHostCatalogText = [
+        'SSH hosts managed by the dsh-ssh-manage plugin. When the user asks to inspect, run commands on, upload to or download from one of these servers, call the ssh_manager tool directly with the exact alias.',
+        'Use action=exec with {host, command} for one command, batch_exec with {hosts, command} for several, and sftp_* actions for files. Use test_connection or inspect_host for status and system facts. list_hosts returns the full catalog.',
+        'Passwords are never returned by the plugin; never ask the user to paste a password into the conversation.',
+        lines.length ? lines.join('\n') : '- No SSH hosts are configured yet; the user can add them in the dsh-ssh-manage sidebar panel.',
+      ].join('\n').slice(0, 6000)
+    } catch {
+      sshHostCatalogText = 'SSH host catalog is temporarily unavailable; call ssh_manager action=list_hosts to read it.'
+    } finally {
+      sshHostCatalogRefresh = null
+    }
+  })()
+  return sshHostCatalogRefresh
+}
+
 async function state(paths) {
   const [current, metadataResult, passwordsResult] = await Promise.all([
     listSshHosts(paths),
@@ -93,6 +141,7 @@ async function state(paths) {
   else passwords = passwordsResult.value
   const passwordSet = new Set(passwords)
   const stateDir = storagePaths(paths).stateDir
+  void refreshSshHostCatalog(paths)
   return {
     ...current,
     stateDir,
@@ -253,7 +302,7 @@ export async function runAction(paths, action, params = {}) {
 function managerTool(paths) {
   return {
     name: 'ssh_manager',
-    description: 'Manage SSH hosts, encrypted local passwords, remote commands and SFTP operations. Passwords are never returned.',
+    description: 'Manage SSH hosts, encrypted local passwords, remote commands and SFTP operations. Hosts entered in the dsh-ssh-manage panel are listed in the system prompt; when the user asks to operate on a server, call this tool directly with its alias. Use action=exec for one command, batch_exec for several hosts, sftp_* for files. Passwords are never returned.',
     parameters: {
       type: 'object',
       additionalProperties: false,
@@ -262,7 +311,7 @@ function managerTool(paths) {
         action: { type: 'string', enum: ACTIONS, description: 'The operation to run.' },
         host: {
           oneOf: [{ type: 'string' }, { type: 'object' }],
-          description: 'Host alias as a string for every action except save_host, which takes a host object: { host, hostname, user, port, identityFile, proxyJump, forwardAgent }.',
+          description: 'Host alias as a string (see the SSH host catalog in the system prompt) for every action except save_host, which takes a host object: { host, hostname, user, port, identityFile, proxyJump, forwardAgent }.',
         },
         originalHost: { type: 'string', description: 'Existing alias when renaming a host.' },
         password: { type: 'string', description: 'Password to save for a host. It is write-only.' },
@@ -830,7 +879,7 @@ function registerAssetRoutes(ctx) {
   }
 }
 
-export const __test = { resolveSshPaths, listSshHosts, saveSshHost, deleteSshHost, runAction, managerTool, MAX_BODY_BYTES, PTY_ROUTE, PTY_EVENTS_ROUTE, PTY_OPEN_ROUTE, PTY_ATTACH_ROUTE, PTY_INPUT_ROUTE, PTY_RESIZE_ROUTE, PTY_CLOSE_ROUTE, PTY_CLEAR_ROUTE, PTY_TOUCH_ROUTE, PTY_IDLE_MS, sweepIdlePtySessions, MAX_PTY_SESSIONS, PTY_BUFFER_BYTES, ASSETS, handlePtyUpgrade, ptyTextSessions }
+export const __test = { resolveSshPaths, listSshHosts, saveSshHost, deleteSshHost, runAction, managerTool, refreshSshHostCatalog, getSshHostCatalog: () => sshHostCatalogText, MAX_BODY_BYTES, PTY_ROUTE, PTY_EVENTS_ROUTE, PTY_OPEN_ROUTE, PTY_ATTACH_ROUTE, PTY_INPUT_ROUTE, PTY_RESIZE_ROUTE, PTY_CLOSE_ROUTE, PTY_CLEAR_ROUTE, PTY_TOUCH_ROUTE, PTY_IDLE_MS, sweepIdlePtySessions, MAX_PTY_SESSIONS, PTY_BUFFER_BYTES, ASSETS, handlePtyUpgrade, ptyTextSessions }
 
 export const inject = ['webServer']
 
@@ -839,7 +888,12 @@ export function apply(ctx) {
     throw new Error('dsh-ssh-manage requires DeepSeek Harness >=0.2.1-rc.3: ctx.webServer.register is unavailable.')
   }
   const paths = resolveSshPaths(process.env)
+  void refreshSshHostCatalog(paths)
   const runtime = createPtyRuntime()
+  const catalogTimer = setInterval(() => {
+    if (runtime.active) void refreshSshHostCatalog(paths)
+  }, 30_000)
+  catalogTimer.unref?.()
   const runtimeIdleTimer = setInterval(() => {
     if (!runtime.active) return
     // Browser heartbeats (/pty/touch) keep attached sessions alive, so a session
@@ -934,6 +988,7 @@ export function apply(ctx) {
       }
       runtime.upgrades.clear()
       clearInterval(runtimeIdleTimer)
+      clearInterval(catalogTimer)
       for (const session of ptySessions) {
         try { session.close() } catch {}
       }
@@ -950,4 +1005,15 @@ export function apply(ctx) {
   ctx.inject(['tools'], (child) => {
     child.effect(() => child.tools.register(managerTool(paths)), 'dsh-ssh-manage: agent tool')
   })
+  ctx.inject(['systemPrompt'], (child) => {
+    if (!child.systemPrompt || typeof child.systemPrompt.context !== 'function') return
+    child.effect(
+      () => child.systemPrompt.context({
+        name: 'dsh-ssh-manage-hosts',
+        order: 60,
+        text: () => sshHostCatalogText,
+      }),
+      'dsh-ssh-manage: host catalog prompt context',
+    )
+  })
 }

package/package.json

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