@agentprojectcontext/apx 1.81.0 → 1.89.1

package/src/interfaces/web/src/screens/project/TasksTab.tsx

@@ -1,159 +1,381 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { useSearchParams } from "react-router-dom";
-import { Plus, ChevronDown, ChevronUp, Check, Trash2, RotateCcw } from "lucide-react";
+import { Check, ListTodo, MousePointerClick, Plus, Settings2, Trash2 } from "lucide-react";
+import useSWR from "swr";
 import { Tasks } from "../../lib/api";
+import type { GlobalTaskEntry } from "../../lib/api/tasks";
+import type { TaskEntry } from "../../types/daemon";
 import { Section } from "../../components/Section";
-import { PagedList, usePagedQuery } from "../../components/Pager";
-import { Badge, Button, Empty, Field, Input, Loading, Textarea } from "../../components/ui";
+import { Pager, usePagedQuery } from "../../components/Pager";
+import { Button, Empty, FilterChips, Loading } from "../../components/ui";
+import { TaskList } from "../../components/tasks/TaskList";
+import { TaskDetail } from "../../components/tasks/TaskDetail";
+import { useTaskColumns } from "../../components/tasks/useTaskColumns";
+import { columnLabel } from "../../components/tasks/columns";
+import {
+  readTaskViewPrefs, statusStillValid, writeTaskViewPrefs,
+  type TaskState, type TaskView,
+} from "../../components/tasks/taskViewPrefs";
+import { TaskFormDialog } from "../../components/tasks/TaskFormDialog";
+import { TaskBoard } from "../../components/tasks/TaskBoard";
+import { TaskColumnsDialog } from "../../components/tasks/TaskColumnsDialog";
+import type { BoardColumn } from "../../components/tasks/columns";
+import { BulkActionBar } from "../../components/common/BulkActionBar";
+import { ConfirmDialog } from "../../components/common/ConfirmDialog";
 import { useToast } from "../../components/Toast";
-import { StatusIcon, StatusBadge, effectiveStatus } from "../../components/tasks/taskStatus";
-import { TaskDetailPanel } from "../../components/tasks/TaskDetailPanel";
+import { useProjects } from "../../hooks/useProjects";
 import { t } from "../../i18n";
 
