test: share the retired-with-resources fixture

PR #439 added `retired_catalog_with_resources` to tests/doctor.rs — a
20-line copy of `retired_catalog` differing only in the retirement clause
and two `resource` lines — and duplicated the same two-`resource` KDL
literal inline in tests/agent_desired_state.rs.

Hoist the literal to `support::RETIRED_RESOURCES`, parameterize
`retired_catalog(root, retirement, extra)`, and delete the clone. Net -4
lines with the 20-line clone gone; the fixture literal now exists once.

agent-identity: dev3.direct.omp.v6c4mkm2
agent-persona: generalist
agent-supervisor: unavailable
agent-tool: OMP
agent-tool-version: 18.1.2
agent-runtime: OMP 18.1.2
tooling-profile: dotfiles@7534055

Author: schickling-assistant

tests/agent_desired_state.rs

@@ -2,6 +2,10 @@ use std::fs;
 use std::path::Path;
 use std::process::{Command, Output};
 
+mod support;
+
+use support::RETIRED_RESOURCES;
+
 fn write(root: &Path, relative: &str, contents: &str) {
     let path = root.join(relative);
     fs::create_dir_all(path.parent().unwrap()).unwrap();
@@ -250,12 +254,8 @@ fn cli_applies_the_existing_self_or_descendant_authority_guardrail() {
 fn legacy_retirement_reads_and_authoring_preserves_resources() {
     let temporary = tempfile::tempdir().unwrap();
     let root = temporary.path();
-    let resources = concat!(
-        "  resource \"work\" uri=\"work://h/current-task\" reason=\"Current implementation task.\"\n",
-        "  resource \"issue\" uri=\"github-issue://example/project/41\" reason=\"Tracking issue.\"\n",
-    );
     let legacy = format!(
-        "agent \"worker\" {{\n  host \"h\"\n  retired #true\n{resources}  command \"true\"\n}}\n"
+        "agent \"worker\" {{\n  host \"h\"\n  retired #true\n{RETIRED_RESOURCES}  command \"true\"\n}}\n"
     );
     write(root, "h/worker/agent.kdl", &legacy);
 

tests/doctor.rs

@@ -8,38 +8,21 @@ use std::time::{Duration, Instant};
 
 use sha2::{Digest as _, Sha256};
 
+mod support;
+
+use support::RETIRED_RESOURCES;
+
 fn executable(path: &Path, body: &str) {
     fs::write(path, body).unwrap();
     fs::set_permissions(path, fs::Permissions::from_mode(0o755)).unwrap();
 }
 
-fn retired_catalog(root: &Path) -> Child {
-    let declaration = root.join("agents/h/gone/agent.kdl");
-    fs::create_dir_all(declaration.parent().unwrap()).unwrap();
-    fs::write(
-        declaration,
-        "agent \"gone\" { host \"h\"; retired #true; command \"true\" }\n",
-    )
-    .unwrap();
-    let owner = Command::new("sleep").arg("30").spawn().unwrap();
-    fs::write(root.join(".st2.h.lock"), format!("{}\n", owner.id())).unwrap();
-    owner
-}
-
-fn retired_catalog_with_resources(root: &Path) -> Child {
+fn retired_catalog(root: &Path, retirement: &str, extra: &str) -> Child {
     let declaration = root.join("agents/h/gone/agent.kdl");
     fs::create_dir_all(declaration.parent().unwrap()).unwrap();
     fs::write(
         declaration,
-        concat!(
-            "agent \"gone\" {\n",
-            "  host \"h\"\n",
-            "  desired-state \"retired\" reason=\"Mission complete\"\n",
-            "  resource \"work\" uri=\"work://h/current-task\" reason=\"Current implementation task.\"\n",
-            "  resource \"issue\" uri=\"github-issue://example/project/41\" reason=\"Tracking issue.\"\n",
-            "  command \"true\"\n",
-            "}\n",
-        ),
+        format!("agent \"gone\" {{\n  host \"h\"\n  {retirement}\n{extra}  command \"true\"\n}}\n"),
     )
     .unwrap();
     let owner = Command::new("sleep").arg("30").spawn().unwrap();
@@ -323,7 +306,7 @@ fn retired_declaration_is_healthy_when_tasks_and_presence_are_absent() {
         &bin.join("pty"),
         "#!/bin/sh\nif [ \"$1\" = list ]; then printf '[]\\n'; fi\n",
     );
-    let mut owner = retired_catalog(&catalog);
+    let mut owner = retired_catalog(&catalog, "retired #true", "");
 
     let output = doctor(&catalog, &bin, &tmp.path().join("state"));
     let _ = owner.kill();
@@ -359,7 +342,11 @@ fn retired_declaration_with_resources_is_healthy_when_tasks_are_absent() {
         "#!/bin/sh\nif [ \"$1\" = list ]; then printf '[]\\n'; fi\n",
     );
     let declaration = catalog.join("agents/h/gone/agent.kdl");
-    let mut owner = retired_catalog_with_resources(&catalog);
+    let mut owner = retired_catalog(
+        &catalog,
+        "desired-state \"retired\" reason=\"Mission complete\"",
+        RETIRED_RESOURCES,
+    );
     let before = fs::read(&declaration).unwrap();
 
     let output = doctor(&catalog, &bin, &tmp.path().join("state"));
@@ -395,7 +382,7 @@ fn retired_declaration_is_unhealthy_while_a_declared_task_is_alive() {
         &bin.join("pty"),
         "#!/bin/sh\nif [ \"$1\" = list ]; then printf '[{\"name\":\"h.gone\",\"status\":\"running\"}]\\n'; fi\n",
     );
-    let mut owner = retired_catalog(&catalog);
+    let mut owner = retired_catalog(&catalog, "retired #true", "");
 
     let output = doctor(&catalog, &bin, &tmp.path().join("state"));
     let _ = owner.kill();
@@ -433,7 +420,7 @@ fn retired_declaration_is_unhealthy_while_a_dead_task_record_remains() {
         &bin.join("pty"),
         "#!/bin/sh\nif [ \"$1\" = list ]; then printf '[{\"name\":\"h.gone\",\"status\":\"exited\"}]\\n'; fi\n",
     );
-    let mut owner = retired_catalog(&catalog);
+    let mut owner = retired_catalog(&catalog, "retired #true", "");
 
     let output = doctor(&catalog, &bin, &tmp.path().join("state"));
     let _ = owner.kill();

tests/support/mod.rs

@@ -1,3 +1,6 @@
+// Shared by several test binaries; each one uses only the parts it needs.
+#![allow(dead_code)]
+
 use std::io;
 use std::ops::{Deref, DerefMut};
 use std::os::fd::{AsRawFd as _, OwnedFd};
@@ -10,6 +13,12 @@ use std::time::{Duration, Instant};
 
 const CLEANUP_DEADLINE: Duration = Duration::from_secs(2);
 
+/// A retired agent's declared `resource` bindings, shared by the desired-state and doctor fixtures.
+pub const RETIRED_RESOURCES: &str = concat!(
+    "  resource \"work\" uri=\"work://h/current-task\" reason=\"Current implementation task.\"\n",
+    "  resource \"issue\" uri=\"github-issue://example/project/41\" reason=\"Tracking issue.\"\n",
+);
+
 /// A subprocess group whose lifetime is bounded by the test process that spawned it.
 ///
 /// A watchdog pins the process-group identity and observes a close-on-exec socket owned only by the