coder · DanielleMaywood · Jun 4, 2026 · Jun 4, 2026 · Jun 4, 2026 · Jun 4, 2026
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/exp_chats.go b/coderd/exp_chats.go
@@ -339,7 +339,7 @@ func (api *API) chatsByWorkspace(rw http.ResponseWriter, r *http.Request) {
 // @Security CoderSessionToken
 // @Tags Chats
 // @Produce json
-// @Param q query string false "Search query. Supports title:<substring> (case-insensitive, quote multi-word values), archived:bool, has_unread:bool, pr_status:<draft\|open\|merged\|closed> as repeated or comma-separated values, diff_url:<url> (quote values containing colons), pr:<number> (exact PR number match), repo:<owner/repo> (case-insensitive substring match against git remote origin or URL), pr_title:<text> (case-insensitive PR title substring). Bare terms are not supported; use title:<value> for title filtering."
+// @Param q query string false "Search query. Supports title:<substring> (case-insensitive, quote multi-word values), archived:bool, has_unread:bool, pr_status:<draft\|open\|merged\|closed> as repeated or comma-separated values, source:<created_by_me\|shared_with_me\|all>, diff_url:<url> (quote values containing colons), pr:<number> (exact PR number match), repo:<owner/repo> (case-insensitive substring match against git remote origin or URL), pr_title:<text> (case-insensitive PR title substring). Bare terms are not supported; use title:<value> for title filtering."
 // @Param label query string false "Filter by label as key:value. Repeat for multiple (AND logic)."
 // @Success 200 {array} codersdk.Chat
 // @Router /api/experimental/chats [get]
@@ -354,7 +354,7 @@ func (api *API) listChats(rw http.ResponseWriter, r *http.Request) {
 	}
 
 	queryStr := r.URL.Query().Get("q")
-	searchParams, errs := searchquery.Chats(queryStr)
+	searchParams, sourceFilter, errs := searchquery.Chats(queryStr)
 	if len(errs) > 0 {
 		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
 			Message:     "Invalid chat search query.",
@@ -390,8 +390,13 @@ func (api *API) listChats(rw http.ResponseWriter, r *http.Request) {
 		}
 	}
 
+	if sourceFilter == searchquery.ChatSourceFilterDefault {
+		searchParams.OwnedOnly = true
+	}
+
 	params := database.GetChatsParams{
-		OwnedOnly:           true,
+		OwnedOnly:           searchParams.OwnedOnly,
+		SharedOnly:          searchParams.SharedOnly,
 		ViewerID:            apiKey.UserID,
 		Archived:            searchParams.Archived,
 		AfterID:             paginationParams.AfterID,

diff --git a/coderd/exp_chats_acl_test.go b/coderd/exp_chats_acl_test.go
@@ -368,7 +368,8 @@ func TestSharedReaderStreamChat(t *testing.T) {
 	require.False(t, persisted.LastReadMessageID.Valid)
 }
 
-func TestListChatsExcludesSharedChats(t *testing.T) {
+//nolint:tparallel,paralleltest // Subtests share a single coderdtest instance.
+func TestListChatsSharedScope(t *testing.T) {
 	t.Parallel()
 
 	ctx := testutil.Context(t, testutil.WaitLong)
@@ -389,6 +390,12 @@ func TestListChatsExcludesSharedChats(t *testing.T) {
 		LastModelConfigID: modelConfig.ID,
 		Title:             "viewer owned",
 	})
+	unsharedChat := dbgen.Chat(t, db, database.Chat{
+		OrganizationID:    firstUser.OrganizationID,
+		OwnerID:           firstUser.UserID,
+		LastModelConfigID: modelConfig.ID,
+		Title:             "not shared with viewer",
+	})
 
 	err := client.UpdateChatACL(ctx, sharedChat.ID, codersdk.UpdateChatACL{
 		UserRoles: map[string]codersdk.ChatRole{
@@ -397,9 +404,44 @@ func TestListChatsExcludesSharedChats(t *testing.T) {
 	})
 	require.NoError(t, err)
 
-	ownedOnly, err := viewerClientExp.ListChats(ctx, nil)
-	require.NoError(t, err)
-	require.Equal(t, map[uuid.UUID]struct{}{viewerChat.ID: {}}, chatIDSet(ownedOnly))
+	for _, tc := range []struct {
+		name     string
+		opts     *codersdk.ListChatsOptions
+		expected map[uuid.UUID]struct{}
+	}{
+		{
+			name:     "default owned only",
+			expected: map[uuid.UUID]struct{}{viewerChat.ID: {}},
+		},
+		{
+			name: "created by me only",
+			opts: &codersdk.ListChatsOptions{
+				Scope: codersdk.ChatListScopeCreatedByMe,
+			},
+			expected: map[uuid.UUID]struct{}{viewerChat.ID: {}},
+		},
+		{
+			name: "shared with me only",
+			opts: &codersdk.ListChatsOptions{
+				Scope: codersdk.ChatListScopeSharedWithMe,
+			},
+			expected: map[uuid.UUID]struct{}{sharedChat.ID: {}},
+		},
+		{
+			name: "all",
+			opts: &codersdk.ListChatsOptions{
+				Scope: codersdk.ChatListScopeAll,
+			},
+			expected: map[uuid.UUID]struct{}{viewerChat.ID: {}, sharedChat.ID: {}},
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			chats, err := viewerClientExp.ListChats(ctx, tc.opts)
+			require.NoError(t, err)
+			require.Equal(t, tc.expected, chatIDSet(chats))
+			require.NotContains(t, chatIDSet(chats), unsharedChat.ID)
+		})
+	}
 }
 
 //nolint:paralleltest // This test verifies a process-wide RBAC kill switch.

diff --git a/coderd/searchquery/search.go b/coderd/searchquery/search.go
@@ -559,14 +559,25 @@ func Tasks(ctx context.Context, db database.Store, query string, actorID uuid.UU
 //   - pr: positive integer (exact PR number match)
 //   - repo: string (case-insensitive substring match against git remote origin or URL)
 //   - pr_title: string (case-insensitive PR title substring match)
-func Chats(query string) (database.GetChatsParams, []codersdk.ValidationError) {
+//   - source: created_by_me, shared_with_me, or all
+type ChatSourceFilter string
+
+const (
+	ChatSourceFilterDefault      ChatSourceFilter = ""
+	ChatSourceFilterCreatedByMe  ChatSourceFilter = "created_by_me"
+	ChatSourceFilterSharedWithMe ChatSourceFilter = "shared_with_me"
+	ChatSourceFilterAll          ChatSourceFilter = "all"
+)
+
+func Chats(query string) (database.GetChatsParams, ChatSourceFilter, []codersdk.ValidationError) {
 	filter := database.GetChatsParams{
 		// Default to hiding archived chats.
 		Archived: sql.NullBool{Bool: false, Valid: true},
 	}
+	var sourceFilter ChatSourceFilter
 
 	if query == "" {
-		return filter, nil
+		return filter, sourceFilter, nil
 	}
 
 	// Lowercase the keys so they match regardless of how the caller
@@ -577,7 +588,7 @@ func Chats(query string) (database.GetChatsParams, []codersdk.ValidationError) {
 		return xerrors.Errorf("unsupported search term: %q", term)
 	})
 	if len(errors) > 0 {
-		return filter, errors
+		return filter, sourceFilter, errors
 	}
 
 	parser := httpapi.NewQueryParamParser()
@@ -606,6 +617,21 @@ func Chats(query string) (database.GetChatsParams, []codersdk.ValidationError) {
 	filter.TitleQuery = parser.String(values, "", "title")
 	filter.PrTitleQuery = parser.String(values, "", "pr_title")
 	filter.RepoQuery = parser.String(values, "", "repo")
+	if source := parser.String(values, "", "source"); source != "" {
+		sourceFilter = ChatSourceFilter(source)
+		switch sourceFilter {
+		case ChatSourceFilterCreatedByMe:
+			filter.OwnedOnly = true
+		case ChatSourceFilterSharedWithMe:
+			filter.SharedOnly = true
+		case ChatSourceFilterAll:
+		default:
+			parser.Errors = append(parser.Errors, codersdk.ValidationError{
+				Field:  "source",
+				Detail: fmt.Sprintf("%q is not a valid value", source),
+			})
+		}
+	}
 
 	// pr: requires a positive integer.
 	if prStr := parser.String(values, "", "pr"); prStr != "" {
@@ -621,7 +647,7 @@ func Chats(query string) (database.GetChatsParams, []codersdk.ValidationError) {
 	}
 
 	parser.ErrorExcessParams(values)
-	return filter, parser.Errors
+	return filter, sourceFilter, parser.Errors
 }
 
 // validateDiffURL checks that the value is a syntactically valid HTTP(S)

diff --git a/coderd/searchquery/search_test.go b/coderd/searchquery/search_test.go
@@ -1519,7 +1519,7 @@ func TestSearchChats(t *testing.T) {
 		t.Run(c.Name, func(t *testing.T) {
 			t.Parallel()
 
-			values, errs := searchquery.Chats(c.Query)
+			values, _, errs := searchquery.Chats(c.Query)
 			if c.ExpectedErrorContains != "" {
 				require.True(t, len(errs) > 0, "expect some errors")
 				var s strings.Builder

diff --git a/codersdk/chats.go b/codersdk/chats.go
@@ -2036,9 +2036,18 @@ type UpdateChatACL struct {
 	GroupRoles map[string]ChatRole `json:"group_roles,omitempty"`
 }
 
+type ChatListScope string
+
+const (
+	ChatListScopeCreatedByMe  ChatListScope = "created_by_me"
+	ChatListScopeSharedWithMe ChatListScope = "shared_with_me"
+	ChatListScopeAll          ChatListScope = "all"
+)
+
 // ListChatsOptions are optional parameters for ListChats.
 type ListChatsOptions struct {
 	Query  string
+	Scope  ChatListScope
 	Labels map[string]string
 	Pagination
 }
@@ -2048,10 +2057,17 @@ func (c *ExperimentalClient) ListChats(ctx context.Context, opts *ListChatsOptio
 	var reqOpts []RequestOption
 	if opts != nil {
 		reqOpts = append(reqOpts, opts.Pagination.asRequestOption())
-		if opts.Query != "" {
+		query := opts.Query
+		if opts.Scope != "" {
+			if query != "" {
+				query += " "
+			}
+			query += "source:" + string(opts.Scope)
+		}
+		if query != "" {
 			reqOpts = append(reqOpts, func(r *http.Request) {
 				q := r.URL.Query()
-				q.Set("q", opts.Query)
+				q.Set("q", query)
 				r.URL.RawQuery = q.Encode()
 			})
 		}

diff --git a/docs/reference/api/chats.md b/docs/reference/api/chats.md
diff --git a/site/src/api/queries/chats.test.ts b/site/src/api/queries/chats.test.ts
@@ -1542,20 +1542,21 @@ describe("infiniteChats", () => {
 			});
 		});
 
-		it("builds q from archived, prStatuses, and chatStatus", async () => {
+		it("builds q from archived, prStatuses, chatStatus, and source", async () => {
 			vi.mocked(API.experimental.getChats).mockResolvedValue([]);
 			const { queryFn } = infiniteChats({
 				archived: true,
 				prStatuses: ["draft", "open", "merged"],
 				chatStatus: "unread",
+				source: "all",
 			});
 
 			await queryFn({ pageParam: 0 });
 
 			expect(API.experimental.getChats).toHaveBeenCalledWith({
 				limit: PAGE_LIMIT,
 				offset: 0,
-				q: "archived:true pr_status:draft,open,merged has_unread:true",
+				q: "archived:true pr_status:draft,open,merged has_unread:true source:all",
 			});
 		});
 

diff --git a/site/src/api/queries/chats.ts b/site/src/api/queries/chats.ts
@@ -29,18 +29,17 @@ export const chatACLKey = (chatId: string) => ["chats", chatId, "acl"] as const;
 
 export type ChatListPRStatusFilter = "draft" | "open" | "merged" | "closed";
 export type ChatListStatusFilter = "read" | "unread";
+type ChatListSourceFilter = "created_by_me" | "shared_with_me" | "all";
 
 type InfiniteChatsFilters = Readonly<{
 	archived?: boolean;
 	prStatuses?: readonly ChatListPRStatusFilter[];
 	chatStatus?: ChatListStatusFilter;
+	source?: ChatListSourceFilter;
 }>;
 
-export const infiniteChatsKey = (filters?: {
-	archived?: boolean;
-	prStatuses?: readonly ChatListPRStatusFilter[];
-	chatStatus?: ChatListStatusFilter;
-}) => [...chatsKey, filters] as const;
+export const infiniteChatsKey = (filters?: InfiniteChatsFilters) =>
+	[...chatsKey, filters] as const;
 
 export const CHAT_LIST_PR_STATUS_ORDER = [
 	"draft",
@@ -561,6 +560,9 @@ const getInfiniteChatsQueryString = (
 	if (filters?.chatStatus) {
 		qParts.push(`has_unread:${filters.chatStatus === "unread"}`);
 	}
+	if (filters?.source) {
+		qParts.push(`source:${filters.source}`);
+	}
 	return qParts.length > 0 ? qParts.join(" ") : undefined;
 };
 

diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
diff --git a/site/src/pages/AgentsPage/AgentCreatePage.tsx b/site/src/pages/AgentsPage/AgentCreatePage.tsx
@@ -1,6 +1,6 @@
 import { type FC, useState } from "react";
 import { useMutation, useQuery, useQueryClient } from "react-query";
-import { useNavigate } from "react-router";
+import { useLocation, useNavigate } from "react-router";
 import { toast } from "sonner";
 import { getErrorMessage } from "#/api/errors";
 import {
@@ -36,6 +36,7 @@ const lastModelConfigIDStorageKey = "agents.last-model-config-id";
 
 const AgentCreatePage: FC = () => {
 	const queryClient = useQueryClient();
+	const location = useLocation();
 	const navigate = useNavigate();
 	const { permissions } = useAuthenticated();
 
@@ -129,7 +130,10 @@ const AgentCreatePage: FC = () => {
 		if (model) {
 			localStorage.setItem(lastModelConfigIDStorageKey, model);
 		}
-		navigate(buildAgentChatPath({ chatId: createdChat.id }));
+		navigate({
+			pathname: buildAgentChatPath({ chatId: createdChat.id }),
+			search: location.search,
+		});
 	};
 
 	const rootPersonalModelOverride = personalModelOverridesQuery.data?.enabled

diff --git a/site/src/pages/AgentsPage/AgentsPage.tsx b/site/src/pages/AgentsPage/AgentsPage.tsx
@@ -149,11 +149,14 @@ const AgentsPage: FC = () => {
 		sidebarFilters.chatStatuses.length === 1
 			? sidebarFilters.chatStatuses[0]
 			: undefined;
+	const sourceFilter =
+		sidebarFilters.sources.length === 2 ? "all" : sidebarFilters.sources[0];
 	const chatsQuery = useInfiniteQuery(
 		infiniteChats({
 			archived: archivedFilter,
 			prStatuses: sidebarFilters.prStatuses,
 			chatStatus: chatStatusFilter,
+			source: sourceFilter,
 		}),
 	);
 	// Model queries are kept here for the sidebar, which displays

diff --git a/site/src/pages/AgentsPage/AgentsPageView.stories.tsx b/site/src/pages/AgentsPage/AgentsPageView.stories.tsx
@@ -56,6 +56,7 @@ const defaultSidebarFilters: AgentSidebarFilters = {
 	groupBy: "date",
 	prStatuses: [],
 	chatStatuses: ["unread", "read"],
+	sources: ["created_by_me"],
 };
 
 const defaultModelOptions: ModelSelectorOption[] = [