From 4da13489fca26d49a4f249d4abeb3b9f6fa7ac8d Mon Sep 17 00:00:00 2001
From: notgitika <gitijh@gmail.com>
Date: Tue, 21 Apr 2026 03:01:25 -0400
Subject: [PATCH] fix: agentcore add component opens component wizard directly

When running `agentcore add memory` (or any other component), the TUI
was always showing the generic resource selection screen. This is because
AddFlow always started in the 'select' state regardless of which
subcommand invoked it.

Added an `initialResource` prop to AddFlow that maps directly to the
correct wizard state, skipping the selection screen. Each primitive now
passes its resource type when rendering AddFlow in TUI fallback mode.

Closes #857
---
 src/cli/primitives/AgentPrimitive.tsx         |  1 +
 src/cli/primitives/CredentialPrimitive.tsx    |  1 +
 src/cli/primitives/EvaluatorPrimitive.ts      |  1 +
 src/cli/primitives/MemoryPrimitive.tsx        |  1 +
 .../primitives/OnlineEvalConfigPrimitive.ts   |  1 +
 src/cli/primitives/PolicyPrimitive.ts         |  1 +
 src/cli/tui/screens/add/AddFlow.tsx           | 27 ++++++++++++++++++-
 7 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/cli/primitives/AgentPrimitive.tsx b/src/cli/primitives/AgentPrimitive.tsx
index dd751454..0845c622 100644
--- a/src/cli/primitives/AgentPrimitive.tsx
+++ b/src/cli/primitives/AgentPrimitive.tsx
@@ -340,6 +340,7 @@ export class AgentPrimitive extends BasePrimitive<AddAgentOptions, RemovableReso
           const { clear, unmount } = render(
             React.createElement(AddFlow, {
               isInteractive: false,
+              initialResource: 'agent',
               onExit: () => {
                 clear();
                 unmount();
diff --git a/src/cli/primitives/CredentialPrimitive.tsx b/src/cli/primitives/CredentialPrimitive.tsx
index be78f708..48f51845 100644
--- a/src/cli/primitives/CredentialPrimitive.tsx
+++ b/src/cli/primitives/CredentialPrimitive.tsx
@@ -347,6 +347,7 @@ export class CredentialPrimitive extends BasePrimitive<AddCredentialOptions, Rem
               const { clear, unmount } = render(
                 React.createElement(AddFlow, {
                   isInteractive: false,
+                  initialResource: 'credential',
                   onExit: () => {
                     clear();
                     unmount();
diff --git a/src/cli/primitives/EvaluatorPrimitive.ts b/src/cli/primitives/EvaluatorPrimitive.ts
index ffd2a440..444e918c 100644
--- a/src/cli/primitives/EvaluatorPrimitive.ts
+++ b/src/cli/primitives/EvaluatorPrimitive.ts
@@ -324,6 +324,7 @@ export class EvaluatorPrimitive extends BasePrimitive<AddEvaluatorOptions, Remov
               const { clear, unmount } = render(
                 React.createElement(AddFlow, {
                   isInteractive: false,
+                  initialResource: 'evaluator',
                   onExit: () => {
                     clear();
                     unmount();
diff --git a/src/cli/primitives/MemoryPrimitive.tsx b/src/cli/primitives/MemoryPrimitive.tsx
index c808bbac..6a92c7bb 100644
--- a/src/cli/primitives/MemoryPrimitive.tsx
+++ b/src/cli/primitives/MemoryPrimitive.tsx
@@ -238,6 +238,7 @@ export class MemoryPrimitive extends BasePrimitive<AddMemoryOptions, RemovableMe
               const { clear, unmount } = render(
                 React.createElement(AddFlow, {
                   isInteractive: false,
+                  initialResource: 'memory',
                   onExit: () => {
                     clear();
                     unmount();
diff --git a/src/cli/primitives/OnlineEvalConfigPrimitive.ts b/src/cli/primitives/OnlineEvalConfigPrimitive.ts
index 03687047..95878025 100644
--- a/src/cli/primitives/OnlineEvalConfigPrimitive.ts
+++ b/src/cli/primitives/OnlineEvalConfigPrimitive.ts
@@ -179,6 +179,7 @@ export class OnlineEvalConfigPrimitive extends BasePrimitive<AddOnlineEvalConfig
               const { clear, unmount } = render(
                 React.createElement(AddFlow, {
                   isInteractive: false,
+                  initialResource: 'online-eval',
                   onExit: () => {
                     clear();
                     unmount();
diff --git a/src/cli/primitives/PolicyPrimitive.ts b/src/cli/primitives/PolicyPrimitive.ts
index 34465eb5..174c9267 100644
--- a/src/cli/primitives/PolicyPrimitive.ts
+++ b/src/cli/primitives/PolicyPrimitive.ts
@@ -351,6 +351,7 @@ export class PolicyPrimitive extends BasePrimitive<AddPolicyOptions, RemovablePo
               const { clear, unmount } = render(
                 React.createElement(AddFlow, {
                   isInteractive: false,
+                  initialResource: 'policy',
                   onExit: () => {
                     clear();
                     unmount();
diff --git a/src/cli/tui/screens/add/AddFlow.tsx b/src/cli/tui/screens/add/AddFlow.tsx
index 85da20b0..491d1a72 100644
--- a/src/cli/tui/screens/add/AddFlow.tsx
+++ b/src/cli/tui/screens/add/AddFlow.tsx
@@ -157,12 +157,37 @@ interface AddFlowProps {
   onDev?: () => void;
   /** Called when user selects deploy from success screen */
   onDeploy?: () => void;
+  /** Skip the selection screen and go directly to a specific resource wizard */
+  initialResource?: AddResourceType;
+}
+
+function getInitialFlowState(resource?: AddResourceType): FlowState {
+  switch (resource) {
+    case 'agent':
+      return { name: 'agent-wizard' };
+    case 'gateway':
+      return { name: 'gateway-wizard' };
+    case 'gateway-target':
+      return { name: 'tool-wizard' };
+    case 'memory':
+      return { name: 'memory-wizard' };
+    case 'credential':
+      return { name: 'identity-wizard' };
+    case 'evaluator':
+      return { name: 'evaluator-wizard' };
+    case 'online-eval':
+      return { name: 'online-eval-wizard' };
+    case 'policy':
+      return { name: 'policy-wizard' };
+    default:
+      return { name: 'select' };
+  }
 }
 
 export function AddFlow(props: AddFlowProps) {
   const { addAgent, reset: resetAgent } = useAddAgent();
   const { agents, refresh: refreshAgents } = useAvailableAgents();
-  const [flow, setFlow] = useState<FlowState>({ name: 'select' });
+  const [flow, setFlow] = useState<FlowState>(() => getInitialFlowState(props.initialResource));
 
   // In non-interactive mode, exit after success (but not while loading)
   useEffect(() => {