Refactor 3/3 | Command Folder & Tree Rearrangement

Author: Bredrumb

.env.example

@@ -151,18 +151,22 @@ MAX_DOCUMENT_OPERATIONS_PER_DAY=20
 DEFAULT_COMMAND_COOLDOWN=1600
 # Cooldown for /config commands
 COOLDOWN_CONFIG=3000
-# Cooldown for /teach commands
+# Legacy fallback cooldown for pre-Wave-3 /teach commands
 COOLDOWN_TEACH=3000
-# Cooldown for /data commands
+# Legacy fallback cooldown for pre-Wave-3 /data commands
 COOLDOWN_DATA=3000
-# Cooldown for /forget commands
+# Legacy fallback cooldown for pre-Wave-3 /forget commands
 COOLDOWN_FORGET=3000
 # Cooldown for /persona commands
 COOLDOWN_PERSONA=10000
+# Cooldown for /memory commands
+COOLDOWN_MEMORY=3000
 # Cooldown for /server commands
 COOLDOWN_SERVER=3000
 # Cooldown for /personal commands
 COOLDOWN_PERSONAL=3000
+# Cooldown for /conditioning commands
+COOLDOWN_CONDITIONING=3000
 
 # Memory & Media Protection (Optional)
 # Number of most recent messages that can contain full media (images, videos, GIFs)

docs/ai/conditioning-memory.md

@@ -14,25 +14,25 @@ This means a persona can accumulate different reward/punish patterns in differen
 
 ## User Commands
 
-### `/reward`
+### `/conditioning reward`
 
 Reward actions remain direct interaction commands:
 
-- `/reward headpat`
-- `/reward hug`
-- `/reward kiss`
-- `/reward tickle`
+- `/conditioning reward headpat`
+- `/conditioning reward hug`
+- `/conditioning reward kiss`
+- `/conditioning reward tickle`
 
 Each subcommand now accepts an optional `reason` string.
 
-### `/punish`
+### `/conditioning punish`
 
 Punishment uses the parallel interaction surface:
 
-- `/punish spank`
-- `/punish pinch`
-- `/punish bite`
-- `/punish squeeze`
+- `/conditioning punish spank`
+- `/conditioning punish pinch`
+- `/conditioning punish bite`
+- `/conditioning punish squeeze`
 
 Each subcommand also accepts an optional `reason` string.
 
@@ -47,10 +47,12 @@ Management is centralized under `/conditioning`:
 `/conditioning manage` is now server-wide:
 
 - it does not require picking a persona first
-- it shows stored reward and punishment entries from every persona in the server
+- it shows only injected reward and punishment entries from every persona in the server
 - each checklist entry includes the persona name plus a ❤️ reward or 💀 punishment marker
 - lists beyond one modal use a page-selection step and page-scoped checkbox modals
 
+Entries that are stored but not currently injectable stay in the database but are hidden from `/conditioning manage`.
+
 ## Storage Rules
 
 Conditioning rows are stored in `conditioning_history`.
@@ -137,6 +139,6 @@ These are documented in `.env.example`.
 - `src/utils/conditioning/conditioning.ts`
 - `src/utils/text/contextBuilder.ts`
 - `src/utils/text/presetContextBuilder.ts`
-- `src/commands/reward/*`
-- `src/commands/punish/*`
+- `src/commands/conditioning/reward/*`
+- `src/commands/conditioning/punish/*`
 - `src/commands/conditioning/*`

docs/ai/context-assembly.md

@@ -72,16 +72,16 @@ The `metadataTag` is a stable interface between the native builder and the prese
 | Tag | Block # | Description | Configured via |
 |-----|---------|-------------|---------------|
 | `SYSTEM_HUMANIZER_RULES` | 1 | System prompt + persona prompt | `/sysprompt`, `/persona` |
-| `SYSTEM_PERSONALITY` | 2 | Personality attributes | `/teach attribute`, `/forget attribute` |
+| `SYSTEM_PERSONALITY` | 2 | Personality attributes | `/persona attribute add`, `/persona attribute remove` |
 | `KNOWLEDGE_SERVER_INFO` | 3 | Server name, description, channel info | Automatic (Discord metadata) |
-| `KNOWLEDGE_SERVER_MEMORIES` | 4 | Server-level memories | `/teach memory server`, `/forget memory server` |
+| `KNOWLEDGE_SERVER_MEMORIES` | 4 | Server-level memories | `/memory server add`, `/memory server remove` |
 | `KNOWLEDGE_SERVER_EMOJIS` | 5 | Available custom emojis | `/server initialize expressions` |
 | `KNOWLEDGE_SERVER_STICKERS` | 6 | Available stickers | `/server initialize expressions` |
