mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-11-16 20:12:20 +01:00
## Thinking Path > - Paperclip is the open source app people use to manage AI agents for work. > - MCP Apps (#21119) show interactive widgets from MCP servers, such as Circleback meeting cards, with the agent's reply in the task chat. > - The first version deferred three parts of the MCP Apps spec. A widget could not propose a chat message (`ui/message`). It could not give the agent context (`ui/update-model-context`). It could not go full screen. > - Paperclip also ignored the `icons` that MCP servers declare on tools (SEP-973). > - The security review of #21119 showed what these features need from day one: explicit consent, untrusted-data labels and strict icon sanitizing. > - This pull request adds the three host features and provider tool icons, with those protections built in. > - The benefit is that widgets can now work with the person and the agent, not only display data. ## Linked Issues or Issue Description Refs #21119 **Subsystem affected** MCP Apps host (task chat widgets), tool catalog, run wake prompt. **Problem or motivation** The MCP Apps host refused `ui/message` (-32601), dropped `ui/update-model-context` and kept every view inline. MCP tool `icons` were not parsed or shown. So widgets could not ask the agent a follow-up, the agent could not see what the person selected in a widget, large widgets were cramped, and tool rows used only generic icons. **Proposed solution** Add consent-gated view messages, per-view app context delivered to the task's next run as untrusted data, a full-screen dialog, and sanitized provider icons. Details are under "What Changed". **Alternatives considered** - Send view messages with a new server route that creates the comment itself. Rejected: comment creation has many rules (agent chat ownership, paused conversations, queued delivery, wakeups, receipts). The widget's Send button uses the same send path as the composer. A small route then records which view the comment came from. - Keep the iframe in place for full screen with CSS. Rejected: chat containers can create containing blocks that break `position: fixed`. A moved iframe always reloads, so the dialog hosts a new frame instead. **Roadmap alignment** Continues the MCP feature work after #21119, #21140 and #21219. It does not touch the MCP Tasks work (gateway `tools/call` polling and elicitation). ## What Changed - **`ui/message`.** The host shows "<App> wants to send: …" with **Send** and **Dismiss** under the widget (and inside the full-screen dialog). Nothing is sent before the click. Send posts the text as the viewer's own comment through the chat's normal send path (`handleThreadAdd`). `POST /api/issues/:issueId/mcp-app-views/:viewId/messages` then logs `issue.mcp_app_message_sent`. It accepts only the caller's own comment on the same task, matched by `clientRequestId`, from the last 10 minutes. One proposal per view can wait at a time. The view gets `{}` after the send, or -32000 "Message sending denied" after Dismiss. Only `user` text up to 8,000 characters is accepted. - **`ui/update-model-context`.** `PUT /api/issues/:issueId/mcp-app-views/:viewId/model-context` stores the latest context per view in `tool_mcp_app_views.model_context` (text blocks and `structuredContent`, 16 KB at most). Updates are applied in order and deduped in the browser and on the server. A change logs `issue.mcp_app_context_updated`, and an empty update clears the context. The task's next run gets the three most recently updated contexts as an `## App context (untrusted)` wake-prompt section. The section quotes the data as JSON and says it is third-party data, not instructions. The read runs in parallel with the other run preparation and never fails the run. CLI adapters and the native runner render it through the same `renderPaperclipWakePrompt`. - **Who may do this.** Messages and context need a signed-in person with `issue:comment` on the task. Agents and API keys get 403. Other tasks and companies get 404. `message` and `updateModelContext` are advertised in `hostCapabilities` only where the viewer can send messages. - **Full screen.** The host advertises `availableDisplayModes: ["inline","fullscreen"]` and handles `ui/request-display-mode`. It honors the view's declared modes and answers with the resulting mode. It sends `host-context-changed` with `displayMode` and the container (fixed `height`/`width` in full screen), and again when that container resizes. A new **Open full screen** control sits next to "Widget from …". Full screen is a Paperclip dialog that closes with Exit, Escape or the view's own request. - **Provider tool icons.** `icons` on MCP tool descriptors are sanitized into the new `tool_catalog_entries.icons` column, outside the version hash, so a new icon never quarantines a reviewed tool. Only `https:` URLs and `data:image/*` URIs are kept, and SVG only as `data:`. A `data:` icon is at most 32 KB, a URL at most 2,048 characters, with at most 4 icons per tool. `GET /api/companies/:companyId/tool-icons` lists them keyed by gateway tool name, in one cached request per chat. Task chat tool rows and the app's actions list show them through `ProviderToolIcon`. It renders `<img referrerPolicy="no-referrer">` at a fixed size and never inlines markup. It checks the source again before rendering and falls back to the taxonomy icon. - **Schema.** Migration `0477` adds `tool_catalog_entries.icons`, `tool_mcp_app_views.model_context` and `model_context_updated_at`, all nullable. - **Docs and stories.** `doc/connections/MCP-APPS.md` documents the new behavior, and the finished items are removed from "Limits and follow-ups". `Tasks/MCP App views` has new stories: "View asks to send a message", "Full screen" and "Tool rows with provider icons". The fixture view now uses `ui/message`, `ui/request-display-mode` and `ui/update-model-context`. ## Verification - `pnpm exec vitest run server/src/__tests__/mcp-apps.test.ts server/src/__tests__/tool-catalog-publication.test.ts server/src/__tests__/openapi-routes.test.ts packages/shared/src/mcp-icons.test.ts packages/shared/src/mcp-apps.test.ts`: pass (embedded Postgres). These tests cover: - Context: stored, deduped, logged once, 413 when too large, cleared, scoped to the task and company, refused for agents (403), and rendered into the wake prompt as untrusted data. - Messages: attributed only to the viewer's own recent comment on the same task. A teammate's comment, an unknown request id or an old comment gets 404. An agent gets 403. - Icons: stored sanitized, and the version hash and status do not change. Another company sees nothing. - `cd ui && pnpm exec vitest run src/components/mcp-app/ src/components/ProviderToolIcon.test.tsx src/pages/apps/app-detail/`: 69 pass. These tests cover: - The host protocol for each new method: capabilities, consent wait, one proposal at a time, invalid input, ordered and deduped context, the size limit, and the display-mode rules. - The consent card (nothing sent without Send). - The full-screen dialog (one frame at a time). - Icon rendering (no-referrer `img`, no inline SVG, fallback). - `cd ui && pnpm typecheck` (including Storybook) and `tsc --noEmit` for the server: clean. - Red/green: the new route and host tests fail on `master`, where the routes do not exist and the host answers -32601 or drops updates. The icon descriptor test failed when the publication write was removed. - Not run locally: the full suite, and `packages/adapter-utils/src/server-utils.test.ts › runChildProcess › does not crash when the child closes stdin before a delayed write`. That test times out on this Mac with or without this change, so it is a local platform issue. CI covers both. ## Risks - Migration risk is low: three nullable columns, no backfill. - Every run on a task now does one extra indexed read, in parallel with the other preparation. Errors are logged and the run continues without app context. - If the attribution request fails after the comment is sent, the comment stays without the `mcp_app_message_sent` activity row. This is documented. - Switching between inline and full screen restarts the view, so state inside the widget resets. This is documented as a limit. - Icon names shortened with a hash by the gateway (very long names) do not match, and those rows keep the taxonomy icon. > For core feature work, check [`ROADMAP.md`](ROADMAP.md) first and discuss it in `#dev` before opening the PR. Feature PRs that overlap with planned core work may need to be redirected — check the roadmap first. See `CONTRIBUTING.md`. ## Model Used - Claude Opus 5.5 (`claude-opus-5-5`) in Claude Code, with tool use and code execution. One subagent (the same model) built the provider-icon part. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have searched GitHub for duplicate or related PRs and linked them above - [x] I have either (a) linked existing issues with `Fixes: #` / `Closes #` / `Refs #` OR (b) described the issue in-PR following the relevant issue template - [x] I have not referenced internal/instance-local Paperclip issues or links (only public GitHub `#NNN` / `github.com/paperclipai/paperclip` URLs) - [x] My branch name describes the change (e.g. `docs/...`, `fix/...`) and contains no internal Paperclip ticket id or instance-derived details - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [ ] All Paperclip CI gates are green - [ ] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [ ] I will address all Greptile and reviewer comments before requesting merge 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
240 lines
17 KiB
TypeScript
240 lines
17 KiB
TypeScript
import { randomUUID } from "node:crypto";
|
|
import { and, eq, sql } from "drizzle-orm";
|
|
import { agents, companies, createDb, toolApplications, toolConnections, toolCatalogEntries, toolProfiles, toolProfileBindings, toolProfileEntries, type Db } from "@paperclipai/db";
|
|
import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
|
|
import { getEmbeddedPostgresTestSupport, startEmbeddedPostgresTestDatabase } from "./helpers/embedded-postgres.js";
|
|
import { toolAccessService } from "../services/tool-access.js";
|
|
import { toolAccessPolicyService } from "../services/tool-access-policy.js";
|
|
import { listCompanyProviderToolIcons } from "../services/tool-access/catalog/icons.js";
|
|
import { assignedToolName } from "../services/native-runtime/assigned-mcp-tools.js";
|
|
|
|
const support = await getEmbeddedPostgresTestSupport();
|
|
const describeDatabase = support.supported ? describe : describe.skip;
|
|
|
|
describeDatabase("catalog publication", () => {
|
|
let database: Awaited<ReturnType<typeof startEmbeddedPostgresTestDatabase>>;
|
|
let db: Db;
|
|
let companyId: string;
|
|
let applicationId: string;
|
|
let connectionId: string;
|
|
beforeAll(async () => { database = await startEmbeddedPostgresTestDatabase("paperclip-catalog-publication-"); db = createDb(database.connectionString); }, 90_000);
|
|
afterAll(async () => { await database?.cleanup(); });
|
|
afterEach(() => vi.restoreAllMocks());
|
|
beforeEach(async () => {
|
|
companyId = randomUUID();
|
|
await db.insert(companies).values({ id: companyId, name: "Catalog fixture", issuePrefix: `C${companyId.slice(0, 6)}` });
|
|
const [application] = await db.insert(toolApplications).values({ companyId, name: "Fixture MCP", type: "mcp_http" }).returning(); applicationId = application.id;
|
|
const [connection] = await db.insert(toolConnections).values({ companyId, applicationId, name: "Fixture connection", uid: randomUUID(), transport: "mcp_remote", authKind: "none", enabled: true, status: "active", config: { url: "https://mcp.example.test/mcp" } }).returning(); connectionId = connection.id;
|
|
});
|
|
|
|
const serviceWithTools = (tools: unknown[]) => toolAccessService(db, {
|
|
remoteHttpEndpointLookup: async () => [{ address: "8.8.8.8", family: 4 }],
|
|
remoteHttpRequest: async (_url, init) => {
|
|
const body = JSON.parse(String(init?.body));
|
|
if (body.method === "notifications/initialized") return new Response(null, { status: 202 });
|
|
return new Response(JSON.stringify({ jsonrpc: "2.0", id: body.id, result: body.method === "initialize" ? { protocolVersion: "2025-06-18" } : { tools } }), { headers: { "content-type": "application/json" } });
|
|
},
|
|
});
|
|
it.each([250, 2500])("publishes a real %i-tool catalog in bounded chunks and preserves row identities", async count => {
|
|
const tools = Array.from({ length: count }, (_, index) => ({ name: `search_${index}`, description: "Search fixture records", inputSchema: { type: "object", properties: {} }, annotations: { readOnlyHint: true } }));
|
|
await db.update(toolConnections).set({ config: { url: "https://mcp.example.test/mcp" } }).where(eq(toolConnections.id, connectionId));
|
|
const service = toolAccessService(db, {
|
|
remoteHttpEndpointLookup: async () => [{ address: "8.8.8.8", family: 4 }],
|
|
remoteHttpRequest: async (_url, init) => {
|
|
const body = JSON.parse(String(init?.body));
|
|
if (body.method === "notifications/initialized") return new Response(null, { status: 202 });
|
|
return new Response(JSON.stringify({ jsonrpc: "2.0", id: body.id, result: body.method === "initialize" ? { protocolVersion: "2025-06-18" } : { tools } }), { headers: { "content-type": "application/json" } });
|
|
},
|
|
});
|
|
let catalogWrites = 0;
|
|
const transaction = db.transaction.bind(db);
|
|
const transactionSpy = vi.spyOn(db, "transaction").mockImplementation((async (operation, config) => transaction(async tx => {
|
|
const insert = tx.insert.bind(tx);
|
|
const insertSpy = vi.spyOn(tx, "insert").mockImplementation(((table: Parameters<typeof tx.insert>[0]) => {
|
|
if (table === toolCatalogEntries) catalogWrites += 1;
|
|
return insert(table);
|
|
}) as typeof tx.insert);
|
|
try { return await operation(tx); }
|
|
finally { insertSpy.mockRestore(); }
|
|
}, config)) as typeof db.transaction);
|
|
expect((await service.refreshCatalog(connectionId)).catalog).toHaveLength(count);
|
|
expect(catalogWrites).toBe(Math.ceil(count / 500));
|
|
const first = await db.select().from(toolCatalogEntries).where(eq(toolCatalogEntries.connectionId, connectionId)).orderBy(toolCatalogEntries.toolName);
|
|
expect((await service.refreshCatalog(connectionId)).catalog).toHaveLength(count);
|
|
expect(catalogWrites).toBe(2 * Math.ceil(count / 500));
|
|
transactionSpy.mockRestore();
|
|
const second = await db.select().from(toolCatalogEntries).where(eq(toolCatalogEntries.connectionId, connectionId)).orderBy(toolCatalogEntries.toolName);
|
|
expect(second.map(row => [row.id, row.firstSeenAt, row.status])).toEqual(first.map(row => [row.id, row.firstSeenAt, row.status]));
|
|
});
|
|
it("stores sanitized provider icons outside the version hash and lists them by gateway name", async () => {
|
|
const tool = (icons: unknown) => ({ name: "DisplayMeetings", description: "Show meetings", inputSchema: { type: "object" }, annotations: { readOnlyHint: true }, ...(icons === undefined ? {} : { icons }) });
|
|
await serviceWithTools([tool(undefined)]).refreshCatalog(connectionId);
|
|
const [before] = await db.select().from(toolCatalogEntries).where(eq(toolCatalogEntries.connectionId, connectionId));
|
|
expect(before.icons).toBeNull();
|
|
await serviceWithTools([tool([
|
|
{ src: "https://cdn.example.com/meetings.png", mimeType: "image/png", sizes: ["32x32"] },
|
|
{ src: "https://cdn.example.com/meetings.svg" },
|
|
{ src: "javascript:alert(1)" },
|
|
{ src: "data:image/svg+xml;base64,PHN2Zy8+", theme: "dark" },
|
|
])]).refreshCatalog(connectionId);
|
|
const [after] = await db.select().from(toolCatalogEntries).where(eq(toolCatalogEntries.connectionId, connectionId));
|
|
expect(after.icons).toEqual([
|
|
{ src: "https://cdn.example.com/meetings.png", mimeType: "image/png", sizes: ["32x32"] },
|
|
{ src: "data:image/svg+xml;base64,PHN2Zy8+", theme: "dark" },
|
|
]);
|
|
// Icons are display data: adding them never changes the reviewed version.
|
|
expect(after.versionHash).toBe(before.versionHash);
|
|
expect(after.status).toBe(before.status);
|
|
const listed = await listCompanyProviderToolIcons(db, companyId, [connectionId]);
|
|
const gatewayToolName = `mcp.fixture-connection-${connectionId.replace(/-/g, "").slice(0, 8)}:displaymeetings`;
|
|
// Native runners name the same tool `app_<name>_<digest>`; transcripts show that name.
|
|
expect(listed).toEqual([{ gatewayToolName, nativeToolName: assignedToolName(gatewayToolName), icons: after.icons }]);
|
|
expect(listed[0]!.nativeToolName).toMatch(/^app_[A-Za-z0-9_]*_[0-9a-f]{12}$/);
|
|
// Another company sees none of them.
|
|
const otherCompanyId = randomUUID();
|
|
await db.insert(companies).values({ id: otherCompanyId, name: "Other", issuePrefix: `O${otherCompanyId.slice(0, 6)}` });
|
|
expect(await listCompanyProviderToolIcons(db, otherCompanyId, [connectionId])).toEqual([]);
|
|
// Only connections the caller may see are listed.
|
|
expect(await listCompanyProviderToolIcons(db, companyId, [])).toEqual([]);
|
|
expect(await listCompanyProviderToolIcons(db, companyId, [randomUUID()])).toEqual([]);
|
|
});
|
|
it("refreshes known tools from overlapping MCP pages using the last descriptor", async () => {
|
|
await db.update(toolConnections).set({ config: { url: "https://mcp.example.test/mcp" } }).where(eq(toolConnections.id, connectionId));
|
|
let overlap = false;
|
|
const descriptor = (description: string) => ({ name: "search", description, inputSchema: { type: "object" }, annotations: { readOnlyHint: true } });
|
|
const service = toolAccessService(db, {
|
|
remoteHttpEndpointLookup: async () => [{ address: "8.8.8.8", family: 4 }],
|
|
remoteHttpRequest: async (_url, init) => {
|
|
const body = JSON.parse(String(init?.body));
|
|
if (body.method === "notifications/initialized") return new Response(null, { status: 202 });
|
|
const result = body.method === "initialize" ? { protocolVersion: "2025-06-18" }
|
|
: body.params?.cursor ? { tools: [descriptor("Last page")] }
|
|
: { tools: [descriptor("First page")], ...(overlap ? { nextCursor: "overlap" } : {}) };
|
|
return new Response(JSON.stringify({ jsonrpc: "2.0", id: body.id, result }), { headers: { "content-type": "application/json" } });
|
|
},
|
|
});
|
|
await service.refreshCatalog(connectionId);
|
|
const [first] = await db.select().from(toolCatalogEntries).where(eq(toolCatalogEntries.connectionId, connectionId));
|
|
overlap = true;
|
|
expect((await service.refreshCatalog(connectionId)).catalog).toHaveLength(1);
|
|
const rows = await db.select().from(toolCatalogEntries).where(eq(toolCatalogEntries.connectionId, connectionId));
|
|
expect(rows).toHaveLength(1);
|
|
expect(rows[0]).toMatchObject({ id: first.id, firstSeenAt: first.firstSeenAt, description: "Last page" });
|
|
});
|
|
|
|
it("preserves operator-disabled tools and unchanged pending reviews", async () => {
|
|
const tools = ["off", "review"].map(name => ({ name, description: "Initial tool", inputSchema: { type: "object" }, annotations: { readOnlyHint: true } }));
|
|
const service = serviceWithTools(tools);
|
|
await service.refreshCatalog(connectionId);
|
|
await db.update(toolConnections).set({ config: { url: "https://mcp.example.test/mcp", quarantineNewEntries: true } }).where(eq(toolConnections.id, connectionId));
|
|
await db.update(toolCatalogEntries).set({ status: "disabled", quarantineReason: null }).where(and(eq(toolCatalogEntries.connectionId, connectionId), eq(toolCatalogEntries.toolName, "off")));
|
|
const reviewedAt = new Date("2020-01-01T00:00:00Z");
|
|
await db.update(toolCatalogEntries).set({ status: "quarantined", quarantineReason: "pending_review", quarantinedAt: reviewedAt }).where(and(eq(toolCatalogEntries.connectionId, connectionId), eq(toolCatalogEntries.toolName, "review")));
|
|
const before = await db.select().from(toolCatalogEntries).where(eq(toolCatalogEntries.connectionId, connectionId)).orderBy(toolCatalogEntries.toolName);
|
|
const result = await service.refreshCatalog(connectionId);
|
|
expect(result.catalog.map(entry => [entry.toolName, entry.status])).toEqual([["off", "disabled"], ["review", "quarantined"]]);
|
|
const after = await db.select().from(toolCatalogEntries).where(eq(toolCatalogEntries.connectionId, connectionId)).orderBy(toolCatalogEntries.toolName);
|
|
expect(after.map(row => [row.id, row.firstSeenAt, row.status, row.quarantinedAt, row.quarantineReason])).toEqual(before.map(row => [row.id, row.firstSeenAt, row.status, row.quarantinedAt, row.quarantineReason]));
|
|
});
|
|
|
|
it.each(["new", "quarantined"] as const)("does not restore an Off action after overlapping refreshes of a %s tool", async state => {
|
|
await serviceWithTools([]).refreshCatalog(connectionId);
|
|
if (state === "quarantined") await db.insert(toolCatalogEntries).values({
|
|
companyId, applicationId, connectionId, name: "search", toolName: "search", riskLevel: "read",
|
|
status: "quarantined", versionHash: "fixture-version", schemaHash: "fixture-schema", quarantineReason: "pending_review", quarantinedAt: new Date("2020-01-01T00:00:00Z"),
|
|
});
|
|
const [agent] = await db.insert(agents).values({ companyId, name: "Catalog permission fixture", role: "engineer", adapterType: "process", adapterConfig: {}, runtimeConfig: {} }).returning();
|
|
const service = serviceWithTools([{ name: "search", annotations: { readOnlyHint: true } }]);
|
|
const transaction = db.transaction.bind(db);
|
|
let paused = false;
|
|
let release!: () => void;
|
|
const resume = new Promise<void>(resolve => { release = resolve; });
|
|
const transactionSpy = vi.spyOn(db, "transaction").mockImplementation((async (operation, config) => {
|
|
if (!paused) { paused = true; await resume; }
|
|
return transaction(operation, config);
|
|
}) as typeof db.transaction);
|
|
const later = Promise.allSettled([service.refreshCatalog(connectionId, undefined, { enableAllByDefault: true })]);
|
|
try {
|
|
await vi.waitFor(() => expect(paused).toBe(true), { timeout: 5000 });
|
|
const first = await service.refreshCatalog(connectionId, undefined, { enableAllByDefault: true });
|
|
const entry = first.catalog[0];
|
|
const decide = () => toolAccessPolicyService(db).decide({ companyId, actor: { actorType: "agent", actorId: agent.id }, request: { connectionId, catalogEntryId: entry.id, toolName: entry.toolName, arguments: {} } });
|
|
await expect(decide()).resolves.toMatchObject({ decision: "allow", reasonCode: "allow_profile" });
|
|
const [selection] = await db.select().from(toolProfileEntries).where(eq(toolProfileEntries.catalogEntryId, entry.id));
|
|
await service.deleteProfileEntry(selection.id);
|
|
await expect(decide()).resolves.toMatchObject({ decision: "deny" });
|
|
release();
|
|
const [result] = await later;
|
|
if (result.status === "rejected") throw result.reason;
|
|
await expect(decide()).resolves.toMatchObject({ decision: "deny" });
|
|
expect(await db.select().from(toolCatalogEntries).where(eq(toolCatalogEntries.connectionId, connectionId))).toHaveLength(1);
|
|
expect(await db.select().from(toolProfileEntries).where(eq(toolProfileEntries.catalogEntryId, entry.id))).toHaveLength(0);
|
|
} finally { release(); await later; transactionSpy.mockRestore(); }
|
|
}, 15000);
|
|
|
|
it("keeps committed chunks and rolls back a failed default-profile publication", async () => {
|
|
const service = serviceWithTools(Array.from({ length: 501 }, (_, index) => ({ name: `search_${index}`, annotations: { readOnlyHint: true } })));
|
|
const transaction = db.transaction.bind(db);
|
|
let catalogWrites = 0;
|
|
let failProfile = false;
|
|
const transactionSpy = vi.spyOn(db, "transaction").mockImplementation((async (operation, config) => transaction(async tx => {
|
|
const insert = tx.insert.bind(tx);
|
|
const insertSpy = vi.spyOn(tx, "insert").mockImplementation(((table: Parameters<typeof tx.insert>[0]) => {
|
|
if (table === toolCatalogEntries && ++catalogWrites === 2) throw new Error("second chunk failed");
|
|
if (table === toolProfileBindings && failProfile) throw new Error("profile binding failed");
|
|
return insert(table);
|
|
}) as typeof tx.insert);
|
|
try { return await operation(tx); }
|
|
finally { insertSpy.mockRestore(); }
|
|
}, config)) as typeof db.transaction);
|
|
await expect(service.refreshCatalog(connectionId)).rejects.toThrow("second chunk failed");
|
|
expect(await db.select().from(toolCatalogEntries).where(eq(toolCatalogEntries.connectionId, connectionId))).toHaveLength(500);
|
|
failProfile = true;
|
|
await expect(service.refreshCatalog(connectionId)).rejects.toThrow("profile binding failed");
|
|
expect(await db.select().from(toolCatalogEntries).where(eq(toolCatalogEntries.connectionId, connectionId))).toHaveLength(501);
|
|
expect(await db.select().from(toolProfiles).where(eq(toolProfiles.companyId, companyId))).toHaveLength(0);
|
|
expect(await db.select().from(toolProfileBindings).where(eq(toolProfileBindings.companyId, companyId))).toHaveLength(0);
|
|
transactionSpy.mockRestore();
|
|
await service.refreshCatalog(connectionId);
|
|
expect(await db.select().from(toolProfiles).where(eq(toolProfiles.companyId, companyId))).toHaveLength(1);
|
|
});
|
|
|
|
it("waits for application publication before changing catalog rows", async () => {
|
|
const tools = [{ name: "search", description: "Initial search", annotations: { readOnlyHint: true } }];
|
|
const service = serviceWithTools(tools);
|
|
await service.refreshCatalog(connectionId);
|
|
tools[0].description = "Changed search";
|
|
let locked!: () => void;
|
|
let release!: () => void;
|
|
const held = new Promise<void>(resolve => { locked = resolve; });
|
|
const resume = new Promise<void>(resolve => { release = resolve; });
|
|
const blocker = db.transaction(async tx => {
|
|
await tx.select().from(toolApplications).where(eq(toolApplications.id, applicationId)).for("no key update");
|
|
locked(); await resume;
|
|
});
|
|
await held;
|
|
const transaction = db.transaction.bind(db);
|
|
let started!: (pid: number) => void;
|
|
const begun = new Promise<number>(resolve => { started = resolve; });
|
|
const transactionSpy = vi.spyOn(db, "transaction").mockImplementation((async (operation, config) => transaction(async tx => {
|
|
await tx.execute(sql`SET LOCAL lock_timeout = '8s'`);
|
|
const [backend] = await tx.execute(sql`SELECT pg_backend_pid() AS pid`);
|
|
started(Number(backend.pid));
|
|
return operation(tx);
|
|
}, config)) as typeof db.transaction);
|
|
const refresh = Promise.allSettled([service.refreshCatalog(connectionId)]);
|
|
try {
|
|
const pid = await begun;
|
|
await vi.waitFor(async () => {
|
|
const [activity] = await db.execute(sql`SELECT wait_event_type FROM pg_stat_activity WHERE pid = ${pid}`);
|
|
expect(activity.wait_event_type).toBe("Lock");
|
|
}, { timeout: 5000 });
|
|
expect((await db.select().from(toolCatalogEntries).where(eq(toolCatalogEntries.connectionId, connectionId)))[0].description).toBe("Initial search");
|
|
} finally { release(); await blocker; }
|
|
const [result] = await refresh;
|
|
if (result.status === "rejected") throw result.reason;
|
|
transactionSpy.mockRestore();
|
|
expect((await db.select().from(toolCatalogEntries).where(eq(toolCatalogEntries.connectionId, connectionId)))[0].description).toBe("Changed search");
|
|
}, 15000);
|
|
});
|