diff --git a/api/services/skill_management_service.py b/api/services/skill_management_service.py
index 40233364562..519d5f28bbe 100644
--- a/api/services/skill_management_service.py
+++ b/api/services/skill_management_service.py
@@ -152,18 +152,25 @@ SKILL.md, write a final name, or create all resources in the first turn.
    MUST emit one upsert_text operation for SKILL.md that updates the
    frontmatter description. Do not write the body, create files, or choose a
    final name. Never claim that the description was updated unless that
-   operation is present.
+   operation is present. Do not mention reviewing or confirming a name.
 2. Workflow (2-5 turns): ask about key steps, decision points, rules, and
    thresholds. Once clear, you MUST emit one upsert_text operation for SKILL.md
    that updates the body only; preserve the placeholder name and display name.
    Never claim that workflow content was added unless that operation is present.
+   If you previously proposed a workflow skeleton and the user asks to insert,
+   reuse, confirm, or proceed with it, that is enough information: generate the
+   body yourself and emit the operation immediately. Do not ask the user to
+   paste text that you already drafted, and do not return a frontmatter-only
+   operation while claiming that the workflow body was inserted.
 3. Resources (0-2 turns): ask whether scripts, templates, or reference
    documents are needed. Create only resources the user confirms under
    scripts/, references/, or assets/. If none are needed, proceed to finalization
    without inventing files.
-4. Finalize: summarize the completed Skill and suggest a display name and a
-   lowercase kebab-case name. Only after the user confirms the name may it be
-   written to SKILL.md.
+4. Finalize: choose a clear display name and matching lowercase kebab-case
+   name, write both directly to SKILL.md, and summarize the completed Skill.
+   MUST emit one upsert_text operation for SKILL.md. Do not ask the user to
+   confirm the kebab-case name. The user can edit the name later in the editor
+   or ask you to change it.
 Ask at most one focused question per turn, use the previous conversation to
 avoid repeating questions, and do not invent missing business rules or
 thresholds. Every reply should include 2-3 short suggested user replies that
@@ -174,6 +181,9 @@ another Skill, because one Builder session cannot create multiple Skills.
 If the user asks you to provide, draft, or propose examples, provide those
 examples yourself in the reply and apply the corresponding operation when the
 stage allows it. Do not ask the user to provide the same examples again.
+If the conversation already contains a draft, skeleton, examples, or rules,
+reuse that material when the user asks to insert or continue; do not ask them
+to paste it again.
 Never repeat the current question in a suggestion. Suggestions must move the
 conversation forward, such as reviewing the generated examples, adding a
 channel, or proceeding to the next stage.
@@ -183,8 +193,11 @@ channels. Do not respond with "please provide 3-5 trigger phrases" or ask the
 user to confirm the same requirement. If the generated triggers are sufficient
 for the Scenario stage, apply them to the description in the same response.
 You may infer a proposed name early and return it as suggested_name and
-suggested_display_name. These are hidden planning metadata: never write them
-into SKILL.md or any Skill detail until the Finalize stage and user confirmation.
+suggested_display_name. When you return a valid name suggestion, write it into
+SKILL.md in the same operation so the editor and Skill detail stay consistent;
+do not turn the name into a confirmation question or a suggested reply chip.
+At Finalize, always return both name fields and the SKILL.md operation even if
+the requested change is only a final review.
 
 Respond with JSON only:
 {
@@ -206,7 +219,10 @@ Respond with JSON only:
 }
 
 If the user asks a question and no file changes are needed, return an empty
-operations array."""
+operations array. When the supplied draft contains
+``<!-- dify-skill-empty-draft -->``, treat it as an internal empty-draft marker,
+not as Skill content. Never copy that marker into an operation or user-facing
+Skill content."""
 _MAX_ASSISTANT_CONTEXT_CHARS = 60_000
 _MAX_ASSISTANT_ATTACHMENTS = 10
 _MAX_ASSISTANT_ATTACHMENT_CHARS = 20_000
@@ -737,11 +753,13 @@ class SkillManagementService:
         with session_factory.create_session() as session:
             rows = session.execute(
                 select(Tag.name, func.count(TagBinding.id).label("binding_count"))
-                .join(TagBinding, Tag.id == TagBinding.tag_id)
+                .outerjoin(
+                    TagBinding,
+                    (Tag.id == TagBinding.tag_id) & (TagBinding.tenant_id == tenant_id),
+                )
                 .where(
                     Tag.tenant_id == tenant_id,
                     Tag.type == TagType.SKILL,
-                    TagBinding.tenant_id == tenant_id,
                 )
                 .group_by(Tag.id, Tag.name)
                 .order_by(func.count(TagBinding.id).desc(), func.lower(Tag.name))
@@ -887,7 +905,11 @@ class SkillManagementService:
                         "answer": reply,
                     }
                 )