-export function TasksTab({ pid }: { pid: string }) {
-  const [state, setState] = useState<"open" | "done" | "dropped">("open");
+/**
+ * Tasks — one screen, two scopes, master-detail like Routines.
+ *
+ * `pid` set = that project. `pid` omitted = every registered project, which is
+ * what the base workspace shows. There used to be two components and they
+ * drifted into two different products: the cross-project one could not filter
+ * by status, mark anything done, or edit a title, and printed the raw state
+ * word on a second line. The only thing scope changes now is the project chip
+ * and where a new task is filed.
+ *
+ * One task is always open on the right — a list you can only stare at is a
+ * report, not a workspace.
+ *
+ * TWO VIEWS OVER THE SAME DATA. The list is unchanged — it is still the fastest
+ * way to read what is open and tick things off. The board is for moving work
+ * between columns, which a list cannot express. Both share the selection and
+ * the same detail pane, so switching never loses your place.
+ */
+export function TasksTab({ pid }: { pid?: string }) {
   const [params, setParams] = useSearchParams();
-  const selected = params.get("task");
+  // Where you left off. Read once, on mount — see taskViewPrefs.ts for why this
+  // is per device and why the URL still outranks it.
+  const [saved] = useState(readTaskViewPrefs);
+  const [state, setState] = useState<TaskState>(saved.state);
+  // Workflow sub-status is a different question from state: "what is blocked
+  // right now" is not "what is open". Only meaningful for open tasks.
+  // A plain string, not the four built-ins: columns are configurable, so the
+  // filter's vocabulary is whatever this project has.
+  const [status, setStatus] = useState<string>(saved.status);
+  const effStatus = state === "open" ? status : "";
+
+  // Which view. The URL is the authority when it says something, so a shared
+  // link opens what it promises; otherwise the device's own last choice wins.
+  const urlView = params.get("view");
+  const view: TaskView = urlView === "board" ? "board" : urlView === "list" ? "list" : saved.view;
+  const setView = (v: TaskView) =>
+    setParams((prev) => {
+      const next = new URLSearchParams(prev);
+      next.set("view", v);
+      return next;
+    }, { replace: true });
+
+  // Put the restored view in the URL once, so the address bar and the screen
+  // never disagree — and so a refresh or a copied link keeps working.
+  useEffect(() => {
+    if (!urlView && view === "board") setView("board");
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
+
+  // Remember every change. Writing on each edit rather than on unmount is what
+  // makes it survive a hard refresh or a tab that is simply closed.
+  useEffect(() => {
+    writeTaskViewPrefs({ view, state, status });
+  }, [view, state, status]);
+
+  const [editingColumns, setEditingColumns] = useState(false);
+  // Bumped after a column edit so the board refetches with the new set, and
+  // after ANY change made from the detail pane — the board keeps its own query,
+  // so revalidating only the list left a card sitting in the column it just
+  // left.
+  const [columnsRev, setColumnsRev] = useState(0);
+  const { data: colData, mutate: mutateColumns } = useSWR(
+    view === "board" ? `/api/tasks/columns?pid=${pid ?? "all"}&r=${columnsRev}` : null,
+    () => (pid ? Tasks.columns.forProject(pid) : Tasks.columns.catalog().then((r) => ({
+      // The aggregated board has no single project to read a subset from, so it
+      // shows the whole vocabulary.
+      columns: [...r.columns, { id: "done", label: null }] as BoardColumn[],
+      catalog: r.columns,
+    }))),
+  );
+
+  const [adding, setAdding] = useState(false);
+  const [editing, setEditing] = useState<{ pid: string; task: TaskEntry } | null>(null);
+  const { projects } = useProjects();
+  const { statuses } = useTaskColumns(pid);
+
+  // A remembered column filter only means something on a board that has that
+  // column. Dropped rather than kept, because a filter matching nothing looks
+  // like an empty project, not like a filter.
+  useEffect(() => {
+    if (!status || statuses.length === 0) return;
+    if (!statusStillValid(status, statuses)) setStatus("");
+  }, [status, statuses]);
   const toast = useToast();
-  // dedupingInterval:0 so switching the state filter always revalidates the
-  // target page instead of showing the stale cached one from a prior switch.
+
+  // Multi-select. Keyed by task id but carries the resolved pid + task so a
+  // bulk verb still works after the page moves or across projects (global view).
+  const [checked, setChecked] = useState<Map<string, { pid: string; task: TaskEntry }>>(new Map());
+  const [bulk, setBulk] = useState<"done" | "drop" | null>(null);
+
+  // dedupingInterval:0 so switching a filter always revalidates the target page
+  // instead of showing the stale cached one from a prior switch.
   const paged = usePagedQuery({
-    key: `/api/projects/${pid}/tasks?state=${state}`,
-    fetchPage: (limit, offset) => Tasks.listPage(pid, { state, limit, offset }),
-    resetKey: state,
+    key: `/api/tasks?pid=${pid ?? "all"}&state=${state}&status=${effStatus}`,
+    fetchPage: (limit, offset) =>
+      pid
+        ? Tasks.listPage(pid, { state, limit, offset, status: effStatus })
+        : Tasks.globalPage({ state, limit, offset, status: effStatus }),
+    resetKey: `${pid ?? "all"}|${state}|${effStatus}`,
     swr: { dedupingInterval: 0, revalidateOnFocus: true },
   });
-  const [draft, setDraft] = useState("");
-  const [body, setBody] = useState("");
-  const [showBody, setShowBody] = useState(false);
-  const [busy, setBusy] = useState(false);
-
-  const select = (id: string | null) => {
-    const next = new URLSearchParams(params);
-    if (id) next.set("task", id); else next.delete("task");
-    setParams(next, { replace: true });
-  };
 
-  const add = async () => {
-    if (!draft.trim()) return;
-    setBusy(true);
-    try {
-      await Tasks.add(pid, { title: draft.trim(), body: body.trim() || null, source: "web" });
-      setDraft(""); setBody(""); setShowBody(false);
-      toast.success(t("project.tasks.created"));
-      paged.mutate();
-    } catch (e: any) {
-      toast.error(e?.message || t("project.tasks.create_error"));
-    } finally {
-      setBusy(false);
-    }
-  };
-  const mark = async (fn: () => Promise<unknown>, label: string) => {
-    try { await fn(); toast.success(label); paged.mutate(); }
-    catch (e: any) { toast.error(e?.message || t("common.error_generic")); }
+  const rowPid = (task: TaskEntry) => pid ?? String((task as GlobalTaskEntry).project_id ?? "");
+
+  /** Both views hold their own query — a change in one has to move the other. */
+  const refreshAll = () => { paged.mutate(); setColumnsRev((n) => n + 1); };
+  const selectedId = params.get("task");
+  const selected = paged.items.find((x) => x.id === selectedId) || null;
+
+  const select = (id: string | null) =>
+    setParams((prev) => {
+      const next = new URLSearchParams(prev);
+      if (id) next.set("task", id); else next.delete("task");
+      return next;
+    }, { replace: true });
+
+  const toggleCheck = (task: TaskEntry) =>
+    setChecked((prev) => {
+      const next = new Map(prev);
+      if (next.has(task.id)) next.delete(task.id);
+      else next.set(task.id, { pid: rowPid(task), task });
+      return next;
+    });
+  const clearChecked = () => setChecked(new Map());
+  const checkedIds = new Set(checked.keys());
+
+  // A filter switch changes what the ids even mean — drop the selection so a
+  // bulk verb can never hit a task you can no longer see.
+  useEffect(() => { setChecked(new Map()); }, [pid, state, effStatus]);
+
+  const runBulk = async (kind: "done" | "drop") => {
+    const entries = [...checked.values()];
+    if (entries.length === 0) return;
+    const results = await Promise.allSettled(
+      entries.map(({ pid: p, task }) => (kind === "done" ? Tasks.done(p, task.id) : Tasks.drop(p, task.id))),
+    );
+    const failed = results.filter((r) => r.status === "rejected").length;
+    const ok = entries.length - failed;
+    if (ok > 0) toast.success(t(kind === "done" ? "tasks.bulk_done_toast" : "tasks.bulk_drop_toast", { count: ok }));
+    if (failed > 0) toast.error(t("common.error_generic"));
+    clearChecked();
+    paged.mutate();
   };
 
+  // Keep the first task selected, and heal a stale ?task (filter switched, the
+  // task closed, the page moved).
+  useEffect(() => {
+    if (paged.items.length === 0) return;
+    if (selectedId && paged.items.some((x) => x.id === selectedId)) return;
+    select(paged.items[0].id);
+  }, [paged.items, selectedId]); // eslint-disable-line react-hooks/exhaustive-deps
+
+  const wantEdit = params.get("edit") === "1";
+  const canOpenEditor = wantEdit && !!selected;
+  useEffect(() => {
+    if (!canOpenEditor || !selected) return;
+    setEditing({ pid: rowPid(selected), task: selected });
+    setParams((prev) => {
+      const next = new URLSearchParams(prev);
+      next.delete("edit");
+      return next;
+    }, { replace: true });
+  }, [canOpenEditor, selectedId]); // eslint-disable-line react-hooks/exhaustive-deps
+
   return (
     <Section
       fullHeight
-      title={t("project.tasks.title")}
-      description={t("project.tasks.subtitle")}
+      title={pid ? t("project.tasks.title") : t("project.global_tasks.title")}
+      description={pid ? t("project.tasks.subtitle") : t("project.global_tasks.subtitle")}
       action={
-        <div className="flex gap-1">
-          {(["open", "done", "dropped"] as const).map((s) => (
-            <Button key={s} size="sm" data-testid={`task-filter-${s}`} variant={state === s ? "primary" : "ghost"} onClick={() => setState(s)}>
-              {t(`tasks.state_${s}` as never)}
+        <div className="flex items-center gap-2">
+          {view === "board" && (
+            <Button size="sm" data-testid="task-columns" onClick={() => setEditingColumns(true)}>
+              <Settings2 size={14} /> {t("tasks.columns_title")}
             </Button>
-          ))}
+          )}
+          <Button size="sm" variant="primary" data-testid="task-new" onClick={() => setAdding(true)}>
+            <Plus size={14} /> {t("project.global_tasks.add")}
+          </Button>
         </div>
       }
+      filters={
+        <>
+          <FilterChips
+            value={view}
+            onChange={setView}
+            testIdPrefix="task-view"
+            label={t("tasks.view_label")}
+            options={[
+              { value: "list" as const, label: t("tasks.view_list") },
+              { value: "board" as const, label: t("tasks.view_board") },
+            ]}
+          />
+          <span className="mx-2" />
+          <FilterChips
+            value={state}
+            onChange={setState}
+            testIdPrefix="task-filter"
+            label={t("project.tasks.title")}
+            options={(["open", "done", "dropped", "all"] as const).map((s) => ({
+              value: s,
+              label: s === "all" ? t("common.all") : t(`tasks.state_${s}` as never),
+            }))}
+          />
+          {state === "open" && view === "list" ? (
+            <div className="ml-2">
+              <FilterChips
+                value={status}
+                onChange={setStatus}
+                testIdPrefix="task-status-filter"
+                label={t("project.global_tasks.any_status")}
+                options={[
+                  { value: "" as const, label: t("project.global_tasks.any_status") },
+                  ...statuses.map((c) => ({ value: c.id, label: columnLabel(c) })),
+                ]}
+              />
+            </div>
+          ) : null}
+        </>
+      }
     >
-      <div className="mb-4 shrink-0 space-y-2">
-        <div className="flex items-end gap-2">
-          <Field label={t("project.tasks.add_label")}>
-            <Input
-              data-testid="task-input"
-              placeholder={t("project.tasks.add_placeholder")}
-              value={draft}
-              onChange={(e) => setDraft(e.target.value)}
-              onKeyDown={(e) => { if (e.key === "Enter" && !showBody) add(); }}
-            />
-          </Field>
-          <Button variant="ghost" size="sm" onClick={() => setShowBody((v) => !v)} aria-label={t("tasks.toggle_prompt")}>
-            {showBody ? <ChevronUp size={14} /> : <ChevronDown size={14} />} {t("tasks.field_prompt")}
-          </Button>
-          <Button variant="primary" data-testid="task-add" onClick={add} loading={busy}>
-            <Plus size={14} /> {t("project.tasks.add")}
-          </Button>
+      {view === "board" && (
+        <div className="flex min-h-0 flex-1 flex-col overflow-hidden rounded-lg border border-border lg:flex-row">
+          <TaskBoard
+            pid={pid}
+            columns={colData?.columns ?? []}
+            state={state}
+            selectedId={selectedId}
+            onSelect={select}
+            onChanged={refreshAll}
+            refreshKey={columnsRev}
+          />
+          <div className="min-h-0 w-full shrink-0 overflow-hidden border-t border-border lg:w-[360px] lg:border-l lg:border-t-0">
+            {selected ? (
+              <TaskDetail
+                key={`${rowPid(selected)}-${selected.id}`}
+                pid={rowPid(selected)}
+                taskId={selected.id}
+                projectName={pid ? undefined : (selected as GlobalTaskEntry).project_name}
+                onEdit={(task) => setEditing({ pid: rowPid(selected), task })}
+                onChanged={refreshAll}
+                onOpenTask={select}
+              />
+            ) : (
+              <Empty fill icon={MousePointerClick}>{t("tasks.detail_empty")}</Empty>
+            )}
+          </div>
         </div>
-        {showBody && (
-          <Textarea rows={3} value={body} onChange={(e) => setBody(e.target.value)} placeholder={t("tasks.prompt_ph")} className="text-xs" />
-        )}
-      </div>
-
-      <div className="flex min-h-0 flex-1 gap-4">
-        <div className="flex min-w-0 flex-1 flex-col">
-          {paged.isLoading && <Loading />}
-          {!paged.isLoading && paged.total === 0 && (
-            <Empty>
-              {state === "open" ? t("project.tasks.empty_open") : t("project.tasks.empty", { state })}
-              {" "}<code>apx task add "…"</code>
-            </Empty>
-          )}
+      )}
 
-          <PagedList paged={paged} fullHeight>
-            <ul className="space-y-2 text-sm" data-testid="task-list">
-              {paged.items.map((task) => {
-                const eff = effectiveStatus(task);
-                return (
-                  <li
-                    key={task.id}
-                    data-testid={`task-${task.id}`}
-                    onClick={() => select(task.id)}
-                    className={`flex cursor-pointer items-start gap-3 rounded-md border px-3 py-2 hover:border-muted-fg/50 ${selected === task.id ? "border-primary/50 bg-primary/5" : "border-border bg-muted/30"}`}
-                  >
-                    <StatusIcon status={eff} className="mt-0.5 shrink-0" />
-                    <div className="min-w-0 flex-1">
-                      <div className="truncate font-medium">{task.title}</div>
-                      <div className="mt-0.5 flex flex-wrap items-center gap-2 text-xs text-muted-fg">
-                        {task.state === "open" && <StatusBadge status={eff} />}
-                        {task.tags?.map((tag) => <Badge key={tag}>#{tag}</Badge>)}
-                        {task.agent && <Badge tone="info">@{task.agent}</Badge>}
-                        {task.due && <span>{t("project.tasks.due")} {task.due}</span>}
-                      </div>
-                    </div>
-                    <div className="flex shrink-0 gap-1" onClick={(e) => e.stopPropagation()}>
-                      {task.state === "open" ? (
-                        <>
-                          <Button size="sm" variant="secondary" aria-label={t("project.tasks.aria_done")} data-testid={`task-done-${task.id}`} onClick={() => mark(() => Tasks.done(pid, task.id), t("project.tasks.done"))}>
-                            <Check size={13} />
-                          </Button>
-                          <Button size="sm" variant="destructive" aria-label={t("project.tasks.aria_drop")} data-testid={`task-drop-${task.id}`} onClick={() => mark(() => Tasks.drop(pid, task.id), t("project.tasks.drop"))}>
-                            <Trash2 size={13} />
-                          </Button>
-                        </>
-                      ) : (
-                        <Button size="sm" variant="ghost" aria-label={t("project.tasks.aria_reopen")} data-testid={`task-reopen-${task.id}`} onClick={() => mark(() => Tasks.reopen(pid, task.id), t("project.tasks.reopen"))}>
-                          <RotateCcw size={13} />
-                        </Button>
-                      )}
-                    </div>
-                  </li>
-                );
-              })}
-            </ul>
-          </PagedList>
-        </div>
+      {view === "list" && paged.isLoading && <Loading />}
+      {view === "list" && !paged.isLoading && paged.total === 0 && (
+        <Empty icon={ListTodo}>
+          {!pid ? t("project.global_tasks.empty")
+            : state === "open" ? t("project.tasks.empty_open")
+            : t("project.tasks.empty", { state })}
+        </Empty>
+      )}
 
-        {selected && (
-          <TaskDetailPanel
-            pid={pid}
-            taskId={selected}
-            onClose={() => select(null)}
+      {view === "list" && paged.items.length > 0 && (
+        <div className={"flex min-h-0 flex-1 flex-col overflow-hidden rounded-lg border border-border lg:flex-row"}>
+          <TaskList
+            className={"max-h-64 shrink-0 border-b border-border lg:h-full lg:max-h-none lg:w-[280px] lg:border-b-0 lg:border-r"}
+            tasks={paged.items}
+            pid={rowPid}
+            selectedId={selected?.id ?? null}
+            onSelect={select}
+            onEdit={(task) => setEditing({ pid: rowPid(task), task })}
             onChanged={() => paged.mutate()}
+            checkedIds={checkedIds}
+            onToggleCheck={toggleCheck}
+            footer={
+              <Pager
+                page={paged.page}
+                pageCount={paged.pageCount}
+                total={paged.total}
+                start={paged.start}
+                end={paged.end}
+                pageSize={paged.pageSize}
+                onPage={paged.setPage}
+                onPageSize={paged.setPageSize}
+              />
+            }
           />
-        )}
-      </div>
+          <div className="min-h-0 min-w-0 flex-1 overflow-hidden">
+            {selected ? (
+              <TaskDetail
+                key={`${rowPid(selected)}-${selected.id}`}
+                pid={rowPid(selected)}
+                taskId={selected.id}
+                projectName={pid ? undefined : (selected as GlobalTaskEntry).project_name}
+                onEdit={(task) => setEditing({ pid: rowPid(selected), task })}
+                onChanged={() => paged.mutate()}
+                // Subtasks and the "part of" link select their target in the
+                // list next door: a child is an ordinary task, so opening one
+                // is the same gesture as clicking its row.
+                onOpenTask={select}
+              />
+            ) : (
+              <Empty fill icon={MousePointerClick}>{t("tasks.detail_empty")}</Empty>
+            )}
+          </div>
+        </div>
+      )}
+
+      <TaskColumnsDialog
+        open={editingColumns}
+        onClose={() => setEditingColumns(false)}
+        pid={pid}
+        onSaved={() => { setColumnsRev((n) => n + 1); void mutateColumns(); }}
+      />
+
+      <TaskFormDialog
+        open={adding || !!editing}
+        onClose={() => { setAdding(false); setEditing(null); }}
+        fixedPid={pid}
+        projects={projects}
+        editing={editing}
+        onSaved={() => paged.mutate()}
+      />
+
+      <BulkActionBar
+        count={checked.size}
+        countLabel={t("tasks.bulk_selected", { count: checked.size })}
+        actions={[
+          { key: "done", label: t("tasks.bulk_done"), icon: <Check size={14} />, variant: "secondary", onClick: () => setBulk("done"), testId: "task-bulk-done" },
+          { key: "drop", label: t("tasks.bulk_drop"), icon: <Trash2 size={14} />, variant: "destructive", onClick: () => setBulk("drop"), testId: "task-bulk-drop" },
+        ]}
+        onClear={clearChecked}
+        clearLabel={t("tasks.bulk_clear")}
+        testId="task-bulk-bar"
+      />
+      <ConfirmDialog
+        open={bulk === "done"}
+        onClose={() => setBulk(null)}
+        onConfirm={() => runBulk("done")}
+        destructive={false}
+        title={t("tasks.confirm_bulk_done_title", { count: checked.size })}
+        description={t("tasks.confirm_bulk_done_desc", { count: checked.size })}
+        confirmLabel={t("tasks.bulk_done")}
+        testId="task-bulk-done-confirm"
+      />
+      <ConfirmDialog
+        open={bulk === "drop"}
+        onClose={() => setBulk(null)}
+        onConfirm={() => runBulk("drop")}
+        title={t("tasks.confirm_bulk_drop_title", { count: checked.size })}
+        description={t("tasks.confirm_bulk_drop_desc", { count: checked.size })}
+        confirmLabel={t("tasks.bulk_drop")}
+        testId="task-bulk-drop-confirm"
+      />
     </Section>
   );
 }

package/src/interfaces/web/src/screens/project/VarsTab.tsx

@@ -1,9 +1,10 @@
 import { useEffect, useMemo, useState } from "react";
 import useSWR from "swr";
-import { Eye, EyeOff, Pencil, Plus, Trash2 } from "lucide-react";
+import { Eye, EyeOff, KeyRound, Pencil, Plus, Trash2 } from "lucide-react";
 import { Vars, type VarScope, type VarsList } from "../../lib/api";
 import { Section } from "../../components/Section";
 import { Badge, Button, Dialog, Empty, Field, Input, Loading, Switch } from "../../components/ui";
+import { ConfirmDialog } from "../../components/common/ConfirmDialog";
 import { UiSelect } from "../../components/UiSelect";
 import { useToast } from "../../components/Toast";
 import { t } from "../../i18n";
@@ -27,6 +28,7 @@ export function VarsTab({ pid }: { pid: string }) {
     () => Vars.list(pid, { reveal: revealAll }),
   );
   const [openCreate, setOpenCreate] = useState<{ name?: string; value?: string; scope?: VarScope } | null>(null);
+  const [confirm, setConfirm] = useState<{ name: string; scope: VarScope } | null>(null);
 
   const rows: Row[] = useMemo(() => {
     if (!list.data) return [];
@@ -45,8 +47,9 @@ export function VarsTab({ pid }: { pid: string }) {
       .sort((a, b) => a.name.localeCompare(b.name));
   }, [list.data, filter]);
 
-  const remove = async (name: string, scope: VarScope) => {
-    if (!confirm(t("project.vars.delete_confirm", { name, scope }))) return;
+  const doRemove = async () => {
+    if (!confirm) return;
+    const { name, scope } = confirm;
     try {
       await Vars.remove(pid, name, scope);
       toast.success(t("project.vars.removed"));
@@ -87,7 +90,7 @@ export function VarsTab({ pid }: { pid: string }) {
       )}
 
       {list.isLoading && <Loading />}
-      {!list.isLoading && rows.length === 0 && <Empty>{t("project.vars.empty")}</Empty>}
+      {!list.isLoading && rows.length === 0 && <Empty icon={KeyRound}>{t("project.vars.empty")}</Empty>}
 
       {rows.length > 0 && (
         <ul className="space-y-2 text-sm">
@@ -117,7 +120,7 @@ export function VarsTab({ pid }: { pid: string }) {
                   <Button
                     size="sm"
                     variant="destructive"
-                    onClick={() => remove(r.name, r.scope)}
+                    onClick={() => setConfirm({ name: r.name, scope: r.scope })}
                     aria-label={t("project.vars.delete_btn")}
                   >
                     <Trash2 size={13} />
@@ -140,6 +143,15 @@ export function VarsTab({ pid }: { pid: string }) {
           list.mutate();
         }}
       />
+
+      <ConfirmDialog
+        open={!!confirm}
+        onClose={() => setConfirm(null)}
+        onConfirm={doRemove}
+        title={confirm ? t("project.vars.delete_confirm", { name: confirm.name, scope: confirm.scope }) : ""}
+        confirmLabel={t("common.delete")}
+        testId="vars-delete-confirm"
+      />
     </Section>
   );
 }