feat(gateway): add delete commands

src/core/gateway.test.ts

@@ -1,5 +1,8 @@
 import { describe, expect, mock, test } from "bun:test";
 import {
+ DeleteGatewayCommand,
+ DeleteGatewayRuleCommand,
+ DeleteGatewayTargetCommand,
  GetGatewayCommand,
  GetGatewayTargetCommand,
  ListGatewayTargetsCommand,
@@ -269,6 +272,30 @@ function target(): GetGatewayTargetResponse {
  } as unknown as GetGatewayTargetResponse;
 }
 
+test("maps Gateway, Target, and Rule selectors to their delete commands", async () => {
+ const { client, commands } = recordingGatewayClient([{}, {}, {}]);
+
+ await client.deleteGateway("gateway-1", OPTIONS);
+ await client.deleteGatewayTarget("gateway-1", "target-1", OPTIONS);
+ await client.deleteGatewayRule("gateway-1", "rule-1", OPTIONS);
+
+ expect(commands).toHaveLength(3);
+ expect(commands[0]).toBeInstanceOf(DeleteGatewayCommand);
+ expect((commands[0] as DeleteGatewayCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ });
+ expect(commands[1]).toBeInstanceOf(DeleteGatewayTargetCommand);
+ expect((commands[1] as DeleteGatewayTargetCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ targetId: "target-1",
+ });
+ expect(commands[2]).toBeInstanceOf(DeleteGatewayRuleCommand);
+ expect((commands[2] as DeleteGatewayRuleCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ ruleId: "rule-1",
+ });
+});
+
 function recordingGatewayClient(responses: unknown[]): {
  client: GatewayClient;
  commands: unknown[];

src/core/gateway.tsx

@@ -2,6 +2,9 @@ import {
  CreateGatewayCommand,
  CreateGatewayRuleCommand,
  CreateGatewayTargetCommand,
+ DeleteGatewayCommand,
+ DeleteGatewayRuleCommand,
+ DeleteGatewayTargetCommand,
  GetGatewayCommand,
  GetGatewayRuleCommand,
  GetGatewayTargetCommand,
@@ -15,6 +18,9 @@ import {
  type CreateGatewayResponse,
  type CreateGatewayRuleResponse,
  type CreateGatewayTargetResponse,
+ type DeleteGatewayResponse,
+ type DeleteGatewayRuleResponse,
+ type DeleteGatewayTargetResponse,
  type GetGatewayResponse,
  type GetGatewayRuleResponse,
  type GetGatewayTargetResponse,
@@ -155,6 +161,12 @@ export class GatewayClient implements CoreGatewayClient {
  .send(new ListGatewaysCommand({ nextToken, maxResults }));
  }
 
+ async deleteGateway(id: string, options: CoreOptions): Promise<DeleteGatewayResponse> {
+ return this.clients
+ .control(toClientConfig(options))
+ .send(new DeleteGatewayCommand({ gatewayIdentifier: id }));
+ }
+
  async getGatewayTarget(
  gatewayId: string,
  targetId: string,
@@ -255,6 +267,19 @@ export class GatewayClient implements CoreGatewayClient {
  return this.updateTarget(patch, options, true);
  }
 
+ async deleteGatewayTarget(
+ gatewayId: string,
+ targetId: string,
+ options: CoreOptions,
+ ): Promise<DeleteGatewayTargetResponse> {
+ return this.clients.control(toClientConfig(options)).send(
+ new DeleteGatewayTargetCommand({
+ gatewayIdentifier: gatewayId,
+ targetId,
+ }),
+ );
+ }
+
  async getGatewayRule(
  gatewayId: string,
  ruleId: string,
@@ -297,6 +322,19 @@ export class GatewayClient implements CoreGatewayClient {
  return this.clients.control(toClientConfig(options)).send(new UpdateGatewayRuleCommand(input));
  }
 
+ async deleteGatewayRule(
+ gatewayId: string,
+ ruleId: string,
+ options: CoreOptions,
+ ): Promise<DeleteGatewayRuleResponse> {
+ return this.clients.control(toClientConfig(options)).send(
+ new DeleteGatewayRuleCommand({
+ gatewayIdentifier: gatewayId,
+ ruleId,
+ }),
+ );
+ }
+
  private async updateTarget(
  patch: GatewayTargetUpdatePatch,
  options: CoreOptions,

src/handlers/gateway/__fixtures__/delete/DeleteGatewayCommand.e015bbd46d1859f1.json

@@ -0,0 +1,4 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayRuleCommand.cee854fd6fa9fd16.json

@@ -0,0 +1,4 @@
+{
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayTargetCommand.94eb9a3262a6cda2.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayTargetCommand.afcce9d3abeac495.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/GetGatewayTargetCommand.94eb9a3262a6cda2.json

@@ -0,0 +1,34 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "createdAt": {
+ "$date": "2026-08-07T17:54:45.522Z"
+ },
+ "updatedAt": {
+ "$date": "2026-08-07T17:54:46.453Z"
+ },
+ "status": "READY",
+ "name": "web-search-delete-fixture",
+ "targetConfiguration": {
+ "mcp": {
+ "connector": {
+ "source": {
+ "connectorId": "web-search"
+ },
+ "configurations": [
+ {
+ "name": "WebSearch",
+ "parameterValues": {
+ "maxResults": 10
+ }
+ }
+ ]
+ }
+ }
+ },
+ "credentialProviderConfigurations": [
+ {
+ "credentialProviderType": "GATEWAY_IAM_ROLE"
+ }
+ ]
+}

src/handlers/gateway/__fixtures__/delete/connector-delete.golden.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/gateway-delete.golden.json

@@ -0,0 +1,4 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/resources.json

@@ -0,0 +1,7 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "connectorId": "U9OM2R9I8Q",
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c"
+}

src/handlers/gateway/__fixtures__/delete/rule-delete.golden.json

@@ -0,0 +1,4 @@
+{
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/target-delete.golden.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "status": "DELETING"
+}

src/handlers/gateway/connector/delete/index.tsx

@@ -0,0 +1,34 @@
+import z from "zod";
+import { InputValidationError } from "../../../../errors";
+import { createHandler, flag } from "../../../../router";
+import { JsonRendererKey } from "../../../../tui";
+import type { Core } from "../../../types";
+import { coreOptsFromCtx } from "../../../utils";
+import { GatewayConnectorTarget } from "../gatewayConnectorTarget";
+
+export const createDeleteGatewayConnectorHandler = (core: Core) =>
+ createHandler({
+ name: "delete",
+ description: "delete a connector-backed Gateway Target",
+ flags: [
+ flag("gateway-id", "the parent Gateway ID", z.string().optional()),
+ flag("id", "the connector-backed Gateway Target ID", z.string().optional()),
+ ],
+ handle: async (ctx, flags) => {
+ if (!flags["gateway-id"]) {
+ throw new InputValidationError("required option '--gateway-id <gateway-id>' not specified");
+ }
+ if (!flags.id) {
+ throw new InputValidationError("required option '--id <id>' not specified");
+ }
+
+ const options = coreOptsFromCtx(ctx);
+ const target = await core.gateway.getGatewayTarget(flags["gateway-id"], flags.id, options);
+ if (!GatewayConnectorTarget.is(target.targetConfiguration)) {
+ throw new InputValidationError(`Gateway Target "${flags.id}" is not connector-backed`);
+ }
+ ctx
+ .require(JsonRendererKey)
+ .renderJson(await core.gateway.deleteGatewayTarget(flags["gateway-id"], flags.id, options));
+ },
+ });

src/handlers/gateway/connector/index.tsx

@@ -3,6 +3,7 @@ import { Router } from "../../../router";
 import { renderTui } from "../../../tui";
 import type { Core } from "../../types";
 import { createCreateGatewayConnectorHandler } from "./create";
+import { createDeleteGatewayConnectorHandler } from "./delete";
 import { createGetGatewayConnectorHandler } from "./get";
 import { createListGatewayConnectorsHandler } from "./list";
 import { createUpdateGatewayConnectorHandler } from "./update";
@@ -14,5 +15,6 @@ export function createGatewayConnectorHandler(core: Core, io: AppIO): Router {
  .handler(createCreateGatewayConnectorHandler(core, io))
  .handler(createUpdateGatewayConnectorHandler(core, io))
  .handler(createGetGatewayConnectorHandler(core))
- .handler(createListGatewayConnectorsHandler(core));
+ .handler(createListGatewayConnectorsHandler(core))
+ .handler(createDeleteGatewayConnectorHandler(core));
 }

src/handlers/gateway/delete/index.tsx

@@ -0,0 +1,21 @@
+import z from "zod";
+import { InputValidationError } from "../../../errors";
+import { createHandler, flag } from "../../../router";
+import { JsonRendererKey } from "../../../tui";
+import type { Core } from "../../types";
+import { coreOptsFromCtx } from "../../utils";
+
+export const createDeleteGatewayHandler = (core: Core) =>
+ createHandler({
+ name: "delete",
+ description: "delete an AgentCore Gateway",
+ flags: [flag("id", "the Gateway ID", z.string().optional())],
+ handle: async (ctx, flags) => {
+ if (!flags.id) {
+ throw new InputValidationError("required option '--id <id>' not specified");
+ }
+ ctx
+ .require(JsonRendererKey)
+ .renderJson(await core.gateway.deleteGateway(flags.id, coreOptsFromCtx(ctx)));
+ },
+ });

src/core/gateway.test.ts

@@ -1,5 +1,8 @@
 import { describe, expect, mock, test } from "bun:test";
 import {
+ DeleteGatewayCommand,
+ DeleteGatewayRuleCommand,
+ DeleteGatewayTargetCommand,
  GetGatewayCommand,
  GetGatewayTargetCommand,
  ListGatewayTargetsCommand,
@@ -269,6 +272,30 @@ function target(): GetGatewayTargetResponse {
  } as unknown as GetGatewayTargetResponse;
 }
 
+test("maps Gateway, Target, and Rule selectors to their delete commands", async () => {
+ const { client, commands } = recordingGatewayClient([{}, {}, {}]);
+
+ await client.deleteGateway("gateway-1", OPTIONS);
+ await client.deleteGatewayTarget("gateway-1", "target-1", OPTIONS);
+ await client.deleteGatewayRule("gateway-1", "rule-1", OPTIONS);
+
+ expect(commands).toHaveLength(3);
+ expect(commands[0]).toBeInstanceOf(DeleteGatewayCommand);
+ expect((commands[0] as DeleteGatewayCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ });
+ expect(commands[1]).toBeInstanceOf(DeleteGatewayTargetCommand);
+ expect((commands[1] as DeleteGatewayTargetCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ targetId: "target-1",
+ });
+ expect(commands[2]).toBeInstanceOf(DeleteGatewayRuleCommand);
+ expect((commands[2] as DeleteGatewayRuleCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ ruleId: "rule-1",
+ });
+});
+
 function recordingGatewayClient(responses: unknown[]): {
  client: GatewayClient;
  commands: unknown[];

src/core/gateway.tsx

@@ -2,6 +2,9 @@ import {
  CreateGatewayCommand,
  CreateGatewayRuleCommand,
  CreateGatewayTargetCommand,
+ DeleteGatewayCommand,
+ DeleteGatewayRuleCommand,
+ DeleteGatewayTargetCommand,
  GetGatewayCommand,
  GetGatewayRuleCommand,
  GetGatewayTargetCommand,
@@ -15,6 +18,9 @@ import {
  type CreateGatewayResponse,
  type CreateGatewayRuleResponse,
  type CreateGatewayTargetResponse,
+ type DeleteGatewayResponse,
+ type DeleteGatewayRuleResponse,
+ type DeleteGatewayTargetResponse,
  type GetGatewayResponse,
  type GetGatewayRuleResponse,
  type GetGatewayTargetResponse,
@@ -155,6 +161,12 @@ export class GatewayClient implements CoreGatewayClient {
  .send(new ListGatewaysCommand({ nextToken, maxResults }));
  }
 
+ async deleteGateway(id: string, options: CoreOptions): Promise<DeleteGatewayResponse> {
+ return this.clients
+ .control(toClientConfig(options))
+ .send(new DeleteGatewayCommand({ gatewayIdentifier: id }));
+ }
+
  async getGatewayTarget(
  gatewayId: string,
  targetId: string,
@@ -255,6 +267,19 @@ export class GatewayClient implements CoreGatewayClient {
  return this.updateTarget(patch, options, true);
  }
 
+ async deleteGatewayTarget(
+ gatewayId: string,
+ targetId: string,
+ options: CoreOptions,
+ ): Promise<DeleteGatewayTargetResponse> {
+ return this.clients.control(toClientConfig(options)).send(
+ new DeleteGatewayTargetCommand({
+ gatewayIdentifier: gatewayId,
+ targetId,
+ }),
+ );
+ }
+
  async getGatewayRule(
  gatewayId: string,
  ruleId: string,
@@ -297,6 +322,19 @@ export class GatewayClient implements CoreGatewayClient {
  return this.clients.control(toClientConfig(options)).send(new UpdateGatewayRuleCommand(input));
  }
 
+ async deleteGatewayRule(
+ gatewayId: string,
+ ruleId: string,
+ options: CoreOptions,
+ ): Promise<DeleteGatewayRuleResponse> {
+ return this.clients.control(toClientConfig(options)).send(
+ new DeleteGatewayRuleCommand({
+ gatewayIdentifier: gatewayId,
+ ruleId,
+ }),
+ );
+ }
+
  private async updateTarget(
  patch: GatewayTargetUpdatePatch,
  options: CoreOptions,

src/handlers/gateway/__fixtures__/delete/DeleteGatewayCommand.e015bbd46d1859f1.json

@@ -0,0 +1,4 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayRuleCommand.cee854fd6fa9fd16.json

@@ -0,0 +1,4 @@
+{
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayTargetCommand.94eb9a3262a6cda2.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayTargetCommand.afcce9d3abeac495.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/GetGatewayTargetCommand.94eb9a3262a6cda2.json

@@ -0,0 +1,34 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "createdAt": {
+ "$date": "2026-08-07T17:54:45.522Z"
+ },
+ "updatedAt": {
+ "$date": "2026-08-07T17:54:46.453Z"
+ },
+ "status": "READY",
+ "name": "web-search-delete-fixture",
+ "targetConfiguration": {
+ "mcp": {
+ "connector": {
+ "source": {
+ "connectorId": "web-search"
+ },
+ "configurations": [
+ {
+ "name": "WebSearch",
+ "parameterValues": {
+ "maxResults": 10
+ }
+ }
+ ]
+ }
+ }
+ },
+ "credentialProviderConfigurations": [
+ {
+ "credentialProviderType": "GATEWAY_IAM_ROLE"
+ }
+ ]
+}

src/handlers/gateway/__fixtures__/delete/connector-delete.golden.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/gateway-delete.golden.json

@@ -0,0 +1,4 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/resources.json

@@ -0,0 +1,7 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "connectorId": "U9OM2R9I8Q",
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c"
+}

src/handlers/gateway/__fixtures__/delete/rule-delete.golden.json

@@ -0,0 +1,4 @@
+{
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/target-delete.golden.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "status": "DELETING"
+}

src/handlers/gateway/connector/delete/index.tsx

@@ -0,0 +1,34 @@
+import z from "zod";
+import { InputValidationError } from "../../../../errors";
+import { createHandler, flag } from "../../../../router";
+import { JsonRendererKey } from "../../../../tui";
+import type { Core } from "../../../types";
+import { coreOptsFromCtx } from "../../../utils";
+import { GatewayConnectorTarget } from "../gatewayConnectorTarget";
+
+export const createDeleteGatewayConnectorHandler = (core: Core) =>
+ createHandler({
+ name: "delete",
+ description: "delete a connector-backed Gateway Target",
+ flags: [
+ flag("gateway-id", "the parent Gateway ID", z.string().optional()),
+ flag("id", "the connector-backed Gateway Target ID", z.string().optional()),
+ ],
+ handle: async (ctx, flags) => {
+ if (!flags["gateway-id"]) {
+ throw new InputValidationError("required option '--gateway-id <gateway-id>' not specified");
+ }
+ if (!flags.id) {
+ throw new InputValidationError("required option '--id <id>' not specified");
+ }
+
+ const options = coreOptsFromCtx(ctx);
+ const target = await core.gateway.getGatewayTarget(flags["gateway-id"], flags.id, options);
+ if (!GatewayConnectorTarget.is(target.targetConfiguration)) {
+ throw new InputValidationError(`Gateway Target "${flags.id}" is not connector-backed`);
+ }
+ ctx
+ .require(JsonRendererKey)
+ .renderJson(await core.gateway.deleteGatewayTarget(flags["gateway-id"], flags.id, options));
+ },
+ });

src/handlers/gateway/connector/index.tsx

@@ -3,6 +3,7 @@ import { Router } from "../../../router";
 import { renderTui } from "../../../tui";
 import type { Core } from "../../types";
 import { createCreateGatewayConnectorHandler } from "./create";
+import { createDeleteGatewayConnectorHandler } from "./delete";
 import { createGetGatewayConnectorHandler } from "./get";
 import { createListGatewayConnectorsHandler } from "./list";
 import { createUpdateGatewayConnectorHandler } from "./update";
@@ -14,5 +15,6 @@ export function createGatewayConnectorHandler(core: Core, io: AppIO): Router {
  .handler(createCreateGatewayConnectorHandler(core, io))
  .handler(createUpdateGatewayConnectorHandler(core, io))
  .handler(createGetGatewayConnectorHandler(core))
- .handler(createListGatewayConnectorsHandler(core));
+ .handler(createListGatewayConnectorsHandler(core))
+ .handler(createDeleteGatewayConnectorHandler(core));
 }

src/handlers/gateway/delete/index.tsx

@@ -0,0 +1,21 @@
+import z from "zod";
+import { InputValidationError } from "../../../errors";
+import { createHandler, flag } from "../../../router";
+import { JsonRendererKey } from "../../../tui";
+import type { Core } from "../../types";
+import { coreOptsFromCtx } from "../../utils";
+
+export const createDeleteGatewayHandler = (core: Core) =>
+ createHandler({
+ name: "delete",
+ description: "delete an AgentCore Gateway",
+ flags: [flag("id", "the Gateway ID", z.string().optional())],
+ handle: async (ctx, flags) => {
+ if (!flags.id) {
+ throw new InputValidationError("required option '--id <id>' not specified");
+ }
+ ctx
+ .require(JsonRendererKey)
+ .renderJson(await core.gateway.deleteGateway(flags.id, coreOptsFromCtx(ctx)));
+ },
+ });

src/core/gateway.test.ts

@@ -1,5 +1,8 @@
 import { describe, expect, mock, test } from "bun:test";
 import {
+ DeleteGatewayCommand,
+ DeleteGatewayRuleCommand,
+ DeleteGatewayTargetCommand,
  GetGatewayCommand,
  GetGatewayTargetCommand,
  ListGatewayTargetsCommand,
@@ -269,6 +272,30 @@ function target(): GetGatewayTargetResponse {
  } as unknown as GetGatewayTargetResponse;
 }
 
+test("maps Gateway, Target, and Rule selectors to their delete commands", async () => {
+ const { client, commands } = recordingGatewayClient([{}, {}, {}]);
+
+ await client.deleteGateway("gateway-1", OPTIONS);
+ await client.deleteGatewayTarget("gateway-1", "target-1", OPTIONS);
+ await client.deleteGatewayRule("gateway-1", "rule-1", OPTIONS);
+
+ expect(commands).toHaveLength(3);
+ expect(commands[0]).toBeInstanceOf(DeleteGatewayCommand);
+ expect((commands[0] as DeleteGatewayCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ });
+ expect(commands[1]).toBeInstanceOf(DeleteGatewayTargetCommand);
+ expect((commands[1] as DeleteGatewayTargetCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ targetId: "target-1",
+ });
+ expect(commands[2]).toBeInstanceOf(DeleteGatewayRuleCommand);
+ expect((commands[2] as DeleteGatewayRuleCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ ruleId: "rule-1",
+ });
+});
+
 function recordingGatewayClient(responses: unknown[]): {
  client: GatewayClient;
  commands: unknown[];

src/core/gateway.tsx

@@ -2,6 +2,9 @@ import {
  CreateGatewayCommand,
  CreateGatewayRuleCommand,
  CreateGatewayTargetCommand,
+ DeleteGatewayCommand,
+ DeleteGatewayRuleCommand,
+ DeleteGatewayTargetCommand,
  GetGatewayCommand,
  GetGatewayRuleCommand,
  GetGatewayTargetCommand,
@@ -15,6 +18,9 @@ import {
  type CreateGatewayResponse,
  type CreateGatewayRuleResponse,
  type CreateGatewayTargetResponse,
+ type DeleteGatewayResponse,
+ type DeleteGatewayRuleResponse,
+ type DeleteGatewayTargetResponse,
  type GetGatewayResponse,
  type GetGatewayRuleResponse,
  type GetGatewayTargetResponse,
@@ -155,6 +161,12 @@ export class GatewayClient implements CoreGatewayClient {
  .send(new ListGatewaysCommand({ nextToken, maxResults }));
  }
 
+ async deleteGateway(id: string, options: CoreOptions): Promise<DeleteGatewayResponse> {
+ return this.clients
+ .control(toClientConfig(options))
+ .send(new DeleteGatewayCommand({ gatewayIdentifier: id }));
+ }
+
  async getGatewayTarget(
  gatewayId: string,
  targetId: string,
@@ -255,6 +267,19 @@ export class GatewayClient implements CoreGatewayClient {
  return this.updateTarget(patch, options, true);
  }
 
+ async deleteGatewayTarget(
+ gatewayId: string,
+ targetId: string,
+ options: CoreOptions,
+ ): Promise<DeleteGatewayTargetResponse> {
+ return this.clients.control(toClientConfig(options)).send(
+ new DeleteGatewayTargetCommand({
+ gatewayIdentifier: gatewayId,
+ targetId,
+ }),
+ );
+ }
+
  async getGatewayRule(
  gatewayId: string,
  ruleId: string,
@@ -297,6 +322,19 @@ export class GatewayClient implements CoreGatewayClient {
  return this.clients.control(toClientConfig(options)).send(new UpdateGatewayRuleCommand(input));
  }
 
+ async deleteGatewayRule(
+ gatewayId: string,
+ ruleId: string,
+ options: CoreOptions,
+ ): Promise<DeleteGatewayRuleResponse> {
+ return this.clients.control(toClientConfig(options)).send(
+ new DeleteGatewayRuleCommand({
+ gatewayIdentifier: gatewayId,
+ ruleId,
+ }),
+ );
+ }
+
  private async updateTarget(
  patch: GatewayTargetUpdatePatch,
  options: CoreOptions,

src/handlers/gateway/__fixtures__/delete/DeleteGatewayCommand.e015bbd46d1859f1.json

@@ -0,0 +1,4 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayRuleCommand.cee854fd6fa9fd16.json

@@ -0,0 +1,4 @@
+{
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayTargetCommand.94eb9a3262a6cda2.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayTargetCommand.afcce9d3abeac495.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/GetGatewayTargetCommand.94eb9a3262a6cda2.json

@@ -0,0 +1,34 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "createdAt": {
+ "$date": "2026-08-07T17:54:45.522Z"
+ },
+ "updatedAt": {
+ "$date": "2026-08-07T17:54:46.453Z"
+ },
+ "status": "READY",
+ "name": "web-search-delete-fixture",
+ "targetConfiguration": {
+ "mcp": {
+ "connector": {
+ "source": {
+ "connectorId": "web-search"
+ },
+ "configurations": [
+ {
+ "name": "WebSearch",
+ "parameterValues": {
+ "maxResults": 10
+ }
+ }
+ ]
+ }
+ }
+ },
+ "credentialProviderConfigurations": [
+ {
+ "credentialProviderType": "GATEWAY_IAM_ROLE"
+ }
+ ]
+}

src/handlers/gateway/__fixtures__/delete/connector-delete.golden.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/gateway-delete.golden.json

@@ -0,0 +1,4 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/resources.json

@@ -0,0 +1,7 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "connectorId": "U9OM2R9I8Q",
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c"
+}

src/handlers/gateway/__fixtures__/delete/rule-delete.golden.json

@@ -0,0 +1,4 @@
+{
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/target-delete.golden.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "status": "DELETING"
+}

src/handlers/gateway/connector/delete/index.tsx

@@ -0,0 +1,34 @@
+import z from "zod";
+import { InputValidationError } from "../../../../errors";
+import { createHandler, flag } from "../../../../router";
+import { JsonRendererKey } from "../../../../tui";
+import type { Core } from "../../../types";
+import { coreOptsFromCtx } from "../../../utils";
+import { GatewayConnectorTarget } from "../gatewayConnectorTarget";
+
+export const createDeleteGatewayConnectorHandler = (core: Core) =>
+ createHandler({
+ name: "delete",
+ description: "delete a connector-backed Gateway Target",
+ flags: [
+ flag("gateway-id", "the parent Gateway ID", z.string().optional()),
+ flag("id", "the connector-backed Gateway Target ID", z.string().optional()),
+ ],
+ handle: async (ctx, flags) => {
+ if (!flags["gateway-id"]) {
+ throw new InputValidationError("required option '--gateway-id <gateway-id>' not specified");
+ }
+ if (!flags.id) {
+ throw new InputValidationError("required option '--id <id>' not specified");
+ }
+
+ const options = coreOptsFromCtx(ctx);
+ const target = await core.gateway.getGatewayTarget(flags["gateway-id"], flags.id, options);
+ if (!GatewayConnectorTarget.is(target.targetConfiguration)) {
+ throw new InputValidationError(`Gateway Target "${flags.id}" is not connector-backed`);
+ }
+ ctx
+ .require(JsonRendererKey)
+ .renderJson(await core.gateway.deleteGatewayTarget(flags["gateway-id"], flags.id, options));
+ },
+ });

src/handlers/gateway/connector/index.tsx

@@ -3,6 +3,7 @@ import { Router } from "../../../router";
 import { renderTui } from "../../../tui";
 import type { Core } from "../../types";
 import { createCreateGatewayConnectorHandler } from "./create";
+import { createDeleteGatewayConnectorHandler } from "./delete";
 import { createGetGatewayConnectorHandler } from "./get";
 import { createListGatewayConnectorsHandler } from "./list";
 import { createUpdateGatewayConnectorHandler } from "./update";
@@ -14,5 +15,6 @@ export function createGatewayConnectorHandler(core: Core, io: AppIO): Router {
  .handler(createCreateGatewayConnectorHandler(core, io))
  .handler(createUpdateGatewayConnectorHandler(core, io))
  .handler(createGetGatewayConnectorHandler(core))
- .handler(createListGatewayConnectorsHandler(core));
+ .handler(createListGatewayConnectorsHandler(core))
+ .handler(createDeleteGatewayConnectorHandler(core));
 }

src/handlers/gateway/delete/index.tsx

@@ -0,0 +1,21 @@
+import z from "zod";
+import { InputValidationError } from "../../../errors";
+import { createHandler, flag } from "../../../router";
+import { JsonRendererKey } from "../../../tui";
+import type { Core } from "../../types";
+import { coreOptsFromCtx } from "../../utils";
+
+export const createDeleteGatewayHandler = (core: Core) =>
+ createHandler({
+ name: "delete",
+ description: "delete an AgentCore Gateway",
+ flags: [flag("id", "the Gateway ID", z.string().optional())],
+ handle: async (ctx, flags) => {
+ if (!flags.id) {
+ throw new InputValidationError("required option '--id <id>' not specified");
+ }
+ ctx
+ .require(JsonRendererKey)
+ .renderJson(await core.gateway.deleteGateway(flags.id, coreOptsFromCtx(ctx)));
+ },
+ });

src/core/gateway.test.ts

@@ -1,5 +1,8 @@
 import { describe, expect, mock, test } from "bun:test";
 import {
+ DeleteGatewayCommand,
+ DeleteGatewayRuleCommand,
+ DeleteGatewayTargetCommand,
  GetGatewayCommand,
  GetGatewayTargetCommand,
  ListGatewayTargetsCommand,
@@ -269,6 +272,30 @@ function target(): GetGatewayTargetResponse {
  } as unknown as GetGatewayTargetResponse;
 }
 
+test("maps Gateway, Target, and Rule selectors to their delete commands", async () => {
+ const { client, commands } = recordingGatewayClient([{}, {}, {}]);
+
+ await client.deleteGateway("gateway-1", OPTIONS);
+ await client.deleteGatewayTarget("gateway-1", "target-1", OPTIONS);
+ await client.deleteGatewayRule("gateway-1", "rule-1", OPTIONS);
+
+ expect(commands).toHaveLength(3);
+ expect(commands[0]).toBeInstanceOf(DeleteGatewayCommand);
+ expect((commands[0] as DeleteGatewayCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ });
+ expect(commands[1]).toBeInstanceOf(DeleteGatewayTargetCommand);
+ expect((commands[1] as DeleteGatewayTargetCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ targetId: "target-1",
+ });
+ expect(commands[2]).toBeInstanceOf(DeleteGatewayRuleCommand);
+ expect((commands[2] as DeleteGatewayRuleCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ ruleId: "rule-1",
+ });
+});
+
 function recordingGatewayClient(responses: unknown[]): {
  client: GatewayClient;
  commands: unknown[];

src/core/gateway.tsx

@@ -2,6 +2,9 @@ import {
  CreateGatewayCommand,
  CreateGatewayRuleCommand,
  CreateGatewayTargetCommand,
+ DeleteGatewayCommand,
+ DeleteGatewayRuleCommand,
+ DeleteGatewayTargetCommand,
  GetGatewayCommand,
  GetGatewayRuleCommand,
  GetGatewayTargetCommand,
@@ -15,6 +18,9 @@ import {
  type CreateGatewayResponse,
  type CreateGatewayRuleResponse,
  type CreateGatewayTargetResponse,
+ type DeleteGatewayResponse,
+ type DeleteGatewayRuleResponse,
+ type DeleteGatewayTargetResponse,
  type GetGatewayResponse,
  type GetGatewayRuleResponse,
  type GetGatewayTargetResponse,
@@ -155,6 +161,12 @@ export class GatewayClient implements CoreGatewayClient {
  .send(new ListGatewaysCommand({ nextToken, maxResults }));
  }
 
+ async deleteGateway(id: string, options: CoreOptions): Promise<DeleteGatewayResponse> {
+ return this.clients
+ .control(toClientConfig(options))
+ .send(new DeleteGatewayCommand({ gatewayIdentifier: id }));
+ }
+
  async getGatewayTarget(
  gatewayId: string,
  targetId: string,
@@ -255,6 +267,19 @@ export class GatewayClient implements CoreGatewayClient {
  return this.updateTarget(patch, options, true);
  }
 
+ async deleteGatewayTarget(
+ gatewayId: string,
+ targetId: string,
+ options: CoreOptions,
+ ): Promise<DeleteGatewayTargetResponse> {
+ return this.clients.control(toClientConfig(options)).send(
+ new DeleteGatewayTargetCommand({
+ gatewayIdentifier: gatewayId,
+ targetId,
+ }),
+ );
+ }
+
  async getGatewayRule(
  gatewayId: string,
  ruleId: string,
@@ -297,6 +322,19 @@ export class GatewayClient implements CoreGatewayClient {
  return this.clients.control(toClientConfig(options)).send(new UpdateGatewayRuleCommand(input));
  }
 
+ async deleteGatewayRule(
+ gatewayId: string,
+ ruleId: string,
+ options: CoreOptions,
+ ): Promise<DeleteGatewayRuleResponse> {
+ return this.clients.control(toClientConfig(options)).send(
+ new DeleteGatewayRuleCommand({
+ gatewayIdentifier: gatewayId,
+ ruleId,
+ }),
+ );
+ }
+
  private async updateTarget(
  patch: GatewayTargetUpdatePatch,
  options: CoreOptions,

src/handlers/gateway/__fixtures__/delete/DeleteGatewayCommand.e015bbd46d1859f1.json

@@ -0,0 +1,4 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayRuleCommand.cee854fd6fa9fd16.json

@@ -0,0 +1,4 @@
+{
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayTargetCommand.94eb9a3262a6cda2.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayTargetCommand.afcce9d3abeac495.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/GetGatewayTargetCommand.94eb9a3262a6cda2.json

@@ -0,0 +1,34 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "createdAt": {
+ "$date": "2026-08-07T17:54:45.522Z"
+ },
+ "updatedAt": {
+ "$date": "2026-08-07T17:54:46.453Z"
+ },
+ "status": "READY",
+ "name": "web-search-delete-fixture",
+ "targetConfiguration": {
+ "mcp": {
+ "connector": {
+ "source": {
+ "connectorId": "web-search"
+ },
+ "configurations": [
+ {
+ "name": "WebSearch",
+ "parameterValues": {
+ "maxResults": 10
+ }
+ }
+ ]
+ }
+ }
+ },
+ "credentialProviderConfigurations": [
+ {
+ "credentialProviderType": "GATEWAY_IAM_ROLE"
+ }
+ ]
+}

src/handlers/gateway/__fixtures__/delete/connector-delete.golden.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/gateway-delete.golden.json

@@ -0,0 +1,4 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/resources.json

@@ -0,0 +1,7 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "connectorId": "U9OM2R9I8Q",
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c"
+}

src/handlers/gateway/__fixtures__/delete/rule-delete.golden.json

@@ -0,0 +1,4 @@
+{
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/target-delete.golden.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "status": "DELETING"
+}

src/handlers/gateway/connector/delete/index.tsx

@@ -0,0 +1,34 @@
+import z from "zod";
+import { InputValidationError } from "../../../../errors";
+import { createHandler, flag } from "../../../../router";
+import { JsonRendererKey } from "../../../../tui";
+import type { Core } from "../../../types";
+import { coreOptsFromCtx } from "../../../utils";
+import { GatewayConnectorTarget } from "../gatewayConnectorTarget";
+
+export const createDeleteGatewayConnectorHandler = (core: Core) =>
+ createHandler({
+ name: "delete",
+ description: "delete a connector-backed Gateway Target",
+ flags: [
+ flag("gateway-id", "the parent Gateway ID", z.string().optional()),
+ flag("id", "the connector-backed Gateway Target ID", z.string().optional()),
+ ],
+ handle: async (ctx, flags) => {
+ if (!flags["gateway-id"]) {
+ throw new InputValidationError("required option '--gateway-id <gateway-id>' not specified");
+ }
+ if (!flags.id) {
+ throw new InputValidationError("required option '--id <id>' not specified");
+ }
+
+ const options = coreOptsFromCtx(ctx);
+ const target = await core.gateway.getGatewayTarget(flags["gateway-id"], flags.id, options);
+ if (!GatewayConnectorTarget.is(target.targetConfiguration)) {
+ throw new InputValidationError(`Gateway Target "${flags.id}" is not connector-backed`);
+ }
+ ctx
+ .require(JsonRendererKey)
+ .renderJson(await core.gateway.deleteGatewayTarget(flags["gateway-id"], flags.id, options));
+ },
+ });

src/handlers/gateway/connector/index.tsx

@@ -3,6 +3,7 @@ import { Router } from "../../../router";
 import { renderTui } from "../../../tui";
 import type { Core } from "../../types";
 import { createCreateGatewayConnectorHandler } from "./create";
+import { createDeleteGatewayConnectorHandler } from "./delete";
 import { createGetGatewayConnectorHandler } from "./get";
 import { createListGatewayConnectorsHandler } from "./list";
 import { createUpdateGatewayConnectorHandler } from "./update";
@@ -14,5 +15,6 @@ export function createGatewayConnectorHandler(core: Core, io: AppIO): Router {
  .handler(createCreateGatewayConnectorHandler(core, io))
  .handler(createUpdateGatewayConnectorHandler(core, io))
  .handler(createGetGatewayConnectorHandler(core))
- .handler(createListGatewayConnectorsHandler(core));
+ .handler(createListGatewayConnectorsHandler(core))
+ .handler(createDeleteGatewayConnectorHandler(core));
 }

src/handlers/gateway/delete/index.tsx

@@ -0,0 +1,21 @@
+import z from "zod";
+import { InputValidationError } from "../../../errors";
+import { createHandler, flag } from "../../../router";
+import { JsonRendererKey } from "../../../tui";
+import type { Core } from "../../types";
+import { coreOptsFromCtx } from "../../utils";
+
+export const createDeleteGatewayHandler = (core: Core) =>
+ createHandler({
+ name: "delete",
+ description: "delete an AgentCore Gateway",
+ flags: [flag("id", "the Gateway ID", z.string().optional())],
+ handle: async (ctx, flags) => {
+ if (!flags.id) {
+ throw new InputValidationError("required option '--id <id>' not specified");
+ }
+ ctx
+ .require(JsonRendererKey)
+ .renderJson(await core.gateway.deleteGateway(flags.id, coreOptsFromCtx(ctx)));
+ },
+ });

src/core/gateway.test.ts

@@ -1,5 +1,8 @@
 import { describe, expect, mock, test } from "bun:test";
 import {
+ DeleteGatewayCommand,
+ DeleteGatewayRuleCommand,
+ DeleteGatewayTargetCommand,
  GetGatewayCommand,
  GetGatewayTargetCommand,
  ListGatewayTargetsCommand,
@@ -269,6 +272,30 @@ function target(): GetGatewayTargetResponse {
  } as unknown as GetGatewayTargetResponse;
 }
 
+test("maps Gateway, Target, and Rule selectors to their delete commands", async () => {
+ const { client, commands } = recordingGatewayClient([{}, {}, {}]);
+
+ await client.deleteGateway("gateway-1", OPTIONS);
+ await client.deleteGatewayTarget("gateway-1", "target-1", OPTIONS);
+ await client.deleteGatewayRule("gateway-1", "rule-1", OPTIONS);
+
+ expect(commands).toHaveLength(3);
+ expect(commands[0]).toBeInstanceOf(DeleteGatewayCommand);
+ expect((commands[0] as DeleteGatewayCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ });
+ expect(commands[1]).toBeInstanceOf(DeleteGatewayTargetCommand);
+ expect((commands[1] as DeleteGatewayTargetCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ targetId: "target-1",
+ });
+ expect(commands[2]).toBeInstanceOf(DeleteGatewayRuleCommand);
+ expect((commands[2] as DeleteGatewayRuleCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ ruleId: "rule-1",
+ });
+});
+
 function recordingGatewayClient(responses: unknown[]): {
  client: GatewayClient;
  commands: unknown[];

src/core/gateway.tsx

@@ -2,6 +2,9 @@ import {
  CreateGatewayCommand,
  CreateGatewayRuleCommand,
  CreateGatewayTargetCommand,
+ DeleteGatewayCommand,
+ DeleteGatewayRuleCommand,
+ DeleteGatewayTargetCommand,
  GetGatewayCommand,
  GetGatewayRuleCommand,
  GetGatewayTargetCommand,
@@ -15,6 +18,9 @@ import {
  type CreateGatewayResponse,
  type CreateGatewayRuleResponse,
  type CreateGatewayTargetResponse,
+ type DeleteGatewayResponse,
+ type DeleteGatewayRuleResponse,
+ type DeleteGatewayTargetResponse,
  type GetGatewayResponse,
  type GetGatewayRuleResponse,
  type GetGatewayTargetResponse,
@@ -155,6 +161,12 @@ export class GatewayClient implements CoreGatewayClient {
  .send(new ListGatewaysCommand({ nextToken, maxResults }));
  }
 
+ async deleteGateway(id: string, options: CoreOptions): Promise<DeleteGatewayResponse> {
+ return this.clients
+ .control(toClientConfig(options))
+ .send(new DeleteGatewayCommand({ gatewayIdentifier: id }));
+ }
+
  async getGatewayTarget(
  gatewayId: string,
  targetId: string,
@@ -255,6 +267,19 @@ export class GatewayClient implements CoreGatewayClient {
  return this.updateTarget(patch, options, true);
  }
 
+ async deleteGatewayTarget(
+ gatewayId: string,
+ targetId: string,
+ options: CoreOptions,
+ ): Promise<DeleteGatewayTargetResponse> {
+ return this.clients.control(toClientConfig(options)).send(
+ new DeleteGatewayTargetCommand({
+ gatewayIdentifier: gatewayId,
+ targetId,
+ }),
+ );
+ }
+
  async getGatewayRule(
  gatewayId: string,
  ruleId: string,
@@ -297,6 +322,19 @@ export class GatewayClient implements CoreGatewayClient {
  return this.clients.control(toClientConfig(options)).send(new UpdateGatewayRuleCommand(input));
  }
 
+ async deleteGatewayRule(
+ gatewayId: string,
+ ruleId: string,
+ options: CoreOptions,
+ ): Promise<DeleteGatewayRuleResponse> {
+ return this.clients.control(toClientConfig(options)).send(
+ new DeleteGatewayRuleCommand({
+ gatewayIdentifier: gatewayId,
+ ruleId,
+ }),
+ );
+ }
+
  private async updateTarget(
  patch: GatewayTargetUpdatePatch,
  options: CoreOptions,

src/handlers/gateway/__fixtures__/delete/DeleteGatewayCommand.e015bbd46d1859f1.json

@@ -0,0 +1,4 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayRuleCommand.cee854fd6fa9fd16.json

@@ -0,0 +1,4 @@
+{
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayTargetCommand.94eb9a3262a6cda2.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayTargetCommand.afcce9d3abeac495.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/GetGatewayTargetCommand.94eb9a3262a6cda2.json

@@ -0,0 +1,34 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "createdAt": {
+ "$date": "2026-08-07T17:54:45.522Z"
+ },
+ "updatedAt": {
+ "$date": "2026-08-07T17:54:46.453Z"
+ },
+ "status": "READY",
+ "name": "web-search-delete-fixture",
+ "targetConfiguration": {
+ "mcp": {
+ "connector": {
+ "source": {
+ "connectorId": "web-search"
+ },
+ "configurations": [
+ {
+ "name": "WebSearch",
+ "parameterValues": {
+ "maxResults": 10
+ }
+ }
+ ]
+ }
+ }
+ },
+ "credentialProviderConfigurations": [
+ {
+ "credentialProviderType": "GATEWAY_IAM_ROLE"
+ }
+ ]
+}

src/handlers/gateway/__fixtures__/delete/connector-delete.golden.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/gateway-delete.golden.json

@@ -0,0 +1,4 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/resources.json

@@ -0,0 +1,7 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "connectorId": "U9OM2R9I8Q",
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c"
+}

src/handlers/gateway/__fixtures__/delete/rule-delete.golden.json

@@ -0,0 +1,4 @@
+{
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/target-delete.golden.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "status": "DELETING"
+}

src/handlers/gateway/connector/delete/index.tsx

@@ -0,0 +1,34 @@
+import z from "zod";
+import { InputValidationError } from "../../../../errors";
+import { createHandler, flag } from "../../../../router";
+import { JsonRendererKey } from "../../../../tui";
+import type { Core } from "../../../types";
+import { coreOptsFromCtx } from "../../../utils";
+import { GatewayConnectorTarget } from "../gatewayConnectorTarget";
+
+export const createDeleteGatewayConnectorHandler = (core: Core) =>
+ createHandler({
+ name: "delete",
+ description: "delete a connector-backed Gateway Target",
+ flags: [
+ flag("gateway-id", "the parent Gateway ID", z.string().optional()),
+ flag("id", "the connector-backed Gateway Target ID", z.string().optional()),
+ ],
+ handle: async (ctx, flags) => {
+ if (!flags["gateway-id"]) {
+ throw new InputValidationError("required option '--gateway-id <gateway-id>' not specified");
+ }
+ if (!flags.id) {
+ throw new InputValidationError("required option '--id <id>' not specified");
+ }
+
+ const options = coreOptsFromCtx(ctx);
+ const target = await core.gateway.getGatewayTarget(flags["gateway-id"], flags.id, options);
+ if (!GatewayConnectorTarget.is(target.targetConfiguration)) {
+ throw new InputValidationError(`Gateway Target "${flags.id}" is not connector-backed`);
+ }
+ ctx
+ .require(JsonRendererKey)
+ .renderJson(await core.gateway.deleteGatewayTarget(flags["gateway-id"], flags.id, options));
+ },
+ });

src/handlers/gateway/connector/index.tsx

@@ -3,6 +3,7 @@ import { Router } from "../../../router";
 import { renderTui } from "../../../tui";
 import type { Core } from "../../types";
 import { createCreateGatewayConnectorHandler } from "./create";
+import { createDeleteGatewayConnectorHandler } from "./delete";
 import { createGetGatewayConnectorHandler } from "./get";
 import { createListGatewayConnectorsHandler } from "./list";
 import { createUpdateGatewayConnectorHandler } from "./update";
@@ -14,5 +15,6 @@ export function createGatewayConnectorHandler(core: Core, io: AppIO): Router {
  .handler(createCreateGatewayConnectorHandler(core, io))
  .handler(createUpdateGatewayConnectorHandler(core, io))
  .handler(createGetGatewayConnectorHandler(core))
- .handler(createListGatewayConnectorsHandler(core));
+ .handler(createListGatewayConnectorsHandler(core))
+ .handler(createDeleteGatewayConnectorHandler(core));
 }

src/handlers/gateway/delete/index.tsx

@@ -0,0 +1,21 @@
+import z from "zod";
+import { InputValidationError } from "../../../errors";
+import { createHandler, flag } from "../../../router";
+import { JsonRendererKey } from "../../../tui";
+import type { Core } from "../../types";
+import { coreOptsFromCtx } from "../../utils";
+
+export const createDeleteGatewayHandler = (core: Core) =>
+ createHandler({
+ name: "delete",
+ description: "delete an AgentCore Gateway",
+ flags: [flag("id", "the Gateway ID", z.string().optional())],
+ handle: async (ctx, flags) => {
+ if (!flags.id) {
+ throw new InputValidationError("required option '--id <id>' not specified");
+ }
+ ctx
+ .require(JsonRendererKey)
+ .renderJson(await core.gateway.deleteGateway(flags.id, coreOptsFromCtx(ctx)));
+ },
+ });

src/core/gateway.test.ts

@@ -1,5 +1,8 @@
 import { describe, expect, mock, test } from "bun:test";
 import {
+ DeleteGatewayCommand,
+ DeleteGatewayRuleCommand,
+ DeleteGatewayTargetCommand,
  GetGatewayCommand,
  GetGatewayTargetCommand,
  ListGatewayTargetsCommand,
@@ -269,6 +272,30 @@ function target(): GetGatewayTargetResponse {
  } as unknown as GetGatewayTargetResponse;
 }
 
+test("maps Gateway, Target, and Rule selectors to their delete commands", async () => {
+ const { client, commands } = recordingGatewayClient([{}, {}, {}]);
+
+ await client.deleteGateway("gateway-1", OPTIONS);
+ await client.deleteGatewayTarget("gateway-1", "target-1", OPTIONS);
+ await client.deleteGatewayRule("gateway-1", "rule-1", OPTIONS);
+
+ expect(commands).toHaveLength(3);
+ expect(commands[0]).toBeInstanceOf(DeleteGatewayCommand);
+ expect((commands[0] as DeleteGatewayCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ });
+ expect(commands[1]).toBeInstanceOf(DeleteGatewayTargetCommand);
+ expect((commands[1] as DeleteGatewayTargetCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ targetId: "target-1",
+ });
+ expect(commands[2]).toBeInstanceOf(DeleteGatewayRuleCommand);
+ expect((commands[2] as DeleteGatewayRuleCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ ruleId: "rule-1",
+ });
+});
+
 function recordingGatewayClient(responses: unknown[]): {
  client: GatewayClient;
  commands: unknown[];

src/core/gateway.tsx

@@ -2,6 +2,9 @@ import {
  CreateGatewayCommand,
  CreateGatewayRuleCommand,
  CreateGatewayTargetCommand,
+ DeleteGatewayCommand,
+ DeleteGatewayRuleCommand,
+ DeleteGatewayTargetCommand,
  GetGatewayCommand,
  GetGatewayRuleCommand,
  GetGatewayTargetCommand,
@@ -15,6 +18,9 @@ import {
  type CreateGatewayResponse,
  type CreateGatewayRuleResponse,
  type CreateGatewayTargetResponse,
+ type DeleteGatewayResponse,
+ type DeleteGatewayRuleResponse,
+ type DeleteGatewayTargetResponse,
  type GetGatewayResponse,
  type GetGatewayRuleResponse,
  type GetGatewayTargetResponse,
@@ -155,6 +161,12 @@ export class GatewayClient implements CoreGatewayClient {
  .send(new ListGatewaysCommand({ nextToken, maxResults }));
  }
 
+ async deleteGateway(id: string, options: CoreOptions): Promise<DeleteGatewayResponse> {
+ return this.clients
+ .control(toClientConfig(options))
+ .send(new DeleteGatewayCommand({ gatewayIdentifier: id }));
+ }
+
  async getGatewayTarget(
  gatewayId: string,
  targetId: string,
@@ -255,6 +267,19 @@ export class GatewayClient implements CoreGatewayClient {
  return this.updateTarget(patch, options, true);
  }
 
+ async deleteGatewayTarget(
+ gatewayId: string,
+ targetId: string,
+ options: CoreOptions,
+ ): Promise<DeleteGatewayTargetResponse> {
+ return this.clients.control(toClientConfig(options)).send(
+ new DeleteGatewayTargetCommand({
+ gatewayIdentifier: gatewayId,
+ targetId,
+ }),
+ );
+ }
+
  async getGatewayRule(
  gatewayId: string,
  ruleId: string,
@@ -297,6 +322,19 @@ export class GatewayClient implements CoreGatewayClient {
  return this.clients.control(toClientConfig(options)).send(new UpdateGatewayRuleCommand(input));
  }
 
+ async deleteGatewayRule(
+ gatewayId: string,
+ ruleId: string,
+ options: CoreOptions,
+ ): Promise<DeleteGatewayRuleResponse> {
+ return this.clients.control(toClientConfig(options)).send(
+ new DeleteGatewayRuleCommand({
+ gatewayIdentifier: gatewayId,
+ ruleId,
+ }),
+ );
+ }
+
  private async updateTarget(
  patch: GatewayTargetUpdatePatch,
  options: CoreOptions,

src/handlers/gateway/__fixtures__/delete/DeleteGatewayCommand.e015bbd46d1859f1.json

@@ -0,0 +1,4 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayRuleCommand.cee854fd6fa9fd16.json

@@ -0,0 +1,4 @@
+{
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayTargetCommand.94eb9a3262a6cda2.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayTargetCommand.afcce9d3abeac495.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/GetGatewayTargetCommand.94eb9a3262a6cda2.json

@@ -0,0 +1,34 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "createdAt": {
+ "$date": "2026-08-07T17:54:45.522Z"
+ },
+ "updatedAt": {
+ "$date": "2026-08-07T17:54:46.453Z"
+ },
+ "status": "READY",
+ "name": "web-search-delete-fixture",
+ "targetConfiguration": {
+ "mcp": {
+ "connector": {
+ "source": {
+ "connectorId": "web-search"
+ },
+ "configurations": [
+ {
+ "name": "WebSearch",
+ "parameterValues": {
+ "maxResults": 10
+ }
+ }
+ ]
+ }
+ }
+ },
+ "credentialProviderConfigurations": [
+ {
+ "credentialProviderType": "GATEWAY_IAM_ROLE"
+ }
+ ]
+}

src/handlers/gateway/__fixtures__/delete/connector-delete.golden.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/gateway-delete.golden.json

@@ -0,0 +1,4 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/resources.json

@@ -0,0 +1,7 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "connectorId": "U9OM2R9I8Q",
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c"
+}

src/handlers/gateway/__fixtures__/delete/rule-delete.golden.json

@@ -0,0 +1,4 @@
+{
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/target-delete.golden.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "status": "DELETING"
+}

src/handlers/gateway/connector/delete/index.tsx

@@ -0,0 +1,34 @@
+import z from "zod";
+import { InputValidationError } from "../../../../errors";
+import { createHandler, flag } from "../../../../router";
+import { JsonRendererKey } from "../../../../tui";
+import type { Core } from "../../../types";
+import { coreOptsFromCtx } from "../../../utils";
+import { GatewayConnectorTarget } from "../gatewayConnectorTarget";
+
+export const createDeleteGatewayConnectorHandler = (core: Core) =>
+ createHandler({
+ name: "delete",
+ description: "delete a connector-backed Gateway Target",
+ flags: [
+ flag("gateway-id", "the parent Gateway ID", z.string().optional()),
+ flag("id", "the connector-backed Gateway Target ID", z.string().optional()),
+ ],
+ handle: async (ctx, flags) => {
+ if (!flags["gateway-id"]) {
+ throw new InputValidationError("required option '--gateway-id <gateway-id>' not specified");
+ }
+ if (!flags.id) {
+ throw new InputValidationError("required option '--id <id>' not specified");
+ }
+
+ const options = coreOptsFromCtx(ctx);
+ const target = await core.gateway.getGatewayTarget(flags["gateway-id"], flags.id, options);
+ if (!GatewayConnectorTarget.is(target.targetConfiguration)) {
+ throw new InputValidationError(`Gateway Target "${flags.id}" is not connector-backed`);
+ }
+ ctx
+ .require(JsonRendererKey)
+ .renderJson(await core.gateway.deleteGatewayTarget(flags["gateway-id"], flags.id, options));
+ },
+ });

src/handlers/gateway/connector/index.tsx

@@ -3,6 +3,7 @@ import { Router } from "../../../router";
 import { renderTui } from "../../../tui";
 import type { Core } from "../../types";
 import { createCreateGatewayConnectorHandler } from "./create";
+import { createDeleteGatewayConnectorHandler } from "./delete";
 import { createGetGatewayConnectorHandler } from "./get";
 import { createListGatewayConnectorsHandler } from "./list";
 import { createUpdateGatewayConnectorHandler } from "./update";
@@ -14,5 +15,6 @@ export function createGatewayConnectorHandler(core: Core, io: AppIO): Router {
  .handler(createCreateGatewayConnectorHandler(core, io))
  .handler(createUpdateGatewayConnectorHandler(core, io))
  .handler(createGetGatewayConnectorHandler(core))
- .handler(createListGatewayConnectorsHandler(core));
+ .handler(createListGatewayConnectorsHandler(core))
+ .handler(createDeleteGatewayConnectorHandler(core));
 }

src/handlers/gateway/delete/index.tsx

@@ -0,0 +1,21 @@
+import z from "zod";
+import { InputValidationError } from "../../../errors";
+import { createHandler, flag } from "../../../router";
+import { JsonRendererKey } from "../../../tui";
+import type { Core } from "../../types";
+import { coreOptsFromCtx } from "../../utils";
+
+export const createDeleteGatewayHandler = (core: Core) =>
+ createHandler({
+ name: "delete",
+ description: "delete an AgentCore Gateway",
+ flags: [flag("id", "the Gateway ID", z.string().optional())],
+ handle: async (ctx, flags) => {
+ if (!flags.id) {
+ throw new InputValidationError("required option '--id <id>' not specified");
+ }
+ ctx
+ .require(JsonRendererKey)
+ .renderJson(await core.gateway.deleteGateway(flags.id, coreOptsFromCtx(ctx)));
+ },
+ });

src/core/gateway.test.ts

@@ -1,5 +1,8 @@
 import { describe, expect, mock, test } from "bun:test";
 import {
+ DeleteGatewayCommand,
+ DeleteGatewayRuleCommand,
+ DeleteGatewayTargetCommand,
  GetGatewayCommand,
  GetGatewayTargetCommand,
  ListGatewayTargetsCommand,
@@ -269,6 +272,30 @@ function target(): GetGatewayTargetResponse {
  } as unknown as GetGatewayTargetResponse;
 }
 
+test("maps Gateway, Target, and Rule selectors to their delete commands", async () => {
+ const { client, commands } = recordingGatewayClient([{}, {}, {}]);
+
+ await client.deleteGateway("gateway-1", OPTIONS);
+ await client.deleteGatewayTarget("gateway-1", "target-1", OPTIONS);
+ await client.deleteGatewayRule("gateway-1", "rule-1", OPTIONS);
+
+ expect(commands).toHaveLength(3);
+ expect(commands[0]).toBeInstanceOf(DeleteGatewayCommand);
+ expect((commands[0] as DeleteGatewayCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ });
+ expect(commands[1]).toBeInstanceOf(DeleteGatewayTargetCommand);
+ expect((commands[1] as DeleteGatewayTargetCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ targetId: "target-1",
+ });
+ expect(commands[2]).toBeInstanceOf(DeleteGatewayRuleCommand);
+ expect((commands[2] as DeleteGatewayRuleCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ ruleId: "rule-1",
+ });
+});
+
 function recordingGatewayClient(responses: unknown[]): {
  client: GatewayClient;
  commands: unknown[];

src/core/gateway.tsx

@@ -2,6 +2,9 @@ import {
  CreateGatewayCommand,
  CreateGatewayRuleCommand,
  CreateGatewayTargetCommand,
+ DeleteGatewayCommand,
+ DeleteGatewayRuleCommand,
+ DeleteGatewayTargetCommand,
  GetGatewayCommand,
  GetGatewayRuleCommand,
  GetGatewayTargetCommand,
@@ -15,6 +18,9 @@ import {
  type CreateGatewayResponse,
  type CreateGatewayRuleResponse,
  type CreateGatewayTargetResponse,
+ type DeleteGatewayResponse,
+ type DeleteGatewayRuleResponse,
+ type DeleteGatewayTargetResponse,
  type GetGatewayResponse,
  type GetGatewayRuleResponse,
  type GetGatewayTargetResponse,
@@ -155,6 +161,12 @@ export class GatewayClient implements CoreGatewayClient {
  .send(new ListGatewaysCommand({ nextToken, maxResults }));
  }
 
+ async deleteGateway(id: string, options: CoreOptions): Promise<DeleteGatewayResponse> {
+ return this.clients
+ .control(toClientConfig(options))
+ .send(new DeleteGatewayCommand({ gatewayIdentifier: id }));
+ }
+
  async getGatewayTarget(
  gatewayId: string,
  targetId: string,
@@ -255,6 +267,19 @@ export class GatewayClient implements CoreGatewayClient {
  return this.updateTarget(patch, options, true);
  }
 
+ async deleteGatewayTarget(
+ gatewayId: string,
+ targetId: string,
+ options: CoreOptions,
+ ): Promise<DeleteGatewayTargetResponse> {
+ return this.clients.control(toClientConfig(options)).send(
+ new DeleteGatewayTargetCommand({
+ gatewayIdentifier: gatewayId,
+ targetId,
+ }),
+ );
+ }
+
  async getGatewayRule(
  gatewayId: string,
  ruleId: string,
@@ -297,6 +322,19 @@ export class GatewayClient implements CoreGatewayClient {
  return this.clients.control(toClientConfig(options)).send(new UpdateGatewayRuleCommand(input));
  }
 
+ async deleteGatewayRule(
+ gatewayId: string,
+ ruleId: string,
+ options: CoreOptions,
+ ): Promise<DeleteGatewayRuleResponse> {
+ return this.clients.control(toClientConfig(options)).send(
+ new DeleteGatewayRuleCommand({
+ gatewayIdentifier: gatewayId,
+ ruleId,
+ }),
+ );
+ }
+
  private async updateTarget(
  patch: GatewayTargetUpdatePatch,
  options: CoreOptions,

src/handlers/gateway/__fixtures__/delete/DeleteGatewayCommand.e015bbd46d1859f1.json

@@ -0,0 +1,4 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayRuleCommand.cee854fd6fa9fd16.json

@@ -0,0 +1,4 @@
+{
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayTargetCommand.94eb9a3262a6cda2.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayTargetCommand.afcce9d3abeac495.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/GetGatewayTargetCommand.94eb9a3262a6cda2.json

@@ -0,0 +1,34 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "createdAt": {
+ "$date": "2026-08-07T17:54:45.522Z"
+ },
+ "updatedAt": {
+ "$date": "2026-08-07T17:54:46.453Z"
+ },
+ "status": "READY",
+ "name": "web-search-delete-fixture",
+ "targetConfiguration": {
+ "mcp": {
+ "connector": {
+ "source": {
+ "connectorId": "web-search"
+ },
+ "configurations": [
+ {
+ "name": "WebSearch",
+ "parameterValues": {
+ "maxResults": 10
+ }
+ }
+ ]
+ }
+ }
+ },
+ "credentialProviderConfigurations": [
+ {
+ "credentialProviderType": "GATEWAY_IAM_ROLE"
+ }
+ ]
+}

src/handlers/gateway/__fixtures__/delete/connector-delete.golden.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/gateway-delete.golden.json

@@ -0,0 +1,4 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/resources.json

@@ -0,0 +1,7 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "connectorId": "U9OM2R9I8Q",
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c"
+}

src/handlers/gateway/__fixtures__/delete/rule-delete.golden.json

@@ -0,0 +1,4 @@
+{
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/target-delete.golden.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "status": "DELETING"
+}

src/handlers/gateway/connector/delete/index.tsx

@@ -0,0 +1,34 @@
+import z from "zod";
+import { InputValidationError } from "../../../../errors";
+import { createHandler, flag } from "../../../../router";
+import { JsonRendererKey } from "../../../../tui";
+import type { Core } from "../../../types";
+import { coreOptsFromCtx } from "../../../utils";
+import { GatewayConnectorTarget } from "../gatewayConnectorTarget";
+
+export const createDeleteGatewayConnectorHandler = (core: Core) =>
+ createHandler({
+ name: "delete",
+ description: "delete a connector-backed Gateway Target",
+ flags: [
+ flag("gateway-id", "the parent Gateway ID", z.string().optional()),
+ flag("id", "the connector-backed Gateway Target ID", z.string().optional()),
+ ],
+ handle: async (ctx, flags) => {
+ if (!flags["gateway-id"]) {
+ throw new InputValidationError("required option '--gateway-id <gateway-id>' not specified");
+ }
+ if (!flags.id) {
+ throw new InputValidationError("required option '--id <id>' not specified");
+ }
+
+ const options = coreOptsFromCtx(ctx);
+ const target = await core.gateway.getGatewayTarget(flags["gateway-id"], flags.id, options);
+ if (!GatewayConnectorTarget.is(target.targetConfiguration)) {
+ throw new InputValidationError(`Gateway Target "${flags.id}" is not connector-backed`);
+ }
+ ctx
+ .require(JsonRendererKey)
+ .renderJson(await core.gateway.deleteGatewayTarget(flags["gateway-id"], flags.id, options));
+ },
+ });

src/handlers/gateway/connector/index.tsx

@@ -3,6 +3,7 @@ import { Router } from "../../../router";
 import { renderTui } from "../../../tui";
 import type { Core } from "../../types";
 import { createCreateGatewayConnectorHandler } from "./create";
+import { createDeleteGatewayConnectorHandler } from "./delete";
 import { createGetGatewayConnectorHandler } from "./get";
 import { createListGatewayConnectorsHandler } from "./list";
 import { createUpdateGatewayConnectorHandler } from "./update";
@@ -14,5 +15,6 @@ export function createGatewayConnectorHandler(core: Core, io: AppIO): Router {
  .handler(createCreateGatewayConnectorHandler(core, io))
  .handler(createUpdateGatewayConnectorHandler(core, io))
  .handler(createGetGatewayConnectorHandler(core))
- .handler(createListGatewayConnectorsHandler(core));
+ .handler(createListGatewayConnectorsHandler(core))
+ .handler(createDeleteGatewayConnectorHandler(core));
 }

src/handlers/gateway/delete/index.tsx

@@ -0,0 +1,21 @@
+import z from "zod";
+import { InputValidationError } from "../../../errors";
+import { createHandler, flag } from "../../../router";
+import { JsonRendererKey } from "../../../tui";
+import type { Core } from "../../types";
+import { coreOptsFromCtx } from "../../utils";
+
+export const createDeleteGatewayHandler = (core: Core) =>
+ createHandler({
+ name: "delete",
+ description: "delete an AgentCore Gateway",
+ flags: [flag("id", "the Gateway ID", z.string().optional())],
+ handle: async (ctx, flags) => {
+ if (!flags.id) {
+ throw new InputValidationError("required option '--id <id>' not specified");
+ }
+ ctx
+ .require(JsonRendererKey)
+ .renderJson(await core.gateway.deleteGateway(flags.id, coreOptsFromCtx(ctx)));
+ },
+ });

src/core/gateway.test.ts

@@ -1,5 +1,8 @@
 import { describe, expect, mock, test } from "bun:test";
 import {
+ DeleteGatewayCommand,
+ DeleteGatewayRuleCommand,
+ DeleteGatewayTargetCommand,
  GetGatewayCommand,
  GetGatewayTargetCommand,
  ListGatewayTargetsCommand,
@@ -269,6 +272,30 @@ function target(): GetGatewayTargetResponse {
  } as unknown as GetGatewayTargetResponse;
 }
 
+test("maps Gateway, Target, and Rule selectors to their delete commands", async () => {
+ const { client, commands } = recordingGatewayClient([{}, {}, {}]);
+
+ await client.deleteGateway("gateway-1", OPTIONS);
+ await client.deleteGatewayTarget("gateway-1", "target-1", OPTIONS);
+ await client.deleteGatewayRule("gateway-1", "rule-1", OPTIONS);
+
+ expect(commands).toHaveLength(3);
+ expect(commands[0]).toBeInstanceOf(DeleteGatewayCommand);
+ expect((commands[0] as DeleteGatewayCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ });
+ expect(commands[1]).toBeInstanceOf(DeleteGatewayTargetCommand);
+ expect((commands[1] as DeleteGatewayTargetCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ targetId: "target-1",
+ });
+ expect(commands[2]).toBeInstanceOf(DeleteGatewayRuleCommand);
+ expect((commands[2] as DeleteGatewayRuleCommand).input).toEqual({
+ gatewayIdentifier: "gateway-1",
+ ruleId: "rule-1",
+ });
+});
+
 function recordingGatewayClient(responses: unknown[]): {
  client: GatewayClient;
  commands: unknown[];

src/core/gateway.tsx

@@ -2,6 +2,9 @@ import {
  CreateGatewayCommand,
  CreateGatewayRuleCommand,
  CreateGatewayTargetCommand,
+ DeleteGatewayCommand,
+ DeleteGatewayRuleCommand,
+ DeleteGatewayTargetCommand,
  GetGatewayCommand,
  GetGatewayRuleCommand,
  GetGatewayTargetCommand,
@@ -15,6 +18,9 @@ import {
  type CreateGatewayResponse,
  type CreateGatewayRuleResponse,
  type CreateGatewayTargetResponse,
+ type DeleteGatewayResponse,
+ type DeleteGatewayRuleResponse,
+ type DeleteGatewayTargetResponse,
  type GetGatewayResponse,
  type GetGatewayRuleResponse,
  type GetGatewayTargetResponse,
@@ -155,6 +161,12 @@ export class GatewayClient implements CoreGatewayClient {
  .send(new ListGatewaysCommand({ nextToken, maxResults }));
  }
 
+ async deleteGateway(id: string, options: CoreOptions): Promise<DeleteGatewayResponse> {
+ return this.clients
+ .control(toClientConfig(options))
+ .send(new DeleteGatewayCommand({ gatewayIdentifier: id }));
+ }
+
  async getGatewayTarget(
  gatewayId: string,
  targetId: string,
@@ -255,6 +267,19 @@ export class GatewayClient implements CoreGatewayClient {
  return this.updateTarget(patch, options, true);
  }
 
+ async deleteGatewayTarget(
+ gatewayId: string,
+ targetId: string,
+ options: CoreOptions,
+ ): Promise<DeleteGatewayTargetResponse> {
+ return this.clients.control(toClientConfig(options)).send(
+ new DeleteGatewayTargetCommand({
+ gatewayIdentifier: gatewayId,
+ targetId,
+ }),
+ );
+ }
+
  async getGatewayRule(
  gatewayId: string,
  ruleId: string,
@@ -297,6 +322,19 @@ export class GatewayClient implements CoreGatewayClient {
  return this.clients.control(toClientConfig(options)).send(new UpdateGatewayRuleCommand(input));
  }
 
+ async deleteGatewayRule(
+ gatewayId: string,
+ ruleId: string,
+ options: CoreOptions,
+ ): Promise<DeleteGatewayRuleResponse> {
+ return this.clients.control(toClientConfig(options)).send(
+ new DeleteGatewayRuleCommand({
+ gatewayIdentifier: gatewayId,
+ ruleId,
+ }),
+ );
+ }
+
  private async updateTarget(
  patch: GatewayTargetUpdatePatch,
  options: CoreOptions,

src/handlers/gateway/__fixtures__/delete/DeleteGatewayCommand.e015bbd46d1859f1.json

@@ -0,0 +1,4 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayRuleCommand.cee854fd6fa9fd16.json

@@ -0,0 +1,4 @@
+{
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayTargetCommand.94eb9a3262a6cda2.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/DeleteGatewayTargetCommand.afcce9d3abeac495.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/GetGatewayTargetCommand.94eb9a3262a6cda2.json

@@ -0,0 +1,34 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "createdAt": {
+ "$date": "2026-08-07T17:54:45.522Z"
+ },
+ "updatedAt": {
+ "$date": "2026-08-07T17:54:46.453Z"
+ },
+ "status": "READY",
+ "name": "web-search-delete-fixture",
+ "targetConfiguration": {
+ "mcp": {
+ "connector": {
+ "source": {
+ "connectorId": "web-search"
+ },
+ "configurations": [
+ {
+ "name": "WebSearch",
+ "parameterValues": {
+ "maxResults": 10
+ }
+ }
+ ]
+ }
+ }
+ },
+ "credentialProviderConfigurations": [
+ {
+ "credentialProviderType": "GATEWAY_IAM_ROLE"
+ }
+ ]
+}

src/handlers/gateway/__fixtures__/delete/connector-delete.golden.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "U9OM2R9I8Q",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/gateway-delete.golden.json

@@ -0,0 +1,4 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/resources.json

@@ -0,0 +1,7 @@
+{
+ "gatewayId": "agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "connectorId": "U9OM2R9I8Q",
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c"
+}

src/handlers/gateway/__fixtures__/delete/rule-delete.golden.json

@@ -0,0 +1,4 @@
+{
+ "ruleId": "80e073e4-eb05-4371-8e6a-f4bde522699c",
+ "status": "DELETING"
+}

src/handlers/gateway/__fixtures__/delete/target-delete.golden.json

@@ -0,0 +1,5 @@
+{
+ "gatewayArn": "arn:aws:bedrock-agentcore:us-east-1:685197708687:gateway/agentcore-cli-gateway-delete-fixture-oiemu02wfc",
+ "targetId": "JYNNGDZ42F",
+ "status": "DELETING"
+}

src/handlers/gateway/connector/delete/index.tsx

@@ -0,0 +1,34 @@
+import z from "zod";
+import { InputValidationError } from "../../../../errors";
+import { createHandler, flag } from "../../../../router";
+import { JsonRendererKey } from "../../../../tui";
+import type { Core } from "../../../types";
+import { coreOptsFromCtx } from "../../../utils";
+import { GatewayConnectorTarget } from "../gatewayConnectorTarget";
+
+export const createDeleteGatewayConnectorHandler = (core: Core) =>
+ createHandler({
+ name: "delete",
+ description: "delete a connector-backed Gateway Target",
+ flags: [
+ flag("gateway-id", "the parent Gateway ID", z.string().optional()),
+ flag("id", "the connector-backed Gateway Target ID", z.string().optional()),
+ ],
+ handle: async (ctx, flags) => {
+ if (!flags["gateway-id"]) {
+ throw new InputValidationError("required option '--gateway-id <gateway-id>' not specified");
+ }
+ if (!flags.id) {
+ throw new InputValidationError("required option '--id <id>' not specified");
+ }
+
+ const options = coreOptsFromCtx(ctx);
+ const target = await core.gateway.getGatewayTarget(flags["gateway-id"], flags.id, options);
+ if (!GatewayConnectorTarget.is(target.targetConfiguration)) {
+ throw new InputValidationError(`Gateway Target "${flags.id}" is not connector-backed`);
+ }
+ ctx
+ .require(JsonRendererKey)
+ .renderJson(await core.gateway.deleteGatewayTarget(flags["gateway-id"], flags.id, options));
+ },
+ });

src/handlers/gateway/connector/index.tsx

@@ -3,6 +3,7 @@ import { Router } from "../../../router";
 import { renderTui } from "../../../tui";
 import type { Core } from "../../types";
 import { createCreateGatewayConnectorHandler } from "./create";
+import { createDeleteGatewayConnectorHandler } from "./delete";
 import { createGetGatewayConnectorHandler } from "./get";
 import { createListGatewayConnectorsHandler } from "./list";
 import { createUpdateGatewayConnectorHandler } from "./update";
@@ -14,5 +15,6 @@ export function createGatewayConnectorHandler(core: Core, io: AppIO): Router {
  .handler(createCreateGatewayConnectorHandler(core, io))
  .handler(createUpdateGatewayConnectorHandler(core, io))
  .handler(createGetGatewayConnectorHandler(core))
- .handler(createListGatewayConnectorsHandler(core));
+ .handler(createListGatewayConnectorsHandler(core))
+ .handler(createDeleteGatewayConnectorHandler(core));
 }

src/handlers/gateway/delete/index.tsx

@@ -0,0 +1,21 @@
+import z from "zod";
+import { InputValidationError } from "../../../errors";
+import { createHandler, flag } from "../../../router";
+import { JsonRendererKey } from "../../../tui";
+import type { Core } from "../../types";
+import { coreOptsFromCtx } from "../../utils";
+
+export const createDeleteGatewayHandler = (core: Core) =>
+ createHandler({
+ name: "delete",
+ description: "delete an AgentCore Gateway",
+ flags: [flag("id", "the Gateway ID", z.string().optional())],
+ handle: async (ctx, flags) => {
+ if (!flags.id) {
+ throw new InputValidationError("required option '--id <id>' not specified");
+ }
+ ctx
+ .require(JsonRendererKey)
+ .renderJson(await core.gateway.deleteGateway(flags.id, coreOptsFromCtx(ctx)));
+ },
+ });