Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cc44a06
feat(coderd/database): add queries for messages that wait for prompt …
ThomasK33 Nov 12, 2026
7a690c8
feat(coderd/x/chatd/chatstate): carry prompt_hooks_pending and add Re…
ThomasK33 Nov 12, 2026
9156732
feat(coderd/x/chatd): run the prompt hooks when a turn starts from a …
ThomasK33 Nov 12, 2026
585e4e6
docs(coderd/x/chatd): describe the prompt hooks of a flagged message
ThomasK33 Nov 12, 2026
3ef896d
Merge remote-tracking branch 'origin/tk/automations-schema' into tk/a…
ThomasK33 Nov 12, 2026
fa45c91
refactor(coderd/x/chatd): drop the dead deleted check and tests that …
ThomasK33 Nov 12, 2026
c7f48ad
docs(coderd/x/chatd): state only what the flag means
ThomasK33 Nov 12, 2026
8b376e4
fix(coderd/x/chatd): keep a message that waits for its hooks out of e…
ThomasK33 Nov 12, 2026
3e8caf6
Merge remote-tracking branch 'origin/tk/automations-schema' into tk/a…
ThomasK33 Nov 12, 2026
2898e5d
docs(coderd/x/chatd): drop the context boundary from the prompt hooks…
ThomasK33 Nov 12, 2026
1693f5c
test(coderd/x/chatd): handle the strings.Builder write error
ThomasK33 Nov 12, 2026
a18a332
Merge remote-tracking branch 'origin/tk/automations-schema' into tk/a…
ThomasK33 Nov 12, 2026
3ea108a
docs(coderd/x/chatd): name the allow outcome and say what an edit doe…
ThomasK33 Nov 12, 2026
e5ffac6
test(coderd/x/chatd): pin the reserved dispatch capacity and drop che…
ThomasK33 Nov 12, 2026
e240bed
test(coderd/x/chatd): compare the whole denial text and find the admi…
ThomasK33 Nov 13, 2026
2b3bbc2
Merge remote-tracking branch 'origin/tk/automations-schema' into tk/a…
ThomasK33 Nov 13, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
201 changes: 201 additions & 0 deletions coderd/database/chatpromptpending_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
package database_test

import (
"context"
"database/sql"
"encoding/json"
"testing"

"github.com/google/uuid"
"github.com/sqlc-dev/pqtype"
"github.com/stretchr/testify/require"

"github.com/coder/coder/v2/coderd/database"
"github.com/coder/coder/v2/coderd/database/dbgen"
"github.com/coder/coder/v2/coderd/database/dbtestutil"
"github.com/coder/coder/v2/testutil"
)

type promptHooksRow struct {
Deleted bool
Pending bool
Content string
Version int16
HasTsv bool
}

func readPromptHooksRow(ctx context.Context, t *testing.T, sqlDB *sql.DB, id int64) promptHooksRow {
t.Helper()
var row promptHooksRow
err := sqlDB.QueryRowContext(ctx,
`SELECT deleted, prompt_hooks_pending, content::text, content_version, search_tsv IS NOT NULL
FROM chat_messages WHERE id = $1`, id,
).Scan(&row.Deleted, &row.Pending, &row.Content, &row.Version, &row.HasTsv)
require.NoError(t, err)
return row
}

