chore(providers): trim bundled v2 profiles

Author: johntmyers

crates/openshell-cli/src/run.rs

@@ -3372,7 +3372,7 @@ fn inferred_provider_type(command: &[String]) -> Option<String> {
 /// passed through directly; the server validates they exist at sandbox creation.
 ///
 /// `inferred_types` are provider **types** inferred from the trailing command
-/// (e.g. `claude` → type `"claude"`). These are resolved to provider names via
+/// (e.g. `claude` -> type `"claude-code"`). These are resolved to provider names via
 /// a type→name lookup, and missing types may be auto-created interactively.
 ///
 /// Returns a deduplicated list of provider **names** suitable for
@@ -6966,7 +6966,7 @@ mod tests {
     #[test]
     fn inferred_provider_type_returns_type_for_known_command() {
         let result = inferred_provider_type(&["claude".to_string(), "--help".to_string()]);
-        assert_eq!(result, Some("claude".to_string()));
+        assert_eq!(result, Some("claude-code".to_string()));
     }
 
     #[test]
@@ -6995,7 +6995,7 @@ mod tests {
     #[test]
     fn inferred_provider_type_handles_full_path() {
         let result = inferred_provider_type(&["/usr/local/bin/claude".to_string()]);
-        assert_eq!(result, Some("claude".to_string()));
+        assert_eq!(result, Some("claude-code".to_string()));
     }
 
     #[test]

crates/openshell-providers/src/lib.rs

@@ -144,7 +144,7 @@ impl ProviderRegistry {
 pub fn normalize_provider_type(input: &str) -> Option<&'static str> {
     let normalized = input.trim().to_ascii_lowercase();
     match normalized.as_str() {
-        "claude" => Some("claude"),
+        "claude" | "claude-code" | "claude_code" => Some("claude-code"),
         "codex" => Some("codex"),
         "copilot" => Some("copilot"),
         "opencode" => Some("opencode"),
@@ -178,7 +178,8 @@ mod tests {
         assert_eq!(normalize_provider_type("gitlab"), Some("gitlab"));
         assert_eq!(normalize_provider_type("glab"), Some("gitlab"));
         assert_eq!(normalize_provider_type("gh"), Some("github"));
-        assert_eq!(normalize_provider_type("CLAUDE"), Some("claude"));
+        assert_eq!(normalize_provider_type("CLAUDE"), Some("claude-code"));
+        assert_eq!(normalize_provider_type("claude-code"), Some("claude-code"));
         assert_eq!(normalize_provider_type("generic"), Some("generic"));
         assert_eq!(normalize_provider_type("openai"), Some("openai"));
         assert_eq!(normalize_provider_type("anthropic"), Some("anthropic"));
@@ -191,7 +192,7 @@ mod tests {
     fn detects_provider_from_command_token() {
         assert_eq!(
             detect_provider_from_command(&["claude".to_string()]),
-            Some("claude")
+            Some("claude-code")
         );
         assert_eq!(
             detect_provider_from_command(&["/usr/bin/glab".to_string()]),

crates/openshell-providers/src/profiles.rs

@@ -17,17 +17,9 @@ use std::collections::{HashMap, HashSet};
 use std::sync::OnceLock;
 
 const BUILT_IN_PROFILE_YAMLS: &[&str] = &[
-    include_str!("../../../providers/anthropic.yaml"),
-    include_str!("../../../providers/claude.yaml"),
-    include_str!("../../../providers/codex.yaml"),
-    include_str!("../../../providers/copilot.yaml"),
-    include_str!("../../../providers/google-drive.yaml"),
+    include_str!("../../../providers/claude-code.yaml"),
     include_str!("../../../providers/github.yaml"),
-    include_str!("../../../providers/gitlab.yaml"),
     include_str!("../../../providers/nvidia.yaml"),
-    include_str!("../../../providers/openai.yaml"),
-    include_str!("../../../providers/opencode.yaml"),
-    include_str!("../../../providers/outlook.yaml"),
 ];
 
 #[derive(Debug, thiserror::Error)]
@@ -1075,10 +1067,10 @@ mod tests {
 
     #[test]
     fn credential_env_vars_are_deduplicated_in_profile_order() {
-        let profile = get_default_profile("copilot").expect("copilot profile");
+        let profile = get_default_profile("claude-code").expect("claude-code profile");
         assert_eq!(
             profile.credential_env_vars(),
-            vec!["COPILOT_GITHUB_TOKEN", "GH_TOKEN", "GITHUB_TOKEN"]
+            vec!["ANTHROPIC_API_KEY", "CLAUDE_API_KEY"]
         );
     }
 

crates/openshell-providers/src/providers/claude.rs

@@ -8,7 +8,7 @@ use crate::{
 pub struct ClaudeProvider;
 
 pub const SPEC: ProviderDiscoverySpec = ProviderDiscoverySpec {
-    id: "claude",
+    id: "claude-code",
     credential_env_vars: &["ANTHROPIC_API_KEY", "CLAUDE_API_KEY"],
 };
 

crates/openshell-server/src/grpc/provider.rs

@@ -573,7 +573,7 @@ use openshell_core::proto::{
 };
 use openshell_providers::{
     CredentialRefreshProfile, ProfileValidationDiagnostic, ProviderTypeProfile, default_profiles,
-    get_default_profile, normalize_profile_id, normalize_provider_type, validate_profile_set,
+    get_default_profile, normalize_profile_id, validate_profile_set,
 };
 use std::sync::Arc;
 use tonic::{Request, Response};
@@ -928,18 +928,6 @@ async fn profile_conflict_diagnostics(
             });
             continue;
         }
-        if let Some(provider_type) = normalize_provider_type(&id) {
-            diagnostics.push(ProfileValidationDiagnostic {
-                source: source.clone(),
-                profile_id: id.clone(),
-                field: "id".to_string(),
-                message: format!(
-                    "provider profile id '{id}' is reserved for legacy provider type '{provider_type}'"
-                ),
-                severity: "error".to_string(),
-            });
-            continue;
-        }
         if store
             .get_message_by_name::<StoredProviderProfile>(&id)
             .await
@@ -1514,6 +1502,29 @@ mod tests {
         }
     }
 
+    async fn import_test_refresh_profile(state: &Arc<ServerState>, id: &str, credential_key: &str) {
+        let mut profile = custom_profile(id);
+        profile.category = ProviderProfileCategory::Messaging as i32;
+        profile.credentials = vec![refreshable_credential("access_token", credential_key)];
+        handle_import_provider_profiles(
+            state,
+            Request::new(ImportProviderProfilesRequest {
+                profiles: vec![ProviderProfileImportItem {
+                    profile: Some(profile),
+                    source: format!("{id}.yaml"),
+                }],
+            }),
+        )
+        .await
+        .unwrap();
+    }
+
+    const TEST_GRAPH_PROVIDER_TYPE: &str = "test-msgraph";
+
+    async fn import_test_graph_refresh_profile(state: &Arc<ServerState>) {
+        import_test_refresh_profile(state, TEST_GRAPH_PROVIDER_TYPE, "MS_GRAPH_ACCESS_TOKEN").await;
+    }
+
     fn static_credential(name: &str, env_var: &str, required: bool) -> ProviderProfileCredential {
         ProviderProfileCredential {
             name: name.to_string(),
@@ -1560,6 +1571,13 @@ mod tests {
         .unwrap()
         .into_inner();
 
+        let ids = response
+            .profiles
+            .iter()
+            .map(|profile| profile.id.as_str())
+            .collect::<Vec<_>>();
+        assert_eq!(ids, vec!["claude-code", "github", "nvidia"]);
+
         let github = response
             .profiles
             .iter()
@@ -1569,13 +1587,6 @@ mod tests {
             github.category,
             ProviderProfileCategory::SourceControl as i32
         );
-        assert!(
-            response
-                .profiles
-                .iter()
-                .all(|profile| profile.id != "generic"),
-            "generic remains a legacy provider type without a v2 profile"
-        );
     }
 
     #[tokio::test]
@@ -1685,38 +1696,36 @@ mod tests {
     }
 
     #[tokio::test]
-    async fn import_provider_profile_rejects_legacy_provider_type_ids() {
+    async fn import_provider_profile_allows_legacy_provider_type_ids_without_built_in_profiles() {
         let state = test_server_state().await;
         let response = handle_import_provider_profiles(
             &state,
             Request::new(ImportProviderProfilesRequest {
                 profiles: vec![ProviderProfileImportItem {
-                    profile: Some(custom_profile("generic")),
-                    source: "generic.yaml".to_string(),
+                    profile: Some(custom_profile("codex")),
+                    source: "codex.yaml".to_string(),
                 }],
             }),
         )
         .await
         .unwrap()
         .into_inner();
 
-        assert!(!response.imported);
-        assert!(
-            response
-                .diagnostics
-                .iter()
-                .any(|diagnostic| diagnostic.message.contains("reserved"))
-        );
+        assert!(response.imported);
+        assert!(response.diagnostics.is_empty());
 
-        let missing = handle_get_provider_profile(
+        let imported = handle_get_provider_profile(
             &state,
             Request::new(GetProviderProfileRequest {
-                id: "generic".to_string(),
+                id: "codex".to_string(),
             }),
         )
         .await
-        .unwrap_err();
-        assert_eq!(missing.code(), Code::NotFound);
+        .unwrap()
+        .into_inner()
+        .profile
+        .expect("codex profile should be returned");
+        assert_eq!(imported.id, "codex");
     }
 
     #[tokio::test]
@@ -2022,6 +2031,7 @@ mod tests {
     #[tokio::test]
     async fn configure_provider_refresh_stores_scoped_status_and_provider_expiry() {
         let state = test_server_state().await;
+        import_test_graph_refresh_profile(&state).await;
         create_provider_record(
             state.store.as_ref(),
             Provider {
@@ -2031,7 +2041,7 @@ mod tests {
                     created_at_ms: 0,
                     labels: HashMap::new(),
                 }),
-                r#type: "outlook".to_string(),
+                r#type: TEST_GRAPH_PROVIDER_TYPE.to_string(),
                 credentials: std::iter::once((
                     "MS_GRAPH_ACCESS_TOKEN".to_string(),
                     "token".to_string(),
@@ -2133,6 +2143,7 @@ mod tests {
     #[tokio::test]
     async fn delete_provider_refresh_preserves_manually_updated_expiry() {
         let state = test_server_state().await;
+        import_test_graph_refresh_profile(&state).await;
         create_provider_record(
             state.store.as_ref(),
             Provider {
@@ -2142,7 +2153,7 @@ mod tests {
                     created_at_ms: 0,
                     labels: HashMap::new(),
                 }),
-                r#type: "outlook".to_string(),
+                r#type: TEST_GRAPH_PROVIDER_TYPE.to_string(),
                 credentials: std::iter::once((
                     "MS_GRAPH_ACCESS_TOKEN".to_string(),
                     "token".to_string(),
@@ -2225,6 +2236,7 @@ mod tests {
     #[tokio::test]
     async fn configure_provider_refresh_rejects_credential_key_collision_for_attached_sandbox() {
         let state = test_server_state().await;
+        import_test_graph_refresh_profile(&state).await;
         create_provider_record(
             state.store.as_ref(),
             Provider {
@@ -2234,7 +2246,7 @@ mod tests {
                     created_at_ms: 0,
                     labels: HashMap::new(),
                 }),
-                r#type: "outlook".to_string(),
+                r#type: TEST_GRAPH_PROVIDER_TYPE.to_string(),
                 credentials: std::iter::once((
                     "MS_GRAPH_ACCESS_TOKEN".to_string(),
                     "existing-token".to_string(),
@@ -2255,7 +2267,7 @@ mod tests {
                     created_at_ms: 0,
                     labels: HashMap::new(),
                 }),
-                r#type: "outlook".to_string(),
+                r#type: TEST_GRAPH_PROVIDER_TYPE.to_string(),
                 credentials: std::iter::once(("OTHER_TOKEN".to_string(), "other".to_string()))
                     .collect(),
                 config: HashMap::new(),
@@ -2312,6 +2324,7 @@ mod tests {
     #[tokio::test]
     async fn configure_provider_refresh_treats_existing_refresh_state_keys_as_reserved() {
         let state = test_server_state().await;
+        import_test_graph_refresh_profile(&state).await;
         for name in ["first-graph", "second-graph"] {
             create_provider_record(
                 state.store.as_ref(),
@@ -2322,7 +2335,7 @@ mod tests {
                         created_at_ms: 0,
                         labels: HashMap::new(),
                     }),
-                    r#type: "outlook".to_string(),
+                    r#type: TEST_GRAPH_PROVIDER_TYPE.to_string(),
                     credentials: HashMap::new(),
                     config: HashMap::new(),
                     credential_expires_at_ms: HashMap::new(),
@@ -2395,6 +2408,7 @@ mod tests {
     #[tokio::test]
     async fn configure_provider_refresh_rejects_profile_endpoint_override_and_missing_material() {
         let state = test_server_state().await;
+        import_test_graph_refresh_profile(&state).await;
         create_provider_record(
             state.store.as_ref(),
             Provider {
@@ -2404,7 +2418,7 @@ mod tests {
                     created_at_ms: 0,
                     labels: HashMap::new(),
                 }),
-                r#type: "outlook".to_string(),
+                r#type: TEST_GRAPH_PROVIDER_TYPE.to_string(),
                 credentials: std::iter::once((
                     "MS_GRAPH_ACCESS_TOKEN".to_string(),
                     "token".to_string(),
@@ -2773,25 +2787,6 @@ mod tests {
         .unwrap_err();
         assert_eq!(create_missing_credentials.code(), Code::InvalidArgument);
 
-        let refresh_bootstrap_provider = create_provider_record(
-            store,
-            Provider {
-                metadata: Some(openshell_core::proto::datamodel::v1::ObjectMeta {
-                    id: String::new(),
-                    name: "outlook-no-token-yet".to_string(),
-                    created_at_ms: 1_000_000,
-                    labels: HashMap::new(),
-                }),
-                r#type: "outlook".to_string(),
-                credentials: HashMap::new(),
-                config: HashMap::new(),
-                credential_expires_at_ms: HashMap::new(),
-            },
-        )
-        .await
-        .unwrap();
-        assert!(refresh_bootstrap_provider.credentials.is_empty());
-
         handle_import_provider_profiles(
             &state,
             Request::new(ImportProviderProfilesRequest {