Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
50c7b30
feat(coderd): key chat diff statuses by ref
DanielleMaywood Sep 8, 2026
70aaf3a
fix(coderd): key discovery writes off the report ordering
DanielleMaywood Sep 21, 2026
6203c52
fix(coderd): state each timestamp rule without its history
DanielleMaywood Sep 21, 2026
cc365fe
fix(coderd): make the timestamp comments plain
DanielleMaywood Sep 21, 2026
0d92ac5
fix(coderd): drop comments that restate the queries
DanielleMaywood Sep 21, 2026
18ad411
feat: expose per-ref diff statuses
DanielleMaywood Sep 8, 2026
eac2f11
feat(site): fetch and merge diff statuses per ref
DanielleMaywood Sep 18, 2026
8f846ab
refactor(site): spread the diff status ref fixture
DanielleMaywood Sep 18, 2026
8c30437
refactor(site): readable names in the diff status merge
DanielleMaywood Sep 18, 2026
be63540
style(site): give the diff status merge room to breathe
DanielleMaywood Sep 21, 2026
c0e01e3
style(site): trim the merge comments to their arguments
DanielleMaywood Sep 21, 2026
062a4fb
feat(site): per-ref views in the git panel
DanielleMaywood Sep 18, 2026
e39968f
refactor(site): name mock data consistently in git panel stories
DanielleMaywood Sep 18, 2026
bd4ee94
refactor(site): make the diff contents fixture a const
DanielleMaywood Sep 18, 2026
2b11d9b
refactor(site): make the git view reconciliation easy to read
DanielleMaywood Sep 18, 2026
7739f78
refactor(site): name the diff fetch conditions
DanielleMaywood Sep 18, 2026
b3180a4
refactor(site): extract the git panel derivations
DanielleMaywood Sep 18, 2026
04b7de9
style(site): give the selected ref derivations room to breathe
DanielleMaywood Sep 21, 2026
bcdc567
style(site): drop restated derivations in the git panel
DanielleMaywood Sep 21, 2026
5906a9d
feat(site/src/pages/AgentsPage/components): simplify the git panel he…
tracyjohnsonux Sep 22, 2026
ceb8455
style(site/src/pages/AgentsPage/components): align the git panel head…
tracyjohnsonux Sep 22, 2026
9cd374b
style(site/src/pages/AgentsPage/components): size the git switcher li…
tracyjohnsonux Sep 22, 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
56 changes: 55 additions & 1 deletion coderd/apidoc/docs.go

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

56 changes: 55 additions & 1 deletion coderd/apidoc/swagger.json

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

