From 055b31bbfd839006f7fa575ab6cf231af8070adf Mon Sep 17 00:00:00 2001
From: AhmedHassan <ahmedhassan.ahmed@fao.org>
Date: Mon, 23 Feb 2026 04:06:33 +0200
Subject: [PATCH 1/3] feat: add unarchive button for archived tasks

Add an "Unarchive" button on archived task cards so users can restore
them directly. Includes the unarchiveTasks store action, ArchiveRestore
icon, and i18n keys for both English and French.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../src/renderer/components/TaskCard.tsx      | 35 +++++++++++++++++--
 .../src/renderer/stores/task-store.ts         | 30 ++++++++++++++++
 .../src/shared/i18n/locales/en/tasks.json     |  2 ++
 .../src/shared/i18n/locales/fr/tasks.json     |  2 ++
 4 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/apps/frontend/src/renderer/components/TaskCard.tsx b/apps/frontend/src/renderer/components/TaskCard.tsx
index 837b7df58f..6881267b0d 100644
--- a/apps/frontend/src/renderer/components/TaskCard.tsx
+++ b/apps/frontend/src/renderer/components/TaskCard.tsx
@@ -1,6 +1,6 @@
 import { useState, useEffect, useRef, memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Play, Square, Clock, Zap, Target, Shield, Gauge, Palette, FileCode, Bug, Wrench, Loader2, AlertTriangle, RotateCcw, Archive, GitPullRequest, MoreVertical } from 'lucide-react';
+import { Play, Square, Clock, Zap, Target, Shield, Gauge, Palette, FileCode, Bug, Wrench, Loader2, AlertTriangle, RotateCcw, Archive, ArchiveRestore, GitPullRequest, MoreVertical } from 'lucide-react';
 import { Card, CardContent } from './ui/card';
 import { Badge } from './ui/badge';
 import { Button } from './ui/button';
@@ -31,7 +31,7 @@ import {
   JSON_ERROR_PREFIX,
   JSON_ERROR_TITLE_SUFFIX
 } from '../../shared/constants';
-import { stopTask, checkTaskRunning, recoverStuckTask, isIncompleteHumanReview, archiveTasks, hasRecentActivity, startTaskOrQueue } from '../stores/task-store';
+import { stopTask, checkTaskRunning, recoverStuckTask, isIncompleteHumanReview, archiveTasks, unarchiveTasks, hasRecentActivity, startTaskOrQueue } from '../stores/task-store';
 import { useToast } from '../hooks/use-toast';
 import type { Task, TaskCategory, ReviewReason, TaskStatus } from '../../shared/types';
 
