dsh-remote 0.8.70 → 0.8.72

package/lib/audit.js

@@ -0,0 +1,45 @@
+// dsh-remote — audit log domain: the pure parts (formatting + reading).
+//
+// Extracted from lib/index.js (issue #82): the god-file keeps only the thin
+// wiring (config gate + file path); everything testable without a mounted
+// plugin lives here. Behaviour is byte-identical to the inlined version —
+// `audit-open-and-no-deploy.test.js` pins it end to end.
+
+/**
+ * Build one audit line (without the trailing newline handling of the caller).
+ * `cmd` is flattened to a single line and capped at 400 chars.
+ *
+ * @param {object} p
+ * @param {string} p.op - operation name.
+ * @param {string} p.cmd - command text or path detail.
+ * @param {number|null} p.code - exit code, or null when not applicable.
+ * @param {string} [p.user]
+ * @param {string} [p.host]
+ * @param {number} [p.port]
+ * @param {Date} [p.now] - clock injection for tests.
+ * @returns {string} the line INCLUDING the trailing newline.
+ */
+export function formatAuditLine({ op, cmd, code, user, host, port, now }) {
+  const iso = (now || new Date()).toISOString()
+  const flat = String(cmd || '').replace(/\s+/g, ' ').slice(0, 400)
+  return [iso, `${user || '?'}@${host || '?'}:${port}`, op, code == null ? '-' : String(code), flat].join(' | ') + '\n'
+}
+
+/**
+ * Read the last `limit` audit lines from a file (clamped to [1, 500]).
+ * A missing/corrupt file degrades to [] — the audit viewer must never throw.
+ *
+ * @param {(file: string, enc: string) => string} readFile - fs.readFileSync-compatible.
+ * @param {string} file
+ * @param {number|string} [limit]
+ * @returns {string[]}
+ */
+export function readAuditLines(readFile, file, limit) {
+  try {
+    const text = readFile(file, 'utf8')
+    const lines = text.split('\n').filter(Boolean)
+    return lines.slice(-Math.max(1, Math.min(Number(limit) || 50, 500)))
+  } catch {
+    return []
+  }
+}

package/lib/client.js

