refactor: defer SDK metadata filtering

Author: aidandaly24

src/handlers/runtime/endpoint/endpoint.screen.test.tsx

@@ -193,10 +193,7 @@ describe("Runtime endpoint flow", () => {
     core.runtime.setListEndpointsResponse({
       runtimeEndpoints: [endpoint({ name: qualifier, id: qualifier })],
     });
-    core.runtime.setGetEndpointResponse({
-      $metadata: { requestId: "endpoint-request-metadata" },
-      ...getEndpointResponse({ name: qualifier, id: qualifier }),
-    } as GetAgentRuntimeEndpointResponse);
+    core.runtime.setGetEndpointResponse(getEndpointResponse({ name: qualifier, id: qualifier }));
     const r = renderScreen("/agentcore/runtime/endpoint/list/runtime-123", {
       core,
       endpointUrl: runtimeEndpointUrl,
@@ -209,8 +206,6 @@ describe("Runtime endpoint flow", () => {
       `agentcore → runtime → endpoint → get → runtime-123 → ${qualifier}`,
     );
     await waitForText(r.lastFrame, '"targetVersion"');
-    expect(r.lastFrame()).not.toContain("$metadata");
-    expect(r.lastFrame()).not.toContain("endpoint-request-metadata");
     await waitFor(() => core.runtime.calls.some((call) => call.method === "getRuntimeEndpoint"));
     expect(core.runtime.calls.find((call) => call.method === "getRuntimeEndpoint")).toEqual({
       method: "getRuntimeEndpoint",

src/handlers/runtime/endpoint/get/index.tsx

@@ -3,7 +3,6 @@ import { createHandler, flag } from "../../../../router";
 import { JsonRendererKey } from "../../../../tui";
 import type { Core } from "../../../types";
 import { coreOptsFromCtx } from "../../../utils";
-import { withoutSdkMetadata } from "../../withoutSdkMetadata";
 
 export const createGetRuntimeEndpointHandler = (core: Core) =>
   createHandler({
@@ -24,9 +23,7 @@ export const createGetRuntimeEndpointHandler = (core: Core) =>
       ctx
         .require(JsonRendererKey)
         .renderJson(
-          withoutSdkMetadata(
-            await core.runtime.getRuntimeEndpoint(flags.id, flags.qualifier, coreOptsFromCtx(ctx)),
-          ),
+          await core.runtime.getRuntimeEndpoint(flags.id, flags.qualifier, coreOptsFromCtx(ctx)),
         );
     },
   });

src/handlers/runtime/endpoint/get/screen.tsx

@@ -1,7 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
 import { useParams } from "react-router";
 import { JsonDetail } from "../../../../components/JsonDetail";
-import { withoutSdkMetadata } from "../../withoutSdkMetadata";
 import type { ScreenProps } from "../../../types";
 import { coreOptsFromCtx } from "../../../utils";
 
@@ -19,7 +18,7 @@ export function RuntimeGetEndpointScreen({ ctx, core }: ScreenProps) {
       breadcrumb={["agentcore", "runtime", "endpoint", "get", runtimeId ?? "", qualifier ?? ""]}
       isPending={detail.isPending}
       error={detail.isError ? (detail.error as Error) : null}
-      data={withoutSdkMetadata(detail.data)}
+      data={detail.data}
       loadingLabel={`Loading endpoint ${qualifier ?? ""} for Runtime ${runtimeId ?? ""}…`}
       onRetry={() => void detail.refetch()}
     />

src/handlers/runtime/endpoint/list/index.tsx

@@ -3,7 +3,6 @@ import { createHandler, flag } from "../../../../router";
 import { JsonRendererKey } from "../../../../tui";
 import type { Core } from "../../../types";
 import { coreOptsFromCtx } from "../../../utils";
-import { withoutSdkMetadata } from "../../withoutSdkMetadata";
 
 export const createListRuntimeEndpointsHandler = (core: Core) =>
   createHandler({
@@ -22,13 +21,11 @@ export const createListRuntimeEndpointsHandler = (core: Core) =>
       ctx
         .require(JsonRendererKey)
         .renderJson(
-          withoutSdkMetadata(
-            await core.runtime.listRuntimeEndpoints(
-              flags.id,
-              flags["next-token"],
-              flags["max-results"],
-              coreOptsFromCtx(ctx),
-            ),
+          await core.runtime.listRuntimeEndpoints(
+            flags.id,
+            flags["next-token"],
+            flags["max-results"],
+            coreOptsFromCtx(ctx),
           ),
         );
     },

src/handlers/runtime/get/index.tsx

@@ -3,7 +3,6 @@ import { createHandler, flag } from "../../../router";
 import { JsonRendererKey } from "../../../tui";
 import type { Core } from "../../types";
 import { coreOptsFromCtx } from "../../utils";
-import { withoutSdkMetadata } from "../withoutSdkMetadata";
 
 export const createGetRuntimeHandler = (core: Core) =>
   createHandler({
@@ -17,8 +16,6 @@ export const createGetRuntimeHandler = (core: Core) =>
 
       ctx
         .require(JsonRendererKey)
-        .renderJson(
-          withoutSdkMetadata(await core.runtime.getRuntime(flags.id, coreOptsFromCtx(ctx))),
-        );
+        .renderJson(await core.runtime.getRuntime(flags.id, coreOptsFromCtx(ctx)));
     },
   });

src/handlers/runtime/get/screen.tsx

@@ -10,7 +10,6 @@ import { Divider } from "../../../components/ui/divider/Divider.js";
 import { Spinner } from "../../../components/ui/spinner";
 import type { ScreenProps } from "../../types";
 import { coreOptsFromCtx } from "../../utils";
-import { withoutSdkMetadata } from "../withoutSdkMetadata";
 
 const ACTIONS = [
   {
@@ -138,7 +137,7 @@ export function RuntimeGetJsonScreen({ ctx, core }: ScreenProps) {
       breadcrumb={["agentcore", "runtime", "get", runtimeId ?? "", "json"]}
       isPending={detail.isPending}
       error={detail.isError ? (detail.error as Error) : null}
-      data={withoutSdkMetadata(detail.data)}
+      data={detail.data}
       loadingLabel="Loading Runtime…"
       onRetry={() => void detail.refetch()}
     />

src/handlers/runtime/list/index.tsx

@@ -3,7 +3,6 @@ import { createHandler, flag } from "../../../router";
 import { JsonRendererKey } from "../../../tui";
 import type { Core } from "../../types";
 import { coreOptsFromCtx } from "../../utils";
-import { withoutSdkMetadata } from "../withoutSdkMetadata";
 
 export const createListRuntimesHandler = (core: Core) =>
   createHandler({
@@ -17,12 +16,10 @@ export const createListRuntimesHandler = (core: Core) =>
       ctx
         .require(JsonRendererKey)
         .renderJson(
-          withoutSdkMetadata(
-            await core.runtime.listRuntimes(
-              flags["next-token"],
-              flags["max-results"],
-              coreOptsFromCtx(ctx),
-            ),
+          await core.runtime.listRuntimes(
+            flags["next-token"],
+            flags["max-results"],
+            coreOptsFromCtx(ctx),
           ),
         );
     },

src/handlers/runtime/runtime.screen.test.tsx

@@ -291,14 +291,13 @@ describe("runtime hub", () => {
 
   test("opens complete Runtime JSON from the detail action and scrolls", async () => {
     const core = new TestCoreClient();
-    core.runtime.setGetResponse({
-      $metadata: { requestId: "runtime-request-metadata" },
-      ...getRuntimeResponse({
+    core.runtime.setGetResponse(
+      getRuntimeResponse({
         environmentVariables: Object.fromEntries(
           Array.from({ length: 30 }, (_, index) => [`VARIABLE_${index}`, `value-${index}`]),
         ),
       }),
-    } as GetAgentRuntimeResponse);
+    );
     const r = renderScreen("/agentcore/runtime/get/runtime-123", { core });
 
     await waitForText(r.lastFrame, "show the full JSON definition");
@@ -308,8 +307,6 @@ describe("runtime hub", () => {
     expect(frame).toContain('"agentRuntimeId"');
     expect(frame).toContain('"networkConfiguration"');
     expect(frame).toContain('"lifecycleConfiguration"');
-    expect(frame).not.toContain("$metadata");
-    expect(frame).not.toContain("runtime-request-metadata");
     expect(frame).not.toContain('"VARIABLE_29"');
     for (let index = 0; index < 20; index += 1) await r.press("down");
     for (let index = 0; index < 20; index += 1) await r.write("j");

src/handlers/runtime/runtime.test.tsx

@@ -1,8 +1,6 @@
 import { describe, expect, test } from "bun:test";
 import { join } from "node:path";
-import type { BedrockAgentCoreControlClient } from "@aws-sdk/client-bedrock-agentcore-control";
 import { CoreClient } from "../../core";
-import type { CreateControlClient } from "../../core/types";
 import {
   createSilentLogger,
   fixtureFactories,
@@ -24,20 +22,9 @@ const MISSING_RUNTIME_ID = "missing_runtime-0000000000";
 
 function createFixtureCore(): CoreClient {
   const { createControlClient, createDataClient, createIamClient } = fixtureFactories(FIXTURES);
-  const createControlClientWithMetadata: CreateControlClient = (config) => {
-    const client = createControlClient(config);
-    const send = client.send.bind(client) as (command: unknown) => Promise<Record<string, unknown>>;
-
-    return {
-      send: async (command: unknown) => ({
-        ...(await send(command)),
-        $metadata: { requestId: "fixture-request-id" },
-      }),
-    } as unknown as BedrockAgentCoreControlClient;
-  };
 
   return new CoreClient({
-    createControlClient: createControlClientWithMetadata,
+    createControlClient,
     createDataClient,
     createIamClient,
     logger: createSilentLogger(),

src/handlers/runtime/version/get/index.tsx

@@ -3,7 +3,6 @@ import { createHandler, flag } from "../../../../router";
 import { JsonRendererKey } from "../../../../tui";
 import type { Core } from "../../../types";
 import { coreOptsFromCtx } from "../../../utils";
-import { withoutSdkMetadata } from "../../withoutSdkMetadata";
 
 export const createGetRuntimeVersionHandler = (core: Core) =>
   createHandler({
@@ -24,9 +23,7 @@ export const createGetRuntimeVersionHandler = (core: Core) =>
       ctx
         .require(JsonRendererKey)
         .renderJson(
-          withoutSdkMetadata(
-            await core.runtime.getRuntimeVersion(flags.id, flags.version, coreOptsFromCtx(ctx)),
-          ),
+          await core.runtime.getRuntimeVersion(flags.id, flags.version, coreOptsFromCtx(ctx)),
         );
     },
   });