refactor: sanitize Rust codebase, batch 2 (refs #3176)

.github/workflows/pr-regression-gates.yml

@@ -1003,7 +1003,7 @@ jobs:
         shell: bash
         run: |
           set -euo pipefail
-          TEST='tests::issue_1930_linux_unmarked_adjacent_unwritable_refuses_to_start'
+          TEST='tests::startup::issue_1930_linux_unmarked_adjacent_unwritable_refuses_to_start'
 
           cargo test --locked --lib "$TEST" -- --exact --test-threads=1 --nocapture 2>&1 | tee test-1577.log
 
@@ -1210,9 +1210,11 @@ jobs:
           set -euo pipefail
           FILTER=config::agent_command::tests
           # LINUX count: the Windows leg also compiles four cfg(windows) tests
-          # and reports 96. Update in the same commit that adds or removes a
-          # test in that module.
-          EXPECTED=92
+          # and reports 100. Update in the same commit that adds or removes a
+          # test in that module. Since #3176 the module also holds the former
+          # sibling modules derived_agent_id_home (3 tests) and
+          # p02_schema_launch (1 test).
+          EXPECTED=96
           cargo test --locked --lib "$FILTER" -- --nocapture 2>&1 | tee test-2431.log
           grep -qF 'env_precedence_is_platform_independent' test-2431.log || {
             echo "::error::the POSIX precedence sentinel never ran; the filter matched nothing or it was renamed."

cognitive-complexity.baseline.json

@@ -119,7 +119,7 @@
       }
     },
     {
-      "id": "rust:src-tauri/src/config/session_context.rs::mod:token_accounting::summarized_default_context_meets_size_budget",
+      "id": "rust:src-tauri/src/config/session_context/tests/token_accounting.rs::summarized_default_context_meets_size_budget",
       "sites": {
         "windows": [
           "24924aced08a"
@@ -133,7 +133,7 @@
       }
     },
     {
-      "id": "rust:src-tauri/src/config/settings.rs::mod:tests::settings_save_error_preserves_sources_and_separates_diagnostic_from_outward",
+      "id": "rust:src-tauri/src/config/settings/tests.rs::settings_save_error_preserves_sources_and_separates_diagnostic_from_outward",
       "sites": {
         "windows": [
           "826617b3bb4f"
@@ -178,7 +178,7 @@
       }
     },
     {
-      "id": "rust:src-tauri/src/phone/mailbox.rs::impl:MailboxPoller::deliver_internal_system_wake",
+      "id": "rust:src-tauri/src/phone/mailbox/internal_delivery.rs::impl:MailboxPoller::deliver_internal_system_wake",
       "sites": {
         "windows": [
           "bb794053ede9"
@@ -192,86 +192,86 @@
       }
     },
     {
-      "id": "rust:src-tauri/src/phone/mailbox.rs::impl:MailboxPoller::handle_close_session",
+      "id": "rust:src-tauri/src/phone/mailbox/pty_artifact.rs::impl:MailboxPoller::process_pty_input_file",
       "sites": {
         "windows": [
-          "1d959a229655"
+          "34a3d771ff0c"
         ],
         "linux": [
-          "1d959a229655"
+          "34a3d771ff0c"
         ],
         "macos": [
-          "1d959a229655"
+          "34a3d771ff0c"
         ]
       }
     },
     {
-      "id": "rust:src-tauri/src/phone/mailbox.rs::impl:MailboxPoller::handle_purge_wg",
+      "id": "rust:src-tauri/src/phone/mailbox/pty_authority.rs::impl:MailboxPoller::spawn_pty_input_target",
       "sites": {
         "windows": [
-          "40cfe953061c"
+          "0e2097deada7"
         ],
         "linux": [
-          "40cfe953061c"
+          "0e2097deada7"
         ],
         "macos": [
-          "40cfe953061c"
+          "0e2097deada7"
         ]
       }
     },
     {
-      "id": "rust:src-tauri/src/phone/mailbox.rs::impl:MailboxPoller::poll",
+      "id": "rust:src-tauri/src/phone/mailbox/self_switch.rs::impl:MailboxPoller::resolve_repo_path",
       "sites": {
         "windows": [
-          "dff40736a7a2"
+          "81f48c31ba89"
         ],
         "linux": [
-          "dff40736a7a2"
+          "81f48c31ba89"
         ],
         "macos": [
-          "dff40736a7a2"
+          "81f48c31ba89"
         ]
       }
     },
     {
-      "id": "rust:src-tauri/src/phone/mailbox.rs::impl:MailboxPoller::process_pty_input_file",
+      "id": "rust:src-tauri/src/phone/mailbox/session_lookup.rs::impl:MailboxPoller::handle_close_session",
       "sites": {
         "windows": [
-          "34a3d771ff0c"
+          "1d959a229655"
         ],
         "linux": [
-          "34a3d771ff0c"
+          "1d959a229655"
         ],
         "macos": [
-          "34a3d771ff0c"
+          "1d959a229655"
         ]
       }
     },
     {
-      "id": "rust:src-tauri/src/phone/mailbox.rs::impl:MailboxPoller::resolve_repo_path",
+      "id": "rust:src-tauri/src/phone/mailbox/session_request.rs::impl:MailboxPoller::handle_purge_wg",
       "sites": {
         "windows": [
-          "81f48c31ba89"
+          "40cfe953061c"
         ],
         "linux": [
-          "81f48c31ba89"
+          "40cfe953061c"
         ],
         "macos": [
-          "81f48c31ba89"
+          "40cfe953061c"
         ]
       }
     },
     {
-      "id": "rust:src-tauri/src/phone/mailbox.rs::impl:MailboxPoller::spawn_pty_input_target",
+      "id": "rust:src-tauri/src/phone/mailbox/wake_workers.rs::impl:MailboxPoller::poll",
       "sites": {
         "windows": [
-          "0e2097deada7"
+          "dff40736a7a2"
         ],
         "linux": [
-          "0e2097deada7"
+          "dff40736a7a2"
         ],
         "macos": [
-          "0e2097deada7"
+          "dff40736a7a2"
         ]
       }
     },

scripts/room-rename-allowlist.mjs

@@ -206,8 +206,16 @@ const STR_EXCEPTIONS = {
 // Their purpose is to represent a legacy Workgroup, so no production line moves
 // and section 9.1 adds room- twins beside the existing literals.
 const P2_FILES = [
-  "src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs",
-  "src-tauri/src/pty/terminal_snapshot/resource_tests.rs",
+  "src-tauri/src/pty/terminal_snapshot/tests/acceptance.rs",
+  "src-tauri/src/pty/terminal_snapshot/tests/acceptance/api_cancellation.rs",
+  "src-tauri/src/pty/terminal_snapshot/tests/acceptance/api_support.rs",
+  "src-tauri/src/pty/terminal_snapshot/tests/acceptance/daemon_paths.rs",
+  "src-tauri/src/pty/terminal_snapshot/tests/acceptance/fixture.rs",
+  "src-tauri/src/pty/terminal_snapshot/tests/acceptance/host_api.rs",
+  "src-tauri/src/pty/terminal_snapshot/tests/acceptance/host_cancellation.rs",
+  "src-tauri/src/pty/terminal_snapshot/tests/acceptance/leakage.rs",
+  "src-tauri/src/pty/terminal_snapshot/tests/acceptance/room_targets.rs",
+  "src-tauri/src/pty/terminal_snapshot/tests/resource.rs",
 ];
 
 // Plan 3.8 / 9.4 AC1 point 8: the 63 frontend lines this plan moves.

scripts/room-rename-allowlist.tsv

@@ -2802,31 +2802,39 @@ P2-fixture	src-tauri/src/pty/docker_runtime.rs	"type=bind,source=C:/project/.ac/
 P1-comment	src-tauri/src/pty/git_watcher.rs	/// workgroups whose project is not in `settings.projectPaths`; sessions alone
 P2-fixture	src-tauri/src/pty/manager.rs	let mark = manager.mark_spawning("C:/repo/.ac/wg-1/__agent_dev", "dev");
 P2-fixture	src-tauri/src/pty/manager.rs	cwd: "C:/repo/.ac/wg-1/__agent_dev".to_string(),
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	const WORKGROUP: &str = "wg-1-dev-team";
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	let workgroup = ac_root.join(WORKGROUP);
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	std::fs::create_dir_all(workgroup.join(format!("__agent_{name}")))
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	workgroup.join(format!("__agent_{name}/config.json")),
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	workgroup.join("__agent_member-tampered/config.json"),
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	coordinator: workgroup.join("__agent_coordinator"),
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	worker: workgroup.join("__agent_worker"),
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	live_member: workgroup.join("__agent_member-live"),
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	exited_member: workgroup.join("__agent_member-exited"),
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	claimed_from: format!("{PROJECT}:{WORKGROUP}/coordinator"),
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	audit.accept_requester("project:wg-1-dev-team/coordinator");
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	target: "project:wg-1-dev-team/member-live".to_string(),
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	let target = format!("{PROJECT}:{WORKGROUP}/member-live");
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	let requester = format!("{PROJECT}:{WORKGROUP}/coordinator");
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	let live_target = format!("{PROJECT}:{WORKGROUP}/member-live");
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	format!("{PROJECT}:{WORKGROUP}/member-live"),
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	format!("{PROJECT}:{WORKGROUP}/member-exited"),
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	format!("{PROJECT}:{WORKGROUP}/member-missing"),
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	format!("{PROJECT}:{WORKGROUP}/member-tampered"),
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	&format!("{PROJECT}:{WORKGROUP}/worker"),
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	&format!("{PROJECT}:{WORKGROUP}/coordinator"),
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	let coordinator_fqn = format!("{PROJECT}:{WORKGROUP}/coordinator");
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	let worker_fqn = format!("{PROJECT}:{WORKGROUP}/worker");
-P2-fixture	src-tauri/src/pty/terminal_snapshot/resource_tests.rs	const REQUESTER: &str = "project:wg-1-team/coordinator";
-P2-fixture	src-tauri/src/pty/terminal_snapshot/resource_tests.rs	const TARGET: &str = "project:wg-1-team/member";
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance.rs	const WORKGROUP: &str = "wg-1-dev-team";
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/fixture.rs	let workgroup = ac_root.join(WORKGROUP);
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/fixture.rs	std::fs::create_dir_all(workgroup.join(format!("__agent_{name}")))
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/fixture.rs	workgroup.join(format!("__agent_{name}/config.json")),
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/fixture.rs	workgroup.join("__agent_member-tampered/config.json"),
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/fixture.rs	coordinator: workgroup.join("__agent_coordinator"),
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/fixture.rs	worker: workgroup.join("__agent_worker"),
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/fixture.rs	live_member: workgroup.join("__agent_member-live"),
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/fixture.rs	exited_member: workgroup.join("__agent_member-exited"),
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/host_api.rs	claimed_from: format!("{PROJECT}:{WORKGROUP}/coordinator"),
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/api_support.rs	audit.accept_requester("project:wg-1-dev-team/coordinator");
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/api_support.rs	target: "project:wg-1-dev-team/member-live".to_string(),
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/api_cancellation.rs	let target = format!("{PROJECT}:{WORKGROUP}/member-live");
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/common_blocking.rs	let target = format!("{PROJECT}:{WORKGROUP}/member-live");
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/host_cancellation.rs	let target = format!("{PROJECT}:{WORKGROUP}/member-live");
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/scanner_shutdown.rs	let target = format!("{PROJECT}:{WORKGROUP}/member-live");
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/host_cancellation.rs	let requester = format!("{PROJECT}:{WORKGROUP}/coordinator");
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/scanner_shutdown.rs	let requester = format!("{PROJECT}:{WORKGROUP}/coordinator");
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/daemon_paths.rs	let live_target = format!("{PROJECT}:{WORKGROUP}/member-live");
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/host_finalizer.rs	let live_target = format!("{PROJECT}:{WORKGROUP}/member-live");
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/leakage.rs	let live_target = format!("{PROJECT}:{WORKGROUP}/member-live");
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/panic_boundaries.rs	let live_target = format!("{PROJECT}:{WORKGROUP}/member-live");
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/daemon_paths.rs	format!("{PROJECT}:{WORKGROUP}/member-live"),
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/daemon_paths.rs	format!("{PROJECT}:{WORKGROUP}/member-exited"),
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/daemon_paths.rs	format!("{PROJECT}:{WORKGROUP}/member-missing"),
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/daemon_paths.rs	format!("{PROJECT}:{WORKGROUP}/member-tampered"),
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/daemon_paths.rs	&format!("{PROJECT}:{WORKGROUP}/worker"),
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/daemon_paths.rs	&format!("{PROJECT}:{WORKGROUP}/coordinator"),
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/leakage.rs	let coordinator_fqn = format!("{PROJECT}:{WORKGROUP}/coordinator");
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/panic_boundaries.rs	let coordinator_fqn = format!("{PROJECT}:{WORKGROUP}/coordinator");
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/leakage.rs	let worker_fqn = format!("{PROJECT}:{WORKGROUP}/worker");
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/resource.rs	const REQUESTER: &str = "project:wg-1-team/coordinator";
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/resource.rs	const TARGET: &str = "project:wg-1-team/member";
 P0-identifier	src-tauri/src/resource_monitor/registry.rs	workgroup: Option<String>,
 P0-identifier	src-tauri/src/resource_monitor/registry.rs	self.metadata.workgroup.clone(),
 P1-comment	src-tauri/src/resource_monitor/registry.rs	// #559 (H3) - a relaunch of the same wg/role must not leave its prior
@@ -2981,7 +2989,7 @@ P2-fixture	src-tauri/src/session/session.rs	let p = find_workgroup_task_path_for
 P2-fixture	src-tauri/src/session/session.rs	assert!(p.ends_with(r"\wg-3-team\TASK.md"));
 P2-fixture	src-tauri/src/telegram/bridge.rs	"   ▄▀▀    ▀▀▄     D:/0_repos/AgentsCommander_iac/.ac/wg-21-ac-dev-team-v3/__agent_ac-cli-tester-v3",
 P2-fixture	src-tauri/src/telegram/bridge.rs	"  D:/0_repos/AgentsCommander_iac/.ac/wg-21-ac-dev-team-v3/__agent_ac-cli-tester-v3"
-P2-fixture	src-tauri/src/testability/ui_automation.rs	workgroup: None,
+P2-fixture	src-tauri/src/testability/ui_automation/tests/watchdog.rs	workgroup: None,
 P0-identifier	src-tauri/src/web/commands.rs	let config: crate::config::project_settings::WorkgroupGroupsConfig =
 P2-fixture	src-tauri/src/web/commands.rs	use crate::config::project_settings::{WorkgroupGroup, WorkgroupGroupsConfig};
 P2-fixture	src-tauri/src/web/commands.rs	let config = WorkgroupGroupsConfig {
@@ -3231,9 +3239,9 @@ P1-comment	src-tauri/src/api/identity.rs	/// #1614 (D): a Room replica and a leg
 P2-fixture	src-tauri/src/api/identity.rs	for entity in ["wg-1-team", "room-1-team"] {	section 9.1 fixture twin: the room- case added BESIDE the kept wg- one (Rule P2)
 P2-fixture	src-tauri/src/api/identity.rs	"a Workgroup and a Room at slot 1 must be two different peers"	section 9.1 fixture twin: the room- case added BESIDE the kept wg- one (Rule P2)
 P2-fixture	src-tauri/src/api/identity.rs	assert!(resolved[0].contains("wg-1-team"), "got: {}", resolved[0]);	section 9.1 fixture twin: the room- case added BESIDE the kept wg- one (Rule P2)
-P1-comment	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	/// `WORKGROUP`, never replacing it: a legacy fixture is the only way	section 9.1 fixture twin's doc comment, stating why the wg- fixture is kept
-P1-comment	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	/// exercising `wg-1-dev-team` and gains the Room case.	section 9.1 fixture twin's doc comment, stating why the wg- fixture is kept
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	assert!(has_entity_prefix(WORKGROUP), "{WORKGROUP}");	section 9.1 fixture twin: the room- case added BESIDE the kept wg- one (Rule P2)
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	assert_eq!(strip_entity_prefix(WORKGROUP), Some("1-dev-team"));	section 9.1 fixture twin: the room- case added BESIDE the kept wg- one (Rule P2)
-P1-comment	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	// directory name, so a Room and a legacy Workgroup at the same slot are	section 9.1 fixture twin's doc comment, stating why the wg- fixture is kept
-P2-fixture	src-tauri/src/pty/terminal_snapshot/acceptance_tests.rs	let legacy_fqn = format!("{PROJECT}:{WORKGROUP}/coordinator");	section 9.1 fixture twin: the room- case added BESIDE the kept wg- one (Rule P2)
+P1-comment	src-tauri/src/pty/terminal_snapshot/tests/acceptance.rs	/// `WORKGROUP`, never replacing it: a legacy fixture is the only way	section 9.1 fixture twin's doc comment, stating why the wg- fixture is kept
+P1-comment	src-tauri/src/pty/terminal_snapshot/tests/acceptance.rs	/// exercising `wg-1-dev-team` and gains the Room case.	section 9.1 fixture twin's doc comment, stating why the wg- fixture is kept
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/room_targets.rs	assert!(has_entity_prefix(WORKGROUP), "{WORKGROUP}");	section 9.1 fixture twin: the room- case added BESIDE the kept wg- one (Rule P2)
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/room_targets.rs	assert_eq!(strip_entity_prefix(WORKGROUP), Some("1-dev-team"));	section 9.1 fixture twin: the room- case added BESIDE the kept wg- one (Rule P2)
+P1-comment	src-tauri/src/pty/terminal_snapshot/tests/acceptance/room_targets.rs	// directory name, so a Room and a legacy Workgroup at the same slot are	section 9.1 fixture twin's doc comment, stating why the wg- fixture is kept
+P2-fixture	src-tauri/src/pty/terminal_snapshot/tests/acceptance/room_targets.rs	let legacy_fqn = format!("{PROJECT}:{WORKGROUP}/coordinator");	section 9.1 fixture twin: the room- case added BESIDE the kept wg- one (Rule P2)

scripts/sanitizing_file_layout.mjs

@@ -44,7 +44,9 @@ function measure(path, scan) {
     }
   }
   for (const scope of scan.scopes) for (const entry of scope.imports) if (entry.glob) {
-    if (path.endsWith('/tests.rs') && entry.target === 'super::*') continue;
+    // C6: a file under a tests/ folder is part of its tests.rs, so it may glob its parent too.
+    const testsFile = path.endsWith('/tests.rs') || path.includes('/tests/');
+    if (testsFile && entry.target === 'super::*') continue;
     const use = scan.items.find(i => i.kind === 'use' && i.scope === scope &&
       ts.slice(i.first, i.last).some(t => t.text === '*'));
     hit(m, 'glob', use?.line ?? 1);