some more qol

Author: jonathanlab

apps/twig/src/renderer/features/sidebar/components/HistoryView.tsx

@@ -59,6 +59,8 @@ function HistoryTaskItem({
       worktreeName={workspace?.worktreeName ?? undefined}
       worktreePath={workspace?.worktreePath ?? workspace?.folderPath}
       workspaceMode={taskState?.workspaceMode}
+      mainRepoPath={workspace?.folderPath}
+      branchName={workspace?.branchName ?? undefined}
       lastActivityAt={task.lastActivityAt}
       isGenerating={task.isGenerating}
       isUnread={task.isUnread}
@@ -102,6 +104,8 @@ function PinnedTaskItem({
       worktreeName={workspace?.worktreeName ?? undefined}
       worktreePath={workspace?.worktreePath ?? workspace?.folderPath}
       workspaceMode={taskState?.workspaceMode}
+      mainRepoPath={workspace?.folderPath}
+      branchName={workspace?.branchName ?? undefined}
       lastActivityAt={task.lastActivityAt}
       isGenerating={task.isGenerating}
       isUnread={task.isUnread}

apps/twig/src/renderer/features/sidebar/components/items/TaskItem.tsx

@@ -28,13 +28,29 @@ function useCurrentBranch(repoPath?: string, worktreeName?: string) {
   });
 }
 
+function useMainRepoBranch(mainRepoPath?: string) {
+  return useQuery({
+    queryKey: ["main-repo-branch", mainRepoPath],
+    queryFn: () => {
+      if (!mainRepoPath) throw new Error("mainRepoPath is required");
+      return trpcVanilla.git.getCurrentBranch.query({
+        directoryPath: mainRepoPath,
+      });
+    },
+    enabled: !!mainRepoPath,
+    staleTime: 0,
+  });
+}
+
 interface TaskItemProps {
   id: string;
   label: string;
   isActive: boolean;
   worktreeName?: string;
   worktreePath?: string;
   workspaceMode?: WorkspaceMode;
+  mainRepoPath?: string;
+  branchName?: string;
   lastActivityAt?: number;
   isGenerating?: boolean;
   isUnread?: boolean;
@@ -135,6 +151,8 @@ export function TaskItem({
   worktreeName,
   worktreePath,
   workspaceMode,
+  mainRepoPath,
+  branchName,
   lastActivityAt,
   isGenerating,
   isUnread,
@@ -145,8 +163,10 @@ export function TaskItem({
   onTogglePin,
 }: TaskItemProps) {
   const { data: currentBranch } = useCurrentBranch(worktreePath, worktreeName);
+  const { data: mainRepoBranch } = useMainRepoBranch(mainRepoPath);
 
   const isCloudTask = workspaceMode === "cloud";
+  const isWatching = !!(branchName && mainRepoBranch === branchName);
 
   const activityText = isGenerating
     ? "Generating..."
@@ -159,6 +179,8 @@ export function TaskItem({
       <Cloud size={10} />
       <span>Cloud</span>
     </span>
+  ) : isWatching ? (
+    <span style={{ color: "var(--blue-11)" }}>Watching</span>
   ) : (
     (worktreeName ?? currentBranch)
   );
@@ -181,7 +203,7 @@ export function TaskItem({
   ) : isPinned ? (
     <PushPin size={12} className="text-accent-11" />
   ) : (
-    <GitBranchIcon size={12} />
+    <GitBranchIcon size={12} className={isWatching ? "text-blue-11" : ""} />
   );
 
   const endContent = useMemo(

apps/twig/src/renderer/features/workspace/components/FocusWorkspaceButton.tsx

@@ -1,6 +1,7 @@
 import { CrosshairIcon, CrosshairSimpleIcon } from "@phosphor-icons/react";
 import { Button, Spinner, Text, Tooltip } from "@radix-ui/themes";
 import { trpcReact } from "@renderer/trpc";
+import { useQueryClient } from "@tanstack/react-query";
 import { toast } from "@utils/toast";
 import { useCallback } from "react";
 import { selectWorkspace, useWorkspaceStore } from "../stores/workspaceStore";
@@ -12,6 +13,7 @@ interface FocusWorkspaceButtonProps {
 export function FocusWorkspaceButton({ taskId }: FocusWorkspaceButtonProps) {
   const workspace = useWorkspaceStore(selectWorkspace(taskId));
   const utils = trpcReact.useUtils();
+  const queryClient = useQueryClient();
 
   // Query current branch of main repo - this is the source of truth
   const { data: currentBranch, isLoading: isBranchLoading } =
@@ -23,6 +25,7 @@ export function FocusWorkspaceButton({ taskId }: FocusWorkspaceButtonProps) {
   const enableFocus = trpcReact.focus.enable.useMutation({
     onSuccess: (result) => {
       utils.git.getCurrentBranch.invalidate();
+      queryClient.invalidateQueries({ queryKey: ["main-repo-branch"] });
       if (result.success) {
         toast.success(
           <>
@@ -53,6 +56,7 @@ export function FocusWorkspaceButton({ taskId }: FocusWorkspaceButtonProps) {
   const disableFocus = trpcReact.focus.disable.useMutation({
     onSuccess: (result) => {
       utils.git.getCurrentBranch.invalidate();
+      queryClient.invalidateQueries({ queryKey: ["main-repo-branch"] });
       if (result.success) {
         toast.success(
           <>