@vybestack/llxprt-code 0.10.0 → 0.11.0-nightly.260728.ffaa8d5d7

package/src/ui/commands/subagentCommand.ts

@@ -14,6 +14,7 @@ import type {
   SlashCommandActionReturn,
 } from './types.js';
 import { CommandKind } from './types.js';
+import type { CommandArgumentSchema } from './schema/types.js';
 import { MessageType } from '../types.js';
 import { Colors } from '../colors.js';
 import { DebugLogger } from '@vybestack/llxprt-code-telemetry';
@@ -111,6 +112,60 @@ async function saveSubagent(
   }
 }
 
+/**
+ * Shared completer that lists existing subagents as autocomplete suggestions.
+ *
+ * @plan:PLAN-20251013-AUTOCOMPLETE.P08
+ * @requirement:REQ-002
+ * @requirement:REQ-004
+ */
+const subagentNameCompleter = withFuzzyFilter(async (ctx: CommandContext) => {
+  const manager = ctx.services.subagentManager;
+  if (!manager) {
+    return [];
+  }
+
+  const names = await manager.listSubagents();
+
+  const suggestions = await Promise.all(
+    names.map(async (name) => {
+      try {
+        const details = await manager.loadSubagent(name);
+        return {
+          value: name,
+          description: `Profile: ${details.profile}`,
+        };
+      } catch (error) {
+        logger.warn(
+          () =>
+            `Error loading subagent '${name}' for autocomplete: ${error instanceof Error ? error.message : String(error)}`,
+        );
+        return {
+          value: name,
+          description: 'Subagent',
+        };
+      }
+    }),
+  );
+
+  return suggestions;
+});
+
+/**
+ * Schema exposing subagent-name autocomplete for single-argument commands
+ * (`/subagent edit|show|delete <name>`).
+ *
+ * @requirement:REQ-004
+ */
+export const subagentNameSchema: CommandArgumentSchema = [
+  {
+    kind: 'value',
+    name: 'name',
+    description: 'Enter subagent name',
+    completer: subagentNameCompleter,
+  },
+];
+
 /**
  * @plan:PLAN-20251013-AUTOCOMPLETE.P08
  * @requirement:REQ-002
@@ -124,33 +179,7 @@ const subagentSchema = [
     kind: 'value' as const,
     name: 'name',
     description: 'Enter subagent name',
-    completer: withFuzzyFilter(async (ctx: CommandContext) => {
-      const manager = ctx.services.subagentManager;
-      if (!manager) {
-        return [];
-      }
-
-      const names = await manager.listSubagents();
-
-      const suggestions = await Promise.all(
-        names.map(async (name) => {
-          try {
-            const details = await manager.loadSubagent(name);
-            return {
-              value: name,
-              description: `Profile: ${details.profile}`,
-            };
-          } catch {
-            return {
-              value: name,
-              description: 'Subagent',
-            };
-          }
-        }),
-      );
-
-      return suggestions;
-    }),
+    completer: subagentNameCompleter,
   },
   {
     kind: 'value' as const,
@@ -393,6 +422,7 @@ const showCommand: SlashCommand = {
   name: 'show',
   description: 'Show detailed subagent configuration (interactive)',
   kind: CommandKind.BUILT_IN,
+  schema: subagentNameSchema,
   action: async (
     context: CommandContext,
     args: string,
@@ -445,6 +475,7 @@ const deleteCommand: SlashCommand = {
   name: 'delete',
   description: 'Delete a subagent configuration (interactive)',
   kind: CommandKind.BUILT_IN,
+  schema: subagentNameSchema,
   action: async (
     context: CommandContext,
     args: string,
@@ -528,6 +559,7 @@ const editCommand: SlashCommand = {
   name: 'edit',
   description: 'Edit subagent configuration (interactive)',
   kind: CommandKind.BUILT_IN,
+  schema: subagentNameSchema,
   action: async (
     context: CommandContext,
     args: string,

package/src/ui/components/AuthDialog.tsx

@@ -100,9 +100,9 @@ function buildAuthItems(
 }> {
   return [
     {
-      key: 'oauth_anthropic',
-      label: `Anthropic Claude (OAuth) ${enabledProviders.has('oauth_anthropic') ? '[ON]' : '[OFF]'}${getStatusLabel('anthropic', authStatuses)}`,
-      value: 'oauth_anthropic',
+      key: 'oauth_claudecode',
+      label: `Claude Code (Claude.ai OAuth) ${enabledProviders.has('oauth_claudecode') ? '[ON]' : '[OFF]'}${getStatusLabel('claudecode', authStatuses)}`,
+      value: 'oauth_claudecode',
     },
     {
       key: 'oauth_codex',

package/src/ui/components/Composer.tsx

@@ -73,6 +73,7 @@ export const Composer = ({
       inputWidth={inputWidth}
       suggestionsWidth={suggestionsWidth}
       onSubmit={uiActions.handleUserInputSubmit}
+      onSteer={uiActions.handleSteer}
       userMessages={inputHistory}
       onClearScreen={uiActions.handleClearScreen}
       config={config}

package/src/ui/components/DialogManager.tsx

@@ -218,6 +218,7 @@ function renderEarlyDialogs(
   uiState: ReturnType<typeof useUIState>,
   uiActions: ReturnType<typeof useUIActions>,
   terminalWidth: number,
+  config: CliUiRuntime,
 ) {
   if (uiState.showWorkspaceMigrationDialog) {
     return (
@@ -239,8 +240,8 @@ function renderEarlyDialogs(
   if (uiState.isFolderTrustDialogOpen) {
     return (
       <FolderTrustDialog
+        workingDirectory={config.getWorkingDir()}
         onSelect={uiActions.handleFolderTrustSelect}
-        isRestarting={uiState.isRestarting}
       />
     );
   }
@@ -743,6 +744,7 @@ function renderDialogBodySecondHalf(
       <PermissionsModifyTrustDialog
         onExit={uiActions.closePermissionsDialog}
         addItem={addItem}
+        config={config}
       />
     );
   }
@@ -823,7 +825,12 @@ export const DialogManager = ({
   );
 
   // NOTE: IdeTrustChangeDialog not yet ported from upstream
-  const earlyDialog = renderEarlyDialogs(uiState, uiActions, terminalWidth);
+  const earlyDialog = renderEarlyDialogs(
+    uiState,
+    uiActions,
+    terminalWidth,
+    config,
+  );
   if (earlyDialog) return earlyDialog;
 
   return renderDialogBody(uiState, uiActions, settings, config, addItem, state);

package/src/ui/components/FolderTrustDialog.tsx

@@ -6,48 +6,30 @@
 
 import { Box, Text } from 'ink';
 import type React from 'react';
-import { useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { Colors } from '../colors.js';
 import { theme } from '../semantic-colors.js';
-import type { RadioSelectItem } from './shared/RadioButtonSelect.js';
 import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
 import { useKeypress } from '../hooks/useKeypress.js';
 import * as process from 'node:process';
 import * as path from 'node:path';
-import { ExitCodes } from '@vybestack/llxprt-code-core';
+import { DebugLogger, ExitCodes } from '@vybestack/llxprt-code-core';
+import { FolderTrustChoice, buildTrustOptions } from '../trustDialogHelpers.js';
 
-export enum FolderTrustChoice {
-  TRUST_FOLDER = 'trust_folder',
-  TRUST_PARENT = 'trust_parent',
-  DO_NOT_TRUST = 'do_not_trust',
-}
+const debug = DebugLogger.getLogger('llxprt:ui:folder-trust-dialog');
 
-interface FolderTrustDialogProps {
-  onSelect: (choice: FolderTrustChoice) => void;
-  isRestarting?: boolean;
+function isFolderTrustChoice(value: unknown): value is FolderTrustChoice {
+  return (
+    typeof value === 'string' &&
+    Object.values(FolderTrustChoice).includes(value as FolderTrustChoice)
+  );
 }
 
-function buildTrustOptions(
-  currentFolder: string,
-  parentFolder: string,
-): Array<RadioSelectItem<FolderTrustChoice>> {
-  return [
-    {
-      label: 'Trust folder',
-      value: FolderTrustChoice.TRUST_FOLDER,
-      key: `Trust folder (${currentFolder})`,
-    },
-    {
-      label: `Trust parent folder (${parentFolder})`,
-      value: FolderTrustChoice.TRUST_PARENT,
-      key: `Trust parent folder (${parentFolder})`,
-    },
-    {
-      label: "Don't trust",
-      value: FolderTrustChoice.DO_NOT_TRUST,
-      key: "Don't trust",
-    },
-  ];
+export { FolderTrustChoice };
+
+interface FolderTrustDialogProps {
+  workingDirectory: string;
+  onSelect: (choice: FolderTrustChoice) => void | Promise<void>;
 }
 
 const TrustDialogHeader: React.FC = () => (
@@ -62,11 +44,11 @@ const TrustDialogHeader: React.FC = () => (
   </Box>
 );
 
-interface RestartingMessageProps {
+interface ExitMessageProps {
   exiting: boolean;
 }
 
-const RestartingMessage: React.FC<RestartingMessageProps> = ({ exiting }) => {
+const ExitMessage: React.FC<ExitMessageProps> = ({ exiting }) => {
   if (!exiting) {
     return null;
   }
@@ -80,37 +62,74 @@ const RestartingMessage: React.FC<RestartingMessageProps> = ({ exiting }) => {
   );
 };
 
+function useMountedRef(): React.MutableRefObject<boolean> {
+  const mountedRef = useRef(true);
+  useEffect(() => {
+    mountedRef.current = true;
+    return () => {
+      mountedRef.current = false;
+    };
+  }, []);
+  return mountedRef;
+}
+
 export const FolderTrustDialog: React.FC<FolderTrustDialogProps> = ({
+  workingDirectory,
   onSelect,
-  isRestarting,
 }) => {
   const [exiting, setExiting] = useState(false);
-
+  const [isCommitting, setIsCommitting] = useState(false);
+  const [errorMessage, setErrorMessage] = useState<string | null>(null);
+  const committingRef = useRef(false);
+  const exitingRef = useRef(false);
+  const exitTimerRef = useRef<ReturnType<typeof setTimeout> | undefined>(
+    undefined,
+  );
+  const mountedRef = useMountedRef();
+  useEffect(() => () => clearTimeout(exitTimerRef.current), []);
   useKeypress(
     (key) => {
+      if (committingRef.current || exitingRef.current) return;
       if (key.name === 'escape') {
+        exitingRef.current = true;
         setExiting(true);
-        setTimeout(() => {
+        exitTimerRef.current = setTimeout(() => {
           process.exit(ExitCodes.FATAL_CONFIG_ERROR);
         }, 100);
       }
     },
-    { isActive: isRestarting !== true },
+    { isActive: true },
   );
 
-  useKeypress(
-    (key) => {
-      if (key.name === 'r') {
-        process.exit(ExitCodes.SUCCESS);
+  const handleSelect = useCallback(
+    (choice: FolderTrustChoice) => {
+      if (!isFolderTrustChoice(choice) || committingRef.current) {
+        return;
       }
+      committingRef.current = true;
+      setIsCommitting(true);
+      setErrorMessage(null);
+      void Promise.resolve()
+        .then(() => onSelect(choice))
+        .catch((error: unknown) => {
+          debug.error('Folder trust selection failed', error);
+          if (!mountedRef.current) return;
+          const detail = error instanceof Error ? error.message : String(error);
+          setErrorMessage(`Failed to apply folder trust selection: ${detail}`);
+        })
+        .finally(() => {
+          committingRef.current = false;
+          if (mountedRef.current) {
+            setIsCommitting(false);
+          }
+        });
     },
-    { isActive: isRestarting === true },
+    [mountedRef, onSelect],
+  );
+  const options = buildTrustOptions(
+    path.basename(workingDirectory),
+    path.basename(path.dirname(workingDirectory)),
   );
-
-  const currentFolder = path.basename(process.cwd());
-  const parentFolder = path.basename(path.dirname(process.cwd()));
-  const options = buildTrustOptions(currentFolder, parentFolder);
-
   return (
     <Box flexDirection="column" width="100%">
       <Box
@@ -122,22 +141,14 @@ export const FolderTrustDialog: React.FC<FolderTrustDialogProps> = ({
         marginRight={1}
       >
         <TrustDialogHeader />
-
         <RadioButtonSelect
           items={options}
-          onSelect={onSelect}
-          isFocused={isRestarting !== true}
+          onSelect={handleSelect}
+          isFocused={!isCommitting}
         />
+        {errorMessage && <Text color={theme.status.error}>{errorMessage}</Text>}
       </Box>
-      {isRestarting === true && (
-        <Box marginLeft={1} marginTop={1}>
-          <Text color={Colors.AccentYellow}>
-            To see changes, llxprt must be restarted. Press r to exit and apply
-            changes now.
-          </Text>
-        </Box>
-      )}
-      <RestartingMessage exiting={exiting} />
+      <ExitMessage exiting={exiting} />
     </Box>
   );
 };