test(evals): decline the actual addressed Notion card

Co-Authored-By: Paperclip <noreply@paperclip.ing>

tests/runner-e2e/chat-catalog-domains/external-connection-setup.test.ts

@@ -0,0 +1,15 @@
+import { expect, it } from "vitest";
+import type { ConnectionIntentInteraction } from "../../../packages/shared/src/types/issue.js";
+import { addressedNotionRequest } from "./external-connection-setup.js";
+
+it("binds the real CEO-needs-Notion card to its exact person/company/source before clicking Not now", () => {
+  const target = { companyId: "company", issueId: "source", agentId: "ceo", personId: "person" };
+  const card = { kind: "connection_intent", companyId: "company", issueId: "source", createdByAgentId: "ceo", sourceRunId: "run", addresseeUserId: "person", payload: { serviceSlug: "notion", serviceName: "Notion", requestingAgentId: "ceo", requestingAgentName: "CEO" } } as ConnectionIntentInteraction;
+  expect(addressedNotionRequest(card, target)).toBe(true);
+  for (const wrong of [
+    { ...card, companyId: "other" }, { ...card, issueId: "other" },
+    { ...card, createdByAgentId: "other" }, { ...card, addresseeUserId: "other" },
+    { ...card, sourceRunId: null }, { ...card, payload: { ...card.payload, serviceSlug: "linear" } },
+    { ...card, payload: { ...card.payload, requestingAgentId: "other" } },
+  ]) expect(addressedNotionRequest(wrong as ConnectionIntentInteraction, target)).toBe(false);
+});

tests/runner-e2e/chat-catalog-domains/external-connection-setup.ts

@@ -3,6 +3,16 @@ import type { ConnectionIntentInteraction } from "../../../packages/shared/src/t
 import { definition, externalObservation, observeExternal, root, checks } from "./external-support.js";
 import { pollUntil } from "../api.js";
 
