Add JJ VCS driver support

- Detect and route jj repositories alongside git - Thread VCS kind through status and UI labels - Add jj driver contract coverage and shared freshness helper

Julius Marminge committed 6 months ago

Commit c31beca1 parent 128b43230 files · +838 −44Browse files

Showing the changes to apps/web/src/components (7 of 30 files). Show all

Unified · Split

7 files

apps/web/src/components/BranchToolbarBranchSelector.tsx +14 −8
apps/web/src/components/ChatView.tsx +7 −5
apps/web/src/components/DiffPanel.tsx +6 −4
apps/web/src/components/GitActionsControl.browser.tsx +1 −0
apps/web/src/components/GitActionsControl.logic.test.ts +1 −0
apps/web/src/components/GitActionsControl.tsx +25 −1
apps/web/src/components/chat/ChatHeader.tsx +12 −7

apps/web/src/components/BranchToolbarBranchSelector.tsx+14−8

 import { parsePullRequestReference } from "../pullRequestReference";
 import { useStore } from "../store";
 import { createProjectSelectorByRef, createThreadSelectorByRef } from "../storeSelectors";
+import { resolveVcsTerms } from "../vcsPresentation";
 import {
   deriveLocalBranchNameFromRemoteRef,
   resolveBranchSelectionTarget,
   activeWorktreePath: string | null;
   effectiveEnvMode: "local" | "worktree";
   resolvedActiveBranch: string | null;
+  refNoun: string;
 }): string {
-  const { activeWorktreePath, effectiveEnvMode, resolvedActiveBranch } = input;
+  const { activeWorktreePath, effectiveEnvMode, resolvedActiveBranch, refNoun } = input;
   if (!resolvedActiveBranch) {
-    return "Select ref";
+    return `Select ${refNoun}`;
   }
   if (effectiveEnvMode === "worktree" && !activeWorktreePath) {
     return `From ${resolvedActiveBranch}`;
   const deferredBranchQuery = useDeferredValue(branchQuery);
   const branchStatusQuery = useGitStatus({ environmentId, cwd: branchCwd });
+  const vcsTerms = resolveVcsTerms(branchStatusQuery.data?.kind);
   const trimmedBranchQuery = branchQuery.trim();
   const deferredTrimmedBranchQuery = deferredBranchQuery.trim();
   const shouldVirtualizeBranchList = filteredBranchPickerItems.length > 40;
   const totalBranchCount = branchesSearchData?.pages[0]?.totalCount ?? 0;
   const branchStatusText = isBranchesSearchPending
-    ? "Loading refs..."
+    ? `Loading ${vcsTerms.refNounPlural}...`
     : isFetchingNextPage
-      ? "Loading more refs..."
+      ? `Loading more ${vcsTerms.refNounPlural}...`
       : hasNextPage
-        ? `Showing ${refs.length} of ${totalBranchCount} refs`
+        ? `Showing ${refs.length} of ${totalBranchCount} ${vcsTerms.refNounPlural}`
         : null;
   // ---------------------------------------------------------------------------
         toastManager.add(
           stackedThreadToast({
             type: "error",
-            title: "Failed to switch ref.",
+            title: `Failed to switch ${vcsTerms.refNoun}.`,
             description: toBranchActionErrorMessage(error),
           }),
         );
         toastManager.add(
           stackedThreadToast({
             type: "error",
-            title: "Failed to create and switch ref.",
+            title: `Failed to create and switch ${vcsTerms.refNoun}.`,
             description: toBranchActionErrorMessage(error),
           }),
         );
     activeWorktreePath,
     effectiveEnvMode,
     resolvedActiveBranch,
+    refNoun: vcsTerms.refNoun,
   });
   function renderPickerItem(itemValue: string, index: number) {
           value={itemValue}
           onClick={() => createRef(trimmedBranchQuery)}
         >
-          <span className="truncate">Create new ref &quot;{trimmedBranchQuery}&quot;</span>
+          <span className="truncate">
+            Create new {vcsTerms.refNoun} &quot;{trimmedBranchQuery}&quot;
+          </span>
         </ComboboxItem>
       );
     }

apps/web/src/components/ChatView.tsx+7−5

       ? terminalLaunchContext
       : (storeServerTerminalLaunchContext ?? null);
   // Default true while loading to avoid toolbar flicker.
