huskies: merge 824

server/src/chat/commands/mod.rs

@@ -8,6 +8,7 @@
 mod ambient;
 mod assign;
 mod backlog;
+mod cleanup_worktrees;
 mod cost;
 mod coverage;
 mod depends;
@@ -256,6 +257,11 @@ pub fn commands() -> &'static [BotCommand] {
             description: "Show setup wizard progress; or `setup generate` / `setup confirm` / `setup skip` / `setup retry` to drive the wizard from chat",
             handler: setup::handle_setup,
         },
+        BotCommand {
+            name: "cleanup_worktrees",
+            description: "List orphaned worktrees (dry run), or `cleanup_worktrees --confirm` to remove them",
+            handler: handle_cleanup_worktrees_fallback,
+        },
     ]
 }
 
@@ -402,6 +408,17 @@ fn handle_rebuild_fallback(_ctx: &CommandContext) -> Option<String> {
     None
 }
 
+/// Fallback handler for the `cleanup_worktrees` command when it is not
+/// intercepted by the async handler in `on_room_message`.  In practice this is
+/// never called — cleanup_worktrees is detected and handled before
+/// `try_handle_command` is invoked.  The entry exists in the registry only so
+/// `help` lists it.
+///
+/// Returns `None` to prevent the LLM from receiving "cleanup_worktrees" as a prompt.
+fn handle_cleanup_worktrees_fallback(_ctx: &CommandContext) -> Option<String> {
+    None
+}
+
 // ---------------------------------------------------------------------------
 // Tests
 // ---------------------------------------------------------------------------