kingdom-cli 0.5.0__tar.gz → 0.5.2__tar.gz

{kingdom_cli-0.5.0/src/kingdom_cli.egg-info → kingdom_cli-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kingdom-cli
-Version: 0.5.0
+Version: 0.5.2
 Summary: A markdown file-based CLI for software development with multi-agent council design, markdown tickets, and background worker loops.
 Author: James Robinson-Bohnslav
 License-Expression: Apache-2.0
@@ -10,14 +10,13 @@ Project-URL: Issues, https://github.com/jbohnslav/kingdom/issues
 Project-URL: Changelog, https://github.com/jbohnslav/kingdom/releases
 Keywords: cli,ai,development,workflow,agents,multi-model,tickets
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development
 Classifier: Environment :: Console
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: rich>=14.3.1
@@ -45,7 +44,7 @@ Gastown minus the polecats.
 ## Install
 
 ```bash
-uv tool install kingdom-cli
+uv tool install kingdom-cli  # add --python 3.11 if Python 3.11+ is not installed yet
 ```
 
 ## Workflow Scales

{kingdom_cli-0.5.0 → kingdom_cli-0.5.2}/README.md

@@ -18,7 +18,7 @@ Gastown minus the polecats.
 ## Install
 
 ```bash
-uv tool install kingdom-cli
+uv tool install kingdom-cli  # add --python 3.11 if Python 3.11+ is not installed yet
 ```
 
 ## Workflow Scales

{kingdom_cli-0.5.0 → kingdom_cli-0.5.2}/pyproject.toml

@@ -1,15 +1,14 @@
 [project]
 name = "kingdom-cli"
-version = "0.5.0"
+version = "0.5.2"
 description = "A markdown file-based CLI for software development with multi-agent council design, markdown tickets, and background worker loops."
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 license = "Apache-2.0"
 authors = [{ name = "James Robinson-Bohnslav" }]
 keywords = ["cli", "ai", "development", "workflow", "agents", "multi-model", "tickets"]
 classifiers = [
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",

{kingdom_cli-0.5.0 → kingdom_cli-0.5.2}/src/kingdom/cli/__init__.py

@@ -503,7 +503,7 @@ def status(
 
 @app.command(help="Upgrade the CLI and refresh skill files.")
 def update() -> None:
-    """Run ``uv tool upgrade kingdom-cli`` then refresh Claude skill files."""
+    """Run ``uv tool upgrade kingdom-cli`` then refresh local agent skill files."""
     console = Console()
 
     # Step 1: uv tool upgrade kingdom-cli
@@ -531,17 +531,13 @@ def update() -> None:
 
     # Step 2: refresh skill files
     typer.echo("Refreshing skill files...")
-    skill_target = Path.home() / ".claude" / "skills" / "kingdom"
-    if skill_target.is_symlink():
+    skill_status = install_skill()
+    if skill_status == "refreshed":
+        styled_echo("  ✓ Skill files refreshed", fg=typer.colors.GREEN)
+    elif skill_status == "skipped":
         styled_echo("  ○ Skipped (dev symlink)", fg=typer.colors.YELLOW)
-        skill_status = "skipped (dev symlink)"
     else:
-        if install_skill():
-            styled_echo("  ✓ Skill files refreshed", fg=typer.colors.GREEN)
-            skill_status = "refreshed"
-        else:
-            styled_echo("  ✗ Skill refresh failed (see warning above)", fg=typer.colors.RED)
-            skill_status = "failed"
+        styled_echo("  ✗ Skill refresh failed (see warning above)", fg=typer.colors.RED)
 
     # Summary
     typer.echo()

{kingdom_cli-0.5.0 → kingdom_cli-0.5.2}/src/kingdom/cli/helpers.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import os
 import subprocess
 from pathlib import Path
+from typing import Literal
 
 import typer
 
@@ -13,6 +14,8 @@ from kingdom.ticket import AmbiguousTicketMatch, Ticket, find_ticket
 
 from .display import print_error
 
+SkillInstallStatus = Literal["refreshed", "skipped", "failed"]
+
 
 def verbose_echo(message: str) -> None:
     """Print a debug message to stderr when --verbose is set."""
@@ -116,38 +119,58 @@ def ensure_feature_branch(feature: str) -> None:
     typer.echo(f"Warning: current branch '{current}' does not match feature '{feature}'.")
 
 
-def install_skill() -> bool:
-    """Install the bundled kingdom skill to ~/.claude/skills/kingdom/.
+def skill_install_targets(home: Path) -> list[Path]:
+    """Return Claude's skill target, plus Cursor/Codex when their config dirs exist."""
+    targets = [home / ".claude" / "skills" / "kingdom"]
+    for agent_dir in (".cursor", ".codex"):
+        root = home / agent_dir
+        if root.is_dir():
+            targets.append(root / "skills" / "kingdom")
+    return targets
+
+
+def install_skill() -> SkillInstallStatus:
+    """Install the bundled kingdom skill to supported local agent skill dirs.
 
-    Copies SKILL.md and reference files from the package into the Claude
-    skills directory.  Skips if the target is a symlink (dev setup).
-    Warns and continues on permission or filesystem errors.
+    Copies SKILL.md and reference files from the package into Claude, and into
+    Cursor/Codex when their top-level config directories already exist. Skips
+    individual targets that are symlinks (dev setup).
+    Warns on permission or filesystem errors.
 
-    Returns True on success (including symlink skip), False on error.
+    Returns "refreshed" when any target was written, "skipped" when every
+    target was a symlink, and "failed" on error.
     """
     from importlib.resources import as_file, files
 
     try:
-        target = Path.home() / ".claude" / "skills" / "kingdom"
-
-        # Don't overwrite a dev symlink
-        if target.is_symlink():
-            return True
-
+        targets = skill_install_targets(Path.home())
         skill_pkg = files("kingdom.skill")
-
-        target.mkdir(parents=True, exist_ok=True)
-        with as_file(skill_pkg / "SKILL.md") as src:
-            (target / "SKILL.md").write_bytes(src.read_bytes())
-
-        refs_target = target / "references"
-        refs_target.mkdir(exist_ok=True)
         refs_pkg = skill_pkg / "references"
-        for item in refs_pkg.iterdir():
-            if item.name.endswith(".md"):
-                with as_file(item) as src:
-                    (refs_target / item.name).write_bytes(src.read_bytes())
+        skipped_targets = 0
+        refreshed_targets = 0
+
+        for target in targets:
+            if target.is_symlink():
+                skipped_targets += 1
+                continue
+
+            target.mkdir(parents=True, exist_ok=True)
+            with as_file(skill_pkg / "SKILL.md") as src:
+                (target / "SKILL.md").write_bytes(src.read_bytes())
+
+            refs_target = target / "references"
+            refs_target.mkdir(exist_ok=True)
+            for item in refs_pkg.iterdir():
+                if item.name.endswith(".md"):
+                    with as_file(item) as src:
+                        (refs_target / item.name).write_bytes(src.read_bytes())
+            refreshed_targets += 1
     except (OSError, RuntimeError) as exc:
         typer.echo(f"Warning: could not install skill ({exc})")
-        return False
-    return True
+        return "failed"
+
+    if refreshed_targets:
+        return "refreshed"
+    if skipped_targets:
+        return "skipped"
+    return "refreshed"

{kingdom_cli-0.5.0 → kingdom_cli-0.5.2}/src/kingdom/cli/peasant.py

@@ -24,6 +24,8 @@ from kingdom.parsing import parse_iso_datetime
 from kingdom.state import (
     backlog_root,
     branch_root,
+    find_git_root,
+    get_current_git_branch,
     logs_root,
     normalize_branch_name,
     resolve_current_run,
@@ -32,9 +34,9 @@ from kingdom.ticket import Ticket, move_ticket, write_ticket
 from kingdom.worktree import (
     check_uncommitted_changes,
     create_worktree,
+    existing_worktree_path_for,
     remove_worktree,
     run_init_script,
-    worktree_path_for,
 )
 
 from .display import error_console, print_error, styled_echo
@@ -58,6 +60,34 @@ class PeasantContext(NamedTuple):
     ticket_path: Path
     full_ticket_id: str
     feature: str
+    git_root: Path
+
+
+def resolve_invocation_git_root(base: Path) -> Path:
+    """Return the checkout git commands should operate on.
+
+    When ``kd`` is invoked under the Kingdom project root, use that root even if
+    a nested repo or submodule is closer to cwd. When ``base`` points at a
+    sibling checkout that owns ``.kd/``, fall back to git discovery for the
+    invocation worktree.
+    """
+    cwd = Path.cwd().resolve()
+    base = base.resolve()
+
+    if cwd == base or base in cwd.parents:
+        return base
+
+    current = cwd
+    while True:
+        if (current / ".git").exists():
+            return current
+        if current == base:
+            return base
+        if current.parent == current:
+            break
+        current = current.parent
+
+    return find_git_root(cwd) or base
 
 
 def resolve_peasant_context(ticket_id: str, base: Path | None = None, auto_pull: bool = False) -> PeasantContext:
@@ -77,6 +107,7 @@ def resolve_peasant_context(ticket_id: str, base: Path | None = None, auto_pull:
     from kingdom.session import find_peasant_branch
 
     base = base or require_project_root()
+    git_root = resolve_invocation_git_root(base)
 
     # For non-start commands, try to find the peasant's owning branch first.
     # Resolve the full ticket ID before building the session name — the user
@@ -92,6 +123,7 @@ def resolve_peasant_context(ticket_id: str, base: Path | None = None, auto_pull:
                 ticket_path=ticket_path,
                 full_ticket_id=ticket.id,
                 feature=owning_branch,
+                git_root=git_root,
             )
 
     # Fall back to current session (required for start, fine for others)
@@ -114,6 +146,7 @@ def resolve_peasant_context(ticket_id: str, base: Path | None = None, auto_pull:
         ticket_path=ticket_path,
         full_ticket_id=full_ticket_id,
         feature=feature,
+        git_root=git_root,
     )
 
 
@@ -308,10 +341,10 @@ def peasant_start(
 
     # 0. Preflight: warn on uncommitted changes (skipped in hand mode or with --no-preflight)
     if not hand and not no_preflight:
-        uncommitted = check_uncommitted_changes(base)
+        uncommitted = check_uncommitted_changes(ctx.git_root, ignore_kd=True)
         if uncommitted:
             error_console.print(
-                f"[yellow]Warning:[/yellow] {len(uncommitted)} uncommitted change(s) in {base}.\n"
+                f"[yellow]Warning:[/yellow] {len(uncommitted)} uncommitted change(s) in {ctx.git_root}.\n"
                 "  Worktrees are created from the last commit — uncommitted changes won't be included.\n"
                 "  Commit or stash first, or use [bold]--hand[/bold] to work in the current directory."
             )
@@ -335,11 +368,11 @@ def peasant_start(
                     f"on this checkout. Stop it first or use worktree mode."
                 )
                 raise typer.Exit(code=1)
-        worktree_path = base
-        typer.echo(f"Running in hand mode (serial) on {base}")
+        worktree_path = ctx.git_root
+        typer.echo(f"Running in hand mode (serial) on {ctx.git_root}")
     else:
         try:
-            worktree_path = create_worktree(base, full_ticket_id, log=typer.echo)
+            worktree_path = create_worktree(base, full_ticket_id, log=typer.echo, git_root=ctx.git_root)
         except RuntimeError as exc:
             print_error(str(exc))
             raise typer.Exit(code=1) from None
@@ -368,18 +401,18 @@ def peasant_start(
     # The worker reads session state immediately on startup (e.g. hand_mode for
     # branch validation), so it must be initialized before the process exists.
     now = datetime.now(UTC).isoformat()
-    update_agent_state(
-        base,
-        feature,
-        session_name,
-        status="working",
-        ticket=full_ticket_id,
-        thread=thread_id,
-        agent_backend=agent,
-        started_at=now,
-        last_activity=now,
-        hand_mode=hand,
-    )
+    session_fields = {
+        "status": "working",
+        "ticket": full_ticket_id,
+        "thread": thread_id,
+        "agent_backend": agent,
+        "started_at": now,
+        "last_activity": now,
+        "hand_mode": hand,
+    }
+    if existing.resume_id and existing.agent_backend and existing.agent_backend != agent:
+        session_fields["resume_id"] = None
+    update_agent_state(base, feature, session_name, **session_fields)
 
     # 5. Launch harness
     try:
@@ -606,7 +639,13 @@ def peasant_show(
         from kingdom.state import read_json
 
         st = read_json(branch_root(ctx.base, ctx.feature) / "state.json")
-        git_ref = st.get("branch", ctx.feature)
+        git_ref = st.get("branch")
+        if not git_ref:
+            current_git_branch = get_current_git_branch(ctx.git_root)
+            if current_git_branch and normalize_branch_name(current_git_branch) == normalize_branch_name(ctx.feature):
+                git_ref = current_git_branch
+            else:
+                git_ref = ctx.feature
         log_spec = [f"{git_ref}..{branch_name}"]
     commits: list[str] = []
     try:
@@ -614,7 +653,7 @@ def peasant_show(
             ["git", "log", "--oneline", *log_spec],
             capture_output=True,
             text=True,
-            cwd=str(ctx.base),
+            cwd=str(ctx.git_root),
             timeout=10,
         )
         if result.returncode == 0 and result.stdout.strip():
@@ -931,7 +970,6 @@ def peasant_watch(
 
     import kingdom.cli as _cli
     from kingdom.session import get_agent_state
-    from kingdom.worktree import worktree_path_for
 
     ctx = _cli.resolve_peasant_context(ticket_id)
     session_name = peasant_session_name(ctx.full_ticket_id)
@@ -941,7 +979,11 @@ def peasant_watch(
 
     # Resolve worktree path for activity polling
     state = get_agent_state(ctx.base, ctx.feature, session_name)
-    worktree = ctx.base if state.hand_mode else worktree_path_for(ctx.base, ctx.full_ticket_id)
+    worktree = (
+        ctx.git_root
+        if state.hand_mode
+        else existing_worktree_path_for(ctx.base, ctx.full_ticket_id, feature=ctx.feature)
+    )
 
     # Resolve agent backend for NDJSON stream decoding
     agent_backend = ""
@@ -1186,7 +1228,7 @@ def peasant_clean(
         typer.confirm(f"Remove worktree for {ctx.full_ticket_id}?", abort=True)
 
     try:
-        remove_worktree(ctx.base, ctx.full_ticket_id)
+        remove_worktree(ctx.base, ctx.full_ticket_id, git_root=ctx.git_root, feature=ctx.feature)
         typer.echo(f"{ctx.full_ticket_id}: worktree removed")
     except FileNotFoundError:
         print_error(f"No worktree found for {ctx.full_ticket_id}")
@@ -1259,7 +1301,7 @@ def peasant_sync(
         raise typer.Exit(code=1)
 
     # Find worktree
-    worktree_path = worktree_path_for(base, full_ticket_id)
+    worktree_path = existing_worktree_path_for(base, full_ticket_id, feature=feature)
     if not worktree_path.exists():
         print_error(f"No worktree found for {full_ticket_id}. Has the peasant been started?")
         raise typer.Exit(code=1)
@@ -1395,7 +1437,7 @@ def peasant_review(
         ["git", "diff", diff_spec, "--stat"],
         capture_output=True,
         text=True,
-        cwd=str(base),
+        cwd=str(ctx.git_root),
     )
     diff_output = diff_result.stdout.strip()
     diff_err = diff_result.stderr.strip()
@@ -1488,7 +1530,7 @@ def peasant_accept(
         ["git", "rev-parse", "--abbrev-ref", "HEAD"],
         capture_output=True,
         text=True,
-        cwd=str(base),
+        cwd=str(ctx.git_root),
     ).stdout.strip()
     if "branch" in state_json:
         # Original git branch name stored — compare exactly
@@ -1514,13 +1556,13 @@ def peasant_accept(
             ["git", "merge-base", "--is-ancestor", branch_name, "HEAD"],
             capture_output=True,
             text=True,
-            cwd=str(base),
+            cwd=str(ctx.git_root),
         )
         if already_merged.returncode == 0:
             typer.echo(f"{branch_name} already merged into {feature}, skipping merge")
         else:
             # Check for uncommitted changes before attempting merge
-            uncommitted = check_uncommitted_changes(base)
+            uncommitted = check_uncommitted_changes(ctx.git_root, ignore_kd=True)
             if uncommitted:
                 print_error(
                     f"Uncommitted changes on {git_branch_name} — commit or stash before accepting.\n"
@@ -1532,7 +1574,7 @@ def peasant_accept(
                 ["git", "merge", branch_name, "--no-edit"],
                 capture_output=True,
                 text=True,
-                cwd=str(base),
+                cwd=str(ctx.git_root),
             )
             if merge_result.returncode != 0:
                 # Integration failed — keep in_review, show recovery steps
@@ -1558,9 +1600,36 @@ def peasant_accept(
         status="done",
         last_activity=datetime.now(UTC).isoformat(),
     )
+    if not state.hand_mode:
+        cleanup_accepted_peasant(ctx, branch_name)
     typer.echo(f"{full_ticket_id}: accepted — ticket closed")
 
 
+def cleanup_accepted_peasant(ctx: PeasantContext, branch_name: str) -> None:
+    """Best-effort cleanup after accepting a peasant's work."""
+    try:
+        remove_worktree(ctx.base, ctx.full_ticket_id, git_root=ctx.git_root, feature=ctx.feature)
+        typer.echo(f"Removed worktree for {ctx.full_ticket_id}")
+    except FileNotFoundError:
+        styled_echo(f"Warning: no worktree found for {ctx.full_ticket_id}; skipping worktree cleanup.", fg="yellow")
+    except RuntimeError as exc:
+        styled_echo(f"Warning: could not remove worktree for {ctx.full_ticket_id}: {exc}", fg="yellow")
+
+    result = subprocess.run(
+        ["git", "branch", "-D", branch_name],
+        capture_output=True,
+        text=True,
+        cwd=str(ctx.git_root),
+        timeout=10,
+    )
+    if result.returncode == 0:
+        typer.echo(f"Deleted branch {branch_name}")
+        return
+
+    message = result.stderr.strip() or result.stdout.strip() or "unknown error"
+    styled_echo(f"Warning: could not delete branch {branch_name}: {message}", fg="yellow")
+
+
 @peasant_app.command("reject", help="Reject a peasant's work with feedback.")
 def peasant_reject(
     ticket_id: Annotated[str, typer.Argument(help="Ticket ID.")],
@@ -1642,10 +1711,10 @@ def peasant_reject(
                     "Stop it first or use --no-resume."
                 )
                 raise typer.Exit(code=1)
-        worktree_path = base
+        worktree_path = ctx.git_root
     else:
         # Worktree mode: use the ticket worktree
-        worktree_path = worktree_path_for(base, full_ticket_id)
+        worktree_path = existing_worktree_path_for(base, full_ticket_id, feature=feature)
         if not worktree_path.exists():
             print_error(f"worktree missing for {full_ticket_id}. Run `kd peasant start` to recreate.")
             raise typer.Exit(code=1)

{kingdom_cli-0.5.0 → kingdom_cli-0.5.2}/src/kingdom/cli/ticket.py

@@ -344,10 +344,16 @@ def render_ticket_panel(
 
 @ticket_app.command("create", help="Create a new ticket.")
 def ticket_create(
-    title: Annotated[str, typer.Argument(help="Ticket title.")],
+    title: Annotated[str | None, typer.Argument(help="Ticket title.")] = None,
+    short_title_or_type: Annotated[
+        str | None,
+        typer.Option("-t", help="Ticket title. With a positional title, treated as legacy ticket type."),
+    ] = None,
+    title_option: Annotated[str | None, typer.Option("--title", help="Ticket title.")] = None,
     description: Annotated[str | None, typer.Option("-d", "--description", help="Ticket description.")] = None,
+    body_text: Annotated[str | None, typer.Option("-b", "--body", help="Ticket description/body.")] = None,
     priority: Annotated[str, typer.Option("-p", "--priority", help="Priority (0-3 or p0-p3, 0 is highest).")] = "2",
-    ticket_type: Annotated[str, typer.Option("-t", "--type", help="Ticket type (task, bug, feature, epic).")] = "task",
+    ticket_type: Annotated[str, typer.Option("--type", help="Ticket type (task, bug, feature, epic).")] = "task",
     backlog: Annotated[bool, typer.Option("--backlog", help="Create in backlog instead of current branch.")] = False,
     dep: Annotated[list[str] | None, typer.Option("--dep", help="Ticket ID(s) this depends on.")] = None,
     parent: Annotated[str | None, typer.Option("--parent", help="Parent ticket ID.")] = None,
@@ -359,6 +365,33 @@ def ticket_create(
 
     base = require_project_root()
 
+    if title and title_option:
+        print_error("Provide the ticket title either positionally or with --title, not both.")
+        raise typer.Exit(code=1)
+
+    if title_option and short_title_or_type:
+        print_error("Provide the ticket title with either -t or --title, not both.")
+        raise typer.Exit(code=1)
+
+    if title and short_title_or_type:
+        if ticket_type != "task":
+            print_error("Provide ticket type with either legacy -t shorthand or --type, not both.")
+            raise typer.Exit(code=1)
+        ticket_type = short_title_or_type
+    elif title_option:
+        title = title_option
+    elif short_title_or_type:
+        title = short_title_or_type
+
+    if not title:
+        print_error("Missing ticket title. Provide it positionally or with -t/--title.")
+        raise typer.Exit(code=1)
+
+    if description and body_text:
+        print_error("Provide ticket body with either --description or --body, not both.")
+        raise typer.Exit(code=1)
+    description = description or body_text
+
     # Parse and validate priority (accepts 0-3, p0-p3, P0-P3)
     from kingdom.ticket import clamp_priority
 
@@ -597,8 +630,12 @@ def ticket_show(
     ] = None,
     all_tickets: Annotated[bool, typer.Option("--all", "-a", help="Show all tickets on the current branch.")] = False,
     output_json: Annotated[bool, typer.Option("--json", help="Output as JSON.")] = False,
+    rich: Annotated[bool, typer.Option("--rich", help="Render the human-friendly Rich panel view.")] = False,
 ) -> None:
-    """Display one or more tickets by ID (supports partial matching). With no args, shows ticket assigned to 'hand'."""
+    """Display one or more tickets as raw Markdown by default.
+
+    Use --rich for the framed human view. With no args, shows the ticket assigned to 'hand'.
+    """
     base = require_project_root()
 
     # Resolve tickets to show as (Ticket, Path) pairs
@@ -646,22 +683,41 @@ def ticket_show(
             ticket_to_json(ticket, detailed=True, base=base, path=ticket_path) for ticket, ticket_path in pairs
         ]
         typer.echo(json.dumps(results_json if len(results_json) > 1 else results_json[0], indent=2))
-    else:
+    elif rich:
         console = Console()
         cached_tickets = collect_all_tickets(base) if len(pairs) > 1 else None
         for i, (ticket, ticket_path) in enumerate(pairs):
             if i > 0:
                 console.print()  # separator between tickets
             console.print(render_ticket_panel(ticket, ticket_path, base, all_tickets=cached_tickets))
+    else:
+        for i, (_, ticket_path) in enumerate(pairs):
+            if i > 0:
+                typer.echo()
+            typer.echo(ticket_path.read_text(encoding="utf-8").rstrip())
+            typer.echo()
+            typer.echo(f"File: {ticket_path.resolve()}")
+
+
+@ticket_app.command("find", help="Find a ticket file by ID.")
+def ticket_find(
+    ticket_id: Annotated[str, typer.Argument(help="Ticket ID (full or partial).")],
+) -> None:
+    """Print the full path to a ticket file."""
+    base = require_project_root()
+    _, ticket_path = resolve_ticket_or_exit(base, ticket_id)
+    typer.echo(ticket_path.resolve())
 
 
-def update_ticket_status(ticket_id: str, new_status: str) -> None:
+def update_ticket_status(ticket_id: str, new_status: str, *, assignee: str | None = None) -> None:
     """Helper to update a ticket's status."""
     base = require_project_root()
 
     ticket, ticket_path = resolve_ticket_or_exit(base, ticket_id)
     old_status = ticket.status
     ticket.status = new_status
+    if assignee is not None:
+        ticket.assignee = assignee
     write_ticket(ticket, ticket_path)
 
     # Auto-archive: closing a backlog ticket moves it to archive/backlog/tickets/
@@ -690,8 +746,8 @@ def update_ticket_status(ticket_id: str, new_status: str) -> None:
 def ticket_start(
     ticket_id: Annotated[str, typer.Argument(help="Ticket ID (full or partial).")],
 ) -> None:
-    """Set ticket status to in_progress."""
-    update_ticket_status(ticket_id, "in_progress")
+    """Set ticket status to in_progress and assign it to the Hand."""
+    update_ticket_status(ticket_id, "in_progress", assignee="hand")
 
 
 @ticket_app.command("current", help="Show the in-progress ticket for this branch.")

{kingdom_cli-0.5.0 → kingdom_cli-0.5.2}/src/kingdom/harness.py

@@ -113,8 +113,10 @@ def build_prompt(
     if ticket_id:
         parts.append(
             "Keep the ticket worklog updated as you work. Log important decisions, "
-            "tradeoffs, things you noticed, or King input using "
-            f'`kd tk log {ticket_id} "message"` or by editing the ticket file directly. '
+            "tradeoffs, things you noticed, or King input by editing the ticket "
+            f"Markdown directly after reading it. Use `kd tk show {ticket_id}` to "
+            f'print the raw ticket file; use `kd tk log {ticket_id} "message"` '
+            "only for quick one-off entries. "
             "The worklog is how the King stays informed about what you're doing and why."
         )
     else:

{kingdom_cli-0.5.0 → kingdom_cli-0.5.2}/src/kingdom/lord_harness.py

@@ -487,7 +487,8 @@ def build_lord_prompt(
     parts.append("`kd peasant status --json` — Check all active peasant statuses")
     parts.append("`kd peasant show <ticket-id> --json` — Show detailed peasant history")
     parts.append(f"`kd tk list --parent {epic_id}` — List all epic children")
-    parts.append("`kd tk show <ticket-id>` — Show ticket details")
+    parts.append("`kd tk show <ticket-id>` — Print raw ticket Markdown")
+    parts.append("`kd tk show <ticket-id> --rich` — Show framed ticket details")
     parts.append("")
     parts.append("### Reviewing completed work")
     parts.append("`kd peasant review <ticket-id>` — Show diff, worklog, council feedback")