10 files changed
+502
-10
No files matched your search
@@ -29,6 +29,8 @@ data class ConnectionOperationTarget(
|
||||
val requiredEnv: List<ConnectionEnvField>,
|
||||
val tools: List<String>,
|
||||
val hint: String?,
|
||||
/** Catalog facts for [ConnectionTargetKind.PLUGIN] / [ConnectionTargetKind.SKILL] rows only. */
|
||||
val catalog: ConnectionCatalogInfo? = null,
|
||||
) {
|
||||
/** Safe validated browser URL. OAuth query parameters stay redacted from [toString]. */
|
||||
val safeConnectUrl: String?
|
||||
@@ -40,9 +42,32 @@ data class ConnectionOperationTarget(
|
||||
"instructions=$instructions, discoveryError=$discoveryError, " +
|
||||
"connectUrl=${if (connectUrl == null) "null" else "[REDACTED]"}, " +
|
||||
"connectionId=$connectionId, attempt=$attempt, requiredEnv=$requiredEnv, " +
|
||||
"tools=$tools, hint=$hint)"
|
||||
"tools=$tools, hint=$hint, catalog=$catalog)"
|
||||
}
|
||||
|
||||
/** Host-resolved catalog row facts (hermes-agent `manage_catalog`); the model supplies only the id. */
|
||||
data class ConnectionCatalogInfo(
|
||||
val display: String,
|
||||
val description: String?,
|
||||
val tier: String?,
|
||||
val platforms: List<String>,
|
||||
val repo: String?,
|
||||
val sha: String?,
|
||||
val subdir: String?,
|
||||
val scan: ConnectionCatalogScan?,
|
||||
val requirements: List<String>,
|
||||
val targetProfile: String,
|
||||
/** On an installed row: the skill the model can now load. */
|
||||
val skill: String?,
|
||||
)
|
||||
|
||||
data class ConnectionCatalogScan(
|
||||
val status: CatalogScanStatus,
|
||||
val summary: String?,
|
||||
)
|
||||
|
||||
enum class CatalogScanStatus { PASSED, WARNINGS, FAILED, UNKNOWN }
|
||||
|
||||
data class ConnectionEnvField(
|
||||
val name: String,
|
||||
val required: Boolean,
|
||||
@@ -51,7 +76,16 @@ data class ConnectionEnvField(
|
||||
val prompt: String?,
|
||||
)
|
||||
|
||||
enum class ConnectionTargetKind { CONNECTOR, MCP, UNKNOWN }
|
||||
enum class ConnectionTargetKind {
|
||||
CONNECTOR,
|
||||
MCP,
|
||||
PLUGIN,
|
||||
SKILL,
|
||||
UNKNOWN,
|
||||
;
|
||||
|
||||
val isCatalog: Boolean get() = this == PLUGIN || this == SKILL
|
||||
}
|
||||
|
||||
enum class ConnectionTargetAction {
|
||||
AUTHORIZE,
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
package com.m57.hermescontrol.data.ws
|
||||
|
||||
import com.m57.hermescontrol.data.model.CatalogScanStatus
|
||||
import com.m57.hermescontrol.data.model.ConnectionCatalogInfo
|
||||
import com.m57.hermescontrol.data.model.ConnectionCatalogScan
|
||||
import com.m57.hermescontrol.data.model.ConnectionEnvField
|
||||
import com.m57.hermescontrol.data.model.ConnectionOperationSnapshot
|
||||
import com.m57.hermescontrol.data.model.ConnectionOperationTarget
|
||||
@@ -58,14 +61,15 @@ object ConnectionOperationParser {
|
||||
val map = raw ?: return null
|
||||
val name = (map["name"] as? String)?.trim() ?: return null
|
||||
if (name.isBlank()) return null
|
||||
val kind =
|
||||
enumValue(
|
||||
map["kind"] as? String,
|
||||
ConnectionTargetKind.values(),
|
||||
ConnectionTargetKind.UNKNOWN,
|
||||
)
|
||||
return ConnectionOperationTarget(
|
||||
name = name,
|
||||
kind =
|
||||
enumValue(
|
||||
map["kind"] as? String,
|
||||
ConnectionTargetKind.values(),
|
||||
ConnectionTargetKind.UNKNOWN,
|
||||
),
|
||||
kind = kind,
|
||||
action =
|
||||
enumValue(
|
||||
map["action"] as? String,
|
||||
@@ -90,9 +94,50 @@ object ConnectionOperationParser {
|
||||
?: emptyList(),
|
||||
tools = (map["tools"] as? List<*>)?.filterIsInstance<String>() ?: emptyList(),
|
||||
hint = map["hint"] as? String,
|
||||
catalog = if (kind.isCatalog) parseCatalog(map, name) else null,
|
||||
)
|
||||
}
|
||||
|
||||
private fun parseCatalog(
|
||||
map: Map<*, *>,
|
||||
name: String,
|
||||
): ConnectionCatalogInfo =
|
||||
ConnectionCatalogInfo(
|
||||
display = map.text("display") ?: name,
|
||||
description = map.text("description"),
|
||||
tier = map.text("tier"),
|
||||
platforms = map.strings("platforms"),
|
||||
repo = map.text("repo"),
|
||||
sha = map.text("sha"),
|
||||
subdir = map.text("subdir"),
|
||||
scan =
|
||||
(map["scan"] as? Map<*, *>)?.let { scan ->
|
||||
ConnectionCatalogScan(
|
||||
status =
|
||||
enumValue(
|
||||
scan["status"] as? String,
|
||||
CatalogScanStatus.values(),
|
||||
CatalogScanStatus.UNKNOWN,
|
||||
),
|
||||
summary = scan.text("summary"),
|
||||
)
|
||||
},
|
||||
requirements = map.strings("requirements"),
|
||||
targetProfile = map.text("target_profile") ?: DEFAULT_PROFILE,
|
||||
skill = map.text("skill"),
|
||||
)
|
||||
|
||||
private fun Map<*, *>.text(key: String): String? = (this[key] as? String)?.trim()?.takeIf { it.isNotEmpty() }
|
||||
|
||||
private fun Map<*, *>.strings(key: String): List<String> =
|
||||
(this[key] as? List<*>)
|
||||
?.filterIsInstance<String>()
|
||||
?.map(String::trim)
|
||||
?.filter(String::isNotEmpty)
|
||||
?: emptyList()
|
||||
|
||||
private const val DEFAULT_PROFILE = "default"
|
||||
|
||||
private fun parseEnv(raw: Map<*, *>?): ConnectionEnvField? {
|
||||
val map = raw ?: return null
|
||||
val name = (map["name"] as? String)?.trim() ?: return null
|
||||
|
||||
Reference in new issue
Block a user