feat(jj): support colocated Jujutsu repositories

.github/actions/setup-jj/action.yml

@@ -0,0 +1,40 @@
+name: Setup Jujutsu
+description: Install the jj CLI from the official jj-vcs release artifacts.
+
+inputs:
+  version:
+    description: Jujutsu release tag to install.
+    required: false
+    default: v0.42.0
+
+runs:
+  using: composite
+  steps:
+    - name: Install jj
+      shell: bash
+      env:
+        JJ_VERSION: ${{ inputs.version }}
+      run: |
+        set -euo pipefail
+
+        case "${RUNNER_OS}-${RUNNER_ARCH}" in
+          Linux-X64)
+            asset="jj-${JJ_VERSION}-x86_64-unknown-linux-musl.tar.gz"
+            ;;
+          *)
+            echo "Unsupported runner for jj install: ${RUNNER_OS}-${RUNNER_ARCH}" >&2
+            exit 1
+            ;;
+        esac
+
+        install_dir="${RUNNER_TEMP}/jj-${JJ_VERSION}"
+        mkdir -p "$install_dir"
+
+        curl -fsSL \
+          "https://github.com/jj-vcs/jj/releases/download/${JJ_VERSION}/${asset}" \
+          -o "${RUNNER_TEMP}/${asset}"
+        tar -xzf "${RUNNER_TEMP}/${asset}" -C "$install_dir"
+
+        chmod +x "${install_dir}/jj"
+        echo "$install_dir" >> "$GITHUB_PATH"
+        "${install_dir}/jj" --version

.github/workflows/ci.yml

@@ -252,6 +252,10 @@ jobs:
           cache: true
           run-install: true
 
+      # The jj suites in apps/server/src/vcs skip themselves when jj is absent,
+      # so this step is what makes them actually run.
+      - uses: ./.github/actions/setup-jj
+
       # No Electron setup here: `t3` (apps/server) has no Electron dependency
       # and none of its tests touch the runtime. Only the non-server `test`
       # job, which covers @t3tools/desktop, needs the download.

.github/workflows/release.yml

@@ -297,6 +297,9 @@ jobs:
           sudo sed -i 's|http://|https://|g' /etc/apt/blacksmith-ubuntu-mirrors.txt /etc/apt/sources.list.d/ubuntu.sources
           sudo apt-get update && sudo apt-get install -y libsecret-1-dev pkg-config build-essential
 
+      # `vp run test` includes the apps/server suite, whose jj tests skip without jj.
+      - uses: ./.github/actions/setup-jj
+
       - name: Test
         run: vp run --parallel --concurrency-limit 4 --filter '!t3' --filter '!@t3tools/monorepo' test
 

apps/mobile/src/features/review/ReviewSheet.tsx

@@ -1,3 +1,6 @@
+import { getVcsTerminology, type VcsTerminology } from "@t3tools/shared/vcs";
+import { useEnvironmentQuery } from "../../state/query";
+import { vcsEnvironment } from "../../state/vcs";
 import type { EnvironmentId, ThreadId } from "@t3tools/contracts";
 import { useNavigation, type StaticScreenProps } from "@react-navigation/native";
 import { nativeHeaderScrollEdgeEffects } from "../../native/StackHeader";
