diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index 3a1334f..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 格式)。 diff --git a/CLAUDE.md b/CLAUDE.md index 6c7202c..26bae0c 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -10,7 +10,7 @@ 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`)有進產物**。 +**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`。 diff --git a/src/ETTerms/Ai/AgentHost.cs b/src/ETTerms/Ai/AgentHost.cs index 5621242..3d2b29b 100644 --- a/src/ETTerms/Ai/AgentHost.cs +++ b/src/ETTerms/Ai/AgentHost.cs @@ -14,9 +14,9 @@ public sealed class AgentHost private readonly OpenAiChatClient _client; private readonly AiTools _tools; private readonly JsonArray _messages = new(); - // 單次 SendAsync 的工具呼叫輪數上限(防失控迴圈的保險)。硬體任務常需多輪 - // (逐一操作多個 port、多次讀寫、power-cycle 等待…),故放寬到 30。 - private const int MaxToolRounds = 30; + // 單次 SendAsync 的工具呼叫輪數上限(防失控迴圈的保險)。由 Settings 設定, + // 0 = 無上限(自動化長跑用;執行中可按 Stop 中止,取消透過 CancellationToken)。 + private readonly int _maxRounds; public event Action? AssistantText; // 最終文字回應 public event Action? ToolActivity; // 「呼叫 serial_write …」之類過程 @@ -28,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", @@ -45,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()); @@ -85,7 +88,7 @@ public sealed class AgentHost } } - AssistantText?.Invoke("(已達工具呼叫上限,停止。請縮小問題或分步再試。)"); + AssistantText?.Invoke($"(已達工具呼叫上限 {_maxRounds} 次,停止。可到 Settings → AI Assistant 調高或設 0 = 無上限,或分步再試。)"); Status?.Invoke("done"); } } diff --git a/src/ETTerms/App/AboutView.cs b/src/ETTerms/App/AboutView.cs index 7355796..7d98841 100644 --- a/src/ETTerms/App/AboutView.cs +++ b/src/ETTerms/App/AboutView.cs @@ -188,6 +188,7 @@ public sealed class AboutView : UserControl "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", [ diff --git a/src/ETTerms/App/AiChatView.cs b/src/ETTerms/App/AiChatView.cs index a22ec66..8270f84 100644 --- a/src/ETTerms/App/AiChatView.cs +++ b/src/ETTerms/App/AiChatView.cs @@ -57,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) }; @@ -163,7 +163,7 @@ 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 = 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(); }); @@ -216,20 +216,31 @@ 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(); AddUser(text); ShowThinking(); - _send.Enabled = false; + SetRunning(true); _cts = new CancellationTokenSource(); try { await _agent.SendAsync(text, _cts.Token); } - catch (OperationCanceledException) { AddNote("(已取消)"); } + catch (OperationCanceledException) { AddNote("(已停止)"); } catch (Exception ex) { AddError(ex.Message); } - finally { HideThinking(); _send.Enabled = true; } + finally { HideThinking(); SetRunning(false); } + } + + private void SetRunning(bool running) + { + _running = running; + _send.Text = running ? "■ Stop" : "Send ⏎"; + _send.FlatAppearance.BorderColor = running ? Color.FromArgb(210, 120, 120) : Theme.Accent; } // ── WebView2 interop(呼叫 ChatHtml 裡的 JS 函式)── 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/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;