func TestChatPromptHooksPendingQueries(t *testing.T) {
t.Parallel()

db, _, sqlDB := dbtestutil.NewDBWithSQLDB(t)
user := dbgen.User(t, db, database.User{})
org := dbgen.Organization(t, db, database.Organization{})
model := dbgen.ChatModelConfig(t, db, database.ChatModelConfig{OrganizationID: org.ID})
newChat := func(t *testing.T) database.Chat {
t.Helper()
return dbgen.Chat(t, db, database.Chat{OrganizationID: org.ID, OwnerID: user.ID, LastModelConfigID: model.ID})
}
newMessage := func(t *testing.T, chatID uuid.UUID, pending bool) database.ChatMessage {
t.Helper()
return dbgen.ChatMessage(t, db, database.ChatMessage{
ChatID: chatID,
CreatedBy: uuid.NullUUID{UUID: user.ID, Valid: true},
Content: pqtype.NullRawMessage{RawMessage: json.RawMessage(`[{"type":"text","text":"original"}]`), Valid: true},
PromptHooksPending: pending,
})
}

t.Run("Resolve", func(t *testing.T) {
t.Parallel()
newContent := pqtype.NullRawMessage{RawMessage: json.RawMessage(`[{"type":"text","text":"rewritten"}]`), Valid: true}
tests := []struct {
name string
arg database.ResolveChatMessagePromptHooksParams
want promptHooksRow
}{
{
name: "Rewrite",
arg: database.ResolveChatMessagePromptHooksParams{Content: newContent, ContentVersion: sql.NullInt16{Int16: 2, Valid: true}},
want: promptHooksRow{Content: `[{"text": "rewritten", "type": "text"}]`, Version: 2},
},
{
name: "Deny",
arg: database.ResolveChatMessagePromptHooksParams{Deleted: true},
want: promptHooksRow{Deleted: true, Content: `[{"text": "original", "type": "text"}]`, Version: 1, HasTsv: true},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
chat := newChat(t)
message := newMessage(t, chat.ID, true)
_, err := sqlDB.ExecContext(ctx,
`UPDATE chat_messages SET search_tsv = to_tsvector('english', 'original'), search_tsv_config = 'english' WHERE id = $1`,
message.ID)
require.NoError(t, err)

arg := tt.arg
arg.ID, arg.ChatID = message.ID, chat.ID
resolved, err := db.ResolveChatMessagePromptHooks(ctx, arg)
require.NoError(t, err)
require.False(t, resolved.PromptHooksPending)
require.Equal(t, tt.want.Deleted, resolved.Deleted)

got := readPromptHooksRow(ctx, t, sqlDB, message.ID)
require.JSONEq(t, tt.want.Content, got.Content)
got.Content, tt.want.Content = "", ""
require.Equal(t, tt.want, got)
})
}

// The row matches only while it is flagged, undeleted and in the chat.
t.Run("MatchesNothing", func(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
chat, other := newChat(t), newChat(t)
resolved := newMessage(t, chat.ID, true)
plain := newMessage(t, chat.ID, false)
deleted := newMessage(t, chat.ID, true)
_, err := sqlDB.ExecContext(ctx, `UPDATE chat_messages SET deleted = true WHERE id = $1`, deleted.ID)
require.NoError(t, err)
_, err = db.ResolveChatMessagePromptHooks(ctx, database.ResolveChatMessagePromptHooksParams{ID: resolved.ID, ChatID: chat.ID})
require.NoError(t, err)

for name, arg := range map[string]database.ResolveChatMessagePromptHooksParams{
"AlreadyResolved": {ID: resolved.ID, ChatID: chat.ID},
"NeverFlagged": {ID: plain.ID, ChatID: chat.ID},
"Deleted": {ID: deleted.ID, ChatID: chat.ID},
"OtherChat": {ID: newMessage(t, chat.ID, true).ID, ChatID: other.ID},
} {
_, err := db.ResolveChatMessagePromptHooks(ctx, arg)
require.ErrorIs(t, err, sql.ErrNoRows, name)
}
})
})

t.Run("PromptQuerySkipsFlagged", func(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
chat := newChat(t)
plain, flagged := newMessage(t, chat.ID, false), newMessage(t, chat.ID, true)
ids := func() []int64 {
rows, err := db.GetChatMessagesForPromptByChatID(ctx, chat.ID)
require.NoError(t, err)
out := make([]int64, 0, len(rows))
for _, row := range rows {
out = append(out, row.ID)
}
return out
}

require.Equal(t, []int64{plain.ID}, ids())
_, err := db.ResolveChatMessagePromptHooks(ctx, database.ResolveChatMessagePromptHooksParams{ID: flagged.ID, ChatID: chat.ID})
require.NoError(t, err)
require.Equal(t, []int64{plain.ID, flagged.ID}, ids())
})

t.Run("SoftDeleteClearsTheFlag", func(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
chat := newChat(t)
first, second, third := newMessage(t, chat.ID, true), newMessage(t, chat.ID, true), newMessage(t, chat.ID, true)

require.NoError(t, db.SoftDeleteChatMessageByID(ctx, first.ID))
require.NoError(t, db.SoftDeleteChatMessagesAfterID(ctx, database.SoftDeleteChatMessagesAfterIDParams{ChatID: chat.ID, AfterID: second.ID - 1}))
for _, id := range []int64{first.ID, second.ID, third.ID} {
row := readPromptHooksRow(ctx, t, sqlDB, id)
require.True(t, row.Deleted)
require.False(t, row.Pending)
}
})

t.Run("ClearChatMessages", func(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
chat, other := newChat(t), newChat(t)
mine := []database.ChatMessage{newMessage(t, chat.ID, true), newMessage(t, chat.ID, true)}
theirs := newMessage(t, other.ID, true)

require.NoError(t, db.ClearChatMessagesPromptHooks(ctx, chat.ID))
for _, message := range mine {
require.False(t, readPromptHooksRow(ctx, t, sqlDB, message.ID).Pending)
}
require.True(t, readPromptHooksRow(ctx, t, sqlDB, theirs.ID).Pending)
})