@@ -206,6 +206,7 @@ window.__ModuleLoader__.load({
         'settings.checkUpdate': '检查更新',
         'settings.updateNow': '立即更新',
         'settings.updateMode': '更新模式：',
+        'settings.explorerAutoOpen': '打开远程工作区时，自动在侧边栏展开「远程文件」（需安装 better-sidebar）',
         'settings.updateManual': '手动',
         'settings.updateAuto': '自动',
         'settings.updateOff': '关闭',
@@ -510,6 +511,7 @@ window.__ModuleLoader__.load({
         'settings.checkUpdate': 'Check for updates',
         'settings.updateNow': 'Update now',
         'settings.updateMode': 'Update mode:',
+        'settings.explorerAutoOpen': 'Auto-open the Remote Files sidebar tab for remote workspaces (via better-sidebar)',
         'settings.updateManual': 'Manual',
         'settings.updateAuto': 'Auto',
         'settings.updateOff': 'Off',
@@ -1134,6 +1136,9 @@ window.__ModuleLoader__.load({
       // Mirrors the host default (DEFAULT_UPDATE_MODE = 'auto') so the panel
       // does not flash "manual" before the first /update-check answers.
       const [updMode, setUpdMode] = React.useState('auto')
+      // Issue #78: initial value comes from localStorage, so a user's choice
+      // survives restarts (the bug was: the panel popped again every restart).
+      const [explorerAuto, setExplorerAuto] = React.useState(() => explorerAutoOpenEnabled())
       const checkUpdate = (quiet) => {
         if (updBusy) return
         setUpdBusy(true); setUpdMsg('')
@@ -1845,6 +1850,19 @@ window.__ModuleLoader__.load({
               }, m === 'manual' ? tr('settings.modeManual') : m === 'auto' ? tr('settings.modeAuto') : tr('settings.modeOff')),
             ),
           ),
+          React.createElement('div', { style: { display: 'flex', gap: 8, alignItems: 'center', marginTop: 6, fontSize: 12 } },
+            React.createElement('label', { style: { display: 'flex', gap: 6, alignItems: 'center', cursor: 'pointer', opacity: 0.85 } },
+              React.createElement('input', {
+                type: 'checkbox', checked: explorerAuto, 'data-testid': 'explorer-auto-open',
+                onChange: (e) => {
+                  const on = !!(e && e.target && e.target.checked)
+                  setExplorerAuto(on)
+                  try { window.localStorage.setItem(EXPLORER_AUTO_OPEN_KEY, on ? '1' : '0') } catch { /* private mode: choice lasts this session only */ }
+                },
+              }),
+              tr('settings.explorerAutoOpen'),
+            ),
+          ),
           upd && upd.pendingReload
             ? React.createElement('div', { style: { marginTop: 6, fontSize: 12, color: T.warn } },
                 tr('settings.updatePendingReload', { disk: upd.disk, loaded: upd.loaded }))
@@ -2646,6 +2664,19 @@ window.__ModuleLoader__.load({
     // resource type, never a better-sidebar card (see registerSidebarIntegration).
     const SIDEBAR_EXPLORER_ID = 'dsh-remote:explorer'
 
+    // Issue #78: durable opt-out for the sidebar auto-open. The in-memory
+    // autoOpenedFor set forgetting across restarts is by design; THIS key is
+    // the user's persistent "别再给我弹远程文件面板". Browser-local because the
+    // feature itself is browser-local. Default ON preserves the behaviour
+    // existing users know — only an explicit uncheck turns it off.
+    const EXPLORER_AUTO_OPEN_KEY = 'dsh-remote:explorerAutoOpen'
+    function explorerAutoOpenEnabled() {
+      try {
+        if (typeof window === 'undefined' || !window.localStorage) return true
+        return window.localStorage.getItem(EXPLORER_AUTO_OPEN_KEY) !== '0'
+      } catch { return true }
+    }
+
     function fetchRemoteStatus(sessionId) {
       return api('GET', withSessionQuery('/dsh-remote/status', sessionId)).catch(() => null)
     }
@@ -3610,6 +3641,7 @@ window.__ModuleLoader__.load({
       let autoOpenedFor = new Set()
       let disposeAuto = null
       const tryAutoOpen = () => {
+        if (!explorerAutoOpenEnabled()) return // issue #78: the user said no, persistently
         if (typeof bs.subscribeState !== 'function') return
         const snap = bs.getSnapshot && bs.getSnapshot()
         if (!snap || !snap.sessionId) return

package/lib/errors.js

@@ -69,6 +69,17 @@ export function classifyError(err, opts = {}) {
       raw: msg,
     }
   }
+  // ECONNRESET is the same class of failure as ECONNREFUSED one step later: the
+  // peer (or a firewall/middlebox) tore the TCP connection down. Windows surfaces
+  // it where POSIX returns ECONNREFUSED (e.g. loopback under load), so leaving it
+  // unclassified made a raw OS errno the user-facing message on exactly one OS.
+  if (/ECONNRESET|connection reset/i.test(msg)) {
+    return {
+      category: 'network',
+      hint: `连接被重置${where}：对端或中间设备强行断开了 TCP——常见于防火墙/安全组拦截、端口上跑的不是 sshd、或远端刚重启。重试一次；持续出现则确认端口 ${port || 22} 确实指向 sshd 并检查防火墙。`,
+      raw: msg,
+    }
+  }
   if (/sftp operation timed out|sftp failed|readdir|writeFile|fastGet|fastPut/i.test(msg)) {
     return {
       category: 'sftp',
@@ -106,8 +117,20 @@ export function classifyError(err, opts = {}) {
  *
  *  An UNCLASSIFIED failure still gets the host appended: "Connection lost before
  *  handshake" or a raw errno on its own leaves the user unable to tell WHICH
- *  machine failed, which is the one thing a multi-machine plugin must never hide. */
+ *  machine failed, which is the one thing a multi-machine plugin must never hide.
+ *
+ *  IDEMPOTENT on purpose: the pool already classifies connect-stage errors, and
+ *  callers (rw_connect, routes) classify again at their own layer. A message
+ *  starting with a known hint prefix passes through unchanged instead of
+ *  growing a second "（原始错误：…）" shell. */
+const KNOWN_HINT_PREFIXES = [
+  '主机指纹校验失败', '认证失败', 'SSH agent 不可用', '缺少凭据', '主机不可达',
+  'SSH 握手未完成', '连接被拒绝', '连接被重置', 'SFTP 操作失败', '连接/操作超时',
+  '无法读取私钥文件', '私钥解析失败',
+]
 export function friendlyMessage(err, opts = {}) {
+  const incoming = String((err && err.message) || err || '')
+  if (KNOWN_HINT_PREFIXES.some((p) => incoming.startsWith(p))) return incoming
   const c = classifyError(err, opts)
   const where = opts.host ? ` (${opts.host}:${opts.port || 22})` : ''
   if (c.category === 'other') {

package/lib/index.js

@@ -50,6 +50,7 @@ import { resolveMirror, poolKey, lookupSessionCwd, encodeSegmentSafe, readSessio
 import { TaskManager } from './tasks.js'
 import { ForwardManager } from './forwards.js'
 import { WebAttach } from './web-attach.js'
+import { formatAuditLine, readAuditLines } from './audit.js'
 
 import { selfDir, diskVersion, LOADED_VERSION, gtVersion, fetchLatestVersion, applyUpdate, persistUpdateMode, readUpdateMode, reloadSelf, scheduleSelfReload, lastSelfReload, isInstalledCopy } from './update.js'
 import { sendHeartbeat, pseudonym, heartbeatUrl, hasPersistedId, installIdPath } from './telemetry.js'
@@ -1030,8 +1031,7 @@ export async function apply(ctx, config) {
     const user = (target && target.username) || config.username
     const port = (target && target.port) || config.port
     try {
-      const line = [new Date().toISOString(), `${user || '?'}@${host || '?'}:${port}`, op, code == null ? '-' : String(code), String(cmd || '').replace(/\s+/g, ' ').slice(0, 400)].join(' | ') + '\n'
-      appendFileSync(auditFile(), line, 'utf8')
+      appendFileSync(auditFile(), formatAuditLine({ op, cmd, code, user, host, port }), 'utf8')
     } catch {}
   }
 
@@ -1076,15 +1076,7 @@ export async function apply(ctx, config) {
     return [fmt('environment', envs), fmt('location', locs), fmt('tags', tags)].filter(Boolean).join('\n')
   }
 
-  const readAudit = (limit) => {
-    try {
-      const text = readFileSync(auditFile(), 'utf8')
-      const lines = text.split('\n').filter(Boolean)
-      return lines.slice(-Math.max(1, Math.min(Number(limit) || 50, 500)))
-    } catch {
-      return []
-    }
-  }
+  const readAudit = (limit) => readAuditLines(readFileSync, auditFile(), limit)
 
   // ── ignore rules (defaults + user file) ───────────────────────────────────
   // NOTE: this matcher is shared by mirror sync (rw_sync/rw_push) and search.

package/lib/pool.js

@@ -6,6 +6,7 @@ import path from 'node:path'
 import { truncate } from './paths.js'
 import { createHostKeyGuard } from './hostkey.js'
 import { buildSftpSurface } from './sftp-surface.js'
+import { friendlyMessage } from './errors.js'
 import { SystemOpenSshPool, isSystemOpenSshBackend } from './openssh.js'
 
 const { Client } = ssh2
@@ -283,11 +284,17 @@ export class SshPool {
     const guard = createHostKeyGuard(this.config, knownHostsFile)
     const client = new Client()
     let settled = false
+    // Every connect-stage failure is classified HERE, at the layer that knows
+    // which machine was being dialed: a bare ssh2 errno ("Timed out while
+    // waiting for handshake") names no host, and on a multi-machine plugin the
+    // user cannot tell WHICH box failed. friendlyMessage is idempotent, so
+    // callers that classify again (rw_connect, routes) do not double-wrap.
+    const classify = (err) => new Error(friendlyMessage(err, { host: this.config.host, port: this.config.port }))
     const fail = (err) => {
       if (settled) return
       settled = true
       if (isCurrent() && this.client === client) this.client = null
-      throw guard.lastError ? new Error(guard.lastError) : err
+      throw classify(guard.lastError ? new Error(guard.lastError) : err)
     }
 
     // Proxy jump: SSH to the bastion first, then tunnel to the target through it.
@@ -345,14 +352,14 @@ export class SshPool {
         if (settled) return
         settled = true
         if (isCurrent() && this.client === client) this.client = null
-        reject(guard.lastError ? new Error(guard.lastError) : err)
+        reject(classify(guard.lastError ? new Error(guard.lastError) : err))
       }
       client.on('ready', () => {
         if (settled) return
         settled = true
         if (!isCurrent()) {
           try { client.end() } catch {}
-          reject(new Error('ssh target changed during connect'))
+          reject(classify(new Error('ssh target changed during connect')))
           return
         }
         this.client = client

package/lib/telemetry.js

@@ -28,7 +28,7 @@ import path from 'node:path'
  *  （默认行为不该需要配置），而是：① 测试必须能把它重定向掉，
  *  否则跑一次 npm test 就会往生产统计里灌假装机（发生过）；
  *  ② 作者换端点/灰度时不必为了改一行字符串发一次版。 */
-const DEFAULT_HEARTBEAT_URL = 'https://gitbolg-d7gmnsrw46e011706-1256429518.ap-shanghai.app.tcloudbase.com/dsh-hb/heartbeat'
+const DEFAULT_HEARTBEAT_URL = 'https://slippery-iguana-d1fhb1xmd469ee8c-1256429518.ap-shanghai.app.tcloudbase.com/dsh-hb/heartbeat'
 
 /** 解析实际使用的端点（env 覆盖优先，仅接受 https，避免被降级到明文）。 */
 export function heartbeatUrl() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote",
-  "version": "0.8.70",
+  "version": "0.8.72",
   "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>",
@@ -94,6 +94,6 @@
   "scripts": {
     "test": "node --import ./test/setup-telemetry-off.mjs --test --test-timeout=40000 --test-force-exit --test-concurrency=8",
     "test:coverage": "node scripts/coverage-union.mjs",
-    "test:coverage:gate": "node scripts/coverage-union.mjs --gate 70"
+    "test:coverage:gate": "node scripts/coverage-union.mjs --gate 70 --file-gate 60"
   }
 }