Skip to content

Fix name fallback for Archestra get tools #3223

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

Open
yodakohl wants to merge 4 commits into
base: main
Choose a base branch
from
+108 −3
Open

Fix name fallback for Archestra get tools #3223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
371287d
Fix name fallback for Archestra get tools
yodakohl Mar 9, 2026
57e1334
Fix get-tool regression scopes
Mar 9, 2026
a08835e
Harden get-tool name fallback
Mar 9, 2026
9d65e7d
Merge branch 'main' into codex/fix-3214-get-tools-name-fallback
iskhakov Mar 10, 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
95 changes: 95 additions & 0 deletions platform/backend/src/archestra-mcp-server.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ describe("executeArchestraTool", () => {
id: testAgent.id,
name: testAgent.name,
},
userId: testAgent.authorId ?? undefined,
};
});

Expand Down Expand Up @@ -1351,6 +1352,100 @@ describe("executeArchestraTool", () => {
});
});
});

describe("get_* tools", () => {
test("should fall back to name search when get_mcp_gateway receives a name in id", async ({
makeAgent,
}) => {
const gateway = await makeAgent({
name: "Grafana Export Gateway",
agentType: "mcp_gateway",
scope: "personal",
});

const result = await executeArchestraTool(
`${ARCHESTRA_MCP_SERVER_NAME}${MCP_SERVER_TOOL_NAME_SEPARATOR}get_mcp_gateway`,
{ id: gateway.name },
{
...mockContext,
userId: gateway.authorId ?? mockContext.userId,
},
);

expect(result.isError).toBe(false);
expect((result.content[0] as any).text).toContain(gateway.id);
expect((result.content[0] as any).text).toContain(gateway.name);
});

test("should fall back to name search when get_agent receives a name in id", async ({
makeAgent,
}) => {
const agent = await makeAgent({
name: "Prompt Router Agent",
agentType: "agent",
scope: "personal",
});

const result = await executeArchestraTool(
`${ARCHESTRA_MCP_SERVER_NAME}${MCP_SERVER_TOOL_NAME_SEPARATOR}get_agent`,
{ id: agent.name },
{
...mockContext,
userId: agent.authorId ?? mockContext.userId,
},
);

expect(result.isError).toBe(false);
expect((result.content[0] as any).text).toContain(agent.id);
expect((result.content[0] as any).text).toContain(agent.name);
});

test("should fall back to name search when get_llm_proxy receives a name in id", async ({
makeAgent,
}) => {
const llmProxy = await makeAgent({
name: "Shared LLM Proxy",
agentType: "llm_proxy",
scope: "personal",
});

const result = await executeArchestraTool(
`${ARCHESTRA_MCP_SERVER_NAME}${MCP_SERVER_TOOL_NAME_SEPARATOR}get_llm_proxy`,
{ id: llmProxy.name },
{
...mockContext,
userId: llmProxy.authorId ?? mockContext.userId,
},
);

expect(result.isError).toBe(false);
expect((result.content[0] as any).text).toContain(llmProxy.id);
expect((result.content[0] as any).text).toContain(llmProxy.name);
});

test("should fall back to name search when get_agent receives a missing UUID id and a valid name", async ({
makeAgent,
}) => {
const agent = await makeAgent({
name: "Fallback Search Agent",
agentType: "agent",
scope: "personal",
});

const result = await executeArchestraTool(
`${ARCHESTRA_MCP_SERVER_NAME}${MCP_SERVER_TOOL_NAME_SEPARATOR}get_agent`,
{ id: crypto.randomUUID(), name: agent.name },
{
...mockContext,
userId: agent.authorId ?? mockContext.userId,
},
);

expect(result.isError).toBe(false);
expect((result.content[0] as any).text).toContain(agent.id);
expect((result.content[0] as any).text).toContain(agent.name);
});
});
});

test("isArchestraMcpServerTool", () => {
Expand Down
16 changes: 13 additions & 3 deletions platform/backend/src/archestra-mcp-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ function slugify(name: string): string {
.replace(/^_+|_+$/g, "");
}

function isUuid(value: string): boolean {
return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(
value,
);
}

Comment on lines +89 to +94
Copy link
Contributor

@joeyorlando joeyorlando Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you mind extracting isUuid (backend/src/models/interaction.ts) and isValidUUID (backend/src/routes/chatops.ts) out into a shared util and reusing in those three spots?

// Construct fully-qualified tool names
const TOOL_WHOAMI_FULL_NAME = `${ARCHESTRA_MCP_SERVER_NAME}${MCP_SERVER_TOOL_NAME_SEPARATOR}${TOOL_WHOAMI_NAME}`;
const TOOL_SEARCH_PRIVATE_MCP_REGISTRY_FULL_NAME = `${ARCHESTRA_MCP_SERVER_NAME}${MCP_SERVER_TOOL_NAME_SEPARATOR}${TOOL_SEARCH_PRIVATE_MCP_REGISTRY_NAME}`;
Expand Down Expand Up @@ -1711,15 +1717,19 @@ export async function executeArchestraTool(

let record: Agent | null | undefined;

if (id) {
if (id && isUuid(id)) {
record = await AgentModel.findById(id);
} else if (name) {
}

if (!record && (name || (id && !isUuid(id)))) {
const searchName = (name ?? id) as string;

// Search by name, only matching personal agents owned by the current user
const results = await AgentModel.findAllPaginated(
{ limit: 1, offset: 0 },
undefined,
{
name,
name: searchName,
agentType: expectedType,
scope: "personal",
authorIds: context.userId ? [context.userId] : [],
Expand Down
Loading