-                suggestions = [suggestion.strip() for suggestion in (plan.suggestions or []) if suggestion.strip()]
+                suggestions = [
+                    suggestion.strip()
+                    for suggestion in (plan.suggestions or [])
+                    if suggestion.strip() and not self._is_name_confirmation_suggestion(suggestion)
+                ]
                 if suggestions:
                     yield self._assistant_sse(
                         {
@@ -1135,13 +1157,19 @@ class SkillManagementService:
                 status_code=422,
                 details={"raw_response": raw_text[:2_000]},
             ) from exc
+        if not plan.suggested_name or not plan.suggested_display_name:
+            history_name, history_display_name = self._latest_assistant_suggested_identity(history)
+            plan = plan.model_copy(
+                update={
+                    "suggested_name": plan.suggested_name or history_name,
+                    "suggested_display_name": plan.suggested_display_name or history_display_name,
+                }
+            )
         plan = self._constrain_progressive_assistant_plan(
             plan=plan,
             stage=authoring_stage,
             skill=skill,
             files=files,
-            user_message=message,
-            history=history,
         )
         if not any(suggestion.strip() for suggestion in (plan.suggestions or [])):
             plan = plan.model_copy(
@@ -1156,6 +1184,17 @@ class SkillManagementService:
             )
         return SkillAssistActionResult(plan=plan)
 
+    @staticmethod
+    def _latest_assistant_suggested_identity(
+        history: list[SkillAssistHistoryMessagePayload] | None,
+    ) -> tuple[str | None, str | None]:
+        for item in reversed(history or []):
+            if item.role != "assistant":
+                continue
+            if item.suggested_name or item.suggested_display_name:
+                return item.suggested_name, item.suggested_display_name
+        return None, None
+
     @classmethod
     def _collect_assistant_stream_response(
         cls,
@@ -1268,6 +1307,7 @@ class SkillManagementService:
             "Do not include generic actions like continue, ok, or looks good.\n"
             "Only suggest actions for the current Skill. Never suggest creating another Skill, "
             "starting a new Skill, or switching Skills.\n"
+            "Never suggest reviewing, confirming, or choosing a kebab-case name or display name.\n"
             "Return exactly one JSON object and no markdown fences, prose, or explanation.\n"
             'Required schema: {"suggestions": ["...", "..."]}\n\n'
             f"User request:\n{user_message}\n\n"
@@ -1305,9 +1345,23 @@ class SkillManagementService:
             return []
         if not isinstance(suggestions, list):
             return []
-        return [suggestion.strip() for suggestion in suggestions if isinstance(suggestion, str) and suggestion.strip()][
-            :3
-        ]
+        return [
+            suggestion.strip()
+            for suggestion in suggestions
+            if isinstance(suggestion, str)
+            and suggestion.strip()
+            and not self._is_name_confirmation_suggestion(suggestion)
+        ][:3]
+
+    @staticmethod
+    def _is_name_confirmation_suggestion(suggestion: str) -> bool:
+        normalized = suggestion.strip().lower()
+        if "kebab" in normalized or "display-name" in normalized or "display name" in normalized:
+            return True
+        return (
+            any(marker in normalized for marker in ("review", "confirm", "choose", "finalize"))
+            and any(marker in normalized for marker in ("name", "名称", "名字", "命名"))
+        )
 
     def _resolve_assistant_model(
         self,
@@ -2632,7 +2686,7 @@ class SkillManagementService:
         history: list[SkillAssistHistoryMessagePayload] | None = None,
     ) -> str:
         """Return the progressive stage for a newly created, untitled Skill."""
-        if not (skill.display_name == _UNTITLED_DISPLAY_NAME and not skill.name_manually_edited):
+        if skill.latest_published_version_id is not None or skill.name_manually_edited:
             return "existing_skill"
 
         skill_md = next((file for file in files if file.path == _SKILL_MD), None)
@@ -2684,8 +2738,6 @@ class SkillManagementService:
         stage: str,
         skill: Skill,
         files: list[SkillDraftFile],
-        user_message: str = "",
-        history: list[SkillAssistHistoryMessagePayload] | None = None,
     ) -> SkillAssistActionPlan:
         if stage == "existing_skill":
             return plan
@@ -2704,29 +2756,40 @@ class SkillManagementService:
                         current_content=current_content,
                         candidate_content=content,
                     )
-                    content = cls._apply_assistant_suggested_identity(
-                        skill=skill,
-                        content=content,
-                        suggested_name=plan.suggested_name,
-                        suggested_display_name=plan.suggested_display_name,
-                    )
-                elif stage == "finalize":
-                    if not cls._user_confirmed_skill_name(user_message, history or []):
-                        content = cls._preserve_assistant_skill_identity(
-                            skill=skill,
-                            current_content=current_content,
-                            candidate_content=content,
-                        )
                 else:
                     content = cls._preserve_assistant_skill_identity(
                         skill=skill,
                         current_content=current_content,
                         candidate_content=content,
                     )
+                if plan.suggested_name or plan.suggested_display_name:
+                    content = cls._apply_assistant_suggested_identity(
+                        skill=skill,
+                        content=content,
+                        suggested_name=plan.suggested_name,
+                        suggested_display_name=plan.suggested_display_name,
+                    )
                 operations.append(operation.model_copy(update={"content": content}))
             elif stage == "resources" and operation.path != _SKILL_MD:
                 operations.append(operation)
 
+        if (plan.suggested_name or plan.suggested_display_name) and not any(
+            operation.path == _SKILL_MD for operation in operations
+        ):
+            operations.append(
+                SkillAssistDraftOperationPayload(
+                    operation="upsert_text",
+                    path=_SKILL_MD,
+                    mime_type="text/markdown",
+                    content=cls._apply_assistant_suggested_identity(
+                        skill=skill,
+                        content=current_content,
+                        suggested_name=plan.suggested_name,
+                        suggested_display_name=plan.suggested_display_name,
+                    ),
+                )
+            )
+
         logger.info(
             "skill_assistant_plan_constrained skill_id=%s stage=%s suggested_name=%s "
             "suggested_display_name=%s operations=%s",
@@ -2748,11 +2811,17 @@ class SkillManagementService:
         suggested_display_name: str | None,
     ) -> str:
         """Materialize a model-proposed identity for an untitled Builder draft."""
