Skip to content

The open-source agent harness - the runtime layer that turns an LLM into a working agent.

fix: keep Build Agent skills selected after a turn (AGE-2565) (#1090)

Govinda Vashishtha6bf93de51588
diff --git a/.changeset/fix-draft-skill-fqn-reconcile.md b/.changeset/fix-draft-skill-fqn-reconcile.md
new file mode 100644
index 000000000..c282b4116
--- /dev/null
+++ b/.changeset/fix-draft-skill-fqn-reconcile.md
@@ -0,0 +1,5 @@
+---
+'@truefoundry/trueforge-ui': patch
+---
+
+Keep Build Agent skills selected after a turn by matching session FQN mounts against catalog attach keys and display names during draft preference reconcile.
diff --git a/packages/trueforge-ui/src/atoms/draft/DraftSpecPreferenceBridge.tsx b/packages/trueforge-ui/src/atoms/draft/DraftSpecPreferenceBridge.tsx
index 9ae92f6f1..be9dbb4b4 100644
--- a/packages/trueforge-ui/src/atoms/draft/DraftSpecPreferenceBridge.tsx
+++ b/packages/trueforge-ui/src/atoms/draft/DraftSpecPreferenceBridge.tsx
@@ -16,6 +16,7 @@ import type { AgentSkill, AgentSpec, ConnectorState, ModelSelection } from '../.
import { mountName } from '../lib/mountName.js';
import { useDraftCatalog } from './DraftCatalogProvider.js';
import { modelPatchWithReasoningEffort } from './reasoningEffort.js';
+import { skillFamilyId } from './SkillVersionSelector.js';
function readDraftSandboxEnabled(spec: AgentSpec): boolean | undefined {
if (spec.config === undefined) return undefined;
@@ -26,15 +27,45 @@ function readDraftSandboxEnabled(spec: AgentSpec): boolean | undefined {
return typeof enabled === 'boolean' ? enabled : undefined;
}
-function filterMounts<T extends object>(mounts: T[] | undefined, availableNames: Set<string>): T[] | undefined {
+function filterMounts<T extends object>(
+ mounts: T[] | undefined,
+ availableNames: Set<string>,
+ { matchFamily = false }: { matchFamily?: boolean } = {},
+): T[] | undefined {
if (mounts === undefined) return undefined;
const filtered = mounts.filter(mount => {
const name = mountName(mount);
- return name !== null && availableNames.has(name);
+ if (name === null) return false;
+ if (availableNames.has(name)) return true;
+ return matchFamily && availableNames.has(skillFamilyId(name));
});
return filtered.length === mounts.length ? mounts : filtered;
}
+function skillAvailableKeys(skills: AgentSkill[]): Set<string> {
+ const keys = new Set<string>();
+ for (const skill of skills) {
+ keys.add(skill.name);
+ keys.add(skill.id);
+ keys.add(skillFamilyId(skill.id));
+ }
+ return keys;
+}
+
+/** Chips render `name`. A post-turn mount stores the FQN there; swap in the catalog label. */
+function labelSkillMounts(mounts: object[] | undefined, skills: readonly AgentSkill[]): object[] | undefined {
+ if (mounts === undefined) return undefined;
+ let changed = false;
+ const next = mounts.map(mount => {
+ const name = mountName(mount);
+ const catalog = skills.find(skill => skill.id === name);
+ if (catalog === undefined || name === catalog.name) return mount;
+ changed = true;
+ return { ...mount, id: catalog.id, name: catalog.name };
+ });
+ return changed ? next : mounts;
+}
+
export function reconcileDraftSpecPreferences({
agentSpec,
models,
@@ -73,7 +104,10 @@ export function reconcileDraftSpecPreferences({
update.skills = [];
}
} else {
- const nextSkills = filterMounts(agentSpec.skills, new Set(skills.map(skill => skill.name)));
+ const nextSkills = labelSkillMounts(
+ filterMounts(agentSpec.skills, skillAvailableKeys(skills), { matchFamily: true }),
+ skills,
+ );
if (nextSkills !== agentSpec.skills) {
update.skills = nextSkills;
}
diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.ts
index 8907091e6..f34a5402f 100644
--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.ts
+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/chatServer.ts
@@ -44,6 +44,7 @@ function toUiMcpServer(server: TrueForgeApi.McpServer): HarnessMcpServerMount {
}
function toUiSkill(skill: TrueForgeApi.Skill): HarnessSkillMount {
+ // Wire Skill is name-only. Catalog reconcile restores picker id + display name.
return { name: skill.name, preload: skill.preload === true };
}
diff --git a/packages/trueforge-ui/test/atoms/draft/DraftCatalogProvider.test.tsx b/packages/trueforge-ui/test/atoms/draft/DraftCatalogProvider.test.tsx
index 8d5c9c8fc..c29ae1cae 100644
--- a/packages/trueforge-ui/test/atoms/draft/DraftCatalogProvider.test.tsx
+++ b/packages/trueforge-ui/test/atoms/draft/DraftCatalogProvider.test.tsx
@@ -174,6 +174,56 @@ describe('DraftCatalogProvider', () => {
expect(update.skills).toEqual([]);
});
+ it('restores the catalog display name for post-turn FQN skill mounts', () => {
+ const update = reconcileDraftSpecPreferences({
+ agentSpec: {
+ model: { name: 'live/model' },
+ skills: [{ name: 'agent-skill:acme/team/echo:3', preload: false }],
+ },
+ models: [{ id: 'live/model', name: 'live/model', provider: { name: 'Live' }, properties: {} }],
+ skills: [{ id: 'agent-skill:acme/team/echo:3', name: 'echo' }],
+ connectors: [],
+ skillsEnabled: true,
+ });
+
+ expect(update).toEqual({
+ skills: [{ id: 'agent-skill:acme/team/echo:3', name: 'echo', preload: false }],
+ });
+ });
+
+ it('keeps skill mounts when only the version suffix differs from the catalog', () => {
+ const skills = [{ name: 'agent-skill:acme/team/echo:2' }];
+ const update = reconcileDraftSpecPreferences({
+ agentSpec: {
+ model: { name: 'live/model' },
+ skills,
+ },
+ models: [{ id: 'live/model', name: 'live/model', provider: { name: 'Live' }, properties: {} }],
+ skills: [{ id: 'agent-skill:acme/team/echo:3', name: 'echo' }],
+ connectors: [],
+ skillsEnabled: true,
+ });
+
+ expect(update).toEqual({});
+ });
+
+ it('still prunes skill mounts missing from the catalog', () => {
+ const update = reconcileDraftSpecPreferences({
+ agentSpec: {
+ model: { name: 'live/model' },
+ skills: [{ name: 'agent-skill:acme/team/echo:3' }, { name: 'agent-skill:acme/team/gone:1' }],
+ },
+ models: [{ id: 'live/model', name: 'live/model', provider: { name: 'Live' }, properties: {} }],
+ skills: [{ id: 'agent-skill:acme/team/echo:3', name: 'echo' }],
+ connectors: [],
+ skillsEnabled: true,
+ });
+
+ expect(update).toEqual({
+ skills: [{ id: 'agent-skill:acme/team/echo:3', name: 'echo' }],
+ });
+ });
+
it('does not re-clear an already empty skills list when skills are unavailable', () => {
const emptySkills: object[] = [];
const update = reconcileDraftSpecPreferences({