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

package/src/ui/layouts/DefaultAppLayoutHelpers.tsx

@@ -5,22 +5,25 @@
  */
 
 import React from 'react';
-import { Box, Text } from 'ink';
+import { Box } from 'ink';
 import type {
   MessageBus,
   IdeContext,
   ThoughtSummary,
+  ApprovalMode,
 } from '@vybestack/llxprt-code-core';
-import { ApprovalMode } from '@vybestack/llxprt-code-core';
-import { StreamingState } from '../types.js';
+import type {
+  StreamingState,
+  HistoryItem,
+  ConsoleMessageItem,
+} from '../types.js';
 import type { SlashCommandRuntime, UiRuntime } from '../cliUiRuntime.js';
-import type { HistoryItem, ConsoleMessageItem } from '../types.js';
+import type { QueuedSubmission } from '../hooks/agentStream/types.js';
 import type { LoadedSettings } from '../../config/settings.js';
 import type { UpdateObject } from '../utils/updateCheck.js';
 import type { UIState } from '../contexts/UIStateContext.js';
 import type { UIActions } from '../contexts/UIActionsContext.js';
 import { OverflowProvider } from '../contexts/OverflowContext.js';
-import { Colors } from '../colors.js';
 import { getCliRuntimeContext } from '@vybestack/llxprt-code-providers/runtime.js';
 import { themeManager } from '../themes/theme-manager.js';
 import type { SlashCommand } from '../commands/types.js';
@@ -30,15 +33,11 @@ import { HistoryItemDisplay } from '../components/HistoryItemDisplay.js';
 import { ShowMoreLines } from '../components/ShowMoreLines.js';
 import { Notifications } from '../components/Notifications.js';
 import { TodoPanel } from '../components/TodoPanel.js';
+import { QueuedMessagesPanel } from '../components/QueuedMessagesPanel.js';
 import { Footer } from '../components/Footer.js';
 import { DialogManager } from '../components/DialogManager.js';
 import { BucketAuthConfirmation } from '../components/BucketAuthConfirmation.js';