-        if not cls._is_placeholder_skill_name(skill.name) or not suggested_name:
+        if not cls._is_placeholder_skill_name(skill.name):
+            return content
+
+        name_candidate = suggested_name or (
+            cls._name_from_display_name(suggested_display_name) if suggested_display_name else None
+        )
+        if not name_candidate:
             return content
 
         try:
-            name = validate_skill_name(suggested_name)
+            name = validate_skill_name(name_candidate)
         except ValueError:
             return content
 
@@ -2760,7 +2829,13 @@ class SkillManagementService:
         try:
             frontmatter = cls._parse_frontmatter(content)
         except SkillManagementServiceError:
-            return content
+            body = "" if content.strip() == _EMPTY_SKILL_DRAFT_CONTENT.strip() else content.strip()
+            return cls._build_skill_md(
+                name=name,
+                description=skill.description,
+                display_name=display_name,
+                body=body,
+            )
         metadata = frontmatter.get("metadata")
         if not isinstance(metadata, dict):
             metadata = {}
@@ -2770,42 +2845,15 @@ class SkillManagementService:
         serialized = yaml.safe_dump(frontmatter, allow_unicode=True, sort_keys=False).rstrip()
         frontmatter_match = _FRONTMATTER_RE.match(content)
         if frontmatter_match is None:
-            return content
+            return cls._build_skill_md(
+                name=name,
+                description=skill.description,
+                display_name=display_name,
+                body=content.strip(),
+            )
         body = content[frontmatter_match.end() :].lstrip("\r\n")
         return f"---\n{serialized}\n---\n\n{body}" if body else f"---\n{serialized}\n---\n"
 
-    @staticmethod
-    def _user_confirmed_skill_name(
-        message: str,
-        history: list[SkillAssistHistoryMessagePayload],
-    ) -> bool:
-        """Only accept a generated name after an explicit user confirmation."""
-        confirmation_messages = [message, *(item.content for item in history if item.role == "user")]
-        for content in confirmation_messages:
-            normalized = content.strip().lower()
-            if not normalized:
-                continue
-            if re.search(
-                r"\b(?:yes|y|confirm|confirmed|use it|use this|use the suggested name|call it|name it)\b",
-                normalized,
-            ):
-                return True
-            if re.search(r"\b(?:set|use)\b.{0,80}\bname\b", normalized):
-                return True
-            if any(
-                marker in normalized
-                for marker in ("就叫", "叫做", "名称为", "名字为", "改成", "定为", "使用这个名称", "确认名称")
-            ):
-                return True
-
-        asked_for_name = any(
-            item.role == "assistant"
-            and any(marker in item.content.lower() for marker in ("name", "名称", "名字", "命名"))
-            for item in history[-3:]
-        )
-        normalized_message = message.strip().lower()
-        return asked_for_name and not re.search(r"[?？。.!！]", normalized_message) and len(normalized_message) <= 128
-
     @classmethod
     def _assistant_description_only_skill_md(
         cls,
@@ -2866,6 +2914,8 @@ class SkillManagementService:
         remaining = _MAX_ASSISTANT_CONTEXT_CHARS - sum(len(section) + 1 for section in sections)
         for file in files:
             content = file.content_text or ""
+            if file.path == _SKILL_MD and content.strip() == _EMPTY_SKILL_DRAFT_CONTENT.strip():
+                content = "[empty draft; SKILL.md has no content yet]"
             header = f"\n--- {file.path} ---\n"
             if remaining <= len(header):
                 break
@@ -3371,11 +3421,9 @@ class SkillManagementService:
             return {}
         first_segments = {path.split("/", 1)[0] for path in paths if "/" in path}
         root = next(iter(first_segments)) if len(first_segments) == 1 else None
-        if root is None:
+        if root is None or f"{root}/{_SKILL_MD}" not in paths or _SKILL_MD in paths:
             return {path: path for path in paths}
         stripped = {path: path.removeprefix(f"{root}/") for path in paths}
-        if _SKILL_MD not in stripped.values():
-            return {path: path for path in paths}
         return stripped
 
     def _draft_payload_from_zip(
@@ -3387,11 +3435,7 @@ class SkillManagementService:
     ) -> tuple[SkillDraftTreePayload, dict[str, Any], str]:
         try:
             with zipfile.ZipFile(io.BytesIO(archive_bytes)) as archive:
-                raw_paths = [
-                    normalize_skill_file_path(info.filename.strip("/"))
-                    for info in archive.infolist()
-                    if not info.is_dir()
-                ]
+                raw_paths = [normalize_skill_file_path(info.filename.strip("/")) for info in archive.infolist()]
                 path_map = self._strip_single_root(raw_paths)
                 if _SKILL_MD not in set(path_map.values()):
                     raise SkillManagementServiceError("missing_skill_md", "Skill package must contain SKILL.md")
@@ -3399,10 +3443,11 @@ class SkillManagementService:
                 metadata: dict[str, Any] = {}
                 skill_md_content = ""
                 for info in archive.infolist():
-                    if info.is_dir():
-                        continue
                     raw_path = normalize_skill_file_path(info.filename.strip("/"))
                     path = normalize_skill_file_path(path_map[raw_path])
+                    if info.is_dir():
+                        items.append(SkillDraftTreeItemPayload(path=path, kind=SkillFileKind.DIRECTORY))
+                        continue
                     payload = archive.read(info)
                     text = self._decode_text_payload(path, payload)
                     if path == _SKILL_MD:
@@ -3509,7 +3554,7 @@ class SkillManagementService:
             user_id=user_id,
             archive_bytes=archive_bytes,
         )
