diff --git a/codex-rs/app-server-protocol/schema/json/ServerNotification.json b/codex-rs/app-server-protocol/schema/json/ServerNotification.json index 47abdaf97a45..21360ae9c3ad 100644 --- a/codex-rs/app-server-protocol/schema/json/ServerNotification.json +++ b/codex-rs/app-server-protocol/schema/json/ServerNotification.json @@ -353,12 +353,6 @@ "null" ] }, - "firstPartyType": { - "type": [ - "string", - "null" - ] - }, "review": { "anyOf": [ { diff --git a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json index 418e8f12ed18..29582cb36e59 100644 --- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json +++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json @@ -6619,12 +6619,6 @@ "null" ] }, - "firstPartyType": { - "type": [ - "string", - "null" - ] - }, "review": { "anyOf": [ { diff --git a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json index bc22245be548..e63580ba6afa 100644 --- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json +++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json @@ -635,12 +635,6 @@ "null" ] }, - "firstPartyType": { - "type": [ - "string", - "null" - ] - }, "review": { "anyOf": [ { diff --git a/codex-rs/app-server-protocol/schema/json/v2/AppListUpdatedNotification.json b/codex-rs/app-server-protocol/schema/json/v2/AppListUpdatedNotification.json index 0b04e2b22d5d..46ca0f64d3a6 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/AppListUpdatedNotification.json +++ b/codex-rs/app-server-protocol/schema/json/v2/AppListUpdatedNotification.json @@ -175,12 +175,6 @@ "null" ] }, - "firstPartyType": { - "type": [ - "string", - "null" - ] - }, "review": { "anyOf": [ { diff --git a/codex-rs/app-server-protocol/schema/json/v2/AppsListResponse.json b/codex-rs/app-server-protocol/schema/json/v2/AppsListResponse.json index 6dfa1accb1c0..a6f220830c99 100644 --- a/codex-rs/app-server-protocol/schema/json/v2/AppsListResponse.json +++ b/codex-rs/app-server-protocol/schema/json/v2/AppsListResponse.json @@ -175,12 +175,6 @@ "null" ] }, - "firstPartyType": { - "type": [ - "string", - "null" - ] - }, "review": { "anyOf": [ { diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/AppMetadata.ts b/codex-rs/app-server-protocol/schema/typescript/v2/AppMetadata.ts index f1a5001eb1bf..d4f0a954884b 100644 --- a/codex-rs/app-server-protocol/schema/typescript/v2/AppMetadata.ts +++ b/codex-rs/app-server-protocol/schema/typescript/v2/AppMetadata.ts @@ -4,4 +4,4 @@ import type { AppReview } from "./AppReview"; import type { AppScreenshot } from "./AppScreenshot"; -export type AppMetadata = { review: AppReview | null, categories: Array | null, subCategories: Array | null, seoDescription: string | null, screenshots: Array | null, developer: string | null, version: string | null, versionId: string | null, versionNotes: string | null, firstPartyType: string | null, firstPartyRequiresInstall: boolean | null, showInComposerWhenUnlinked: boolean | null, }; +export type AppMetadata = { review: AppReview | null, categories: Array | null, subCategories: Array | null, seoDescription: string | null, screenshots: Array | null, developer: string | null, version: string | null, versionId: string | null, versionNotes: string | null, firstPartyRequiresInstall: boolean | null, showInComposerWhenUnlinked: boolean | null, }; diff --git a/codex-rs/app-server-protocol/src/protocol/v2/apps.rs b/codex-rs/app-server-protocol/src/protocol/v2/apps.rs index e806ffd7430b..9cc69c2e899d 100644 --- a/codex-rs/app-server-protocol/src/protocol/v2/apps.rs +++ b/codex-rs/app-server-protocol/src/protocol/v2/apps.rs @@ -107,7 +107,6 @@ pub struct AppMetadata { pub version: Option, pub version_id: Option, pub version_notes: Option, - pub first_party_type: Option, pub first_party_requires_install: Option, pub show_in_composer_when_unlinked: Option, } diff --git a/codex-rs/app-server/src/app_info.rs b/codex-rs/app-server/src/app_info.rs index 0360e2175387..dd07182e760f 100644 --- a/codex-rs/app-server/src/app_info.rs +++ b/codex-rs/app-server/src/app_info.rs @@ -149,7 +149,6 @@ fn app_metadata_to_api(metadata: AppMetadata) -> ApiAppMetadata { version, version_id, version_notes, - first_party_type, first_party_requires_install, show_in_composer_when_unlinked, } = metadata; @@ -164,7 +163,6 @@ fn app_metadata_to_api(metadata: AppMetadata) -> ApiAppMetadata { version, version_id, version_notes, - first_party_type, first_party_requires_install, show_in_composer_when_unlinked, } diff --git a/codex-rs/app-server/tests/suite/v2/app_list.rs b/codex-rs/app-server/tests/suite/v2/app_list.rs index 8dab9a829bd5..f16c80ea71ec 100644 --- a/codex-rs/app-server/tests/suite/v2/app_list.rs +++ b/codex-rs/app-server/tests/suite/v2/app_list.rs @@ -596,7 +596,6 @@ async fn list_apps_emits_updates_and_returns_after_both_lists_load() -> Result<( version: Some("1.2.3".to_string()), version_id: Some("version_123".to_string()), version_notes: Some("Fixes and improvements".to_string()), - first_party_type: Some("internal".to_string()), first_party_requires_install: Some(true), show_in_composer_when_unlinked: Some(true), }); diff --git a/codex-rs/app-server/tests/suite/v2/app_read.rs b/codex-rs/app-server/tests/suite/v2/app_read.rs index e81f01773b0b..57b9208738f5 100644 --- a/codex-rs/app-server/tests/suite/v2/app_read.rs +++ b/codex-rs/app-server/tests/suite/v2/app_read.rs @@ -497,7 +497,6 @@ fn app_response(id: &str, name: &str, icon_url: Option<&str>) -> Value { "version": "1.0.0", "version_id": "version-1", "version_notes": "Initial release", - "first_party_type": "must-not-escape", "first_party_requires_install": true, "show_in_composer_when_unlinked": true, "subtitle": "must-not-escape", diff --git a/codex-rs/app-server/tests/suite/v2/plugin_read.rs b/codex-rs/app-server/tests/suite/v2/plugin_read.rs index 75735e19ea00..40825d49c22c 100644 --- a/codex-rs/app-server/tests/suite/v2/plugin_read.rs +++ b/codex-rs/app-server/tests/suite/v2/plugin_read.rs @@ -1678,7 +1678,6 @@ async fn plugin_read_returns_app_metadata_category() -> Result<()> { version: None, version_id: None, version_notes: None, - first_party_type: None, first_party_requires_install: None, show_in_composer_when_unlinked: None, }), @@ -1784,7 +1783,6 @@ async fn plugin_read_hides_apps_for_api_key_auth() -> Result<()> { version: None, version_id: None, version_notes: None, - first_party_type: None, first_party_requires_install: None, show_in_composer_when_unlinked: None, }), diff --git a/codex-rs/connectors/src/app_info.rs b/codex-rs/connectors/src/app_info.rs index bead54b6ca7b..cffe20f46726 100644 --- a/codex-rs/connectors/src/app_info.rs +++ b/codex-rs/connectors/src/app_info.rs @@ -51,7 +51,6 @@ pub struct AppMetadata { pub version: Option, pub version_id: Option, pub version_notes: Option, - pub first_party_type: Option, pub first_party_requires_install: Option, pub show_in_composer_when_unlinked: Option, } diff --git a/codex-rs/connectors/src/lib.rs b/codex-rs/connectors/src/lib.rs index 9e9d92844661..c79adaf04745 100644 --- a/codex-rs/connectors/src/lib.rs +++ b/codex-rs/connectors/src/lib.rs @@ -429,11 +429,6 @@ fn merge_directory_app(existing: &mut DirectoryApp, incoming: DirectoryApp) { { existing_app_metadata.version_notes = incoming_app_metadata.version_notes; } - if existing_app_metadata.first_party_type.is_none() - && incoming_app_metadata.first_party_type.is_some() - { - existing_app_metadata.first_party_type = incoming_app_metadata.first_party_type; - } if existing_app_metadata.first_party_requires_install.is_none() && incoming_app_metadata.first_party_requires_install.is_some() { diff --git a/codex-rs/tui/src/app_info.rs b/codex-rs/tui/src/app_info.rs index aee33ec044cb..c0dbda028235 100644 --- a/codex-rs/tui/src/app_info.rs +++ b/codex-rs/tui/src/app_info.rs @@ -100,7 +100,6 @@ fn app_metadata_from_api(metadata: ApiAppMetadata) -> AppMetadata { version, version_id, version_notes, - first_party_type, first_party_requires_install, show_in_composer_when_unlinked, } = metadata; @@ -119,7 +118,6 @@ fn app_metadata_from_api(metadata: ApiAppMetadata) -> AppMetadata { version, version_id, version_notes, - first_party_type, first_party_requires_install, show_in_composer_when_unlinked, }