diff --git a/src/components/common.tsx b/src/components/common.tsx
index 2ef79cb..8fe22a9 100644
--- a/src/components/common.tsx
+++ b/src/components/common.tsx
@@ -1,6 +1,8 @@
 import clsx from 'clsx';
 import {
 	Ban,
+	ChevronLeft,
+	ChevronRight,
 	CircleDot,
 	GitMerge,
 	GitPullRequest,
@@ -8,6 +10,7 @@ import {
 	LoaderCircle,
 	UserRound,
 } from 'lucide-solid';
+import { A } from '@solidjs/router';
 import { Match, Show, Switch, createEffect, createMemo, createSignal, type Component } from 'solid-js';
 import { createQuery } from '@tanstack/solid-query';
 import { resolveAvatarUrl } from '../lib/api';
@@ -37,6 +40,104 @@ export const ToggleButton: Component<{
 	</button>
 );
 
+export const PaginationControls: Component<{
+	basePath?: string;
+	offset: number;
+	limit: number;
+	totalCount?: number;
+	hasNext?: boolean;
+	query?: Record<string, string | undefined>;
+	hrefForOffset?: (offset: number) => string;
+}> = (props) => {
+	const safeLimit = createMemo(() => Math.max(1, props.limit));
+	const hasExactTotal = createMemo(() => typeof props.totalCount === 'number');
+	const lastOffset = createMemo(() => Math.floor(Math.max((props.totalCount ?? 0) - 1, 0) / safeLimit()) * safeLimit());
+	const previousOffset = createMemo(() => Math.max(0, props.offset - safeLimit()));
+	const nextOffset = createMemo(() => props.offset + safeLimit());
+	const hasNextPage = createMemo(() =>
+		hasExactTotal() ? nextOffset() < (props.totalCount ?? 0) : Boolean(props.hasNext),
+	);
+	const pageNumber = (offset: number) => Math.floor(offset / safeLimit()) + 1;
+	const hrefForOffset = (offset: number) => {
+		if (props.hrefForOffset) {
+			return props.hrefForOffset(Math.max(0, offset));
+		}
+
+		const params = new URLSearchParams();
+
+		for (const [key, value] of Object.entries(props.query ?? {})) {
+			if (value) {
+				params.set(key, value);
+			}
+		}
+
+		params.set('offset', String(Math.max(0, offset)));
+		params.set('limit', String(safeLimit()));
+		return `${props.basePath ?? ''}?${params.toString()}`;
+	};
+	const showNextNumber = createMemo(() => hasExactTotal() ? nextOffset() < lastOffset() : hasNextPage());
+	const showGap = createMemo(() => hasExactTotal() && nextOffset() < (props.totalCount ?? 0) - safeLimit() * 2);
+
+	const linkClass = 'flex items-center gap-1 no-underline hover:no-underline dark:text-white text-sm';
+
+	return (
+		<Show when={props.offset > 0 || hasNextPage()}>
+			<div class="mt-4 flex items-center justify-center gap-5">
+				<Show
+					when={props.offset > 0}
+					fallback={
+						<span class={clsx(linkClass, 'cursor-not-allowed opacity-50')}>
+							<ChevronLeft class="size-4" />
+							prev
+						</span>
+					}
+				>
+					<A href={hrefForOffset(previousOffset())} class={linkClass}>
+						<ChevronLeft class="size-4" />
+						prev
+					</A>
+				</Show>
+
+				<Show when={props.offset > 0}>
+					<A href={hrefForOffset(0)}>1</A>
+				</Show>
+				<Show when={hasExactTotal() && previousOffset() > 0}>
+					<A href={hrefForOffset(previousOffset())}>{pageNumber(previousOffset())}</A>
+				</Show>
+
+				<span class="rounded-sm border border-gray-200 bg-white px-2 py-1 dark:border-gray-700 dark:bg-gray-800">
+					{pageNumber(props.offset)}
+				</span>
+
+				<Show when={showNextNumber()}>
+					<A href={hrefForOffset(nextOffset())}>{pageNumber(nextOffset())}</A>
+				</Show>
+				<Show when={showGap()}>
+					<span class="text-gray-400 dark:text-gray-500">--</span>
+				</Show>
+				<Show when={hasExactTotal() && props.offset < lastOffset()}>
+					<A href={hrefForOffset(lastOffset())}>{pageNumber(lastOffset())}</A>
+				</Show>
+
+				<Show
+					when={hasNextPage()}
+					fallback={
+						<span class={clsx(linkClass, 'cursor-not-allowed opacity-50')}>
+							next
+							<ChevronRight class="size-4" />
+						</span>
+					}
+				>
+					<A href={hrefForOffset(nextOffset())} class={linkClass}>
+						next
+						<ChevronRight class="size-4" />
+					</A>
+				</Show>
+			</div>
+		</Show>
+	);
+};
+
 export const LoadingState: Component<{ label: string }> = (props) => (
 	<div class="flex items-center justify-center gap-2 text-gray-500 dark:text-gray-400">
 		<LoaderCircle class="size-4 animate-spin" />
diff --git a/src/components/repo.tsx b/src/components/repo.tsx
index 595d264..b49c1f6 100644
--- a/src/components/repo.tsx
+++ b/src/components/repo.tsx
@@ -14,7 +14,6 @@ import {
 	PanelRightClose,
 	PanelRightOpen,
 	UnfoldVertical,
-	ChevronLeft,
 } from 'lucide-solid';
 import { marked } from 'marked';
 import { A } from '@solidjs/router';
@@ -55,97 +54,6 @@ export const RepoTabLink: Component<{
 	</A>
 );
 
-export const PaginationControls: Component<{
-	basePath: string;
-	offset: number;
-	limit: number;
-	totalCount?: number;
-	hasNext?: boolean;
-	query?: Record<string, string | undefined>;
-}> = (props) => {
-	const safeLimit = createMemo(() => Math.max(1, props.limit));
-	const hasExactTotal = createMemo(() => typeof props.totalCount === 'number');
-	const lastOffset = createMemo(() => Math.floor(Math.max((props.totalCount ?? 0) - 1, 0) / safeLimit()) * safeLimit());
-	const previousOffset = createMemo(() => Math.max(0, props.offset - safeLimit()));
-	const nextOffset = createMemo(() => props.offset + safeLimit());
-	const hasNextPage = createMemo(() =>
-		hasExactTotal() ? nextOffset() < (props.totalCount ?? 0) : Boolean(props.hasNext),
-	);
-	const pageNumber = (offset: number) => Math.floor(offset / safeLimit()) + 1;
-	const hrefForOffset = (offset: number) => {
-		const params = new URLSearchParams();
-
-		for (const [key, value] of Object.entries(props.query ?? {})) {
-			if (value) {
-				params.set(key, value);
-			}
-		}
-
-		params.set('offset', String(Math.max(0, offset)));
-		params.set('limit', String(safeLimit()));
-		return `${props.basePath}?${params.toString()}`;
-	};
-
-	const linkClass = 'flex items-center gap-1 no-underline hover:no-underline dark:text-white text-sm';
-
-	return (
-		<Show when={props.offset > 0 || hasNextPage()}>
-			<div class="mt-4 flex items-center justify-center gap-5">
-				<Show
-					when={props.offset > 0}
-					fallback={
-						<span class={clsx(linkClass, 'cursor-not-allowed opacity-50')}>
-							<ChevronLeft class="size-4" />
-							prev
-						</span>
-					}
-				>
-					<A href={hrefForOffset(previousOffset())} class={linkClass}>
-						<ChevronLeft class="size-4" />
-						prev
-					</A>
-				</Show>
-
-				<Show when={props.offset > 0}>
-					<A href={hrefForOffset(0)}>1</A>
-				</Show>
-				<Show when={hasExactTotal() && previousOffset() > 0}>
-					<A href={hrefForOffset(previousOffset())}>{pageNumber(previousOffset())}</A>
-				</Show>
-
-				<span class="rounded-sm border border-gray-200 bg-white px-2 py-1 dark:border-gray-700 dark:bg-gray-800">
-					{pageNumber(props.offset)}
-				</span>
-
-				<Show when={hasExactTotal() && nextOffset() < lastOffset()}>
-					<A href={hrefForOffset(nextOffset())}>{pageNumber(nextOffset())}</A>
-				</Show>
-				<Show when={hasExactTotal() && nextOffset() < (props.totalCount ?? 0) - safeLimit() * 2}>
-					<span class="text-gray-400 dark:text-gray-500">-</span>
-				</Show>
-				<Show when={hasExactTotal() && props.offset < lastOffset()}>
-					<A href={hrefForOffset(lastOffset())}>{pageNumber(lastOffset())}</A>
-				</Show>
-
-				<Show
-					when={hasNextPage()}
-					fallback={
-						<span class={clsx(linkClass, 'cursor-not-allowed opacity-50')}>
-							next
-							<ChevronRight class="size-4" />
-						</span>
-					}
-				>
-					<A href={hrefForOffset(nextOffset())} class={linkClass}>
-						next
-						<ChevronRight class="size-4" />
-					</A>
-				</Show>
-			</div>
-		</Show>
-	);
-};
-
 const skeletonRows = Array.from({ length: 7 });
 const listSkeletonRows = Array.from({ length: 10 });
 const skeletonCodeLines = Array.from({ length: 18 });
diff --git a/src/index.css b/src/index.css
index 4956181..8990c7a 100644
--- a/src/index.css
+++ b/src/index.css
@@ -914,6 +914,70 @@ details[open] > .untangled-language-bar {
 	min-height: 140px;
 }
 
+.untangled-topbar-search-box {
+	position: relative;
+	display: flex;
+	max-height: 30px;
+	width: 20rem;
+	align-items: center;
+	gap: 0.5rem;
+	border: 1px solid rgb(229 231 235);
+	border-radius: 0.25rem;
+	background: rgb(255 255 255);
+	padding: 1rem 0.375rem 1rem 0.5rem;
+}
+
+.untangled-topbar-search-box:focus-within {
+	z-index: 51;
+	outline: 2px solid rgb(209 213 219);
+	outline-offset: 1px;
+}
+
+.untangled-topbar-search-input {
+	min-width: 0;
+	flex: 1;
+	border: 0;
+	border-color: transparent;
+	border-radius: 0;
+	background: transparent;
+	padding: 0;
+	color: rgb(31 41 55);
+	font-size: 0.875rem;
+	line-height: 1.25rem;
+	outline: none;
+}
+
+.untangled-topbar-search-input:focus {
+	border: 0;
+	border-color: transparent;
+	box-shadow: none;
+	outline: none;
+}
+
+.untangled-topbar-search-input::placeholder {
+	color: rgb(156 163 175);
+}
+
+.untangled-topbar-search-kbd {
+	display: flex;
+	align-items: center;
+	border: 1px solid rgb(229 231 235);
+	border-bottom-width: 2px;
+	border-radius: 0.25rem;
+	padding: 0 0.25rem;
+	color: rgb(156 163 175);
+	font-family: inherit;
+	font-size: 0.75rem;
+	line-height: 1.25rem;
+	pointer-events: none;
+}
+
+.untangled-topbar-search-input:focus + .untangled-topbar-search-kbd,
+.untangled-topbar-search-box:focus-within .untangled-topbar-search-kbd,
+.untangled-topbar-search-input:not(:placeholder-shown) + .untangled-topbar-search-kbd {
+	display: none;
+}
+
 .untangled-file-row {
 	display: grid;
 	grid-template-columns: minmax(0, 2fr) minmax(0, 1fr);
@@ -939,6 +1003,160 @@ details[open] > .untangled-language-bar {
 	gap: 0.5rem;
 }
 
+.untangled-repo-filter-search {
+	position: relative;
+	display: flex;
+	min-width: 0;
+}
+
+.untangled-repo-filter-input {
+	min-width: 0;
+	flex: 1;
+	border: 1px solid rgb(209 213 219);
+	border-radius: 0.25rem 0 0 0.25rem;
+	background: rgb(255 255 255);
+	padding: 0.25rem 2.5rem 0.25rem 0.5rem;
+	color: rgb(17 24 39);
+	font-size: 0.875rem;
+	line-height: 1.5rem;
+	outline: none;
+}
+
+.untangled-repo-filter-input:focus {
+	border-color: rgb(156 163 175);
+	box-shadow: 0 0 0 1px rgb(156 163 175);
+	z-index: 1;
+}
+
+.untangled-repo-filter-input::placeholder {
+	color: rgb(156 163 175);
+}
+
+.untangled-repo-filter-reset {
+	position: absolute;
+	right: 2.75rem;
+	top: 50%;
+	display: none;
+	color: rgb(156 163 175);
+	transform: translateY(-50%);
+}
+
+.untangled-repo-filter-input:not(:placeholder-shown) + .untangled-repo-filter-reset {
+	display: block;
+}
+
+.untangled-repo-filter-reset:hover {
+	color: rgb(75 85 99);
+}
+
+.untangled-repo-filter-submit {
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	width: 2.5rem;
+	border: 1px solid rgb(209 213 219);
+	border-left: 0;
+	border-radius: 0 0.25rem 0.25rem 0;
+	background: rgb(255 255 255);
+	color: rgb(156 163 175);
+}
+
+.untangled-repo-filter-submit:hover {
+	color: rgb(31 41 55);
+}
+
+.untangled-search-grid {
+	display: grid;
+	grid-template-columns: minmax(0, 1fr);
+	gap: 1rem;
+}
+
+.untangled-search-main {
+	display: flex;
+	min-width: 0;
+	flex-direction: column;
+	gap: 1rem;
+}
+
+.untangled-search-sidebar {
+	display: none;
+}
+
+.untangled-search-page-input {
+	min-width: 0;
+	flex: 1;
+	border: 1px solid rgb(209 213 219);
+	border-radius: 0.25rem 0 0 0.25rem;
+	background: rgb(255 255 255);
+	margin-right: -1px;
+	padding: 0.25rem 2.5rem 0.25rem 0.5rem;
+	color: rgb(17 24 39);
+	outline: none;
+}
+
+.untangled-search-page-input::placeholder {
+	color: rgb(156 163 175);
+}
+
+.untangled-search-page-input:focus {
+	border-color: rgb(156 163 175);
+	box-shadow: 0 0 0 1px rgb(156 163 175);
+	z-index: 1;
+}
+
+.untangled-search-page-submit {
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	border: 1px solid rgb(209 213 219);
+	border-radius: 0 0.25rem 0.25rem 0;
+	padding: 0.5rem;
+	background: rgb(255 255 255);
+	color: rgb(156 163 175);
+}
+
+.untangled-search-page-submit:hover {
+	color: rgb(75 85 99);
+}
+
+.untangled-search-type-dot {
+	width: 0.5rem;
+	height: 0.5rem;
+	flex-shrink: 0;
+	border-radius: 9999px;
+	background: radial-gradient(circle at 35% 35%, rgb(156 163 175), rgb(107 114 128) 30%, rgb(75 85 99));
+}
+
+.untangled-search-description {
+	display: -webkit-box;
+	overflow: hidden;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+}
+
+@media (min-width: 1024px) {
+	.untangled-topbar-search-box {
+		width: 24rem;
+	}
+}
+
+@media (min-width: 768px) {
+	.untangled-search-grid {
+		grid-template-columns: repeat(4, minmax(0, 1fr));
+	}
+
+	.untangled-search-main {
+		grid-column: span 3 / span 3;
+	}
+
+	.untangled-search-sidebar {
+		position: sticky;
+		top: 0.5rem;
+		display: block;
+		align-self: start;
+	}
+}
+
 .untangled-repo-actions {
 	display: grid;
 	grid-template-columns: repeat(2, minmax(0, 1fr));
@@ -1601,6 +1819,54 @@ details[open] > .untangled-language-bar {
 		background: rgb(31 41 55);
 	}
 
+	.untangled-topbar-search-box,
+	.untangled-search-page-input,
+	.untangled-search-page-submit,
+	.untangled-repo-filter-input,
+	.untangled-repo-filter-submit {
+		border-color: rgb(55 65 81);
+		background: rgb(17 24 39);
+	}
+
+	.untangled-topbar-search-box:focus-within {
+		outline-color: rgb(75 85 99);
+	}
+
+	.untangled-topbar-search-input,
+	.untangled-search-page-input,
+	.untangled-repo-filter-input {
+		color: rgb(229 231 235);
+	}
+
+	.untangled-topbar-search-input::placeholder,
+	.untangled-search-page-input::placeholder,
+	.untangled-repo-filter-input::placeholder {
+		color: rgb(75 85 99);
+	}
+
+	.untangled-topbar-search-kbd {
+		border-color: rgb(75 85 99);
+		color: rgb(107 114 128);
+	}
+
+	.untangled-search-page-input:focus,
+	.untangled-repo-filter-input:focus {
+		border-color: rgb(75 85 99);
+		box-shadow: 0 0 0 1px rgb(75 85 99);
+	}
+
+	.untangled-search-page-submit,
+	.untangled-repo-filter-reset,
+	.untangled-repo-filter-submit {
+		color: rgb(156 163 175);
+	}
+
+	.untangled-search-page-submit:hover,
+	.untangled-repo-filter-reset:hover,
+	.untangled-repo-filter-submit:hover {
+		color: rgb(229 231 235);
+	}
+
 	.untangled-blob-commit-panel {
 		border-bottom-color: rgb(55 65 81);
 	}
@@ -1618,6 +1884,10 @@ details[open] > .untangled-language-bar {
 		grid-template-columns: minmax(0, 1fr);
 	}
 
+	.untangled-repo-filter-search {
+		grid-row: 1;
+	}
+
 	.untangled-file-row {
 		grid-template-columns: minmax(0, 1fr);
 		gap: 0.125rem;
diff --git a/src/layout.tsx b/src/layout.tsx
index 8419317..1cccc94 100644
--- a/src/layout.tsx
+++ b/src/layout.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
-import { Bell, LogOut, RotateCcw, Save, Settings } from 'lucide-solid';
-import { A } from '@solidjs/router';
+import { Bell, LogOut, RotateCcw, Save, Search, Settings } from 'lucide-solid';
+import { A, useLocation, useNavigate } from '@solidjs/router';
 import { createQuery, useQueryClient } from '@tanstack/solid-query';
 import { For, Show, createEffect, createSignal, onCleanup, onMount, type Component, type JSX } from 'solid-js';
 
@@ -242,6 +242,43 @@ const UserProfileMenu: Component = () => {
 	);
 };
 
+const TopbarSearch: Component = () => {
+	const navigate = useNavigate();
+	const location = useLocation();
+	const [query, setQuery] = createSignal('');
+
+	createEffect(() => {
+		if (location.pathname !== '/search') {
+			setQuery('');
+			return;
+		}
+
+		const params = new URLSearchParams(location.search);
+		setQuery(params.get('q') ?? '');
+	});
+
+	const onSubmit = (event: SubmitEvent) => {
+		event.preventDefault();
+		const trimmed = query().trim();
+		navigate(trimmed ? `/search?q=${encodeURIComponent(trimmed)}` : '/search');
+	};
+
+	return (
+		<form onSubmit={onSubmit} class="relative hidden md:block">
+			<div class="untangled-topbar-search-box">
+				<Search class="size-4 shrink-0 text-gray-400" />
+				<input
+					value={query()}
+					onInput={(event) => setQuery(event.currentTarget.value)}
+					placeholder="search..."
+					class="untangled-topbar-search-input"
+				/>
+				<kbd class="untangled-topbar-search-kbd">/</kbd>
+			</div>
+		</form>
+	);
+};
+
 const Topbar: Component = () => {
 	const auth = useAuth();
 	let topbar: HTMLElement | undefined;
@@ -265,14 +302,18 @@ const Topbar: Component = () => {
 
 	return (
 		<nav ref={(element) => { topbar = element; }} class="mx-auto space-x-4 px-6 py-2">
-			<div class="flex justify-between p-0 items-center">
-				<A href="/" class="text-2xl no-underline hover:no-underline flex items-center gap-2">
+			<div class="flex justify-between gap-4 p-0 items-center">
+				<A href="/" class="text-2xl no-underline hover:no-underline flex shrink-0 items-center gap-2">
 					<img src="/static/logos/dolly.svg" alt="" class="size-8" />
 					<span class="font-bold text-xl">untangled</span>
 					<span class="font-normal text-xs rounded bg-gray-100 dark:bg-gray-700 px-1">alpha</span>
 				</A>
 
-				<div class="flex items-center gap-4">
+				<div class="flex shrink-0 items-center gap-4">
+					<TopbarSearch />
+					<A href="/search" class="md:hidden text-gray-500 dark:text-gray-400" title="Search">
+						<Search class="size-5" />
+					</A>
 					<AppSettingsMenu />
 					<Show
 						when={auth.currentDid()}
diff --git a/src/lib/api.ts b/src/lib/api.ts
index 07df569..3090113 100644
--- a/src/lib/api.ts
+++ b/src/lib/api.ts
@@ -24,6 +24,7 @@ export {
 	getRepo,
 	getRepoBlob,
 	getRepoBranches,
+	getRepoByDid,
 	getRepoDefaultBranch,
 	getRepoLanguages,
 	getRepoLog,
@@ -41,6 +42,7 @@ export {
 	createIssue,
 	createIssueComment,
 	getIssue,
+	getIssueRecord,
 	listIssues,
 	listIssuesPage,
 	setIssueState,
@@ -50,10 +52,14 @@ export {
 	createPullComment,
 	fetchPullRoundPatch,
 	getPull,
+	getPullRecord,
 	listPulls,
 	listPullsPage,
 	setPullStatus,
 } from './api/pulls';
+export {
+	searchRecords,
+} from './api/search';
 
 export type {
 	HydratedRecord,
@@ -91,3 +97,10 @@ export type {
 	PullDetail,
 	PullSummary,
 } from './api/pulls';
+export type {
+	SearchCollection,
+	SearchHit,
+	SearchRecordValue,
+	SearchRecordsOptions,
+	SearchResponse,
+} from './api/search';
diff --git a/src/lib/api/core.ts b/src/lib/api/core.ts
index 1fd8c15..c61791e 100644
--- a/src/lib/api/core.ts
+++ b/src/lib/api/core.ts
@@ -16,6 +16,7 @@ import type { OAuthUserAgent } from '@atcute/oauth-browser-client';
 import {
 	ShTangledActorProfile,
 	ShTangledFeedStar,
+	ShTangledLabelDefinition,
 	ShTangledRepo,
 	ShTangledRepoIssue,
 	ShTangledRepoIssueComment,
@@ -23,6 +24,7 @@ import {
 	ShTangledRepoPull,
 	ShTangledRepoPullComment,
 	ShTangledRepoPullStatus,
+	ShTangledString,
 } from '@atcute/tangled';
 import { gunzipSync, gzipSync, strFromU8, strToU8 } from 'fflate';
 
@@ -132,6 +134,14 @@ type StatefulHydratedRecord<T, State extends string> = HydratedRecord<T> & {
 	state: State;
 };
 
+type StatefulPageOptions<State extends string> = {
+	offset: number;
+	limit: number;
+	state: State;
+	author?: Did;
+	query?: string;
+};
+
 export interface IssueComment extends HydratedRecord<ShTangledRepoIssueComment.Main> {}
 export interface PullComment extends HydratedRecord<ShTangledRepoPullComment.Main> {}
 
@@ -145,6 +155,47 @@ export interface PullDetail {
 	comments: PullComment[];
 }
 
+export type SearchCollection =
+	| 'sh.tangled.actor.profile'
+	| 'sh.tangled.repo'
+	| 'sh.tangled.repo.issue'
+	| 'sh.tangled.repo.issue.comment'
+	| 'sh.tangled.repo.pull'
+	| 'sh.tangled.repo.pull.comment'
+	| 'sh.tangled.string'
+	| 'sh.tangled.label.definition';
+
+export type SearchRecordValue =
+	| ShTangledActorProfile.Main
+	| ShTangledRepo.Main
+	| ShTangledRepoIssue.Main
+	| ShTangledRepoIssueComment.Main
+	| ShTangledRepoPull.Main
+	| ShTangledRepoPullComment.Main
+	| ShTangledString.Main
+	| ShTangledLabelDefinition.Main;
+
+export interface SearchHit extends HydratedRecord<SearchRecordValue> {
+	nsid: SearchCollection;
+	score: number;
+}
+
+export interface SearchResponse {
+	hits: SearchHit[];
+	cursor?: string;
+}
+
+export interface SearchRecordsOptions {
+	q: string;
+	nsid?: SearchCollection;
+	author?: Did;
+	repo?: Did;
+	since?: string;
+	until?: string;
+	cursor?: string;
+	limit?: number;
+}
+
 export interface PaginatedResult<T> {
 	items: T[];
 	totalCount?: number;
@@ -358,6 +409,16 @@ interface AppviewStatefulListResponse<T> {
 	cursor?: string | null;
 }
 
+interface AppviewSearchHit<T> extends AppviewRecordView<T> {
+	nsid: SearchCollection;
+	score: number;
+}
+
+interface AppviewSearchResponse<T> {
+	hits: Array<AppviewSearchHit<T>>;
+	cursor?: string | null;
+}
+
 interface AppviewCountResponse {
 	count: number;
 	distinctAuthors?: number;
@@ -445,11 +506,15 @@ const sortStatefulRecordsByUpdatedAt = async <T, State extends string>(
 
 const paginateStatefulRecords = <T, State extends string>(
 	items: Array<StatefulHydratedRecord<T, State>>,
-	options: { offset: number; limit: number; state: State },
+	options: StatefulPageOptions<State>,
 ): PaginatedResult<StatefulHydratedRecord<T, State>> => {
 	const offset = Math.max(options.offset, 0);
 	const limit = Math.max(options.limit, 1);
-	const matching = items.filter((item) => item.state === options.state);
+	const matching = items.filter((item) =>
+		item.state === options.state &&
+		(!options.author || item.author.did === options.author) &&
+		statefulRecordMatchesQuery(item.value, options.query),
+	);
 
 	return {
 		items: matching.slice(offset, offset + limit),
@@ -458,6 +523,18 @@ const paginateStatefulRecords = <T, State extends string>(
 	};
 };
 
+const statefulRecordMatchesQuery = (value: unknown, query?: string): boolean => {
+	const normalized = query?.trim().toLowerCase();
+	if (!normalized) {
+		return true;
+	}
+
+	const record = value as { title?: unknown; body?: unknown };
+	return [record.title, record.body]
+		.filter((part): part is string => typeof part === 'string')
+		.some((part) => part.toLowerCase().includes(normalized));
+};
+
 const normalizeServiceUrl = (input: string): string => {
 	if (input.startsWith('http://') || input.startsWith('https://')) {
 		return input;
@@ -691,7 +768,7 @@ const getNearestAppviewCursorCheckpoint = (
 const listAppviewStatefulRecordsPage = async <T extends { createdAt?: string }, State extends string>(
 	nsid: string,
 	subject: string,
-	options: { offset: number; limit: number; state: State },
+	options: StatefulPageOptions<State>,
 	normalizeState: (value?: string) => State,
 	extraParams: Record<string, AppviewParamValue> = {},
 	getUpdatedAt?: (
@@ -783,6 +860,10 @@ const listAppviewStatefulRecordsPage = async <T extends { createdAt?: string },
 				continue;
 			}
 
+			if (!statefulRecordMatchesQuery(record.value, options.query)) {
+				continue;
+			}
+
 			if (matchingSeen >= offset && matchingSeen < requestedEnd) {
 				pendingItems.push({ record, number, state });
 			}
@@ -1082,6 +1163,83 @@ export const getRepo = async (ownerIdentifier: string, repoSlug: string): Promis
 	};
 };
 
+export const getRepoByDid = async (repoDid: Did): Promise<RepoContext> => {
+	const record = await appviewJson<AppviewRecordView<ShTangledRepo.Main>>(
+		'sh.tangled.repo.getRepoByRepoDid',
+		{ repoDid },
+	);
+	const parsed = parseAtUri(record.uri);
+	const owner = await resolveActor(parsed.did);
+	const slug = record.value.name?.trim() || parsed.rkey;
+
+	if (!record.value.repoDid) {
+		throw new Error(`Repository is missing repoDid metadata`);
+	}
+
+	return {
+		owner,
+		record: {
+			uri: record.uri,
+			cid: record.cid ?? '',
+			rkey: parsed.rkey,
+			value: record.value,
+		},
+		repoDid: record.value.repoDid,
+		slug,
+		rkey: parsed.rkey,
+		knot: normalizeServiceUrl(record.value.knot),
+	};
+};
+
+export const searchRecords = async (options: SearchRecordsOptions): Promise<SearchResponse> => {
+	const q = options.q.trim();
+	if (!q) {
+		return { hits: [] };
+	}
+
+	const response = await appviewJson<AppviewSearchResponse<SearchRecordValue>>(
+		'sh.tangled.search.query',
+		{
+			q,
+			nsid: options.nsid,
+			author: options.author,
+			repo: options.repo,
+			since: options.since,
+			until: options.until,
+			cursor: options.cursor,
+			limit: options.limit,
+		},
+	);
+	const hits = await Promise.all(
+		response.hits.map(async (hit) => ({
+			...(await appviewRecordToHydrated(hit)),
+			nsid: hit.nsid,
+			score: hit.score,
+		})),
+	);
+
+	return {
+		hits,
+		cursor: response.cursor ?? undefined,
+	};
+};
+
+export const getIssueRecord = async (issueUri: ResourceUri): Promise<HydratedRecord<ShTangledRepoIssue.Main>> => {
+	const record = await appviewJson<AppviewRecordView<ShTangledRepoIssue.Main>>(
+		'sh.tangled.repo.getIssue',
+		{ issue: issueUri },
+	);
+	return appviewRecordToHydrated(record);
+};
+
+export const getPullRecord = async (pullUri: ResourceUri): Promise<HydratedRecord<ShTangledRepoPull.Main>> => {
+	const record = await appviewJson<AppviewRecordView<ShTangledRepoPull.Main>>(
+		'sh.tangled.repo.getPull',
+		{ pull: pullUri },
+	);
+	return appviewRecordToHydrated(record);
+};
+
 const getRepoTreeFromKnot = async (
 	repo: RepoContext,
 	ref: string,
@@ -1504,7 +1662,7 @@ const BACKLINK_BATCH_LIMIT = 50;
 const listBacklinkedRecordsPage = async <T extends { createdAt?: string }, State extends string>(
 	subject: GenericUri,
 	source: string | string[],
-	options: { offset: number; limit: number; state: State },
+	options: StatefulPageOptions<State>,
 	getState: (uri: ResourceUri) => Promise<State>,
 	getUpdatedAt?: (record: StatefulHydratedRecord<T, State>) => Promise<number>,
 ): Promise<PaginatedResult<StatefulHydratedRecord<T, State>>> => {
@@ -1590,6 +1748,10 @@ const listBacklinkedRecordsPage = async <T extends { createdAt?: string }, State
 				continue;
 			}
 
+			if (!statefulRecordMatchesQuery(record.value, options.query)) {
+				continue;
+			}
+
 			if (matchingSeen >= options.offset && matchingSeen < requestedEnd + 1) {
 				items.push({ ...record, number, state });
 			}
@@ -1678,7 +1840,7 @@ const listIssuesFromBacklinks = async (repo: RepoContext): Promise<IssueSummary[
 
 const listIssuesPageFromBacklinks = async (
 	repo: RepoContext,
-	options: { offset: number; limit: number; state: 'open' | 'closed' },
+	options: StatefulPageOptions<'open' | 'closed'>,
 ): Promise<PaginatedResult<IssueSummary>> =>
 	listBacklinkedRecordsPage<ShTangledRepoIssue.Main, 'open' | 'closed'>(
 		repo.repoDid,
@@ -1723,7 +1885,7 @@ const listPullsFromBacklinks = async (repo: RepoContext): Promise<PullSummary[]>
 
 const listPullsPageFromBacklinks = async (
 	repo: RepoContext,
-	options: { offset: number; limit: number; state: 'open' | 'closed' | 'merged' },
+	options: StatefulPageOptions<'open' | 'closed' | 'merged'>,
 ): Promise<PaginatedResult<PullSummary>> =>
 	listBacklinkedRecordsPage<ShTangledRepoPull.Main, 'open' | 'closed' | 'merged'>(
 		repo.repoDid,
@@ -1794,14 +1956,14 @@ const listIssuesFromAppview = async (repo: RepoContext): Promise<IssueSummary[]>
 
 const listIssuesPageFromAppview = async (
 	repo: RepoContext,
-	options: { offset: number; limit: number; state: 'open' | 'closed' },
+	options: StatefulPageOptions<'open' | 'closed'>,
 ): Promise<PaginatedResult<IssueSummary>> =>
 	listAppviewStatefulRecordsPage<ShTangledRepoIssue.Main, 'open' | 'closed'>(
 		'sh.tangled.repo.listIssues',
 		repo.repoDid,
 		options,
 		normalizeIssueState,
-		{},
+		options.author ? { author: options.author } : {},
 		(issue, record) => getIssueUpdatedAt(issue, record.stateUpdatedAt),
 	);
 
@@ -1842,14 +2004,14 @@ const listPullsFromAppview = async (repo: RepoContext): Promise<PullSummary[]> =
 
 const listPullsPageFromAppview = async (
 	repo: RepoContext,
-	options: { offset: number; limit: number; state: 'open' | 'closed' | 'merged' },
+	options: StatefulPageOptions<'open' | 'closed' | 'merged'>,
 ): Promise<PaginatedResult<PullSummary>> =>
 	listAppviewStatefulRecordsPage<ShTangledRepoPull.Main, 'open' | 'closed' | 'merged'>(
 		'sh.tangled.repo.listPulls',
 		repo.repoDid,
 		options,
 		normalizePullStatus,
-		{},
+		options.author ? { author: options.author } : {},
 		(pull, record) => getPullUpdatedAt(pull, record.stateUpdatedAt),
 	);
 
@@ -1874,7 +2036,7 @@ export const listIssues = async (repo: RepoContext): Promise<IssueSummary[]> =>
 
 export const listIssuesPage = async (
 	repo: RepoContext,
-	options: { offset: number; limit: number; state: 'open' | 'closed' },
+	options: StatefulPageOptions<'open' | 'closed'>,
 ): Promise<PaginatedResult<IssueSummary>> =>
 	appviewFallback(
 		() => listIssuesPageFromAppview(repo, options),
@@ -1895,7 +2057,7 @@ export const listPulls = async (repo: RepoContext): Promise<PullSummary[]> =>
 
 export const listPullsPage = async (
 	repo: RepoContext,
-	options: { offset: number; limit: number; state: 'open' | 'closed' | 'merged' },
+	options: StatefulPageOptions<'open' | 'closed' | 'merged'>,
 ): Promise<PaginatedResult<PullSummary>> =>
 	appviewFallback(
 		() => listPullsPageFromAppview(repo, options),
diff --git a/src/lib/api/issues.ts b/src/lib/api/issues.ts
index fc57fcd..5dfd6c1 100644
--- a/src/lib/api/issues.ts
+++ b/src/lib/api/issues.ts
@@ -2,6 +2,7 @@ export {
 	createIssue,
 	createIssueComment,
 	getIssue,
+	getIssueRecord,
 	listIssues,
 	listIssuesPage,
 	setIssueState,
diff --git a/src/lib/api/pulls.ts b/src/lib/api/pulls.ts
index fa72126..44a872c 100644
--- a/src/lib/api/pulls.ts
+++ b/src/lib/api/pulls.ts
@@ -3,6 +3,7 @@ export {
 	createPullComment,
 	fetchPullRoundPatch,
 	getPull,
+	getPullRecord,
 	listPulls,
 	listPullsPage,
 	setPullStatus,
diff --git a/src/lib/api/repos.ts b/src/lib/api/repos.ts
index 9d0413f..669ec18 100644
--- a/src/lib/api/repos.ts
+++ b/src/lib/api/repos.ts
@@ -6,6 +6,7 @@ export {
 	getRepoBlob,
 	getRepoBranches,
 	getRepoDefaultBranch,
+	getRepoByDid,
 	getRepoLanguages,
 	getRepoLog,
 	getRepoTags,
diff --git a/src/lib/api/search.ts b/src/lib/api/search.ts
new file mode 100644
index 0000000..e42e39b
--- /dev/null
+++ b/src/lib/api/search.ts
@@ -0,0 +1,11 @@
+export {
+	searchRecords,
+} from './core';
+
+export type {
+	SearchCollection,
+	SearchHit,
+	SearchRecordValue,
+	SearchRecordsOptions,
+	SearchResponse,
+} from './core';
diff --git a/src/pages/repo/issues-helpers.ts b/src/pages/repo/issues-helpers.ts
index 905d082..949408a 100644
--- a/src/pages/repo/issues-helpers.ts
+++ b/src/pages/repo/issues-helpers.ts
@@ -1,4 +1,57 @@
 import type { IssueComment } from '../../lib/api';
+import type { SearchParamValue } from '../../lib/repo-utils';
+
+export type IssueStateFilter = 'open' | 'closed';
+
+export interface IssueFilter {
+	state: IssueStateFilter;
+	author?: string;
+	query?: string;
+}
+
+const searchParamString = (value: SearchParamValue): string => Array.isArray(value) ? value[0] ?? '' : value ?? '';
+
+export const parseIssueFilter = (value: SearchParamValue): IssueFilter => {
+	const filter: IssueFilter = { state: 'open' };
+	const tokens = searchParamString(value).split(/\s+/).filter(Boolean);
+	const queryTokens: string[] = [];
+
+	for (const token of tokens) {
+		if (token === 'state:closed') {
+			filter.state = 'closed';
+			continue;
+		}
+
+		if (token === 'state:open') {
+			filter.state = 'open';
+			continue;
+		}
+
+		if (token.startsWith('author:')) {
+			const author = token.slice('author:'.length).trim();
+			if (author) {
+				filter.author = author;
+			}
+			continue;
+		}
+
+		queryTokens.push(token);
+	}
+
+	const query = queryTokens.join(' ').trim();
+	if (query) {
+		filter.query = query;
+	}
+
+	return filter;
+};
+
+export const buildIssueFilterQuery = (filter: IssueFilter): string =>
+	[
+		filter.query,
+		`state:${filter.state}`,
+		filter.author ? `author:${filter.author}` : undefined,
+	].filter(Boolean).join(' ');
 
 export type IssueCommentThread = {
 	item: IssueComment;
diff --git a/src/pages/repo/issues.tsx b/src/pages/repo/issues.tsx
index ff147e7..3a4ea71 100644
--- a/src/pages/repo/issues.tsx
+++ b/src/pages/repo/issues.tsx
@@ -3,30 +3,52 @@ import { Ban, CirclePlus, Copy, ExternalLink, LoaderCircle, MessageSquarePlus, P
 import { A, useNavigate, useParams, useSearchParams } from '@solidjs/router';
 import { createQuery, useQueryClient } from '@tanstack/solid-query';
 import type { ResourceUri } from '@atcute/lexicons/syntax';
-import { For, Match, Show, Switch, createMemo, createSignal, type Component } from 'solid-js';
+import { For, Match, Show, Switch, createEffect, createMemo, createSignal, type Component } from 'solid-js';
 import { createIssue, createIssueComment, getIssue, listIssuesPage, parseAtUri, resolveActor, setIssueState, type RepoContext } from '../../lib/api';
 import { useAuth } from '../../lib/auth';
-import { Avatar, ErrorState, StateBadge, ToggleButton, buttonStyles, cardStyles, inputStyles, textareaStyles } from '../../components/common';
-import { MarkdownBlock, PaginationControls, RepoListSkeleton, RepoThreadSkeleton } from '../../components/repo';
+import { Avatar, ErrorState, PaginationControls, StateBadge, ToggleButton, buttonStyles, cardStyles, inputStyles, textareaStyles } from '../../components/common';
+import { MarkdownBlock, RepoListSkeleton, RepoThreadSkeleton } from '../../components/repo';
 import { RepoFrame, issueQueryKey, issuesQueryKey, useRepoQuery } from './shared';
 import { REPO_LIST_PAGE_LIMIT, formatRelativeTime, getErrorMessage, issueHref, parseIntegerSearchParam, uniqueCommenters } from '../../lib/repo-utils';
-import { buildIssueCommentThreads } from './issues-helpers';
+import { buildIssueCommentThreads, buildIssueFilterQuery, parseIssueFilter } from './issues-helpers';
 
 export const IssuesPage: Component = () => {
 	const auth = useAuth();
 	const repoQuery = useRepoQuery();
 	const [searchParams, setSearchParams] = useSearchParams();
-	const stateFilter = createMemo<'open' | 'closed'>(() => (searchParams.q === 'state:closed' ? 'closed' : 'open'));
-	const filterQuery = createMemo(() => `state:${stateFilter()}`);
+	const filter = createMemo(() => parseIssueFilter(searchParams.q));
+	const stateFilter = createMemo(() => filter().state);
+	const authorFilter = createMemo(() => filter().author);
+	const textFilter = createMemo(() => filter().query);
+	const filterQuery = createMemo(() => buildIssueFilterQuery(filter()));
+	const [filterDraft, setFilterDraft] = createSignal(filterQuery());
 	const pageOffset = createMemo(() => parseIntegerSearchParam(searchParams.offset, 0, 0));
 	const pageLimit = createMemo(() => parseIntegerSearchParam(searchParams.limit, REPO_LIST_PAGE_LIMIT, 1));
 	const basePath = createMemo(() => {
 		const repo = repoQuery.data;
 		return repo ? `/${repo.owner.handle}/${repo.slug}/issues` : '/';
 	});
+	createEffect(() => {
+		setFilterDraft(filterQuery());
+	});
 	const setStateFilter = (state: 'open' | 'closed') => {
 		setSearchParams({
-			q: `state:${state}`,
+			q: buildIssueFilterQuery({ ...filter(), state }),
+			offset: '0',
+			limit: String(pageLimit()),
+		});
+	};
+	const applyFilter = (event: SubmitEvent) => {
+		event.preventDefault();
+		setSearchParams({
+			q: buildIssueFilterQuery(parseIssueFilter(filterDraft())),
+			offset: '0',
+			limit: String(pageLimit()),
+		});
+	};
+	const resetFilter = () => {
+		setSearchParams({
+			q: 'state:open',
 			offset: '0',
 			limit: String(pageLimit()),
 		});
@@ -35,14 +57,18 @@ export const IssuesPage: Component = () => {
 	const issuesQuery = createQuery(() => {
 		const repo = repoQuery.data;
 		return {
-			queryKey: [...issuesQueryKey(repo?.repoDid ?? ''), stateFilter(), pageOffset(), pageLimit()],
+			queryKey: [...issuesQueryKey(repo?.repoDid ?? ''), stateFilter(), authorFilter(), textFilter(), pageOffset(), pageLimit()],
 			enabled: Boolean(repo),
-			queryFn: async () =>
-				listIssuesPage(repo!, {
+			queryFn: async () => {
+				const author = authorFilter() ? (await resolveActor(authorFilter()!)).did : undefined;
+				return listIssuesPage(repo!, {
 					state: stateFilter(),
+					author,
+					query: textFilter(),
 					offset: pageOffset(),
 					limit: pageLimit(),
-				}),
+				});
+			},
 		};
 	});
 
@@ -72,11 +98,20 @@ export const IssuesPage: Component = () => {
 						/>
 					</div>
 
-					<div class="hidden min-w-0 items-center rounded border border-gray-300 px-3 text-gray-500 dark:border-gray-700 md:flex">
-						state:{stateFilter()}
-						<span class="ml-auto">×</span>
-						<Search class="ml-3 size-4" />
-					</div>
+					<form onSubmit={applyFilter} class="untangled-repo-filter-search">
+						<input
+							value={filterDraft()}
+							onInput={(event) => setFilterDraft(event.currentTarget.value)}
+							placeholder="search issues..."
+							class="untangled-repo-filter-input"
+						/>
+						<button type="button" class="untangled-repo-filter-reset" aria-label="reset filters" onClick={resetFilter}>
+							<X class="size-4" />
+						</button>
+						<button type="submit" class="untangled-repo-filter-submit" aria-label="apply filters">
+							<Search class="size-4" />
+						</button>
+					</form>
 
 					<Show when={auth.agent() && repoQuery.data}>
 						<A
@@ -109,7 +144,11 @@ export const IssuesPage: Component = () => {
 							when={paginated().length > 0}
 							fallback={
 								<div class={cardStyles('px-6 py-4 text-sm text-gray-500 dark:text-gray-400')}>
-									{stateFilter() === 'open' ? 'No open issues.' : 'No closed issues.'}
+									{stateFilter() === 'open' ? 'No open issues' : 'No closed issues'}
+									<Show when={authorFilter()}>
+										{' '}by {authorFilter()}
+									</Show>
+									.
 								</div>
 							}
 						>
diff --git a/src/pages/repo/pulls-helpers.ts b/src/pages/repo/pulls-helpers.ts
index 00cd38d..52daa2b 100644
--- a/src/pages/repo/pulls-helpers.ts
+++ b/src/pages/repo/pulls-helpers.ts
@@ -3,18 +3,63 @@ import type { SearchParamValue } from '../../lib/repo-utils';
 export type PullStateFilter = 'open' | 'closed' | 'merged';
 export type PullSourceMode = 'branch' | 'patch';
 
-export const parsePullStateFilter = (value: SearchParamValue): PullStateFilter => {
-	if (value === 'state:closed') {
-		return 'closed';
+export interface PullFilter {
+	state: PullStateFilter;
+	author?: string;
+	query?: string;
+}
+
+const searchParamString = (value: SearchParamValue): string => Array.isArray(value) ? value[0] ?? '' : value ?? '';
+
+export const parsePullFilter = (value: SearchParamValue): PullFilter => {
+	const filter: PullFilter = { state: 'open' };
+	const tokens = searchParamString(value).split(/\s+/).filter(Boolean);
+	const queryTokens: string[] = [];
+
+	for (const token of tokens) {
+		if (token === 'state:closed') {
+			filter.state = 'closed';
+			continue;
+		}
+
+		if (token === 'state:merged') {
+			filter.state = 'merged';
+			continue;
+		}
+
+		if (token === 'state:open') {
+			filter.state = 'open';
+			continue;
+		}
+
+		if (token.startsWith('author:')) {
+			const author = token.slice('author:'.length).trim();
+			if (author) {
+				filter.author = author;
+			}
+			continue;
+		}
+
+		queryTokens.push(token);
 	}
 
-	if (value === 'state:merged') {
-		return 'merged';
+	const query = queryTokens.join(' ').trim();
+	if (query) {
+		filter.query = query;
 	}
 
-	return 'open';
+	return filter;
 };
 
+export const parsePullStateFilter = (value: SearchParamValue): PullStateFilter => parsePullFilter(value).state;
+
+export const buildPullFilterQuery = (filter: PullFilter): string =>
+	[
+		filter.query,
+		`state:${filter.state}`,
+		filter.author ? `author:${filter.author}` : undefined,
+	].filter(Boolean).join(' ');
+
 export const parsePastedPatchPrefill = (patch: string): { title: string; body: string } => {
 	const subject = /^Subject:\s*(?:\[[^\]]+\]\s*)?(.*)$/im.exec(patch)?.[1]?.trim() ?? '';
 	const headerEnd = patch.indexOf('\n---');
diff --git a/src/pages/repo/pulls.tsx b/src/pages/repo/pulls.tsx
index 663732b..b7fd6d4 100644
--- a/src/pages/repo/pulls.tsx
+++ b/src/pages/repo/pulls.tsx
@@ -12,33 +12,56 @@ import {
 	MessageSquare,
 	Pencil,
 	Search,
+	X,
 } from 'lucide-solid';
 import { A, useNavigate, useParams, useSearchParams } from '@solidjs/router';
 import { createQuery, useQueryClient } from '@tanstack/solid-query';
 import { For, Match, Show, Switch, createEffect, createMemo, createSignal, type Component, type JSX } from 'solid-js';
-import { compareBranches, createPull, createPullComment, fetchPullRoundPatch, getPull, getRepoBranches, listPullsPage, parseAtUri, setPullStatus, type RepoContext } from '../../lib/api';
+import { compareBranches, createPull, createPullComment, fetchPullRoundPatch, getPull, getRepoBranches, listPullsPage, parseAtUri, resolveActor, setPullStatus, type RepoContext } from '../../lib/api';
 import { useAuth } from '../../lib/auth';
-import { Avatar, ErrorState, LoadingState, StateBadge, ToggleButton, buttonStyles, cardStyles, textareaStyles } from '../../components/common';
-import { BranchPill, CommentCard, DiffView, MarkdownBlock, PaginationControls, PullDiffSkeleton, PullDiffView, RepoListSkeleton, RepoThreadSkeleton } from '../../components/repo';
+import { Avatar, ErrorState, LoadingState, PaginationControls, StateBadge, ToggleButton, buttonStyles, cardStyles, textareaStyles } from '../../components/common';
+import { BranchPill, CommentCard, DiffView, MarkdownBlock, PullDiffSkeleton, PullDiffView, RepoListSkeleton, RepoThreadSkeleton } from '../../components/repo';
 import { RepoFrame, pullQueryKey, pullsQueryKey, useRepoQuery } from './shared';
 import { REPO_LIST_PAGE_LIMIT, formatRelativeTime, getErrorMessage, parseIntegerSearchParam, pullHref, uniqueCommenters } from '../../lib/repo-utils';
-import { parsePastedPatchPrefill, parsePullStateFilter, type PullSourceMode, type PullStateFilter } from './pulls-helpers';
+import { buildPullFilterQuery, parsePastedPatchPrefill, parsePullFilter, type PullSourceMode } from './pulls-helpers';
 
 export const PullsPage: Component = () => {
 	const auth = useAuth();
 	const repoQuery = useRepoQuery();
 	const [searchParams, setSearchParams] = useSearchParams();
-	const stateFilter = createMemo<PullStateFilter>(() => parsePullStateFilter(searchParams.q));
-	const filterQuery = createMemo(() => `state:${stateFilter()}`);
+	const filter = createMemo(() => parsePullFilter(searchParams.q));
+	const stateFilter = createMemo(() => filter().state);
+	const authorFilter = createMemo(() => filter().author);
+	const textFilter = createMemo(() => filter().query);
+	const filterQuery = createMemo(() => buildPullFilterQuery(filter()));
+	const [filterDraft, setFilterDraft] = createSignal(filterQuery());
 	const pageOffset = createMemo(() => parseIntegerSearchParam(searchParams.offset, 0, 0));
 	const pageLimit = createMemo(() => parseIntegerSearchParam(searchParams.limit, REPO_LIST_PAGE_LIMIT, 1));
 	const basePath = createMemo(() => {
 		const repo = repoQuery.data;
 		return repo ? `/${repo.owner.handle}/${repo.slug}/pulls` : '/';
 	});
+	createEffect(() => {
+		setFilterDraft(filterQuery());
+	});
 	const setStateFilter = (state: 'open' | 'closed' | 'merged') => {
 		setSearchParams({
-			q: `state:${state}`,
+			q: buildPullFilterQuery({ ...filter(), state }),
+			offset: '0',
+			limit: String(pageLimit()),
+		});
+	};
+	const applyFilter = (event: SubmitEvent) => {
+		event.preventDefault();
+		setSearchParams({
+			q: buildPullFilterQuery(parsePullFilter(filterDraft())),
+			offset: '0',
+			limit: String(pageLimit()),
+		});
+	};
+	const resetFilter = () => {
+		setSearchParams({
+			q: 'state:open',
 			offset: '0',
 			limit: String(pageLimit()),
 		});
@@ -47,14 +70,18 @@ export const PullsPage: Component = () => {
 	const pullsQuery = createQuery(() => {
 		const repo = repoQuery.data;
 		return {
-			queryKey: [...pullsQueryKey(repo?.repoDid ?? ''), stateFilter(), pageOffset(), pageLimit()],
+			queryKey: [...pullsQueryKey(repo?.repoDid ?? ''), stateFilter(), authorFilter(), textFilter(), pageOffset(), pageLimit()],
 			enabled: Boolean(repo),
-			queryFn: async () =>
-				listPullsPage(repo!, {
+			queryFn: async () => {
+				const author = authorFilter() ? (await resolveActor(authorFilter()!)).did : undefined;
+				return listPullsPage(repo!, {
 					state: stateFilter(),
+					author,
+					query: textFilter(),
 					offset: pageOffset(),
 					limit: pageLimit(),
-				}),
+				});
+			},
 		};
 	});
 
@@ -90,11 +117,20 @@ export const PullsPage: Component = () => {
 						/>
 					</div>
 
-					<div class="hidden min-w-0 items-center rounded border border-gray-300 px-3 text-gray-500 dark:border-gray-700 md:flex">
-						state:{stateFilter()}
-						<span class="ml-auto">×</span>
-						<Search class="ml-3 size-4" />
-					</div>
+					<form onSubmit={applyFilter} class="untangled-repo-filter-search">
+						<input
+							value={filterDraft()}
+							onInput={(event) => setFilterDraft(event.currentTarget.value)}
+							placeholder="search pulls..."
+							class="untangled-repo-filter-input"
+						/>
+						<button type="button" class="untangled-repo-filter-reset" aria-label="reset filters" onClick={resetFilter}>
+							<X class="size-4" />
+						</button>
+						<button type="submit" class="untangled-repo-filter-submit" aria-label="apply filters">
+							<Search class="size-4" />
+						</button>
+					</form>
 
 					<Show when={auth.agent() && repoQuery.data}>
 						<A
@@ -127,7 +163,11 @@ export const PullsPage: Component = () => {
 							when={paginated().length > 0}
 							fallback={
 								<div class={cardStyles('px-6 py-4 text-sm text-gray-500 dark:text-gray-400')}>
-									No {stateFilter()} pull requests.
+									No {stateFilter()} pull requests
+									<Show when={authorFilter()}>
+										{' '}by {authorFilter()}
+									</Show>
+									.
 								</div>
 							}
 						>
diff --git a/src/routes.tsx b/src/routes.tsx
index 100bb7f..1c5ddeb 100644
--- a/src/routes.tsx
+++ b/src/routes.tsx
@@ -16,10 +16,12 @@ import { RepoLayout } from './pages/repo/shared';
 import { HomePage } from './views/home';
 import { NotFoundPage } from './views/not-found';
 import { OAuthCallbackPage } from './views/oauth-callback';
+import { SearchPage } from './views/search';
 
 export const AppRoutes: Component = () => (
 	<Router root={RootShell}>
 		<Route path="/" component={HomePage} />
+		<Route path="/search" component={SearchPage} />
 		<Route path="/oauth/callback" component={OAuthCallbackPage} />
 		<Route path="/:owner/:repo" component={RepoLayout}>
 			<Route path="/" component={RepoCodePage} />
diff --git a/src/views/search.tsx b/src/views/search.tsx
new file mode 100644
index 0000000..acd89ad
--- /dev/null
+++ b/src/views/search.tsx
@@ -0,0 +1,592 @@
+import clsx from 'clsx';
+import {
+	BookMarked,
+	CircleDot,
+	FileText,
+	GitFork,
+	GitPullRequest,
+	MessageSquare,
+	Search,
+	Tag,
+	UserRound,
+	X,
+} from 'lucide-solid';
+import { A, useNavigate, useSearchParams } from '@solidjs/router';
+import { createQuery } from '@tanstack/solid-query';
+import type { Did, ResourceUri } from '@atcute/lexicons/syntax';
+import { For, Match, Show, Switch, createEffect, createMemo, createSignal, type Component, type JSX } from 'solid-js';
+
+import { ErrorState, LoadingState, PaginationControls } from '../components/common';
+import {
+	getIssueRecord,
+	getPullRecord,
+	getRepoByDid,
+	searchRecords,
+	type SearchCollection,
+	type SearchHit,
+} from '../lib/api';
+import { formatRelativeTime, getErrorMessage, issueHref, pullHref } from '../lib/repo-utils';
+
+type SearchKind =
+	| 'all'
+	| 'repos'
+	| 'issues'
+	| 'pulls'
+	| 'issue-comments'
+	| 'pull-comments'
+	| 'profiles'
+	| 'strings'
+	| 'labels';
+
+interface SearchKindOption {
+	kind: SearchKind;
+	label: string;
+	nsid?: SearchCollection;
+}
+
+const SEARCH_KINDS: SearchKindOption[] = [
+	{ kind: 'all', label: 'all' },
+	{ kind: 'repos', label: 'repos', nsid: 'sh.tangled.repo' },
+	{ kind: 'issues', label: 'issues', nsid: 'sh.tangled.repo.issue' },
+	{ kind: 'pulls', label: 'pulls', nsid: 'sh.tangled.repo.pull' },
+	{ kind: 'issue-comments', label: 'issue comments', nsid: 'sh.tangled.repo.issue.comment' },
+	{ kind: 'pull-comments', label: 'pull comments', nsid: 'sh.tangled.repo.pull.comment' },
+	{ kind: 'profiles', label: 'profiles', nsid: 'sh.tangled.actor.profile' },
+	{ kind: 'strings', label: 'strings', nsid: 'sh.tangled.string' },
+	{ kind: 'labels', label: 'labels', nsid: 'sh.tangled.label.definition' },
+];
+
+const SEARCH_PAGE_LIMIT = 20;
+const SEARCH_OFFSET_PATTERN = /^[0-9a-fA-F]{8}$/;
+
+const paramValue = (value: string | string[] | undefined): string => Array.isArray(value) ? value[0] ?? '' : value ?? '';
+
+const parseSearchKind = (value: string | string[] | undefined): SearchKind => {
+	const raw = paramValue(value);
+	return SEARCH_KINDS.some((option) => option.kind === raw) ? raw as SearchKind : 'all';
+};
+
+const searchHref = (q: string, kind: SearchKind, cursor?: string): string => {
+	const params = new URLSearchParams();
+	const trimmed = q.trim();
+	if (trimmed) params.set('q', trimmed);
+	if (kind !== 'all') params.set('type', kind);
+	if (cursor) params.set('cursor', cursor);
+	const query = params.toString();
+	return query ? `/search?${query}` : '/search';
+};
+
+const decodeSearchOffset = (cursor: string): number => {
+	const trimmed = cursor.trim();
+	if (!SEARCH_OFFSET_PATTERN.test(trimmed)) return 0;
+	const parsed = Number.parseInt(trimmed, 16);
+	return Number.isFinite(parsed) && parsed > 0 ? parsed : 0;
+};
+
+const normalizeSearchCursor = (cursor: string): string | undefined => {
+	const trimmed = cursor.trim();
+	return SEARCH_OFFSET_PATTERN.test(trimmed) ? trimmed.toLowerCase() : undefined;
+};
+
+const encodeSearchOffset = (offset: number): string | undefined => {
+	if (offset <= 0) return undefined;
+	return Math.max(0, offset).toString(16).padStart(8, '0');
+};
+
+const formatSearchElapsed = (milliseconds?: number): string | undefined => {
+	if (milliseconds === undefined) return undefined;
+	if (milliseconds < 1) return `${Math.max(1, Math.round(milliseconds * 1000))}us`;
+	if (milliseconds < 10) return `${milliseconds.toFixed(2)}ms`;
+	if (milliseconds < 100) return `${milliseconds.toFixed(1)}ms`;
+	return `${Math.round(milliseconds)}ms`;
+};
+
+const snippet = (value?: string, max = 220): string => {
+	const normalized = value?.replace(/\s+/g, ' ').trim() ?? '';
+	if (normalized.length <= max) {
+		return normalized;
+	}
+	return `${normalized.slice(0, max - 1).trimEnd()}...`;
+};
+
+const collectionLabel = (nsid: SearchCollection): string => {
+	if (nsid === 'sh.tangled.repo') return 'repo';
+	if (nsid === 'sh.tangled.repo.issue') return 'issue';
+	if (nsid === 'sh.tangled.repo.pull') return 'pull';
+	if (nsid === 'sh.tangled.repo.issue.comment') return 'issue comment';
+	if (nsid === 'sh.tangled.repo.pull.comment') return 'pull comment';
+	if (nsid === 'sh.tangled.actor.profile') return 'profile';
+	if (nsid === 'sh.tangled.label.definition') return 'label';
+	return 'string';
+};
+
+const SearchResultIcon: Component<{ hit: SearchHit }> = (props) => (
+	<Switch fallback={<FileText class="w-4 h-4 mr-1.5 shrink-0" />}>
+		<Match when={props.hit.nsid === 'sh.tangled.repo'}>
+			<Show when={(props.hit.value as { source?: string }).source} fallback={<BookMarked class="w-4 h-4 mr-1.5 shrink-0" />}>
+				<GitFork class="w-4 h-4 mr-1.5 shrink-0" />
+			</Show>
+		</Match>
+		<Match when={props.hit.nsid === 'sh.tangled.repo.issue'}>
+			<CircleDot class="w-4 h-4 mr-1.5 shrink-0" />
+		</Match>
+		<Match when={props.hit.nsid === 'sh.tangled.repo.pull'}>
+			<GitPullRequest class="w-4 h-4 mr-1.5 shrink-0" />
+		</Match>
+		<Match when={props.hit.nsid === 'sh.tangled.repo.issue.comment' || props.hit.nsid === 'sh.tangled.repo.pull.comment'}>
+			<MessageSquare class="w-4 h-4 mr-1.5 shrink-0" />
+		</Match>
+		<Match when={props.hit.nsid === 'sh.tangled.actor.profile'}>
+			<UserRound class="w-4 h-4 mr-1.5 shrink-0" />
+		</Match>
+		<Match when={props.hit.nsid === 'sh.tangled.label.definition'}>
+			<Tag class="w-4 h-4 mr-1.5 shrink-0" />
+		</Match>
+	</Switch>
+);
+
+const RepoContextLink: Component<{ repoDid: Did }> = (props) => {
+	const repoQuery = createQuery(() => ({
+		queryKey: ['repo-by-did', props.repoDid],
+		queryFn: async () => getRepoByDid(props.repoDid),
+		staleTime: 300_000,
+	}));
+
+	return (
+		<Show
+			when={repoQuery.data}
+			fallback={
+				<div class="flex gap-1 items-center text-sm">
+					<BookMarked class="w-3 h-3" />
+					<span>repo</span>
+				</div>
+			}
+		>
+			{(repo) => (
+				<A
+					href={`/${repo().owner.handle}/${repo().slug}`}
+					class="flex min-w-0 gap-1 items-center text-sm no-underline hover:underline"
+				>
+					<BookMarked class="w-3 h-3 shrink-0" />
+					<span class="truncate">{repo().owner.handle}/{repo().slug}</span>
+				</A>
+			)}
+		</Show>
+	);
+};
+
+const RepoThreadLink: Component<{
+	kind: 'issue' | 'pull';
+	repoDid: Did;
+	ref: string;
+	children: JSX.Element;
+}> = (props) => {
+	const repoQuery = createQuery(() => ({
+		queryKey: ['repo-by-did', props.repoDid],
+		queryFn: async () => getRepoByDid(props.repoDid),
+		staleTime: 300_000,
+	}));
+	const href = createMemo(() => {
+		const repo = repoQuery.data;
+		if (!repo) return undefined;
+		return props.kind === 'issue' ? issueHref(repo, props.ref) : pullHref(repo, props.ref);
+	});
+
+	return (
+		<Show when={href()} fallback={<span>{props.children}</span>}>
+			{(target) => <A href={target()} class="truncate min-w-0">{props.children}</A>}
+		</Show>
+	);
+};
+
+const CommentParentLink: Component<{ hit: SearchHit }> = (props) => {
+	const isIssueComment = createMemo(() => props.hit.nsid === 'sh.tangled.repo.issue.comment');
+	const parentUri = createMemo(() => {
+		if (isIssueComment()) {
+			return (props.hit.value as { issue: ResourceUri }).issue;
+		}
+		return (props.hit.value as { pull: ResourceUri }).pull;
+	});
+	const parentQuery = createQuery(() => ({
+		queryKey: ['search-parent', props.hit.nsid, parentUri()],
+		queryFn: async () => isIssueComment()
+			? { kind: 'issue' as const, record: await getIssueRecord(parentUri()) }
+			: { kind: 'pull' as const, record: await getPullRecord(parentUri()) },
+		staleTime: 300_000,
+	}));
+
+	return (
+		<Show when={parentQuery.data} fallback={<span>comment</span>}>
+			{(parent) => {
+				const repoDid = createMemo(() => parent().kind === 'issue'
+					? (parent().record.value as { repo: Did }).repo
+					: (parent().record.value as { target: { repo: Did } }).target.repo);
+				return (
+					<RepoThreadLink kind={parent().kind} repoDid={repoDid()} ref={parent().record.rkey}>
+						comment on {parent().kind}
+					</RepoThreadLink>
+				);
+			}}
+		</Show>
+	);
+};
+
+const ResultRepoContext: Component<{ hit: SearchHit }> = (props) => {
+	const directRepoDid = createMemo(() => {
+		if (props.hit.nsid === 'sh.tangled.repo.issue') {
+			return (props.hit.value as { repo: Did }).repo;
+		}
+		if (props.hit.nsid === 'sh.tangled.repo.pull') {
+			return (props.hit.value as { target: { repo: Did } }).target.repo;
+		}
+		return undefined;
+	});
+	const isIssueComment = createMemo(() => props.hit.nsid === 'sh.tangled.repo.issue.comment');
+	const isRepoComment = createMemo(() => isIssueComment() || props.hit.nsid === 'sh.tangled.repo.pull.comment');
+	const parentUri = createMemo(() => {
+		if (!isRepoComment()) return undefined;
+		if (isIssueComment()) {
+			return (props.hit.value as { issue: ResourceUri }).issue;
+		}
+		return (props.hit.value as { pull: ResourceUri }).pull;
+	});
+	const parentQuery = createQuery(() => ({
+		queryKey: ['search-parent', props.hit.nsid, parentUri()],
+		enabled: Boolean(parentUri()),
+		queryFn: async () => isIssueComment()
+			? { kind: 'issue' as const, record: await getIssueRecord(parentUri()!) }
+			: { kind: 'pull' as const, record: await getPullRecord(parentUri()!) },
+		staleTime: 300_000,
+	}));
+	const commentRepoDid = createMemo(() => {
+		const parent = parentQuery.data;
+		if (!parent) return undefined;
+		return parent.kind === 'issue'
+			? (parent.record.value as { repo: Did }).repo
+			: (parent.record.value as { target: { repo: Did } }).target.repo;
+	});
+	const repoDid = createMemo(() => directRepoDid() ?? commentRepoDid());
+
+	return (
+		<Show when={repoDid()}>
+			{(did) => <RepoContextLink repoDid={did()} />}
+		</Show>
+	);
+};
+
+const ResultTitle: Component<{ hit: SearchHit }> = (props) => {
+	const title = createMemo(() => {
+		const value = props.hit.value as {
+			title?: string;
+			name?: string;
+			filename?: string;
+			preferredHandle?: string;
+		};
+		return value.title || value.name || value.filename || value.preferredHandle || props.hit.rkey;
+	});
+	const repoName = createMemo(() => (props.hit.value as { name?: string }).name?.trim() || props.hit.rkey);
+
+	return (
+		<div class="flex items-center min-w-0 flex-1 mr-2">
+			<SearchResultIcon hit={props.hit} />
+			<Switch fallback={<span class="truncate min-w-0">{title()}</span>}>
+				<Match when={props.hit.nsid === 'sh.tangled.repo'}>
+					<A href={`/${props.hit.author.handle}/${repoName()}`} class="truncate min-w-0">
+						{props.hit.author.handle}/{repoName()}
+					</A>
+				</Match>
+				<Match when={props.hit.nsid === 'sh.tangled.repo.issue'}>
+					<RepoThreadLink kind="issue" repoDid={(props.hit.value as { repo: Did }).repo} ref={props.hit.rkey}>
+						{title()}
+					</RepoThreadLink>
+				</Match>
+				<Match when={props.hit.nsid === 'sh.tangled.repo.pull'}>
+					<RepoThreadLink kind="pull" repoDid={(props.hit.value as { target: { repo: Did } }).target.repo} ref={props.hit.rkey}>
+						{title()}
+					</RepoThreadLink>
+				</Match>
+				<Match when={props.hit.nsid === 'sh.tangled.repo.issue.comment' || props.hit.nsid === 'sh.tangled.repo.pull.comment'}>
+					<CommentParentLink hit={props.hit} />
+				</Match>
+			</Switch>
+		</div>
+	);
+};
+
+const SearchResultCard: Component<{ hit: SearchHit }> = (props) => {
+	const createdAt = createMemo(() => (props.hit.value as { createdAt?: string }).createdAt);
+	const body = createMemo(() => {
+		const value = props.hit.value as {
+			body?: string;
+			description?: string;
+			contents?: string;
+			location?: string;
+			pronouns?: string;
+		};
+		return snippet(value.body || value.description || value.contents || [value.location, value.pronouns].filter(Boolean).join(' '));
+	});
+	const topics = createMemo(() => props.hit.nsid === 'sh.tangled.repo'
+		? (props.hit.value as { topics?: string[] }).topics ?? []
+		: []);
+
+	return (
+		<div class="border border-gray-200 dark:border-gray-700 rounded-sm">
+			<div class="min-h-32 py-4 px-6 gap-1 flex flex-col drop-shadow-sm bg-white dark:bg-gray-800">
+				<div class="font-medium dark:text-white flex items-center justify-between">
+					<ResultTitle hit={props.hit} />
+				</div>
+
+				<Show when={body()}>
+					<div class="untangled-search-description text-gray-600 dark:text-gray-300 text-sm">{body()}</div>
+				</Show>
+
+				<div class="text-gray-400 text-sm font-mono inline-flex flex-wrap gap-4 mt-auto pt-4">
+					<div class="flex gap-2 items-center text-sm">
+						<span class="untangled-search-type-dot" />
+						<span>{collectionLabel(props.hit.nsid)}</span>
+					</div>
+					<div class="flex gap-1 items-center text-sm">
+						<UserRound class="w-3 h-3" />
+						<span>{props.hit.author.handle}</span>
+					</div>
+					<ResultRepoContext hit={props.hit} />
+					<Show when={createdAt()}>
+						<div class="flex gap-1 items-center text-sm">
+							<span>{formatRelativeTime(createdAt())}</span>
+						</div>
+					</Show>
+				</div>
+
+				<Show when={topics().length > 0}>
+					<div class="mt-2 flex flex-wrap gap-2">
+						<For each={topics()}>
+							{(topic) => (
+								<span class="rounded border border-gray-200 px-2 py-0.5 text-xs text-gray-500 dark:border-gray-700 dark:text-gray-400">
+									{topic}
+								</span>
+							)}
+						</For>
+					</div>
+				</Show>
+			</div>
+		</div>
+	);
+};
+
+const TypeFilters: Component<{ query: string; active: SearchKind }> = (props) => (
+	<div class="flex gap-2 md:flex-wrap overflow-x-auto pb-2 md:pb-0">
+		<For each={SEARCH_KINDS}>
+			{(option) => (
+				<A
+					href={searchHref(props.query, option.kind)}
+					class={clsx(
+						'w-fit flex items-center flex-shrink-0 gap-2 font-normal normal-case rounded py-1 px-2 border text-sm transition-colors no-underline hover:no-underline',
+						option.kind === props.active
+							? 'border-gray-400 bg-gray-100 text-gray-900 dark:border-gray-500 dark:bg-gray-700 dark:text-gray-100'
+							: 'border-gray-200 bg-white text-gray-700 hover:bg-gray-50 dark:border-gray-700 dark:bg-gray-800 dark:text-gray-200 dark:hover:bg-gray-700',
+					)}
+				>
+					<span class="untangled-search-type-dot" />
+					<span>{option.label}</span>
+				</A>
+			)}
+		</For>
+	</div>
+);
+
+const SearchStatistics: Component<{
+	returnedCount?: number;
+	returnedStart?: number;
+	elapsedMs?: number;
+	hasMore?: boolean;
+}> = (props) => {
+	const returnedThrough = createMemo(() => (props.returnedStart ?? 0) + (props.returnedCount ?? 0));
+	const elapsed = createMemo(() => formatSearchElapsed(props.elapsedMs));
+
+	return (
+		<Show when={props.returnedCount !== undefined}>
+			<div class="text-xs text-gray-600 dark:text-gray-400 border-t border-gray-200 dark:border-gray-700 py-2">
+				returned {returnedThrough()}{props.hasMore ? '+' : ''} indexed record{returnedThrough() === 1 ? '' : 's'}
+				<Show when={elapsed()}> in {elapsed()}</Show>
+			</div>
+		</Show>
+	);
+};
+
+const SearchOptionsPanel: Component<{
+	query: string;
+	kind: SearchKind;
+	returnedCount?: number;
+	returnedStart?: number;
+	elapsedMs?: number;
+	hasMore?: boolean;
+}> = (props) => (
+	<div class="flex flex-col gap-6 px-2 md:px-0">
+		<div>
+			<h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300 mb-3">sort by</h3>
+			<select class="w-full px-3 py-2 border border-gray-300 dark:border-gray-600 rounded bg-white dark:bg-gray-800 dark:text-white text-sm">
+				<option>relevance</option>
+			</select>
+		</div>
+
+		<div>
+			<h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300 mb-3">content</h3>
+			<TypeFilters query={props.query} active={props.kind} />
+			<p class="hidden md:block text-gray-500 dark:text-gray-400 text-xs mt-3">
+				filter by indexed record type.
+			</p>
+		</div>
+
+		<SearchStatistics
+			returnedCount={props.returnedCount}
+			returnedStart={props.returnedStart}
+			elapsedMs={props.elapsedMs}
+			hasMore={props.hasMore}
+		/>
+	</div>
+);
+
+export const SearchPage: Component = () => {
+	const [searchParams] = useSearchParams();
+	const navigate = useNavigate();
+	const q = createMemo(() => paramValue(searchParams.q));
+	const kind = createMemo(() => parseSearchKind(searchParams.type));
+	const cursor = createMemo(() => paramValue(searchParams.cursor));
+	const normalizedCursor = createMemo(() => normalizeSearchCursor(cursor()));
+	const currentOffset = createMemo(() => decodeSearchOffset(normalizedCursor() ?? ''));
+	const selectedKind = createMemo(() => SEARCH_KINDS.find((option) => option.kind === kind()) ?? SEARCH_KINDS[0]);
+	const [draft, setDraft] = createSignal(q());
+
+	createEffect(() => {
+		setDraft(q());
+	});
+
+	const searchQuery = createQuery(() => ({
+		queryKey: ['global-search', q(), kind(), normalizedCursor()],
+		enabled: Boolean(q().trim()),
+		queryFn: async () => {
+			const startedAt = performance.now();
+			const result = await searchRecords({
+				q: q(),
+				nsid: selectedKind().nsid,
+				cursor: normalizedCursor(),
+				limit: SEARCH_PAGE_LIMIT,
+			});
+			return { ...result, elapsedMs: performance.now() - startedAt };
+		},
+	}));
+
+	const onSubmit = (event: SubmitEvent) => {
+		event.preventDefault();
+		navigate(searchHref(draft(), kind()));
+	};
+
+	const clearHref = createMemo(() => searchHref('', kind()));
+	const hits = createMemo(() => searchQuery.data?.hits ?? []);
+	const returnedCount = createMemo(() => searchQuery.data ? hits().length : undefined);
+
+	return (
+		<>
+			<h1 class="text-2xl font-bold mb-4 px-2">Search</h1>
+
+			<div class="untangled-search-grid px-2">
+				<div class="untangled-search-main">
+					<form onSubmit={onSubmit} class="flex items-center gap-2">
+						<div class="flex relative w-full">
+							<div class="flex-1 flex relative">
+								<input
+									id="search-q"
+									value={draft()}
+									onInput={(event) => setDraft(event.currentTarget.value)}
+									placeholder="search..."
+									class="untangled-search-page-input peer"
+								/>
+								<A
+									href={clearHref()}
+									class={clsx(
+										'absolute right-3 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300',
+										!draft().trim() && 'hidden',
+									)}
+								>
+									<X class="w-4 h-4" />
+								</A>
+							</div>
+							<button type="submit" class="untangled-search-page-submit">
+								<Search class="w-4 h-4" />
+							</button>
+						</div>
+					</form>
+
+					<div class="md:hidden mt-3">
+						<TypeFilters query={q()} active={kind()} />
+					</div>
+
+					<Show
+						when={q().trim()}
+						fallback={<div class="text-base text-gray-500 flex items-center justify-center italic p-12 border border-gray-200 dark:border-gray-700 rounded">Enter a query to search indexed records.</div>}
+					>
+						<Switch>
+							<Match when={searchQuery.isLoading}>
+								<div class="p-12 border border-gray-200 dark:border-gray-700 rounded">
+									<LoadingState label="Searching..." />
+								</div>
+							</Match>
+							<Match when={searchQuery.error}>
+								<div class="p-6 border border-gray-200 dark:border-gray-700 rounded">
+									<ErrorState message={getErrorMessage(searchQuery.error)} />
+								</div>
+							</Match>
+							<Match when={searchQuery.data}>
+								{(data) => (
+									<>
+										<div id="search-results" class="grid grid-cols-1 gap-4 mb-6">
+											<Show
+												when={data().hits.length > 0}
+												fallback={
+													<div class="text-base text-gray-500 flex items-center justify-center italic p-12 border border-gray-200 dark:border-gray-700 rounded">
+														<span>No results found.</span>
+													</div>
+												}
+											>
+												<For each={data().hits}>
+													{(hit) => <SearchResultCard hit={hit} />}
+												</For>
+											</Show>
+										</div>
+
+										<div class="md:hidden mb-4">
+											<SearchStatistics
+												returnedCount={data().hits.length}
+												returnedStart={currentOffset()}
+												elapsedMs={data().elapsedMs}
+												hasMore={Boolean(data().cursor)}
+											/>
+										</div>
+
+										<PaginationControls
+											offset={currentOffset()}
+											limit={SEARCH_PAGE_LIMIT}
+											hasNext={Boolean(data().cursor)}
+											hrefForOffset={(offset) => searchHref(q(), kind(), encodeSearchOffset(offset))}
+										/>
+									</>
+								)}
+							</Match>
+						</Switch>
+					</Show>
+				</div>
+
+				<div class="untangled-search-sidebar">
+					<SearchOptionsPanel
+						query={q()}
+						kind={kind()}
+						returnedCount={returnedCount()}
+						returnedStart={currentOffset()}
+						elapsedMs={searchQuery.data?.elapsedMs}
+						hasMore={Boolean(searchQuery.data?.cursor)}
+					/>
+				</div>
+			</div>
+		</>
+	);
+};