fix(qa): tighten kitchen sink rpc proof

vincentkoc · vincentkoc · commit fa614d0907e8 · 2026-06-07T07:03:43.000+02:00
diff --git a/scripts/e2e/kitchen-sink-rpc-walk.mjs b/scripts/e2e/kitchen-sink-rpc-walk.mjs
@@ -1262,6 +1262,36 @@ export function assertKitchenSinkTextInvokeResult(payload) {
   }
 }
 
+export function assertCreatedKitchenSinkSession(payload, expectedKey = SESSION_KEY) {
+  const created = assertObjectPayload(payload, "sessions.create");
+  if (created.ok !== true || created.key !== expectedKey || !isNonEmptyString(created.sessionId)) {
+    throw new Error(
+      `sessions.create did not return the requested Kitchen Sink session: ${boundedJsonPreview(
+        payload,
+      )}`,
+    );
+  }
+  return created;
+}
+
+export function assertKitchenSinkUiDescriptors(payload) {
+  const descriptorPayload = assertObjectPayload(payload, "plugins.uiDescriptors");
+  if (descriptorPayload.ok !== true || !Array.isArray(descriptorPayload.descriptors)) {
+    throw new Error(
+      `plugins.uiDescriptors returned invalid payload: ${boundedJsonPreview(payload)}`,
+    );
+  }
+  const descriptor = descriptorPayload.descriptors.find((entry) => entry?.pluginId === PLUGIN_ID);
+  if (!descriptor) {
+    throw new Error(
+      `plugins.uiDescriptors did not report Kitchen Sink descriptor for ${PLUGIN_ID}: ${boundedJsonPreview(
+        descriptorPayload.descriptors,
+      )}`,
+    );
+  }
+  return descriptor;
+}
+
 export function assertDiagnosticStabilityClean(payload) {
   const problems = [];
   if (!payload || typeof payload !== "object") {
@@ -2016,6 +2046,7 @@ export async function main() {
       { key: SESSION_KEY, agentId: "main", label: "kitchen-sink-rpc" },
       rpcOptions,
     );
+    assertCreatedKitchenSinkSession(createdSession);
     const effective = await retryRpcCall(
       "tools.effective",
       { sessionKey: createdSession.key, agentId: "main" },
@@ -2059,11 +2090,7 @@ export async function main() {
     assertTtsProviderCoverage(ttsStatus, "status");
 
     const uiDescriptors = await retryRpcCall("plugins.uiDescriptors", {}, rpcOptions);
-    if (!uiDescriptors || typeof uiDescriptors !== "object") {
-      throw new Error(
-        `plugins.uiDescriptors returned invalid payload: ${boundedJsonPreview(uiDescriptors)}`,
-      );
-    }
+    assertKitchenSinkUiDescriptors(uiDescriptors);
     const stability = await retryRpcCall("diagnostics.stability", {}, rpcOptions);
     assertDiagnosticStabilityClean(stability);
     await sampleInFlight?.catch(() => {});
diff --git a/test/scripts/kitchen-sink-rpc-walk.test.ts b/test/scripts/kitchen-sink-rpc-walk.test.ts
@@ -16,10 +16,12 @@ import {
   appendBoundedOutput,
   assertChannelAccountRunning,
   assertCommandResourceCeiling,
+  assertCreatedKitchenSinkSession,
   assertDiagnosticStabilityClean,
   assertExpectedKitchenSinkToolEntries,
   assertGatewayHealthPayload,
   assertGatewayStatusPayload,
+  assertKitchenSinkUiDescriptors,
   assertKitchenSinkSearchInvokeResult,
   assertKitchenSinkTextInvokeResult,
   assertResourceCeiling,
@@ -920,6 +922,46 @@ describe("kitchen-sink RPC command catalog assertions", () => {
     expect(error.message).not.toContain("DO_NOT_DUMP_TOOL_MIDDLE");
     expect(error.message.length).toBeLessThan(1400);
   });
+
+  it("requires sessions.create to return the requested Kitchen Sink session", () => {
+    expect(() =>
+      assertCreatedKitchenSinkSession({
+        ok: true,
+        key: "agent:main:kitchen-sink-rpc",
+        sessionId: "session-1",
+      }),
+    ).not.toThrow();
+
+    expect(() =>
+      assertCreatedKitchenSinkSession({
+        ok: true,
+        key: "agent:main:stale-session",
+        sessionId: "session-1",
+      }),
+    ).toThrow("sessions.create did not return the requested Kitchen Sink session");
+    expect(() =>
+      assertCreatedKitchenSinkSession({
+        ok: true,
+        key: "agent:main:kitchen-sink-rpc",
+      }),
+    ).toThrow("sessions.create did not return the requested Kitchen Sink session");
+  });
+
+  it("requires Kitchen Sink UI descriptor coverage", () => {
+    expect(() =>
+      assertKitchenSinkUiDescriptors({
+        ok: true,
+        descriptors: [{ pluginId: "openclaw-kitchen-sink-fixture", id: "kitchen-sink-panel" }],
+      }),
+    ).not.toThrow();
+
+    expect(() => assertKitchenSinkUiDescriptors({})).toThrow(
+      "plugins.uiDescriptors returned invalid payload",
+    );
+    expect(() => assertKitchenSinkUiDescriptors({ ok: true, descriptors: [] })).toThrow(
+      "plugins.uiDescriptors did not report Kitchen Sink descriptor",
+    );
+  });
 });
 
 describe("kitchen-sink RPC diagnostics assertions", () => {
