feat: centralize support TUI command routing logic (#1940)

* feat: centralize support TUI command routing logic

* refactor: switch supportedTUICommands from global to handler level

Author: nborges-aws

src/components/RouterScreen.tsx

@@ -2,7 +2,7 @@ import React, { useMemo, useState } from "react";
 import { Box, Text, useApp, useInput, useStdin } from "ink";
 import type { Command } from "commander";
 import { useNavigate } from "react-router";
-import { CommandKey } from "../router";
+import { CommandKey, isTuiCommandSupported } from "../router";
 import { Layout } from "./Layout";
 import { Divider } from "./ui/divider";
 import { TextInput } from "./ui/text-input";
@@ -44,18 +44,13 @@ export interface RouterScreenProps extends ScreenProps {
   // segment is the app root; the last is the command whose subcommands are the
   // menu options.
   path: string[];
-  // omit hides subcommands from the menu by name. The command tree still carries
-  // them (they remain usable from the CLI), but they are not offered here — used
-  // when the TUI intentionally does not route a command yet, so it can't fall
-  // through to the HelpScreen catch-all (which exits the app).
-  omit?: string[];
 }
 
 // RouterScreen renders the interactive command menu for a Router node: a filter
 // input at the top and the node's subcommands (read straight off the Commander
 // Command) as navigable options below. Selecting an option routes to that
 // subcommand's screen.
-export function RouterScreen({ ctx, path, omit }: RouterScreenProps) {
+export function RouterScreen({ ctx, path }: RouterScreenProps) {
   const navigate = useNavigate();
   const { isRawModeSupported } = useStdin();
   const { exit } = useApp();
@@ -64,9 +59,9 @@ export function RouterScreen({ ctx, path, omit }: RouterScreenProps) {
   const options: Option[] = useMemo(
     () =>
       command.commands
-        .filter((c) => !omit?.includes(c.name()))
+        .filter(isTuiCommandSupported)
         .map((c) => ({ name: c.name(), description: c.description() })),
-    [command, omit],
+    [command],
   );
 
   const [query, setQuery] = useState("");

src/handlers/eval/evaluator/evaluator.test.tsx

@@ -167,6 +167,19 @@ describe("eval command hierarchy", () => {
       );
     },
   );
+
+  test("runs normal validation for a bare CLI-only evaluator command", async () => {
+    await expect(run(["eval", "evaluator", "delete"])).rejects.toThrow(
+      "required option '--id <id>' not specified",
+    );
+  });
+
+  test("prints help for a bare CLI-only evaluator group", async () => {
+    const stdout = await run(["eval", "evaluator", "llm-as-a-judge"]);
+
+    expect(stdout).toContain("Usage: agentcore eval evaluator llm-as-a-judge");
+    expect(stdout).toContain("Commands:");
+  });
 });
 
 describe("evaluator CRUDL", () => {

src/handlers/eval/evaluator/index.tsx

@@ -13,6 +13,7 @@ export function createEvaluatorHandler(core: Core, io: AppIO): Router {
   return new Router("evaluator", "manage AgentCore evaluators")
     .use(withTuiOnEmptyFlagsAndArgs(core, io))
     .default(renderTui(core, io))
+    .supportedTuiCommands("get", "list")
     .handler(createLlmAsAJudgeHandler(core, io))
     .handler(createCodeBasedHandler(core, io))
     .handler(createGetEvaluatorHandler(core))

src/handlers/eval/evaluator/screen.tsx

@@ -1,12 +1,6 @@
 import { RouterScreen } from "../../../components/RouterScreen";
 import type { ScreenProps } from "../../types";
 
-// The read-only TUI offers only get/list. The mutating subcommands
-// (llm-as-a-judge and code-based, which host create/update; and delete) stay
-// CLI-only for now, so they are omitted from the menu — an unrouted menu entry
-// would fall through to the HelpScreen catch-all and exit the app.
-const OMIT = ["llm-as-a-judge", "code-based", "delete"];
-
 export function EvaluatorScreen(props: ScreenProps) {
-  return <RouterScreen {...props} path={["agentcore", "eval", "evaluator"]} omit={OMIT} />;
+  return <RouterScreen {...props} path={["agentcore", "eval", "evaluator"]} />;
 }

src/handlers/eval/online-eval/index.tsx

@@ -15,6 +15,7 @@ export function createOnlineEvalHandler(core: Core, io: AppIO): Router {
   return new Router("online-eval", "manage AgentCore online evaluation configs")
     .use(withTuiOnEmptyFlagsAndArgs(core, io))
     .default(renderTui(core, io))
+    .supportedTuiCommands("get", "list")
     .handler(createCreateOnlineEvalHandler(core, io))
     .handler(createGetOnlineEvalHandler(core))
     .handler(createListOnlineEvalHandler(core))

src/handlers/eval/online-eval/online-eval.test.tsx

@@ -113,6 +113,12 @@ describe("eval online-eval command hierarchy", () => {
       );
     },
   );
+
+  test("runs normal validation for a bare CLI-only command", async () => {
+    await expect(run(["eval", "online-eval", "create"])).rejects.toThrow(
+      "required option '--name <name>' not specified",
+    );
+  });
 });
 
 describe("online-eval CRUDL", () => {

src/handlers/eval/online-eval/screen.tsx

@@ -1,11 +1,6 @@
 import { RouterScreen } from "../../../components/RouterScreen";
 import type { ScreenProps } from "../../types";
 
-// The read-only TUI offers only get/list. The mutating subcommands stay CLI-only
-// for now, so they are omitted from the menu — an unrouted menu entry would fall
-// through to the HelpScreen catch-all and exit the app.
-const OMIT = ["create", "update", "pause", "resume", "delete"];
-
 export function OnlineEvalScreen(props: ScreenProps) {
-  return <RouterScreen {...props} path={["agentcore", "eval", "online-eval"]} omit={OMIT} />;
+  return <RouterScreen {...props} path={["agentcore", "eval", "online-eval"]} />;
 }

src/handlers/identity/api-key-credential-provider/index.tsx

@@ -11,6 +11,7 @@ import { createUpdateApiKeyCredentialProviderHandler } from "./update";
 export function createApiKeyCredentialProviderHandler(core: Core, io: AppIO): Router {
   return new Router("api-key-credential-provider", "manage API key credential providers")
     .default(renderTui(core, io))
+    .supportedTuiCommands("get", "list")
     .handler(createCreateApiKeyCredentialProviderHandler(core, io))
     .handler(createGetApiKeyCredentialProviderHandler(core))
     .handler(createListApiKeyCredentialProvidersHandler(core))

src/handlers/identity/api-key-credential-provider/screen.tsx

@@ -1,14 +1,8 @@
 import { RouterScreen } from "../../../components/RouterScreen";
 import type { ScreenProps } from "../../types";
 
-const OMIT = ["create", "update", "delete"];
-
 export function ApiKeyCredentialProviderScreen(props: ScreenProps) {
   return (
-    <RouterScreen
-      {...props}
-      path={["agentcore", "identity", "api-key-credential-provider"]}
-      omit={OMIT}
-    />
+    <RouterScreen {...props} path={["agentcore", "identity", "api-key-credential-provider"]} />
   );
 }

src/handlers/identity/identity.test.tsx

@@ -81,16 +81,22 @@ describe("api-key-credential-provider TUI dispatch", () => {
   test.each([
     ["identity", ["identity"]],
     ["api-key-credential-provider", ["identity", "api-key-credential-provider"]],
-    ["create", ["identity", "api-key-credential-provider", "create"]],
     ["get", ["identity", "api-key-credential-provider", "get"]],
     ["list", ["identity", "api-key-credential-provider", "list"]],
-    ["update", ["identity", "api-key-credential-provider", "update"]],
-    ["delete", ["identity", "api-key-credential-provider", "delete"]],
   ] as const)("opens the TUI for a bare `%s`", async (_label, args) => {
     await expect(run([...args])).rejects.toThrow(
       "interactive mode requires a TTY on stdin and stdout",
     );
   });
+
+  test.each(["create", "update", "delete"] as const)(
+    "runs normal validation for bare CLI-only `%s`",
+    async (command) => {
+      await expect(run(["identity", "api-key-credential-provider", command])).rejects.toThrow(
+        "required option '--name <name>' not specified",
+      );
+    },
+  );
 });
 
 describe("api-key-credential-provider CRUDL", () => {