diff --git a/chatbot/src/useChat.js b/chatbot/src/useChat.js index 50c626ae..b3f0d8e9 100644 --- a/chatbot/src/useChat.js +++ b/chatbot/src/useChat.js @@ -137,6 +137,7 @@ export function useChat() { [error, setError] = useState(""), [ready, setReady] = useState(false), [submitting, setSubmitting] = useState(false), + [steerOnSend, setSteerOnSend] = useState(false), // Messages sent while a reply runs, per conversation (see message-queue.js). [queues, setQueues] = useState(readQueues), // The generation whose final transcript has been loaded. A queued message @@ -232,6 +233,37 @@ export function useChat() { setDraftIssueId(""); open(null); }, [open]); + useEffect(() => { + if (!user?.id || user.isGuest) { + setSteerOnSend(false); + return; + } + let current = true, revision = 0; + const refresh = () => { + const requested = ++revision; + return api("/api/assistant/preferences") + .then((prefs) => { + if (current && requested === revision) setSteerOnSend(!!prefs?.steerOnSend); + }) + .catch(() => {}); + }; + const onMessage = (event) => { + if (event.source === window.parent && event.origin === location.origin && + event.data?.type === "agentflow-assistant-preferences-changed") + void refresh(); + }; + const onVisibilityChange = () => { + if (document.visibilityState === "visible") void refresh(); + }; + void refresh(); + document.addEventListener("visibilitychange", onVisibilityChange); + window.addEventListener("message", onMessage); + return () => { + current = false; + document.removeEventListener("visibilitychange", onVisibilityChange); + window.removeEventListener("message", onMessage); + }; + }, [user?.id, user?.isGuest]); useEffect(() => { let current = true, timer, @@ -684,6 +716,8 @@ export function useChat() { if (generation?.id !== s.generationId || generation.status === "running") return; if (settledId !== s.generationId) return; if (!generation.steer) { + // The POST can still reject the message after the reply finishes. + if (s.pending) return; // The reply ended before the message was taken: send it next instead. done(); setQueues((old) => restoreQueued(old, s.sessionId, s.item, false)); @@ -748,8 +782,12 @@ export function useChat() { dispatchingRef.current = false; } } + return steerMessage(id, item); + } + async function steerMessage(id, item) { const from = generation.id; - steeringRef.current = { sessionId: id, generationId: from, item }; + const request = { sessionId: id, generationId: from, item, pending: true }; + steeringRef.current = request; setSteering({ sessionId: id, item }); setQueues((old) => removeQueued(old, id, item.id)); setError(""); @@ -765,13 +803,19 @@ export function useChat() { approvalMode: item.approvalMode || "confirm", }, ); + request.pending = false; + if (steeringRef.current === request) setSteering({ sessionId: id, item }); return true; } catch (e) { - steeringRef.current = null; - setSteering(null); - // If the reply just ended, the message simply goes out next. - setQueues((old) => restoreQueued(old, id, item, false)); - if (!/没有进行中|已经结束|已结束/.test(e.message || "")) setError(e.message); + if (steeringRef.current === request) { + steeringRef.current = null; + setSteering(null); + } + const turnEnded = e.status === 409 && + /^(当前没有进行中的回复|这一轮已经结束,请重新发送|生成已结束或不存在)$/.test(e.message); + const held = !turnEnded && e.status >= 400 && e.status < 500; + setQueues((old) => restoreQueued(old, id, item, held)); + if (!turnEnded && currentId.current === id) setError(e.message); return false; } } @@ -793,16 +837,22 @@ export function useChat() { generation?.status === "running" || steeringRef.current?.sessionId === currentId.current ) { - // Like Codex, a message sent during a reply waits its turn instead of - // stopping the reply. Internal follow-ups (confirmed drafts) never queue. + // Internal follow-ups (confirmed drafts) never queue or interrupt. if (messagesOverride || fromQueue || !currentId.current) { setError("当前回复仍在生成,请稍后再试。"); return false; } const id = currentId.current; - setQueues((old) => - enqueue(old, id, queuedMessage({ text, attachments, references, approvalMode })), - ); + const item = queuedMessage({ text, attachments, references, approvalMode }); + if (steerOnSend && generation?.status === "running" && generation.id && + !submittingRef.current && !steeringRef.current && !dispatchingRef.current && + !stopRequestRef.current) { + // Failed steering restores the message to the queue, so the composer + // can clear without losing it. Further sends wait for this handoff. + await steerMessage(id, item); + return true; + } + setQueues((old) => enqueue(old, id, item)); setError(""); return true; } diff --git a/chatbot/tests/message-queue-hook.test.jsx b/chatbot/tests/message-queue-hook.test.jsx index 2565347b..c04fee90 100644 --- a/chatbot/tests/message-queue-hook.test.jsx +++ b/chatbot/tests/message-queue-hook.test.jsx @@ -1,7 +1,7 @@ import { act, renderHook, waitFor } from "@testing-library/react"; import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; -const state = vi.hoisted(() => ({ transcript: [], generation: null, generationGate: null })); +const state = vi.hoisted(() => ({ transcript: [], generation: null, generationGate: null, preferences: {} })); const { apiMock, writeMock } = vi.hoisted(() => { const apiMock = vi.fn(async (path) => { if (path === "/api/auth/current") @@ -9,6 +9,7 @@ const { apiMock, writeMock } = vi.hoisted(() => { if (path === "/api/projects") return [{ id: "p1", name: "项目一", ownerId: 1, members: [1] }]; if (path === "/api/assistant/models") return { default: "m1", sponsoredModel: "m1", models: [{ id: "m1", name: "模型一" }] }; + if (path === "/api/assistant/preferences") return structuredClone(state.preferences); if (path === "/api/users") return [{ id: 1, loginName: "tester", codeBuddyApiKeyConfigured: true }]; if (path === "/api/assistant/sessions") return []; if (path.startsWith("/api/assistant/sessions/s2")) { @@ -91,6 +92,7 @@ describe("sending while a reply runs", () => { state.transcript = [{ role: "user", content: "查失败节点" }]; state.generation = { id: "g-running", status: "running", events: [{ sequence: 1, data: { kind: "tool", tool: "runs_get" } }] }; state.generationGate = null; + state.preferences = {}; globalThis.EventSource = FakeEventSource; }); afterEach(() => { @@ -139,6 +141,123 @@ describe("sending while a reply runs", () => { unmount(); }); + test("the saved immediate-send preference steers with attachments and queues later sends during handoff", async () => { + state.preferences = { steerOnSend: true }; + const { result, unmount } = await openRunning(); + const attachments = [{ id: "screenshot", name: "image.png", mimeType: "image/png" }]; + const references = [{ type: "issue", id: "issue-1" }]; + await act(async () => { + expect(await result.current.send({ text: "立即看这里", attachments, references, approvalMode: "assisted" })).toBe(true); + expect(await result.current.send({ text: "下一条补充" })).toBe(true); + }); + expect(steerPosts()).toHaveLength(1); + expect(steerPosts()[0][1]).toMatchObject({ + content: "立即看这里", model: "m1", attachments, references, approvalMode: "assisted", + }); + expect(result.current.steering?.text).toBe("立即看这里"); + expect(result.current.queue.map((m) => m.text)).toEqual(["下一条补充"]); + expect(generationPosts()).toHaveLength(0); + unmount(); + }); + + test.each([ + [400, "请先配置 API Key"], + [409, "这个对话由 Codex 回复,不能中途切换 CLI"], + ])("an immediate send rejected with %i holds the queue", async (status, error) => { + state.preferences = { steerOnSend: true }; + const { result, unmount } = await openRunning(); + writeMock.mockRejectedValueOnce(Object.assign(new Error(error), { status })); + await act(async () => { + expect(await result.current.send({ text: "不能丢失" })).toBe(true); + }); + expect(steerPosts()).toHaveLength(1); + expect(result.current.steering).toBe(null); + expect(result.current.queue.map((m) => m.text)).toEqual(["不能丢失"]); + expect(result.current.error).toBe(error); + expect(result.current.queueHeld).toBe(true); + await finish("completed"); + await waitFor(() => expect(result.current.session?.messages).toHaveLength(2)); + expect(generationPosts()).toHaveLength(0); + expect(result.current.queue.map((m) => m.text)).toEqual(["不能丢失"]); + unmount(); + }); + + test("a reply ending before the steer response does not retry a rejected message", async () => { + state.preferences = { steerOnSend: true }; + const { result, unmount } = await openRunning(); + let rejectSteer; + writeMock.mockImplementationOnce(() => new Promise((_, reject) => { rejectSteer = reject; })); + let sent; + act(() => { sent = result.current.send({ text: "等待引导结果" }); }); + + await finish("completed"); + await waitFor(() => expect(result.current.session?.messages).toHaveLength(2)); + expect(generationPosts()).toHaveLength(0); + await act(async () => { + rejectSteer(Object.assign(new Error("请先配置 API Key"), { status: 400 })); + expect(await sent).toBe(true); + }); + expect(result.current.queueHeld).toBe(true); + expect(result.current.queue.map((m) => m.text)).toEqual(["等待引导结果"]); + expect(generationPosts()).toHaveLength(0); + unmount(); + }); + + test("saving the setting updates an already open chat", async () => { + const { result, unmount } = await openRunning(); + state.preferences = { steerOnSend: true }; + await act(async () => { + window.dispatchEvent(new MessageEvent("message", { + source: window.parent, origin: location.origin, + data: { type: "agentflow-assistant-preferences-changed" }, + })); + }); + await act(async () => { await result.current.send({ text: "使用新设置" }); }); + expect(steerPosts()).toHaveLength(1); + expect(result.current.queue).toHaveLength(0); + expect(result.current.steering?.text).toBe("使用新设置"); + unmount(); + }); + + test("a slow initial preferences read cannot overwrite a newly saved setting", async () => { + let release; + const original = apiMock.getMockImplementation(); + apiMock.mockImplementation((path) => path === "/api/assistant/preferences" + ? new Promise((resolve) => { release = resolve; }) : original(path)); + const { result, unmount } = await openRunning(); + apiMock.mockImplementation(original); + state.preferences = { steerOnSend: true }; + await act(async () => { + window.dispatchEvent(new MessageEvent("message", { + source: window.parent, origin: location.origin, + data: { type: "agentflow-assistant-preferences-changed" }, + })); + }); + await act(async () => { release({ steerOnSend: false }); }); + await act(async () => { await result.current.send({ text: "按最新设置发送" }); }); + expect(steerPosts()).toHaveLength(1); + unmount(); + }); + + test("returning to a hidden tab picks up the saved send preference", async () => { + const { result, unmount } = await openRunning(); + const visibility = vi.spyOn(document, "visibilityState", "get").mockReturnValue("hidden"); + const preferenceReads = () => apiMock.mock.calls.filter(([path]) => path === "/api/assistant/preferences").length; + const initialReads = preferenceReads(); + try { + await act(async () => { document.dispatchEvent(new Event("visibilitychange")); }); + expect(preferenceReads()).toBe(initialReads); + state.preferences = { steerOnSend: true }; + visibility.mockReturnValue("visible"); + await act(async () => { document.dispatchEvent(new Event("visibilitychange")); }); + await act(async () => { await result.current.send({ text: "切回后使用新设置" }); }); + expect(steerPosts()).toHaveLength(1); + } finally { + visibility.mockRestore(); + unmount(); + } + }); + test("prevents repeated stop requests and waits for actual process exit", async () => { const { result, unmount } = await openRunning(); let resolve; @@ -253,7 +372,7 @@ describe("sending while a reply runs", () => { await result.current.send({ text: "补充一句" }); }); writeMock.mockImplementationOnce(async () => { - throw new Error("生成已结束或不存在"); + throw Object.assign(new Error("生成已结束或不存在"), { status: 409 }); }); await act(async () => { await result.current.sendNow(result.current.queue[0].id); diff --git a/design.md b/design.md index f33cee36..cb0344bb 100644 --- a/design.md +++ b/design.md @@ -378,7 +378,9 @@ Bot 管理页(`#botsView`)按需求列表与运行记录列表的 Harness 界面上称「AI 助手」,避免和「Bot 管理」里的企业微信机器人混淆。设置页、SOP 建议卡片和子 Agent 面板都用这个名字。 -AI 助手页(`#assistantView`,路由 `#/assistant`)在设置导航「管理与记录」下紧跟 Bot 管理,图标为 Harness `sparkles`。页头只有 H1 和一句说明(先讲它是谁,再讲能设置什么);内容和其他设置页一样铺满 1200px 居中容器,两块 14px 圆角面板:「主动派发」里是「主动派角色」「主动走 SOP」两行(默认关闭,面板说明写明打开后更主动,以及角色直接派、SOP 先确认),左侧标题 + 说明,右侧 `role="switch"` 开关;「自定义规则」是一个可纵向拉伸的输入框,右下角显示「N / 4000」。底部「保存」是页面唯一的实心按钮,没有改动或保存中时禁用;未登录只显示提示。样式在 `web/app/assistant-settings.css`,规则限定在 `#assistantView` 内,只引用 `--hui-*` 令牌。 +AI 助手页(`#assistantView`,路由 `#/assistant`)在设置导航「管理与记录」下紧跟 Bot 管理,图标为 Harness `sparkles`。页头只有 H1 和一句说明(先讲它是谁,再讲能设置什么);内容和其他设置页一样铺满 1200px 居中容器,使用三块 14px 圆角面板:「消息发送」提供「生成中发送消息」下拉选项,默认「排队」,也可选「立即发送」,说明会打断当前回复、保留已输出内容并继续处理新消息;「主动派发」里是「主动派角色」「主动走 SOP」两行(默认关闭,面板说明写明打开后更主动,以及角色直接派、SOP 先确认),左侧标题 + 说明,右侧 `role="switch"` 开关;「自定义规则」是一个可纵向拉伸的输入框,右下角显示「N / 4000」。底部「保存」是页面唯一的实心按钮,没有改动或保存中时禁用;未登录只显示提示。样式在 `web/app/assistant-settings.css`,规则限定在 `#assistantView` 内,只引用 `--hui-*` 令牌。 + +发送方式按用户保存为 `steerOnSend`,设置保存后通知已打开的工作台即时刷新。立即发送复用排队消息的「引导」操作;引导切换期间再次发送的消息先排队,引导请求失败也保留消息。手动「引导」仍可用于排队模式。 没有 @ SOP、也没有点名要走 SOP 时,AI 助手自己决定交给 SOP 的事是建议。每次批准由用户在卡片上确认;帮我批准由独立审查决定,未通过时同样变成建议卡片;完全权限下直接启动。角色始终直接派发,不弹卡片。`timing=start` 的建议 3 分钟无人处理就超时,服务端把事情交回 AI 助手自己做,不依赖浏览器还开着。决定通过 `POST /api/assistant/sessions/{id}/proposals` 提交。开关和自定义规则按用户存在 `assistant_preferences`,由 AutoMigrate 建表,接口是 `GET` / `PUT /api/assistant/preferences`。 diff --git a/internal/domain/assistant_generation.go b/internal/domain/assistant_generation.go index 9e74d6df..78d336f3 100644 --- a/internal/domain/assistant_generation.go +++ b/internal/domain/assistant_generation.go @@ -46,6 +46,8 @@ type AssistantSteer struct { ActorName string `json:"actorName,omitempty"` // Trigger marks the follow-up message; empty means the user steered. Trigger string `json:"trigger,omitempty"` + // TriggerID identifies the accepted steer in the saved transcript. + TriggerID string `json:"triggerId,omitempty"` } // A bounded projection survives eviction of old token events and reconnects. diff --git a/internal/domain/assistant_preferences.go b/internal/domain/assistant_preferences.go index 69e94c2e..b5bdc139 100644 --- a/internal/domain/assistant_preferences.go +++ b/internal/domain/assistant_preferences.go @@ -7,10 +7,12 @@ const AssistantPreferencesInstructionsMax = 4000 // AssistantPreferences is how one user wants Main Bot to work: whether it // hands work to roles and SOPs more readily (off by default), and extra -// rules added to every turn. +// rules added to every turn. SteerOnSend interrupts a running reply when +// sending a message; the default queues it until the reply finishes. type AssistantPreferences struct { ProactiveRoles bool `json:"proactiveRoles"` ProactiveSOPs bool `json:"proactiveSops"` + SteerOnSend bool `json:"steerOnSend"` Instructions string `json:"instructions"` UpdatedAt time.Time `json:"updatedAt,omitempty"` } diff --git a/internal/httpapi/assistant_generation.go b/internal/httpapi/assistant_generation.go index 115b7371..1865e621 100644 --- a/internal/httpapi/assistant_generation.go +++ b/internal/httpapi/assistant_generation.go @@ -7,6 +7,7 @@ import ( "bytes" "context" + "crypto/rand" "encoding/json" "fmt" "github.com/gin-gonic/gin" @@ -385,8 +386,7 @@ func (h *assistantHandlers) executeGeneration(parent context.Context, req assist trackAssistantWorkspaceSave(req.RunID, result) } } - rec.mu.Lock() - g = rec.g + g = rec.snapshot() if workspaceWarning != "" { g.WorkspaceWarning = workspaceWarning } @@ -421,30 +421,32 @@ func (h *assistantHandlers) executeGeneration(parent context.Context, req assist if g.Status == "failed" && g.Failure == nil { g.Failure = rec.diagnostics.failureForMessage(g.Error) } - rec.g = g - g = rec.snapshotLocked() - steer := g.Steer - rec.mu.Unlock() - if steer == nil { - if latest, ok := h.repo.PeekAssistantGeneration(g.UserID, g.SessionID); ok && latest.ID == g.ID && latest.Steer != nil { - rec.mu.Lock() - g.Steer = latest.Steer - steer = latest.Steer - rec.mu.Unlock() + steer, finishErr := h.repo.CloseAssistantGenerationSteering(g.UserID, g.SessionID, g.ID) + if finishErr != nil { + fmt.Printf("assistant generation steering close failed: %T\n", finishErr) + } else { + g.Steer = steer + g.CancelRequested = g.CancelRequested || steer != nil + // A stop or a mid-turn redirect keeps the paragraphs and tool rows + // written so far. The completed path already stored its own reply. + if g.Status != "completed" || steer != nil { + if err := h.commitTurnTranscript(g, steer, g.Status != "completed" && steer == nil); err != nil { + fmt.Printf("assistant transcript keep failed: %T\n", err) + steer = nil + } } - } - // A stop or a mid-turn redirect keeps the paragraphs and tool rows written - // so far. The completed path already stored its own reply. - if g.Status != "completed" || steer != nil { - if err := h.commitTurnTranscript(g, steer, g.Status != "completed" && steer == nil); err != nil { - fmt.Printf("assistant transcript keep failed: %T\n", err) - steer = nil + finishErr = h.repo.CheckpointAssistantGeneration(g, rec.diagnostics.snapshot(g)) + if finishErr != nil { + fmt.Printf("assistant generation checkpoint failed: %T\n", finishErr) } } - if err := h.repo.CheckpointAssistantGeneration(g, rec.diagnostics.snapshot(g)); err != nil { - fmt.Printf("assistant generation checkpoint failed: %T\n", err) - } + rec.mu.Lock() + rec.g = g + rec.mu.Unlock() rec.live.publish() + if finishErr != nil { + return + } if steer != nil { h.followSteer(parent, g, steer, actor) } else if g.Status == "completed" { @@ -463,12 +465,7 @@ func (h *assistantHandlers) steerGeneration(c *gin.Context) { c.JSON(400, gin.H{"error": "请先配置个人 CodeBuddy API Key"}) return } - user, sharedModels, ok := h.assistantChatUser(stored) - if !ok { - c.JSON(400, gin.H{"error": "请先配置个人 CodeBuddy API Key"}) - return - } - ownerID, _, err := h.conversationScope(c, c.Param("id"), "", "", user.ID) + ownerID, _, err := h.conversationScope(c, c.Param("id"), "", "", stored.ID) if err != nil { c.JSON(403, gin.H{"error": err.Error()}) return @@ -499,22 +496,49 @@ func (h *assistantHandlers) steerGeneration(c *gin.Context) { c.JSON(404, gin.H{"error": "会话不存在"}) return } - model := body.Model - if sharedModels != nil { - forced, allowed := assistantSponsoredModelFor(sharedModels, model) - if !allowed { - c.JSON(400, gin.H{"error": errAssistantSponsoredModel(sharedModels)}) - return - } - model = forced + // The saved conversation selects the CLI for steering. Bare model IDs + // use that CLI, and an explicit CLI prefix must match it. + cliEngine := assistantConversationEngine(session.Messages, session.Executor) + if cliEngine == "" { + cliEngine, _ = assistantModelEngine(assistantRequestModel(session.Executor, session.Model)) + } + model := strings.TrimSpace(firstNonEmpty(body.Model, session.Model)) + if !assistantModelHasEnginePrefix(model) { + model = assistantRequestModel(cliEngine, model) + } else if id, explicit := strings.CutPrefix(model, assistantEngineCodeBuddy+":"); explicit { + model = strings.TrimSpace(id) + } + // Refuse a switch before recording cancellation, even without credentials + // for the requested CLI. The current reply must keep running on refusal. + if refusal := assistantEngineSwitchRefusal(cliEngine, model); refusal != "" { + c.JSON(409, gin.H{"error": refusal}) + return + } + target := session.Execution() + runnerLogin := h.assistantUsesRunnerLogin(stored.ID, &target, cliEngine) + user, model, refusal := h.assistantTurnUser(stored, model, runnerLogin) + if refusal != "" { + c.JSON(400, gin.H{"error": refusal}) + return + } + if engine, id := assistantModelEngine(model); engine != assistantEngineCodeBuddy && !assistantValidEngineModel(id) { + c.JSON(400, gin.H{"error": "模型 ID 无效"}) + return } // A CodeBuddy model this instance has not listed yet refreshes the list // first, like a new turn, instead of silently becoming the default. - catalog := h.chatCatalog(c.Request.Context(), user) + catalog := assistantChatCatalog(c.Request.Context(), user.CodeBuddyInternetEnvironment, nil) if engine, _ := assistantModelEngine(model); engine == assistantEngineCodeBuddy { catalog = h.turnCatalog(c.Request.Context(), user, model) } - model = assistantAllowedModel(model, catalog) + if !runnerLogin { + model = assistantAllowedUserModel(model, catalog, user) + } + // The catalog can substitute a configured default. Check that model too. + if refusal := assistantEngineSwitchRefusal(cliEngine, model); refusal != "" { + c.JSON(409, gin.H{"error": refusal}) + return + } if err := validateAssistantEffort(user, model, body.Effort); err != nil { c.JSON(400, gin.H{"error": err.Error()}) return @@ -525,7 +549,17 @@ func (h *assistantHandlers) steerGeneration(c *gin.Context) { return } message := probe.Messages[0] - steer := domain.AssistantSteer{Content: message.Content, Attachments: message.Attachments, References: message.References, Model: model, Effort: body.Effort, ApprovalMode: normalizeAssistantApprovalMode(body.ApprovalMode), ActorID: user.ID, ActorName: user.LoginName} + steer := domain.AssistantSteer{ + Content: message.Content, + Attachments: message.Attachments, + References: message.References, + Model: model, + Effort: body.Effort, + ApprovalMode: normalizeAssistantApprovalMode(body.ApprovalMode), + ActorID: user.ID, + ActorName: user.LoginName, + TriggerID: rand.Text(), + } if err := h.repo.SteerAssistantGeneration(ownerID, g.SessionID, g.ID, steer); err != nil { c.JSON(409, gin.H{"error": err.Error()}) return @@ -538,6 +572,17 @@ func (h *assistantHandlers) commitTurnTranscript(g domain.AssistantGeneration, s if !ok { return fmt.Errorf("会话不存在") } + var trigger, triggerID string + if steer != nil { + trigger = firstNonEmpty(steer.Trigger, "steer") + // Generations written before steers had an ID still have a stable ID. + triggerID = firstNonEmpty(steer.TriggerID, g.ID) + for _, message := range session.Messages { + if triggerID != "" && message.Role == "user" && message.Trigger == trigger && message.TriggerID == triggerID { + return nil + } + } + } changed := false if message, worth := turnTranscriptMessage(g, session.Model, stopped); worth && (len(session.Messages) == 0 || session.Messages[len(session.Messages)-1].Role != "assistant") { session.Messages = append(session.Messages, message) @@ -548,11 +593,18 @@ func (h *assistantHandlers) commitTurnTranscript(g domain.AssistantGeneration, s if content == "" { content = "请阅读本轮附件并回答。" } - last := len(session.Messages) - 1 - if last < 0 || session.Messages[last].Role != "user" || session.Messages[last].Content != content { - session.Messages = append(session.Messages, domain.AssistantMessage{Role: "user", Content: content, AuthorID: steer.ActorID, AuthorName: steer.ActorName, CreatedAt: time.Now().UTC(), Attachments: steer.Attachments, References: steer.References, Trigger: firstNonEmpty(steer.Trigger, "steer")}) - changed = true - } + session.Messages = append(session.Messages, domain.AssistantMessage{ + Role: "user", + Content: content, + AuthorID: steer.ActorID, + AuthorName: steer.ActorName, + CreatedAt: time.Now().UTC(), + Attachments: steer.Attachments, + References: steer.References, + Trigger: trigger, + TriggerID: triggerID, + }) + changed = true } if !changed { return nil @@ -565,7 +617,11 @@ func (h *assistantHandlers) commitTurnTranscript(g domain.AssistantGeneration, s func (h *assistantHandlers) followSteer(parent context.Context, prev domain.AssistantGeneration, steer *domain.AssistantSteer, actor *auth.User) { session, ok := h.repo.AssistantSession(prev.UserID, prev.SessionID) - if !ok || len(session.Messages) == 0 || session.Messages[len(session.Messages)-1].Role != "user" { + if !ok || len(session.Messages) == 0 { + return + } + last := session.Messages[len(session.Messages)-1] + if last.Role != "user" || (steer.TriggerID != "" && last.TriggerID != steer.TriggerID) { return } if steer.ActorID != 0 { @@ -576,10 +632,19 @@ func (h *assistantHandlers) followSteer(parent context.Context, prev domain.Assi if strings.TrimSpace(steer.Model) != "" { session.Model = steer.Model } - if strings.TrimSpace(steer.Effort) != "" { - session.Effort = steer.Effort + // Empty effort selects the follow-up model's default. + session.Effort = steer.Effort + req := assistantRequest{ + ProjectID: session.ProjectID, + SessionID: session.ID, + RunID: session.RunID, + Executor: session.Executor, + ExecutionTarget: session.ExecutionTarget, + Model: session.Model, + Effort: session.Effort, + ApprovalMode: steer.ApprovalMode, + Messages: session.Messages, } - req := assistantRequest{ProjectID: session.ProjectID, SessionID: session.ID, RunID: session.RunID, Model: firstNonEmpty(steer.Model, session.Model), Effort: firstNonEmpty(steer.Effort, session.Effort), ApprovalMode: steer.ApprovalMode, Messages: session.Messages} if req.RunID != "" && h.engine != nil { token, err := h.engine.BeginConversationWorkspaceUse(req.RunID) if err != nil { diff --git a/internal/httpapi/assistant_proposals_test.go b/internal/httpapi/assistant_proposals_test.go index d5a5d449..110b53ab 100644 --- a/internal/httpapi/assistant_proposals_test.go +++ b/internal/httpapi/assistant_proposals_test.go @@ -341,7 +341,7 @@ func TestSOPDraftsNeedAProposalUnlessTheUserAskedForTheSOP(t *testing.T) { func TestAssistantPreferencesShapeTheContext(t *testing.T) { h, u := workbenchFixture(t) h.repo.PutAgent(domain.AgentDefinition{ID: "reviewer", Name: "评审", ProjectID: "workbench", Prompt: "评审"}) - if p := h.repo.AssistantPreferences(u.ID); p.ProactiveRoles || p.ProactiveSOPs || p.Instructions != "" { + if p := h.repo.AssistantPreferences(u.ID); p.ProactiveRoles || p.ProactiveSOPs || p.SteerOnSend || p.Instructions != "" { t.Fatalf("defaults=%+v", p) } put := func(body string) (int, domain.AssistantPreferences) { @@ -403,13 +403,13 @@ func TestAssistantPreferencesShapeTheContext(t *testing.T) { } } - code, saved := put(`{"proactiveRoles":true,"proactiveSops":false,"instructions":" 回复先给结论 "}`) - if code != 200 || !saved.ProactiveRoles || saved.ProactiveSOPs || saved.Instructions != "回复先给结论" { + code, saved := put(`{"proactiveRoles":true,"proactiveSops":false,"steerOnSend":true,"instructions":" 回复先给结论 "}`) + if code != 200 || !saved.ProactiveRoles || saved.ProactiveSOPs || !saved.SteerOnSend || saved.Instructions != "回复先给结论" { t.Fatalf("saved=%d %+v", code, saved) } c, rec := workbenchContext(u, "GET", "/api/assistant/preferences", &bytes.Buffer{}) h.preferences(c) - if !strings.Contains(rec.Body.String(), `"proactiveRoles":true`) { + if !strings.Contains(rec.Body.String(), `"proactiveRoles":true`) || !strings.Contains(rec.Body.String(), `"steerOnSend":true`) { t.Fatalf("get=%s", rec.Body.String()) } for _, mode := range []string{AssistantApprovalConfirm, AssistantApprovalAuto} { diff --git a/internal/httpapi/assistant_steer_test.go b/internal/httpapi/assistant_steer_test.go new file mode 100644 index 00000000..8eef0494 --- /dev/null +++ b/internal/httpapi/assistant_steer_test.go @@ -0,0 +1,349 @@ +package httpapi + +import ( + "bytes" + "context" + "encoding/json" + "errors" + "mime/multipart" + "net/http/httptest" + "strings" + "sync/atomic" + "testing" + "time" + + "agentflow/internal/domain" + "agentflow/internal/repo" + "github.com/gin-gonic/gin" + "gorm.io/gorm" +) + +func TestSteerRejectsSecondRequestForSameGeneration(t *testing.T) { + h, user := workbenchFixture(t) + const sessionID = "steer-two-tabs" + session := domain.AssistantSession{ID: sessionID, Model: "default", Messages: []assistantMessage{ + {Role: "user", Content: "original"}, + }} + g := domain.AssistantGeneration{ID: "running-turn", SessionID: sessionID, UserID: user.ID, Status: "running"} + if err := h.repo.BeginAssistantGeneration(g, session); err != nil { + t.Fatal(err) + } + steer := func(content string) *httptest.ResponseRecorder { + body, _ := json.Marshal(domain.AssistantSteer{Content: content}) + path := "/api/assistant/sessions/" + sessionID + "/generation/steer?generationId=" + g.ID + c, rec := workbenchContext(user, "POST", path, bytes.NewBuffer(body)) + c.Params = gin.Params{{Key: "id", Value: sessionID}} + h.steerGeneration(c) + return rec + } + if rec := steer("first tab"); rec.Code != 200 { + t.Fatalf("first steer: %d %s", rec.Code, rec.Body) + } + first, _ := h.repo.PeekAssistantGeneration(user.ID, sessionID) + if rec := steer("second tab"); rec.Code != 409 || !strings.Contains(rec.Body.String(), "已有待处理的引导") { + t.Fatalf("second steer must report a pending steer: %d %s", rec.Code, rec.Body) + } + current, _ := h.repo.PeekAssistantGeneration(user.ID, sessionID) + if !current.CancelRequested || first.Steer == nil || current.Steer == nil || + current.Steer.Content != "first tab" || current.Steer.TriggerID != first.Steer.TriggerID { + t.Fatalf("the first accepted steer was changed: %+v", current.Steer) + } +} + +func TestSteerDuringTurnFinalization(t *testing.T) { + for _, tc := range []struct { + name string + steerFirst bool + }{ + {name: "steer accepted before finalization", steerFirst: true}, + {name: "steer arrives while saving partial reply"}, + } { + t.Run(tc.name, func(t *testing.T) { + h, user := workbenchFixture(t) + stubCLIModelDiscovery(t) + const followUp = "continue with this instruction" + s := domain.AssistantSession{ID: "steer-at-finish", ProjectID: "workbench", Model: "default", Messages: []assistantMessage{ + {Role: "user", Content: "original"}, + }} + g := domain.AssistantGeneration{ID: "finishing-turn", SessionID: s.ID, UserID: user.ID, ProjectID: s.ProjectID, Status: "running", MessageCount: 1} + if err := h.repo.BeginAssistantGeneration(g, s); err != nil { + t.Fatal(err) + } + submitSteer := func() *httptest.ResponseRecorder { + body, _ := json.Marshal(domain.AssistantSteer{Content: followUp}) + path := "/api/assistant/sessions/" + s.ID + "/generation/steer?generationId=" + g.ID + c, rec := workbenchContext(user, "POST", path, bytes.NewBuffer(body)) + c.Params = gin.Params{{Key: "id", Value: s.ID}} + h.steerGeneration(c) + return rec + } + var response *httptest.ResponseRecorder + var savePartial atomic.Bool + h.generate = func(ctx context.Context, prompt string, _ domain.User) (string, error) { + if strings.Contains(prompt, followUp) { + return `{"message":"follow-up reply","drafts":[]}`, nil + } + sink := ctx.Value(assistantGenerationSinkKey{}).(func(string, any)) + sink("thought", assistantStreamEvent{Kind: "answer", Text: "partial reply"}) + if tc.steerFirst { + response = submitSteer() + } else { + savePartial.Store(true) + } + return "", errors.New("test model stopped") + } + // This read starts the partial transcript write after the worker has + // stopped checking for steering requests. The old code accepted a + // request here, then closed the turn without following it. + const callback = "test:steer_during_transcript_save" + queries := h.repo.DB.Callback().Query() + if err := queries.After("gorm:query").Register(callback, func(tx *gorm.DB) { + if tx.Statement.Table == "assistant_sessions" && savePartial.CompareAndSwap(true, false) { + response = submitSteer() + } + }); err != nil { + t.Fatal(err) + } + defer queries.Remove(callback) + h.executeGeneration(t.Context(), assistantRequest{SessionID: s.ID, ProjectID: s.ProjectID, Model: s.Model, Messages: s.Messages}, g, domainUserToAuth(user)) + + if response == nil { + t.Fatal("steering request did not run") + } + saved, _ := h.repo.AssistantSession(user.ID, s.ID) + if len(saved.Messages) < 2 || replyMessageText(saved.Messages[1].Content) != "partial reply" { + t.Fatalf("the first turn must keep the partial reply: %+v", saved.Messages) + } + current, _ := h.repo.PeekAssistantGeneration(user.ID, s.ID) + if tc.steerFirst { + if response.Code != 200 || current.ID == g.ID || current.Status != "completed" || len(saved.Messages) != 4 || + saved.Messages[2].Content != followUp || saved.Messages[2].TriggerID == "" || replyMessageText(saved.Messages[3].Content) != "follow-up reply" { + t.Fatalf("accepted steer must start its own turn: %d %s, %s, %+v", response.Code, response.Body, current.Status, saved.Messages) + } + } else if response.Code != 409 || !strings.Contains(response.Body.String(), "生成已结束或不存在") || + current.ID != g.ID || current.Status != "failed" || current.CancelRequested || current.Steer != nil || len(saved.Messages) != 2 { + t.Fatalf("a turn that is closing must reject the steer as ended: %d %s, %+v, %+v", response.Code, response.Body, current, saved.Messages) + } + }) + } +} + +func TestSteerKeepsNewAttachmentsAndReferencesWithSameText(t *testing.T) { + h, user := workbenchFixture(t) + stubCLIModelDiscovery(t) + const projectID, sessionID = "workbench", "same-text-steer" + const question = "请查看这份文件" + upload := func(name string) domain.AssistantAttachment { + t.Helper() + var form bytes.Buffer + w := multipart.NewWriter(&form) + if err := w.WriteField("projectId", projectID); err != nil { + t.Fatal(err) + } + file, err := w.CreateFormFile("file", name) + if err != nil { + t.Fatal(err) + } + if _, err := file.Write([]byte(name)); err != nil { + t.Fatal(err) + } + if err := w.Close(); err != nil { + t.Fatal(err) + } + c, rec := workbenchContext(user, "POST", "/api/assistant/attachments", &form) + c.Request.Header.Set("Content-Type", w.FormDataContentType()) + h.uploadAttachment(c) + var item domain.AssistantAttachment + if rec.Code != 201 || json.Unmarshal(rec.Body.Bytes(), &item) != nil { + t.Fatalf("upload %s: %d %s", name, rec.Code, rec.Body) + } + return item + } + first, second := upload("first.txt"), upload("second.txt") + for _, id := range []string{"first-issue", "second-issue"} { + if err := h.repo.PutIssue(domain.Issue{ID: id, Title: id, ProjectID: projectID}); err != nil { + t.Fatal(err) + } + } + + started := make(chan struct{}) + followUpPrompt := make(chan string, 1) + h.generate = func(ctx context.Context, prompt string, _ domain.User) (string, error) { + select { + case <-started: + followUpPrompt <- prompt + return "已查看附件", nil + default: + close(started) + <-ctx.Done() + return "", ctx.Err() + } + } + request, _ := json.Marshal(assistantRequest{ + SessionID: sessionID, ProjectID: projectID, + Messages: []assistantMessage{{ + Role: "user", Content: question, + Attachments: []domain.AssistantAttachment{first}, + References: []domain.AssistantReference{{Type: "issue", ID: "first-issue"}}, + }}, + }) + c, rec := workbenchContext(user, "POST", "/api/assistant/generations", bytes.NewBuffer(request)) + h.startGeneration(c) + if rec.Code != 202 { + t.Fatalf("start: %d %s", rec.Code, rec.Body) + } + select { + case <-started: + case <-time.After(5 * time.Second): + t.Fatal("initial turn did not start") + } + generation, _ := h.repo.PeekAssistantGeneration(user.ID, sessionID) + body, _ := json.Marshal(domain.AssistantSteer{ + Content: question, Attachments: []domain.AssistantAttachment{second}, + References: []domain.AssistantReference{{Type: "issue", ID: "second-issue"}}, + }) + path := "/api/assistant/sessions/" + sessionID + "/generation/steer?generationId=" + generation.ID + c, rec = workbenchContext(user, "POST", path, bytes.NewBuffer(body)) + c.Params = gin.Params{{Key: "id", Value: sessionID}} + h.steerGeneration(c) + if rec.Code != 200 { + t.Fatalf("steer: %d %s", rec.Code, rec.Body) + } + + for deadline := time.Now().Add(5 * time.Second); ; { + next, _ := h.repo.PeekAssistantGeneration(user.ID, sessionID) + if next.ID != generation.ID && next.Status == "completed" { + break + } + if (next.ID != generation.ID && next.Status == "failed") || time.Now().After(deadline) { + t.Fatalf("follow-up did not complete: %s %s", next.Status, next.Error) + } + time.Sleep(10 * time.Millisecond) + } + saved, _ := h.repo.AssistantSession(user.ID, sessionID) + if len(saved.Messages) != 3 { + t.Fatalf("expected two user messages and a reply, got %+v", saved.Messages) + } + original, steered := saved.Messages[0], saved.Messages[1] + if original.Content != question || len(original.Attachments) != 1 || original.Attachments[0].ID != first.ID || + len(original.References) != 1 || original.References[0].ID != "first-issue" { + t.Fatalf("original message changed: %+v", original) + } + if steered.Role != "user" || steered.Content != question || steered.Trigger != "steer" || steered.TriggerID == "" || + len(steered.Attachments) != 1 || steered.Attachments[0].ID != second.ID || + len(steered.References) != 1 || steered.References[0].ID != "second-issue" { + t.Fatalf("steered message lost its context: %+v", steered) + } + prompt := <-followUpPrompt + if !strings.Contains(prompt, second.Name) || !strings.Contains(prompt, "second-issue") { + t.Fatal("the follow-up prompt must contain the new file and reference") + } +} + +func TestCommitTurnTranscriptKeepsSameSteerOnce(t *testing.T) { + for _, tc := range []struct{ name, id, want string }{ + {"accepted steer", "accepted-steer-id", "accepted-steer-id"}, + {"legacy steer", "", "interrupted-turn"}, + } { + t.Run(tc.name, func(t *testing.T) { + h, user := workbenchFixture(t) + session := domain.AssistantSession{ID: "steer-replay", Model: "default", Messages: []assistantMessage{ + {Role: "user", Content: "original"}, + }} + if err := h.repo.PutAssistantSession(user.ID, session); err != nil { + t.Fatal(err) + } + generation := domain.AssistantGeneration{ID: "interrupted-turn", SessionID: session.ID, UserID: user.ID, + Stream: &domain.AssistantStreamSnapshot{Answer: "partial reply"}} + steer := &domain.AssistantSteer{Content: "continue", TriggerID: tc.id} + for range 2 { + if err := h.commitTurnTranscript(generation, steer, false); err != nil { + t.Fatal(err) + } + } + stored, _ := h.repo.AssistantSession(user.ID, session.ID) + if len(stored.Messages) != 3 || + stored.Messages[1].GenerationID != generation.ID || + stored.Messages[2].TriggerID != tc.want || stored.Messages[2].Content != steer.Content { + t.Fatalf("replaying a steer must keep one partial reply and one follow-up: %+v", stored.Messages) + } + }) + } +} + +func TestSteerKeepsConversationCLI(t *testing.T) { + for _, tc := range []struct { + name, executor, savedModel, requested, wantModel string + runnerLogin, missingKey bool + wantStatus int + }{ + {"codex login prefixed", "codex", "codex:gpt-old", "codex:gpt-selected", "codex:gpt-selected", true, false, 200}, + {"codex login unprefixed", "codex", "codex:gpt-old", "gpt-selected", "codex:gpt-selected", true, false, 200}, + {"codex login omitted", "codex", "codex:gpt-old", "", "codex:gpt-old", true, false, 200}, + {"codex legacy", "codex", "gpt-old", "gpt-selected", "codex:gpt-selected", true, false, 200}, + {"codex key", "codex", "codex:gpt-old", "gpt-selected", "codex:gpt-selected", false, false, 200}, + {"cursor prefixed", "cursor", "cursor:old", "cursor:selected", "cursor:selected", false, false, 200}, + {"cursor unprefixed", "cursor", "cursor:old", "selected", "cursor:selected", false, false, 200}, + {"cursor legacy", "cursor", "old", "selected", "cursor:selected", false, false, 200}, + {"codebuddy", "codebuddy", "default", "default", "default", false, false, 200}, + {"codex missing key", "codex", "codex:gpt-old", "gpt-selected", "", false, true, 400}, + {"cursor missing key", "cursor", "cursor:old", "selected", "", false, true, 400}, + {"codex to cursor", "codex", "codex:gpt-old", "cursor:selected", "", true, false, 409}, + {"cursor to codex", "cursor", "cursor:old", "codex:gpt-selected", "", false, false, 409}, + {"codex to codebuddy", "codex", "codex:gpt-old", "codebuddy:default", "", true, false, 409}, + {"codebuddy to codex", "codebuddy", "default", "codex:gpt-selected", "", false, false, 409}, + {"invalid codex model", "codex", "codex:gpt-old", "codex:bad model", "", true, false, 400}, + } { + t.Run(tc.name, func(t *testing.T) { + h, user := workbenchFixture(t) + stubCLIModelDiscovery(t) + credentials := repo.UserCredentialUpdate{CodeBuddyAPIKeyClear: tc.executor != "codebuddy"} + if !tc.missingKey && !tc.runnerLogin { + credentials.CodexAPIKey = "test-codex" + credentials.AgentCLICredentials = map[string]repo.AgentCLICredentialUpdate{"cursor": {APIKey: "test-cursor"}} + } + var err error + user, err = h.repo.UpdateUserCredentials(user.ID, credentials) + if err != nil { + t.Fatal(err) + } + target := domain.AssistantExecutionTarget{Pool: domain.ExecutionModeCloud} + if tc.runnerLogin { + runner := domain.Runner{ID: "login-runner", OwnerUserID: user.ID, Runtimes: []domain.RunnerRuntime{{Provider: "codex", AuthMode: domain.RuntimeAuthLocal}}} + if err := h.repo.PutRunner(runner); err != nil { + t.Fatal(err) + } + target = domain.AssistantExecutionTarget{Pool: domain.ExecutionModeRunner, RunnerID: runner.ID} + } + session := domain.AssistantSession{ID: "steer-cli", Executor: tc.executor, Model: tc.savedModel, ExecutionTarget: &target, Messages: []assistantMessage{ + {Role: "user", Content: "first"}, + {Role: "assistant", Content: "first reply", Model: tc.savedModel}, + {Role: "user", Content: "continue"}, + }} + g := domain.AssistantGeneration{ID: "running-turn", SessionID: session.ID, UserID: user.ID, Status: "running", MessageCount: len(session.Messages)} + if err := h.repo.BeginAssistantGeneration(g, session); err != nil { + t.Fatal(err) + } + body, _ := json.Marshal(domain.AssistantSteer{Content: "redirect", Model: tc.requested}) + c, rec := workbenchContext(user, "POST", "/api/assistant/sessions/steer-cli/generation/steer?generationId="+g.ID, bytes.NewBuffer(body)) + c.Params = gin.Params{{Key: "id", Value: session.ID}} + h.steerGeneration(c) + if rec.Code != tc.wantStatus { + t.Fatalf("steer: %d %s, want %d", rec.Code, rec.Body, tc.wantStatus) + } + current, _ := h.repo.AssistantGeneration(user.ID, session.ID) + if tc.wantStatus != 200 { + if current.CancelRequested || current.Steer != nil || current.Status != "running" { + t.Fatalf("rejected request interrupted the turn: %+v", current) + } + if tc.wantStatus == 409 && !strings.Contains(rec.Body.String(), "不能中途切换 CLI") { + t.Fatalf("missing switch refusal: %s", rec.Body) + } + return + } + if !current.CancelRequested || current.Steer == nil || current.Steer.Model != tc.wantModel { + t.Fatalf("steer: %+v, want model %q", current.Steer, tc.wantModel) + } + }) + } +} diff --git a/internal/httpapi/assistant_transcript_test.go b/internal/httpapi/assistant_transcript_test.go index f65bacd2..53511eb6 100644 --- a/internal/httpapi/assistant_transcript_test.go +++ b/internal/httpapi/assistant_transcript_test.go @@ -3,12 +3,14 @@ package httpapi import ( "bytes" "context" + "encoding/json" "strings" "sync" "testing" "time" "agentflow/internal/domain" + "agentflow/internal/repo" "github.com/gin-gonic/gin" ) @@ -197,67 +199,124 @@ func TestStoppedGenerationKeepsPartialTranscript(t *testing.T) { } func TestSteerContinuesFromPartialTranscript(t *testing.T) { - h, user := workbenchFixture(t) - started := make(chan struct{}) - var mu sync.Mutex - var prompts []string - h.generate = func(ctx context.Context, prompt string, _ domain.User) (string, error) { - mu.Lock() - prompts = append(prompts, prompt) - n := len(prompts) - mu.Unlock() - if n == 1 { - sink := ctx.Value(assistantGenerationSinkKey{}).(func(string, any)) - sink("thought", assistantStreamEvent{Kind: "answer", Text: "第一段说明"}) - close(started) - <-ctx.Done() - return "", ctx.Err() - } - return "已改为查看仓库", nil - } - c, rec := workbenchContext(user, "POST", "/api/assistant/generations", bytes.NewBufferString(`{"projectId":"workbench","sessionId":"steer-chat","messages":[{"role":"user","content":"先查项目"}]}`)) - h.startGeneration(c) - if rec.Code != 202 { - t.Fatalf("start: %d %s", rec.Code, rec.Body.String()) - } - select { - case <-started: - case <-time.After(5 * time.Second): - t.Fatal("generation never wrote") - } - g, _ := h.repo.AssistantGeneration(user.ID, "steer-chat") - c, rec = workbenchContext(user, "POST", "/api/assistant/sessions/steer-chat/generation/steer?generationId="+g.ID, bytes.NewBufferString(`{"content":"改查仓库","approvalMode":"confirm"}`)) - c.Params = gin.Params{{Key: "id", Value: "steer-chat"}} - h.steerGeneration(c) - if rec.Code != 200 { - t.Fatalf("steer: %d %s", rec.Code, rec.Body.String()) - } - deadline := time.Now().Add(5 * time.Second) - for { - saved, _ := h.repo.AssistantSession(user.ID, "steer-chat") - current, _ := h.repo.AssistantGeneration(user.ID, "steer-chat") - if current.Status == "completed" && len(saved.Messages) == 4 { - if !strings.Contains(saved.Messages[1].Content, "第一段说明") { - t.Fatalf("partial missing: %s", saved.Messages[1].Content) + for _, tc := range []struct { + name, cli string + runner, login, prefixed bool + }{ + {"codebuddy cloud", "codebuddy", false, false, false}, + {"codebuddy runner", "codebuddy", true, false, false}, + {"codex login bare model", "codex", true, true, false}, + {"codex login prefixed model", "codex", true, true, true}, + {"codex cloud key", "codex", false, false, true}, + {"cursor cloud bare model", "cursor", false, false, false}, + {"cursor runner prefixed model", "cursor", true, false, true}, + } { + t.Run(tc.name, func(t *testing.T) { + h, user := workbenchFixture(t) + stubCLIModelDiscovery(t) + discoverCLIModels = func(context.Context, string, string) []string { return []string{"claude-opus-5.5", "gpt-6-sol"} } + credentials := repo.UserCredentialUpdate{CodeBuddyAPIKeyClear: tc.cli != "codebuddy"} + if !tc.login { + credentials.CodexAPIKey = "test-codex" + credentials.AgentCLICredentials = map[string]repo.AgentCLICredentialUpdate{"cursor": {APIKey: "test-cursor"}} } - if saved.Messages[2].Content != "改查仓库" || saved.Messages[2].Trigger != "steer" { - t.Fatalf("steer message: %+v", saved.Messages[2]) + var err error + user, err = h.repo.UpdateUserCredentials(user.ID, credentials) + if err != nil { + t.Fatal(err) } - if !strings.Contains(saved.Messages[3].Content, "已改为查看仓库") { - t.Fatalf("follow-up: %s", saved.Messages[3].Content) + target := domain.AssistantExecutionTarget{Pool: domain.ExecutionModeCloud} + if tc.runner { + runner := domain.Runner{ID: "steer-runner", OwnerUserID: user.ID, Runtimes: []domain.RunnerRuntime{{Provider: "codex", AuthMode: domain.RuntimeAuthLocal}}} + if err := h.repo.PutRunner(runner); err != nil { + t.Fatal(err) + } + target = domain.AssistantExecutionTarget{Pool: domain.ExecutionModeRunner, RunnerID: runner.ID} } - mu.Lock() - got := append([]string(nil), prompts...) - mu.Unlock() - if len(got) < 2 || !strings.Contains(got[1], "第一段说明") || !strings.Contains(got[1], "改查仓库") { - t.Fatalf("follow-up prompt: %v", got) + // Switch between CodeBuddy models and reset an effort the new one does not support. + initialModel, selectedModel, initialEffort := "claude-opus-5.5", "gpt-6-sol", "max" + if tc.cli != "codebuddy" { + initialModel, selectedModel, initialEffort = tc.cli+":initial", tc.cli+":selected", "" } - return - } - if time.Now().After(deadline) { - t.Fatalf("steer did not continue: status=%s messages=%d prompts=%d", current.Status, len(saved.Messages), len(prompts)) - } - time.Sleep(20 * time.Millisecond) + messages := []assistantMessage{{Role: "user", Content: "上一轮"}, {Role: "assistant", Content: "上一轮已完成", Model: initialModel}} + if err := h.repo.PutAssistantSession(user.ID, domain.AssistantSession{ID: "steer-chat", ProjectID: "workbench", Executor: tc.cli, Model: initialModel, ExecutionTarget: &target, Messages: messages}); err != nil { + t.Fatal(err) + } + started := make(chan struct{}) + var mu sync.Mutex + var prompts []string + h.generate = func(ctx context.Context, prompt string, _ domain.User) (string, error) { + mu.Lock() + prompts = append(prompts, prompt) + n := len(prompts) + mu.Unlock() + if n == 1 { + sink := ctx.Value(assistantGenerationSinkKey{}).(func(string, any)) + sink("thought", assistantStreamEvent{Kind: "answer", Text: "第一段说明"}) + close(started) + <-ctx.Done() + return "", ctx.Err() + } + return "已改为查看仓库", nil + } + messages = append(messages, assistantMessage{Role: "user", Content: "先查项目"}) + request, _ := json.Marshal(assistantRequest{ProjectID: "workbench", SessionID: "steer-chat", Model: initialModel, Effort: initialEffort, Messages: messages}) + c, rec := workbenchContext(user, "POST", "/api/assistant/generations", bytes.NewBuffer(request)) + h.startGeneration(c) + if rec.Code != 202 { + t.Fatalf("start: %d %s", rec.Code, rec.Body.String()) + } + select { + case <-started: + case <-time.After(5 * time.Second): + t.Fatal("generation never wrote") + } + g, _ := h.repo.AssistantGeneration(user.ID, "steer-chat") + requestedModel := selectedModel + if tc.cli != "codebuddy" && !tc.prefixed { + requestedModel = "selected" + } + body, _ := json.Marshal(gin.H{"content": "改查仓库", "model": requestedModel, "effort": "", "approvalMode": "confirm"}) + c, rec = workbenchContext(user, "POST", "/api/assistant/sessions/steer-chat/generation/steer?generationId="+g.ID, bytes.NewBuffer(body)) + c.Params = gin.Params{{Key: "id", Value: "steer-chat"}} + h.steerGeneration(c) + if rec.Code != 200 { + t.Fatalf("steer: %d %s", rec.Code, rec.Body.String()) + } + deadline := time.Now().Add(5 * time.Second) + for { + saved, _ := h.repo.AssistantSession(user.ID, "steer-chat") + current, _ := h.repo.AssistantGeneration(user.ID, "steer-chat") + if current.Status == "completed" && len(saved.Messages) == 6 { + if saved.Effort != "" { + t.Fatalf("follow-up kept the old effort %q", saved.Effort) + } + if saved.Executor != tc.cli || saved.Model != selectedModel || saved.Execution() != target || saved.Messages[5].Model != selectedModel { + t.Fatalf("follow-up changed CLI, model or execution target: %+v", saved) + } + if saved.Messages[3].Model != initialModel || !strings.Contains(saved.Messages[3].Content, "第一段说明") { + t.Fatalf("partial missing: %+v", saved.Messages[3]) + } + if saved.Messages[4].Content != "改查仓库" || saved.Messages[4].Trigger != "steer" { + t.Fatalf("steer message: %+v", saved.Messages[4]) + } + if !strings.Contains(saved.Messages[5].Content, "已改为查看仓库") { + t.Fatalf("follow-up: %s", saved.Messages[5].Content) + } + mu.Lock() + got := append([]string(nil), prompts...) + mu.Unlock() + if len(got) < 2 || !strings.Contains(got[1], "第一段说明") || !strings.Contains(got[1], "改查仓库") { + t.Fatalf("follow-up prompt: %v", got) + } + return + } + if time.Now().After(deadline) { + t.Fatalf("steer did not continue: status=%s messages=%d error=%s", current.Status, len(saved.Messages), current.Error) + } + time.Sleep(20 * time.Millisecond) + } + }) } } diff --git a/internal/repo/assistant_generation_approvals.go b/internal/repo/assistant_generation_approvals.go index ae48d67f..b59edc5d 100644 --- a/internal/repo/assistant_generation_approvals.go +++ b/internal/repo/assistant_generation_approvals.go @@ -13,15 +13,8 @@ import ( "gorm.io/gorm/clause" ) -// Approvals are transient control state in the existing generation payload. -// Any API instance can answer the browser or CLI without a separate queue. -// This envelope is absent from the public generation DTO: raw tool arguments -// must only leave through the redacted approvals endpoint. -type assistantGenerationPayload struct { - domain.AssistantGeneration - NativeApprovals []assistantNativeApprovalState `json:"nativeApprovals,omitempty"` -} - +// Approval state is stored in the private generation payload, so any API +// instance can answer without exposing raw tool arguments in the generation DTO. type assistantNativeApprovalState struct { domain.AssistantNativeApproval Phase string `json:"phase"` @@ -34,12 +27,6 @@ func nativeApprovalState(item assistantNativeApprovalState) domain.AssistantNati return out } -func generationPayload(row assistantGenerationRow) assistantGenerationPayload { - var payload assistantGenerationPayload - _ = json.Unmarshal(row.Payload, &payload) - return payload -} - // nativeApprovalGenerationActive measures the heartbeat on the same clock that // stamped it (see heartbeatNow). func (r *AssistantRepo) nativeApprovalGenerationActive(db *gorm.DB, row assistantGenerationRow) bool { diff --git a/internal/repo/assistant_generations.go b/internal/repo/assistant_generations.go index 4a406191..2c4d7b32 100644 --- a/internal/repo/assistant_generations.go +++ b/internal/repo/assistant_generations.go @@ -30,10 +30,19 @@ type assistantGenerationRow struct { WorkspaceLease string `gorm:"size:64"` } +// Keep private control state alongside the public generation snapshot. +type assistantGenerationPayload struct { + domain.AssistantGeneration + NativeApprovals []assistantNativeApprovalState `json:"nativeApprovals,omitempty"` + SteeringClosed bool `json:"steeringClosed,omitempty"` +} + // assistantHeartbeatTimeout is how long a running turn may go without a // durable heartbeat before a reader that does not own it declares it dead. const assistantHeartbeatTimeout = 45 * time.Second +var errAssistantGenerationEnded = errors.New("生成已结束或不存在") + // AssistantGenerationLease is the workspace lease a reaped turn held. type AssistantGenerationLease struct { RunID string @@ -41,6 +50,13 @@ type AssistantGenerationLease struct { } func (assistantGenerationRow) TableName() string { return "assistant_generations" } + +func generationPayload(row assistantGenerationRow) assistantGenerationPayload { + var payload assistantGenerationPayload + _ = json.Unmarshal(row.Payload, &payload) + return payload +} + func decodeGeneration(row assistantGenerationRow) domain.AssistantGeneration { var g domain.AssistantGeneration _ = json.Unmarshal(row.Payload, &g) @@ -251,8 +267,7 @@ func (r *AssistantRepo) HeartbeatAssistantGeneration(g domain.AssistantGeneratio func (r *AssistantRepo) checkpointAssistantGeneration(g domain.AssistantGeneration, withDiagnostics bool, diagnostics []domain.AssistantDiagnostics) error { return r.DB.Transaction(func(tx *gorm.DB) error { - var row assistantGenerationRow - err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).Where("session_id = ? AND user_id = ? AND generation_id = ? AND status = ?", g.SessionID, g.UserID, g.ID, "running").Take(&row).Error + row, err := lockRunningAssistantGeneration(tx, g.UserID, g.SessionID, g.ID) if err != nil { return fmt.Errorf("生成状态已变化") } @@ -292,16 +307,49 @@ func (r *AssistantRepo) checkpointAssistantGeneration(g domain.AssistantGenerati }) } +func lockRunningAssistantGeneration(tx *gorm.DB, userID int64, sessionID, id string) (assistantGenerationRow, error) { + var row assistantGenerationRow + err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).Where("session_id = ? AND user_id = ? AND generation_id = ? AND status = ?", sessionID, userID, id, "running").Take(&row).Error + return row, err +} + +// CloseAssistantGenerationSteering hands the worker any accepted steer and +// prevents new steers while the worker saves the transcript. The generation +// stays running until that transcript is available to readers. +func (r *AssistantRepo) CloseAssistantGenerationSteering(userID int64, sessionID, id string) (*domain.AssistantSteer, error) { + var steer *domain.AssistantSteer + err := r.DB.Transaction(func(tx *gorm.DB) error { + row, err := lockRunningAssistantGeneration(tx, userID, sessionID, id) + if err != nil { + return err + } + payload := generationPayload(row) + steer = payload.Steer + if steer != nil || payload.SteeringClosed { + return nil + } + payload.SteeringClosed = true + return tx.Model(&row).Updates(map[string]any{"payload": mustJSON(payload), "updated_at": r.generationClock()}).Error + }) + return steer, err +} + func (r *AssistantRepo) SteerAssistantGeneration(userID int64, sessionID, id string, steer domain.AssistantSteer) error { return r.DB.Transaction(func(tx *gorm.DB) error { - var row assistantGenerationRow - err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).Where("session_id = ? AND user_id = ? AND generation_id = ? AND status = ?", sessionID, userID, id, "running").Take(&row).Error + row, err := lockRunningAssistantGeneration(tx, userID, sessionID, id) if err != nil { - return fmt.Errorf("生成已结束或不存在") + return errAssistantGenerationEnded } - g := decodeGeneration(row) - g.Steer = &steer - return tx.Model(&row).Updates(map[string]any{"cancel_requested": true, "payload": mustJSON(g), "updated_at": r.generationClock()}).Error + payload := generationPayload(row) + if payload.Steer != nil { + return errors.New("本轮已有待处理的引导,请稍后重试") + } + if payload.SteeringClosed { + return errAssistantGenerationEnded + } + payload.Steer = &steer + payload.NativeApprovals = nil + return tx.Model(&row).Updates(map[string]any{"cancel_requested": true, "payload": mustJSON(payload), "updated_at": r.generationClock()}).Error }) } func (r *AssistantRepo) CancelAssistantGeneration(userID int64, sessionID, id string) error { @@ -310,7 +358,7 @@ func (r *AssistantRepo) CancelAssistantGeneration(userID int64, sessionID, id st return res.Error } if res.RowsAffected != 1 { - return fmt.Errorf("生成已结束或不存在") + return errAssistantGenerationEnded } return nil } diff --git a/internal/repo/assistant_generations_test.go b/internal/repo/assistant_generations_test.go index 29fd7317..fb5b6f6c 100644 --- a/internal/repo/assistant_generations_test.go +++ b/internal/repo/assistant_generations_test.go @@ -1,11 +1,117 @@ package repo import ( - "agentflow/internal/domain" + "errors" + "fmt" + "os" + "strings" "testing" "time" + + "agentflow/internal/domain" ) +func TestAssistantGenerationCoordinatesSteering(t *testing.T) { + for _, backend := range []string{"sqlite", "mysql"} { + t.Run(backend, func(t *testing.T) { + var st *Store + var err error + if backend == "mysql" { + dsn := os.Getenv("AGENTFLOW_TEST_MYSQL_DSN") + if dsn == "" { + t.Skip("isolated local Docker MySQL required") + } + st, err = Open(dsn) + } else { + st, err = OpenTest() + } + if err != nil { + t.Fatal(err) + } + t.Cleanup(st.Close) + sessionID := fmt.Sprintf("steer-conflict-%d", time.Now().UnixNano()) + g := domain.AssistantGeneration{ + ID: sessionID + "-first", SessionID: sessionID, + UserID: 91, Status: "running", + } + if err := st.BeginAssistantGeneration(g); err != nil { + t.Fatal(err) + } + t.Cleanup(func() { + st.DB.Where("session_id = ?", sessionID).Delete(&assistantGenerationRow{}) + st.DB.Where("session_id = ?", sessionID).Delete(&assistantDiagnosticsRow{}) + }) + + type result struct { + steer domain.AssistantSteer + err error + } + start := make(chan struct{}) + results := make(chan result, 2) + for _, request := range []domain.AssistantSteer{ + {Content: "first tab", TriggerID: "steer-a"}, + {Content: "second tab", TriggerID: "steer-b"}, + } { + go func() { + <-start + results <- result{request, st.SteerAssistantGeneration(g.UserID, g.SessionID, g.ID, request)} + }() + } + close(start) + accepted, rejected := <-results, <-results + if accepted.err != nil { + accepted, rejected = rejected, accepted + } + if accepted.err != nil || rejected.err == nil || !strings.Contains(rejected.err.Error(), "已有待处理的引导") { + t.Fatalf("concurrent steers must accept one request and report one pending conflict: %v, %v", accepted.err, rejected.err) + } + saved, _ := st.PeekAssistantGeneration(g.UserID, g.SessionID) + if !saved.CancelRequested || saved.Steer == nil || + saved.Steer.TriggerID != accepted.steer.TriggerID || saved.Steer.Content != accepted.steer.Content { + t.Fatalf("the accepted steer was lost: %+v", saved.Steer) + } + pending, err := st.CloseAssistantGenerationSteering(g.UserID, g.SessionID, g.ID) + if err != nil || pending == nil || pending.TriggerID != accepted.steer.TriggerID || pending.Content != accepted.steer.Content { + t.Fatalf("finalization must receive the accepted steer: %+v %v", pending, err) + } + + g.Status = "cancelled" + if err := st.CheckpointAssistantGeneration(g); err != nil { + t.Fatal(err) + } + g.ID, g.Status = sessionID+"-next", "running" + if err := st.BeginAssistantGeneration(g); err != nil { + t.Fatal(err) + } + pending, err = st.CloseAssistantGenerationSteering(g.UserID, g.SessionID, g.ID) + if err != nil || pending != nil { + t.Fatalf("finalization received a steer from the previous turn: %+v %v", pending, err) + } + if err := st.HeartbeatAssistantGeneration(g); err != nil { + t.Fatal(err) + } + if err := st.SteerAssistantGeneration(g.UserID, g.SessionID, g.ID, rejected.steer); !errors.Is(err, errAssistantGenerationEnded) { + t.Fatalf("a steer arriving after finalization must report an ended turn: %v", err) + } + saved, _ = st.PeekAssistantGeneration(g.UserID, g.SessionID) + if saved.Status != "running" || saved.CancelRequested || saved.Steer != nil { + t.Fatalf("the generation must stay running while its transcript is saved: %+v", saved) + } + g.Status = "completed" + if err := st.CheckpointAssistantGeneration(g); err != nil { + t.Fatal(err) + } + g.ID, g.Status = sessionID+"-third", "running" + if err := st.BeginAssistantGeneration(g); err != nil { + t.Fatal(err) + } + if err := st.SteerAssistantGeneration(g.UserID, g.SessionID, g.ID, rejected.steer); err != nil { + t.Fatalf("next generation must accept a new steer: %v", err) + } + }) + } +} + func TestAssistantGenerationClaimCheckpointAndPrivacy(t *testing.T) { s, err := OpenTest() if err != nil { diff --git a/internal/repo/assistant_preferences.go b/internal/repo/assistant_preferences.go index 4dd39a8b..8c91cb80 100644 --- a/internal/repo/assistant_preferences.go +++ b/internal/repo/assistant_preferences.go @@ -20,6 +20,7 @@ func (r *AssistantRepo) AssistantPreferences(userID int64) domain.AssistantPrefe return out } out.ProactiveRoles, out.ProactiveSOPs, out.Instructions = row.ProactiveRoles, row.ProactiveSOPs, row.Instructions + out.SteerOnSend = row.SteerOnSend if row.UpdatedAt != nil { out.UpdatedAt = *row.UpdatedAt } @@ -32,7 +33,7 @@ func (r *AssistantRepo) PutAssistantPreferences(userID int64, p domain.Assistant return p, errors.New("user id is required") } now := time.Now().UTC() - row := assistantPreferenceRow{UserID: userID, ProactiveRoles: p.ProactiveRoles, ProactiveSOPs: p.ProactiveSOPs, Instructions: strings.TrimSpace(p.Instructions), UpdatedAt: &now} + row := assistantPreferenceRow{UserID: userID, ProactiveRoles: p.ProactiveRoles, ProactiveSOPs: p.ProactiveSOPs, SteerOnSend: p.SteerOnSend, Instructions: strings.TrimSpace(p.Instructions), UpdatedAt: &now} if err := r.DB.Save(&row).Error; err != nil { return p, err } diff --git a/internal/repo/assistant_preferences_test.go b/internal/repo/assistant_preferences_test.go new file mode 100644 index 00000000..9065a781 --- /dev/null +++ b/internal/repo/assistant_preferences_test.go @@ -0,0 +1,50 @@ +package repo + +import ( + "os" + "testing" + + "agentflow/internal/domain" +) + +func TestAssistantMessageSendPreference(t *testing.T) { + for _, driver := range []string{"sqlite", "mysql"} { + t.Run(driver, func(t *testing.T) { + var st *Store + var err error + if driver == "mysql" { + dsn := os.Getenv("AGENTFLOW_TEST_MYSQL_DSN") + if dsn == "" { + t.Skip("AGENTFLOW_TEST_MYSQL_DSN is not set") + } + st, err = Open(dsn) + } else { + st, err = OpenTest() + } + if err != nil { + t.Fatal(err) + } + t.Cleanup(st.Close) + const userID = int64(801036) + if err := st.DB.Where("user_id = ?", userID).Delete(&assistantPreferenceRow{}).Error; err != nil { + t.Fatal(err) + } + t.Cleanup(func() { st.DB.Where("user_id = ?", userID).Delete(&assistantPreferenceRow{}) }) + if st.AssistantPreferences(userID).SteerOnSend { + t.Fatal("messages should queue by default") + } + for _, immediate := range []bool{true, false} { + saved, err := st.PutAssistantPreferences(userID, domain.AssistantPreferences{SteerOnSend: immediate, Instructions: "keep this rule"}) + if err != nil { + t.Fatal(err) + } + if saved.SteerOnSend != immediate || st.AssistantPreferences(userID).SteerOnSend != immediate || saved.Instructions != "keep this rule" { + t.Fatalf("saved preferences: %+v", saved) + } + if st.AssistantPreferences(userID + 1).SteerOnSend { + t.Fatal("preference leaked to another user") + } + } + }) + } +} diff --git a/internal/repo/models.go b/internal/repo/models.go index 538418d6..c290f229 100644 --- a/internal/repo/models.go +++ b/internal/repo/models.go @@ -565,11 +565,12 @@ type userRunnerPrefRow struct { func (userRunnerPrefRow) TableName() string { return "user_runner_prefs" } -// assistantPreferenceRow: a missing row means both switches are off. +// assistantPreferenceRow: a missing row means switches are off and messages queue. type assistantPreferenceRow struct { UserID int64 `gorm:"column:user_id;primaryKey;autoIncrement:false"` ProactiveRoles bool `gorm:"column:proactive_roles;not null;default:false"` ProactiveSOPs bool `gorm:"column:proactive_sops;not null;default:false"` + SteerOnSend bool `gorm:"column:steer_on_send;not null;default:false"` Instructions string `gorm:"column:instructions;type:text"` UpdatedAt *time.Time `gorm:"column:updated_at"` } diff --git a/migrations/036_assistant_steer_on_send.sql b/migrations/036_assistant_steer_on_send.sql new file mode 100644 index 00000000..2b5718e5 --- /dev/null +++ b/migrations/036_assistant_steer_on_send.sql @@ -0,0 +1,10 @@ +-- Optional manual additive DDL; startup AutoMigrate also adds this column. +-- Existing users keep queueing messages sent during a running reply. +SET @assistant_steer_ddl = IF( + (SELECT COUNT(*) FROM information_schema.columns + WHERE table_schema=DATABASE() AND table_name='assistant_preferences' AND column_name='steer_on_send')=0, + 'ALTER TABLE assistant_preferences ADD COLUMN steer_on_send TINYINT(1) NOT NULL DEFAULT 0', + 'SELECT 1'); +PREPARE assistant_steer_stmt FROM @assistant_steer_ddl; +EXECUTE assistant_steer_stmt; +DEALLOCATE PREPARE assistant_steer_stmt; diff --git a/web/app/assistant-settings.css b/web/app/assistant-settings.css index 5693bb9b..a177e5f9 100644 --- a/web/app/assistant-settings.css +++ b/web/app/assistant-settings.css @@ -1,4 +1,4 @@ -/* AI 助手设置页(#assistantView):两张面板,主动派发开关 + 自定义规则。 */ +/* AI 助手设置页(#assistantView):发送方式、主动派发与自定义规则。 */ #assistantView .asst-form fieldset { margin: 0; padding: 0; border: 0; min-width: 0; display: grid; gap: 16px; } #assistantView .asst-panel { padding: 20px 22px; border: 1px solid var(--hui-border); border-radius: 14px; background: var(--hui-surface); box-shadow: var(--hui-panel-shadow); } #assistantView .asst-panel-head h2 { margin: 0; color: var(--hui-text); font: 600 15px/1.4 var(--hui-sans); } @@ -7,6 +7,7 @@ #assistantView .asst-switch-row { display: flex; align-items: center; justify-content: space-between; gap: 24px; padding: 14px 0; border-top: 1px solid var(--hui-border-soft); cursor: pointer; } #assistantView .asst-switch-row:first-child { border-top: 0; } #assistantView .asst-switch-row > input { flex: none; } +#assistantView .asst-switch-row > select { flex: none; width: 140px; } #assistantView .asst-switch-row b { display: block; color: var(--hui-text); font-size: 13px; font-weight: 500; } #assistantView .asst-switch-row small { display: block; margin-top: 3px; color: var(--hui-tertiary); font-size: 12px; line-height: 1.6; } #assistantView .asst-rules-label { position: absolute; width: 1px; height: 1px; overflow: hidden; clip: rect(0 0 0 0); white-space: nowrap; } @@ -19,4 +20,5 @@ @media (max-width: 640px) { #assistantView .asst-panel { padding: 16px; } #assistantView .asst-switch-row { gap: 16px; } + #assistantView .asst-switch-row:has(select) { align-items: flex-start; flex-direction: column; } } diff --git a/web/app/assistant-settings.js b/web/app/assistant-settings.js index 20269fd7..e54b2ded 100644 --- a/web/app/assistant-settings.js +++ b/web/app/assistant-settings.js @@ -1,14 +1,14 @@ -// AI 助手设置:没有 @ 时是否更主动地派角色、走 SOP(默认都关),以及每轮都带上的自定义规则。只对当前用户生效。 +// AI 助手设置:生成中消息的发送方式、主动派发与每轮自定义规则。只对当前用户生效。 const ASSISTANT_RULES_MAX=4000; const assistantPrefsUI={saved:null,loading:false,saving:false,error:''}; function assistantPrefsSignedIn(){return !!state.currentUser&&!state.currentUser.isGuest} function assistantPrefsForm(){return document.querySelector('#assistantPrefsForm')} -function assistantPrefsDraft(form){return {proactiveRoles:form.proactiveRoles.checked,proactiveSops:form.proactiveSops.checked,instructions:form.instructions.value.trim()}} +function assistantPrefsDraft(form){return {proactiveRoles:form.proactiveRoles.checked,proactiveSops:form.proactiveSops.checked,steerOnSend:form.messageDuringGeneration.value==='steer',instructions:form.instructions.value.trim()}} function assistantPrefsDirty(form){ const saved=assistantPrefsUI.saved;if(!saved||!form)return false; const draft=assistantPrefsDraft(form); - return draft.proactiveRoles!==!!saved.proactiveRoles||draft.proactiveSops!==!!saved.proactiveSops||draft.instructions!==(saved.instructions||''); + return draft.proactiveRoles!==!!saved.proactiveRoles||draft.proactiveSops!==!!saved.proactiveSops||draft.steerOnSend!==!!saved.steerOnSend||draft.instructions!==(saved.instructions||''); } function assistantPrefsSwitchRow(name,title,help,on){ return ``; @@ -16,6 +16,10 @@ function assistantPrefsSwitchRow(name,title,help,on){ function assistantPrefsFormHTML(p){ const rules=p.instructions||''; return `
+

消息发送

+

主动派发

打开后 AI 助手会更主动地把事情交给角色或 SOP。派角色不需要确认;走 SOP 仍按审批模式先征求同意,完全权限下直接启动。

${assistantPrefsSwitchRow('proactiveRoles','主动派角色','整件事是某个角色的本职(如独立评审、整套测试),或改了高风险代码需要复核时,直接交给这个角色。',p.proactiveRoles)} @@ -45,6 +49,7 @@ function renderAssistantSettings(){ assistantPrefsUI.saving=true;save.disabled=true;save.textContent='保存中…'; try{ assistantPrefsUI.saved=await api('/api/assistant/preferences',{method:'PUT',body:JSON.stringify(draft)}); + document.querySelector('#chatNextFrame')?.contentWindow?.postMessage({type:'agentflow-assistant-preferences-changed'},location.origin); toast('AI 助手设置已保存'); }catch(err){toast(err.message||'保存失败,请重试')} finally{assistantPrefsUI.saving=false;save.textContent='保存';refresh()} diff --git a/web/assistant_settings_test.js b/web/assistant_settings_test.js index c20a1664..1d63be9f 100644 --- a/web/assistant_settings_test.js +++ b/web/assistant_settings_test.js @@ -19,10 +19,15 @@ assert.match(html, /maxlength="4000"/); assert.match(html, />先给结论 <b>&<\/textarea>/, 'rules must be escaped inside the textarea'); assert.match(html, /9 \/ 4000/); assert.match(html, /id="assistantPrefsSave" disabled/); +assert.match(html, /