Merge branch 'work/companion' into develop

2026-08-19 21:22:04 +09:00
parent 17d81e29cc 856ea7119a
commit 25baeedc03
2 changed files with 21 additions and 1 deletions
@@ -595,6 +595,20 @@ mod tests {
        assert!(!catalog.projection.templates.is_empty());
    }

+    #[test]
+    fn orchestrator_prompt_uses_normal_branch_integration_before_escalation() {
+        let catalog = PromptCatalog::builtins_only().unwrap();
+        let prompt = &catalog.projection.templates["role.orchestrator"];
+
+        assert!(prompt.contains("`merge_from`"));
+        assert!(prompt.contains("`merge_to`"));
+        assert!(prompt.contains("normal source-control operations"));
+        assert!(prompt.contains("switch to `merge_to`"));
+        assert!(prompt.contains("concrete source-control or provider failure"));
+        assert!(prompt.contains("does not update the branch itself"));
+        assert!(!prompt.contains("use the Ticket repository `origin` transport"));
+    }
+
    #[test]
    fn graph_rejects_dynamic_legacy_missing_and_cycles() {
        let invalid = BTreeMap::from([