test(plugin): remove duplicated file listing helper

Author: ScriptedAlchemy

tests/agent_suite/plugin_bundle_sync_test.rs

@@ -1,11 +1,8 @@
 //! Cross-bundle sync enforcement for the shipped plugin source bundles.
 //!
-//! `cursor-plugin/` and `codex-plugin/` (and any future ecosystem bundle,
-//! e.g. `claude-plugin/`) must not silently drift: every content unit is
-//! either present and byte-identical in all bundles, or covered by a
+//! `cursor-plugin/` and `codex-plugin/` must not silently drift: every content
+//! unit is either present and byte-identical in all bundles, or covered by a
 //! declarative exception below that documents why it diverges or is absent.
-//! Adding a bundle means adding one `Bundle` row plus manifest entries — the
-//! assertions themselves are bundle-count agnostic.
 //!
 //! Division of labour with existing tests (do not duplicate them here):
 //! - `tests/agent_suite/plugin_skill_contract_test.rs` — per-host frontmatter
@@ -15,9 +12,7 @@
 //!   `src/agents/codex.rs` unit tests
 //!   (`codex_embedded_file_list_covers_the_whole_source_bundle`) — the
 //!   private `EMBEDDED_PLUGIN_FILES` / `CODEX_EMBEDDED_PLUGIN_FILES`
-//!   registries must cover exactly the on-disk bundle trees. Because those
-//!   pin registry == disk, the disk-level sync enforced here transitively
-//!   keeps the embedded registries in sync too.
+//!   registries must cover exactly the on-disk bundle trees.
 //! - `src/agents/codex.rs` `codex_skills_match_the_cursor_source_for_parity`
 //!   — the original two-bundle skill parity check with its own allowlists.
 //!   The skill exceptions below mirror those allowlists; if the two tables
@@ -38,9 +33,7 @@ struct Bundle {
     root: &'static str,
 }
 
