dsh-ssh-workbench 1.6.4 → 1.7.0

package/lib/client.js

@@ -23,6 +23,10 @@ window.__ModuleLoader__.load({
     // don't expose the primitives table.
     let primitives = null
     try { primitives = require('@deepseek-ai/dsh-client-ui-primitives') } catch { primitives = null }
+    // Portal the dock panel to document.body so the composer's stacking context
+    // cannot clip or cover it. Optional: fall back to inline when unavailable.
+    let ReactDOM = null
+    try { ReactDOM = require('react-dom') } catch { ReactDOM = null }
 
     // The merged SSH guide card remembers which page (server manager or remote
     // files) its main button should open; the chevron always offers both.
@@ -247,7 +251,6 @@ window.__ModuleLoader__.load({
       'overview.kind.server-update': '更新资源',
       'overview.kind.server-remove': '删除资源',
       'common.loading': '加载中…',
-      'tool.target': '切换远程目标',
       'tool.running': '执行中…',
       'tool.noOutput': '（无输出）',
       'tool.input': '参数',
@@ -265,8 +268,15 @@ window.__ModuleLoader__.load({
       'files.chunkIncomplete': '文件分块读取不完整',
       'settings.tabServers': '纳管资源',
       'settings.tabActivity': '操作日志',
-      'target.chip': '目标',
-      'target.chipTitle': '当前远程目标：{name}（命令在该资源上执行；点击打开远程工作台面板）',
+      'target.popTitle': '远程执行',
+      'target.popCount': '{n} 次',
+      'target.rowCount': '{n} 次',
+      'target.execChip': '远程执行 · {n} 次',
+      'target.execTitle': '本会话远程执行次数',
+      'target.runningOne': '{name} · 执行中',
+      'target.runningMany': '{n} 个目标 · 执行中',
+      'target.runningValue': '{n} 个目标执行中',
+      'target.runningLabel': '执行中',
       'common.close': '关闭',
     }
 
@@ -465,7 +475,6 @@ window.__ModuleLoader__.load({
       'overview.kind.server-update': 'Resource updated',
       'overview.kind.server-remove': 'Resource removed',
       'common.loading': 'Loading…',
-      'tool.target': 'Switch remote target',
       'tool.running': 'Running…',
       'tool.noOutput': '(no output)',
       'tool.input': 'Input',
@@ -483,8 +492,15 @@ window.__ModuleLoader__.load({
       'files.chunkIncomplete': 'File chunk read was incomplete',
       'settings.tabServers': 'Managed resources',
       'settings.tabActivity': 'Activity log',
-      'target.chip': 'Target',
-      'target.chipTitle': 'Current remote target: {name} (commands run there; click to open SSH Workbench)',
+      'target.popTitle': 'Remote executions',
+      'target.popCount': '{n} runs',
+      'target.rowCount': '{n} runs',
+      'target.execChip': 'Remote · {n} runs',
+      'target.execTitle': 'Remote executions in this session',
+      'target.runningOne': '{name} · running',
+      'target.runningMany': '{n} targets · running',
+      'target.runningValue': '{n} targets running',
+      'target.runningLabel': 'running',
       'common.close': 'Close',
       'files.transferUploading': 'Uploading {name}',
       'files.transferDownloading': 'Downloading {name}',
@@ -590,13 +606,19 @@ window.__ModuleLoader__.load({
     }
 
     /**
-     * Current remote target in the composer dock (the small parameter row below
-     * the composer). Styled like the shipped usage counters instead of a chip
-     * button, so it visually belongs to that row.
+     * Composer dock for the Session's remote resources. The popover deliberately
+     * mirrors the shipped usage counter: one header value, a hairline divider,
+     * and a label/value grid. It is read-only: targets are shown with their
+     * plugin-local execution count for this Session.
      */
     function TargetDock(props) {
       const sessionId = props && props.sessionId
-      const [target, setTarget] = useState(null)
+      const [stats, setStats] = useState(null)
+      const [running, setRunning] = useState(null)
+      const [open, setOpen] = useState(false)
+      const [rect, setRect] = useState(null)
+      const rootRef = useRef(null)
+      const panelRef = useRef(null)
       useEffect(() => {
         ensurePanelStyle()
       }, [])
@@ -606,56 +628,147 @@ window.__ModuleLoader__.load({
         const load = async () => {
           try {
             const body = await api('/target?session=' + encodeURIComponent(sessionId))
-            if (alive) setTarget(body && body.target ? String(body.target) : null)
+            if (!alive) return
+            setStats(body && body.stats && typeof body.stats === 'object' ? body.stats : null)
+            setRunning(body && body.running && typeof body.running === 'object' ? body.running : null)
           } catch {
-            if (alive) setTarget(null)
+            if (!alive) return
+            setStats(null)
+            setRunning(null)
           }
         }
         void load()
-        const timer = setInterval(load, 4000)
+        // The dock is a read-only projection of the execution ledger. Tool
+        // events already trigger a refresh on the next turn; this low-frequency
+        // fallback keeps a long turn from showing stale counts.
+        const timer = setInterval(load, 1500)
         return () => {
           alive = false
           clearInterval(timer)
         }
       }, [sessionId])
-      if (!target) return null
-      const label = (() => {
-        try {
-          return String(translate('target.chip'))
-        } catch {
-          return 'Target'
+      useEffect(() => {
+        if (!open || typeof document === 'undefined') return undefined
+        const onPointerDown = (event) => {
+          const node = event.target
+          if (node && typeof node.closest === 'function' && node.closest('[data-sdh-target-dock]')) return
+          if (rootRef.current && node && rootRef.current.contains(node)) return
+          if (panelRef.current && node && panelRef.current.contains(node)) return
+          setOpen(false)
         }
-      })()
-      const title = (() => {
+        const onKeyDown = (event) => {
+          if (event.key === 'Escape') {
+            event.stopPropagation()
+            setOpen(false)
+          }
+        }
+        document.addEventListener('mousedown', onPointerDown, true)
+        document.addEventListener('keydown', onKeyDown, true)
+        return () => {
+          document.removeEventListener('mousedown', onPointerDown, true)
+          document.removeEventListener('keydown', onKeyDown, true)
+        }
+      }, [open])
+
+      const tr = (key, fallback) => {
         try {
-          return String(translate('target.chipTitle')).replace('{name}', target)
+          const value = String(translate(key))
+          return value === key ? fallback : value
         } catch {
-          return target
+          return fallback
         }
-      })()
-      return h('span', { className: 'dsh-ssh-workbench-target-anchor' },
-        h('button', {
-          type: 'button',
-          className: 'dsh-ssh-workbench-target-pill',
-          title,
-          'aria-label': title,
-          onClick: () => {
-            try {
-              const layout = clientCtx && clientCtx.get('layout')
-              if (layout && typeof layout.openRightbar === 'function') layout.openRightbar(true, false)
-            } catch {
-              // opening the panel is a convenience, not required
-            }
-          },
-        },
-          h('svg', {
-            viewBox: '0 0 24 24', fill: 'none', stroke: 'currentColor',
-            strokeWidth: 1.7, strokeLinecap: 'round', strokeLinejoin: 'round', 'aria-hidden': true,
+      }
+      const statsServers = stats && Array.isArray(stats.servers) ? stats.servers : []
+      const rows = statsServers.filter((bucket) => bucket && Number.isFinite(bucket.count) && bucket.count > 0)
+      const total = stats && Number.isFinite(stats.count) ? stats.count : 0
+      const runningServers = running && Array.isArray(running.servers) ? running.servers.filter((entry) => entry && entry.name) : []
+      const runningNames = [...new Set(runningServers.map((entry) => entry.name))]
+      // A session with no remote execution has no dock. While a call is in
+      // flight we still render: the live target is the point of the indicator.
+      if (rows.length === 0 && total === 0 && runningNames.length === 0) return null
+      const togglePanel = (event) => {
+        if (open) {
+          setOpen(false)
+          return
+        }
+        const bounds = event.currentTarget.getBoundingClientRect()
+        const viewportWidth = typeof window !== 'undefined' && Number.isFinite(window.innerWidth) ? window.innerWidth : 320
+        const viewportHeight = typeof window !== 'undefined' && Number.isFinite(window.innerHeight) ? window.innerHeight : 600
+        const right = Math.max(8, viewportWidth - bounds.right)
+        const bottom = Math.max(8, viewportHeight - bounds.top + 6)
+        setRect({ right, bottom })
+        setOpen(true)
+      }
+      const runningOne = runningNames.length === 1
+      const label = runningOne
+        ? tr('target.runningOne', '{name} · running').replace('{name}', runningNames[0])
+        : runningNames.length > 1
+          ? tr('target.runningMany', '{n} targets · running').replace('{n}', String(runningNames.length))
+          : tr('target.execChip', 'Remote · {n}').replace('{n}', String(total))
+      const title = runningNames.length > 0
+        ? runningOne
+          ? tr('target.runningOne', '{name} · running').replace('{name}', runningNames[0])
+          : tr('target.runningMany', '{n} targets · running').replace('{n}', String(runningNames.length))
+        : tr('target.execTitle', 'Remote executions in this session')
+      const icon = h('svg', {
+        viewBox: '0 0 24 24', fill: 'none', stroke: 'currentColor',
+        strokeWidth: 1.7, strokeLinecap: 'round', strokeLinejoin: 'round', 'aria-hidden': true,
+      },
+        h('rect', { x: 3, y: 4, width: 18, height: 7, rx: 1.5 }),
+        h('rect', { x: 3, y: 13, width: 18, height: 7, rx: 1.5 }),
+        h('path', { d: 'M6.5 7.5h.01M6.5 16.5h.01M10 7.5h7M10 16.5h7' }))
+      const button = h('button', {
+        type: 'button',
+        className: 'dsh-ssh-workbench-target-pill',
+        title,
+        'aria-label': title,
+        'aria-haspopup': 'dialog',
+        'aria-expanded': open ? 'true' : 'false',
+        onClick: togglePanel,
+      },
+        icon,
+        h('span', { className: 'dsh-ssh-workbench-target-label' }, label))
+
+      const rowByName = new Map(rows.map((bucket) => [bucket.name, bucket]))
+      const detailNames = [
+        ...runningNames,
+        ...rows.map((bucket) => bucket.name).filter((name) => !runningNames.includes(name)),
+      ]
+      const details = []
+      for (const name of detailNames) {
+        const bucket = rowByName.get(name)
+        const active = runningNames.includes(name)
+        const parts = []
+        if (active) parts.push(tr('target.runningLabel', 'running'))
+        if (bucket) parts.push(tr('target.rowCount', '{n} runs').replace('{n}', String(bucket.count)))
+        details.push(h('dt', { key: name + ':label' }, name))
+        details.push(h('dd', {
+          key: name + ':value',
+          ...(active ? { className: 'dsh-ssh-workbench-target-row-running' } : {}),
+        }, parts.join(' · ')))
+      }
+
+      const panel = open && rect
+        ? h('div', {
+            ref: panelRef,
+            className: 'dsh-ssh-workbench-target-popover',
+            role: 'dialog',
+            'aria-label': tr('target.popTitle', 'Remote executions'),
+            'data-sdh-target-dock': '',
+            style: { right: rect.right + 'px', bottom: rect.bottom + 'px' },
           },
-            h('rect', { x: 3, y: 4, width: 18, height: 7, rx: 1.5 }),
-            h('rect', { x: 3, y: 13, width: 18, height: 7, rx: 1.5 }),
-            h('path', { d: 'M6.5 7.5h.01M6.5 16.5h.01M10 7.5h7M10 16.5h7' })),
-          h('span', { className: 'dsh-ssh-workbench-target-label' }, label + ' ' + target)))
+            h('div', { className: 'dsh-ssh-workbench-target-title' },
+              h('span', { className: 'dsh-ssh-workbench-target-title-label' }, icon, tr('target.popTitle', 'Remote executions')),
+              h('span', { className: 'dsh-ssh-workbench-target-title-value' }, runningNames.length > 0
+                ? tr('target.runningValue', '{n} targets running').replace('{n}', String(runningNames.length))
+                : tr('target.popCount', '{n} runs').replace('{n}', String(total)))),
+            h('div', { className: 'dsh-ssh-workbench-target-rule', 'aria-hidden': true }),
+            h('dl', { className: 'dsh-ssh-workbench-target-details' }, ...details))
+        : null
+      const mountedPanel = panel && ReactDOM && typeof document !== 'undefined'
+        ? ReactDOM.createPortal(panel, document.body)
+        : panel
+      return h('span', { ref: rootRef, className: 'dsh-ssh-workbench-target-anchor', 'data-sdh-target-dock': '' }, button, mountedPanel)
     }
 
     /**
@@ -867,7 +980,18 @@ window.__ModuleLoader__.load({
         '@media (hover:hover){.dsh-ssh-workbench-target-pill:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-secondary)}}',
         '.dsh-ssh-workbench-target-pill:focus-visible{outline:var(--dsw-focus-ring-width) solid var(--dsw-focus-ring-color,var(--dsw-alias-state-business-primary));outline-offset:-1px}',
         '.dsh-ssh-workbench-target-label{min-width:0;overflow:hidden;text-overflow:ellipsis}',
-        '.dsh-ssh-workbench-input{box-sizing:border-box;border:.5px solid var(--dsw-alias-border-l4);border-radius:var(--dsw-radius-md);background:var(--dsw-alias-bg-layer-3);color:var(--dsw-alias-label-primary);font:inherit;font-size:13px;line-height:20px;padding:0 12px;min-width:0}',
+        '.dsh-ssh-workbench-target-popover{position:fixed;z-index:1100;box-sizing:border-box;width:max-content;min-width:min(300px,calc(100vw - 24px),var(--dsh-anchored-max-width,100vw));max-width:min(440px,calc(100vw - 24px),var(--dsh-anchored-max-width,100vw));max-height:var(--dsh-anchored-max-height,70vh);overflow:hidden auto;padding:16px;border:0;border-radius:var(--dsw-radius-lg);background:var(--dsw-specific-menu,var(--dsw-menu-surface-fill));backdrop-filter:var(--dsw-menu-backdrop-filter);--dsw-elevation-stroke-color:var(--dsw-alias-border-l1);box-shadow:var(--dsw-elevation-prominent);color:var(--dsw-alias-label-secondary);cursor:default;font-size:12px;line-height:18px;--dsh-scrollbar-thumb:var(--dsw-alias-scrollbar-bg-l2);--dsh-scrollbar-thumb-hover:var(--dsw-alias-scrollbar-hover-l2)}',
+        '.dsh-ssh-workbench-target-title{display:flex;justify-content:space-between;gap:16px;margin-bottom:8px;color:var(--dsw-alias-label-primary);font-weight:500}',
+        '.dsh-ssh-workbench-target-title-label{display:inline-flex;align-items:center;gap:6px;min-width:0}',
+        '.dsh-ssh-workbench-target-title-label svg{flex:none;width:14px;height:14px}',
+        '.dsh-ssh-workbench-target-title-value{font-variant-numeric:tabular-nums}',
+        '.dsh-ssh-workbench-target-rule{border-top:.5px solid var(--dsw-alias-border-l2);margin-bottom:10px}',
+        '.dsh-ssh-workbench-target-details{display:grid;grid-template-columns:minmax(76px,auto) minmax(0,1fr);gap:6px 16px;margin:0;color:var(--dsw-alias-label-tertiary)}',
+        '.dsh-ssh-workbench-target-details dt,.dsh-ssh-workbench-target-details dd{min-width:0;margin:0}',
+        '.dsh-ssh-workbench-target-details dt{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}',
+        '.dsh-ssh-workbench-target-details dd{color:var(--dsw-alias-label-secondary);font-variant-numeric:tabular-nums;text-align:right}',
+        '.dsh-ssh-workbench-target-details dd.dsh-ssh-workbench-target-row-running{color:var(--dsw-alias-label-primary);font-weight:500}',
+                '.dsh-ssh-workbench-input{box-sizing:border-box;border:.5px solid var(--dsw-alias-border-l4);border-radius:var(--dsw-radius-md);background:var(--dsw-alias-bg-layer-3);color:var(--dsw-alias-label-primary);font:inherit;font-size:13px;line-height:20px;padding:0 12px;min-width:0}',
         '.dsh-ssh-workbench-input:focus-visible{outline:none;border-color:var(--dsw-alias-state-business-primary)}',
         '.dsh-ssh-workbench-input-compact{height:28px;padding:0 8px;border-radius:var(--dsw-radius-sm);border-color:var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-1);font-size:12px;line-height:18px}',
         '.dsh-ssh-workbench-select-trigger{display:flex;align-items:center;justify-content:space-between;gap:8px;text-align:left;cursor:pointer}',
@@ -2013,106 +2137,6 @@ window.__ModuleLoader__.load({
         : tr('tool.failed', '调用失败')
     }
 
-    function SshOpsToolRow(props) {
-      const phase = props?.phase ?? 'result'
-      const block = props?.block
-      const args = toolArgs(block)
-      const toolName = props?.toolName ?? block?.call?.name ?? 'ssh_workbench'
-      const command = typeof args?.command === 'string'
-        ? args.command
-        : typeof args?.commands === 'string'
-          ? args.commands
-          : typeof args?.pack === 'string'
-            ? args.pack
-            : typeof args?.text === 'string'
-              ? args.text
-              : ''
-      const target = Array.isArray(args?.servers)
-        ? args.servers.join(', ')
-        : args?.tag
-          ? 'tag:' + args.tag
-          : args?.server ?? args?.session ?? ''
-      const body = phase === 'result' ? textFromToolContent(block) : ''
-      const bodyText = body.trim()
-      const errorCode = phase === 'result' ? toolErrorCode(block) : ''
-      const failed = phase === 'result' && (block?.isError || block?.error)
-      const running = phase === 'preparing' || phase === 'start'
-      const [expanded, setExpanded] = useState(false)
-      const labels = {
-        ssh_workbench_target: tr('tool.target', '切换远程目标'),
-      }
-      const label = labels[toolName] ?? tr('tool.target', '切换远程目标')
-      const argsText = args ? JSON.stringify(args, null, 2) : ''
-      const canExpand = Boolean(bodyText || argsText)
-      const summary = failed
-        ? toolRowFailureText(bodyText, errorCode)
-        : target && command
-          ? target + ' · ' + command
-          : target || command || (running ? tr('tool.running', '执行中…') : tr('tool.noOutput', '（无输出）'))
-      const state = failed ? 'error' : running ? 'running' : 'ok'
-      const leading = running
-        ? spinner(14)
-        : h('svg', {
-            width: 14, height: 14, viewBox: '0 0 16 16', fill: 'none',
-            'aria-hidden': 'true', style: { display: 'block' },
-          },
-          state === 'error'
-            ? [
-                h('circle', { key: 'ring', cx: 8, cy: 8, r: 6, stroke: 'currentColor', strokeWidth: 1.2 }),
-                h('line', { key: 'a', x1: 5.8, y1: 5.8, x2: 10.2, y2: 10.2, stroke: 'currentColor', strokeWidth: 1.2 }),
-                h('line', { key: 'b', x1: 10.2, y1: 5.8, x2: 5.8, y2: 10.2, stroke: 'currentColor', strokeWidth: 1.2 }),
-              ]
-            : h('polyline', {
-                points: '3.5 8.5 6.5 11.5 12.5 5',
-                stroke: 'currentColor', strokeWidth: 1.2, strokeLinecap: 'round', strokeLinejoin: 'round',
-              }))
-      const ioSection = (labelText, text) => h('div', { className: 'dsh-ssh-workbench-io-section' },
-        h('span', { className: 'dsh-ssh-workbench-io-label' }, labelText),
-        h('span', { className: 'dsh-ssh-workbench-io-text' }, text))
-      const ioDivider = (key) => h('div', { key, className: 'dsh-ssh-workbench-io-divider' })
-      const sections = []
-      if (argsText) sections.push(ioSection(tr('tool.input', '参数'), argsText))
-      if (bodyText) sections.push(ioSection(tr('tool.output', '输出'), bodyText))
-      const bodyBlocks = sections.reduce((accumulator, section, index) => {
-        if (index > 0) accumulator.push(ioDivider('divider-' + index))
-        accumulator.push(section)
-        return accumulator
-      }, [])
-      return h('div', {
-        'data-sdh-tool-card': toolName,
-        style: { display: 'flex', flexDirection: 'column', minWidth: 0 },
-      },
-        h('button', {
-          type: 'button',
-          className: 'dsh-ssh-workbench-tool-row',
-          'data-sdh-tool-details-toggle': '',
-          'aria-expanded': expanded ? 'true' : 'false',
-          disabled: canExpand !== true,
-          onClick: () => setExpanded((value) => !value),
-        },
-          h('span', { className: 'dsh-ssh-workbench-tool-leading', 'data-state': state }, leading),
-          h('span', { className: 'dsh-ssh-workbench-tool-title' }, label),
-          h('span', { className: 'dsh-ssh-workbench-tool-sep', 'aria-hidden': 'true' }),
-          h('span', {
-            className: 'dsh-ssh-workbench-tool-summary',
-            'data-error': failed ? '' : undefined,
-            'data-stopped': !failed && !running && /stop|cancel/i.test(errorCode) ? '' : undefined,
-          }, summary),
-          canExpand
-            ? h('span', { className: 'dsh-ssh-workbench-tool-action' }, expanded ? tr('tool.collapse', '收起详情') : tr('tool.expand', '查看详情'))
-            : null,
-        ),
-        expanded && canExpand
-          ? h('div', { className: 'dsh-ssh-workbench-tool-body' },
-              h('div', { className: 'dsh-ssh-workbench-io-card' },
-                bodyBlocks.length > 0
-                  ? bodyBlocks
-                  : h('div', { className: 'dsh-ssh-workbench-io-section' },
-                      h('span', { className: 'dsh-ssh-workbench-io-label' }, tr('tool.output', '输出')),
-                      h('span', { className: 'dsh-ssh-workbench-io-text' }, tr('tool.noOutput', '（无输出）')))))
-          : null,
-      )
-    }
     let translate = (key) => key
     /** Locale lookup with a Chinese fallback for hosts/tests where the locale service is not bound. */
     const tr = (key, fallback) => {
@@ -4836,16 +4860,6 @@ ${d.join(`
             TargetDock,
           ),
         )
-        for (const toolName of ['ssh_workbench_target']) {
-          slots.inject('tool.call.toolview', () =>
-            slots.register(
-              { name: 'tool.call.toolview', key: toolName },
-              function SdhSshOpsToolView(props) {
-                return h(SshOpsToolRow, props)
-              },
-            ),
-          )
-        }
       }
 
       // Native right sidebar: a page type opened by kind, plus a guide entry.

package/lib/core/activity.js

@@ -63,6 +63,11 @@ export function createActivityStore({ file = activityPath(), maxEntries = MAX_AC
       ...(entry?.server !== undefined ? { server: String(entry.server) } : {}),
       ...(entry?.summary !== undefined ? { summary: String(entry.summary) } : {}),
       ...(entry?.outcome !== undefined ? { outcome: String(entry.outcome) } : {}),
+      // Session/duration let the composer dock summarize this session's remote
+      // executions without reading DSH's private session metrics. Absent on
+      // older entries; readers must tolerate that.
+      ...(typeof entry?.sessionId === 'string' && entry.sessionId.length > 0 ? { sessionId: entry.sessionId } : {}),
+      ...(Number.isFinite(entry?.durationMs) && entry.durationMs >= 0 ? { durationMs: Math.round(entry.durationMs) } : {}),
     }
     const next = [normalized, ...load()].slice(0, maxEntries)
     save(next)

package/lib/core/broker.js

@@ -177,13 +177,16 @@ export function createSessionBroker({ getSecret, knownHosts, config = {}, log =
     return `${server.host}|${server.port}|${server.username}|${auth}`
   }
 
-  function connectOptions(server, state) {
+  function connectOptions(server, state, connectTimeoutMs) {
     const hostKeyMode = settings.hostKeyMode === 'accept-new' ? 'accept-new' : 'strict'
+    const readyTimeout = Number.isInteger(connectTimeoutMs) && connectTimeoutMs > 0
+      ? Math.min(connectTimeoutMs, settings.connectTimeoutMs)
+      : settings.connectTimeoutMs
     return {
       host: server.host,
       port: server.port,
       username: server.username,
-      readyTimeout: settings.connectTimeoutMs,
+      readyTimeout,
       keepaliveInterval: settings.keepaliveInterval,
       keepaliveCountMax: settings.keepaliveCountMax,
       hostHash: 'sha256',
@@ -197,7 +200,7 @@ export function createSessionBroker({ getSecret, knownHosts, config = {}, log =
   }
 
   /** Open a fresh client and resolve on `ready`. */
-  async function connectClient(server) {
+  async function connectClient(server, connectTimeoutMs) {
     const { Client } = await loadSsh2()
     const state = {}
     const client = new Client()
@@ -226,7 +229,7 @@ export function createSessionBroker({ getSecret, knownHosts, config = {}, log =
         log('ssh client error', { server: server.name, error: error instanceof Error ? error.message : String(error) })
       })
       try {
-        client.connect(connectOptions(server, state))
+        client.connect(connectOptions(server, state, connectTimeoutMs))
       } catch (error) {
         fail(error)
       }
@@ -281,7 +284,7 @@ export function createSessionBroker({ getSecret, knownHosts, config = {}, log =
   }
 
 
-  async function acquire(server) {
+  async function acquire(server, options = {}) {
     const id = server.id ?? server.name
     const key = serverKey(server)
     let entry = entries.get(id)
@@ -328,7 +331,7 @@ export function createSessionBroker({ getSecret, knownHosts, config = {}, log =
     }
     created.pending = (async () => {
       try {
-        const { client, fingerprint, connectMs } = await connectClient(server)
+        const { client, fingerprint, connectMs } = await connectClient(server, options.connectTimeoutMs)
         created.client = client
         created.fingerprint = fingerprint
         created.connectMs = connectMs
@@ -589,7 +592,7 @@ export function createSessionBroker({ getSecret, knownHosts, config = {}, log =
     for (;;) {
       let acquired
       try {
-        acquired = await acquire(server)
+        acquired = await acquire(server, { connectTimeoutMs: options.connectTimeoutMs })
       } catch (error) {
         const normalized = error instanceof SshError ? error : normalizeError(error)
         const result = errorResult(normalized.code, normalized.message, { durationMs: now() - startedAt })

package/lib/core/dialect.js

@@ -9,7 +9,7 @@
  */
 
 /** The dialect values this plugin understands. */
-export const DIALECTS = Object.freeze({ POSIX: 'posix', WINDOWS: 'windows' })
+const DIALECTS = Object.freeze({ POSIX: 'posix', WINDOWS: 'windows' })
 
 /** Normalize one raw dialect/platform value. */
 export function normalizeDialect(value) {

package/lib/core/execution-stats.js

@@ -0,0 +1,88 @@
+/**
+ * Per-session execution summary for the composer target dock.
+ *
+ * DSH owns conversation/model metrics (turns, TTFT, TPS); the plugin cannot
+ * read them. This module only summarizes the activity entries the plugin
+ * writes for remote executions, so the dock can show accurate SSH-side counts
+ * and latency without inventing values it does not own.
+ */
+
+function numericDuration(entry) {
+  return Number.isFinite(entry?.durationMs) && entry.durationMs >= 0 ? entry.durationMs : 0
+}
+
+function emptyBucket(name) {
+  return { name, count: 0, success: 0, failed: 0, durationMs: 0, averageMs: 0, lastAt: null }
+}
+
+function addToBucket(bucket, entry) {
+  bucket.count += 1
+  if (entry.outcome === 'success') bucket.success += 1
+  else bucket.failed += 1
+  bucket.durationMs += numericDuration(entry)
+  if (typeof entry.at === 'string' && (bucket.lastAt === null || entry.at > bucket.lastAt)) bucket.lastAt = entry.at
+}
+
+/**
+ * Summarize the plugin's remote execution activity for one Session.
+ *
+ * @param {object[]} entries newest-first activity entries
+ * @param {{ sessionId?: string, candidates?: string[] }} options
+ * @returns {{
+ *   sessionId: string|null,
+ *   count: number,
+ *   success: number,
+ *   failed: number,
+ *   durationMs: number,
+ *   averageMs: number,
+ *   lastAt: string|null,
+ *   servers: Array<{name:string,count:number,success:number,failed:number,durationMs:number,averageMs:number,lastAt:string|null}>
+ * }}
+ */
+export function summarizeExecution(entries, { sessionId, candidates = [] } = {}) {
+  const wanted = typeof sessionId === 'string' && sessionId.length > 0 ? sessionId : null
+  const byServer = new Map()
+  const summary = {
+    sessionId: wanted,
+    count: 0,
+    success: 0,
+    failed: 0,
+    durationMs: 0,
+    averageMs: 0,
+    lastAt: null,
+    servers: [],
+  }
+
+  if (wanted !== null) {
+    for (const entry of Array.isArray(entries) ? entries : []) {
+      if (!entry || entry.kind !== 'exec' || entry.sessionId !== wanted) continue
+      summary.count += 1
+      if (entry.outcome === 'success') summary.success += 1
+      else summary.failed += 1
+      summary.durationMs += numericDuration(entry)
+      if (typeof entry.at === 'string' && (summary.lastAt === null || entry.at > summary.lastAt)) summary.lastAt = entry.at
+      const name = typeof entry.server === 'string' && entry.server.length > 0 ? entry.server : null
+      if (name === null) continue
+      if (!byServer.has(name)) byServer.set(name, emptyBucket(name))
+      addToBucket(byServer.get(name), entry)
+    }
+  }
+
+  summary.averageMs = summary.count > 0 ? Math.round(summary.durationMs / summary.count) : 0
+
+  // Keep the mentioned resources in mention order, then append any target that
+  // ran from an explicit remote_exec task without being a session candidate.
+  const names = []
+  for (const name of Array.isArray(candidates) ? candidates : []) {
+    const value = String(name)
+    if (value && !names.includes(value)) names.push(value)
+  }
+  for (const name of [...byServer.keys()].sort()) {
+    if (!names.includes(name)) names.push(name)
+  }
+  summary.servers = names.map((name) => {
+    const bucket = byServer.get(name) ?? emptyBucket(name)
+    return { ...bucket, averageMs: bucket.count > 0 ? Math.round(bucket.durationMs / bucket.count) : 0 }
+  })
+  return summary
+}

package/lib/core/gate-pwsh.js

@@ -58,7 +58,7 @@ const RULES = [
 ]
 
 /** Split one PowerShell command into independently-executed statements. */
-export function powerShellStatements(command) {
+function powerShellStatements(command) {
   return String(command ?? '')
     .split(/[;\r\n]|\|\||&&|\|/)
     .map((part) => part.trim())