46 changes: 40 additions & 6 deletions coderd/database/db2sdk/db2sdk.go
Original file line number Diff line number Diff line change
Expand Up @@ -1851,6 +1851,17 @@ func decodeChatLastError(raw pqtype.NullRawMessage) *codersdk.ChatError {
// When files is non-empty the response includes file metadata;
// pass nil to omit the files field (e.g. list endpoints).
func Chat(c database.Chat, diffStatus *database.ChatDiffStatus, files []database.GetChatFileMetadataByChatIDRow) codersdk.Chat {
return ChatWithDiffStatuses(c, diffStatus, nil, files)
}

// ChatWithDiffStatuses converts a chat with its per-ref diff status
// list. diffStatus is the primary shown in the legacy diff_status field.
func ChatWithDiffStatuses(
c database.Chat,
diffStatus *database.ChatDiffStatus,
diffStatuses []database.ChatDiffStatus,
files []database.GetChatFileMetadataByChatIDRow,
) codersdk.Chat {
mcpServerIDs := c.MCPServerIDs
if mcpServerIDs == nil {
mcpServerIDs = []uuid.UUID{}
Expand Down Expand Up @@ -1925,6 +1936,12 @@ func Chat(c database.Chat, diffStatus *database.ChatDiffStatus, files []database
convertedDiffStatus := ChatDiffStatus(c.ID, diffStatus)
chat.DiffStatus = &convertedDiffStatus
}
if len(diffStatuses) > 0 {
chat.DiffStatuses = make([]codersdk.ChatDiffStatus, 0, len(diffStatuses))
for i := range diffStatuses {
chat.DiffStatuses = append(chat.DiffStatuses, ChatDiffStatus(c.ID, &diffStatuses[i]))
}
}
if len(files) > 0 {
chat.Files = make([]codersdk.ChatFileMetadata, 0, len(files))
for _, row := range files {
Expand Down Expand Up @@ -2083,13 +2100,13 @@ func ChatDebugRunDetail(r database.ChatDebugRun, steps []database.ChatDebugStep)
// is non-nil, children without an entry receive an empty DiffStatus.
func ChildChatRows(
children []database.GetChildChatsByParentIDsRow,
diffStatuses map[uuid.UUID]database.ChatDiffStatus,
diffStatuses map[uuid.UUID][]database.ChatDiffStatus,
) []codersdk.Chat {
result := make([]codersdk.Chat, len(children))
for i, row := range children {
diffStatus, ok := diffStatuses[row.Chat.ID]
statuses, ok := diffStatuses[row.Chat.ID]
if ok {
result[i] = Chat(row.Chat, &diffStatus, nil)
result[i] = ChatWithDiffStatuses(row.Chat, firstChatDiffStatus(statuses), statuses, nil)
} else {
result[i] = Chat(row.Chat, nil, nil)
if diffStatuses != nil {
Expand All @@ -2108,7 +2125,7 @@ func ChildChatRows(
func ChatRowsWithChildren(
roots []database.GetChatsRow,
children []database.GetChildChatsByParentIDsRow,
diffStatuses map[uuid.UUID]database.ChatDiffStatus,
diffStatuses map[uuid.UUID][]database.ChatDiffStatus,
) []codersdk.Chat {
// Group children by parent ID.
childrenByParent := make(map[uuid.UUID][]database.GetChildChatsByParentIDsRow, len(children))
Expand All @@ -2119,9 +2136,9 @@ func ChatRowsWithChildren(

result := make([]codersdk.Chat, len(roots))
for i, row := range roots {
diffStatus, ok := diffStatuses[row.Chat.ID]
statuses, ok := diffStatuses[row.Chat.ID]
if ok {
result[i] = Chat(row.Chat, &diffStatus, nil)
result[i] = ChatWithDiffStatuses(row.Chat, firstChatDiffStatus(statuses), statuses, nil)
} else {
result[i] = Chat(row.Chat, nil, nil)
if diffStatuses != nil {
Expand Down Expand Up @@ -2151,6 +2168,14 @@ func ChatDiffStatus(chatID uuid.UUID, status *database.ChatDiffStatus) codersdk.
}

result.ChatID = status.ChatID
if status.GitRemoteOrigin != "" {
remoteOrigin := status.GitRemoteOrigin
result.RemoteOrigin = &remoteOrigin
}
if status.GitBranch != "" {
gitBranch := status.GitBranch
result.GitBranch = &gitBranch
}
if status.Url.Valid {
u := strings.TrimSpace(status.Url.String)
if u != "" {
Expand Down Expand Up @@ -2222,6 +2247,15 @@ func ChatDiffStatus(chatID uuid.UUID, status *database.ChatDiffStatus) codersdk.
return result
}

// firstChatDiffStatus returns the primary status row of a chat. The
// status list is ordered newest first, so the first row is the primary.
func firstChatDiffStatus(statuses []database.ChatDiffStatus) *database.ChatDiffStatus {
if len(statuses) == 0 {
return nil
}
return &statuses[0]
}

// UserSecret converts a database ListUserSecretsRow (metadata only,
// no value) to an SDK UserSecret.
func UserSecret(secret database.ListUserSecretsRow) codersdk.UserSecret {
Expand Down
3 changes: 2 additions & 1 deletion coderd/database/db2sdk/db2sdk_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -889,6 +889,7 @@ func TestChat_AllFieldsPopulated(t *testing.T) {
diffStatus := &database.ChatDiffStatus{
ChatID: input.ID,
}
diffStatuses := []database.ChatDiffStatus{*diffStatus}

fileRows := []database.GetChatFileMetadataByChatIDRow{
{
Expand All @@ -901,7 +902,7 @@ func TestChat_AllFieldsPopulated(t *testing.T) {
},
}

got := db2sdk.Chat(input, diffStatus, fileRows)
got := db2sdk.ChatWithDiffStatuses(input, diffStatus, diffStatuses, fileRows)

require.Equal(t, &lastErrorPayload, got.LastError)

Expand Down
31 changes: 20 additions & 11 deletions coderd/database/dbauthz/dbauthz.go
Original file line number Diff line number Diff line change
Expand Up @@ -3297,15 +3297,6 @@ func (q *querier) GetChatDesktopEnabled(ctx context.Context) (bool, error) {
return q.db.GetChatDesktopEnabled(ctx)
}

func (q *querier) GetChatDiffStatusByChatID(ctx context.Context, chatID uuid.UUID) (database.ChatDiffStatus, error) {
// Authorize read on the parent chat.
_, err := q.GetChatByID(ctx, chatID)
if err != nil {
return database.ChatDiffStatus{}, err
}
return q.db.GetChatDiffStatusByChatID(ctx, chatID)
}

func (q *querier) GetChatDiffStatusSummary(ctx context.Context) (database.GetChatDiffStatusSummaryRow, error) {
// Telemetry queries are called from system contexts only.
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
Expand All @@ -3314,6 +3305,15 @@ func (q *querier) GetChatDiffStatusSummary(ctx context.Context) (database.GetCha
return q.db.GetChatDiffStatusSummary(ctx)
}

func (q *querier) GetChatDiffStatusesByChatID(ctx context.Context, chatID uuid.UUID) ([]database.ChatDiffStatus, error) {
// Authorize read on the parent chat.
_, err := q.GetChatByID(ctx, chatID)
if err != nil {
return nil, err
}
return q.db.GetChatDiffStatusesByChatID(ctx, chatID)
}

func (q *querier) GetChatDiffStatusesByChatIDs(ctx context.Context, chatIDs []uuid.UUID) ([]database.ChatDiffStatus, error) {
if len(chatIDs) == 0 {
return []database.ChatDiffStatus{}, nil
Expand Down Expand Up @@ -7504,6 +7504,17 @@ func (q *querier) UpdateChatDebugStep(ctx context.Context, arg database.UpdateCh
return q.db.UpdateChatDebugStep(ctx, arg)
}

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

func (q *querier) UpdateChatExecutionState(ctx context.Context, arg database.UpdateChatExecutionStateParams) (database.Chat, error) {
chat, err := q.db.GetChatByID(ctx, arg.ID)
if err != nil {
Expand Down Expand Up @@ -9042,7 +9053,6 @@ func (q *querier) UpsertChatDesktopEnabled(ctx context.Context, enableDesktop bo
}

func (q *querier) UpsertChatDiffStatus(ctx context.Context, arg database.UpsertChatDiffStatusParams) (database.ChatDiffStatus, error) {
// Authorize update on the parent chat.
chat, err := q.db.GetChatByID(ctx, arg.ChatID)
if err != nil {
return database.ChatDiffStatus{}, err
Expand All @@ -9054,7 +9064,6 @@ func (q *querier) UpsertChatDiffStatus(ctx context.Context, arg database.UpsertC
}

func (q *querier) UpsertChatDiffStatusReference(ctx context.Context, arg database.UpsertChatDiffStatusReferenceParams) (database.ChatDiffStatus, error) {
// Authorize update on the parent chat.
chat, err := q.db.GetChatByID(ctx, arg.ChatID)
if err != nil {
return database.ChatDiffStatus{}, err
Expand Down
Loading
Loading