@@ -265,6 +265,14 @@ export const TaskCard = memo(function TaskCard({
     }
   };
 
+  const handleUnarchive = async (e: React.MouseEvent) => {
+    e.stopPropagation();
+    const result = await unarchiveTasks(task.projectId, [task.id]);
+    if (!result.success) {
+      console.error('[TaskCard] Failed to unarchive task:', task.id, result.error);
+    }
+  };
+
   const handleViewPR = (e: React.MouseEvent) => {
     e.stopPropagation();
     if (task.metadata?.prUrl && window.electronAPI?.openExternal) {
@@ -571,7 +579,17 @@ export const TaskCard = memo(function TaskCard({
                     <GitPullRequest className="h-3 w-3" />
                   </Button>
                 )}
-                {!task.metadata?.archivedAt && (
+                {task.metadata?.archivedAt ? (
+                  <Button
+                    variant="ghost"
+                    size="sm"
+                    className="h-7 px-2 cursor-pointer"
+                    onClick={handleUnarchive}
+                    title={t('tooltips.unarchiveTask')}
+                  >
+                    <ArchiveRestore className="h-3 w-3" />
+                  </Button>
+                ) : (
                   <Button
                     variant="ghost"
                     size="sm"
@@ -583,6 +601,17 @@ export const TaskCard = memo(function TaskCard({
                   </Button>
                 )}
               </div>
+            ) : task.status === 'done' && task.metadata?.archivedAt ? (
+              <Button
+                variant="ghost"
+                size="sm"
+                className="h-7 px-2.5 hover:bg-muted-foreground/10"
+                onClick={handleUnarchive}
+                title={t('tooltips.unarchiveTask')}
+              >
+                <ArchiveRestore className="mr-1.5 h-3 w-3" />
+                {t('actions.unarchive')}
+              </Button>
             ) : task.status === 'done' && !task.metadata?.archivedAt ? (
               <Button
                 variant="ghost"
diff --git a/apps/frontend/src/renderer/stores/task-store.ts b/apps/frontend/src/renderer/stores/task-store.ts
index aa89e4cfa0..0b4fa6c6b7 100644
--- a/apps/frontend/src/renderer/stores/task-store.ts
+++ b/apps/frontend/src/renderer/stores/task-store.ts
@@ -1043,6 +1043,36 @@ export async function deleteTasks(
   }
 }
 
+/**
+ * Unarchive tasks
+ * Removes the archivedAt timestamp from task metadata
+ */
+export async function unarchiveTasks(
+  projectId: string,
+  taskIds: string[]
+): Promise<{ success: boolean; error?: string }> {
+  try {
+    const result = await window.electronAPI.unarchiveTasks(projectId, taskIds);
+
+    if (result.success) {
+      // Reload tasks to update the UI
+      await loadTasks(projectId);
+      return { success: true };
+    }
+
+    return {
+      success: false,
+      error: result.error || 'Failed to unarchive tasks'
+    };
+  } catch (error) {
+    console.error('Error unarchiving tasks:', error);
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : 'Unknown error'
+    };
+  }
+}
+
 /**
  * Archive tasks
  * Marks tasks as archived by adding archivedAt timestamp to metadata
diff --git a/apps/frontend/src/shared/i18n/locales/en/tasks.json b/apps/frontend/src/shared/i18n/locales/en/tasks.json
index ecd78827ad..2260c955c9 100644
--- a/apps/frontend/src/shared/i18n/locales/en/tasks.json
+++ b/apps/frontend/src/shared/i18n/locales/en/tasks.json
@@ -16,6 +16,7 @@
     "recover": "Recover",
     "resume": "Resume",
     "archive": "Archive",
+    "unarchive": "Unarchive",
     "delete": "Delete",
     "view": "View Details",
     "viewPR": "View PR",
@@ -43,6 +44,7 @@
   },
   "tooltips": {
     "archiveTask": "Archive task",
+    "unarchiveTask": "Unarchive task",
     "archiveAllDone": "Archive all done tasks",
     "viewPR": "Open pull request in browser"
   },
diff --git a/apps/frontend/src/shared/i18n/locales/fr/tasks.json b/apps/frontend/src/shared/i18n/locales/fr/tasks.json
index 00af23a49e..94a4e8cd29 100644
--- a/apps/frontend/src/shared/i18n/locales/fr/tasks.json
+++ b/apps/frontend/src/shared/i18n/locales/fr/tasks.json
@@ -16,6 +16,7 @@
     "recover": "Récupérer",
     "resume": "Reprendre",
     "archive": "Archiver",
+    "unarchive": "Désarchiver",
     "delete": "Supprimer",
     "view": "Voir les détails",
     "viewPR": "Voir la PR",
@@ -43,6 +44,7 @@
   },
   "tooltips": {
     "archiveTask": "Archiver la tâche",
+    "unarchiveTask": "Désarchiver la tâche",
     "archiveAllDone": "Archiver toutes les tâches terminées",
     "viewPR": "Ouvrir la pull request dans le navigateur"
   },

From 1378198d2d74a293c3384f92a169ee52105a06fe Mon Sep 17 00:00:00 2001
From: AhmedHassan <ahmedhassan.ahmed@fao.org>
Date: Mon, 23 Feb 2026 04:06:38 +0200
Subject: [PATCH 2/3] feat: auto-unarchive tasks when moved to another column
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When an archived task is dragged from Done to another column (backlog,
queue, in_progress), automatically unarchive it — moving an archived
task is a clear signal the user wants it active again.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 apps/frontend/src/renderer/components/KanbanBoard.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/frontend/src/renderer/components/KanbanBoard.tsx b/apps/frontend/src/renderer/components/KanbanBoard.tsx
index 25e37d56a7..8cc1289a5f 100644
--- a/apps/frontend/src/renderer/components/KanbanBoard.tsx
+++ b/apps/frontend/src/renderer/components/KanbanBoard.tsx
@@ -29,7 +29,7 @@ import { SortableTaskCard } from './SortableTaskCard';
 import { QueueSettingsModal } from './QueueSettingsModal';
 import { TASK_STATUS_COLUMNS, TASK_STATUS_LABELS } from '../../shared/constants';
 import { cn } from '../lib/utils';
-import { persistTaskStatus, forceCompleteTask, archiveTasks, deleteTasks, useTaskStore, isQueueAtCapacity, DEFAULT_MAX_PARALLEL_TASKS } from '../stores/task-store';
+import { persistTaskStatus, forceCompleteTask, archiveTasks, unarchiveTasks, deleteTasks, useTaskStore, isQueueAtCapacity, DEFAULT_MAX_PARALLEL_TASKS } from '../stores/task-store';
 import { updateProjectSettings, useProjectStore } from '../stores/project-store';
 import { useKanbanSettingsStore, DEFAULT_COLUMN_WIDTH, MIN_COLUMN_WIDTH, MAX_COLUMN_WIDTH, COLLAPSED_COLUMN_WIDTH_REM, MIN_COLUMN_WIDTH_REM, MAX_COLUMN_WIDTH_REM, BASE_FONT_SIZE, pxToRem } from '../stores/kanban-settings-store';
 import { useToast } from '../hooks/use-toast';
@@ -986,6 +986,12 @@ export function KanbanBoard({ tasks, onTaskClick, onNewTaskClick, onRefresh, isR
         });
       }
     }
+
+    // Auto-unarchive: moving an archived task to another state implies the user wants it active
+    if (result.success && task?.metadata?.archivedAt && projectId) {
+      await unarchiveTasks(projectId, [taskId]);
+    }
+
     // Note: queue auto-promotion when a task leaves in_progress is handled by the
     // useEffect task status change listener (registerTaskStatusChangeListener), so
     // no explicit processQueue() call is needed here.

From 72aad258ae017774da3c4a4762721fb6887af528 Mon Sep 17 00:00:00 2001
From: AhmedHassan <ahmedhassan.ahmed@fao.org>
Date: Mon, 23 Feb 2026 04:22:16 +0200
Subject: [PATCH 3/3] fix: check unarchive result and replace console.error
 with toast

Address PR review feedback: check unarchiveTasks() return value in
KanbanBoard and show a toast on failure, and replace console.error
with a toast in TaskCard since console output is invisible in bundled
Electron apps.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 apps/frontend/src/renderer/components/KanbanBoard.tsx | 9 ++++++++-
 apps/frontend/src/renderer/components/TaskCard.tsx    | 6 +++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/apps/frontend/src/renderer/components/KanbanBoard.tsx b/apps/frontend/src/renderer/components/KanbanBoard.tsx
index 8cc1289a5f..711871e8d9 100644
--- a/apps/frontend/src/renderer/components/KanbanBoard.tsx
+++ b/apps/frontend/src/renderer/components/KanbanBoard.tsx
@@ -989,7 +989,14 @@ export function KanbanBoard({ tasks, onTaskClick, onNewTaskClick, onRefresh, isR
 
     // Auto-unarchive: moving an archived task to another state implies the user wants it active
     if (result.success && task?.metadata?.archivedAt && projectId) {
-      await unarchiveTasks(projectId, [taskId]);
+      const unarchiveResult = await unarchiveTasks(projectId, [taskId]);
+      if (!unarchiveResult.success) {
+        toast({
+          title: t('common:errors.operationFailed'),
+          description: unarchiveResult.error,
+          variant: 'destructive',
+        });
+      }
     }
 
     // Note: queue auto-promotion when a task leaves in_progress is handled by the
diff --git a/apps/frontend/src/renderer/components/TaskCard.tsx b/apps/frontend/src/renderer/components/TaskCard.tsx
index 6881267b0d..6e6e492a9f 100644
--- a/apps/frontend/src/renderer/components/TaskCard.tsx
+++ b/apps/frontend/src/renderer/components/TaskCard.tsx
@@ -269,7 +269,11 @@ export const TaskCard = memo(function TaskCard({
     e.stopPropagation();
     const result = await unarchiveTasks(task.projectId, [task.id]);
     if (!result.success) {
-      console.error('[TaskCard] Failed to unarchive task:', task.id, result.error);
+      toast({
+        title: t('tasks:actions.unarchive'),
+        description: result.error,
+        variant: 'destructive',
+      });
     }
   };