net-connector 0.17.2 → 0.18.0

data/lib/net/connector/netdisco/progress.rb

@@ -12,26 +12,26 @@ module Net
         # 备份入口保留清单对象接口，显示由公共批次组件处理。
         def plan(plan, parallel:, limit_per_vendor: nil)
           @operation_mode = false
-          mode = limit_per_vendor ? "抽样（每厂商最多 #{limit_per_vendor} 台）" : "全量"
+          mode = limit_per_vendor ? "sample (at most #{limit_per_vendor} devices per vendor)" : "all devices"
           super(total: plan.inventory.size, selected: plan.ready.size, parallel: parallel, label: mode)
         end
 
         # 设备对象只在领域入口转换为显示身份。
-        def start(device, label: "备份")
-          super(host: device.host, label: "#{label}（#{device.vendor}）")
+        def start(device, label: "Backup")
+          super(host: device.host, label: "#{label}(#{device.vendor})")
         end
 
         # 分别展示已保存、设备报告上传和服务器核验状态。
         def result(outcome)
           error_code = diagnostic_code(outcome)
           message = case outcome.status
-                    when :backed_up then "备份已保存（#{outcome.backup.bytes} 字节）"
+                    when :backed_up then "Backup saved (#{outcome.backup.bytes} bytes)"
                     when :reported_uploaded
-                      outcome.backup&.verification == :server_verified ? "配置已归档（#{outcome.backup.server_bytes} 字节）" :
-                        "设备报告上传完成；服务器文件尚未核验"
-                    when :saved_with_error then "备份有产物但未完全成功（#{error_code || outcome.status}）"
-                    when :reported_with_error then "设备报告上传但收尾异常（#{error_code || outcome.status}）"
-                    else "未完成（#{error_code || outcome.status}）"
+                      outcome.backup&.verification == :server_verified ? "Configuration archived (#{outcome.backup.server_bytes} bytes)" :
+                        "Device reported a completed upload; server file has not been verified"
+                    when :saved_with_error then "Backup artifact exists but the operation did not fully succeed (#{error_code || outcome.status})"
+                    when :reported_with_error then "Device reported an upload but finalization failed (#{error_code || outcome.status})"
+                    else "Incomplete (#{error_code || outcome.status})"
                     end
           super(host: outcome.device.host, success: outcome.success?, duration_ms: outcome.duration_ms, message: message, error_code: error_code)
         end
@@ -45,10 +45,10 @@ module Net
                            .group_by { |item| diagnostic_code(item) || item.status }.transform_values(&:size)
           super(success: report.policy_success?, **summary.slice(:succeeded, :partial, :failed, :skipped), failures: failures)
           unverified = summary[:verification]&.fetch(:unverified, 0) || 0
-          write(nil, "其中 #{unverified} 台仅设备报告上传完成，服务器文件尚未核验") if unverified.positive?
+          write(nil, "Of these, #{unverified} devices only reported a completed upload; server files have not been verified") if unverified.positive?
           return unless !report.callback_errors.empty? || report.report_error
 
-          write(nil, "回调异常 #{report.callback_errors.size}，报告错误 #{summary[:report_error] || "无"}")
+          write(nil, "Callback errors #{report.callback_errors.size}, report error #{summary[:report_error] || "none"}")
         end
 
         # 清空上一阶段计数，初始化本次拓扑操作的任务规模与计时。
@@ -61,7 +61,7 @@ module Net
             @stages.clear
             @task_started.clear
             @run_started = monotonic
-            emit(nil, "#{label} | 本次 #{@total} 台；并发 #{parallel}")
+            emit(nil, "#{label} | Selected #{@total} devices; concurrency #{parallel}")
           end
         end
 
@@ -89,8 +89,8 @@ module Net
             @failures[error_code || status] += 1 unless succeeded || skipped
             if @verbose || failed
               label = Topology::Presentation.status(status, changes: changes)
