Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/system-specs/modules/learn-cron-dashboard.md

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion src/kiro_crew/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -2916,7 +2916,12 @@ def _tunnel_opts(p: "argparse.ArgumentParser") -> None:
agent_sub = agent_parser.add_subparsers(dest="agent_action")
agent_sub.add_parser("list", help="List Kiro Crew agents")
agent_create = agent_sub.add_parser("create", help="Create a Kiro Crew agent")
agent_create.add_argument("--name", required=True, help="Agent name")
agent_create.add_argument(
"--name",
required=True,
help="Agent id, or any name: shown as typed, stored under a URL-safe id",
)
agent_create.add_argument("--display-name", default="", help="Label the dashboard shows")
agent_create.add_argument("--kiro-agent", default="kirocrew", help="Kiro agent name")
agent_create.add_argument("--workspace", default="default", help="Workspace name")
agent_create.add_argument(
Expand Down
17 changes: 13 additions & 4 deletions src/kiro_crew/cli_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
_vet_shell_command,
)
from kiro_crew.member_memory_auth import require_member_memory_creation
from kiro_crew.members import MemberNameError, validate_member_name
from kiro_crew.members import MemberNameError, key_new_crew, validate_member_name
from kiro_crew.memory import MemoryStore
from kiro_crew.memory_stores import (
DEFAULT_MEMORY_STORE,
Expand Down Expand Up @@ -1441,9 +1441,14 @@ def _handle_agent(args: argparse.Namespace) -> None:
except MemberNameError as exc:
print(f"Error: invalid Crew Member name ({exc})", file=sys.stderr)
sys.exit(1)
if args.name in cfg.agents:
print(f"Error: agent '{args.name}' already exists", file=sys.stderr)
# Same keying as POST /api/agents.
keyed = key_new_crew(
args.name, (getattr(args, "display_name", None) or "").strip(), cfg.agents
)
if keyed.taken:
print(f"Error: agent '{keyed.taken}' already exists", file=sys.stderr)
sys.exit(1)
args.name, display_name = keyed.key, keyed.display_name
if not TEMPLATE_NAME_RE.fullmatch(args.kiro_agent):
print("Error: invalid kiro agent name", file=sys.stderr)
sys.exit(1)
Expand All @@ -1463,6 +1468,7 @@ def _handle_agent(args: argparse.Namespace) -> None:
kiro_agent=args.kiro_agent,
workspace=args.workspace,
memory_store=memory_store,
display_name=display_name,
)
previous_store = cfg.agents[args.name].memory_store
previous_member_id = cfg.agents[args.name].member_id
Expand Down Expand Up @@ -1493,7 +1499,10 @@ def _handle_agent(args: argparse.Namespace) -> None:
raise
print(f"Error: {exc}", file=sys.stderr)
sys.exit(1)
print(f"Created agent: {args.name}")
if display_name:
print(f"Created agent: {args.name} (display name: {display_name})")
else:
print(f"Created agent: {args.name}")

elif action == "update":
if args.name not in cfg.agents:
Expand Down
11 changes: 8 additions & 3 deletions src/kiro_crew/dashboard/handlers/agents.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
from kiro_crew.external_text import redact_external_text as _redact_external
from kiro_crew.kiro_prerequisite import spawn_supervised_oneshot
from kiro_crew.loop_lock import LoopBoundLock
from kiro_crew.members import MemberNameError, validate_member_name
from kiro_crew.members import MemberNameError, key_new_crew, validate_member_name
from kiro_crew.memory_stores import (
DEFAULT_MEMORY_STORE,
MemberAlreadyExists,
Expand Down Expand Up @@ -5071,10 +5071,15 @@ async def api_kirocrew_agents_create(request: web.Request) -> web.Response:
)
async with _get_config_lock():
cfg = KiroCrewConfig.load()
if name in cfg.agents:
# The config key is an id and the name the user typed is its label
# (`members.key_new_crew`, shared with `kirocrew agent create`).
keyed = key_new_crew(name, display_name, cfg.agents)
if keyed.taken:
return web.json_response(
{"error": f"Agent '{name}' already exists", "code": "agent_exists"}, status=409
{"error": f"Agent '{keyed.taken}' already exists", "code": "agent_exists"},
status=409,
)
name, display_name = keyed.key, keyed.display_name
model_reason = _model_pin_rejected(
model, request, cfg.agent.provider, backend=_pin_entitlement_backend(cfg)
)
Expand Down
80 changes: 79 additions & 1 deletion src/kiro_crew/members.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import os
import re
import stat
from collections.abc import Container, Mapping
from dataclasses import dataclass
from datetime import datetime, timezone
from enum import Enum
Expand All @@ -41,7 +42,12 @@
supports_pinned_walk,
)
from kiro_crew.slugs import slug_hash_fallback
from kiro_crew.validation import MAX_SHORT_STRING, normalize_unicode, sanitize_string
from kiro_crew.validation import (
_AGENT_NAME_RE,
MAX_SHORT_STRING,
normalize_unicode,
sanitize_string,
)

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -400,6 +406,78 @@ def validate_member_name(name: object) -> str:
return name


#: Longest base a derived crew id keeps, leaving room for a ``-<n>`` suffix
#: inside ``_AGENT_NAME_RE``'s 64-character cap.
_CREW_ID_BASE_MAX_CHARS = 56

#: Suffixes tried before a derived crew id falls back to the name's hash.
_CREW_ID_SUFFIX_ATTEMPTS = 99


