fix: improve git operation progress banner

Replace placeholder conflict text with localized copy
Split in-progress operation details and actions into clearer rows
Keep merge and rebase status messages consistent

packages/ui/src/components/views/git/InProgressOperationBanner.tsx

@@ -79,8 +79,8 @@ export const InProgressOperationBanner: React.FC<InProgressOperationBannerProps>
 
   return (
     <div className="bg-[var(--status-warning-bg)] border border-[var(--status-warning)] rounded-lg p-3 mx-3 mt-3">
-      <div className="flex items-center justify-between gap-3">
-        <div className="flex items-center gap-2 min-w-0">
+      <div className="flex flex-col gap-3">
+        <div className="flex items-start gap-2 min-w-0">
           <OperationIcon className="size-4 text-[var(--status-warning)] shrink-0" />
           <div className="min-w-0">
             <p className="typography-label text-[var(--status-warning)]">
@@ -94,7 +94,7 @@ export const InProgressOperationBanner: React.FC<InProgressOperationBannerProps>
           </div>
         </div>
 
-        <div className="flex items-center gap-2 shrink-0">
+        <div className="flex flex-wrap items-center gap-2">
           {hasUnresolvedConflicts && onResolveWithAI && (
             <Button
               variant="outline"
@@ -142,13 +142,13 @@ export const InProgressOperationBanner: React.FC<InProgressOperationBannerProps>
             </Button>
           )}
         </div>
-      </div>
 
-      {hasUnresolvedConflicts && (
-        <p className="typography-micro text-[var(--status-warning)] mt-2">
-          {t('gitView.operation.resolveConflictsHint')}
-        </p>
-      )}
+        {hasUnresolvedConflicts && (
+          <p className="typography-micro text-[var(--status-warning)]">
+            {t('gitView.operation.resolveConflictsHint')}
+          </p>
+        )}
+      </div>
     </div>
   );
 };

packages/ui/src/lib/i18n/messages/en.ts

