diff --git a/.storkit/work/1_backlog/420_story_loc_for_a_specified_file_bot_command_and_web_ui_slash_command.md b/.storkit/work/1_backlog/420_story_loc_for_a_specified_file_bot_command_and_web_ui_slash_command.md
deleted file mode 100644
index 9424cb8b..00000000
--- a/.storkit/work/1_backlog/420_story_loc_for_a_specified_file_bot_command_and_web_ui_slash_command.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-name: "loc for a specified file — bot command and web UI slash command"
----
-
-# Story 420: loc for a specified file — bot command and web UI slash command
-
-## User Story
-
-As a developer, I want to send `loc <filepath>` to the bot or use it as a slash command in the web UI to see the line count for a specific file, so I can quickly check how large a file is without leaving my workflow.
-
-## Acceptance Criteria
-
-- [ ] loc <filepath> returns the line count for the specified file
-- [ ] Relative paths are resolved against the project root
-- [ ] If the file does not exist, returns a clear error
-- [ ] Works from all transports (Matrix, WhatsApp, Slack)
-- [ ] Works as a slash command in the web UI
-- [ ] loc with no argument retains existing behavior (top files by line count)
-- [ ] Exposed as an MCP tool so agents can query file line counts programmatically
-
-## Out of Scope
-
-- TBD
diff --git a/.storkit/work/5_done/417_refactor_split_matrix_bot_rs_into_focused_modules.md b/.storkit/work/5_done/417_refactor_split_matrix_bot_rs_into_focused_modules.md
new file mode 100644
index 00000000..1d839a61
--- /dev/null
+++ b/.storkit/work/5_done/417_refactor_split_matrix_bot_rs_into_focused_modules.md
@@ -0,0 +1,30 @@
+---
+name: "Split matrix/bot.rs into focused modules"
+---
+
+# Refactor 417: Split matrix/bot.rs into focused modules
+
+## Current State
+
+- TBD
+
+## Desired State
+
+Refactor the monolithic server/src/chat/transport/matrix/bot.rs (1926 lines) into focused submodules.
+
+## Acceptance Criteria
+
+- [ ] history.rs contains ConversationRole, ConversationEntry, RoomConversation, PersistedHistory, load_history, save_history and their unit tests
+- [ ] context.rs contains BotContext struct
+- [ ] run.rs contains run_bot main event loop
+- [ ] messages.rs contains on_room_message, handle_message, format_user_prompt, is_permission_approval and their unit tests
+- [ ] mentions.rs contains mentions_bot, contains_word, is_reply_to_bot and their unit tests
+- [ ] verification.rs contains check_sender_verified, on_to_device_verification_request, handle_sas_verification and their unit tests
+- [ ] format.rs contains markdown_to_html, format_startup_announcement and their unit tests
+- [ ] mod.rs re-exports all public types
+- [ ] Unit tests live in their respective module files
+- [ ] No public API changes — all existing imports continue to work
+
+## Out of Scope
+
+- TBD