Skip to content

fix(desktop): derive skill host from tool catalog #1240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Astro-Han merged 1 commit into from
Jul 20, 2026
Merged

fix(desktop): derive skill host from tool catalog #1240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/desktop/src/main/__tests__/skills.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@ Use the Office tools.`);
assert.match(mainProcess, /hostCapabilities: desktopHostCapabilities/);
assert.match(mainProcess, /buildSkillsPromptFragment\(\s*skillSource,\s*options\?\.host \?\? deps\.host \?\? deps\.hostCapabilities,\s*options\?\.skillBudget,\s*\)/);
assert.match(mainProcess, /buildSkillAgentTool\([\s\S]*resolveDesktopSkillHost(?:,\s*)?\)/);
assert.match(mainProcess, /const backendSkillHost: HostCapabilities =/);
assert.match(mainProcess, /const backendSkillHost = buildHostCapabilitiesFromBinding\(backendToolNames\)/);
assert.doesNotMatch(mainProcess, /const backendCapabilities = new Set<string>\(\)/);
assert.match(mainProcess, /\[\.\.\.builtinTools, \.\.\.buildMcpTools\(mcpManager\)\]/);
assert.match(mainProcess, /const backendTools = computerUseToolsForModel\(/);
assert.match(mainProcess, /const backendToolNames = new Set\(/);
assert.match(mainProcess, /if \(tools\.some\(\(tool\) => backendToolNames\.has\(tool\.name\)\)\) backendCapabilities\.add\(capability\)/);
assert.match(mainProcess, /backendTools\.map\(\(tool\) => tool\.name\)/);
assert.match(mainProcess, /if \(!ctx\.tools\) desktopSessionSkillHosts\.set\(ctx\.sessionId, backendSkillHost\)/);
assert.match(mainProcess, /host: backendSkillHost/);
Expand Down
3 changes: 0 additions & 3 deletions apps/desktop/src/main/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,9 +679,6 @@ backends.register('ai-sdk', createAiSdkBackendFactory({
telemetryRepo,
artifactStore,
desktopSessionSkillHosts,
riveTools,
officeTools,
browserTools,
computerUseTools,
agentTeamLeadTools,
builtinTools,
Expand Down
21 changes: 2 additions & 19 deletions apps/desktop/src/main/session-stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
AiSdkBackend,
buildDefaultContextBudgetPolicy,
buildExpertDispatchToolForTeamId,
buildHostCapabilitiesFromBinding,
buildLlmHistorySummarizer,
buildMcpTools,
buildProviderOptions,
Expand Down Expand Up @@ -85,9 +86,6 @@ export interface AiSdkBackendFactoryDeps {
telemetryRepo: TelemetryRepo;
artifactStore: ArtifactStore;
desktopSessionSkillHosts: Map<string, HostCapabilities>;
riveTools: AssembledTools['riveTools'];
officeTools: AssembledTools['officeTools'];
browserTools: AssembledTools['browserTools'];
computerUseTools: AssembledTools['computerUseTools'];
agentTeamLeadTools: AssembledTools['agentTeamLeadTools'];
builtinTools: AssembledTools['builtinTools'];
Expand Down Expand Up @@ -123,9 +121,6 @@ export function createAiSdkBackendFactory(deps: AiSdkBackendFactoryDeps): Backen
telemetryRepo,
artifactStore,
desktopSessionSkillHosts,
riveTools,
officeTools,
browserTools,
computerUseTools,
agentTeamLeadTools,
builtinTools,
Expand Down Expand Up @@ -179,19 +174,7 @@ export function createAiSdkBackendFactory(deps: AiSdkBackendFactoryDeps): Backen
...backendTools.map((tool) => tool.name),
...(expertDispatchTool ? [expertDispatchTool.name, ...agentTeamLeadTools.map((tool) => tool.name)] : []),
]);
const backendCapabilities = new Set<string>();
for (const [capability, tools] of [
['rive', riveTools],
['office', officeTools],
['browser', browserTools],
['computer_use', computerUseTools],
] as const) {
if (tools.some((tool) => backendToolNames.has(tool.name))) backendCapabilities.add(capability);
}
const backendSkillHost: HostCapabilities = {
toolNames: backendToolNames,
capabilities: backendCapabilities,
};
const backendSkillHost = buildHostCapabilitiesFromBinding(backendToolNames);
// Child backends share the parent sessionId but intentionally have a
// narrower tool surface. They do not receive the Desktop Skill tool, so
// they must not overwrite the parent session's resolver entry.
Expand Down
5 changes: 2 additions & 3 deletions packages/runtime/src/skills.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ export async function buildSkillsPromptFragment(
let skills = (await scanSkills(source)).filter((skill) => skill.enabled);
// Gate before prompt-budget truncation so a host lacking a required tool
// never advertises the skill. `host === undefined` keeps the legacy
// no-gating behavior (desktop call sites stay unchanged).
// no-gating behavior.
if (host) skills = gateSkillsByHostCapabilities(skills, host).filter((gated) => gated.eligible);
if (skills.length === 0) return undefined;

Expand Down Expand Up @@ -575,8 +575,7 @@ export function loadSkillInstructionsFromScan(
const raw = typeof name === 'string' ? name.trim() : '';
const enabledSkills = skills.filter((skill) => skill.enabled);
// Gate eligible skills before exposing them as available or loading them.
// `host === undefined` keeps the legacy no-gating behavior (desktop call
// sites stay unchanged).
// `host === undefined` keeps the legacy no-gating behavior.
const gated = host
? gateSkillsByHostCapabilities(enabledSkills, host)
: enabledSkills.map((skill) => ({
Expand Down
Loading