-        return self._build_draft_rows_from_tree(skill=skill, payload=payload, sync_frontmatter_name=False)
+        return self._build_draft_rows_from_tree(skill=skill, payload=payload, sync_frontmatter_name=True)
 
     @staticmethod
     def _draft_payload_items_from_rows(files: list[SkillDraftFile]) -> list[SkillDraftTreeItemPayload]:
@@ -3947,7 +3992,10 @@ class SkillManagementService:
         output = io.BytesIO()
         manifest_files: list[SkillVersionManifestFile] = []
         with zipfile.ZipFile(output, "w", compression=zipfile.ZIP_DEFLATED) as archive:
-            for file in sorted(file_entries, key=lambda item: item.path):
+            for file in sorted(files, key=lambda item: item.path):
+                if file.kind == SkillFileKind.DIRECTORY:
+                    archive.writestr(f"{file.path.rstrip('/')}/", b"")
+                    continue
                 if file.storage == SkillFileStorage.TEXT:
                     if file.content_text is None:
                         raise SkillManagementServiceError("invalid_skill_file", "text draft file is missing content")
diff --git a/api/tests/unit_tests/services/test_skill_management_service.py b/api/tests/unit_tests/services/test_skill_management_service.py
index afad3dce0ed..97f91d38f10 100644
--- a/api/tests/unit_tests/services/test_skill_management_service.py
+++ b/api/tests/unit_tests/services/test_skill_management_service.py
@@ -37,12 +37,14 @@ from models.agent_config_entities import (
     AgentSoulModelConfig,
     AgentSoulModelSettings,
 )
+from models.enums import TagType
 from models.model import App, AppMode, IconType, Tag, TagBinding
 from models.skill import AgentSkillBinding, Skill, SkillDraftFile, SkillVersion
 from models.tools import ToolFile
 from services.skill_management_service import (
     SkillAssistAttachmentPayload,
     SkillAssistDraftOperationPayload,
+    SkillAssistHistoryMessagePayload,
     SkillAssistModelPayload,
     SkillCreatePayload,
     SkillDraftFileCheckPayload,
@@ -316,6 +318,9 @@ def test_list_tags_returns_distinct_tags_with_counts() -> None:
         user_id=USER,
         payload=SkillCreatePayload(name="empty-tags"),
     )
+    with session_factory.create_session() as session:
+        session.add(Tag(tenant_id=TENANT, type=TagType.SKILL, name="unbound", created_by=USER))
+        session.commit()
 
     result = service.list_tags(tenant_id=TENANT)
 
@@ -324,6 +329,7 @@ def test_list_tags_returns_distinct_tags_with_counts() -> None:
             {"tag": "Finance", "count": 2},
             {"tag": "audit", "count": 1},
             {"tag": "legal", "count": 1},
+            {"tag": "unbound", "count": 0},
         ]
     }
 