def is_crew_id(value: object) -> bool:
"""Return whether *value* is shaped like a new crew's config key.

A crew id is the identifier grammar crews carried before free-form names
(``validation._AGENT_NAME_RE``). New crews are keyed by one; a crew already
stored under a free-form name stays readable and is never renamed.
"""
return isinstance(value, str) and bool(_AGENT_NAME_RE.match(value))


def crew_id_for_display_name(name: str, taken: Container[str]) -> str:
"""Derive an unused crew id for a crew the user named *name*.

The id is a slug of the name, suffixed ``-2``, ``-3``... past any id in
*taken*. A name with no slug-safe characters (CJK, emoji) derives from its
hash, so two such names never share an id. Deterministic for a given
*name* and *taken*.
"""
base = slugify(name)[:_CREW_ID_BASE_MAX_CHARS].strip("-")
if not base or base == slug_hash_fallback(name, "artifact"):
base = slug_hash_fallback(name, "crew")
for n in range(1, _CREW_ID_SUFFIX_ATTEMPTS + 1):
candidate = base if n == 1 else f"{base}-{n}"
if candidate not in taken and is_crew_id(candidate):
return candidate
return slug_hash_fallback(name, "crew")


@dataclass(frozen=True)
class NewCrewKey:
"""How a crew being created is keyed and labelled.

``taken`` is the name the user would see twice when the create must be
refused (``409 agent_exists``), else ``""``.
"""

key: str
display_name: str
taken: str


def key_new_crew(name: str, display_name: str, agents: Mapping[str, object]) -> NewCrewKey:
"""Decide the config key and label for a crew created as *name*.

An id-shaped *name* is the key as sent. A free-form one is kept as the
label of an id :func:`crew_id_for_display_name` derives. An explicit
*display_name* is the label either way. The create is refused when the
key is taken, or when the name the crew would show (its label, else its
key) is exactly what another crew already shows. The one decision both
create surfaces (``POST /api/agents``, ``kirocrew agent create``) share.
"""
if is_crew_id(name):
key, label = name, display_name
if key in agents:
return NewCrewKey(key, label, name)
else:
key, label = crew_id_for_display_name(name, agents), display_name or name
shown = label or key
for other_key, other in agents.items():
if (getattr(other, "display_name", "") or other_key) == shown:
return NewCrewKey(key, label, shown)
return NewCrewKey(key, label, "")


def is_valid_member_name(value: object) -> bool:
"""Return whether *value* is a valid Crew Member display name."""
try:
Expand Down
38 changes: 38 additions & 0 deletions test/test_cli_agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,44 @@ def test_create_duplicate_exits_nonzero(
err = capsys.readouterr().err
assert "already exists" in err

def test_create_free_form_name_keys_a_derived_id(
self, tmp_path: Path, capsys: pytest.CaptureFixture[str]
) -> None:
cfg_path = _write_config(tmp_path, _base_config())

with (
unittest.mock.patch("kiro_crew.config.loader.config_path", return_value=cfg_path),
unittest.mock.patch(
"sys.argv",
["kirocrew", "agent", "create", "--name", "Release Writer"],
),
):
main()

assert "Created agent: release-writer (display name: Release Writer)" in (
capsys.readouterr().out
)
saved = json.loads(cfg_path.read_text(encoding="utf-8"))
assert "Release Writer" not in saved["agents"]
assert saved["agents"]["release-writer"]["display_name"] == "Release Writer"

def test_create_display_name_flag_labels_an_id(
self, tmp_path: Path, capsys: pytest.CaptureFixture[str]
) -> None:
cfg_path = _write_config(tmp_path, _base_config())

with (
unittest.mock.patch("kiro_crew.config.loader.config_path", return_value=cfg_path),
unittest.mock.patch(
"sys.argv",
["kirocrew", "agent", "create", "--name", "scribe", "--display-name", "Scribe"],
),
):
main()

saved = json.loads(cfg_path.read_text(encoding="utf-8"))
assert saved["agents"]["scribe"]["display_name"] == "Scribe"

def test_create_rejects_free_form_template_identifier(
self, tmp_path: Path, capsys: pytest.CaptureFixture[str]
) -> None:
Expand Down
18 changes: 13 additions & 5 deletions test/test_config_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
SCHEMA_REGISTRY,
config_entry_to_dict,
)
from kiro_crew.members import is_valid_member_name
from kiro_crew.members import is_crew_id, is_valid_member_name


@pytest.fixture(autouse=True)
Expand Down Expand Up @@ -322,21 +322,29 @@ async def test_crud_create_round_trip(
assert private_store != "default"
# The immutable identity a client binds to (never the name).
assert create_data["member_id"]
# An id-shaped name is the key as sent; a free-form one is
# the label of a derived id.
key = create_data["name"]
if is_crew_id(name):
assert key == name
else:
assert is_crew_id(key)

# List and verify
resp = await client.get("/api/agents")
assert resp.status == 200
data = await resp.json()
agents_by_name = {a["name"]: a for a in data["agents"]}
assert name in agents_by_name
created = agents_by_name[name]
assert key in agents_by_name
created = agents_by_name[key]
assert created["display_name"] == ("" if is_crew_id(name) else name)
assert created["kiro_agent"] == kiro_agent
assert created["workspace"] == workspace
assert created["memory_store"] == private_store
persisted = json.loads(tmp.read_text())
assert persisted["agents"][name]["memory_store"] == private_store
assert persisted["agents"][key]["memory_store"] == private_store
store = persisted["memory_stores"][private_store]
assert store["owner_member"] == name
assert store["owner_member"] == key
assert store["memory_version"] == 2
finally:
tmp.unlink(missing_ok=True)
Expand Down
Loading
Loading