fix(plugins): preserve legacy utility config for direct profiles

This commit is contained in:
ayattara
2026-08-30 11:30:44 +00:00
parent 2e0c8d8169
commit b96dbf92b8
2 changed files with 13 additions and 9 deletions
@@ -94,7 +94,11 @@ func (h *pluginHost) InvokeUtilityAgent(ctx context.Context, prompt string) (str
return h.invokeConfiguredAgentProfile(ctx, profileID, profiles, runner, prompt)
}
}
if hasUtilityAgentConfig(h.configSchema) {
// A direct-profile schema may belong to a plugin upgraded from the legacy
// utility-agent schema. Keep reading the persisted legacy key even though
// the new settings form no longer renders it; plugin config replacement does
// not migrate or delete unknown keys.
if hasUtilityAgentConfig(h.configSchema) || hasAgentProfileConfig(h.configSchema) {
agentID, _ := config[utilityAgentConfigKey].(string)
if agentID != "" {
return h.invokeConfiguredUtilityAgent(ctx, agentID, agents, runner, prompt)
@@ -109,7 +109,7 @@ func TestPluginHost_InvokeUtilityAgent_UsesConfiguredAgentProfileBeforeUtilityAg
}
}
func TestPluginHost_InvokeUtilityAgent_RejectsUndeclaredLegacyUtilityAgentConfig(t *testing.T) {
func TestPluginHost_InvokeUtilityAgent_FallsBackToUndeclaredLegacyUtilityAgentConfig(t *testing.T) {
d := configuredUtilityHost(t)
d.host.configSchema = map[string]any{
"properties": map[string]any{
@@ -117,15 +117,15 @@ func TestPluginHost_InvokeUtilityAgent_RejectsUndeclaredLegacyUtilityAgentConfig
},
}
_, err := d.host.InvokeUtilityAgent(context.Background(), "summarize yesterday")
if status.Code(err) != codes.FailedPrecondition {
t.Fatalf("InvokeUtilityAgent() status = %s, want %s; err = %v", status.Code(err), codes.FailedPrecondition, err)
got, err := d.host.InvokeUtilityAgent(context.Background(), "summarize yesterday")
if err != nil || got != "the summary" {
t.Fatalf("InvokeUtilityAgent() = (%q, %v)", got, err)
}
if status.Convert(err).Message() != "no agent profile configured for this plugin" {
t.Fatalf("InvokeUtilityAgent() message = %q", status.Convert(err).Message())
if d.utilAgents.gotSelector != "utility-agent-42" {
t.Fatalf("looked up utility agent %q", d.utilAgents.gotSelector)
}
if d.utilAgents.calls != 0 || d.utilRun.calls != 0 {
t.Fatalf("stale utility config touched agent lookup %d times and runner %d times", d.utilAgents.calls, d.utilRun.calls)
if d.utilRun.gotProfileID != "profile-42" {
t.Fatalf("runner got profile %q", d.utilRun.gotProfileID)
}
}