diff --git a/web/.storybook/SimulatedRepoSettings.svelte b/web/.storybook/SimulatedRepoSettings.svelte
index fbd00e000..c58283a9d 100644
--- a/web/.storybook/SimulatedRepoSettings.svelte
+++ b/web/.storybook/SimulatedRepoSettings.svelte
@@ -16,7 +16,14 @@
 	let loadDelay = $state(600); // ms
 	let statusLog = $state<string[]>([]);
 
-	let pageData = $state<any>({
+	type Collaborator = { did: string; handle: string; role: string };
+	type TabData = {
+		labels?: string[] | Promise<string[]>;
+		collaborators?: Collaborator[] | Promise<Collaborator[]>;
+		spindles?: string[] | Promise<string[]>;
+	};
+
+	let pageData = $state<TabData>({
 		labels: ["bug", "enhancement"]
 	});
 
@@ -34,14 +41,14 @@
 		log(`Navigating to ${id}`);
 		const start = performance.now();
 
-		let rawData: any;
+		let rawData: TabData = {};
 		if (id === "general") {
 			const p = new Promise<string[]>((res) =>
 				setTimeout(() => res(["bug", "enhancement", "feature"]), loadDelay)
 			);
 			rawData = { labels: stream(p) };
 		} else if (id === "access") {
-			const p = new Promise<{ did: string; handle: string; role: string }[]>((res) =>
+			const p = new Promise<Collaborator[]>((res) =>
 				setTimeout(
 					() =>
 						res([
@@ -72,12 +79,12 @@
 
 <div class="flex w-full flex-col gap-md p-md">
 	<div
-		class="flex items-center gap-md rounded border border-border-default bg-background-subtle p-sm"
+		class="flex items-center gap-md rounded-sm border border-border-default bg-background-subtle p-sm"
 	>
 		<span class="text-sm font-medium">Request Delay:</span>
 		<button
 			id="delay-100"
-			class="rounded border px-xs py-2xs text-xs {loadDelay === 100
+			class="rounded-sm border px-xs py-2xs text-xs {loadDelay === 100
 				? 'bg-black text-white'
 				: 'bg-white'}"
 			onclick={() => (loadDelay = 100)}
@@ -86,7 +93,7 @@
 		</button>
 		<button
 			id="delay-600"
-			class="rounded border px-xs py-2xs text-xs {loadDelay === 600
+			class="rounded-sm border px-xs py-2xs text-xs {loadDelay === 600
 				? 'bg-black text-white'
 				: 'bg-white'}"
 			onclick={() => (loadDelay = 600)}
@@ -98,19 +105,19 @@
 	<!-- Log display -->
 	<div
 		id="status-log"
-		class="h-20 overflow-auto rounded bg-black p-xs font-mono text-xs text-green-400"
+		class="h-20 overflow-auto rounded-sm bg-black p-xs font-mono text-xs text-green-400"
 	>
-		{#each statusLog as entry}
+		{#each statusLog as entry, i (i)}
 			<div>{entry}</div>
 		{/each}
 	</div>
 
 	<!-- Custom nav buttons -->
 	<div class="flex gap-xs">
-		{#each items as item}
+		{#each items as item (item.id)}
 			<button
 				id="btn-nav-{item.id}"
-				class="rounded border px-sm py-1.5 text-sm font-medium {activeTab === item.id
+				class="rounded-sm border px-sm py-1.5 text-sm font-medium {activeTab === item.id
 					? 'bg-black text-white'
 					: 'bg-background-default'}"
 				onclick={() => navigateTab(item.id)}
@@ -139,7 +146,7 @@
 						/>
 						<SettingsBlock title="Labels" description="Issue and PR labels">
 							<SettingsList>
-								{#each labels as label}
+								{#each labels as label (label)}
 									<SettingsRow title={label} />
 								{/each}
 							</SettingsList>
@@ -162,7 +169,7 @@
 							description="Manage repository collaborators"
 						>
 							<SettingsList>
-								{#each collaborators as c}
+								{#each collaborators as c (c.did)}
 									<SettingsRow title={c.handle}>
 										{#snippet label()}
 											<span>{c.handle} ({c.role})</span>
@@ -188,7 +195,7 @@
 						<SettingsHeader title="Pipelines" />
 						<SettingsBlock title="Spindles" description="Configured spindles">
 							<SettingsList>
-								{#each spindles as s}
+								{#each spindles as s (s)}
 									<SettingsRow title={s} />
 								{/each}
 							</SettingsList>
diff --git a/web/eslint.config.js b/web/eslint.config.js
index 2f2f03afc..593cc10a3 100644
--- a/web/eslint.config.js
+++ b/web/eslint.config.js
@@ -39,6 +39,7 @@ export default defineConfig(
 		rules: {
 			// typescript owns undefined-name checks.
 			"no-undef": "off",
+			"no-empty": ["error", { allowEmptyCatch: true }],
 			"@typescript-eslint/no-unused-vars": [
 				"error",
 				{ argsIgnorePattern: "^_", varsIgnorePattern: "^_", caughtErrorsIgnorePattern: "^_" }
@@ -54,7 +55,8 @@ export default defineConfig(
 						".storybook/MockAuth.svelte",
 						".storybook/MockNotifications.svelte",
 						".storybook/BoneCaptureDecorator.svelte",
-						".storybook/WorkflowRunReplay.svelte"
+						".storybook/WorkflowRunReplay.svelte",
+						".storybook/SimulatedRepoSettings.svelte"
 					]
 				},
 				extraFileExtensions: [".svelte"],
diff --git a/web/src/app.html b/web/src/app.html
index 7a820b306..434b3f2a8 100644
--- a/web/src/app.html
+++ b/web/src/app.html
@@ -24,7 +24,13 @@
 		<link rel="apple-touch-icon" href="/logos/dolly.png" />
 		<link rel="preconnect" href="https://avatar.tangled.sh" />
 		<link rel="preconnect" href="https://camo.tangled.sh" />
-		<link rel="preload" href="/fonts/TimelessSansVF.woff2" as="font" type="font/woff2" crossorigin />
+		<link
+			rel="preload"
+			href="/fonts/TimelessSansVF.woff2"
+			as="font"
+			type="font/woff2"
+			crossorigin
+		/>
 		<script type="application/ld+json">
 			{
 				"@context": "https://schema.org",
diff --git a/web/src/lib/api/client.ts b/web/src/lib/api/client.ts
index 955242c28..779efb9d7 100644
--- a/web/src/lib/api/client.ts
+++ b/web/src/lib/api/client.ts
@@ -31,9 +31,7 @@ export const nsidFromUrl = (input: RequestInfo | URL): Nsid | null => {
 		return null;
 	}
 	const [, prefix, nsid, ...rest] = pathname.split("/");
-	return prefix === "xrpc" && nsid && rest.length === 0 && isNsid(nsid)
-		? nsidOf(nsid)
-		: null;
+	return prefix === "xrpc" && nsid && rest.length === 0 && isNsid(nsid) ? nsidOf(nsid) : null;
 };
 
 // pocket keys stored preferences by the token's `aud`
diff --git a/web/src/lib/api/githubImport.test.ts b/web/src/lib/api/githubImport.test.ts
index 41e8b1e52..3e4d9fcd2 100644
--- a/web/src/lib/api/githubImport.test.ts
+++ b/web/src/lib/api/githubImport.test.ts
@@ -385,7 +385,7 @@ describe("importGitHubProfile", () => {
 		mockReadRecord.mockReset();
 		mockReadRecord.mockResolvedValue(null);
 		mockCreatePubKey.mockReset();
-		mockCreatePubKey.mockImplementation(async (agent, name, key) => ({
+		mockCreatePubKey.mockImplementation(async (agent, name) => ({
 			uri: `at://${agent.sub}/sh.tangled.publicKey/${name}`,
 			cid: "bafycreated",
 			rkey: `rkey-${name}`
diff --git a/web/src/lib/api/knot.ts b/web/src/lib/api/knot.ts
index 2c9cf6b9d..085d1a4b1 100644
--- a/web/src/lib/api/knot.ts
+++ b/web/src/lib/api/knot.ts
@@ -1,13 +1,6 @@
 import { createBobbinClient, type BobbinContext, type XrpcRequestInit } from "$lib/api/client";
 import { resolveRepoKnot } from "$lib/api/repo";
-import {
-	capabilityOf,
-	didOf,
-	knotOf,
-	type Capability,
-	type Did,
-	type KnotOrigin
-} from "$lib/api/syntax";
+import { capabilityOf, knotOf, type Capability, type Did, type KnotOrigin } from "$lib/api/syntax";
 
 export const SOCIAL_WRITES_CAPABILITY = capabilityOf("knot-social-writes");
 
diff --git a/web/src/lib/api/migrator.test.ts b/web/src/lib/api/migrator.test.ts
index d6923f6ae..9914a710c 100644
--- a/web/src/lib/api/migrator.test.ts
+++ b/web/src/lib/api/migrator.test.ts
@@ -6,22 +6,18 @@ import type { OAuthUserAgent } from "@atcute/oauth-browser-client";
 import type { Did } from "@atcute/lexicons/syntax";
 import {
 	createMigrationTask,
-	describeSource,
-	getMigrationTask,
 	grantRefused,
-	listMigrationTasks,
 	migrationRunning,
 	describeSourcePermission,
 	missingDescribeSourceScope,
 	migrationsInFlight,
 	migrationsUnfinished,
-	retryMigrationJob,
 	flowReturnPath,
 	returnPathFrom,
 	startUrlFrom,
 	MigrationGrantRequired
-} from "./migrator";
-import type { MigrationTask } from "./migrator";
+} from "$lib/api/migrator";
+import type { MigrationTask } from "$lib/api/migrator";
 
 const agent = {
 	sub: "did:plc:alice" as Did
@@ -136,7 +132,7 @@ describe("migrator client", () => {
 			})
 		}));
 
-		const { getMigrationTask: getTask } = await import("./migrator");
+		const { getMigrationTask: getTask } = await import("$lib/api/migrator");
 		let caught: unknown;
 		try {
 			await getTask(agent, host, "task-1");
@@ -161,7 +157,7 @@ describe("migrator client", () => {
 			jsonGet
 		}));
 
-		const { describeSource: describe } = await import("./migrator");
+		const { describeSource: describe } = await import("$lib/api/migrator");
 		const out = await describe(agent, host, "https://example.com/a/repo.git");
 
 		expect(jsonGet).toHaveBeenCalledTimes(1);
@@ -186,7 +182,7 @@ describe("migrator client", () => {
 			})
 		}));
 
-		const { describeSource: describe } = await import("./migrator");
+		const { describeSource: describe } = await import("$lib/api/migrator");
 		let caught: unknown;
 		try {
 			await describe(agent, host, "https://example.com/a/repo.git");
@@ -218,7 +214,7 @@ describe("migrator client", () => {
 			})
 		}));
 
-		const { describeSource: describe } = await import("./migrator");
+		const { describeSource: describe } = await import("$lib/api/migrator");
 		let caught: unknown;
 		try {
 			await describe(agent, host, "https://example.com/a/repo.git");
@@ -273,9 +269,7 @@ describe("grant return path", () => {
 		}) as unknown as MigrationTask;
 
 	it("drops the migrator's own transport params and keeps the rest", () => {
-		expect(returnPathFrom({ pathname: "/repo/migrate", search: "" })).toBe(
-			"/repo/migrate"
-		);
+		expect(returnPathFrom({ pathname: "/repo/migrate", search: "" })).toBe("/repo/migrate");
 		expect(
 			returnPathFrom({
 				pathname: "/repo/migrate",
@@ -297,9 +291,9 @@ describe("grant return path", () => {
 		expect(
 			flowReturnPath({ pathname: "/welcome", search: "?step=github&github_error=denied" })
 		).toBe("/welcome?step=github");
-		expect(
-			flowReturnPath({ pathname: "/repo/migrate", search: "?github_error=denied" })
-		).toBe("/repo/migrate");
+		expect(flowReturnPath({ pathname: "/repo/migrate", search: "?github_error=denied" })).toBe(
+			"/repo/migrate"
+		);
 		expect(flowReturnPath({ pathname: "/welcome", search: "" })).toBe("/welcome");
 	});
 
diff --git a/web/src/lib/api/preferences.ts b/web/src/lib/api/preferences.ts
index 0098be65c..bfcd2a55d 100644
--- a/web/src/lib/api/preferences.ts
+++ b/web/src/lib/api/preferences.ts
@@ -33,7 +33,10 @@ export const getPreferences = async (ctx: BobbinContext): Promise<Preferences> =
 	}
 };
 
-export const putPreferences = async (ctx: BobbinContext, preferences: Preferences): Promise<void> => {
+export const putPreferences = async (
+	ctx: BobbinContext,
+	preferences: Preferences
+): Promise<void> => {
 	const items = (hosts: string[]) => hosts.map((host) => ({ id: host, value: host }));
 	await ok(
 		ctx.xrpc.call(putPreferencesSchema, {
diff --git a/web/src/lib/api/repoCreate.test.ts b/web/src/lib/api/repoCreate.test.ts
index 59132b68c..7afb7f2b7 100644
--- a/web/src/lib/api/repoCreate.test.ts
+++ b/web/src/lib/api/repoCreate.test.ts
@@ -20,7 +20,7 @@ const load = async ({
 	recordError,
 	putError,
 	readError,
-	existing = null,
+	existing = null
 }: HarnessOptions = {}) => {
 	vi.resetModules();
 	const events: string[] = [];
diff --git a/web/src/lib/api/repoIndex.ts b/web/src/lib/api/repoIndex.ts
index c270cdc30..b45793361 100644
--- a/web/src/lib/api/repoIndex.ts
+++ b/web/src/lib/api/repoIndex.ts
@@ -58,12 +58,7 @@ const isUnsupported = (cause: unknown): boolean =>
 	cause instanceof ClientResponseError && cause.status === 404;
 
 export type RepoAvailability =
-	| "ok"
-	| "empty"
-	| "needs-upgrade"
-	| "unreachable"
-	| "importing"
-	| "import-failed";
+	"ok" | "empty" | "needs-upgrade" | "unreachable" | "importing" | "import-failed";
 
 export const classifyRepoAvailability = (
 	attempts: readonly { value: unknown | null; error: unknown | null }[]
diff --git a/web/src/lib/api/spindlewrite.test.ts b/web/src/lib/api/spindlewrite.test.ts
index 0484ecf06..e54c1c794 100644
--- a/web/src/lib/api/spindlewrite.test.ts
+++ b/web/src/lib/api/spindlewrite.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 import type { OAuthUserAgent } from "@atcute/oauth-browser-client";
 import { mainSchema as addSecretSchema } from "$lib/api/lexicons/types/org/tangled/secret/addSecret";
 import { didOf, type Capability, type KnotOrigin } from "$lib/api/syntax";
diff --git a/web/src/lib/api/spindlewrite.ts b/web/src/lib/api/spindlewrite.ts
index 3bb65eb7e..8af47f1bf 100644
--- a/web/src/lib/api/spindlewrite.ts
+++ b/web/src/lib/api/spindlewrite.ts
@@ -4,14 +4,7 @@ import { knotProcedure } from "$lib/api/cob";
 import { nsidFromUrl, withServiceAuth } from "$lib/api/client";
 import { knotCapabilities } from "$lib/api/knot";
 import { knotFor } from "$lib/api/repo";
-import {
-	capabilityOf,
-	didOf,
-	nsidOf,
-	type Did,
-	type KnotOrigin,
-	type Nsid
-} from "$lib/api/syntax";
+import { capabilityOf, didOf, nsidOf, type Did, type KnotOrigin, type Nsid } from "$lib/api/syntax";
 import { serviceDidForHost } from "$lib/auth/agent";
 
 export const REPO_TOKEN_MINT_CAPABILITY = capabilityOf("knot-repo-token-mint");
@@ -84,7 +77,14 @@ export const spindleXrpc = async (
 	const userToken = withServiceAuth(globalThis.fetch, agent, origin);
 	const authenticated =
 		target.knot && (await knotCapabilities(target.knot))?.includes(REPO_TOKEN_MINT_CAPABILITY)
-			? withRepoToken(globalThis.fetch, agent, target.knot, target.repoDid, spindle, userToken)
+			? withRepoToken(
+					globalThis.fetch,
+					agent,
+					target.knot,
+					target.repoDid,
+					spindle,
+					userToken
+				)
 			: userToken;
 	return new Client({ handler: simpleFetchHandler({ service: origin, fetch: authenticated }) });
 };
diff --git a/web/src/lib/api/syntax.ts b/web/src/lib/api/syntax.ts
index dc4558402..04ce75e08 100644
--- a/web/src/lib/api/syntax.ts
+++ b/web/src/lib/api/syntax.ts
@@ -1,5 +1,4 @@
 import {
-	isCanonicalResourceUri,
 	isCid,
 	isDatetime,
 	isDid,
diff --git a/web/src/lib/api/webhooks.ts b/web/src/lib/api/webhooks.ts
index e8131a823..e88e3dfc7 100644
--- a/web/src/lib/api/webhooks.ts
+++ b/web/src/lib/api/webhooks.ts
@@ -1,5 +1,5 @@
 import { ok } from "@atcute/client";
-import type { Did, Nsid } from "@atcute/lexicons/syntax";
+import type { Nsid } from "@atcute/lexicons/syntax";
 import type { OAuthUserAgent } from "@atcute/oauth-browser-client";
 import { spindleXrpc, type SpindleTarget } from "$lib/api/spindlewrite";
 import { serviceDidForHost } from "$lib/auth/agent";
diff --git a/web/src/lib/api/write.test.ts b/web/src/lib/api/write.test.ts
index 8e34a77cd..19f64c32f 100644
--- a/web/src/lib/api/write.test.ts
+++ b/web/src/lib/api/write.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it, vi } from "vitest";
 import { cidOf, nsidOf, recordKeyOf } from "$lib/api/syntax";
 import type { OAuthUserAgent } from "@atcute/oauth-browser-client";
-import type * as Write from "./write";
+import type * as Write from "$lib/api/write";
 
 const agent = { sub: "did:plc:writer" } as unknown as OAuthUserAgent;
 const collection = nsidOf("sh.tangled.repo.issue");
@@ -26,7 +26,7 @@ const load = async () => {
 			}
 		})
 	}));
-	return { cache: await import("./cache"), write: await import("./write"), inputs };
+	return { cache: await import("./cache"), write: await import("$lib/api/write"), inputs };
 };
 
 describe("record writes", () => {
@@ -80,7 +80,7 @@ describe("record writes", () => {
 			})
 		}));
 		const cache = await import("./cache");
-		const write = await import("./write");
+		const write = await import("$lib/api/write");
 		const read = vi.fn().mockResolvedValue("fresh");
 
 		await cache.cached("issues:did:plc:repo:open:", 30_000, read);
@@ -107,7 +107,7 @@ describe("readRecord", () => {
 				})
 			})
 		}));
-		const write = await import("./write");
+		const write = await import("$lib/api/write");
 		const result = await write.readRecord<{ title: string }>(
 			agent,
 			collection,
@@ -130,7 +130,7 @@ describe("readRecord", () => {
 				})
 			})
 		}));
-		const write = await import("./write");
+		const write = await import("$lib/api/write");
 		const result = await write.readRecord(agent, collection, recordKeyOf("3lk"));
 		expect(result).toBeNull();
 	});
@@ -147,7 +147,7 @@ describe("readRecord", () => {
 				})
 			})
 		}));
-		const write = await import("./write");
+		const write = await import("$lib/api/write");
 		await expect(write.readRecord(agent, collection, recordKeyOf("3lk"))).rejects.toThrow();
 	});
 });
diff --git a/web/src/lib/auth/agent.ts b/web/src/lib/auth/agent.ts
index 6e55ee46a..e303ee6bb 100644
--- a/web/src/lib/auth/agent.ts
+++ b/web/src/lib/auth/agent.ts
@@ -1,7 +1,7 @@
 import { Client, ok } from "@atcute/client";
 import { mainSchema as getServiceAuthSchema } from "@atcute/atproto/types/server/getServiceAuth";
 import { isDid, type AtprotoAudience } from "@atcute/lexicons/syntax";
-import { didOf, nsidOf, type Did, type Nsid } from "$lib/api/syntax";
+import { didOf, type Did, type Nsid } from "$lib/api/syntax";
 import type { OAuthUserAgent } from "@atcute/oauth-browser-client";
 
 export const createClient = (agent: OAuthUserAgent, proxy?: AtprotoAudience): Client =>
diff --git a/web/src/lib/components/home/HomeCta.svelte b/web/src/lib/components/home/HomeCta.svelte
index ad246bc05..78c25f2d9 100644
--- a/web/src/lib/components/home/HomeCta.svelte
+++ b/web/src/lib/components/home/HomeCta.svelte
@@ -17,7 +17,7 @@
 	});
 </script>
 