t.Run("QueuedMessage", func(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitLong)
chat := newChat(t)
queued, err := db.InsertChatQueuedMessageWithCreator(ctx, database.InsertChatQueuedMessageWithCreatorParams{
ChatID: chat.ID,
Content: json.RawMessage(`[{"type":"text","text":"queued"}]`),
CreatedBy: user.ID,
BusyBehavior: database.ChatBusyBehaviorQueue,
PromptHooksPending: true,
})
require.NoError(t, err)
require.True(t, queued.PromptHooksPending)

// An edit runs the hooks on the new content, so it clears the flag.
edited, err := db.UpdateChatQueuedMessageContent(ctx, database.UpdateChatQueuedMessageContentParams{
ID: queued.ID,
ChatID: chat.ID,
Content: json.RawMessage(`[{"type":"text","text":"edited"}]`),
})
require.NoError(t, err)
require.False(t, edited.PromptHooksPending)
})
}
22 changes: 22 additions & 0 deletions coderd/database/dbauthz/dbauthz.go
Original file line number Diff line number Diff line change
Expand Up @@ -2054,6 +2054,17 @@ func (q *querier) ClearChatDiffStatusPR(ctx context.Context, arg database.ClearC
return q.db.ClearChatDiffStatusPR(ctx, arg)
}

func (q *querier) ClearChatMessagesPromptHooks(ctx context.Context, chatID uuid.UUID) error {
chat, err := q.db.GetChatByID(ctx, chatID)
if err != nil {
return err
}
if err := q.authorizeContext(ctx, policy.ActionUpdate, chat); err != nil {
return err
}
return q.db.ClearChatMessagesPromptHooks(ctx, chatID)
}

func (q *querier) ClearWorkspaceSecretsBeforeBuild(ctx context.Context, arg database.ClearWorkspaceSecretsBeforeBuildParams) error {
workspace, err := q.db.GetWorkspaceByID(ctx, arg.WorkspaceID)
if err != nil {
Expand Down Expand Up @@ -7773,6 +7784,17 @@ func (q *querier) ReorderChatQueuedMessageToFront(ctx context.Context, arg datab
return q.db.ReorderChatQueuedMessageToFront(ctx, arg)
}

func (q *querier) ResolveChatMessagePromptHooks(ctx context.Context, arg database.ResolveChatMessagePromptHooksParams) (database.ChatMessage, error) {
chat, err := q.db.GetChatByID(ctx, arg.ChatID)
if err != nil {
return database.ChatMessage{}, err
}
if err := q.authorizeContext(ctx, policy.ActionUpdate, chat); err != nil {
return database.ChatMessage{}, err
}
return q.db.ResolveChatMessagePromptHooks(ctx, arg)
}

func (q *querier) RevokeDBCryptKey(ctx context.Context, activeKeyDigest string) error {
if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceSystem); err != nil {
return err
Expand Down
14 changes: 14 additions & 0 deletions coderd/database/dbauthz/dbauthz_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -952,6 +952,20 @@ func (s *MethodTestSuite) TestChats() {
dbm.EXPECT().SoftDeleteChatMessageByID(gomock.Any(), msg.ID).Return(nil).AnyTimes()
check.Args(msg.ID).Asserts(chat, policy.ActionUpdate).Returns()
}))
s.Run("ResolveChatMessagePromptHooks", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
chat := testutil.Fake(s.T(), faker, database.Chat{})
msg := database.ChatMessage{ID: 456, ChatID: chat.ID}
arg := database.ResolveChatMessagePromptHooksParams{ID: msg.ID, ChatID: chat.ID, Deleted: true}
dbm.EXPECT().GetChatByID(gomock.Any(), chat.ID).Return(chat, nil).AnyTimes()
dbm.EXPECT().ResolveChatMessagePromptHooks(gomock.Any(), arg).Return(msg, nil).AnyTimes()
check.Args(arg).Asserts(chat, policy.ActionUpdate).Returns(msg)
}))
s.Run("ClearChatMessagesPromptHooks", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
chat := testutil.Fake(s.T(), faker, database.Chat{})
dbm.EXPECT().GetChatByID(gomock.Any(), chat.ID).Return(chat, nil).AnyTimes()
dbm.EXPECT().ClearChatMessagesPromptHooks(gomock.Any(), chat.ID).Return(nil).AnyTimes()
check.Args(chat.ID).Asserts(chat, policy.ActionUpdate).Returns()
}))
s.Run("DeleteChatModelConfigByID", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
config := testutil.Fake(s.T(), faker, database.ChatModelConfig{})
dbm.EXPECT().GetChatModelConfigByID(gomock.Any(), config.ID).Return(config, nil).AnyTimes()
Expand Down
1 change: 1 addition & 0 deletions coderd/database/dbgen/dbgen.go
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ func ChatMessage(t testing.TB, db database.Store, seed database.ChatMessage) dat
RuntimeMs: []int64{seed.RuntimeMs.Int64},
ProviderResponseID: []string{seed.ProviderResponseID.String},
QueuedMessageID: []int64{seed.QueuedMessageID.Int64},
PromptHooksPending: []bool{seed.PromptHooksPending},
})
require.NoError(t, err, "insert chat message")
require.Len(t, msgs, 1)
Expand Down
16 changes: 16 additions & 0 deletions coderd/database/dbmetrics/querymetrics.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 29 additions & 0 deletions coderd/database/dbmock/dbmock.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 11 additions & 1 deletion coderd/database/querier.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading