fix: TUI UX bug, linter failures and missing telemetry

Author: nborges-aws

src/cli/aws/policy-generation.ts

@@ -6,7 +6,7 @@ import {
   StartPolicyGenerationCommand,
   waitUntilPolicyGenerationCompleted,
 } from '@aws-sdk/client-bedrock-agentcore-control';
-import { WaiterState } from '@smithy/util-waiter';
+import { WaiterState } from '@smithy/core/client';
 
 export interface StartPolicyGenerationOptions {
   policyEngineId: string;

src/cli/commands/shared/indexed-key-parser.ts

@@ -1,11 +1,36 @@
 import type { IndexedKey, IndexedKeyType } from '../../../schema';
-import { IndexedKeyTypeSchema } from '../../../schema';
+import {
+  INDEXED_KEY_NAME_PATTERN,
+  INDEXED_KEY_NAME_PATTERN_MESSAGE,
+  IndexedKeyTypeSchema,
+  MAX_INDEXED_KEYS,
+  MAX_INDEXED_KEY_NAME_LENGTH,
+} from '../../../schema';
 
-export const INDEXED_KEY_NAME_PATTERN = /^[a-zA-Z0-9\s._:/=+@-]+$/;
-export const MAX_INDEXED_KEYS = 10;
-export const MAX_KEY_NAME_LENGTH = 128;
+export { INDEXED_KEY_NAME_PATTERN, MAX_INDEXED_KEYS };
+export const MAX_KEY_NAME_LENGTH = MAX_INDEXED_KEY_NAME_LENGTH;
 export const VALID_INDEXED_KEY_TYPES: readonly IndexedKeyType[] = ['STRING', 'STRINGLIST', 'NUMBER'];
 
+/**
+ * Validate an indexed key name. Returns `true` when valid, or an error message.
+ * Shared between the schema-side regex (via constants) and TUI inline validation.
+ */
+export function validateIndexedKeyName(value: string, existingNames: readonly string[] = []): true | string {
+  if (!INDEXED_KEY_NAME_PATTERN.test(value)) {
+    return INDEXED_KEY_NAME_PATTERN_MESSAGE;
+  }
+  if (value.trim().length === 0) {
+    return 'Key cannot be only whitespace';
+  }
+  if (value.length > MAX_INDEXED_KEY_NAME_LENGTH) {
+    return `Maximum ${MAX_INDEXED_KEY_NAME_LENGTH} characters`;
+  }
+  if (existingNames.includes(value)) {
+    return 'Key already defined';
+  }
+  return true;
+}
+
 export interface IndexedKeyParseError {
   ok: false;
   error: string;

src/cli/primitives/MemoryPrimitive.tsx

@@ -250,12 +250,15 @@ export class MemoryPrimitive extends BasePrimitive<AddMemoryOptions, RemovableMe
                 .split(',')
                 .map(s => s.trim().toUpperCase())
                 .filter(Boolean);
+              const indexedKeyCount = cliOptions.indexedKey?.length ?? 0;
               return {
                 strategy_count: strategyList.length,
                 strategy_semantic: strategyList.includes('SEMANTIC'),
                 strategy_summarization: strategyList.includes('SUMMARIZATION'),
                 strategy_user_preference: strategyList.includes('USER_PREFERENCE'),
                 strategy_episodic: strategyList.includes('EPISODIC'),
+                indexed_key_count: indexedKeyCount,
+                has_indexed_keys: indexedKeyCount > 0,
               };
             });
           } else {

src/cli/telemetry/schemas/command-run.ts

@@ -65,6 +65,8 @@ const AddMemoryAttrs = safeSchema({
   strategy_summarization: z.boolean(),
   strategy_user_preference: z.boolean(),
   strategy_episodic: z.boolean(),
+  indexed_key_count: Count,
+  has_indexed_keys: z.boolean(),
 });
 
 const AddCredentialAttrs = safeSchema({ credential_type: CredentialType });

src/cli/tui/hooks/useCreateMemory.ts

@@ -28,6 +28,7 @@ export function useCreateMemory() {
       const strategiesStr = config.strategies.map(s => s.type).join(',');
       const strategyList = strategiesStr ? strategiesStr.split(',').map(s => s.trim().toUpperCase()) : [];
       const indexedKey = config.indexedKeys?.map(k => `${k.key}:${k.type}`);
+      const indexedKeyCount = config.indexedKeys?.length ?? 0;
 
       const addResult = await withCommandRunTelemetry(
         'add.memory',
@@ -37,6 +38,8 @@ export function useCreateMemory() {
           strategy_summarization: strategyList.includes('SUMMARIZATION'),
           strategy_user_preference: strategyList.includes('USER_PREFERENCE'),
           strategy_episodic: strategyList.includes('EPISODIC'),
+          indexed_key_count: indexedKeyCount,
+          has_indexed_keys: indexedKeyCount > 0,
         },
         () =>
           memoryPrimitive.add({

src/cli/tui/screens/memory/AddMemoryScreen.tsx

@@ -1,6 +1,7 @@
 import type { IndexedKeyType, MemoryStrategyType } from '../../../../schema';
 import { AgentNameSchema, StreamContentLevelSchema } from '../../../../schema';
 import { ARN_VALIDATION_MESSAGE, isValidArn } from '../../../commands/shared/arn-utils';
+import { validateIndexedKeyName } from '../../../commands/shared/indexed-key-parser';
 import {
   ConfirmReview,
   Panel,
@@ -24,7 +25,7 @@ import {
 } from './types';
 import { useAddMemoryWizard } from './useAddMemoryWizard';
 import { Box, Text } from 'ink';
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
 interface AddMemoryScreenProps {
   onComplete: (config: AddMemoryConfig) => void;
@@ -72,16 +73,20 @@ export function AddMemoryScreen({ onComplete, onExit, existingMemoryNames }: Add
   const isStrategiesStep = wizard.step === 'strategies';
   const isIndexedKeysStep = wizard.step === 'indexedKeys';
 
-  if (
-    isIndexedKeysStep &&
-    indexedKeysSubStep === 'prompt' &&
-    collectedKeys.length === 0 &&
-    wizard.config.indexedKeys &&
-    wizard.config.indexedKeys.length > 0
-  ) {
-    setCollectedKeys(wizard.config.indexedKeys);
-    setIndexedKeysSubStep('addAnother');
-  }
+  /* eslint-disable react-hooks/set-state-in-effect */
+  useEffect(() => {
+    if (
+      isIndexedKeysStep &&
+      indexedKeysSubStep === 'prompt' &&
+      collectedKeys.length === 0 &&
+      wizard.config.indexedKeys &&
+      wizard.config.indexedKeys.length > 0
+    ) {
+      setCollectedKeys(wizard.config.indexedKeys);
+      setIndexedKeysSubStep('addAnother');
+    }
+  }, [isIndexedKeysStep, indexedKeysSubStep, collectedKeys.length, wizard.config.indexedKeys]);
+  /* eslint-enable react-hooks/set-state-in-effect */
 
   const isStreamingStep = wizard.step === 'streaming';
   const isStreamArnStep = wizard.step === 'streamArn';
@@ -305,31 +310,18 @@ export function AddMemoryScreen({ onComplete, onExit, existingMemoryNames }: Add
             <TextInput
               key={`keyName-${collectedKeys.length}`}
               prompt="Metadata key name"
-              initialValue=""
+              initialValue={pendingKeyName}
               onSubmit={handleKeyNameSubmit}
               onCancel={() => {
+                setPendingKeyName('');
                 if (collectedKeys.length > 0) {
                   setIndexedKeysSubStep('addAnother');
                 } else {
                   wizard.clearIndexedKeys();
                   setIndexedKeysSubStep('prompt');
                 }
               }}
-              customValidation={value => {
-                if (!/^[a-zA-Z0-9\s._:/=+@-]+$/.test(value)) {
-                  return 'Must contain only alphanumeric characters, whitespace, or the symbols . _ : / = + @ -';
-                }
-                if (value.trim().length === 0) {
-                  return 'Key cannot be only whitespace';
-                }
-                if (value.length > 128) {
-                  return 'Maximum 128 characters';
-                }
-                if (existingKeyNames.includes(value)) {
-                  return 'Key already defined';
-                }
-                return true;
-              }}
+              customValidation={value => validateIndexedKeyName(value, existingKeyNames)}
             />
           </Box>
         )}

src/schema/schemas/agentcore-project.ts

@@ -162,15 +162,18 @@ export type IndexedKeyType = z.infer<typeof IndexedKeyTypeSchema>;
  * Note: indexed keys are append-only on the AWS service side — once added to a Memory,
  * a key cannot be removed. Reducing the array on update will fail at deploy time.
  */
+export const INDEXED_KEY_NAME_PATTERN = /^[a-zA-Z0-9\s._:/=+@-]+$/;
+export const INDEXED_KEY_NAME_PATTERN_MESSAGE =
+  'Must contain only alphanumeric characters, whitespace, or the symbols . _ : / = + @ -';
+export const MAX_INDEXED_KEY_NAME_LENGTH = 128;
+export const MAX_INDEXED_KEYS = 10;
+
 export const IndexedKeySchema = z.object({
   key: z
     .string()
     .min(1)
-    .max(128)
-    .regex(
-      /^[a-zA-Z0-9\s._:/=+@-]+$/,
-      'Must contain only alphanumeric characters, whitespace, or the symbols . _ : / = + @ -'
-    )
+    .max(MAX_INDEXED_KEY_NAME_LENGTH)
+    .regex(INDEXED_KEY_NAME_PATTERN, INDEXED_KEY_NAME_PATTERN_MESSAGE)
     .refine(s => s.trim().length > 0, 'Key cannot be only whitespace'),
   type: IndexedKeyTypeSchema,
 });
@@ -193,7 +196,7 @@ export const MemorySchema = z
       ),
     indexedKeys: z
       .array(IndexedKeySchema)
-      .max(10)
+      .max(MAX_INDEXED_KEYS)
       .superRefine(
         uniqueBy(
           entry => entry.key,