Skip to content

feat(tools): promote discovered tools only on execute #1226

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
TheGreatAxios merged 3 commits into from
Sep 29, 2026
Merged

feat(tools): promote discovered tools only on execute #1226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f926eb
feat(tools): promote discovered tools only on execute
TheGreatAxios Sep 29, 2026
d677b90
fix(tools): keep list_dir off the advertised wire on execute
TheGreatAxios Sep 29, 2026
40ef520
fix(tools): advertise late MCP tools on execute in tests
TheGreatAxios Sep 29, 2026
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
35 changes: 31 additions & 4 deletions e2e/mcp-late-dispatch.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ import { createAgentWithLiveToolDispatch } from "../src/agent/live-tool-dispatch
import type { MCPClient } from "../src/mcp/client.js";
import { mcpClientTools } from "../src/mcp/plugin.js";
import { createPermissionGate } from "../src/permission/gate.js";
import { createAdvertisedToolset } from "../src/session/assemble-runtime.js";
import {
closeIntegrationSession,
INTEGRATION_SOURCE,
openIntegrationSession,
runUntilDone,
toolDoneEvents,
Expand Down Expand Up @@ -108,13 +110,35 @@ function toolDoneContents(events: ReactorEmittedEvent[]): string[] {
);
}

// Registers dynamic tools as promotable so the next request advertises them.
// Wires production promote-on-execute: search returns cards only; a call to a
// registered-but-unadvertised name declares that one schema, then dispatches.
function promoteDynamicTools(session: IntegrationSession): void {
session.toolset.setToolPromoter(() => {
const advertised = createAdvertisedToolset({
sessionMode: "orchestrator",
toolAvailability: { languageServerAvailable: false },
getProvider: () => ({
providerName: INTEGRATION_SOURCE.provider,
model: INTEGRATION_SOURCE.model,
}),
});
session.toolset.dynamicRunner.setCallGate(
(name) => advertised.isAdvertised(name),
{ isActivated: (name) => advertised.activated.has(name) },
);
session.toolset.setToolPromoter((names) => {
if (!advertised.activated.activate(names)) return;
if (!advertised.flushPromotions()) return;
session.updateToolDefinitions(
session.toolset.dynamicRunner.currentDefinitions(),
advertised.computeAdvertised(
session.toolset.dynamicRunner.currentDefinitions(),
),
);
});
session.updateToolDefinitions(
advertised.computeAdvertised(
session.toolset.dynamicRunner.currentDefinitions(),
),
);
}

function replyScript(
Expand Down Expand Up @@ -318,7 +342,10 @@ describe("integration — late MCP dispatch", () => {
promotionScript(session, call);

const { events } = await runUntilDone(session, "list one linear issue");
const published = publishedTool(await requestBodies(session));
const bodies = await requestBodies(session);
expect(bodies.length).toBeGreaterThan(0);
expect(publishedTool(bodies.slice(0, 1))).toBeUndefined();
const published = publishedTool(bodies);

if (schema === undefined) {
expect(published?.input_schema.properties).toEqual(
Expand Down
Loading
Loading