diff --git a/src/kiro_crew/dashboard/handlers/__init__.py b/src/kiro_crew/dashboard/handlers/__init__.py
index 0612b9dc3e1..4dd8b8e7b96 100644
--- a/src/kiro_crew/dashboard/handlers/__init__.py
+++ b/src/kiro_crew/dashboard/handlers/__init__.py
@@ -60,6 +60,7 @@ def sel():
     _get_config_lock,
     _installed_agent_config,
     api_agent_config,
+    api_agent_create,
     api_agent_detail,
     api_agents_installed,
     api_capability_agents_install,
diff --git a/src/kiro_crew/dashboard/handlers/agents.py b/src/kiro_crew/dashboard/handlers/agents.py
index 32cd9a10551..23d89f14814 100644
--- a/src/kiro_crew/dashboard/handlers/agents.py
+++ b/src/kiro_crew/dashboard/handlers/agents.py
@@ -1040,6 +1040,323 @@ async def api_slash_commands(request: web.Request) -> web.Response:
     )
 
 
+#: A template name has to be safe as a bare filename stem (``<name>.json`` inside
+#: the agents dir) AND usable as a kiro-cli ``--agent`` argument. The character
+#: class excludes the separators and ``..`` that a traversal would need, so no
+#: separate traversal check is required to keep the write inside the dir — the
+#: post-join containment assert below is belt and braces, not the primary guard.
+_VALID_AGENT_NAME_RE = re.compile(r"^[A-Za-z0-9][A-Za-z0-9._-]*$")
+
+_MAX_AGENT_NAME_LEN = 64
+_MAX_AGENT_DESCRIPTION_LEN = 500
+#: Generous by design: a system prompt is prose and some are genuinely long.
+#: The cap exists so one request cannot write an unbounded file, not to express
+#: an opinion about prompt length.
+_MAX_AGENT_PROMPT_LEN = 100_000
+
+
+def _managed_agent_filenames() -> tuple[str, ...]:
+    """The agent spec filenames Kiro Crew itself writes and rewrites.
+
+    Read through ``agent_files`` rather than duplicated as literals so adding a
+    managed spec there automatically protects it here — both from being shadowed
+    by a new template of the same name and from prompt/description edits that
+    the next install would silently revert.
+    """
+    from kiro_crew.agent_files import OWNED_KIRO_AGENT_FILES
+
+    return OWNED_KIRO_AGENT_FILES
+
+
+def _reserved_agent_names() -> set[str]:
+    """Names a new template may not take.
+
+    The managed specs' own stems (a template called ``kirocrew`` would either
+    collide with the file or shadow it by ``name``), plus ``default`` — the
+    built-in agent that has no config file and is special-cased by
+    :func:`api_agent_detail`.
+    """
+    return {Path(f).stem for f in _managed_agent_filenames()} | {"default"}
+
+
+#: The spec a blank new template starts from.
+#:
+#: ``tools`` is the surface the agent CAN reach; ``allowedTools`` is the subset
+#: auto-approved without asking. The split is the whole security story of a
+#: template, so a created one starts with a useful tool surface but auto-approves
+#: only side-effect-free reads — an agent that can edit files or run a command
+#: has to ask the first time. Kiro Crew's own privileged MCP servers
+#: (``@kirocrew-core`` and friends: spawn, cron, computer use) are deliberately
+#: absent; a user who wants that surface duplicates ``kirocrew`` instead of
+#: starting blank, which is an explicit act rather than a default.
+_BLANK_TEMPLATE_TOOLS = (
+    "execute_bash",
+    "fs_read",
+    "fs_write",
+    "code",
+    "grep",
+    "glob",
+    "web_fetch",
+    "web_search",
+)
+_BLANK_TEMPLATE_ALLOWED_TOOLS = ("fs_read", "code", "grep", "glob")
+
+
+def _blank_template_spec() -> dict[str, Any]:
+    """A minimal, schema-clean kiro agent spec for a from-scratch template.
+
+    Only fields kiro-cli understands: it rejects a spec with unknown fields and
+    then resolves no agent at all, so the safest new spec is a small one.
+    """
+    return {
+        "tools": list(_BLANK_TEMPLATE_TOOLS),
+        "allowedTools": list(_BLANK_TEMPLATE_ALLOWED_TOOLS),
+        "resources": ["file://.kiro/steering/**/*.md"],
+    }
+
+
+def _validate_new_agent_name(raw: Any) -> tuple[str, str, str]:
+    """Return ``(name, code, message)`` for a requested template name.
+
+    ``code`` is empty when the name is acceptable. The machine-readable code is
+    what the dashboard branches on; the prose is advisory (RFC 9457 3.1.3).
+    """
+    if not isinstance(raw, str):
+        return "", "name_required", "name must be a string"
+    name = raw.strip()
+    if not name:
+        return "", "name_required", "name is required"
+    if len(name) > _MAX_AGENT_NAME_LEN:
+        return (
+            "",
+            "name_too_long",
+            f"name must be at most {_MAX_AGENT_NAME_LEN} characters",
+        )
+    if not _VALID_AGENT_NAME_RE.match(name):
+        return (
+            "",
+            "invalid_agent_name",
+            "name may contain only letters, digits, dot, dash and underscore, "
+            "and must start with a letter or digit",
+        )
+    if name in _reserved_agent_names():
+        return "", "agent_name_reserved", f"'{name}' is reserved"
+    return name, "", ""
+
+
+def _validate_spec_text(raw: Any, field: str, limit: int) -> tuple[str, str, str]:
+    """Return ``(value, code, message)`` for a free-text spec field."""
+    if not isinstance(raw, str):
+        return "", f"{field}_invalid", f"{field} must be a string"
+    if len(raw) > limit:
+        return "", f"{field}_too_long", f"{field} must be at most {limit} characters"
+    return raw, "", ""
+
+
+def _read_agent_specs(agents_dir: Path) -> list[tuple[Path, dict[str, Any]]]:
+    """Every parseable spec in *agents_dir*, as ``(path, data)`` pairs.
+
+    Unreadable and non-object files are skipped rather than raising: the dir is
+    shared with other tools, and one bad file must not block creating a template.
+    """
+    out: list[tuple[Path, dict[str, Any]]] = []
+    try:
+        candidates = sorted(agents_dir.glob("*.json"))
+    except OSError:
+        return out
+    for path in candidates:
+        try:
+            data = json.loads(path.read_text(encoding="utf-8"))
+        except (OSError, ValueError):
+            continue
+        if isinstance(data, dict):
+            out.append((path, data))
+    return out
+
+
+def _clone_source_spec(
+    specs: list[tuple[Path, dict[str, Any]]], source: str
+) -> dict[str, Any] | None:
+    """The spec to copy for a ``from`` request, matched the way kiro-cli resolves.
+
+    Both the declared ``name`` and the file stem are accepted because a
+    package-installed agent's file is ``<package>-<name>.json`` while its
+    identity is the ``name`` field.
+    """
+    for path, data in specs:
+        if spec_str(data, "name") == source or path.stem == source:
+            return data
+    return None
+
+
+async def api_agent_create(request: web.Request) -> web.Response:
+    """POST /api/agents/detail — create a new agent template.
+
+    Writes ``<name>.json`` into the agents dir, either from a conservative blank
+    baseline or as a copy of an existing template (``from``).
+
+    ``tools``, ``allowedTools`` and ``toolsSettings`` are deliberately NOT
+    accepted from the request body. They are the privilege surface — the
+    auto-approve list and the bash deny patterns — so a create call cannot mint
+    a spec that auto-approves everything. A copy inherits them from a spec that
+    already exists on disk; a blank template gets the read-only baseline. Editing
+    them is a separate, deliberate capability this endpoint does not grant.
+    """
+    from kiro_crew.agent import kiro_agents_dir_path  # noqa: F811
+
+    try:
+        body = await request.json()
+    except (json.JSONDecodeError, ValueError):
+        return web.json_response({"error": "invalid JSON", "code": "invalid_json"}, status=400)
+    if not isinstance(body, dict):
+        return web.json_response(
+            {"error": "body must be a JSON object", "code": "invalid_body"}, status=400
+        )
+
+    def _denied(code: str, message: str) -> web.Response:
+        """A 400 that is also recorded — a rejected create is worth an audit line."""
+        _sel().log_api_access(
+            caller=request.get("user", "dashboard"),
+            operation="agent_template.create",
+            outcome="denied",
+            source="dashboard",
+            resources=str(body.get("name", ""))[:_MAX_AGENT_NAME_LEN],
+            error=code,
+        )
+        return web.json_response({"error": message, "code": code}, status=400)
+
+    name, code, message = _validate_new_agent_name(body.get("name"))
+    if code:
+        return _denied(code, message)
+    description, code, message = _validate_spec_text(
+        body.get("description", ""), "description", _MAX_AGENT_DESCRIPTION_LEN
+    )
+    if code:
+        return _denied(code, message)
+    prompt, code, message = _validate_spec_text(
+        body.get("prompt", ""), "prompt", _MAX_AGENT_PROMPT_LEN
+    )
+    if code:
+        return _denied(code, message)
+    raw_from = body.get("from", "")
+    if not isinstance(raw_from, str):
+        return _denied("invalid_from", "from must be a string")
+    clone_from = raw_from.strip()
+
+    state: DashboardState = request.app["state"]
+    agents_dir = kiro_agents_dir_path()
+    target = agents_dir / f"{name}.json"
+    # The name regex already excludes every separator, so this cannot fail; it is
+    # here so a future loosening of the regex trips this instead of writing
+    # outside the agents dir.
+    if target.parent.resolve() != agents_dir.resolve():
+        return _denied("invalid_agent_name", "invalid name")
+
+    async with _get_config_lock():
+        specs = await asyncio.to_thread(_read_agent_specs, agents_dir)
+        # Reject a name any EXISTING spec already answers to, not just a file-name
+        # collision: kiro-cli resolves by the ``name`` field, so a second spec
+        # declaring a package agent's name makes which one wins a coin flip.
+        for path, data in specs:
+            if spec_str(data, "name") == name or path.stem == name:
+                _sel().log_api_access(
+                    caller=request.get("user", "dashboard"),
+                    operation="agent_template.create",
+                    outcome="denied",
+                    source="dashboard",
+                    resources=name,
+                    error="agent_template_exists",
+                )
+                return web.json_response(
+                    {"error": f"'{name}' already exists", "code": "agent_template_exists"},
+                    status=409,
+                )
+
+        if clone_from:
+            source = _clone_source_spec(specs, clone_from)
+            if source is None:
+                return web.json_response(
+                    {
+                        "error": f"template '{clone_from}' not found",
+                        "code": "source_template_not_found",
+                    },
+                    status=404,
+                )
+            spec: dict[str, Any] = json.loads(json.dumps(source))
+        else:
+            spec = _blank_template_spec()
+        spec["name"] = name
+        if description:
+            spec["description"] = description
+        else:
+            spec.pop("description", None)
+        if prompt:
+            spec["prompt"] = prompt
+        elif not clone_from:
+            spec.pop("prompt", None)
+        # Kiro Crew bookkeeping that older specs may carry; kiro-cli rejects
+        # unknown fields and drops the whole agent, so a copy must not inherit it.
+        spec.pop("model_managed", None)
+        spec.pop("cc_model", None)
+
+        payload = json.dumps(spec, indent=2) + "\n"
+
+        def _write() -> str:
+            """Create the file exclusively; returns an error code or ''."""
+            agents_dir.mkdir(parents=True, exist_ok=True)
+            try:
+                # O_EXCL, not a write after the collision scan above: the scan and
+                # the write are two steps, and the kernel is the only party that
+                # can make "create only if absent" atomic against a concurrent
+                # POST or another tool writing the same path.
+                fd = os.open(target, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0o600)
+            except FileExistsError:
+                return "agent_template_exists"
+            except OSError as exc:
+                logger.warning("Failed to create agent template %s: %s", target, exc)
+                return "agent_template_write_failed"
+            try:
+                with os.fdopen(fd, "w", encoding="utf-8") as fh:
+                    fh.write(payload)
+            except OSError as exc:
+                logger.warning("Failed to write agent template %s: %s", target, exc)
+                target.unlink(missing_ok=True)
+                return "agent_template_write_failed"
+            return ""
+
+        write_code = await asyncio.to_thread(_write)
+
+    if write_code:
+        _sel().log_api_access(
+            caller=request.get("user", "dashboard"),
+            operation="agent_template.create",
+            outcome="failure",
+            source="dashboard",
+            resources=name,
+            error=write_code,
+        )
+        if write_code == "agent_template_exists":
+            return web.json_response(
+                {"error": f"'{name}' already exists", "code": write_code}, status=409
+            )
+        return web.json_response(
+            {"error": "could not write agent template", "code": write_code}, status=500
+        )
+
+    # The list_agents() cache keys on a (count, newest-mtime-ns) signature, which
+    # a write inside the current mtime granularity would not move.
+    clear_list_agents_cache()
+    state.push_refresh("agents")
+    _sel().log_api_access(
+        caller=request.get("user", "dashboard"),
+        operation="agent_template.create",
+        outcome="success",
+        source="dashboard",
+        resources=f"{name} (from={clone_from})" if clone_from else name,
+    )
+    return web.json_response({"ok": True, "name": name})
+
+
 async def api_agent_detail(request: web.Request) -> web.Response:
     """GET/DELETE/PATCH /api/agents/detail/{name} — view, delete, or update agent config."""
     name = request.match_info["name"]
@@ -1089,6 +1406,38 @@ async def api_agent_detail(request: web.Request) -> web.Response:
                                 {"error": f"at most {MAX_AGENT_SKILLS} skills per agent"},
                                 status=400,
                             )
+                    # ``prompt`` and ``description`` are validated here, with
+                    # ``skills``, so a bad value is rejected before any state
+                    # mutation rather than half-applying a combined PATCH.
+                    text_edits: dict[str, str] = {}
+                    for field, limit in (
+                        ("prompt", _MAX_AGENT_PROMPT_LEN),
+                        ("description", _MAX_AGENT_DESCRIPTION_LEN),
+                    ):
+                        if field not in patch_body:
+                            continue
+                        if f.name in _managed_agent_filenames():
+                            # Both fields are rewritten from the shipped defaults
+                            # on every install and at boot self-heal, so accepting
+                            # the edit would show a save that silently reverts.
+                            return web.json_response(
+                                {
+                                    "error": (
+                                        f"{f.stem} is managed by Kiro Crew; its "
+                                        f"{field} cannot be edited"
+                                    ),
+                                    "code": "agent_template_managed",
+                                },
+                                status=400,
+                            )
+                        value, code, message = _validate_spec_text(
+                            patch_body[field], field, limit
+                        )
+                        if code:
+                            return web.json_response(
+                                {"error": message, "code": code}, status=400
+                            )
+                        text_edits[field] = value
                     mapped: list[str] = []
                     loop = asyncio.get_running_loop()
                     async with _get_config_lock():
@@ -1141,6 +1490,14 @@ async def api_agent_detail(request: web.Request) -> web.Response:
                         # kiro-cli rejects unknown fields and drops the agent.
                         data.pop("model_managed", None)
                         data.pop("cc_model", None)
+                        # An empty string means "no value", not the literal "":
+                        # the key is dropped so the spec stays minimal and reads
+                        # back through spec_str() as absent.
+                        for field, value in text_edits.items():
+                            if value:
+                                data[field] = value
+                            else:
+                                data.pop(field, None)
                         f.write_text(json.dumps(data, indent=2) + "\n", encoding="utf-8")
                     # The list_agents() cache keys on a (count, newest-mtime-ns)
                     # signature; two writes inside the same mtime granularity