@@ -498,14 +498,14 @@ export const dict = {
   'gitView.integrate.toMoveCount': 'To Move Count',
   'gitView.operation.abort': 'Abort',
   'gitView.operation.continue': 'Continue',
-  'gitView.operation.inProgressTitle': 'In Progress Title',
+  'gitView.operation.inProgressTitle': '{operation} in progress',
   'gitView.operation.merge': 'Merge',
-  'gitView.operation.mergeInProgressWithHead': 'Merge In Progress With Head',
-  'gitView.operation.mergingMessage': 'Merging Message',
+  'gitView.operation.mergeInProgressWithHead': 'Merging {head}',
+  'gitView.operation.mergingMessage': 'Merging: {message}',
   'gitView.operation.rebase': 'Rebase',
-  'gitView.operation.rebaseInProgress': 'Rebase In Progress',
-  'gitView.operation.rebasingOnto': 'Rebasing Onto',
-  'gitView.operation.resolveConflictsHint': 'Resolve Conflicts Hint',
+  'gitView.operation.rebaseInProgress': 'Rebase in progress',
+  'gitView.operation.rebasingOnto': 'Rebasing {headName} onto {onto}',
+  'gitView.operation.resolveConflictsHint': 'Resolve conflicts, then continue the operation.',
   'gitView.operation.resolveWithAi': 'Resolve with AI',
   'gitView.stash.confirmButton': 'Confirm Button',
   'gitView.stash.description': 'Description',

packages/ui/src/lib/i18n/messages/es.ts

@@ -499,14 +499,14 @@ export const dict: Record<I18nKey, string> = {
   "gitView.integrate.toMoveCount": "Commits por mover",
   "gitView.operation.abort": "Abortar",
   "gitView.operation.continue": "Continuar",
-  "gitView.operation.inProgressTitle": "Operación en progreso",
+  "gitView.operation.inProgressTitle": "{operation} en progreso",
   "gitView.operation.merge": "Merge",
-  "gitView.operation.mergeInProgressWithHead": "Merge en progreso",
-  "gitView.operation.mergingMessage": "Fusionando...",
+  "gitView.operation.mergeInProgressWithHead": "Haciendo merge de {head}",
+  "gitView.operation.mergingMessage": "Haciendo merge: {message}",
   "gitView.operation.rebase": "Rebase",
   "gitView.operation.rebaseInProgress": "Rebase en progreso",
-  "gitView.operation.rebasingOnto": "Haciendo rebase",
-  "gitView.operation.resolveConflictsHint": "Resuelve los conflictos para continuar.",
+  "gitView.operation.rebasingOnto": "Haciendo rebase de {headName} sobre {onto}",
+  "gitView.operation.resolveConflictsHint": "Resuelve los conflictos y luego continúa la operación.",
   "gitView.operation.resolveWithAi": "Resolver con IA",
   "gitView.stash.confirmButton": "Guardar cambios y continuar",
   "gitView.stash.description": "Tienes cambios sin commit que podrían sobrescribirse. Guárdalos temporalmente antes de continuar.",

packages/ui/src/lib/i18n/messages/ko.ts

@@ -499,14 +499,14 @@ export const dict: Record<I18nKey, string> = {
   'gitView.integrate.toMoveCount': '이동할 커밋 수',
   'gitView.operation.abort': '중단',
   'gitView.operation.continue': '계속',
-  'gitView.operation.inProgressTitle': 'Git 작업 진행 중',
+  'gitView.operation.inProgressTitle': '{operation} 진행 중',
   'gitView.operation.merge': '병합',
   'gitView.operation.mergeInProgressWithHead': '{head} 병합 진행 중',
-  'gitView.operation.mergingMessage': '병합 중…',
+  'gitView.operation.mergingMessage': '병합 중: {message}',
   'gitView.operation.rebase': '리베이스',
   'gitView.operation.rebaseInProgress': '리베이스 진행 중',
-  'gitView.operation.rebasingOnto': '{branch} 위로 리베이스 중',
-  'gitView.operation.resolveConflictsHint': '충돌을 해결한 뒤 계속 진행하세요.',
+  'gitView.operation.rebasingOnto': '{headName}을(를) {onto} 위로 리베이스 중',
+  'gitView.operation.resolveConflictsHint': '충돌을 해결한 뒤 작업을 계속하세요.',
   'gitView.operation.resolveWithAi': 'AI로 해결',
   'gitView.stash.confirmButton': '확인',
   'gitView.stash.description': '설명',

packages/ui/src/lib/i18n/messages/pt-BR.ts

@@ -499,14 +499,14 @@ export const dict: Record<I18nKey, string> = {
   "gitView.integrate.toMoveCount": "Commits por mover",
   "gitView.operation.abort": "Abortar",
   "gitView.operation.continue": "Continuar",
-  "gitView.operation.inProgressTitle": "Operación em andamento",
+  "gitView.operation.inProgressTitle": "{operation} em andamento",
   "gitView.operation.merge": "Merge",
-  "gitView.operation.mergeInProgressWithHead": "Merge em andamento",
-  "gitView.operation.mergingMessage": "Fusionando...",
+  "gitView.operation.mergeInProgressWithHead": "Fazendo merge de {head}",
+  "gitView.operation.mergingMessage": "Fazendo merge: {message}",
   "gitView.operation.rebase": "Rebase",
   "gitView.operation.rebaseInProgress": "Rebase em andamento",
-  "gitView.operation.rebasingOnto": "Haciendo rebase",
-  "gitView.operation.resolveConflictsHint": "Resuelve os conflitos para continuar.",
+  "gitView.operation.rebasingOnto": "Fazendo rebase de {headName} sobre {onto}",
+  "gitView.operation.resolveConflictsHint": "Resolva os conflitos e depois continue a operação.",
   "gitView.operation.resolveWithAi": "Resolver com IA",
   "gitView.stash.confirmButton": "Salvar alterações e continuar",
   "gitView.stash.description": "Você tem alterações sem commit que podem ser sobrescritas. Guarde-as temporariamente antes de continuar.",

packages/ui/src/lib/i18n/messages/uk.ts

@@ -499,14 +499,14 @@ export const dict: Record<I18nKey, string> = {
   "gitView.integrate.toMoveCount": "До переміщення",
   "gitView.operation.abort": "Перервати",
   "gitView.operation.continue": "Продовжити",
-  "gitView.operation.inProgressTitle": "Виконується операція Git",
+  "gitView.operation.inProgressTitle": "Виконується {operation}",
   "gitView.operation.merge": "Злити",
-  "gitView.operation.mergeInProgressWithHead": "Виконується злиття з HEAD",
-  "gitView.operation.mergingMessage": "Виконується злиття",
+  "gitView.operation.mergeInProgressWithHead": "Виконується злиття з {head}",
+  "gitView.operation.mergingMessage": "Виконується злиття: {message}",
   "gitView.operation.rebase": "Перебазувати",
   "gitView.operation.rebaseInProgress": "Виконується перебазування",
-  "gitView.operation.rebasingOnto": "Перебазування на",
-  "gitView.operation.resolveConflictsHint": "Вирішіть конфлікти, щоб продовжити.",
+  "gitView.operation.rebasingOnto": "Перебазування {headName} на {onto}",
+  "gitView.operation.resolveConflictsHint": "Вирішіть конфлікти, потім продовжіть операцію.",
   "gitView.operation.resolveWithAi": "Вирішити за допомогою ШІ",
   "gitView.stash.confirmButton": "Підтвердити",
   "gitView.stash.description": "Опис",

packages/ui/src/lib/i18n/messages/zh-CN.ts

@@ -506,7 +506,7 @@ export const dict: Record<I18nKey, string> = {
   'gitView.operation.rebase': '变基',
   'gitView.operation.rebaseInProgress': '变基进行中',
   'gitView.operation.rebasingOnto': '正在将 {headName} 变基到 {onto}',
-  'gitView.operation.resolveConflictsHint': '继续前必须先解决冲突。可使用“使用 AI 解决”或手动解决，然后暂存更改并点击继续。',
+  'gitView.operation.resolveConflictsHint': '解决冲突，然后继续操作。',
   'gitView.operation.resolveWithAi': '使用 AI 解决',
   'gitView.stash.confirmButton': '储藏并{operation}',
   'gitView.stash.description': '你有未提交更改会被此次 {operation} 覆盖。是否先临时储藏这些更改？',