diff --git a/src/components/ProjectSettings.tsx b/src/components/ProjectSettings.tsx
index 7722ee5..2d82b29 100644
--- a/src/components/ProjectSettings.tsx
+++ b/src/components/ProjectSettings.tsx
@@ -24,6 +24,7 @@ export default function ProjectSettings({ project, onUpdated }: Props) {
   const [description, setDescription] = useState(project.description || "");
   const [repoUrls, setRepoUrls] = useState(project.repo_urls?.join("\n") || "");
   const [status, setStatus] = useState(project.status);
+  const [autoAssign, setAutoAssign] = useState(project.auto_assign || false);
   const [saving, setSaving] = useState(false);
   const [saved, setSaved] = useState(false);
   const [confirmDelete, setConfirmDelete] = useState(false);
@@ -96,6 +97,7 @@ export default function ProjectSettings({ project, onUpdated }: Props) {
         description: description.trim() || null,
         repo_urls: urls,
         status,
+        auto_assign: autoAssign,
       });
       onUpdated(updated);
       setSaved(true);
@@ -164,6 +166,24 @@ export default function ProjectSettings({ project, onUpdated }: Props) {
         </select>
       </div>
 
+      {/* Auto-assign toggle */}
+      <div className="flex items-center justify-between">
+        <div>
+          <div className="text-sm">Авто-назначение</div>
+          <div className="text-xs text-[var(--muted)]">Назначать задачи агентам по лейблам ↔ capabilities</div>
+        </div>
+        <button
+          onClick={() => setAutoAssign(!autoAssign)}
+          className={`relative w-10 h-5 rounded-full transition-colors duration-200 ${
+            autoAssign ? "bg-[var(--accent)]" : "bg-[var(--border)]"
+          }`}
+        >
+          <span className={`absolute top-0.5 left-0.5 w-4 h-4 rounded-full bg-white transition-transform duration-200 ${
+            autoAssign ? "translate-x-5" : "translate-x-0"
+          }`} />
+        </button>
+      </div>
+
       <div className="flex items-center gap-3">
         <button
           onClick={handleSave}
diff --git a/src/lib/api.ts b/src/lib/api.ts
index 2a6987d..0b23c43 100644
--- a/src/lib/api.ts
+++ b/src/lib/api.ts
@@ -86,6 +86,7 @@ export interface Project {
   status: string;
   task_counter: number;
   chat_id: string | null;
+  auto_assign: boolean;
 }
 
 export interface ProjectMember {
@@ -178,7 +179,7 @@ export async function createProject(data: { name: string; slug: string; descript
   return request("/api/v1/projects", { method: "POST", body: JSON.stringify(data) });
 }
 
-export async function updateProject(projectId: string, data: Partial<Pick<Project, "name" | "slug" | "description" | "repo_urls" | "status">>): Promise<Project> {
+export async function updateProject(projectId: string, data: Partial<Pick<Project, "name" | "slug" | "description" | "repo_urls" | "status" | "auto_assign">>): Promise<Project> {
   return request(`/api/v1/projects/${projectId}`, { method: "PATCH", body: JSON.stringify(data) });
 }