-| `KNOWLEDGE_USERS_IN_CONVERSATION` | 7 | User list + personal memories + status + reminders + time/channel info | `/teach memory personal`, `/forget memory personal` |
+| `KNOWLEDGE_USERS_IN_CONVERSATION` | 7 | User list + personal memories + status + reminders + time/channel info | `/memory personal add`, `/memory personal remove` |
 | `KNOWLEDGE_SHORT_TERM_MEMORY` | 8 | Recent conversation summaries from other channels (STM) | `/personal cache` |
-| `KNOWLEDGE_SERVER_DOCUMENTS` | 9 | RAG document chunks | `/teach document`, `/teach history`, `/forget document` |
-| `KNOWLEDGE_SERVER_CONDITIONING` | 10 | Reward/punish conditioning guidance for the active persona | `/reward`, `/punish`, `/conditioning manage` |
-| `DIALOGUE_SAMPLE` | 11 | Sample dialogue pairs | `/teach sampledialogue`, `/forget sampledialogue` |
+| `KNOWLEDGE_SERVER_DOCUMENTS` | 9 | RAG document chunks | `/memory document add`, `/memory history import`, `/memory document remove` |
+| `KNOWLEDGE_SERVER_CONDITIONING` | 10 | Reward/punish conditioning guidance for the active persona | `/conditioning reward`, `/conditioning punish`, `/conditioning manage` |
+| `DIALOGUE_SAMPLE` | 11 | Sample dialogue pairs | `/persona sample-dialogue add`, `/persona sample-dialogue remove` |
 | `DIALOGUE_HISTORY` | 12 | Actual conversation history | `/config message-fetch-limit` |
 
 ## Native Assembly Order