-              reasons = issues.empty? ? "" : "；#{Topology::Presentation.issues(issues)}"
-              emit(device.host, "#{label}；耗时 #{duration_ms} ms#{error_code ? "（#{error_code}）" : ""}#{reasons}")
+              reasons = issues.empty? ? "" : "; #{Topology::Presentation.issues(issues)}"
+              emit(device.host, "#{label}; elapsed #{duration_ms} ms#{error_code ? "(#{error_code})" : ""}#{reasons}")
             elsif !@tty && ((@completed % 25).zero? || @completed == @total)
               emit(nil, status_line)
             end
@@ -101,15 +101,15 @@ module Net
         # 输出拓扑批次的最终状态计数和完成判断。
         def finish_operations(success:, counts:)
           failed = counts.any? { |status, count| Topology::Presentation::FAILURES.include?(status) && count.positive? }
-          result = success ? "完成" : (failed ? "未完成" : "存在待处理项")
-          write(nil, "拓扑批次结束：#{counts.map { |status, count| "#{Topology::Presentation.status(status)} #{count} 台" }.join("，")}；结果 #{result}")
+          result = success ? "complete" : (failed ? "incomplete" : "pending items remain")
+          write(nil, "Topology batch finished: #{counts.map { |status, count| "#{Topology::Presentation.status(status)} #{count} devices" }.join(", ")}; result #{result}")
         end
 
         private
 
         # 拓扑进度保留待核实项计数，备份使用通用成功与失败计数。
         def progress_counts
-          @operation_mode ? "完成 #{@completed} 待核实 #{@operation_pending} 失败 #{@failed}" : super
+          @operation_mode ? "complete #{@completed} unverified #{@operation_pending} failed #{@failed}" : super
         end
 
         # 与持久化摘要采用同一诊断白名单，保留领域结果自身的原始错误字段。

data/lib/net/connector/netdisco/report/text.rb

@@ -14,24 +14,24 @@ module Net
             summary = report.statistics
             failed = report.outcomes.reject { |item| item.success? || %i[filtered sample_limit].include?(item.status) }
             groups = failed.group_by { |item| diagnostic_code(item) || item.status }
-            lines = ["网络设备备份报告", "=" * 72,
-                     "开始时间：#{report.started_at.getlocal("+08:00").strftime("%Y-%m-%d %H:%M:%S %:z")}",
-                     "结束时间：#{report.finished_at.getlocal("+08:00").strftime("%Y-%m-%d %H:%M:%S %:z")}",
-                     "清单：#{plan.inventory.size} 台；本次：#{plan.ready.size} 台；并发：#{parallel}",
-                     "成功：#{summary[:succeeded]}；部分成功：#{summary[:partial]}；失败：#{summary[:failed]}；跳过：#{summary[:skipped]}",
-                     "耗时：#{(report.duration_ms.to_f / 1000).round(1)} 秒；批次状态：#{summary[:status]}",
-                     "成功策略：#{report.policy}；策略通过：#{report.policy_success?}",
-                     "回调异常：#{report.callback_errors.size}；报告错误：#{summary[:report_error] || "无"}",
-                     "状态计数：#{report.counts.map { |key, value| "#{key}=#{value}" }.join("，")}",
-                     "未完成分类：#{groups.empty? ? "无" : groups.map { |key, items| "#{key}=#{items.size}" }.join("，")}",
-                     "-" * 72, "未完成设备："]
+            lines = ["Network device backup report", "=" * 72,
+                     "Started: #{report.started_at.getlocal("+08:00").strftime("%Y-%m-%d %H:%M:%S %:z")}",
+                     "Finished: #{report.finished_at.getlocal("+08:00").strftime("%Y-%m-%d %H:%M:%S %:z")}",
+                     "Inventory: #{plan.inventory.size} devices; selected: #{plan.ready.size} devices; concurrency: #{parallel}",
+                     "Succeeded: #{summary[:succeeded]}; partial: #{summary[:partial]}; failed: #{summary[:failed]}; skipped: #{summary[:skipped]}",
+                     "Elapsed: #{(report.duration_ms.to_f / 1000).round(1)} seconds; batch status: #{summary[:status]}",
+                     "Success policy: #{report.policy}; policy passed: #{report.policy_success?}",
+                     "Callback errors: #{report.callback_errors.size}; report error: #{summary[:report_error] || "none"}",
+                     "Status counts: #{report.counts.map { |key, value| "#{key}=#{value}" }.join(", ")}",
+                     "Incomplete categories: #{groups.empty? ? "none" : groups.map { |key, items| "#{key}=#{items.size}" }.join(", ")}",
+                     "-" * 72, "Incomplete devices: "]
             lines.concat(failure_lines(failed))
-            lines << "无" if failed.empty?
+            lines << "none" if failed.empty?
             if report.mode == :tftp
               verification = summary.fetch(:verification)
-              lines << "TFTP 服务器文件：已核验 #{verification[:verified]}，未核验 #{verification[:unverified]}。"
+              lines << "TFTP server files: verified #{verification[:verified]}, unverified #{verification[:unverified]}."
             end
-            lines += ["=" * 72, "备份目录：#{directory}", "完整明细：#{File.join(directory, "summary.json")}"]
+            lines += ["=" * 72, "Backup directory: #{directory}", "Full details: #{File.join(directory, "summary.json")}"]
             Net::Connector::Storage::AtomicFile.write(File.join(directory, "summary.txt"), lines.join("\n") + "\n")
           end
 
@@ -39,7 +39,7 @@ module Net
           def self.failure_lines(failed)
             failed.map do |item|
               label = item.device.name.to_s.gsub(/[[:cntrl:]]/, " ")
-              "#{item.device.host} | #{label} | #{item.status} | #{diagnostic_code(item) || "无错误码"} | #{item.duration_ms} ms"
+              "#{item.device.host} | #{label} | #{item.status} | #{diagnostic_code(item) || "no error code"} | #{item.duration_ms} ms"
             end
           end
           private_class_method :failure_lines

data/lib/net/connector/netdisco/ssh/archive/client.rb

@@ -25,11 +25,11 @@ module Net
               # 构造不含凭据值的认证不可用提示，在设备任务开始前拒绝执行。
               def initialize(password_configured: false)
                 detail = if password_configured
-                           "已读取 NC_TFTP_SSH_PASSWORD，但 SSH 认证或主连接建立失败；请检查账号、密码、主机密钥及网络。密码含 # 或 $ 时请在 .env 中用单引号包裹"
+                           "NC_TFTP_SSH_PASSWORD was read, but SSH authentication or master connection setup failed; check username, password, host key and network. Wrap passwords containing # or $ in single quotes in .env"
                          else
-                           "请在项目根目录 .env 设置 NC_TFTP_SSH_PASSWORD，或配置可用的 SSH 密钥/agent"
+                           "Set NC_TFTP_SSH_PASSWORD in the project root .env, or configure a working SSH key/agent"
                          end
-                super("SSH 归档认证不可用：#{detail}。已停止，未连接设备。")
+                super("SSH archive authentication unavailable: #{detail}. Stopped without connecting to devices.")
               end
             end
 
@@ -37,7 +37,7 @@ module Net
             class PreparationUnavailable < ArgumentError
               # 提示检查远端运行时及私有目录，不携带 SSH 输出或设备配置。
               def initialize
-                super("SSH 归档目录预检失败：请检查服务器 python3、TFTP 根目录及写权限；archive、批次目录和 .net-connector-locks 须由 SSH 账号拥有且权限为 0700。已停止，未连接设备。")
+                super("SSH archive directory preflight failed: check server python3, the TFTP root and write permissions; archive, batch directories and .net-connector-locks must be owned by the SSH user with mode 0700. Stopped without connecting to devices.")
               end
             end
 

data/lib/net/connector/netdisco/ssh/authentication.rb

@@ -14,17 +14,15 @@ module Net
 
           # 在同一认证期限内等待一次密码提示及连接结束；主连接可用性由调用方另行核对。
           def self.respond(arguments, password:)
-            session = Expect::Session.new(buffer_limit: 65_536, write_timeout: 5)
-            session.spawn(*arguments, raw: true)
-            deadline = Expect.monotonic + 15
-            challenge = session.expect(PASSWORD, REJECTED, timeout: [deadline - Expect.monotonic, 0].max)
-            return false unless challenge.number == 1
+            Expect.spawn(*arguments, raw: true, buffer_limit: 65_536, write_timeout: 5) do |session|
+              deadline = Expect.monotonic + 15
+              challenge = session.expect(PASSWORD, REJECTED, timeout: [deadline - Expect.monotonic, 0].max)
+              next false unless challenge.number == 1
 
-            session.write(password + "\n")
-            completion = session.expect(PASSWORD, REJECTED, timeout: [deadline - Expect.monotonic, 0].max)
-            completion.error == :eof
-          ensure
-            session&.close
+              session.write(password + "\n")
+              completion = session.expect(PASSWORD, REJECTED, timeout: [deadline - Expect.monotonic, 0].max)
+              completion.error == :eof
+            end
           end
         end
       end

data/lib/net/connector/netdisco/topology/files.rb

@@ -35,16 +35,16 @@ module Net
             path = outcome[:device_report]
             return unless path
 
-            lines = ["设备：#{text(outcome[:name])}（#{text(outcome[:host])}）", "厂商：#{text(outcome[:vendor])}",
-                     "状态：#{Presentation.status(outcome[:status], changes: outcome.fetch(:changes, 0))}；候选变更：#{outcome.fetch(:changes, 0)}",
-                     outcome[:script_file] ? "命令文件：#{outcome[:script_file]}" : "命令文件：未生成（没有已核实的配置变更）"]
-            lines << "命令校验 SHA-256：#{outcome[:script_sha256]}" if outcome[:script_sha256]
-            lines << "诊断：#{text(outcome.dig(:diagnostic, :error_code))}" if outcome[:diagnostic]
-            lines << "配置命令来自本次计划；文件生成不表示已经下发，执行结果以状态和设备回执为准。"
+            lines = ["Device: #{text(outcome[:name])} (#{text(outcome[:host])})", "Vendor: #{text(outcome[:vendor])}",
+                     "Status: #{Presentation.status(outcome[:status], changes: outcome.fetch(:changes, 0))}; candidate changes: #{outcome.fetch(:changes, 0)}",
+                     outcome[:script_file] ? "Command file: #{outcome[:script_file]}" : "Command file: not generated (no verified configuration changes)"]
+            lines << "Command SHA-256: #{outcome[:script_sha256]}" if outcome[:script_sha256]
+            lines << "Diagnostics: #{text(outcome.dig(:diagnostic, :error_code))}" if outcome[:diagnostic]
+            lines << "Configuration commands come from this plan; generating a file does not mean commands were sent. Check status and device receipts for execution results."
             lines.concat(outcome.fetch(:neighbors, []).map do |row|
-              "#{text(row[:interface])} #{text(row[:status])} 现有=#{row[:current].inspect} 目标=#{row[:expected].inspect}"
+              "#{text(row[:interface])} #{text(row[:status])} current=#{row[:current].inspect} target=#{row[:expected].inspect}"
             end)
-            lines.concat(outcome.fetch(:issues, []).map { |issue| "未核实：#{text(issue[:interface])} #{text(Presentation.reason(issue[:code]))}" })
+            lines.concat(outcome.fetch(:issues, []).map { |issue| "Unverified: #{text(issue[:interface])} #{text(Presentation.reason(issue[:code]))}" })
             FileUtils.mkdir_p(File.dirname(path), mode: 0o700)
             Storage::AtomicFile.write(path, lines.join("\n") + "\n")
           end

data/lib/net/connector/netdisco/topology/presentation.rb

@@ -6,18 +6,18 @@ module Net
       module Topology
         # JSON 状态码保持稳定；终端、汇总和设备说明共用中文含义及分类统计。
         module Presentation
-          STATUSES = { planned: "已生成计划", partial_planned: "已生成部分计划", unverified: "含待核实接口",
-                       discovered: "发现完成", applied: "应用完成", partial_applied: "部分应用完成", manual_required: "需人工处理",
-                       unsupported_operation: "不支持，已跳过", failed: "执行失败", partial: "执行部分失败",
-                       missing_credentials: "缺少凭据", interrupted: "已中断", not_started: "未开始", offline_review: "离线重审" }.freeze
-          REASONS = { unknown_neighbor_name: "邻居未提供名称", unknown_neighbor_interface: "邻居未提供端口",
-                      ambiguous_neighbor: "同一接口存在多个邻居", interface_missing: "配置中未找到本地接口",
-                      unsafe_description: "目标描述不符合安全约束" }.freeze
+          STATUSES = { planned: "plan generated", partial_planned: "partial plan generated", unverified: "contains unverified interfaces",
+                       discovered: "discovery complete", applied: "apply complete", partial_applied: "partial apply complete", manual_required: "manual action required",
+                       unsupported_operation: "unsupported; skipped", failed: "execution failed", partial: "execution partially failed",
+                       missing_credentials: "missing credentials", interrupted: "interrupted", not_started: "not started", offline_review: "offline review" }.freeze
+          REASONS = { unknown_neighbor_name: "neighbor name missing", unknown_neighbor_interface: "neighbor port missing",
+                      ambiguous_neighbor: "multiple neighbors on one interface", interface_missing: "local interface not found in configuration",
+                      unsafe_description: "target description violates safety constraints" }.freeze
           FAILURES = %i[failed partial missing_credentials interrupted not_started].freeze
 
           # 已规划但没有变更时明确显示无需修改，避免读者将 planned 理解为已经执行。
           def self.status(value, changes: nil)
-            return "无需修改" if value.to_sym == :planned && changes == 0
+            return "no changes needed" if value.to_sym == :planned && changes == 0
 
             STATUSES.fetch(value.to_sym, value.to_s)
           end
@@ -27,7 +27,7 @@ module Net
 
           # 汇总逐接口的问题数量，不把身份不足与设备连接或命令失败混为一谈。
           def self.issues(rows)
-            rows.map { |row| row[:code] }.tally.map { |code, count| "#{reason(code)} #{count} 个接口" }.join("；")
+            rows.map { |row| row[:code] }.tally.map { |code, count| "#{reason(code)} #{count} interfaces" }.join("; ")
           end
 
           # 设备与接口分别统计；含待核实项的设备也可能拥有可执行的局部计划。
@@ -43,14 +43,14 @@ module Net
 
           # 只读计划中有差异或未知证据表示待处理，不能把生成计划描述为配置下发完成。
           def self.result(summary)
-            return "未完成" if summary[:orchestration_error_type] || summary[:interrupted] || summary[:progress_error]
-            return "完成" if summary[:success]
-            return "执行存在失败" if summary.fetch(:statistics).fetch(:failed).positive?
+            return "incomplete" if summary[:orchestration_error_type] || summary[:interrupted] || summary[:progress_error]
+            return "complete" if summary[:success]
+            return "execution contains failures" if summary.fetch(:statistics).fetch(:failed).positive?
 
-            return "没有可处理设备" if summary[:devices].empty?
+            return "no eligible devices" if summary[:devices].empty?
 
-            { plan: "已生成计划，存在待修正或待核实项", discover: "发现结束，仍有待核实接口",
-              apply: "应用结束，仍有待处理项" }.fetch(summary[:mode], "存在待处理项")
+            { plan: "plan generated; corrections or verification still required", discover: "discovery finished; unverified interfaces remain",
+              apply: "apply finished; pending items remain" }.fetch(summary[:mode], "pending items remain")
           end
         end
       end

data/lib/net/connector/progress.rb

@@ -27,26 +27,26 @@ module Net
 
       # 输出当前开始读取清单的进度提示。
       def reading_inventory(config: nil)
-        write(nil, "正在读取 Netdisco 设备清单#{config ? "（配置：#{config}）" : ""}")
+        write(nil, "Reading Netdisco device inventory#{config ? "(configuration: #{config})" : ""}")
       end
 
       # 以实际选中设备初始化进度，跳过的条目不计入执行任务总数。
-      def plan(total:, selected:, parallel:, label: "全量")
+      def plan(total:, selected:, parallel:, label: "all devices")
         @mutex.synchronize do
           @total = selected
           @completed = @active = 0
           @run_started = monotonic
-          emit(nil, "#{label} | 清单 #{total} 台；本次 #{@total} 台；跳过 #{total - @total} 台；并发 #{parallel}")
+          emit(nil, "#{label} | Inventory #{total} devices; selected #{@total}; skipped #{total - @total} devices; concurrency #{parallel}")
         end
       end
 
       # 任务开始只表示进入登录阶段，不代表设备已连接。
-      def start(host:, label: "采集")
+      def start(host:, label: "collecting")
         @mutex.synchronize do
           @active += 1
-          @stages[host] = "登录"
+          @stages[host] = "logging in"
           @task_started[host] = monotonic
-          @verbose ? emit(host, "开始#{label}") : refresh
+          @verbose ? emit(host, "starting#{label}") : refresh
         end
       end
 
@@ -59,9 +59,9 @@ module Net
           @task_started.delete(host)
           success ? @succeeded += 1 : @failed += 1
           hint = failure_hint(error_code)
-          message = "#{message}；#{hint}" if hint
+          message = "#{message}; #{hint}" if hint
           if @verbose || !success
-            emit(host, "#{message}；耗时 #{duration_ms} ms")
+            emit(host, "#{message}; elapsed #{duration_ms} ms")
           elsif !@tty && ((@completed % 25).zero? || @completed == @total)
             emit(nil, status_line)
           end
@@ -72,9 +72,9 @@ module Net
       # 完成百分比只表示任务结束，最终结果始终由已保存的业务报告决定。
       def finish(success:, succeeded:, partial:, failed:, skipped:, failures: {})
         unless failures.empty?
-          write(nil, "未完成分类：#{failures.sort_by { |code, count| [-count, code.to_s] }.map { |code, count| "#{code}=#{count}" }.join("，")}")
+          write(nil, "Incomplete categories: #{failures.sort_by { |code, count| [-count, code.to_s] }.map { |code, count| "#{code}=#{count}" }.join(", ")}")
         end
-        write(nil, "批次结束：成功 #{succeeded}，部分成功 #{partial}，失败 #{failed}，跳过 #{skipped}；耗时 #{(monotonic - @started_at).round(1)} 秒；结果 #{success ? "完成" : "未完成"}")
+        write(nil, "Batch finished: succeeded #{succeeded}, partial #{partial}, failed #{failed}, skipped #{skipped}; elapsed #{(monotonic - @started_at).round(1)} seconds; result #{success ? "complete" : "incomplete"}")
       end
 
       # 普通批次提示也复用锁、脱敏和输出故障处理。
@@ -89,7 +89,7 @@ module Net
         unless @verbose
           @mutex.synchronize do
             host = event.fields[:host]
-            @stages[host] = "采集" if @stages.key?(host) && event.name == "login_complete" && event.fields[:status] == "ok"
+            @stages[host] = "collecting" if @stages.key?(host) && event.name == "login_complete" && event.fields[:status] == "ok"
             refresh
           end
           return
@@ -97,16 +97,16 @@ module Net
 
         fields = event.fields
         message = case event.name
-                  when "connect" then "正在连接并登录（#{fields[:protocol]}）"
+                  when "connect" then "Connecting and logging in (#{fields[:protocol]})"
                   when "login_complete"
-                    fields[:status] == "ok" ? "登录成功" : "登录失败（#{fields[:code]}）"
-                  when "connect_failed" then "连接失败（#{fields[:code]}）"
-                  when "command_start" then "执行命令：#{fields[:text]}；等待响应"
+                    fields[:status] == "ok" ? "Login succeeded" : "Login failed (#{fields[:code]})"
+                  when "connect_failed" then "Connection failed (#{fields[:code]})"
+                  when "command_start" then "Executing command: #{fields[:text]}; waiting for response"
                   when "command_complete"
-                    fields[:status] == "response_received" ? "命令响应完成（#{fields[:duration_ms]} ms）" :
-                      "命令失败（#{fields[:code]}）"
+                    fields[:status] == "response_received" ? "Command response complete (#{fields[:duration_ms]} ms)" :
+                      "Command failed (#{fields[:code]})"
                   when "operation_complete"
-                    fields[:status] == "completed" ? "脚本处理完成" : "脚本处理失败（#{fields[:code]}）"
+                    fields[:status] == "completed" ? "Script complete" : "Script failed (#{fields[:code]})"
                   end
         write(fields[:host], message) if message
       end
@@ -151,8 +151,8 @@ module Net
       end
 
       # 显示已保存报告的位置与可读标签。
-      def location(path, label: "报告")
-        write(nil, "#{label}：#{path}")
+      def location(path, label: "report")
+        write(nil, "#{label}: #{path}")
       end
 
       private
@@ -160,15 +160,15 @@ module Net
       # 根据已知错误码返回简短排查建议，不展示任意异常正文。
       def failure_hint(code)
         case code
-        when :authentication_failed then "设备拒绝认证，请核对账号、密码或 AAA 策略"
-        when :authentication_error then "认证交互未完成，请核对认证方式或设备 AAA 日志"
-        when :host_key_untrusted then "主机密钥尚未信任，请确认指纹并登记"
-        when :host_key_changed then "已登记主机密钥发生变化，请核实设备身份"
-        when :login_timeout then "未在期限内获得登录提示，请检查 SSH 握手与登录交互"
-        when :connection_timeout then "SSH 连接或握手超时，请检查服务与网络"
-        when :device_error then "设备拒绝命令，请核对厂商映射和账号权限"
-        when :missing_completeness_evidence then "缺少完整性证据，未完成维度见设备报告"
-        when :report_not_saved then "设备报告保存未确认"
+        when :authentication_failed then "Device rejected authentication; check username, password or AAA policy"
+        when :authentication_error then "Authentication dialogue incomplete; check authentication method or device AAA logs"
+        when :host_key_untrusted then "Host key is not yet trusted; verify and register its fingerprint"
+        when :host_key_changed then "Registered host key changed; verify device identity"
+        when :login_timeout then "Login prompt not received before the deadline; check SSH handshake and login dialogue"
+        when :connection_timeout then "SSH connection or handshake timed out; check service and network"
+        when :device_error then "Device rejected the command; check vendor mapping and account permissions"
+        when :missing_completeness_evidence then "Completeness evidence missing; see the device report for incomplete dimensions"
+        when :report_not_saved then "Device report persistence unconfirmed"
         end
       end
 
@@ -176,11 +176,11 @@ module Net
       def status_line
         percent = @total.positive? ? @completed * 100 / @total : 0
         counts = progress_counts
-        "#{@completed}/#{@total} #{percent}% | #{counts} | 登录 #{@stages.values.count("登录")} 采集 #{@stages.values.count("采集")} 排队 #{[@total - @completed - @active, 0].max}"
+        "#{@completed}/#{@total} #{percent}% | #{counts} | Logging in #{@stages.values.count("logging in")} collecting #{@stages.values.count("collecting")} queued #{[@total - @completed - @active, 0].max}"
       end
 
       # 默认统计设备任务，领域适配器可提供自己的计数文案。
-      def progress_counts = "成功 #{@succeeded} 未完成 #{@failed}"
+      def progress_counts = "succeeded #{@succeeded} incomplete #{@failed}"
 
       # 读取单调时钟秒数，避免系统校时影响期限与耗时计算。
       def monotonic = Process.clock_gettime(Process::CLOCK_MONOTONIC)
@@ -198,14 +198,14 @@ module Net
         eta = if @completed == @total && @total.positive?
                 "00:00:00"
               elsif @completed >= 5 && rate.positive?
-                "约 #{duration((@total - @completed) / rate)}"
+                "about #{duration((@total - @completed) / rate)}"
               else
-                "估算中"
+                "estimating"
               end
-        line = "耗时 #{duration(elapsed)} | #{format("%.1f", rate)} 台/秒 | 剩余 #{eta}"
+        line = "elapsed #{duration(elapsed)} | #{format("%.1f", rate)} devices/s | remaining #{eta}"
         host, started = @task_started.min_by { |_key, value| value }
         if started && monotonic - started >= 10
-          line += " | 最久 #{host} #{@stages[host]} #{(monotonic - started).floor}s"
+          line += " | longest #{host} #{@stages[host]} #{(monotonic - started).floor}s"
         end
         line
       end
@@ -260,7 +260,7 @@ module Net
 
         percent = @total.positive? ? " #{(@completed * 100.0 / @total).floor}%" : ""
         clear_refresh
-        line = "[#{Time.now.strftime("%H:%M:%S")}] [#{@completed}/#{@total}#{percent} 执行中 #{@active}] [#{host || "批次"}] #{message}"
+        line = "[#{Time.now.strftime("%H:%M:%S")}] [#{@completed}/#{@total}#{percent} running #{@active}] [#{host || "batch"}] #{message}"
         line = "[#{Time.now.strftime("%H:%M:%S")}] #{host ? "#{host}  " : ""}#{message}" unless @verbose
         write_output(line.gsub(/[[:cntrl:]]/, " ") + "\n")
       end

data/lib/net/connector/resources.rb

@@ -32,7 +32,7 @@ module Net
           Process.setrlimit(:NOFILE, required, hard)
         end
       rescue SystemCallError, ArgumentError, NotImplementedError
-        raise ArgumentError, "本机文件描述符额度不足：#{parallel} 并发至少预留 #{required} 个文件描述符；请提高终端 ulimit -n 或降低 --parallel。已停止，未连接设备。", cause: nil
+        raise ArgumentError, "Insufficient local file descriptor limit: #{parallel} concurrent devices require at least #{required} file descriptors; raise the terminal ulimit -n or lower --parallel. Stopped without connecting to devices.", cause: nil
       end
       private_class_method :reserve!
     end

data/lib/net/connector/version.rb

@@ -3,6 +3,6 @@
 module Net
   module Connector
     # gemspec、CLI 与发布工具共用此版本，运行时读取不触发设备依赖加载。
-    VERSION = "0.17.2"
+    VERSION = "0.18.0"
   end
 end

metadata

@@ -1,28 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: net-connector
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.18.0
 platform: ruby
 authors:
 - net-connector contributors
 bindir: bin
 cert_chain: []
-date: 2026-10-22 00:00:00.000000000 Z
+date: 2026-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ctx_cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: expect-pty
   requirement: !ruby/object:Gem::Requirement