+export function addressedNotionRequest(card: ConnectionIntentInteraction, target: {
+  companyId: string; issueId: string; agentId: string; personId: string;
+}) {
+  return card.kind === "connection_intent" && card.companyId === target.companyId
+    && card.issueId === target.issueId && card.payload.serviceSlug === "notion"
+    && card.payload.serviceName === "Notion" && card.payload.requestingAgentId === target.agentId
+    && card.createdByAgentId === target.agentId && card.addresseeUserId === target.personId
+    && typeof card.sourceRunId === "string" && !!card.sourceRunId;
+}
+
 export function gradeConnectionDecline(value: unknown) {
   const c = checks(); const o = externalObservation(value);
   c.add("complete-declined-connection-evidence", !!o, "The actual addressed connection request and persisted decline are required."); if (!o) return c.result();
@@ -10,7 +20,8 @@ export function gradeConnectionDecline(value: unknown) {
   const card = cards[0] as unknown as ConnectionIntentInteraction | undefined;
   c.add("single-addressed-human-decline", cards.length === 1 && !!card && card.id === o.state.intentId && card.status !== "pending"
     && card.result?.outcome === "declined" && !!card.resolvedByUserId && card.resolvedByUserId === card.addresseeUserId && !card.resolvedByAgentId
-    && o.state.cardVisibleBeforeDecline === true, "The intended person visibly declines one Notion request; no replacement request is created.");
+    && o.state.cardVisibleBeforeDecline === true && o.state.declineRequestMatched === true
+    && addressedNotionRequest(card, { companyId: o.companyId, issueId: String(o.state.sourceIssueId), agentId: o.leadId, personId: String(o.state.personId) }), "The intended person visibly declines one Notion request; no replacement request is created.");
   c.add("no-connected-account-or-provider-read", o.connections.length === 0 && o.state.connectedBeforeDecline === 0
     && o.state.providerInvocations === 0, "There is no credential-bearing connection and no provider invocation after a decline.");
   c.add("post-decline-response-bound", typeof o.state.initialRunId === "string" && o.phaseReplies.some(row => row.runId !== o.state.initialRunId && o.runs.some(run => run.id === row.runId && run.status === "succeeded")), "The incomplete research explanation belongs to the actual decline continuation run.");
@@ -22,19 +33,34 @@ export function gradeConnectionDecline(value: unknown) {
 export const connectionSetupExternalCases = [definition("connection-setup.notion-declined", async ctx => {
   const current = await ctx.input.api.get<{ connections: unknown[] }>(`${root(ctx)}/tools/connections`);
   if (current.connections.length) throw new Error("No-connection prerequisite violated in disposable company");
-  return { connectedBeforeDecline: current.connections.length };
+  const session = await ctx.input.api.get<{ user: { id: string } }>("/api/auth/get-session");
+  if (!session.user?.id) throw new Error("Notion decline requires the actual signed-in person");
+  return { connectedBeforeDecline: current.connections.length, personId: session.user.id };
 }, gradeConnectionDecline, {
   authentication: "human-session", expectedRunCount: 2, minimumRunCount: 1, attemptTimeoutMs: 420_000,
-  sourceFiles: ["chat-catalog-domains/external-connection-setup.ts", "chat-catalog-domains/external-support.ts", "chat-catalog-domains/internal-support.ts", "chat-scenarios/connection-setup.yaml"],
+  sourceFiles: ["chat-catalog-domains/external-connection-setup.ts", "chat-catalog-domains/external-support.ts", "chat-catalog-domains/internal-support.ts", "../../ui/src/features/connections/ConnectionIntentInteractionBody.tsx", "../../ui/src/api/connection-intents.ts", "chat-scenarios/connection-setup.yaml"],
   async act(ctx, state) {
     const cards = await pollUntil({ label: "addressed Notion connection request", deadlineAt: Date.now() + 150_000,
       load: async () => { await ctx.refreshIssue(); return ctx.issue() ? ctx.input.api.get<ConnectionIntentInteraction[]>(`/api/issues/${ctx.issue()!.id}/interactions`) : []; },
       accept: rows => rows.some(row => row.kind === "connection_intent" && row.payload.serviceSlug === "notion" && row.status === "pending") });
     const pending = cards.filter(row => row.kind === "connection_intent" && row.payload.serviceSlug === "notion" && row.status === "pending");
     if (pending.length !== 1) throw new Error("Expected exactly one Notion connection request");
-    state.intentId = pending[0]!.id; state.initialRunId = pending[0]!.sourceRunId;
-    await expect(ctx.input.page.getByText("Notion", { exact: true }).first()).toBeVisible();
-    const button = ctx.input.page.getByRole("button", { name: "Not now", exact: true }); await expect(button).toBeVisible(); state.cardVisibleBeforeDecline = true; await button.click();
+    const card = pending[0]!;
+    if (!ctx.issue() || !addressedNotionRequest(card, { companyId: ctx.input.fixtures.company.id, issueId: ctx.issue()!.id, agentId: ctx.input.fixtures.agent.id, personId: String(state.personId) })
+      || !(await ctx.allRuns()).some(run => run.id === card.sourceRunId)) throw new Error("Notion card does not belong to this person's actual canonical run");
+    state.intentId = card.id; state.initialRunId = card.sourceRunId; state.sourceIssueId = card.issueId;
+    const view = ctx.input.page.locator(`[id=${JSON.stringify(`connection-intent-focus-target-${card.id}`)}]`);
+    await expect(view.getByText(`${card.payload.requestingAgentName} needs Notion`, { exact: true })).toBeVisible();
+    const button = view.getByRole("button", { name: "Not now", exact: true });
+    await expect(button).toBeVisible(); state.cardVisibleBeforeDecline = true;
+    const declined = ctx.input.page.waitForResponse(response => new URL(response.url()).origin === ctx.input.api.baseURL && new URL(response.url()).pathname === `/api/connection-intents/${card.id}/decline` && response.request().method() === "POST");
+    await button.click();
+    const response = await declined;
+    if (!response.ok()) throw new Error(`Actual addressed Notion decline returned HTTP ${response.status()}`);
+    const saved = await response.json() as ConnectionIntentInteraction;
+    state.declineRequestMatched = saved.id === card.id && saved.status === "rejected" && saved.result?.outcome === "declined" && saved.resolvedByUserId === state.personId;
+    if (!state.declineRequestMatched) throw new Error("Visible Not now did not retain this person's exact decline");
+    await expect(view.getByText("Connection declined", { exact: true })).toBeVisible();
   },
   async observe(ctx, state) {
     // A public connection activity read is only available for real connections.
@@ -46,9 +72,8 @@ export const connectionSetupExternalCases = [definition("connection-setup.notion
     return { ...o, state };
   },
   async verifyResult(ctx, state) {
-    const card = ctx.input.page.locator(`[data-interaction-id=${JSON.stringify(String(state.intentId))}]`);
-    if (await card.count()) await expect(card).toContainText(/declined|not connected|not now/i);
-    else await expect(ctx.input.page.getByText(/declined|not connected/i).first()).toBeVisible();
+    const card = ctx.input.page.locator(`[id=${JSON.stringify(`connection-intent-focus-target-${state.intentId}`)}]`);
+    await expect(card.getByText("Connection declined", { exact: true })).toBeVisible();
     await expect(ctx.input.page.getByTestId("task-chat-composer-input")).toBeVisible();
   },
 })];

tests/runner-e2e/chat-catalog-domains/external.test.ts

@@ -98,8 +98,8 @@ function valid(id: string) {
       gatewayCountBeforeHuman: 0, humanCreated: true, agentCreateStatus: 403, tokenScanComplete: true, tokenLeaked: false });
     o.activity = [{ id: "event", entityId: "gateway", actorType: "user", action: "tool_gateway.created" }];
   } else if (id === "connection-setup.notion-declined") {
-    Object.assign(o.state, { intentId: "intent", cardVisibleBeforeDecline: true, connectedBeforeDecline: 0, providerInvocations: 0 });
-    o.interactions = [{ id: "intent", kind: "connection_intent", status: "answered", resolvedByUserId: "person", payload: { serviceSlug: "notion" },
+    Object.assign(o.state, { intentId: "intent", personId: "person", sourceIssueId: "source", declineRequestMatched: true, cardVisibleBeforeDecline: true, connectedBeforeDecline: 0, providerInvocations: 0 });
+    o.interactions = [{ id: "intent", companyId: "company", issueId: "source", createdByAgentId: "ceo", ...{ sourceRunId: "initial" }, kind: "connection_intent", status: "rejected", resolvedByUserId: "person", payload: { serviceSlug: "notion", serviceName: "Notion", requestingAgentId: "ceo" },
       ...{ addresseeUserId: "person", result: { outcome: "declined" } } }];
     o.reply = "I could not read Notion because you declined access. You can paste an excerpt instead.";
   } else if (id === "chat-channels.provider-disabled") {