@@ -1148,7 +1505,13 @@ async def api_agent_detail(request: web.Request) -> web.Response:
                     clear_list_agents_cache()
                     state.push_refresh("agents")
                     return web.json_response(
-                        {"ok": True, "model": data.get("model", ""), "skills": mapped}
+                        {
+                            "ok": True,
+                            "model": data.get("model", ""),
+                            "skills": mapped,
+                            "prompt": spec_str(data, "prompt"),
+                            "description": spec_str(data, "description"),
+                        }
                     )
                 # ``skills`` / ``unmanaged_skills`` are computed, response-only
                 # views of ``resources`` — never written back into the spec
@@ -1170,6 +1533,12 @@ async def api_agent_detail(request: web.Request) -> web.Response:
                         "model": spec_model(data),
                         "skills": keys,
                         "unmanaged_skills": unmanaged_uris,
+                        # Whether Kiro Crew owns this spec and rewrites it on
+                        # install. Served rather than re-derived client-side so
+                        # the editor disables exactly the fields PATCH refuses,
+                        # instead of keeping a second copy of the owned-file list
+                        # in TypeScript that would drift from agent_files.py.
+                        "managed": f.name in _managed_agent_filenames(),
                     }
                 )
         except (json.JSONDecodeError, OSError):
@@ -1178,7 +1547,9 @@ async def api_agent_detail(request: web.Request) -> web.Response:
     if name == "default":
         if request.method != "GET":
             return web.json_response({"error": "cannot modify built-in default agent"}, status=400)
-        return web.json_response({"name": "default", "model": ""})
+        # No file to edit, so it is managed by definition — the editor must not
+        # offer fields whose PATCH the branch above already refuses.
+        return web.json_response({"name": "default", "model": "", "managed": True})
 
     return web.json_response({"error": "not found"}, status=404)
 
diff --git a/src/kiro_crew/dashboard/server.py b/src/kiro_crew/dashboard/server.py
index 2d9c6c66dc7..eeba7e990f0 100644
--- a/src/kiro_crew/dashboard/server.py
+++ b/src/kiro_crew/dashboard/server.py
@@ -2335,6 +2335,7 @@ async def _wf_nudge_authorizer(
     app.router.add_get("/api/agents/detail/{name}", handlers.api_agent_detail)
     app.router.add_patch("/api/agents/detail/{name}", handlers.api_agent_detail)
     app.router.add_delete("/api/agents/detail/{name}", handlers.api_agent_detail)
+    app.router.add_post("/api/agents/detail", handlers.api_agent_create)
     # KiroCrew Agent CRUD
     app.router.add_get("/api/agents", handlers.api_kirocrew_agents)
     app.router.add_get(
diff --git a/test/test_agent_template_create.py b/test/test_agent_template_create.py
new file mode 100644
index 00000000000..8b252aaef1f
--- /dev/null
+++ b/test/test_agent_template_create.py
@@ -0,0 +1,533 @@
+"""Tests for authoring agent templates from the dashboard.
+
+Two capabilities, both previously absent — the agents dir could only be written
+by a package install, an app, or by hand:
+
+* CREATE — ``POST /api/agents/detail`` writes ``<name>.json``, either from a
+  conservative blank baseline or as a copy of an existing template.
+* EDIT — ``PATCH /api/agents/detail/{name}`` accepts ``prompt`` and
+  ``description``, so a created template can be corrected without hand-editing
+  JSON.
+
+The privilege surface (``tools`` / ``allowedTools`` / ``toolsSettings``) is
+deliberately not writable through either verb; the tests below pin that.
+"""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+import pytest
+from aiohttp import web
+
+from kiro_crew.agent_discovery import clear_list_agents_cache
+from kiro_crew.dashboard.handlers.agents import (
+    _BLANK_TEMPLATE_ALLOWED_TOOLS,
+    api_agent_create,
+    api_agent_detail,
+)
+
+
+@pytest.fixture(autouse=True)
+def _no_agent_cache():
+    clear_list_agents_cache()
+    yield
+    clear_list_agents_cache()
+
+
+def _request(method: str, body: dict | list | None = None, name: str = "") -> MagicMock:
+    request = MagicMock(spec=web.Request)
+    request.method = method
+    request.match_info = {"name": name}
+    request.app = {"state": MagicMock()}
+    request.get = lambda key, default=None: default
+
+    async def _json():
+        if body is None:
+            raise json.JSONDecodeError("no body", "", 0)
+        return body
+
+    request.json = _json
+    return request
+
+
+async def _create(agents_dir: Path, body: dict | list | None) -> web.Response:
+    with patch("kiro_crew.agent.KIRO_AGENTS_DIR", agents_dir):
+        return await api_agent_create(_request("POST", body))
+
+
+async def _patch(agents_dir: Path, name: str, body: dict) -> web.Response:
+    with patch("kiro_crew.agent.KIRO_AGENTS_DIR", agents_dir):
+        return await api_agent_detail(_request("PATCH", body, name=name))
+
+
+async def _get(agents_dir: Path, name: str) -> web.Response:
+    with patch("kiro_crew.agent.KIRO_AGENTS_DIR", agents_dir):
+        return await api_agent_detail(_request("GET", None, name=name))
+
+
+def _spec(resp: web.Response) -> dict:
+    return json.loads(resp.body.decode("utf-8"))
+
+
+@pytest.fixture
+def agents_dir(tmp_path: Path) -> Path:
+    d = tmp_path / "agents"
+    d.mkdir()
+    return d
+
+
+# ── CREATE: the blank baseline ──
+
+
+class TestCreateBlank:
+    @pytest.mark.asyncio
+    async def test_writes_a_named_spec(self, agents_dir):
+        resp = await _create(agents_dir, {"name": "researcher"})
+
+        assert resp.status == 200
+        written = json.loads((agents_dir / "researcher.json").read_text(encoding="utf-8"))
+        assert written["name"] == "researcher"
+
+    @pytest.mark.asyncio
+    async def test_auto_approves_only_read_only_tools(self, agents_dir):
+        """The blank baseline's whole security story: a useful tool surface, but
+        nothing with a side effect is pre-approved."""
+        await _create(agents_dir, {"name": "researcher"})
+
+        written = json.loads((agents_dir / "researcher.json").read_text(encoding="utf-8"))
+        assert set(written["allowedTools"]) == set(_BLANK_TEMPLATE_ALLOWED_TOOLS)
+        assert "execute_bash" in written["tools"]
+        assert "execute_bash" not in written["allowedTools"]
+        assert "fs_write" not in written["allowedTools"]
+
+    @pytest.mark.asyncio
+    async def test_omits_kirocrew_mcp_servers(self, agents_dir):
+        """Kiro Crew's own MCP surface (spawn / cron / computer use) is opt-in via
+        a copy of ``kirocrew``, never a blank template's default."""
+        await _create(agents_dir, {"name": "researcher"})
+
+        written = json.loads((agents_dir / "researcher.json").read_text(encoding="utf-8"))
+        assert not [t for t in written["tools"] if t.startswith("@kirocrew")]
+
+    @pytest.mark.asyncio
+    async def test_description_and_prompt_are_stored(self, agents_dir):
+        await _create(
+            agents_dir,
+            {"name": "researcher", "description": "Digs through papers", "prompt": "Be rigorous."},
+        )
+
+        written = json.loads((agents_dir / "researcher.json").read_text(encoding="utf-8"))
+        assert written["description"] == "Digs through papers"
+        assert written["prompt"] == "Be rigorous."
+
+    @pytest.mark.asyncio
+    async def test_absent_optional_fields_are_omitted_not_empty(self, agents_dir):
+        """kiro-cli reads the spec; an empty-string prompt is not the same as no
+        prompt, and a minimal spec is the one least likely to be rejected."""
+        await _create(agents_dir, {"name": "researcher"})
+
+        written = json.loads((agents_dir / "researcher.json").read_text(encoding="utf-8"))
+        assert "prompt" not in written
+        assert "description" not in written
+
+    @pytest.mark.asyncio
+    async def test_tools_in_the_body_are_ignored(self, agents_dir):
+        """The privilege surface is not settable through create — otherwise one
+        call could mint a template that auto-approves everything."""
+        await _create(
+            agents_dir,
+            {
+                "name": "researcher",
+                "tools": ["execute_bash"],
+                "allowedTools": ["execute_bash", "fs_write"],
+                "toolsSettings": {"execute_bash": {"deniedCommands": []}},
+            },
+        )
+
+        written = json.loads((agents_dir / "researcher.json").read_text(encoding="utf-8"))
+        assert "execute_bash" not in written["allowedTools"]
+        assert "toolsSettings" not in written
+
+
+# ── CREATE: name validation ──
+
+
+class TestCreateNameValidation:
+    @pytest.mark.asyncio
+    async def test_missing_name_is_rejected(self, agents_dir):
+        resp = await _create(agents_dir, {})
+        assert resp.status == 400
+
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize(
+        "name",
+        [
+            "../escape",
+            "sub/dir",
+            "back\\slash",
+            "..",
+            ".hidden",
+            "has space",
+            "-leading-dash",
+            "sym*bol",
+        ],
+    )
+    async def test_unsafe_names_are_rejected(self, agents_dir, name):
+        resp = await _create(agents_dir, {"name": name})
+
+        assert resp.status == 400
+        assert list(agents_dir.iterdir()) == []
+
+    @pytest.mark.asyncio
+    async def test_traversal_writes_nothing_outside_the_agents_dir(self, agents_dir, tmp_path):
+        await _create(agents_dir, {"name": "../../pwned"})
+
+        assert not (tmp_path / "pwned.json").exists()
+        assert not (tmp_path.parent / "pwned.json").exists()
+
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize(
+        "name", ["kirocrew", "kirocrew-lite", "kirocrew-knowledge", "default"]
+    )
+    async def test_managed_and_builtin_names_are_reserved(self, agents_dir, name):
+        resp = await _create(agents_dir, {"name": name})
+
+        assert resp.status == 400
+        assert not (agents_dir / f"{name}.json").exists()
+
+    @pytest.mark.asyncio
+    async def test_overlong_name_is_rejected(self, agents_dir):
+        resp = await _create(agents_dir, {"name": "a" * 65})
+        assert resp.status == 400
+
+    @pytest.mark.asyncio
+    async def test_non_string_name_is_rejected(self, agents_dir):
+        resp = await _create(agents_dir, {"name": {"id": "x"}})
+        assert resp.status == 400
+
+    @pytest.mark.asyncio
+    async def test_non_object_body_is_rejected(self, agents_dir):
+        resp = await _create(agents_dir, ["name"])
+        assert resp.status == 400
+
+    @pytest.mark.asyncio
+    async def test_invalid_json_is_rejected(self, agents_dir):
+        resp = await _create(agents_dir, None)
+        assert resp.status == 400
+
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize(
+        "body,code",
+        [
+            ({}, "name_required"),
+            ({"name": "../escape"}, "invalid_agent_name"),
+            ({"name": "kirocrew"}, "agent_name_reserved"),
+            ({"name": "a" * 65}, "name_too_long"),
+            ({"name": "ok", "prompt": {"bad": 1}}, "prompt_invalid"),
+            ({"name": "ok", "description": "d" * 501}, "description_too_long"),
+            ({"name": "ok", "from": 7}, "invalid_from"),
+        ],
+    )
+    async def test_every_rejection_carries_a_machine_readable_code(
+        self, agents_dir, body, code
+    ):
+        """The dashboard branches on ``code``; the prose is advisory and localized
+        away, so an un-coded rejection is untranslatable by construction."""
+        resp = await _create(agents_dir, body)
+
+        assert resp.status == 400
+        assert _spec(resp)["code"] == code
+
+
+# ── CREATE: collisions ──
+
+
+class TestCreateCollisions:
+    @pytest.mark.asyncio
+    async def test_existing_filename_conflicts(self, agents_dir):
+        (agents_dir / "researcher.json").write_text('{"name": "researcher"}', encoding="utf-8")
+
+        resp = await _create(agents_dir, {"name": "researcher"})
+        assert resp.status == 409
+        assert _spec(resp)["code"] == "agent_template_exists"
+
+    @pytest.mark.asyncio
+    async def test_name_claimed_by_a_package_spec_conflicts(self, agents_dir):
+        """kiro-cli resolves an agent by its ``name`` field, so a second spec
+        declaring a package agent's name makes which one wins a coin flip — the
+        filename being free is not enough."""
+        (agents_dir / "somepkg-reviewer.json").write_text(
+            '{"name": "reviewer"}', encoding="utf-8"
+        )
+
+        resp = await _create(agents_dir, {"name": "reviewer"})
+
+        assert resp.status == 409
+        assert not (agents_dir / "reviewer.json").exists()
+
+    @pytest.mark.asyncio
+    async def test_an_unparseable_neighbour_does_not_block_creation(self, agents_dir):
+        (agents_dir / "broken.json").write_text("{not json", encoding="utf-8")
+
+        resp = await _create(agents_dir, {"name": "researcher"})
+        assert resp.status == 200
+
+    @pytest.mark.asyncio
+    async def test_existing_file_is_never_overwritten(self, agents_dir):
+        (agents_dir / "researcher.json").write_text(
+            '{"name": "researcher", "prompt": "original"}', encoding="utf-8"
+        )
+
+        await _create(agents_dir, {"name": "researcher", "prompt": "replacement"})
+
+        kept = json.loads((agents_dir / "researcher.json").read_text(encoding="utf-8"))
+        assert kept["prompt"] == "original"
+
+    @pytest.mark.asyncio
+    async def test_a_file_appearing_after_the_scan_is_not_clobbered(self, agents_dir):
+        """The TOCTOU window the exclusive create closes.
+
+        Reading the dir and writing the file are two steps. A concurrent POST for
+        the same name — or another tool writing the same path — lands in between,
+        and only the kernel can make "create only if absent" atomic. Stubbing the
+        scan to report an empty dir is exactly what the loser of that race sees,
+        so this reaches the write with the file already present.
+        """
+        victim = agents_dir / "researcher.json"
+        victim.write_text('{"name": "researcher", "prompt": "original"}', encoding="utf-8")
+
+        with patch(
+            "kiro_crew.dashboard.handlers.agents._read_agent_specs", return_value=[]
+        ):
+            resp = await _create(agents_dir, {"name": "researcher", "prompt": "replacement"})
+
+        assert resp.status == 409
+        assert json.loads(victim.read_text(encoding="utf-8"))["prompt"] == "original"
+
+
+# ── CREATE: copying an existing template ──
+
+
+class TestCreateFromCopy:
+    @pytest.fixture
+    def source(self, agents_dir) -> Path:
+        path = agents_dir / "base.json"
+        path.write_text(
+            json.dumps(
+                {
+                    "name": "base",
+                    "description": "the original",
+                    "prompt": "original prompt",
+                    "model": "some-model",
+                    "tools": ["execute_bash", "fs_read", "@kirocrew-core"],
+                    "allowedTools": ["fs_read", "@kirocrew-core"],
+                    "mcpServers": {"kirocrew-core": {"command": "mcp", "args": []}},
+                    "resources": ["skill://~/.kiro/skills/babysit/SKILL.md"],
+                    "toolsSettings": {"execute_bash": {"deniedCommands": ["rm -rf /*"]}},
+                }
+            ),
+            encoding="utf-8",
+        )
+        return path
+
+    @pytest.mark.asyncio
+    async def test_copy_inherits_the_privilege_surface(self, agents_dir, source):
+        """A copy is how a user gets a privileged tool surface: inherited from a
+        spec that already exists on disk, not assembled from a request body."""
+        await _create(agents_dir, {"name": "clone", "from": "base"})
+
+        written = json.loads((agents_dir / "clone.json").read_text(encoding="utf-8"))
+        assert written["tools"] == ["execute_bash", "fs_read", "@kirocrew-core"]
+        assert written["allowedTools"] == ["fs_read", "@kirocrew-core"]
+        assert written["toolsSettings"]["execute_bash"]["deniedCommands"] == ["rm -rf /*"]
+        assert written["mcpServers"] == {"kirocrew-core": {"command": "mcp", "args": []}}
+        assert written["resources"] == ["skill://~/.kiro/skills/babysit/SKILL.md"]
+
+    @pytest.mark.asyncio
+    async def test_copy_takes_the_new_name(self, agents_dir, source):
+        await _create(agents_dir, {"name": "clone", "from": "base"})
+
+        written = json.loads((agents_dir / "clone.json").read_text(encoding="utf-8"))
+        assert written["name"] == "clone"
+
+    @pytest.mark.asyncio
+    async def test_supplied_prompt_overrides_the_copied_one(self, agents_dir, source):
+        await _create(agents_dir, {"name": "clone", "from": "base", "prompt": "mine"})
+
+        written = json.loads((agents_dir / "clone.json").read_text(encoding="utf-8"))
+        assert written["prompt"] == "mine"
+
+    @pytest.mark.asyncio
+    async def test_source_is_left_untouched(self, agents_dir, source):
+        await _create(agents_dir, {"name": "clone", "from": "base", "prompt": "mine"})
+
+        original = json.loads(source.read_text(encoding="utf-8"))
+        assert original["name"] == "base"
+        assert original["prompt"] == "original prompt"
+
+    @pytest.mark.asyncio
+    async def test_copy_resolves_a_package_spec_by_its_name_field(self, agents_dir):
+        (agents_dir / "somepkg-reviewer.json").write_text(
+            json.dumps({"name": "reviewer", "tools": ["fs_read"]}), encoding="utf-8"
+        )
+
+        resp = await _create(agents_dir, {"name": "myreviewer", "from": "reviewer"})
+
+        assert resp.status == 200
+        written = json.loads((agents_dir / "myreviewer.json").read_text(encoding="utf-8"))
+        assert written["tools"] == ["fs_read"]
+
+    @pytest.mark.asyncio
+    async def test_unknown_source_is_a_404(self, agents_dir):
+        resp = await _create(agents_dir, {"name": "clone", "from": "nope"})
+
+        assert resp.status == 404
+        assert _spec(resp)["code"] == "source_template_not_found"
+        assert not (agents_dir / "clone.json").exists()
+
+    @pytest.mark.asyncio
+    async def test_bookkeeping_keys_are_not_inherited(self, agents_dir):
+        """kiro-cli rejects unknown fields and then resolves no agent at all, so a
+        copy of an older spec must not carry Kiro Crew's sidecar keys."""
+        (agents_dir / "legacy.json").write_text(
+            json.dumps({"name": "legacy", "model_managed": True, "cc_model": "x"}),
+            encoding="utf-8",
+        )
+
+        await _create(agents_dir, {"name": "clone", "from": "legacy"})
+
+        written = json.loads((agents_dir / "clone.json").read_text(encoding="utf-8"))
+        assert "model_managed" not in written
+        assert "cc_model" not in written
+
+
+# ── EDIT: prompt and description ──
+
+
+class TestPatchText:
+    @pytest.fixture
+    def template(self, agents_dir) -> Path:
+        path = agents_dir / "researcher.json"
+        path.write_text(
+            json.dumps({"name": "researcher", "prompt": "old", "description": "old desc"}),
+            encoding="utf-8",
+        )
+        return path
+
+    @pytest.mark.asyncio
+    async def test_prompt_is_written(self, agents_dir, template):
+        resp = await _patch(agents_dir, "researcher", {"prompt": "new prompt"})
+
+        assert resp.status == 200
+        assert json.loads(template.read_text(encoding="utf-8"))["prompt"] == "new prompt"
+        assert _spec(resp)["prompt"] == "new prompt"
+
+    @pytest.mark.asyncio
+    async def test_description_is_written(self, agents_dir, template):
+        resp = await _patch(agents_dir, "researcher", {"description": "new desc"})
+
+        assert resp.status == 200
+        assert json.loads(template.read_text(encoding="utf-8"))["description"] == "new desc"
+
+    @pytest.mark.asyncio
+    async def test_empty_value_drops_the_key(self, agents_dir, template):
+        await _patch(agents_dir, "researcher", {"prompt": ""})
+
+        assert "prompt" not in json.loads(template.read_text(encoding="utf-8"))
+
+    @pytest.mark.asyncio
+    async def test_a_file_prompt_can_be_replaced_with_inline_text(self, agents_dir):
+        """A copied template inherits ``prompt: file://…`` from its source; the
+        editor has to be able to detach it."""
+        path = agents_dir / "clone.json"
+        path.write_text(
+            json.dumps({"name": "clone", "prompt": "file:///somewhere/prompt.md"}),
+            encoding="utf-8",
+        )
+
+        await _patch(agents_dir, "clone", {"prompt": "inline now"})
+
+        assert json.loads(path.read_text(encoding="utf-8"))["prompt"] == "inline now"
+
+    @pytest.mark.asyncio
+    async def test_non_string_prompt_is_rejected(self, agents_dir, template):
+        resp = await _patch(agents_dir, "researcher", {"prompt": {"file": "x"}})
+
+        assert resp.status == 400
+        assert json.loads(template.read_text(encoding="utf-8"))["prompt"] == "old"
+
+    @pytest.mark.asyncio
+    async def test_overlong_prompt_is_rejected(self, agents_dir, template):
+        resp = await _patch(agents_dir, "researcher", {"prompt": "x" * 100_001})
+
+        assert resp.status == 400
+        assert json.loads(template.read_text(encoding="utf-8"))["prompt"] == "old"
+
+    @pytest.mark.asyncio
+    async def test_a_rejected_combined_patch_applies_nothing(self, agents_dir, template):
+        """Validation runs before any mutation, so a bad prompt cannot leave a
+        half-applied model change behind."""
+        resp = await _patch(
+            agents_dir, "researcher", {"model": "new-model", "prompt": {"bad": 1}}
+        )
+
+        assert resp.status == 400
+        written = json.loads(template.read_text(encoding="utf-8"))
+        assert "model" not in written
+        assert written["prompt"] == "old"
+
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize("field", ["prompt", "description"])
+    async def test_managed_specs_refuse_the_edit(self, agents_dir, field):
+        """Kiro Crew rewrites these fields on every install, so accepting the edit
+        would show the user a save that silently reverts."""
+        path = agents_dir / "kirocrew.json"
+        path.write_text(
+            json.dumps({"name": "kirocrew", "prompt": "file://p.md", "description": "d"}),
+            encoding="utf-8",
+        )
+
+        resp = await _patch(agents_dir, "kirocrew", {field: "hijacked"})
+
+        assert resp.status == 400
+        assert _spec(resp)["code"] == "agent_template_managed"
+        assert json.loads(path.read_text(encoding="utf-8"))[field] != "hijacked"
+
+    @pytest.mark.asyncio
+    async def test_managed_specs_still_accept_a_model_patch(self, agents_dir):
+        """Only the rewritten fields are refused; the model pin is a real sidecar
+        -backed setting and must keep working."""
+        path = agents_dir / "kirocrew.json"
+        path.write_text(json.dumps({"name": "kirocrew"}), encoding="utf-8")
+
+        resp = await _patch(agents_dir, "kirocrew", {"model": "some-model"})
+
+        assert resp.status == 200
+        assert json.loads(path.read_text(encoding="utf-8"))["model"] == "some-model"
+
+
+# ── The managed flag the editor gates on ──
+
+
+class TestManagedFlag:
+    @pytest.mark.asyncio
+    async def test_a_created_template_is_not_managed(self, agents_dir):
+        await _create(agents_dir, {"name": "researcher"})
+
+        resp = await _get(agents_dir, "researcher")
+        assert _spec(resp)["managed"] is False
+
+    @pytest.mark.asyncio
+    async def test_a_kirocrew_owned_spec_is_managed(self, agents_dir):
+        (agents_dir / "kirocrew.json").write_text('{"name": "kirocrew"}', encoding="utf-8")
+
+        resp = await _get(agents_dir, "kirocrew")
+        assert _spec(resp)["managed"] is True
+
+    @pytest.mark.asyncio
+    async def test_the_builtin_default_is_managed(self, agents_dir):
+        resp = await _get(agents_dir, "default")
+        assert _spec(resp)["managed"] is True
diff --git a/website/src/api/client.ts b/website/src/api/client.ts
index 4c5ba5156d7..aa7336fd33a 100644
--- a/website/src/api/client.ts
+++ b/website/src/api/client.ts
@@ -1219,6 +1219,7 @@ export const api = {
   // Agents
   agentsInstalled: () => fetch('/api/agents/installed').then(j),
   agentDetail: (name: string) => fetch('/api/agents/detail/' + encodeURIComponent(name)).then(j),
+  agentCreate: (body: object) => fetch('/api/agents/detail', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body) }).then(j),
   agentPatch: (name: string, body: object) => fetch('/api/agents/detail/' + encodeURIComponent(name), { method: 'PATCH', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body) }).then(j),
   agentDelete: (name: string) => fetch('/api/agents/detail/' + encodeURIComponent(name), { method: 'DELETE' }).then(j),
   // KiroCrew agents