@@ -71,6 +74,7 @@ import { reportShowcaseSceneRendered } from "../showcase/showcaseRenderSignal";
 function ReviewHeader(
   props: Parameters<typeof useReviewHeaderPresentation>[0] & {
     readonly iconColor: string;
+    readonly vcsTerminology: VcsTerminology;
     readonly sectionMenu: ReturnType<typeof buildReviewSectionMenu>;
     readonly showSectionToolbar: boolean;
     readonly showChangedFilesToggle: boolean;
@@ -461,6 +465,13 @@ export function ReviewSheet(props: ReviewSheetProps) {
   const { draftMessage } = useThreadDraftForThread({ environmentId, threadId });
   const reviewCache = useReviewCacheForThread({ environmentId, threadId });
   const { selectedThreadCwd } = useSelectedThreadWorktree();
+  const gitStatusQuery = useEnvironmentQuery(
+    selectedThreadCwd === null
+      ? null
+      : vcsEnvironment.status({ environmentId, input: { cwd: selectedThreadCwd } }),
+  );
+  const vcsKind = gitStatusQuery.data?.vcs?.kind ?? null;
+  const vcsTerminology = getVcsTerminology(vcsKind);
   // With a solid (non-overlay) header the content lays out below the header
   // natively, so no manual top inset is needed. (Android renders its own
   // in-flow AndroidScreenHeader, so it needs no inset either.)
@@ -482,6 +493,7 @@ export function ReviewSheet(props: ReviewSheetProps) {
     environmentId,
     threadId,
     reviewCache,
+    vcsKind,
   });
   useReviewDiffPrewarming({
     threadKey: reviewCache.threadKey,
@@ -724,6 +736,7 @@ export function ReviewSheet(props: ReviewSheetProps) {
         subtitle={headerSubtitle}
         androidSubtitle={androidHeaderSubtitle}
         iconColor={headerIcon}
+        vcsTerminology={vcsTerminology}
         selectedThreadCwd={selectedThreadCwd}
         sectionMenu={sectionMenu}
         selectedSection={selectedSection}

apps/mobile/src/features/review/reviewModel.test.ts

@@ -146,6 +146,30 @@ describe("buildReviewSectionItems", () => {
     ]);
     expect(getDefaultReviewSectionId(items)).toBe("git:branch-range");
   });
+
+  it("names a missing base with the project's ref noun", () => {
+    const [section] = buildReviewSectionItems({
+      checkpoints: [],
+      gitSections: [
+        {
+          id: "branch-range",
+          kind: "branch-range",
+          title: "Bookmark changes",
+          baseRef: null,
+          headRef: null,
+          diff: "",
+          diffHash: "h",
+          truncated: false,
+        },
+      ],
+      turnDiffById: {},
+      loadingTurnIds: {},
+      loadingGitSections: false,
+      vcsKind: "jj",
+    });
+
+    expect(section?.subtitle).toBe("Base bookmark unavailable");
+  });
 });
 
 describe("buildReviewParsedDiff", () => {

apps/mobile/src/features/review/reviewModel.ts

@@ -1,7 +1,8 @@
 import { parsePatchFiles } from "@pierre/diffs/utils/parsePatchFiles";
 import type { ChangeTypes, FileDiffMetadata } from "@pierre/diffs/types";
 import type { ThreadCheckpointSummary } from "@t3tools/client-runtime/state/thread-checkpoints";
-import type { ReviewDiffPreviewSource } from "@t3tools/contracts";
+import type { ReviewDiffPreviewSource, VcsDriverKind } from "@t3tools/contracts";
+import { getVcsTerminology, type VcsTerminology } from "@t3tools/shared/vcs";
 import { unquoteGitPatchPath } from "@t3tools/shared/gitPatchPath";
 import * as Arr from "effect/Array";
 import { pipe } from "effect/Function";
@@ -122,14 +123,21 @@ const readyCheckpointOrder = Order.make<ThreadCheckpointSummary>(
   compareCheckpointTurnCountDescending,
 );
 
-function gitSubtitle(section: ReviewDiffPreviewSource): string | null {
+function workingTreeSubtitle(terminology: VcsTerminology): string {
+  // jj has no index: everything in the working copy is already part of the change.
+  return terminology.systemName === "Jujutsu"
+    ? "Tracked and untracked working-copy changes"
+    : UNCOMMITTED_SUBTITLE;
+}
+
+function gitSubtitle(section: ReviewDiffPreviewSource, terminology: VcsTerminology): string | null {
   if (section.kind === "working-tree") {
-    return UNCOMMITTED_SUBTITLE;
+    return workingTreeSubtitle(terminology);
   }
   if (section.baseRef) {
     return `${section.baseRef} ... ${section.headRef ?? "HEAD"}`;
   }
-  return "Base branch unavailable";
+  return `Base ${terminology.refNoun} unavailable`;
 }
 
 function stripTrailingNewline(value: string): string {
@@ -417,7 +425,9 @@ export function buildReviewSectionItems(input: {
   readonly turnDiffById: Readonly<Record<string, string | undefined>>;
   readonly loadingTurnIds: Readonly<Record<string, boolean | undefined>>;
   readonly loadingGitSections: boolean;
+  readonly vcsKind?: VcsDriverKind | null;
 }): ReadonlyArray<ReviewSectionItem> {
+  const terminology = getVcsTerminology(input.vcsKind);
   const turnItems = getReadyReviewCheckpoints(input.checkpoints).map<ReviewSectionItem>(
     (checkpoint) => {
       const id = getReviewSectionIdForCheckpoint(checkpoint);
@@ -436,7 +446,7 @@ export function buildReviewSectionItems(input: {
     id: `git:${section.kind}`,
     kind: section.kind,
     title: section.title,
-    subtitle: gitSubtitle(section),
+    subtitle: gitSubtitle(section, terminology),
     diff: section.diff,
     source: section,
     ...(section.files ? { files: section.files } : {}),

apps/mobile/src/features/review/useReviewSections.ts

@@ -5,7 +5,7 @@ import {
   deriveThreadCheckpointSummaries,
   type ThreadCheckpointSummary,
 } from "@t3tools/client-runtime/state/thread-checkpoints";
-import type { EnvironmentId, ThreadId } from "@t3tools/contracts";
+import type { EnvironmentId, ThreadId, VcsDriverKind } from "@t3tools/contracts";
 
 import { useCheckpointDiff } from "../../state/queries";
 import { useEnvironmentQuery } from "../../state/query";
@@ -32,8 +32,10 @@ export function useReviewSections(input: {
   readonly environmentId?: EnvironmentId;
   readonly threadId?: ThreadId;
   readonly reviewCache: ReviewCacheForThread;
+  readonly vcsKind?: VcsDriverKind | null;
 }) {
   const { environmentId, reviewCache, threadId } = input;
+  const vcsKind = input.vcsKind ?? null;
   const enabled = input.enabled ?? true;
   const selectedThread = useSelectedThreadProjection();
   const { selectedThreadCwd } = useSelectedThreadWorktree();
@@ -78,6 +80,7 @@ export function useReviewSections(input: {
         turnDiffById: reviewCache.turnDiffById,
         loadingTurnIds,
         loadingGitSections: diffPreview.isPending,
+        vcsKind,
       }),
     [
       diffPreview.isPending,
@@ -86,6 +89,7 @@ export function useReviewSections(input: {
       readyCheckpoints,
       reviewCache.gitSections,
       reviewCache.turnDiffById,
+      vcsKind,
     ],
   );
   const selectedSection = useMemo(

apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx

@@ -1,6 +1,7 @@
 import { MaterialListRow } from "../../components/MaterialListRow";
 import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell";
 import type { VcsRef } from "@t3tools/client-runtime/state/vcs";
+import { DEFAULT_VCS_TERMINOLOGY, type VcsTerminology } from "@t3tools/shared/vcs";
 import { resolveEnvironmentMachineKind } from "@t3tools/contracts";
 import { LegendList } from "@legendapp/list/react-native";
 import {
@@ -310,8 +311,10 @@ export function NewTaskBranchPickerRouteScreen() {
           if (mountedRef.current && navigation.isFocused() && !isAtomCommandInterrupted(result)) {
             const error = squashAtomCommandFailure(result);
             Alert.alert(
-              "Could not switch branch",
-              error instanceof Error ? error.message : "The branch could not be checked out.",
+              `Could not switch ${flow.vcsTerminology.refNoun}`,
+              error instanceof Error
+                ? error.message
+                : `The ${flow.vcsTerminology.refNoun} could not be checked out.`,
             );
           }
           return;
@@ -340,14 +343,20 @@ export function NewTaskBranchPickerRouteScreen() {
       flow.selectedProject,
       flow.setBranchQuery,
       flow.workspaceMode,
+      flow.vcsTerminology,
       navigation,
       switchRef,
     ],
   );
 
   return (
     <BranchPickerScreen
-      title={flow.workspaceMode === "worktree" ? "Base branch" : "Branch"}
+      title={
+        flow.workspaceMode === "worktree"
+          ? `Base ${flow.vcsTerminology.refNoun}`
+          : flow.vcsTerminology.refNounTitle
+      }
+      terminology={flow.vcsTerminology}
       project={flow.selectedProject}
       branches={flow.filteredBranches}
       selectedBranchName={
@@ -398,7 +407,9 @@ export function BranchPickerScreen(props: {
     readonly startFromOrigin: boolean;
     readonly onChangeStartFromOrigin: (value: boolean) => void;
   };
+  readonly terminology?: VcsTerminology;
 }) {
+  const terminology = props.terminology ?? DEFAULT_VCS_TERMINOLOGY;
   const navigation = useNavigation();
   const insets = useSafeAreaInsets();
   const usesNativeMailSearchToolbar = Platform.OS === "ios" && NATIVE_MAIL_SEARCH_TOOLBAR_SUPPORTED;
@@ -423,7 +434,7 @@ export function BranchPickerScreen(props: {
   const renderBranch = useCallback(
     ({ item, index }: { readonly item: VcsRef; readonly index: number }) => (
       <BranchSelectionRow
-        badge={branchBadgeLabel({ branch: item, project: props.project })}
+        badge={branchBadgeLabel({ branch: item, project: props.project, terminology })}
         branch={item}
         disabled={props.selectionDisabled ?? false}
         isFirst={index === 0}
@@ -436,6 +447,7 @@ export function BranchPickerScreen(props: {
       props.branches.length,
       props.project,
       props.onSelect,
+      terminology,
       selectedBranchName,
       props.selectionDisabled,
     ],
@@ -477,12 +489,12 @@ export function BranchPickerScreen(props: {
           {props.loading ? <ActivityIndicator /> : null}
           <Text className="text-center text-sm text-foreground-muted">
             {props.loading
-              ? "Loading branches…"
+              ? `Loading ${terminology.refNounPlural}…`
               : props.error
                 ? props.error
                 : props.query
-                  ? "No matching branches"
-                  : "No branches available"}
+                  ? `No matching ${terminology.refNounPlural}`
+                  : `No ${terminology.refNounPlural} available`}
           </Text>
           {!props.loading && props.error ? (
             <Pressable
@@ -537,13 +549,13 @@ export function BranchPickerScreen(props: {
           <TextInput
             autoCapitalize="none"
             autoCorrect={false}
-            accessibilityLabel="Find a branch"
+            accessibilityLabel={`Find a ${terminology.refNoun}`}
             className="h-12 rounded-full border border-input-border bg-input px-4 font-sans text-base text-foreground"
             selectionColorClassName="accent-focus/32"
             cursorColorClassName="accent-focus"
             selectionHandleColorClassName="accent-focus"
             onChangeText={props.onQueryChange}
-            placeholder="Find a branch"
+            placeholder={`Find a ${terminology.refNoun}`}
             placeholderTextColorClassName="accent-placeholder"
             value={props.query}
           />
@@ -563,7 +575,7 @@ export function BranchPickerScreen(props: {
             ? () => [
                 createNativeMailSearchToolbarItem({
                   onSearchTextChange: props.onQueryChange,
-                  placeholder: "Find a branch",
+                  placeholder: `Find a ${terminology.refNoun}`,
                   searchTextChangeId: "new-task-branch-search-text",
                   showsSearchDismissButton: true,
                 }),
@@ -576,7 +588,7 @@ export function BranchPickerScreen(props: {
                 autoCapitalize: "none",
                 hideNavigationBar: false,
                 obscureBackground: false,
-                placeholder: "Find a branch",
+                placeholder: `Find a ${terminology.refNoun}`,
                 onChangeText: (event) => {
                   props.onQueryChange(event.nativeEvent.text);
                 },

apps/mobile/src/features/threads/NewTaskDraftScreen.tsx

@@ -1019,10 +1019,12 @@ export function NewTaskDraftScreen(props: {
     branchName: selectedBranchName,
     startFromOrigin: flow.startFromOrigin,
     workspaceMode: flow.workspaceMode,
+    terminology: flow.vcsTerminology,
   });
   const workspaceLabel = resolveNewTaskWorkspaceLabel({
     workspaceMode: flow.workspaceMode,
     worktreePath: flow.selectedWorktreePath,
+    terminology: flow.vcsTerminology,
   });
   const showBranchLoading = flow.branchesLoading && flow.availableBranches.length === 0;
 
@@ -1579,7 +1581,7 @@ export function NewTaskDraftScreen(props: {
   const workspaceControls = (
     <View className="flex-row items-center gap-1 px-2">
       <ComposerInlineControl
-        accessibilityHint={`Switches to ${flow.workspaceMode === "local" ? "a new worktree" : "the current checkout"}`}
+        accessibilityHint={`Switches to ${flow.workspaceMode === "local" ? `a new ${flow.vcsTerminology.workspaceNoun}` : `the current ${flow.vcsTerminology.currentRefFallback}`}`}
         accessibilityLabel={workspaceLabel}
         disabled={isComposerInteractionLocked || voiceInput.isBusy}
         renderIcon={(size) => (
@@ -1596,11 +1598,13 @@ export function NewTaskDraftScreen(props: {
       />
 
       <ComposerInlineControl
-        accessibilityLabel={`${flow.workspaceMode === "worktree" ? "Base branch" : "Branch"}: ${selectedBranchLabel}`}
+        accessibilityLabel={`${flow.workspaceMode === "worktree" ? `Base ${flow.vcsTerminology.refNoun}` : flow.vcsTerminology.refNounTitle}: ${selectedBranchLabel}`}
         chevronDirection="right"
         disabled={isComposerInteractionLocked}
         icon="arrow.triangle.branch"
-        label={showBranchLoading ? "Loading branches…" : selectedBranchLabel}
+        label={
+          showBranchLoading ? `Loading ${flow.vcsTerminology.refNounPlural}…` : selectedBranchLabel
+        }
         maxWidth={190}
         onPress={() => openContextPicker("NewTaskBranch")}
       />