-import { Composer } from '../components/Composer.js';
-import { LoadingIndicator } from '../components/LoadingIndicator.js';
-import { AutoAcceptIndicator } from '../components/AutoAcceptIndicator.js';
-import { ShellModeIndicator } from '../components/ShellModeIndicator.js';
-import { ContextSummaryDisplay } from '../components/ContextSummaryDisplay.js';
-import { DetailedMessagesDisplay } from '../components/DetailedMessagesDisplay.js';
+import { InlineContent } from './InlineContent.js';
 
 export type { ScrollableMainContentItem } from './scrollableMainContent.js';
 export {
@@ -52,7 +51,6 @@ export function hasActiveDialog(uiState: UIState): boolean {
   const dialogFlags = [
     uiState.showWorkspaceMigrationDialog,
     uiState.shouldShowIdePrompt,
-    uiState.showIdeRestartPrompt,
     uiState.isFolderTrustDialogOpen,
     uiState.isWelcomeDialogOpen,
     uiState.isPermissionsDialogOpen,
@@ -516,6 +514,8 @@ export interface MainControlsProps {
   history: HistoryItem[];
   inputWidth: number;
   isTodoPanelCollapsed: boolean;
+  isQueuedMessagesPanelCollapsed: boolean;
+  queuedSubmissions: readonly QueuedSubmission[];
   showTodoPanelSetting: boolean;
   dialogsVisible: boolean;
   hideContextSummary: boolean;
@@ -575,6 +575,11 @@ export function MainControls(props: MainControlsProps) {
         inputWidth={props.inputWidth}
         isTodoPanelCollapsed={props.isTodoPanelCollapsed}
       />
+      <QueuedMessagesPanelSection
+        inputWidth={props.inputWidth}
+        isQueuedMessagesPanelCollapsed={props.isQueuedMessagesPanelCollapsed}
+        queuedSubmissions={props.queuedSubmissions}
+      />
       <BucketAuthSection dialogsVisible={dialogsVisible} />
       {dialogsVisible ? (
         <DialogManager
@@ -634,164 +639,34 @@ function TodoPanelSection({
   return <TodoPanel width={inputWidth} collapsed={isTodoPanelCollapsed} />;
 }
 
-function BucketAuthSection({ dialogsVisible }: { dialogsVisible: boolean }) {
-  return (
-    <BucketAuthConfirmation
-      messageBus={
-        (getCliRuntimeContext() as { messageBus?: MessageBus }).messageBus
-      }
-      isFocused={!dialogsVisible}
-    />
-  );
-}
-
-export interface InlineContentProps {
-  streamingState: StreamingState;
-  disableLoadingPhrases: boolean;
-  thought: ThoughtSummary | null;
-  currentLoadingPhrase: string | undefined;
-  elapsedTime: number;
-  hideContextSummary: boolean;
-  isNarrow: boolean;
-  ctrlCPressedOnce: boolean;
-  ctrlDPressedOnce: boolean;
-  showEscapePrompt: boolean;
-  ideContextState: IdeContext | undefined;
-  llxprtMdFileCount: number;
-  coreMemoryFileCount: number;
-  contextFileNames: string[];
-  config: SlashCommandRuntime;
-  showToolDescriptions: boolean;
-  showAutoAcceptIndicator: ApprovalMode;
-  shellModeActive: boolean;
-  showErrorDetails: boolean;
-  consoleMessages: ConsoleMessageItem[];
-  constrainHeight: boolean;
-  debugConsoleMaxHeight: number;
+function QueuedMessagesPanelSection({
+  inputWidth,
+  isQueuedMessagesPanelCollapsed,
+  queuedSubmissions,
+}: {
   inputWidth: number;
-  isInputActive: boolean;
-  settings: LoadedSettings;
-  onSuggestionsVisibilityChange: (visible: boolean) => void;
-}
-
-export function InlineContent(props: InlineContentProps) {
-  return (
-    <>
-      <LoadingIndicator
-        thought={
-          props.streamingState === StreamingState.WaitingForConfirmation ||
-          props.disableLoadingPhrases
-            ? undefined
-            : props.thought
-        }
-        currentLoadingPhrase={
-          props.disableLoadingPhrases ? undefined : props.currentLoadingPhrase
-        }
-        elapsedTime={props.elapsedTime}
-      />
-      <StatusBar {...props} />
-      <ErrorConsoleSection {...props} />
-      <ComposerSection {...props} />
-    </>
-  );
-}
-
-function StatusBar(props: InlineContentProps) {
-  return (
-    <Box
-      marginTop={1}
-      display="flex"
-      justifyContent={props.hideContextSummary ? 'flex-start' : 'space-between'}
-      width="100%"
-    >
-      <StatusBarLeft {...props} />
-      <StatusBarRight {...props} />
-    </Box>
-  );
-}
-
-function StatusBarLeftPrompt(props: InlineContentProps) {
-  const transientPrompt = [
-    { active: props.ctrlCPressedOnce, text: 'Press Ctrl+C again to exit.' },
-    { active: props.ctrlDPressedOnce, text: 'Press Ctrl+D again to exit.' },
-  ].find((entry) => entry.active);
-  if (transientPrompt) {
-    return <Text color={Colors.AccentYellow}>{transientPrompt.text}</Text>;
-  }
-  if (props.showEscapePrompt) {
-    return <Text color={Colors.Gray}>Press Esc again to clear.</Text>;
-  }
-  if (!props.hideContextSummary) {
-    return (
-      <ContextSummaryDisplay
-        ideContext={props.ideContextState}
-        llxprtMdFileCount={props.llxprtMdFileCount}
-        coreMemoryFileCount={props.coreMemoryFileCount}
-        contextFileNames={props.contextFileNames}
-        mcpServers={props.config.getMcpServers()}
-        blockedMcpServers={props.config.getBlockedMcpServers()}
-        showToolDescriptions={props.showToolDescriptions}
-      />
-    );
-  }
-  return null;
-}
-
-function StatusBarLeft(props: InlineContentProps) {
-  return (
-    <Box>
-      {process.env.GEMINI_SYSTEM_MD && (
-        <Text color={Colors.AccentRed}>|&#x2310;&#x25A0;_&#x25A0;| </Text>
-      )}
-      <StatusBarLeftPrompt {...props} />
-    </Box>
-  );
-}
-
-function StatusBarRight(props: InlineContentProps) {
-  return (
-    <Box
-      paddingTop={props.isNarrow ? 1 : 0}
-      marginLeft={props.hideContextSummary ? 1 : 2}
-    >
-      {props.showAutoAcceptIndicator !== ApprovalMode.DEFAULT &&
-        !props.shellModeActive && (
-          <AutoAcceptIndicator approvalMode={props.showAutoAcceptIndicator} />
-        )}
-      {props.shellModeActive && <ShellModeIndicator />}
-    </Box>
-  );
-}
-
-function ErrorConsoleSection(props: InlineContentProps) {
-  if (!props.showErrorDetails) {
+  isQueuedMessagesPanelCollapsed: boolean;
+  queuedSubmissions: readonly QueuedSubmission[];
+}) {
+  if (queuedSubmissions.length === 0) {
     return null;
   }
   return (
-    <OverflowProvider>
-      <Box flexDirection="column">
-        <DetailedMessagesDisplay
-          messages={props.consoleMessages}
-          maxHeight={
-            props.constrainHeight ? props.debugConsoleMaxHeight : undefined
-          }
-          width={props.inputWidth}
-        />
-        <ShowMoreLines constrainHeight={props.constrainHeight} />
-      </Box>
-    </OverflowProvider>
+    <QueuedMessagesPanel
+      width={inputWidth}
+      collapsed={isQueuedMessagesPanelCollapsed}
+      messages={queuedSubmissions}
+    />
   );
 }
 
-function ComposerSection(props: InlineContentProps) {
-  if (!props.isInputActive) {
-    return null;
-  }
+function BucketAuthSection({ dialogsVisible }: { dialogsVisible: boolean }) {
   return (
-    <Composer
-      config={props.config}
-      settings={props.settings}
-      onSuggestionsVisibilityChange={props.onSuggestionsVisibilityChange}
+    <BucketAuthConfirmation
+      messageBus={
+        (getCliRuntimeContext() as { messageBus?: MessageBus }).messageBus
+      }
+      isFocused={!dialogsVisible}
     />
   );
 }

package/src/ui/layouts/InlineContent.tsx

@@ -0,0 +1,198 @@
+/**
+ * @license
+ * Copyright 2025 Vybestack LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Box, Text } from 'ink';
+import type { IdeContext, ThoughtSummary } from '@vybestack/llxprt-code-core';
+import { ApprovalMode } from '@vybestack/llxprt-code-core';
+import { StreamingState } from '../types.js';
+import type { ConsoleMessageItem } from '../types.js';
+import type { LoadedSettings } from '../../config/settings.js';
+import type { SlashCommandRuntime } from '../cliUiRuntime.js';
+import { OverflowProvider } from '../contexts/OverflowContext.js';
+import { Colors } from '../colors.js';
+import { ShowMoreLines } from '../components/ShowMoreLines.js';
+import { LoadingIndicator } from '../components/LoadingIndicator.js';
+import { AutoAcceptIndicator } from '../components/AutoAcceptIndicator.js';
+import { ShellModeIndicator } from '../components/ShellModeIndicator.js';
+import { ContextSummaryDisplay } from '../components/ContextSummaryDisplay.js';
+import { DetailedMessagesDisplay } from '../components/DetailedMessagesDisplay.js';
+import { Composer } from '../components/Composer.js';
+
+const CTRL_C_EXIT_PROMPT = 'Press Ctrl+C again to exit.';
+const CTRL_D_EXIT_PROMPT = 'Press Ctrl+D again to exit.';
+const ESCAPE_CLEAR_PROMPT = 'Press Esc again to clear.';
+const SYSTEM_MD_ENVIRONMENT_VARIABLE = 'GEMINI_SYSTEM_MD';
+
+function isSystemMdEnabled(): boolean {
+  return Boolean(process.env[SYSTEM_MD_ENVIRONMENT_VARIABLE]);
+}
+
+export interface InlineContentProps {
+  streamingState: StreamingState;
+  disableLoadingPhrases: boolean;
+  thought: ThoughtSummary | null;
+  currentLoadingPhrase: string | undefined;
+  elapsedTime: number;
+  hideContextSummary: boolean;
+  isNarrow: boolean;
+  ctrlCPressedOnce: boolean;
+  ctrlDPressedOnce: boolean;
+  showEscapePrompt: boolean;
+  ideContextState: IdeContext | undefined;
+  llxprtMdFileCount: number;
+  coreMemoryFileCount: number;
+  contextFileNames: string[];
+  config: SlashCommandRuntime;
+  showToolDescriptions: boolean;
+  showAutoAcceptIndicator: ApprovalMode;
+  shellModeActive: boolean;
+  showErrorDetails: boolean;
+  consoleMessages: ConsoleMessageItem[];
+  constrainHeight: boolean;
+  debugConsoleMaxHeight: number;
+  inputWidth: number;
+  isInputActive: boolean;
+  settings: LoadedSettings;
+  onSuggestionsVisibilityChange: (visible: boolean) => void;
+}
+
+export function InlineContent(props: InlineContentProps) {
+  const shouldHideThought =
+    props.streamingState === StreamingState.WaitingForConfirmation ||
+    props.disableLoadingPhrases;
+
+  return (
+    <>
+      <LoadingIndicator
+        thought={shouldHideThought ? undefined : props.thought}
+        currentLoadingPhrase={
+          props.disableLoadingPhrases ? undefined : props.currentLoadingPhrase
+        }
+        elapsedTime={props.elapsedTime}
+      />
+      <StatusBar {...props} />
+      <ErrorConsoleSection {...props} />
+      <ComposerSection {...props} />
+    </>
+  );
+}
+
+function StatusBar(props: InlineContentProps) {
+  return (
+    <Box
+      marginTop={1}
+      display="flex"
+      justifyContent={props.hideContextSummary ? 'flex-start' : 'space-between'}
+      width="100%"
+    >
+      <StatusBarLeft {...props} />
+      <StatusBarRight {...props} />
+    </Box>
+  );
+}
+
+function StatusBarLeftPrompt(props: InlineContentProps) {
+  // Exit confirmations take precedence over clearing feedback and context status.
+  if (props.ctrlCPressedOnce) {
+    return <Text color={Colors.AccentYellow}>{CTRL_C_EXIT_PROMPT}</Text>;
+  }
+  if (props.ctrlDPressedOnce) {
+    return <Text color={Colors.AccentYellow}>{CTRL_D_EXIT_PROMPT}</Text>;
+  }
+  if (props.showEscapePrompt) {
+    return <Text color={Colors.Gray}>{ESCAPE_CLEAR_PROMPT}</Text>;
+  }
+  if (!props.hideContextSummary) {
+    return (
+      <ContextSummaryDisplay
+        ideContext={props.ideContextState}
+        llxprtMdFileCount={props.llxprtMdFileCount}
+        coreMemoryFileCount={props.coreMemoryFileCount}
+        contextFileNames={props.contextFileNames}
+        mcpServers={props.config.getMcpServers()}
+        blockedMcpServers={props.config.getBlockedMcpServers()}
+        showToolDescriptions={props.showToolDescriptions}
+      />
+    );
+  }
+  return null;
+}
+
+function StatusBarLeft(props: InlineContentProps) {
+  const showSystemMdIndicator = isSystemMdEnabled();
+  const showPrompt =
+    props.ctrlCPressedOnce ||
+    props.ctrlDPressedOnce ||
+    props.showEscapePrompt ||
+    !props.hideContextSummary;
+  if (!showSystemMdIndicator && !showPrompt) {
+    return null;
+  }
+
+  return (
+    <Box>
+      {showSystemMdIndicator && (
+        <Text color={Colors.AccentRed}>|&#x2310;&#x25A0;_&#x25A0;| </Text>
+      )}
+      <StatusBarLeftPrompt {...props} />
+    </Box>
+  );
+}
+
+function StatusBarRight(props: InlineContentProps) {
+  if (
+    props.showAutoAcceptIndicator === ApprovalMode.DEFAULT &&
+    !props.shellModeActive
+  ) {
+    return null;
+  }
+  const shouldShowAutoAcceptIndicator = !props.shellModeActive;
+
+  return (
+    <Box
+      paddingTop={props.isNarrow ? 1 : 0}
+      marginLeft={props.hideContextSummary ? 1 : 2}
+    >
+      {shouldShowAutoAcceptIndicator && (
+        <AutoAcceptIndicator approvalMode={props.showAutoAcceptIndicator} />
+      )}
+      {props.shellModeActive && <ShellModeIndicator />}
+    </Box>
+  );
+}
+
+function ErrorConsoleSection(props: InlineContentProps) {
+  if (!props.showErrorDetails) {
+    return null;
+  }
+  return (
+    <OverflowProvider>
+      <Box flexDirection="column">
+        <DetailedMessagesDisplay
+          messages={props.consoleMessages}
+          maxHeight={
+            props.constrainHeight ? props.debugConsoleMaxHeight : undefined
+          }
+          width={props.inputWidth}
+        />
+        <ShowMoreLines constrainHeight={props.constrainHeight} />
+      </Box>
+    </OverflowProvider>
+  );
+}
+
+function ComposerSection(props: InlineContentProps) {
+  if (!props.isInputActive) {
+    return null;
+  }
+  return (
+    <Composer
+      config={props.config}
+      settings={props.settings}
+      onSuggestionsVisibilityChange={props.onSuggestionsVisibilityChange}
+    />
+  );
+}

package/src/ui/trustDialogHelpers.ts

@@ -0,0 +1,190 @@
+/**
+ * @license
+ * Copyright 2025 Vybestack LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { TrustLevel } from '../config/trustedFolders.js';
+import type { RadioSelectItem } from './components/shared/RadioButtonSelect.js';
+
+export enum FolderTrustChoice {
+  TRUST_FOLDER = 'trust_folder',
+  TRUST_PARENT = 'trust_parent',
+  DO_NOT_TRUST = 'do_not_trust',
+}
+
+function buildTrustRadioOptions<T extends string>(
+  currentFolder: string,
+  parentFolder: string,
+  values: {
+    readonly trustFolder: T;
+    readonly trustParent: T;
+    readonly doNotTrust: T;
+  },
+): Array<RadioSelectItem<T>> {
+  return [
+    {
+      label: `Trust folder (${currentFolder})`,
+      value: values.trustFolder,
+      key: values.trustFolder,
+    },
+    {
+      label: `Trust parent folder (${parentFolder})`,
+      value: values.trustParent,
+      key: values.trustParent,
+    },
+    {
+      label: "Don't trust",
+      value: values.doNotTrust,
+      key: values.doNotTrust,
+    },
+  ];
+}
+
+export function buildTrustOptions(
+  currentFolder: string,
+  parentFolder: string,
+): Array<RadioSelectItem<FolderTrustChoice>> {
+  return buildTrustRadioOptions(currentFolder, parentFolder, {
+    trustFolder: FolderTrustChoice.TRUST_FOLDER,
+    trustParent: FolderTrustChoice.TRUST_PARENT,
+    doNotTrust: FolderTrustChoice.DO_NOT_TRUST,
+  });
+}
+
+export function getLocalTrustLevelDisplay(
+  level: TrustLevel | undefined,
+): string {
+  switch (level) {
+    case TrustLevel.TRUST_FOLDER:
+      return 'Trusted';
+    case TrustLevel.TRUST_PARENT:
+      return 'Trust parent';
+    case TrustLevel.DO_NOT_TRUST:
+      return 'Not trusted';
+    default:
+      return 'Not set';
+  }
+}
+
+export function getTrustLevelDisplay(
+  level: TrustLevel | undefined,
+  isIdeTrusted: boolean | undefined,
+  isParentTrusted: boolean | undefined,
+): string {
+  if (isIdeTrusted !== undefined) {
+    return isIdeTrusted ? 'Trusted (via IDE)' : 'Not trusted (via IDE)';
+  }
+  const localDisplay = getLocalTrustLevelDisplay(level);
+  if (isParentTrusted === true) {
+    return level === undefined
+      ? 'Trusted (via parent folder)'
+      : `${localDisplay} (via parent folder)`;
+  }
+  return localDisplay;
+}
+
+export function getWarningMessage(
+  isIdeTrusted: boolean | undefined,
+  isParentTrusted: boolean | undefined,
+  currentTrustLevel: TrustLevel | undefined,
+): string | null {
+  if (isIdeTrusted !== undefined) {
+    const status = isIdeTrusted ? 'trusted' : 'not trusted';
+    return `This folder is ${status} via your IDE settings. Changes here save a local fallback for use without the IDE.`;
+  }
+  if (isParentTrusted === true) {
+    if (currentTrustLevel === TrustLevel.DO_NOT_TRUST) {
+      return 'This folder is not trusted because a parent folder rule denies trust.';
+    }
+    return 'This folder is trusted via a parent folder setting. You can override it with a more specific rule.';
+  }
+  return null;
+}
+
+export function getTrustUpdateDisplay(
+  committedTrustLevel: TrustLevel | undefined,
+  effectiveTrust: boolean | undefined,
+  isIdeTrusted: boolean | undefined,
+  isParentTrusted: boolean | undefined,
+): { savedLocalFallback: string; effectiveNow: string } {
+  let effectiveTrustLevel: TrustLevel | undefined;
+  if (effectiveTrust !== undefined) {
+    effectiveTrustLevel = effectiveTrust
+      ? TrustLevel.TRUST_FOLDER
+      : TrustLevel.DO_NOT_TRUST;
+  }
+  return {
+    savedLocalFallback: getLocalTrustLevelDisplay(committedTrustLevel),
+    effectiveNow: getTrustLevelDisplay(
+      effectiveTrustLevel,
+      isIdeTrusted,
+      isParentTrusted,
+    ),
+  };
+}
+
+function flattenErrorDetails(error: unknown): string[] {
+  if (error instanceof AggregateError) {
+    return error.errors.flatMap(flattenErrorDetails);
+  }
+  return [error instanceof Error ? error.message : String(error)];
+}
+
+export function combineTrustUpdateFailure(
+  error: unknown,
+  rollbackFailures: readonly unknown[],
+  aggregateMessage: string,
+): { error: unknown; rollbackSucceeded: boolean } {
+  if (rollbackFailures.length === 0) {
+    return { error, rollbackSucceeded: true };
+  }
+  return {
+    error: new AggregateError([error, ...rollbackFailures], aggregateMessage),
+    rollbackSucceeded: false,
+  };
+}
+
+export function getTrustCommitErrorMessage(
+  phase: 'persistence' | 'live',
+  error: unknown,
+  rollbackSucceeded = true,
+): string {
+  const detail = flattenErrorDetails(error).join('; ');
+  if (phase === 'persistence') {
+    return rollbackSucceeded
+      ? `Failed to save trust settings: ${detail}`
+      : `Failed to save trust settings and rollback was incomplete: ${detail}`;
+  }
+  return rollbackSucceeded
+    ? `Trust settings could not be applied live, so the saved setting was restored: ${detail}`
+    : `Trust settings could not be applied live and rollback was incomplete: ${detail}`;
+}
+
+export function shouldDismissTrustDialog(
+  showUpdatedPrompt: boolean,
+  keyName: string,
+): boolean {
+  return keyName === 'escape' || (showUpdatedPrompt && keyName === 'return');
+}
+
+export function buildTrustLevelOptions(
+  folderName: string,
+  parentFolderName: string,
+): Array<RadioSelectItem<TrustLevel>> {
+  return buildTrustRadioOptions(folderName, parentFolderName, {
+    trustFolder: TrustLevel.TRUST_FOLDER,
+    trustParent: TrustLevel.TRUST_PARENT,
+    doNotTrust: TrustLevel.DO_NOT_TRUST,
+  });
+}
+
+export function findInitialTrustOptionIndex(
+  options: Array<RadioSelectItem<TrustLevel>>,
+  currentTrustLevel: TrustLevel | undefined,
+): number {
+  const index = options.findIndex(
+    (option) => option.value === currentTrustLevel,
+  );
+  return index >= 0 ? index : 0;
+}