upstream 取り込み PR #5: #3295 + 19 procedure architecture rework

apps/desktop/src/lib/trpc/routers/workspaces/utils/github/cache.ts

@@ -349,7 +349,7 @@ export function readCachedGitHubCommitAuthor(
 }
 
 export function clearGitHubCachesForWorktree(worktreePath: string): void {
-	githubStatusResource.invalidate(worktreePath);
+	githubStatusResource.invalidatePrefix(worktreePath);
 	repoContextResource.invalidate(worktreePath);
 	recordGitHubCacheMetric({
 		kind: "status",

apps/desktop/src/lib/trpc/routers/workspaces/utils/github/github.ts

@@ -125,8 +125,9 @@ async function resolveAttachedPullRequest({
 
 async function resolvePullRequestCommentsTarget(
 	worktreePath: string,
+	branchName?: string | null,
 ): Promise<PullRequestCommentsTarget | null> {
-	const githubStatus = await fetchGitHubPRStatus(worktreePath);
+	const githubStatus = await fetchGitHubPRStatus(worktreePath, branchName);
 	if (!githubStatus?.pr) {
 		return null;
 	}
@@ -265,26 +266,36 @@ async function refreshGitHubPRComments({
 }
 
 /**
- * Fetches GitHub PR status for a worktree using the `gh` CLI.
+ * Fetches GitHub PR status for a worktree or branch workspace using the `gh` CLI.
  * Returns null if `gh` is not installed, not authenticated, or on error.
+ *
+ * @param branchName - Optional branch name override. Used **only** to scope the
+ *   cache key so multiple branch workspaces sharing a main-repo path do not
+ *   cross-contaminate each other's PR status. The inner `refreshGitHubPRStatus`
+ *   call still resolves SHA/upstream from the repo's currently checked-out
+ *   branch — fully propagating the override inside the refresh path is out of
+ *   scope for this PR because the fork's PR attachment / resolution helpers
+ *   (`resolveGitHubStatusContext`, `resolveAttachedPullRequest`) differ from
+ *   upstream and need a separate rework. Tracked as follow-up work.
  */
 export async function fetchGitHubPRStatus(
 	worktreePath: string,
+	branchName?: string | null,
 ): Promise<GitHubStatus | null> {
+	const cacheKey = branchName ? `${worktreePath}::${branchName}` : worktreePath;
 	if (isRateLimited()) {
 		// When rate limited, return stale cache or null — never throw,
 		// and never overwrite stale cache with null
-		const cached = getCachedGitHubStatus(worktreePath);
+		const cached = getCachedGitHubStatus(cacheKey);
 		trackGitHubOperationEvent({
 			name: "status_refresh",
 			category: "sync",
 			worktreePath,
-			success:
-				cached !== null || getCachedGitHubStatusState(worktreePath) !== null,
+			success: cached !== null || getCachedGitHubStatusState(cacheKey) !== null,
 			durationMs: 0,
 			rateLimited: true,
 			error:
-				cached === null && getCachedGitHubStatusState(worktreePath) === null
+				cached === null && getCachedGitHubStatusState(cacheKey) === null
 					? "Rate limited without cached status"
 					: undefined,
 		});
@@ -295,7 +306,7 @@ export async function fetchGitHubPRStatus(
 		category: "sync",
 		worktreePath,
 		fn: () =>
-			readCachedGitHubStatus(worktreePath, () =>
+			readCachedGitHubStatus(cacheKey, () =>
 				rateLimitedRefresh(() => refreshGitHubPRStatus(worktreePath)),
 			),
 	});
@@ -317,9 +328,11 @@ async function rateLimitedRefresh<T>(fn: () => Promise<T>): Promise<T> {
 export async function fetchGitHubPRComments({
 	worktreePath,
 	pullRequest,
+	branchName,
 }: {
 	worktreePath: string;
 	pullRequest?: PullRequestCommentsTarget | null;
+	branchName?: string | null;
 }): Promise<PullRequestComment[]> {
 	if (isRateLimited()) {
 		trackGitHubOperationEvent({
@@ -339,7 +352,8 @@ export async function fetchGitHubPRComments({
 			worktreePath,
 			fn: async () => {
 				const pullRequestTarget =
-					pullRequest ?? (await resolvePullRequestCommentsTarget(worktreePath));
+					pullRequest ??
+					(await resolvePullRequestCommentsTarget(worktreePath, branchName));
 				if (!pullRequestTarget) {
 					return [];
 				}

apps/desktop/src/lib/trpc/routers/workspaces/workspaces.ts

@@ -1,4 +1,5 @@
-import { mergeRouters } from "../..";
+import { mergeRouters, router } from "../..";
+import { createGithubExtendedRouter } from "./github-extended";
 import { createCreateProcedures } from "./procedures/create";
 import { createDeleteProcedures } from "./procedures/delete";
 import { createGenerateBranchNameProcedures } from "./procedures/generate-branch-name";
@@ -14,6 +15,7 @@ export const createWorkspacesRouter = () => {
 		createDeleteProcedures(),
 		createQueryProcedures(),
 		createGitStatusProcedures(),
+		router({ githubExtended: createGithubExtendedRouter() }),
 		createStatusProcedures(),
 		createInitProcedures(),
 		createSectionsProcedures(),

apps/desktop/src/renderer/react-query/workspaces/useCleanupMissingWorktrees.ts

@@ -3,10 +3,12 @@ import { electronTrpc } from "renderer/lib/electron-trpc";
 export function useCleanupMissingWorktrees() {
 	const utils = electronTrpc.useUtils();
 
-	return electronTrpc.workspaces.cleanupMissingWorktrees.useMutation({
-		onSuccess: async () => {
-			await utils.workspaces.invalidate();
-			await utils.projects.getRecents.invalidate();
+	return electronTrpc.workspaces.githubExtended.cleanupMissingWorktrees.useMutation(
+		{
+			onSuccess: async () => {
+				await utils.workspaces.invalidate();
+				await utils.projects.getRecents.invalidate();
+			},
 		},
-	});
+	);
 }

apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/KeepAliveWorkspaces.tsx

@@ -30,7 +30,7 @@ export function KeepAliveWorkspaces() {
 	// Notify SyncService which workspace is active so only it gets polled.
 	// Passing workspaceId=null deactivates all polling (e.g., dashboard view).
 	const { mutate: setActiveSyncWorkspace } =
-		electronTrpc.workspaces.setActiveSyncWorkspace.useMutation();
+		electronTrpc.workspaces.githubExtended.setActiveSyncWorkspace.useMutation();
 	const prevActiveIdRef = useRef<string | null>(null);
 
 	useEffect(() => {

apps/desktop/src/renderer/routes/_authenticated/_dashboard/project/$projectId/components/ProjectWorktreeAutoSync/ProjectWorktreeAutoSync.tsx

@@ -19,7 +19,7 @@ export function ProjectWorktreeAutoSync({ projectId }: { projectId: string }) {
 	// Only pay the cost of listing + existsSync-ing tracked worktrees when the
 	// project has opted in. Otherwise the query is skipped entirely.
 	const { data: missingWorktrees = [], isLoading } =
-		electronTrpc.workspaces.getMissingWorktrees.useQuery(
+		electronTrpc.workspaces.githubExtended.getMissingWorktrees.useQuery(
 			{ projectId },
 			{ enabled: autoRemoveEnabled },
 		);

apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/TabView/ActionLogsPane/ActionLogsPane.tsx

@@ -123,11 +123,11 @@ function JobSteps({
 }: JobStepsProps) {
 	const [expandedSteps, setExpandedSteps] = useState<Set<number>>(new Set());
 	const rerunMutation =
-		electronTrpc.workspaces.rerunPullRequestChecks.useMutation();
+		electronTrpc.workspaces.githubExtended.rerunPullRequestChecks.useMutation();
 	const trpcUtils = electronTrpc.useUtils();
 
 	const { data: jobResult, isLoading } =
-		electronTrpc.workspaces.getJobLogs.useQuery(
+		electronTrpc.workspaces.githubExtended.getJobLogs.useQuery(
 			{ workspaceId, detailsUrl },
 			{
 				staleTime: 3_000,
@@ -160,7 +160,7 @@ function JobSteps({
 			toast.success(
 				`Re-running ${mode === "failed" ? "failed" : "all"} jobs (${result.rerunCount})`,
 			);
-			void trpcUtils.workspaces.getJobLogs.invalidate();
+			void trpcUtils.workspaces.githubExtended.getJobLogs.invalidate();
 			void trpcUtils.workspaces.getGitHubStatus.invalidate();
 		} catch {
 			toast.error("Failed to re-run jobs");
@@ -442,7 +442,7 @@ export function ActionLogsPane({
 
 	// Poll workflow run jobs when runId is present (workflow dispatch case)
 	const { data: polledJobs } =
-		electronTrpc.workspaces.getWorkflowRunJobs.useQuery(
+		electronTrpc.workspaces.githubExtended.getWorkflowRunJobs.useQuery(
 			{ workspaceId, runId: runId ?? 0 },
 			{
 				enabled: !!runId,

apps/desktop/src/renderer/screens/main/components/WorkspaceView/RightSidebar/ChangesView/components/RepositoryPanel/RepositoryPanel.tsx

@@ -218,7 +218,7 @@ function WorkflowRunCard({
 	onViewLogs: (runId: number) => void;
 }) {
 	const { data: runs = [], isFetching } =
-		electronTrpc.workspaces.getGitHubWorkflowRuns.useQuery(
+		electronTrpc.workspaces.githubExtended.getGitHubWorkflowRuns.useQuery(
 			{
 				workspaceId,
 				workflowId: tracked.workflowId,
@@ -372,7 +372,7 @@ export function RepositoryPanel({ isActive = true }: RepositoryPanelProps) {
 		data: repositoryOverview,
 		isLoading,
 		error,
-	} = electronTrpc.workspaces.getGitHubRepositoryOverview.useQuery(
+	} = electronTrpc.workspaces.githubExtended.getGitHubRepositoryOverview.useQuery(
 		{ workspaceId: workspaceId ?? "" },
 		{
 			enabled: !!workspaceId && isActive,
@@ -381,11 +381,11 @@ export function RepositoryPanel({ isActive = true }: RepositoryPanelProps) {
 		},
 	);
 	const createIssueMutation =
-		electronTrpc.workspaces.createGitHubIssue.useMutation();
+		electronTrpc.workspaces.githubExtended.createGitHubIssue.useMutation();
 	const uploadIssueAssetMutation =
-		electronTrpc.workspaces.uploadGitHubIssueAsset.useMutation();
+		electronTrpc.workspaces.githubExtended.uploadGitHubIssueAsset.useMutation();
 	const dispatchWorkflowMutation =
-		electronTrpc.workspaces.dispatchGitHubWorkflow.useMutation();
+		electronTrpc.workspaces.githubExtended.dispatchGitHubWorkflow.useMutation();
 
 	const availableAssignees = repositoryOverview?.issueAssignees ?? [];
 	const availableAssigneesByLogin = useMemo(
@@ -471,9 +471,11 @@ export function RepositoryPanel({ isActive = true }: RepositoryPanelProps) {
 			return;
 		}
 
-		await trpcUtils.workspaces.getGitHubRepositoryOverview.invalidate({
-			workspaceId,
-		});
+		await trpcUtils.workspaces.githubExtended.getGitHubRepositoryOverview.invalidate(
+			{
+				workspaceId,
+			},
+		);
 	};
 
 	const handleCreateIssue = async () => {
@@ -664,10 +666,11 @@ export function RepositoryPanel({ isActive = true }: RepositoryPanelProps) {
 			return;
 		}
 		try {
-			const jobs = await trpcUtils.workspaces.getWorkflowRunJobs.fetch({
-				workspaceId,
-				runId,
-			});
+			const jobs =
+				await trpcUtils.workspaces.githubExtended.getWorkflowRunJobs.fetch({
+					workspaceId,
+					runId,
+				});
 			const failedIdx = jobs.findIndex((j) => j.status === "failure");
 			addActionLogsTab(
 				workspaceId,

apps/desktop/src/renderer/screens/main/components/WorkspaceView/RightSidebar/ChangesView/components/ReviewPanel/ReviewPanel.tsx

@@ -149,17 +149,17 @@ export function ReviewPanel({
 	> | null>(null);
 	const copyToClipboardMutation = electronTrpc.external.copyText.useMutation();
 	const setPullRequestDraftStateMutation =
-		electronTrpc.workspaces.setPullRequestDraftState.useMutation();
+		electronTrpc.workspaces.githubExtended.setPullRequestDraftState.useMutation();
 	const setPullRequestThreadResolutionMutation =
-		electronTrpc.workspaces.setPullRequestThreadResolution.useMutation();
+		electronTrpc.workspaces.githubExtended.setPullRequestThreadResolution.useMutation();
 	const replyToPullRequestCommentMutation =
-		electronTrpc.workspaces.replyToPullRequestComment.useMutation();
+		electronTrpc.workspaces.githubExtended.replyToPullRequestComment.useMutation();
 	const updatePullRequestReviewersMutation =
-		electronTrpc.workspaces.updatePullRequestReviewers.useMutation();
+		electronTrpc.workspaces.githubExtended.updatePullRequestReviewers.useMutation();
 	const updatePullRequestAssigneesMutation =
-		electronTrpc.workspaces.updatePullRequestAssignees.useMutation();
+		electronTrpc.workspaces.githubExtended.updatePullRequestAssignees.useMutation();
 	const rerunPullRequestChecksMutation =
-		electronTrpc.workspaces.rerunPullRequestChecks.useMutation();
+		electronTrpc.workspaces.githubExtended.rerunPullRequestChecks.useMutation();
 	const candidateKind =
 		identityPopoverOpen === "assignees" ? "assignee" : "reviewer";
 	const canEditPullRequest = pr?.state === "open" || pr?.state === "draft";
@@ -190,19 +190,22 @@ export function ReviewPanel({
 	const {
 		data: identityCandidates = [],
 		isLoading: isIdentityCandidatesLoading,
-	} = electronTrpc.workspaces.getPullRequestIdentityCandidates.useQuery(
-		{
-			workspaceId: resolvedWorkspaceId ?? "",
-			kind: candidateKind,
-			pullRequestUrl: pr?.url,
-		},
-		{
-			enabled:
-				!!resolvedWorkspaceId && !!identityPopoverOpen && !!canEditPullRequest,
-			staleTime: 60_000,
-			refetchOnWindowFocus: false,
-		},
-	);
+	} =
+		electronTrpc.workspaces.githubExtended.getPullRequestIdentityCandidates.useQuery(
+			{
+				workspaceId: resolvedWorkspaceId ?? "",
+				kind: candidateKind,
+				pullRequestUrl: pr?.url,
+			},
+			{
+				enabled:
+					!!resolvedWorkspaceId &&
+					!!identityPopoverOpen &&
+					!!canEditPullRequest,
+				staleTime: 60_000,
+				refetchOnWindowFocus: false,
+			},
+		);
 
 	useEffect(() => {
 		return () => {
@@ -610,7 +613,7 @@ export function ReviewPanel({
 					: `Re-ran ${result.rerunCount} workflow run${result.rerunCount === 1 ? "" : "s"}`,
 			);
 			await refreshReview("status");
-			void trpcUtils.workspaces.getJobLogs.invalidate();
+			void trpcUtils.workspaces.githubExtended.getJobLogs.invalidate();
 		} catch (error) {
 			const message = error instanceof Error ? error.message : "Unknown error";
 			toast.error(`Failed to rerun jobs: ${message}`);

apps/desktop/src/renderer/screens/main/components/WorkspaceView/RightSidebar/ChangesView/components/ReviewPanel/components/CheckSteps/CheckSteps.tsx

@@ -51,7 +51,7 @@ export function CheckSteps({ detailsUrl }: CheckStepsProps) {
 	const workspaceId = useWorkspaceId();
 
 	const { data: steps, isLoading } =
-		electronTrpc.workspaces.getCheckJobSteps.useQuery(
+		electronTrpc.workspaces.githubExtended.getCheckJobSteps.useQuery(
 			{ workspaceId: workspaceId ?? "", detailsUrl },
 			{
 				enabled: !!workspaceId && !!detailsUrl,