diff --git a/apps/web/app/(dashboard)/skills/page.tsx b/apps/web/app/(dashboard)/skills/page.tsx
index 95017940..309fe556 100644
--- a/apps/web/app/(dashboard)/skills/page.tsx
+++ b/apps/web/app/(dashboard)/skills/page.tsx
@@ -1,538 +1 @@
-"use client";
-
-import { useState, useEffect, useCallback } from "react";
-import {
-  Sparkles,
-  Plus,
-  Trash2,
-  Save,
-  FileText,
-  FolderOpen,
-  AlertCircle,
-  X,
-} from "lucide-react";
-import type { Skill, CreateSkillRequest, UpdateSkillRequest } from "@multica/types";
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogDescription,
-  DialogFooter,
-} from "@/components/ui/dialog";
-import { Button } from "@/components/ui/button";
-import { Input } from "@/components/ui/input";
-import { Textarea } from "@/components/ui/textarea";
-import { Label } from "@/components/ui/label";
-import { api } from "@/shared/api";
-import { useAuthStore } from "@/features/auth";
-import { useWorkspaceStore } from "@/features/workspace";
-import { useWSEvent } from "@/features/realtime";
-
-// ---------------------------------------------------------------------------
-// Create Skill Dialog
-// ---------------------------------------------------------------------------
-
-function CreateSkillDialog({
-  onClose,
-  onCreate,
-}: {
-  onClose: () => void;
-  onCreate: (data: CreateSkillRequest) => Promise<void>;
-}) {
-  const [name, setName] = useState("");
-  const [description, setDescription] = useState("");
-  const [creating, setCreating] = useState(false);
-
-  const handleSubmit = async () => {
-    if (!name.trim()) return;
-    setCreating(true);
-    try {
-      await onCreate({ name: name.trim(), description: description.trim() });
-      onClose();
-    } catch {
-      setCreating(false);
-    }
-  };
-
-  return (
-    <Dialog open onOpenChange={(v) => { if (!v) onClose(); }}>
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>Create Skill</DialogTitle>
-          <DialogDescription>
-            Create a reusable skill that can be assigned to agents.
-          </DialogDescription>
-        </DialogHeader>
-
-        <div className="space-y-4">
-          <div>
-            <Label className="text-xs text-muted-foreground">Name</Label>
-            <Input
-              autoFocus
-              type="text"
-              value={name}
-              onChange={(e) => setName(e.target.value)}
-              placeholder="e.g. Code Review, Bug Triage"
-              className="mt-1"
-              onKeyDown={(e) => e.key === "Enter" && handleSubmit()}
-            />
-          </div>
-          <div>
-            <Label className="text-xs text-muted-foreground">Description</Label>
-            <Input
-              type="text"
-              value={description}
-              onChange={(e) => setDescription(e.target.value)}
-              placeholder="Brief description of what this skill does"
-              className="mt-1"
-            />
-          </div>
-        </div>
-
-        <DialogFooter>
-          <Button variant="ghost" onClick={onClose}>Cancel</Button>
-          <Button onClick={handleSubmit} disabled={creating || !name.trim()}>
-            {creating ? "Creating..." : "Create"}
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-}
-
-// ---------------------------------------------------------------------------
-// Skill List Item
-// ---------------------------------------------------------------------------
-
-function SkillListItem({
-  skill,
-  isSelected,
-  onClick,
-}: {
-  skill: Skill;
-  isSelected: boolean;
-  onClick: () => void;
-}) {
-  return (
-    <button
-      onClick={onClick}
-      className={`flex w-full items-center gap-3 px-4 py-3 text-left transition-colors ${
-        isSelected ? "bg-accent" : "hover:bg-accent/50"
-      }`}
-    >
-      <div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg bg-muted">
-        <Sparkles className="h-4 w-4 text-muted-foreground" />
-      </div>
-      <div className="min-w-0 flex-1">
-        <div className="truncate text-sm font-medium">{skill.name}</div>
-        {skill.description && (
-          <div className="mt-0.5 truncate text-xs text-muted-foreground">
-            {skill.description}
-          </div>
-        )}
-      </div>
-      {(skill.files?.length ?? 0) > 0 && (
-        <span className="shrink-0 rounded bg-muted px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground">
-          {skill.files.length} file{skill.files.length !== 1 ? "s" : ""}
-        </span>
-      )}
-    </button>
-  );
-}
-
-// ---------------------------------------------------------------------------
-// File Editor
-// ---------------------------------------------------------------------------
-
-function FileEditor({
-  files,
-  onFilesChange,
-}: {
-  files: { path: string; content: string }[];
-  onFilesChange: (files: { path: string; content: string }[]) => void;
-}) {
-  const [editingIndex, setEditingIndex] = useState<number | null>(null);
-
-  const addFile = () => {
-    onFilesChange([...files, { path: "", content: "" }]);
-    setEditingIndex(files.length);
-  };
-
-  const updateFile = (index: number, field: "path" | "content", value: string) => {
-    const updated = files.map((f, i) =>
-      i === index ? { ...f, [field]: value } : f,
-    );
-    onFilesChange(updated);
-  };
-
-  const removeFile = (index: number) => {
-    onFilesChange(files.filter((_, i) => i !== index));
-    if (editingIndex === index) setEditingIndex(null);
-  };
-
-  return (
-    <div className="space-y-3">
-      <div className="flex items-center justify-between">
-        <div>
-          <h4 className="text-sm font-medium">Supporting Files</h4>
-          <p className="text-xs text-muted-foreground mt-0.5">
-            Templates, scripts, or reference files available to the agent.
-          </p>
-        </div>
-        <Button variant="outline" size="xs" onClick={addFile}>
-          <Plus className="h-3 w-3" />
-          Add File
-        </Button>
-      </div>
-
-      {files.length === 0 ? (
-        <div className="flex flex-col items-center justify-center rounded-lg border border-dashed py-8">
-          <FolderOpen className="h-6 w-6 text-muted-foreground/40" />
-          <p className="mt-2 text-xs text-muted-foreground">No supporting files</p>
-        </div>
-      ) : (
-        <div className="space-y-2">
-          {files.map((file, index) => (
-            <div key={index} className="rounded-lg border">
-              <div className="flex items-center gap-2 border-b px-3 py-2">
-                <FileText className="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
-                <Input
-                  type="text"
-                  value={file.path}
-                  onChange={(e) => updateFile(index, "path", e.target.value)}
-                  placeholder="path/to/file.md"
-                  className="h-7 border-0 p-0 text-xs font-mono shadow-none focus-visible:ring-0"
-                />
-                <Button
-                  variant="ghost"
-                  size="icon-xs"
-                  onClick={() =>
-                    setEditingIndex(editingIndex === index ? null : index)
-                  }
-                  className="shrink-0 text-muted-foreground"
-                >
-                  <FileText className="h-3 w-3" />
-                </Button>
-                <Button
-                  variant="ghost"
-                  size="icon-xs"
-                  onClick={() => removeFile(index)}
-                  className="shrink-0 text-muted-foreground hover:text-destructive"
-                >
-                  <X className="h-3 w-3" />
-                </Button>
-              </div>
-              {editingIndex === index && (
-                <Textarea
-                  value={file.content}
-                  onChange={(e) => updateFile(index, "content", e.target.value)}
-                  placeholder="File content..."
-                  className="min-h-32 resize-none rounded-none rounded-b-lg border-0 font-mono text-xs"
-                />
-              )}
-            </div>
-          ))}
-        </div>
-      )}
-    </div>
-  );
-}
-
-// ---------------------------------------------------------------------------
-// Skill Detail
-// ---------------------------------------------------------------------------
-
-function SkillDetail({
-  skill,
-  onUpdate,
-  onDelete,
-}: {
-  skill: Skill;
-  onUpdate: (id: string, data: UpdateSkillRequest) => Promise<void>;
-  onDelete: (id: string) => Promise<void>;
-}) {
-  const [name, setName] = useState(skill.name);
-  const [description, setDescription] = useState(skill.description);
-  const [content, setContent] = useState(skill.content);
-  const [files, setFiles] = useState<{ path: string; content: string }[]>(
-    (skill.files ?? []).map((f) => ({ path: f.path, content: f.content })),
-  );
-  const [saving, setSaving] = useState(false);
-  const [confirmDelete, setConfirmDelete] = useState(false);
-
-  useEffect(() => {
-    setName(skill.name);
-    setDescription(skill.description);
-    setContent(skill.content);
-    setFiles((skill.files ?? []).map((f) => ({ path: f.path, content: f.content })));
-  }, [skill.id, skill.name, skill.description, skill.content, skill.files]);
-
-  const isDirty =
-    name !== skill.name ||
-    description !== skill.description ||
-    content !== skill.content ||
-    JSON.stringify(files) !==
-      JSON.stringify((skill.files ?? []).map((f) => ({ path: f.path, content: f.content })));
-
-  const handleSave = async () => {
-    setSaving(true);
-    try {
-      await onUpdate(skill.id, {
-        name: name.trim(),
-        description: description.trim(),
-        content,
-        files: files.filter((f) => f.path.trim()),
-      });
-    } finally {
-      setSaving(false);
-    }
-  };
-
-  return (
-    <div className="flex h-full flex-col">
-      {/* Header */}
-      <div className="flex items-center justify-between border-b px-6 py-4">
-        <div className="flex items-center gap-3">
-          <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-lg bg-muted">
-            <Sparkles className="h-4 w-4 text-muted-foreground" />
-          </div>
-          <div>
-            <h2 className="text-sm font-semibold">{skill.name}</h2>
-            {skill.description && (
-              <p className="text-xs text-muted-foreground">{skill.description}</p>
-            )}
-          </div>
-        </div>
-        <div className="flex items-center gap-2">
-          {isDirty && (
-            <Button onClick={handleSave} disabled={saving || !name.trim()} size="xs">
-              <Save className="h-3 w-3" />
-              {saving ? "Saving..." : "Save"}
-            </Button>
-          )}
-          <Button
-            variant="ghost"
-            size="xs"
-            onClick={() => setConfirmDelete(true)}
-            className="text-muted-foreground hover:text-destructive"
-          >
-            <Trash2 className="h-3 w-3" />
-          </Button>
-        </div>
-      </div>
-
-      {/* Content */}
-      <div className="flex-1 overflow-y-auto p-6 space-y-6">
-        {/* Basic Info */}
-        <div className="grid grid-cols-2 gap-4">
-          <div>
-            <Label className="text-xs text-muted-foreground">Name</Label>
-            <Input
-              type="text"
-              value={name}
-              onChange={(e) => setName(e.target.value)}
-              className="mt-1"
-            />
-          </div>
-          <div>
-            <Label className="text-xs text-muted-foreground">Description</Label>
-            <Input
-              type="text"
-              value={description}
-              onChange={(e) => setDescription(e.target.value)}
-              placeholder="Brief description"
-              className="mt-1"
-            />
-          </div>
-        </div>
-
-        {/* Content Editor */}
-        <div>
-          <Label className="text-xs text-muted-foreground">
-            Content (SKILL.md)
-          </Label>
-          <p className="text-xs text-muted-foreground mt-0.5 mb-2">
-            Main skill instructions in Markdown. This becomes the SKILL.md file in the agent&apos;s execution environment.
-          </p>
-          <Textarea
-            value={content}
-            onChange={(e) => setContent(e.target.value)}
-            placeholder={`# Skill Name\n\nDescribe what this skill does and provide instructions.\n\n## Workflow\n1. Step one\n2. Step two\n\n## Rules\n- Rule one\n- Rule two`}
-            className="h-64 resize-none font-mono text-sm leading-relaxed"
-          />
-        </div>
-
-        {/* Files */}
-        <FileEditor files={files} onFilesChange={setFiles} />
-      </div>
-
-      {/* Delete Confirmation */}
-      {confirmDelete && (
-        <Dialog open onOpenChange={(v) => { if (!v) setConfirmDelete(false); }}>
-          <DialogContent className="max-w-sm" showCloseButton={false}>
-            <div className="flex items-center gap-3">
-              <div className="flex h-10 w-10 items-center justify-center rounded-full bg-destructive/10">
-                <AlertCircle className="h-5 w-5 text-destructive" />
-              </div>
-              <div>
-                <h3 className="text-sm font-semibold">Delete skill?</h3>
-                <p className="mt-0.5 text-xs text-muted-foreground">
-                  This will permanently delete &quot;{skill.name}&quot; and remove it from all agents.
-                </p>
-              </div>
-            </div>
-            <DialogFooter>
-              <Button variant="ghost" onClick={() => setConfirmDelete(false)}>
-                Cancel
-              </Button>
-              <Button
-                variant="destructive"
-                onClick={() => {
-                  setConfirmDelete(false);
-                  onDelete(skill.id);
-                }}
-              >
-                Delete
-              </Button>
-            </DialogFooter>
-          </DialogContent>
-        </Dialog>
-      )}
-    </div>
-  );
-}
-
-// ---------------------------------------------------------------------------
-// Page
-// ---------------------------------------------------------------------------
-
-export default function SkillsPage() {
-  const isLoading = useAuthStore((s) => s.isLoading);
-  const skills = useWorkspaceStore((s) => s.skills);
-  const refreshSkills = useWorkspaceStore((s) => s.refreshSkills);
-  const [selectedId, setSelectedId] = useState<string>("");
-  const [showCreate, setShowCreate] = useState(false);
-
-  useEffect(() => {
-    if (skills.length > 0 && !selectedId) {
-      setSelectedId(skills[0]!.id);
-    }
-  }, [skills, selectedId]);
-
-  const handleRefresh = useCallback(() => {
-    refreshSkills();
-  }, [refreshSkills]);
-
-  useWSEvent("skill:created", handleRefresh);
-  useWSEvent("skill:updated", handleRefresh);
-  useWSEvent("skill:deleted", handleRefresh);
-
-  const handleCreate = async (data: CreateSkillRequest) => {
-    const skill = await api.createSkill(data);
-    await refreshSkills();
-    setSelectedId(skill.id);
-  };
-
-  const handleUpdate = async (id: string, data: UpdateSkillRequest) => {
-    await api.updateSkill(id, data);
-    await refreshSkills();
-  };
-
-  const handleDelete = async (id: string) => {
-    await api.deleteSkill(id);
-    if (selectedId === id) {
-      const remaining = skills.filter((s) => s.id !== id);
-      setSelectedId(remaining[0]?.id ?? "");
-    }
-    await refreshSkills();
-  };
-
-  const selected = skills.find((s) => s.id === selectedId) ?? null;
-
-  if (isLoading) {
-    return (
-      <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
-        Loading...
-      </div>
-    );
-  }
-
-  return (
-    <div className="flex h-full">
-      {/* Left column — skill list */}
-      <div className="w-72 shrink-0 overflow-y-auto border-r">
-        <div className="flex h-12 items-center justify-between border-b px-4">
-          <h1 className="text-sm font-semibold">Skills</h1>
-          <Button
-            variant="ghost"
-            size="icon-xs"
-            onClick={() => setShowCreate(true)}
-          >
-            <Plus className="h-4 w-4 text-muted-foreground" />
-          </Button>
-        </div>
-        {skills.length === 0 ? (
-          <div className="flex flex-col items-center justify-center px-4 py-12">
-            <Sparkles className="h-8 w-8 text-muted-foreground/40" />
-            <p className="mt-3 text-sm text-muted-foreground">No skills yet</p>
-            <p className="mt-1 text-xs text-muted-foreground text-center">
-              Skills define reusable instructions for agents.
-            </p>
-            <Button
-              onClick={() => setShowCreate(true)}
-              size="xs"
-              className="mt-3"
-            >
-              <Plus className="h-3 w-3" />
-              Create Skill
-            </Button>
-          </div>
-        ) : (
-          <div className="divide-y">
-            {skills.map((skill) => (
-              <SkillListItem
-                key={skill.id}
-                skill={skill}
-                isSelected={skill.id === selectedId}
-                onClick={() => setSelectedId(skill.id)}
-              />
-            ))}
-          </div>
-        )}
-      </div>
-
-      {/* Right column — skill detail */}
-      <div className="flex-1 overflow-hidden">
-        {selected ? (
-          <SkillDetail
-            key={selected.id}
-            skill={selected}
-            onUpdate={handleUpdate}
-            onDelete={handleDelete}
-          />
-        ) : (
-          <div className="flex h-full flex-col items-center justify-center text-muted-foreground">
-            <Sparkles className="h-10 w-10 text-muted-foreground/30" />
-            <p className="mt-3 text-sm">Select a skill to view details</p>
-            <Button
-              onClick={() => setShowCreate(true)}
-              size="xs"
-              className="mt-3"
-            >
-              <Plus className="h-3 w-3" />
-              Create Skill
-            </Button>
-          </div>
-        )}
-      </div>
-
-      {showCreate && (
-        <CreateSkillDialog
-          onClose={() => setShowCreate(false)}
-          onCreate={handleCreate}
-        />
-      )}
-    </div>
-  );
-}
+export { SkillsPage as default } from "@/features/skills";
diff --git a/apps/web/features/skills/components/index.ts b/apps/web/features/skills/components/index.ts
new file mode 100644
index 00000000..ce95e843
--- /dev/null
+++ b/apps/web/features/skills/components/index.ts
@@ -0,0 +1 @@
+export { default as SkillsPage } from "./skills-page";
diff --git a/apps/web/features/skills/components/skills-page.tsx b/apps/web/features/skills/components/skills-page.tsx
new file mode 100644
index 00000000..c607f16d
--- /dev/null
+++ b/apps/web/features/skills/components/skills-page.tsx
@@ -0,0 +1,548 @@
+"use client";
+
+import { useState, useEffect, useCallback } from "react";
+import {
+  Sparkles,
+  Plus,
+  Trash2,
+  Save,
+  FileText,
+  FolderOpen,
+  AlertCircle,
+  X,
+} from "lucide-react";
+import type { Skill, CreateSkillRequest, UpdateSkillRequest } from "@multica/types";
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  DialogDescription,
+  DialogFooter,
+} from "@/components/ui/dialog";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
+import { Label } from "@/components/ui/label";
+import { api } from "@/shared/api";
+import { useAuthStore } from "@/features/auth";
+import { useWorkspaceStore } from "@/features/workspace";
+import { useWSEvent } from "@/features/realtime";
+
+// ---------------------------------------------------------------------------
+// Create Skill Dialog
+// ---------------------------------------------------------------------------
+
+function CreateSkillDialog({
+  onClose,
+  onCreate,
+}: {
+  onClose: () => void;
+  onCreate: (data: CreateSkillRequest) => Promise<void>;
+}) {
+  const [name, setName] = useState("");
+  const [description, setDescription] = useState("");
+  const [creating, setCreating] = useState(false);
+
+  const handleSubmit = async () => {
+    if (!name.trim()) return;
+    setCreating(true);
+    try {
+      await onCreate({ name: name.trim(), description: description.trim() });
+      onClose();
+    } catch {
+      setCreating(false);
+    }
+  };
+
+  return (
+    <Dialog open onOpenChange={(v) => { if (!v) onClose(); }}>
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>Create Skill</DialogTitle>
+          <DialogDescription>
+            Create a reusable skill that can be assigned to agents.
+          </DialogDescription>
+        </DialogHeader>
+
+        <div className="space-y-4">
+          <div>
+            <Label className="text-xs text-muted-foreground">Name</Label>
+            <Input
+              autoFocus
+              type="text"
+              value={name}
+              onChange={(e) => setName(e.target.value)}
+              placeholder="e.g. Code Review, Bug Triage"
+              className="mt-1"
+              onKeyDown={(e) => e.key === "Enter" && handleSubmit()}
+            />
+          </div>
+          <div>
+            <Label className="text-xs text-muted-foreground">Description</Label>
+            <Input
+              type="text"
+              value={description}
+              onChange={(e) => setDescription(e.target.value)}
+              placeholder="Brief description of what this skill does"
+              className="mt-1"
+            />
+          </div>
+        </div>
+
+        <DialogFooter>
+          <Button variant="ghost" onClick={onClose}>Cancel</Button>
+          <Button onClick={handleSubmit} disabled={creating || !name.trim()}>
+            {creating ? "Creating..." : "Create"}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
+
+// ---------------------------------------------------------------------------
+// Skill List Item
+// ---------------------------------------------------------------------------
+
+function SkillListItem({
+  skill,
+  isSelected,
+  onClick,
+}: {
+  skill: Skill;
+  isSelected: boolean;
+  onClick: () => void;
+}) {
+  return (
+    <button
+      onClick={onClick}
+      className={`flex w-full items-center gap-3 px-4 py-3 text-left transition-colors ${
+        isSelected ? "bg-accent" : "hover:bg-accent/50"
+      }`}
+    >
+      <div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg bg-muted">
+        <Sparkles className="h-4 w-4 text-muted-foreground" />
+      </div>
+      <div className="min-w-0 flex-1">
+        <div className="truncate text-sm font-medium">{skill.name}</div>
+        {skill.description && (
+          <div className="mt-0.5 truncate text-xs text-muted-foreground">
+            {skill.description}
+          </div>
+        )}
+      </div>
+      {(skill.files?.length ?? 0) > 0 && (
+        <span className="shrink-0 rounded bg-muted px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground">
+          {skill.files.length} file{skill.files.length !== 1 ? "s" : ""}
+        </span>
+      )}
+    </button>
+  );
+}
+
+// ---------------------------------------------------------------------------
+// File Editor
+// ---------------------------------------------------------------------------
+
+function FileEditor({
+  files,
+  onFilesChange,
+}: {
+  files: { path: string; content: string }[];
+  onFilesChange: (files: { path: string; content: string }[]) => void;
+}) {
+  const [editingIndex, setEditingIndex] = useState<number | null>(null);
+
+  const addFile = () => {
+    onFilesChange([...files, { path: "", content: "" }]);
+    setEditingIndex(files.length);
+  };
+
+  const updateFile = (index: number, field: "path" | "content", value: string) => {
+    const updated = files.map((f, i) =>
+      i === index ? { ...f, [field]: value } : f,
+    );
+    onFilesChange(updated);
+  };
+
+  const removeFile = (index: number) => {
+    onFilesChange(files.filter((_, i) => i !== index));
+    if (editingIndex === index) setEditingIndex(null);
+  };
+
+  return (
+    <div className="space-y-3">
+      <div className="flex items-center justify-between">
+        <div>
+          <h4 className="text-sm font-medium">Supporting Files</h4>
+          <p className="text-xs text-muted-foreground mt-0.5">
+            Templates, scripts, or reference files available to the agent.
+          </p>
+        </div>
+        <Button variant="outline" size="xs" onClick={addFile}>
+          <Plus className="h-3 w-3" />
+          Add File
+        </Button>
+      </div>
+
+      {files.length === 0 ? (
+        <div className="flex flex-col items-center justify-center rounded-lg border border-dashed py-8">
+          <FolderOpen className="h-6 w-6 text-muted-foreground/40" />
+          <p className="mt-2 text-xs text-muted-foreground">No supporting files</p>
+        </div>
+      ) : (
+        <div className="space-y-2">
+          {files.map((file, index) => (
+            <div key={index} className="rounded-lg border">
+              <div className="flex items-center gap-2 border-b px-3 py-2">
+                <FileText className="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
+                <Input
+                  type="text"
+                  value={file.path}
+                  onChange={(e) => updateFile(index, "path", e.target.value)}
+                  placeholder="path/to/file.md"
+                  className="h-7 border-0 p-0 text-xs font-mono shadow-none focus-visible:ring-0"
+                />
+                <Button
+                  variant="ghost"
+                  size="icon-xs"
+                  onClick={() =>
+                    setEditingIndex(editingIndex === index ? null : index)
+                  }
+                  className="shrink-0 text-muted-foreground"
+                >
+                  <FileText className="h-3 w-3" />
+                </Button>
+                <Button
+                  variant="ghost"
+                  size="icon-xs"
+                  onClick={() => removeFile(index)}
+                  className="shrink-0 text-muted-foreground hover:text-destructive"
+                >
+                  <X className="h-3 w-3" />
+                </Button>
+              </div>
+              {editingIndex === index && (
+                <Textarea
+                  value={file.content}
+                  onChange={(e) => updateFile(index, "content", e.target.value)}
+                  placeholder="File content..."
+                  className="min-h-32 resize-none rounded-none rounded-b-lg border-0 font-mono text-xs"
+                />
+              )}
+            </div>
+          ))}
+        </div>
+      )}
+    </div>
+  );
+}
+
+// ---------------------------------------------------------------------------
+// Skill Detail
+// ---------------------------------------------------------------------------
+
+function SkillDetail({
+  skill,
+  onUpdate,
+  onDelete,
+}: {
+  skill: Skill;
+  onUpdate: (id: string, data: UpdateSkillRequest) => Promise<void>;
+  onDelete: (id: string) => Promise<void>;
+}) {
+  const [name, setName] = useState(skill.name);
+  const [description, setDescription] = useState(skill.description);
+  const [content, setContent] = useState(skill.content);
+  const [files, setFiles] = useState<{ path: string; content: string }[]>(
+    (skill.files ?? []).map((f) => ({ path: f.path, content: f.content })),
+  );
+  const [saving, setSaving] = useState(false);
+  const [confirmDelete, setConfirmDelete] = useState(false);
+
+  // Sync basic fields from store updates
+  useEffect(() => {
+    setName(skill.name);
+    setDescription(skill.description);
+    setContent(skill.content);
+  }, [skill.id, skill.name, skill.description, skill.content]);
+
+  // Fetch full skill (with files) on selection change
+  useEffect(() => {
+    api.getSkill(skill.id).then((full) => {
+      useWorkspaceStore.getState().upsertSkill(full);
+      setFiles((full.files ?? []).map((f) => ({ path: f.path, content: f.content })));
+    });
+  }, [skill.id]);
+
+  const isDirty =
+    name !== skill.name ||
+    description !== skill.description ||
+    content !== skill.content ||
+    JSON.stringify(files) !==
+      JSON.stringify((skill.files ?? []).map((f) => ({ path: f.path, content: f.content })));
+
+  const handleSave = async () => {
+    setSaving(true);
+    try {
+      await onUpdate(skill.id, {
+        name: name.trim(),
+        description: description.trim(),
+        content,
+        files: files.filter((f) => f.path.trim()),
+      });
+    } finally {
+      setSaving(false);
+    }
+  };
+
+  return (
+    <div className="flex h-full flex-col">
+      {/* Header */}
+      <div className="flex items-center justify-between border-b px-6 py-4">
+        <div className="flex items-center gap-3">
+          <div className="flex h-9 w-9 shrink-0 items-center justify-center rounded-lg bg-muted">
+            <Sparkles className="h-4 w-4 text-muted-foreground" />
+          </div>
+          <div>
+            <h2 className="text-sm font-semibold">{skill.name}</h2>
+            {skill.description && (
+              <p className="text-xs text-muted-foreground">{skill.description}</p>
+            )}
+          </div>
+        </div>
+        <div className="flex items-center gap-2">
+          {isDirty && (
+            <Button onClick={handleSave} disabled={saving || !name.trim()} size="xs">
+              <Save className="h-3 w-3" />
+              {saving ? "Saving..." : "Save"}
+            </Button>
+          )}
+          <Button
+            variant="ghost"
+            size="xs"
+            onClick={() => setConfirmDelete(true)}
+            className="text-muted-foreground hover:text-destructive"
+          >
+            <Trash2 className="h-3 w-3" />
+          </Button>
+        </div>
+      </div>
+
+      {/* Content */}
+      <div className="flex-1 overflow-y-auto p-6 space-y-6">
+        {/* Basic Info */}
+        <div className="grid grid-cols-2 gap-4">
+          <div>
+            <Label className="text-xs text-muted-foreground">Name</Label>
+            <Input
+              type="text"
+              value={name}
+              onChange={(e) => setName(e.target.value)}
+              className="mt-1"
+            />
+          </div>
+          <div>
+            <Label className="text-xs text-muted-foreground">Description</Label>
+            <Input
+              type="text"
+              value={description}
+              onChange={(e) => setDescription(e.target.value)}
+              placeholder="Brief description"
+              className="mt-1"
+            />
+          </div>
+        </div>
+
+        {/* Content Editor */}
+        <div>
+          <Label className="text-xs text-muted-foreground">
+            Content (SKILL.md)
+          </Label>
+          <p className="text-xs text-muted-foreground mt-0.5 mb-2">
+            Main skill instructions in Markdown. This becomes the SKILL.md file in the agent&apos;s execution environment.
+          </p>
+          <Textarea
+            value={content}
+            onChange={(e) => setContent(e.target.value)}
+            placeholder={`# Skill Name\n\nDescribe what this skill does and provide instructions.\n\n## Workflow\n1. Step one\n2. Step two\n\n## Rules\n- Rule one\n- Rule two`}
+            className="h-64 resize-none font-mono text-sm leading-relaxed"
+          />
+        </div>
+
+        {/* Files */}
+        <FileEditor files={files} onFilesChange={setFiles} />
+      </div>
+
+      {/* Delete Confirmation */}
+      {confirmDelete && (
+        <Dialog open onOpenChange={(v) => { if (!v) setConfirmDelete(false); }}>
+          <DialogContent className="max-w-sm" showCloseButton={false}>
+            <div className="flex items-center gap-3">
+              <div className="flex h-10 w-10 items-center justify-center rounded-full bg-destructive/10">
+                <AlertCircle className="h-5 w-5 text-destructive" />
+              </div>
+              <div>
+                <h3 className="text-sm font-semibold">Delete skill?</h3>
+                <p className="mt-0.5 text-xs text-muted-foreground">
+                  This will permanently delete &quot;{skill.name}&quot; and remove it from all agents.
+                </p>
+              </div>
+            </div>
+            <DialogFooter>
+              <Button variant="ghost" onClick={() => setConfirmDelete(false)}>
+                Cancel
+              </Button>
+              <Button
+                variant="destructive"
+                onClick={() => {
+                  setConfirmDelete(false);
+                  onDelete(skill.id);
+                }}
+              >
+                Delete
+              </Button>
+            </DialogFooter>
+          </DialogContent>
+        </Dialog>
+      )}
+    </div>
+  );
+}
+
+// ---------------------------------------------------------------------------
+// Page
+// ---------------------------------------------------------------------------
+
+export default function SkillsPage() {
+  const isLoading = useAuthStore((s) => s.isLoading);
+  const skills = useWorkspaceStore((s) => s.skills);
+  const refreshSkills = useWorkspaceStore((s) => s.refreshSkills);
+  const upsertSkill = useWorkspaceStore((s) => s.upsertSkill);
+  const removeSkill = useWorkspaceStore((s) => s.removeSkill);
+  const [selectedId, setSelectedId] = useState<string>("");
+  const [showCreate, setShowCreate] = useState(false);
+
+  useEffect(() => {
+    if (skills.length > 0 && !selectedId) {
+      setSelectedId(skills[0]!.id);
+    }
+  }, [skills, selectedId]);
+
+  const handleRefresh = useCallback(() => {
+    refreshSkills();
+  }, [refreshSkills]);
+
+  useWSEvent("skill:created", handleRefresh);
+  useWSEvent("skill:updated", handleRefresh);
+  useWSEvent("skill:deleted", handleRefresh);
+
+  const handleCreate = async (data: CreateSkillRequest) => {
+    const skill = await api.createSkill(data);
+    upsertSkill(skill);
+    setSelectedId(skill.id);
+  };
+
+  const handleUpdate = async (id: string, data: UpdateSkillRequest) => {
+    const updated = await api.updateSkill(id, data);
+    upsertSkill(updated);
+  };
+
+  const handleDelete = async (id: string) => {
+    await api.deleteSkill(id);
+    if (selectedId === id) {
+      const remaining = skills.filter((s) => s.id !== id);
+      setSelectedId(remaining[0]?.id ?? "");
+    }
+    removeSkill(id);
+  };
+
+  const selected = skills.find((s) => s.id === selectedId) ?? null;
+
+  if (isLoading) {
+    return (
+      <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
+        Loading...
+      </div>
+    );
+  }
+
+  return (
+    <div className="flex h-full">
+      {/* Left column — skill list */}
+      <div className="w-72 shrink-0 overflow-y-auto border-r">
+        <div className="flex h-12 items-center justify-between border-b px-4">
+          <h1 className="text-sm font-semibold">Skills</h1>
+          <Button
+            variant="ghost"
+            size="icon-xs"
+            onClick={() => setShowCreate(true)}
+          >
+            <Plus className="h-4 w-4 text-muted-foreground" />
+          </Button>
+        </div>
+        {skills.length === 0 ? (
+          <div className="flex flex-col items-center justify-center px-4 py-12">
+            <Sparkles className="h-8 w-8 text-muted-foreground/40" />
+            <p className="mt-3 text-sm text-muted-foreground">No skills yet</p>
+            <p className="mt-1 text-xs text-muted-foreground text-center">
+              Skills define reusable instructions for agents.
+            </p>
+            <Button
+              onClick={() => setShowCreate(true)}
+              size="xs"
+              className="mt-3"
+            >
+              <Plus className="h-3 w-3" />
+              Create Skill
+            </Button>
+          </div>
+        ) : (
+          <div className="divide-y">
+            {skills.map((skill) => (
+              <SkillListItem
+                key={skill.id}
+                skill={skill}
+                isSelected={skill.id === selectedId}
+                onClick={() => setSelectedId(skill.id)}
+              />
+            ))}
+          </div>
+        )}
+      </div>
+
+      {/* Right column — skill detail */}
+      <div className="flex-1 overflow-hidden">
+        {selected ? (
+          <SkillDetail
+            key={selected.id}
+            skill={selected}
+            onUpdate={handleUpdate}
+            onDelete={handleDelete}
+          />
+        ) : (
+          <div className="flex h-full flex-col items-center justify-center text-muted-foreground">
+            <Sparkles className="h-10 w-10 text-muted-foreground/30" />
+            <p className="mt-3 text-sm">Select a skill to view details</p>
+            <Button
+              onClick={() => setShowCreate(true)}
+              size="xs"
+              className="mt-3"
+            >
+              <Plus className="h-3 w-3" />
+              Create Skill
+            </Button>
+          </div>
+        )}
+      </div>
+
+      {showCreate && (
+        <CreateSkillDialog
+          onClose={() => setShowCreate(false)}
+          onCreate={handleCreate}
+        />
+      )}
+    </div>
+  );
+}
diff --git a/apps/web/features/skills/index.ts b/apps/web/features/skills/index.ts
new file mode 100644
index 00000000..3ee589c0
--- /dev/null
+++ b/apps/web/features/skills/index.ts
@@ -0,0 +1 @@
+export { SkillsPage } from "./components";
diff --git a/apps/web/features/workspace/store.ts b/apps/web/features/workspace/store.ts
index 0196962f..4bb673f1 100644
--- a/apps/web/features/workspace/store.ts
+++ b/apps/web/features/workspace/store.ts
@@ -22,6 +22,8 @@ interface WorkspaceActions {
   refreshMembers: () => Promise<void>;
   refreshAgents: () => Promise<void>;
   refreshSkills: () => Promise<void>;
+  upsertSkill: (skill: Skill) => void;
+  removeSkill: (id: string) => void;
   createWorkspace: (data: {
     name: string;
     slug: string;
@@ -106,10 +108,34 @@ export const useWorkspaceStore = create<WorkspaceStore>((set, get) => ({
   },
 
   refreshSkills: async () => {
-    const { workspace } = get();
+    const { workspace, skills: existing } = get();
     if (!workspace) return;
-    const skills = await api.listSkills();
-    set({ skills });
+    const fetched = await api.listSkills();
+    // listSkills doesn't include files — preserve files from existing entries
+    const filesById = new Map(
+      existing.filter((s) => s.files?.length).map((s) => [s.id, s.files]),
+    );
+    const merged = fetched.map((s) => ({
+      ...s,
+      files: s.files ?? filesById.get(s.id) ?? [],
+    }));
+    set({ skills: merged });
+  },
+
+  upsertSkill: (skill) => {
+    set((state) => {
+      const idx = state.skills.findIndex((s) => s.id === skill.id);
+      if (idx >= 0) {
+        const next = [...state.skills];
+        next[idx] = skill;
+        return { skills: next };
+      }
+      return { skills: [...state.skills, skill] };
+    });
+  },
+
+  removeSkill: (id) => {
+    set((state) => ({ skills: state.skills.filter((s) => s.id !== id) }));
   },
 
   createWorkspace: async (data) => {
diff --git a/server/internal/handler/agent.go b/server/internal/handler/agent.go
index 1f059514..935bb388 100644
--- a/server/internal/handler/agent.go
+++ b/server/internal/handler/agent.go
@@ -130,7 +130,11 @@ func (h *Handler) ListAgents(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Batch-load skills for all agents to avoid N+1.
-	skillRows, _ := h.Queries.ListAgentSkillsByWorkspace(r.Context(), parseUUID(workspaceID))
+	skillRows, err := h.Queries.ListAgentSkillsByWorkspace(r.Context(), parseUUID(workspaceID))
+	if err != nil {
+		writeError(w, http.StatusInternalServerError, "failed to load agent skills")
+		return
+	}
 	skillMap := map[string][]SkillResponse{}
 	for _, row := range skillRows {
 		agentID := uuidToString(row.AgentID)
@@ -159,7 +163,11 @@ func (h *Handler) GetAgent(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	resp := agentToResponse(agent)
-	skills, _ := h.Queries.ListAgentSkills(r.Context(), agent.ID)
+	skills, err := h.Queries.ListAgentSkills(r.Context(), agent.ID)
+	if err != nil {
+		writeError(w, http.StatusInternalServerError, "failed to load agent skills")
+		return
+	}
 	if len(skills) > 0 {
 		resp.Skills = make([]SkillResponse, len(skills))
 		for i, s := range skills {
diff --git a/server/internal/handler/skill.go b/server/internal/handler/skill.go
index 76bed385..39082a31 100644
--- a/server/internal/handler/skill.go
+++ b/server/internal/handler/skill.go
@@ -440,6 +440,15 @@ func (h *Handler) UpsertSkillFile(w http.ResponseWriter, r *http.Request) {
 }
 
 func (h *Handler) DeleteSkillFile(w http.ResponseWriter, r *http.Request) {
+	id := chi.URLParam(r, "id")
+	skill, ok := h.loadSkillForUser(w, r, id)
+	if !ok {
+		return
+	}
+	if _, ok := h.requireWorkspaceRole(w, r, uuidToString(skill.WorkspaceID), "skill not found", "owner", "admin"); !ok {
+		return
+	}
+
 	fileID := chi.URLParam(r, "fileId")
 	if err := h.Queries.DeleteSkillFile(r.Context(), parseUUID(fileID)); err != nil {
 		writeError(w, http.StatusInternalServerError, "failed to delete skill file")