feat: add git integration with smart actions and status tracking (#254)

Co-authored-by: Claude <[email protected]>

Author: k11kirky

apps/array/src/main/preload.ts

@@ -297,6 +297,33 @@ contextBridge.exposeInMainWorld("electronAPI", {
     fileStatus: string,
   ): Promise<void> =>
     ipcRenderer.invoke("discard-file-changes", repoPath, filePath, fileStatus),
+  getGitSyncStatus: (
+    repoPath: string,
+  ): Promise<{
+    ahead: number;
+    behind: number;
+    hasRemote: boolean;
+    currentBranch: string | null;
+    isFeatureBranch: boolean;
+  }> => ipcRenderer.invoke("get-git-sync-status", repoPath),
+  getLatestCommit: (
+    repoPath: string,
+  ): Promise<{
+    sha: string;
+    shortSha: string;
+    message: string;
+    author: string;
+    date: string;
+  } | null> => ipcRenderer.invoke("get-latest-commit", repoPath),
+  getGitRepoInfo: (
+    repoPath: string,
+  ): Promise<{
+    organization: string;
+    repository: string;
+    currentBranch: string | null;
+    defaultBranch: string;
+    compareUrl: string | null;
+  } | null> => ipcRenderer.invoke("get-git-repo-info", repoPath),
   listDirectory: (
     dirPath: string,
   ): Promise<

apps/array/src/main/services/git.ts

@@ -383,6 +383,158 @@ export interface DiffStats {
   linesRemoved: number;
 }
 
+export interface GitSyncStatus {
+  ahead: number;
+  behind: number;
+  hasRemote: boolean;
+  currentBranch: string | null;
+  isFeatureBranch: boolean;
+}
+
+export interface GitCommitInfo {
+  sha: string;
+  shortSha: string;
+  message: string;
+  author: string;
+  date: string;
+}
+
+export interface GitRepoInfo {
+  organization: string;
+  repository: string;
+  currentBranch: string | null;
+  defaultBranch: string;
+  compareUrl: string | null;
+}
+
+const getLatestCommit = async (
+  directoryPath: string,
+): Promise<GitCommitInfo | null> => {
+  try {
+    const { stdout } = await execAsync(
+      'git log -1 --format="%H|%h|%s|%an|%aI"',
+      { cwd: directoryPath },
+    );
+
+    const [sha, shortSha, message, author, date] = stdout.trim().split("|");
+    if (!sha) return null;
+
+    return { sha, shortSha, message, author, date };
+  } catch {
+    return null;
+  }
+};
+
+const getGitRepoInfo = async (
+  directoryPath: string,
+): Promise<GitRepoInfo | null> => {
+  try {
+    const remoteUrl = await getRemoteUrl(directoryPath);
+    if (!remoteUrl) return null;
+
+    const parsed = parseGitHubUrl(remoteUrl);
+    if (!parsed) return null;
+
+    const currentBranch = await getCurrentBranch(directoryPath);
+    const defaultBranch = await getDefaultBranch(directoryPath);
+
+    let compareUrl: string | null = null;
+    if (currentBranch && currentBranch !== defaultBranch) {
+      compareUrl = `https://github.com/${parsed.organization}/${parsed.repository}/compare/${defaultBranch}...${currentBranch}?expand=1`;
+    }
+
+    return {
+      organization: parsed.organization,
+      repository: parsed.repository,
+      currentBranch: currentBranch ?? null,
+      defaultBranch,
+      compareUrl,
+    };
+  } catch {
+    return null;
+  }
+};
+
+const getGitSyncStatus = async (
+  directoryPath: string,
+): Promise<GitSyncStatus> => {
+  try {
+    const currentBranch = await getCurrentBranch(directoryPath);
+    if (!currentBranch) {
+      return {
+        ahead: 0,
+        behind: 0,
+        hasRemote: false,
+        currentBranch: null,
+        isFeatureBranch: false,
+      };
+    }
+
+    const defaultBranch = await getDefaultBranch(directoryPath);
+    const isFeatureBranch = currentBranch !== defaultBranch;
+
+    try {
+      const { stdout: upstream } = await execAsync(
+        `git rev-parse --abbrev-ref ${currentBranch}@{upstream}`,
+        { cwd: directoryPath },
+      );
+
+      const upstreamBranch = upstream.trim();
+      if (!upstreamBranch) {
+        return {
+          ahead: 0,
+          behind: 0,
+          hasRemote: false,
+          currentBranch,
+          isFeatureBranch,
+        };
+      }
+
+      // Use --quiet to suppress output, ignore errors (network may be unavailable)
+      try {
+        await execAsync("git fetch --quiet", {
+          cwd: directoryPath,
+          timeout: 10000,
+        });
+      } catch {
+        // Fetch failed (likely offline), continue with stale data
+      }
+
+      const { stdout: revList } = await execAsync(
+        `git rev-list --left-right --count ${currentBranch}...${upstreamBranch}`,
+        { cwd: directoryPath },
+      );
+
+      const [ahead, behind] = revList.trim().split("\t").map(Number);
+
+      return {
+        ahead: ahead || 0,
+        behind: behind || 0,
+        hasRemote: true,
+        currentBranch,
+        isFeatureBranch,
+      };
+    } catch {
+      return {
+        ahead: 0,
+        behind: 0,
+        hasRemote: false,
+        currentBranch,
+        isFeatureBranch,
+      };
+    }
+  } catch (error) {
+    log.error("Error getting git sync status:", error);
+    return {
+      ahead: 0,
+      behind: 0,
+      hasRemote: false,
+      currentBranch: null,
+      isFeatureBranch: false,
+    };
+  }
+};
+
 const discardFileChanges = async (
   directoryPath: string,
   filePath: string,
@@ -857,4 +1009,34 @@ export function registerGitIpc(
       return discardFileChanges(directoryPath, filePath, fileStatus);
     },
   );
+
+  ipcMain.handle(
+    "get-git-sync-status",
+    async (
+      _event: IpcMainInvokeEvent,
+      directoryPath: string,
+    ): Promise<GitSyncStatus> => {
+      return getGitSyncStatus(directoryPath);
+    },
+  );
+
+  ipcMain.handle(
+    "get-latest-commit",
+    async (
+      _event: IpcMainInvokeEvent,
+      directoryPath: string,
+    ): Promise<GitCommitInfo | null> => {
+      return getLatestCommit(directoryPath);
+    },
+  );
+
+  ipcMain.handle(
+    "get-git-repo-info",
+    async (
+      _event: IpcMainInvokeEvent,
+      directoryPath: string,
+    ): Promise<GitRepoInfo | null> => {
+      return getGitRepoInfo(directoryPath);
+    },
+  );
 }

apps/array/src/renderer/features/sessions/components/GitActionMessage.tsx

@@ -0,0 +1,119 @@
+import {
+  ArrowsClockwise,
+  CloudArrowUp,
+  GitBranch,
+  GitPullRequest,
+} from "@phosphor-icons/react";
+import { Badge, Box, Flex, Text } from "@radix-ui/themes";
+import type { ReactNode } from "react";
+
+export type GitActionType =
+  | "commit-push"
+  | "publish"
+  | "push"
+  | "pull"
+  | "sync"
+  | "create-pr";
+
+export const GIT_ACTION_MARKER_PREFIX = "<!-- GIT_ACTION:";
+export const GIT_ACTION_MARKER_SUFFIX = " -->";
+
+export function createGitActionMessage(
+  actionType: GitActionType,
+  prompt: string,
+): string {
+  return `${GIT_ACTION_MARKER_PREFIX}${actionType}${GIT_ACTION_MARKER_SUFFIX}\n${prompt}`;
+}
+
+export function parseGitActionMessage(content: string): {
+  isGitAction: boolean;
+  actionType: GitActionType | null;
+  prompt: string;
+} {
+  if (!content.startsWith(GIT_ACTION_MARKER_PREFIX)) {
+    return { isGitAction: false, actionType: null, prompt: content };
+  }
+
+  const markerEnd = content.indexOf(GIT_ACTION_MARKER_SUFFIX);
+  if (markerEnd === -1) {
+    return { isGitAction: false, actionType: null, prompt: content };
+  }
+
+  const actionType = content.slice(
+    GIT_ACTION_MARKER_PREFIX.length,
+    markerEnd,
+  ) as GitActionType;
+
+  const prompt = content.slice(markerEnd + GIT_ACTION_MARKER_SUFFIX.length + 1); // +1 for newline
+
+  return { isGitAction: true, actionType, prompt };
+}
+
+function getActionIcon(actionType: GitActionType): ReactNode {
+  switch (actionType) {
+    case "commit-push":
+      return <CloudArrowUp size={14} weight="bold" />;
+    case "publish":
+      return <GitBranch size={14} weight="bold" />;
+    case "push":
+      return <CloudArrowUp size={14} weight="bold" />;
+    case "pull":
+      return <ArrowsClockwise size={14} weight="bold" />;
+    case "sync":
+      return <ArrowsClockwise size={14} weight="bold" />;
+    case "create-pr":
+      return <GitPullRequest size={14} weight="bold" />;
+    default:
+      return <CloudArrowUp size={14} weight="bold" />;
+  }
+}
+
+function getActionLabel(actionType: GitActionType): string {
+  switch (actionType) {
+    case "commit-push":
+      return "Commit & Push";
+    case "publish":
+      return "Publish Branch";
+    case "push":
+      return "Push";
+    case "pull":
+      return "Pull";
+    case "sync":
+      return "Sync";
+    case "create-pr":
+      return "Create PR";
+    default:
+      return "Git Action";
+  }
+}
+
+interface GitActionMessageProps {
+  actionType: GitActionType;
+}
+
+export function GitActionMessage({ actionType }: GitActionMessageProps) {
+  return (
+    <Box className="mt-4 max-w-[95%] xl:max-w-[60%]">
+      <Flex
+        align="center"
+        gap="2"
+        className="rounded-lg border border-accent-6 bg-accent-3 px-3 py-2"
+      >
+        <Flex
+          align="center"
+          justify="center"
+          className="rounded bg-accent-9 p-1"
+          style={{ color: "white" }}
+        >
+          {getActionIcon(actionType)}
+        </Flex>
+        <Text size="2" weight="medium">
+          {getActionLabel(actionType)}
+        </Text>
+        <Badge size="1" color="gray" variant="soft">
+          Git Action
+        </Badge>
+      </Flex>
+    </Box>
+  );
+}