@@ -92,9 +92,9 @@ All blocks marked with `*` are conditional (only included when enabled/available
 ```text
  1.  System prompt (/sysprompt)                          [SYSTEM_HUMANIZER_RULES]
  2.  Persona prompt (/persona)*                          [SYSTEM_HUMANIZER_RULES]
- 3.  Personality attributes (/teach attribute)*           [SYSTEM_PERSONALITY]
+ 3.  Personality attributes (/persona attribute add)*     [SYSTEM_PERSONALITY]
  4.  Server info = server name + description              [KNOWLEDGE_SERVER_INFO]
- 5.  Server memories (/teach memory server)*              [KNOWLEDGE_SERVER_MEMORIES]
+ 5.  Server memories (/memory server add)*                [KNOWLEDGE_SERVER_MEMORIES]
  6.  Server emojis*                                       [KNOWLEDGE_SERVER_EMOJIS]
  7.  Server stickers*                                     [KNOWLEDGE_SERVER_STICKERS]
  8.  Users in conversation = user list + personal         [KNOWLEDGE_USERS_IN_CONVERSATION]
@@ -122,7 +122,7 @@ When a SillyTavern preset is active, the system uses a **Build-Then-Rearrange**
 5. Merge depth-injected nodes into dialogue history items
 6. Flush any remaining TomoriBot-only blocks at anchor points
 
-This avoids refactoring the native builder while gaining full preset control over prompt ordering. The native blocks still contain the same content (system prompt from `/sysprompt`, personality from `/teach attribute`, etc.) — the preset only controls **where** each block appears and **what additional content** is injected around them.
+This avoids refactoring the native builder while gaining full preset control over prompt ordering. The native blocks still contain the same content (system prompt from `/sysprompt`, personality from `/persona attribute add`, etc.) — the preset only controls **where** each block appears and **what additional content** is injected around them.
 
 If the preset is deactivated or deleted, context assembly immediately reverts to the native fixed order above. No data is lost — `/sysprompt`, personality attributes, memories, and all other settings are stored independently from the preset.
 

docs/ai/providers.md

@@ -339,7 +339,7 @@ Current command examples:
 - `src/commands/server/initialize/expressions.ts`
 - `src/commands/persona/generate.ts`
 - `src/commands/tool/compact.ts`
-- `src/commands/teach/history.ts`
+- `src/commands/memory/history/import.ts`
 
 ## Intentional Exceptions
 

docs/ai/rag.md

@@ -16,12 +16,12 @@ ACTIVATE_LOCAL_RAG=true
 
 This gate affects both schema initialization and runtime behavior:
 - The pgvector extension and document tables are not created locally unless RAG is enabled.
-- `/teach document` and `/forget document` are blocked locally unless RAG is enabled.
+- `/memory document add` and `/memory document remove` are blocked locally unless RAG is enabled.
 - Automatic retrieval is skipped locally unless RAG is enabled.
 
 ## End-to-End Flow (Detailed)
 
-### 1) Upload (`/teach document`)
+### 1) Upload (`/memory document add`)
 Input:
 - `name` (string, unique per server)
 - `file` (attachment: .txt, .md, .pdf)
@@ -114,11 +114,11 @@ This block is injected as a system context item tagged:
   - If the model family changes, documents are re-embedded.
   - If RAG is disabled locally, re-embedding is skipped.
 
-- `/teach document`
+- `/memory document add`
   - Upload + parse + chunk + embed + store.
   - Blocked when RAG is disabled locally.
 
-- `/forget document`
+- `/memory document remove`
   - Deletes the selected document and cascades its chunks.
   - Blocked when RAG is disabled locally.
 
@@ -170,9 +170,9 @@ pgvector requirement:
 ## Code Pointers (Primary Paths)
 
 - Upload + parse + chunk + embed:
-  - `src/commands/teach/document.ts`
+  - `src/commands/memory/document/add.ts`
 - Delete:
-  - `src/commands/forget/document.ts`
+  - `src/commands/memory/document/remove.ts`
 - Model selection + optional re-embed:
   - `src/commands/config/model/embedding.ts`
 - Embedding requests:

docs/core/introduction.md

@@ -32,9 +32,9 @@ TomoriBot is a TypeScript + Bun Discord AI chatbot focused on configurable perso
 
 ## Current Command Surface
 
-Commands are loaded from folders under `src/commands/` (currently 19 top-level categories):
+Commands are loaded from folders under `src/commands/` (currently 17 top-level categories):
 
-- `bot`, `conditioning`, `config`, `contribute`, `data`, `donate`, `forget`, `generate`, `help`, `legal`, `novelai`, `persona`, `personal`, `punish`, `reward`, `server`, `support`, `teach`, `tool`
+- `bot`, `conditioning`, `config`, `contribute`, `donate`, `generate`, `help`, `legal`, `memory`, `novelai`, `optional-key`, `persona`, `personal`, `server`, `st-preset`, `support`, `tool`
 
 ## Documentation Layout
 

docs/integrations/matrix-bridge.md

@@ -340,7 +340,7 @@ Matrix users can be set as reminder targets. Since they have no row in the `user
 
 1. **`reminderTool.ts`**: Skips BigInt fuzzy-matching (Matrix IDs are not numeric), skips `users` table lookup, and trusts the AI-provided nickname directly.
 2. **`reminderTimer.ts`**: After delivering the reminder, calls `sendMatrixReminderMention()` instead of the Discord mention path. This sends a direct Matrix mention to the linked room if the AI response didn't already include the `@{localpart}` placeholder.
-3. **`forget/reminder.ts`**: Displays Matrix reminders with `(Matrix)` suffix and `for {nickname}` instead of `created by {nickname}` so server managers can identify them.
+3. **`personal/reminder/remove.ts`**: Displays Matrix reminders with `(Matrix)` suffix and `for {nickname}` instead of `created by {nickname}` so server managers can identify them.
 
 Matrix user IDs are stored as-is in the `user_discord_id` TEXT column of the `reminders` table (which already accepts arbitrary strings). No schema changes were needed for reminder support.
 

docs/integrations/modal-input-components.md

@@ -418,11 +418,11 @@ These commands still remove one dynamic item at a time, but the data shape is a
 
 | Command                    | File                               | Current Input         | Why Checkbox Groups Fit                                                   | Notes                                                                 |
 | -------------------------- | ---------------------------------- | --------------------- | ------------------------------------------------------------------------- | --------------------------------------------------------------------- |
-| `/forget attribute`        | `forget/attribute.ts`              | Persona picker + single paginated select | Personality attributes are usually reviewed and pruned in batches        | Needs index-safe array rewrite if duplicate attributes must be preserved |
-| `/forget reminder`         | `forget/reminder.ts`               | Persona picker + single paginated select | Reminder cleanup is often batch-oriented, especially for stale schedules | Manager-only reminder views may need concise descriptions              |
-| `/forget document`         | `forget/document.ts`               | Persona picker + single paginated select | Document cleanup is an obvious multi-select management flow              | Large lists should keep paginated fallback                             |
-| `/forget history`          | `forget/history.ts`                | Persona picker + single paginated select | History entries are frequently pruned in groups                          | Large lists should keep paginated fallback                             |
-| `/forget sampledialogue`   | `forget/sampledialogue.ts`         | Persona picker + single paginated select | Dialogue cleanup is often batch-oriented and already has index-safe removal | Good fit for index-valued checkbox groups                              |
+| `/persona attribute remove` | `persona/attribute/remove.ts`      | Persona picker + single paginated select | Personality attributes are usually reviewed and pruned in batches        | Needs index-safe array rewrite if duplicate attributes must be preserved |
+| `/personal reminder remove` | `personal/reminder/remove.ts`      | Persona picker + single paginated select | Reminder cleanup is often batch-oriented, especially for stale schedules | Manager-only reminder views may need concise descriptions              |
+| `/memory document remove`   | `memory/document/remove.ts`        | Persona picker + single paginated select | Document cleanup is an obvious multi-select management flow              | Large lists should keep paginated fallback                             |
+| `/memory history remove`    | `memory/history/remove.ts`         | Persona picker + single paginated select | History entries are frequently pruned in groups                          | Large lists should keep paginated fallback                             |
+| `/persona sample-dialogue remove` | `persona/sample-dialogue/remove.ts` | Persona picker + single paginated select | Dialogue cleanup is often batch-oriented and already has index-safe removal | Good fit for index-valued checkbox groups                              |
 | `/persona remove`          | `persona/remove.ts`                | Single paginated select | Alter persona cleanup could be batch-managed                             | Should pair the bulk UI with stronger destructive-action messaging     |
 
 ### Not Candidates — Keep String Select
@@ -439,14 +439,14 @@ These modals have dynamic or large option sets that exceed Radio Group/Checkbox
 | `/config model fallback`         | `config/model/fallback.ts`       | Dynamic model list, uses pagination                       |
 | `/config system-prompt preset`       | `config/system-prompt/preset.ts`     | Dynamic preset list from DB                               |
 | `/config api-key set`             | `config/api-key/set.ts`           | Provider select + text input combo; list may grow         |
-| `/teach personaprompt`           | `teach/personaprompt.ts`         | Dynamic persona list + free-form prompt (up to 16000 chars, 4 fields) |
-| `/teach attribute`               | `teach/attribute.ts`             | Dynamic persona list, uses pagination                     |
-| `/teach sampledialogue`          | `teach/sampledialogue.ts`        | Dynamic persona list, uses pagination                     |
-| `/teach memory personal`         | `teach/memory/personal.ts`       | Dynamic memory list                                       |
-| `/teach memory server`           | `teach/memory/server.ts`         | Dynamic memory list                                       |
+| `/persona prompt set`            | `persona/prompt/set.ts`         | Dynamic persona list + free-form prompt (up to 16000 chars, 4 fields) |
+| `/persona attribute add`         | `persona/attribute/add.ts`      | Dynamic persona list, uses pagination                     |
+| `/persona sample-dialogue add`   | `persona/sample-dialogue/add.ts`| Dynamic persona list, uses pagination                     |
+| `/memory personal add`           | `memory/personal/add.ts`        | Dynamic memory list                                       |
+| `/memory server add`             | `memory/server/add.ts`          | Dynamic memory list                                       |
 | `/novelai image-tags character`        | `novelai/tags/character.ts`      | Dynamic persona list                                      |
-| `/forget attribute`              | `forget/attribute.ts`            | Dynamic attribute list, uses pagination                   |
-| `/forget reminder`               | `forget/reminder.ts`             | Dynamic reminder list                                     |
+| `/persona attribute remove`      | `persona/attribute/remove.ts`   | Dynamic attribute list, uses pagination                   |
+| `/personal reminder remove`      | `personal/reminder/remove.ts`   | Dynamic reminder list                                     |
 | `/server welcome-channel set`    | `server/welcome-channel/set.ts`  | Channel option + dynamic persona list                     |
 
 ### Not Candidates — Keep Text Input
@@ -466,7 +466,7 @@ These modals collect free-form text and have no structured option set:
 | `/server trigger add`      | `server/trigger/add.ts`       | Free-form text fields (word, response, cooldown)        |
 | `/server avatar`           | `server/avatar.ts`            | File upload only                                        |
 | `/tool comment`            | `tool/comment.ts`             | Free-form paragraph text                                |
-| `/data import`             | `data/import.ts`              | File upload only                                        |
+| `/memory personal import`  | `memory/personal/import.ts`   | File upload only                                        |
 
 ---
 

docs/integrations/sillytavern-preset-system.md

@@ -389,7 +389,7 @@ This section documents what our implementation supports versus what native Silly
 |-------|--------|-------|
 | `{{user}}` | Supported | Deferred to `convertMentions()` |
 | `{{char}}` / `{{bot}}` | Supported | Deferred to `convertMentions()` |
-| `{{personality}}` | Supported | Maps to `/teach attribute` values |
+| `{{personality}}` | Supported | Maps to `/persona attribute add` values |
 | `{{description}}` | Supported | Maps to persona prompt |
 | `{{mesExamples}}` | Supported | Maps to sample dialogues |
 | `{{lastChatMessage}}` | Supported | Most recent user message |