diff --git a/website/src/components/AgentTemplateCreateDialog.tsx b/website/src/components/AgentTemplateCreateDialog.tsx
new file mode 100644
index 00000000000..0c76c866852
--- /dev/null
+++ b/website/src/components/AgentTemplateCreateDialog.tsx
@@ -0,0 +1,142 @@
+import { useEffect, useState } from 'react'
+import { api } from '../api/client'
+import { Btn, SendBtn, Input } from './ui'
+import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogBody, DialogFooter } from './ui/dialog'
+import SimpleSelect from './SimpleSelect'
+import InfoTip from './InfoTip'
+
+import { i18nT } from '../i18n/t'
+/**
+ * The one authoring surface for a kiro agent template (`~/.kiro/agents/<name>.json`).
+ *
+ * Both entry points share it: "New template" opens it with no source, and
+ * "Duplicate" opens it with `initialFrom` set. They differ only in that one
+ * field, and a second component for the copy case would have to keep the same
+ * name validation, the same conflict messages, and the same tool-surface
+ * explainer in sync.
+ *
+ * The dialog deliberately does NOT offer `tools` / `allowedTools` /
+ * `deniedCommands`. Those are the privilege surface — the auto-approve list and
+ * the bash deny patterns — and the create endpoint refuses them from a request
+ * body for that reason. A blank template gets a read-only auto-approve baseline;
+ * copying a template inherits whatever that one was already trusted with.
+ */
+export default function AgentTemplateCreateDialog({
+  open,
+  templates,
+  initialFrom,
+  onClose,
+  onCreated,
+}: {
+  open: boolean
+  /** Names of installed templates offered as a starting point. */
+  templates: string[]
+  /** Preselected source, for the Duplicate entry point. */
+  initialFrom?: string
+  onClose: () => void
+  onCreated: (name: string) => void
+}) {
+  const [name, setName] = useState('')
+  const [description, setDescription] = useState('')
+  const [prompt, setPrompt] = useState('')
+  const [from, setFrom] = useState(initialFrom || '')
+  const [error, setError] = useState('')
+  const [submitting, setSubmitting] = useState(false)
+
+  // Reset on each open so a dismissed attempt does not resurface half-typed,
+  // and so Duplicate always reflects the row the user actually clicked.
+  useEffect(() => {
+    if (!open) return
+    setName(initialFrom ? `${initialFrom}-copy` : '')
+    setDescription('')
+    setPrompt('')
+    setFrom(initialFrom || '')
+    setError('')
+    setSubmitting(false)
+  }, [open, initialFrom])
+
+  const submit = async () => {
+    setError('')
+    const n = name.trim()
+    if (!n) { setError(i18nT('components.agentTemplateCreateDialog.name_is_required')); return }
+    setSubmitting(true)
+    try {
+      const body: Record<string, string> = { name: n }
+      if (description.trim()) body.description = description.trim()
+      if (prompt.trim()) body.prompt = prompt
+      if (from) body.from = from
+      const r: { ok?: boolean; name?: string; error?: string } = await api.agentCreate(body)
+      // The server owns the rules the form cannot check (reserved names, a name
+      // already claimed by a package spec), so its message is shown verbatim
+      // rather than replaced with a guess.
+      if (r.error) { setError(r.error); setSubmitting(false); return }
+      onCreated(r.name || n)
+    } catch (e) {
+      setError(e instanceof Error ? e.message : i18nT('components.agentTemplateCreateDialog.failed_to_create_template'))
+    } finally {
+      setSubmitting(false)
+    }
+  }
+
+  return (
+    <Dialog open={open} onOpenChange={next => { if (!next) onClose() }}>
+      <DialogContent maxWidth={520} aria-label={i18nT('components.agentTemplateCreateDialog.new_agent_template')}>
+        <DialogHeader>
+          <DialogTitle>{initialFrom ? i18nT('components.agentTemplateCreateDialog.duplicate_agent_template') : i18nT('components.agentTemplateCreateDialog.new_agent_template')}</DialogTitle>
+        </DialogHeader>
+        <DialogBody>
+          <div className="flex flex-col gap-3.5">
+            <div className="flex flex-col gap-1">
+              <div className="flex items-center gap-1">
+                {/* Native input associated via htmlFor+id; label-has-for's nesting requirement is a false positive. */}
+                {/* eslint-disable-next-line jsx-a11y/label-has-for */}
+                <label htmlFor="tpl-name" className="text-[11px] text-muted uppercase tracking-wider font-medium">{i18nT('components.agentTemplateCreateDialog.name')}</label>
+                <InfoTip text={i18nT('components.agentTemplateCreateDialog.also_the_config_filename_and_the_value_passed_to')} />
+              </div>
+              <Input id="tpl-name" placeholder={i18nT('components.agentTemplateCreateDialog.e_g_researcher')} value={name} onChange={e => setName(e.target.value)} autoFocus />
+            </div>
+            <div className="flex flex-col gap-1">
+              <div className="flex items-center gap-1">
+                <span className="text-[11px] text-muted uppercase tracking-wider font-medium">{i18nT('components.agentTemplateCreateDialog.start_from')}</span>
+                <InfoTip text={i18nT('components.agentTemplateCreateDialog.copies_an_existing_template_s_tools_mcp_servers')} />
+              </div>
+              <SimpleSelect
+                options={templates}
+                value={from}
+                onChange={setFrom}
+                clearLabel={i18nT('components.agentTemplateCreateDialog.blank_template')}
+                triggerFallback={i18nT('components.agentTemplateCreateDialog.blank_template')}
+                aria-label={i18nT('components.agentTemplateCreateDialog.start_from_template')}
+              />
+            </div>
+            <div className="flex flex-col gap-1">
+              {/* eslint-disable-next-line jsx-a11y/label-has-for */}
+              <label htmlFor="tpl-desc" className="text-[11px] text-muted uppercase tracking-wider font-medium">{i18nT('components.agentTemplateCreateDialog.description')}</label>
+              <Input id="tpl-desc" placeholder={i18nT('components.agentTemplateCreateDialog.what_this_agent_is_for')} value={description} onChange={e => setDescription(e.target.value)} />
+            </div>
+            <div className="flex flex-col gap-1">
+              <div className="flex items-center gap-1">
+                {/* eslint-disable-next-line jsx-a11y/label-has-for */}
+                <label htmlFor="tpl-prompt" className="text-[11px] text-muted uppercase tracking-wider font-medium">{i18nT('components.agentTemplateCreateDialog.system_prompt')}</label>
+                <InfoTip text={i18nT('components.agentTemplateCreateDialog.leave_empty_to_keep_the_copied_template_s_prompt')} />
+              </div>
+              <textarea
+                id="tpl-prompt"
+                className="w-full bg-bg-elevated border border-border rounded-md px-3 py-2.5 text-text text-[13px] font-mono outline-none transition-colors focus-ring resize-y min-h-[110px]"
+                rows={6}
+                placeholder={i18nT('components.agentTemplateCreateDialog.you_are_a_research_assistant')}
+                value={prompt}
+                onChange={e => setPrompt(e.target.value)}
+              />
+            </div>
+            {error && <div className="text-danger text-[13px]" role="alert">{error}</div>}
+          </div>
+        </DialogBody>
+        <DialogFooter>
+          <Btn onClick={onClose}>{i18nT('components.agentTemplateCreateDialog.cancel')}</Btn>
+          <SendBtn onClick={submit} disabled={submitting}>{submitting ? i18nT('components.agentTemplateCreateDialog.creating') : i18nT('components.agentTemplateCreateDialog.create_template')}</SendBtn>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/website/src/components/AgentTemplateEditor.tsx b/website/src/components/AgentTemplateEditor.tsx
new file mode 100644
index 00000000000..d1842116847
--- /dev/null
+++ b/website/src/components/AgentTemplateEditor.tsx
@@ -0,0 +1,135 @@
+import { useEffect, useState } from 'react'
+import { useMutation } from '@tanstack/react-query'
+import { Check, Lock } from 'lucide-react'
+import { api } from '../api/client'
+import { Btn, Input } from './ui'
+import InfoTip from './InfoTip'
+import ErrorNotice from './ErrorNotice'
+
+import { i18nT } from '../i18n/t'
+interface Props {
+  /** Agent template name (the `{name}` in `/api/agents/detail/{name}`). */
+  agentName: string
+  description: string
+  /**
+   * The spec's `prompt`. A `file://…` value is a reference to a prompt file
+   * rather than prose; it is shown as-is so replacing it is a deliberate act.
+   */
+  prompt: string
+  /**
+   * True when Kiro Crew owns the spec and rewrites it on install. Served by the
+   * backend rather than derived here, so the editor disables exactly the fields
+   * PATCH refuses instead of keeping a second copy of the owned-file list.
+   */
+  managed?: boolean
+  /**
+   * Called after a successful save with the agent the save was issued FOR. A
+   * slow PATCH can resolve after the selection has moved on, and the caller must
+   * drop a response that no longer matches what is on screen — otherwise agent
+   * A's prompt renders under agent B and the next edit writes it into B's spec.
+   */
+  onSaved: (agentName: string, patch: { description?: string; prompt?: string }) => void
+}
+
+/**
+ * Edit an agent template's description and system prompt.
+ *
+ * Unlike the model picker and skills editor on this page, these two save on an
+ * explicit button rather than on change: a prompt is prose that is typed over
+ * many keystrokes, and a save-per-keystroke would write a spec kiro-cli reads
+ * for every half-finished sentence.
+ */
+export default function AgentTemplateEditor({ agentName, description, prompt, managed, onSaved }: Props) {
+  const [desc, setDesc] = useState(description)
+  const [text, setText] = useState(prompt)
+  const [error, setError] = useState('')
+
+  // Re-seed when the selection changes OR when a value arrives from the server
+  // (the detail fetch resolves after first paint). Keyed on the agent as well as
+  // the values so switching to a template whose prompt happens to be identical
+  // still resets any unsaved edit.
+  useEffect(() => {
+    setDesc(description)
+    setText(prompt)
+    setError('')
+  }, [agentName, description, prompt])
+
+  const saveMut = useMutation({
+    mutationFn: (patch: { description?: string; prompt?: string }) =>
+      api.agentPatch(agentName, patch).then((r: { error?: string }) => {
+        // A 400 still resolves the fetch, so the error has to be read off the
+        // body rather than left to a rejected promise.
+        if (r?.error) throw new Error(r.error)
+        return r
+      }),
+    onMutate: () => setError(''),
+    onSuccess: (_r, patch) => onSaved(agentName, patch),
+    onError: (e: unknown) => setError(e instanceof Error ? e.message : i18nT('components.agentTemplateEditor.save_failed')),
+  })
+
+  const dirtyDesc = desc !== description
+  const dirtyPrompt = text !== prompt
+  const dirty = dirtyDesc || dirtyPrompt
+
+  const save = () => {
+    const patch: { description?: string; prompt?: string } = {}
+    if (dirtyDesc) patch.description = desc
+    if (dirtyPrompt) patch.prompt = text
+    if (Object.keys(patch).length) saveMut.mutate(patch)
+  }
+
+  const revert = () => { setDesc(description); setText(prompt); setError('') }
+
+  if (managed) {
+    return (
+      <div className="mb-3 flex flex-col gap-3">
+        {description && <div className="text-[13px] text-muted leading-relaxed">{description}</div>}
+        {prompt && (
+          <div className="flex flex-col gap-1">
+            <div className="text-[12px] text-muted font-medium uppercase tracking-wider">{i18nT('components.agentTemplateEditor.system_prompt')}</div>
+            <pre className="text-[12px] text-text font-mono bg-bg-elevated rounded-md p-2.5 border border-border overflow-x-auto max-h-[160px] overflow-y-auto whitespace-pre-wrap leading-relaxed">{prompt.startsWith('file://') ? prompt : prompt.slice(0, 2000)}</pre>
+          </div>
+        )}
+        <div className="text-[11.5px] text-muted flex items-start gap-1">
+          <Lock className="lucide-inline shrink-0" /> <span>{i18nT('components.agentTemplateEditor.kiro_crew_rewrites_this_template_on_every_instal')}</span>
+        </div>
+      </div>
+    )
+  }
+
+  return (
+    <div className="mb-3 flex flex-col gap-3">
+      <div className="flex flex-col gap-1">
+        <div className="flex items-center gap-1">
+          {/* Native input associated via htmlFor+id; label-has-for's nesting requirement is a false positive. */}
+          {/* eslint-disable-next-line jsx-a11y/label-has-for */}
+          <label htmlFor="agent-desc" className="text-[12px] text-muted font-medium uppercase tracking-wider">{i18nT('components.agentTemplateEditor.description')}</label>
+          <InfoTip text={i18nT('components.agentTemplateEditor.shown_in_the_agent_picker_and_the_crew_editor')} />
+        </div>
+        <Input id="agent-desc" className="w-full" placeholder={i18nT('components.agentTemplateEditor.what_this_agent_is_for')} value={desc} onChange={e => setDesc(e.target.value)} />
+      </div>
+      <div className="flex flex-col gap-1">
+        <div className="flex items-center gap-1">
+          {/* eslint-disable-next-line jsx-a11y/label-has-for */}
+          <label htmlFor="agent-prompt" className="text-[12px] text-muted font-medium uppercase tracking-wider">{i18nT('components.agentTemplateEditor.system_prompt')}</label>
+          <InfoTip text={i18nT('components.agentTemplateEditor.a_file_value_points_at_a_prompt_file_on_disk_rep')} />
+        </div>
+        <textarea
+          id="agent-prompt"
+          className="w-full bg-bg-elevated border border-border rounded-md p-2.5 text-text text-[12px] font-mono outline-none resize-y leading-relaxed transition-colors focus-ring min-h-[140px]"
+          rows={8}
+          placeholder={i18nT('components.agentTemplateEditor.you_are_a_research_assistant')}
+          value={text}
+          onChange={e => setText(e.target.value)}
+        />
+      </div>
+      {error && <ErrorNotice message={error} variant="inline" onDismiss={() => setError('')} />}
+      <div className="flex items-center gap-2">
+        <Btn primary onClick={save} disabled={!dirty || saveMut.isPending}>
+          {saveMut.isPending ? i18nT('components.agentTemplateEditor.saving') : saveMut.isSuccess && !dirty ? <><Check className="lucide-inline" /> {i18nT('components.agentTemplateEditor.saved')}</> : i18nT('components.agentTemplateEditor.save')}
+        </Btn>
+        {dirty && <Btn onClick={revert}>{i18nT('components.agentTemplateEditor.revert')}</Btn>}
+      </div>
+    </div>
+  )
+}
diff --git a/website/src/i18n/locales/bn.json b/website/src/i18n/locales/bn.json
index db3b60be817..f0e01d2bd8b 100644
--- a/website/src/i18n/locales/bn.json
+++ b/website/src/i18n/locales/bn.json
@@ -5666,6 +5666,41 @@
       "subtitle": "আগে থেকে তৈরি একটি সময়সূচি থেকে শুরু করুন — কিছু চালু হওয়ার আগে আপনি তা দেখে সংরক্ষণ করবেন।",
       "title": "সময়সূচি টেমপ্লেট",
       "use_template": "{{title}} টেমপ্লেট ব্যবহার করুন"
+    },
+    "agentTemplateCreateDialog": {
+      "also_the_config_filename_and_the_value_passed_to": "এটি কনফিগ ফাইলের নাম, আর --agent-এ পাঠানো মানও। শুধু অক্ষর, সংখ্যা, ডট, ড্যাশ ও আন্ডারস্কোর চলবে।",
+      "blank_template": "ফাঁকা টেমপ্লেট",
+      "cancel": "বাতিল",
+      "copies_an_existing_template_s_tools_mcp_servers": "একটি বিদ্যমান টেমপ্লেটের টুল, MCP সার্ভার ও স্কিল কপি করে। ফাঁকা টেমপ্লেট জিজ্ঞাসা ছাড়াই পড়তে ও খুঁজতে পারে, কিন্তু ফাইল লেখার বা কমান্ড চালানোর আগে অনুমতি নিতে হয়।",
+      "create_template": "টেমপ্লেট তৈরি করো",
+      "creating": "তৈরি হচ্ছে…",
+      "description": "বিবরণ",
+      "duplicate_agent_template": "এজেন্ট টেমপ্লেট ডুপ্লিকেট",
+      "e_g_researcher": "যেমন researcher",
+      "failed_to_create_template": "টেমপ্লেট তৈরি করা যায়নি",
+      "leave_empty_to_keep_the_copied_template_s_prompt": "কপি করা টেমপ্লেটের প্রম্পট রাখতে, বা ফাঁকা টেমপ্লেটে ব্যাকএন্ডের ডিফল্ট ব্যবহার করতে খালি রাখো। পরে বদলানো যাবে।",
+      "name": "নাম",
+      "name_is_required": "নাম দেওয়া দরকার",
+      "new_agent_template": "নতুন এজেন্ট টেমপ্লেট",
+      "start_from": "শুরুর ভিত্তি",
+      "start_from_template": "টেমপ্লেট থেকে শুরু",
+      "system_prompt": "সিস্টেম প্রম্পট",
+      "what_this_agent_is_for": "এই এজেন্ট কী কাজের জন্য",
+      "you_are_a_research_assistant": "তুমি একজন রিসার্চ অ্যাসিস্ট্যান্ট…"
+    },
+    "agentTemplateEditor": {
+      "a_file_value_points_at_a_prompt_file_on_disk_rep": "file:// দিয়ে দেওয়া মান ডিস্কে থাকা একটি প্রম্পট ফাইলকে দেখায়। এখানে টেক্সট বসিয়ে দিলে টেমপ্লেটটি সেই ফাইল থেকে আলাদা হয়ে যাবে।",
+      "description": "বিবরণ",
+      "kiro_crew_rewrites_this_template_on_every_instal": "প্রতিবার ইনস্টলের সময় Kiro Crew এই টেমপ্লেটটি আবার লেখে, তাই এর প্রম্পট ও বিবরণ এখানে বদলানো যায় না। বদলানো যায় এমন কপি পেতে এটি ডুপ্লিকেট করো।",
+      "revert": "ফিরিয়ে নাও",
+      "save": "সেভ করো",
+      "save_failed": "সেভ করা যায়নি",
+      "saved": "সেভ হয়েছে",
+      "saving": "সেভ হচ্ছে…",
+      "shown_in_the_agent_picker_and_the_crew_editor": "এজেন্ট পিকার ও ক্রু এডিটরে দেখানো হবে।",
+      "system_prompt": "সিস্টেম প্রম্পট",
+      "what_this_agent_is_for": "এই এজেন্ট কী কাজের জন্য",
+      "you_are_a_research_assistant": "তুমি একজন রিসার্চ অ্যাসিস্ট্যান্ট…"
     }
   },
   "hooks": {
@@ -5846,11 +5881,12 @@
       "skills": "স্কিল",
       "spawn_tasks_from_chat_or_cli": "চ্যাট বা CLI থেকে টাস্ক চালু করুন",
       "subagents": "সাবএজেন্ট",
-      "system_prompt": "সিস্টেম প্রম্পট",
       "tools": "টুল",
       "tools_2": "টুল",
       "type_to_filter": "ফিল্টার করতে টাইপ করুন…",
-      "usage": "ব্যবহার"
+      "usage": "ব্যবহার",
+      "duplicate": "ডুপ্লিকেট",
+      "new_template": "নতুন টেমপ্লেট"
     },
     "aidlc": {
       "dagView": {
diff --git a/website/src/i18n/locales/de.json b/website/src/i18n/locales/de.json
index 598f786e5f4..6b76096d0f1 100644
--- a/website/src/i18n/locales/de.json
+++ b/website/src/i18n/locales/de.json
@@ -5585,6 +5585,41 @@
     "searchableSelect": {
       "no_matches": "Keine Treffer",
       "search": "Suchen…"
+    },
+    "agentTemplateCreateDialog": {
+      "also_the_config_filename_and_the_value_passed_to": "Außerdem der Name der Konfigurationsdatei und der Wert, der an --agent übergeben wird. Nur Buchstaben, Ziffern, Punkt, Bindestrich und Unterstrich.",
+      "blank_template": "Leere Vorlage",
+      "cancel": "Abbrechen",
+      "copies_an_existing_template_s_tools_mcp_servers": "Kopiert Tools, MCP-Server und Skills einer bestehenden Vorlage. Eine leere Vorlage kann ohne Rückfrage lesen und suchen, muss aber fragen, bevor sie Dateien schreibt oder einen Befehl ausführt.",
+      "create_template": "Vorlage erstellen",
+      "creating": "Wird erstellt…",
+      "description": "Beschreibung",
+      "duplicate_agent_template": "Agentenvorlage duplizieren",
+      "e_g_researcher": "z. B. researcher",
+      "failed_to_create_template": "Vorlage konnte nicht erstellt werden",
+      "leave_empty_to_keep_the_copied_template_s_prompt": "Leer lassen, um den Prompt der kopierten Vorlage zu behalten oder bei einer leeren Vorlage den Standard des Backends zu verwenden. Später bearbeitbar.",
+      "name": "Name",
+      "name_is_required": "Name ist erforderlich",
+      "new_agent_template": "Neue Agentenvorlage",
+      "start_from": "Ausgangspunkt",
+      "start_from_template": "Von Vorlage starten",
+      "system_prompt": "System-Prompt",
+      "what_this_agent_is_for": "Wofür dieser Agent gedacht ist",
+      "you_are_a_research_assistant": "Du bist ein Forschungsassistent…"
+    },
+    "agentTemplateEditor": {
+      "a_file_value_points_at_a_prompt_file_on_disk_rep": "Ein file://-Wert verweist auf eine Prompt-Datei auf der Festplatte. Wenn du ihn hier durch Text ersetzt, wird die Vorlage von dieser Datei gelöst.",
+      "description": "Beschreibung",
+      "kiro_crew_rewrites_this_template_on_every_instal": "Kiro Crew schreibt diese Vorlage bei jeder Installation neu, daher sind ihr Prompt und ihre Beschreibung hier nicht bearbeitbar. Dupliziere sie, um eine bearbeitbare Kopie zu erhalten.",
+      "revert": "Zurücksetzen",
+      "save": "Speichern",
+      "save_failed": "Speichern fehlgeschlagen",
+      "saved": "Gespeichert",
+      "saving": "Wird gespeichert…",
+      "shown_in_the_agent_picker_and_the_crew_editor": "Wird in der Agentenauswahl und im Crew-Editor angezeigt.",
+      "system_prompt": "System-Prompt",
+      "what_this_agent_is_for": "Wofür dieser Agent gedacht ist",
+      "you_are_a_research_assistant": "Du bist ein Forschungsassistent…"
     }
   },
   "hooks": {
@@ -5765,11 +5800,12 @@
       "skills": "Skills",
       "spawn_tasks_from_chat_or_cli": "Aufgaben aus dem Chat oder der CLI starten",
       "subagents": "Subagenten",
-      "system_prompt": "System-Prompt",
       "tools": "Werkzeuge",
       "tools_2": "Werkzeuge",
       "type_to_filter": "Zum Filtern tippen…",
-      "usage": "Verbrauch"
+      "usage": "Verbrauch",
+      "duplicate": "Duplizieren",
+      "new_template": "Neue Vorlage"
     },
     "aidlc": {
       "dagView": {
diff --git a/website/src/i18n/locales/en-XA.json b/website/src/i18n/locales/en-XA.json
index 7e33b8bfe9a..095fa08b5d9 100644
--- a/website/src/i18n/locales/en-XA.json
+++ b/website/src/i18n/locales/en-XA.json
@@ -5295,6 +5295,41 @@
       "no_thanks": "[Ñøţ ñøẁ ···········]",
       "yes_move_it": "[Ṁøṽè ìţ ···········]"
     },
+    "agentTemplateCreateDialog": {
+      "cancel": "[Çàñçèĺ ·········]",
+      "description": "[Ðèşçŕìþţìøñ ··········]",
+      "e_g_researcher": "[è.ğ. ŕèşèàŕçĥèŕ ··············]",
+      "name": "[Ñàɱè ······]",
+      "new_agent_template": "[Ñèẁ àğèñţ ţèɱþĺàţè ················]",
+      "start_from": "[Şţàŕţ ƒŕøɱ ···············]",
+      "start_from_template": "[Şţàŕţ ƒŕøɱ ţèɱþĺàţè ·················]",
+      "system_prompt": "[Şýşţèɱ þŕøɱþţ ············]",
+      "what_this_agent_is_for": "[Ẁĥàţ ţĥìş àğèñţ ìş ƒøŕ ···············]",
+      "you_are_a_research_assistant": "[Ýøù àŕè à ŕèşèàŕçĥ àşşìşţàñţ… ····················]",
+      "name_is_required": "[Ñàɱè ìş ŕèǫùìŕèð ··············]",
+      "failed_to_create_template": "[Ƒàìĺèð ţø çŕèàţè ţèɱþĺàţè ··················]",
+      "duplicate_agent_template": "[Ðùþĺìçàţè àğèñţ ţèɱþĺàţè ·················]",
+      "also_the_config_filename_and_the_value_passed_to": "[Àĺşø ţĥè çøñƒìğ ƒìĺèñàɱè àñð ţĥè ṽàĺùè þàşşèð ţø --àğèñţ. Ĺèţţèŕş, ðìğìţş, ðøţ, ðàşĥ àñð ùñðèŕşçøŕè øñĺý. ································]",
+      "copies_an_existing_template_s_tools_mcp_servers": "[Çøþìèş àñ èẋìşţìñğ ţèɱþĺàţè'ş ţøøĺş, ṀÇÞ şèŕṽèŕş àñð şķìĺĺş. À ƀĺàñķ ţèɱþĺàţè çàñ ŕèàð àñð şèàŕçĥ ẁìţĥøùţ àşķìñğ, ƀùţ ĥàş ţø àşķ ƀèƒøŕè ẁŕìţìñğ ƒìĺèş øŕ ŕùññìñğ à çøɱɱàñð. ···················································]",
+      "blank_template": "[Ɓĺàñķ ţèɱþĺàţè ·············]",
+      "leave_empty_to_keep_the_copied_template_s_prompt": "[Ĺèàṽè èɱþţý ţø ķèèþ ţĥè çøþìèð ţèɱþĺàţè'ş þŕøɱþţ, øŕ ţø ùşè ţĥè ƀàçķèñð'ş ðèƒàùĺţ øñ à ƀĺàñķ øñè. Èðìţàƀĺè ĺàţèŕ. ··································]",
+      "creating": "[Çŕèàţìñğ… ··············]",
+      "create_template": "[Çŕèàţè ţèɱþĺàţè ··············]"
+    },
+    "agentTemplateEditor": {
+      "description": "[Ðèşçŕìþţìøñ ··········]",
+      "kiro_crew_rewrites_this_template_on_every_instal": "[Ķìŕø Çŕèẁ ŕèẁŕìţèş ţĥìş ţèɱþĺàţè øñ èṽèŕý ìñşţàĺĺ, şø ìţş þŕøɱþţ àñð ðèşçŕìþţìøñ àŕè ñøţ èðìţàƀĺè ĥèŕè. Ðùþĺìçàţè ìţ ţø ğèţ àñ èðìţàƀĺè çøþý. ··········································]",
+      "revert": "[Ŕèṽèŕţ ·········]",
+      "saved": "[Şàṽèð ········]",
+      "system_prompt": "[Şýşţèɱ þŕøɱþţ ············]",
+      "what_this_agent_is_for": "[Ẁĥàţ ţĥìş àğèñţ ìş ƒøŕ ···············]",
+      "you_are_a_research_assistant": "[Ýøù àŕè à ŕèşèàŕçĥ àşşìşţàñţ… ····················]",
+      "save_failed": "[Şàṽè ƒàìĺèð ··········]",
+      "shown_in_the_agent_picker_and_the_crew_editor": "[Şĥøẁñ ìñ ţĥè àğèñţ þìçķèŕ àñð ţĥè çŕèẁ èðìţøŕ. ·······················]",
+      "a_file_value_points_at_a_prompt_file_on_disk_rep": "[À ƒìĺè:// ṽàĺùè þøìñţş àţ à þŕøɱþţ ƒìĺè øñ ðìşķ. Ŕèþĺàçìñğ ìţ ẁìţĥ ţèẋţ ĥèŕè ðèţàçĥèş ţĥè ţèɱþĺàţè ƒŕøɱ ţĥàţ ƒìĺè. ··································]",
+      "saving": "[Şàṽìñğ… ···········]",
+      "save": "[Şàṽè ······]"
+    },
     "artifactChatPanel": {
       "agent_chat": "[Àğèñţ çĥàţ ···············]",
       "artifact_companion_chat": "[Àŕţìƒàçţ çøɱþàñìøñ çĥàţ ················]",
@@ -5734,11 +5769,12 @@
       "skills": "[Şķìĺĺş ·········]",
       "spawn_tasks_from_chat_or_cli": "[Şþàẁñ ţàşķş ƒŕøɱ çĥàţ øŕ ÇĹÌ ····················]",
       "subagents": "[Şùƀàğèñţş ··············]",
-      "system_prompt": "[Şýşţèɱ Þŕøɱþţ ············]",
       "tools": "[Ţøøĺş ········]",
       "tools_2": "[ţøøĺş ········]",
       "type_to_filter": "[Ţýþè ţø ƒìĺţèŕ… ··············]",
       "usage": "[Ùşàğè ········]",
+      "duplicate": "[Ðùþĺìçàţè ··············]",
+      "new_template": "[Ñèẁ ţèɱþĺàţè ···········]",
       "agent_templates_grouped_by_package_update_and_un": "[Àğèñţ ţèɱþĺàţèş ğŕøùþèð ƀý þàçķàğè. Ùþðàţè àñð ùñìñşţàĺĺ àţ þàçķàğè ĺèṽèĺ. Ìñðìṽìðùàĺ àğèñţş çàñ ƀè ðèĺèţèð (ŕèɱøṽèş çøñƒìğ ƒìĺè). ·······································]",
       "consumption_for_current_billing_period": "[{{provider}} çøñşùɱþţìøñ ƒøŕ ţĥè çùŕŕèñţ ƀìĺĺìñğ þèŕìøð. Çàçĥèð 10 ɱìñ. ·····················]",
       "context_window_usage_tip": "[Ĺìṽè çøñţèẋţ ẁìñðøẁ ùţìĺìžàţìøñ þèŕ àçţìṽè {{label}} şèşşìøñ. Çùşţøɱ àğèñţş şĥøẁ ţĥèìŕ çøñƒìğùŕèð ɱøðèĺ. Çøɱþàçţìøñ ţŕìğğèŕş àţ 90%. ·····································]",
diff --git a/website/src/i18n/locales/en.json b/website/src/i18n/locales/en.json
index 3738a075d17..384d98a9c72 100644
--- a/website/src/i18n/locales/en.json
+++ b/website/src/i18n/locales/en.json
@@ -3989,6 +3989,41 @@
       "move_to_folder_question": "Move this session to {{folder}}?",
       "no_thanks": "Not now",
       "yes_move_it": "Move it"
+    },
+    "agentTemplateCreateDialog": {
+      "cancel": "Cancel",
+      "description": "Description",
+      "e_g_researcher": "e.g. researcher",
+      "name": "Name",
+      "new_agent_template": "New agent template",
+      "start_from": "Start from",
+      "start_from_template": "Start from template",
+      "system_prompt": "System prompt",
+      "what_this_agent_is_for": "What this agent is for",
+      "you_are_a_research_assistant": "You are a research assistant…",
+      "name_is_required": "Name is required",
+      "failed_to_create_template": "Failed to create template",
+      "duplicate_agent_template": "Duplicate agent template",
+      "also_the_config_filename_and_the_value_passed_to": "Also the config filename and the value passed to --agent. Letters, digits, dot, dash and underscore only.",
+      "copies_an_existing_template_s_tools_mcp_servers": "Copies an existing template's tools, MCP servers and skills. A blank template can read and search without asking, but has to ask before writing files or running a command.",
+      "blank_template": "Blank template",
+      "leave_empty_to_keep_the_copied_template_s_prompt": "Leave empty to keep the copied template's prompt, or to use the backend's default on a blank one. Editable later.",
+      "creating": "Creating…",
+      "create_template": "Create template"
+    },
+    "agentTemplateEditor": {
+      "description": "Description",
+      "kiro_crew_rewrites_this_template_on_every_instal": "Kiro Crew rewrites this template on every install, so its prompt and description are not editable here. Duplicate it to get an editable copy.",
+      "revert": "Revert",
+      "saved": "Saved",
+      "system_prompt": "System prompt",
+      "what_this_agent_is_for": "What this agent is for",
+      "you_are_a_research_assistant": "You are a research assistant…",
+      "save_failed": "Save failed",
+      "shown_in_the_agent_picker_and_the_crew_editor": "Shown in the agent picker and the crew editor.",
+      "a_file_value_points_at_a_prompt_file_on_disk_rep": "A file:// value points at a prompt file on disk. Replacing it with text here detaches the template from that file.",
+      "saving": "Saving…",
+      "save": "Save"
     }
   },
   "hooks": {
@@ -4050,11 +4085,12 @@
       "skills": "Skills",
       "spawn_tasks_from_chat_or_cli": "Spawn tasks from chat or CLI",
       "subagents": "Subagents",
-      "system_prompt": "System Prompt",
       "tools": "Tools",
       "tools_2": "tools",
       "type_to_filter": "Type to filter…",
-      "usage": "Usage"
+      "usage": "Usage",
+      "duplicate": "Duplicate",
+      "new_template": "New template"
     },
     "aidlc": {
       "dagView": {
diff --git a/website/src/i18n/locales/es.json b/website/src/i18n/locales/es.json
index 29439421d4a..e2d2a6a0041 100644
--- a/website/src/i18n/locales/es.json
+++ b/website/src/i18n/locales/es.json
@@ -5728,6 +5728,41 @@
       "subtitle": "Empieza con una programación predefinida — tú la revisas y la guardas antes de que se ejecute nada.",
       "title": "Plantillas de programación",
       "use_template": "Usar la plantilla {{title}}"
+    },
+    "agentTemplateCreateDialog": {
+      "also_the_config_filename_and_the_value_passed_to": "También es el nombre del archivo de configuración y el valor que se pasa a --agent. Solo letras, dígitos, punto, guion y guion bajo.",
+      "blank_template": "Plantilla en blanco",
+      "cancel": "Cancelar",
+      "copies_an_existing_template_s_tools_mcp_servers": "Copia las herramientas, los servidores MCP y las habilidades de una plantilla existente. Una plantilla en blanco puede leer y buscar sin preguntar, pero tiene que preguntar antes de escribir archivos o ejecutar un comando.",
+      "create_template": "Crear plantilla",
+      "creating": "Creando…",
+      "description": "Descripción",
+      "duplicate_agent_template": "Duplicar plantilla de agente",
+      "e_g_researcher": "p. ej. investigador",
+      "failed_to_create_template": "No se pudo crear la plantilla",
+      "leave_empty_to_keep_the_copied_template_s_prompt": "Déjalo vacío para conservar el prompt de la plantilla copiada, o para usar el valor predeterminado del backend en una plantilla en blanco. Se puede editar después.",
+      "name": "Nombre",
+      "name_is_required": "El nombre es obligatorio",
+      "new_agent_template": "Nueva plantilla de agente",
+      "start_from": "Empezar desde",
+      "start_from_template": "Empezar desde una plantilla",
+      "system_prompt": "Prompt del sistema",
+      "what_this_agent_is_for": "Para qué sirve este agente",
+      "you_are_a_research_assistant": "Eres un asistente de investigación…"
+    },
+    "agentTemplateEditor": {
+      "a_file_value_points_at_a_prompt_file_on_disk_rep": "Un valor file:// apunta a un archivo de prompt en el disco. Si lo reemplazas por texto aquí, la plantilla se desvincula de ese archivo.",
+      "description": "Descripción",
+      "kiro_crew_rewrites_this_template_on_every_instal": "Kiro Crew reescribe esta plantilla en cada instalación, así que su prompt y su descripción no se pueden editar aquí. Duplícala para obtener una copia editable.",
+      "revert": "Revertir",
+      "save": "Guardar",
+      "save_failed": "No se pudo guardar",
+      "saved": "Guardado",
+      "saving": "Guardando…",
+      "shown_in_the_agent_picker_and_the_crew_editor": "Se muestra en el selector de agentes y en el editor de crews.",
+      "system_prompt": "Prompt del sistema",
+      "what_this_agent_is_for": "Para qué sirve este agente",
+      "you_are_a_research_assistant": "Eres un asistente de investigación…"
     }
   },
   "hooks": {
@@ -5909,11 +5944,12 @@
       "skills": "Habilidades",
       "spawn_tasks_from_chat_or_cli": "Lanza tareas desde el chat o la CLI",
       "subagents": "Subagentes",
-      "system_prompt": "Prompt del sistema",
       "tools": "Herramientas",
       "tools_2": "herramientas",
       "type_to_filter": "Escribe para filtrar…",
-      "usage": "Uso"
+      "usage": "Uso",
+      "duplicate": "Duplicar",
+      "new_template": "Plantilla nueva"
     },
     "aidlc": {
       "dagView": {
diff --git a/website/src/i18n/locales/fr.json b/website/src/i18n/locales/fr.json
index 505331150bc..23de9d799d6 100644
--- a/website/src/i18n/locales/fr.json
+++ b/website/src/i18n/locales/fr.json
@@ -5647,6 +5647,41 @@
     "searchableSelect": {
       "no_matches": "Aucun résultat",
       "search": "Rechercher…"
+    },
+    "agentTemplateCreateDialog": {
+      "also_the_config_filename_and_the_value_passed_to": "Sert aussi de nom de fichier de configuration et de valeur passée à --agent. Uniquement lettres, chiffres, point, tiret et tiret bas.",
+      "blank_template": "Modèle vierge",
+      "cancel": "Annuler",
+      "copies_an_existing_template_s_tools_mcp_servers": "Copie les outils, serveurs MCP et compétences d’un modèle existant. Un modèle vierge peut lire et effectuer des recherches sans demander, mais doit demander avant d’écrire des fichiers ou d’exécuter une commande.",
+      "create_template": "Créer le modèle",
+      "creating": "Création…",
+      "description": "Description",
+      "duplicate_agent_template": "Dupliquer le modèle d’agent",
+      "e_g_researcher": "ex. chercheur",
+      "failed_to_create_template": "Impossible de créer le modèle",
+      "leave_empty_to_keep_the_copied_template_s_prompt": "Laisse vide pour conserver le prompt du modèle copié, ou pour utiliser la valeur par défaut du backend sur un modèle vierge. Modifiable plus tard.",
+      "name": "Nom",
+      "name_is_required": "Le nom est obligatoire",
+      "new_agent_template": "Nouveau modèle d’agent",
+      "start_from": "Point de départ",
+      "start_from_template": "Partir d’un modèle",
+      "system_prompt": "Prompt système",
+      "what_this_agent_is_for": "À quoi sert cet agent",
+      "you_are_a_research_assistant": "Tu es un assistant de recherche…"
+    },
+    "agentTemplateEditor": {
+      "a_file_value_points_at_a_prompt_file_on_disk_rep": "Une valeur file:// pointe vers un fichier de prompt sur le disque. La remplacer par du texte ici détache le modèle de ce fichier.",
+      "description": "Description",
+      "kiro_crew_rewrites_this_template_on_every_instal": "Kiro Crew réécrit ce modèle à chaque installation, donc son prompt et sa description ne sont pas modifiables ici. Duplique-le pour obtenir une copie modifiable.",
+      "revert": "Restaurer",
+      "save": "Enregistrer",
+      "save_failed": "Échec de l’enregistrement",
+      "saved": "Enregistré",
+      "saving": "Enregistrement…",
+      "shown_in_the_agent_picker_and_the_crew_editor": "Affiché dans le sélecteur d’agents et l’éditeur de crew.",
+      "system_prompt": "Prompt système",
+      "what_this_agent_is_for": "À quoi sert cet agent",
+      "you_are_a_research_assistant": "Tu es un assistant de recherche…"
     }
   },
   "hooks": {
@@ -5828,11 +5863,12 @@
       "skills": "Compétences",
       "spawn_tasks_from_chat_or_cli": "Lancez des tâches depuis le chat ou la CLI",
       "subagents": "Sous-agents",
-      "system_prompt": "Prompt système",
       "tools": "Outils",
       "tools_2": "outils",
       "type_to_filter": "Saisissez pour filtrer…",
-      "usage": "Utilisation"
+      "usage": "Utilisation",
+      "duplicate": "Dupliquer",
+      "new_template": "Nouveau modèle"
     },
     "aidlc": {
       "dagView": {
diff --git a/website/src/i18n/locales/hi.json b/website/src/i18n/locales/hi.json
index 3ad73fc0fd7..3ba69e2519d 100644
--- a/website/src/i18n/locales/hi.json
+++ b/website/src/i18n/locales/hi.json
@@ -5666,6 +5666,41 @@
     "searchableSelect": {
       "no_matches": "कोई मेल नहीं",
       "search": "खोजें…"
+    },
+    "agentTemplateCreateDialog": {
+      "also_the_config_filename_and_the_value_passed_to": "यही कॉन्फ़िग फ़ाइल का नाम है और --agent को पास की जाने वाली वैल्यू भी। सिर्फ़ अक्षर, अंक, डॉट, डैश और अंडरस्कोर।",
+      "blank_template": "खाली टेम्पलेट",
+      "cancel": "रद्द करें",
+      "copies_an_existing_template_s_tools_mcp_servers": "किसी मौजूदा टेम्पलेट के टूल, MCP सर्वर और स्किल कॉपी करता है। खाली टेम्पलेट बिना पूछे पढ़ और खोज सकता है, लेकिन फ़ाइल लिखने या कमांड चलाने से पहले पूछना पड़ता है।",
+      "create_template": "टेम्पलेट बनाएँ",
+      "creating": "बनाया जा रहा है…",
+      "description": "विवरण",
+      "duplicate_agent_template": "एजेंट टेम्पलेट की कॉपी बनाएँ",
+      "e_g_researcher": "उदाहरण: researcher",
+      "failed_to_create_template": "टेम्पलेट बनाने में विफल",
+      "leave_empty_to_keep_the_copied_template_s_prompt": "कॉपी किए गए टेम्पलेट का प्रॉम्प्ट रखने के लिए, या खाली टेम्पलेट पर बैकएंड का डिफ़ॉल्ट इस्तेमाल करने के लिए इसे खाली छोड़ दें। बाद में एडिट किया जा सकता है।",
+      "name": "नाम",
+      "name_is_required": "नाम ज़रूरी है",
+      "new_agent_template": "नया एजेंट टेम्पलेट",
+      "start_from": "किससे शुरू करें",
+      "start_from_template": "टेम्पलेट से शुरू करें",
+      "system_prompt": "सिस्टम प्रॉम्प्ट",
+      "what_this_agent_is_for": "यह एजेंट किस काम के लिए है",
+      "you_are_a_research_assistant": "तुम एक रिसर्च असिस्टेंट हो…"
+    },
+    "agentTemplateEditor": {
+      "a_file_value_points_at_a_prompt_file_on_disk_rep": "file:// वैल्यू डिस्क पर मौजूद किसी प्रॉम्प्ट फ़ाइल की ओर इशारा करती है। यहाँ टेक्स्ट से बदलने पर टेम्पलेट उस फ़ाइल से अलग हो जाएगा।",
+      "description": "विवरण",
+      "kiro_crew_rewrites_this_template_on_every_instal": "Kiro Crew हर इंस्टॉल पर इस टेम्पलेट को दोबारा लिखता है, इसलिए इसका प्रॉम्प्ट और विवरण यहाँ एडिट नहीं किए जा सकते। एडिट करने योग्य कॉपी पाने के लिए इसकी कॉपी बनाएँ।",
+      "revert": "रिवर्ट करें",
+      "save": "सहेजें",
+      "save_failed": "सहेजना विफल",
+      "saved": "सहेजा गया",
+      "saving": "सहेजा जा रहा है…",
+      "shown_in_the_agent_picker_and_the_crew_editor": "एजेंट पिकर और क्रू एडिटर में दिखता है।",
+      "system_prompt": "सिस्टम प्रॉम्प्ट",
+      "what_this_agent_is_for": "यह एजेंट किस काम के लिए है",
+      "you_are_a_research_assistant": "तुम एक रिसर्च असिस्टेंट हो…"
     }
   },
   "hooks": {
@@ -5846,11 +5881,12 @@
       "skills": "स्किल",
       "spawn_tasks_from_chat_or_cli": "चैट या CLI से कार्य स्पॉन करें",
       "subagents": "सब-एजेंट",
-      "system_prompt": "सिस्टम प्रॉम्प्ट",
       "tools": "टूल",
       "tools_2": "टूल",
       "type_to_filter": "फ़िल्टर करने के लिए टाइप करें…",
-      "usage": "उपयोग"
+      "usage": "उपयोग",
+      "duplicate": "कॉपी बनाएँ",
+      "new_template": "नया टेम्पलेट"
     },
     "aidlc": {
       "dagView": {
diff --git a/website/src/i18n/locales/it.json b/website/src/i18n/locales/it.json
index 68049f70d49..a618448c7db 100644
--- a/website/src/i18n/locales/it.json
+++ b/website/src/i18n/locales/it.json
@@ -5728,6 +5728,41 @@
       "title": "Modelli di pianificazione",
       "subtitle": "Parti da una pianificazione predefinita — la esamini e la salvi prima che venga eseguito qualcosa.",
       "use_template": "Usa il modello {{title}}"
+    },
+    "agentTemplateCreateDialog": {
+      "also_the_config_filename_and_the_value_passed_to": "È anche il nome del file di configurazione e il valore passato a --agent. Solo lettere, cifre, punto, trattino e trattino basso.",
+      "blank_template": "Modello vuoto",
+      "cancel": "Annulla",
+      "copies_an_existing_template_s_tools_mcp_servers": "Copia gli strumenti, i server MCP e le skill di un modello esistente. Un modello vuoto può leggere e cercare senza chiedere, ma deve chiedere prima di scrivere file o eseguire un comando.",
+      "create_template": "Crea modello",
+      "creating": "Creazione in corso…",
+      "description": "Descrizione",
+      "duplicate_agent_template": "Duplica modello di agente",
+      "e_g_researcher": "ad es. ricercatore",
+      "failed_to_create_template": "Impossibile creare il modello",
+      "leave_empty_to_keep_the_copied_template_s_prompt": "Lascia vuoto per mantenere il prompt del modello copiato, o per usare quello predefinito del backend su un modello vuoto. Modificabile in seguito.",
+      "name": "Nome",
+      "name_is_required": "Il nome è obbligatorio",
+      "new_agent_template": "Nuovo modello di agente",
+      "start_from": "Parti da",
+      "start_from_template": "Parti da un modello",
+      "system_prompt": "Prompt di sistema",
+      "what_this_agent_is_for": "A cosa serve questo agente",
+      "you_are_a_research_assistant": "Sei un assistente di ricerca…"
+    },
+    "agentTemplateEditor": {
+      "a_file_value_points_at_a_prompt_file_on_disk_rep": "Un valore file:// punta a un file di prompt sul disco. Sostituirlo con del testo qui scollega il modello da quel file.",
+      "description": "Descrizione",
+      "kiro_crew_rewrites_this_template_on_every_instal": "Kiro Crew riscrive questo modello a ogni installazione, quindi il suo prompt e la sua descrizione non sono modificabili qui. Duplicalo per ottenere una copia modificabile.",
+      "revert": "Ripristina",
+      "save": "Salva",
+      "save_failed": "Salvataggio non riuscito",
+      "saved": "Salvato",
+      "saving": "Salvataggio…",
+      "shown_in_the_agent_picker_and_the_crew_editor": "Mostrata nel selettore degli agenti e nell’editor delle crew.",
+      "system_prompt": "Prompt di sistema",
+      "what_this_agent_is_for": "A cosa serve questo agente",
+      "you_are_a_research_assistant": "Sei un assistente di ricerca…"
     }
   },
   "hooks": {
@@ -5909,11 +5944,12 @@
       "skills": "Skill",
       "spawn_tasks_from_chat_or_cli": "Avvia attività dalla chat o dalla CLI",
       "subagents": "Subagenti",
-      "system_prompt": "Prompt di sistema",
       "tools": "Strumenti",
       "tools_2": "strumenti",
       "type_to_filter": "Digita per filtrare…",
-      "usage": "Utilizzo"
+      "usage": "Utilizzo",
+      "duplicate": "Duplica",
+      "new_template": "Nuovo modello"
     },
     "aidlc": {
       "dagView": {
diff --git a/website/src/i18n/locales/ja.json b/website/src/i18n/locales/ja.json
index e62d59ebdf9..259e9d5458d 100644
--- a/website/src/i18n/locales/ja.json
+++ b/website/src/i18n/locales/ja.json
@@ -5604,6 +5604,41 @@
       "subtitle": "既成スケジュールから開始します — 実行される前に、内容を確認して保存できます。",
       "title": "スケジュールテンプレート",
       "use_template": "「{{title}}」テンプレートを使用"
+    },
+    "agentTemplateCreateDialog": {
+      "also_the_config_filename_and_the_value_passed_to": "設定ファイル名および --agent に渡す値にもなります。使用できるのは英数字、ドット、ダッシュ、アンダースコアのみです。",
+      "blank_template": "空のテンプレート",
+      "cancel": "キャンセル",
+      "copies_an_existing_template_s_tools_mcp_servers": "既存のテンプレートのツール、MCP サーバー、スキルをコピーします。空のテンプレートは確認なしで読み取りと検索ができますが、ファイルの書き込みやコマンドの実行の前には確認が必要です。",
+      "create_template": "テンプレートを作成",
+      "creating": "作成中…",
+      "description": "説明",
+      "duplicate_agent_template": "エージェントテンプレートを複製",
+      "e_g_researcher": "例: researcher",
+      "failed_to_create_template": "テンプレートの作成に失敗しました",
+      "leave_empty_to_keep_the_copied_template_s_prompt": "空欄のままにすると、コピー元テンプレートのプロンプトを保持します。空のテンプレートの場合はバックエンドのデフォルトを使用します。後から編集できます。",
+      "name": "名前",
+      "name_is_required": "名前は必須です",
+      "new_agent_template": "新規エージェントテンプレート",
+      "start_from": "作成元",
+      "start_from_template": "テンプレートから作成",
+      "system_prompt": "システムプロンプト",
+      "what_this_agent_is_for": "このエージェントの用途",
+      "you_are_a_research_assistant": "あなたはリサーチアシスタントです…"
+    },
+    "agentTemplateEditor": {
+      "a_file_value_points_at_a_prompt_file_on_disk_rep": "file:// の値はディスク上のプロンプトファイルを指します。ここでテキストに置き換えると、テンプレートはそのファイルから切り離されます。",
+      "description": "説明",
+      "kiro_crew_rewrites_this_template_on_every_instal": "Kiro Crew はインストールごとにこのテンプレートを書き換えるため、プロンプトと説明はここでは編集できません。複製すると編集可能なコピーが得られます。",
+      "revert": "元に戻す",
+      "save": "保存",
+      "save_failed": "保存に失敗しました",
+      "saved": "保存しました",
+      "saving": "保存中…",
+      "shown_in_the_agent_picker_and_the_crew_editor": "エージェントピッカーとクルーエディターに表示されます。",
+      "system_prompt": "システムプロンプト",
+      "what_this_agent_is_for": "このエージェントの用途",
+      "you_are_a_research_assistant": "あなたはリサーチアシスタントです…"
     }
   },
   "hooks": {
@@ -5793,11 +5828,12 @@
       "skills": "スキル",
       "spawn_tasks_from_chat_or_cli": "チャットまたはCLIからタスクを生成",
       "subagents": "サブエージェント",
-      "system_prompt": "システムプロンプト",
       "tools": "ツール",
       "tools_2": "ツール",
       "type_to_filter": "フィルタリングに入力…",
-      "usage": "使用"
+      "usage": "使用",
+      "duplicate": "複製",
+      "new_template": "新規テンプレート"
     },
     "aidlc": {
       "dagView": {
diff --git a/website/src/i18n/locales/pt.json b/website/src/i18n/locales/pt.json
index cd4f7063ee0..9578d724ccd 100644
--- a/website/src/i18n/locales/pt.json
+++ b/website/src/i18n/locales/pt.json
@@ -5728,6 +5728,41 @@
     "searchableSelect": {
       "no_matches": "Nenhum resultado",
       "search": "Pesquisar…"
+    },
+    "agentTemplateCreateDialog": {
+      "also_the_config_filename_and_the_value_passed_to": "Também é o nome do arquivo de configuração e o valor passado para --agent. Apenas letras, dígitos, ponto, hífen e sublinhado.",
+      "blank_template": "Modelo em branco",
+      "cancel": "Cancelar",
+      "copies_an_existing_template_s_tools_mcp_servers": "Copia as ferramentas, os servidores MCP e as skills de um modelo existente. Um modelo em branco pode ler e pesquisar sem pedir permissão, mas precisa pedir antes de gravar arquivos ou executar um comando.",
+      "create_template": "Criar modelo",
+      "creating": "Criando…",
+      "description": "Descrição",
+      "duplicate_agent_template": "Duplicar modelo de agente",
+      "e_g_researcher": "ex.: pesquisador",
+      "failed_to_create_template": "Falha ao criar o modelo",
+      "leave_empty_to_keep_the_copied_template_s_prompt": "Deixe vazio para manter o prompt do modelo copiado ou para usar o padrão do backend em um modelo em branco. Editável depois.",
+      "name": "Nome",
+      "name_is_required": "O nome é obrigatório",
+      "new_agent_template": "Novo modelo de agente",
+      "start_from": "Começar de",
+      "start_from_template": "Começar de um modelo",
+      "system_prompt": "Prompt do sistema",
+      "what_this_agent_is_for": "Para que serve este agente",
+      "you_are_a_research_assistant": "Você é um assistente de pesquisa…"
+    },
+    "agentTemplateEditor": {
+      "a_file_value_points_at_a_prompt_file_on_disk_rep": "Um valor file:// aponta para um arquivo de prompt no disco. Substituí-lo por texto aqui desvincula o modelo desse arquivo.",
+      "description": "Descrição",
+      "kiro_crew_rewrites_this_template_on_every_instal": "O Kiro Crew reescreve este modelo em cada instalação, portanto seu prompt e sua descrição não são editáveis aqui. Duplique-o para obter uma cópia editável.",
+      "revert": "Reverter",
+      "save": "Salvar",
+      "save_failed": "Falha ao salvar",
+      "saved": "Salvo",
+      "saving": "Salvando…",
+      "shown_in_the_agent_picker_and_the_crew_editor": "Exibido no seletor de agentes e no editor de crews.",
+      "system_prompt": "Prompt do sistema",
+      "what_this_agent_is_for": "Para que serve este agente",
+      "you_are_a_research_assistant": "Você é um assistente de pesquisa…"
     }
   },
   "hooks": {
@@ -5909,11 +5944,12 @@
       "skills": "Habilidades",
       "spawn_tasks_from_chat_or_cli": "Crie tarefas pelo chat ou pela CLI",
       "subagents": "Subagentes",
-      "system_prompt": "Prompt do sistema",
       "tools": "Ferramentas",
       "tools_2": "ferramentas",
       "type_to_filter": "Digite para filtrar…",
-      "usage": "Uso"
+      "usage": "Uso",
+      "duplicate": "Duplicar",
+      "new_template": "Novo modelo"
     },
     "aidlc": {
       "dagView": {
diff --git a/website/src/i18n/locales/ru.json b/website/src/i18n/locales/ru.json
index b3233d5a49d..99122fab274 100644
--- a/website/src/i18n/locales/ru.json
+++ b/website/src/i18n/locales/ru.json
@@ -5790,6 +5790,41 @@
     "searchableSelect": {
       "no_matches": "Нет совпадений",
       "search": "Поиск…"
+    },
+    "agentTemplateCreateDialog": {
+      "also_the_config_filename_and_the_value_passed_to": "Также имя файла конфигурации и значение, передаваемое в --agent. Только буквы, цифры, точка, дефис и подчёркивание.",
+      "blank_template": "Пустой шаблон",
+      "cancel": "Отмена",
+      "copies_an_existing_template_s_tools_mcp_servers": "Копирует инструменты, MCP-серверы и навыки существующего шаблона. Пустой шаблон может читать и искать без запроса, но перед записью файлов или запуском команды должен спросить.",
+      "create_template": "Создать шаблон",
+      "creating": "Создание...",
+      "description": "Описание",
+      "duplicate_agent_template": "Дублирование шаблона агента",
+      "e_g_researcher": "например, researcher",
+      "failed_to_create_template": "Не удалось создать шаблон",
+      "leave_empty_to_keep_the_copied_template_s_prompt": "Оставь пустым, чтобы сохранить промпт скопированного шаблона или взять значение по умолчанию из бэкенда для пустого. Изменить можно позже.",
+      "name": "Имя",
+      "name_is_required": "Имя обязательно",
+      "new_agent_template": "Новый шаблон агента",
+      "start_from": "Основа",
+      "start_from_template": "На основе шаблона",
+      "system_prompt": "Системный промпт",
+      "what_this_agent_is_for": "Для чего нужен этот агент",
+      "you_are_a_research_assistant": "Ты — исследовательский ассистент..."
+    },
+    "agentTemplateEditor": {
+      "a_file_value_points_at_a_prompt_file_on_disk_rep": "Значение file:// указывает на файл с промптом на диске. Если заменить его текстом здесь, шаблон отвяжется от этого файла.",
+      "description": "Описание",
+      "kiro_crew_rewrites_this_template_on_every_instal": "Kiro Crew перезаписывает этот шаблон при каждой установке, поэтому его промпт и описание здесь изменить нельзя. Дублируй его, чтобы получить редактируемую копию.",
+      "revert": "Откатить",
+      "save": "Сохранить",
+      "save_failed": "Не удалось сохранить",
+      "saved": "Сохранено",
+      "saving": "Сохранение...",
+      "shown_in_the_agent_picker_and_the_crew_editor": "Отображается в списке выбора агента и редакторе команды.",
+      "system_prompt": "Системный промпт",
+      "what_this_agent_is_for": "Для чего нужен этот агент",
+      "you_are_a_research_assistant": "Ты — исследовательский ассистент..."
     }
   },
   "hooks": {
@@ -5972,11 +6007,12 @@
       "skills": "Навыки",
       "spawn_tasks_from_chat_or_cli": "Запускайте задачи из чата или CLI",
       "subagents": "Субагенты",
-      "system_prompt": "Системный промпт",
       "tools": "Инструменты",
       "tools_2": "инструментов",
       "type_to_filter": "Введите текст для фильтра…",
-      "usage": "Использование"
+      "usage": "Использование",
+      "duplicate": "Дублировать",
+      "new_template": "Новый шаблон"
     },
     "aidlc": {
       "dagView": {
diff --git a/website/src/i18n/locales/zh-CN.json b/website/src/i18n/locales/zh-CN.json
index fa74217702e..8fc81543067 100644
--- a/website/src/i18n/locales/zh-CN.json
+++ b/website/src/i18n/locales/zh-CN.json
@@ -5523,6 +5523,41 @@
       "subtitle": "从预设计划开始 — 在任何任务运行前，你先审阅并保存。",
       "title": "定时任务模板",
       "use_template": "使用“{{title}}”模板"
+    },
+    "agentTemplateCreateDialog": {
+      "also_the_config_filename_and_the_value_passed_to": "同时也是配置文件名和传给 --agent 的值。只能用字母、数字、点、短横和下划线。",
+      "blank_template": "空白模板",
+      "cancel": "取消",
+      "copies_an_existing_template_s_tools_mcp_servers": "复制现有模板的工具、MCP 服务器和技能。空白模板可以直接读取和搜索，无需询问，但写入文件或运行命令前会先询问。",
+      "create_template": "创建模板",
+      "creating": "正在创建…",
+      "description": "描述",
+      "duplicate_agent_template": "复制代理模板",
+      "e_g_researcher": "例如 researcher",
+      "failed_to_create_template": "创建模板失败",
+      "leave_empty_to_keep_the_copied_template_s_prompt": "留空则保留所复制模板的提示词；空白模板则使用后端默认值。之后可以修改。",
+      "name": "名称",
+      "name_is_required": "必须填写名称",
+      "new_agent_template": "新建代理模板",
+      "start_from": "创建方式",
+      "start_from_template": "基于模板",
+      "system_prompt": "系统提示词",
+      "what_this_agent_is_for": "这个代理用来做什么",
+      "you_are_a_research_assistant": "你是一名研究助手…"
+    },
+    "agentTemplateEditor": {
+      "a_file_value_points_at_a_prompt_file_on_disk_rep": "file:// 值指向磁盘上的提示词文件。在这里改成文本会让模板与此文件解除关联。",
+      "description": "描述",
+      "kiro_crew_rewrites_this_template_on_every_instal": "Kiro Crew 每次安装都会重写此模板，所以它的提示词和描述在这里不可编辑。复制一份即可获得可编辑的副本。",
+      "revert": "还原",
+      "save": "保存",
+      "save_failed": "保存失败",
+      "saved": "已保存",
+      "saving": "正在保存…",
+      "shown_in_the_agent_picker_and_the_crew_editor": "显示在代理选择器和 Crew 编辑器中。",
+      "system_prompt": "系统提示词",
+      "what_this_agent_is_for": "这个代理用来做什么",
+      "you_are_a_research_assistant": "你是一名研究助手…"
     }
   },
   "hooks": {
@@ -5702,11 +5737,12 @@
       "skills": "技能",
       "spawn_tasks_from_chat_or_cli": "从聊天或 CLI 派生任务",
       "subagents": "子代理",
-      "system_prompt": "系统提示词",
       "tools": "工具",
       "tools_2": "工具",
       "type_to_filter": "输入以筛选…",
-      "usage": "用量"
+      "usage": "用量",
+      "duplicate": "复制",
+      "new_template": "新建模板"
     },
     "aidlc": {
       "dagView": {
diff --git a/website/src/pages/AgentsPage.tsx b/website/src/pages/AgentsPage.tsx
index d5f9ec22dd9..f953331a093 100644
--- a/website/src/pages/AgentsPage.tsx
+++ b/website/src/pages/AgentsPage.tsx
@@ -1,6 +1,6 @@
 import { useState, useEffect, useRef } from 'react'
 import { useQuery, useMutation } from '@tanstack/react-query'
-import { Star, StarOff, Brain, Plug, X, Pin, Package, Lock, Hourglass, Bot, ChevronDown } from 'lucide-react'
+import { Star, StarOff, Brain, Plug, X, Pin, Package, Lock, Hourglass, Bot, ChevronDown, Plus, Copy } from 'lucide-react'
 import { createPortal } from 'react-dom'
 import { useAppSelector } from '../store'
 import { api } from '../api/client'
@@ -9,6 +9,8 @@ import Clickable from '../components/Clickable'
 import { SourceBadge, StatCard, PageHeader, EmptyState, Btn, Input } from '../components/ui'
 import ModelDropdownList from '../components/ModelDropdownList'
 import AgentSkillsEditor from '../components/AgentSkillsEditor'
+import AgentTemplateEditor from '../components/AgentTemplateEditor'
+import AgentTemplateCreateDialog from '../components/AgentTemplateCreateDialog'
 import { LAYOUT } from '../components/layout'
 import InfoTip from '../components/InfoTip'
 import { useProvider } from '../providers'
@@ -79,6 +81,14 @@ interface AgentDetail extends Partial<InstalledAgent> {
   toolsSettings?: { execute_bash?: { deniedCommands?: string[] } }
   /** `skill://` resources the catalog editor cannot express (wildcards, foreign paths). */
   unmanaged_skills?: string[]
+  /**
+   * True when Kiro Crew owns the spec and rewrites it on install, so its prompt
+   * and description are not editable. Served by the backend rather than derived
+   * from `source` here: `source` is filename-derived and only marks the two
+   * user-facing specs, while several more managed files (knowledge, research,
+   * heartbeat) present as ordinary built-ins.
+   */
+  managed?: boolean
 }
 
 export default function AgentsPage({ embedded }: { embedded?: boolean } = {}) {
@@ -135,6 +145,19 @@ export default function AgentsPage({ embedded }: { embedded?: boolean } = {}) {
   const defaultAgent = defaultAgentData ?? ''
 
   const [selectedAgent, setSelectedAgent] = useState<AgentDetail | null>(null)
+  // `''` closes the dialog; `'blank'` opens it with no source; any other value is
+  // the template to duplicate. One state instead of an open flag plus a source
+  // avoids the intermediate render where the dialog is open with a stale source.
+  const [createFrom, setCreateFrom] = useState('')
+  const selectAgent = async (name: string) => {
+    try {
+      setSelectedAgent(await api.agentDetail(name))
+    } catch {
+      /* List rows carry display NAMES; the editor round-trips catalog KEYS, so drop them rather than offer unsavable chips. */
+      const row = installed.find(a => a.name === name)
+      setSelectedAgent(row ? { ...row, skills: undefined } : { name })
+    }
+  }
   const modelOptions = useAvailableModels()
   const { open: modelDropOpen, setOpen: setModelDropOpen, filter: modelFilter, setFilter: setModelFilter, dropdownRef: modelDropRef, inputRef: modelInputRef, filtered: filteredModels } = useFilteredDropdown(modelOptions)
   // Roving-focus keyboard nav for the model dropdown (shared with StyledSelect/AgentSelector).
@@ -197,7 +220,10 @@ export default function AgentsPage({ embedded }: { embedded?: boolean } = {}) {
           </div>
         ) : installed.length > 0 && (
           <div className="card-glow border border-border bg-card rounded-lg mb-4 animate-rise shadow-sm hover:border-border-strong hover:shadow-md transition-all overflow-hidden">
-            <div className="px-5 pt-5 pb-3"><h3 className="text-sm font-semibold text-text-strong flex items-center gap-1.5">{i18nT('pages.agentsPage.installed_agents')} <InfoTip text={i18nT('pages.agentsPage.agent_templates_grouped_by_package_update_and_un')} /></h3></div>
+            <div className="px-5 pt-5 pb-3 flex items-center justify-between gap-2">
+              <h3 className="text-sm font-semibold text-text-strong flex items-center gap-1.5">{i18nT('pages.agentsPage.installed_agents')} <InfoTip text={i18nT('pages.agentsPage.agent_templates_grouped_by_package_update_and_un')} /></h3>
+              <Btn className="flex items-center gap-1 px-2 py-1 text-[12px] shrink-0" onClick={() => setCreateFrom('blank')}><Plus className="lucide-inline" /> {i18nT('pages.agentsPage.new_template')}</Btn>
+            </div>
             <div className="flex" style={{ height: `${LAYOUT.AGENT_LIST_HEIGHT}px` }}>
               {/* Agent list — scrollable */}
               <div className="w-[280px] shrink-0 border-r border-border overflow-y-auto p-2">
@@ -208,7 +234,7 @@ export default function AgentsPage({ embedded }: { embedded?: boolean } = {}) {
                     const key = a.package || a.name; (g[key] ||= []).push(a); return g
                   }, {})
                   const renderAgent = (a: typeof installed[0], showDelete?: boolean) => (
-                    <Clickable key={a.name} className={`flex flex-col gap-1.5 px-3 py-2.5 rounded-md border transition-all cursor-pointer mb-1 ${selectedAgent?.name === a.name ? 'list-selected bg-accent-subtle border-accent/40' : 'bg-bg-elevated border-transparent hover:bg-bg-hover hover:border-border-strong'}`} onClick={async () => { try { const d = await api.agentDetail(a.name); setSelectedAgent(d) } catch { /* List rows carry display NAMES; the editor round-trips catalog KEYS, so drop them rather than offer unsavable chips. */ setSelectedAgent({ ...a, skills: undefined }) } }}>
+                    <Clickable key={a.name} className={`flex flex-col gap-1.5 px-3 py-2.5 rounded-md border transition-all cursor-pointer mb-1 ${selectedAgent?.name === a.name ? 'list-selected bg-accent-subtle border-accent/40' : 'bg-bg-elevated border-transparent hover:bg-bg-hover hover:border-border-strong'}`} onClick={() => selectAgent(a.name)}>
                       {/* Row 1: the name owns the full column width; badge + delete are pinned right and never steal the name's space. */}
                       <div className="flex items-center gap-1.5 min-w-0">
                         <span className="text-[13px] font-mono font-semibold text-text truncate flex-1 min-w-0" title={a.name}>{a.name}</span>
@@ -285,12 +311,30 @@ export default function AgentsPage({ embedded }: { embedded?: boolean } = {}) {
                       </div>
                       {(() => { const a = installed.find(a => a.name === selectedAgent.name); return a?.package ? <span className="text-[11px] text-aim bg-aim/10 px-2 py-0.5 rounded-md border border-aim/30">{a.filename?.startsWith('local-') ? <Pin className="lucide-inline" /> : <Package className="lucide-inline" />} {a.package}</span> : null })()}
                     </div>
+                    <Btn className="flex items-center gap-1 px-2 py-0.5 text-[12px] shrink-0" onClick={() => setCreateFrom(selectedAgent.name)}><Copy className="lucide-inline" /> {i18nT('pages.agentsPage.duplicate')}</Btn>
                   </div>
                   {/* `typeof` guard, not a bare truthiness check: an object is
                       truthy, so a foreign spec's structured `description` would
                       pass `&&` and then throw React error #31 as a JSX child —
-                      the same whole-tab crash `modelLabel` guards on `model`. */}
-                  {typeof selectedAgent.description === 'string' && selectedAgent.description && <div className="text-[13px] text-muted mb-3 leading-relaxed">{selectedAgent.description}</div>}
+                      the same whole-tab crash `modelLabel` guards on `model`.
+                      The same rule applies to `prompt`, which is rendered as
+                      text and fed into a controlled textarea. */}
+                  <AgentTemplateEditor
+                    key={selectedAgent.name}
+                    agentName={selectedAgent.name}
+                    description={typeof selectedAgent.description === 'string' ? selectedAgent.description : ''}
+                    prompt={typeof selectedAgent.prompt === 'string' ? selectedAgent.prompt : ''}
+                    // A detail fetch that failed leaves the real spec UNKNOWN, so
+                    // the editor is locked rather than offering a write over a
+                    // blank field that would erase the prompt on disk. `skills`
+                    // is the same signal the skills editor below gates on.
+                    managed={selectedAgent.managed !== false || selectedAgent.skills === undefined}
+                    onSaved={(agentName, patch) => {
+                      // Ignore a save that resolved after the selection moved on.
+                      setSelectedAgent(prev => (prev && prev.name === agentName ? { ...prev, ...patch } : prev))
+                      refetchInstalled()
+                    }}
+                  />
                   {selectedAgent.skills === undefined ? (
                     /* The agent-detail fetch failed, so the real mapping is
                      * UNKNOWN. An empty-but-enabled editor here is destructive:
@@ -321,7 +365,6 @@ export default function AgentsPage({ embedded }: { embedded?: boolean } = {}) {
                       }}
                     />
                   )}
-                  {selectedAgent.prompt && <div className="mb-3"><div className="text-[12px] text-muted font-medium uppercase tracking-wider mb-1">{i18nT('pages.agentsPage.system_prompt')}</div><pre className="text-[12px] text-text font-mono bg-bg-elevated rounded-md p-2.5 border border-border overflow-x-auto max-h-[160px] overflow-y-auto whitespace-pre-wrap leading-relaxed">{typeof selectedAgent.prompt === 'string' && selectedAgent.prompt.startsWith('file://') ? selectedAgent.prompt : (selectedAgent.prompt || '').slice(0, 2000)}</pre></div>}
                   {selectedAgent.tools && <div className="mb-3"><div className="text-[12px] text-muted font-medium uppercase tracking-wider mb-1">{i18nT('pages.agentsPage.tools')}</div><div className="flex flex-wrap gap-1.5">{(selectedAgent.tools as string[]).map((t: string) => <span key={t} className="px-2 py-1 rounded-full text-[12px] font-mono bg-bg-elevated border border-border text-text">{t}</span>)}</div></div>}
                   {selectedAgent.allowedTools && <div className="mb-3"><div className="text-[12px] text-muted font-medium uppercase tracking-wider mb-1">{i18nT('pages.agentsPage.auto_approved')}</div><div className="flex flex-wrap gap-1.5">{(selectedAgent.allowedTools as string[]).map((t: string) => <span key={t} className="px-2 py-1 rounded-full text-[12px] font-mono bg-ok/10 border border-ok/30 text-ok">{t}</span>)}</div></div>}
                   {selectedAgent.mcpServers && <div className="mb-3"><div className="text-[12px] text-muted font-medium uppercase tracking-wider mb-1">{i18nT('pages.agentsPage.mcp_servers')}</div><div className="flex flex-wrap gap-1.5">{Object.keys(selectedAgent.mcpServers).map((s: string) => {
@@ -443,6 +486,22 @@ export default function AgentsPage({ embedded }: { embedded?: boolean } = {}) {
             ))}</tbody></table>
         </div>
       </div>
+      {/* Kept MOUNTED and driven by `open` rather than conditionally rendered:
+          Radix tracks dismissable layers in a global stack, and unmounting the
+          subtree the instant it closes skips the layer's deregistration. */}
+      <AgentTemplateCreateDialog
+        open={!!createFrom}
+        templates={installed.map(a => a.name)}
+        initialFrom={createFrom && createFrom !== 'blank' ? createFrom : undefined}
+        onClose={() => setCreateFrom('')}
+        onCreated={name => {
+          setCreateFrom('')
+          refetchInstalled()
+          // Select the new template so its editors are immediately in reach —
+          // creating one and then having to find it in the list is a dead end.
+          selectAgent(name)
+        }}
+      />
     </>
   )
 }
diff --git a/website/src/test/AgentTemplateAuthoring.test.tsx b/website/src/test/AgentTemplateAuthoring.test.tsx
new file mode 100644
index 00000000000..aa442c0acb2
--- /dev/null
+++ b/website/src/test/AgentTemplateAuthoring.test.tsx
@@ -0,0 +1,244 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+import { render, screen, waitFor, fireEvent } from '@testing-library/react'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+
+/* ── Mock api/client BEFORE the components import ── */
+const mockApi = vi.hoisted(() => ({
+  agentCreate: vi.fn(),
+  agentPatch: vi.fn(),
+}))
+vi.mock('../api/client', () => ({ api: mockApi }))
+
+import AgentTemplateCreateDialog from '../components/AgentTemplateCreateDialog'
+import AgentTemplateEditor from '../components/AgentTemplateEditor'
+
+beforeEach(() => {
+  mockApi.agentCreate.mockReset()
+  mockApi.agentPatch.mockReset()
+  mockApi.agentCreate.mockResolvedValue({ ok: true, name: 'researcher' })
+  mockApi.agentPatch.mockResolvedValue({ ok: true })
+})
+
+function renderDialog(
+  props: Partial<React.ComponentProps<typeof AgentTemplateCreateDialog>> = {},
+) {
+  const onCreated = props.onCreated ?? vi.fn()
+  const onClose = props.onClose ?? vi.fn()
+  const utils = render(
+    <AgentTemplateCreateDialog
+      open={props.open ?? true}
+      templates={props.templates ?? ['kirocrew', 'base']}
+      initialFrom={props.initialFrom}
+      onClose={onClose}
+      onCreated={onCreated}
+    />,
+  )
+  return { ...utils, onCreated, onClose }
+}
+
+describe('AgentTemplateCreateDialog', () => {
+  it('creates a blank template from just a name', async () => {
+    const { onCreated } = renderDialog()
+
+    fireEvent.change(screen.getByLabelText(/^Name$/i), { target: { value: 'researcher' } })
+    fireEvent.click(screen.getByRole('button', { name: /Create template/i }))
+
+    await waitFor(() => expect(mockApi.agentCreate).toHaveBeenCalledWith({ name: 'researcher' }))
+    await waitFor(() => expect(onCreated).toHaveBeenCalledWith('researcher'))
+  })
+
+  it('never sends tools or an allowlist', async () => {
+    // The privilege surface is not this dialog's to set — the endpoint refuses it
+    // from a body, and the form must not imply otherwise by sending one.
+    renderDialog()
+
+    fireEvent.change(screen.getByLabelText(/^Name$/i), { target: { value: 'researcher' } })
+    fireEvent.change(screen.getByLabelText(/System prompt/i), { target: { value: 'Be brief.' } })
+    fireEvent.click(screen.getByRole('button', { name: /Create template/i }))
+
+    await waitFor(() => expect(mockApi.agentCreate).toHaveBeenCalled())
+    const body = mockApi.agentCreate.mock.calls[0][0]
+    expect(body).not.toHaveProperty('tools')
+    expect(body).not.toHaveProperty('allowedTools')
+    expect(body).not.toHaveProperty('toolsSettings')
+  })
+
+  it('omits empty optional fields rather than sending blanks', async () => {
+    renderDialog()
+
+    fireEvent.change(screen.getByLabelText(/^Name$/i), { target: { value: 'researcher' } })
+    fireEvent.change(screen.getByLabelText(/Description/i), { target: { value: '   ' } })
+    fireEvent.click(screen.getByRole('button', { name: /Create template/i }))
+
+    await waitFor(() => expect(mockApi.agentCreate).toHaveBeenCalledWith({ name: 'researcher' }))
+  })
+
+  it('refuses to submit without a name', async () => {
+    renderDialog()
+
+    fireEvent.click(screen.getByRole('button', { name: /Create template/i }))
+
+    expect(await screen.findByRole('alert')).toHaveTextContent(/Name is required/i)
+    expect(mockApi.agentCreate).not.toHaveBeenCalled()
+  })
+
+  it('shows the server error verbatim instead of a guess', async () => {
+    // Reserved names and names already claimed by a package spec are rules only
+    // the server knows; replacing its message would mislead.
+    mockApi.agentCreate.mockResolvedValue({ error: "'kirocrew' is reserved" })
+    const { onCreated } = renderDialog()
+
+    fireEvent.change(screen.getByLabelText(/^Name$/i), { target: { value: 'kirocrew' } })
+    fireEvent.click(screen.getByRole('button', { name: /Create template/i }))
+
+    expect(await screen.findByRole('alert')).toHaveTextContent(/'kirocrew' is reserved/)
+    expect(onCreated).not.toHaveBeenCalled()
+  })
+
+  it('does not report success when the request rejects', async () => {
+    mockApi.agentCreate.mockRejectedValue(new Error('network down'))
+    const { onCreated } = renderDialog()
+
+    fireEvent.change(screen.getByLabelText(/^Name$/i), { target: { value: 'researcher' } })
+    fireEvent.click(screen.getByRole('button', { name: /Create template/i }))
+
+    expect(await screen.findByRole('alert')).toHaveTextContent(/network down/i)
+    expect(onCreated).not.toHaveBeenCalled()
+  })
+
+  it('sends the duplicate source and seeds a distinct name', async () => {
+    renderDialog({ initialFrom: 'base' })
+
+    // A copy defaulting to the source's own name would 409 on every open.
+    const nameField = screen.getByLabelText(/^Name$/i) as HTMLInputElement
+    expect(nameField.value).toBe('base-copy')
+
+    fireEvent.click(screen.getByRole('button', { name: /Create template/i }))
+    await waitFor(() =>
+      expect(mockApi.agentCreate).toHaveBeenCalledWith({ name: 'base-copy', from: 'base' }),
+    )
+  })
+
+  it('titles itself for the entry point it was opened from', () => {
+    const { unmount } = renderDialog({ initialFrom: 'base' })
+    expect(screen.getByText(/Duplicate agent template/i)).toBeInTheDocument()
+    unmount()
+
+    renderDialog()
+    expect(screen.getByText(/New agent template/i)).toBeInTheDocument()
+  })
+})
+
+function renderEditor(props: Partial<React.ComponentProps<typeof AgentTemplateEditor>> = {}) {
+  const qc = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+  const onSaved = props.onSaved ?? vi.fn()
+  const utils = render(
+    <QueryClientProvider client={qc}>
+      <AgentTemplateEditor
+        agentName={props.agentName ?? 'researcher'}
+        description={props.description ?? 'Digs through papers'}
+        prompt={props.prompt ?? 'Be rigorous.'}
+        managed={props.managed}
+        onSaved={onSaved}
+      />
+    </QueryClientProvider>,
+  )
+  return { ...utils, onSaved }
+}
+
+describe('AgentTemplateEditor', () => {
+  it('saves only the field that changed', async () => {
+    const { onSaved } = renderEditor()
+
+    fireEvent.change(screen.getByLabelText(/System prompt/i), { target: { value: 'Be terse.' } })
+    fireEvent.click(screen.getByRole('button', { name: /^Save$/i }))
+
+    await waitFor(() =>
+      expect(mockApi.agentPatch).toHaveBeenCalledWith('researcher', { prompt: 'Be terse.' }),
+    )
+    await waitFor(() => expect(onSaved).toHaveBeenCalledWith('researcher', { prompt: 'Be terse.' }))
+  })
+
+  it('sends both fields when both changed', async () => {
+    renderEditor()
+
+    fireEvent.change(screen.getByLabelText(/Description/i), { target: { value: 'New purpose' } })
+    fireEvent.change(screen.getByLabelText(/System prompt/i), { target: { value: 'Be terse.' } })
+    fireEvent.click(screen.getByRole('button', { name: /^Save$/i }))
+
+    await waitFor(() =>
+      expect(mockApi.agentPatch).toHaveBeenCalledWith('researcher', {
+        description: 'New purpose',
+        prompt: 'Be terse.',
+      }),
+    )
+  })
+
+  it('keeps Save inert until something is dirty', () => {
+    renderEditor()
+    expect(screen.getByRole('button', { name: /^Save$/i })).toBeDisabled()
+  })
+
+  it('surfaces a rejected save instead of reporting it as done', async () => {
+    // A 400 resolves the fetch, so an error read off the body is the only signal
+    // — a component that ignores it shows "Saved" over an unwritten file.
+    mockApi.agentPatch.mockResolvedValue({ error: 'prompt must be at most 100000 characters' })
+    const { onSaved } = renderEditor()
+
+    fireEvent.change(screen.getByLabelText(/System prompt/i), { target: { value: 'x' } })
+    fireEvent.click(screen.getByRole('button', { name: /^Save$/i }))
+
+    await waitFor(() => expect(screen.getByText(/at most 100000 characters/i)).toBeInTheDocument())
+    expect(onSaved).not.toHaveBeenCalled()
+  })
+
+  it('reverts to the server values', async () => {
+    renderEditor()
+    const prompt = screen.getByLabelText(/System prompt/i) as HTMLTextAreaElement
+
+    fireEvent.change(prompt, { target: { value: 'scratch' } })
+    fireEvent.click(screen.getByRole('button', { name: /Revert/i }))
+
+    expect(prompt.value).toBe('Be rigorous.')
+    expect(mockApi.agentPatch).not.toHaveBeenCalled()
+  })
+
+  it('re-seeds when the selection moves to another template', () => {
+    // The other two props are held IDENTICAL and only the agent changes: two
+    // templates can legitimately share a description and prompt, and keying the
+    // reset on the values alone would let an unsaved edit survive the switch and
+    // be written into the WRONG template's spec on the next Save.
+    const { rerender } = renderEditor({ description: 'Shared', prompt: 'Shared prompt.' })
+    const prompt = () => screen.getByLabelText(/System prompt/i) as HTMLTextAreaElement
+
+    fireEvent.change(prompt(), { target: { value: 'unsaved edit' } })
+    const qc = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+    rerender(
+      <QueryClientProvider client={qc}>
+        <AgentTemplateEditor
+          agentName="other"
+          description="Shared"
+          prompt="Shared prompt."
+          onSaved={vi.fn()}
+        />
+      </QueryClientProvider>,
+    )
+
+    expect(prompt().value).toBe('Shared prompt.')
+  })
+
+  it('offers no write for a managed template', () => {
+    renderEditor({ managed: true, prompt: 'file:///home/u/.kiro/crew/prompt.md' })
+
+    expect(screen.queryByRole('button', { name: /^Save$/i })).not.toBeInTheDocument()
+    expect(screen.queryByLabelText(/System prompt/i)).not.toBeInTheDocument()
+    // The reason is stated, not just the absence — a locked field with no
+    // explanation reads as a bug.
+    expect(screen.getByText(/rewrites this template on every install/i)).toBeInTheDocument()
+  })
+
+  it('shows a managed template its file:// prompt as-is', () => {
+    renderEditor({ managed: true, prompt: 'file:///home/u/.kiro/crew/prompt.md' })
+    expect(screen.getByText('file:///home/u/.kiro/crew/prompt.md')).toBeInTheDocument()
+  })
+})