Integrate the reviewed application upgrades into the suite

tests/integration

@@ -90,19 +90,21 @@ printf '%s\n' \
 baseline_log="$test_tmp/baseline.log"
 run_converge "$baseline_log" "${baseline_args[@]}"
 /usr/local/bin/seriatim --version
-/usr/local/bin/audita config validate --config /usr/local/etc/audita/config.yml
+AUDITA_LLM_API_KEY="$synthetic_audita_api_key" \
+  /usr/local/bin/audita config validate --config /usr/local/etc/audita/config.yml
 /usr/local/bin/notarius config validate --config /usr/local/etc/notarius/config.yml \
   --pipeline dnd-session
 /usr/local/bin/notarius config validate --config /usr/local/etc/notarius/config.yml \
-  --config-profile testing --pipeline dnd-session
+  --config-overlay testing --pipeline dnd-session
 notarius_effective_config="$test_tmp/notarius-effective.yml"
 /usr/local/bin/notarius config effective --config /usr/local/etc/notarius/config.yml \
   > "$notarius_effective_config"
 notarius_testing_effective_config="$test_tmp/notarius-testing-effective.yml"
 /usr/local/bin/notarius config effective --config /usr/local/etc/notarius/config.yml \
-  --config-profile testing > "$notarius_testing_effective_config"
+  --config-overlay testing > "$notarius_testing_effective_config"
 grep -Fq 'mode: auto' "$notarius_effective_config"
 grep -Fq 'step: describe-session' "$notarius_effective_config"
+/usr/local/bin/scriptorium config validate --config /usr/local/etc/scriptorium/config.yml
 /usr/local/bin/scriptorium inspect profile --config /usr/local/etc/scriptorium/config.yml \
   --profile-dir "$profile_dir" --profile endpoint-profile
 /usr/bin/sudo -u narratio /usr/local/bin/narratio config validate \
@@ -110,19 +112,17 @@ grep -Fq 'step: describe-session' "$notarius_effective_config"
 /usr/bin/sudo -u narratio /usr/local/bin/narratio config validate \
   --config /usr/local/etc/narratio/pipeline.yml --campaign dilfs
 /usr/bin/sudo -u narratio /usr/local/bin/narratio config validate \
-  --config /usr/local/etc/narratio/pipeline.yml --campaign centaurs --profile testing
+  --config /usr/local/etc/narratio/pipeline.yml --campaign centaurs --overlay testing
 narratio_effective_config="$test_tmp/narratio-effective.yml"
 /usr/bin/sudo -u narratio /usr/local/bin/narratio config show \
   --config /usr/local/etc/narratio/pipeline.yml --campaign centaurs \
   > "$narratio_effective_config"
 narratio_testing_effective_config="$test_tmp/narratio-testing-effective.yml"
 /usr/bin/sudo -u narratio /usr/local/bin/narratio config show \
-  --config /usr/local/etc/narratio/pipeline.yml --campaign centaurs --profile testing \
+  --config /usr/local/etc/narratio/pipeline.yml --campaign centaurs --overlay testing \
   > "$narratio_testing_effective_config"
 grep -Fq 'enabled: true' "$narratio_effective_config"
-grep -Fq 'llm_api_key: AUDITA_LLM_API_KEY' "$narratio_effective_config"
 grep -Fq 'pipeline_id: dnd-session' "$narratio_effective_config"
-grep -Fq 'llm_api_key: OPENROUTER_API_KEY' "$narratio_effective_config"
 grep -Fq 'resume: true' "$narratio_effective_config"
 ! grep -Fq 'chunk_cache:' "$narratio_effective_config"
 grep -Fq 'party: narratio.input.party' "$narratio_effective_config"
@@ -152,6 +152,8 @@ assert config["storage"] == {
     },
 }
 assert config["cache"]["s3_audio"] is False
+assert config["audita"]["credentials"] == ["AUDITA_LLM_API_KEY"]
+assert config["notarius"]["credentials"] == ["OPENROUTER_API_KEY"]
 assert config["publish"] == {
     "enabled": True,
     "upload_run": True,
@@ -168,8 +170,8 @@ assert config["publish"] == {
         },
     ],
 }
-assert "config_profile" not in config["notarius"]
-assert testing_config["notarius"]["config_profile"] == "testing"
+assert "config_overlay" not in config["notarius"]
+assert testing_config["notarius"]["config_overlay"] == "testing"
 assert all(
     artifact["profile_id"] == "endpoint-profile"
     for artifact in testing_config["scriptorium"]["artifacts"].values()
@@ -256,7 +258,7 @@ run_converge "$alternate_log" "${baseline_args[@]}" -e "$alternate_config"
 /usr/local/bin/notarius config validate --config /usr/local/etc/notarius/config.yml \
   --pipeline archive-session
 /usr/local/bin/notarius config validate --config /usr/local/etc/notarius/config.yml \
-  --config-profile testing --pipeline archive-session
+  --config-overlay testing --pipeline archive-session
 alternate_narratio_config="$test_tmp/alternate-narratio.yml"
 /usr/bin/sudo -u narratio /usr/local/bin/narratio config show \
   --config /usr/local/etc/narratio/pipeline.yml --campaign centaurs \
@@ -264,14 +266,14 @@ alternate_narratio_config="$test_tmp/alternate-narratio.yml"
 grep -Fq 'pipeline_id: archive-session' "$alternate_narratio_config"
 alternate_testing_narratio_config="$test_tmp/alternate-testing-narratio.yml"
 /usr/bin/sudo -u narratio /usr/local/bin/narratio config show \
-  --config /usr/local/etc/narratio/pipeline.yml --campaign centaurs --profile testing \
+  --config /usr/local/etc/narratio/pipeline.yml --campaign centaurs --overlay testing \
   > "$alternate_testing_narratio_config"
 alternate_effective_config="$test_tmp/alternate-effective.yml"
 /usr/local/bin/notarius config effective --config /usr/local/etc/notarius/config.yml \
   > "$alternate_effective_config"
 alternate_testing_effective_config="$test_tmp/alternate-testing-effective.yml"
 /usr/local/bin/notarius config effective --config /usr/local/etc/notarius/config.yml \
-  --config-profile testing > "$alternate_testing_effective_config"
+  --config-overlay testing > "$alternate_testing_effective_config"
 "$workspace_venv/bin/python" - \
   "$alternate_narratio_config" "$alternate_testing_narratio_config" \
   "$alternate_effective_config" "$alternate_testing_effective_config" <<'PY'
@@ -289,9 +291,9 @@ with open(sys.argv[4], encoding="utf-8") as config_file:
     notarius_testing = yaml.safe_load(config_file)
 
 assert narratio_base["notarius"]["pipeline_id"] == "archive-session"
-assert "config_profile" not in narratio_base["notarius"]
+assert "config_overlay" not in narratio_base["notarius"]
 assert narratio_testing["notarius"]["pipeline_id"] == "archive-session"
-assert narratio_testing["notarius"]["config_profile"] == "testing"
+assert narratio_testing["notarius"]["config_overlay"] == "testing"
 assert notarius_base["pipelines"]["archive-session"]["llm_profile"] == "gpt-luna-latest"
 assert notarius_testing["pipelines"]["archive-session"]["llm_profile"] == "gpt-terra-latest"
 assert notarius_testing["pipelines"]["research-session"]["llm_profile"] == "gpt-luna-latest"