-<section bind:this={stage} class="relative px-md pt-44 pb-36 md:pt-56 md:pb-56">
+<section bind:this={stage} class="relative px-md pt-44 pb-36 md:py-56">
 	<svg
 		width={size.width}
 		{height}
diff --git a/web/src/lib/components/import/GitHubConnectStep.svelte b/web/src/lib/components/import/GitHubConnectStep.svelte
index 4d1bffd90..ac69cbde1 100644
--- a/web/src/lib/components/import/GitHubConnectStep.svelte
+++ b/web/src/lib/components/import/GitHubConnectStep.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { GitHubAccount } from "$lib/github";
 	import FormStep from "$lib/components/ui/FormStep.svelte";
-	import ConnectAccount from "./ConnectAccount.svelte";
+	import ConnectAccount from "$lib/components/import/ConnectAccount.svelte";
 
 	interface Props {
 		number: number;
diff --git a/web/src/lib/components/import/GitHubImporter.stories.svelte b/web/src/lib/components/import/GitHubImporter.stories.svelte
index 55a8d2f2d..49cdc8663 100644
--- a/web/src/lib/components/import/GitHubImporter.stories.svelte
+++ b/web/src/lib/components/import/GitHubImporter.stories.svelte
@@ -1,6 +1,6 @@
 <script module lang="ts">
 	import { defineMeta } from "@storybook/addon-svelte-csf";
-	import { expect, fn, userEvent, waitFor, within } from "storybook/test";
+	import { expect, userEvent, waitFor, within } from "storybook/test";
 	import GitHubImporterFixture from "$lib/components/import/GitHubImporterFixture.svelte";
 
 	const { Story } = defineMeta({
@@ -37,7 +37,9 @@
 	play={async ({ canvasElement }) => {
 		const canvas = within(canvasElement);
 		await waitFor(() => expect(canvas.getByText("ada/alpha")).toBeVisible());
-		await waitFor(() => expect(canvas.getByRole("checkbox", { name: "Select ada/alpha" })).toBeEnabled());
+		await waitFor(() =>
+			expect(canvas.getByRole("checkbox", { name: "Select ada/alpha" })).toBeEnabled()
+		);
 		await userEvent.click(canvas.getByRole("checkbox", { name: "Select ada/alpha" }));
 		await userEvent.click(canvas.getByRole("checkbox", { name: "Select ada/beta" }));
 		await waitFor(() =>
diff --git a/web/src/lib/components/import/GitHubImporter.svelte b/web/src/lib/components/import/GitHubImporter.svelte
index c2001b843..74b4e0480 100644
--- a/web/src/lib/components/import/GitHubImporter.svelte
+++ b/web/src/lib/components/import/GitHubImporter.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
 	import type { Snippet } from "svelte";
 	import ErrorAlert from "$lib/components/ui/Error.svelte";
-	import GitHubConnectStep from "./GitHubConnectStep.svelte";
-	import GitHubAuthorizeStep from "./GitHubAuthorizeStep.svelte";
-	import GitHubRepoSelectStep from "./GitHubRepoSelectStep.svelte";
-	import MigrationStep from "./MigrationStep.svelte";
-	import { createGitHubImporter } from "./gitHubImportState.svelte";
-	import { isAuthorizeGated } from "./stepGating";
+	import GitHubConnectStep from "$lib/components/import/GitHubConnectStep.svelte";
+	import GitHubAuthorizeStep from "$lib/components/import/GitHubAuthorizeStep.svelte";
+	import GitHubRepoSelectStep from "$lib/components/import/GitHubRepoSelectStep.svelte";
+	import MigrationStep from "$lib/components/import/MigrationStep.svelte";
+	import { createGitHubImporter } from "$lib/components/import/gitHubImportState.svelte";
+	import { isAuthorizeGated } from "$lib/components/import/stepGating";
 
 	interface Props {
 		knots: readonly string[] | Promise<readonly string[]>;
diff --git a/web/src/lib/components/import/GitHubImporterFixture.svelte b/web/src/lib/components/import/GitHubImporterFixture.svelte
index f6c93e638..a31000f62 100644
--- a/web/src/lib/components/import/GitHubImporterFixture.svelte
+++ b/web/src/lib/components/import/GitHubImporterFixture.svelte
@@ -1,9 +1,6 @@
 <script lang="ts">
 	import GitHubImporter from "$lib/components/import/GitHubImporter.svelte";
 
-	interface Props {}
-
-
 	const account = {
 		publicOrigin: "https://github.com",
 		login: "ada",
@@ -60,7 +57,11 @@
 	};
 	globalThis.fetch = (async (input, init) => {
 		const href =
-			typeof input === "string" ? input : input instanceof Request ? input.url : String(input);
+			typeof input === "string"
+				? input
+				: input instanceof Request
+					? input.url
+					: String(input);
 		if (href.includes("migrator.example.test") && href.includes("listTasks")) {
 			return Response.json({ tasks: [earlierTask] });
 		}
diff --git a/web/src/lib/components/import/GitHubRepoSelectStep.svelte b/web/src/lib/components/import/GitHubRepoSelectStep.svelte
index b79d30feb..5f9d6bf50 100644
--- a/web/src/lib/components/import/GitHubRepoSelectStep.svelte
+++ b/web/src/lib/components/import/GitHubRepoSelectStep.svelte
@@ -6,7 +6,7 @@
 	import Fuse from "fuse.js";
 	import { tick } from "svelte";
 	import type { GitHubAccount, GitHubRepo } from "$lib/github";
-	import type { Draft } from "./gitHubImportState.svelte";
+	import type { Draft } from "$lib/components/import/gitHubImportState.svelte";
 	import Button from "$lib/components/ui/Button.svelte";
 	import Checkbox from "$lib/components/ui/Checkbox.svelte";
 	import LayerCard from "$lib/components/ui/LayerCard.svelte";
@@ -15,9 +15,9 @@
 	import Input from "$lib/components/ui/Input.svelte";
 	import Pagination from "$lib/components/ui/Pagination.svelte";
 	import { plural } from "$lib/format";
-	import RepoRow, { repoTableGrid } from "./RepoRow.svelte";
-	import { isMigratable } from "./gitHubImportState.svelte";
-	import { isMigrateDisabled, isRepoSelectGated } from "./stepGating";
+	import RepoRow, { repoTableGrid } from "$lib/components/import/RepoRow.svelte";
+	import { isMigratable } from "$lib/components/import/gitHubImportState.svelte";
+	import { isMigrateDisabled, isRepoSelectGated } from "$lib/components/import/stepGating";
 
 	interface Props {
 		number: number;
@@ -74,7 +74,11 @@
 				name: drafts[repo.id]?.name ?? repo.name,
 				description: drafts[repo.id]?.description ?? repo.description ?? ""
 			})),
-			{ keys: [{ name: "name", weight: 2 }, "description"], threshold: 0.4, ignoreLocation: true }
+			{
+				keys: [{ name: "name", weight: 2 }, "description"],
+				threshold: 0.4,
+				ignoreLocation: true
+			}
 		)
 	);
 	const filtered = $derived(
@@ -142,7 +146,9 @@
 						indeterminate={selectedCount > 0 && !allSelected}
 						disabled={stepDisabled}
 						onchange={() => onSelectAll(!allSelected)}
-						aria-label={allSelected ? "Deselect all repositories" : "Select all repositories"}
+						aria-label={allSelected
+							? "Deselect all repositories"
+							: "Select all repositories"}
 					/>
 					{#if searching}
 						<Input
@@ -171,7 +177,9 @@
 						/>
 					{:else}
 						{#if selectedCount > 0}
-							<span class="md:col-span-5">{selectedCount}/{repos.length} selected</span>
+							<span class="md:col-span-5"
+								>{selectedCount}/{repos.length} selected</span
+							>
 						{:else}
 							<span>Name</span>
 							<span class="hidden md:block"></span>
@@ -222,7 +230,9 @@
 					/>
 				{:else}
 					<p class="p-sm typography-paragraph-small text-foreground-muted">
-						{query.trim() ? "No repositories match your search." : "No public repositories found."}
+						{query.trim()
+							? "No repositories match your search."
+							: "No public repositories found."}
 					</p>
 				{/each}
 			</LayerCardPrimary>
diff --git a/web/src/lib/components/import/MigrationRow.svelte b/web/src/lib/components/import/MigrationRow.svelte
index 552489281..abe68a39b 100644
--- a/web/src/lib/components/import/MigrationRow.svelte
+++ b/web/src/lib/components/import/MigrationRow.svelte
@@ -10,6 +10,7 @@
 </script>
 
 <script lang="ts">
+	import type { ResolvedPathname } from "$app/types";
 	import Check from "$icon/check";
 	import Download from "$icon/download";
 	import ExternalLink from "$icon/external-link";
@@ -22,8 +23,8 @@
 		label: string;
 		state: "running" | "done" | "failed";
 		eta?: string;
-		href?: string;
-		logsHref?: string;
+		href?: ResolvedPathname;
+		logsHref?: ResolvedPathname;
 	}
 
 	let { label, percent, state, stage, eta, href, logsHref }: Props = $props();
diff --git a/web/src/lib/components/import/MigrationStep.svelte b/web/src/lib/components/import/MigrationStep.svelte
index a2019d0d7..93551d66a 100644
--- a/web/src/lib/components/import/MigrationStep.svelte
+++ b/web/src/lib/components/import/MigrationStep.svelte
@@ -23,8 +23,8 @@
 	import { grantRefused, migrationRunning } from "$lib/api/migrator";
 	import Button from "$lib/components/ui/Button.svelte";
 	import FormStep from "$lib/components/ui/FormStep.svelte";
-	import MigrationRow, { stageLabel } from "./MigrationRow.svelte";
-	import StartedBanner from "./StartedBanner.svelte";
+	import MigrationRow, { stageLabel } from "$lib/components/import/MigrationRow.svelte";
+	import StartedBanner from "$lib/components/import/StartedBanner.svelte";
 
 	interface Props {
 		number: number;
diff --git a/web/src/lib/components/import/RepoConfig.svelte b/web/src/lib/components/import/RepoConfig.svelte
index a1a310675..1a9986a7c 100644
--- a/web/src/lib/components/import/RepoConfig.svelte
+++ b/web/src/lib/components/import/RepoConfig.svelte
@@ -26,10 +26,7 @@
 	}: Props = $props();
 
 	// mirror knot through local state for Radio bind:group
-	let selectedKnot = $state<string>();
-	$effect(() => {
-		selectedKnot = knot;
-	});
+	let selectedKnot = $derived(knot);
 	$effect(() => {
 		if (selectedKnot !== undefined && selectedKnot !== knot) onKnot(selectedKnot);
 	});
diff --git a/web/src/lib/components/import/UrlRepoImporter.svelte b/web/src/lib/components/import/UrlRepoImporter.svelte
index 4f06b055f..af44c4673 100644
--- a/web/src/lib/components/import/UrlRepoImporter.svelte
+++ b/web/src/lib/components/import/UrlRepoImporter.svelte
@@ -2,6 +2,7 @@
 	import { page } from "$app/state";
 	import { onDestroy } from "svelte";
 	import { replaceState } from "$app/navigation";
+	import type { ResolvedPathname } from "$app/types";
 	import RefreshCw from "$icon/refresh-cw";
 	import UserKey from "$icon/user-key";
 	import { getAuth } from "$lib/auth.svelte";
@@ -14,7 +15,7 @@
 		MigrationGrantRequired,
 		type MigrationJobStatus
 	} from "$lib/api/migrator";
-	import RepoConfig from "./RepoConfig.svelte";
+	import RepoConfig from "$lib/components/import/RepoConfig.svelte";
 	import Button from "$lib/components/ui/Button.svelte";
 	import ErrorAlert from "$lib/components/ui/Error.svelte";
 	import Field from "$lib/components/ui/Field.svelte";
@@ -102,7 +103,7 @@
 		if (hasTransportParams) {
 			const clean = new URL(page.url);
 			for (const p of ["return_to", "oauth_error", "migrator"]) clean.searchParams.delete(p);
-			replaceState(clean, {});
+			replaceState(`${clean.pathname}${clean.search}${clean.hash}` as ResolvedPathname, {});
 		}
 	});
 
diff --git a/web/src/lib/components/import/gitHubImportState.svelte.ts b/web/src/lib/components/import/gitHubImportState.svelte.ts
index 0a7fdb9b2..794169817 100644
--- a/web/src/lib/components/import/gitHubImportState.svelte.ts
+++ b/web/src/lib/components/import/gitHubImportState.svelte.ts
@@ -1,11 +1,12 @@
 import { page } from "$app/state";
+import { SvelteSet } from "svelte/reactivity";
 import { isDid, type Did } from "@atcute/lexicons/syntax";
 import { getAuth } from "$lib/auth.svelte";
 import { hostForServiceDid, serviceDidForHost } from "$lib/auth/agent";
 import { validateRepoName } from "$lib/api/repoCreate";
 import type { GitHubAccount, GitHubRepo } from "$lib/github";
 import { flowReturnPath, returnPathFrom, startUrlFrom } from "$lib/api/migrator";
-import { hasGrantEvidence } from "./grantEvidence";
+import { hasGrantEvidence } from "$lib/components/import/grantEvidence";
 import {
 	findRepoCollisions,
 	fetchGitHubAccount,
@@ -21,8 +22,8 @@ import {
 	type MigrationJobStatus,
 	type MigrationTask
 } from "$lib/api/migrator";
-import type { MigrationItem } from "./MigrationStep.svelte";
-import { migrationRows } from "./migrationRows";
+import type { MigrationItem } from "$lib/components/import/MigrationStep.svelte";
+import { migrationRows } from "$lib/components/import/migrationRows";
 
 type Migration =
 	| { status: "idle" }
@@ -140,7 +141,7 @@ export const createGitHubImporter = (options: GitHubImporterOptions) => {
 	let account = $state<GitHubAccount | null>(null);
 	let accountLoading = $state(false);
 	let drafts = $state<Record<number, Draft>>({});
-	let expanded = $state<Set<number>>(new Set());
+	const expanded = new SvelteSet<number>();
 	let errorMessage = $state("");
 	let fetchedKnots = $state<readonly string[]>([]);
 	let grantConfirmed = $state(false);
@@ -349,10 +350,8 @@ export const createGitHubImporter = (options: GitHubImporterOptions) => {
 	};
 
 	const toggleExpand = (id: number) => {
-		const next = new Set(expanded);
-		if (next.has(id)) next.delete(id);
-		else next.add(id);
-		expanded = next;
+		if (expanded.has(id)) expanded.delete(id);
+		else expanded.add(id);
 	};
 
 	const collidingNames = (names: string[]): string[] =>
@@ -439,7 +438,7 @@ export const createGitHubImporter = (options: GitHubImporterOptions) => {
 			drafts = {};
 			loadedTasks = [];
 			running = false;
-			expanded = new Set();
+			expanded.clear();
 			grantConfirmed = false;
 			sessionTaskCreated = false;
 			grantAsked = false;
@@ -724,7 +723,7 @@ export const createGitHubImporter = (options: GitHubImporterOptions) => {
 		}
 
 		let reached = 0;
-		for (const taskId of new Set(watched)) {
+		for (const taskId of watched.filter((id, i) => watched.indexOf(id) === i)) {
 			if (stale(version)) return;
 			try {
 				const task = await getMigrationTask(agent, options.migratorUrl(), taskId);
diff --git a/web/src/lib/components/import/gitHubImportState.test.ts b/web/src/lib/components/import/gitHubImportState.test.ts
index 28cd4658b..4799d4b85 100644
--- a/web/src/lib/components/import/gitHubImportState.test.ts
+++ b/web/src/lib/components/import/gitHubImportState.test.ts
@@ -1,5 +1,11 @@
 import { describe, expect, it } from "vitest";
-import { createRememberedGrant, createRunGuard, isMigratable, matchJobToRepo, resolveKnotOptions } from "./gitHubImportState.svelte";
+import {
+	createRememberedGrant,
+	createRunGuard,
+	isMigratable,
+	matchJobToRepo,
+	resolveKnotOptions
+} from "$lib/components/import/gitHubImportState.svelte";
 
 describe("matchJobToRepo", () => {
 	const repos = [
@@ -77,7 +83,11 @@ describe("isMigratable", () => {
 		["submitting", { status: "submitting" }, false],
 		["landed", { status: "success", jobStatus: "completed" }, false],
 		["landed but failed", { status: "success", jobStatus: "failed" }, true],
-		["landed but needs authorization", { status: "success", jobStatus: "authorization_required" }, true]
+		[
+			"landed but needs authorization",
+			{ status: "success", jobStatus: "authorization_required" },
+			true
+		]
 	])("treats a row with %s as migratable: %s", (_name, migration, expected) => {
 		expect(isMigratable(migration as never)).toBe(expected);
 	});
diff --git a/web/src/lib/components/import/grantEvidence.test.ts b/web/src/lib/components/import/grantEvidence.test.ts
index 7cc5d17d1..4197236f1 100644
--- a/web/src/lib/components/import/grantEvidence.test.ts
+++ b/web/src/lib/components/import/grantEvidence.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { hasGrantEvidence } from "./grantEvidence";
+import { hasGrantEvidence } from "$lib/components/import/grantEvidence";
 
 const url = (search: string) => ({ searchParams: new URLSearchParams(search) });
 
@@ -19,9 +19,9 @@ describe("hasGrantEvidence", () => {
 
 	it("trusts the callback's attestation only when it came back without an error", () => {
 		expect(hasGrantEvidence({ granted: true, url: url("") })).toBe(true);
-		expect(
-			hasGrantEvidence({ granted: true, url: url("?oauth_error=grant_failed") })
-		).toBe(false);
+		expect(hasGrantEvidence({ granted: true, url: url("?oauth_error=grant_failed") })).toBe(
+			false
+		);
 		expect(hasGrantEvidence({ granted: false, url: url("?page=2") })).toBe(false);
 	});
 });
diff --git a/web/src/lib/components/import/migrationRows.test.ts b/web/src/lib/components/import/migrationRows.test.ts
index edccc882f..63b64c31f 100644
--- a/web/src/lib/components/import/migrationRows.test.ts
+++ b/web/src/lib/components/import/migrationRows.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 import type { MigrationTask } from "$lib/api/migrator";
-import { migrationRows } from "./migrationRows";
+import { migrationRows } from "$lib/components/import/migrationRows";
 
 const makeTask = (
 	id: string,
diff --git a/web/src/lib/components/import/migrationRows.ts b/web/src/lib/components/import/migrationRows.ts
index 67df2d648..ae2e61737 100644
--- a/web/src/lib/components/import/migrationRows.ts
+++ b/web/src/lib/components/import/migrationRows.ts
@@ -1,5 +1,5 @@
 import type { MigrationTask } from "$lib/api/migrator";
-import type { MigrationItem } from "./MigrationStep.svelte";
+import type { MigrationItem } from "$lib/components/import/MigrationStep.svelte";
 
 type MigrationRowDraft = {
 	id?: string | number;
diff --git a/web/src/lib/components/import/stepGating.test.ts b/web/src/lib/components/import/stepGating.test.ts
index 42452af42..6039e5d42 100644
--- a/web/src/lib/components/import/stepGating.test.ts
+++ b/web/src/lib/components/import/stepGating.test.ts
@@ -1,5 +1,9 @@
 import { describe, expect, it } from "vitest";
-import { isAuthorizeGated, isMigrateDisabled, isRepoSelectGated } from "./stepGating";
+import {
+	isAuthorizeGated,
+	isMigrateDisabled,
+	isRepoSelectGated
+} from "$lib/components/import/stepGating";
 
 describe("stepGating", () => {
 	const dummyAccount = { login: "octocat" };
diff --git a/web/src/lib/components/organization/OrganizationCreationForm.svelte b/web/src/lib/components/organization/OrganizationCreationForm.svelte
index 76e753c8e..8b567e676 100644
--- a/web/src/lib/components/organization/OrganizationCreationForm.svelte
+++ b/web/src/lib/components/organization/OrganizationCreationForm.svelte
@@ -211,9 +211,7 @@
 				subtitle="Pick a name for your organization."
 				for="organization-handle"
 			>
-				{#snippet children()}
-					{@render field()}
-				{/snippet}
+				{@render field()}
 			</Field>
 			{#if accounts.length > 1}
 				<Field
@@ -221,9 +219,7 @@
 					subtitle="The account that will own this organization."
 					class="mt-xs"
 				>
-					{#snippet children()}
-						{@render owner()}
-					{/snippet}
+					{@render owner()}
 				</Field>
 			{/if}
 			<div class="mt-md flex flex-col gap-md">
diff --git a/web/src/lib/components/profile/ProfileSocialLinks.svelte b/web/src/lib/components/profile/ProfileSocialLinks.svelte
index 636730d0b..916bb128f 100644
--- a/web/src/lib/components/profile/ProfileSocialLinks.svelte
+++ b/web/src/lib/components/profile/ProfileSocialLinks.svelte
@@ -9,7 +9,7 @@
 	import { formatCount, pluralize } from "$lib/format";
 
 	interface Props {
-		identity: { did: string; handle: string };
+		identity: { handle: string };
 		profile: ProfileRecord;
 		followers: number;
 		following?: number;
diff --git a/web/src/lib/components/profile/RepoSearchForm.svelte b/web/src/lib/components/profile/RepoSearchForm.svelte
index 5323fd093..6f4812d96 100644
--- a/web/src/lib/components/profile/RepoSearchForm.svelte
+++ b/web/src/lib/components/profile/RepoSearchForm.svelte
@@ -20,7 +20,7 @@
 			placeholder="Search repositories..."
 			aria-label="Search repositories"
 			iconLeft={Search}
-			class={hasQuery ? "h-full w-full pr-9" : "h-full w-full"}
+			class={hasQuery ? "size-full  pr-9" : "size-full "}
 		/>
 		{#if hasQuery}
 			<Button
diff --git a/web/src/lib/components/profile/UserProfileChrome.svelte b/web/src/lib/components/profile/UserProfileChrome.svelte
index 7e56ee2bf..de0fb746f 100644
--- a/web/src/lib/components/profile/UserProfileChrome.svelte
+++ b/web/src/lib/components/profile/UserProfileChrome.svelte
@@ -12,7 +12,7 @@
 	import ProfileTabs from "$lib/components/profile/ProfileTabs.svelte";
 	import VouchButton from "$lib/components/profile/VouchButton.svelte";
 	import type { DirectVouch, NetworkVouch, ProfileCounts } from "$lib/components/profile/types";
-	import Avatar, { avatar } from "$lib/components/ui/Avatar.svelte";
+	import Avatar from "$lib/components/ui/Avatar.svelte";
 	import { avatarUrl } from "$lib/avatar.ts";
 	import Button from "$lib/components/ui/Button.svelte";
 	import Card from "$lib/components/ui/Card.svelte";
diff --git a/web/src/lib/components/repo/LabelPanel.svelte b/web/src/lib/components/repo/LabelPanel.svelte
index f9ddaa016..f2d80dc71 100644
--- a/web/src/lib/components/repo/LabelPanel.svelte
+++ b/web/src/lib/components/repo/LabelPanel.svelte
@@ -190,20 +190,20 @@
 						<Link
 							href={label.href}
 							variant="inherit"
-							class="flex min-w-0 items-center gap-xs rounded-md border border-border-default bg-background-default px-xs py-[3px] hover:bg-background-subtle hover:no-underline"
+							class="flex min-w-0 items-center gap-xs rounded-md border border-border-default bg-background-default px-xs py-0.75 hover:bg-background-subtle hover:no-underline"
 						>
 							{@render labelBall(label)}
 						</Link>
 					{:else}
 						<span
-							class="flex min-w-0 items-center gap-xs rounded-md border border-border-default bg-background-default px-xs py-[3px]"
+							class="flex min-w-0 items-center gap-xs rounded-md border border-border-default bg-background-default px-xs py-0.75"
 						>
 							{@render labelBall(label)}
 						</span>
 					{/if}
 				</li>
 			{:else}
-				<li class="flex py-[3px] typography-paragraph-small text-foreground-muted">
+				<li class="flex py-0.75 typography-paragraph-small text-foreground-muted">
 					No labels
 				</li>
 			{/each}
diff --git a/web/src/lib/components/repo/RepoIndexView.stories.svelte b/web/src/lib/components/repo/RepoIndexView.stories.svelte
index 87d2325da..440b09ce4 100644
--- a/web/src/lib/components/repo/RepoIndexView.stories.svelte
+++ b/web/src/lib/components/repo/RepoIndexView.stories.svelte
@@ -237,9 +237,7 @@
 		await waitFor(() =>
 			expect(canvas.getByText("The import from GitHub failed.")).toBeVisible()
 		);
-		await waitFor(() =>
-			expect(canvas.getByText("clone timed out after 300s")).toBeVisible()
-		);
+		await waitFor(() => expect(canvas.getByText("clone timed out after 300s")).toBeVisible());
 		expect(canvas.queryByText("This is an empty repository.")).toBeNull();
 	}}
 />
diff --git a/web/src/lib/components/repo/importPoll.test.ts b/web/src/lib/components/repo/importPoll.test.ts
index 4017cf380..8862a7e70 100644
--- a/web/src/lib/components/repo/importPoll.test.ts
+++ b/web/src/lib/components/repo/importPoll.test.ts
@@ -14,7 +14,13 @@ describe("startImportPoll", () => {
 		const fetchState = vi.fn().mockResolvedValueOnce(importing).mockResolvedValue(null);
 		const onState = vi.fn();
 		const onSettled = vi.fn();
-		const stop = startImportPoll({ fetchState, onState, onSettled, minDelayMs: 100, maxDelayMs: 200 });
+		const stop = startImportPoll({
+			fetchState,
+			onState,
+			onSettled,
+			minDelayMs: 100,
+			maxDelayMs: 200
+		});
 
 		await vi.advanceTimersByTimeAsync(100);
 		expect(onState).toHaveBeenLastCalledWith(importing);
diff --git a/web/src/lib/components/repo/pipelines/PipelineSearch.svelte b/web/src/lib/components/repo/pipelines/PipelineSearch.svelte
index e79af9b16..105fe8770 100644
--- a/web/src/lib/components/repo/pipelines/PipelineSearch.svelte
+++ b/web/src/lib/components/repo/pipelines/PipelineSearch.svelte
@@ -5,7 +5,7 @@
 		slots: {
 			form: "flex w-full",
 			field: "relative flex w-full items-center",
-			input: "h-full w-full",
+			input: "size-full",
 			clear: "absolute right-0.5"
 		},
 		variants: {
diff --git a/web/src/lib/components/repo/pulls/PullCommitListHeader.svelte b/web/src/lib/components/repo/pulls/PullCommitListHeader.svelte
index 40398bee0..7ab2bb240 100644
--- a/web/src/lib/components/repo/pulls/PullCommitListHeader.svelte
+++ b/web/src/lib/components/repo/pulls/PullCommitListHeader.svelte
@@ -7,7 +7,6 @@
 	import PullVersionList from "$lib/components/repo/pulls/PullVersionList.svelte";
 	import { type Range } from "$lib/components/ui/RangeSelector.svelte";
 	import type { PullSubmission } from "$lib/api";
-	import Separator from "$lib/components/ui/Separator.svelte";
 	import TextSwap from "$lib/components/ui/TextSwap.svelte";
 
 	interface Props {
diff --git a/web/src/lib/components/repo/pulls/PullCompose.svelte b/web/src/lib/components/repo/pulls/PullCompose.svelte
index 7a5de411b..f40872cb3 100644
--- a/web/src/lib/components/repo/pulls/PullCompose.svelte
+++ b/web/src/lib/components/repo/pulls/PullCompose.svelte
@@ -17,12 +17,7 @@
 	import { rkeyFromUri } from "$lib/api/uri";
 	import { pingIndexNow } from "$lib/api/indexnow";
 	import { createEntitySubscription } from "$lib/api/graph";
-	import {
-		composeQuery,
-		loadCompose,
-		type ComposeData,
-		type PullSource
-	} from "$lib/api/pullCompose";
+	import { composeQuery, loadCompose, type ComposeData } from "$lib/api/pullCompose";
 	import { loadDiff, type RepoDiffDeps, type RepoDiffSpec } from "$lib/api/repoDiff";
 	import { createAction, createLoad } from "$lib/action.svelte";
 	import { getAuth } from "$lib/auth.svelte";
@@ -35,7 +30,6 @@
 	import MarkdownEditor from "$lib/components/ui/MarkdownEditor.svelte";
 	import Spinner from "$lib/components/ui/Spinner.svelte";
 	import StepMarker from "$lib/components/ui/StepMarker.svelte";
-	import Textarea from "$lib/components/ui/Textarea.svelte";
 	import DiffView from "$lib/components/repo/DiffView.svelte";
 	import PullCommitList from "$lib/components/repo/pulls/PullCommitList.svelte";
 	import PullCommitListHeader from "$lib/components/repo/pulls/PullCommitListHeader.svelte";
diff --git a/web/src/lib/components/repo/tickets/TicketSearch.svelte b/web/src/lib/components/repo/tickets/TicketSearch.svelte
index 01f68de7e..87b18b661 100644
--- a/web/src/lib/components/repo/tickets/TicketSearch.svelte
+++ b/web/src/lib/components/repo/tickets/TicketSearch.svelte
@@ -31,7 +31,7 @@
 			placeholder="{label}..."
 			aria-label={label}
 			iconLeft={Search}
-			class={value ? "h-full w-full pr-9" : "h-full w-full"}
+			class={value ? "size-full  pr-9" : "size-full "}
 		/>
 		{#if value}
 			<Button
diff --git a/web/src/lib/components/settings/tabs/EmailsTab.svelte b/web/src/lib/components/settings/tabs/EmailsTab.svelte
index 2514aa671..976b900df 100644
--- a/web/src/lib/components/settings/tabs/EmailsTab.svelte
+++ b/web/src/lib/components/settings/tabs/EmailsTab.svelte
@@ -34,7 +34,10 @@
 	import Hourglass from "$icon/hourglass";
 	import Send from "$icon/send";
 	import X from "$icon/x";
-	import { hasUnverifiedEmails, recheckUnverifiedEmails } from "./emailRecheck";
+	import {
+		hasUnverifiedEmails,
+		recheckUnverifiedEmails
+	} from "$lib/components/settings/tabs/emailRecheck";
 
 	interface Props {
 		embedded?: boolean;
diff --git a/web/src/lib/components/settings/tabs/emailRecheck.test.ts b/web/src/lib/components/settings/tabs/emailRecheck.test.ts
index e7dde40d1..b37a7655b 100644
--- a/web/src/lib/components/settings/tabs/emailRecheck.test.ts
+++ b/web/src/lib/components/settings/tabs/emailRecheck.test.ts
@@ -59,7 +59,12 @@ describe("recheckUnverifiedEmails", () => {
 		const { channel } = fakeChannel();
 		const initial = [email("alice@example.com", false)];
 		const fetchLatest = vi.fn().mockResolvedValue(initial);
-		const stop = recheckUnverifiedEmails(() => initial, fetchLatest, () => {}, { visibility, channel });
+		const stop = recheckUnverifiedEmails(
+			() => initial,
+			fetchLatest,
+			() => {},
+			{ visibility, channel }
+		);
 
 		expect(fetchLatest).not.toHaveBeenCalled();
 		visible();
@@ -73,7 +78,12 @@ describe("recheckUnverifiedEmails", () => {
 		const { channel } = fakeChannel();
 		const initial = [email("alice@example.com", false)];
 		const fetchLatest = vi.fn().mockResolvedValue(initial);
-		const stop = recheckUnverifiedEmails(() => initial, fetchLatest, () => {}, { visibility, channel });
+		const stop = recheckUnverifiedEmails(
+			() => initial,
+			fetchLatest,
+			() => {},
+			{ visibility, channel }
+		);
 
 		focus();
 		await settled();
@@ -109,7 +119,12 @@ describe("recheckUnverifiedEmails", () => {
 		const { channel } = fakeChannel();
 		const initial = [email("alice@example.com", false)];
 		const fetchLatest = vi.fn().mockResolvedValue(initial);
-		const stop = recheckUnverifiedEmails(() => initial, fetchLatest, () => {}, { visibility, channel });
+		const stop = recheckUnverifiedEmails(
+			() => initial,
+			fetchLatest,
+			() => {},
+			{ visibility, channel }
+		);
 
 		visible();
 		await settled();
@@ -123,9 +138,17 @@ describe("recheckUnverifiedEmails", () => {
 		const initial = [email("alice@example.com", false)];
 		let release: (rows: ListEmailItem[]) => void = () => {};
 		const fetchLatest = vi.fn(
-			() => new Promise<ListEmailItem[]>((resolve) => { release = resolve; })
+			() =>
+				new Promise<ListEmailItem[]>((resolve) => {
+					release = resolve;
+				})
+		);
+		const stop = recheckUnverifiedEmails(
+			() => initial,
+			fetchLatest,
+			() => {},
+			{ visibility, channel }
 		);
-		const stop = recheckUnverifiedEmails(() => initial, fetchLatest, () => {}, { visibility, channel });
 
 		visible();
 		await settled();
@@ -146,7 +169,12 @@ describe("recheckUnverifiedEmails", () => {
 		const { channel, verifiedElsewhere, wasUnsubscribed } = fakeChannel();
 		const initial = [email("alice@example.com", false)];
 		const fetchLatest = vi.fn().mockResolvedValue(initial);
-		const stop = recheckUnverifiedEmails(() => initial, fetchLatest, () => {}, { visibility, channel });
+		const stop = recheckUnverifiedEmails(
+			() => initial,
+			fetchLatest,
+			() => {},
+			{ visibility, channel }
+		);
 
 		stop();
 		expect(wasUnsubscribed()).toBe(true);
@@ -162,7 +190,12 @@ describe("recheckUnverifiedEmails", () => {
 		const { channel } = fakeChannel();
 		const verified = [email("alice@example.com", true)];
 		const fetchLatest = vi.fn().mockResolvedValue(verified);
-		const stop = recheckUnverifiedEmails(() => verified, fetchLatest, () => {}, { visibility, channel });
+		const stop = recheckUnverifiedEmails(
+			() => verified,
+			fetchLatest,
+			() => {},
+			{ visibility, channel }
+		);
 
 		visible();
 		await settled();
@@ -183,7 +216,9 @@ describe("EmailsTab rows", () => {
 			[
 				AUTH_KEY,
 				{
-					agent: { session: { token: { sub: "did:plc:alice" } } } as unknown as OAuthUserAgent,
+					agent: {
+						session: { token: { sub: "did:plc:alice" } }
+					} as unknown as OAuthUserAgent,
 					currentDid: "did:plc:alice",
 					agentPending: false
 				} as unknown as Auth
diff --git a/web/src/lib/components/timeline/PreviewCard.svelte b/web/src/lib/components/timeline/PreviewCard.svelte
index 800be41d4..1021a1bfb 100644
--- a/web/src/lib/components/timeline/PreviewCard.svelte
+++ b/web/src/lib/components/timeline/PreviewCard.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-	import { resolve } from "$app/paths";
 	import type { Component, Snippet } from "svelte";
 	import type { SvelteHTMLElements } from "svelte/elements";
 	import LayerCard from "$lib/components/ui/LayerCard.svelte";
diff --git a/web/src/lib/components/timeline/RecentItem.svelte b/web/src/lib/components/timeline/RecentItem.svelte
index a4d250d02..39c0b2897 100644
--- a/web/src/lib/components/timeline/RecentItem.svelte
+++ b/web/src/lib/components/timeline/RecentItem.svelte
@@ -81,7 +81,7 @@
 
 <a
 	href={resolve(recentPath(item) as "/")}
-	class="relative grid grid-cols-[1.75rem_1fr_auto] grid-rows-2 gap-x-sm overflow-hidden rounded-[calc(var(--radius-md)-1px-var(--spacing-2xs))] px-sm py-sm typography-paragraph-small no-underline hover:bg-background-canvas hover:no-underline dark:hover:bg-background-inset"
+	class="relative grid grid-cols-[1.75rem_1fr_auto] grid-rows-2 gap-x-sm overflow-hidden rounded-[calc(var(--radius-md)-1px-var(--spacing-2xs))] p-3 typography-paragraph-small no-underline hover:bg-background-canvas hover:no-underline dark:hover:bg-background-inset"
 >
 	{#if item.kind === "repo"}
 		<span class="relative z-10 col-start-1 row-span-2 row-start-1 self-center">
diff --git a/web/src/lib/components/ui/Button.stories.svelte b/web/src/lib/components/ui/Button.stories.svelte
index 0278806ac..5bf574464 100644
--- a/web/src/lib/components/ui/Button.stories.svelte
+++ b/web/src/lib/components/ui/Button.stories.svelte
@@ -2,7 +2,6 @@
 	import { defineMeta } from "@storybook/addon-svelte-csf";
 	import { expect, fireEvent, fn, waitFor } from "storybook/test";
 	import ChevronRight from "$icon/chevron-right";
-	import GitFork from "$icon/git-fork";
 	import Star from "$icon/star";
 	import Button from "$lib/components/ui/Button.svelte";
 
diff --git a/web/src/lib/components/ui/Checkbox.svelte b/web/src/lib/components/ui/Checkbox.svelte
index 2d33fef28..579771fdd 100644
--- a/web/src/lib/components/ui/Checkbox.svelte
+++ b/web/src/lib/components/ui/Checkbox.svelte
@@ -9,7 +9,7 @@
 		slots: {
 			label: "inline-flex items-center gap-xs",
 			input: [
-				"peer size-4 shrink-0 appearance-none rounded border border-border-default bg-background-default",
+				"peer size-4 shrink-0 appearance-none rounded-sm border border-border-default bg-background-default",
 				"hover:cursor-pointer hover:bg-background-inset",
 				"checked:border-foreground-default checked:bg-foreground-default checked:hover:bg-foreground-default",
 				"indeterminate:border-foreground-default indeterminate:bg-foreground-default indeterminate:hover:bg-foreground-default",
diff --git a/web/src/lib/components/ui/Combobox.svelte b/web/src/lib/components/ui/Combobox.svelte
index 999fefd10..d0f47e50b 100644
--- a/web/src/lib/components/ui/Combobox.svelte
+++ b/web/src/lib/components/ui/Combobox.svelte
@@ -10,7 +10,7 @@
 			search: "shrink-0 border-b border-border-default p-xs",
 			list: "min-h-0 flex-auto touch-pan-y overflow-y-auto overscroll-contain p-2xs [-webkit-overflow-scrolling:touch]",
 			groupHeading: "px-xs pt-xs pb-2xs font-semibold text-foreground-muted first:pt-2xs",
-			option: "flex w-full cursor-pointer items-center gap-xs rounded bg-transparent px-xs py-1.5 text-left aria-disabled:cursor-not-allowed aria-disabled:text-foreground-disabled data-active:bg-background-subtle dark:data-active:bg-background-subtle",
+			option: "flex w-full cursor-pointer items-center gap-xs rounded-sm bg-transparent px-xs py-1.5 text-left aria-disabled:cursor-not-allowed aria-disabled:text-foreground-disabled data-active:bg-background-subtle dark:data-active:bg-background-subtle",
 			check: "size-3.5 shrink-0 text-foreground-default",
 			optionLabel: "min-w-0 flex-1 truncate",
 			hint: "shrink-0 text-foreground-subtle",
diff --git a/web/src/lib/components/ui/Kbd.svelte b/web/src/lib/components/ui/Kbd.svelte
index b0590445f..01f52b3b7 100644
--- a/web/src/lib/components/ui/Kbd.svelte
+++ b/web/src/lib/components/ui/Kbd.svelte
@@ -2,7 +2,7 @@
 	import { tv, type VariantProps } from "tailwind-variants";
 
 	export const kbd = tv({
-		base: "inline-flex h-4.5 min-w-4.5 items-center justify-center rounded border px-1 pb-3xs font-sans typography-paragraph-mini not-italic select-none",
+		base: "inline-flex h-4.5 min-w-4.5 items-center justify-center rounded-sm border px-1 pb-3xs font-sans typography-paragraph-mini not-italic select-none",
 		variants: {
 			inverted: {
 				false: "border-border-default bg-background-default text-foreground-default shadow-[inset_0_-2px_0_0_var(--color-shadow-inner-subtle)]",
diff --git a/web/src/lib/components/ui/Lightbox.svelte b/web/src/lib/components/ui/Lightbox.svelte
index 9252f114d..e136574ef 100644
--- a/web/src/lib/components/ui/Lightbox.svelte
+++ b/web/src/lib/components/ui/Lightbox.svelte
@@ -35,7 +35,7 @@
 	import ZoomOut from "$icon/zoom-out";
 	import { CELL, HOME, Motion, VEIL } from "$lib/motion/value.svelte";
 	import type { LightboxImage } from "$lib/lightbox.svelte";
-	import ButtonGroup from "./ButtonGroup.svelte";
+	import ButtonGroup from "$lib/components/ui/ButtonGroup.svelte";
 
 	interface Props {
 		open: boolean;
diff --git a/web/src/lib/components/ui/Logo.svelte b/web/src/lib/components/ui/Logo.svelte
index cb3293417..08468e8ed 100644
--- a/web/src/lib/components/ui/Logo.svelte
+++ b/web/src/lib/components/ui/Logo.svelte
@@ -73,7 +73,7 @@
 	<span class="inline-flex items-center gap-xs select-none">
 		{@render mark()}
 		<span
-			class="rounded bg-background-subtle px-2xs typography-paragraph-mini font-normal text-foreground-default not-italic"
+			class="rounded-sm bg-background-subtle px-2xs typography-paragraph-mini font-normal text-foreground-default not-italic"
 		>
 			alpha
 		</span>
diff --git a/web/src/lib/components/ui/Tabs.svelte b/web/src/lib/components/ui/Tabs.svelte
index 92b680924..4b315b623 100644
--- a/web/src/lib/components/ui/Tabs.svelte
+++ b/web/src/lib/components/ui/Tabs.svelte
@@ -25,8 +25,7 @@
 			vertical: {
 				true: {
 					nav: "relative flex w-full flex-col gap-2xs bg-background-navigation-frame p-xs",
-					plate:
-						"rounded-md bg-background-navigation-item edge-ring-inset inset-ring-border-navigation-item-active",
+					plate: "rounded-md bg-background-navigation-item edge-ring-inset inset-ring-border-navigation-item-active",
 					item: "min-h-8 w-full gap-1.5 overflow-hidden rounded-md px-sm py-1.5 typography-paragraph-regular text-foreground-default focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-border-focus",
 					icon: "size-3.5 shrink-0",
 					label: "min-w-0 truncate",
@@ -46,8 +45,7 @@
 					count: "bg-background-muted"
 				},
 				false: {
-					count:
-						"bg-background-muted group-hover/item:bg-background-strong dark:bg-background-subtle group-hover/item:dark:bg-background-subtle"
+					count: "bg-background-muted group-hover/item:bg-background-strong dark:bg-background-subtle group-hover/item:dark:bg-background-subtle"
 				}
 			},
 			layered: { true: {}, false: {} },
@@ -146,7 +144,9 @@
 	const items = $derived(
 		defs.map((tab) => ({
 			...tab,
-			url: (tab.href.startsWith("/") ? resolve(tab.href as "/") : tab.href) as ResolvedPathname
+			url: (tab.href.startsWith("/")
+				? resolve(tab.href as "/")
+				: tab.href) as ResolvedPathname
 		}))
 	);
 
@@ -217,9 +217,12 @@
 	let placed = false;
 	$effect(() => {
 		if (!box) return;
-		plate.set(vertical ? { pos: box.top, size: box.height } : { pos: box.left, size: box.width }, {
-			instant: !placed || prefersReducedMotion.current
-		});
+		plate.set(
+			vertical ? { pos: box.top, size: box.height } : { pos: box.left, size: box.width },
+			{
+				instant: !placed || prefersReducedMotion.current
+			}
+		);
 		placed = true;
 		ready = true;
 	});
@@ -266,11 +269,15 @@
 						{/snippet}
 						{@const count = await tab.count}
 						{#if count}
-							<span class={style.count({ selected: isSelected })}>{formatCount(count)}</span>
+							<span class={style.count({ selected: isSelected })}
+								>{formatCount(count)}</span
+							>
 						{/if}
 					</Pending>
 				{:else if tab.count}
-					<span class={style.count({ selected: isSelected })}>{formatCount(tab.count)}</span>
+					<span class={style.count({ selected: isSelected })}
+						>{formatCount(tab.count)}</span
+					>
 				{/if}
 			{/if}
 		</a>
diff --git a/web/src/lib/components/ui/TagInput.svelte b/web/src/lib/components/ui/TagInput.svelte
index f491904a1..5ef1a5cdf 100644
--- a/web/src/lib/components/ui/TagInput.svelte
+++ b/web/src/lib/components/ui/TagInput.svelte
@@ -7,17 +7,17 @@
 			list: "flex min-w-0 flex-1 flex-wrap content-center items-center",
 			item: "flex min-w-0",
 			draftItem: "flex min-w-0 flex-1 items-center",
-			chip: "max-w-full rounded py-0 ring-1 inset-ring-0 ring-border-default",
+			chip: "max-w-full rounded-sm py-0 ring-1 inset-ring-0 ring-border-default",
 			icon: "shrink-0 text-foreground-subtle",
 			spinner: "shrink-0 self-start",
 			field: "shrink-0 opacity-70",
 			label: "truncate",
-			remove: "text-foreground-inherit flex min-h-0 min-w-0 shrink-0 rounded p-none shadow-none hover:bg-alpha-dark-10 focus-visible:outline-1 focus-visible:outline-offset-1 focus-visible:outline-border-focus",
+			remove: "text-foreground-inherit flex min-h-0 min-w-0 shrink-0 rounded-sm p-none shadow-none hover:bg-alpha-dark-10 focus-visible:outline-1 focus-visible:outline-offset-1 focus-visible:outline-border-focus",
 			draft: "w-full min-w-0 bg-transparent px-1 outline-none placeholder:text-foreground-placeholder placeholder:transition-opacity placeholder:duration-200 disabled:cursor-not-allowed motion-reduce:placeholder:transition-none",
 			panel: "tag-panel fixed inset-auto z-50 m-none hidden h-fit max-h-[min(18rem,calc(100dvh-1rem))] w-72 max-w-[calc(100vw-1rem)] popover-transition flex-col overflow-hidden rounded-md bg-background-default p-none text-foreground-default edge-ring open:flex",
 			options:
 				"min-h-0 flex-auto touch-pan-y overflow-y-auto overscroll-contain p-2xs [-webkit-overflow-scrolling:touch]",
-			option: "flex w-full cursor-pointer items-center gap-xs rounded bg-transparent px-xs py-1.5 text-left data-active:bg-background-subtle",
+			option: "flex w-full cursor-pointer items-center gap-xs rounded-sm bg-transparent px-xs py-1.5 text-left data-active:bg-background-subtle",
 			optionLabel: "min-w-0 flex-1 truncate",
 			empty: "px-xs py-xl text-center text-foreground-muted",
 			footer: "mt-1.5 flex items-start gap-xs",
@@ -32,7 +32,7 @@
 				mini: {
 					icon: "ml-0.5",
 					spinner: "m-0.5",
-					chip: "h-4 gap-1 pr-px pl-1 typography-paragraph-mini leading-3",
+					chip: "h-4 gap-1 pr-px pl-1 text-[10px]/3",
 					remove: "size-3",
 					list: "gap-2xs",
 					draftItem: "basis-16",
@@ -40,8 +40,8 @@
 					panel: "typography-paragraph-mini"
 				},
 				small: {
-					icon: "ml-[3px]",
-					spinner: "m-[3px]",
+					icon: "ml-0.75",
+					spinner: "m-0.75",
 					chip: "h-5 gap-1.5 pr-0.5 pl-1.5 typography-paragraph-mini leading-4",
 					remove: "size-3.5",
 					list: "gap-2xs",
@@ -52,9 +52,9 @@
 					panel: "typography-paragraph-small"
 				},
 				regular: {
-					icon: "ml-[5px]",
-					spinner: "m-[5px]",
-					chip: "h-6 gap-2.5 pr-[3px] pl-2 typography-paragraph-small leading-4",
+					icon: "ml-1.25",
+					spinner: "m-1.25",
+					chip: "h-6 gap-2.5 pr-0.75 pl-2 typography-paragraph-small leading-4",
 					remove: "size-3.5",
 					list: "gap-1.5",
 					draftItem: "basis-20",
diff --git a/web/src/lib/components/ui/inputField.ts b/web/src/lib/components/ui/inputField.ts
index 3f26c9ee7..e34dc80bc 100644
--- a/web/src/lib/components/ui/inputField.ts
+++ b/web/src/lib/components/ui/inputField.ts
@@ -27,7 +27,7 @@ export const inputField = tv({
 	base: "flex items-center rounded-md bg-background-default edge-ring-inset transition-colors",
 	variants: {
 		size: {
-			mini: "min-h-6 gap-2xs rounded typography-paragraph-mini",
+			mini: "min-h-6 gap-2xs rounded-sm typography-paragraph-mini",
 			small: "min-h-7 gap-1.5 rounded-sm typography-paragraph-small",
 			regular: "min-h-8 gap-xs typography-paragraph-regular",
 			large: "min-h-9 gap-2.5 typography-paragraph-large"
diff --git a/web/src/lib/components/welcome/EmailsStep.svelte b/web/src/lib/components/welcome/EmailsStep.svelte
index d8322841c..ef8e15dd9 100644
--- a/web/src/lib/components/welcome/EmailsStep.svelte
+++ b/web/src/lib/components/welcome/EmailsStep.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import EmailsTab from "$lib/components/settings/tabs/EmailsTab.svelte";
-	import StepHeader from "./StepHeader.svelte";
+	import StepHeader from "$lib/components/welcome/StepHeader.svelte";
 
 	interface Props {
 		deliberiUrl?: string;
diff --git a/web/src/lib/server/github/api.ts b/web/src/lib/server/github/api.ts
index 088fc70cb..183c0a4e7 100644
--- a/web/src/lib/server/github/api.ts
+++ b/web/src/lib/server/github/api.ts
@@ -1,5 +1,5 @@
 import type { GitHubAccount, GitHubKey, GitHubRepo } from "$lib/github";
-import { type GitHubEnv, hostOf } from "./env";
+import { type GitHubEnv, hostOf } from "$lib/server/github/env";
 
 export class GitHubUpstreamError extends Error {
 	constructor(public status: number) {
diff --git a/web/src/lib/server/github/cookies.ts b/web/src/lib/server/github/cookies.ts
index c37e9433b..4c446762c 100644
--- a/web/src/lib/server/github/cookies.ts
+++ b/web/src/lib/server/github/cookies.ts
@@ -1,5 +1,5 @@
 import type { Cookies } from "@sveltejs/kit";
-import { isSecureRequest } from "./http";
+import { isSecureRequest } from "$lib/server/github/http";
 
 export const GITHUB_TOKEN_COOKIE = "tangled.github.token";
 export const GITHUB_STATE_COOKIE = "tangled.github.state";
diff --git a/web/src/lib/server/github/index.ts b/web/src/lib/server/github/index.ts
index 57bd6a554..0c674caf2 100644
--- a/web/src/lib/server/github/index.ts
+++ b/web/src/lib/server/github/index.ts
@@ -1,14 +1,19 @@
 export { seal, open } from "$lib/server/sealed";
-export { githubEnv } from "./env";
-export { noStore, redirectTo, requestOrigin } from "./http";
+export { githubEnv } from "$lib/server/github/env";
+export { noStore, redirectTo, requestOrigin } from "$lib/server/github/http";
 export {
 	githubCookies,
 	GITHUB_STATE_COOKIE,
 	GITHUB_TOKEN_COOKIE,
 	TOKEN_TTL_SECONDS
-} from "./cookies";
-export { sessionActor, sessionToken, claimedServiceAuthDid } from "./session";
-export { account, hasInstallations, avatarSource, GitHubUpstreamError } from "./api";
+} from "$lib/server/github/cookies";
+export { sessionActor, sessionToken, claimedServiceAuthDid } from "$lib/server/github/session";
+export {
+	account,
+	hasInstallations,
+	avatarSource,
+	GitHubUpstreamError
+} from "$lib/server/github/api";
 export {
 	CALLBACK_PATH,
 	authorizeUrl,
@@ -22,4 +27,4 @@ export {
 	sealState,
 	tokenFromCode,
 	type GitHubState
-} from "./oauth";
+} from "$lib/server/github/oauth";
diff --git a/web/src/lib/server/github/oauth.ts b/web/src/lib/server/github/oauth.ts
index a996a1041..235b39c11 100644
--- a/web/src/lib/server/github/oauth.ts
+++ b/web/src/lib/server/github/oauth.ts
@@ -1,6 +1,6 @@
 import { seal, sha256Base64Url } from "$lib/server/sealed";
 import { internalUrl } from "$lib/auth/returnTo";
-import type { GitHubEnv } from "./env";
+import type { GitHubEnv } from "$lib/server/github/env";
 
 export const CALLBACK_PATH = "/_internal/github/callback";
 
diff --git a/web/src/lib/server/github/session.ts b/web/src/lib/server/github/session.ts
index 490ed42f9..416e6d0cc 100644
--- a/web/src/lib/server/github/session.ts
+++ b/web/src/lib/server/github/session.ts
@@ -1,8 +1,8 @@
 import type { Cookies } from "@sveltejs/kit";
 import { CURRENT_DID_KEY } from "$lib/auth/accounts";
 import { open } from "$lib/server/sealed";
-import { githubEnv } from "./env";
-import { GITHUB_TOKEN_COOKIE } from "./cookies";
+import { githubEnv } from "$lib/server/github/env";
+import { GITHUB_TOKEN_COOKIE } from "$lib/server/github/cookies";
 
 interface GitHubSession {
 	token: string;
diff --git a/web/src/routes/[handle]/[repo]/+page.svelte b/web/src/routes/[handle]/[repo]/+page.svelte
index e37f5e0b0..a66957fbb 100644
--- a/web/src/routes/[handle]/[repo]/+page.svelte
+++ b/web/src/routes/[handle]/[repo]/+page.svelte
@@ -25,22 +25,24 @@
 		let cancelled = false;
 		let stopPoll: (() => void) | undefined;
 
-		Promise.all([data.repo, Promise.resolve(data.importStatus)]).then(([repo, initialStatus]) => {
-			if (cancelled) return;
-			importStatus = initialStatus;
-			const inFlight =
-				initialStatus?.content === "fetching" || initialStatus?.content === "partial";
-			if (!inFlight || !repo.repoDid) return;
+		Promise.all([data.repo, Promise.resolve(data.importStatus)]).then(
+			([repo, initialStatus]) => {
+				if (cancelled) return;
+				importStatus = initialStatus;
+				const inFlight =
+					initialStatus?.content === "fetching" || initialStatus?.content === "partial";
+				if (!inFlight || !repo.repoDid) return;
 
-			const ctx = createBobbinClient({ serviceUrl: data.publicConfig.bobbinUrl });
-			stopPoll = startImportPoll({
-				fetchState: () => orNull(importState(ctx, repo)),
-				onState: (next) => {
-					importStatus = next;
-				},
-				onSettled: () => void invalidateAll()
-			});
-		});
+				const ctx = createBobbinClient({ serviceUrl: data.publicConfig.bobbinUrl });
+				stopPoll = startImportPoll({
+					fetchState: () => orNull(importState(ctx, repo)),
+					onState: (next) => {
+						importStatus = next;
+					},
+					onSettled: () => void invalidateAll()
+				});
+			}
+		);
 
 		return () => {
 			cancelled = true;
diff --git a/web/src/routes/[handle]/[repo]/commit/[ref]/+page.svelte b/web/src/routes/[handle]/[repo]/commit/[ref]/+page.svelte
index f015f5378..0839c6dab 100644
--- a/web/src/routes/[handle]/[repo]/commit/[ref]/+page.svelte
+++ b/web/src/routes/[handle]/[repo]/commit/[ref]/+page.svelte
@@ -5,7 +5,6 @@
 	import { formatPatchUrl } from "$lib/api/knotmirror";
 	import { liveCommitStatuses } from "$lib/api/liveCommitStatuses.svelte";
 	import type { CommitDetail } from "$lib/api/repo";
-	import type { RepoInfo } from "$lib/components/repo/types";
 	import Bones from "$lib/components/ui/Bones.svelte";
 	import repoCommitviewFullCommit from "$lib/bones/repo-commitview--full-commit.bones.json";
 	import CommitView from "$lib/components/repo/CommitView.svelte";
@@ -18,25 +17,6 @@
 		page.url.searchParams.get("diff") === "split" ? "split" : "unified"
 	);
 
-	const synchronousRepo = $derived(data.repo instanceof Promise ? null : data.repo);
-	let asyncRepo = $state<RepoInfo | null>(null);
-	let asyncCommitPage = $state<Awaited<typeof data.commitPage> | null>(null);
-
-	$effect(() => {
-		let active = true;
-		void Promise.resolve(data.repo).then((r) => {
-			if (active) asyncRepo = r;
-		});
-		void Promise.resolve(data.commitPage).then((cp) => {
-			if (active) asyncCommitPage = cp;
-		});
-		return () => {
-			active = false;
-		};
-	});
-
-	const resolvedRepo = $derived(asyncRepo ?? synchronousRepo);
-	const repoName = $derived(resolvedRepo?.name ?? decodeURIComponent(page.params.repo ?? ""));
 	const pipelineStatuses = liveCommitStatuses(() =>
 		Promise.all([data.repo, data.commitPage]).then(([repo, commitPage]) => ({
 			repo,
diff --git a/web/src/routes/[handle]/[repo]/fork/+page.svelte b/web/src/routes/[handle]/[repo]/fork/+page.svelte
index 2dc5f54e4..63f26b450 100644
--- a/web/src/routes/[handle]/[repo]/fork/+page.svelte
+++ b/web/src/routes/[handle]/[repo]/fork/+page.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-	import { page } from "$app/state";
 	import repoRepoforkformSkeletonFixture from "$lib/bones/repo-repoforkform--skeleton-fixture.bones.json";
 	import RepoForkForm from "$lib/components/repo/RepoForkForm.svelte";
 	import Bones from "$lib/components/ui/Bones.svelte";
diff --git a/web/src/routes/[handle]/[repo]/pulls/[rkey]/[version]/[[range]]/PullViewPage.svelte b/web/src/routes/[handle]/[repo]/pulls/[rkey]/[version]/[[range]]/PullViewPage.svelte
index 937ae3533..749fb5988 100644
--- a/web/src/routes/[handle]/[repo]/pulls/[rkey]/[version]/[[range]]/PullViewPage.svelte
+++ b/web/src/routes/[handle]/[repo]/pulls/[rkey]/[version]/[[range]]/PullViewPage.svelte
@@ -870,7 +870,7 @@
 			class="flex shrink-0"
 			transition:revealWidth={{ duration: panelDuration, easing: railEasing }}
 		>
-			<div class="flex shrink-0 px-2xs pt-[45px] max-sm:hidden">
+			<div class="flex shrink-0 px-2xs pt-11.25 max-sm:hidden">
 				<div class="sticky top-0 flex h-screen">
 					<ResizeHandle
 						bind:width={discussionWidth}
@@ -886,7 +886,7 @@
 			<!-- discussion sidebar -->
 			<div
 				class={[
-					"relative shrink-0 pt-[45px] max-sm:w-full! max-sm:pt-0",
+					"relative shrink-0 pt-11.25 max-sm:w-full! max-sm:pt-0",
 					tab !== "comments" && "max-sm:hidden"
 				]}
 				style:width="{discussionWidth}px"
diff --git a/web/src/routes/[handle]/[repo]/tree/[ref]/[...path]/+page.svelte b/web/src/routes/[handle]/[repo]/tree/[ref]/[...path]/+page.svelte
index fd3bd7edf..e86d9a75e 100644
--- a/web/src/routes/[handle]/[repo]/tree/[ref]/[...path]/+page.svelte
+++ b/web/src/routes/[handle]/[repo]/tree/[ref]/[...path]/+page.svelte
@@ -1,6 +1,4 @@
 <script lang="ts">
-	import { page } from "$app/state";
-	import type { RepoInfo } from "$lib/components/repo/types";
 	import FileTree from "$lib/components/repo/FileTree.svelte";
 	import LastCommitPanel from "$lib/components/repo/LastCommitPanel.svelte";
 	import Readme from "$lib/components/repo/Readme.svelte";
@@ -12,22 +10,6 @@
 	import Card from "$lib/components/ui/Card.svelte";
 
 	let { data } = $props();
-
-	const synchronousRepo = $derived(data.repo instanceof Promise ? null : data.repo);
-	let asyncRepo = $state<RepoInfo | null>(null);
-
-	$effect(() => {
-		let active = true;
-		void Promise.resolve(data.repo).then((r) => {
-			if (active) asyncRepo = r;
-		});
-		return () => {
-			active = false;
-		};
-	});
-
-	const resolvedRepo = $derived(asyncRepo ?? synchronousRepo);
-	const repoName = $derived(resolvedRepo?.name ?? decodeURIComponent(page.params.repo ?? ""));
 </script>
 
 <!-- shared boundary avoids reserving a skeleton card for directories without a readme -->
diff --git a/web/src/routes/[handle]/settings/OrganizationSettingsTab.svelte b/web/src/routes/[handle]/settings/OrganizationSettingsTab.svelte
index 9a6eafc3a..d54fce33a 100644
--- a/web/src/routes/[handle]/settings/OrganizationSettingsTab.svelte
+++ b/web/src/routes/[handle]/settings/OrganizationSettingsTab.svelte
@@ -59,12 +59,7 @@
 		<Error size="large" label={controls.error} />
 	</div>
 {:else if controls.data}
-	<SettingsPanel
-		{items}
-		{active}
-		label="Organization"
-		framed={false}
-	>
+	<SettingsPanel {items} {active} label="Organization" framed={false}>
 		{#if section === "avatar"}
 			<OrganizationAvatar {identity} {profile} />
 		{:else if section === "knots"}
diff --git a/web/src/routes/repo/migrate/+page.svelte b/web/src/routes/repo/migrate/+page.svelte
index be4205ac9..110106e8b 100644
--- a/web/src/routes/repo/migrate/+page.svelte
+++ b/web/src/routes/repo/migrate/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { resolve } from "$app/paths";
 	import Meta from "$lib/components/seo/Meta.svelte";
 	import GitHubImporter from "$lib/components/import/GitHubImporter.svelte";
 	import MethodPicker from "$lib/components/import/MethodPicker.svelte";
@@ -73,7 +74,7 @@
 			</p>
 			<p class="typography-paragraph-small text-foreground-subtle">
 				You can also
-				<a class="underline" href="/repo/new">create a new repository</a> instead.
+				<a class="underline" href={resolve("/repo/new")}>create a new repository</a> instead.
 			</p>
 		</span>
 	</div>
diff --git a/web/src/routes/repo/new/+page.svelte b/web/src/routes/repo/new/+page.svelte
index 79dfadfb6..01a892990 100644
--- a/web/src/routes/repo/new/+page.svelte
+++ b/web/src/routes/repo/new/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { resolve } from "$app/paths";
 	import Meta from "$lib/components/seo/Meta.svelte";
 	import BookPlus from "$icon/book-plus";
 	import { createRepo } from "$lib/api/repoCreate";
@@ -31,7 +32,9 @@
 			</p>
 			<p class="typography-paragraph-small text-foreground-subtle">
 				You can also
-				<a class="underline" href="/repo/migrate">migrate an existing repository</a> instead.
+				<a class="underline" href={resolve("/repo/migrate")}
+					>migrate an existing repository</a
+				> instead.
 			</p>
 		</span>
 	</div>
diff --git a/web/src/routes/welcome/+page.svelte b/web/src/routes/welcome/+page.svelte
index 033059516..82efd61f1 100644
--- a/web/src/routes/welcome/+page.svelte
+++ b/web/src/routes/welcome/+page.svelte
@@ -5,6 +5,7 @@
 	import { resolve } from "$app/paths";
 	import { onDestroy } from "svelte";
 	import { page } from "$app/state";
+	import type { ResolvedPathname } from "$app/types";
 	import X from "$icon/x";
 	import Github from "$icon/github";
 	import { awaitDeletedRecord, awaitIndexedOrSaved } from "$lib/api/awaitRecord";
@@ -258,7 +259,9 @@
 			return;
 		}
 		const returnTo = encodeURIComponent("/welcome?github=import");
-		await goto(`${resolve("/_internal/github/connect")}?return_to=${returnTo}`).catch(() => {
+		await goto(
+			`${resolve("/_internal/github/connect")}?return_to=${returnTo}` as ResolvedPathname
+		).catch(() => {
 			githubImport = "idle";
 		});
 	};
@@ -304,7 +307,7 @@
 		if (!browser || page.url.searchParams.get("github") !== "import" || !agent) return;
 		if (importingFor === agent.sub) return;
 		importingFor = agent.sub;
-		replaceState(`${resolve("/welcome")}`, {});
+		replaceState(resolve("/welcome"), {});
 		void importFromGitHub();
 	});
 
@@ -346,7 +349,7 @@
 					You have an unfinished repository migration from GitHub.
 				</p>
 				<a
-					href={`${resolve("/repo/migrate")}#migrations`}
+					href={`${resolve("/repo/migrate")}#migrations` as ResolvedPathname}
 					class="hover:text-foreground-strong shrink-0 font-medium text-foreground-default underline"
 				>
 					View migration