birdclaw 0.5.1 → 0.6.0

package/src/lib/types.ts

@@ -9,6 +9,9 @@ export interface AccountRecord {
 	name: string;
 	handle: string;
 	externalUserId?: string | null;
+	profileId?: string;
+	avatarHue?: number;
+	avatarUrl?: string;
 	transport: string;
 	isDefault: number;
 	createdAt: string;
@@ -124,6 +127,11 @@ export interface EmbeddedTweet {
 	text: string;
 	createdAt: string;
 	replyToId?: string | null;
+	isReplied?: boolean;
+	likeCount?: number;
+	mediaCount?: number;
+	bookmarked?: boolean;
+	liked?: boolean;
 	author: ProfileRecord;
 	entities: TweetEntities;
 	media: TweetMediaItem[];
@@ -172,6 +180,7 @@ export interface TimelineItem {
 	media: TweetMediaItem[];
 	replyToTweet?: EmbeddedTweet | null;
 	quotedTweet?: EmbeddedTweet | null;
+	retweetedTweet?: EmbeddedTweet | null;
 	qualityReason?: string | null;
 }
 
@@ -289,6 +298,7 @@ export interface LinkInsightItem {
 }
 
 export interface LinkInsightQuery {
+	account?: string;
 	kind?: LinkInsightKind;
 	range?: LinkInsightRange;
 	sort?: LinkInsightSort;
@@ -327,6 +337,8 @@ export interface DmConversationItem {
 	accountHandle: string;
 	title: string;
 	searchSnippet?: string;
+	inboxKind?: "accepted" | "request";
+	isMessageRequest?: boolean;
 	lastMessageAt: string;
 	lastMessagePreview: string;
 	unreadCount: number;
@@ -356,14 +368,17 @@ export interface TimelineQuery {
 export interface DmQuery {
 	account?: string;
 	conversationIds?: string[];
+	inbox?: "all" | "accepted" | "requests";
 	participant?: string;
 	search?: string;
 	replyFilter?: ReplyFilter;
+	since?: string;
+	until?: string;
 	minFollowers?: number;
 	maxFollowers?: number;
 	minInfluenceScore?: number;
 	maxInfluenceScore?: number;
-	sort?: "recent" | "influence";
+	sort?: "recent" | "followers" | "influence";
 	context?: number;
 	limit?: number;
 }
@@ -435,6 +450,7 @@ export interface InboxItem {
 
 export interface InboxQuery {
 	kind?: InboxKind;
+	account?: string;
 	minScore?: number;
 	hideLowSignal?: boolean;
 	limit?: number;
@@ -595,6 +611,27 @@ export interface XurlMentionsResponse {
 	meta?: Record<string, unknown>;
 }
 
+export interface XurlDmEvent {
+	id: string;
+	event_type?: string;
+	text?: string;
+	created_at?: string;
+	dm_conversation_id?: string;
+	sender_id?: string;
+	participant_ids?: string[];
+	attachments?: Record<string, unknown>;
+	entities?: Record<string, unknown>;
+	referenced_tweets?: XurlReferencedTweet[];
+}
+
+export interface XurlDmEventsResponse {
+	data: XurlDmEvent[];
+	includes?: {
+		users?: XurlMentionUser[];
+	};
+	meta?: Record<string, unknown>;
+}
+
 export interface XurlTweetsResponse {
 	data: XurlTweetData[];
 	includes?: {

package/src/lib/ui.ts

@@ -9,9 +9,15 @@ export const bodyClass =
 export const siteShellClass =
 	"mx-auto flex min-h-screen w-full max-w-[1280px] gap-0";
 
+export const siteShellDmClass =
+	"mx-auto flex min-h-screen w-full max-w-[1280px] gap-0";
+
 export const sidebarShellClass =
 	"sticky top-0 z-30 flex h-screen w-[72px] shrink-0 flex-col justify-between border-r border-[var(--line)] bg-[var(--bg)] px-2 py-3 min-[1100px]:w-[260px] min-[1100px]:px-3";
 
+export const sidebarShellCompactClass =
+	"sticky top-0 z-30 flex h-screen w-[72px] shrink-0 flex-col justify-between border-r border-[var(--line)] bg-[var(--bg)] px-2 py-3";
+
 export const sidebarBrandClass =
 	"flex items-center gap-2.5 px-2 py-2 text-[var(--ink)] min-[1100px]:px-3";
 
@@ -20,6 +26,8 @@ export const sidebarBrandMarkClass = "grid size-10 place-items-center";
 export const sidebarBrandCopyClass =
 	"hidden flex-col leading-tight min-[1100px]:flex";
 
+export const sidebarBrandCopyCompactClass = "sr-only";
+
 export const sidebarBrandTitleClass = "text-[15px] font-bold tracking-tight";
 
 export const sidebarBrandTaglineClass = "text-[12px] text-[var(--ink-soft)]";
@@ -31,16 +39,24 @@ export const sidebarFooterClass = "flex flex-col gap-2 pb-1";
 export const navLinkClass =
 	"nav-link group flex items-center justify-center gap-4 rounded-full px-3 py-2.5 text-[15px] text-[var(--ink)] transition-colors duration-150 hover:bg-[var(--bg-hover)] min-[1100px]:justify-start";
 
+export const navLinkCompactClass =
+	"nav-link group flex items-center justify-center rounded-full px-3 py-2.5 text-[15px] text-[var(--ink)] transition-colors duration-150 hover:bg-[var(--bg-hover)]";
+
 export const navLinkActiveClass = "nav-link-active font-bold";
 
 export const navLinkIconClass = "shrink-0";
 
 export const navLinkLabelClass = "sr-only min-[1100px]:not-sr-only";
 
+export const navLinkLabelCompactClass = "sr-only";
+
 /* Main column. */
 export const mainColumnClass =
 	"flex w-full min-w-0 max-w-[680px] flex-1 flex-col border-x border-[var(--line)] bg-[var(--bg)]";
 
+export const mainColumnDmClass =
+	"flex w-full min-w-0 flex-1 flex-col border-x border-[var(--line)] bg-[var(--bg)]";
+
 export const pageWrapClass = "flex w-full min-w-0 flex-1 justify-start";
 
 /* Sticky page header at top of the main column. */
@@ -66,7 +82,7 @@ export const tabButtonClass =
 export const tabButtonActiveClass = "text-[var(--ink)] font-bold";
 
 export const tabButtonIndicatorClass =
-	"pointer-events-none absolute inset-x-0 bottom-0 mx-auto h-[3px] w-12 rounded-full bg-[var(--accent)]";
+	"pointer-events-none absolute bottom-0 left-1/2 h-[3px] w-12 -translate-x-1/2 rounded-full bg-[var(--accent)]";
 
 /* Feed rows: flat, hairline divider, no boxed cards. */
 export const feedClass = "flex flex-col";
@@ -230,7 +246,7 @@ export const linkPreviewHostClass =
 
 /* DM grid. */
 export const dmShellClass =
-	"grid h-[calc(100vh-56px)] min-h-[520px] grid-cols-1 min-[1100px]:grid-cols-[320px_minmax(0,1fr)]";
+	"grid h-[calc(100vh-56px)] min-h-[520px] grid-cols-1 min-[960px]:grid-cols-[360px_minmax(0,1fr)] min-[1360px]:grid-cols-[400px_minmax(0,1fr)]";
 
 export const dmListClass =
 	"flex flex-col overflow-y-auto border-r border-[var(--line)]";
@@ -274,10 +290,13 @@ export const dmMessageRowClass = "flex max-w-[78%] flex-col gap-1";
 export const dmMessageRowOutboundClass = "self-end items-end";
 
 export const dmMessageBubbleClass =
-	"rounded-2xl rounded-bl-md bg-[var(--bg-active)] px-3.5 py-2 text-[15px] leading-[1.4] text-[var(--ink)]";
+	"rounded-2xl rounded-bl-md px-3.5 py-2 text-[15px] leading-[1.4]";
+
+export const dmMessageBubbleInboundClass =
+	"bg-[var(--bg-active)] text-[var(--ink)]";
 
 export const dmMessageBubbleOutboundClass =
-	"rounded-bl-2xl rounded-br-md bg-[var(--accent)] text-white";
+	"rounded-bl-2xl rounded-br-md bg-[var(--accent)] text-[var(--accent-text)]";
 
 export const dmMessageMetaClass =
 	"flex items-center gap-2 text-[12px] text-[var(--ink-soft)]";
@@ -490,6 +509,8 @@ export const messageMetaClass = dmMessageMetaClass;
 
 export const messageBubbleClass = dmMessageBubbleClass;
 
+export const messageBubbleInboundClass = dmMessageBubbleInboundClass;
+
 export const messageBubbleOutboundClass = dmMessageBubbleOutboundClass;
 
 export const contextHandleClass = "text-[14px] text-[var(--ink-soft)]";
@@ -499,8 +520,10 @@ export const contextBioClass = "text-[14px] leading-[1.4] text-[var(--ink)]";
 export const contextStatsClass = "flex flex-col gap-0";
 
 export const contextStatRowClass =
-	"flex items-baseline justify-between border-t border-[var(--line)] py-2 first:border-t-0 first:pt-0";
+	"grid grid-cols-[minmax(0,1fr)_auto] items-center gap-3 border-t border-[var(--line)] py-2 first:border-t-0 first:pt-0";
 
-export const contextStatTermClass = "text-[13px] text-[var(--ink-soft)]";
+export const contextStatTermClass =
+	"min-w-0 text-[13px] text-[var(--ink-soft)]";
 
-export const contextStatValueClass = "text-[14px] font-bold text-[var(--ink)]";
+export const contextStatValueClass =
+	"shrink-0 whitespace-nowrap text-right text-[14px] font-bold text-[var(--ink)]";

package/src/lib/url-expansion.ts

@@ -1,6 +1,13 @@
+import { Effect } from "effect";
 import { getNativeDb } from "./db";
+import { runEffectPromise, tryPromise } from "./effect-runtime";
+import {
+	resolvePublicAddresses,
+	safePreviewFetchEffect,
+} from "./link-preview-metadata";
 import { readSyncCache, writeSyncCache } from "./sync-cache";
 import type { UrlExpansionItem } from "./types";
+import { assertSafePreviewUrl } from "./url-safety";
 import {
 	normalizeUrlExpansionForIndex,
 	upsertUrlExpansion,
@@ -9,6 +16,7 @@ import {
 const SUCCESS_CACHE_TTL_MS = 365 * 24 * 60 * 60 * 1000;
 const FAILURE_CACHE_TTL_MS = 24 * 60 * 60 * 1000;
 const DEFAULT_FETCH_TIMEOUT_MS = 15_000;
+const MAX_REDIRECTS = 4;
 const URL_REGEX = /https?:\/\/[^\s<>"')\]]+/g;
 
 interface CachedUrlExpansion {
@@ -25,6 +33,7 @@ export interface ExpandUrlsOptions {
 	successMaxAgeMs?: number;
 	failureMaxAgeMs?: number;
 	fetchImpl?: typeof fetch;
+	resolveHost?: (hostname: string) => Promise<string[]>;
 	timeoutMs?: number;
 }
 
@@ -40,6 +49,23 @@ function trimTrailingPunctuation(url: string) {
 	return url.replace(/[.,;:!?]+$/g, "");
 }
 
+function toError(error: unknown) {
+	return error instanceof Error ? error : new Error(String(error));
+}
+
+function trySync<T>(try_: () => T) {
+	return Effect.try({
+		try: try_,
+		catch: toError,
+	});
+}
+
+function cancelBodyEffect(response: Response) {
+	return tryPromise(() => response.body?.cancel() ?? Promise.resolve()).pipe(
+		Effect.catchAll(() => Effect.void),
+	);
+}
+
 export function extractUrls(text: string) {
 	return Array.from(
 		new Set(
@@ -76,96 +102,241 @@ function persistExpansion(item: UrlExpansionItem) {
 	upsertUrlExpansion(db, normalizeUrlExpansionForIndex(item));
 }
 
-async function fetchExpansion(
+function fetchExpansionEffect(
 	url: string,
 	fetchImpl: typeof fetch,
+	usesInjectedFetch: boolean,
 	timeoutMs: number,
-): Promise<CachedUrlExpansion> {
+	resolveHost: ((hostname: string) => Promise<string[]>) | null,
+): Effect.Effect<CachedUrlExpansion, never> {
 	const requestInit = {
-		redirect: "follow",
+		redirect: "manual",
 		headers: { "user-agent": "birdclaw/0.3 url-expander" },
 		signal: AbortSignal.timeout(timeoutMs),
 	} satisfies RequestInit;
 
-	try {
-		let response = await fetchImpl(url, {
-			...requestInit,
-			method: "HEAD",
-		});
+	return Effect.gen(function* () {
+		if (resolveHost) {
+			const headResponse = yield* safePreviewFetchEffect(url, {
+				...(usesInjectedFetch ? { fetchImpl } : {}),
+				resolveHost,
+				method: "HEAD",
+				timeoutMs,
+			});
+			yield* cancelBodyEffect(headResponse);
+			const headFinalUrl = headResponse.url || url;
+			if (headFinalUrl !== url && headResponse.status < 400) {
+				yield* Effect.try({
+					try: () => assertSafePreviewUrl(headFinalUrl),
+					catch: (error) => error,
+				});
+				return {
+					expandedUrl: headFinalUrl,
+					finalUrl: headFinalUrl,
+					status: "hit",
+				} satisfies CachedUrlExpansion;
+			}
 
-		if (!response.url || response.url === url || response.status >= 400) {
-			response = await fetchImpl(url, {
-				...requestInit,
+			const response = yield* safePreviewFetchEffect(headFinalUrl, {
+				...(usesInjectedFetch ? { fetchImpl } : {}),
+				resolveHost,
 				method: "GET",
+				timeoutMs,
+			});
+			yield* cancelBodyEffect(response);
+			const finalUrl = response.url || headFinalUrl;
+			if (finalUrl !== url) {
+				yield* Effect.try({
+					try: () => assertSafePreviewUrl(finalUrl),
+					catch: (error) => error,
+				});
+			}
+			return {
+				expandedUrl: finalUrl,
+				finalUrl,
+				status: response.ok || finalUrl !== url ? "hit" : "miss",
+				...(response.ok ? {} : { error: `HTTP ${response.status}` }),
+			} satisfies CachedUrlExpansion;
+		}
+
+		let currentUrl = url;
+		let response: Response | null = null;
+
+		for (let redirect = 0; redirect <= MAX_REDIRECTS; redirect += 1) {
+			yield* Effect.try({
+				try: () => assertSafePreviewUrl(currentUrl),
+				catch: (error) => error,
+			});
+
+			response = yield* tryPromise(() =>
+				fetchImpl(currentUrl, {
+					...requestInit,
+					method: "HEAD",
+				}),
+			);
+
+			if (response.status >= 300 && response.status < 400) {
+				const location = response.headers.get("location");
+				if (!location) break;
+				if (redirect >= MAX_REDIRECTS) {
+					return yield* Effect.fail(
+						new Error("URL expansion redirected too many times"),
+					);
+				}
+				currentUrl = yield* Effect.try({
+					try: () => new URL(location, currentUrl).toString(),
+					catch: (error) => error,
+				});
+				continue;
+			}
+
+			if (
+				!response.url ||
+				response.url === currentUrl ||
+				response.status >= 400
+			) {
+				response = yield* tryPromise(() =>
+					fetchImpl(currentUrl, {
+						...requestInit,
+						method: "GET",
+					}),
+				);
+				if (response.status >= 300 && response.status < 400) {
+					const location = response.headers.get("location");
+					if (!location) break;
+					if (redirect >= MAX_REDIRECTS) {
+						return yield* Effect.fail(
+							new Error("URL expansion redirected too many times"),
+						);
+					}
+					currentUrl = yield* Effect.try({
+						try: () => new URL(location, currentUrl).toString(),
+						catch: (error) => error,
+					});
+					continue;
+				}
+			}
+
+			break;
+		}
+
+		if (!response) {
+			return yield* Effect.fail(new Error("URL expansion failed"));
+		}
+		if (response.status >= 300 && response.status < 400) {
+			return yield* Effect.fail(new Error("URL expansion ended on a redirect"));
+		}
+
+		const finalUrl = response.url || currentUrl;
+		if (finalUrl !== url) {
+			yield* Effect.try({
+				try: () => assertSafePreviewUrl(finalUrl),
+				catch: (error) => error,
 			});
 		}
 
-		const finalUrl = response.url || url;
 		return {
 			expandedUrl: finalUrl,
 			finalUrl,
-			status: response.ok || finalUrl !== url ? "hit" : "miss",
+			status:
+				response.ok || (finalUrl !== url && response.status < 300)
+					? "hit"
+					: "miss",
 			...(response.ok ? {} : { error: `HTTP ${response.status}` }),
-		};
-	} catch (error) {
-		return {
-			expandedUrl: url,
-			finalUrl: url,
-			status: "error",
-			error: error instanceof Error ? error.message : String(error),
-		};
-	}
+		} satisfies CachedUrlExpansion;
+	}).pipe(
+		Effect.catchAll((error) =>
+			Effect.succeed({
+				expandedUrl: url,
+				finalUrl: url,
+				status: "error" as const,
+				error: error instanceof Error ? error.message : String(error),
+			}),
+		),
+	);
 }
 
-export async function expandUrls(
+export function expandUrlsEffect(
 	urls: string[],
 	options: ExpandUrlsOptions = {},
-): Promise<UrlExpansionItem[]> {
-	const uniqueUrls = Array.from(new Set(urls));
-	const fetchImpl = options.fetchImpl ?? globalThis.fetch;
-	const timeoutMs = options.timeoutMs ?? DEFAULT_FETCH_TIMEOUT_MS;
-	const results: UrlExpansionItem[] = [];
-
-	for (const url of uniqueUrls) {
-		const cached = readSyncCache<CachedUrlExpansion>(cacheKeyForUrl(url));
-		if (cached && !options.refresh) {
-			const maxAge =
-				cached.value.status === "hit"
-					? (options.successMaxAgeMs ?? SUCCESS_CACHE_TTL_MS)
-					: (options.failureMaxAgeMs ?? FAILURE_CACHE_TTL_MS);
-			if (isFresh(cached.updatedAt, maxAge)) {
-				const item = toExpansionItem(
-					url,
-					cached.value,
-					"cache",
-					cached.updatedAt,
-				);
-				persistExpansion(item);
-				results.push(item);
-				continue;
+): Effect.Effect<UrlExpansionItem[], unknown> {
+	return Effect.gen(function* () {
+		const uniqueUrls = Array.from(new Set(urls));
+		const usesInjectedFetch = options.fetchImpl !== undefined;
+		const fetchImpl = options.fetchImpl ?? globalThis.fetch;
+		const resolveHost =
+			options.resolveHost ??
+			(options.fetchImpl
+				? null
+				: (hostname: string) => resolvePublicAddresses(hostname));
+		const timeoutMs = options.timeoutMs ?? DEFAULT_FETCH_TIMEOUT_MS;
+		const results: UrlExpansionItem[] = [];
+
+		for (const url of uniqueUrls) {
+			const cached = yield* trySync(() =>
+				readSyncCache<CachedUrlExpansion>(cacheKeyForUrl(url)),
+			);
+			if (cached && !options.refresh) {
+				const maxAge =
+					cached.value.status === "hit"
+						? (options.successMaxAgeMs ?? SUCCESS_CACHE_TTL_MS)
+						: (options.failureMaxAgeMs ?? FAILURE_CACHE_TTL_MS);
+				if (isFresh(cached.updatedAt, maxAge)) {
+					const item = toExpansionItem(
+						url,
+						cached.value,
+						"cache",
+						cached.updatedAt,
+					);
+					yield* trySync(() => persistExpansion(item));
+					results.push(item);
+					continue;
+				}
 			}
+
+			const value = yield* fetchExpansionEffect(
+				url,
+				fetchImpl,
+				usesInjectedFetch,
+				timeoutMs,
+				resolveHost,
+			);
+			const updatedAt = yield* trySync(() =>
+				writeSyncCache(cacheKeyForUrl(url), value),
+			);
+			const item = toExpansionItem(url, value, "network", updatedAt);
+			yield* trySync(() => persistExpansion(item));
+			results.push(item);
 		}
 
-		const value = await fetchExpansion(url, fetchImpl, timeoutMs);
-		const updatedAt = writeSyncCache(cacheKeyForUrl(url), value);
-		const item = toExpansionItem(url, value, "network", updatedAt);
-		persistExpansion(item);
-		results.push(item);
-	}
+		return results;
+	});
+}
 
-	return results;
+export function expandUrls(
+	urls: string[],
+	options: ExpandUrlsOptions = {},
+): Promise<UrlExpansionItem[]> {
+	return runEffectPromise(expandUrlsEffect(urls, options));
 }
 
-export async function expandUrlsFromTexts(
+export function expandUrlsFromTextsEffect(
 	texts: string[],
 	options: ExpandUrlsOptions = {},
 ) {
-	return expandUrls(
+	return expandUrlsEffect(
 		texts.flatMap((text) => extractUrls(text)),
 		options,
 	);
 }
 
+export function expandUrlsFromTexts(
+	texts: string[],
+	options: ExpandUrlsOptions = {},
+) {
+	return runEffectPromise(expandUrlsFromTextsEffect(texts, options));
+}
+
 export const __test__ = {
 	cacheKeyForUrl,
 	trimTrailingPunctuation,