birdclaw 0.8.1 → 0.8.3

package/src/lib/web-sync.ts

@@ -1,11 +1,14 @@
 import { existsSync } from "node:fs";
 import { Effect } from "effect";
 import { maybeAutoSyncBackupEffect } from "./backup";
-import { getBirdclawPaths } from "./config";
 import { syncDirectMessagesViaCachedBirdEffect } from "./dms-live";
 import { runEffectBackground, runEffectPromise } from "./effect-runtime";
 import { syncMentionThreadsEffect } from "./mention-threads-live";
 import { syncMentionsEffect } from "./mentions-live";
+import {
+	defaultServerRuntimeServices,
+	type ServerRuntimeServices,
+} from "./server-runtime-services";
 import NativeSqliteDatabase from "./sqlite";
 import { syncTimelineCollectionEffect } from "./timeline-collections-live";
 import { syncHomeTimelineEffect } from "./timeline-live";
@@ -69,6 +72,7 @@ interface WebSyncPlan {
 	run: (
 		accountId: string | undefined,
 		options: WebSyncOptions,
+		runtime: ServerRuntimeServices,
 	) => Effect.Effect<WebSyncStep[], unknown>;
 }
 
@@ -132,12 +136,12 @@ const WEB_SYNC_PLANS: Record<WebSyncKind, WebSyncPlan> = {
 	timeline: {
 		label: "Home timeline",
 		accountAware: true,
-		run: (account) =>
+		run: (account, _options, runtime) =>
 			Effect.gen(function* () {
 				const result = yield* syncHomeTimelineEffect({
 					account,
 					mode:
-						!account || account === resolveDefaultSyncAccountId()
+						!account || account === resolveDefaultSyncAccountId(runtime)
 							? "auto"
 							: "xurl",
 					limit: 100,
@@ -201,12 +205,14 @@ const WEB_SYNC_PLANS: Record<WebSyncKind, WebSyncPlan> = {
 	likes: {
 		label: "Likes",
 		accountAware: true,
-		run: (account) => syncSavedCollection("likes", account),
+		run: (account, _options, runtime) =>
+			syncSavedCollection("likes", account, runtime),
 	},
 	bookmarks: {
 		label: "Bookmarks",
 		accountAware: true,
-		run: (account) => syncSavedCollection("bookmarks", account),
+		run: (account, _options, runtime) =>
+			syncSavedCollection("bookmarks", account, runtime),
 	},
 	dms: {
 		label: "Direct messages",
@@ -242,10 +248,11 @@ const WEB_SYNC_PLANS: Record<WebSyncKind, WebSyncPlan> = {
 function syncSavedCollection(
 	kind: "likes" | "bookmarks",
 	account: string | undefined,
+	runtime: ServerRuntimeServices,
 ): Effect.Effect<WebSyncStep[], unknown> {
 	return Effect.gen(function* () {
 		const isNonDefaultAccount =
-			account !== undefined && account !== resolveDefaultSyncAccountId();
+			account !== undefined && account !== resolveDefaultSyncAccountId(runtime);
 		const result = yield* syncTimelineCollectionEffect({
 			kind,
 			account,
@@ -270,13 +277,14 @@ export function performWebSyncEffect(
 	kind: WebSyncKind,
 	accountId?: string,
 	options: WebSyncOptions = {},
+	runtime: ServerRuntimeServices = defaultServerRuntimeServices,
 ) {
 	return Effect.gen(function* () {
-		const startedAt = new Date().toISOString();
-		const steps = yield* WEB_SYNC_PLANS[kind].run(accountId, options);
+		const startedAt = runtime.now().toISOString();
+		const steps = yield* WEB_SYNC_PLANS[kind].run(accountId, options, runtime);
 
 		const backup = yield* maybeAutoSyncBackupEffect();
-		const finishedAt = new Date().toISOString();
+		const finishedAt = runtime.now().toISOString();
 		return {
 			ok: true,
 			kind,
@@ -290,12 +298,12 @@ export function performWebSyncEffect(
 	});
 }
 
-function createWebSyncJobId(kind: WebSyncKind) {
-	return `sync_${kind}_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
+function createWebSyncJobId(kind: WebSyncKind, runtime: ServerRuntimeServices) {
+	return `sync_${kind}_${runtime.now().getTime().toString(36)}_${runtime.random().toString(36).slice(2, 8)}`;
 }
 
-function resolveDefaultSyncAccountId() {
-	const dbPath = getBirdclawPaths().dbPath;
+function resolveDefaultSyncAccountId(runtime: ServerRuntimeServices) {
+	const dbPath = runtime.getPaths().dbPath;
 	if (!existsSync(dbPath)) {
 		return "acct_primary";
 	}
@@ -336,12 +344,13 @@ function getRunningSyncKey(
 	kind: WebSyncKind,
 	accountId: string | undefined,
 	options: WebSyncOptions = {},
+	runtime: ServerRuntimeServices = defaultServerRuntimeServices,
 ) {
 	if (!WEB_SYNC_PLANS[kind].accountAware) {
 		const optionKey = serializeSyncOptions(kind, options);
 		return optionKey ? `${kind}:${optionKey}` : kind;
 	}
-	return `${kind}:${accountId ?? resolveDefaultSyncAccountId()}`;
+	return `${kind}:${accountId ?? resolveDefaultSyncAccountId(runtime)}`;
 }
 
 function getEffectiveAccountId(
@@ -380,8 +389,9 @@ function toFailedResponse(
 	startedAt: string,
 	error: unknown,
 	accountId?: string,
+	runtime: ServerRuntimeServices = defaultServerRuntimeServices,
 ): WebSyncResponse {
-	const finishedAt = new Date().toISOString();
+	const finishedAt = runtime.now().toISOString();
 	const message = messageFromError(error);
 	return {
 		ok: false,
@@ -399,17 +409,18 @@ export function startWebSync(
 	kind: WebSyncKind,
 	accountId?: string,
 	options: WebSyncOptions = {},
+	runtime: ServerRuntimeServices = defaultServerRuntimeServices,
 ): WebSyncJobSnapshot {
 	const effectiveAccountId = getEffectiveAccountId(kind, accountId);
-	const syncKey = getRunningSyncKey(kind, effectiveAccountId, options);
+	const syncKey = getRunningSyncKey(kind, effectiveAccountId, options, runtime);
 	const current = runningSyncs.get(syncKey);
 	if (current) {
 		return current;
 	}
 
-	const startedAt = new Date().toISOString();
+	const startedAt = runtime.now().toISOString();
 	const job: WebSyncJobSnapshot = {
-		id: createWebSyncJobId(kind),
+		id: createWebSyncJobId(kind, runtime),
 		kind,
 		...(effectiveAccountId ? { accountId: effectiveAccountId } : {}),
 		status: "running",
@@ -420,35 +431,39 @@ export function startWebSync(
 	webSyncJobKeys.set(job.id, syncKey);
 	setJobSnapshot(job);
 
-	runEffectBackground(performWebSyncEffect(kind, effectiveAccountId, options), {
-		onSuccess: (result) => {
-			setJobSnapshot({
-				...job,
-				status: "succeeded",
-				finishedAt: result.finishedAt,
-				summary: result.summary,
-				inProgress: false,
-				result,
-			});
-		},
-		onFailure: (error) => {
-			const result = toFailedResponse(
-				kind,
-				startedAt,
-				error,
-				effectiveAccountId,
-			);
-			setJobSnapshot({
-				...job,
-				status: "failed",
-				finishedAt: result.finishedAt,
-				summary: result.summary,
-				inProgress: false,
-				result,
-				error: result.error,
-			});
+	runEffectBackground(
+		performWebSyncEffect(kind, effectiveAccountId, options, runtime),
+		{
+			onSuccess: (result) => {
+				setJobSnapshot({
+					...job,
+					status: "succeeded",
+					finishedAt: result.finishedAt,
+					summary: result.summary,
+					inProgress: false,
+					result,
+				});
+			},
+			onFailure: (error) => {
+				const result = toFailedResponse(
+					kind,
+					startedAt,
+					error,
+					effectiveAccountId,
+					runtime,
+				);
+				setJobSnapshot({
+					...job,
+					status: "failed",
+					finishedAt: result.finishedAt,
+					summary: result.summary,
+					inProgress: false,
+					result,
+					error: result.error,
+				});
+			},
 		},
-	});
+	);
 
 	return job;
 }
@@ -461,13 +476,14 @@ export function runWebSyncEffect(
 	kind: WebSyncKind,
 	accountId?: string,
 	options: WebSyncOptions = {},
+	runtime: ServerRuntimeServices = defaultServerRuntimeServices,
 ): Effect.Effect<WebSyncResponse, Error> {
 	return Effect.gen(function* () {
 		const effectiveAccountId = getEffectiveAccountId(kind, accountId);
 		const current = runningSyncs.get(
-			getRunningSyncKey(kind, effectiveAccountId, options),
+			getRunningSyncKey(kind, effectiveAccountId, options, runtime),
 		);
-		const startedAt = new Date().toISOString();
+		const startedAt = runtime.now().toISOString();
 		if (current) {
 			return {
 				ok: false,
@@ -480,7 +496,7 @@ export function runWebSyncEffect(
 			} satisfies WebSyncResponse;
 		}
 
-		const job = startWebSync(kind, effectiveAccountId, options);
+		const job = startWebSync(kind, effectiveAccountId, options, runtime);
 		while (job.inProgress) {
 			yield* Effect.sleep(25);
 			const latest = getWebSyncJob(job.id);
@@ -501,8 +517,9 @@ export function runWebSync(
 	kind: WebSyncKind,
 	accountId?: string,
 	options: WebSyncOptions = {},
+	runtime: ServerRuntimeServices = defaultServerRuntimeServices,
 ): Promise<WebSyncResponse> {
-	return runEffectPromise(runWebSyncEffect(kind, accountId, options));
+	return runEffectPromise(runWebSyncEffect(kind, accountId, options, runtime));
 }
 
 export function clearWebSyncLocksForTests() {

package/src/lib/whois.ts

@@ -9,7 +9,8 @@ import { fetchProfileBioEntities } from "./profile-bio-entities";
 import { fetchProfileSnapshots } from "./profile-history";
 import { resolveProfilesForIdsEffect } from "./profile-resolver";
 import type { ProfileResolveResult } from "./profile-resolver";
-import { listDmConversations, listTimelineItems } from "./queries";
+import { listDmConversations } from "./dm-read-model";
+import { listTimelineItems } from "./timeline-read-model";
 import { expandUrlsFromTextsEffect } from "./url-expansion";
 import type {
 	DmConversationItem,

package/src/router.tsx

@@ -7,7 +7,7 @@ export function getRouter() {
 
 		scrollRestoration: true,
 		defaultPreload: "intent",
-		defaultPreloadStaleTime: 0,
+		defaultPreloadStaleTime: 60_000,
 	});
 
 	return router;

package/src/routes/__root.tsx

@@ -1,13 +1,12 @@
-import { TanStackDevtools } from "@tanstack/react-devtools";
 import {
 	createRootRoute,
 	HeadContent,
 	Scripts,
 	useRouterState,
 } from "@tanstack/react-router";
-import { TanStackRouterDevtoolsPanel } from "@tanstack/react-router-devtools";
 import type { ReactNode } from "react";
 import { AppNav } from "#/components/AppNav";
+import { BirdclawQueryProvider } from "#/lib/query-client";
 import { ThemeProvider, themeScript } from "#/lib/theme";
 import {
 	bodyClass,
@@ -66,25 +65,16 @@ function RootDocument({ children }: { children: ReactNode }) {
 				<script suppressHydrationWarning>{themeScript}</script>
 			</head>
 			<body className={bodyClass}>
-				<ThemeProvider>
-					<div className={wideMode ? siteShellDmClass : siteShellClass}>
-						<AppNav compact={wideMode} />
-						<main className={wideMode ? mainColumnDmClass : mainColumnClass}>
-							{children}
-						</main>
-					</div>
-				</ThemeProvider>
-				<TanStackDevtools
-					config={{
-						position: "bottom-right",
-					}}
-					plugins={[
-						{
-							name: "Tanstack Router",
-							render: <TanStackRouterDevtoolsPanel />,
-						},
-					]}
-				/>
+				<BirdclawQueryProvider>
+					<ThemeProvider>
+						<div className={wideMode ? siteShellDmClass : siteShellClass}>
+							<AppNav compact={wideMode} />
+							<main className={wideMode ? mainColumnDmClass : mainColumnClass}>
+								{children}
+							</main>
+						</div>
+					</ThemeProvider>
+				</BirdclawQueryProvider>
 				<Scripts />
 			</body>
 		</html>

package/src/routes/api/action.tsx

@@ -18,7 +18,7 @@ import {
 	createDmReplyEffect,
 	createPostEffect,
 	createTweetReplyEffect,
-} from "#/lib/queries";
+} from "#/lib/query-actions";
 import type { ActionsTransport } from "#/lib/config";
 import type { InboxKind } from "#/lib/types";
 

package/src/routes/api/conversation.tsx

@@ -5,7 +5,7 @@ import {
 	runRouteEffect,
 	sensitiveRequestErrorResponse,
 } from "#/lib/http-effect";
-import { getTweetConversation } from "#/lib/queries";
+import { getTweetConversation } from "#/lib/timeline-read-model";
 
 function json(data: unknown, status = 200) {
 	return new Response(JSON.stringify(data), {

package/src/routes/api/query.tsx

@@ -1,5 +1,6 @@
 import { createFileRoute } from "@tanstack/react-router";
 import { Effect } from "effect";
+import { queryResponseSchema } from "#/lib/api-contracts";
 import { maybeAutoUpdateBackupEffect } from "#/lib/backup";
 import {
 	jsonResponse,
@@ -7,7 +8,7 @@ import {
 	runRouteEffect,
 	sensitiveRequestErrorResponse,
 } from "#/lib/http-effect";
-import { queryResource } from "#/lib/queries";
+import { queryResource } from "#/lib/query-resource";
 import type {
 	DmQuery,
 	ReplyFilter,
@@ -78,35 +79,40 @@ export const Route = createFileRoute("/api/query")({
 
 						if (resource === "dms") {
 							return jsonResponse(
-								queryResource("dms", {
-									...baseFilters,
-									participant: url.searchParams.get("participant") ?? undefined,
-									minFollowers: parseOptionalNumber(
-										url.searchParams.get("minFollowers"),
-									),
-									maxFollowers: parseOptionalNumber(
-										url.searchParams.get("maxFollowers"),
-									),
-									minInfluenceScore: parseOptionalNumber(
-										url.searchParams.get("minInfluenceScore"),
-									),
-									maxInfluenceScore: parseOptionalNumber(
-										url.searchParams.get("maxInfluenceScore"),
-									),
-									sort: parseDmSort(url.searchParams.get("sort")),
-									inbox: parseDmInbox(url.searchParams.get("inbox")),
-									conversationId:
-										url.searchParams.get("conversationId") ?? undefined,
-								}),
+								queryResponseSchema.parse(
+									queryResource("dms", {
+										...baseFilters,
+										participant:
+											url.searchParams.get("participant") ?? undefined,
+										minFollowers: parseOptionalNumber(
+											url.searchParams.get("minFollowers"),
+										),
+										maxFollowers: parseOptionalNumber(
+											url.searchParams.get("maxFollowers"),
+										),
+										minInfluenceScore: parseOptionalNumber(
+											url.searchParams.get("minInfluenceScore"),
+										),
+										maxInfluenceScore: parseOptionalNumber(
+											url.searchParams.get("maxInfluenceScore"),
+										),
+										sort: parseDmSort(url.searchParams.get("sort")),
+										inbox: parseDmInbox(url.searchParams.get("inbox")),
+										conversationId:
+											url.searchParams.get("conversationId") ?? undefined,
+									}),
+								),
 							);
 						}
 
 						return jsonResponse(
-							queryResource(resource, {
-								...baseFilters,
-								resource,
-								untilId: url.searchParams.get("untilId") ?? undefined,
-							}),
+							queryResponseSchema.parse(
+								queryResource(resource, {
+									...baseFilters,
+									resource,
+									untilId: url.searchParams.get("untilId") ?? undefined,
+								}),
+							),
 						);
 					}),
 				),

package/src/routes/api/status.tsx

@@ -1,12 +1,13 @@
 import { createFileRoute } from "@tanstack/react-router";
 import { Effect } from "effect";
+import { queryEnvelopeSchema } from "#/lib/api-contracts";
 import { maybeAutoUpdateBackupEffect } from "#/lib/backup";
 import {
 	jsonResponse,
 	runRouteEffect,
 	sensitiveRequestErrorResponse,
 } from "#/lib/http-effect";
-import { getQueryEnvelopeEffect } from "#/lib/queries";
+import { getQueryEnvelopeEffect } from "#/lib/query-status";
 
 export const Route = createFileRoute("/api/status")({
 	server: {
@@ -18,7 +19,10 @@ export const Route = createFileRoute("/api/status")({
 						if (denied) return denied;
 
 						yield* maybeAutoUpdateBackupEffect();
-						return jsonResponse(yield* getQueryEnvelopeEffect());
+						const envelope = yield* getQueryEnvelopeEffect({
+							includeArchives: false,
+						});
+						return jsonResponse(queryEnvelopeSchema.parse(envelope));
 					}),
 				),
 		},

package/src/routes/api/sync.tsx

@@ -1,5 +1,6 @@
 import { createFileRoute } from "@tanstack/react-router";
 import { Effect } from "effect";
+import { webSyncJobSchema } from "#/lib/api-contracts";
 import {
 	jsonResponse,
 	requestJsonEffect,
@@ -72,7 +73,7 @@ export const Route = createFileRoute("/api/sync")({
 					);
 				}
 
-				return jsonResponse(job);
+				return jsonResponse(webSyncJobSchema.parse(job));
 			},
 			POST: ({ request }) =>
 				runRouteEffect(
@@ -97,7 +98,9 @@ export const Route = createFileRoute("/api/sync")({
 							parseAccountId(body.accountId),
 							parseSyncOptions(kind, body),
 						);
-						return jsonResponse(job, { status: job.inProgress ? 202 : 200 });
+						return jsonResponse(webSyncJobSchema.parse(job), {
+							status: job.inProgress ? 202 : 200,
+						});
 					}),
 				),
 		},