-/// Every ecosystem bundle shipped from this repo. A third ecosystem (e.g.
-/// `claude-plugin/`) joins the sync check by adding a row here plus its
-/// host-specific rows in [`TOP_LEVEL_MANIFEST`] / [`SKILL_SYNC_EXCEPTIONS`].
+/// Every ecosystem bundle shipped from this repo.
 const BUNDLES: &[Bundle] = &[
     Bundle {
         name: "cursor",
@@ -267,10 +260,7 @@ fn skills_are_synced_across_bundles_or_declared_exceptions() {
 }
 
 /// The cross-bundle shared skill set must equal the runtime skill index the
-/// hooks advertise (`hooks::CURSOR_PLUGIN_SKILLS`), tying this manifest to
-/// the session-context steering and to the codex.rs parity unit tests. If a
-/// future bundle intentionally ships a subset, its missing skills become
-/// `OnlyIn` exceptions and this expectation must be revisited alongside them.
+/// hooks advertise (`hooks::CURSOR_PLUGIN_SKILLS`).
 #[test]
 fn skills_shared_by_every_bundle_match_the_runtime_skill_index() {
     let bundle_count = BUNDLES.len();

tests/agent_suite/plugin_config_schema_test.rs

@@ -15,7 +15,7 @@
 //! cross-checked against the hooks.json files shipped by official plugins in
 //! <https://github.com/cursor/plugins> (commit 0452e08). See each schema's
 //! top-level `description` for provenance details. The `plugin.json`
-//! manifests themselves are covered by `tests/plugin_manifest_schema_test.rs`.
+//! manifests themselves are covered by `plugin_manifest_schema_test.rs`.
 
 #![allow(clippy::unwrap_used, clippy::expect_used)]
 

tests/agent_suite/skill_lint_claude_test.rs

@@ -1,9 +1,8 @@
 //! Claude Code / Agent Skills portability lint for the bundled skill
 //! collections (`cursor-plugin/skills/` and `codex-plugin/skills/`).
 //!
-//! TraceDecay may ship a `claude-plugin/` bundle later; these tests verify the
-//! centralized skills already satisfy Claude Code's skill rules so the bundle
-//! would be a re-packaging exercise, not a rewrite.
+//! These tests keep the shared skills close to Claude Code's documented skill
+//! rules so a Claude bundle can reuse them without a rewrite.
 //!
 //! Rule sources (fetched 2026-07-02):
 //! - Claude Code skills reference (frontmatter field table, 1,536-char
@@ -258,11 +257,9 @@ fn documented_conflict_fields_are_actually_used_by_the_cursor_bundle() {
     }
 }
 
-/// A future claude-plugin bundle would preload every model-invocable skill's
-/// name + description into Claude Code's skill listing (default budget ~1% of
-/// context). Keep the aggregate small so the bundle never crowds the window;
-/// this mirrors the 6,000-char house budget the Cursor/Codex contract test
-/// uses for the same reason.
+/// Claude Code preloads model-invocable skill metadata into its skill listing.
+/// Keep the aggregate near the Cursor/Codex contract budget so the listing
+/// stays small.
 #[test]
 fn model_invocable_skill_metadata_fits_a_claude_listing_budget() {
     const MAX_PRELOADED_METADATA_CHARS: usize = 6_000;

tests/agent_suite/update_plugin_test.rs

@@ -14,7 +14,9 @@ use serde_json::json;
 use tempfile::TempDir;
 use tracedecay::agents::{get_integration, InstallContext, UpdatePluginOutcome};
 
-use crate::common::{assert_schema_valid, compile_schema, EnvVarGuard, PROCESS_ENV_LOCK};
+use crate::common::{
+    assert_schema_valid, compile_schema, relative_files_under, EnvVarGuard, PROCESS_ENV_LOCK,
+};
 
 const OLD_BIN: &str = "/old/bin/tracedecay";
 const NEW_BIN: &str = "/new/bin/tracedecay";
@@ -105,27 +107,6 @@ fn write_stale_codex_skill(plugin_dir: &Path) {
     .unwrap();
 }
 
-/// Every regular file under `root`, relative to it, sorted.
-fn file_listing(root: &Path) -> Vec<PathBuf> {
-    fn walk(dir: &Path, root: &Path, out: &mut Vec<PathBuf>) {
-        let Ok(entries) = std::fs::read_dir(dir) else {
-            return;
-        };
-        for entry in entries.flatten() {
-            let path = entry.path();
-            if path.is_dir() {
-                walk(&path, root, out);
-            } else {
-                out.push(path.strip_prefix(root).unwrap().to_path_buf());
-            }
-        }
-    }
-    let mut out = Vec::new();
-    walk(root, root, &mut out);
-    out.sort();
-    out
-}
-
 // ---------------------------------------------------------------------------
 // Hermes
 // ---------------------------------------------------------------------------
@@ -637,7 +618,7 @@ fn config_only_integrations_report_config_only_and_write_nothing() {
             "{id} should be config-only"
         );
         assert!(
-            file_listing(home.path()).is_empty(),
+            relative_files_under(home.path()).is_empty(),
             "{id} update_plugin wrote files into the home dir"
         );
     }
@@ -727,7 +708,7 @@ fn rendered_json_placeholders(install_dir: &Path) -> Vec<(String, String, String
         }
     }
     let mut found = Vec::new();
-    for relative in file_listing(install_dir) {
+    for relative in relative_files_under(install_dir) {
         if relative.extension().and_then(|ext| ext.to_str()) != Some("json") {
             continue;
         }
@@ -748,20 +729,20 @@ fn rendered_json_placeholders(install_dir: &Path) -> Vec<(String, String, String
 /// wipes the previous managed files first. The rendered dir may hold extras
 /// (managed skill overlay, user files); source ⊆ rendered is the contract.
 fn assert_source_bundle_fully_rendered(source_dir: &Path, install_dir: &Path) {
-    let source = file_listing(source_dir);
+    let source = relative_files_under(source_dir);
     assert!(
         !source.is_empty(),
         "source bundle {} should not be empty",
         source_dir.display()
     );
-    let rendered = file_listing(install_dir);
+    let rendered = relative_files_under(install_dir);
     let missing: Vec<&PathBuf> = source
         .iter()
         .filter(|relative| !rendered.contains(relative))
         .collect();
     assert!(
         missing.is_empty(),
-        "files present in {} but silently dropped from the rendered install {}: {missing:?}",
+        "files present in {} but missing from rendered install {}: {missing:?}",
         source_dir.display(),
         install_dir.display()
     );