Fix overly broad GitLab error matching and deduplicate ChangeRequestIcon

- Narrow normalizeGitLabCliError 'not found' patterns to only match
  merge-request-specific errors instead of any 404/not-found response,
  preventing misleading 'Merge request not found' messages for project
  or repository lookups.

- Remove duplicate ChangeRequestIcon from GitActionsControl.tsx and
  reuse the already-exported ChangeRequestStatusIcon from
  ThreadStatusIndicators.tsx.

Author: cursoragent

apps/server/src/sourceControl/GitLabCli.ts

@@ -116,8 +116,8 @@ function normalizeGitLabCliError(operation: "execute" | "stdout", error: unknown
 
     if (
       lower.includes("merge request not found") ||
-      lower.includes("not found") ||
-      lower.includes("404")
+      lower.includes("no merge request found") ||
+      (lower.includes("merge_requests") && lower.includes("404"))
     ) {
       return new GitLabCliError({
         operation,

apps/web/src/components/GitActionsControl.tsx

@@ -7,14 +7,8 @@ import type {
 } from "@t3tools/contracts";
 import { useIsMutating, useMutation, useQueryClient } from "@tanstack/react-query";
 import { useCallback, useEffect, useEffectEvent, useMemo, useRef, useState } from "react";
-import {
-  ChevronDownIcon,
-  CloudUploadIcon,
-  GitCommitIcon,
-  GitPullRequestIcon,
-  InfoIcon,
-} from "lucide-react";
-import { GitHubIcon, GitLabIcon } from "./Icons";
+import { ChevronDownIcon, CloudUploadIcon, GitCommitIcon, InfoIcon } from "lucide-react";
+import { ChangeRequestStatusIcon } from "./ThreadStatusIndicators";
 import {
   buildGitActionProgressStages,
   buildMenuItems,
@@ -202,18 +196,6 @@ const COMMIT_DIALOG_TITLE = "Commit changes";
 const COMMIT_DIALOG_DESCRIPTION =
   "Review and confirm your commit. Leave the message blank to auto-generate one.";
 
-function ChangeRequestIcon({
-  presentation,
-  className,
-}: {
-  presentation: ChangeRequestPresentation;
-  className?: string;
-}) {
-  if (presentation.icon === "github") return <GitHubIcon className={className} />;
-  if (presentation.icon === "gitlab") return <GitLabIcon className={className} />;
-  return <GitPullRequestIcon className={className} />;
-}
-
 function GitActionItemIcon({
   icon,
   changeRequestPresentation,
@@ -223,7 +205,7 @@ function GitActionItemIcon({
 }) {
   if (icon === "commit") return <GitCommitIcon />;
   if (icon === "push") return <CloudUploadIcon />;
-  return <ChangeRequestIcon presentation={changeRequestPresentation} />;
+  return <ChangeRequestStatusIcon icon={changeRequestPresentation.icon} />;
 }
 
 function GitQuickActionIcon({
@@ -235,15 +217,19 @@ function GitQuickActionIcon({
 }) {
   const iconClassName = "size-3.5";
   if (quickAction.kind === "open_pr") {
-    return <ChangeRequestIcon presentation={changeRequestPresentation} className={iconClassName} />;
+    return (
+      <ChangeRequestStatusIcon icon={changeRequestPresentation.icon} className={iconClassName} />
+    );
   }
   if (quickAction.kind === "run_pull") return <InfoIcon className={iconClassName} />;
   if (quickAction.kind === "run_action") {
     if (quickAction.action === "commit") return <GitCommitIcon className={iconClassName} />;
     if (quickAction.action === "push" || quickAction.action === "commit_push") {
       return <CloudUploadIcon className={iconClassName} />;
     }
-    return <ChangeRequestIcon presentation={changeRequestPresentation} className={iconClassName} />;
+    return (
+      <ChangeRequestStatusIcon icon={changeRequestPresentation.icon} className={iconClassName} />
+    );
   }
   if (quickAction.label === "Commit") return <GitCommitIcon className={iconClassName} />;
   return <InfoIcon className={iconClassName} />;