Merge pull request #9502 from gitbutlerapp/feed-factory-refactor

refactor: introduce FeedFactory for per-project feeds

Author: estib-vega

apps/desktop/src/components/Feed.svelte

@@ -8,7 +8,7 @@
 	import { invoke } from '$lib/backend/ipc';
 	import { SettingsService } from '$lib/config/appSettingsV2';
 	import { persistedChatModelName, projectAiGenEnabled } from '$lib/config/config';
-	import { Feed } from '$lib/feed/feed';
+	import FeedFactory from '$lib/feed/feed';
 	import { newProjectSettingsPath } from '$lib/routes/routes.svelte';
 	import { User } from '$lib/user/user';
 	import { getContext, getContextStore } from '@gitbutler/shared/context';
@@ -29,15 +29,16 @@
 
 	const { projectId, onCloseClick }: Props = $props();
 
-	const feed = getContext(Feed);
+	const feedFactory = getContext(FeedFactory);
+	const feed = $derived(feedFactory.getFeed(projectId));
 	const actionService = getContext(ActionService);
 	const user = getContextStore(User);
 	const settingsService = getContext(SettingsService);
 	const settingsStore = $derived(settingsService.appSettings);
 
 	const isAdmin = $derived($user.role === 'admin');
-	const combinedEntries = feed.combined;
-	const lastAddedId = feed.lastAddedId;
+	const combinedEntries = $derived(feed.combined);
+	const lastAddedId = $derived(feed.lastAddedId);
 
 	const MODELS = ['gpt-4.1', 'gpt-4.1-mini'] as const;
 

apps/desktop/src/components/FeedStreamMessage.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import FeedItemKind from '$components/FeedItemKind.svelte';
-	import { Feed, type InProgressAssistantMessage } from '$lib/feed/feed';
+	import FeedFactory, { type InProgressAssistantMessage } from '$lib/feed/feed';
 	import { getContext } from '@gitbutler/shared/context';
 	import Markdown from '@gitbutler/ui/markdown/Markdown.svelte';
 	import type { ToolCall } from '$lib/ai/tool';
@@ -12,7 +12,8 @@
 
 	const { projectId, message }: Props = $props();
 
-	const feed = getContext(Feed);
+	const feedFactory = getContext(FeedFactory);
+	const feed = $derived(feedFactory.getFeed(projectId));
 	let toolCalls = $state<ToolCall[]>(message.toolCalls);
 	let messageContent = $state(message.content);
 	const messageContentLines = $derived(messageContent.split('\n'));

apps/desktop/src/lib/feed/feed.ts

@@ -9,6 +9,36 @@ import type { ToolCall } from '$lib/ai/tool';
 import type { Tauri } from '$lib/backend/tauri';
 import type { StackService } from '$lib/stacks/stackService.svelte';
 
