Skip to content
Merged
Prev Previous commit
Next Next commit
fix(skill): stabilize runtime skill prompt assembly
  • Loading branch information
Xinhua Gu committed Mar 13, 2026
commit 40bc7358ad629ac69201061ad57e3d8cda3987ab
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,9 @@ public List<String> names(String sessionId) {
if (sessionId != null && !sessionId.isBlank()) {
var runtime = runtimeRegistry.get(sessionId);
if (runtime != null && !runtime.isEmpty()) {
names.addAll(runtime.keySet());
runtime.keySet().stream()
.sorted()
.forEach(names::add);
}
}
return List.copyOf(names);
Expand All @@ -162,7 +164,9 @@ public List<SkillConfig> all(String sessionId) {
if (sessionId != null && !sessionId.isBlank()) {
var runtime = runtimeRegistry.get(sessionId);
if (runtime != null && !runtime.isEmpty()) {
runtime.forEach(combined::put);
runtime.entrySet().stream()
.sorted(Map.Entry.comparingByKey())
.forEach(entry -> combined.put(entry.getKey(), entry.getValue()));
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
return List.copyOf(combined.values());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1355,7 +1355,11 @@ public void setContextAssemblyConfig(MarkdownMemoryStore markdownStore,
this.registeredToolNames = registeredToolNames != null ? Set.copyOf(registeredToolNames) : Set.of();
this.hasBraveApiKey = hasBraveApiKey;
this.skillDescriptionsProvider = skillDescriptionsProvider != null
? skillDescriptionsProvider : ignored -> "";
? sessionId -> {
var descriptions = skillDescriptionsProvider.apply(sessionId);
return descriptions != null ? descriptions : "";
}
: ignored -> "";
}

/**
Expand Down
Loading