diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index 2a1cca8..95cf9ce 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -502,6 +502,10 @@ AiChatView（Workspace 的一種 pane，與 SessionPage 並排；工具列 ✨ A - 破壞性 PDU 動作（`pdu_set_port` off / `pdu_power_cycle`）一律 **C# 端彈確認框**（`AiTools.ConfirmAsync` → GUI MessageBox,預設按鈕 No；不信 LLM 自律）。 - 所有 AI 工具呼叫寫 **AppLogger** 留跡（`[AI tool] `）。 - Serial TX 沿 Phase 9 慣例以 `[AI]` 標色 echo（`SerialBridgeEndpoint.Write`）,使用者全程看得到 AI 打了什麼。 +- **工具呼叫上限可設定**（`AppSettings.AiMaxToolRounds`,Settings → AI Assistant）：單次訊息最多鏈幾輪工具的保險,**0 = 無上限**（給放著跑一天的自動化腳本；每輪都燒 token,執行中聊天視窗的 **Stop** 鈕可隨時中止,經 `CancellationToken`）。預設 30。 + +**典型應用（搭配自架 OpenAI 相容 gateway = 硬體工程助理）：** +把 Provider 指向你自己的 LLM gateway（本機 Ollama / LiteLLM / 公司 gateway…),ETTerms 就變成一個能用自然語言操作實體硬體的助理:查/送 serial console 指令、依裝置回應判斷、控制 PDU power-cycle DUT、跑重複性測試序列（工具上限設 0 可長跑）。AI 的 serial TX 以 `[AI]` 顯示在終端機,與手動操作同一條 channel,所見即所得。⚠️ 端點由使用者自帶,發佈版不含任何端點（見下方 Security）。 **實作選型：** 手寫 `OpenAiChatClient`（HttpClient + System.Text.Json,非串流）+ 手寫 agent loop,**不引入 `Microsoft.Extensions.AI`**——依賴最小、對任意 OpenAI 相容 gateway 相容性自己掌控、無額外 NuGet 演進風險。工具 schema 為手組 JSON（OpenAI function-calling 格式）。 @@ -764,7 +768,7 @@ Rename-Item (Join-Path $proot "ETTerms.exe") "ETTerms v$ver.exe" - ~~**AI / MCP 整合**~~（✅ 已於 [Phase 9](#development-phases) 實作：Serial MCP Server，讓 AI agent 直接操作 serial；未來可再擴充 SSH / Shell MCP 工具） - ~~**SFTP 檔案瀏覽**~~（✅ 已於 Phase 8 實作：sidebar SFTP 分頁） -- **AI Chat 氣泡版（WebView2）**（v0.7.0 候選）：目前 AI 分頁走 RichTextBox「乾淨逐字稿」風（與終端機一致、務實）；若要真正的聊天氣泡（圓角、限寬、user 右 AI 左）+ Markdown / 程式碼區塊高亮 + 工具呼叫可摺疊卡片,正解是改用 WebView2 + HTML/CSS 渲染。代價：引入 WebView2 依賴、portable 版變大。列為獨立升級,不在 RichTextBox 上硬做氣泡。 +- ~~**AI Chat 氣泡版（WebView2）**~~（✅ v0.7.0 已實作）：AI 分頁訊息區改用 WebView2 渲染真氣泡（user 右 / AI 左）+ Markdown（Markdig 轉 HTML：程式碼區塊、表格、清單）+ 送出後 thinking 動畫泡。HTML 模板 `Ai/ChatHtml.cs`（全內嵌 CSS/JS,`NavigateToString`）,C# 經 `ExecuteScriptAsync` 呼叫 JS（`addUser`/`addAI`/`addTool`/`showThinking`/`hideThinking`…；WebView2 未就緒前的呼叫先入佇列,`NavigationCompleted` 後 flush）。WebView2 使用者資料夾 `%LocalAppData%\ETTerms\WebView2`。底部控制列（輸入框 / 模型下拉 / Send）仍 WinForms。依賴 WebView2 Runtime（Win11 內建）。 - **Telnet** session 類型（補一個 `TelnetChannel : ISessionChannel`） - **RDP / VNC** 分頁（KKTerm 用 mstscax.dll；ETTerms 可後期評估） - **tmux 自動 attach**（SSH 斷線後自動回貼，仿 KKTerm） diff --git a/CLAUDE.md b/CLAUDE.md index be15db9..26bae0c 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -10,6 +10,8 @@ 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）、**Phase 10 ✅（v0.6.0）內建 AI Assistant**（見下）。打包待指示。 +**v0.7.0：** **AI Chat 改用 WebView2 渲染**（真氣泡 + Markdown + thinking 動畫泡）。訊息區從 RichTextBox 換成 `WebView2`：user 右泡 / AI 左泡、AI 回覆走 **Markdig** markdown→HTML（程式碼區塊/表格/清單）、送出後顯示會動的 thinking「…」泡（`AgentHost.Status "thinking"` → `showThinking()`，收到 `AssistantText` 時 `hideThinking()` 再加 AI 泡）。HTML 模板全內嵌於 `Ai/ChatHtml.cs`（`NavigateToString`,無外部依賴）,C# 經 `ExecuteScriptAsync` 呼叫 JS 函式;WebView2 async 初始化,就緒前的呼叫先入 `_pending` 佇列、`NavigationCompleted` 後 flush。使用者資料夾 `%LocalAppData%\ETTerms\WebView2`（避開 Program Files 唯讀）。底部控制列（輸入框/模型下拉/Send）仍 WinForms。新增 NuGet `Microsoft.Web.WebView2` + `Markdig`;依賴 WebView2 Runtime（Win11 內建,缺時 hint 顯示錯誤）。⚠️ **publish 要確認 WebView2 native（`runtimes/win-x64/native/WebView2Loader.dll`）有進產物**。**工具呼叫上限可設定**（`AppSettings.AiMaxToolRounds`,Settings → AI Assistant,`AgentHost` 建構子傳入）：**0 = 無上限**（自動化長跑;每輪燒 token,聊天視窗 Send 鈕在執行中變 **Stop**,經 `CancellationToken` 中止）,預設 30。 + **v0.6.0：** **內建 AI Assistant（Phase 10）** — 不經 Claude / Kiro，GUI 內建 ✨ AI 聊天**分頁**，自然語言驅動 serial + PDU。**AI 是 Workspace 的一種 pane**（工具列 `✨ AI Chat` 開啟，`WorkspaceView.Session` 抽象化為可容納 `SessionPage` 或 `AiChatView` 的 `Content`），可用 Layout 與 serial 分頁**並排同時用**（像 Claude/Kiro）；AI 分頁無 Group/Log/Script。**UI 走乾淨逐字稿風**（user 靠右 accent、AI 靠左、工具灰字、thinking 收進 Send 按鈕不洗版；與終端機美學一致，非氣泡——真氣泡+Markdown 的 WebView2 版列 v0.7.0）。**模型下拉**（右下角）打端點 `/v1/models` 列可選模型、即時切換並記住；**Settings 只留 Base URL / API Key / 系統提示詞,不再設 model**（`configured` 只看 Base URL）。**BYO endpoint**：`Settings → AI Assistant` 填 Base URL / Model / API Key（任意 OpenAI 相容 gateway：本機 Ollama、LiteLLM、公司 gateway、OpenAI…），**預設全空白＝功能停用**；🚫 **發佈版不含任何私人端點**，API key 存 Windows Credential Manager（`ETTerms/AiApiKey`）、Base URL/Model 存 settings.json，程式碼範例一律 `localhost`/假 IP。**架構（in-process，不經 MCP）**：`Ai/OpenAiChatClient`（極簡 OpenAI 相容 `/chat/completions`，HttpClient 非串流）+ `Ai/AgentHost`（手寫 agent loop，tool_calls→執行→role=tool 餵回→迴圈上限 8 輪）+ `Ai/AiTools`（serial list/attach/write/read 經 `SerialBridge`——與 MCP 同一路徑、AI 的 TX 照樣 `[AI]` 標色顯示在終端機；PDU connect/status/set_port/power_cycle 經 `ETTerms.PduCore`）。**安全**：破壞性 PDU 動作（關插座 / power-cycle）一律 `AiTools.ConfirmAsync` → GUI MessageBox（預設 No）確認，AI 不能自己斷電；每筆工具呼叫寫 AppLogger（`[AI tool] …`）。**刻意不引入 `Microsoft.Extensions.AI`**（手寫 client+loop，依賴最小、對任意 gateway 相容性自己掌控）。既有 SerialMcp/PduMcp（Settings → AI MCP）**不受影響**，繼續服務外部 AI CLI；兩者是「內建 agent（in-process）vs 外部 AI（MCP 跨行程）」的分工。新增 `src/ETTerms/Ai/`（3 檔）+ `App/AiChatView.cs`，`ActivityRail` 加 `Ai` view，`SettingsView` 加 AI Assistant 分頁，`AppSettings` 加 `AiBaseUrl/AiModel/AiSystemPrompt`。 **v0.5.0：** 搜尋 / 關鍵字警示 / TTL 大擴充。**(1) Ctrl+F scrollback 搜尋** — `TerminalView` 內建搜尋列（Enter 往上找、Shift+Enter 往下、F3/Esc），全部命中黃底、目前命中橘底；命中以「絕對行號 = `ScreenBuffer.DroppedLines` + abs」錨定，環形緩衝丟舊行不漂移。**(2) 關鍵字高亮 + 分頁警示** — `AppSettings.KeywordRules`（`KeywordRule{Text,Enabled}` + 全域開關），Settings 新 **Highlight** 分頁可增刪/勾選；`TerminalView` 每次重繪只掃可見行標紅底（不分大小寫），`Feed` 路徑用獨立 Decoder+去 ANSI 偵測觸發 `KeywordAlert`（每關鍵字 2s 冷卻）→ `SessionPage` → `WorkspaceView` 把**非 active 分頁**的圓點標紅、切過去自動清除。**(3) TTL 對齊 TeraTerm** — 新 `TtlExpression` 運算式解析器（括號/邏輯/比較/十六進位 `0x`/`$`，失敗退回 legacy 規則相容舊腳本）；新增控制流 `goto/call(行內執行，迴圈內可用)/return/for-next/do-loop/until-enduntil/break/continue/end/exit/include/mpause`、等待 `waitln/waitregex/recvln/wait 多字串(TeraTerm 語意：逾時 result=0 繼續)/mtimeout`、字串 `strlen/strcompare/strconcat/strcopy/strinsert/strremove/strmatch/strscan/strreplace/strtrim/strsplit/strjoin/tolower/toupper/str2int/int2str/code2str/str2code/sprintf(→inputstr)/expandenv`、檔案 `fileopen/filereadln(result=1 是 EOF)/filewrite(ln)/fileclose/filecreate/filedelete/filesearch/basename/dirname/makepath/foldercreate/folderdelete/foldersearch/getdir/setdir`、雜項 `beep/getdate/gettime(strftime 子集)/getenv/setenv/random/exec/getver/getttdir/uptime/ifdefined/clipb2var/var2clipb/inputbox/yesnobox/crc32/checksum8/16/32/dispstr`、serial 專用 `sendbreak/setbaud/setdtr/setrts/sendfile`（`SerialChannel` 新增對應方法）；單行 `if ` 支援；`Preprocess` 引號內 `;` 不再被當註解；系統變數 `inputstr/matchstr/groupmatchstr1-9`；`_vars` 改大小寫不敏感；**單字串 `wait` 保留 ETTerms settle+逾時中止語意（勿改）**，多字串才是 TeraTerm 語意。`SessionPage` 把 `runner.Output`（trace：`[wait]`/`>>`/錯誤）以灰色 echo 進終端機，**可由 Settings → Terminal 的 `ShowScriptTrace` 開關關閉**；`dispstr` 走獨立的 `Display` 事件一律顯示。灰色訊息只進畫面 buffer——不進 ⏺ Log 側錄、不進 AI bridge、不送裝置（機台原始 log 乾淨）。指令表＋範例：[docs/ttl-script-reference.md](docs/ttl-script-reference.md)（前段 ETTerms 獨有、後段與 TeraTerm 共有）。 diff --git a/docs/release-notes/v0.7.0.md b/docs/release-notes/v0.7.0.md new file mode 100644 index 0000000..4c06945 --- /dev/null +++ b/docs/release-notes/v0.7.0.md @@ -0,0 +1,29 @@ +# v0.7.0 — The AI Assistant grows up: real chat bubbles, Markdown & a thinking indicator + +## ✨ New features + +**A proper chat UI for the AI Assistant** +* The AI Chat pane now renders real chat bubbles — your messages on the right, the AI's on the left — with full **Markdown**: code blocks, tables, lists and inline `code` all display cleanly. +* When you send a prompt, an animated **"…" thinking bubble** appears while the AI works and disappears the moment the reply lands, so you always know it's running. +* Built on WebView2 (part of Windows 11). The model dropdown, `[AI]` serial tagging, and PDU confirmations all work exactly as before. + +**Control how far the AI runs** +* New setting **Max tool calls / message** (Settings → AI Assistant): how many tool calls the assistant may chain before it stops — a runaway-loop guard. Default is 30. +* Set it to **0 for unlimited**, handy for long automation runs you leave going for hours. +* While the AI is working, the **Send button turns into Stop** so you can abort any run — bounded or unlimited — at any time. + +## 📦 Downloads + +| Build | Needs .NET Runtime? | Notes | +|---|---|---| +| **ETTerms_v0.7.0** (Standard) | ✅ Requires .NET 8 Desktop Runtime | Smaller download | +| **ETTerms_v0.7.0_portable** (Portable) | ❌ Runtime included | Unzip and run anywhere, no admin | + +Run `ETTerms v0.7.0.exe`. (The WebView2 Runtime ships with Windows 11; both builds include the native loader.) + +## 🔗 Links + +* [Architecture](https://github.com/ETWen/ETTerms/blob/main/ARCHITECTURE.md) — see "Built-in AI Assistant (Phase 10)" +* [Serial MCP guide](https://github.com/ETWen/ETTerms/blob/main/docs/serial-mcp-guide.md) + +**Full changelog:** [v0.6.0...v0.7.0](https://github.com/ETWen/ETTerms/compare/v0.6.0...v0.7.0) diff --git a/src/ETTerms/Ai/AgentHost.cs b/src/ETTerms/Ai/AgentHost.cs index 8ba5112..3d2b29b 100644 --- a/src/ETTerms/Ai/AgentHost.cs +++ b/src/ETTerms/Ai/AgentHost.cs @@ -14,7 +14,9 @@ public sealed class AgentHost private readonly OpenAiChatClient _client; private readonly AiTools _tools; private readonly JsonArray _messages = new(); - private const int MaxToolRounds = 8; + // 單次 SendAsync 的工具呼叫輪數上限（防失控迴圈的保險）。由 Settings 設定, + // 0 = 無上限（自動化長跑用；執行中可按 Stop 中止,取消透過 CancellationToken）。 + private readonly int _maxRounds; public event Action? AssistantText; // 最終文字回應 public event Action? ToolActivity; // 「呼叫 serial_write …」之類過程 @@ -26,10 +28,11 @@ public sealed class AgentHost "破壞性動作（關插座 / power-cycle）會由使用者在 GUI 確認,你只需正常呼叫工具。" + "serial 操作前必須先 serial_attach 到 GUI 已開啟的 session。"; - public AgentHost(OpenAiChatClient client, AiTools tools, string? systemPrompt) + public AgentHost(OpenAiChatClient client, AiTools tools, string? systemPrompt, int maxRounds) { _client = client; _tools = tools; + _maxRounds = maxRounds; _messages.Add(new JsonObject { ["role"] = "system", @@ -43,8 +46,10 @@ public sealed class AgentHost _messages.Add(new JsonObject { ["role"] = "user", ["content"] = userText }); var tools = _tools.GetSchemas(); - for (int round = 0; round < MaxToolRounds; round++) + // _maxRounds <= 0 → 無上限（自動化長跑；靠 Stop / CancellationToken 中止） + for (int round = 0; _maxRounds <= 0 || round < _maxRounds; round++) { + ct.ThrowIfCancellationRequested(); Status?.Invoke("thinking"); var msg = await _client.CompleteAsync(_messages, tools, ct); _messages.Add((JsonObject)msg.DeepClone()); @@ -83,7 +88,7 @@ public sealed class AgentHost } } - AssistantText?.Invoke("（已達工具呼叫上限,停止。請縮小問題或分步再試。）"); + AssistantText?.Invoke($"（已達工具呼叫上限 {_maxRounds} 次,停止。可到 Settings → AI Assistant 調高或設 0 = 無上限,或分步再試。）"); Status?.Invoke("done"); } } diff --git a/src/ETTerms/Ai/ChatHtml.cs b/src/ETTerms/Ai/ChatHtml.cs new file mode 100644 index 0000000..81c91b5 --- /dev/null +++ b/src/ETTerms/Ai/ChatHtml.cs @@ -0,0 +1,96 @@ +namespace ETTerms.Ai; + +/// +/// 內建 AI Assistant 聊天視窗的 WebView2 HTML 模板（v0.7.0）。 +/// 全內嵌（CSS + JS,無外部依賴,符合 NavigateToString 的離線/CSP 需求）。 +/// +/// C# 端透過 ExecuteScriptAsync 呼叫這裡的 JS 函式： +/// addUser(text) / addAI(html) / addTool(text) / addError(text) / addNote(text) +/// showThinking() / hideThinking() +/// AI 回覆的 markdown 由 C#（Markdig）先轉成 HTML 再傳入 addAI。 +/// +internal static class ChatHtml +{ + public const string Page = """ + + + + + + + +
+
+
+
+
+ + + +"""; +} diff --git a/src/ETTerms/App/AboutView.cs b/src/ETTerms/App/AboutView.cs index 56a3b26..7d98841 100644 --- a/src/ETTerms/App/AboutView.cs +++ b/src/ETTerms/App/AboutView.cs @@ -183,6 +183,13 @@ public sealed class AboutView : UserControl private static readonly ChangelogEntry[] Changelog = [ + new("0.7.0", new DateOnly(2026, 7, 5), "AI chat gets real bubbles, Markdown & a thinking indicator", + [ + "The AI Chat pane now renders proper chat bubbles (your messages on the right, the AI's on the left) with full Markdown — code blocks, tables, lists and inline `code` all display nicely.", + "When you send a prompt, an animated \"…\" thinking bubble appears while the AI works and disappears the moment the reply arrives — so you always know it's running.", + "Under the hood this uses WebView2 (built into Windows 11); the model dropdown, [AI] serial tagging, and PDU confirmations all work exactly as before.", + "New setting: Max tool calls per message (Settings → AI Assistant). Set it to 0 for unlimited — handy for long automation runs you leave going — and press Stop in the chat to abort any run in progress.", + ]), new("0.6.0", new DateOnly(2026, 7, 5), "Built-in AI Assistant — drive serial & PDU in plain language", [ "New ✨ AI Chat: click ✨ AI Chat in the toolbar to open an AI pane, then use Layout (1×2, 2×2…) to sit it right next to a Serial session — chat on one side while you watch the terminal on the other, just like Claude Code / Kiro.", diff --git a/src/ETTerms/App/AiChatView.cs b/src/ETTerms/App/AiChatView.cs index 0c49b15..8270f84 100644 --- a/src/ETTerms/App/AiChatView.cs +++ b/src/ETTerms/App/AiChatView.cs @@ -1,47 +1,51 @@ +using System.Collections.Generic; using System.Drawing; +using System.IO; +using System.Text.Json; using System.Windows.Forms; using ETTerms.Ai; using ETTerms.Connections; using ETTerms.Infrastructure; +using Markdig; +using Microsoft.Web.WebView2.Core; +using Microsoft.Web.WebView2.WinForms; namespace ETTerms.App; /// /// 內建 AI Assistant 分頁（Workspace 的一種 pane，可與 serial 並排）。自然語言驅動 serial + PDU。 /// -/// 呈現走「乾淨對話逐字稿」風格（與 ETTerms 終端機/log 美學一致，非氣泡卡片）： -/// 使用者訊息靠右 accent 色、AI 回覆靠左段落、工具活動灰字縮排、思考中收進 Send 按鈕不洗版。 -/// （真氣泡 + Markdown 的 WebView2 版列為 v0.7.0。） +/// v0.7.0：訊息區改用 WebView2 渲染真聊天氣泡（user 右 / AI 左）+ Markdown（程式碼區塊、 +/// 表格、清單）+ 送出後的 thinking 動畫泡。底部控制列（輸入框 / 模型下拉 / Send）仍為 WinForms。 /// /// Provider 未設定（Base URL 空）時停用並提示。⚠️ 端點 / 金鑰皆由使用者設定,程式不含任何預設私人端點。 /// public sealed class AiChatView : UserControl { - private readonly RichTextBox _log; + private readonly WebView2 _web; private readonly TextBox _input; private readonly Button _send; private readonly Label _hint; private readonly ComboBox _modelBox; private bool _suppressModelEvent; + private bool _ready; + private readonly Queue _pending = new(); + private AgentHost? _agent; private OpenAiChatClient? _client; private AiTools? _tools; private CancellationTokenSource? _cts; - private const string SendText = "Send ⏎"; + private static readonly MarkdownPipeline Md = + new MarkdownPipelineBuilder().UseAdvancedExtensions().Build(); public AiChatView() { Dock = DockStyle.Fill; BackColor = Theme.WorkspaceBack; - _log = new RichTextBox - { - Dock = DockStyle.Fill, ReadOnly = true, BorderStyle = BorderStyle.None, - BackColor = Color.FromArgb(28, 28, 32), ForeColor = Theme.Text, - Font = new Font("Cascadia Mono", 10f), DetectUrls = false - }; + _web = new WebView2 { Dock = DockStyle.Fill }; // ── 底部控制列：輸入框(Fill) + 右下角欄(模型下拉在上、Send 在下) ── var bottom = new Panel { Dock = DockStyle.Bottom, Height = 96, BackColor = Theme.RailBack, Padding = new Padding(10, 8, 10, 8) }; @@ -53,7 +57,7 @@ public sealed class AiChatView : UserControl }; _input.KeyDown += (_, e) => { - if (e.KeyCode == Keys.Enter && !e.Shift) { e.Handled = e.SuppressKeyPress = true; OnSend(); } + if (e.KeyCode == Keys.Enter && !e.Shift && !_running) { e.Handled = e.SuppressKeyPress = true; OnSend(); } }; var rightCol = new Panel { Dock = DockStyle.Right, Width = 178, BackColor = Theme.RailBack, Padding = new Padding(8, 0, 0, 0) }; @@ -70,7 +74,7 @@ public sealed class AiChatView : UserControl _client.Model = m; AppSettings.Instance.AiModel = m; // 記住選擇,下次開 pane 用同一個 AppSettings.Instance.Save(); - AppendDim($"— 模型切換為 {m} —"); + AddNote($"— 模型切換為 {m} —"); }; var refreshBtn = new Button { @@ -86,7 +90,7 @@ public sealed class AiChatView : UserControl _send = new Button { - Text = SendText, Dock = DockStyle.Fill, FlatStyle = FlatStyle.Flat, + Text = "Send ⏎", Dock = DockStyle.Fill, FlatStyle = FlatStyle.Flat, ForeColor = Theme.Text, BackColor = Theme.TabBack, Font = Theme.UiFont, Cursor = Cursors.Hand }; _send.FlatAppearance.BorderColor = Theme.Accent; @@ -106,12 +110,40 @@ public sealed class AiChatView : UserControl Text = "尚未設定 AI Provider — 到 Settings → AI Assistant 填入 Base URL 與 API Key。" }; - Controls.Add(_log); // Fill + Controls.Add(_web); // Fill Controls.Add(_hint); // Top Controls.Add(bottom); // Bottom - AppendSystem("ETTerms AI Assistant — 用自然語言操作 serial 與 PDU。"); - AppendSystem("例：「列出目前的 serial session」、「接上 COM3，送 help 看回應」、「連上 PDU 192.168.1.50，把 outlet 3 重開」"); + _ = InitWebAsync(); + } + + private async Task InitWebAsync() + { + try + { + var dataDir = Path.Combine( + Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "ETTerms", "WebView2"); + Directory.CreateDirectory(dataDir); + var env = await CoreWebView2Environment.CreateAsync(null, dataDir); + await _web.EnsureCoreWebView2Async(env); + _web.CoreWebView2.Settings.AreDevToolsEnabled = false; + _web.CoreWebView2.Settings.IsZoomControlEnabled = false; + _web.CoreWebView2.NavigationCompleted += (_, _) => + { + if (_ready) return; + _ready = true; + while (_pending.Count > 0) Exec(_pending.Dequeue()); + AddNote("ETTerms AI Assistant — 用自然語言操作 serial 與 PDU。"); + AddNote("例：「列出目前的 serial session」、「接上 COM3，送 help 看回應」、「連上 PDU 192.168.1.50，把 outlet 3 重開」"); + }; + _web.NavigateToString(ChatHtml.Page); + } + catch (Exception ex) + { + AppLogger.LogError("WebView2 init failed", ex); + _hint.Text = "AI 聊天需要 WebView2 Runtime（Win11 內建）。初始化失敗：" + ex.Message; + _hint.Visible = true; + } } /// 開分頁時呼叫,依最新設定重建 client。Base URL 空＝停用。 @@ -131,10 +163,10 @@ public sealed class AiChatView : UserControl var key = CredentialVault.Get("ETTerms/AiApiKey") ?? ""; _client = new OpenAiChatClient(s.AiBaseUrl, key, s.AiModel); _tools = new AiTools { ConfirmAsync = ConfirmOnUiAsync }; - _agent = new AgentHost(_client, _tools, s.AiSystemPrompt); - _agent.AssistantText += t => Ui(() => AppendAssistant(t)); - _agent.ToolActivity += t => Ui(() => AppendTool(t)); - // thinking 不印進對話流（改由 Send 按鈕顯示忙碌）,避免洗版。 + _agent = new AgentHost(_client, _tools, s.AiSystemPrompt, s.AiMaxToolRounds); + _agent.AssistantText += t => Ui(() => { HideThinking(); AddAI(t); }); + _agent.ToolActivity += t => Ui(() => AddTool(t)); + _agent.Status += st => Ui(() => { if (st == "thinking") ShowThinking(); }); _ = LoadModelsAsync(); } @@ -167,7 +199,7 @@ public sealed class AiChatView : UserControl AppSettings.Instance.Save(); } } - else AppendError("端點未回報任何模型 — 確認 Base URL 是否為 OpenAI 相容 /v1 端點。"); + else AddError("端點未回報任何模型 — 確認 Base URL 是否為 OpenAI 相容 /v1 端點。"); _suppressModelEvent = false; }); } @@ -184,65 +216,48 @@ public sealed class AiChatView : UserControl return tcs.Task; } + private bool _running; + private async void OnSend() { if (_agent == null) return; + if (_running) { _cts?.Cancel(); return; } // 執行中再按 = 中止（長跑用） + var text = _input.Text.Trim(); if (text.Length == 0) return; _input.Clear(); - AppendUser(text); - SetBusy(true); + AddUser(text); + ShowThinking(); + SetRunning(true); _cts = new CancellationTokenSource(); try { await _agent.SendAsync(text, _cts.Token); } - catch (OperationCanceledException) { AppendDim("（已取消）"); } - catch (Exception ex) { AppendError(ex.Message); } - finally { SetBusy(false); } + catch (OperationCanceledException) { AddNote("（已停止）"); } + catch (Exception ex) { AddError(ex.Message); } + finally { HideThinking(); SetRunning(false); } } - private void SetBusy(bool busy) + private void SetRunning(bool running) { - _send.Enabled = !busy; - _send.Text = busy ? "…" : SendText; + _running = running; + _send.Text = running ? "■ Stop" : "Send ⏎"; + _send.FlatAppearance.BorderColor = running ? Color.FromArgb(210, 120, 120) : Theme.Accent; } - // ── 輸出（乾淨 transcript）── - /// 使用者訊息：靠右 accent 色,無前綴。 - private void AppendUser(string t) - { - _log.SelectionStart = _log.TextLength; - _log.SelectionAlignment = HorizontalAlignment.Right; - _log.SelectionColor = Theme.Accent; - _log.SelectionFont = new Font(_log.Font, FontStyle.Bold); - _log.AppendText(t + "\n"); - _log.SelectionAlignment = HorizontalAlignment.Left; - _log.AppendText("\n"); - _log.ScrollToCaret(); - } + // ── WebView2 interop（呼叫 ChatHtml 裡的 JS 函式）── + private void AddUser(string t) => Exec($"addUser({Js(t)})"); + private void AddAI(string markdown) => Exec($"addAI({Js(Markdown.ToHtml(markdown, Md))})"); + private void AddTool(string t) => Exec($"addTool({Js(t)})"); + private void AddError(string t) => Exec($"addError({Js(t)})"); + private void AddNote(string t) => Exec($"addNote({Js(t)})"); + private void ShowThinking() => Exec("showThinking()"); + private void HideThinking() => Exec("hideThinking()"); - /// AI 回覆：靠左段落。 - private void AppendAssistant(string t) - { - _log.SelectionStart = _log.TextLength; - _log.SelectionAlignment = HorizontalAlignment.Left; - _log.SelectionColor = Theme.Text; - _log.SelectionFont = _log.Font; - _log.AppendText(t + "\n\n"); - _log.ScrollToCaret(); - } + private static string Js(string s) => JsonSerializer.Serialize(s); - private void AppendTool(string t) => AppendLine("⚙ " + t, Color.FromArgb(150, 150, 158)); - private void AppendSystem(string t) => AppendLine(t, Theme.TextDim); - private void AppendError(string t) => AppendLine("⚠ " + t, Color.FromArgb(235, 120, 120)); - private void AppendDim(string t) => AppendLine(t, Theme.TextDim); - - private void AppendLine(string t, Color color) + private void Exec(string js) { - _log.SelectionStart = _log.TextLength; - _log.SelectionAlignment = HorizontalAlignment.Left; - _log.SelectionColor = color; - _log.SelectionFont = _log.Font; - _log.AppendText(t + "\n"); - _log.ScrollToCaret(); + if (!_ready) { _pending.Enqueue(js); return; } + try { _ = _web.CoreWebView2.ExecuteScriptAsync(js); } catch { } } private void Ui(Action a) @@ -258,6 +273,7 @@ public sealed class AiChatView : UserControl _cts?.Cancel(); _client?.Dispose(); _tools?.Dispose(); + _web?.Dispose(); } base.Dispose(disposing); } diff --git a/src/ETTerms/App/SettingsView.cs b/src/ETTerms/App/SettingsView.cs index 93fcd5c..c1523ed 100644 --- a/src/ETTerms/App/SettingsView.cs +++ b/src/ETTerms/App/SettingsView.cs @@ -339,8 +339,22 @@ public sealed class SettingsView : UserControl PlaceholderText = "(optional) override the assistant persona / system prompt" }; + var maxRounds = new NumericUpDown + { + Width = 100, Minimum = 0, Maximum = 100000, Increment = 10, Value = s.AiMaxToolRounds, + BackColor = Theme.TabBack, ForeColor = Theme.Text, BorderStyle = BorderStyle.FixedSingle + }; + flow.Controls.Add(MakeRow("Base URL (with /v1)", baseUrl)); flow.Controls.Add(MakeRow("API Key", apiKey)); + flow.Controls.Add(MakeRow("Max tool calls / message", maxRounds)); + flow.Controls.Add(new Label + { + Text = "How many tool calls the assistant may chain per message before it stops (a runaway-loop guard).\n" + + "0 = unlimited — for long automation runs. Every round costs tokens; press Stop in the chat to abort.", + AutoSize = false, Width = 620, Height = 34, + ForeColor = Theme.TextDim, Font = Theme.UiFont, Margin = new Padding(0, 0, 0, 6) + }); flow.Controls.Add(MakeSpacer(4)); flow.Controls.Add(new Label { @@ -363,6 +377,7 @@ public sealed class SettingsView : UserControl { s.AiBaseUrl = baseUrl.Text.Trim(); s.AiSystemPrompt = sysPrompt.Text.Trim(); + s.AiMaxToolRounds = (int)maxRounds.Value; s.Save(); var key = apiKey.Text; if (string.IsNullOrEmpty(key)) CredentialVault.Delete("ETTerms/AiApiKey"); diff --git a/src/ETTerms/ETTerms.csproj b/src/ETTerms/ETTerms.csproj index 240a5c1..6c80eb1 100644 --- a/src/ETTerms/ETTerms.csproj +++ b/src/ETTerms/ETTerms.csproj @@ -10,7 +10,7 @@ ETTerms - 0.6.0 + 0.7.0 ETTerms ETTerms Project @@ -27,7 +27,9 @@ + + diff --git a/src/ETTerms/Infrastructure/AppSettings.cs b/src/ETTerms/Infrastructure/AppSettings.cs index d469c9d..5a753d7 100644 --- a/src/ETTerms/Infrastructure/AppSettings.cs +++ b/src/ETTerms/Infrastructure/AppSettings.cs @@ -39,6 +39,9 @@ public sealed class AppSettings public string AiModel { get; set; } = ""; /// 系統提示詞（人設）；空則用內建預設。 public string AiSystemPrompt { get; set; } = ""; + /// AI agent 單次訊息的工具呼叫輪數上限（防失控迴圈的保險）。 + /// **0 = 無上限**（自動化長跑用；注意每輪都燒 token/費用,執行中可按 Stop 中止）。 + public int AiMaxToolRounds { get; set; } = 30; // ── Keyword highlight（終端機關鍵字標色 + 分頁警示；Settings → Highlight 分頁設定）── public bool KeywordHighlightEnabled { get; set; } = true;