+export default class FeedFactory {
+	private instance: Feed | null = null;
+
+	constructor(
+		private tauri: Tauri,
+		private stackService: StackService
+	) {}
+
+	/**
+	 * Gets or creates a Feed instance for the given project ID.
+	 *
+	 * If an instance already exists for the project ID, it returns that instance
+	 *
+	 * If the instance exists but is for a different project ID, it unsubscribes from the previous instance
+	 * and creates a new instance for the new project ID.
+	 */
+	getFeed(projectId: string): Feed {
+		if (!this.instance) {
+			this.instance = new Feed(this.tauri, projectId, this.stackService);
+		}
+
+		if (!this.instance.isProjectFeed(projectId)) {
+			this.instance.unlisten();
+			this.instance = new Feed(this.tauri, projectId, this.stackService);
+		}
+
+		return this.instance;
+	}
+}
+
 type DBEvent = {
 	kind: 'actions' | 'workflows' | 'hunk-assignments' | 'unknown';
 	item?: string;
@@ -86,13 +116,13 @@ export type InProgressUpdate = TokenUpdate | ToolCallUpdate;
 
 type InProgressSubscribeCallback = (update: InProgressUpdate) => void;
 
-export class Feed {
-	private actionsBuffer: ButlerAction[] = [];
-	private workflowsBuffer: Workflow[] = [];
+class Feed {
+	private actionsBuffer: ButlerAction[];
+	private workflowsBuffer: Workflow[];
 	private unlistenDB: () => void;
 	private unlistenTokens: () => void;
 	private unlistenToolCalls: () => void;
-	private initialized = false;
+	private initialized;
 	private mutex = new Mutex();
 	private updateTimeout: ReturnType<typeof setTimeout> | null = null;
 	private messageSubscribers: Map<InProgressAssistantMessageId, InProgressSubscribeCallback[]>;
@@ -108,7 +138,10 @@ export class Feed {
 		private projectId: string,
 		private stackService: StackService
 	) {
+		this.actionsBuffer = [];
+		this.workflowsBuffer = [];
 		this.messageSubscribers = new Map();
+		this.initialized = false;
 
 		this.unlistenDB = this.tauri.listen<DBEvent>(`project://${projectId}/db-updates`, (event) => {
 			this.handleDBEvent(event.payload);
@@ -129,6 +162,10 @@ export class Feed {
 		);
 	}
 
+	isProjectFeed(projectId: string): boolean {
+		return this.projectId === projectId;
+	}
+
 	subscribeToMessage(
 		messageId: InProgressAssistantMessageId,
 		callback: InProgressSubscribeCallback

apps/desktop/src/routes/+layout.svelte

@@ -31,6 +31,7 @@
 	import DependencyService from '$lib/dependencies/dependencyService.svelte';
 	import { DragStateService } from '$lib/dragging/dragStateService.svelte';
 	import { DropzoneRegistry } from '$lib/dragging/registry';
+	import FeedFactory from '$lib/feed/feed';
 	import { FileService } from '$lib/files/fileService';
 	import { UncommitedFilesWatcher } from '$lib/files/watcher';
 	import { DefaultForgeFactory } from '$lib/forge/forgeFactory.svelte';
@@ -148,6 +149,7 @@
 		forgeFactory,
 		uiState
 	);
+	const feedFactory = new FeedFactory(data.tauri, stackService);
 	const rulesService = new RulesService(clientState['backendApi']);
 	const actionService = new ActionService(clientState['backendApi']);
 	const oplogService = new OplogService(clientState['backendApi']);
@@ -226,6 +228,7 @@
 	setContext(AppSettings, data.appSettings);
 	setContext(EventContext, data.eventContext);
 	setContext(StackService, stackService);
+	setContext(FeedFactory, feedFactory);
 	setContext(RulesService, rulesService);
 	setContext(ActionService, actionService);
 	setContext(OplogService, oplogService);

apps/desktop/src/routes/[projectId]/+layout.svelte

@@ -18,7 +18,7 @@
 	import { SettingsService } from '$lib/config/appSettingsV2';
 	import { showHistoryView } from '$lib/config/config';
 	import { StackingReorderDropzoneManagerFactory } from '$lib/dragging/stackingReorderDropzoneManager';
-	import { Feed } from '$lib/feed/feed';
+	import FeedFactory from '$lib/feed/feed';
 	import { FocusManager } from '$lib/focus/focusManager.svelte';
 	import { DefaultForgeFactory } from '$lib/forge/forgeFactory.svelte';
 	import { GitHubClient } from '$lib/forge/github/githubClient';
@@ -43,7 +43,7 @@
 
 	const { data, children: pageChildren }: { data: LayoutData; children: Snippet } = $props();
 
-	const { projectId, userService, posthog, projectMetrics, tauri } = $derived(data);
+	const { projectId, userService, posthog, projectMetrics } = $derived(data);
 
 	const baseBranchService = getContext(BaseBranchService);
 	const repoInfoResponse = $derived(baseBranchService.repo(projectId));
@@ -56,7 +56,7 @@
 	const branchService = getContext(BranchService);
 
 	const stackService = getContext(StackService);
-	const feed = $derived(new Feed(tauri, projectId, stackService));
+	const feedFactory = getContext(FeedFactory);
 	const modeService = $derived(new ModeService(projectId, stackService));
 	$effect.pre(() => {
 		setContext(ModeService, modeService);
@@ -95,9 +95,6 @@
 	$effect.pre(() => {
 		setContext(HistoryService, data.historyService);
 		setContext(BaseBranch, baseBranch);
-
-		// Cloud related services
-		setContext(Feed, feed);
 	});
 
 	const focusManager = new FocusManager();
@@ -280,6 +277,11 @@
 	$effect(() => {
 		stackService.stackDetailsUpdateListener(projectId);
 	});
+
+	// Listen for the feed updates from the backend.
+	$effect(() => {
+		feedFactory.getFeed(projectId);
+	});
 </script>
 
 <ProjectSettingsMenuAction {projectId} />