Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c9671c819f | ||
|
|
ef533d9783 | ||
|
|
572e6589ec | ||
|
|
38b6af1f35 | ||
|
|
9628609eea | ||
|
|
fc69adfae4 | ||
|
|
260f5b57d5 | ||
|
|
1263514586 | ||
|
|
9addc5f2d9 | ||
|
|
a9050e31ea | ||
|
|
4bc15ff529 | ||
|
|
6a85a48e6d | ||
|
|
02f4ac49e8 | ||
|
|
89ec175669 | ||
|
|
776509cc6c | ||
|
|
a66d2a19e4 | ||
|
|
68b727f38a | ||
|
|
e5c10afd94 | ||
|
|
fc97e04846 |
+81
-18
@@ -32,7 +32,7 @@ ETTerms 是一個給工程師 / 韌體 / 硬體驗證人員用的**單一視窗
|
||||
| 祕密儲存 | **Windows Credential Manager**(DPAPI / CredMan) | 連線密碼、SSH key passphrase,不落地明碼 |
|
||||
| PDU 控制(選用) | **SnmpSharpNet** | 沿用 MyTeraTerm PDU 控制(`pductrl` / `pduconnect`) |
|
||||
| 日誌 | 自製 **AppLogger**(從 MyTeraTerm 移植) | 檔案 + Debug 雙輸出 |
|
||||
| AI / MCP 整合(選用) | **stdio MCP server**(官方 C# SDK `ModelContextProtocol`) | 獨立行程,但不自己開 port——經本機 named pipe 橋接到 GUI 持有的 serial session,把收發暴露成 AI 可呼叫工具(Kiro CLI / Claude CLI),見 [AI / MCP Integration](#ai--mcp-integrationserial-mcp-server) |
|
||||
| AI / MCP 整合(選用) | **stdio MCP server**(官方 C# SDK `ModelContextProtocol`) | 兩個獨立 server:`ETTerms.SerialMcp`(不自己開 port,經本機 named pipe 橋接 GUI 持有的 serial session)與 `ETTerms.PduMcp`(直接打 SNMP 控制 PDU 插座,不需 GUI);把收發 / 電源控制暴露成 AI 可呼叫工具(Kiro CLI / Claude CLI),見 [AI / MCP Integration](#ai--mcp-integrationserial-mcp--pdu-mcp-server) |
|
||||
| 打包 | `dotnet publish` + (選用)Inno Setup / MSIX | 單機安裝,current-user |
|
||||
|
||||
> **與舊版 MyTeraTerm 的關鍵差異:** 舊版是把真正的 `ttermpro.exe`(TeraTerm)嵌進 Panel,靠 **com0com 虛擬 COM 對**攔截 serial 來跑腳本。ETTerms 改走**全原生**:SSH.NET 做 SSH、`System.IO.Ports` 做 serial、自繪 VT100 控制項做終端機畫面,**不再依賴外部 TeraTerm exe,也不再需要 com0com**。腳本引擎從「驅動 com0com bridge」改成「驅動原生 `ISessionChannel`」。
|
||||
@@ -118,8 +118,11 @@ ETTerms/
|
||||
│ ├── MainForm.cs # 主視窗:Rail + Sidebar + Workspace(含深色標題列 DWM)
|
||||
│ ├── MainForm.Designer.cs
|
||||
│ ├── Theme.cs # 全域深色配色 (KKTerm 風格)
|
||||
│ ├── ActivityRail.cs # 左側圖示列 (Terminal/Scripts/Settings)
|
||||
│ ├── ActivityRail.cs # 左側圖示列 (Terminal/Status/Settings/About)
|
||||
│ ├── ConnectionSidebar.cs# 仿 KKTerm 可編輯資料夾樹(搜尋/CRUD/拖曳分類)
|
||||
│ ├── StatusView.cs # Status 檢視:分頁式(PDU…),PDU 連線後每 3 秒背景輪詢插座狀態,並可用表格內 Control 鈕直接開關各 Port
|
||||
│ ├── SettingsView.cs # Settings 檢視:分頁式(Terminal / AI MCP)
|
||||
│ ├── AboutView.cs # About 檢視(版本 / 連結)
|
||||
│ ├── Dialogs/ # ── 深色對話框 ──
|
||||
│ │ ├── DarkDialog.cs # 對話框基底(深色 + DWM 標題列)
|
||||
│ │ ├── TextPromptDialog.cs # 單行輸入(資料夾命名 / 改名)
|
||||
@@ -131,7 +134,8 @@ ETTerms/
|
||||
│
|
||||
├── Terminal/ # ── 終端機渲染 ──
|
||||
│ ├── TerminalView.cs # 自繪 VT100 控制項 (owner-drawn)
|
||||
│ ├── AnsiParser.cs # ANSI/VT100 escape 解析狀態機
|
||||
│ ├── DarkScrollBar.cs # 自繪深色垂直捲軸 (細長/圓角滑塊, 配深色主題)
|
||||
│ ├── AnsiParser.cs # ANSI/VT100 escape 解析狀態機 (含 DEC 2004 bracketed paste)
|
||||
│ ├── ScreenBuffer.cs # 字格緩衝 (rows×cols, 屬性/顏色)
|
||||
│ └── TerminalInput.cs # 鍵盤 → byte 序列 (含特殊鍵)
|
||||
│
|
||||
@@ -139,7 +143,7 @@ ETTerms/
|
||||
│ ├── ISessionChannel.cs # Write(byte[]) + event DataReceived
|
||||
│ ├── SshChannel.cs # SSH.NET 實作 (ShellStream)
|
||||
│ ├── SerialChannel.cs # System.IO.Ports 實作
|
||||
│ ├── ShellChannel.cs # Windows ConPTY 本機 Shell
|
||||
│ ├── ShellChannel.cs # Windows ConPTY 本機 Shell(StartupDirectory 不存在時 fallback 使用者家目錄)
|
||||
│ ├── SessionPage.cs # 一個分頁 = TerminalView + Channel + 狀態
|
||||
│ ├── SessionManager.cs # 開 / 關 / 列舉所有 active session
|
||||
│ ├── SerialBridgeServer.cs# ✅ 本機 named pipe server:把 serial session 的讀寫橋接給 MCP(Phase 9)
|
||||
@@ -295,6 +299,9 @@ ETTerms 是單視窗多分頁,沒有「路由」,以下以**功能面板**
|
||||
- 接收 channel bytes → `AnsiParser` → `ScreenBuffer` → 繪製
|
||||
- 鍵盤輸入 → `TerminalInput` → byte 序列 → channel
|
||||
- 支援:scrollback、選取 / 複製、貼上、字型 / 配色(從 `TerminalProfile`)
|
||||
- **捲動:** 滑鼠滾輪或右側自繪深色捲軸 `DarkScrollBar`(拖曳滑塊 / 點軌道翻頁);`ContentWidth` 扣掉捲軸寬避免文字被蓋,捲軸範圍 / 位置在 `Feed` / 滾輪 / resize 時同步
|
||||
- **貼上:** 對方啟用 bracketed paste(DEC mode 2004,如 PSReadLine / Kiro CLI)時,整段以 `ESC[200~ … ESC[201~` 包夾送出,避免多行貼上被逐行 Enter 立即送出;未啟用則逐字送出
|
||||
- **複製:** 右鍵複製選取內容後自動清除反白(提示已複製)
|
||||
|
||||
### Script Editor / Runner(Scripts 檢視)
|
||||
- 載入 / 編輯 `.ttl` 腳本(語法沿用 MyTeraTerm)
|
||||
@@ -356,7 +363,16 @@ ScriptRunner.RunAsync(scriptText, activeChannel)
|
||||
|
||||
---
|
||||
|
||||
## AI / MCP Integration(Serial MCP Server)
|
||||
## AI / MCP Integration(Serial MCP + PDU MCP Server)
|
||||
|
||||
ETTerms 提供**兩個獨立的 stdio MCP server**給 AI agent(Kiro CLI / Claude CLI):
|
||||
|
||||
- **`ETTerms.SerialMcp`** — 收發 serial。COM port 獨佔,故由 GUI 唯一持有、MCP 經本機 named pipe 橋接(見下方)。
|
||||
- **`ETTerms.PduMcp`** — 控制 SNMP PDU 電源插座。SNMP(UDP) 非獨佔,故 MCP **直接打 SNMP**,不需 GUI 在跑、也不經 pipe。
|
||||
|
||||
兩者都能用 GUI **Settings → AI MCP** 一鍵 Setup(`McpRegistrar` 會同時註冊 `etterms-serial` 與 `etterms-pdu`)。
|
||||
|
||||
### Serial MCP Server
|
||||
|
||||
> 讓 **Kiro CLI / Claude CLI** 等 AI agent 收發 serial,**且使用者能在 ETTerms GUI 即時看到 AI 的每筆收發**。
|
||||
>
|
||||
@@ -425,6 +441,33 @@ kiro-cli mcp add --name serial --command dotnet `
|
||||
|
||||
或寫進 agent.json 的 `mcpServers`;Claude CLI 則用其對應的 `mcpServers` 設定。**使用前提:先在 ETTerms GUI 開好要操作的 serial 連線**,AI 才能 `serial_attach` 上去。註冊後即可對 AI 說「列出目前 serial session → 接上 COM3 → 送指令看回應」。
|
||||
|
||||
### PDU MCP Server(v0.3.0)
|
||||
|
||||
> 讓 AI agent 直接控制 SNMP PDU 的電源插座,**典型用途:測試中自動 power-cycle DUT**。
|
||||
|
||||
**關鍵設計:直接打 SNMP,不經 GUI 橋接。** 與 serial 不同,PDU 走 SNMP(UDP)**非獨佔**——多個行程可同時對同一台 PDU 下命令。因此 `ETTerms.PduMcp` 不需要像 serial 那樣繞 GUI 的 named pipe,而是內含一份精簡版 `PduController`(OID 邏輯複製自 GUI 的 `Scripting/Pdu/PduController`,診斷改走 stderr 以免污染 stdio JSON-RPC)直接與 PDU 對話。**好處:GUI 不必開著,AI 也能控制 PDU;最少程式碼、最穩。**
|
||||
|
||||
```
|
||||
Kiro/Claude CLI ── 啟動子行程 ETTerms.PduMcp(stdio / JSON-RPC)
|
||||
└─ SnmpSharpNet ──(SNMP/UDP 161)──► PDU(iPoMan II/III)
|
||||
```
|
||||
|
||||
連線狀態(device IP → controller)以行程內單例 `PduRegistry` 保存,跨工具呼叫保留,直到 `pdu_disconnect` 或行程結束。
|
||||
|
||||
**暴露的工具:**
|
||||
|
||||
| 工具 | 參數 | 說明 |
|
||||
|------|------|------|
|
||||
| `pdu_connect` | ip | 以 SNMP 連線並驗證 PDU 回應,成功回傳 model name;控制前必須先呼叫 |
|
||||
| `pdu_list` | — | 列出本 session 已連線的 PDU(依 IP) |
|
||||
| `pdu_set_port` | ip, port, on | 將某插座開(on=true)/關(off=false) |
|
||||
| `pdu_get_port` | ip, port | 讀單一插座的狀態 / 電流(mA) / 功率(W) |
|
||||
| `pdu_status` | ip | 讀全部 12 個插座的狀態 / 電流 / 功率 |
|
||||
| `pdu_power_cycle` | ip, port, offSeconds? | 關 → 等 offSeconds → 開(重啟 DUT) |
|
||||
| `pdu_disconnect` | ip | 解除本 session 的 PDU 連線(不改變插座狀態) |
|
||||
|
||||
> 所有工具回傳統一的 `{ "ok": bool, "result"/"error": ... }` JSON。SNMP community 目前沿用 GUI 版的 `"private"`。
|
||||
|
||||
---
|
||||
|
||||
## Key Constraints & Business Rules
|
||||
@@ -504,32 +547,52 @@ dotnet publish src\ETTerms\ETTerms.csproj -c Release -r win-x64 --self-contained
|
||||
|
||||
**內容結構:**
|
||||
```
|
||||
ETTerms_v0.2.0\
|
||||
├── ETTerms v0.2.0.exe # 主程式 apphost,改名為「ETTerms v{Version}.exe」
|
||||
ETTerms_v0.3.0\
|
||||
├── ETTerms v0.3.0.exe # 主程式 apphost,改名為「ETTerms v{Version}.exe」
|
||||
├── ETTerms.dll + 各相依 dll # SSH.NET / SQLite / SnmpSharpNet / System.IO.Ports …
|
||||
└── ETTerms.SerialMcp\ # Serial MCP server,獨立發佈到子資料夾(相依 dll 與 GUI 隔離)
|
||||
├── ETTerms.SerialMcp.exe
|
||||
└── ETTerms.SerialMcp.dll + 相依
|
||||
├── ETTerms.SerialMcp\ # Serial MCP server,獨立發佈到子資料夾(相依 dll 與 GUI 隔離)
|
||||
│ ├── ETTerms.SerialMcp.exe
|
||||
│ └── ETTerms.SerialMcp.dll + 相依
|
||||
└── ETTerms.PduMcp\ # PDU MCP server(v0.3.0),同樣獨立發佈到子資料夾
|
||||
├── ETTerms.PduMcp.exe
|
||||
└── ETTerms.PduMcp.dll + 相依(含 SnmpSharpNet)
|
||||
```
|
||||
|
||||
**規則:**
|
||||
1. **GUI publish 會自動帶上 MCP**:`ETTerms.csproj` 有 `PublishSerialMcp` target(`AfterTargets="Publish"`),會把 `ETTerms.SerialMcp` 一併發佈到 `ETTerms_v{Version}\ETTerms.SerialMcp\` **子資料夾**(與 GUI 相依 dll 隔離)。因此**只要發佈 GUI 一個指令**即可,不必再單獨發 MCP。
|
||||
- 對齊 `McpRegistrar.ResolveServerExe()`:它解析的 `<ETTerms.exe>\ETTerms.SerialMcp\ETTerms.SerialMcp.exe` 因此**必定存在**,AI MCP 一鍵設定寫進去的路徑才不會落空。
|
||||
1. **GUI publish 會自動帶上兩個 MCP server**:`ETTerms.csproj` 有 `PublishMcpServers` target(`AfterTargets="Publish"`),會把 `ETTerms.SerialMcp` 與 `ETTerms.PduMcp` 一併發佈到各自的 `<publish>\<server>\` **子資料夾**(與 GUI 相依 dll 隔離)。因此**只要發佈 GUI 一個指令**即可,不必再單獨發 MCP。
|
||||
- 對齊 `McpRegistrar.ResolveServerExe()`:它解析的 `<ETTerms.exe>\<server>\<server>.exe` 因此**必定存在**,AI MCP 一鍵設定寫進去的路徑才不會落空。
|
||||
- MCP 子發佈會**跟隨 GUI 的 `SelfContained` 設定**(target 內以 `$(SelfContained)` 傳入):框架相依版的 MCP 也框架相依;portable 版的 MCP 也免 runtime。
|
||||
2. **主 exe 改名**:`dotnet publish` 產生的 `ETTerms.exe` 重新命名為 **`ETTerms v{Version}.exe`**。
|
||||
- 可安全改名:.NET apphost 內部記錄要載入的 `ETTerms.dll`,**不靠自身檔名**,改名後仍正常啟動。
|
||||
3. **框架相依**:`--self-contained false -r win-x64`(目標機需已裝 .NET 8 Desktop Runtime)。
|
||||
|
||||
**PowerShell 範例:**
|
||||
### 兩種發佈版本(兩個都要產出)
|
||||
|
||||
| 版本 | 資料夾 | 指令旗標 | 需 .NET Runtime? | 用途 |
|
||||
|------|--------|----------|-------------------|------|
|
||||
| **A. 框架相依(預設)** | `ETTerms_v{Version}\` | `--self-contained false` | ✅ 需先裝 .NET 8 Desktop Runtime | 體積小;給已具備 runtime 的環境 |
|
||||
| **B. Portable(免安裝)** | `ETTerms_v{Version}_portable\` | `--self-contained true` | ❌ 不需要,runtime 已內含 | 體積大(約 240MB);給受 MIS 管控、不便裝 runtime 的環境,解壓即用、免系統管理員權限 |
|
||||
|
||||
> ⚠️ **不要開 trimming**(`PublishTrimmed`):WinForms 大量用反射,trim 後易在執行時出錯。
|
||||
|
||||
**PowerShell 範例(一次產出兩種):**
|
||||
```powershell
|
||||
$ver = ([regex]::Match((Get-Content src\ETTerms\ETTerms.csproj -Raw), '<Version>([^<]+)</Version>')).Groups[1].Value
|
||||
$root = "src\ETTerms\Publish\ETTerms_v$ver"
|
||||
if (Test-Path $root) { Remove-Item $root -Recurse -Force }
|
||||
$ver = ([regex]::Match((Get-Content src\ETTerms\ETTerms.csproj -Raw), '<Version>([^<]+)</Version>')).Groups[1].Value
|
||||
|
||||
# 發佈 GUI;ETTerms.SerialMcp 由 PublishSerialMcp target 自動發到 $root\ETTerms.SerialMcp\
|
||||
# A. 框架相依版 → ETTerms_v{Version}\
|
||||
$root = "src\ETTerms\Publish\ETTerms_v$ver"
|
||||
if (Test-Path $root) { Remove-Item $root -Recurse -Force }
|
||||
dotnet publish src\ETTerms\ETTerms.csproj -c Release -r win-x64 --self-contained false -o $root
|
||||
Rename-Item (Join-Path $root "ETTerms.exe") "ETTerms v$ver.exe"
|
||||
|
||||
# B. Portable 免安裝版 → ETTerms_v{Version}_portable\(runtime 已內含;MCP 也跟著 self-contained)
|
||||
$proot = "src\ETTerms\Publish\ETTerms_v${ver}_portable"
|
||||
if (Test-Path $proot) { Remove-Item $proot -Recurse -Force }
|
||||
dotnet publish src\ETTerms\ETTerms.csproj -c Release -r win-x64 --self-contained true -o $proot
|
||||
Rename-Item (Join-Path $proot "ETTerms.exe") "ETTerms v$ver.exe"
|
||||
```
|
||||
|
||||
> 兩版的 `ETTerms.SerialMcp\` 與 `ETTerms.PduMcp\` 子資料夾都由 `PublishMcpServers` target 自動產生;portable 版的 MCP 也是 self-contained,故 AI MCP 功能在無 runtime 環境同樣可用。
|
||||
|
||||
---
|
||||
|
||||
## Development Phases
|
||||
|
||||
@@ -10,7 +10,15 @@ ETTerms 是一個 **C# .NET 8 WinForms** 的原生 Windows 終端機工作台,
|
||||
|
||||
**進度:** Phase 1–5 ✅、Phase 6 ✅(TTL 引擎 + Group 同步,SSH 待驗收)、Phase 7 ✅(Settings/About)、Phase 8 ✅(PDU + Shell/ConPTY + SFTP + Settings 擴充)、Phase 9 ✅(Serial MCP server:**GUI 持有 COM port,MCP 經本機 named pipe 橋接**,AI 收發的資料即時以 `[AI]` 標色顯示在 GUI)。打包待指示。
|
||||
|
||||
**v0.2.1:** 新增 GUI **Settings → AI MCP** 分頁(`McpRegistrar`):對 Claude Code(`~/.claude.json`)與 Kiro(`~/.kiro/settings/mcp.json`)**一鍵 Setup / Remove** 註冊 `etterms-serial` MCP server,read-modify-write 保留檔內其他設定、原子寫回;卡片附 CLI 驗證指令。`ETTerms.csproj` 加 `PublishSerialMcp` target(`AfterTargets=Publish`),GUI publish 會自動把 `ETTerms.SerialMcp` 帶到 `\ETTerms.SerialMcp\` 子資料夾,與 `McpRegistrar.ResolveServerExe()` 解析路徑對齊。
|
||||
**v0.4.0:** 效能 / 穩定性總整理(來自全 codebase 審視)。**(1) 終端機繪製熱路徑去配置** — `TerminalView` 快取 4 種 Font 變體(Bold/Underline 組合)與單一可變色 `SolidBrush`,run 合併時每 cell 顏色只解析一次,`Dispose` 收掉 GDI 資源;**(2) scrollback 改環形緩衝** — `ScreenBuffer` 從 `List+RemoveRange(0,…)`(滿了每行 O(n) 搬移)改 O(1) ring buffer;**(3) UTF-8 跨 chunk 亂碼修正(3 處)** — `TTLInterpreter.OnData`、`SerialBridgeServer` rx 轉發、`SessionLogger.Write` 改用 stateful `Decoder`(比照 `AnsiParser` 原本的正確做法);**(4) PDU SNMP 批次查詢** — 新共用專案 **`src/ETTerms.PduCore/`** 取代 GUI 與 PduMcp 兩份複製的 `PduController`(log 走建構子委派),新增 `GetAllPortsStatus()` 一個 SNMP GET 帶 12 個 varbind,12 port 輪詢從 36 個 UDP 來回縮成 3 個(StatusView 與 `pdu_status` 都改用);**(5) ShellChannel 資源修正** — `DeleteProcThreadAttributeList`+`FreeHGlobal` 釋放 attribute list、`CloseHandle(pi.hProcess)`,shell 自行 exit 時顯示灰色 `[ETTerms] shell process exited` 提示;**(6) SSH 斷線可見** — 訂 `ErrorOccurred`/`ShellStream.Closed` 顯示提示,`Write` 例外不再炸 UI thread;**(7) 終端機行為** — 新輸出只在已貼底時跟隨(看歷史不被拉回底部)、alt screen 滾輪轉方向鍵(vim/htop 可滾)、回應 DSR `ESC[6n`/`ESC[5n` 與 DA `ESC[c`(TUI 查游標位置不再卡住);**(8) TTL** — `_recv` 上限 1MB、wait 輪詢長度沒變不重掃;**(9) 去重複** — `ScriptRunner` 兩個 Run 合併、`TtlScript` 共用選檔/group 指令檢查(SessionPage/WorkspaceView 三份流程收斂)、`ConnectionStore` 讀取改 InvariantCulture+RoundtripKind。註:group `waitall` 一個成員失敗其他成員停在 barrier 是**刻意行為**(使用者要求整組停下),勿「修」。
|
||||
|
||||
**v0.3.2:** **(1) 新增左側 `Status` rail view** — 位於 Terminal 與 Settings 之間(圖示 `⚡`,新增 `ActivityRail.RailView.Status` 列舉與 `Items`),獨立 `App/StatusView.cs`,沿用 `SettingsView` 的自繪 tab strip + panel 切換風格(避免 TabControl 白邊);`MainForm` 加 `_statusView` 欄位、佈局與 rail 切換可見性。目前只有 **PDU 分頁**,未來會再加分頁(`MakeTab(...)` 即可擴充)。**(2) PDU 搬到 Status 並改自動輪詢** — PDU 從 `SettingsView` 移到 `StatusView`,**移除手動 Refresh 按鈕**,連線成功後以 `System.Threading.Timer`(period 3000ms)在**背景執行緒**讀 SNMP、再 `BeginInvoke` 回 UI 更新表格(不卡 UI);`Interlocked` 旗標防止前一輪未讀完就重入;斷線 / 控制項 Dispose 時自動停掉 timer 與 `PduController`;表格下方顯示「last update HH:mm:ss」。`SettingsView` 移除 `BuildPduTab`/`RefreshPduGrid` 與 `ETTerms.Scripting.Pdu` import,現只剩 **Terminal / AI MCP** 兩分頁。**(2b) PDU 分頁加手動開關鈕** — 狀態表格新增 **Control** 欄(`DataGridViewButtonColumn`),每個 Port 一顆鈕,文字隨狀態切換(ON→「Turn OFF」、OFF→「Turn ON」、未知→「—」);點擊在背景執行緒呼叫 `PduController.SetPortOn/SetPortOff`(不卡 UI),等 ~400ms 後回讀刷新整表,失敗跳 `MessageBox`;未連線點擊會提示先 Connect,斷線時清空表格避免顯示過時狀態。**(3) 修 `ShellChannel` 啟動目錄 fallback** — 本機 Shell 的 `StartupDirectory` 若已不存在(外接碟拔除 / 資料夾被刪)會 `CreateProcess failed: 267 (ERROR_DIRECTORY)`;改為「為空 **或** `Directory.Exists` 為 false」即 fallback 到使用者家目錄(`Environment.SpecialFolder.UserProfile`,隨登入者變動,例如 `C:\Users\et_wen`),與 Windows PowerShell 行為一致。
|
||||
|
||||
**v0.3.1:** 終端機體驗修正(皆在 `src/ETTerms/Terminal/`)。**(1) 深色垂直捲軸** — 新增自繪 `DarkScrollBar`(細長、無箭頭、圓角滑塊,配合 KKTerm 深色主題),`TerminalView` 右側 `Dock=Right` 掛上,`ContentWidth` 扣掉捲軸寬避免文字被蓋,`UpdateScrollBar()` 在 `Feed` / 滾輪 / resize 時同步滑塊範圍與位置,滾輪與拖曳互通。**(2) 多行貼上修正** — `AnsiParser` 新增 `BracketedPaste`(DEC mode 2004);`TerminalView.Paste()` 在對方啟用 bracketed paste(PSReadLine / Kiro CLI 等)時以 `ESC[200~ … ESC[201~` 包夾整段,視為「單次貼上」而非逐行 Enter 立即送出;未啟用時退回原本逐字送出。**(3) 右鍵複製清反白** — 右鍵複製後清掉 `_hasSel` 並重繪,讓使用者知道已複製。
|
||||
|
||||
**v0.3.0:** 新增 **`ETTerms.PduMcp`**(stdio MCP server):讓 AI agent 直接控制 SNMP PDU 插座。與 serial 不同,PDU 走 SNMP(UDP) **非獨佔**,故 PduMcp **直接打 SNMP、不經 GUI 橋接**(內含精簡版 `PduController`,OID 邏輯複製自 GUI 版,log 走 stderr),GUI 不開著也能用。工具:`pdu_connect` / `pdu_list` / `pdu_set_port` / `pdu_get_port` / `pdu_status` / `pdu_power_cycle` / `pdu_disconnect`,回傳統一 `{ok, result/error}` JSON;連線狀態以行程內單例 `PduRegistry`(IP→controller)保存。`McpRegistrar` 改為多 server,**Settings → AI MCP 一鍵同時註冊 `etterms-serial` 與 `etterms-pdu`**;`ETTerms.csproj` 的 publish target 更名 `PublishMcpServers`,GUI publish 會把兩個 MCP 各自帶到 `\ETTerms.SerialMcp\`、`\ETTerms.PduMcp\` 子資料夾。
|
||||
|
||||
**v0.2.1:** 新增 GUI **Settings → AI MCP** 分頁(`McpRegistrar`):對 Claude Code(`~/.claude.json`)與 Kiro(`~/.kiro/settings/mcp.json`)**一鍵 Setup / Remove** 註冊 `etterms-serial` MCP server,read-modify-write 保留檔內其他設定、原子寫回;卡片附 CLI 驗證指令。`ETTerms.csproj` 加 publish target(`AfterTargets=Publish`),GUI publish 會自動把 MCP server 帶到子資料夾,與 `McpRegistrar.ResolveServerExe()` 解析路徑對齊。
|
||||
|
||||
**v0.2.0:** Phase 9 完成 — `ETTerms.SerialMcp`(stdio MCP server)+ GUI `SerialBridgeServer`(named pipe `\\.\pipe\etterms-serial`)上線,提供 `serial_list` / `serial_attach` / `serial_write` / `serial_read` / `serial_detach` 五個工具,AI 的 TX 在 GUI 以 `[AI]` 標色即時 echo;視窗 / 工作列 / About 改用 Choco 圖示,標題列顯示版本號。見 [docs/serial-mcp-guide.md](docs/serial-mcp-guide.md)。
|
||||
|
||||
@@ -27,7 +35,7 @@ ETTerms 是一個 **C# .NET 8 WinForms** 的原生 Windows 終端機工作台,
|
||||
- **連線儲存:** SQLite(`Microsoft.Data.Sqlite`)
|
||||
- **密碼儲存:** Windows Credential Manager(不落地明碼)
|
||||
- **PDU:** SnmpSharpNet(iPoMan II/III via SNMP)
|
||||
- **AI / MCP(選用):** stdio MCP server(`ETTerms.SerialMcp`,官方 C# SDK `ModelContextProtocol`)。**不自己開 COM port**,而是經本機 named pipe 接上 GUI 持有的 serial session,把 serial 收發暴露給 Kiro CLI / Claude CLI;AI 的 TX/RX 同步顯示在 GUI
|
||||
- **AI / MCP(選用):** 兩個 stdio MCP server(官方 C# SDK `ModelContextProtocol`)。`ETTerms.SerialMcp`:**不自己開 COM port**,經本機 named pipe 接上 GUI 持有的 serial session,AI 的 TX/RX 同步顯示在 GUI。`ETTerms.PduMcp`(v0.3.0):**直接打 SNMP** 控制 PDU 插座,非獨佔故不需 GUI 在跑。皆暴露給 Kiro CLI / Claude CLI
|
||||
- **設定持久化:** JSON → `%LocalAppData%\ETTerms\settings.json`
|
||||
|
||||
## 常用指令
|
||||
@@ -40,14 +48,21 @@ dotnet run --project src\ETTerms\ETTerms.csproj
|
||||
# 加套件
|
||||
dotnet add src\ETTerms package SSH.NET
|
||||
|
||||
# 打包(見「Publish / 打包慣例」,輸出固定到 src\ETTerms\Publish\ETTerms_v{Version}\)
|
||||
# GUI publish 會「自動」把 ETTerms.SerialMcp 一併發到 \ETTerms.SerialMcp\ 子資料夾
|
||||
# (ETTerms.csproj 的 PublishSerialMcp target,AfterTargets=Publish),不必再單獨發 MCP。
|
||||
# 打包(見「Publish / 打包慣例」)—— 兩種版本都產出,輸出到 src\ETTerms\Publish\
|
||||
# GUI publish 會「自動」把 ETTerms.SerialMcp 與 ETTerms.PduMcp 一併發到各自的子資料夾
|
||||
# (ETTerms.csproj 的 PublishMcpServers target,AfterTargets=Publish),且 MCP 跟隨 GUI 的 self-contained 設定。
|
||||
$ver = ([regex]::Match((Get-Content src\ETTerms\ETTerms.csproj -Raw), '<Version>([^<]+)</Version>')).Groups[1].Value
|
||||
|
||||
# A. 框架相依版(需目標機已裝 .NET 8 Desktop Runtime)→ ETTerms_v{Version}\
|
||||
$root = "src\ETTerms\Publish\ETTerms_v$ver"
|
||||
dotnet publish src\ETTerms\ETTerms.csproj -c Release -r win-x64 --self-contained false -o $root
|
||||
Rename-Item (Join-Path $root "ETTerms.exe") "ETTerms v$ver.exe"
|
||||
|
||||
# B. Portable 免安裝版(runtime 內含,免裝、免管理員)→ ETTerms_v{Version}_portable\
|
||||
$proot = "src\ETTerms\Publish\ETTerms_v${ver}_portable"
|
||||
dotnet publish src\ETTerms\ETTerms.csproj -c Release -r win-x64 --self-contained true -o $proot
|
||||
Rename-Item (Join-Path $proot "ETTerms.exe") "ETTerms v$ver.exe"
|
||||
|
||||
# 註冊 Serial MCP server(給 AI agent 操作 serial)
|
||||
# 推薦:GUI Settings → AI MCP 分頁,對 Claude Code / Kiro 按 Setup 一鍵註冊(McpRegistrar)。
|
||||
# 或手動 CLI:
|
||||
@@ -57,7 +72,7 @@ kiro-cli mcp add --name serial --command dotnet --args "run --project src\ETTerm
|
||||
## 開發慣例
|
||||
|
||||
- **命名:** PascalCase 類別 / 方法,`_camelCase` 私有欄位;檔名 = 類別名。
|
||||
- **Publish / 打包:** 固定輸出到 `src\ETTerms\Publish\ETTerms_v{Version}\`(`{Version}` 取自 csproj `<Version>`);主 exe 改名為 `ETTerms v{Version}.exe`;`ETTerms.SerialMcp` 一併發到其下 `ETTerms.SerialMcp\` 子資料夾。框架相依(`--self-contained false -r win-x64`)。詳見 [ARCHITECTURE.md](ARCHITECTURE.md#publish--打包慣例)。
|
||||
- **Publish / 打包:** 輸出到 `src\ETTerms\Publish\`;主 exe 改名為 `ETTerms v{Version}.exe`;`ETTerms.SerialMcp` 與 `ETTerms.PduMcp` 一併發到其下 `ETTerms.SerialMcp\`、`ETTerms.PduMcp\` 子資料夾(且跟隨 GUI 的 self-contained 設定)。**兩種版本都產出**:框架相依 `ETTerms_v{Version}\`(`--self-contained false`,需裝 .NET 8 Desktop Runtime)+ portable 免安裝 `ETTerms_v{Version}_portable\`(`--self-contained true`,runtime 內含)。不要開 trimming(WinForms 反射)。詳見 [ARCHITECTURE.md](ARCHITECTURE.md#publish--打包慣例)。
|
||||
- **分層:** UI(`App/`)只認 `ISessionChannel` 抽象,不直接相依 SSH.NET / SerialPort。
|
||||
- **執行緒:** channel I/O 在背景;所有 UI 更新一律 `Control.Invoke` 回 UI thread。
|
||||
- **commit:** 走 Conventional Commits(`feat:` / `fix:` / `refactor:` …)。
|
||||
@@ -73,10 +88,14 @@ kiro-cli mcp add --name serial --command dotnet --args "run --project src\ETTerm
|
||||
- ⚠️ VT 相容性以常見情境(VT100 / 常見 ANSI)為主,冷門 escape 後補,不阻塞 GUI 進度。
|
||||
- ⚠️ 本專案**無伺服端祕密 / 無 DB 密碼 / 無 EC2 / 無 VM**,因此不套用 AWS / VirtualBox 部署流程。
|
||||
- ⚠️ Group 同步指令(`waitall` / `sendlnall` / `sendlngroup`)**只能在 Run Group 模式**使用;`▶ Script` 和 `▶ Run All` 須拒絕含這些指令的腳本。
|
||||
- ⚠️ Group `waitall` 的 barrier 行為:**一個成員失敗/停止,其他成員會停在 barrier 等** —— 這是刻意設計(整組一起停下來),不是 bug,勿改成 RemoveParticipant。
|
||||
- ⚠️ `SshChannel.Resize` 用反射挖 SSH.NET 私有 `_channel` 呼叫 `SendWindowChangeRequest`(該 API 未公開)。**升級 SSH.NET 版本時必須驗證 resize 仍有效**(連上後拉視窗大小看遠端 TUI 是否跟著變)。
|
||||
|
||||
## 資料夾用途
|
||||
|
||||
- **`src/ETTerms/`** — 主應用程式(WinForms 視窗外殼 + 連線 / 終端機 / 腳本引擎)。
|
||||
- **`src/ETTerms.SerialMcp/`** — ✅ stdio MCP server(給 AI agent 收發 serial)。獨立行程,但**不直接開 COM port**:經本機 named pipe 連到 GUI 的 `SerialBridgeServer`,由 GUI 代為讀寫實體 port;net8.0 console + `ModelContextProtocol` SDK。
|
||||
- **`src/ETTerms.PduMcp/`** — ✅ stdio MCP server(給 AI agent 控制 SNMP PDU,v0.3.0)。獨立行程,**直接打 SNMP**,不經 GUI、GUI 不開著也能用;net8.0 console + `ModelContextProtocol`,PDU 邏輯用 `ETTerms.PduCore`。
|
||||
- **`src/ETTerms.PduCore/`** — ✅ PDU SNMP 控制共用庫(v0.4.0)。GUI 與 PduMcp 共用的唯一 `PduController`(先前兩份複製已移除);診斷 log 走建構子注入委派(GUI→AppLogger、MCP→stderr);含批次查詢 `GetAllPortsStatus()`。
|
||||
- **`For_AI/`** — AI 協作素材與**參考專案**(`KKTerm-main` UI 參考、`MyTeraTerm` Script 參考)。整個資料夾 gitignored,僅供開發對照。
|
||||
- 本專案**無 `secret/` 資料夾**:沒有伺服端祕密 / DB 密碼 / compile-time secret,連線密碼一律走 Windows Credential Manager。
|
||||
|
||||
@@ -2,5 +2,7 @@
|
||||
<Folder Name="/src/">
|
||||
<Project Path="src/ETTerms/ETTerms.csproj" />
|
||||
<Project Path="src/ETTerms.SerialMcp/ETTerms.SerialMcp.csproj" />
|
||||
<Project Path="src/ETTerms.PduMcp/ETTerms.PduMcp.csproj" />
|
||||
<Project Path="src/ETTerms.PduCore/ETTerms.PduCore.csproj" />
|
||||
</Folder>
|
||||
</Solution>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
> A native Windows terminal workspace (C# .NET 8 WinForms) — **SSH**, **Serial Port**, and **local Shell (ConPTY)** in one window, with a **TTL scripting engine** ported from MyTeraTerm for automation, plus an optional **Serial MCP server** that lets AI agents (Kiro CLI / Claude CLI) drive the serial port directly. Standalone, no cloud, no login.
|
||||
|
||||
       
|
||||
       
|
||||
|
||||
---
|
||||
|
||||
@@ -63,6 +63,7 @@
|
||||
|
||||
- ⚡ **PDU power control (optional)**
|
||||
- Control PDU outlets over SNMP (`SnmpSharpNet`) to power-cycle devices during tests
|
||||
- **Status → PDU** tab: connect to a PDU, auto-poll outlet state every 3 s, and toggle any port on/off with per-row **Control** buttons
|
||||
- Script commands: `pduconnect` / `pductrl`
|
||||
|
||||
- 🤖 **AI / MCP integration (optional)**
|
||||
@@ -77,9 +78,10 @@
|
||||
### Terminal Rendering
|
||||
|
||||
- 🎨 Owner-drawn VT100 / ANSI control, double-buffered cell grid
|
||||
- 🌑 KKTerm-style dark theme (incl. DWM dark title bar)
|
||||
- 🌑 KKTerm-style dark theme (incl. DWM dark title bar + dark terminal scrollbar)
|
||||
- 🔤 Configurable font / size / palette / scrollback
|
||||
- 📋 Select / copy / paste
|
||||
- 🖱️ Scroll back through long output with the mouse wheel or the dark scrollbar
|
||||
- 📋 Select / copy / paste — right-click copy clears the highlight; multi-line paste uses **bracketed paste** so it isn't submitted line-by-line
|
||||
|
||||
---
|
||||
|
||||
@@ -402,6 +404,35 @@ ETTerms/
|
||||
|
||||
## 📜 Version History
|
||||
|
||||
### v0.3.3
|
||||
|
||||
- **Terminal input fix** — after the terminal had printed output (Serial or PowerShell), switching away and back (minimize, or click another app) could leave it unable to accept typing or **Enter**, forcing a session reopen; idle sessions were never affected
|
||||
- Cause: once output built up scrollback, the terminal's scrollbar could steal keyboard focus on window re-activation. The scrollbar is now mouse-only and never takes focus, so input keeps working no matter how much has printed
|
||||
|
||||
### v0.3.2
|
||||
|
||||
- **Status → PDU tab** — a dedicated `Status` rail view hosts the PDU panel: connect by IP, auto-poll all 12 outlets every 3 s (background thread, no manual Refresh), with live current / power readouts
|
||||
- **Manual outlet control buttons** — each row has a **Control** button that toggles that port on/off over SNMP; the label tracks state (ON → "Turn OFF", OFF → "Turn ON"), the SNMP set runs off the UI thread, and the grid refreshes after the command
|
||||
|
||||
### v0.3.1
|
||||
|
||||
- **Terminal usability fixes** — added a **dark vertical scrollbar** (drag or click-to-page through long output instead of long mouse-wheel scrolling)
|
||||
- **Multi-line paste** into Kiro CLI / PSReadLine now pastes as a single block (**bracketed paste**, DEC mode 2004) instead of submitting each line immediately
|
||||
- Right-click copy now **clears the highlight** so you know it worked
|
||||
|
||||
### v0.3.0
|
||||
|
||||
- **AI-driven PDU power control (MCP)** — new `ETTerms.PduMcp` server lets AI agents (Kiro CLI / Claude CLI) control an SNMP PDU directly: outlets on/off, status, and power-cycle a DUT during automated tests
|
||||
- PDU runs over SNMP (UDP, non-exclusive), so the AI talks to it directly — the ETTerms GUI does not need to be running
|
||||
- Tools: `pdu_connect` / `pdu_list` / `pdu_set_port` / `pdu_get_port` / `pdu_status` / `pdu_power_cycle` / `pdu_disconnect`
|
||||
- **Settings → AI MCP** now registers both `etterms-serial` and `etterms-pdu` with one click; publishing the GUI auto-bundles both MCP servers
|
||||
|
||||
### v0.2.2
|
||||
|
||||
- **Terminal stability** — the terminal no longer freezes after minimizing or switching tabs (most noticeable with full-screen TUIs like Kiro CLI in PowerShell); a degenerate 1×1 size is no longer sent to the pseudo-console
|
||||
- **Shift+Enter** inserts a newline in the shell, so you can type multi-line commands (plain Enter still submits)
|
||||
- **High-DPI fixes** — text and buttons no longer clipped at 125% / 150% scaling (PerMonitorV2); toolbar / settings / sidebar / About now scale adaptively
|
||||
|
||||
### v0.2.1
|
||||
|
||||
- **AI MCP one-click setup** — new **Settings → AI MCP** tab registers the Serial MCP server into Claude Code (`~/.claude.json`) or Kiro (`~/.kiro/settings/mcp.json`) with a single button; existing MCP servers are preserved, and each card shows the verify command
|
||||
@@ -432,7 +463,7 @@ Licensed under the **MIT License** — see [LICENSE](LICENSE).
|
||||
|
||||
## 🙏 Acknowledgments
|
||||
|
||||
- **[KKTerm](https://github.com/)** — UI design reference (Activity Rail + tabbed workspace + Saved Connections)
|
||||
- **[KKTerm](https://github.com/ryantsai/KKTerm)** — by ryantsai (MIT) — UI design reference (Activity Rail + tabbed workspace + Saved Connections)
|
||||
- **MyTeraTerm** — source of the TTL scripting engine and `AppLogger`
|
||||
- **[SSH.NET](https://github.com/sshnet/SSH.NET)**, **[SnmpSharpNet](http://www.snmpsharpnet.com/)** — open-source connectivity / SNMP libraries
|
||||
- **Microsoft** — .NET 8, WinForms, ConPTY, Credential Manager
|
||||
|
||||
+35
-4
@@ -4,7 +4,7 @@
|
||||
|
||||
> 原生 Windows 終端機工作台(C# .NET 8 WinForms)—— 一個視窗整合 **SSH**、**Serial Port**、**本機 Shell (ConPTY)** 連線,內建從 MyTeraTerm 移植的 **TTL 腳本引擎**做自動化,並提供選用的 **Serial MCP server**,讓 AI agent(Kiro CLI / Claude CLI)直接操作 serial port。單機、無雲、無登入系統。
|
||||
|
||||
       
|
||||
       
|
||||
|
||||
---
|
||||
|
||||
@@ -63,6 +63,7 @@
|
||||
|
||||
- ⚡ **PDU 電源控制(選用)**
|
||||
- 透過 SNMP(`SnmpSharpNet`)控制 PDU 插座,測試中遠端電源循環
|
||||
- **Status → PDU** 分頁:連線 PDU 後每 3 秒自動輪詢插座狀態,並可用各列的 **Control** 鈕直接開 / 關該 Port
|
||||
- 腳本指令:`pduconnect` / `pductrl`
|
||||
|
||||
- 🤖 **AI / MCP 整合(選用)**
|
||||
@@ -77,9 +78,10 @@
|
||||
### 終端機渲染
|
||||
|
||||
- 🎨 自繪 VT100 / ANSI 控制項(owner-drawn),雙緩衝繪字格
|
||||
- 🌑 KKTerm 風格深色主題(含 DWM 深色標題列)
|
||||
- 🌑 KKTerm 風格深色主題(含 DWM 深色標題列 + 深色終端機捲軸)
|
||||
- 🔤 可調字型 / 字級 / 配色 / scrollback 行數
|
||||
- 📋 選取 / 複製 / 貼上
|
||||
- 🖱️ 用滑鼠滾輪或深色捲軸往回捲長輸出
|
||||
- 📋 選取 / 複製 / 貼上 —— 右鍵複製會清掉反白;多行貼上採 **bracketed paste**,不會被逐行送出
|
||||
|
||||
---
|
||||
|
||||
@@ -402,6 +404,35 @@ ETTerms/
|
||||
|
||||
## 📜 版本紀錄
|
||||
|
||||
### v0.3.3
|
||||
|
||||
- **終端機輸入修正** —— 終端機印過輸出後(Serial 或 PowerShell),切走再切回(縮小視窗、或點其他程式)可能導致無法打字或按 **Enter**,只能重開 session;閒置時則不受影響
|
||||
- 原因:輸出累積出 scrollback 後,視窗重新取得焦點時終端機捲軸可能搶走鍵盤焦點。捲軸已改為純滑鼠操作、永不吃焦點,無論印出多少都能正常輸入
|
||||
|
||||
### v0.3.2
|
||||
|
||||
- **Status → PDU 分頁** —— 新增 `Status` rail 檢視,PDU 面板移到此處:輸入 IP 連線後每 3 秒自動輪詢全部 12 個插座(背景執行緒,免手動 Refresh),即時顯示電流 / 功率
|
||||
- **手動插座開關鈕** —— 每列新增 **Control** 鈕,按一下即透過 SNMP 切換該 Port 開 / 關;按鈕文字隨狀態變動(ON →「Turn OFF」、OFF →「Turn ON」),SNMP 設定在 UI 執行緒外執行,下命令後自動回讀刷新表格
|
||||
|
||||
### v0.3.1
|
||||
|
||||
- **終端機體驗修正** —— 新增**深色垂直捲軸**(拖曳滑塊或點軌道翻頁,不必狂滾滑鼠看長輸出)
|
||||
- 貼多行到 Kiro CLI / PSReadLine 現在會**整段一次貼上**(**bracketed paste**,DEC mode 2004),不再逐行立即送出
|
||||
- 右鍵複製後會**清掉反白**,讓你知道已複製
|
||||
|
||||
### v0.3.0
|
||||
|
||||
- **AI 控制 PDU 電源(MCP)** —— 新增 `ETTerms.PduMcp` server,讓 AI agent(Kiro CLI / Claude CLI)直接控制 SNMP PDU:插座開 / 關、讀狀態、自動化測試時 power-cycle 一台 DUT
|
||||
- PDU 走 SNMP(UDP,非獨佔),AI 直接打 PDU —— ETTerms GUI 不需開著
|
||||
- 工具:`pdu_connect` / `pdu_list` / `pdu_set_port` / `pdu_get_port` / `pdu_status` / `pdu_power_cycle` / `pdu_disconnect`
|
||||
- **設定 → AI MCP** 一鍵同時註冊 `etterms-serial` 與 `etterms-pdu`;publish 會自動把兩個 MCP server 一併打包
|
||||
|
||||
### v0.2.2
|
||||
|
||||
- **終端機穩定性** —— 視窗最小化或切換分頁後終端機不再卡住(跑全螢幕 TUI 如 PowerShell 裡的 Kiro CLI 最明顯);不再把退化的 1×1 尺寸送給 pseudo-console
|
||||
- **Shift+Enter** 在 shell 插入換行,可輸入多行指令(單純 Enter 仍是送出)
|
||||
- **高 DPI 修正** —— 125% / 150% 縮放下文字與按鈕不再被裁切(PerMonitorV2);toolbar / 設定 / 側欄 / About 改為自適應縮放
|
||||
|
||||
### v0.2.1
|
||||
|
||||
- **AI MCP 一鍵設定** —— 新增 **設定 → AI MCP** 分頁,一個按鈕就把 Serial MCP server 註冊進 Claude Code(`~/.claude.json`)或 Kiro(`~/.kiro/settings/mcp.json`);保留檔內其他既有 MCP server,卡片並顯示驗證指令
|
||||
@@ -432,7 +463,7 @@ ETTerms/
|
||||
|
||||
## 🙏 致謝
|
||||
|
||||
- **[KKTerm](https://github.com/)** — UI 設計參考(Activity Rail + 分頁工作區 + Saved Connections)
|
||||
- **[KKTerm](https://github.com/ryantsai/KKTerm)** — by ryantsai(MIT)UI 設計參考(Activity Rail + 分頁工作區 + Saved Connections)
|
||||
- **MyTeraTerm** — TTL 腳本引擎與 `AppLogger` 來源
|
||||
- **[SSH.NET](https://github.com/sshnet/SSH.NET)**、**[SnmpSharpNet](http://www.snmpsharpnet.com/)** — 開源連線 / SNMP 函式庫
|
||||
- **Microsoft** — .NET 8、WinForms、ConPTY、Credential Manager
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
# v0.3.2 — Status page with PDU outlet control
|
||||
|
||||
## ✨ New features
|
||||
|
||||
**Status page — control PDU outlets with buttons**
|
||||
* New **Status** view (the **⚡** icon on the left, between Terminal and Settings) with a **PDU** tab —
|
||||
connect to your PDU by IP and see every outlet at a glance: state, current (mA) and power (W).
|
||||
* Each outlet row now has its own **Control** button: the label tracks the live state
|
||||
(**Turn ON** when off, **Turn OFF** when on), so a single click flips that port. The SNMP command
|
||||
runs off the UI thread, the grid refreshes after the change, and it resets cleanly on disconnect.
|
||||
* Outlet status **auto-refreshes every 3 seconds** in the background — no more manual Refresh button.
|
||||
* The PDU panel moved out of **Settings** into its own Status tab (Settings now keeps just
|
||||
**Terminal / AI MCP**), and the layout is ready for more Status tabs later.
|
||||
|
||||
## 🐛 Bug fixes
|
||||
|
||||
**Local Shell startup**
|
||||
* Fixed: the local Shell no longer fails to start when its saved working folder is gone
|
||||
(e.g. an unplugged USB drive or a deleted folder), which previously caused
|
||||
`CreateProcess failed: 267 (ERROR_DIRECTORY)`. It now falls back to your home folder,
|
||||
matching Windows PowerShell behavior.
|
||||
|
||||
## 📦 Downloads
|
||||
|
||||
Two builds are produced:
|
||||
|
||||
| Build | Needs .NET 8 Desktop Runtime? | Notes |
|
||||
|-------|-------------------------------|-------|
|
||||
| **Standard** (`ETTerms_v0.3.2`) | ✅ Yes | Smaller; for machines that already have the runtime |
|
||||
| **Portable** (`ETTerms_v0.3.2_portable`) | ❌ No | Runtime bundled — unzip and run, no install / admin needed |
|
||||
|
||||
Run `ETTerms v0.3.2.exe`.
|
||||
|
||||
## 🔗 Links
|
||||
* PDU MCP & Serial MCP setup guide:
|
||||
[docs/serial-mcp-guide.md](https://github.com/ETWen/ETTerms/blob/main/docs/serial-mcp-guide.md)
|
||||
* TTL reference:
|
||||
[docs/ttl-script-reference.md](https://github.com/ETWen/ETTerms/blob/main/docs/ttl-script-reference.md)
|
||||
|
||||
**Full changelog:** [v0.3.1...v0.3.2](https://github.com/ETWen/ETTerms/compare/v0.3.1...v0.3.2)
|
||||
@@ -0,0 +1,32 @@
|
||||
# v0.3.3 — Terminal input no longer dies after activity
|
||||
|
||||
## 🐛 Bug fixes
|
||||
|
||||
**Terminal stops accepting input after you switch away and back**
|
||||
* Fixed: once the terminal had printed some output (on a **Serial** or **PowerShell** tab),
|
||||
switching away and back — minimizing the window, or clicking another app — could leave the
|
||||
terminal unable to accept any typing or **Enter**. Previously the only way out was to close
|
||||
and reopen the session (re-open the COM port / start a fresh PowerShell).
|
||||
* While the session sat idle, this never happened — it only showed up after enough output had
|
||||
scrolled by, which is exactly when it bit you mid-task.
|
||||
* Cause: after enough output built up scrollback, the terminal's scrollbar could grab the
|
||||
keyboard focus when the window regained focus, and the scrollbar has no keyboard handling —
|
||||
so your keystrokes went nowhere. The scrollbar is now mouse-only and never takes focus, so
|
||||
the terminal keeps working no matter how much it has printed.
|
||||
|
||||
## 📦 Downloads
|
||||
|
||||
Two builds are produced:
|
||||
|
||||
| Build | Needs .NET 8 Desktop Runtime? | Notes |
|
||||
|-------|-------------------------------|-------|
|
||||
| **Standard** (`ETTerms_v0.3.3`) | ✅ Yes | Smaller; for machines that already have the runtime |
|
||||
| **Portable** (`ETTerms_v0.3.3_portable`) | ❌ No | Runtime bundled — unzip and run, no install / admin needed |
|
||||
|
||||
Run `ETTerms v0.3.3.exe`.
|
||||
|
||||
## 🔗 Links
|
||||
* PDU MCP & Serial MCP setup guide:
|
||||
[docs/serial-mcp-guide.md](https://github.com/ETWen/ETTerms/blob/main/docs/serial-mcp-guide.md)
|
||||
|
||||
**Full changelog:** [v0.3.2...v0.3.3](https://github.com/ETWen/ETTerms/compare/v0.3.2...v0.3.3)
|
||||
@@ -0,0 +1,61 @@
|
||||
# v0.4.0 — Performance & stability overhaul
|
||||
|
||||
## ✨ New features
|
||||
|
||||
**Terminal performance overhaul**
|
||||
* Heavy output (long boot logs, big file dumps) now renders much more smoothly — drawing was
|
||||
reworked to stop re-creating fonts and brushes on every frame.
|
||||
* Scroll-back history storage was rebuilt so the terminal stays fast no matter how much output
|
||||
has accumulated; previously it got slower and slower once the history buffer filled up.
|
||||
|
||||
**Full-screen apps (vim / htop) behave like a real terminal**
|
||||
* The mouse wheel now scrolls inside full-screen tools like `vim` and `htop` instead of doing nothing.
|
||||
* Tools that ask the terminal "where is the cursor?" now get an answer — fixes full-screen apps
|
||||
that could hang on startup or draw at the wrong position.
|
||||
|
||||
**Connection status you can actually see**
|
||||
* When an SSH connection drops or hits an error, a message now appears right in the tab —
|
||||
no more sessions that silently stop responding.
|
||||
* When the local shell exits (e.g. you type `exit`), the tab shows
|
||||
`[ETTerms] shell process exited` instead of just going dead.
|
||||
|
||||
**Faster PDU status (GUI and AI)**
|
||||
* Outlet polling now bundles all 12 ports into a few SNMP requests instead of 36 separate ones —
|
||||
the Status page refreshes faster, and an unreachable PDU no longer stalls the poll for minutes.
|
||||
* The AI `pdu_status` tool gets the same speed-up.
|
||||
|
||||
## 🐛 Bug fixes
|
||||
|
||||
**Garbled Chinese / non-English text**
|
||||
* Fixed: multi-byte characters could occasionally turn into `�` garbage when text was split
|
||||
across data chunks — this affected TTL script `wait` matching, what the AI reads over the
|
||||
serial bridge, and saved session log files. All three now decode correctly.
|
||||
|
||||
**Scrolling**
|
||||
* Fixed: while you were scrolled back reading history, any new output yanked the view down to
|
||||
the bottom. The view now stays where you are and only follows when you're already at the bottom.
|
||||
|
||||
**Resource & stability**
|
||||
* Fixed small memory and handle leaks when opening and closing many local shell tabs over a
|
||||
long session.
|
||||
* Fixed: typing into an SSH session after the connection died could crash the window — it now
|
||||
just prints a short "write failed" note in the tab.
|
||||
|
||||
## 📦 Downloads
|
||||
|
||||
Two builds are produced:
|
||||
|
||||
| Build | Needs .NET 8 Desktop Runtime? | Notes |
|
||||
|-------|-------------------------------|-------|
|
||||
| **Standard** (`ETTerms_v0.4.0`) | ✅ Yes | Smaller; for machines that already have the runtime |
|
||||
| **Portable** (`ETTerms_v0.4.0_portable`) | ❌ No | Runtime bundled — unzip and run, no install / admin needed |
|
||||
|
||||
Run `ETTerms v0.4.0.exe`.
|
||||
|
||||
## 🔗 Links
|
||||
* PDU MCP & Serial MCP setup guide:
|
||||
[docs/serial-mcp-guide.md](https://github.com/ETWen/ETTerms/blob/main/docs/serial-mcp-guide.md)
|
||||
* TTL reference:
|
||||
[docs/ttl-script-reference.md](https://github.com/ETWen/ETTerms/blob/main/docs/ttl-script-reference.md)
|
||||
|
||||
**Full changelog:** [v0.3.3...v0.4.0](https://github.com/ETWen/ETTerms/compare/v0.3.3...v0.4.0)
|
||||
@@ -0,0 +1,17 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<RootNamespace>ETTerms.PduCore</RootNamespace>
|
||||
<AssemblyName>ETTerms.PduCore</AssemblyName>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="SnmpSharpNet" Version="0.9.7">
|
||||
<NoWarn>NU1701</NoWarn>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -0,0 +1,124 @@
|
||||
using System.Net;
|
||||
using SnmpSharpNet;
|
||||
|
||||
namespace ETTerms.PduCore;
|
||||
|
||||
/// <summary>
|
||||
/// PDU controller for iPoMan II/III models via SNMP。
|
||||
/// GUI 與 ETTerms.PduMcp 共用的唯一實作(v0.4.0 起取代兩份複製的版本)。
|
||||
/// 診斷輸出走建構子注入的 log 委派:GUI 給 AppLogger、MCP server 給 stderr
|
||||
/// (stdio MCP 的 stdout 專供 JSON-RPC,不可污染)。
|
||||
/// SNMP 走 UDP、非獨佔,多個行程可同時對同一台 PDU 操作。
|
||||
/// </summary>
|
||||
public sealed class PduController : IDisposable
|
||||
{
|
||||
private readonly string _ip;
|
||||
private readonly Action<string>? _logInfo;
|
||||
private readonly Action<string>? _logWarn;
|
||||
|
||||
private const string Community = "private";
|
||||
private const int SnmpPort = 161;
|
||||
private const int Timeout = 3000;
|
||||
|
||||
public string Ip => _ip;
|
||||
|
||||
public PduController(string ip, Action<string>? logInfo = null, Action<string>? logWarn = null)
|
||||
{
|
||||
_ip = ip;
|
||||
_logInfo = logInfo;
|
||||
_logWarn = logWarn;
|
||||
}
|
||||
|
||||
/// <summary>讀 PDU 型號/名稱 OID;非空且含 "PDU" 代表連得上。</summary>
|
||||
public string? GetModelName() => SnmpGet(".1.3.6.1.4.1.2468.1.4.2.1.1.4");
|
||||
|
||||
public bool CheckConnection()
|
||||
{
|
||||
var name = GetModelName();
|
||||
_logInfo?.Invoke($"[PDU] CheckConnection {_ip}: name='{name ?? "<null>"}'");
|
||||
return !string.IsNullOrEmpty(name) && name.Contains("PDU");
|
||||
}
|
||||
|
||||
public bool SetPortOn(int port) => SnmpSet(PortControlOid(port), new Integer32(3));
|
||||
public bool SetPortOff(int port) => SnmpSet(PortControlOid(port), new Integer32(4));
|
||||
|
||||
/// <summary>true = on, false = off, null = unknown/unreachable.</summary>
|
||||
public bool? GetPortState(int port) => ParseState(SnmpGet(PortStateOid(port)));
|
||||
|
||||
public int? GetPortCurrent(int port) => int.TryParse(SnmpGet(PortCurrentOid(port)), out int v) ? v : null;
|
||||
public double? GetPortPowerWatts(int port) => int.TryParse(SnmpGet(PortPowerOid(port)), out int v) ? v / 10.0 : null;
|
||||
|
||||
/// <summary>
|
||||
/// 一次讀回所有插座的狀態 / 電流(mA) / 功率(W)。
|
||||
/// 以 3 個批次 SNMP GET(每個 PDU 含 <paramref name="portCount"/> 個 varbind)取代
|
||||
/// 逐 port 逐 OID 的 3×N 個請求 —— 12 port 從 36 個 UDP 來回縮成 3 個,
|
||||
/// 逾時時的最壞情況也從 36×Timeout 縮到 3×Timeout。
|
||||
/// </summary>
|
||||
public (bool? State, int? CurrentMilliAmps, double? PowerWatts)[] GetAllPortsStatus(int portCount)
|
||||
{
|
||||
var ports = Enumerable.Range(1, portCount).ToArray();
|
||||
var states = SnmpGetMany(ports.Select(PortStateOid).ToArray());
|
||||
var currents = SnmpGetMany(ports.Select(PortCurrentOid).ToArray());
|
||||
var powers = SnmpGetMany(ports.Select(PortPowerOid).ToArray());
|
||||
|
||||
var result = new (bool?, int?, double?)[portCount];
|
||||
for (int i = 0; i < portCount; i++)
|
||||
{
|
||||
result[i] = (
|
||||
ParseState(states[i]),
|
||||
int.TryParse(currents[i], out int c) ? c : null,
|
||||
int.TryParse(powers[i], out int p) ? p / 10.0 : null);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private static bool? ParseState(string? r) => r == "3" ? true : (r == "2" || r == "4") ? false : null;
|
||||
|
||||
private static string PortControlOid(int port) => $".1.3.6.1.4.1.2468.1.4.2.1.3.2.4.1.2.{port}";
|
||||
private static string PortStateOid(int port) => $".1.3.6.1.4.1.2468.1.4.2.1.3.2.3.1.2.{port}";
|
||||
private static string PortCurrentOid(int port) => $".1.3.6.1.4.1.2468.1.4.2.1.3.2.3.1.3.{port}";
|
||||
private static string PortPowerOid(int port) => $".1.3.6.1.4.1.2468.1.4.2.1.3.2.3.1.5.{port}";
|
||||
|
||||
private bool SnmpSet(string oid, AsnType value)
|
||||
{
|
||||
try
|
||||
{
|
||||
var param = new AgentParameters(new OctetString(Community)) { Version = SnmpVersion.Ver1 };
|
||||
using var target = new UdpTarget((IPAddress)new IpAddress(_ip), SnmpPort, Timeout, 1);
|
||||
var pdu = new SnmpSharpNet.Pdu(PduType.Set);
|
||||
pdu.VbList.Add(new Oid(oid), value);
|
||||
var result = (SnmpV1Packet)target.Request(pdu, param);
|
||||
return result?.Pdu.ErrorStatus == 0;
|
||||
}
|
||||
catch (Exception ex) { _logWarn?.Invoke($"[PDU] SNMP SET {oid} exception: {ex.Message}"); return false; }
|
||||
}
|
||||
|
||||
private string? SnmpGet(string oid)
|
||||
{
|
||||
var r = SnmpGetMany(new[] { oid });
|
||||
return r[0];
|
||||
}
|
||||
|
||||
/// <summary>一個 SNMP GET 帶多個 OID(varbind),回傳同序的值;失敗整批回 null。</summary>
|
||||
private string?[] SnmpGetMany(string[] oids)
|
||||
{
|
||||
var result = new string?[oids.Length];
|
||||
try
|
||||
{
|
||||
var param = new AgentParameters(new OctetString(Community)) { Version = SnmpVersion.Ver1 };
|
||||
using var target = new UdpTarget((IPAddress)new IpAddress(_ip), SnmpPort, Timeout, 1);
|
||||
var pdu = new SnmpSharpNet.Pdu(PduType.Get);
|
||||
foreach (var oid in oids) pdu.VbList.Add(new Oid(oid));
|
||||
var resp = (SnmpV1Packet)target.Request(pdu, param);
|
||||
if (resp == null) { _logWarn?.Invoke($"[PDU] SNMP GET ({oids.Length} oids): no response (timeout)"); return result; }
|
||||
if (resp.Pdu.ErrorStatus != 0) { _logWarn?.Invoke($"[PDU] SNMP GET ({oids.Length} oids): ErrorStatus={resp.Pdu.ErrorStatus}"); return result; }
|
||||
// SNMP GET 回應的 varbind 順序與請求一致,直接依 index 對回去。
|
||||
int n = Math.Min(oids.Length, resp.Pdu.VbList.Count);
|
||||
for (int i = 0; i < n; i++) result[i] = resp.Pdu.VbList[i].Value.ToString();
|
||||
}
|
||||
catch (Exception ex) { _logWarn?.Invoke($"[PDU] SNMP GET ({oids.Length} oids) exception: {ex.Message}"); }
|
||||
return result;
|
||||
}
|
||||
|
||||
public void Dispose() { }
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<RootNamespace>ETTerms.PduMcp</RootNamespace>
|
||||
<AssemblyName>ETTerms.PduMcp</AssemblyName>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="ModelContextProtocol" Version="1.2.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\ETTerms.PduCore\ETTerms.PduCore.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -0,0 +1,35 @@
|
||||
using System.Collections.Concurrent;
|
||||
using ETTerms.PduCore;
|
||||
|
||||
namespace ETTerms.PduMcp;
|
||||
|
||||
/// <summary>
|
||||
/// Process-wide registry of connected PDUs, keyed by IP. The MCP server is long-lived,
|
||||
/// so connections established by <c>pdu_connect</c> persist across tool calls.
|
||||
/// </summary>
|
||||
public sealed class PduRegistry
|
||||
{
|
||||
public static readonly PduRegistry Instance = new();
|
||||
|
||||
/// <summary>iPoMan II/III outlet count.</summary>
|
||||
public const int PortCount = 12;
|
||||
|
||||
private readonly ConcurrentDictionary<string, PduController> _pdus = new(StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
public PduController GetOrAdd(string ip) =>
|
||||
_pdus.GetOrAdd(ip.Trim(), static k => new PduController(k, Log, Log));
|
||||
|
||||
// stdio MCP server:stdout 專供 JSON-RPC,診斷一律走 stderr。
|
||||
private static void Log(string msg) => Console.Error.WriteLine(msg);
|
||||
|
||||
public bool TryGet(string ip, out PduController pdu) =>
|
||||
_pdus.TryGetValue(ip.Trim(), out pdu!);
|
||||
|
||||
public bool Remove(string ip)
|
||||
{
|
||||
if (_pdus.TryRemove(ip.Trim(), out var pdu)) { pdu.Dispose(); return true; }
|
||||
return false;
|
||||
}
|
||||
|
||||
public IReadOnlyCollection<string> ConnectedIps => _pdus.Keys.ToArray();
|
||||
}
|
||||
@@ -0,0 +1,144 @@
|
||||
using System.ComponentModel;
|
||||
using System.Text;
|
||||
using System.Text.Json;
|
||||
using ETTerms.PduCore;
|
||||
using ModelContextProtocol.Server;
|
||||
|
||||
namespace ETTerms.PduMcp;
|
||||
|
||||
/// <summary>
|
||||
/// MCP tools exposed to the AI for controlling an SNMP PDU (iPoMan II/III).
|
||||
///
|
||||
/// Unlike the serial bridge, the PDU is reached directly over SNMP — the ETTerms GUI
|
||||
/// does NOT need to be running. Connections are held per-IP and persist for the lifetime
|
||||
/// of this MCP server. Always <c>pdu_connect</c> an IP first, then control its ports.
|
||||
/// </summary>
|
||||
[McpServerToolType]
|
||||
public static class PduTools
|
||||
{
|
||||
private static readonly JsonSerializerOptions Json = new() { WriteIndented = false };
|
||||
|
||||
[McpServerTool, Description("Connect to a PDU over SNMP by IP and verify it responds. Required before controlling ports. Returns the model name on success.")]
|
||||
public static Task<string> pdu_connect(
|
||||
[Description("PDU IP address, e.g. 192.168.1.21")] string ip)
|
||||
{
|
||||
ip = (ip ?? "").Trim();
|
||||
if (ip.Length == 0) return Err("ip is required");
|
||||
var pdu = PduRegistry.Instance.GetOrAdd(ip);
|
||||
var model = pdu.GetModelName();
|
||||
bool ok = !string.IsNullOrEmpty(model) && model.Contains("PDU");
|
||||
if (!ok)
|
||||
{
|
||||
PduRegistry.Instance.Remove(ip);
|
||||
return Err($"no SNMP response from PDU at {ip} (check IP/network/community)");
|
||||
}
|
||||
return Ok(new { ip, model });
|
||||
}
|
||||
|
||||
[McpServerTool, Description("List PDUs currently connected in this MCP session (by IP).")]
|
||||
public static Task<string> pdu_list()
|
||||
=> Ok(new { connected = PduRegistry.Instance.ConnectedIps });
|
||||
|
||||
[McpServerTool, Description("Turn a PDU outlet on or off. The PDU must be connected first via pdu_connect.")]
|
||||
public static Task<string> pdu_set_port(
|
||||
[Description("PDU IP address")] string ip,
|
||||
[Description("Outlet/port number (1-12)")] int port,
|
||||
[Description("true = ON, false = OFF")] bool on)
|
||||
{
|
||||
if (!TryResolve(ip, port, out var pdu, out var error)) return Err(error);
|
||||
bool ok = on ? pdu.SetPortOn(port) : pdu.SetPortOff(port);
|
||||
if (!ok) return Err($"SNMP set failed for {ip} port {port}");
|
||||
return Ok(new { ip, port, state = on ? "on" : "off" });
|
||||
}
|
||||
|
||||
[McpServerTool, Description("Read a single outlet's state, current (mA) and power (W).")]
|
||||
public static Task<string> pdu_get_port(
|
||||
[Description("PDU IP address")] string ip,
|
||||
[Description("Outlet/port number (1-12)")] int port)
|
||||
{
|
||||
if (!TryResolve(ip, port, out var pdu, out var error)) return Err(error);
|
||||
return Ok(PortSnapshot(pdu, port));
|
||||
}
|
||||
|
||||
[McpServerTool, Description("Read the state, current (mA) and power (W) of all outlets on the PDU.")]
|
||||
public static Task<string> pdu_status(
|
||||
[Description("PDU IP address")] string ip)
|
||||
{
|
||||
if (!PduRegistry.Instance.TryGet(ip, out var pdu))
|
||||
return Err($"PDU {ip} not connected. Call pdu_connect first.");
|
||||
// 批次 SNMP GET:12 port 只需 3 個 UDP 來回,而非逐 port 逐 OID 36 個。
|
||||
var all = pdu.GetAllPortsStatus(PduRegistry.PortCount);
|
||||
var ports = new List<object>();
|
||||
for (int p = 0; p < all.Length; p++)
|
||||
{
|
||||
var (state, current, power) = all[p];
|
||||
ports.Add(new
|
||||
{
|
||||
port = p + 1,
|
||||
state = state == true ? "on" : state == false ? "off" : "unknown",
|
||||
currentMilliAmps = current,
|
||||
powerWatts = power
|
||||
});
|
||||
}
|
||||
return Ok(new { ip, ports });
|
||||
}
|
||||
|
||||
[McpServerTool, Description("Power-cycle an outlet: turn it OFF, wait offSeconds, then turn it ON. Useful for rebooting a DUT.")]
|
||||
public static async Task<string> pdu_power_cycle(
|
||||
[Description("PDU IP address")] string ip,
|
||||
[Description("Outlet/port number (1-12)")] int port,
|
||||
[Description("Seconds to stay off before powering back on")] int offSeconds = 5)
|
||||
{
|
||||
if (!TryResolve(ip, port, out var pdu, out var error)) return await Err(error);
|
||||
if (offSeconds < 0) offSeconds = 0;
|
||||
if (!pdu.SetPortOff(port)) return await Err($"SNMP off failed for {ip} port {port}");
|
||||
await Task.Delay(offSeconds * 1000);
|
||||
if (!pdu.SetPortOn(port)) return await Err($"SNMP on failed for {ip} port {port}");
|
||||
return await Ok(new { ip, port, action = "power_cycle", offSeconds, state = "on" });
|
||||
}
|
||||
|
||||
[McpServerTool, Description("Disconnect a PDU from this MCP session (does not change outlet states).")]
|
||||
public static Task<string> pdu_disconnect(
|
||||
[Description("PDU IP address")] string ip)
|
||||
=> Ok(new { ip, removed = PduRegistry.Instance.Remove(ip) });
|
||||
|
||||
// ── helpers ──
|
||||
|
||||
private static bool TryResolve(string ip, int port, out PduController pdu, out string error)
|
||||
{
|
||||
pdu = null!;
|
||||
error = "";
|
||||
if (port < 1 || port > PduRegistry.PortCount)
|
||||
{
|
||||
error = $"port must be 1-{PduRegistry.PortCount}";
|
||||
return false;
|
||||
}
|
||||
if (!PduRegistry.Instance.TryGet(ip, out pdu))
|
||||
{
|
||||
error = $"PDU {ip} not connected. Call pdu_connect first.";
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private static object PortSnapshot(PduController pdu, int port)
|
||||
{
|
||||
var state = pdu.GetPortState(port);
|
||||
return new
|
||||
{
|
||||
port,
|
||||
state = state == true ? "on" : state == false ? "off" : "unknown",
|
||||
currentMilliAmps = pdu.GetPortCurrent(port),
|
||||
powerWatts = pdu.GetPortPowerWatts(port)
|
||||
};
|
||||
}
|
||||
|
||||
private static Task<string> Ok(object payload)
|
||||
{
|
||||
var node = new { ok = true, result = payload };
|
||||
return Task.FromResult(JsonSerializer.Serialize(node, Json));
|
||||
}
|
||||
|
||||
private static Task<string> Err(string message)
|
||||
=> Task.FromResult(JsonSerializer.Serialize(new { ok = false, error = message }, Json));
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
// stdio MCP server:把 SNMP PDU 控制暴露給 AI(Kiro / Claude CLI)。
|
||||
// 與 ETTerms.SerialMcp 不同,PDU 走 SNMP(UDP) 非獨佔,故直接打 SNMP,不需 GUI 在跑。
|
||||
var builder = Host.CreateApplicationBuilder(args);
|
||||
|
||||
// stdio 傳輸:stdout 專供 JSON-RPC,log 一律走 stderr,否則會污染協議。
|
||||
builder.Logging.AddConsole(o => o.LogToStandardErrorThreshold = LogLevel.Trace);
|
||||
|
||||
builder.Services
|
||||
.AddMcpServer()
|
||||
.WithStdioServerTransport()
|
||||
.WithToolsFromAssembly();
|
||||
|
||||
await builder.Build().RunAsync();
|
||||
@@ -21,7 +21,7 @@ public sealed class AboutView : UserControl
|
||||
var left = new FlowLayoutPanel
|
||||
{
|
||||
Dock = DockStyle.Left, Width = 380, FlowDirection = FlowDirection.TopDown,
|
||||
WrapContents = false, AutoScroll = false, Padding = new Padding(20),
|
||||
WrapContents = false, AutoScroll = true, Padding = new Padding(20),
|
||||
BackColor = Theme.WorkspaceBack
|
||||
};
|
||||
|
||||
@@ -73,7 +73,7 @@ public sealed class AboutView : UserControl
|
||||
{
|
||||
var header = new Label
|
||||
{
|
||||
AutoSize = false, Width = 500, Height = 22,
|
||||
AutoSize = true,
|
||||
Text = $"● v{entry.Version} · {entry.Title} ({entry.Date:yyyy-MM-dd})",
|
||||
ForeColor = Theme.Accent, Font = Theme.UiFontBold,
|
||||
Margin = new Padding(0, 8, 0, 2)
|
||||
@@ -83,7 +83,7 @@ public sealed class AboutView : UserControl
|
||||
{
|
||||
right.Controls.Add(new Label
|
||||
{
|
||||
AutoSize = false, Width = 500, Height = 20,
|
||||
AutoSize = true,
|
||||
Text = $" • {change}",
|
||||
ForeColor = Theme.Text, Font = Theme.UiFont,
|
||||
Margin = new Padding(0)
|
||||
@@ -99,18 +99,17 @@ public sealed class AboutView : UserControl
|
||||
|
||||
private static Panel MakeCard(int width, int height, Action<FlowLayoutPanel> build)
|
||||
{
|
||||
var card = new Panel
|
||||
// 卡片本身就是 TopDown 的 AutoSize FlowLayoutPanel:高度永遠長到容得下內容
|
||||
// (高 DPI 字變大也不會被裁),MinimumSize 維持 100% 的設計尺寸。
|
||||
var card = new FlowLayoutPanel
|
||||
{
|
||||
Width = width, Height = height, Margin = new Padding(0, 0, 0, 12),
|
||||
FlowDirection = FlowDirection.TopDown, WrapContents = false,
|
||||
AutoSize = true, AutoSizeMode = AutoSizeMode.GrowAndShrink,
|
||||
MinimumSize = new Size(width, height),
|
||||
Margin = new Padding(0, 0, 0, 12),
|
||||
BackColor = Theme.TabBack, Padding = new Padding(12)
|
||||
};
|
||||
var flow = new FlowLayoutPanel
|
||||
{
|
||||
Dock = DockStyle.Fill, FlowDirection = FlowDirection.TopDown,
|
||||
WrapContents = false, BackColor = Theme.TabBack, AutoSize = false
|
||||
};
|
||||
build(flow);
|
||||
card.Controls.Add(flow);
|
||||
build(card);
|
||||
return card;
|
||||
}
|
||||
|
||||
@@ -149,24 +148,31 @@ public sealed class AboutView : UserControl
|
||||
{
|
||||
return new Label
|
||||
{
|
||||
AutoSize = false, Width = 310, Height = 20,
|
||||
AutoSize = true,
|
||||
Text = text, Font = font, ForeColor = color,
|
||||
TextAlign = align, Margin = new Padding(0)
|
||||
TextAlign = align, Margin = new Padding(0, 1, 0, 1)
|
||||
};
|
||||
}
|
||||
|
||||
private static Panel MakeRow(string label, string value)
|
||||
private static Control MakeRow(string label, string value)
|
||||
{
|
||||
var row = new Panel { Width = 310, Height = 20, Margin = new Padding(0, 2, 0, 0), BackColor = Color.Transparent };
|
||||
var row = new FlowLayoutPanel
|
||||
{
|
||||
AutoSize = true, AutoSizeMode = AutoSizeMode.GrowAndShrink,
|
||||
FlowDirection = FlowDirection.LeftToRight, WrapContents = false,
|
||||
Margin = new Padding(0, 2, 0, 0), BackColor = Color.Transparent
|
||||
};
|
||||
row.Controls.Add(new Label
|
||||
{
|
||||
Text = value, AutoSize = false, Width = 230, Height = 20, Dock = DockStyle.Right,
|
||||
ForeColor = Theme.Text, Font = Theme.UiFont, TextAlign = ContentAlignment.MiddleRight
|
||||
Text = label, AutoSize = true, MinimumSize = new Size(70, 0),
|
||||
ForeColor = Theme.TextDim, Font = Theme.UiFont,
|
||||
TextAlign = ContentAlignment.MiddleLeft, Margin = new Padding(0, 0, 8, 0)
|
||||
});
|
||||
row.Controls.Add(new Label
|
||||
{
|
||||
Text = label, AutoSize = false, Width = 70, Height = 20, Dock = DockStyle.Left,
|
||||
ForeColor = Theme.TextDim, Font = Theme.UiFont, TextAlign = ContentAlignment.MiddleLeft
|
||||
Text = value, AutoSize = true,
|
||||
ForeColor = Theme.Text, Font = Theme.UiFont,
|
||||
TextAlign = ContentAlignment.MiddleLeft, Margin = new Padding(0)
|
||||
});
|
||||
return row;
|
||||
}
|
||||
@@ -177,6 +183,47 @@ public sealed class AboutView : UserControl
|
||||
|
||||
private static readonly ChangelogEntry[] Changelog =
|
||||
[
|
||||
new("0.4.0", new DateOnly(2026, 7, 2), "Performance & stability overhaul",
|
||||
[
|
||||
"The terminal is much smoother during heavy output (long boot logs, big file dumps) — drawing and scroll history were reworked to stay fast no matter how much text has scrolled by.",
|
||||
"Fixed Chinese and other non-English text occasionally turning into garbled characters — in script 'wait' matching, in what the AI reads from the serial port, and in saved session logs.",
|
||||
"While you are scrolled back reading history, new output no longer yanks the view down to the bottom.",
|
||||
"The mouse wheel now scrolls inside full-screen tools like vim and htop instead of doing nothing.",
|
||||
"Full-screen tools that ask the terminal where the cursor is now get an answer, fixing apps that could hang or draw at the wrong position.",
|
||||
"You now see a clear message in the tab when an SSH connection drops or the local shell exits, instead of the session silently going dead.",
|
||||
"PDU status refresh is much faster and lighter on the network (one bundled query instead of 36 separate ones).",
|
||||
"Fixed small memory and handle leaks when opening many local shell tabs over a long session.",
|
||||
]),
|
||||
new("0.3.3", new DateOnly(2026, 6, 16), "Bugfix — terminal input no longer dies after activity",
|
||||
[
|
||||
"Fixed: after the terminal had printed output (Serial or PowerShell), switching away and back — minimizing, or clicking another window — left the terminal unable to accept any typing or Enter, forcing you to reopen the session.",
|
||||
"Cause: once enough output scrolled by, the terminal's scrollbar could steal the keyboard focus when the window regained focus. The scrollbar is now mouse-only and never takes focus, so input keeps working.",
|
||||
]),
|
||||
new("0.3.2", new DateOnly(2026, 6, 11), "New Status page — control PDU outlets with buttons",
|
||||
[
|
||||
"New Status page (the ⚡ icon on the left) with a PDU tab — connect to your PDU by IP and see every outlet at a glance.",
|
||||
"Each outlet now has its own on/off button: the button shows \"Turn ON\" or \"Turn OFF\" depending on the current state, so one click flips it.",
|
||||
"Outlet status, current and power refresh automatically every 3 seconds — no need to hit Refresh anymore.",
|
||||
"Fixed: the local Shell no longer fails to start when its saved folder is gone (e.g. an unplugged USB drive); it now falls back to your home folder.",
|
||||
]),
|
||||
new("0.3.1", new DateOnly(2026, 6, 8), "Bugfix — terminal usability",
|
||||
[
|
||||
"Added a scrollbar on the right of the terminal — just drag it to look back through long output, instead of spinning the mouse wheel for ages.",
|
||||
"Fixed pasting multiple lines into Kiro CLI (and similar tools): the whole block now pastes in one go, instead of each line being sent off immediately.",
|
||||
"After you right-click to copy, the highlight now clears so you can tell the copy actually worked.",
|
||||
]),
|
||||
new("0.3.0", new DateOnly(2026, 6, 8), "AI power control for PDU outlets",
|
||||
[
|
||||
"AI assistants (Kiro / Claude) can now switch your PDU power outlets on and off for you.",
|
||||
"Great for automated testing — the AI can power-cycle (restart) a connected device by itself.",
|
||||
"Works even when the main ETTerms window isn't open.",
|
||||
"One click in Settings → AI MCP now sets up both the Serial and PDU AI helpers at the same time.",
|
||||
]),
|
||||
new("0.2.2", new DateOnly(2026, 6, 5), "Bugfix — terminal stability",
|
||||
[
|
||||
"Fixed: the terminal no longer freezes after minimizing or switching tabs (notably in PowerShell / Kiro).",
|
||||
"Added: Shift+Enter inserts a newline in the shell, so you can type multi-line commands.",
|
||||
]),
|
||||
new("0.2.1", new DateOnly(2026, 6, 4), "AI MCP one-click setup",
|
||||
[
|
||||
"New Settings → AI MCP tab: register the Serial MCP server into Claude Code or Kiro with one click.",
|
||||
|
||||
@@ -10,17 +10,20 @@ namespace ETTerms.App;
|
||||
/// </summary>
|
||||
public sealed class ActivityRail : UserControl
|
||||
{
|
||||
public enum RailView { Terminal, Settings, About }
|
||||
public enum RailView { Terminal, Status, Settings, About }
|
||||
|
||||
public event EventHandler<RailView>? ViewSelected;
|
||||
|
||||
private RailView _active = RailView.Terminal;
|
||||
private RailView? _hover;
|
||||
|
||||
private const int ItemSize = 56;
|
||||
private const int BaseItemSize = 56;
|
||||
/// <summary>依目前螢幕 DPI 縮放的格子大小(owner-draw 不會自動縮放像素,需自己換算)。</summary>
|
||||
private int ItemSize => (int)Math.Round(BaseItemSize * (DeviceDpi / 96.0));
|
||||
private static readonly (RailView view, string glyph, string tip)[] Items =
|
||||
{
|
||||
(RailView.Terminal, "▤", "Terminal"),
|
||||
(RailView.Status, "⚡", "Status"),
|
||||
(RailView.Settings, "⚙", "Settings"),
|
||||
(RailView.About, "ℹ", "About"),
|
||||
};
|
||||
@@ -37,6 +40,19 @@ public sealed class ActivityRail : UserControl
|
||||
Cursor = Cursors.Hand;
|
||||
}
|
||||
|
||||
protected override void OnHandleCreated(EventArgs e)
|
||||
{
|
||||
base.OnHandleCreated(e);
|
||||
Width = ItemSize; // handle 建立後 DeviceDpi 才正確,依實際 DPI 重設寬度
|
||||
}
|
||||
|
||||
protected override void OnDpiChangedAfterParent(EventArgs e)
|
||||
{
|
||||
base.OnDpiChangedAfterParent(e);
|
||||
Width = ItemSize; // 拖到不同縮放的螢幕時跟著調整
|
||||
Invalidate();
|
||||
}
|
||||
|
||||
[System.ComponentModel.DesignerSerializationVisibility(
|
||||
System.ComponentModel.DesignerSerializationVisibility.Hidden)]
|
||||
public RailView ActiveView
|
||||
|
||||
@@ -49,10 +49,11 @@ public sealed class ConnectionSidebar : UserControl
|
||||
BackColor = Theme.SidebarBack;
|
||||
|
||||
// ── Tab bar (Sessions / SFTP) ──
|
||||
// 高度 40 與右側 Workspace 工具列對齊,讓「CONNECTIONS / 連線清單」與右側分頁列同一條基準線
|
||||
var tabBar = new FlowLayoutPanel
|
||||
{
|
||||
Dock = DockStyle.Top, Height = 30, BackColor = Theme.RailBack,
|
||||
Padding = new Padding(4, 3, 4, 0), WrapContents = false
|
||||
Dock = DockStyle.Top, Height = 40, BackColor = Theme.RailBack,
|
||||
Padding = new Padding(4, 7, 4, 0), WrapContents = false
|
||||
};
|
||||
|
||||
var sessionsPanel = new Panel { Dock = DockStyle.Fill, BackColor = Theme.SidebarBack };
|
||||
@@ -63,7 +64,9 @@ public sealed class ConnectionSidebar : UserControl
|
||||
{
|
||||
var b = new Button
|
||||
{
|
||||
Text = text, Width = 70, Height = 24, FlatStyle = FlatStyle.Flat,
|
||||
Text = text, AutoSize = true, AutoSizeMode = AutoSizeMode.GrowAndShrink,
|
||||
MinimumSize = new Size(70, 24), Padding = new Padding(8, 2, 8, 2),
|
||||
FlatStyle = FlatStyle.Flat,
|
||||
ForeColor = Theme.Text, BackColor = Theme.TabBack, Font = Theme.UiFont,
|
||||
Margin = new Padding(0, 0, 4, 0), Cursor = Cursors.Hand
|
||||
};
|
||||
@@ -217,7 +220,9 @@ public sealed class ConnectionSidebar : UserControl
|
||||
var sshCombo = new ComboBox { Width = 120, DropDownStyle = ComboBoxStyle.DropDownList, BackColor = Theme.TabBack, ForeColor = Theme.Text, Font = Theme.UiFont };
|
||||
var connectBtn = new Button
|
||||
{
|
||||
Text = "Connect", Width = 64, Height = 24, FlatStyle = FlatStyle.Flat,
|
||||
Text = "Connect", AutoSize = true, AutoSizeMode = AutoSizeMode.GrowAndShrink,
|
||||
MinimumSize = new Size(64, 24), Padding = new Padding(8, 2, 8, 2),
|
||||
FlatStyle = FlatStyle.Flat,
|
||||
ForeColor = Theme.Text, BackColor = Theme.TabBack, Font = Theme.UiFont, Cursor = Cursors.Hand, Margin = new Padding(4, 0, 0, 0)
|
||||
};
|
||||
connectBtn.FlatAppearance.BorderColor = Theme.SerialColor;
|
||||
|
||||
Generated
+4
-2
@@ -18,8 +18,10 @@ partial class MainForm
|
||||
{
|
||||
SuspendLayout();
|
||||
|
||||
AutoScaleDimensions = new SizeF(7F, 15F);
|
||||
AutoScaleMode = AutoScaleMode.Font;
|
||||
// 用 Dpi 自動縮放:尺寸縮放比例 = 螢幕 DPI 比例,與點數字型的實際渲染比例一致,
|
||||
// 避免「字放大了、容器沒放大」造成的高 DPI 文字/按鈕被裁切。
|
||||
AutoScaleDimensions = new SizeF(96F, 96F);
|
||||
AutoScaleMode = AutoScaleMode.Dpi;
|
||||
ClientSize = new Size(1100, 700);
|
||||
MinimumSize = new Size(720, 480);
|
||||
BackColor = Theme.WorkspaceBack;
|
||||
|
||||
@@ -14,6 +14,7 @@ public partial class MainForm : Form
|
||||
private readonly ActivityRail _rail = new();
|
||||
private readonly ConnectionSidebar _sidebar = new();
|
||||
private readonly WorkspaceView _workspace = new();
|
||||
private readonly StatusView _statusView = new();
|
||||
private readonly SettingsView _settings = new();
|
||||
private readonly AboutView _about = new();
|
||||
private readonly StatusStrip _status = new();
|
||||
@@ -45,11 +46,13 @@ public partial class MainForm : Form
|
||||
private void BuildLayout()
|
||||
{
|
||||
Controls.Add(_workspace); // Fill
|
||||
Controls.Add(_statusView); // Fill (hidden)
|
||||
Controls.Add(_settings); // Fill (hidden)
|
||||
Controls.Add(_about); // Fill (hidden)
|
||||
Controls.Add(_sidebar); // Left (內側)
|
||||
Controls.Add(_rail); // Left (最外側)
|
||||
|
||||
_statusView.Visible = false;
|
||||
_settings.Visible = false;
|
||||
_about.Visible = false;
|
||||
|
||||
@@ -68,6 +71,7 @@ public partial class MainForm : Form
|
||||
_statusLabel.Text = $"View: {view}";
|
||||
_sidebar.Visible = view == ActivityRail.RailView.Terminal;
|
||||
_workspace.Visible = view == ActivityRail.RailView.Terminal;
|
||||
_statusView.Visible = view == ActivityRail.RailView.Status;
|
||||
_settings.Visible = view == ActivityRail.RailView.Settings;
|
||||
_about.Visible = view == ActivityRail.RailView.About;
|
||||
AppLogger.LogInfo($"View selected: {view}");
|
||||
|
||||
+42
-136
@@ -1,11 +1,10 @@
|
||||
using System.Drawing;
|
||||
using System.Windows.Forms;
|
||||
using ETTerms.Infrastructure;
|
||||
using ETTerms.Scripting.Pdu;
|
||||
|
||||
namespace ETTerms.App;
|
||||
|
||||
/// <summary>Settings page with tabs: Terminal / PDU / AI MCP.</summary>
|
||||
/// <summary>Settings page with tabs: Terminal / AI MCP.</summary>
|
||||
public sealed class SettingsView : UserControl
|
||||
{
|
||||
public SettingsView()
|
||||
@@ -33,7 +32,9 @@ public sealed class SettingsView : UserControl
|
||||
|
||||
var b = new Button
|
||||
{
|
||||
Text = text, AutoSize = false, Width = 80, Height = 26, FlatStyle = FlatStyle.Flat,
|
||||
Text = text, AutoSize = true, AutoSizeMode = AutoSizeMode.GrowAndShrink,
|
||||
MinimumSize = new Size(70, 26), Padding = new Padding(10, 2, 10, 2),
|
||||
FlatStyle = FlatStyle.Flat,
|
||||
ForeColor = Theme.Text, BackColor = Theme.TabBack, Font = Theme.UiFont,
|
||||
Margin = new Padding(0, 0, 4, 0), Cursor = Cursors.Hand
|
||||
};
|
||||
@@ -51,7 +52,6 @@ public sealed class SettingsView : UserControl
|
||||
|
||||
var termBtn = MakeTab("Terminal", BuildTerminalTab());
|
||||
tabBar.Controls.Add(termBtn);
|
||||
tabBar.Controls.Add(MakeTab("PDU", BuildPduTab()));
|
||||
tabBar.Controls.Add(MakeTab("AI MCP", BuildAiMcpTab()));
|
||||
|
||||
Controls.Add(body);
|
||||
@@ -171,106 +171,6 @@ public sealed class SettingsView : UserControl
|
||||
return page;
|
||||
}
|
||||
|
||||
// ═══ PDU Tab ═══
|
||||
private Panel BuildPduTab()
|
||||
{
|
||||
var page = new Panel { BackColor = Theme.WorkspaceBack, Padding = new Padding(20) };
|
||||
|
||||
var flow = new FlowLayoutPanel
|
||||
{
|
||||
Dock = DockStyle.Fill, FlowDirection = FlowDirection.TopDown,
|
||||
WrapContents = false, BackColor = Theme.WorkspaceBack, AutoScroll = true
|
||||
};
|
||||
|
||||
// Connection row
|
||||
var ipBox = new TextBox { Width = 160, Text = "192.168.1.21", BackColor = Theme.TabBack, ForeColor = Theme.Text, Font = Theme.UiFont };
|
||||
var connectBtn = MakeButton("Connect", Theme.SerialColor);
|
||||
var statusLabel = new Label { AutoSize = true, Text = "Disconnected", ForeColor = Theme.TextDim, Font = Theme.UiFont, Margin = new Padding(8, 8, 0, 0) };
|
||||
|
||||
var connRow = new FlowLayoutPanel { FlowDirection = FlowDirection.LeftToRight, Width = 500, Height = 36, WrapContents = false, Margin = new Padding(0, 0, 0, 8) };
|
||||
connRow.Controls.Add(new Label { Text = "PDU IP:", AutoSize = true, ForeColor = Theme.Text, Font = Theme.UiFont, Margin = new Padding(0, 6, 8, 0) });
|
||||
connRow.Controls.Add(ipBox);
|
||||
connRow.Controls.Add(connectBtn);
|
||||
connRow.Controls.Add(statusLabel);
|
||||
flow.Controls.Add(connRow);
|
||||
|
||||
// Port status grid
|
||||
var grid = new DataGridView
|
||||
{
|
||||
Width = 480, Height = 310, AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill,
|
||||
BackgroundColor = Theme.WorkspaceBack, ForeColor = Theme.Text, GridColor = Theme.Border,
|
||||
BorderStyle = BorderStyle.None, CellBorderStyle = DataGridViewCellBorderStyle.SingleHorizontal,
|
||||
DefaultCellStyle = { BackColor = Theme.TabBack, ForeColor = Theme.Text, SelectionBackColor = Theme.Hover, SelectionForeColor = Theme.Text },
|
||||
ColumnHeadersDefaultCellStyle = { BackColor = Theme.RailBack, ForeColor = Theme.Accent, Font = Theme.UiFontBold },
|
||||
ColumnHeadersBorderStyle = DataGridViewHeaderBorderStyle.Single,
|
||||
EnableHeadersVisualStyles = false, RowHeadersVisible = false,
|
||||
AllowUserToAddRows = false, AllowUserToDeleteRows = false, ReadOnly = true,
|
||||
AllowUserToResizeRows = false, SelectionMode = DataGridViewSelectionMode.FullRowSelect,
|
||||
ScrollBars = ScrollBars.None, Font = Theme.UiFont,
|
||||
RowTemplate = { Height = 24 },
|
||||
Margin = new Padding(0, 8, 0, 8)
|
||||
};
|
||||
grid.Columns.Add("Port", "Port");
|
||||
grid.Columns.Add("Status", "Status");
|
||||
grid.Columns.Add("Current", "Current (mA)");
|
||||
grid.Columns.Add("Power", "Power (W)");
|
||||
for (int i = 1; i <= 12; i++)
|
||||
grid.Rows.Add($"Port {i}", "—", "—", "—");
|
||||
flow.Controls.Add(grid);
|
||||
|
||||
// Refresh button
|
||||
var refreshBtn = MakeButton("Refresh", Theme.Accent);
|
||||
flow.Controls.Add(refreshBtn);
|
||||
|
||||
// Logic
|
||||
PduController? pdu = null;
|
||||
|
||||
connectBtn.Click += (_, _) =>
|
||||
{
|
||||
if (pdu != null) { pdu.Dispose(); pdu = null; statusLabel.Text = "Disconnected"; statusLabel.ForeColor = Theme.TextDim; connectBtn.Text = "Connect"; return; }
|
||||
var ip = ipBox.Text.Trim();
|
||||
var p = new PduController(ip);
|
||||
if (p.CheckConnection())
|
||||
{
|
||||
pdu = p;
|
||||
statusLabel.Text = $"Connected to {ip}";
|
||||
statusLabel.ForeColor = Theme.SerialColor;
|
||||
connectBtn.Text = "Disconnect";
|
||||
RefreshPduGrid(pdu, grid);
|
||||
}
|
||||
else
|
||||
{
|
||||
p.Dispose();
|
||||
MessageBox.Show(this, $"Failed to connect to PDU at {ip}", "PDU", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||
}
|
||||
};
|
||||
|
||||
refreshBtn.Click += (_, _) =>
|
||||
{
|
||||
if (pdu == null) { MessageBox.Show(this, "Connect to PDU first.", "PDU", MessageBoxButtons.OK, MessageBoxIcon.Information); return; }
|
||||
RefreshPduGrid(pdu, grid);
|
||||
};
|
||||
|
||||
page.Controls.Add(flow);
|
||||
return page;
|
||||
}
|
||||
|
||||
private static void RefreshPduGrid(PduController pdu, DataGridView grid)
|
||||
{
|
||||
for (int i = 0; i < 12; i++)
|
||||
{
|
||||
int port = i + 1;
|
||||
var state = pdu.GetPortState(port);
|
||||
var current = pdu.GetPortCurrent(port);
|
||||
var power = pdu.GetPortPowerWatts(port);
|
||||
var row = grid.Rows[i];
|
||||
row.Cells["Status"].Value = state == true ? "ON" : state == false ? "OFF" : "—";
|
||||
row.Cells["Current"].Value = current.HasValue ? $"{current.Value}" : "—";
|
||||
row.Cells["Power"].Value = power.HasValue ? $"{power.Value:F1}" : "—";
|
||||
row.DefaultCellStyle.BackColor = state == true ? Color.FromArgb(40, 80, 40) : state == false ? Color.FromArgb(60, 40, 40) : Theme.TabBack;
|
||||
}
|
||||
}
|
||||
|
||||
// ═══ AI MCP Tab ═══
|
||||
private Panel BuildAiMcpTab()
|
||||
{
|
||||
@@ -289,28 +189,30 @@ public sealed class SettingsView : UserControl
|
||||
});
|
||||
flow.Controls.Add(new Label
|
||||
{
|
||||
Text = "One-click register the ETTerms Serial MCP server into your AI CLI's user-level\n" +
|
||||
"config. ETTerms keeps sole ownership of the COM port; the AI drives serial through\n" +
|
||||
"a local named pipe. Open a Serial session in ETTerms first, then the AI can attach.",
|
||||
AutoSize = false, Width = 600, Height = 56,
|
||||
Text = "One-click register the ETTerms MCP servers (Serial + PDU) into your AI CLI's\n" +
|
||||
"user-level config. Serial: ETTerms owns the COM port, the AI drives it through a\n" +
|
||||
"local named pipe (open a Serial session first). PDU: the AI controls outlets\n" +
|
||||
"directly over SNMP — no GUI session required.",
|
||||
AutoSize = false, Width = 600, Height = 64,
|
||||
ForeColor = Theme.TextDim, Font = Theme.UiFont, Margin = new Padding(0, 0, 0, 8)
|
||||
});
|
||||
|
||||
// Resolved MCP server exe
|
||||
var exe = McpRegistrar.ResolveServerExe();
|
||||
var exists = McpRegistrar.ServerExeExists();
|
||||
flow.Controls.Add(new Label
|
||||
{
|
||||
Text = $"MCP server: {exe}",
|
||||
AutoSize = false, Width = 600, Height = 20,
|
||||
ForeColor = exists ? Theme.SerialColor : Color.FromArgb(210, 150, 120),
|
||||
Font = Theme.UiFont, Margin = new Padding(0, 0, 0, 2)
|
||||
});
|
||||
if (!exists)
|
||||
// Resolved MCP server exes (serial + pdu)
|
||||
foreach (var (name, exe, exists) in McpRegistrar.ServerInfos())
|
||||
{
|
||||
flow.Controls.Add(new Label
|
||||
{
|
||||
Text = "⚠ Not found yet — publish the app (or build ETTerms.SerialMcp). Setup still writes this expected path.",
|
||||
Text = $"{name}: {exe}",
|
||||
AutoSize = false, Width = 600, Height = 20,
|
||||
ForeColor = exists ? Theme.SerialColor : Color.FromArgb(210, 150, 120),
|
||||
Font = Theme.UiFont, Margin = new Padding(0, 0, 0, 2)
|
||||
});
|
||||
}
|
||||
if (!McpRegistrar.ServerExeExists())
|
||||
{
|
||||
flow.Controls.Add(new Label
|
||||
{
|
||||
Text = "⚠ Some servers not built yet — publish the app (or build the MCP projects). Setup still writes the expected paths.",
|
||||
AutoSize = false, Width = 600, Height = 20,
|
||||
ForeColor = Color.FromArgb(210, 150, 120), Font = Theme.UiFont, Margin = new Padding(0, 0, 0, 4)
|
||||
});
|
||||
@@ -432,25 +334,27 @@ public sealed class SettingsView : UserControl
|
||||
}
|
||||
|
||||
// ── Helpers ──
|
||||
private const int LabelWidth = 150; // 標籤欄固定寬度
|
||||
private const int LabelWidth = 150; // 標籤欄最小寬度
|
||||
private const int InputWidth = 200; // 所有輸入框統一寬度
|
||||
|
||||
private static Panel MakeRow(string label, Control control)
|
||||
private static Control MakeRow(string label, Control control)
|
||||
{
|
||||
var row = new Panel { Width = LabelWidth + InputWidth, Height = 32, Margin = new Padding(0, 3, 0, 3) };
|
||||
|
||||
// 統一輸入框寬度 + 左緣對齊(不再 Dock.Right,避免右對齊造成左緣參差)
|
||||
control.Width = InputWidth;
|
||||
int top = (row.Height - control.Height) / 2;
|
||||
control.Location = new Point(LabelWidth, top < 0 ? 0 : top);
|
||||
|
||||
row.Controls.Add(control);
|
||||
row.Controls.Add(new Label
|
||||
// 用 FlowLayout + AutoSize 標籤取代絕對定位,讓高 DPI 下標籤變寬也不會被裁、且對齊穩定
|
||||
var row = new FlowLayoutPanel
|
||||
{
|
||||
Text = label, AutoSize = false, Width = LabelWidth, Height = row.Height,
|
||||
Location = new Point(0, 0), ForeColor = Theme.Text, Font = Theme.UiFont,
|
||||
TextAlign = ContentAlignment.MiddleLeft
|
||||
});
|
||||
AutoSize = true, AutoSizeMode = AutoSizeMode.GrowAndShrink,
|
||||
FlowDirection = FlowDirection.LeftToRight, WrapContents = false,
|
||||
Margin = new Padding(0, 3, 0, 3), BackColor = Color.Transparent
|
||||
};
|
||||
var lbl = new Label
|
||||
{
|
||||
Text = label, AutoSize = true, MinimumSize = new Size(LabelWidth, 0),
|
||||
ForeColor = Theme.Text, Font = Theme.UiFont,
|
||||
TextAlign = ContentAlignment.MiddleLeft, Margin = new Padding(0, 6, 8, 0)
|
||||
};
|
||||
if (control.Width <= 0) control.Width = InputWidth;
|
||||
row.Controls.Add(lbl);
|
||||
row.Controls.Add(control);
|
||||
return row;
|
||||
}
|
||||
|
||||
@@ -458,7 +362,9 @@ public sealed class SettingsView : UserControl
|
||||
{
|
||||
var b = new Button
|
||||
{
|
||||
Text = text, Width = 90, Height = 28, FlatStyle = FlatStyle.Flat,
|
||||
Text = text, AutoSize = true, AutoSizeMode = AutoSizeMode.GrowAndShrink,
|
||||
MinimumSize = new Size(90, 28), Padding = new Padding(10, 2, 10, 2),
|
||||
FlatStyle = FlatStyle.Flat,
|
||||
ForeColor = Theme.Text, BackColor = Theme.TabBack, Font = Theme.UiFont,
|
||||
Cursor = Cursors.Hand, Margin = new Padding(8, 0, 0, 0)
|
||||
};
|
||||
|
||||
@@ -0,0 +1,286 @@
|
||||
using System.Drawing;
|
||||
using System.Windows.Forms;
|
||||
using ETTerms.Infrastructure;
|
||||
using ETTerms.PduCore;
|
||||
|
||||
namespace ETTerms.App;
|
||||
|
||||
/// <summary>
|
||||
/// Status page with tabs: PDU (more views to come).
|
||||
/// 風格參考 <see cref="SettingsView"/>:自繪 tab strip + panel 切換,避免 TabControl 白邊。
|
||||
/// PDU 分頁連線後每 3 秒於背景自動輪詢插座狀態(不需手動 Refresh)。
|
||||
/// </summary>
|
||||
public sealed class StatusView : UserControl
|
||||
{
|
||||
public StatusView()
|
||||
{
|
||||
Dock = DockStyle.Fill;
|
||||
BackColor = Theme.WorkspaceBack;
|
||||
|
||||
var tabBar = new FlowLayoutPanel
|
||||
{
|
||||
Dock = DockStyle.Top, Height = 32, BackColor = Theme.RailBack,
|
||||
Padding = new Padding(4, 4, 4, 0), WrapContents = false
|
||||
};
|
||||
|
||||
var body = new Panel { Dock = DockStyle.Fill, BackColor = Theme.WorkspaceBack };
|
||||
var pages = new List<Panel>();
|
||||
|
||||
Button? activeBtn = null;
|
||||
Button MakeTab(string text, Panel page)
|
||||
{
|
||||
page.Dock = DockStyle.Fill;
|
||||
page.Visible = false;
|
||||
body.Controls.Add(page);
|
||||
pages.Add(page);
|
||||
|
||||
var b = new Button
|
||||
{
|
||||
Text = text, AutoSize = true, AutoSizeMode = AutoSizeMode.GrowAndShrink,
|
||||
MinimumSize = new Size(70, 26), Padding = new Padding(10, 2, 10, 2),
|
||||
FlatStyle = FlatStyle.Flat,
|
||||
ForeColor = Theme.Text, BackColor = Theme.TabBack, Font = Theme.UiFont,
|
||||
Margin = new Padding(0, 0, 4, 0), Cursor = Cursors.Hand
|
||||
};
|
||||
b.FlatAppearance.BorderColor = Theme.Border;
|
||||
b.FlatAppearance.MouseOverBackColor = Theme.Hover;
|
||||
b.Click += (_, _) =>
|
||||
{
|
||||
foreach (var p in pages) p.Visible = p == page;
|
||||
if (activeBtn != null) activeBtn.BackColor = Theme.TabBack;
|
||||
b.BackColor = Theme.TabActiveBack;
|
||||
activeBtn = b;
|
||||
};
|
||||
return b;
|
||||
}
|
||||
|
||||
var pduBtn = MakeTab("PDU", BuildPduTab());
|
||||
tabBar.Controls.Add(pduBtn);
|
||||
|
||||
Controls.Add(body);
|
||||
Controls.Add(tabBar);
|
||||
|
||||
pduBtn.PerformClick();
|
||||
}
|
||||
|
||||
// ═══ PDU Tab ═══
|
||||
private Panel BuildPduTab()
|
||||
{
|
||||
var page = new Panel { BackColor = Theme.WorkspaceBack, Padding = new Padding(20) };
|
||||
|
||||
var flow = new FlowLayoutPanel
|
||||
{
|
||||
Dock = DockStyle.Fill, FlowDirection = FlowDirection.TopDown,
|
||||
WrapContents = false, BackColor = Theme.WorkspaceBack, AutoScroll = true
|
||||
};
|
||||
|
||||
// Connection row
|
||||
var ipBox = new TextBox { Width = 160, Text = "192.168.1.21", BackColor = Theme.TabBack, ForeColor = Theme.Text, Font = Theme.UiFont };
|
||||
var connectBtn = MakeButton("Connect", Theme.SerialColor);
|
||||
var statusLabel = new Label { AutoSize = true, Text = "Disconnected", ForeColor = Theme.TextDim, Font = Theme.UiFont, Margin = new Padding(8, 8, 0, 0) };
|
||||
|
||||
var connRow = new FlowLayoutPanel { FlowDirection = FlowDirection.LeftToRight, Width = 500, Height = 36, WrapContents = false, Margin = new Padding(0, 0, 0, 8) };
|
||||
connRow.Controls.Add(new Label { Text = "PDU IP:", AutoSize = true, ForeColor = Theme.Text, Font = Theme.UiFont, Margin = new Padding(0, 6, 8, 0) });
|
||||
connRow.Controls.Add(ipBox);
|
||||
connRow.Controls.Add(connectBtn);
|
||||
connRow.Controls.Add(statusLabel);
|
||||
flow.Controls.Add(connRow);
|
||||
|
||||
// Port status grid
|
||||
var grid = new DataGridView
|
||||
{
|
||||
Width = 480, Height = 310, AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill,
|
||||
BackgroundColor = Theme.WorkspaceBack, ForeColor = Theme.Text, GridColor = Theme.Border,
|
||||
BorderStyle = BorderStyle.None, CellBorderStyle = DataGridViewCellBorderStyle.SingleHorizontal,
|
||||
DefaultCellStyle = { BackColor = Theme.TabBack, ForeColor = Theme.Text, SelectionBackColor = Theme.Hover, SelectionForeColor = Theme.Text },
|
||||
ColumnHeadersDefaultCellStyle = { BackColor = Theme.RailBack, ForeColor = Theme.Accent, Font = Theme.UiFontBold },
|
||||
ColumnHeadersBorderStyle = DataGridViewHeaderBorderStyle.Single,
|
||||
EnableHeadersVisualStyles = false, RowHeadersVisible = false,
|
||||
AllowUserToAddRows = false, AllowUserToDeleteRows = false, ReadOnly = true,
|
||||
AllowUserToResizeRows = false, SelectionMode = DataGridViewSelectionMode.FullRowSelect,
|
||||
ScrollBars = ScrollBars.None, Font = Theme.UiFont,
|
||||
RowTemplate = { Height = 24 },
|
||||
Margin = new Padding(0, 8, 0, 8)
|
||||
};
|
||||
grid.Columns.Add("Port", "Port");
|
||||
grid.Columns.Add("Status", "Status");
|
||||
grid.Columns.Add("Current", "Current (mA)");
|
||||
grid.Columns.Add("Power", "Power (W)");
|
||||
|
||||
// 控制按鈕欄:按一下切換該 Port 的 ON/OFF
|
||||
var actionCol = new DataGridViewButtonColumn
|
||||
{
|
||||
Name = "Action", HeaderText = "Control",
|
||||
UseColumnTextForButtonValue = false, FlatStyle = FlatStyle.Flat,
|
||||
FillWeight = 80,
|
||||
DefaultCellStyle =
|
||||
{
|
||||
BackColor = Theme.TabBack, ForeColor = Theme.Text,
|
||||
SelectionBackColor = Theme.Hover, SelectionForeColor = Theme.Text,
|
||||
Alignment = DataGridViewContentAlignment.MiddleCenter
|
||||
}
|
||||
};
|
||||
grid.Columns.Add(actionCol);
|
||||
|
||||
for (int i = 1; i <= 12; i++)
|
||||
grid.Rows.Add($"Port {i}", "—", "—", "—", "—");
|
||||
flow.Controls.Add(grid);
|
||||
|
||||
// 連線後每 3 秒自動輪詢(背景執行緒讀 SNMP,Invoke 回 UI 更新)
|
||||
var pollLabel = new Label { AutoSize = true, Text = "", ForeColor = Theme.TextDim, Font = Theme.UiFont, Margin = new Padding(0, 4, 0, 0) };
|
||||
flow.Controls.Add(pollLabel);
|
||||
|
||||
// Logic
|
||||
PduController? pdu = null;
|
||||
System.Threading.Timer? timer = null;
|
||||
int polling = 0; // 0=idle, 1=in-flight(避免上一次未讀完又疊一次)
|
||||
|
||||
void StopPolling()
|
||||
{
|
||||
timer?.Dispose();
|
||||
timer = null;
|
||||
}
|
||||
|
||||
void PollOnce()
|
||||
{
|
||||
// 已在輪詢中就跳過這一輪
|
||||
if (System.Threading.Interlocked.Exchange(ref polling, 1) == 1) return;
|
||||
var current = pdu;
|
||||
if (current == null) { System.Threading.Volatile.Write(ref polling, 0); return; }
|
||||
|
||||
try
|
||||
{
|
||||
// 批次 SNMP GET:12 port 只需 3 個 UDP 來回(原本逐 port 逐 OID 36 個,
|
||||
// 逾時時最壞一輪要 36×3 秒)。
|
||||
var rows = current.GetAllPortsStatus(12);
|
||||
|
||||
if (!IsDisposed && IsHandleCreated)
|
||||
{
|
||||
BeginInvoke(new Action(() =>
|
||||
{
|
||||
if (pdu != current) return; // 期間已斷線
|
||||
ApplyPduRows(grid, rows);
|
||||
pollLabel.Text = $"Auto-refresh every 3s · last update {DateTime.Now:HH:mm:ss}";
|
||||
}));
|
||||
}
|
||||
}
|
||||
catch { /* 輪詢失敗忽略,下一輪再試 */ }
|
||||
finally { System.Threading.Volatile.Write(ref polling, 0); }
|
||||
}
|
||||
|
||||
connectBtn.Click += (_, _) =>
|
||||
{
|
||||
if (pdu != null)
|
||||
{
|
||||
StopPolling();
|
||||
pdu.Dispose(); pdu = null;
|
||||
statusLabel.Text = "Disconnected"; statusLabel.ForeColor = Theme.TextDim;
|
||||
connectBtn.Text = "Connect";
|
||||
pollLabel.Text = "";
|
||||
// 斷線後清空表格,避免顯示過時的狀態
|
||||
foreach (DataGridViewRow row in grid.Rows)
|
||||
{
|
||||
row.Cells["Status"].Value = "—";
|
||||
row.Cells["Current"].Value = "—";
|
||||
row.Cells["Power"].Value = "—";
|
||||
row.Cells["Action"].Value = "—";
|
||||
row.DefaultCellStyle.BackColor = Theme.TabBack;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
var ip = ipBox.Text.Trim();
|
||||
var p = new PduController(ip, AppLogger.Info, AppLogger.LogWarning);
|
||||
if (p.CheckConnection())
|
||||
{
|
||||
pdu = p;
|
||||
statusLabel.Text = $"Connected to {ip}";
|
||||
statusLabel.ForeColor = Theme.SerialColor;
|
||||
connectBtn.Text = "Disconnect";
|
||||
// 立即讀一次,之後每 3 秒一次
|
||||
timer = new System.Threading.Timer(_ => PollOnce(), null,
|
||||
dueTime: 0, period: 3000);
|
||||
}
|
||||
else
|
||||
{
|
||||
p.Dispose();
|
||||
MessageBox.Show(this, $"Failed to connect to PDU at {ip}", "PDU", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||
}
|
||||
};
|
||||
|
||||
// 控制項銷毀時收掉計時器與連線
|
||||
Disposed += (_, _) => { StopPolling(); pdu?.Dispose(); };
|
||||
|
||||
// 按下 Control 欄按鈕:切換該 Port 的 ON/OFF(SNMP Set 在背景執行,避免卡 UI)
|
||||
grid.CellContentClick += (_, e) =>
|
||||
{
|
||||
if (e.RowIndex < 0 || e.ColumnIndex < 0) return;
|
||||
if (grid.Columns[e.ColumnIndex].Name != "Action") return;
|
||||
|
||||
var current = pdu;
|
||||
if (current == null)
|
||||
{
|
||||
MessageBox.Show(this, "PDU is not connected. Please connect first.",
|
||||
"PDU", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
int port = e.RowIndex + 1;
|
||||
var statusVal = grid.Rows[e.RowIndex].Cells["Status"].Value?.ToString();
|
||||
if (statusVal != "ON" && statusVal != "OFF") return; // 狀態未知時不動作
|
||||
bool turnOn = statusVal != "ON"; // 目前 ON → 關;其餘 → 開
|
||||
|
||||
var actionCell = grid.Rows[e.RowIndex].Cells["Action"];
|
||||
actionCell.Value = "…";
|
||||
|
||||
System.Threading.Tasks.Task.Run(() =>
|
||||
{
|
||||
bool ok = turnOn ? current.SetPortOn(port) : current.SetPortOff(port);
|
||||
System.Threading.Thread.Sleep(400); // 等 PDU 套用後再讀回確認
|
||||
PollOnce(); // 背景讀 SNMP 後 Invoke 回 UI 更新整張表
|
||||
|
||||
if (!ok && !IsDisposed && IsHandleCreated)
|
||||
{
|
||||
BeginInvoke(new Action(() =>
|
||||
MessageBox.Show(this,
|
||||
$"Failed to turn {(turnOn ? "ON" : "OFF")} Port {port}",
|
||||
"PDU", MessageBoxButtons.OK, MessageBoxIcon.Error)));
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
page.Controls.Add(flow);
|
||||
return page;
|
||||
}
|
||||
|
||||
private static void ApplyPduRows(DataGridView grid, (bool? State, int? CurrentMilliAmps, double? PowerWatts)[] rows)
|
||||
{
|
||||
for (int i = 0; i < rows.Length && i < grid.Rows.Count; i++)
|
||||
{
|
||||
var (state, current, power) = rows[i];
|
||||
var row = grid.Rows[i];
|
||||
row.Cells["Status"].Value = state == true ? "ON" : state == false ? "OFF" : "—";
|
||||
row.Cells["Current"].Value = current.HasValue ? $"{current.Value}" : "—";
|
||||
row.Cells["Power"].Value = power.HasValue ? $"{power.Value:F1}" : "—";
|
||||
// 按鈕文字代表「按下後會做的動作」:ON 時顯示 Turn OFF,反之亦然
|
||||
row.Cells["Action"].Value = state == true ? "Turn OFF" : state == false ? "Turn ON" : "—";
|
||||
row.DefaultCellStyle.BackColor = state == true ? Color.FromArgb(40, 80, 40) : state == false ? Color.FromArgb(60, 40, 40) : Theme.TabBack;
|
||||
}
|
||||
}
|
||||
|
||||
// ── Helpers ──
|
||||
private static Button MakeButton(string text, Color borderColor)
|
||||
{
|
||||
var b = new Button
|
||||
{
|
||||
Text = text, AutoSize = true, AutoSizeMode = AutoSizeMode.GrowAndShrink,
|
||||
MinimumSize = new Size(90, 28), Padding = new Padding(10, 2, 10, 2),
|
||||
FlatStyle = FlatStyle.Flat,
|
||||
ForeColor = Theme.Text, BackColor = Theme.TabBack, Font = Theme.UiFont,
|
||||
Cursor = Cursors.Hand, Margin = new Padding(8, 0, 0, 0)
|
||||
};
|
||||
b.FlatAppearance.BorderColor = borderColor;
|
||||
b.FlatAppearance.MouseOverBackColor = Theme.Hover;
|
||||
return b;
|
||||
}
|
||||
}
|
||||
@@ -52,7 +52,8 @@ public sealed class WorkspaceView : UserControl
|
||||
BackColor = Theme.WorkspaceBack;
|
||||
|
||||
// 頂部工具列容器:左側為 Layout/Run 群組(Fill),右側為 Log All(Dock Right)
|
||||
var topBar = new Panel { Dock = DockStyle.Top, Height = 38, BackColor = Theme.RailBack };
|
||||
// 高度 40 與左側 ConnectionSidebar 的 tab bar 對齊,且容得下 AutoSize 按鈕(不被裁切)
|
||||
var topBar = new Panel { Dock = DockStyle.Top, Height = 40, BackColor = Theme.RailBack };
|
||||
|
||||
_toolbar = new FlowLayoutPanel
|
||||
{
|
||||
@@ -374,7 +375,9 @@ public sealed class WorkspaceView : UserControl
|
||||
{
|
||||
var b = new Button
|
||||
{
|
||||
Text = label, AutoSize = false, Size = new Size(44, 26), FlatStyle = FlatStyle.Flat,
|
||||
Text = label, AutoSize = true, AutoSizeMode = AutoSizeMode.GrowAndShrink,
|
||||
MinimumSize = new Size(40, 26), Padding = new Padding(8, 2, 8, 2),
|
||||
FlatStyle = FlatStyle.Flat,
|
||||
ForeColor = Theme.Text, BackColor = Theme.TabBack, Font = Theme.UiFont,
|
||||
Margin = new Padding(3, 0, 3, 0), Cursor = Cursors.Hand
|
||||
};
|
||||
@@ -384,11 +387,13 @@ public sealed class WorkspaceView : UserControl
|
||||
return b;
|
||||
}
|
||||
|
||||
private static Button MakeActionButton(string text, int width, int leftMargin, EventHandler onClick)
|
||||
private static Button MakeActionButton(string text, int minWidth, int leftMargin, EventHandler onClick)
|
||||
{
|
||||
var b = new Button
|
||||
{
|
||||
Text = text, AutoSize = false, Size = new Size(width, 26), FlatStyle = FlatStyle.Flat,
|
||||
Text = text, AutoSize = true, AutoSizeMode = AutoSizeMode.GrowAndShrink,
|
||||
MinimumSize = new Size(minWidth, 26), Padding = new Padding(10, 2, 10, 2),
|
||||
FlatStyle = FlatStyle.Flat,
|
||||
ForeColor = Theme.Text, BackColor = Theme.TabBack, Font = Theme.UiFont,
|
||||
Margin = new Padding(leftMargin, 0, 3, 0), Cursor = Cursors.Hand
|
||||
};
|
||||
@@ -447,22 +452,9 @@ public sealed class WorkspaceView : UserControl
|
||||
return;
|
||||
}
|
||||
|
||||
string content, name;
|
||||
using (var dlg = new OpenFileDialog { Filter = "TTL scripts (*.ttl)|*.ttl|All files (*.*)|*.*" })
|
||||
{
|
||||
if (dlg.ShowDialog(this) != DialogResult.OK) return;
|
||||
content = File.ReadAllText(dlg.FileName);
|
||||
name = Path.GetFileName(dlg.FileName);
|
||||
}
|
||||
|
||||
if (!TtlScript.TryPick(this, out var content, out var name)) return;
|
||||
// Run All 拒絕含 waitall / sendlnall 的腳本
|
||||
if (ScriptContainsGroupCommands(content))
|
||||
{
|
||||
MessageBox.Show(this,
|
||||
"Script contains 'waitall' or 'sendlnall' which require Group execution.\nPlease use Run Group buttons instead.",
|
||||
"Run All", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
if (TtlScript.WarnIfGroupCommands(this, content, "Run All")) return;
|
||||
|
||||
await Task.WhenAll(serials.Select(sp => sp.RunScriptAsync(content, name)));
|
||||
}
|
||||
@@ -481,29 +473,12 @@ public sealed class WorkspaceView : UserControl
|
||||
return;
|
||||
}
|
||||
|
||||
string content, name;
|
||||
using (var dlg = new OpenFileDialog { Filter = "TTL scripts (*.ttl)|*.ttl|All files (*.*)|*.*" })
|
||||
{
|
||||
if (dlg.ShowDialog(this) != DialogResult.OK) return;
|
||||
content = File.ReadAllText(dlg.FileName);
|
||||
name = Path.GetFileName(dlg.FileName);
|
||||
}
|
||||
if (!TtlScript.TryPick(this, out var content, out var name)) return;
|
||||
|
||||
var sync = new GroupSyncContext(members.Count);
|
||||
await Task.WhenAll(members.Select((sp, i) => sp.RunGroupScriptAsync(content, name, sync, ((char)('A' + i)).ToString())));
|
||||
}
|
||||
|
||||
private static bool ScriptContainsGroupCommands(string content)
|
||||
{
|
||||
foreach (var line in content.Split('\n'))
|
||||
{
|
||||
var t = line.Trim().ToLower();
|
||||
if (t.StartsWith("waitall") || t.StartsWith("sendlnall") || t.StartsWith("sendlngroup"))
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing)
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using System.Globalization;
|
||||
using System.Text.Json;
|
||||
using Microsoft.Data.Sqlite;
|
||||
using ETTerms.Infrastructure;
|
||||
@@ -59,7 +60,8 @@ public sealed class ConnectionStore
|
||||
Type = (ConnectionType)r.GetInt32(2),
|
||||
SortOrder = r.GetInt32(3),
|
||||
GroupName = r.IsDBNull(4) ? null : r.GetString(4),
|
||||
LastUsedUtc = DateTime.Parse(r.GetString(5)),
|
||||
// 與寫入端的 "o" (round-trip) 格式對稱,不受系統地區設定影響
|
||||
LastUsedUtc = DateTime.Parse(r.GetString(5), CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind),
|
||||
Ssh = blob?.Ssh,
|
||||
Serial = blob?.Serial
|
||||
});
|
||||
|
||||
@@ -10,10 +10,13 @@
|
||||
<AssemblyName>ETTerms</AssemblyName>
|
||||
|
||||
<!-- 版本資訊 -->
|
||||
<Version>0.2.1</Version>
|
||||
<Version>0.4.0</Version>
|
||||
<Product>ETTerms</Product>
|
||||
<Company>ETTerms Project</Company>
|
||||
|
||||
<!-- 高 DPI:PerMonitorV2,讓不同縮放比例的螢幕都能正確縮放、避免文字/按鈕被裁切 -->
|
||||
<ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
|
||||
|
||||
<!-- 視窗 / 工作列 / exe 圖示 -->
|
||||
<ApplicationIcon>Assets\Choco_256x256.ico</ApplicationIcon>
|
||||
</PropertyGroup>
|
||||
@@ -25,26 +28,33 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.10" />
|
||||
<PackageReference Include="SnmpSharpNet" Version="0.9.7">
|
||||
<NoWarn>NU1701</NoWarn>
|
||||
</PackageReference>
|
||||
<PackageReference Include="SSH.NET" Version="2024.2.0" />
|
||||
<PackageReference Include="System.IO.Ports" Version="8.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<!-- PDU SNMP 控制共用庫(GUI 與 ETTerms.PduMcp 共用,v0.4.0 取代兩份複製的 PduController) -->
|
||||
<ProjectReference Include="..\ETTerms.PduCore\ETTerms.PduCore.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<!--
|
||||
發佈 GUI 時,自動把 Serial MCP server 一併發佈到 <publish>\ETTerms.SerialMcp\ 子資料夾。
|
||||
發佈 GUI 時,自動把 MCP servers(Serial + PDU)一併發佈到 <publish>\<server>\ 子資料夾。
|
||||
這樣單一 `dotnet publish src\ETTerms` 就會產生完整自洽的 bundle,
|
||||
且 McpRegistrar.ResolveServerExe() 解析的 <ETTerms.exe>\ETTerms.SerialMcp\ETTerms.SerialMcp.exe 必定存在。
|
||||
且 McpRegistrar.ResolveServerExe() 解析的 <ETTerms.exe>\<server>\<server>.exe 必定存在。
|
||||
刻意放子資料夾:與 GUI 的相依 dll 隔離,避免互相覆蓋。
|
||||
MCP 跟隨 GUI 的 self-contained 設定:框架相依版 → MCP 也框架相依;portable(self-contained)版 → MCP 也免 runtime。
|
||||
-->
|
||||
<Target Name="PublishSerialMcp" AfterTargets="Publish">
|
||||
<Target Name="PublishMcpServers" AfterTargets="Publish">
|
||||
<PropertyGroup>
|
||||
<_McpRid Condition="'$(RuntimeIdentifier)' != ''">$(RuntimeIdentifier)</_McpRid>
|
||||
<_McpRid Condition="'$(RuntimeIdentifier)' == ''">win-x64</_McpRid>
|
||||
<_McpSelfContained Condition="'$(SelfContained)' != ''">$(SelfContained)</_McpSelfContained>
|
||||
<_McpSelfContained Condition="'$(SelfContained)' == ''">false</_McpSelfContained>
|
||||
</PropertyGroup>
|
||||
<Message Importance="high" Text="[ETTerms] Publishing ETTerms.SerialMcp -> $(PublishDir)ETTerms.SerialMcp" />
|
||||
<Exec Command="dotnet publish "$(MSBuildThisFileDirectory)..\ETTerms.SerialMcp\ETTerms.SerialMcp.csproj" -c $(Configuration) -r $(_McpRid) --self-contained false -o "$(PublishDir)ETTerms.SerialMcp"" />
|
||||
<Message Importance="high" Text="[ETTerms] Publishing ETTerms.SerialMcp -> $(PublishDir)ETTerms.SerialMcp (self-contained=$(_McpSelfContained))" />
|
||||
<Exec Command="dotnet publish "$(MSBuildThisFileDirectory)..\ETTerms.SerialMcp\ETTerms.SerialMcp.csproj" -c $(Configuration) -r $(_McpRid) --self-contained $(_McpSelfContained) -o "$(PublishDir)ETTerms.SerialMcp"" />
|
||||
<Message Importance="high" Text="[ETTerms] Publishing ETTerms.PduMcp -> $(PublishDir)ETTerms.PduMcp (self-contained=$(_McpSelfContained))" />
|
||||
<Exec Command="dotnet publish "$(MSBuildThisFileDirectory)..\ETTerms.PduMcp\ETTerms.PduMcp.csproj" -c $(Configuration) -r $(_McpRid) --self-contained $(_McpSelfContained) -o "$(PublishDir)ETTerms.PduMcp"" />
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
@@ -8,16 +8,25 @@ namespace ETTerms.Infrastructure;
|
||||
public enum McpTarget { Claude, Kiro }
|
||||
|
||||
/// <summary>
|
||||
/// 把 ETTerms 的 Serial MCP server(<c>ETTerms.SerialMcp</c>)一鍵註冊 / 移除到
|
||||
/// 各 AI CLI 的「使用者層級」MCP 設定檔。採 read-modify-write,保留檔內其他既有伺服器。
|
||||
/// 把 ETTerms 的 MCP servers(<c>ETTerms.SerialMcp</c> 與 <c>ETTerms.PduMcp</c>)一鍵註冊 /
|
||||
/// 移除到各 AI CLI 的「使用者層級」MCP 設定檔。採 read-modify-write,保留檔內其他既有伺服器。
|
||||
///
|
||||
/// - Claude Code:<c>~/.claude.json</c> 頂層 <c>mcpServers</c>,entry 需 <c>type:"stdio"</c>。
|
||||
/// - Kiro:<c>%USERPROFILE%\.kiro\settings\mcp.json</c> 頂層 <c>mcpServers</c>。
|
||||
///
|
||||
/// 兩個 server 一起註冊 / 移除(一鍵同時設定 serial 與 pdu)。
|
||||
/// </summary>
|
||||
public static class McpRegistrar
|
||||
{
|
||||
/// <summary>註冊到各 CLI 時用的 MCP server 名稱。</summary>
|
||||
public const string ServerName = "etterms-serial";
|
||||
/// <summary>一個可被註冊的 MCP server 描述:CLI 內名稱 + 發佈子資料夾 + 執行檔名。</summary>
|
||||
public sealed record McpServer(string Name, string PublishFolder, string ExeName);
|
||||
|
||||
/// <summary>ETTerms 提供的所有 MCP servers。</summary>
|
||||
public static readonly IReadOnlyList<McpServer> Servers = new[]
|
||||
{
|
||||
new McpServer("etterms-serial", "ETTerms.SerialMcp", "ETTerms.SerialMcp.exe"),
|
||||
new McpServer("etterms-pdu", "ETTerms.PduMcp", "ETTerms.PduMcp.exe"),
|
||||
};
|
||||
|
||||
public static string DisplayName(McpTarget t) => t switch
|
||||
{
|
||||
@@ -43,33 +52,33 @@ public static class McpRegistrar
|
||||
{
|
||||
McpTarget.Claude =>
|
||||
"claude mcp list\r\n" +
|
||||
$"# 應看到:{ServerName} ✓ Connected\r\n" +
|
||||
$"# 細節: claude mcp get {ServerName}",
|
||||
"# 應看到:etterms-serial / etterms-pdu ✓ Connected\r\n" +
|
||||
"# 細節: claude mcp get etterms-pdu",
|
||||
McpTarget.Kiro =>
|
||||
"kiro-cli mcp list\r\n" +
|
||||
$"kiro-cli mcp status --name {ServerName}\r\n" +
|
||||
"kiro-cli mcp status --name etterms-pdu\r\n" +
|
||||
"# 或在 Kiro IDE:點 ghost 圖示開 MCP Servers 面板查看狀態",
|
||||
_ => ""
|
||||
};
|
||||
|
||||
/// <summary>找出 ETTerms.SerialMcp 執行檔路徑(找不到回傳最可能的位置作為註冊值)。</summary>
|
||||
public static string ResolveServerExe()
|
||||
/// <summary>找出某個 MCP server 執行檔路徑(找不到回傳最可能的位置作為註冊值)。</summary>
|
||||
public static string ResolveServerExe(McpServer server)
|
||||
{
|
||||
var baseDir = AppContext.BaseDirectory;
|
||||
var candidates = new List<string>
|
||||
{
|
||||
Path.Combine(baseDir, "ETTerms.SerialMcp", "ETTerms.SerialMcp.exe"), // 發佈版(子資料夾)
|
||||
Path.Combine(baseDir, "ETTerms.SerialMcp.exe"), // 同層
|
||||
Path.Combine(baseDir, server.PublishFolder, server.ExeName), // 發佈版(子資料夾)
|
||||
Path.Combine(baseDir, server.ExeName), // 同層
|
||||
};
|
||||
|
||||
// 開發版 fallback:src\ETTerms\bin\<cfg>\net8.0-windows → src\ETTerms.SerialMcp\bin\<cfg>\net8.0
|
||||
// 開發版 fallback:src\ETTerms\bin\<cfg>\net8.0-windows → src\<folder>\bin\<cfg>\net8.0
|
||||
try
|
||||
{
|
||||
var binCfg = new DirectoryInfo(baseDir); // ...\net8.0-windows
|
||||
var config = binCfg.Parent?.Name ?? "Debug"; // Debug / Release
|
||||
var srcDir = binCfg.Parent?.Parent?.Parent?.Parent; // ...\src
|
||||
if (srcDir != null)
|
||||
candidates.Add(Path.Combine(srcDir.FullName, "ETTerms.SerialMcp", "bin", config, "net8.0", "ETTerms.SerialMcp.exe"));
|
||||
candidates.Add(Path.Combine(srcDir.FullName, server.PublishFolder, "bin", config, "net8.0", server.ExeName));
|
||||
}
|
||||
catch { /* 路徑推導失敗就略過開發版 fallback */ }
|
||||
|
||||
@@ -78,22 +87,34 @@ public static class McpRegistrar
|
||||
return candidates[0]; // 都找不到 → 回發佈版預期位置
|
||||
}
|
||||
|
||||
public static bool ServerExeExists() => File.Exists(ResolveServerExe());
|
||||
/// <summary>所有 server 執行檔是否都存在。</summary>
|
||||
public static bool ServerExeExists() => Servers.All(s => File.Exists(ResolveServerExe(s)));
|
||||
|
||||
/// <summary>該目標是否已註冊 etterms-serial。</summary>
|
||||
/// <summary>列出每個 server 的解析路徑與是否存在(給 UI 顯示)。</summary>
|
||||
public static IEnumerable<(string Name, string Exe, bool Exists)> ServerInfos()
|
||||
{
|
||||
foreach (var s in Servers)
|
||||
{
|
||||
var exe = ResolveServerExe(s);
|
||||
yield return (s.Name, exe, File.Exists(exe));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>該目標是否已註冊「全部」ETTerms MCP servers。</summary>
|
||||
public static bool IsRegistered(McpTarget t)
|
||||
{
|
||||
try
|
||||
{
|
||||
var path = ConfigPath(t);
|
||||
if (!File.Exists(path)) return false;
|
||||
var root = JsonNode.Parse(File.ReadAllText(path)) as JsonObject;
|
||||
return (root?["mcpServers"] as JsonObject)?[ServerName] != null;
|
||||
var servers = (JsonNode.Parse(File.ReadAllText(path)) as JsonObject)?["mcpServers"] as JsonObject;
|
||||
if (servers == null) return false;
|
||||
return Servers.All(s => servers[s.Name] != null);
|
||||
}
|
||||
catch { return false; }
|
||||
}
|
||||
|
||||
/// <summary>註冊(或更新)etterms-serial 到該目標設定檔。</summary>
|
||||
/// <summary>註冊(或更新)所有 ETTerms MCP servers 到該目標設定檔。</summary>
|
||||
public static void Register(McpTarget t)
|
||||
{
|
||||
var path = ConfigPath(t);
|
||||
@@ -106,27 +127,34 @@ public static class McpRegistrar
|
||||
servers = new JsonObject();
|
||||
root["mcpServers"] = servers;
|
||||
}
|
||||
servers[ServerName] = BuildEntry(t);
|
||||
foreach (var s in Servers)
|
||||
servers[s.Name] = BuildEntry(t, s);
|
||||
WriteRoot(path, root);
|
||||
AppLogger.Info($"MCP registered to {DisplayName(t)} at {path}");
|
||||
}
|
||||
|
||||
/// <summary>從該目標設定檔移除 etterms-serial。</summary>
|
||||
/// <summary>從該目標設定檔移除所有 ETTerms MCP servers。</summary>
|
||||
public static void Unregister(McpTarget t)
|
||||
{
|
||||
var path = ConfigPath(t);
|
||||
if (!File.Exists(path)) return;
|
||||
var root = LoadRoot(path);
|
||||
if (root["mcpServers"] is JsonObject servers && servers.Remove(ServerName))
|
||||
if (root["mcpServers"] is JsonObject servers)
|
||||
{
|
||||
WriteRoot(path, root);
|
||||
AppLogger.Info($"MCP unregistered from {DisplayName(t)} at {path}");
|
||||
bool changed = false;
|
||||
foreach (var s in Servers)
|
||||
changed |= servers.Remove(s.Name);
|
||||
if (changed)
|
||||
{
|
||||
WriteRoot(path, root);
|
||||
AppLogger.Info($"MCP unregistered from {DisplayName(t)} at {path}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static JsonObject BuildEntry(McpTarget t)
|
||||
private static JsonObject BuildEntry(McpTarget t, McpServer server)
|
||||
{
|
||||
var exe = ResolveServerExe();
|
||||
var exe = ResolveServerExe(server);
|
||||
return t switch
|
||||
{
|
||||
// Claude Code:stdio server 需 type 欄位
|
||||
|
||||
@@ -23,6 +23,7 @@ public sealed class SessionLogger : IDisposable
|
||||
private readonly object _lock = new();
|
||||
private readonly StreamWriter _writer;
|
||||
private readonly StringBuilder _pending = new();
|
||||
private readonly Decoder _decoder = Encoding.UTF8.GetDecoder(); // stateful:多位元組字元跨 chunk 不會解成亂碼
|
||||
private bool _disposed;
|
||||
|
||||
/// <summary>實際寫入的完整檔案路徑。</summary>
|
||||
@@ -52,13 +53,15 @@ public sealed class SessionLogger : IDisposable
|
||||
public void Write(byte[] data)
|
||||
{
|
||||
if (_disposed || data.Length == 0) return;
|
||||
string text = Encoding.UTF8.GetString(data);
|
||||
string clean = AnsiRegex.Replace(text, "").Replace("\r", "");
|
||||
if (clean.Length == 0) return;
|
||||
|
||||
lock (_lock)
|
||||
{
|
||||
if (_disposed) return;
|
||||
var chars = new char[data.Length];
|
||||
int n = _decoder.GetChars(data, 0, data.Length, chars, 0);
|
||||
if (n == 0) return;
|
||||
string clean = AnsiRegex.Replace(new string(chars, 0, n), "").Replace("\r", "");
|
||||
if (clean.Length == 0) return;
|
||||
string stamp = $"[{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}] ";
|
||||
int start = 0;
|
||||
for (int i = 0; i < clean.Length; i++)
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
using System.Net;
|
||||
using ETTerms.Infrastructure;
|
||||
using SnmpSharpNet;
|
||||
|
||||
namespace ETTerms.Scripting.Pdu;
|
||||
|
||||
/// <summary>
|
||||
/// PDU Controller for iPoMan II/III models via SNMP.
|
||||
/// Ported from MyTeraTerm's PDUControlLib.
|
||||
/// </summary>
|
||||
public sealed class PduController : IDisposable
|
||||
{
|
||||
private readonly string _ip;
|
||||
private const string Community = "private";
|
||||
private const int SnmpPort = 161;
|
||||
private const int Timeout = 3000;
|
||||
|
||||
public PduController(string ip) => _ip = ip;
|
||||
|
||||
public bool CheckConnection()
|
||||
{
|
||||
var name = SnmpGet(".1.3.6.1.4.1.2468.1.4.2.1.1.4");
|
||||
AppLogger.Info($"[PDU] CheckConnection {_ip}: name='{name ?? "<null>"}'");
|
||||
return !string.IsNullOrEmpty(name) && name.Contains("PDU");
|
||||
}
|
||||
|
||||
public bool SetPortOn(int port) => SnmpSet(PortControlOid(port), new Integer32(3));
|
||||
public bool SetPortOff(int port) => SnmpSet(PortControlOid(port), new Integer32(4));
|
||||
|
||||
public bool? GetPortState(int port)
|
||||
{
|
||||
var r = SnmpGet(PortStateOid(port));
|
||||
return r == "3" ? true : (r == "2" || r == "4") ? false : null;
|
||||
}
|
||||
|
||||
public int? GetPortCurrent(int port) => int.TryParse(SnmpGet(PortCurrentOid(port)), out int v) ? v : null;
|
||||
public double? GetPortPowerWatts(int port) => int.TryParse(SnmpGet(PortPowerOid(port)), out int v) ? v / 10.0 : null;
|
||||
|
||||
private static string PortControlOid(int port) => $".1.3.6.1.4.1.2468.1.4.2.1.3.2.4.1.2.{port}";
|
||||
private static string PortStateOid(int port) => $".1.3.6.1.4.1.2468.1.4.2.1.3.2.3.1.2.{port}";
|
||||
private static string PortCurrentOid(int port) => $".1.3.6.1.4.1.2468.1.4.2.1.3.2.3.1.3.{port}";
|
||||
private static string PortPowerOid(int port) => $".1.3.6.1.4.1.2468.1.4.2.1.3.2.3.1.5.{port}";
|
||||
|
||||
private bool SnmpSet(string oid, AsnType value)
|
||||
{
|
||||
try
|
||||
{
|
||||
var param = new AgentParameters(new OctetString(Community)) { Version = SnmpVersion.Ver1 };
|
||||
using var target = new UdpTarget((IPAddress)new IpAddress(_ip), SnmpPort, Timeout, 1);
|
||||
var pdu = new SnmpSharpNet.Pdu(PduType.Set);
|
||||
pdu.VbList.Add(new Oid(oid), value);
|
||||
var result = (SnmpV1Packet)target.Request(pdu, param);
|
||||
return result?.Pdu.ErrorStatus == 0;
|
||||
}
|
||||
catch { return false; }
|
||||
}
|
||||
|
||||
private string? SnmpGet(string oid)
|
||||
{
|
||||
try
|
||||
{
|
||||
var param = new AgentParameters(new OctetString(Community)) { Version = SnmpVersion.Ver1 };
|
||||
using var target = new UdpTarget((IPAddress)new IpAddress(_ip), SnmpPort, Timeout, 1);
|
||||
var pdu = new SnmpSharpNet.Pdu(PduType.Get);
|
||||
pdu.VbList.Add(new Oid(oid));
|
||||
var result = (SnmpV1Packet)target.Request(pdu, param);
|
||||
if (result == null) { AppLogger.LogWarning($"[PDU] SNMP GET {oid}: no response (timeout)"); return null; }
|
||||
if (result.Pdu.ErrorStatus != 0) { AppLogger.LogWarning($"[PDU] SNMP GET {oid}: ErrorStatus={result.Pdu.ErrorStatus}"); return null; }
|
||||
foreach (var v in result.Pdu.VbList) return v.Value.ToString();
|
||||
}
|
||||
catch (Exception ex) { AppLogger.LogError($"[PDU] SNMP GET {oid} exception", ex); }
|
||||
return null;
|
||||
}
|
||||
|
||||
public void Dispose() { }
|
||||
}
|
||||
@@ -22,39 +22,14 @@ public sealed class ScriptRunner
|
||||
|
||||
public bool IsRunning { get; private set; }
|
||||
|
||||
public async Task RunAsync(string content, string fileName, ISessionChannel channel)
|
||||
{
|
||||
if (IsRunning) return;
|
||||
IsRunning = true;
|
||||
public Task RunAsync(string content, string fileName, ISessionChannel channel)
|
||||
=> RunCoreAsync(content, fileName, channel, null, "");
|
||||
|
||||
var interp = new TTLInterpreter(channel);
|
||||
interp.StatusChanged += (f, l, c) => StatusChanged?.Invoke(f, l, c);
|
||||
interp.Output += m => Output?.Invoke(m);
|
||||
_interp = interp;
|
||||
public Task RunGroupAsync(string content, string fileName, ISessionChannel channel, GroupSyncContext sync, string memberLabel = "")
|
||||
=> RunCoreAsync(content, fileName, channel, sync, memberLabel);
|
||||
|
||||
try
|
||||
{
|
||||
await Task.Run(() => interp.ExecuteScriptContent(content, fileName));
|
||||
Finished?.Invoke(true, "Completed");
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
Finished?.Invoke(false, "Cancelled");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Output?.Invoke($"[error] {ex.Message}");
|
||||
Finished?.Invoke(false, ex.Message);
|
||||
}
|
||||
finally
|
||||
{
|
||||
interp.Dispose();
|
||||
_interp = null;
|
||||
IsRunning = false;
|
||||
}
|
||||
}
|
||||
|
||||
public async Task RunGroupAsync(string content, string fileName, ISessionChannel channel, GroupSyncContext sync, string memberLabel = "")
|
||||
private async Task RunCoreAsync(string content, string fileName, ISessionChannel channel,
|
||||
GroupSyncContext? sync, string memberLabel)
|
||||
{
|
||||
if (IsRunning) return;
|
||||
IsRunning = true;
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
using System.Globalization;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
using ETTerms.Scripting.Pdu;
|
||||
using ETTerms.Infrastructure;
|
||||
using ETTerms.PduCore;
|
||||
using ETTerms.Sessions;
|
||||
|
||||
namespace ETTerms.Scripting;
|
||||
@@ -17,11 +18,13 @@ public sealed class TTLInterpreter : IDisposable
|
||||
{
|
||||
private readonly ISessionChannel _channel;
|
||||
private readonly Encoding _enc = new UTF8Encoding(false);
|
||||
private readonly Decoder _rxDecoder = Encoding.UTF8.GetDecoder(); // stateful:多位元組字元跨 chunk 不會解成亂碼
|
||||
private readonly Dictionary<string, object> _vars = new();
|
||||
private readonly StringBuilder _recv = new();
|
||||
private readonly CancellationTokenSource _cts = new();
|
||||
|
||||
private const int SettleMs = 300; // wait 命中關鍵字後,需連續安靜這麼久(無新資料)才接受,避免比對到輸出中途的回顯
|
||||
private const int MaxRecvChars = 1_000_000; // _recv 上限:長時間無 wait 消費時避免無限成長
|
||||
|
||||
private GroupSyncContext? _groupSync;
|
||||
private string _groupMemberLabel = "";
|
||||
@@ -51,7 +54,13 @@ public sealed class TTLInterpreter : IDisposable
|
||||
|
||||
private void OnData(byte[] data)
|
||||
{
|
||||
lock (_recv) _recv.Append(_enc.GetString(data));
|
||||
lock (_recv)
|
||||
{
|
||||
var chars = new char[data.Length];
|
||||
int n = _rxDecoder.GetChars(data, 0, data.Length, chars, 0);
|
||||
_recv.Append(chars, 0, n);
|
||||
if (_recv.Length > MaxRecvChars) _recv.Remove(0, _recv.Length - MaxRecvChars);
|
||||
}
|
||||
}
|
||||
|
||||
#region Script Execution
|
||||
@@ -350,11 +359,19 @@ public sealed class TTLInterpreter : IDisposable
|
||||
_logWriter?.WriteLine($"[Wait] {text}");
|
||||
|
||||
int elapsed = 0;
|
||||
int lastLen = -1; // buffer 長度沒變就不重掃(避免每 100ms 全量 ToString+IndexOf)
|
||||
while (true)
|
||||
{
|
||||
ThrowIfCancelled();
|
||||
bool found;
|
||||
lock (_recv) found = _recv.ToString().IndexOf(text, StringComparison.Ordinal) >= 0;
|
||||
bool found = false;
|
||||
lock (_recv)
|
||||
{
|
||||
if (_recv.Length != lastLen)
|
||||
{
|
||||
lastLen = _recv.Length;
|
||||
found = _recv.ToString().IndexOf(text, StringComparison.Ordinal) >= 0;
|
||||
}
|
||||
}
|
||||
if (found && SettleAndConsume(text)) return;
|
||||
|
||||
// 只有在明確設定 timeout(>0) 且超時才中止腳本;否則一直等到關鍵字出現或被取消。
|
||||
@@ -503,7 +520,7 @@ public sealed class TTLInterpreter : IDisposable
|
||||
if (parts.Length != 2) { Output?.Invoke("[pduconnect] syntax: pduconnect <device> <ip>"); _result = 0; return; }
|
||||
int device = ParseIntDirect(parts[0]);
|
||||
string ip = parts[1].Trim('\'', '"');
|
||||
var pdu = new PduController(ip);
|
||||
var pdu = new PduController(ip, AppLogger.Info, AppLogger.LogWarning);
|
||||
if (pdu.CheckConnection())
|
||||
{
|
||||
_pdus[device] = pdu;
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace ETTerms.Scripting;
|
||||
|
||||
/// <summary>
|
||||
/// TTL 腳本檔的共用小工具:選檔載入與 group 指令檢查。
|
||||
/// SessionPage(▶ Script)與 WorkspaceView(Run All / Run Group)共用,避免三份重複流程。
|
||||
/// </summary>
|
||||
public static class TtlScript
|
||||
{
|
||||
/// <summary>跳出選檔對話框並讀入腳本內容。使用者取消回傳 false。</summary>
|
||||
public static bool TryPick(IWin32Window owner, out string content, out string fileName)
|
||||
{
|
||||
content = "";
|
||||
fileName = "";
|
||||
using var dlg = new OpenFileDialog { Filter = "TTL scripts (*.ttl)|*.ttl|All files (*.*)|*.*" };
|
||||
if (dlg.ShowDialog(owner) != DialogResult.OK) return false;
|
||||
content = File.ReadAllText(dlg.FileName);
|
||||
fileName = Path.GetFileName(dlg.FileName);
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>腳本是否含只能在 Run Group 模式使用的同步指令(waitall / sendlnall / sendlngroup)。</summary>
|
||||
public static bool ContainsGroupCommands(string content)
|
||||
{
|
||||
foreach (var line in content.Split('\n'))
|
||||
{
|
||||
var t = line.Trim().ToLower();
|
||||
if (t.StartsWith("waitall") || t.StartsWith("sendlnall") || t.StartsWith("sendlngroup"))
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>含 group 指令時警告並回傳 true(呼叫端應中止,改用 Run Group)。</summary>
|
||||
public static bool WarnIfGroupCommands(IWin32Window owner, string content, string caption)
|
||||
{
|
||||
if (!ContainsGroupCommands(content)) return false;
|
||||
MessageBox.Show(owner,
|
||||
"Script contains 'waitall' or 'sendlnall' which require Group execution.\nPlease use Run Group buttons instead.",
|
||||
caption, MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -69,13 +69,28 @@ public sealed class SerialBridgeServer : IDisposable
|
||||
Send(new { sessions = SerialBridge.All.Select(e => new { name = e.Name, baud = e.BaudRate }) });
|
||||
break;
|
||||
case "attach":
|
||||
{
|
||||
Detach();
|
||||
attached = SerialBridge.Find(req.session ?? "");
|
||||
if (attached == null) { Send(new { ok = false, error = $"no open serial session '{req.session}' in GUI" }); break; }
|
||||
rx = data => Send(new { op = "rx", data = Encoding.UTF8.GetString(data) });
|
||||
// stateful Decoder:UTF-8 多位元組字元跨 chunk 邊界時不會解成亂碼
|
||||
var dec = Encoding.UTF8.GetDecoder();
|
||||
var decLock = new object();
|
||||
rx = data =>
|
||||
{
|
||||
string s;
|
||||
lock (decLock)
|
||||
{
|
||||
var chars = new char[data.Length];
|
||||
int n = dec.GetChars(data, 0, data.Length, chars, 0);
|
||||
s = new string(chars, 0, n);
|
||||
}
|
||||
if (s.Length > 0) Send(new { op = "rx", data = s });
|
||||
};
|
||||
attached.Rx += rx;
|
||||
Send(new { ok = true, name = attached.Name });
|
||||
break;
|
||||
}
|
||||
case "write":
|
||||
if (attached == null) { Send(new { ok = false, error = "not attached" }); break; }
|
||||
attached.Write(req.data ?? "", req.newline);
|
||||
|
||||
@@ -100,20 +100,8 @@ public sealed class SessionPage : UserControl
|
||||
|
||||
private async void OnRunScript(object? sender, EventArgs e)
|
||||
{
|
||||
string content, name;
|
||||
using (var dlg = new OpenFileDialog { Filter = "TTL scripts (*.ttl)|*.ttl|All files (*.*)|*.*" })
|
||||
{
|
||||
if (dlg.ShowDialog(this) != DialogResult.OK) return;
|
||||
content = File.ReadAllText(dlg.FileName);
|
||||
name = Path.GetFileName(dlg.FileName);
|
||||
}
|
||||
if (ContainsGroupCommands(content))
|
||||
{
|
||||
MessageBox.Show(this,
|
||||
"Script contains 'waitall' or 'sendlnall' which require Group execution.\nPlease use Run Group buttons instead.",
|
||||
"Script", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
if (!TtlScript.TryPick(this, out var content, out var name)) return;
|
||||
if (TtlScript.WarnIfGroupCommands(this, content, "Script")) return;
|
||||
SetRunning(true);
|
||||
await _runner.RunAsync(content, name, _channel);
|
||||
}
|
||||
@@ -168,17 +156,6 @@ public sealed class SessionPage : UserControl
|
||||
_log.FlatAppearance.BorderColor = on ? Theme.SerialColor : Theme.Border;
|
||||
}
|
||||
|
||||
private static bool ContainsGroupCommands(string content)
|
||||
{
|
||||
foreach (var line in content.Split('\n'))
|
||||
{
|
||||
var t = line.Trim().ToLower();
|
||||
if (t.StartsWith("waitall") || t.StartsWith("sendlnall") || t.StartsWith("sendlngroup"))
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private void SetRunning(bool running)
|
||||
{
|
||||
_run.Enabled = !running;
|
||||
|
||||
@@ -66,17 +66,32 @@ public sealed class ShellChannel : ISessionChannel
|
||||
UpdateProcThreadAttribute(si.lpAttributeList, 0, (IntPtr)0x00020016 /* PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE */,
|
||||
_ptyHandle, IntPtr.Size, IntPtr.Zero, IntPtr.Zero);
|
||||
|
||||
string workDir = string.IsNullOrWhiteSpace(_settings.StartupDirectory)
|
||||
? Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)
|
||||
: _settings.StartupDirectory;
|
||||
// 啟動目錄:若未設定或該目錄已不存在(例如外接碟拔除、資料夾被刪),
|
||||
// 一律退回目前使用者的家目錄(C:\Users\<user>),避免 CreateProcess 失敗 267 (ERROR_DIRECTORY)。
|
||||
string configured = _settings.StartupDirectory;
|
||||
string workDir = (!string.IsNullOrWhiteSpace(configured) && Directory.Exists(configured))
|
||||
? configured
|
||||
: Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
|
||||
|
||||
bool ok = CreateProcess(null, $"{exe} {args}".TrimEnd(), IntPtr.Zero, IntPtr.Zero, false,
|
||||
0x00080000 /* EXTENDED_STARTUPINFO_PRESENT */, IntPtr.Zero, workDir, ref si, out var pi);
|
||||
bool ok;
|
||||
PROCESS_INFORMATION pi;
|
||||
try
|
||||
{
|
||||
ok = CreateProcess(null, $"{exe} {args}".TrimEnd(), IntPtr.Zero, IntPtr.Zero, false,
|
||||
0x00080000 /* EXTENDED_STARTUPINFO_PRESENT */, IntPtr.Zero, workDir, ref si, out pi);
|
||||
}
|
||||
finally
|
||||
{
|
||||
// attribute list 在 CreateProcess 返回後即可釋放(文件保證),不釋放會每開一個 shell 漏一次
|
||||
DeleteProcThreadAttributeList(si.lpAttributeList);
|
||||
Marshal.FreeHGlobal(si.lpAttributeList);
|
||||
}
|
||||
|
||||
if (!ok) throw new Exception($"CreateProcess failed: {Marshal.GetLastWin32Error()}");
|
||||
|
||||
CloseHandle(pi.hThread);
|
||||
_proc = Process.GetProcessById(pi.dwProcessId);
|
||||
CloseHandle(pi.hProcess); // 之後都經由 _proc 操作,raw handle 不留(避免 handle 洩漏)
|
||||
|
||||
// Start reader thread
|
||||
_reader = new Thread(ReadLoop) { IsBackground = true, Name = "ConPTY-Reader" };
|
||||
@@ -98,7 +113,12 @@ public sealed class ShellChannel : ISessionChannel
|
||||
DataReceived?.Invoke(data);
|
||||
}
|
||||
}
|
||||
catch when (_closed) { }
|
||||
catch { /* 使用者關閉或 ConPTY 收掉都會走到這,不可讓例外殺掉行程 */ }
|
||||
|
||||
// shell 自己 exit(非使用者關分頁)時給個明確提示,分頁才不會看起來像死掉
|
||||
if (!_closed)
|
||||
DataReceived?.Invoke(Encoding.UTF8.GetBytes(
|
||||
"\r\n\x1b[90m[ETTerms] shell process exited\x1b[0m\r\n"));
|
||||
}
|
||||
|
||||
public void Write(byte[] data)
|
||||
@@ -173,6 +193,9 @@ public sealed class ShellChannel : ISessionChannel
|
||||
[DllImport("kernel32.dll", SetLastError = true)]
|
||||
private static extern bool UpdateProcThreadAttribute(IntPtr lpAttributeList, uint dwFlags, IntPtr Attribute, IntPtr lpValue, IntPtr cbSize, IntPtr lpPreviousValue, IntPtr lpReturnSize);
|
||||
|
||||
[DllImport("kernel32.dll")]
|
||||
private static extern void DeleteProcThreadAttributeList(IntPtr lpAttributeList);
|
||||
|
||||
[DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
|
||||
private static extern bool CreateProcess(string? lpApplicationName, string lpCommandLine, IntPtr lpProcessAttributes, IntPtr lpThreadAttributes, bool bInheritHandles, uint dwCreationFlags, IntPtr lpEnvironment, string lpCurrentDirectory, ref STARTUPINFOEX lpStartupInfo, out PROCESS_INFORMATION lpProcessInformation);
|
||||
|
||||
|
||||
@@ -40,9 +40,22 @@ public sealed class SshChannel : ISessionChannel
|
||||
var ci = BuildConnectionInfo();
|
||||
_client = new SshClient(ci);
|
||||
_client.HostKeyReceived += OnHostKey;
|
||||
// 斷線 / 錯誤要讓使用者看得到,否則只會覺得「打字沒反應」
|
||||
_client.ErrorOccurred += (_, e) =>
|
||||
{
|
||||
if (_closed) return;
|
||||
Emit($"\r\n\x1b[90m[SSH error] {e.Exception.Message}\x1b[0m\r\n");
|
||||
AppLogger.LogWarning($"SSH error {_ssh.Host}: {e.Exception.Message}");
|
||||
};
|
||||
_client.Connect();
|
||||
_shell = _client.CreateShellStream("xterm-256color", (uint)_cols, (uint)_rows, 0, 0, 4096);
|
||||
_shell.DataReceived += (_, e) => DataReceived?.Invoke(e.Data);
|
||||
_shell.Closed += (_, _) =>
|
||||
{
|
||||
if (_closed) return;
|
||||
Emit("\r\n\x1b[90m[SSH] connection closed by remote host\x1b[0m\r\n");
|
||||
AppLogger.Info($"SSH shell closed: {_ssh.Host}");
|
||||
};
|
||||
AppLogger.Info($"SSH connected: {_ssh.Username}@{_ssh.Host}:{_ssh.Port}");
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -102,8 +115,15 @@ public sealed class SshChannel : ISessionChannel
|
||||
public void Write(byte[] data)
|
||||
{
|
||||
if (_shell == null) return;
|
||||
_shell.Write(data, 0, data.Length);
|
||||
_shell.Flush();
|
||||
try
|
||||
{
|
||||
_shell.Write(data, 0, data.Length);
|
||||
_shell.Flush();
|
||||
}
|
||||
catch (Exception ex) // 連線已斷時從 UI thread 寫入不可讓例外炸掉視窗
|
||||
{
|
||||
if (!_closed) Emit($"\r\n\x1b[90m[SSH] write failed: {ex.Message}\x1b[0m\r\n");
|
||||
}
|
||||
}
|
||||
|
||||
public void Resize(int cols, int rows)
|
||||
|
||||
@@ -19,6 +19,14 @@ public sealed class AnsiParser
|
||||
/// <summary>DECCKM:application cursor keys(影響方向鍵送出序列)。</summary>
|
||||
public bool AppCursorKeys { get; private set; }
|
||||
|
||||
/// <summary>DEC mode 2004:bracketed paste。啟用時貼上內容須以 ESC[200~ / ESC[201~ 包夾,
|
||||
/// 讓 PSReadLine / Kiro CLI 等把多行貼上視為單一輸入而非逐行立即送出。</summary>
|
||||
public bool BracketedPaste { get; private set; }
|
||||
|
||||
/// <summary>對查詢序列(DSR ESC[5n/6n、DA ESC[c)的回覆,須回送給遠端。
|
||||
/// vim 等 TUI 會查游標位置,收不到回覆可能卡住或排版錯亂。</summary>
|
||||
public event Action<byte[]>? Response;
|
||||
|
||||
public AnsiParser(ScreenBuffer buffer) => _b = buffer;
|
||||
|
||||
public void Feed(byte[] data)
|
||||
@@ -126,9 +134,20 @@ public sealed class AnsiParser
|
||||
case 'h': SetMode(p, true); break;
|
||||
case 'l': SetMode(p, false); break;
|
||||
case 'm': Sgr(p); break;
|
||||
case 'n': if (!_priv) DeviceStatusReport(p); break;
|
||||
case 'c': if (!_priv) Respond("\x1b[?1;2c"); break; // DA:VT100 with AVO
|
||||
}
|
||||
}
|
||||
|
||||
private void DeviceStatusReport(int[] p)
|
||||
{
|
||||
int code = p.Length > 0 ? p[0] : 0;
|
||||
if (code == 5) Respond("\x1b[0n"); // 裝置 OK
|
||||
else if (code == 6) Respond($"\x1b[{_b.CursorRow + 1};{_b.CursorCol + 1}R"); // 游標位置(1-based)
|
||||
}
|
||||
|
||||
private void Respond(string seq) => Response?.Invoke(Encoding.ASCII.GetBytes(seq));
|
||||
|
||||
private void SetMode(int[] p, bool set)
|
||||
{
|
||||
if (!_priv) return;
|
||||
@@ -138,6 +157,7 @@ public sealed class AnsiParser
|
||||
case 25: _b.CursorVisible = set; break;
|
||||
case 7: _b.AutoWrap = set; break;
|
||||
case 1: AppCursorKeys = set; break;
|
||||
case 2004: BracketedPaste = set; break;
|
||||
case 47: case 1047: case 1049:
|
||||
if (set) _b.EnterAlt(); else _b.ExitAlt(); break;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,166 @@
|
||||
using System.Drawing;
|
||||
using System.Drawing.Drawing2D;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace ETTerms.Terminal;
|
||||
|
||||
/// <summary>
|
||||
/// 自繪深色垂直捲軸:細長、無箭頭按鈕、圓角滑塊,配合終端機深色主題。
|
||||
/// API(Minimum / Maximum / Value / LargeChange / SmallChange / Scroll)對齊 <see cref="VScrollBar"/>,
|
||||
/// 方便直接替換。<see cref="Scroll"/> 只在「使用者操作」造成值變動時觸發(程式設定 Value 不觸發)。
|
||||
/// </summary>
|
||||
public sealed class DarkScrollBar : Control
|
||||
{
|
||||
public int Minimum { get; set; } = 0;
|
||||
public int Maximum { get; set; } = 0;
|
||||
public int LargeChange { get; set; } = 1;
|
||||
public int SmallChange { get; set; } = 1;
|
||||
|
||||
private int _value;
|
||||
public int Value
|
||||
{
|
||||
get => _value;
|
||||
set { int v = Clamp(value); if (v != _value) { _value = v; Invalidate(); } }
|
||||
}
|
||||
|
||||
/// <summary>使用者拖曳 / 點軌道 / 滾輪造成值變動時觸發。</summary>
|
||||
public event EventHandler? Scroll;
|
||||
|
||||
// 配色(KKTerm 深色)
|
||||
private static readonly Color TrackColor = Color.FromArgb(24, 24, 28);
|
||||
private static readonly Color ThumbColor = Color.FromArgb(70, 70, 82);
|
||||
private static readonly Color ThumbHover = Color.FromArgb(100, 100, 118);
|
||||
private static readonly Color ThumbDrag = Color.FromArgb(130, 130, 152);
|
||||
|
||||
private bool _hover, _dragging;
|
||||
private int _dragOffset;
|
||||
|
||||
public DarkScrollBar()
|
||||
{
|
||||
SetStyle(ControlStyles.AllPaintingInWmPaint | ControlStyles.UserPaint
|
||||
| ControlStyles.OptimizedDoubleBuffer | ControlStyles.ResizeRedraw, true);
|
||||
// 純滑鼠操作的捲軸,無任何鍵盤邏輯,絕不可吃鍵盤焦點:否則身為唯一可選取子控制項,
|
||||
// 在 scrollback 出現(Enabled=true)後,視窗切走再切回時 WinForms 會把焦點還原到它身上,
|
||||
// 導致 TerminalView 收不到鍵盤輸入(打字 / Enter 全失效),需重開 session 才恢復。
|
||||
SetStyle(ControlStyles.Selectable, false);
|
||||
TabStop = false;
|
||||
Width = 12;
|
||||
BackColor = TrackColor;
|
||||
}
|
||||
|
||||
// ── 數值範圍工具 ─────────────────────────────────────────
|
||||
/// <summary>可達的最大 Value(與 VScrollBar 相同:Maximum - LargeChange + 1)。</summary>
|
||||
private int MaxValue => Math.Max(Minimum, Maximum - LargeChange + 1);
|
||||
private int Clamp(int v) => Math.Clamp(v, Minimum, MaxValue);
|
||||
private bool Scrollable => Enabled && MaxValue > Minimum;
|
||||
|
||||
// ── 滑塊幾何 ─────────────────────────────────────────────
|
||||
private const int MinThumb = 24;
|
||||
private const int Pad = 2;
|
||||
|
||||
private int TrackHeight => Math.Max(1, Height - Pad * 2);
|
||||
|
||||
private int ThumbHeight()
|
||||
{
|
||||
int total = Maximum - Minimum + 1;
|
||||
if (total <= 0) return TrackHeight;
|
||||
int h = (int)((long)TrackHeight * LargeChange / total);
|
||||
return Math.Clamp(h, MinThumb, TrackHeight);
|
||||
}
|
||||
|
||||
private int ThumbTop()
|
||||
{
|
||||
int range = MaxValue - Minimum;
|
||||
if (range <= 0) return Pad;
|
||||
int travel = TrackHeight - ThumbHeight();
|
||||
return Pad + (int)((long)travel * (_value - Minimum) / range);
|
||||
}
|
||||
|
||||
private Rectangle ThumbRect() => new(Pad, ThumbTop(), Math.Max(1, Width - Pad * 2), ThumbHeight());
|
||||
|
||||
// ── 繪製 ─────────────────────────────────────────────────
|
||||
protected override void OnPaint(PaintEventArgs e)
|
||||
{
|
||||
var g = e.Graphics;
|
||||
g.Clear(TrackColor);
|
||||
if (!Scrollable) return; // 不可捲動時只畫底色(與停用態一致)
|
||||
|
||||
g.SmoothingMode = SmoothingMode.AntiAlias;
|
||||
var r = ThumbRect();
|
||||
var color = _dragging ? ThumbDrag : _hover ? ThumbHover : ThumbColor;
|
||||
int radius = Math.Min(r.Width, 6);
|
||||
using var path = RoundedRect(r, radius);
|
||||
using var b = new SolidBrush(color);
|
||||
g.FillPath(b, path);
|
||||
}
|
||||
|
||||
private static GraphicsPath RoundedRect(Rectangle r, int radius)
|
||||
{
|
||||
int d = radius * 2;
|
||||
var p = new GraphicsPath();
|
||||
if (d <= 0 || d > r.Width || d > r.Height) { p.AddRectangle(r); return p; }
|
||||
p.AddArc(r.X, r.Y, d, d, 180, 90);
|
||||
p.AddArc(r.Right - d, r.Y, d, d, 270, 90);
|
||||
p.AddArc(r.Right - d, r.Bottom - d, d, d, 0, 90);
|
||||
p.AddArc(r.X, r.Bottom - d, d, d, 90, 90);
|
||||
p.CloseFigure();
|
||||
return p;
|
||||
}
|
||||
|
||||
// ── 滑鼠互動 ─────────────────────────────────────────────
|
||||
protected override void OnMouseDown(MouseEventArgs e)
|
||||
{
|
||||
if (e.Button != MouseButtons.Left || !Scrollable) return;
|
||||
var thumb = ThumbRect();
|
||||
if (thumb.Contains(e.Location))
|
||||
{
|
||||
_dragging = true;
|
||||
_dragOffset = e.Y - thumb.Top;
|
||||
}
|
||||
else
|
||||
{
|
||||
// 點軌道:往點擊方向翻一頁
|
||||
SetValueFromUser(e.Y < thumb.Top ? _value - LargeChange : _value + LargeChange);
|
||||
}
|
||||
Invalidate();
|
||||
}
|
||||
|
||||
protected override void OnMouseMove(MouseEventArgs e)
|
||||
{
|
||||
bool over = ThumbRect().Contains(e.Location);
|
||||
if (over != _hover) { _hover = over; Invalidate(); }
|
||||
|
||||
if (!_dragging) return;
|
||||
int travel = TrackHeight - ThumbHeight();
|
||||
if (travel <= 0) return;
|
||||
int range = MaxValue - Minimum;
|
||||
int y = Math.Clamp(e.Y - _dragOffset - Pad, 0, travel);
|
||||
SetValueFromUser(Minimum + (int)((long)y * range / travel));
|
||||
}
|
||||
|
||||
protected override void OnMouseUp(MouseEventArgs e)
|
||||
{
|
||||
if (_dragging) { _dragging = false; Invalidate(); }
|
||||
}
|
||||
|
||||
protected override void OnMouseLeave(EventArgs e)
|
||||
{
|
||||
if (_hover) { _hover = false; Invalidate(); }
|
||||
}
|
||||
|
||||
protected override void OnMouseWheel(MouseEventArgs e)
|
||||
{
|
||||
if (!Scrollable) return;
|
||||
int step = e.Delta / 120 * SmallChange * 3;
|
||||
SetValueFromUser(_value - step);
|
||||
}
|
||||
|
||||
private void SetValueFromUser(int v)
|
||||
{
|
||||
int nv = Clamp(v);
|
||||
if (nv == _value) return;
|
||||
_value = nv;
|
||||
Invalidate();
|
||||
Scroll?.Invoke(this, EventArgs.Empty);
|
||||
}
|
||||
}
|
||||
@@ -33,8 +33,11 @@ public sealed class ScreenBuffer
|
||||
public bool AutoWrap = true;
|
||||
|
||||
private Cell[][] _screen;
|
||||
private readonly List<Cell[]> _scrollback = new();
|
||||
private readonly int _maxScroll;
|
||||
// scrollback 用環形緩衝:滿了以後 push/丟舊行都是 O(1)。
|
||||
// (原本 List + RemoveRange(0,…) 在 buffer 滿時每推一行就整串搬移,大量輸出會愈跑愈卡。)
|
||||
private readonly Cell[]?[] _sb;
|
||||
private int _sbHead; // 最舊一行的位置
|
||||
private int _sbCount;
|
||||
private int _top, _bottom; // 滾動區(含)
|
||||
private bool _wrapPending;
|
||||
|
||||
@@ -49,15 +52,15 @@ public sealed class ScreenBuffer
|
||||
{
|
||||
Cols = Math.Max(1, cols); Rows = Math.Max(1, rows);
|
||||
DefaultFg = fg; DefaultBg = bg; PenFg = fg; PenBg = bg;
|
||||
_maxScroll = maxScrollback;
|
||||
_sb = new Cell[Math.Max(0, maxScrollback)][];
|
||||
_screen = NewGrid(Rows, Cols);
|
||||
_top = 0; _bottom = Rows - 1;
|
||||
}
|
||||
|
||||
// ── 給 TerminalView 讀取 ─────────────────────────────────
|
||||
public int ScrollbackCount => _scrollback.Count;
|
||||
public int TotalRows => _scrollback.Count + Rows;
|
||||
public Cell[] LineAt(int abs) => abs < _scrollback.Count ? _scrollback[abs] : _screen[abs - _scrollback.Count];
|
||||
public int ScrollbackCount => _sbCount;
|
||||
public int TotalRows => _sbCount + Rows;
|
||||
public Cell[] LineAt(int abs) => abs < _sbCount ? _sb[(_sbHead + abs) % _sb.Length]! : _screen[abs - _sbCount];
|
||||
|
||||
// ── 內部建構工具 ─────────────────────────────────────────
|
||||
private Cell BlankPen() => new() { Ch = ' ', Fg = PenFg, Bg = PenBg, Attr = CellAttr.None };
|
||||
@@ -73,8 +76,9 @@ public sealed class ScreenBuffer
|
||||
|
||||
private void PushScroll(Cell[] line)
|
||||
{
|
||||
_scrollback.Add(line);
|
||||
if (_scrollback.Count > _maxScroll) _scrollback.RemoveRange(0, _scrollback.Count - _maxScroll);
|
||||
if (_sb.Length == 0) return;
|
||||
if (_sbCount < _sb.Length) _sb[(_sbHead + _sbCount++) % _sb.Length] = line;
|
||||
else { _sb[_sbHead] = line; _sbHead = (_sbHead + 1) % _sb.Length; } // 滿了:覆蓋最舊一行
|
||||
}
|
||||
|
||||
// ── 輸出字元 ─────────────────────────────────────────────
|
||||
@@ -229,7 +233,7 @@ public sealed class ScreenBuffer
|
||||
|
||||
public void EraseInDisplay(int mode)
|
||||
{
|
||||
if (mode == 3) { _scrollback.Clear(); return; }
|
||||
if (mode == 3) { Array.Clear(_sb); _sbHead = 0; _sbCount = 0; return; }
|
||||
if (mode == 2) { for (int r = 0; r < Rows; r++) _screen[r] = BlankLine(); return; }
|
||||
if (mode == 0)
|
||||
{
|
||||
@@ -270,20 +274,29 @@ public sealed class ScreenBuffer
|
||||
{
|
||||
cols = Math.Max(1, cols); rows = Math.Max(1, rows);
|
||||
if (cols == Cols && rows == Rows) return;
|
||||
var ng = new Cell[rows][];
|
||||
for (int r = 0; r < rows; r++)
|
||||
{
|
||||
ng[r] = new Cell[cols];
|
||||
for (int c = 0; c < cols; c++)
|
||||
ng[r][c] = (r < Rows && c < Cols) ? _screen[r][c] : BlankDefault();
|
||||
}
|
||||
_screen = ng;
|
||||
_screen = Reflow(_screen, rows, cols);
|
||||
// alt screen 啟用中也要一併 reflow 保存的主畫面,否則 resize 後 ExitAlt 會還原失敗、
|
||||
// 畫面殘留 TUI 內容。不可把 _mainScreen 丟掉。
|
||||
if (_mainScreen != null) _mainScreen = Reflow(_mainScreen, rows, cols);
|
||||
Rows = rows; Cols = cols;
|
||||
_top = 0; _bottom = Rows - 1;
|
||||
CursorRow = Math.Clamp(CursorRow, 0, Rows - 1);
|
||||
CursorCol = Math.Clamp(CursorCol, 0, Cols - 1);
|
||||
_wrapPending = false;
|
||||
_mainScreen = null;
|
||||
if (AltActive) { /* alt 下 resize:重建 alt 畫面 */ }
|
||||
}
|
||||
|
||||
/// <summary>把字格陣列重排到新尺寸,保留左上重疊區,其餘填預設空白。</summary>
|
||||
private Cell[][] Reflow(Cell[][] src, int rows, int cols)
|
||||
{
|
||||
int oldRows = src.Length;
|
||||
var ng = new Cell[rows][];
|
||||
for (int r = 0; r < rows; r++)
|
||||
{
|
||||
ng[r] = new Cell[cols];
|
||||
int oldCols = r < oldRows ? src[r].Length : 0;
|
||||
for (int c = 0; c < cols; c++)
|
||||
ng[r][c] = (c < oldCols) ? src[r][c] : BlankDefault();
|
||||
}
|
||||
return ng;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,6 +9,11 @@ public static class TerminalInput
|
||||
{
|
||||
public static byte[]? Map(KeyEventArgs e, bool appCursor)
|
||||
{
|
||||
// Enter:一般送 CR(\r) 視為「送出」;Shift+Enter 送 LF(\n),讓 PSReadLine / Kiro 等
|
||||
// 視為「插入換行」以便輸入多行指令,而不是直接送出。
|
||||
if (e.KeyCode == Keys.Enter)
|
||||
return new[] { (byte)(e.Shift ? '\n' : '\r') };
|
||||
|
||||
string? seq = e.KeyCode switch
|
||||
{
|
||||
Keys.Up => appCursor ? "\x1bOA" : "\x1b[A",
|
||||
@@ -21,7 +26,6 @@ public static class TerminalInput
|
||||
Keys.Delete => "\x1b[3~",
|
||||
Keys.PageUp => "\x1b[5~",
|
||||
Keys.PageDown => "\x1b[6~",
|
||||
Keys.Enter => "\r",
|
||||
Keys.Tab => "\t",
|
||||
Keys.Escape => "\x1b",
|
||||
Keys.Back => "\x7f",
|
||||
@@ -41,4 +45,17 @@ public static class TerminalInput
|
||||
};
|
||||
return seq is null ? null : Encoding.ASCII.GetBytes(seq);
|
||||
}
|
||||
|
||||
/// <summary>滾輪 → 上/下方向鍵序列(alt screen 用,每格 3 行)。notches 正值往上。</summary>
|
||||
public static byte[]? WheelArrows(int notches, bool appCursor)
|
||||
{
|
||||
if (notches == 0) return null;
|
||||
string one = notches > 0
|
||||
? (appCursor ? "\x1bOA" : "\x1b[A")
|
||||
: (appCursor ? "\x1bOB" : "\x1b[B");
|
||||
int count = Math.Abs(notches) * 3;
|
||||
var sb = new StringBuilder(one.Length * count);
|
||||
for (int i = 0; i < count; i++) sb.Append(one);
|
||||
return Encoding.ASCII.GetBytes(sb.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,6 +17,13 @@ public sealed class TerminalView : UserControl
|
||||
private readonly ScreenBuffer _buf;
|
||||
private readonly AnsiParser _parser;
|
||||
private readonly Font _font;
|
||||
// 繪製熱路徑的快取:Font 建立是貴的 GDI 操作,預先做好 4 種變體;
|
||||
// SolidBrush 的 Color 可改,用單一 brush 重複填色,避免每段 run 都 new/dispose。
|
||||
private readonly Font _fontBold, _fontUnderline, _fontBoldUnderline;
|
||||
private readonly SolidBrush _fill = new(Color.Black);
|
||||
private readonly StringBuilder _runSb = new();
|
||||
private readonly DarkScrollBar _vscroll; // 右側深色垂直捲軸(可拖曳捲動 scrollback)
|
||||
private bool _suppressScroll; // 程式設定捲軸值時抑制回呼
|
||||
private int _cellW, _cellH;
|
||||
private int _scrollOffset; // 0 = 貼底;>0 = 往上看 scrollback
|
||||
private int _lastCols = -1, _lastRows = -1;
|
||||
@@ -33,6 +40,9 @@ public sealed class TerminalView : UserControl
|
||||
BackColor = Color.FromArgb(18, 18, 22);
|
||||
ImeMode = ImeMode.NoControl; // 容器控制項預設關 IME,這裡明確開啟讓使用者可切中文
|
||||
_font = new Font(profile.FontFamily, profile.FontSize);
|
||||
_fontBold = new Font(_font, FontStyle.Bold);
|
||||
_fontUnderline = new Font(_font, FontStyle.Underline);
|
||||
_fontBoldUnderline = new Font(_font, FontStyle.Bold | FontStyle.Underline);
|
||||
using (var g = CreateGraphics())
|
||||
{
|
||||
var sz = TextRenderer.MeasureText(g, "W", _font, Size.Empty, TextFormatFlags.NoPadding);
|
||||
@@ -42,28 +52,48 @@ public sealed class TerminalView : UserControl
|
||||
_buf = new ScreenBuffer(profile.Cols, profile.Rows,
|
||||
Color.FromArgb(220, 220, 220), BackColor, profile.ScrollbackLines);
|
||||
_parser = new AnsiParser(_buf);
|
||||
_parser.Response += bytes => SendData?.Invoke(bytes); // DSR/DA 查詢回覆(如 ESC[6n 游標位置)
|
||||
|
||||
// 右側深色垂直捲軸:拖曳即捲動 scrollback。內容寬度會扣掉捲軸寬,故文字不會被蓋住。
|
||||
_vscroll = new DarkScrollBar { Dock = DockStyle.Right, SmallChange = 1, Minimum = 0, Maximum = 0 };
|
||||
_vscroll.Scroll += OnVScroll;
|
||||
Controls.Add(_vscroll);
|
||||
}
|
||||
|
||||
/// <summary>餵入遠端資料(須在 UI thread 呼叫)。</summary>
|
||||
public void Feed(byte[] data)
|
||||
{
|
||||
int before = _buf.ScrollbackCount;
|
||||
_parser.Feed(data);
|
||||
_scrollOffset = 0; // 新輸出貼底
|
||||
// 已貼底才跟隨新輸出;使用者往回看歷史時,補償 scrollback 增量讓畫面停在原處,
|
||||
// 不會每來一筆輸出就被拉回底部。
|
||||
if (_scrollOffset > 0)
|
||||
_scrollOffset = Math.Min(_scrollOffset + (_buf.ScrollbackCount - before), _buf.ScrollbackCount);
|
||||
UpdateScrollBar();
|
||||
Invalidate();
|
||||
}
|
||||
|
||||
private int ContentWidth => Math.Max(_cellW, ClientSize.Width - (_vscroll?.Width ?? 0));
|
||||
private int VisibleRows => Math.Max(1, ClientSize.Height / _cellH);
|
||||
private int VisibleCols => Math.Max(1, ClientSize.Width / _cellW);
|
||||
private int VisibleCols => Math.Max(1, ContentWidth / _cellW);
|
||||
|
||||
// ── resize → 通知 PTY ────────────────────────────────────
|
||||
protected override void OnSizeChanged(EventArgs e)
|
||||
{
|
||||
base.OnSizeChanged(e);
|
||||
|
||||
// 視窗最小化、或分頁/分割切換的瞬間,ClientSize 會變成 0/極小。此時若把退化尺寸
|
||||
// (會被算成 1×1)送給 PTY,ConPTY 下的全螢幕 TUI(如 Kiro CLI)會誤以為終端機只剩
|
||||
// 1×1 而停止重繪、輸入也像「卡住」。直接忽略這種尺寸,還原後再以正常尺寸重繪即可。
|
||||
if (ClientSize.Width < _cellW || ClientSize.Height < _cellH) return;
|
||||
if (FindForm() is { WindowState: FormWindowState.Minimized }) return;
|
||||
|
||||
int cols = VisibleCols, rows = VisibleRows;
|
||||
if (cols == _lastCols && rows == _lastRows) return;
|
||||
_lastCols = cols; _lastRows = rows;
|
||||
_buf.Resize(cols, rows);
|
||||
Resized?.Invoke(cols, rows);
|
||||
UpdateScrollBar();
|
||||
Invalidate();
|
||||
}
|
||||
|
||||
@@ -99,36 +129,48 @@ public sealed class TerminalView : UserControl
|
||||
if ((cell.Attr & CellAttr.Wide) != 0)
|
||||
{
|
||||
var wr = new Rectangle(c * _cellW, y, _cellW * 2, _cellH);
|
||||
using (var bb = new SolidBrush(bg)) g.FillRectangle(bb, wr);
|
||||
FillRect(g, wr, bg);
|
||||
DrawRun(g, cell.Ch == '\0' ? " " : cell.Ch.ToString(), cell.Attr, wr, fg);
|
||||
c++;
|
||||
continue;
|
||||
}
|
||||
|
||||
// 合併同屬性連續的窄字
|
||||
// 合併同色同字型的連續窄字(每個 cell 的顏色只解析一次)
|
||||
const CellAttr FontAttrs = CellAttr.Bold | CellAttr.Underline;
|
||||
int start = c;
|
||||
var sb = new StringBuilder();
|
||||
_runSb.Clear();
|
||||
_runSb.Append(cell.Ch == '\0' ? ' ' : cell.Ch);
|
||||
c++;
|
||||
while (c < line.Length)
|
||||
{
|
||||
var cur = line[c];
|
||||
if ((cur.Attr & (CellAttr.Wide | CellAttr.WideTrail)) != 0) break;
|
||||
ResolveColors(cur, out var f2, out var b2, abs, c);
|
||||
if (f2 != fg || b2 != bg || (cur.Attr & CellAttr.Bold) != (cell.Attr & CellAttr.Bold)) break;
|
||||
sb.Append(cur.Ch == '\0' ? ' ' : cur.Ch);
|
||||
if (f2 != fg || b2 != bg || (cur.Attr & FontAttrs) != (cell.Attr & FontAttrs)) break;
|
||||
_runSb.Append(cur.Ch == '\0' ? ' ' : cur.Ch);
|
||||
c++;
|
||||
}
|
||||
var rect = new Rectangle(start * _cellW, y, (c - start) * _cellW, _cellH);
|
||||
using (var bb = new SolidBrush(bg)) g.FillRectangle(bb, rect);
|
||||
DrawRun(g, sb.ToString(), cell.Attr, rect, fg);
|
||||
FillRect(g, rect, bg);
|
||||
DrawRun(g, _runSb.ToString(), cell.Attr, rect, fg);
|
||||
}
|
||||
}
|
||||
|
||||
private void FillRect(Graphics g, Rectangle rect, Color bg)
|
||||
{
|
||||
_fill.Color = bg;
|
||||
g.FillRectangle(_fill, rect);
|
||||
}
|
||||
|
||||
private Font FontFor(CellAttr attr)
|
||||
{
|
||||
bool bold = (attr & CellAttr.Bold) != 0, ul = (attr & CellAttr.Underline) != 0;
|
||||
return bold ? (ul ? _fontBoldUnderline : _fontBold) : (ul ? _fontUnderline : _font);
|
||||
}
|
||||
|
||||
private void DrawRun(Graphics g, string text, CellAttr attr, Rectangle rect, Color fg)
|
||||
{
|
||||
var style = (attr & CellAttr.Bold) != 0 ? FontStyle.Bold : FontStyle.Regular;
|
||||
if ((attr & CellAttr.Underline) != 0) style |= FontStyle.Underline;
|
||||
using var fnt = style == FontStyle.Regular ? _font : new Font(_font, style);
|
||||
TextRenderer.DrawText(g, text, fnt, rect, fg,
|
||||
TextRenderer.DrawText(g, text, FontFor(attr), rect, fg,
|
||||
TextFormatFlags.NoPadding | TextFormatFlags.NoPrefix | TextFormatFlags.Left);
|
||||
}
|
||||
|
||||
@@ -165,10 +207,7 @@ public sealed class TerminalView : UserControl
|
||||
|
||||
protected override void OnKeyPress(KeyPressEventArgs e)
|
||||
{
|
||||
if (!char.IsControl(e.KeyChar) || e.KeyChar is '\r' or '\t' or '\b' or '\x1b')
|
||||
{
|
||||
// \r,\t,\b,\x1b 已由 OnKeyDown 送出,這裡只送一般可列印字元與 Ctrl 組合碼
|
||||
}
|
||||
// \r,\t,\b,\x1b 已由 OnKeyDown 送出,這裡只送一般可列印字元與 Ctrl 組合碼
|
||||
if (e.KeyChar >= ' ' && e.KeyChar != '\x7f')
|
||||
SendData?.Invoke(Encoding.UTF8.GetBytes(e.KeyChar.ToString()));
|
||||
else if (char.IsControl(e.KeyChar) && e.KeyChar is not ('\r' or '\t' or '\b' or '\x1b'))
|
||||
@@ -179,11 +218,57 @@ public sealed class TerminalView : UserControl
|
||||
// ── 滑鼠:scrollback / 選取 / 貼上 ───────────────────────
|
||||
protected override void OnMouseWheel(MouseEventArgs e)
|
||||
{
|
||||
int delta = e.Delta / 120 * 3;
|
||||
_scrollOffset = Math.Clamp(_scrollOffset + delta, 0, _buf.ScrollbackCount);
|
||||
int notches = e.Delta / 120;
|
||||
// alt screen(vim / htop 等全螢幕 TUI)沒有 scrollback:慣例是把滾輪轉成
|
||||
// 上下方向鍵送給對方,讓應用程式自己捲動。
|
||||
if (_buf.AltActive)
|
||||
{
|
||||
var seq = TerminalInput.WheelArrows(notches, _parser.AppCursorKeys);
|
||||
if (seq != null) SendData?.Invoke(seq);
|
||||
return;
|
||||
}
|
||||
_scrollOffset = Math.Clamp(_scrollOffset + notches * 3, 0, _buf.ScrollbackCount);
|
||||
UpdateScrollBar();
|
||||
Invalidate();
|
||||
}
|
||||
|
||||
// ── 垂直捲軸 ─────────────────────────────────────────────
|
||||
private void OnVScroll(object? sender, EventArgs e)
|
||||
{
|
||||
if (_suppressScroll) return;
|
||||
// 捲軸值 = 視窗第一列的絕對 index;_scrollOffset = 距底部的列數。
|
||||
_scrollOffset = Math.Clamp(_buf.ScrollbackCount - _vscroll.Value, 0, _buf.ScrollbackCount);
|
||||
Invalidate();
|
||||
}
|
||||
|
||||
/// <summary>依目前 scrollback / 捲動位置同步捲軸的範圍與滑塊位置。</summary>
|
||||
private void UpdateScrollBar()
|
||||
{
|
||||
if (_vscroll is null) return;
|
||||
_suppressScroll = true;
|
||||
try
|
||||
{
|
||||
int visible = VisibleRows;
|
||||
int total = _buf.TotalRows;
|
||||
if (_buf.ScrollbackCount <= 0)
|
||||
{
|
||||
_vscroll.Enabled = false;
|
||||
_vscroll.LargeChange = 1;
|
||||
_vscroll.Maximum = 0;
|
||||
_vscroll.Value = 0;
|
||||
return;
|
||||
}
|
||||
_vscroll.Enabled = true;
|
||||
// 先設 LargeChange/Maximum 再設 Value,避免 Value 超出可達範圍被夾掉。
|
||||
_vscroll.LargeChange = Math.Max(1, visible);
|
||||
_vscroll.Maximum = Math.Max(0, total - 1);
|
||||
int top = _buf.ScrollbackCount - _scrollOffset; // 視窗第一列絕對 index
|
||||
int maxValue = Math.Max(0, _vscroll.Maximum - _vscroll.LargeChange + 1);
|
||||
_vscroll.Value = Math.Clamp(top, 0, maxValue);
|
||||
}
|
||||
finally { _suppressScroll = false; }
|
||||
}
|
||||
|
||||
protected override void OnMouseDown(MouseEventArgs e)
|
||||
{
|
||||
Focus();
|
||||
@@ -195,7 +280,8 @@ public sealed class TerminalView : UserControl
|
||||
}
|
||||
else if (e.Button == MouseButtons.Right)
|
||||
{
|
||||
if (_hasSel) CopySelection(); else Paste();
|
||||
if (_hasSel) { CopySelection(); _hasSel = false; Invalidate(); } // 複製後清掉反白,讓 user 知道已動作
|
||||
else Paste();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -257,8 +343,17 @@ public sealed class TerminalView : UserControl
|
||||
{
|
||||
try
|
||||
{
|
||||
if (Clipboard.ContainsText())
|
||||
SendData?.Invoke(Encoding.UTF8.GetBytes(Clipboard.GetText().Replace("\r\n", "\r")));
|
||||
if (!Clipboard.ContainsText()) return;
|
||||
// 換行統一成 CR:剪貼簿多為 \r\n,也處理單獨的 \n。
|
||||
var text = Clipboard.GetText().Replace("\r\n", "\r").Replace('\n', '\r');
|
||||
|
||||
// 應用程式啟用 bracketed paste(PSReadLine / Kiro CLI 等)時,以 ESC[200~ … ESC[201~
|
||||
// 包夾整段貼上內容,讓對方視為「單次貼上」而非逐行 Enter 立即送出;
|
||||
// 未啟用時才退回原本逐字送出(一般 shell 的預期行為)。
|
||||
var data = _parser.BracketedPaste
|
||||
? Encoding.UTF8.GetBytes("\x1b[200~" + text + "\x1b[201~")
|
||||
: Encoding.UTF8.GetBytes(text);
|
||||
SendData?.Invoke(data);
|
||||
}
|
||||
catch { }
|
||||
}
|
||||
@@ -332,6 +427,19 @@ public sealed class TerminalView : UserControl
|
||||
finally { ImmReleaseContext(Handle, hImc); }
|
||||
}
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing)
|
||||
{
|
||||
_fill.Dispose();
|
||||
_fontBold.Dispose();
|
||||
_fontUnderline.Dispose();
|
||||
_fontBoldUnderline.Dispose();
|
||||
_font.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
[StructLayout(LayoutKind.Sequential)] private struct POINT { public int x, y; }
|
||||
[StructLayout(LayoutKind.Sequential)] private struct RECT { public int left, top, right, bottom; }
|
||||
[StructLayout(LayoutKind.Sequential)] private struct COMPOSITIONFORM { public int dwStyle; public POINT ptCurrentPos; public RECT rcArea; }
|
||||
|
||||
Reference in New Issue
Block a user