diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 7e091ce..bb918a7 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -74,6 +74,14 @@
   margin: 0 auto;
   padding: 1.5rem 1rem 3rem;
 }
+/* У кита .card имеет intrinsic max-width: 340px / width: max-content — в наших видах
+   карточки должны заполнять колонку контента целиком (иначе обрезаются действия).
+   overflow отключаем, иначе dropdown-меню внутри карточки обрезается. */
+.app-content .card {
+  max-width: 100%;
+  width: 100%;
+  overflow: visible;
+}
 .user-chip a {
   margin-left: 0.5rem;
   color: var(--muted);
diff --git a/frontend/src/components/QuickPrompt.vue b/frontend/src/components/QuickPrompt.vue
new file mode 100644
index 0000000..fd8825c
--- /dev/null
+++ b/frontend/src/components/QuickPrompt.vue
@@ -0,0 +1,60 @@
+<script setup lang="ts">
+// Модальный ввод одной строки — замена window.prompt (в стиле кита, с фокусом).
+import { nextTick, ref, watch } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+const props = defineProps<{ open: boolean; title: string }>()
+const emit = defineEmits<{
+  (e: 'update:open', value: boolean): void
+  (e: 'confirm', text: string): void
+}>()
+
+const { t } = useI18n()
+const text = ref('')
+const inputRef = ref<HTMLInputElement | null>(null)
+
+watch(
+  () => props.open,
+  (open) => {
+    if (open) {
+      text.value = ''
+      void nextTick(() => inputRef.value?.querySelector('input')?.focus())
+    }
+  },
+)
+
+function submit() {
+  const value = text.value.trim()
+  if (!value) return
+  emit('confirm', value)
+  emit('update:open', false)
+}
+</script>
+
+<template>
+  <GnModal :open="open" :title="title" @update:open="emit('update:open', $event)">
+    <form class="quick-prompt" @submit.prevent="submit">
+      <GnInput ref="inputRef" v-model="text" />
+      <div class="quick-prompt-actions">
+        <GnButton type="submit" variant="primary" icon="ph-check">
+          {{ t('common.save') }}
+        </GnButton>
+        <GnButton type="button" variant="secondary" @click="emit('update:open', false)">
+          {{ t('common.cancel') }}
+        </GnButton>
+      </div>
+    </form>
+  </GnModal>
+</template>
+
+<style scoped>
+.quick-prompt {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+}
+.quick-prompt-actions {
+  display: flex;
+  gap: 0.75rem;
+}
+</style>
\ No newline at end of file
diff --git a/frontend/src/components/TaskBadges.vue b/frontend/src/components/TaskBadges.vue
new file mode 100644
index 0000000..62a2984
--- /dev/null
+++ b/frontend/src/components/TaskBadges.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+// Строка бейджей метаданных задачи (статус, проект, приоритет, время, дедлайн, бюджет, теги).
+import { useI18n } from 'vue-i18n'
+import type { Task } from '../api'
+import {
+  budgetBadge,
+  deadlineLabel,
+  deadlineOverdue,
+  formatMinutes,
+  recurrenceLabel,
+  statusLabel,
+  statusVariant,
+} from '../taskui'
+
+defineProps<{ task: Task }>()
+
+const { t } = useI18n()
+</script>
+
+<template>
+  <GnBadge :variant="statusVariant(task.status)">{{ statusLabel(task.status) }}</GnBadge>
+  <GnBadge v-if="task.project" variant="neutral" icon="ph-folder">
+    {{ task.project.name }}
+  </GnBadge>
+  <GnBadge v-if="task.priority !== null" variant="warning">P{{ task.priority }}</GnBadge>
+  <GnBadge v-if="task.estimated_minutes" variant="neutral">
+    ≈ {{ formatMinutes(task.estimated_minutes) }}
+  </GnBadge>
+  <GnBadge v-if="task.task_type === 'recurring'" variant="info" icon="ph-repeat">
+    {{ recurrenceLabel(task) || t('taskui.recur.recurring') }}
+  </GnBadge>
+  <GnBadge
+    v-if="deadlineLabel(task)"
+    :variant="deadlineOverdue(task) ? 'error' : 'warning'"
+    icon="ph-alarm"
+  >
+    {{ deadlineLabel(task) }}
+  </GnBadge>
+  <GnBadge v-if="task.budget_money !== null" variant="neutral">{{ budgetBadge(task) }}</GnBadge>
+  <GnBadge v-for="tag in task.tags" :key="tag.id" variant="neutral">{{ tag.name }}</GnBadge>
+</template>
\ No newline at end of file
diff --git a/frontend/src/locales/en.ts b/frontend/src/locales/en.ts
index 362cb61..a30bbc5 100644
--- a/frontend/src/locales/en.ts
+++ b/frontend/src/locales/en.ts
@@ -13,6 +13,17 @@
     cancel: 'Cancel',
     edit: 'Edit',
     preview: 'Preview',
+    confirmTitle: 'Confirmation',
+    delete: 'Delete',
+    deleteConfirmTask: 'Delete task "{title}"? This cannot be undone.',
+    deleteConfirmProject: 'Delete project "{name}"? Tasks will remain, but without a project.',
+    saved: 'Saved',
+    created: 'Created',
+    taskDeleted: 'Task deleted',
+    projectDeleted: 'Project deleted',
+    taskApproved: 'Task approved',
+    taskTaken: 'Task started',
+    taskFinished: 'Task finished',
   },
   nav: {
     sections: 'Sections',
@@ -31,6 +42,8 @@
     count: 'Tasks in stack: {n}',
     quickPlaceholder: 'Throw in a task — just the text, details later…',
     quickAdd: 'Throw in',
+    added: 'Task added to the stack',
+    detailTitle: 'Task details',
     emptyTitle: 'Stack is empty',
     emptyText: 'Throw in your first task — detailing is picked automatically.',
     inStack: 'in stack',
@@ -88,7 +101,6 @@
   list: {
     title: 'Task list',
     count: 'Found: {n}',
-    apply: 'Apply',
     emptyTitle: 'Nothing found',
     emptyText: 'Try relaxing the filters or throw a new task into the stack.',
     filterStatus: 'Status',
diff --git a/frontend/src/locales/ru.ts b/frontend/src/locales/ru.ts
index 0f9b992..2ca1bca 100644
--- a/frontend/src/locales/ru.ts
+++ b/frontend/src/locales/ru.ts
@@ -14,6 +14,17 @@
     cancel: 'Отмена',
     edit: 'Редактировать',
     preview: 'Предпросмотр',
+    confirmTitle: 'Подтверждение',
+    delete: 'Удалить',
+    deleteConfirmTask: 'Удалить задачу «{title}»? Действие необратимо.',
+    deleteConfirmProject: 'Удалить проект «{name}»? Задачи останутся, но без проекта.',
+    saved: 'Сохранено',
+    created: 'Создано',
+    taskDeleted: 'Задача удалена',
+    projectDeleted: 'Проект удалён',
+    taskApproved: 'Задача утверждена',
+    taskTaken: 'Задача взята в работу',
+    taskFinished: 'Задача завершена',
   },
   nav: {
     sections: 'Разделы',
@@ -32,6 +43,8 @@
     count: 'Задач в стеке: {n}',
     quickPlaceholder: 'Закинуть задачу — только текст, остальное потом…',
     quickAdd: 'Закинуть',
+    added: 'Задача закинута в стек',
+    detailTitle: 'Детализация задачи',
     emptyTitle: 'Стек пуст',
     emptyText: 'Закиньте первую задачу — детализация подберётся автоматически.',
     inStack: 'в стеке',
@@ -89,7 +102,6 @@
   list: {
     title: 'Список задач',
     count: 'Найдено: {n}',
-    apply: 'Применить',
     emptyTitle: 'Ничего не найдено',
     emptyText: 'Попробуйте ослабить фильтры или закиньте новую задачу в стек.',
     filterStatus: 'Статус',
diff --git a/frontend/src/locales/uk.ts b/frontend/src/locales/uk.ts
index 3b3df9c..91c45c7 100644
--- a/frontend/src/locales/uk.ts
+++ b/frontend/src/locales/uk.ts
@@ -13,6 +13,17 @@
     cancel: 'Скасувати',
     edit: 'Редагувати',
     preview: 'Попередній перегляд',
+    confirmTitle: 'Підтвердження',
+    delete: 'Видалити',
+    deleteConfirmTask: 'Видалити задачу «{title}»? Дію не можна скасувати.',
+    deleteConfirmProject: 'Видалити проєкт «{name}»? Задачі залишаться, але без проєкту.',
+    saved: 'Збережено',
+    created: 'Створено',
+    taskDeleted: 'Задачу видалено',
+    projectDeleted: 'Проєкт видалено',
+    taskApproved: 'Задачу затверджено',
+    taskTaken: 'Задачу взято в роботу',
+    taskFinished: 'Задачу завершено',
   },
   nav: {
     sections: 'Розділи',
@@ -31,6 +42,8 @@
     count: 'Завдань у стеці: {n}',
     quickPlaceholder: 'Кинути задачу — лише текст, решта потім…',
     quickAdd: 'Кинути',
+    added: 'Задачу кинуто в стек',
+    detailTitle: 'Деталізація задачі',
     emptyTitle: 'Стек порожній',
     emptyText: 'Киньте першу задачу — деталізація підбереться автоматично.',
     inStack: 'у стеці',
@@ -88,7 +101,6 @@
   list: {
     title: 'Список задач',
     count: 'Знайдено: {n}',
-    apply: 'Застосувати',
     emptyTitle: 'Нічого не знайдено',
     emptyText: 'Спробуйте послабити фільтри або киньте нову задачу у стек.',
     filterStatus: 'Статус',
diff --git a/frontend/src/views/ListView.vue b/frontend/src/views/ListView.vue
index b167853..e7cb7f7 100644
--- a/frontend/src/views/ListView.vue
+++ b/frontend/src/views/ListView.vue
@@ -2,18 +2,11 @@
 import { computed, onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { api, type Project, type Tag, type Task } from '../api'
-import {
-  budgetBadge,
-  deadlineLabel,
-  deadlineOverdue,
-  formatMinutes,
-  recurrenceLabel,
-  statusLabel,
-  statusOptions,
-  statusVariant,
-} from '../taskui'
+import { statusOptions } from '../taskui'
+import TaskBadges from '../components/TaskBadges.vue'
 
 // Классический вид (ТЗ 3.6): список с фильтрами — проект, тег, статус.
+// Фильтры применяются сразу при смене значения.
 
 const { t } = useI18n()
 
@@ -62,7 +55,19 @@
   }
 }
 
-async function remove(task: Task) {
+// Удаление — через подтверждение
+const deleteTarget = ref<Task | null>(null)
+const confirmOpen = ref(false)
+
+function askDelete(task: Task) {
+  deleteTarget.value = task
+  confirmOpen.value = true
+}
+
+async function remove() {
+  const task = deleteTarget.value
+  if (!task) return
+  confirmOpen.value = false
   error.value = ''
   try {
     await api.deleteTask(task.id)
@@ -77,6 +82,18 @@
   { value: '', label: t('common.anyStatus') },
   ...statusOptions(),
 ])
+
+// Меню «⋯» в карточке: смена статуса (отмечен текущий), удаление
+function taskMenu(task: Task) {
+  return [
+    ...statusOptions().map((o) => ({
+      label: o.label,
+      icon: o.value === task.status ? 'ph-check' : undefined,
+      onSelect: () => setStatus(task, o.value),
+    })),
+    { label: t('stack.deleteTask'), icon: 'ph-trash', danger: true, onSelect: () => askDelete(task) },
+  ]
+}
 </script>
 
 <template>
@@ -85,31 +102,40 @@
       <template #meta>{{ t('list.count', { n: tasks.length }) }}</template>
     </GnPageHeader>
 
-    <form class="filters" @submit.prevent>
-      <GnSelect v-model="filters.status" :label="t('list.filterStatus')" icon="ph-funnel" :options="statusOptionsWithAny" />
+    <!-- Фильтры в одну строку (переносятся на мобильных); применяются сразу -->
+    <GnToolbar class="filters">
+      <GnSelect
+        v-model="filters.status"
+        class="filter-select"
+        :options="statusOptionsWithAny"
+        @update:model-value="load"
+      />
       <GnSelect
         v-model="filters.project_id"
-        :label="t('list.filterProject')"
+        class="filter-select"
         icon="ph-folder"
         :options="[
           { value: '', label: t('common.any') },
           ...projects.map((p) => ({ value: String(p.id), label: p.name })),
         ]"
+        @update:model-value="load"
       />
       <GnSelect
         v-model="filters.tag_id"
-        :label="t('list.filterTag')"
+        class="filter-select"
         icon="ph-tag"
         :options="[
           { value: '', label: t('common.any') },
           ...tags.map((tg) => ({ value: String(tg.id), label: tg.name })),
         ]"
+        @update:model-value="load"
       />
-      <GnButton variant="secondary" icon="ph-funnel" @click="load">{{ t('list.apply') }}</GnButton>
-    </form>
+    </GnToolbar>
 
     <GnAlert v-if="error" variant="error">{{ error }}</GnAlert>
 
+    <GnSkeleton v-if="loading" type="block" stack :count="3" class="list-skeleton" />
+
     <GnEmptyState
       v-if="!loading && tasks.length === 0"
       icon="ph-list-magnifying-glass"
@@ -119,67 +145,78 @@
 
     <div class="task-list">
       <GnCard v-for="task in tasks" :key="task.id" class="task-card">
-        <template #title>{{ task.title }}</template>
-        <div class="task-row">
-          <GnBadge :variant="statusVariant(task.status)">{{ statusLabel(task.status) }}</GnBadge>
-          <GnBadge v-if="task.project" variant="neutral" icon="ph-folder">
-            {{ task.project.name }}
-          </GnBadge>
-          <GnBadge v-if="task.priority !== null" variant="warning">P{{ task.priority }}</GnBadge>
-          <GnBadge v-if="task.estimated_minutes" variant="neutral">
-            ≈ {{ formatMinutes(task.estimated_minutes) }}
-          </GnBadge>
-          <GnBadge v-if="task.task_type === 'recurring'" variant="info" icon="ph-repeat">
-            {{ recurrenceLabel(task) || t('taskui.recur.recurring') }}
-          </GnBadge>
-          <GnBadge
-            v-if="deadlineLabel(task)"
-            :variant="deadlineOverdue(task) ? 'error' : 'warning'"
-            icon="ph-alarm"
-          >
-            {{ deadlineLabel(task) }}
-          </GnBadge>
-          <GnBadge v-if="task.budget_money !== null" variant="neutral">
-            {{ budgetBadge(task) }}
-          </GnBadge>
-          <GnBadge v-for="tag in task.tags" :key="tag.id" variant="neutral">{{ tag.name }}</GnBadge>
-          <span class="spacer" />
-          <GnSelect
-            class="status-select"
-            :model-value="task.status"
-            :options="statusOptionsWithAny"
-            @update:model-value="(s: string) => setStatus(task, s)"
-          />
-          <GnIconButton icon="ph-trash" :label="t('stack.deleteTask')" @click="remove(task)" />
+        <div class="task-main">
+          <span class="title" :class="{ done: task.status === 'done' }">{{ task.title }}</span>
+          <GnDropdown class="task-menu" :items="taskMenu(task)">
+            <template #trigger="{ toggle }">
+              <GnIconButton icon="ph-dots-three-outline" :label="t('common.edit')" @click="toggle" />
+            </template>
+          </GnDropdown>
+        </div>
+        <div class="task-meta">
+          <TaskBadges :task="task" />
         </div>
       </GnCard>
     </div>
+
+    <GnConfirmDialog
+      v-model:open="confirmOpen"
+      :title="t('common.confirmTitle')"
+      :message="t('common.deleteConfirmTask', { title: deleteTarget?.title ?? '' })"
+      :confirm-text="t('common.delete')"
+      :cancel-text="t('common.cancel')"
+      confirm-variant="danger"
+      @confirm="remove"
+    />
   </section>
 </template>
 
 <style scoped>
 .filters {
-  display: flex;
-  gap: 0.75rem;
-  align-items: end;
   margin-bottom: 1.5rem;
-  flex-wrap: wrap;
+}
+/* GnSelect рендерит div.form-group > label > div.select-wrap > select — сжимаем обёртки */
+.filters :deep(.form-group) {
+  width: auto;
+  margin-bottom: 0;
+}
+.filters :deep(.select-wrap) {
+  width: 14rem;
+  margin-top: 0;
+}
+.list-skeleton {
+  margin-bottom: 1rem;
 }
 .task-list {
   display: flex;
   flex-direction: column;
   gap: 0.75rem;
 }
-.task-row {
+.task-main {
   display: flex;
-  gap: 0.4rem;
+  gap: 0.5rem;
   align-items: center;
-  flex-wrap: wrap;
 }
-.spacer {
+.task-main .title {
   flex: 1;
+  min-width: 0;
+  font-weight: 600;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
-.status-select {
-  min-width: 9rem;
+.task-main .title.done {
+  text-decoration: line-through;
+  color: var(--text-muted, #888);
+}
+.task-menu {
+  flex: none;
+}
+.task-meta {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.3rem;
+  align-items: center;
+  margin-top: 0.5rem;
 }
 </style>
\ No newline at end of file
diff --git a/frontend/src/views/OptionsView.vue b/frontend/src/views/OptionsView.vue
index ad07d70..67e8d93 100644
--- a/frontend/src/views/OptionsView.vue
+++ b/frontend/src/views/OptionsView.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
+import { useToast } from 'gnexus-ui-kit/vue'
 import { api, type Task } from '../api'
 import { formatMinutes, renderMarkdown, statusLabel } from '../taskui'
 
@@ -8,6 +9,7 @@
 // доступное время и делать её прямо сейчас.
 
 const { t } = useI18n()
+const toast = useToast()
 
 const availableMinutes = ref(180)
 const options = ref<Task[]>([])
@@ -31,23 +33,24 @@
 onMounted(fetchOptions)
 
 async function choose(task: Task) {
-  error.value = ''
   try {
     chosen.value = await api.updateTask(task.id, { status: 'in_progress' })
+    toast.success({ title: t('common.taskTaken') })
     options.value = []
   } catch (e) {
-    error.value = String(e)
+    toast.error({ title: t('common.error'), text: String(e) })
   }
 }
 
 async function finishChosen() {
   if (!chosen.value) return
-  error.value = ''
   try {
     await api.updateTask(chosen.value.id, { status: 'done' })
+    toast.success({ title: t('common.taskFinished') })
     chosen.value = null
+    await fetchOptions()
   } catch (e) {
-    error.value = String(e)
+    toast.error({ title: t('common.error'), text: String(e) })
   }
 }
 
@@ -100,8 +103,9 @@
     <GnAlert v-if="error" variant="error">{{ error }}</GnAlert>
 
     <template v-if="!chosen">
+      <GnSkeleton v-if="loading" type="block" stack :count="3" class="list-skeleton" />
       <GnEmptyState
-        v-if="!loading && options.length === 0"
+        v-else-if="options.length === 0"
         icon="ph-confetti"
         :title="t('options.emptyTitle')"
         :text="t('options.emptyText')"
@@ -128,15 +132,24 @@
 <style scoped>
 .time-form {
   display: flex;
+  flex-wrap: wrap;
   gap: 0.75rem;
   align-items: end;
   margin-bottom: 1.5rem;
 }
+/* GnInput рендерит div.form-group > label > input — ограничиваем обёртку */
+.time-form :deep(.form-group) {
+  width: 12rem;
+  margin-bottom: 0;
+}
 .options {
   display: flex;
   flex-direction: column;
   gap: 0.75rem;
 }
+.list-skeleton {
+  margin-bottom: 1rem;
+}
 .option-meta,
 .chosen-meta {
   display: flex;
@@ -149,6 +162,7 @@
 }
 .form-actions {
   display: flex;
+  flex-wrap: wrap;
   gap: 0.75rem;
 }
 .md-preview {
diff --git a/frontend/src/views/ProjectsView.vue b/frontend/src/views/ProjectsView.vue
index 04721fd..9dc721f 100644
--- a/frontend/src/views/ProjectsView.vue
+++ b/frontend/src/views/ProjectsView.vue
@@ -1,12 +1,15 @@
 <script setup lang="ts">
 import { computed, onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
+import { useToast } from 'gnexus-ui-kit/vue'
 import { api, type Project } from '../api'
 import { relevanceLabel, renderMarkdown } from '../taskui'
+import QuickPrompt from '../components/QuickPrompt.vue'
 
 // Проекты (ТЗ 3.7): актуальность, приоритет, Markdown-заметка с ресурсами.
 
 const { t } = useI18n()
+const toast = useToast()
 
 const projects = ref<Project[]>([])
 const error = ref('')
@@ -14,6 +17,7 @@
 const showPreview = ref(false)
 
 const editing = ref<Project | null>(null)
+const drawerOpen = ref(false)
 const editForm = ref({
   name: '',
   relevance_status: 'active',
@@ -37,6 +41,7 @@
 
 const notePreview = computed(() => renderMarkdown(editForm.value.note))
 
+// Редактирование — в боковой панели, карточка остаётся компактной
 function startEdit(project: Project) {
   editing.value = project
   showPreview.value = false
@@ -46,11 +51,16 @@
     priority: project.priority,
     note: project.note,
   }
+  drawerOpen.value = true
+}
+
+function closeDrawer() {
+  drawerOpen.value = false
+  editing.value = null
 }
 
 async function saveEdit() {
   if (!editing.value) return
-  error.value = ''
   try {
     await api.updateProject(editing.value.id, {
       name: editForm.value.name,
@@ -58,32 +68,46 @@
       priority: editForm.value.priority,
       note: editForm.value.note,
     })
-    editing.value = null
+    toast.success({ title: t('common.saved') })
+    closeDrawer()
     await load()
   } catch (e) {
-    error.value = String(e)
+    toast.error({ title: t('common.error'), text: String(e) })
   }
 }
 
-async function createProject() {
-  const name = window.prompt(t('projects.prompt'))
-  if (!name) return
-  error.value = ''
+// Создание — модальное окно вместо window.prompt
+const createOpen = ref(false)
+
+async function createProject(name: string) {
   try {
-    await api.createProject(name.trim())
+    await api.createProject(name)
+    toast.success({ title: t('common.created') })
     await load()
   } catch (e) {
-    error.value = String(e)
+    toast.error({ title: t('common.error'), text: String(e) })
   }
 }
 
-async function remove(project: Project) {
-  error.value = ''
+// Удаление — через подтверждение
+const deleteTarget = ref<Project | null>(null)
+const confirmOpen = ref(false)
+
+function askDelete(project: Project) {
+  deleteTarget.value = project
+  confirmOpen.value = true
+}
+
+async function remove() {
+  const project = deleteTarget.value
+  if (!project) return
+  confirmOpen.value = false
   try {
     await api.deleteProject(project.id)
+    toast.success({ title: t('common.projectDeleted') })
     await load()
   } catch (e) {
-    error.value = String(e)
+    toast.error({ title: t('common.error'), text: String(e) })
   }
 }
 
@@ -97,7 +121,7 @@
     <GnPageHeader kicker="gntodo" :title="t('projects.title')">
       <template #meta>{{ t('projects.count', { n: projects.length }) }}</template>
       <template #actions>
-        <GnButton variant="primary" icon="ph-plus" @click="createProject">
+        <GnButton variant="primary" icon="ph-plus" @click="createOpen = true">
           {{ t('projects.new') }}
         </GnButton>
       </template>
@@ -105,58 +129,74 @@
 
     <GnAlert v-if="error" variant="error">{{ error }}</GnAlert>
 
+    <GnSkeleton v-if="loading && projects.length === 0" type="block" stack :count="3" class="list-skeleton" />
+
     <GnEmptyState
       v-if="!loading && projects.length === 0"
       icon="ph-folders"
       :title="t('projects.emptyTitle')"
       :text="t('projects.emptyText')"
-    />
+    >
+      <template #actions>
+        <GnButton variant="primary" icon="ph-plus" @click="createOpen = true">
+          {{ t('projects.new') }}
+        </GnButton>
+      </template>
+    </GnEmptyState>
 
     <div class="project-list">
       <GnCard v-for="project in projects" :key="project.id" class="project-card">
-        <template #title>
-          <template v-if="editing?.id !== project.id">{{ project.name }}</template>
-        </template>
+        <template #title>{{ project.name }}</template>
 
-        <form v-if="editing?.id === project.id" class="edit-form" @submit.prevent="saveEdit">
-          <GnInput v-model="editForm.name" :label="t('projects.form.name')" required />
-          <GnSelect
-            v-model="editForm.relevance_status"
-            :label="t('projects.form.relevance')"
-            icon="ph-activity"
-            :options="relevanceOptions"
-          />
-          <GnInput v-model.number="editForm.priority" :label="t('projects.form.priority')" type="number" />
-          <GnTextarea v-model="editForm.note" :label="t('projects.form.note')" :rows="6" />
-          <GnCheckbox v-model="showPreview" :label="t('projects.form.preview')" />
-          <div v-if="showPreview" class="md-preview" v-html="notePreview" />
-          <div class="form-actions">
-            <GnButton type="submit" variant="accent" icon="ph-check">
-              {{ t('common.save') }}
-            </GnButton>
-            <GnButton type="button" variant="secondary" @click="editing = null">
-              {{ t('common.cancel') }}
-            </GnButton>
-          </div>
-        </form>
-
-        <template v-else>
-          <div class="project-meta">
-            <GnBadge variant="info">{{ relevanceLabel(project.relevance_status) }}</GnBadge>
-            <GnBadge v-if="project.priority !== null" variant="warning">
-              P{{ project.priority }}
-            </GnBadge>
-          </div>
-          <div v-if="project.note" class="md-preview note" v-html="renderMarkdown(project.note)" />
-          <div class="form-actions">
-            <GnButton variant="secondary" size="sm" icon="ph-pencil-simple" @click="startEdit(project)">
-              {{ t('projects.edit') }}
-            </GnButton>
-            <GnIconButton icon="ph-trash" :label="t('projects.delete')" @click="remove(project)" />
-          </div>
-        </template>
+        <div class="project-meta">
+          <GnBadge variant="info">{{ relevanceLabel(project.relevance_status) }}</GnBadge>
+          <GnBadge v-if="project.priority !== null" variant="warning">P{{ project.priority }}</GnBadge>
+        </div>
+        <div v-if="project.note" class="md-preview note" v-html="renderMarkdown(project.note)" />
+        <div class="form-actions">
+          <GnButton variant="secondary" size="sm" icon="ph-pencil-simple" @click="startEdit(project)">
+            {{ t('projects.edit') }}
+          </GnButton>
+          <GnIconButton icon="ph-trash" :label="t('projects.delete')" @click="askDelete(project)" />
+        </div>
       </GnCard>
     </div>
+
+    <GnDrawer v-model:open="drawerOpen" :title="editing?.name || t('projects.edit')" position="right" @close="closeDrawer">
+      <form v-if="editing" class="edit-form" @submit.prevent="saveEdit">
+        <GnInput v-model="editForm.name" :label="t('projects.form.name')" required />
+        <GnSelect
+          v-model="editForm.relevance_status"
+          :label="t('projects.form.relevance')"
+          icon="ph-activity"
+          :options="relevanceOptions"
+        />
+        <GnInput v-model.number="editForm.priority" :label="t('projects.form.priority')" type="number" />
+        <GnTextarea v-model="editForm.note" :label="t('projects.form.note')" :rows="6" />
+        <GnCheckbox v-model="showPreview" :label="t('projects.form.preview')" />
+        <div v-if="showPreview" class="md-preview" v-html="notePreview" />
+        <div class="form-actions">
+          <GnButton type="submit" variant="accent" icon="ph-check">
+            {{ t('common.save') }}
+          </GnButton>
+          <GnButton type="button" variant="secondary" @click="closeDrawer">
+            {{ t('common.cancel') }}
+          </GnButton>
+        </div>
+      </form>
+    </GnDrawer>
+
+    <QuickPrompt v-model:open="createOpen" :title="t('projects.prompt')" @confirm="createProject" />
+
+    <GnConfirmDialog
+      v-model:open="confirmOpen"
+      :title="t('common.confirmTitle')"
+      :message="t('common.deleteConfirmProject', { name: deleteTarget?.name ?? '' })"
+      :confirm-text="t('common.delete')"
+      :cancel-text="t('common.cancel')"
+      confirm-variant="danger"
+      @confirm="remove"
+    />
   </section>
 </template>
 
@@ -166,6 +206,9 @@
   flex-direction: column;
   gap: 0.75rem;
 }
+.list-skeleton {
+  margin-bottom: 1rem;
+}
 .project-meta {
   display: flex;
   gap: 0.5rem;
diff --git a/frontend/src/views/SettingsView.vue b/frontend/src/views/SettingsView.vue
index c14b2d0..103197c 100644
--- a/frontend/src/views/SettingsView.vue
+++ b/frontend/src/views/SettingsView.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { computed, onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
+import { useToast } from 'gnexus-ui-kit/vue'
 import { api } from '../api'
 import { setLocale } from '../i18n/locale'
 import { currencyOptions, setCurrency } from '../taskui'
@@ -8,12 +9,12 @@
 // Глобальные настройки: валюта бюджетов и язык интерфейса.
 
 const { t } = useI18n()
+const toast = useToast()
 
 const currency = ref('UAH')
 const language = ref('') // '' = как в аккаунте (SSO)
 const error = ref('')
 const saving = ref(false)
-const saved = ref(false)
 
 const languageOptions = computed(() => [
   { value: '', label: t('settings.languageAuto') },
@@ -34,7 +35,6 @@
 
 async function save() {
   error.value = ''
-  saved.value = false
   saving.value = true
   try {
     const s = await api.updateSettings({ currency: currency.value, language: language.value })
@@ -47,9 +47,9 @@
       setLocale(s.language)
     }
     language.value = s.language
-    saved.value = true
+    toast.success({ title: t('common.saved') })
   } catch (e) {
-    error.value = String(e)
+    toast.error({ title: t('common.error'), text: String(e) })
   } finally {
     saving.value = false
   }
@@ -65,39 +65,20 @@
     <GnCard>
       <template #title>{{ t('settings.currencyTitle') }}</template>
       <p class="hint">{{ t('settings.currencyHint') }}</p>
-      <GnSelect
-        v-model="currency"
-        :label="t('settings.currencyUnit')"
-        :options="currencyOptions()"
-      />
+      <GnRadioGroup v-model="currency" :options="currencyOptions()" />
       <div class="form-actions">
-        <GnButton
-          variant="primary"
-          icon="ph-floppy-disk"
-          :disabled="saving"
-          @click="save"
-        >
+        <GnButton variant="primary" icon="ph-floppy-disk" :disabled="saving" @click="save">
           {{ t('common.save') }}
         </GnButton>
       </div>
-      <GnAlert v-if="saved" variant="success">{{ t('settings.saved') }}</GnAlert>
     </GnCard>
 
     <GnCard>
       <template #title>{{ t('settings.languageTitle') }}</template>
       <p class="hint">{{ t('settings.languageHint') }}</p>
-      <GnSelect
-        v-model="language"
-        :label="t('settings.languageUnit')"
-        :options="languageOptions"
-      />
+      <GnRadioGroup v-model="language" :options="languageOptions" />
       <div class="form-actions">
-        <GnButton
-          variant="primary"
-          icon="ph-floppy-disk"
-          :disabled="saving"
-          @click="save"
-        >
+        <GnButton variant="primary" icon="ph-floppy-disk" :disabled="saving" @click="save">
           {{ t('common.save') }}
         </GnButton>
       </div>
@@ -110,11 +91,11 @@
   color: var(--muted, #888);
   margin: 0 0 0.75rem;
 }
-.form-actions {
-  margin-top: 0.75rem;
+/* карточки кита не имеют собственного вертикального отступа */
+.card + .card {
+  margin-top: 1.5rem;
 }
-.form-actions + .alert,
-:deep(.alert) {
+.form-actions {
   margin-top: 0.75rem;
 }
 </style>
\ No newline at end of file
diff --git a/frontend/src/views/StackView.vue b/frontend/src/views/StackView.vue
index b6d9500..bf1de6d 100644
--- a/frontend/src/views/StackView.vue
+++ b/frontend/src/views/StackView.vue
@@ -6,11 +6,14 @@
 import { api, type Attachment, type Project, type Task } from '../api'
 import { intlLocale } from '../i18n/locale'
 import { deadlinePeriodOptions, formatMinutes, recurKindOptions, weekdayShort } from '../taskui'
+import { useToast } from 'gnexus-ui-kit/vue'
+import QuickPrompt from '../components/QuickPrompt.vue'
 
 // Стек входящих: сырые задачи, ожидающие детализации и утверждения.
 // LLM-предложение — черновик: «Да, всё верно» применяет его, иначе правим вручную.
 
 const { t } = useI18n()
+const toast = useToast()
 
 const stack = ref<Task[]>([])
 const projects = ref<Project[]>([])
@@ -20,6 +23,7 @@
 const loading = ref(false)
 
 const editing = ref<Task | null>(null)
+const drawerOpen = ref(false)
 const editForm = ref({
   title: '',
   description: '',
@@ -89,13 +93,13 @@
 async function quickAdd() {
   const title = quickTitle.value.trim()
   if (!title) return
-  error.value = ''
   try {
     await api.createTask(title)
     quickTitle.value = ''
+    toast.success({ title: t('stack.added') })
     await loadStack()
   } catch (e) {
-    error.value = String(e)
+    toast.error({ title: t('common.error'), text: String(e) })
   }
 }
 
@@ -105,6 +109,7 @@
     .map(([id]) => Number(id))
 }
 
+// Редактирование — в боковой панели (GnDrawer), карточка остаётся компактной
 function startEdit(task: Task) {
   editing.value = task
   const selection: Record<number, boolean> = {}
@@ -129,20 +134,27 @@
     recur_day_of_month: task.recur_day_of_month ?? 1,
   }
   showPreview.value = false
+  attachments.value = []
   void loadAttachments(task.id)
+  drawerOpen.value = true
+}
+
+function closeDrawer() {
+  drawerOpen.value = false
+  editing.value = null
+  attachments.value = []
 }
 
 async function loadAttachments(taskId: number) {
   try {
     attachments.value = await api.listAttachments(taskId)
   } catch (e) {
-    error.value = String(e)
+    toast.error({ title: t('common.error'), text: String(e) })
   }
 }
 
 async function saveEdit() {
   if (!editing.value) return
-  error.value = ''
   try {
     await api.updateTask(editing.value.id, {
       title: editForm.value.title,
@@ -176,45 +188,64 @@
           : null,
     })
     await api.approveTask(editing.value.id)
-    editing.value = null
-    attachments.value = []
+    toast.success({ title: t('common.taskApproved') })
+    closeDrawer()
     await loadStack()
   } catch (e) {
-    error.value = String(e)
+    toast.error({ title: t('common.error'), text: String(e) })
   }
 }
 
 async function approve(task: Task) {
-  error.value = ''
   try {
     // «Да, всё верно» — принять предложение автодетализации
     await api.approveTask(task.id, task.ai_proposal !== null)
+    toast.success({ title: t('common.taskApproved') })
     await loadStack()
   } catch (e) {
-    error.value = String(e)
+    toast.error({ title: t('common.error'), text: String(e) })
   }
 }
 
 async function redetail(task: Task) {
-  error.value = ''
   try {
     await api.redetailTask(task.id)
     await loadStack()
   } catch (e) {
-    error.value = String(e)
+    toast.error({ title: t('common.error'), text: String(e) })
   }
 }
 
-async function remove(task: Task) {
-  error.value = ''
+// Удаление — через подтверждение
+const deleteTarget = ref<Task | null>(null)
+const confirmOpen = ref(false)
+
+function askDelete(task: Task) {
+  deleteTarget.value = task
+  confirmOpen.value = true
+}
+
+async function remove() {
+  const task = deleteTarget.value
+  if (!task) return
+  confirmOpen.value = false
   try {
     await api.deleteTask(task.id)
+    toast.success({ title: t('common.taskDeleted') })
     await loadStack()
   } catch (e) {
-    error.value = String(e)
+    toast.error({ title: t('common.error'), text: String(e) })
   }
 }
 
+// Меню «⋯» карточки: переспросить ИИ, удалить
+function taskMenu(task: Task) {
+  return [
+    { label: t('stack.redetail'), icon: 'ph-arrows-counter-clockwise', onSelect: () => redetail(task) },
+    { label: t('stack.deleteTask'), icon: 'ph-trash', danger: true, onSelect: () => askDelete(task) },
+  ]
+}
+
 // Вставка изображений из буфера обмена прямо в редактор описания
 async function onPaste(event: ClipboardEvent) {
   const files = Array.from(event.clipboardData?.files ?? []).filter((f) =>
@@ -227,43 +258,45 @@
     const saved = await api.uploadAttachments(editing.value.id, files)
     attachments.value.push(...saved)
   } catch (e) {
-    error.value = String(e)
+    toast.error({ title: t('common.error'), text: String(e) })
   } finally {
     uploading.value = false
   }
 }
 
 async function removeAttachment(att: Attachment) {
-  error.value = ''
   try {
     await api.deleteAttachment(att.id)
     attachments.value = attachments.value.filter((a) => a.id !== att.id)
   } catch (e) {
-    error.value = String(e)
+    toast.error({ title: t('common.error'), text: String(e) })
   }
 }
 
-async function createProjectInline() {
-  const name = window.prompt(t('stack.promptProject'))
-  if (!name) return
-  try {
-    const p = await api.createProject(name.trim())
-    projects.value.push(p)
-    editForm.value.project_id = p.id
-  } catch (e) {
-    error.value = String(e)
-  }
+// Создание проекта/тега на лету — модальное окно вместо window.prompt
+const promptOpen = ref(false)
+const promptTitle = ref('')
+let promptKind: 'project' | 'tag' = 'project'
+
+function openPrompt(kind: 'project' | 'tag') {
+  promptKind = kind
+  promptTitle.value = kind === 'project' ? t('stack.promptProject') : t('stack.promptTag')
+  promptOpen.value = true
 }
 
-async function createTagInline() {
-  const name = window.prompt(t('stack.promptTag'))
-  if (!name) return
+async function onPromptConfirm(name: string) {
   try {
-    const t = await api.createTag(name.trim())
-    tags.value.push(t)
-    editForm.value.tagSelection[t.id] = true
+    if (promptKind === 'project') {
+      const p = await api.createProject(name)
+      projects.value.push(p)
+      editForm.value.project_id = p.id
+    } else {
+      const tag = await api.createTag(name)
+      tags.value.push(tag)
+      editForm.value.tagSelection[tag.id] = true
+    }
   } catch (e) {
-    error.value = String(e)
+    toast.error({ title: t('common.error'), text: String(e) })
   }
 }
 
@@ -308,6 +341,8 @@
 
     <GnAlert v-if="error" variant="error">{{ error }}</GnAlert>
 
+    <GnSkeleton v-if="loading && stack.length === 0" type="block" stack :count="3" class="stack-skeleton" />
+
     <GnEmptyState
       v-if="!loading && stack.length === 0"
       icon="ph-inbox"
@@ -317,211 +352,217 @@
 
     <div class="task-list">
       <GnCard v-for="task in stack" :key="task.id" class="task-card">
-        <template #title>
-          <template v-if="editing?.id !== task.id">{{ task.title }}</template>
-        </template>
+        <template #title>{{ task.title }}</template>
 
-        <!-- Редактирование: метаданные правятся вручную, затем утверждение -->
-        <form v-if="editing?.id === task.id" class="edit-form" @submit.prevent="saveEdit">
-          <GnInput v-model="editForm.title" :label="t('stack.form.title')" required />
-          <GnTextarea
-            v-model="editForm.description"
-            :label="t('stack.form.description')"
-            :rows="4"
-            @paste="onPaste"
-          />
-          <GnCheckbox v-model="showPreview" :label="t('stack.form.preview')" />
-          <div v-if="showPreview" class="md-preview" v-html="markdownPreview" />
+        <div class="task-meta">
+          <GnBadge variant="info">{{ t('stack.inStack') }}</GnBadge>
+          <span class="muted">{{ new Date(task.created_at).toLocaleString(intlLocale()) }}</span>
+        </div>
 
-          <GnSelect
-            v-model="editForm.project_id"
-            :label="t('stack.form.project')"
-            icon="ph-folder"
-            :options="projectOptions()"
-          />
-          <div class="form-row-actions">
-            <GnButton
-              type="button"
-              variant="secondary"
-              size="sm"
-              icon="ph-plus"
-              @click="createProjectInline"
-            >
-              {{ t('stack.newProject') }}
-            </GnButton>
-          </div>
-          <fieldset class="tags-fieldset">
-            <legend>{{ t('stack.form.tags') }}</legend>
-            <GnCheckbox
-              v-for="tag in tags"
-              :key="tag.id"
-              v-model="editForm.tagSelection[tag.id]"
-              :label="tag.name"
-            />
-            <GnButton
-              type="button"
-              variant="secondary"
-              size="sm"
-              icon="ph-plus"
-              @click="createTagInline"
-            >
-              {{ t('stack.newTag') }}
-            </GnButton>
-          </fieldset>
-          <GnInput v-model.number="editForm.priority" :label="t('stack.form.priority')" type="number" />
-          <GnInput
-            v-model.number="editForm.estimated_minutes"
-            :label="t('stack.form.estimate')"
-            type="number"
-            min="1"
-          />
-          <div class="budget-row">
-            <GnInput
-              v-model.number="editForm.budget_money"
-              :label="t('stack.form.budget')"
-              type="number"
-              min="0"
-            />
-            <GnInput
-              v-model.number="editForm.cost_estimate_money"
-              :label="t('stack.form.cost')"
-              type="number"
-              min="0"
-            />
-          </div>
-          <fieldset class="tags-fieldset">
-            <legend>{{ t('stack.deadline.legend') }}</legend>
-            <GnInput v-model="editForm.deadline_date" :label="t('stack.deadline.date')" type="date" />
-            <GnSelect
-              v-model="editForm.deadline_period"
-              :label="t('stack.deadline.period')"
-              :options="[{ value: '', label: t('common.none') }, ...deadlinePeriodOptions()]"
-            />
-          </fieldset>
-          <fieldset class="tags-fieldset">
-            <legend>{{ t('stack.recur.legend') }}</legend>
-            <GnSelect
-              v-model="editForm.task_type"
-              :options="[
-                { value: 'one_time', label: t('stack.recur.oneTime') },
-                { value: 'recurring', label: t('stack.recur.recurring') },
-              ]"
-            />
-            <template v-if="editForm.task_type === 'recurring'">
-              <GnSelect
-                v-model="editForm.recur_kind"
-                :label="t('stack.recur.kind')"
-                :options="[{ value: '', label: t('common.choose') }, ...recurKindOptions()]"
-              />
-              <GnInput
-                v-if="editForm.recur_kind === 'interval'"
-                v-model.number="editForm.recur_interval_days"
-                :label="t('stack.recur.interval')"
-                type="number"
-                min="1"
-                max="365"
-              />
-              <template v-if="editForm.recur_kind === 'weekdays'">
-                <fieldset class="tags-fieldset weekdays-fieldset">
-                  <legend>{{ t('stack.recur.weekdays') }}</legend>
-                  <GnCheckbox
-                    v-for="d in WEEKDAYS"
-                    :key="d.value"
-                    v-model="editForm.recurWeekday[d.value]"
-                    :label="d.label"
-                  />
-                </fieldset>
-              </template>
-              <GnInput
-                v-if="editForm.recur_kind === 'monthly'"
-                v-model.number="editForm.recur_day_of_month"
-                :label="t('stack.recur.monthlyDay')"
-                type="number"
-                min="1"
-                max="31"
-              />
+        <!-- Черновое предложение автодетализации -->
+        <div v-if="task.ai_proposal" class="proposal">
+          <span class="muted">{{ t('stack.proposal') }}</span>
+          <GnBadge v-for="(item, i) in proposalItems(task)" :key="i" variant="neutral">
+            {{ item }}
+          </GnBadge>
+        </div>
+        <div v-else class="proposal">
+          <span class="muted">{{ t('stack.proposalPending') }}</span>
+        </div>
+
+        <div class="task-actions">
+          <GnButton
+            variant="accent"
+            size="sm"
+            icon="ph-check"
+            :disabled="!task.ai_proposal"
+            @click="approve(task)"
+          >
+            {{ t('stack.approveProposal') }}
+          </GnButton>
+          <GnButton variant="secondary" size="sm" icon="ph-pencil-simple" @click="startEdit(task)">
+            {{ t('stack.detail') }}
+          </GnButton>
+          <GnDropdown class="task-menu" :items="taskMenu(task)">
+            <template #trigger="{ toggle }">
+              <GnIconButton icon="ph-dots-three-outline" :label="t('common.edit')" @click="toggle" />
             </template>
-          </fieldset>
-
-          <!-- Вложения: вставленные Ctrl+V изображения -->
-          <div v-if="attachments.length || uploading" class="attachments">
-            <GnBadge v-if="uploading" variant="info">{{ t('stack.uploading') }}</GnBadge>
-            <div class="thumbs">
-              <div v-for="att in attachments" :key="att.id" class="thumb">
-                <img :src="api.attachmentUrl(att.id)" :alt="att.original_name" />
-                <GnIconButton
-                  icon="ph-x"
-                  :label="t('stack.deleteAttachment')"
-                  size="sm"
-                  @click="removeAttachment(att)"
-                />
-              </div>
-            </div>
-          </div>
-
-          <div class="form-actions">
-            <GnButton type="submit" variant="accent" icon="ph-check-circle">
-              {{ t('stack.approve') }}
-            </GnButton>
-            <GnButton type="button" variant="secondary" @click="editing = null">
-              {{ t('common.cancel') }}
-            </GnButton>
-          </div>
-        </form>
-
-        <!-- Просмотр сырой задачи -->
-        <template v-else>
-          <div class="task-meta">
-            <GnBadge variant="info">{{ t('stack.inStack') }}</GnBadge>
-            <span class="muted">{{ new Date(task.created_at).toLocaleString(intlLocale()) }}</span>
-          </div>
-
-          <!-- Черновое предложение автодетализации -->
-          <div v-if="task.ai_proposal" class="proposal">
-            <span class="muted">{{ t('stack.proposal') }}</span>
-            <GnBadge v-for="(item, i) in proposalItems(task)" :key="i" variant="neutral">
-              {{ item }}
-            </GnBadge>
-          </div>
-          <div v-else class="proposal">
-            <span class="muted">{{ t('stack.proposalPending') }}</span>
-          </div>
-
-          <div class="task-actions">
-            <GnButton
-              variant="accent"
-              size="sm"
-              icon="ph-check"
-              :disabled="!task.ai_proposal"
-              @click="approve(task)"
-            >
-              {{ t('stack.approveProposal') }}
-            </GnButton>
-            <GnButton variant="secondary" size="sm" icon="ph-pencil-simple" @click="startEdit(task)">
-              {{ t('stack.detail') }}
-            </GnButton>
-            <GnIconButton
-              icon="ph-arrows-counter-clockwise"
-              :label="t('stack.redetail')"
-              @click="redetail(task)"
-            />
-            <GnIconButton icon="ph-trash" :label="t('stack.deleteTask')" @click="remove(task)" />
-          </div>
-        </template>
+          </GnDropdown>
+        </div>
       </GnCard>
     </div>
+
+    <!-- Редактирование метаданных и утверждение — боковая панель -->
+    <GnDrawer v-model:open="drawerOpen" :title="t('stack.detailTitle')" position="right" @close="closeDrawer">
+      <form v-if="editing" class="edit-form" @submit.prevent="saveEdit">
+        <GnInput v-model="editForm.title" :label="t('stack.form.title')" required />
+        <GnTextarea
+          v-model="editForm.description"
+          :label="t('stack.form.description')"
+          :rows="4"
+          @paste="onPaste"
+        />
+        <GnCheckbox v-model="showPreview" :label="t('stack.form.preview')" />
+        <div v-if="showPreview" class="md-preview" v-html="markdownPreview" />
+
+        <GnSelect
+          v-model="editForm.project_id"
+          :label="t('stack.form.project')"
+          icon="ph-folder"
+          :options="projectOptions()"
+        />
+        <div class="form-row-actions">
+          <GnButton
+            type="button"
+            variant="secondary"
+            size="sm"
+            icon="ph-plus"
+            @click="openPrompt('project')"
+          >
+            {{ t('stack.newProject') }}
+          </GnButton>
+        </div>
+        <fieldset class="tags-fieldset">
+          <legend>{{ t('stack.form.tags') }}</legend>
+          <GnCheckbox
+            v-for="tag in tags"
+            :key="tag.id"
+            v-model="editForm.tagSelection[tag.id]"
+            :label="tag.name"
+          />
+          <GnButton type="button" variant="secondary" size="sm" icon="ph-plus" @click="openPrompt('tag')">
+            {{ t('stack.newTag') }}
+          </GnButton>
+        </fieldset>
+        <GnInput v-model.number="editForm.priority" :label="t('stack.form.priority')" type="number" />
+        <GnInput
+          v-model.number="editForm.estimated_minutes"
+          :label="t('stack.form.estimate')"
+          type="number"
+          min="1"
+        />
+        <div class="budget-row">
+          <GnInput
+            v-model.number="editForm.budget_money"
+            :label="t('stack.form.budget')"
+            type="number"
+            min="0"
+          />
+          <GnInput
+            v-model.number="editForm.cost_estimate_money"
+            :label="t('stack.form.cost')"
+            type="number"
+            min="0"
+          />
+        </div>
+        <fieldset class="tags-fieldset">
+          <legend>{{ t('stack.deadline.legend') }}</legend>
+          <GnInput v-model="editForm.deadline_date" :label="t('stack.deadline.date')" type="date" />
+          <GnSelect
+            v-model="editForm.deadline_period"
+            :label="t('stack.deadline.period')"
+            :options="[{ value: '', label: t('common.none') }, ...deadlinePeriodOptions()]"
+          />
+        </fieldset>
+        <fieldset class="tags-fieldset">
+          <legend>{{ t('stack.recur.legend') }}</legend>
+          <GnSelect
+            v-model="editForm.task_type"
+            :options="[
+              { value: 'one_time', label: t('stack.recur.oneTime') },
+              { value: 'recurring', label: t('stack.recur.recurring') },
+            ]"
+          />
+          <template v-if="editForm.task_type === 'recurring'">
+            <GnSelect
+              v-model="editForm.recur_kind"
+              :label="t('stack.recur.kind')"
+              :options="[{ value: '', label: t('common.choose') }, ...recurKindOptions()]"
+            />
+            <GnInput
+              v-if="editForm.recur_kind === 'interval'"
+              v-model.number="editForm.recur_interval_days"
+              :label="t('stack.recur.interval')"
+              type="number"
+              min="1"
+              max="365"
+            />
+            <template v-if="editForm.recur_kind === 'weekdays'">
+              <fieldset class="tags-fieldset weekdays-fieldset">
+                <legend>{{ t('stack.recur.weekdays') }}</legend>
+                <GnCheckbox
+                  v-for="d in WEEKDAYS"
+                  :key="d.value"
+                  v-model="editForm.recurWeekday[d.value]"
+                  :label="d.label"
+                />
+              </fieldset>
+            </template>
+            <GnInput
+              v-if="editForm.recur_kind === 'monthly'"
+              v-model.number="editForm.recur_day_of_month"
+              :label="t('stack.recur.monthlyDay')"
+              type="number"
+              min="1"
+              max="31"
+            />
+          </template>
+        </fieldset>
+
+        <!-- Вложения: вставленные Ctrl+V изображения -->
+        <div v-if="attachments.length || uploading" class="attachments">
+          <GnBadge v-if="uploading" variant="info">{{ t('stack.uploading') }}</GnBadge>
+          <div class="thumbs">
+            <div v-for="att in attachments" :key="att.id" class="thumb">
+              <img :src="api.attachmentUrl(att.id)" :alt="att.original_name" />
+              <GnIconButton
+                icon="ph-x"
+                :label="t('stack.deleteAttachment')"
+                size="sm"
+                @click="removeAttachment(att)"
+              />
+            </div>
+          </div>
+        </div>
+
+        <div class="form-actions">
+          <GnButton type="submit" variant="accent" icon="ph-check-circle">
+            {{ t('stack.approve') }}
+          </GnButton>
+          <GnButton type="button" variant="secondary" @click="closeDrawer">
+            {{ t('common.cancel') }}
+          </GnButton>
+        </div>
+      </form>
+    </GnDrawer>
+
+    <QuickPrompt v-model:open="promptOpen" :title="promptTitle" @confirm="onPromptConfirm" />
+
+    <GnConfirmDialog
+      v-model:open="confirmOpen"
+      :title="t('common.confirmTitle')"
+      :message="t('common.deleteConfirmTask', { title: deleteTarget?.title ?? '' })"
+      :confirm-text="t('common.delete')"
+      :cancel-text="t('common.cancel')"
+      confirm-variant="danger"
+      @confirm="remove"
+    />
   </section>
 </template>
 
 <style scoped>
 .quick-add {
   display: flex;
+  flex-wrap: wrap;
   gap: 0.75rem;
   align-items: start;
   margin-bottom: 1.5rem;
 }
 .quick-add > :first-child {
-  flex: 1;
+  flex: 1 1 14rem;
+}
+.stack-skeleton {
+  margin-bottom: 1rem;
 }
 .task-list {
   display: flex;
@@ -547,9 +588,13 @@
 }
 .task-actions {
   display: flex;
+  flex-wrap: wrap;
   gap: 0.5rem;
   align-items: center;
 }
+.task-menu {
+  margin-left: auto;
+}
 .edit-form {
   display: flex;
   flex-direction: column;
@@ -605,6 +650,7 @@
 }
 .form-actions {
   display: flex;
+  flex-wrap: wrap;
   gap: 0.75rem;
 }
 .budget-row {
diff --git a/frontend/src/views/TreeView.vue b/frontend/src/views/TreeView.vue
index 8ff539d..970bf3e 100644
--- a/frontend/src/views/TreeView.vue
+++ b/frontend/src/views/TreeView.vue
@@ -2,16 +2,9 @@
 import { computed, onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { api, type Project, type Task } from '../api'
-import {
-  budgetBadge,
-  deadlineLabel,
-  deadlineOverdue,
-  formatMinutes,
-  recurrenceLabel,
-  statusLabel,
-  statusOptions,
-  statusVariant,
-} from '../taskui'
+import { statusOptions } from '../taskui'
+import QuickPrompt from '../components/QuickPrompt.vue'
+import TaskBadges from '../components/TaskBadges.vue'
 
 defineOptions({ name: 'TreeView' })
 
@@ -85,21 +78,41 @@
   }
 }
 
-async function addSubtask(task: Task) {
-  const title = window.prompt(t('tree.promptSubtask'))
-  if (!title) return
+// Быстрое добавление подзадачи — модальное окно вместо window.prompt
+const subtaskFor = ref<Task | null>(null)
+const subtaskOpen = ref(false)
+
+function openSubtaskPrompt(task: Task) {
+  subtaskFor.value = task
+  subtaskOpen.value = true
+}
+
+async function createSubtask(title: string) {
+  if (!subtaskFor.value) return
   error.value = ''
   try {
-    await api.createTask(title.trim(), '', task.id)
+    await api.createTask(title, '', subtaskFor.value.id)
     // подзадача попадёт в стек; в дереве появится после утверждения
-    expanded.value[task.id] = true
+    expanded.value[subtaskFor.value.id] = true
     await load()
   } catch (e) {
     error.value = String(e)
   }
 }
 
-async function remove(task: Task) {
+// Удаление — только через подтверждение (действие необратимо)
+const deleteTarget = ref<Task | null>(null)
+const confirmOpen = ref(false)
+
+function askDelete(task: Task) {
+  deleteTarget.value = task
+  confirmOpen.value = true
+}
+
+async function remove() {
+  const task = deleteTarget.value
+  if (!task) return
+  confirmOpen.value = false
   error.value = ''
   try {
     await api.deleteTask(task.id)
@@ -108,6 +121,19 @@
     error.value = String(e)
   }
 }
+
+// Меню «⋯» в строке: смена статуса (отмечен текущий), подзадача, удаление
+function taskMenu(task: Task) {
+  return [
+    ...statusOptions().map((o) => ({
+      label: o.label,
+      icon: o.value === task.status ? 'ph-check' : undefined,
+      onSelect: () => setStatus(task, o.value),
+    })),
+    { label: t('tree.addSubtask'), icon: 'ph-plus', onSelect: () => openSubtaskPrompt(task) },
+    { label: t('stack.deleteTask'), icon: 'ph-trash', danger: true, onSelect: () => askDelete(task) },
+  ]
+}
 </script>
 
 <template>
@@ -118,61 +144,65 @@
 
     <GnAlert v-if="error" variant="error">{{ error }}</GnAlert>
 
+    <GnSkeleton v-if="loading" type="line" stack :count="6" class="tree-skeleton" />
+
     <GnEmptyState
       v-if="!loading && rows.length === 0"
       icon="ph-tree-structure"
       :title="t('tree.emptyTitle')"
       :text="t('tree.emptyText')"
-    />
+    >
+      <template #actions>
+        <GnButton variant="primary" icon="ph-inbox" @click="$router.push('/stack')">
+          {{ t('nav.stack') }}
+        </GnButton>
+      </template>
+    </GnEmptyState>
 
     <div class="tree">
-      <div v-for="row in rows" :key="row.task.id" class="node" :style="{ marginLeft: row.depth * 24 + 'px' }">
-        <div class="node-row">
+      <div
+        v-for="row in rows"
+        :key="row.task.id"
+        class="node"
+        :style="{ marginLeft: row.depth * 24 + 'px' }"
+      >
+        <div class="node-main">
           <GnIconButton
             v-if="row.hasChildren"
             :icon="expanded[row.task.id] ?? true ? 'ph-caret-down' : 'ph-caret-right'"
             :label="expanded[row.task.id] ?? true ? t('tree.collapse') : t('tree.expand')"
+            size="sm"
             @click="toggle(row.task)"
           />
           <span v-else class="leaf-space" />
           <span class="title" :class="{ done: row.task.status === 'done' }">{{ row.task.title }}</span>
-          <GnBadge :variant="statusVariant(row.task.status)">{{ statusLabel(row.task.status) }}</GnBadge>
-          <GnBadge v-if="row.task.project" variant="neutral" icon="ph-folder">
-            {{ row.task.project.name }}
-          </GnBadge>
-          <GnBadge v-if="row.task.priority !== null" variant="warning">
-            P{{ row.task.priority }}
-          </GnBadge>
-          <GnBadge v-if="row.task.estimated_minutes" variant="neutral">
-            ≈ {{ formatMinutes(row.task.estimated_minutes) }}
-          </GnBadge>
-          <GnBadge v-if="row.task.task_type === 'recurring'" variant="info" icon="ph-repeat">
-            {{ recurrenceLabel(row.task) || t('taskui.recur.recurring') }}
-          </GnBadge>
-          <GnBadge
-            v-if="deadlineLabel(row.task)"
-            :variant="deadlineOverdue(row.task) ? 'error' : 'warning'"
-            icon="ph-alarm"
-          >
-            {{ deadlineLabel(row.task) }}
-          </GnBadge>
-          <GnBadge v-if="row.task.budget_money !== null" variant="neutral">
-            {{ budgetBadge(row.task) }}
-          </GnBadge>
-          <GnBadge v-for="tag in row.task.tags" :key="tag.id" variant="neutral">{{ tag.name }}</GnBadge>
-
-          <span class="spacer" />
-          <GnSelect
-            class="status-select"
-            :model-value="row.task.status"
-            :options="statusOptions()"
-            @update:model-value="(s: string) => setStatus(row.task, s)"
-          />
-          <GnIconButton icon="ph-plus" :label="t('tree.addSubtask')" @click="addSubtask(row.task)" />
-          <GnIconButton icon="ph-trash" :label="t('stack.deleteTask')" @click="remove(row.task)" />
+          <GnDropdown class="node-menu" :items="taskMenu(row.task)">
+            <template #trigger="{ toggle }">
+              <GnIconButton icon="ph-dots-three-outline" :label="t('common.edit')" @click="toggle" />
+            </template>
+          </GnDropdown>
+        </div>
+        <div class="node-meta">
+          <TaskBadges :task="row.task" />
         </div>
       </div>
     </div>
+
+    <QuickPrompt
+      v-model:open="subtaskOpen"
+      :title="t('tree.promptSubtask')"
+      @confirm="createSubtask"
+    />
+
+    <GnConfirmDialog
+      v-model:open="confirmOpen"
+      :title="t('common.confirmTitle')"
+      :message="t('common.deleteConfirmTask', { title: deleteTarget?.title ?? '' })"
+      :confirm-text="t('common.delete')"
+      :cancel-text="t('common.cancel')"
+      confirm-variant="danger"
+      @confirm="remove"
+    />
   </section>
 </template>
 
@@ -182,33 +212,55 @@
   flex-direction: column;
   gap: 0.4rem;
 }
-.node-row {
-  display: flex;
-  gap: 0.4rem;
-  align-items: center;
+.tree-skeleton {
+  margin-bottom: 1rem;
+}
+.node {
   border: 1px solid var(--border, #333);
   border-radius: 8px;
   padding: 0.4rem 0.6rem;
   background: var(--surface, transparent);
 }
+.node-main {
+  display: flex;
+  gap: 0.4rem;
+  align-items: center;
+}
+.node-meta {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.3rem;
+  align-items: center;
+  margin-top: 0.35rem;
+  /* выравнивание по заголовку (после каретки) */
+  padding-left: 2.4rem;
+}
 .leaf-space {
   width: 2rem;
   flex: none;
 }
-.node-row .title {
+.node-main .title {
+  flex: 1;
+  min-width: 0;
   font-weight: 500;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.node-row .title.done {
+.node-main .title.done {
   text-decoration: line-through;
   color: var(--text-muted, #888);
 }
-.spacer {
-  flex: 1;
+.node-menu {
+  flex: none;
 }
-.status-select {
-  min-width: 9rem;
+/* метаданные переносятся на свою строку, мобильной вёрстке ничего не грозит */
+@media (max-width: 480px) {
+  .node {
+    margin-left: 0 !important;
+  }
+  .node-meta {
+    padding-left: 0;
+  }
 }
 </style>
\ No newline at end of file