Clarify local and remote plugin selectors

This commit is contained in:
xli-oai
2026-05-01 19:34:56 -07:00
parent 127434cd8b
commit f45d2ef316
17 changed files with 381 additions and 192 deletions
+24 -12
View File
@@ -2119,7 +2119,7 @@
},
"PluginInstallParams": {
"properties": {
"marketplacePath": {
"localMarketplacePath": {
"anyOf": [
{
"$ref": "#/definitions/AbsolutePathBuf"
@@ -2129,19 +2129,25 @@
}
]
},
"pluginName": {
"type": "string"
"localPluginName": {
"type": [
"string",
"null"
]
},
"remoteMarketplaceName": {
"type": [
"string",
"null"
]
},
"remotePluginId": {
"type": [
"string",
"null"
]
}
},
"required": [
"pluginName"
],
"type": "object"
},
"PluginListParams": {
@@ -2161,7 +2167,7 @@
},
"PluginReadParams": {
"properties": {
"marketplacePath": {
"localMarketplacePath": {
"anyOf": [
{
"$ref": "#/definitions/AbsolutePathBuf"
@@ -2171,19 +2177,25 @@
}
]
},
"pluginName": {
"type": "string"
"localPluginName": {
"type": [
"string",
"null"
]
},
"remoteMarketplaceName": {
"type": [
"string",
"null"
]
},
"remotePluginId": {
"type": [
"string",
"null"
]
}
},
"required": [
"pluginName"
],
"type": "object"
},
"PluginShareDeleteParams": {
@@ -12028,7 +12028,7 @@
"PluginInstallParams": {
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
"marketplacePath": {
"localMarketplacePath": {
"anyOf": [
{
"$ref": "#/definitions/v2/AbsolutePathBuf"
@@ -12038,19 +12038,25 @@
}
]
},
"pluginName": {
"type": "string"
"localPluginName": {
"type": [
"string",
"null"
]
},
"remoteMarketplaceName": {
"type": [
"string",
"null"
]
},
"remotePluginId": {
"type": [
"string",
"null"
]
}
},
"required": [
"pluginName"
],
"title": "PluginInstallParams",
"type": "object"
},
@@ -12301,7 +12307,7 @@
"PluginReadParams": {
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
"marketplacePath": {
"localMarketplacePath": {
"anyOf": [
{
"$ref": "#/definitions/v2/AbsolutePathBuf"
@@ -12311,19 +12317,25 @@
}
]
},
"pluginName": {
"type": "string"
"localPluginName": {
"type": [
"string",
"null"
]
},
"remoteMarketplaceName": {
"type": [
"string",
"null"
]
},
"remotePluginId": {
"type": [
"string",
"null"
]
}
},
"required": [
"pluginName"
],
"title": "PluginReadParams",
"type": "object"
},
@@ -8681,7 +8681,7 @@
"PluginInstallParams": {
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
"marketplacePath": {
"localMarketplacePath": {
"anyOf": [
{
"$ref": "#/definitions/AbsolutePathBuf"
@@ -8691,19 +8691,25 @@
}
]
},
"pluginName": {
"type": "string"
"localPluginName": {
"type": [
"string",
"null"
]
},
"remoteMarketplaceName": {
"type": [
"string",
"null"
]
},
"remotePluginId": {
"type": [
"string",
"null"
]
}
},
"required": [
"pluginName"
],
"title": "PluginInstallParams",
"type": "object"
},
@@ -8954,7 +8960,7 @@
"PluginReadParams": {
"$schema": "http://json-schema.org/draft-07/schema#",
"properties": {
"marketplacePath": {
"localMarketplacePath": {
"anyOf": [
{
"$ref": "#/definitions/AbsolutePathBuf"
@@ -8964,19 +8970,25 @@
}
]
},
"pluginName": {
"type": "string"
"localPluginName": {
"type": [
"string",
"null"
]
},
"remoteMarketplaceName": {
"type": [
"string",
"null"
]
},
"remotePluginId": {
"type": [
"string",
"null"
]
}
},
"required": [
"pluginName"
],
"title": "PluginReadParams",
"type": "object"
},
@@ -7,7 +7,7 @@
}
},
"properties": {
"marketplacePath": {
"localMarketplacePath": {
"anyOf": [
{
"$ref": "#/definitions/AbsolutePathBuf"
@@ -17,19 +17,25 @@
}
]
},
"pluginName": {
"type": "string"
"localPluginName": {
"type": [
"string",
"null"
]
},
"remoteMarketplaceName": {
"type": [
"string",
"null"
]
},
"remotePluginId": {
"type": [
"string",
"null"
]
}
},
"required": [
"pluginName"
],
"title": "PluginInstallParams",
"type": "object"
}
@@ -7,7 +7,7 @@
}
},
"properties": {
"marketplacePath": {
"localMarketplacePath": {
"anyOf": [
{
"$ref": "#/definitions/AbsolutePathBuf"
@@ -17,19 +17,25 @@
}
]
},
"pluginName": {
"type": "string"
"localPluginName": {
"type": [
"string",
"null"
]
},
"remoteMarketplaceName": {
"type": [
"string",
"null"
]
},
"remotePluginId": {
"type": [
"string",
"null"
]
}
},
"required": [
"pluginName"
],
"title": "PluginReadParams",
"type": "object"
}
@@ -3,4 +3,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { AbsolutePathBuf } from "../AbsolutePathBuf";
export type PluginInstallParams = { marketplacePath?: AbsolutePathBuf | null, remoteMarketplaceName?: string | null, pluginName: string, };
export type PluginInstallParams = { localMarketplacePath?: AbsolutePathBuf | null, remoteMarketplaceName?: string | null, localPluginName?: string | null, remotePluginId?: string | null, };
@@ -3,4 +3,4 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
import type { AbsolutePathBuf } from "../AbsolutePathBuf";
export type PluginReadParams = { marketplacePath?: AbsolutePathBuf | null, remoteMarketplaceName?: string | null, pluginName: string, };
export type PluginReadParams = { localMarketplacePath?: AbsolutePathBuf | null, remoteMarketplaceName?: string | null, localPluginName?: string | null, remotePluginId?: string | null, };
@@ -1595,9 +1595,10 @@ mod tests {
let plugin_install = ClientRequest::PluginInstall {
request_id: request_id(),
params: v2::PluginInstallParams {
marketplace_path: Some(absolute_path("/tmp/marketplace")),
local_marketplace_path: Some(absolute_path("/tmp/marketplace")),
remote_marketplace_name: None,
plugin_name: "plugin-a".to_string(),
local_plugin_name: Some("plugin-a".to_string()),
remote_plugin_id: None,
},
};
assert_eq!(
+40 -26
View File
@@ -4597,10 +4597,13 @@ pub struct MarketplaceLoadErrorInfo {
#[ts(export_to = "v2/")]
pub struct PluginReadParams {
#[ts(optional = nullable)]
pub marketplace_path: Option<AbsolutePathBuf>,
pub local_marketplace_path: Option<AbsolutePathBuf>,
#[ts(optional = nullable)]
pub remote_marketplace_name: Option<String>,
pub plugin_name: String,
#[ts(optional = nullable)]
pub local_plugin_name: Option<String>,
#[ts(optional = nullable)]
pub remote_plugin_id: Option<String>,
}
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
@@ -4987,10 +4990,13 @@ pub struct SkillsConfigWriteResponse {
#[ts(export_to = "v2/")]
pub struct PluginInstallParams {
#[ts(optional = nullable)]
pub marketplace_path: Option<AbsolutePathBuf>,
pub local_marketplace_path: Option<AbsolutePathBuf>,
#[ts(optional = nullable)]
pub remote_marketplace_name: Option<String>,
pub plugin_name: String,
#[ts(optional = nullable)]
pub local_plugin_name: Option<String>,
#[ts(optional = nullable)]
pub remote_plugin_id: Option<String>,
}
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]
@@ -10658,42 +10664,46 @@ mod tests {
let marketplace_path_json = marketplace_path.as_path().display().to_string();
assert_eq!(
serde_json::to_value(PluginReadParams {
marketplace_path: Some(marketplace_path.clone()),
local_marketplace_path: Some(marketplace_path.clone()),
remote_marketplace_name: None,
plugin_name: "gmail".to_string(),
local_plugin_name: Some("gmail".to_string()),
remote_plugin_id: None,
})
.unwrap(),
json!({
"marketplacePath": marketplace_path_json,
"localMarketplacePath": marketplace_path_json,
"remoteMarketplaceName": null,
"pluginName": "gmail",
"localPluginName": "gmail",
"remotePluginId": null,
}),
);
assert_eq!(
serde_json::from_value::<PluginReadParams>(json!({
"marketplacePath": marketplace_path_json,
"pluginName": "gmail",
"localMarketplacePath": marketplace_path_json,
"localPluginName": "gmail",
"forceRemoteSync": true,
}))
.unwrap(),
PluginReadParams {
marketplace_path: Some(marketplace_path),
local_marketplace_path: Some(marketplace_path),
remote_marketplace_name: None,
plugin_name: "gmail".to_string(),
local_plugin_name: Some("gmail".to_string()),
remote_plugin_id: None,
},
);
assert_eq!(
serde_json::from_value::<PluginReadParams>(json!({
"remoteMarketplaceName": "openai-curated",
"pluginName": "gmail",
"remotePluginId": "plugins~Plugin_gmail",
}))
.unwrap(),
PluginReadParams {
marketplace_path: None,
local_marketplace_path: None,
remote_marketplace_name: Some("openai-curated".to_string()),
plugin_name: "gmail".to_string(),
local_plugin_name: None,
remote_plugin_id: Some("plugins~Plugin_gmail".to_string()),
},
);
}
@@ -10709,43 +10719,47 @@ mod tests {
let marketplace_path_json = marketplace_path.as_path().display().to_string();
assert_eq!(
serde_json::to_value(PluginInstallParams {
marketplace_path: Some(marketplace_path.clone()),
local_marketplace_path: Some(marketplace_path.clone()),
remote_marketplace_name: None,
plugin_name: "gmail".to_string(),
local_plugin_name: Some("gmail".to_string()),
remote_plugin_id: None,
})
.unwrap(),
json!({
"marketplacePath": marketplace_path_json,
"localMarketplacePath": marketplace_path_json,
"remoteMarketplaceName": null,
"pluginName": "gmail",
"localPluginName": "gmail",
"remotePluginId": null,
}),
);
assert_eq!(
serde_json::from_value::<PluginInstallParams>(json!({
"marketplacePath": marketplace_path_json,
"pluginName": "gmail",
"localMarketplacePath": marketplace_path_json,
"localPluginName": "gmail",
"forceRemoteSync": true,
}))
.unwrap(),
PluginInstallParams {
marketplace_path: Some(marketplace_path),
local_marketplace_path: Some(marketplace_path),
remote_marketplace_name: None,
plugin_name: "gmail".to_string(),
local_plugin_name: Some("gmail".to_string()),
remote_plugin_id: None,
},
);
assert_eq!(
serde_json::from_value::<PluginInstallParams>(json!({
"remoteMarketplaceName": "openai-curated",
"pluginName": "gmail",
"remotePluginId": "plugins~Plugin_gmail",
"forceRemoteSync": true,
}))
.unwrap(),
PluginInstallParams {
marketplace_path: None,
local_marketplace_path: None,
remote_marketplace_name: Some("openai-curated".to_string()),
plugin_name: "gmail".to_string(),
local_plugin_name: None,
remote_plugin_id: Some("plugins~Plugin_gmail".to_string()),
},
);
}