From a79c0bd369516f04a7950f5a955d6346c6815852 Mon Sep 17 00:00:00 2001
From: Alexandre Teixeira <111787685+alteixeira20@users.noreply.github.com>
Date: Thu, 11 Jun 2026 18:01:14 +0100
Subject: [PATCH] test: move area_cli tests into cli directory (#3842)

* test: move area_cli tests into cli directory

* test: include research CLI status in cli test move
---
 tests/TESTING_STANDARD.md                            | 9 +++++----
 tests/{ => cli}/test_calendar_cli_name.py            | 0
 tests/{ => cli}/test_contacts_cli_rows.py            | 0
 tests/{ => cli}/test_cookbook_cli_state.py           | 0
 tests/{ => cli}/test_docs_cli_content_length.py      | 0
 tests/{ => cli}/test_gallery_cli_album_count.py      | 0
 tests/{ => cli}/test_gallery_cli_preview.py          | 0
 tests/{ => cli}/test_logs_cli_resolve_nonstring.py   | 0
 tests/{ => cli}/test_mail_cli_read_empty_fetch.py    | 0
 tests/{ => cli}/test_mail_cli_recipients.py          | 0
 tests/{ => cli}/test_mcp_cli_env_serialize.py        | 0
 tests/{ => cli}/test_mcp_cli_json.py                 | 0
 tests/{ => cli}/test_memory_cli_rows.py              | 0
 tests/{ => cli}/test_notes_cli_items.py              | 0
 tests/{ => cli}/test_personal_cli_rows.py            | 0
 tests/{ => cli}/test_preset_cli_invalid_entries.py   | 0
 tests/{ => cli}/test_preset_cli_set_corrupt_entry.py | 0
 tests/{ => cli}/test_preset_cli_store.py             | 0
 tests/{ => cli}/test_research_cli_preview.py         | 0
 tests/{ => cli}/test_research_cli_status.py          | 2 +-
 tests/{ => cli}/test_research_cli_status_filter.py   | 2 +-
 tests/{ => cli}/test_research_cli_store.py           | 0
 tests/{ => cli}/test_sessions_cli.py                 | 0
 tests/{ => cli}/test_signature_cli_export.py         | 0
 tests/{ => cli}/test_skills_cli_preview.py           | 0
 tests/{ => cli}/test_skills_cli_rows.py              | 0
 tests/{ => cli}/test_tasks_cli_preview.py            | 0
 tests/{ => cli}/test_theme_cli_store.py              | 0
 tests/{ => cli}/test_webhook_cli_mask.py             | 0
 29 files changed, 7 insertions(+), 6 deletions(-)
 rename tests/{ => cli}/test_calendar_cli_name.py (100%)
 rename tests/{ => cli}/test_contacts_cli_rows.py (100%)
 rename tests/{ => cli}/test_cookbook_cli_state.py (100%)
 rename tests/{ => cli}/test_docs_cli_content_length.py (100%)
 rename tests/{ => cli}/test_gallery_cli_album_count.py (100%)
 rename tests/{ => cli}/test_gallery_cli_preview.py (100%)
 rename tests/{ => cli}/test_logs_cli_resolve_nonstring.py (100%)
 rename tests/{ => cli}/test_mail_cli_read_empty_fetch.py (100%)
 rename tests/{ => cli}/test_mail_cli_recipients.py (100%)
 rename tests/{ => cli}/test_mcp_cli_env_serialize.py (100%)
 rename tests/{ => cli}/test_mcp_cli_json.py (100%)
 rename tests/{ => cli}/test_memory_cli_rows.py (100%)
 rename tests/{ => cli}/test_notes_cli_items.py (100%)
 rename tests/{ => cli}/test_personal_cli_rows.py (100%)
 rename tests/{ => cli}/test_preset_cli_invalid_entries.py (100%)
 rename tests/{ => cli}/test_preset_cli_set_corrupt_entry.py (100%)
 rename tests/{ => cli}/test_preset_cli_store.py (100%)
 rename tests/{ => cli}/test_research_cli_preview.py (100%)
 rename tests/{ => cli}/test_research_cli_status.py (98%)
 rename tests/{ => cli}/test_research_cli_status_filter.py (99%)
 rename tests/{ => cli}/test_research_cli_store.py (100%)
 rename tests/{ => cli}/test_sessions_cli.py (100%)
 rename tests/{ => cli}/test_signature_cli_export.py (100%)
 rename tests/{ => cli}/test_skills_cli_preview.py (100%)
 rename tests/{ => cli}/test_skills_cli_rows.py (100%)
 rename tests/{ => cli}/test_tasks_cli_preview.py (100%)
 rename tests/{ => cli}/test_theme_cli_store.py (100%)
 rename tests/{ => cli}/test_webhook_cli_mask.py (100%)

diff --git a/tests/TESTING_STANDARD.md b/tests/TESTING_STANDARD.md
index 44bd3015c..cb489c9a7 100644
--- a/tests/TESTING_STANDARD.md
+++ b/tests/TESTING_STANDARD.md
@@ -51,10 +51,11 @@ Every new or refactored test should be:
 
 ## Test taxonomy
 
-Tests are classified by the categories below. Today the suite is flat under
-`tests/`; the **Target dir** column is the phased layout from #2523 that we move
-toward *after* helpers and determinism are stable. Until a category is moved,
-new tests in that category stay in flat `tests/` but should still follow this
+Tests are classified by the categories below. Today the suite is mostly flat
+under `tests/` (the current `area_cli` set has moved to `tests/cli/`); the
+**Target dir** column is the phased layout from #2523 that we move toward
+*after* helpers and determinism are stable. Until a category is moved, new
+tests in that category stay in flat `tests/` but should still follow this
 standard.
 
 | Category | What it covers | Examples today | Target dir |
diff --git a/tests/test_calendar_cli_name.py b/tests/cli/test_calendar_cli_name.py
similarity index 100%
rename from tests/test_calendar_cli_name.py
rename to tests/cli/test_calendar_cli_name.py
diff --git a/tests/test_contacts_cli_rows.py b/tests/cli/test_contacts_cli_rows.py
similarity index 100%
rename from tests/test_contacts_cli_rows.py
rename to tests/cli/test_contacts_cli_rows.py
diff --git a/tests/test_cookbook_cli_state.py b/tests/cli/test_cookbook_cli_state.py
similarity index 100%
rename from tests/test_cookbook_cli_state.py
rename to tests/cli/test_cookbook_cli_state.py
diff --git a/tests/test_docs_cli_content_length.py b/tests/cli/test_docs_cli_content_length.py
similarity index 100%
rename from tests/test_docs_cli_content_length.py
rename to tests/cli/test_docs_cli_content_length.py
diff --git a/tests/test_gallery_cli_album_count.py b/tests/cli/test_gallery_cli_album_count.py
similarity index 100%
rename from tests/test_gallery_cli_album_count.py
rename to tests/cli/test_gallery_cli_album_count.py
diff --git a/tests/test_gallery_cli_preview.py b/tests/cli/test_gallery_cli_preview.py
similarity index 100%
rename from tests/test_gallery_cli_preview.py
rename to tests/cli/test_gallery_cli_preview.py
diff --git a/tests/test_logs_cli_resolve_nonstring.py b/tests/cli/test_logs_cli_resolve_nonstring.py
similarity index 100%
rename from tests/test_logs_cli_resolve_nonstring.py
rename to tests/cli/test_logs_cli_resolve_nonstring.py
diff --git a/tests/test_mail_cli_read_empty_fetch.py b/tests/cli/test_mail_cli_read_empty_fetch.py
similarity index 100%
rename from tests/test_mail_cli_read_empty_fetch.py
rename to tests/cli/test_mail_cli_read_empty_fetch.py
diff --git a/tests/test_mail_cli_recipients.py b/tests/cli/test_mail_cli_recipients.py
similarity index 100%
rename from tests/test_mail_cli_recipients.py
rename to tests/cli/test_mail_cli_recipients.py
diff --git a/tests/test_mcp_cli_env_serialize.py b/tests/cli/test_mcp_cli_env_serialize.py
similarity index 100%
rename from tests/test_mcp_cli_env_serialize.py
rename to tests/cli/test_mcp_cli_env_serialize.py
diff --git a/tests/test_mcp_cli_json.py b/tests/cli/test_mcp_cli_json.py
similarity index 100%
rename from tests/test_mcp_cli_json.py
rename to tests/cli/test_mcp_cli_json.py
diff --git a/tests/test_memory_cli_rows.py b/tests/cli/test_memory_cli_rows.py
similarity index 100%
rename from tests/test_memory_cli_rows.py
rename to tests/cli/test_memory_cli_rows.py
diff --git a/tests/test_notes_cli_items.py b/tests/cli/test_notes_cli_items.py
similarity index 100%
rename from tests/test_notes_cli_items.py
rename to tests/cli/test_notes_cli_items.py
diff --git a/tests/test_personal_cli_rows.py b/tests/cli/test_personal_cli_rows.py
similarity index 100%
rename from tests/test_personal_cli_rows.py
rename to tests/cli/test_personal_cli_rows.py
diff --git a/tests/test_preset_cli_invalid_entries.py b/tests/cli/test_preset_cli_invalid_entries.py
similarity index 100%
rename from tests/test_preset_cli_invalid_entries.py
rename to tests/cli/test_preset_cli_invalid_entries.py
diff --git a/tests/test_preset_cli_set_corrupt_entry.py b/tests/cli/test_preset_cli_set_corrupt_entry.py
similarity index 100%
rename from tests/test_preset_cli_set_corrupt_entry.py
rename to tests/cli/test_preset_cli_set_corrupt_entry.py
diff --git a/tests/test_preset_cli_store.py b/tests/cli/test_preset_cli_store.py
similarity index 100%
rename from tests/test_preset_cli_store.py
rename to tests/cli/test_preset_cli_store.py
diff --git a/tests/test_research_cli_preview.py b/tests/cli/test_research_cli_preview.py
similarity index 100%
rename from tests/test_research_cli_preview.py
rename to tests/cli/test_research_cli_preview.py
diff --git a/tests/test_research_cli_status.py b/tests/cli/test_research_cli_status.py
similarity index 98%
rename from tests/test_research_cli_status.py
rename to tests/cli/test_research_cli_status.py
index fef4b3b22..4cd8051bc 100644
--- a/tests/test_research_cli_status.py
+++ b/tests/cli/test_research_cli_status.py
@@ -15,7 +15,7 @@ from types import SimpleNamespace
 
 import pytest
 
-ROOT = Path(__file__).resolve().parents[1]
+ROOT = Path(__file__).resolve().parents[2]
 
 
 def _load_cli():
diff --git a/tests/test_research_cli_status_filter.py b/tests/cli/test_research_cli_status_filter.py
similarity index 99%
rename from tests/test_research_cli_status_filter.py
rename to tests/cli/test_research_cli_status_filter.py
index a406a8be6..da8e65fcc 100644
--- a/tests/test_research_cli_status_filter.py
+++ b/tests/cli/test_research_cli_status_filter.py
@@ -21,7 +21,7 @@ import json
 from pathlib import Path
 from types import SimpleNamespace
 
-ROOT = Path(__file__).resolve().parents[1]
+ROOT = Path(__file__).resolve().parents[2]
 
 
 def _load_cli():
diff --git a/tests/test_research_cli_store.py b/tests/cli/test_research_cli_store.py
similarity index 100%
rename from tests/test_research_cli_store.py
rename to tests/cli/test_research_cli_store.py
diff --git a/tests/test_sessions_cli.py b/tests/cli/test_sessions_cli.py
similarity index 100%
rename from tests/test_sessions_cli.py
rename to tests/cli/test_sessions_cli.py
diff --git a/tests/test_signature_cli_export.py b/tests/cli/test_signature_cli_export.py
similarity index 100%
rename from tests/test_signature_cli_export.py
rename to tests/cli/test_signature_cli_export.py
diff --git a/tests/test_skills_cli_preview.py b/tests/cli/test_skills_cli_preview.py
similarity index 100%
rename from tests/test_skills_cli_preview.py
rename to tests/cli/test_skills_cli_preview.py
diff --git a/tests/test_skills_cli_rows.py b/tests/cli/test_skills_cli_rows.py
similarity index 100%
rename from tests/test_skills_cli_rows.py
rename to tests/cli/test_skills_cli_rows.py
diff --git a/tests/test_tasks_cli_preview.py b/tests/cli/test_tasks_cli_preview.py
similarity index 100%
rename from tests/test_tasks_cli_preview.py
rename to tests/cli/test_tasks_cli_preview.py
diff --git a/tests/test_theme_cli_store.py b/tests/cli/test_theme_cli_store.py
similarity index 100%
rename from tests/test_theme_cli_store.py
rename to tests/cli/test_theme_cli_store.py
diff --git a/tests/test_webhook_cli_mask.py b/tests/cli/test_webhook_cli_mask.py
similarity index 100%
rename from tests/test_webhook_cli_mask.py
rename to tests/cli/test_webhook_cli_mask.py