mirror of
https://github.com/coder/coder.git
synced 2026-11-01 12:53:26 +08:00
## Stack Context Follow-up fixes from live UAT of the merged chat lifecycle hooks stack (#27430). Two PRs: 1. **This PR**: make hook effects visible and correctly attributed in the transcript. 2. [`mike/chat-hooks-uat/dispatch-capacity`]: reserve dispatch capacity so an admission burst can't fail running turns. ## Why? UAT found three ways the transcript misrepresented what a lifecycle hook did. All three are user-visible and share the same surface (`chathooks/effects.go`, `codersdk.ChatMessagePart`, the conversation timeline), so they're reviewed together. **A prompt `input_override` silently discarded attachments.** `ComposeUserPromptContent` replaced the entire submitted part list with one text part, dropping `file` and `file-reference` parts along with their `chat_file_links`. The user saw their attachments vanish with no explanation. The override now replaces submitted *text* parts only and preserves non-text parts in order. A consumer that wants to block attachments uses `deny`, which is the documented mechanism for refusing a submission. **Every user-visible `system` row was labelled "Lifecycle hook".** The timeline keyed the notice off `role === "system"`. That was correct only by accident, because the hook `user_message` was the sole client-visible system row. The backend now emits the notice as a typed `hook-notice` part and the timeline renders on that, so a future system row can't be mislabelled as a policy notice. **Nothing marked a tool call the hook had rewritten.** A consumer could replace tool input via `input_override` and the transcript showed the rewritten input as if the model had produced it. `ChatMessagePart` gains `hook_rewritten`, set from `preflight.Overrides` on the same path that already carries `ToolCallCreatedAt`, and the tool row renders a "Modified by policy" badge. `ToolCall.PolicyProvider` renders the badge itself, at four wrap sites: the `Tool` dispatch wrapper, the `ReadFilesTool` aggregate and its per-file rows, and `ReadFileTimelineBlock` (grouped and single `read_file` rows bypass `Tool`). Renderer props do not include the flag; descendants consume it through the provider context. The badge is emitted by the provider rather than by the shared header because several renderer branches return early without one, including the auth-required `execute` card, a completed `ask_user_question`, and an empty question payload. Those branches would drop the attribution with no type or runtime error, and the gap is not greppable: every renderer file contains a header somewhere, only individual branches do not. Emitting at the provider removes the possibility instead of enumerating the cases. A rewritten call is wrapped in a group labelled by its badge, so one rewritten file inside a merged read is attributed on its own rather than inheriting the group's badge. `HeaderButton` still appends the policy wording to an explicit `ariaLabel`, since an explicit `aria-label` replaces the name computed from descendants. Provider-executed calls are excluded from attribution. Hooks never see them, and duplicate tool-call ID rejection deliberately skips them, so a reused ID would otherwise mark a provider-executed call as policy-rewritten. ## Testing Go: `coderd/x/chatd/...`, `coderd/x/agenthooks/...`, `codersdk/...`, and `coderd -run 'Hook|Chat'`. Frontend: `tsc` plus every `AgentsPage` story; the only failures are `MCP Tool Completed` and `Scroll To Bottom Button Works With Inverse Scroll`, both of which fail on trunk. A registry-wide story asserts every registered renderer shows the badge, verified against three inverted toggles: removing the badge, hiding it with `display:none`, and skipping the provider for one renderer (which names that renderer). Storybook also covers the rewritten subagent spawn, a completed empty question payload, a non-hook system message, and a failed `read_file` guarding the accessible name. > Mux opened this PR on Mike's behalf.
203 lines
6.9 KiB
Go
203 lines
6.9 KiB
Go
package chathooks
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"io"
|
|
"slices"
|
|
"strings"
|
|
|
|
"charm.land/fantasy"
|
|
"github.com/google/uuid"
|
|
"golang.org/x/xerrors"
|
|
|
|
"github.com/coder/coder/v2/coderd/database"
|
|
"github.com/coder/coder/v2/coderd/x/chatd/chatprompt"
|
|
"github.com/coder/coder/v2/coderd/x/chatd/chatstate"
|
|
"github.com/coder/coder/v2/codersdk"
|
|
)
|
|
|
|
// EventMessages converts a turn-time hook result into ordinary
|
|
// transcript rows: model context becomes a user-role, model-visible row
|
|
// and the user message becomes a system-role, user-visible notice row.
|
|
func EventMessages(result *Result, modelConfigID uuid.UUID) ([]chatstate.Message, error) {
|
|
messages := make([]chatstate.Message, 0, 2)
|
|
if strings.TrimSpace(result.GetModelContext()) != "" {
|
|
content, err := chatprompt.MarshalParts([]codersdk.ChatMessagePart{codersdk.ChatMessageText(result.ModelContext)})
|
|
if err != nil {
|
|
return nil, xerrors.Errorf("marshal hook model context: %w", err)
|
|
}
|
|
messages = append(messages, chatstate.Message{
|
|
Role: database.ChatMessageRoleUser,
|
|
Content: content,
|
|
Visibility: database.ChatMessageVisibilityModel,
|
|
ModelConfigID: uuid.NullUUID{UUID: modelConfigID, Valid: modelConfigID != uuid.Nil},
|
|
ContentVersion: chatprompt.CurrentContentVersion,
|
|
})
|
|
}
|
|
if result.GetUserMessage() != "" {
|
|
content, err := chatprompt.MarshalParts([]codersdk.ChatMessagePart{{
|
|
Type: codersdk.ChatMessagePartTypeHookNotice,
|
|
Text: result.UserMessage,
|
|
}})
|
|
if err != nil {
|
|
return nil, xerrors.Errorf("marshal hook user message: %w", err)
|
|
}
|
|
messages = append(messages, chatstate.Message{
|
|
Role: database.ChatMessageRoleSystem,
|
|
Content: content,
|
|
Visibility: database.ChatMessageVisibilityUser,
|
|
ModelConfigID: uuid.NullUUID{UUID: modelConfigID, Valid: modelConfigID != uuid.Nil},
|
|
ContentVersion: chatprompt.CurrentContentVersion,
|
|
})
|
|
}
|
|
return messages, nil
|
|
}
|
|
|
|
func EventMessagesForResults(
|
|
results []*Result,
|
|
modelConfigID uuid.UUID,
|
|
) ([]chatstate.Message, error) {
|
|
var messages []chatstate.Message
|
|
for _, result := range results {
|
|
resultMessages, err := EventMessages(result, modelConfigID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
messages = append(messages, resultMessages...)
|
|
}
|
|
return messages, nil
|
|
}
|
|
|
|
// deniedToolResult synthesizes the denial as a tool result so the model
|
|
// can replan within the same turn. The result is client-visible, so it
|
|
// must never carry the consumer's model_context; that travels as a
|
|
// model-only transcript row instead. The text must distinguish a policy
|
|
// denial from a genuine tool failure, or the model retries the call and
|
|
// misreports the denial as an infrastructure error.
|
|
func deniedToolResult(toolCall fantasy.ToolCallContent, reason string) fantasy.ToolResultContent {
|
|
message := "This tool usage was blocked by an external policy" +
|
|
" (the deployment's lifecycle hook); the tool call was not executed."
|
|
if reason = strings.TrimSpace(reason); reason != "" {
|
|
message += " Reason: " + reason + "."
|
|
}
|
|
message += " This is an administrative policy decision, not a tool or" +
|
|
" workspace failure; retrying the same call will be denied again." +
|
|
" Explain the policy block to the user and adjust your approach."
|
|
return fantasy.ToolResultContent{
|
|
ToolCallID: toolCall.ToolCallID,
|
|
ToolName: toolCall.ToolName,
|
|
Result: fantasy.ToolResultOutputContentError{
|
|
Error: xerrors.New(message),
|
|
},
|
|
}
|
|
}
|
|
|
|
// RestoreToolCallOrder reorders known tool results to match the assistant's
|
|
// call order while preserving slots for unrelated entries.
|
|
func RestoreToolCallOrder(content []fantasy.Content, calls []fantasy.ToolCallContent) {
|
|
position := make(map[string]int, len(calls))
|
|
for index, call := range calls {
|
|
position[call.ToolCallID] = index
|
|
}
|
|
slots := make([]int, 0, len(content))
|
|
results := make([]fantasy.ToolResultContent, 0, len(content))
|
|
for index, entry := range content {
|
|
result, ok := entry.(fantasy.ToolResultContent)
|
|
if !ok {
|
|
continue
|
|
}
|
|
if _, known := position[result.ToolCallID]; !known {
|
|
continue
|
|
}
|
|
slots = append(slots, index)
|
|
results = append(results, result)
|
|
}
|
|
slices.SortStableFunc(results, func(a, b fantasy.ToolResultContent) int {
|
|
return position[a.ToolCallID] - position[b.ToolCallID]
|
|
})
|
|
for index, slot := range slots {
|
|
content[slot] = results[index]
|
|
}
|
|
}
|
|
|
|
func UserPromptOverride(result *Result) (string, bool, error) {
|
|
if result == nil || len(result.InputOverride) == 0 {
|
|
return "", false, nil
|
|
}
|
|
var override struct {
|
|
Prompt *string `json:"prompt"`
|
|
}
|
|
decoder := json.NewDecoder(bytes.NewReader(result.InputOverride))
|
|
decoder.DisallowUnknownFields()
|
|
if err := decoder.Decode(&override); err != nil {
|
|
return "", false, xerrors.Errorf("decode user prompt input override: %w", err)
|
|
}
|
|
if override.Prompt == nil {
|
|
return "", false, xerrors.New("decode user prompt input override: prompt is required")
|
|
}
|
|
if err := decoder.Decode(&struct{}{}); err != io.EOF {
|
|
return "", false, xerrors.New("decode user prompt input override: trailing JSON value")
|
|
}
|
|
return *override.Prompt, true, nil
|
|
}
|
|
|
|
func UserPromptParts(result *Result) []codersdk.ChatMessagePart {
|
|
parts := make([]codersdk.ChatMessagePart, 0, 2)
|
|
if result.GetModelContext() != "" {
|
|
parts = append(parts, codersdk.ChatMessagePart{
|
|
Type: codersdk.ChatMessagePartTypeHookContext,
|
|
Text: result.ModelContext,
|
|
})
|
|
}
|
|
if result.GetUserMessage() != "" {
|
|
parts = append(parts, codersdk.ChatMessagePart{
|
|
Type: codersdk.ChatMessagePartTypeHookNotice,
|
|
Text: result.UserMessage,
|
|
})
|
|
}
|
|
return parts
|
|
}
|
|
|
|
func applyPromptOverride(parts []codersdk.ChatMessagePart, override string) []codersdk.ChatMessagePart {
|
|
userParts := make([]codersdk.ChatMessagePart, 0, len(parts)+1)
|
|
replaced := false
|
|
for _, part := range parts {
|
|
if part.Type != codersdk.ChatMessagePartTypeText {
|
|
userParts = append(userParts, part)
|
|
continue
|
|
}
|
|
if !replaced {
|
|
userParts = append(userParts, codersdk.ChatMessageText(override))
|
|
replaced = true
|
|
}
|
|
}
|
|
if !replaced {
|
|
userParts = append(userParts, codersdk.ChatMessageText(override))
|
|
}
|
|
return userParts
|
|
}
|
|
|
|
// ComposeUserPromptContent applies a user_prompt_submit result to the
|
|
// submitted parts. The merge order is fixed: override-or-original user
|
|
// parts first, then hook-context, then hook-notice. The composite
|
|
// content then flows through the ordinary send, queue, and edit paths.
|
|
func ComposeUserPromptContent(parts []codersdk.ChatMessagePart, result *Result) ([]codersdk.ChatMessagePart, bool, error) {
|
|
override, overridden, err := UserPromptOverride(result)
|
|
if err != nil {
|
|
return nil, false, err
|
|
}
|
|
userParts := parts
|
|
if overridden {
|
|
userParts = applyPromptOverride(parts, override)
|
|
}
|
|
hookParts := UserPromptParts(result)
|
|
if len(hookParts) == 0 {
|
|
return userParts, overridden, nil
|
|
}
|
|
combined := make([]codersdk.ChatMessagePart, 0, len(userParts)+len(hookParts))
|
|
combined = append(combined, userParts...)
|
|
combined = append(combined, hookParts...)
|
|
return combined, overridden, nil
|
|
}
|