@@ -461,6 +467,8 @@ def test_new_skill_builder_stays_in_scenario_stage_on_first_turn() -> None:
     model_output = json.dumps(
         {
             "reply": "Created a complete Customer Issue Triage skill.",
+            "suggested_name": "customer-issue-triage",
+            "suggested_display_name": "Customer Issue Triage",
             "suggestions": ["Describe the customer issue trigger"],
             "operations": [
                 {
@@ -508,13 +516,56 @@ def test_new_skill_builder_stays_in_scenario_stage_on_first_turn() -> None:
 
     detail = next(event["detail"] for event in events if event["event"] == "skill_detail_updated")
     skill_md = next(file for file in detail["files"] if file["path"] == "SKILL.md")
-    assert detail["name"] == created["name"]
-    assert detail["display_name"] == "Untitled skill"
+    assert detail["name"] == "customer-issue-triage"
+    assert detail["display_name"] == "Customer Issue Triage"
     assert detail["description"] == "Classify customer feedback into P0-P3 priorities."
     assert "Invented escalation rules" not in skill_md["content"]
     assert not any(file["path"] == "references/example.md" for file in detail["files"])
 
 
+def test_skill_builder_reuses_previous_name_suggestion_when_final_response_omits_it() -> None:
+    history = [
+        SkillAssistHistoryMessagePayload(
+            role="assistant",
+            content="I suggest Customer Issue Triage.",
+            suggested_name="customer-issue-triage",
+            suggested_display_name="Customer Issue Triage",
+        ),
+        SkillAssistHistoryMessagePayload(role="user", content="Proceed to finalize the Skill."),
+    ]
+
+    assert SkillManagementService._latest_assistant_suggested_identity(history) == (
+        "customer-issue-triage",
+        "Customer Issue Triage",
+    )
+
+
+def test_skill_builder_stays_progressive_after_auto_generated_name() -> None:
+    skill = SimpleNamespace(
+        display_name="Sales Lead Follow-Up Strategy",
+        name_manually_edited=False,
+        latest_published_version_id=None,
+        description="Automate sales lead follow-up.",
+    )
+    files = [
+        SimpleNamespace(
+            path="SKILL.md",
+            content_text=(
+                "---\n"
+                "name: sales-lead-follow-up-strategy\n"
+                "description: Automate sales lead follow-up.\n"
+                "metadata:\n"
+                "  display-name: Sales Lead Follow-Up Strategy\n"
+                "---\n"
+                "# Sales Lead Follow-Up Strategy\n\n"
+                "Workflow body.\n"
+            ),
+        )
+    ]
+
+    assert SkillManagementService._assistant_authoring_stage(skill=skill, files=files) == "resources"
+
+
 def test_create_assistant_action_stream_strips_skill_frontmatter_from_reference_files() -> None:
     service = SkillManagementService(tool_file_manager=_FakeToolFileManager())
     created = service.create_skill(
@@ -1496,7 +1547,13 @@ def test_list_versions_includes_publisher_name_and_version_detail_files() -> Non
         tenant_id=TENANT,
         user_id=USER,
         skill_id=created["id"],
-        payload=SkillDraftTreePayload(files=[{"path": "SKILL.md", "content": _skill_md(body="# Published body")}]),
+        payload=SkillDraftTreePayload(
+            files=[
+                {"path": "SKILL.md", "content": _skill_md(body="# Published body")},
+                {"path": "references", "kind": "directory"},
+                {"path": "references/policy.md", "content": "Policy text."},
+            ]
+        ),
     )
     version = service.publish_skill(
         tenant_id=TENANT,
@@ -1908,6 +1965,23 @@ def test_apply_draft_file_operation_keeps_auto_generated_name_in_sync_with_build
     assert "name: customer-issue-triage" not in skill_md["content"]
 
 
+def test_assistant_name_suggestion_materializes_empty_skill_draft() -> None:
+    skill = SimpleNamespace(
+        name="untitled-skill-699bed24",
+        description="",
+    )
+
+    content = SkillManagementService._apply_assistant_suggested_identity(
+        skill=skill,
+        content="<!-- dify-skill-empty-draft -->\n",
+        suggested_name="sales-lead-follow-up-strategy",
+        suggested_display_name="Sales Lead Follow-Up Strategy",
+    )
+
+    assert "name: sales-lead-follow-up-strategy" in content
+    assert "display-name: Sales Lead Follow-Up Strategy" in content
+
+
 def test_apply_draft_file_operation_reports_builder_generated_name_conflict() -> None:
     service = SkillManagementService(tool_file_manager=_FakeToolFileManager())
     service.create_skill(
@@ -2301,7 +2375,13 @@ def test_duplicate_skill_copies_latest_published_content_without_history() -> No
         tenant_id=TENANT,
         user_id=USER,
         skill_id=created["id"],
-        payload=SkillDraftTreePayload(files=[{"path": "SKILL.md", "content": _skill_md(body="# Published body")}]),
+        payload=SkillDraftTreePayload(
+            files=[
+                {"path": "SKILL.md", "content": _skill_md(body="# Published body")},
+                {"path": "references", "kind": "directory"},
+                {"path": "references/policy.md", "content": "Policy text."},
+            ]
+        ),
     )
     service.publish_skill(tenant_id=TENANT, user_id=USER, skill_id=created["id"], payload=SkillPublishPayload())
 
@@ -2314,6 +2394,9 @@ def test_duplicate_skill_copies_latest_published_content_without_history() -> No
     assert duplicated["latest_published_version_id"] is None
     assert "name: finance-sop-copy" in duplicated["files"][0]["content"]
     assert "# Published body" in duplicated["files"][0]["content"]
+    references = next(file for file in duplicated["files"] if file["path"] == "references")
+    assert references["kind"] == "directory"
+    assert any(file["path"] == "references/policy.md" for file in duplicated["files"])
     assert service.list_versions(tenant_id=TENANT, skill_id=duplicated["id"]) == {"data": []}
 
 
@@ -2627,14 +2710,36 @@ def test_restore_version_replaces_draft_without_publishing() -> None:
         tenant_id=TENANT,
         user_id=USER,
         skill_id=created["id"],
-        payload=SkillDraftTreePayload(files=[{"path": "SKILL.md", "content": _skill_md(body="# First")}]),
+        payload=SkillDraftTreePayload(
+            files=[
+                {
+                    "path": "SKILL.md",
+                    "content": _skill_md(
+                        name="finance-sop-v1",
+                        description="Finance SOP version one",
+                        body="# First",
+                    ),
+                }
+            ]
+        ),
     )
     first = service.publish_skill(tenant_id=TENANT, user_id=USER, skill_id=created["id"], payload=SkillPublishPayload())
     service.replace_draft_tree(
         tenant_id=TENANT,
         user_id=USER,
         skill_id=created["id"],
-        payload=SkillDraftTreePayload(files=[{"path": "SKILL.md", "content": _skill_md(body="# Second")}]),
+        payload=SkillDraftTreePayload(
+            files=[
+                {
+                    "path": "SKILL.md",
+                    "content": _skill_md(
+                        name="finance-sop-v2",
+                        description="Finance SOP version two",
+                        body="# Second",
+                    ),
+                }
+            ]
+        ),
     )
     second = service.publish_skill(
         tenant_id=TENANT,
@@ -2655,6 +2760,8 @@ def test_restore_version_replaces_draft_without_publishing() -> None:
     assert restored["latest_published_version_number"] == 2
     files = restored["files"]
     assert "# First" in files[0]["content"]
+    assert restored["name"] == "finance-sop-v1"
+    assert restored["description"] == "Finance SOP version one"
 
     versions = service.list_versions(tenant_id=TENANT, skill_id=created["id"])
     assert [version["version_number"] for version in versions["data"]] == [2, 1]
diff --git a/web/features/skills/__tests__/detail-page.spec.tsx b/web/features/skills/__tests__/detail-page.spec.tsx
index 62607629524..d627bdd3cf8 100644
--- a/web/features/skills/__tests__/detail-page.spec.tsx
+++ b/web/features/skills/__tests__/detail-page.spec.tsx
@@ -3231,6 +3231,11 @@ describe('SkillDetailPage', () => {
     await user.click(
       screen.getByRole('button', { name: 'skill.skillManagement.detail.restoreVersion' }),
     )
+    await user.click(
+      within(await screen.findByRole('alertdialog')).getByRole('button', {
+        name: 'skill.skillManagement.detail.restoreVersion',
+      }),
+    )
 
     await waitFor(() => {
       expect(mocks.restoreSkillMutationFn).toHaveBeenCalledWith(
@@ -3296,6 +3301,11 @@ describe('SkillDetailPage', () => {
     await user.click(
       screen.getByRole('button', { name: 'skill.skillManagement.detail.restoreVersion' }),
     )
+    await user.click(
+      within(await screen.findByRole('alertdialog')).getByRole('button', {
+        name: 'skill.skillManagement.detail.restoreVersion',
+      }),
+    )
 
     await waitFor(() => {
       expect(mocks.restoreSkillMutationFn).toHaveBeenCalledWith(
@@ -4098,6 +4108,42 @@ describe('SkillDetailPage', () => {
     })
   })
 
+  it('does not overwrite an existing file when creating a duplicate name', async () => {
+    const user = userEvent.setup()
+    mocks.skillDetail = createSkillDetail({
+      files: [
+        ...(createSkillDetail().files ?? []),
+        {
+          id: 'notes-file',
+          path: 'notes.md',
+          kind: 'file',
+          storage: 'text',
+          mime_type: 'text/markdown',
+          content: '# Existing notes',
+          tool_file_id: null,
+          size: 16,
+          hash: 'notes-hash',
+        },
+      ],
+    })
+    renderSkillDetailPage()
+
+    await waitFor(() => {
+      expect(getFileTreeItem('notes.md')).toBeInTheDocument()
+    })
+    await openRootCreateMenu(user)
+    await user.click(await screen.findByText('skill.skillManagement.detail.createFileMenu'))
+    const fileNameInput = await screen.findByPlaceholderText('File name')
+
+    await user.type(fileNameInput, 'notes.md')
+    await user.click(screen.getByTestId('skill-detail-sidebar-header'))
+
+    await waitFor(() => {
+      expect(toast.error).toHaveBeenCalledWith('skill.skillManagement.detail.fileAlreadyExists')
+    })
+    expect(mocks.saveDraftFileMutationFn).not.toHaveBeenCalled()
+  })
+
   it('creates a JSON file with a code-editor-compatible MIME type', async () => {
     const user = userEvent.setup()
     renderSkillDetailPage()
diff --git a/web/features/skills/detail/file-editor.tsx b/web/features/skills/detail/file-editor.tsx
index f97762401ca..e380597337f 100644
--- a/web/features/skills/detail/file-editor.tsx
+++ b/web/features/skills/detail/file-editor.tsx
@@ -187,19 +187,23 @@ export function FileEditor({
     () => normalizeSkillDraftContentForEditing(draftContent),
     [draftContent],
   )
-  const markdownContent = useMemo(
-    () =>
-      isSkillManifestFile
-        ? parseMarkdownContent(editableDraftContent)
-        : {
-            body: stripSkillFrontmatterForDisplay(editableDraftContent),
-            description: '',
-            displayName: '',
-            metadata: [],
-            name: '',
-          },
-    [editableDraftContent, isSkillManifestFile],
-  )
+  const markdownContent = useMemo(() => {
+    if (!isSkillManifestFile) {
+      return {
+        body: stripSkillFrontmatterForDisplay(editableDraftContent),
+        description: '',
+        displayName: '',
+        metadata: [],
+        name: '',
+      }
+    }
+
+    const parsed = parseMarkdownContent(editableDraftContent)
+    return {
+      ...parsed,
+      name: parsed.name.startsWith('untitled-skill-') ? '' : parsed.name,
+    }
+  }, [editableDraftContent, isSkillManifestFile])
   const csvRows = useMemo(() => parseCsvRows(editableDraftContent), [editableDraftContent])
   const hasPublishedVersion = !!detail?.latest_published_version_id
   const latestPublishedAt = detail?.latest_published_at
diff --git a/web/features/skills/detail/file-tree.tsx b/web/features/skills/detail/file-tree.tsx
index 47d44dc94a1..f8273215977 100644
--- a/web/features/skills/detail/file-tree.tsx
+++ b/web/features/skills/detail/file-tree.tsx
@@ -481,6 +481,10 @@ export function FileTree({
     }
 
     const path = joinSkillPath(inlineAction.parentPath, name)
+    if (files.some((file) => file.path === path)) {
+      toast.error(t(($) => $['skillManagement.detail.fileAlreadyExists']))
+      return
+    }
     if (inlineAction.nodeType === 'directory') {
       mutateFile(
         {
diff --git a/web/features/skills/detail/page.tsx b/web/features/skills/detail/page.tsx
index e1efe60a668..ed3130e3342 100644
--- a/web/features/skills/detail/page.tsx
+++ b/web/features/skills/detail/page.tsx
@@ -18,11 +18,12 @@ import {
   deriveSkillDetailFromDraftFiles,
   findFileByPath,
   getFirstTextFile,
+  getSkillVersionTitle,
   isDirectory,
   setSkillDetailCache,
 } from './shared'
 import { DetailSkeleton } from './shell'
-import { VersionPanel } from './version-panel'
+import { RestoreVersionDialog, VersionPanel } from './version-panel'
 
 export function SkillDetailPage({ skillId }: { skillId: string }) {
   const { t } = useTranslation('skill')
@@ -33,6 +34,7 @@ export function SkillDetailPage({ skillId }: { skillId: string }) {
   const [rightPanelMode, setRightPanelMode] = useState<'builder' | 'hidden' | 'versions'>('builder')
   const [sidebarCollapsed, setSidebarCollapsed] = useState(false)
   const [selectedVersionId, setSelectedVersionId] = useState<string | null>()
+  const [restoreVersionConfirmOpen, setRestoreVersionConfirmOpen] = useState(false)
   const [draftDetailOverride, setDraftDetailOverride] = useState<SkillDetailResponse>()
   const [hasLocalUnpublishedChanges, setHasLocalUnpublishedChanges] = useState(false)
   const [publishedOverride, setPublishedOverride] = useState<{
@@ -263,7 +265,7 @@ export function SkillDetailPage({ skillId }: { skillId: string }) {
       },
     )
   }
-  const handleRestoreSelectedVersion = async () => {
+  const restoreSelectedVersion = async () => {
     if (!selectedVersion || restoreMutation.isPending) return
 
     try {
@@ -305,6 +307,11 @@ export function SkillDetailPage({ skillId }: { skillId: string }) {
     }
   }
 
+  const handleRestoreSelectedVersion = () => {
+    if (!selectedVersion || restoreMutation.isPending) return
+    setRestoreVersionConfirmOpen(true)
+  }
+
   const handleExitVersion = () => {
     setSelectedVersionId(undefined)
     setRightPanelMode('builder')
@@ -405,6 +412,17 @@ export function SkillDetailPage({ skillId }: { skillId: string }) {
             }}
           />
         )}
+        {selectedVersion && (
+          <RestoreVersionDialog
+            open={restoreVersionConfirmOpen}
+            loading={restoreMutation.isPending}
+            versionTitle={getSkillVersionTitle(selectedVersion)}
+            onOpenChange={setRestoreVersionConfirmOpen}
+            onConfirm={() => {
+              void restoreSelectedVersion()
+            }}
+          />
+        )}
       </div>
     </div>
   )
diff --git a/web/features/skills/detail/version-panel.tsx b/web/features/skills/detail/version-panel.tsx
index 07b8592fc09..226424f9fc7 100644
--- a/web/features/skills/detail/version-panel.tsx
+++ b/web/features/skills/detail/version-panel.tsx
@@ -39,6 +39,46 @@ import { getSkillVersionTitle, invalidateSkillDetail } from './shared'
 
 type VersionFilterValue = 'all' | 'onlyNamed'
 
+export function RestoreVersionDialog({
+  loading,
+  onConfirm,
+  onOpenChange,
+  open,
+  versionTitle,
+}: {
+  loading: boolean
+  onConfirm: () => void
+  onOpenChange: (open: boolean) => void
+  open: boolean
+  versionTitle: string
+}) {
+  const { t } = useTranslation('skill')
+  const { t: tCommon } = useTranslation('common')
+
+  return (
+    <AlertDialog open={open} onOpenChange={onOpenChange}>
+      <AlertDialogContent className="p-6">
+        <AlertDialogTitle className="title-2xl-semi-bold text-text-primary">
+          {t(($) => $['skillManagement.detail.restoreVersionConfirmTitle'])}
+        </AlertDialogTitle>
+        <AlertDialogDescription className="mt-2 system-md-regular whitespace-pre-line text-text-tertiary">
+          {t(($) => $['skillManagement.detail.restoreVersionConfirmDescription'], {
+            version: versionTitle,
+          })}
+        </AlertDialogDescription>
+        <AlertDialogActions className="p-0 pt-6">
+          <AlertDialogCancelButton disabled={loading}>
+            {tCommon(($) => $['operation.cancel'])}
+          </AlertDialogCancelButton>
+          <AlertDialogConfirmButton loading={loading} onClick={onConfirm}>
+            {t(($) => $['skillManagement.detail.restoreVersion'])}
+          </AlertDialogConfirmButton>
+        </AlertDialogActions>
+      </AlertDialogContent>
+    </AlertDialog>
+  )
+}
+
 function VersionTimelineDot({
   isActive,
   isFirst,
@@ -186,6 +226,7 @@ function VersionRow({
   const queryClient = useQueryClient()
   const [renameOpen, setRenameOpen] = useState(false)
   const [deleteOpen, setDeleteOpen] = useState(false)
+  const [restoreOpen, setRestoreOpen] = useState(false)
   const [versionName, setVersionName] = useState(version.version_name)
   const [publishNote, setPublishNote] = useState(version.publish_note)
   const renameMutation = useMutation(
@@ -246,6 +287,7 @@ function VersionRow({
       {
         onSuccess: () => {
           toast.success(t(($) => $['skillManagement.detail.restoreVersionSuccess']))
+          setRestoreOpen(false)
           invalidateVersions()
           onSelect(null)
         },
@@ -334,7 +376,7 @@ function VersionRow({
               <span aria-hidden className="i-ri-more-fill size-4 text-text-tertiary" />
             </DropdownMenuTrigger>
             <DropdownMenuContent placement="bottom-end" sideOffset={4} popupClassName="w-[184px]">
-              <DropdownMenuItem onClick={handleRestore}>
+              <DropdownMenuItem onClick={() => setRestoreOpen(true)}>
                 {t(($) => $['skillManagement.detail.restoreVersion'])}
               </DropdownMenuItem>
               <DropdownMenuItem
@@ -403,6 +445,13 @@ function VersionRow({
           </div>
         </DialogContent>
       </Dialog>
+      <RestoreVersionDialog
+        open={restoreOpen}
+        loading={restoreMutation.isPending}
+        versionTitle={versionTitle}
+        onOpenChange={setRestoreOpen}
+        onConfirm={handleRestore}
+      />
       <AlertDialog open={deleteOpen} onOpenChange={setDeleteOpen}>
         <AlertDialogContent className="p-6">
           <AlertDialogTitle className="title-2xl-semi-bold text-text-primary">
diff --git a/web/features/skills/page.tsx b/web/features/skills/page.tsx
index 98198bfacf3..6739670b640 100644
--- a/web/features/skills/page.tsx
+++ b/web/features/skills/page.tsx
@@ -429,7 +429,9 @@ function SkillCard({
               <h2 className="truncate system-md-semibold text-text-secondary">
                 {skill.display_name}
               </h2>
-              <p className="truncate system-xs-regular text-text-tertiary">{skill.name}</p>
+              {!skill.name.startsWith('untitled-skill-') && (
+                <p className="truncate system-xs-regular text-text-tertiary">{skill.name}</p>
+              )}
             </div>
           </div>
           <div className="px-4 py-1 system-xs-regular text-text-tertiary">
diff --git a/web/i18n/en-US/skill.json b/web/i18n/en-US/skill.json
index 28be7f7a686..f1c49de1d5f 100644
--- a/web/i18n/en-US/skill.json
+++ b/web/i18n/en-US/skill.json
@@ -93,6 +93,7 @@
   "skillManagement.detail.editVersionInfo": "Edit version info",
   "skillManagement.detail.exitVersions": "Exit versions",
   "skillManagement.detail.expandSidebar": "Expand sidebar",
+  "skillManagement.detail.fileAlreadyExists": "A file or folder with this name already exists.",
   "skillManagement.detail.fileCount": "{{count}} FILES",
   "skillManagement.detail.fileMeta": "{{type}} · {{size}} bytes",
   "skillManagement.detail.fileMissing": "File not found.",
@@ -146,6 +147,8 @@
   "skillManagement.detail.renameVersionSuccess": "Version renamed.",
   "skillManagement.detail.resizeSidebar": "Resize file sidebar",
   "skillManagement.detail.restoreVersion": "Restore",
+  "skillManagement.detail.restoreVersionConfirmDescription": "This will replace the current draft with the files from \"{{version}}\". It will not publish the Skill or create a new version.",
+  "skillManagement.detail.restoreVersionConfirmTitle": "Restore this version?",
   "skillManagement.detail.restoreVersionFailed": "Failed to restore version.",
   "skillManagement.detail.restoreVersionSuccess": "Version restored to draft.",
   "skillManagement.detail.save": "Save",
diff --git a/web/i18n/zh-Hans/skill.json b/web/i18n/zh-Hans/skill.json
index e00175b05d7..12b92197a1a 100644
--- a/web/i18n/zh-Hans/skill.json
+++ b/web/i18n/zh-Hans/skill.json
@@ -93,6 +93,7 @@
   "skillManagement.detail.editVersionInfo": "编辑版本信息",
   "skillManagement.detail.exitVersions": "退出版本",
   "skillManagement.detail.expandSidebar": "展开侧边栏",
+  "skillManagement.detail.fileAlreadyExists": "已存在同名文件或文件夹。",
   "skillManagement.detail.fileCount": "{{count}} 个文件",
   "skillManagement.detail.fileMeta": "{{type}} · {{size}} 字节",
   "skillManagement.detail.fileMissing": "文件不存在。",
@@ -146,6 +147,8 @@
   "skillManagement.detail.renameVersionSuccess": "版本已重命名。",
   "skillManagement.detail.resizeSidebar": "调整文件侧边栏宽度",
   "skillManagement.detail.restoreVersion": "恢复",
+  "skillManagement.detail.restoreVersionConfirmDescription": "这会用“{{version}}”中的文件替换当前草稿，不会发布 Skill，也不会创建新的版本。",
+  "skillManagement.detail.restoreVersionConfirmTitle": "确认恢复此版本？",
   "skillManagement.detail.restoreVersionFailed": "版本恢复失败。",
   "skillManagement.detail.restoreVersionSuccess": "版本已恢复到草稿。",
   "skillManagement.detail.save": "保存",