-  const isGitRepo = gitStatusQuery.data?.isRepo ?? true;
+  const vcsKind = gitStatusQuery.data?.kind ?? null;
+  const isVcsRepo = gitStatusQuery.data?.isRepo ?? true;
   const terminalShortcutLabelOptions = useMemo(
     () => ({
       context: {
       : (activeThread?.branch ?? null);
   const sendEnvMode = resolveSendEnvMode({
     requestedEnvMode: envMode,
-    isGitRepo,
+    isGitRepo: isVcsRepo,
   });
   useEffect(() => {
           {...(routeKind === "draft" && draftId ? { draftId } : {})}
           activeThreadTitle={activeThread.title}
           activeProjectName={activeProject?.name}
-          isGitRepo={isGitRepo}
+          isVcsRepo={isVcsRepo}
+          vcsKind={vcsKind}
           openInCwd={gitCwd}
           activeProjectScripts={activeProject?.scripts}
           preferredScriptId={
           <div
             className={cn(
               "pl-[calc(env(safe-area-inset-left)+0.75rem)] pr-[calc(env(safe-area-inset-right)+0.75rem)] pt-1.5 sm:pl-[calc(env(safe-area-inset-left)+1.25rem)] sm:pr-[calc(env(safe-area-inset-right)+1.25rem)] sm:pt-2",
-              isGitRepo
+              isVcsRepo
                 ? "pb-[calc(env(safe-area-inset-bottom)+0.25rem)]"
                 : "pb-[calc(env(safe-area-inset-bottom)+0.75rem)] sm:pb-[calc(env(safe-area-inset-bottom)+1rem)]",
             )}
               setThreadError={setThreadError}
               onExpandImage={onExpandTimelineImage}
             />
-            {isGitRepo && (
+            {isVcsRepo && (
               <BranchToolbar
                 environmentId={activeThread.environmentId}
                 threadId={activeThread.id}

apps/web/src/components/DiffPanel.tsx+6−4

 import { buildThreadRouteParams, resolveThreadRouteRef } from "../threadRoutes";
 import { useSettings } from "../hooks/useSettings";
 import { formatShortTimestamp } from "../timestampFormat";
+import { resolveVcsTerms } from "../vcsPresentation";
 import { DiffPanelLoadingState, DiffPanelShell, type DiffPanelMode } from "./DiffPanelShell";
 import { ToggleGroup, Toggle } from "./ui/toggle-group";
     environmentId: activeThread?.environmentId ?? null,
     cwd: activeCwd ?? null,
   });
-  const isGitRepo = gitStatusQuery.data?.isRepo ?? true;
+  const isVcsRepo = gitStatusQuery.data?.isRepo ?? true;
+  const vcsTerms = resolveVcsTerms(gitStatusQuery.data?.kind);
   const { turnDiffSummaries, inferredCheckpointTurnCountByTurnId } =
     useTurnDiffSummaries(activeThread);
   const orderedTurnDiffSummaries = useMemo(
       fromTurnCount: activeCheckpointRange?.fromTurnCount ?? null,
       toTurnCount: activeCheckpointRange?.toTurnCount ?? null,
       cacheScope: selectedTurn ? `turn:${selectedTurn.turnId}` : conversationCacheScope,
-      enabled: isGitRepo,
+      enabled: isVcsRepo,
     }),
   );
   const selectedTurnCheckpointDiff = selectedTurn
         <div className="flex flex-1 items-center justify-center px-5 text-center text-xs text-muted-foreground/70">
           Select a thread to inspect turn diffs.
         </div>
-      ) : !isGitRepo ? (
+      ) : !isVcsRepo ? (
         <div className="flex flex-1 items-center justify-center px-5 text-center text-xs text-muted-foreground/70">
-          Turn diffs are unavailable because this project is not a git repository.
+          Turn diffs are unavailable because this project is not a {vcsTerms.repositoryNoun}.
         </div>
       ) : orderedTurnDiffSummaries.length === 0 ? (
         <div className="flex flex-1 items-center justify-center px-5 text-center text-xs text-muted-foreground/70">

apps/web/src/components/GitActionsControl.browser.tsx+1−0

@@ -113,6 +113,7 @@ vi.mock("~/lib/gitStatusState", () => ({ · 112 unmodified lines
113	resetGitStatusStateForTests: () => undefined,	113	resetGitStatusStateForTests: () => undefined,
114	useGitStatus: vi.fn(() => ({	114	useGitStatus: vi.fn(() => ({
115	data: {	115	data: {
		116	kind: "git",
116	isRepo: true,	117	isRepo: true,
117	sourceControlProvider: {	118	sourceControlProvider: {
118	kind: "github",	119	kind: "github",

apps/web/src/components/GitActionsControl.logic.test.ts+1−0

@@ -13,6 +13,7 @@ import { · 12 unmodified lines
13		13
14	function status(overrides: Partial<VcsStatusResult> = {}): VcsStatusResult {	14	function status(overrides: Partial<VcsStatusResult> = {}): VcsStatusResult {
15	return {	15	return {
		16	kind: "git",
16	isRepo: true,	17	isRepo: true,
17	hasPrimaryRemote: true,	18	hasPrimaryRemote: true,
18	isDefaultRef: false,	19	isDefaultRef: false,

apps/web/src/components/GitActionsControl.tsx+25−1

@@ -54,6 +54,7 @@ import { readEnvironmentApi } from "~/environmentApi"; · 53 unmodified lines
54	import { readLocalApi } from "~/localApi";	54	import { readLocalApi } from "~/localApi";
55	import { useStore } from "~/store";	55	import { useStore } from "~/store";
56	import { createThreadSelectorByRef } from "~/storeSelectors";	56	import { createThreadSelectorByRef } from "~/storeSelectors";
		57	import { resolveVcsActionPresentation, resolveVcsTerms } from "~/vcsPresentation";
57		58
58	interface GitActionsControlProps {	59	interface GitActionsControlProps {
59	gitCwd: string \| null;	60	gitCwd: string \| null;
@@ -324,8 +325,12 @@ export default function GitActionsControl({ · 264 unmodified lines
324	});	325	});
325	// Default to true while loading so we don't flash init controls.	326	// Default to true while loading so we don't flash init controls.
326	const isRepo = gitStatus?.isRepo ?? true;	327	const isRepo = gitStatus?.isRepo ?? true;
		328	const vcsKind = gitStatus?.kind ?? null;
		329	const vcsTerms = resolveVcsTerms(vcsKind);
		330	const vcsActionPresentation = resolveVcsActionPresentation(vcsKind);
		331	const supportsGitWorkflowActions = !isRepo \|\| vcsActionPresentation.supportsGitWorkflowActions;
327	const hasPrimaryRemote = gitStatus?.hasPrimaryRemote ?? false;	332	const hasPrimaryRemote = gitStatus?.hasPrimaryRemote ?? false;
328	const gitStatusForActions = gitStatus;	333	const gitStatusForActions = supportsGitWorkflowActions ? gitStatus : null;
329		334
330	const allFiles = gitStatusForActions?.workingTree.files ?? [];	335	const allFiles = gitStatusForActions?.workingTree.files ?? [];
331	const selectedFiles = allFiles.filter((f) => !excludedFiles.has(f.path));	336	const selectedFiles = allFiles.filter((f) => !excludedFiles.has(f.path));
@@ -874,6 +879,25 @@ export default function GitActionsControl({ · 542 unmodified lines
874	>	879	>
875	{initMutation.isPending ? "Initializing..." : "Initialize Git"}	880	{initMutation.isPending ? "Initializing..." : "Initialize Git"}
876	</Button>	881	</Button>
		882	) : !supportsGitWorkflowActions ? (
		883	<Popover>
		884	<PopoverTrigger
		885	openOnHover
		886	render={
		887	<Button
		888	aria-disabled="true"
		889	className="cursor-not-allowed opacity-70"
		890	size="xs"
		891	variant="outline"
		892	/>
		893	}
		894	>
		895	{vcsTerms.systemName} {vcsTerms.repositoryNoun}
		896	</PopoverTrigger>
		897	<PopoverPopup tooltipStyle side="bottom" align="end">
		898	{vcsActionPresentation.unsupportedGitWorkflowDescription}
		899	</PopoverPopup>
		900	</Popover>
877	) : (	901	) : (
878	<Group aria-label="Git actions" className="shrink-0">	902	<Group aria-label="Git actions" className="shrink-0">
879	{quickActionDisabledReason ? (	903	{quickActionDisabledReason ? (

apps/web/src/components/chat/ChatHeader.tsx+12−7

 import { SidebarTrigger } from "../ui/sidebar";
 import { OpenInPicker } from "./OpenInPicker";
 import { usePrimaryEnvironmentId } from "../../environments/primary";
+import { resolveVcsTerms } from "../../vcsPresentation";
+import type { VcsDriverKind } from "@t3tools/contracts";
 interface ChatHeaderProps {
   activeThreadEnvironmentId: EnvironmentId;
   draftId?: DraftId;
   activeThreadTitle: string;
   activeProjectName: string | undefined;
-  isGitRepo: boolean;
+  isVcsRepo: boolean;
+  vcsKind: VcsDriverKind | null;
   openInCwd: string | null;
   activeProjectScripts: ProjectScript[] | undefined;
   preferredScriptId: string | null;
   draftId,
   activeThreadTitle,
   activeProjectName,
-  isGitRepo,
+  isVcsRepo,
+  vcsKind,
   openInCwd,
   activeProjectScripts,
   preferredScriptId,
   const primaryEnvironmentId = usePrimaryEnvironmentId();
   const isRemoteEnvironment =
     primaryEnvironmentId !== null && activeThreadEnvironmentId !== primaryEnvironmentId;
+  const vcsTerms = resolveVcsTerms(vcsKind);
   return (
     <div className="@container/header-actions flex min-w-0 flex-1 items-center gap-2">
             <span className="min-w-0 truncate">{activeProjectName}</span>
           </Badge>
         )}
-        {activeProjectName && !isGitRepo && (
+        {activeProjectName && !isVcsRepo && (
           <Badge variant="outline" className="shrink-0 text-[10px] text-amber-700">
-            No Git
+            No repository
           </Badge>
         )}
       </div>
                 aria-label="Toggle diff panel"
                 variant="outline"
                 size="xs"
-                disabled={!isGitRepo && !diffOpen}
+                disabled={!isVcsRepo && !diffOpen}
               >
                 <DiffIcon className="size-3" />
               </Toggle>
             }
           />
           <TooltipPopup side="bottom">
-            {!isGitRepo && !diffOpen
+            {!isVcsRepo && !diffOpen
-              ? "Diff panel is unavailable because this project is not a git repository."
+              ? `Diff panel is unavailable because this project is not a supported ${vcsTerms.repositoryNoun}.`
               : diffToggleShortcutLabel
                 ? `Toggle diff panel (${diffToggleShortcutLabel})`
                 : "Toggle diff panel"}