fix: reject ambiguous canonical routes

agent-session-id: dev3.dotfiles-cos-misc-issue-1329-upstream
agent-tool: Codex
agent-tool-version: 0.145.0
agent-model: gpt-5.6-sol
agent-runtime-profile: /nix/store/qlk5xbdfmj5nn1q145j0fx73f2pmdjj7-coding-agent-runtime-profile/share/coding-agents/profile.json
agent-skills-manifest: /nix/store/2km8dbiyv3wc484l1hd8n2lh65121qvq-agent-skills-corpus/share/agent-skills/manifest.json
tooling-profile: dotfiles@unknown-dirty

Author: schickling-assistant

src/eval_run.rs

@@ -258,8 +258,18 @@ fn load_canonical_eval_team(catalog: &Path, host: &str) -> Result<CanonicalEvalT
             inbox: crate::message::inbox_dir(agent_dir),
             archive: crate::message::archive_dir(agent_dir),
         };
-        routes.insert(bus_id, route.clone());
-        routes.insert(spec.identity.clone(), route);
+        for spelling in [bus_id, spec.identity.clone()] {
+            match routes.entry(spelling.clone()) {
+                std::collections::btree_map::Entry::Vacant(entry) => {
+                    entry.insert(route.clone());
+                }
+                std::collections::btree_map::Entry::Occupied(_) => {
+                    anyhow::bail!(
+                        "canonical-agents found duplicate canonical route spelling `{spelling}`"
+                    );
+                }
+            }
+        }
     }
     runtime_tasks.sort_by(|left, right| left.runtime_id.cmp(&right.runtime_id));
 

tests/eval_run_e2e.rs

@@ -810,6 +810,20 @@ fn canonical_agents_fail_closed_matrix_is_pre_spawn_and_non_vacuous() {
                 r#"agent "worker" { identity "worker"; name "requester"; host "evalhost"; argv "sh" "-c" "touch \"$CATALOG/SPAWNED\"; sleep 60" }"#,
             )],
         ),
+        (
+            "duplicate canonical route",
+            "worker",
+            vec![
+                (
+                    "worker",
+                    r#"agent "worker" { identity "worker"; host "evalhost"; argv "sh" "-c" "touch \"$CATALOG/SPAWNED\"; sleep 60" }"#,
+                ),
+                (
+                    "qualified",
+                    r#"agent "evalhost.worker" { identity "evalhost.worker"; host "evalhost"; argv "sh" "-c" "sleep 60" }"#,
+                ),
+            ],
+        ),
     ];
     for (expected, target, declarations) in cases {
         let tmp = tempfile::tempdir().unwrap();