Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/cli/commands/deploy/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,15 +22,6 @@ function handleDeployTUI(options: { autoConfirm?: boolean } = {}): void {
unmount();
process.exit(0);
}}
onShellCommand={command => {
unmount();
if (command) {
console.log(`\nRun: ${command}\n`);
} else {
console.log('\nSet your AWS credentials and re-run `agentcore deploy`\n');
}
process.exit(0);
}}
/>
);
}
Expand Down
9 changes: 0 additions & 9 deletions src/cli/commands/plan/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,15 +21,6 @@ function handlePlanTUI(options: TUIOptions = {}): void {
unmount();
process.exit(0);
}}
onShellCommand={command => {
unmount();
if (command) {
console.log(`\nRun: ${command}\n`);
} else {
console.log('\nSet your AWS credentials and re-run `agentcore plan`\n');
}
process.exit(0);
}}
/>
);
}
Expand Down
22 changes: 3 additions & 19 deletions src/cli/tui/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
import { getWorkingDirectory } from '../../lib';
import { createProgram } from '../cli';
import { destroyShell, warmupShell } from '../shell';
import { LayoutProvider } from './context';
import { MissingProjectMessage, projectExists } from './guards';
import { PlaceholderScreen } from './screens/PlaceholderScreen';
Expand All@@ -21,13 +20,13 @@ import { StatusScreen } from './screens/status/StatusScreen';
import { UpdateScreen } from './screens/update';
import { ValidateScreen } from './screens/validate';
import { type CommandMeta, getCommandsForUI } from './utils/commands';
import React, { useEffect, useState } from 'react';
import React, { useState } from 'react';

// Capture cwd once at app initialization
const cwd = getWorkingDirectory();

type Route =
| { name: 'home'; initialShellCommand?: string; returnTo?: 'deploy' | 'plan' }
| { name: 'home' }
| { name: 'help'; initialQuery?: string }
| { name: 'command'; command: CommandMeta }
| { name: 'dev' }
Expand All@@ -52,12 +51,6 @@ function AppContent() {
const [route, setRoute] = useState<Route>(initialRoute);
const [helpNotice, setHelpNotice] = useState<React.ReactNode | null>(null);

// Pre-warm shell during idle time (sources config once)
useEffect(() => {
warmupShell();
return () => destroyShell();
}, []);

// Get commands from commander program
const program = createProgram();
const commands = getCommandsForUI(program);
Expand DownExpand Up@@ -114,10 +107,8 @@ function AppContent() {
<HomeScreen
cwd={cwd}
version={program.version() ?? '0.0.0'}
initialShellCommand={route.initialShellCommand}
onShowHelp={initialQuery => setRoute({ name: 'help', initialQuery })}
onSelectCreate={() => setRoute({ name: 'create' })}
onShellComplete={route.returnTo ? () => setRoute({ name: route.returnTo } as Route) : undefined}
/>
);
}
Expand DownExpand Up@@ -147,7 +138,6 @@ function AppContent() {
<DeployScreen
isInteractive={true}
onExit={() => setRoute({ name: 'home' })}
onShellCommand={cmd => setRoute({ name: 'home', initialShellCommand: cmd, returnTo: 'deploy' })}
onNavigate={command => setRoute({ name: command } as Route)}
/>
);
Expand All@@ -166,13 +156,7 @@ function AppContent() {
}

if (route.name === 'plan') {
return (
<PlanScreen
isInteractive={true}
onExit={() => setRoute({ name: 'home' })}
onShellCommand={cmd => setRoute({ name: 'home', initialShellCommand: cmd, returnTo: 'plan' })}
/>
);
return <PlanScreen isInteractive={true} onExit={() => setRoute({ name: 'home' })} />;
}

if (route.name === 'edit') {
Expand Down
2 changes: 1 addition & 1 deletion src/cli/tui/screens/agent/AddAgentScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ export function AddAgentScreen({ existingAgentNames, onComplete, onExit }: AddAg
const byoCurrentIndex = byoSteps.indexOf(byoStep);

// BYO language options (include "Other" for BYO path)
const languageItems: SelectableItem[] = useMemo(() => LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: o.disabled })), []);
const languageItems: SelectableItem[] = useMemo(() => LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: 'disabled' in o ? o.disabled : undefined })), []);

const frameworkItems: SelectableItem[] = useMemo(
() => FRAMEWORK_OPTIONS.map(o => ({ id: o.id, title: o.title, description: o.description })),
Expand Down
2 changes: 1 addition & 1 deletion src/cli/tui/screens/generate/GenerateWizardUI.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ export function GenerateWizardUI({ wizard, onBack, onConfirm, isActive }: Genera
const getItems = (): SelectableItem[] => {
switch (wizard.step) {
case 'language':
return LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: o.disabled }));
return LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: 'disabled' in o ? o.disabled : undefined }));
case 'sdk':
return SDK_OPTIONS.map(o => ({ id: o.id, title: o.title, description: o.description }));
case 'modelProvider':
Expand Down
143 changes: 48 additions & 95 deletions src/cli/tui/screens/home/HelpScreen.tsx
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
import {
Cursor,
ScreenLayout,
ShellCommandText,
ShellEscapeContainer,
ShellPrompt,
useShellContext,
} from '../../components';
import { Cursor, ScreenLayout } from '../../components';
import { useLayout } from '../../context';
import { HINTS } from '../../copy';
import { useTextInput } from '../../hooks';
import type { CommandMeta } from '../../utils/commands';
import { Box, Text, useInput } from 'ink';
import React, { useMemo } from 'react';
import React, { useMemo, useState } from 'react';

const MAX_DESC_WIDTH = 50;

Expand All@@ -34,7 +27,6 @@ interface HelpDisplayProps {
}

function HelpDisplay({ items, query, cursor, clampedIndex, notice }: HelpDisplayProps) {
const { isActive } = useShellContext();
const { contentWidth } = useLayout();
const divider = '─'.repeat(contentWidth);

Expand All@@ -45,88 +37,76 @@ function HelpDisplay({ items, query, cursor, clampedIndex, notice }: HelpDisplay
Commands
</Text>

{/* Input line - changes based on shell mode */}
{/* Input line */}
<Box marginTop={1} flexShrink={0}>
<ShellPrompt />
{isActive ? (
<ShellCommandText />
<Text color="cyan">&gt; </Text>
<Text>{query.slice(0, cursor)}</Text>
<Cursor />
<Text>{query.slice(cursor)}</Text>
</Box>

{/* Commands list */}
<Box marginTop={1} flexDirection="column">
{items.length === 0 ? (
<Box flexDirection="column">
<Text dimColor>No commands match &quot;{query}&quot;</Text>
<Text dimColor>Esc to clear</Text>
</Box>
) : (
<>
<Text>{query.slice(0, cursor)}</Text>
<Cursor />
<Text>{query.slice(cursor)}</Text>
</>
items.map((item, idx) => {
const selected = idx === clampedIndex;
const itemKey = item.matchedSubcommand ? `${item.command.id}-${item.matchedSubcommand}` : item.command.id;
const desc = truncateDescription(item.command.description, MAX_DESC_WIDTH);
return (
<Box key={itemKey}>
<Text color={selected ? 'cyan' : 'white'}>{selected ? '❯' : ' '} </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.command.title}
</Text>
{item.matchedSubcommand && (
<>
<Text dimColor> → </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.matchedSubcommand}
</Text>
</>
)}
<Text dimColor> {desc}</Text>
</Box>
);
})
)}
</Box>

{/* Commands list - only visible when NOT in shell mode */}
{!isActive && (
<Box marginTop={1} flexDirection="column">
{items.length === 0 ? (
<Box flexDirection="column">
<Text dimColor>No commands match &quot;{query}&quot;</Text>
<Text dimColor>Esc to clear</Text>
</Box>
) : (
items.map((item, idx) => {
const selected = idx === clampedIndex;
const itemKey = item.matchedSubcommand ? `${item.command.id}-${item.matchedSubcommand}` : item.command.id;
const desc = truncateDescription(item.command.description, MAX_DESC_WIDTH);
return (
<Box key={itemKey}>
<Text color={selected ? 'cyan' : 'white'}>{selected ? '❯' : ' '} </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.command.title}
</Text>
{item.matchedSubcommand && (
<>
<Text dimColor> → </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.matchedSubcommand}
</Text>
</>
)}
<Text dimColor> {desc}</Text>
</Box>
);
})
)}
</Box>
)}

{!isActive && notice && <Box marginTop={1}>{notice}</Box>}
{notice && <Box marginTop={1}>{notice}</Box>}

{/* Divider and hints at bottom */}
{!isActive && (
<Box marginTop={1} flexDirection="column">
<Text dimColor>{divider}</Text>
<Text dimColor>{HINTS.COMMANDS}</Text>
</Box>
)}
<Box marginTop={1} flexDirection="column">
<Text dimColor>{divider}</Text>
<Text dimColor>{HINTS.COMMANDS}</Text>
</Box>
</Box>
);
}

interface HelpContentProps {
export function HelpScreen(props: {
commands: CommandMeta[];
initialQuery?: string;
notice?: React.ReactNode;
onNoticeDismiss?: () => void;
onSelect: (id: string) => void;
onBack: () => void;
}

function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect, onBack }: HelpContentProps) {
const { isActive } = useShellContext();
const [index, setIndex] = React.useState(0);
}) {
const { commands, initialQuery, notice, onNoticeDismiss, onSelect, onBack } = props;
const [index, setIndex] = useState(0);

const {
value: query,
cursor,
clear,
} = useTextInput({
initialValue: initialQuery ?? '',
isActive: !isActive,
isActive: true,
});

const items = useMemo((): DisplayItem[] => {
Expand DownExpand Up@@ -162,11 +142,6 @@ function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect
const clampedIndex = Math.min(index, Math.max(0, items.length - 1));

useInput((input, key) => {
// When shell mode is active, don't handle normal screen input
if (isActive) {
return;
}

if (notice && onNoticeDismiss) {
onNoticeDismiss();
}
Expand DownExpand Up@@ -203,25 +178,3 @@ function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect
</ScreenLayout>
);
}

export function HelpScreen(props: {
commands: CommandMeta[];
initialQuery?: string;
notice?: React.ReactNode;
onNoticeDismiss?: () => void;
onSelect: (id: string) => void;
onBack: () => void;
}) {
return (
<ShellEscapeContainer>
<HelpContent
commands={props.commands}
initialQuery={props.initialQuery}
notice={props.notice}
onNoticeDismiss={props.onNoticeDismiss}
onSelect={props.onSelect}
onBack={props.onBack}
/>
</ShellEscapeContainer>
);
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix: remove broken shell mode in help screen which i recently rebased and took in removed dependencies by aidandaly24 · Pull Request #31 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/cli/commands/deploy/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,15 +22,6 @@ function handleDeployTUI(options: { autoConfirm?: boolean } = {}): void {
unmount();
process.exit(0);
}}
onShellCommand={command => {
unmount();
if (command) {
console.log(`\nRun: ${command}\n`);
} else {
console.log('\nSet your AWS credentials and re-run `agentcore deploy`\n');
}
process.exit(0);
}}
/>
);
}
Expand Down
9 changes: 0 additions & 9 deletions src/cli/commands/plan/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,15 +21,6 @@ function handlePlanTUI(options: TUIOptions = {}): void {
unmount();
process.exit(0);
}}
onShellCommand={command => {
unmount();
if (command) {
console.log(`\nRun: ${command}\n`);
} else {
console.log('\nSet your AWS credentials and re-run `agentcore plan`\n');
}
process.exit(0);
}}
/>
);
}
Expand Down
22 changes: 3 additions & 19 deletions src/cli/tui/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
import { getWorkingDirectory } from '../../lib';
import { createProgram } from '../cli';
import { destroyShell, warmupShell } from '../shell';
import { LayoutProvider } from './context';
import { MissingProjectMessage, projectExists } from './guards';
import { PlaceholderScreen } from './screens/PlaceholderScreen';
Expand All@@ -21,13 +20,13 @@ import { StatusScreen } from './screens/status/StatusScreen';
import { UpdateScreen } from './screens/update';
import { ValidateScreen } from './screens/validate';
import { type CommandMeta, getCommandsForUI } from './utils/commands';
import React, { useEffect, useState } from 'react';
import React, { useState } from 'react';

// Capture cwd once at app initialization
const cwd = getWorkingDirectory();

type Route =
| { name: 'home'; initialShellCommand?: string; returnTo?: 'deploy' | 'plan' }
| { name: 'home' }
| { name: 'help'; initialQuery?: string }
| { name: 'command'; command: CommandMeta }
| { name: 'dev' }
Expand All@@ -52,12 +51,6 @@ function AppContent() {
const [route, setRoute] = useState<Route>(initialRoute);
const [helpNotice, setHelpNotice] = useState<React.ReactNode | null>(null);

// Pre-warm shell during idle time (sources config once)
useEffect(() => {
warmupShell();
return () => destroyShell();
}, []);

// Get commands from commander program
const program = createProgram();
const commands = getCommandsForUI(program);
Expand DownExpand Up@@ -114,10 +107,8 @@ function AppContent() {
<HomeScreen
cwd={cwd}
version={program.version() ?? '0.0.0'}
initialShellCommand={route.initialShellCommand}
onShowHelp={initialQuery => setRoute({ name: 'help', initialQuery })}
onSelectCreate={() => setRoute({ name: 'create' })}
onShellComplete={route.returnTo ? () => setRoute({ name: route.returnTo } as Route) : undefined}
/>
);
}
Expand DownExpand Up@@ -147,7 +138,6 @@ function AppContent() {
<DeployScreen
isInteractive={true}
onExit={() => setRoute({ name: 'home' })}
onShellCommand={cmd => setRoute({ name: 'home', initialShellCommand: cmd, returnTo: 'deploy' })}
onNavigate={command => setRoute({ name: command } as Route)}
/>
);
Expand All@@ -166,13 +156,7 @@ function AppContent() {
}

if (route.name === 'plan') {
return (
<PlanScreen
isInteractive={true}
onExit={() => setRoute({ name: 'home' })}
onShellCommand={cmd => setRoute({ name: 'home', initialShellCommand: cmd, returnTo: 'plan' })}
/>
);
return <PlanScreen isInteractive={true} onExit={() => setRoute({ name: 'home' })} />;
}

if (route.name === 'edit') {
Expand Down
2 changes: 1 addition & 1 deletion src/cli/tui/screens/agent/AddAgentScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ export function AddAgentScreen({ existingAgentNames, onComplete, onExit }: AddAg
const byoCurrentIndex = byoSteps.indexOf(byoStep);

// BYO language options (include "Other" for BYO path)
const languageItems: SelectableItem[] = useMemo(() => LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: o.disabled })), []);
const languageItems: SelectableItem[] = useMemo(() => LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: 'disabled' in o ? o.disabled : undefined })), []);

const frameworkItems: SelectableItem[] = useMemo(
() => FRAMEWORK_OPTIONS.map(o => ({ id: o.id, title: o.title, description: o.description })),
Expand Down
2 changes: 1 addition & 1 deletion src/cli/tui/screens/generate/GenerateWizardUI.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ export function GenerateWizardUI({ wizard, onBack, onConfirm, isActive }: Genera
const getItems = (): SelectableItem[] => {
switch (wizard.step) {
case 'language':
return LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: o.disabled }));
return LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: 'disabled' in o ? o.disabled : undefined }));
case 'sdk':
return SDK_OPTIONS.map(o => ({ id: o.id, title: o.title, description: o.description }));
case 'modelProvider':
Expand Down
143 changes: 48 additions & 95 deletions src/cli/tui/screens/home/HelpScreen.tsx
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
import {
Cursor,
ScreenLayout,
ShellCommandText,
ShellEscapeContainer,
ShellPrompt,
useShellContext,
} from '../../components';
import { Cursor, ScreenLayout } from '../../components';
import { useLayout } from '../../context';
import { HINTS } from '../../copy';
import { useTextInput } from '../../hooks';
import type { CommandMeta } from '../../utils/commands';
import { Box, Text, useInput } from 'ink';
import React, { useMemo } from 'react';
import React, { useMemo, useState } from 'react';

const MAX_DESC_WIDTH = 50;

Expand All@@ -34,7 +27,6 @@ interface HelpDisplayProps {
}

function HelpDisplay({ items, query, cursor, clampedIndex, notice }: HelpDisplayProps) {
const { isActive } = useShellContext();
const { contentWidth } = useLayout();
const divider = '─'.repeat(contentWidth);

Expand All@@ -45,88 +37,76 @@ function HelpDisplay({ items, query, cursor, clampedIndex, notice }: HelpDisplay
Commands
</Text>

{/* Input line - changes based on shell mode */}
{/* Input line */}
<Box marginTop={1} flexShrink={0}>
<ShellPrompt />
{isActive ? (
<ShellCommandText />
<Text color="cyan">&gt; </Text>
<Text>{query.slice(0, cursor)}</Text>
<Cursor />
<Text>{query.slice(cursor)}</Text>
</Box>

{/* Commands list */}
<Box marginTop={1} flexDirection="column">
{items.length === 0 ? (
<Box flexDirection="column">
<Text dimColor>No commands match &quot;{query}&quot;</Text>
<Text dimColor>Esc to clear</Text>
</Box>
) : (
<>
<Text>{query.slice(0, cursor)}</Text>
<Cursor />
<Text>{query.slice(cursor)}</Text>
</>
items.map((item, idx) => {
const selected = idx === clampedIndex;
const itemKey = item.matchedSubcommand ? `${item.command.id}-${item.matchedSubcommand}` : item.command.id;
const desc = truncateDescription(item.command.description, MAX_DESC_WIDTH);
return (
<Box key={itemKey}>
<Text color={selected ? 'cyan' : 'white'}>{selected ? '❯' : ' '} </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.command.title}
</Text>
{item.matchedSubcommand && (
<>
<Text dimColor> → </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.matchedSubcommand}
</Text>
</>
)}
<Text dimColor> {desc}</Text>
</Box>
);
})
)}
</Box>

{/* Commands list - only visible when NOT in shell mode */}
{!isActive && (
<Box marginTop={1} flexDirection="column">
{items.length === 0 ? (
<Box flexDirection="column">
<Text dimColor>No commands match &quot;{query}&quot;</Text>
<Text dimColor>Esc to clear</Text>
</Box>
) : (
items.map((item, idx) => {
const selected = idx === clampedIndex;
const itemKey = item.matchedSubcommand ? `${item.command.id}-${item.matchedSubcommand}` : item.command.id;
const desc = truncateDescription(item.command.description, MAX_DESC_WIDTH);
return (
<Box key={itemKey}>
<Text color={selected ? 'cyan' : 'white'}>{selected ? '❯' : ' '} </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.command.title}
</Text>
{item.matchedSubcommand && (
<>
<Text dimColor> → </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.matchedSubcommand}
</Text>
</>
)}
<Text dimColor> {desc}</Text>
</Box>
);
})
)}
</Box>
)}

{!isActive && notice && <Box marginTop={1}>{notice}</Box>}
{notice && <Box marginTop={1}>{notice}</Box>}

{/* Divider and hints at bottom */}
{!isActive && (
<Box marginTop={1} flexDirection="column">
<Text dimColor>{divider}</Text>
<Text dimColor>{HINTS.COMMANDS}</Text>
</Box>
)}
<Box marginTop={1} flexDirection="column">
<Text dimColor>{divider}</Text>
<Text dimColor>{HINTS.COMMANDS}</Text>
</Box>
</Box>
);
}

interface HelpContentProps {
export function HelpScreen(props: {
commands: CommandMeta[];
initialQuery?: string;
notice?: React.ReactNode;
onNoticeDismiss?: () => void;
onSelect: (id: string) => void;
onBack: () => void;
}

function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect, onBack }: HelpContentProps) {
const { isActive } = useShellContext();
const [index, setIndex] = React.useState(0);
}) {
const { commands, initialQuery, notice, onNoticeDismiss, onSelect, onBack } = props;
const [index, setIndex] = useState(0);

const {
value: query,
cursor,
clear,
} = useTextInput({
initialValue: initialQuery ?? '',
isActive: !isActive,
isActive: true,
});

const items = useMemo((): DisplayItem[] => {
Expand DownExpand Up@@ -162,11 +142,6 @@ function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect
const clampedIndex = Math.min(index, Math.max(0, items.length - 1));

useInput((input, key) => {
// When shell mode is active, don't handle normal screen input
if (isActive) {
return;
}

if (notice && onNoticeDismiss) {
onNoticeDismiss();
}
Expand DownExpand Up@@ -203,25 +178,3 @@ function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect
</ScreenLayout>
);
}

export function HelpScreen(props: {
commands: CommandMeta[];
initialQuery?: string;
notice?: React.ReactNode;
onNoticeDismiss?: () => void;
onSelect: (id: string) => void;
onBack: () => void;
}) {
return (
<ShellEscapeContainer>
<HelpContent
commands={props.commands}
initialQuery={props.initialQuery}
notice={props.notice}
onNoticeDismiss={props.onNoticeDismiss}
onSelect={props.onSelect}
onBack={props.onBack}
/>
</ShellEscapeContainer>
);
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: remove broken shell mode in help screen which i recently rebased and took in removed dependencies by aidandaly24 · Pull Request #31 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/cli/commands/deploy/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,15 +22,6 @@ function handleDeployTUI(options: { autoConfirm?: boolean } = {}): void {
unmount();
process.exit(0);
}}
onShellCommand={command => {
unmount();
if (command) {
console.log(`\nRun: ${command}\n`);
} else {
console.log('\nSet your AWS credentials and re-run `agentcore deploy`\n');
}
process.exit(0);
}}
/>
);
}
Expand Down
9 changes: 0 additions & 9 deletions src/cli/commands/plan/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,15 +21,6 @@ function handlePlanTUI(options: TUIOptions = {}): void {
unmount();
process.exit(0);
}}
onShellCommand={command => {
unmount();
if (command) {
console.log(`\nRun: ${command}\n`);
} else {
console.log('\nSet your AWS credentials and re-run `agentcore plan`\n');
}
process.exit(0);
}}
/>
);
}
Expand Down
22 changes: 3 additions & 19 deletions src/cli/tui/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
import { getWorkingDirectory } from '../../lib';
import { createProgram } from '../cli';
import { destroyShell, warmupShell } from '../shell';
import { LayoutProvider } from './context';
import { MissingProjectMessage, projectExists } from './guards';
import { PlaceholderScreen } from './screens/PlaceholderScreen';
Expand All@@ -21,13 +20,13 @@ import { StatusScreen } from './screens/status/StatusScreen';
import { UpdateScreen } from './screens/update';
import { ValidateScreen } from './screens/validate';
import { type CommandMeta, getCommandsForUI } from './utils/commands';
import React, { useEffect, useState } from 'react';
import React, { useState } from 'react';

// Capture cwd once at app initialization
const cwd = getWorkingDirectory();

type Route =
| { name: 'home'; initialShellCommand?: string; returnTo?: 'deploy' | 'plan' }
| { name: 'home' }
| { name: 'help'; initialQuery?: string }
| { name: 'command'; command: CommandMeta }
| { name: 'dev' }
Expand All@@ -52,12 +51,6 @@ function AppContent() {
const [route, setRoute] = useState<Route>(initialRoute);
const [helpNotice, setHelpNotice] = useState<React.ReactNode | null>(null);

// Pre-warm shell during idle time (sources config once)
useEffect(() => {
warmupShell();
return () => destroyShell();
}, []);

// Get commands from commander program
const program = createProgram();
const commands = getCommandsForUI(program);
Expand DownExpand Up@@ -114,10 +107,8 @@ function AppContent() {
<HomeScreen
cwd={cwd}
version={program.version() ?? '0.0.0'}
initialShellCommand={route.initialShellCommand}
onShowHelp={initialQuery => setRoute({ name: 'help', initialQuery })}
onSelectCreate={() => setRoute({ name: 'create' })}
onShellComplete={route.returnTo ? () => setRoute({ name: route.returnTo } as Route) : undefined}
/>
);
}
Expand DownExpand Up@@ -147,7 +138,6 @@ function AppContent() {
<DeployScreen
isInteractive={true}
onExit={() => setRoute({ name: 'home' })}
onShellCommand={cmd => setRoute({ name: 'home', initialShellCommand: cmd, returnTo: 'deploy' })}
onNavigate={command => setRoute({ name: command } as Route)}
/>
);
Expand All@@ -166,13 +156,7 @@ function AppContent() {
}

if (route.name === 'plan') {
return (
<PlanScreen
isInteractive={true}
onExit={() => setRoute({ name: 'home' })}
onShellCommand={cmd => setRoute({ name: 'home', initialShellCommand: cmd, returnTo: 'plan' })}
/>
);
return <PlanScreen isInteractive={true} onExit={() => setRoute({ name: 'home' })} />;
}

if (route.name === 'edit') {
Expand Down
2 changes: 1 addition & 1 deletion src/cli/tui/screens/agent/AddAgentScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ export function AddAgentScreen({ existingAgentNames, onComplete, onExit }: AddAg
const byoCurrentIndex = byoSteps.indexOf(byoStep);

// BYO language options (include "Other" for BYO path)
const languageItems: SelectableItem[] = useMemo(() => LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: o.disabled })), []);
const languageItems: SelectableItem[] = useMemo(() => LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: 'disabled' in o ? o.disabled : undefined })), []);

const frameworkItems: SelectableItem[] = useMemo(
() => FRAMEWORK_OPTIONS.map(o => ({ id: o.id, title: o.title, description: o.description })),
Expand Down
2 changes: 1 addition & 1 deletion src/cli/tui/screens/generate/GenerateWizardUI.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ export function GenerateWizardUI({ wizard, onBack, onConfirm, isActive }: Genera
const getItems = (): SelectableItem[] => {
switch (wizard.step) {
case 'language':
return LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: o.disabled }));
return LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: 'disabled' in o ? o.disabled : undefined }));
case 'sdk':
return SDK_OPTIONS.map(o => ({ id: o.id, title: o.title, description: o.description }));
case 'modelProvider':
Expand Down
143 changes: 48 additions & 95 deletions src/cli/tui/screens/home/HelpScreen.tsx
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
import {
Cursor,
ScreenLayout,
ShellCommandText,
ShellEscapeContainer,
ShellPrompt,
useShellContext,
} from '../../components';
import { Cursor, ScreenLayout } from '../../components';
import { useLayout } from '../../context';
import { HINTS } from '../../copy';
import { useTextInput } from '../../hooks';
import type { CommandMeta } from '../../utils/commands';
import { Box, Text, useInput } from 'ink';
import React, { useMemo } from 'react';
import React, { useMemo, useState } from 'react';

const MAX_DESC_WIDTH = 50;

Expand All@@ -34,7 +27,6 @@ interface HelpDisplayProps {
}

function HelpDisplay({ items, query, cursor, clampedIndex, notice }: HelpDisplayProps) {
const { isActive } = useShellContext();
const { contentWidth } = useLayout();
const divider = '─'.repeat(contentWidth);

Expand All@@ -45,88 +37,76 @@ function HelpDisplay({ items, query, cursor, clampedIndex, notice }: HelpDisplay
Commands
</Text>

{/* Input line - changes based on shell mode */}
{/* Input line */}
<Box marginTop={1} flexShrink={0}>
<ShellPrompt />
{isActive ? (
<ShellCommandText />
<Text color="cyan">&gt; </Text>
<Text>{query.slice(0, cursor)}</Text>
<Cursor />
<Text>{query.slice(cursor)}</Text>
</Box>

{/* Commands list */}
<Box marginTop={1} flexDirection="column">
{items.length === 0 ? (
<Box flexDirection="column">
<Text dimColor>No commands match &quot;{query}&quot;</Text>
<Text dimColor>Esc to clear</Text>
</Box>
) : (
<>
<Text>{query.slice(0, cursor)}</Text>
<Cursor />
<Text>{query.slice(cursor)}</Text>
</>
items.map((item, idx) => {
const selected = idx === clampedIndex;
const itemKey = item.matchedSubcommand ? `${item.command.id}-${item.matchedSubcommand}` : item.command.id;
const desc = truncateDescription(item.command.description, MAX_DESC_WIDTH);
return (
<Box key={itemKey}>
<Text color={selected ? 'cyan' : 'white'}>{selected ? '❯' : ' '} </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.command.title}
</Text>
{item.matchedSubcommand && (
<>
<Text dimColor> → </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.matchedSubcommand}
</Text>
</>
)}
<Text dimColor> {desc}</Text>
</Box>
);
})
)}
</Box>

{/* Commands list - only visible when NOT in shell mode */}
{!isActive && (
<Box marginTop={1} flexDirection="column">
{items.length === 0 ? (
<Box flexDirection="column">
<Text dimColor>No commands match &quot;{query}&quot;</Text>
<Text dimColor>Esc to clear</Text>
</Box>
) : (
items.map((item, idx) => {
const selected = idx === clampedIndex;
const itemKey = item.matchedSubcommand ? `${item.command.id}-${item.matchedSubcommand}` : item.command.id;
const desc = truncateDescription(item.command.description, MAX_DESC_WIDTH);
return (
<Box key={itemKey}>
<Text color={selected ? 'cyan' : 'white'}>{selected ? '❯' : ' '} </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.command.title}
</Text>
{item.matchedSubcommand && (
<>
<Text dimColor> → </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.matchedSubcommand}
</Text>
</>
)}
<Text dimColor> {desc}</Text>
</Box>
);
})
)}
</Box>
)}

{!isActive && notice && <Box marginTop={1}>{notice}</Box>}
{notice && <Box marginTop={1}>{notice}</Box>}

{/* Divider and hints at bottom */}
{!isActive && (
<Box marginTop={1} flexDirection="column">
<Text dimColor>{divider}</Text>
<Text dimColor>{HINTS.COMMANDS}</Text>
</Box>
)}
<Box marginTop={1} flexDirection="column">
<Text dimColor>{divider}</Text>
<Text dimColor>{HINTS.COMMANDS}</Text>
</Box>
</Box>
);
}

interface HelpContentProps {
export function HelpScreen(props: {
commands: CommandMeta[];
initialQuery?: string;
notice?: React.ReactNode;
onNoticeDismiss?: () => void;
onSelect: (id: string) => void;
onBack: () => void;
}

function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect, onBack }: HelpContentProps) {
const { isActive } = useShellContext();
const [index, setIndex] = React.useState(0);
}) {
const { commands, initialQuery, notice, onNoticeDismiss, onSelect, onBack } = props;
const [index, setIndex] = useState(0);

const {
value: query,
cursor,
clear,
} = useTextInput({
initialValue: initialQuery ?? '',
isActive: !isActive,
isActive: true,
});

const items = useMemo((): DisplayItem[] => {
Expand DownExpand Up@@ -162,11 +142,6 @@ function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect
const clampedIndex = Math.min(index, Math.max(0, items.length - 1));

useInput((input, key) => {
// When shell mode is active, don't handle normal screen input
if (isActive) {
return;
}

if (notice && onNoticeDismiss) {
onNoticeDismiss();
}
Expand DownExpand Up@@ -203,25 +178,3 @@ function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect
</ScreenLayout>
);
}

export function HelpScreen(props: {
commands: CommandMeta[];
initialQuery?: string;
notice?: React.ReactNode;
onNoticeDismiss?: () => void;
onSelect: (id: string) => void;
onBack: () => void;
}) {
return (
<ShellEscapeContainer>
<HelpContent
commands={props.commands}
initialQuery={props.initialQuery}
notice={props.notice}
onNoticeDismiss={props.onNoticeDismiss}
onSelect={props.onSelect}
onBack={props.onBack}
/>
</ShellEscapeContainer>
);
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: remove broken shell mode in help screen which i recently rebased and took in removed dependencies by aidandaly24 · Pull Request #31 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/cli/commands/deploy/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,15 +22,6 @@ function handleDeployTUI(options: { autoConfirm?: boolean } = {}): void {
unmount();
process.exit(0);
}}
onShellCommand={command => {
unmount();
if (command) {
console.log(`\nRun: ${command}\n`);
} else {
console.log('\nSet your AWS credentials and re-run `agentcore deploy`\n');
}
process.exit(0);
}}
/>
);
}
Expand Down
9 changes: 0 additions & 9 deletions src/cli/commands/plan/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,15 +21,6 @@ function handlePlanTUI(options: TUIOptions = {}): void {
unmount();
process.exit(0);
}}
onShellCommand={command => {
unmount();
if (command) {
console.log(`\nRun: ${command}\n`);
} else {
console.log('\nSet your AWS credentials and re-run `agentcore plan`\n');
}
process.exit(0);
}}
/>
);
}
Expand Down
22 changes: 3 additions & 19 deletions src/cli/tui/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
import { getWorkingDirectory } from '../../lib';
import { createProgram } from '../cli';
import { destroyShell, warmupShell } from '../shell';
import { LayoutProvider } from './context';
import { MissingProjectMessage, projectExists } from './guards';
import { PlaceholderScreen } from './screens/PlaceholderScreen';
Expand All@@ -21,13 +20,13 @@ import { StatusScreen } from './screens/status/StatusScreen';
import { UpdateScreen } from './screens/update';
import { ValidateScreen } from './screens/validate';
import { type CommandMeta, getCommandsForUI } from './utils/commands';
import React, { useEffect, useState } from 'react';
import React, { useState } from 'react';

// Capture cwd once at app initialization
const cwd = getWorkingDirectory();

type Route =
| { name: 'home'; initialShellCommand?: string; returnTo?: 'deploy' | 'plan' }
| { name: 'home' }
| { name: 'help'; initialQuery?: string }
| { name: 'command'; command: CommandMeta }
| { name: 'dev' }
Expand All@@ -52,12 +51,6 @@ function AppContent() {
const [route, setRoute] = useState<Route>(initialRoute);
const [helpNotice, setHelpNotice] = useState<React.ReactNode | null>(null);

// Pre-warm shell during idle time (sources config once)
useEffect(() => {
warmupShell();
return () => destroyShell();
}, []);

// Get commands from commander program
const program = createProgram();
const commands = getCommandsForUI(program);
Expand DownExpand Up@@ -114,10 +107,8 @@ function AppContent() {
<HomeScreen
cwd={cwd}
version={program.version() ?? '0.0.0'}
initialShellCommand={route.initialShellCommand}
onShowHelp={initialQuery => setRoute({ name: 'help', initialQuery })}
onSelectCreate={() => setRoute({ name: 'create' })}
onShellComplete={route.returnTo ? () => setRoute({ name: route.returnTo } as Route) : undefined}
/>
);
}
Expand DownExpand Up@@ -147,7 +138,6 @@ function AppContent() {
<DeployScreen
isInteractive={true}
onExit={() => setRoute({ name: 'home' })}
onShellCommand={cmd => setRoute({ name: 'home', initialShellCommand: cmd, returnTo: 'deploy' })}
onNavigate={command => setRoute({ name: command } as Route)}
/>
);
Expand All@@ -166,13 +156,7 @@ function AppContent() {
}

if (route.name === 'plan') {
return (
<PlanScreen
isInteractive={true}
onExit={() => setRoute({ name: 'home' })}
onShellCommand={cmd => setRoute({ name: 'home', initialShellCommand: cmd, returnTo: 'plan' })}
/>
);
return <PlanScreen isInteractive={true} onExit={() => setRoute({ name: 'home' })} />;
}

if (route.name === 'edit') {
Expand Down
2 changes: 1 addition & 1 deletion src/cli/tui/screens/agent/AddAgentScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ export function AddAgentScreen({ existingAgentNames, onComplete, onExit }: AddAg
const byoCurrentIndex = byoSteps.indexOf(byoStep);

// BYO language options (include "Other" for BYO path)
const languageItems: SelectableItem[] = useMemo(() => LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: o.disabled })), []);
const languageItems: SelectableItem[] = useMemo(() => LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: 'disabled' in o ? o.disabled : undefined })), []);

const frameworkItems: SelectableItem[] = useMemo(
() => FRAMEWORK_OPTIONS.map(o => ({ id: o.id, title: o.title, description: o.description })),
Expand Down
2 changes: 1 addition & 1 deletion src/cli/tui/screens/generate/GenerateWizardUI.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ export function GenerateWizardUI({ wizard, onBack, onConfirm, isActive }: Genera
const getItems = (): SelectableItem[] => {
switch (wizard.step) {
case 'language':
return LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: o.disabled }));
return LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: 'disabled' in o ? o.disabled : undefined }));
case 'sdk':
return SDK_OPTIONS.map(o => ({ id: o.id, title: o.title, description: o.description }));
case 'modelProvider':
Expand Down
143 changes: 48 additions & 95 deletions src/cli/tui/screens/home/HelpScreen.tsx
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
import {
Cursor,
ScreenLayout,
ShellCommandText,
ShellEscapeContainer,
ShellPrompt,
useShellContext,
} from '../../components';
import { Cursor, ScreenLayout } from '../../components';
import { useLayout } from '../../context';
import { HINTS } from '../../copy';
import { useTextInput } from '../../hooks';
import type { CommandMeta } from '../../utils/commands';
import { Box, Text, useInput } from 'ink';
import React, { useMemo } from 'react';
import React, { useMemo, useState } from 'react';

const MAX_DESC_WIDTH = 50;

Expand All@@ -34,7 +27,6 @@ interface HelpDisplayProps {
}

function HelpDisplay({ items, query, cursor, clampedIndex, notice }: HelpDisplayProps) {
const { isActive } = useShellContext();
const { contentWidth } = useLayout();
const divider = '─'.repeat(contentWidth);

Expand All@@ -45,88 +37,76 @@ function HelpDisplay({ items, query, cursor, clampedIndex, notice }: HelpDisplay
Commands
</Text>

{/* Input line - changes based on shell mode */}
{/* Input line */}
<Box marginTop={1} flexShrink={0}>
<ShellPrompt />
{isActive ? (
<ShellCommandText />
<Text color="cyan">&gt; </Text>
<Text>{query.slice(0, cursor)}</Text>
<Cursor />
<Text>{query.slice(cursor)}</Text>
</Box>

{/* Commands list */}
<Box marginTop={1} flexDirection="column">
{items.length === 0 ? (
<Box flexDirection="column">
<Text dimColor>No commands match &quot;{query}&quot;</Text>
<Text dimColor>Esc to clear</Text>
</Box>
) : (
<>
<Text>{query.slice(0, cursor)}</Text>
<Cursor />
<Text>{query.slice(cursor)}</Text>
</>
items.map((item, idx) => {
const selected = idx === clampedIndex;
const itemKey = item.matchedSubcommand ? `${item.command.id}-${item.matchedSubcommand}` : item.command.id;
const desc = truncateDescription(item.command.description, MAX_DESC_WIDTH);
return (
<Box key={itemKey}>
<Text color={selected ? 'cyan' : 'white'}>{selected ? '❯' : ' '} </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.command.title}
</Text>
{item.matchedSubcommand && (
<>
<Text dimColor> → </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.matchedSubcommand}
</Text>
</>
)}
<Text dimColor> {desc}</Text>
</Box>
);
})
)}
</Box>

{/* Commands list - only visible when NOT in shell mode */}
{!isActive && (
<Box marginTop={1} flexDirection="column">
{items.length === 0 ? (
<Box flexDirection="column">
<Text dimColor>No commands match &quot;{query}&quot;</Text>
<Text dimColor>Esc to clear</Text>
</Box>
) : (
items.map((item, idx) => {
const selected = idx === clampedIndex;
const itemKey = item.matchedSubcommand ? `${item.command.id}-${item.matchedSubcommand}` : item.command.id;
const desc = truncateDescription(item.command.description, MAX_DESC_WIDTH);
return (
<Box key={itemKey}>
<Text color={selected ? 'cyan' : 'white'}>{selected ? '❯' : ' '} </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.command.title}
</Text>
{item.matchedSubcommand && (
<>
<Text dimColor> → </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.matchedSubcommand}
</Text>
</>
)}
<Text dimColor> {desc}</Text>
</Box>
);
})
)}
</Box>
)}

{!isActive && notice && <Box marginTop={1}>{notice}</Box>}
{notice && <Box marginTop={1}>{notice}</Box>}

{/* Divider and hints at bottom */}
{!isActive && (
<Box marginTop={1} flexDirection="column">
<Text dimColor>{divider}</Text>
<Text dimColor>{HINTS.COMMANDS}</Text>
</Box>
)}
<Box marginTop={1} flexDirection="column">
<Text dimColor>{divider}</Text>
<Text dimColor>{HINTS.COMMANDS}</Text>
</Box>
</Box>
);
}

interface HelpContentProps {
export function HelpScreen(props: {
commands: CommandMeta[];
initialQuery?: string;
notice?: React.ReactNode;
onNoticeDismiss?: () => void;
onSelect: (id: string) => void;
onBack: () => void;
}

function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect, onBack }: HelpContentProps) {
const { isActive } = useShellContext();
const [index, setIndex] = React.useState(0);
}) {
const { commands, initialQuery, notice, onNoticeDismiss, onSelect, onBack } = props;
const [index, setIndex] = useState(0);

const {
value: query,
cursor,
clear,
} = useTextInput({
initialValue: initialQuery ?? '',
isActive: !isActive,
isActive: true,
});

const items = useMemo((): DisplayItem[] => {
Expand DownExpand Up@@ -162,11 +142,6 @@ function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect
const clampedIndex = Math.min(index, Math.max(0, items.length - 1));

useInput((input, key) => {
// When shell mode is active, don't handle normal screen input
if (isActive) {
return;
}

if (notice && onNoticeDismiss) {
onNoticeDismiss();
}
Expand DownExpand Up@@ -203,25 +178,3 @@ function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect
</ScreenLayout>
);
}

export function HelpScreen(props: {
commands: CommandMeta[];
initialQuery?: string;
notice?: React.ReactNode;
onNoticeDismiss?: () => void;
onSelect: (id: string) => void;
onBack: () => void;
}) {
return (
<ShellEscapeContainer>
<HelpContent
commands={props.commands}
initialQuery={props.initialQuery}
notice={props.notice}
onNoticeDismiss={props.onNoticeDismiss}
onSelect={props.onSelect}
onBack={props.onBack}
/>
</ShellEscapeContainer>
);
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix: remove broken shell mode in help screen which i recently rebased and took in removed dependencies by aidandaly24 · Pull Request #31 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/cli/commands/deploy/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,15 +22,6 @@ function handleDeployTUI(options: { autoConfirm?: boolean } = {}): void {
unmount();
process.exit(0);
}}
onShellCommand={command => {
unmount();
if (command) {
console.log(`\nRun: ${command}\n`);
} else {
console.log('\nSet your AWS credentials and re-run `agentcore deploy`\n');
}
process.exit(0);
}}
/>
);
}
Expand Down
9 changes: 0 additions & 9 deletions src/cli/commands/plan/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,15 +21,6 @@ function handlePlanTUI(options: TUIOptions = {}): void {
unmount();
process.exit(0);
}}
onShellCommand={command => {
unmount();
if (command) {
console.log(`\nRun: ${command}\n`);
} else {
console.log('\nSet your AWS credentials and re-run `agentcore plan`\n');
}
process.exit(0);
}}
/>
);
}
Expand Down
22 changes: 3 additions & 19 deletions src/cli/tui/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
import { getWorkingDirectory } from '../../lib';
import { createProgram } from '../cli';
import { destroyShell, warmupShell } from '../shell';
import { LayoutProvider } from './context';
import { MissingProjectMessage, projectExists } from './guards';
import { PlaceholderScreen } from './screens/PlaceholderScreen';
Expand All@@ -21,13 +20,13 @@ import { StatusScreen } from './screens/status/StatusScreen';
import { UpdateScreen } from './screens/update';
import { ValidateScreen } from './screens/validate';
import { type CommandMeta, getCommandsForUI } from './utils/commands';
import React, { useEffect, useState } from 'react';
import React, { useState } from 'react';

// Capture cwd once at app initialization
const cwd = getWorkingDirectory();

type Route =
| { name: 'home'; initialShellCommand?: string; returnTo?: 'deploy' | 'plan' }
| { name: 'home' }
| { name: 'help'; initialQuery?: string }
| { name: 'command'; command: CommandMeta }
| { name: 'dev' }
Expand All@@ -52,12 +51,6 @@ function AppContent() {
const [route, setRoute] = useState<Route>(initialRoute);
const [helpNotice, setHelpNotice] = useState<React.ReactNode | null>(null);

// Pre-warm shell during idle time (sources config once)
useEffect(() => {
warmupShell();
return () => destroyShell();
}, []);

// Get commands from commander program
const program = createProgram();
const commands = getCommandsForUI(program);
Expand DownExpand Up@@ -114,10 +107,8 @@ function AppContent() {
<HomeScreen
cwd={cwd}
version={program.version() ?? '0.0.0'}
initialShellCommand={route.initialShellCommand}
onShowHelp={initialQuery => setRoute({ name: 'help', initialQuery })}
onSelectCreate={() => setRoute({ name: 'create' })}
onShellComplete={route.returnTo ? () => setRoute({ name: route.returnTo } as Route) : undefined}
/>
);
}
Expand DownExpand Up@@ -147,7 +138,6 @@ function AppContent() {
<DeployScreen
isInteractive={true}
onExit={() => setRoute({ name: 'home' })}
onShellCommand={cmd => setRoute({ name: 'home', initialShellCommand: cmd, returnTo: 'deploy' })}
onNavigate={command => setRoute({ name: command } as Route)}
/>
);
Expand All@@ -166,13 +156,7 @@ function AppContent() {
}

if (route.name === 'plan') {
return (
<PlanScreen
isInteractive={true}
onExit={() => setRoute({ name: 'home' })}
onShellCommand={cmd => setRoute({ name: 'home', initialShellCommand: cmd, returnTo: 'plan' })}
/>
);
return <PlanScreen isInteractive={true} onExit={() => setRoute({ name: 'home' })} />;
}

if (route.name === 'edit') {
Expand Down
2 changes: 1 addition & 1 deletion src/cli/tui/screens/agent/AddAgentScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ export function AddAgentScreen({ existingAgentNames, onComplete, onExit }: AddAg
const byoCurrentIndex = byoSteps.indexOf(byoStep);

// BYO language options (include "Other" for BYO path)
const languageItems: SelectableItem[] = useMemo(() => LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: o.disabled })), []);
const languageItems: SelectableItem[] = useMemo(() => LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: 'disabled' in o ? o.disabled : undefined })), []);

const frameworkItems: SelectableItem[] = useMemo(
() => FRAMEWORK_OPTIONS.map(o => ({ id: o.id, title: o.title, description: o.description })),
Expand Down
2 changes: 1 addition & 1 deletion src/cli/tui/screens/generate/GenerateWizardUI.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ export function GenerateWizardUI({ wizard, onBack, onConfirm, isActive }: Genera
const getItems = (): SelectableItem[] => {
switch (wizard.step) {
case 'language':
return LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: o.disabled }));
return LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: 'disabled' in o ? o.disabled : undefined }));
case 'sdk':
return SDK_OPTIONS.map(o => ({ id: o.id, title: o.title, description: o.description }));
case 'modelProvider':
Expand Down
143 changes: 48 additions & 95 deletions src/cli/tui/screens/home/HelpScreen.tsx
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
import {
Cursor,
ScreenLayout,
ShellCommandText,
ShellEscapeContainer,
ShellPrompt,
useShellContext,
} from '../../components';
import { Cursor, ScreenLayout } from '../../components';
import { useLayout } from '../../context';
import { HINTS } from '../../copy';
import { useTextInput } from '../../hooks';
import type { CommandMeta } from '../../utils/commands';
import { Box, Text, useInput } from 'ink';
import React, { useMemo } from 'react';
import React, { useMemo, useState } from 'react';

const MAX_DESC_WIDTH = 50;

Expand All@@ -34,7 +27,6 @@ interface HelpDisplayProps {
}

function HelpDisplay({ items, query, cursor, clampedIndex, notice }: HelpDisplayProps) {
const { isActive } = useShellContext();
const { contentWidth } = useLayout();
const divider = '─'.repeat(contentWidth);

Expand All@@ -45,88 +37,76 @@ function HelpDisplay({ items, query, cursor, clampedIndex, notice }: HelpDisplay
Commands
</Text>

{/* Input line - changes based on shell mode */}
{/* Input line */}
<Box marginTop={1} flexShrink={0}>
<ShellPrompt />
{isActive ? (
<ShellCommandText />
<Text color="cyan">&gt; </Text>
<Text>{query.slice(0, cursor)}</Text>
<Cursor />
<Text>{query.slice(cursor)}</Text>
</Box>

{/* Commands list */}
<Box marginTop={1} flexDirection="column">
{items.length === 0 ? (
<Box flexDirection="column">
<Text dimColor>No commands match &quot;{query}&quot;</Text>
<Text dimColor>Esc to clear</Text>
</Box>
) : (
<>
<Text>{query.slice(0, cursor)}</Text>
<Cursor />
<Text>{query.slice(cursor)}</Text>
</>
items.map((item, idx) => {
const selected = idx === clampedIndex;
const itemKey = item.matchedSubcommand ? `${item.command.id}-${item.matchedSubcommand}` : item.command.id;
const desc = truncateDescription(item.command.description, MAX_DESC_WIDTH);
return (
<Box key={itemKey}>
<Text color={selected ? 'cyan' : 'white'}>{selected ? '❯' : ' '} </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.command.title}
</Text>
{item.matchedSubcommand && (
<>
<Text dimColor> → </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.matchedSubcommand}
</Text>
</>
)}
<Text dimColor> {desc}</Text>
</Box>
);
})
)}
</Box>

{/* Commands list - only visible when NOT in shell mode */}
{!isActive && (
<Box marginTop={1} flexDirection="column">
{items.length === 0 ? (
<Box flexDirection="column">
<Text dimColor>No commands match &quot;{query}&quot;</Text>
<Text dimColor>Esc to clear</Text>
</Box>
) : (
items.map((item, idx) => {
const selected = idx === clampedIndex;
const itemKey = item.matchedSubcommand ? `${item.command.id}-${item.matchedSubcommand}` : item.command.id;
const desc = truncateDescription(item.command.description, MAX_DESC_WIDTH);
return (
<Box key={itemKey}>
<Text color={selected ? 'cyan' : 'white'}>{selected ? '❯' : ' '} </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.command.title}
</Text>
{item.matchedSubcommand && (
<>
<Text dimColor> → </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.matchedSubcommand}
</Text>
</>
)}
<Text dimColor> {desc}</Text>
</Box>
);
})
)}
</Box>
)}

{!isActive && notice && <Box marginTop={1}>{notice}</Box>}
{notice && <Box marginTop={1}>{notice}</Box>}

{/* Divider and hints at bottom */}
{!isActive && (
<Box marginTop={1} flexDirection="column">
<Text dimColor>{divider}</Text>
<Text dimColor>{HINTS.COMMANDS}</Text>
</Box>
)}
<Box marginTop={1} flexDirection="column">
<Text dimColor>{divider}</Text>
<Text dimColor>{HINTS.COMMANDS}</Text>
</Box>
</Box>
);
}

interface HelpContentProps {
export function HelpScreen(props: {
commands: CommandMeta[];
initialQuery?: string;
notice?: React.ReactNode;
onNoticeDismiss?: () => void;
onSelect: (id: string) => void;
onBack: () => void;
}

function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect, onBack }: HelpContentProps) {
const { isActive } = useShellContext();
const [index, setIndex] = React.useState(0);
}) {
const { commands, initialQuery, notice, onNoticeDismiss, onSelect, onBack } = props;
const [index, setIndex] = useState(0);

const {
value: query,
cursor,
clear,
} = useTextInput({
initialValue: initialQuery ?? '',
isActive: !isActive,
isActive: true,
});

const items = useMemo((): DisplayItem[] => {
Expand DownExpand Up@@ -162,11 +142,6 @@ function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect
const clampedIndex = Math.min(index, Math.max(0, items.length - 1));

useInput((input, key) => {
// When shell mode is active, don't handle normal screen input
if (isActive) {
return;
}

if (notice && onNoticeDismiss) {
onNoticeDismiss();
}
Expand DownExpand Up@@ -203,25 +178,3 @@ function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect
</ScreenLayout>
);
}

export function HelpScreen(props: {
commands: CommandMeta[];
initialQuery?: string;
notice?: React.ReactNode;
onNoticeDismiss?: () => void;
onSelect: (id: string) => void;
onBack: () => void;
}) {
return (
<ShellEscapeContainer>
<HelpContent
commands={props.commands}
initialQuery={props.initialQuery}
notice={props.notice}
onNoticeDismiss={props.onNoticeDismiss}
onSelect={props.onSelect}
onBack={props.onBack}
/>
</ShellEscapeContainer>
);
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: remove broken shell mode in help screen which i recently rebased and took in removed dependencies by aidandaly24 · Pull Request #31 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/cli/commands/deploy/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,15 +22,6 @@ function handleDeployTUI(options: { autoConfirm?: boolean } = {}): void {
unmount();
process.exit(0);
}}
onShellCommand={command => {
unmount();
if (command) {
console.log(`\nRun: ${command}\n`);
} else {
console.log('\nSet your AWS credentials and re-run `agentcore deploy`\n');
}
process.exit(0);
}}
/>
);
}
Expand Down
9 changes: 0 additions & 9 deletions src/cli/commands/plan/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,15 +21,6 @@ function handlePlanTUI(options: TUIOptions = {}): void {
unmount();
process.exit(0);
}}
onShellCommand={command => {
unmount();
if (command) {
console.log(`\nRun: ${command}\n`);
} else {
console.log('\nSet your AWS credentials and re-run `agentcore plan`\n');
}
process.exit(0);
}}
/>
);
}
Expand Down
22 changes: 3 additions & 19 deletions src/cli/tui/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
import { getWorkingDirectory } from '../../lib';
import { createProgram } from '../cli';
import { destroyShell, warmupShell } from '../shell';
import { LayoutProvider } from './context';
import { MissingProjectMessage, projectExists } from './guards';
import { PlaceholderScreen } from './screens/PlaceholderScreen';
Expand All@@ -21,13 +20,13 @@ import { StatusScreen } from './screens/status/StatusScreen';
import { UpdateScreen } from './screens/update';
import { ValidateScreen } from './screens/validate';
import { type CommandMeta, getCommandsForUI } from './utils/commands';
import React, { useEffect, useState } from 'react';
import React, { useState } from 'react';

// Capture cwd once at app initialization
const cwd = getWorkingDirectory();

type Route =
| { name: 'home'; initialShellCommand?: string; returnTo?: 'deploy' | 'plan' }
| { name: 'home' }
| { name: 'help'; initialQuery?: string }
| { name: 'command'; command: CommandMeta }
| { name: 'dev' }
Expand All@@ -52,12 +51,6 @@ function AppContent() {
const [route, setRoute] = useState<Route>(initialRoute);
const [helpNotice, setHelpNotice] = useState<React.ReactNode | null>(null);

// Pre-warm shell during idle time (sources config once)
useEffect(() => {
warmupShell();
return () => destroyShell();
}, []);

// Get commands from commander program
const program = createProgram();
const commands = getCommandsForUI(program);
Expand DownExpand Up@@ -114,10 +107,8 @@ function AppContent() {
<HomeScreen
cwd={cwd}
version={program.version() ?? '0.0.0'}
initialShellCommand={route.initialShellCommand}
onShowHelp={initialQuery => setRoute({ name: 'help', initialQuery })}
onSelectCreate={() => setRoute({ name: 'create' })}
onShellComplete={route.returnTo ? () => setRoute({ name: route.returnTo } as Route) : undefined}
/>
);
}
Expand DownExpand Up@@ -147,7 +138,6 @@ function AppContent() {
<DeployScreen
isInteractive={true}
onExit={() => setRoute({ name: 'home' })}
onShellCommand={cmd => setRoute({ name: 'home', initialShellCommand: cmd, returnTo: 'deploy' })}
onNavigate={command => setRoute({ name: command } as Route)}
/>
);
Expand All@@ -166,13 +156,7 @@ function AppContent() {
}

if (route.name === 'plan') {
return (
<PlanScreen
isInteractive={true}
onExit={() => setRoute({ name: 'home' })}
onShellCommand={cmd => setRoute({ name: 'home', initialShellCommand: cmd, returnTo: 'plan' })}
/>
);
return <PlanScreen isInteractive={true} onExit={() => setRoute({ name: 'home' })} />;
}

if (route.name === 'edit') {
Expand Down
2 changes: 1 addition & 1 deletion src/cli/tui/screens/agent/AddAgentScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ export function AddAgentScreen({ existingAgentNames, onComplete, onExit }: AddAg
const byoCurrentIndex = byoSteps.indexOf(byoStep);

// BYO language options (include "Other" for BYO path)
const languageItems: SelectableItem[] = useMemo(() => LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: o.disabled })), []);
const languageItems: SelectableItem[] = useMemo(() => LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: 'disabled' in o ? o.disabled : undefined })), []);

const frameworkItems: SelectableItem[] = useMemo(
() => FRAMEWORK_OPTIONS.map(o => ({ id: o.id, title: o.title, description: o.description })),
Expand Down
2 changes: 1 addition & 1 deletion src/cli/tui/screens/generate/GenerateWizardUI.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ export function GenerateWizardUI({ wizard, onBack, onConfirm, isActive }: Genera
const getItems = (): SelectableItem[] => {
switch (wizard.step) {
case 'language':
return LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: o.disabled }));
return LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: 'disabled' in o ? o.disabled : undefined }));
case 'sdk':
return SDK_OPTIONS.map(o => ({ id: o.id, title: o.title, description: o.description }));
case 'modelProvider':
Expand Down
143 changes: 48 additions & 95 deletions src/cli/tui/screens/home/HelpScreen.tsx
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
import {
Cursor,
ScreenLayout,
ShellCommandText,
ShellEscapeContainer,
ShellPrompt,
useShellContext,
} from '../../components';
import { Cursor, ScreenLayout } from '../../components';
import { useLayout } from '../../context';
import { HINTS } from '../../copy';
import { useTextInput } from '../../hooks';
import type { CommandMeta } from '../../utils/commands';
import { Box, Text, useInput } from 'ink';
import React, { useMemo } from 'react';
import React, { useMemo, useState } from 'react';

const MAX_DESC_WIDTH = 50;

Expand All@@ -34,7 +27,6 @@ interface HelpDisplayProps {
}

function HelpDisplay({ items, query, cursor, clampedIndex, notice }: HelpDisplayProps) {
const { isActive } = useShellContext();
const { contentWidth } = useLayout();
const divider = '─'.repeat(contentWidth);

Expand All@@ -45,88 +37,76 @@ function HelpDisplay({ items, query, cursor, clampedIndex, notice }: HelpDisplay
Commands
</Text>

{/* Input line - changes based on shell mode */}
{/* Input line */}
<Box marginTop={1} flexShrink={0}>
<ShellPrompt />
{isActive ? (
<ShellCommandText />
<Text color="cyan">&gt; </Text>
<Text>{query.slice(0, cursor)}</Text>
<Cursor />
<Text>{query.slice(cursor)}</Text>
</Box>

{/* Commands list */}
<Box marginTop={1} flexDirection="column">
{items.length === 0 ? (
<Box flexDirection="column">
<Text dimColor>No commands match &quot;{query}&quot;</Text>
<Text dimColor>Esc to clear</Text>
</Box>
) : (
<>
<Text>{query.slice(0, cursor)}</Text>
<Cursor />
<Text>{query.slice(cursor)}</Text>
</>
items.map((item, idx) => {
const selected = idx === clampedIndex;
const itemKey = item.matchedSubcommand ? `${item.command.id}-${item.matchedSubcommand}` : item.command.id;
const desc = truncateDescription(item.command.description, MAX_DESC_WIDTH);
return (
<Box key={itemKey}>
<Text color={selected ? 'cyan' : 'white'}>{selected ? '❯' : ' '} </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.command.title}
</Text>
{item.matchedSubcommand && (
<>
<Text dimColor> → </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.matchedSubcommand}
</Text>
</>
)}
<Text dimColor> {desc}</Text>
</Box>
);
})
)}
</Box>

{/* Commands list - only visible when NOT in shell mode */}
{!isActive && (
<Box marginTop={1} flexDirection="column">
{items.length === 0 ? (
<Box flexDirection="column">
<Text dimColor>No commands match &quot;{query}&quot;</Text>
<Text dimColor>Esc to clear</Text>
</Box>
) : (
items.map((item, idx) => {
const selected = idx === clampedIndex;
const itemKey = item.matchedSubcommand ? `${item.command.id}-${item.matchedSubcommand}` : item.command.id;
const desc = truncateDescription(item.command.description, MAX_DESC_WIDTH);
return (
<Box key={itemKey}>
<Text color={selected ? 'cyan' : 'white'}>{selected ? '❯' : ' '} </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.command.title}
</Text>
{item.matchedSubcommand && (
<>
<Text dimColor> → </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.matchedSubcommand}
</Text>
</>
)}
<Text dimColor> {desc}</Text>
</Box>
);
})
)}
</Box>
)}

{!isActive && notice && <Box marginTop={1}>{notice}</Box>}
{notice && <Box marginTop={1}>{notice}</Box>}

{/* Divider and hints at bottom */}
{!isActive && (
<Box marginTop={1} flexDirection="column">
<Text dimColor>{divider}</Text>
<Text dimColor>{HINTS.COMMANDS}</Text>
</Box>
)}
<Box marginTop={1} flexDirection="column">
<Text dimColor>{divider}</Text>
<Text dimColor>{HINTS.COMMANDS}</Text>
</Box>
</Box>
);
}

interface HelpContentProps {
export function HelpScreen(props: {
commands: CommandMeta[];
initialQuery?: string;
notice?: React.ReactNode;
onNoticeDismiss?: () => void;
onSelect: (id: string) => void;
onBack: () => void;
}

function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect, onBack }: HelpContentProps) {
const { isActive } = useShellContext();
const [index, setIndex] = React.useState(0);
}) {
const { commands, initialQuery, notice, onNoticeDismiss, onSelect, onBack } = props;
const [index, setIndex] = useState(0);

const {
value: query,
cursor,
clear,
} = useTextInput({
initialValue: initialQuery ?? '',
isActive: !isActive,
isActive: true,
});

const items = useMemo((): DisplayItem[] => {
Expand DownExpand Up@@ -162,11 +142,6 @@ function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect
const clampedIndex = Math.min(index, Math.max(0, items.length - 1));

useInput((input, key) => {
// When shell mode is active, don't handle normal screen input
if (isActive) {
return;
}

if (notice && onNoticeDismiss) {
onNoticeDismiss();
}
Expand DownExpand Up@@ -203,25 +178,3 @@ function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect
</ScreenLayout>
);
}

export function HelpScreen(props: {
commands: CommandMeta[];
initialQuery?: string;
notice?: React.ReactNode;
onNoticeDismiss?: () => void;
onSelect: (id: string) => void;
onBack: () => void;
}) {
return (
<ShellEscapeContainer>
<HelpContent
commands={props.commands}
initialQuery={props.initialQuery}
notice={props.notice}
onNoticeDismiss={props.onNoticeDismiss}
onSelect={props.onSelect}
onBack={props.onBack}
/>
</ShellEscapeContainer>
);
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: remove broken shell mode in help screen which i recently rebased and took in removed dependencies by aidandaly24 · Pull Request #31 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/cli/commands/deploy/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,15 +22,6 @@ function handleDeployTUI(options: { autoConfirm?: boolean } = {}): void {
unmount();
process.exit(0);
}}
onShellCommand={command => {
unmount();
if (command) {
console.log(`\nRun: ${command}\n`);
} else {
console.log('\nSet your AWS credentials and re-run `agentcore deploy`\n');
}
process.exit(0);
}}
/>
);
}
Expand Down
9 changes: 0 additions & 9 deletions src/cli/commands/plan/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,15 +21,6 @@ function handlePlanTUI(options: TUIOptions = {}): void {
unmount();
process.exit(0);
}}
onShellCommand={command => {
unmount();
if (command) {
console.log(`\nRun: ${command}\n`);
} else {
console.log('\nSet your AWS credentials and re-run `agentcore plan`\n');
}
process.exit(0);
}}
/>
);
}
Expand Down
22 changes: 3 additions & 19 deletions src/cli/tui/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
import { getWorkingDirectory } from '../../lib';
import { createProgram } from '../cli';
import { destroyShell, warmupShell } from '../shell';
import { LayoutProvider } from './context';
import { MissingProjectMessage, projectExists } from './guards';
import { PlaceholderScreen } from './screens/PlaceholderScreen';
Expand All@@ -21,13 +20,13 @@ import { StatusScreen } from './screens/status/StatusScreen';
import { UpdateScreen } from './screens/update';
import { ValidateScreen } from './screens/validate';
import { type CommandMeta, getCommandsForUI } from './utils/commands';
import React, { useEffect, useState } from 'react';
import React, { useState } from 'react';

// Capture cwd once at app initialization
const cwd = getWorkingDirectory();

type Route =
| { name: 'home'; initialShellCommand?: string; returnTo?: 'deploy' | 'plan' }
| { name: 'home' }
| { name: 'help'; initialQuery?: string }
| { name: 'command'; command: CommandMeta }
| { name: 'dev' }
Expand All@@ -52,12 +51,6 @@ function AppContent() {
const [route, setRoute] = useState<Route>(initialRoute);
const [helpNotice, setHelpNotice] = useState<React.ReactNode | null>(null);

// Pre-warm shell during idle time (sources config once)
useEffect(() => {
warmupShell();
return () => destroyShell();
}, []);

// Get commands from commander program
const program = createProgram();
const commands = getCommandsForUI(program);
Expand DownExpand Up@@ -114,10 +107,8 @@ function AppContent() {
<HomeScreen
cwd={cwd}
version={program.version() ?? '0.0.0'}
initialShellCommand={route.initialShellCommand}
onShowHelp={initialQuery => setRoute({ name: 'help', initialQuery })}
onSelectCreate={() => setRoute({ name: 'create' })}
onShellComplete={route.returnTo ? () => setRoute({ name: route.returnTo } as Route) : undefined}
/>
);
}
Expand DownExpand Up@@ -147,7 +138,6 @@ function AppContent() {
<DeployScreen
isInteractive={true}
onExit={() => setRoute({ name: 'home' })}
onShellCommand={cmd => setRoute({ name: 'home', initialShellCommand: cmd, returnTo: 'deploy' })}
onNavigate={command => setRoute({ name: command } as Route)}
/>
);
Expand All@@ -166,13 +156,7 @@ function AppContent() {
}

if (route.name === 'plan') {
return (
<PlanScreen
isInteractive={true}
onExit={() => setRoute({ name: 'home' })}
onShellCommand={cmd => setRoute({ name: 'home', initialShellCommand: cmd, returnTo: 'plan' })}
/>
);
return <PlanScreen isInteractive={true} onExit={() => setRoute({ name: 'home' })} />;
}

if (route.name === 'edit') {
Expand Down
2 changes: 1 addition & 1 deletion src/cli/tui/screens/agent/AddAgentScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ export function AddAgentScreen({ existingAgentNames, onComplete, onExit }: AddAg
const byoCurrentIndex = byoSteps.indexOf(byoStep);

// BYO language options (include "Other" for BYO path)
const languageItems: SelectableItem[] = useMemo(() => LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: o.disabled })), []);
const languageItems: SelectableItem[] = useMemo(() => LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: 'disabled' in o ? o.disabled : undefined })), []);

const frameworkItems: SelectableItem[] = useMemo(
() => FRAMEWORK_OPTIONS.map(o => ({ id: o.id, title: o.title, description: o.description })),
Expand Down
2 changes: 1 addition & 1 deletion src/cli/tui/screens/generate/GenerateWizardUI.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ export function GenerateWizardUI({ wizard, onBack, onConfirm, isActive }: Genera
const getItems = (): SelectableItem[] => {
switch (wizard.step) {
case 'language':
return LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: o.disabled }));
return LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: 'disabled' in o ? o.disabled : undefined }));
case 'sdk':
return SDK_OPTIONS.map(o => ({ id: o.id, title: o.title, description: o.description }));
case 'modelProvider':
Expand Down
143 changes: 48 additions & 95 deletions src/cli/tui/screens/home/HelpScreen.tsx
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
import {
Cursor,
ScreenLayout,
ShellCommandText,
ShellEscapeContainer,
ShellPrompt,
useShellContext,
} from '../../components';
import { Cursor, ScreenLayout } from '../../components';
import { useLayout } from '../../context';
import { HINTS } from '../../copy';
import { useTextInput } from '../../hooks';
import type { CommandMeta } from '../../utils/commands';
import { Box, Text, useInput } from 'ink';
import React, { useMemo } from 'react';
import React, { useMemo, useState } from 'react';

const MAX_DESC_WIDTH = 50;

Expand All@@ -34,7 +27,6 @@ interface HelpDisplayProps {
}

function HelpDisplay({ items, query, cursor, clampedIndex, notice }: HelpDisplayProps) {
const { isActive } = useShellContext();
const { contentWidth } = useLayout();
const divider = '─'.repeat(contentWidth);

Expand All@@ -45,88 +37,76 @@ function HelpDisplay({ items, query, cursor, clampedIndex, notice }: HelpDisplay
Commands
</Text>

{/* Input line - changes based on shell mode */}
{/* Input line */}
<Box marginTop={1} flexShrink={0}>
<ShellPrompt />
{isActive ? (
<ShellCommandText />
<Text color="cyan">&gt; </Text>
<Text>{query.slice(0, cursor)}</Text>
<Cursor />
<Text>{query.slice(cursor)}</Text>
</Box>

{/* Commands list */}
<Box marginTop={1} flexDirection="column">
{items.length === 0 ? (
<Box flexDirection="column">
<Text dimColor>No commands match &quot;{query}&quot;</Text>
<Text dimColor>Esc to clear</Text>
</Box>
) : (
<>
<Text>{query.slice(0, cursor)}</Text>
<Cursor />
<Text>{query.slice(cursor)}</Text>
</>
items.map((item, idx) => {
const selected = idx === clampedIndex;
const itemKey = item.matchedSubcommand ? `${item.command.id}-${item.matchedSubcommand}` : item.command.id;
const desc = truncateDescription(item.command.description, MAX_DESC_WIDTH);
return (
<Box key={itemKey}>
<Text color={selected ? 'cyan' : 'white'}>{selected ? '❯' : ' '} </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.command.title}
</Text>
{item.matchedSubcommand && (
<>
<Text dimColor> → </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.matchedSubcommand}
</Text>
</>
)}
<Text dimColor> {desc}</Text>
</Box>
);
})
)}
</Box>

{/* Commands list - only visible when NOT in shell mode */}
{!isActive && (
<Box marginTop={1} flexDirection="column">
{items.length === 0 ? (
<Box flexDirection="column">
<Text dimColor>No commands match &quot;{query}&quot;</Text>
<Text dimColor>Esc to clear</Text>
</Box>
) : (
items.map((item, idx) => {
const selected = idx === clampedIndex;
const itemKey = item.matchedSubcommand ? `${item.command.id}-${item.matchedSubcommand}` : item.command.id;
const desc = truncateDescription(item.command.description, MAX_DESC_WIDTH);
return (
<Box key={itemKey}>
<Text color={selected ? 'cyan' : 'white'}>{selected ? '❯' : ' '} </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.command.title}
</Text>
{item.matchedSubcommand && (
<>
<Text dimColor> → </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.matchedSubcommand}
</Text>
</>
)}
<Text dimColor> {desc}</Text>
</Box>
);
})
)}
</Box>
)}

{!isActive && notice && <Box marginTop={1}>{notice}</Box>}
{notice && <Box marginTop={1}>{notice}</Box>}

{/* Divider and hints at bottom */}
{!isActive && (
<Box marginTop={1} flexDirection="column">
<Text dimColor>{divider}</Text>
<Text dimColor>{HINTS.COMMANDS}</Text>
</Box>
)}
<Box marginTop={1} flexDirection="column">
<Text dimColor>{divider}</Text>
<Text dimColor>{HINTS.COMMANDS}</Text>
</Box>
</Box>
);
}

interface HelpContentProps {
export function HelpScreen(props: {
commands: CommandMeta[];
initialQuery?: string;
notice?: React.ReactNode;
onNoticeDismiss?: () => void;
onSelect: (id: string) => void;
onBack: () => void;
}

function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect, onBack }: HelpContentProps) {
const { isActive } = useShellContext();
const [index, setIndex] = React.useState(0);
}) {
const { commands, initialQuery, notice, onNoticeDismiss, onSelect, onBack } = props;
const [index, setIndex] = useState(0);

const {
value: query,
cursor,
clear,
} = useTextInput({
initialValue: initialQuery ?? '',
isActive: !isActive,
isActive: true,
});

const items = useMemo((): DisplayItem[] => {
Expand DownExpand Up@@ -162,11 +142,6 @@ function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect
const clampedIndex = Math.min(index, Math.max(0, items.length - 1));

useInput((input, key) => {
// When shell mode is active, don't handle normal screen input
if (isActive) {
return;
}

if (notice && onNoticeDismiss) {
onNoticeDismiss();
}
Expand DownExpand Up@@ -203,25 +178,3 @@ function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect
</ScreenLayout>
);
}

export function HelpScreen(props: {
commands: CommandMeta[];
initialQuery?: string;
notice?: React.ReactNode;
onNoticeDismiss?: () => void;
onSelect: (id: string) => void;
onBack: () => void;
}) {
return (
<ShellEscapeContainer>
<HelpContent
commands={props.commands}
initialQuery={props.initialQuery}
notice={props.notice}
onNoticeDismiss={props.onNoticeDismiss}
onSelect={props.onSelect}
onBack={props.onBack}
/>
</ShellEscapeContainer>
);
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); fix: remove broken shell mode in help screen which i recently rebased and took in removed dependencies by aidandaly24 · Pull Request #31 · aws/agentcore-cli · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/cli/commands/deploy/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,15 +22,6 @@ function handleDeployTUI(options: { autoConfirm?: boolean } = {}): void {
unmount();
process.exit(0);
}}
onShellCommand={command => {
unmount();
if (command) {
console.log(`\nRun: ${command}\n`);
} else {
console.log('\nSet your AWS credentials and re-run `agentcore deploy`\n');
}
process.exit(0);
}}
/>
);
}
Expand Down
9 changes: 0 additions & 9 deletions src/cli/commands/plan/command.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,15 +21,6 @@ function handlePlanTUI(options: TUIOptions = {}): void {
unmount();
process.exit(0);
}}
onShellCommand={command => {
unmount();
if (command) {
console.log(`\nRun: ${command}\n`);
} else {
console.log('\nSet your AWS credentials and re-run `agentcore plan`\n');
}
process.exit(0);
}}
/>
);
}
Expand Down
22 changes: 3 additions & 19 deletions src/cli/tui/App.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
import { getWorkingDirectory } from '../../lib';
import { createProgram } from '../cli';
import { destroyShell, warmupShell } from '../shell';
import { LayoutProvider } from './context';
import { MissingProjectMessage, projectExists } from './guards';
import { PlaceholderScreen } from './screens/PlaceholderScreen';
Expand All@@ -21,13 +20,13 @@ import { StatusScreen } from './screens/status/StatusScreen';
import { UpdateScreen } from './screens/update';
import { ValidateScreen } from './screens/validate';
import { type CommandMeta, getCommandsForUI } from './utils/commands';
import React, { useEffect, useState } from 'react';
import React, { useState } from 'react';

// Capture cwd once at app initialization
const cwd = getWorkingDirectory();

type Route =
| { name: 'home'; initialShellCommand?: string; returnTo?: 'deploy' | 'plan' }
| { name: 'home' }
| { name: 'help'; initialQuery?: string }
| { name: 'command'; command: CommandMeta }
| { name: 'dev' }
Expand All@@ -52,12 +51,6 @@ function AppContent() {
const [route, setRoute] = useState<Route>(initialRoute);
const [helpNotice, setHelpNotice] = useState<React.ReactNode | null>(null);

// Pre-warm shell during idle time (sources config once)
useEffect(() => {
warmupShell();
return () => destroyShell();
}, []);

// Get commands from commander program
const program = createProgram();
const commands = getCommandsForUI(program);
Expand DownExpand Up@@ -114,10 +107,8 @@ function AppContent() {
<HomeScreen
cwd={cwd}
version={program.version() ?? '0.0.0'}
initialShellCommand={route.initialShellCommand}
onShowHelp={initialQuery => setRoute({ name: 'help', initialQuery })}
onSelectCreate={() => setRoute({ name: 'create' })}
onShellComplete={route.returnTo ? () => setRoute({ name: route.returnTo } as Route) : undefined}
/>
);
}
Expand DownExpand Up@@ -147,7 +138,6 @@ function AppContent() {
<DeployScreen
isInteractive={true}
onExit={() => setRoute({ name: 'home' })}
onShellCommand={cmd => setRoute({ name: 'home', initialShellCommand: cmd, returnTo: 'deploy' })}
onNavigate={command => setRoute({ name: command } as Route)}
/>
);
Expand All@@ -166,13 +156,7 @@ function AppContent() {
}

if (route.name === 'plan') {
return (
<PlanScreen
isInteractive={true}
onExit={() => setRoute({ name: 'home' })}
onShellCommand={cmd => setRoute({ name: 'home', initialShellCommand: cmd, returnTo: 'plan' })}
/>
);
return <PlanScreen isInteractive={true} onExit={() => setRoute({ name: 'home' })} />;
}

if (route.name === 'edit') {
Expand Down
2 changes: 1 addition & 1 deletion src/cli/tui/screens/agent/AddAgentScreen.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -166,7 +166,7 @@ export function AddAgentScreen({ existingAgentNames, onComplete, onExit }: AddAg
const byoCurrentIndex = byoSteps.indexOf(byoStep);

// BYO language options (include "Other" for BYO path)
const languageItems: SelectableItem[] = useMemo(() => LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: o.disabled })), []);
const languageItems: SelectableItem[] = useMemo(() => LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: 'disabled' in o ? o.disabled : undefined })), []);

const frameworkItems: SelectableItem[] = useMemo(
() => FRAMEWORK_OPTIONS.map(o => ({ id: o.id, title: o.title, description: o.description })),
Expand Down
2 changes: 1 addition & 1 deletion src/cli/tui/screens/generate/GenerateWizardUI.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,7 @@ export function GenerateWizardUI({ wizard, onBack, onConfirm, isActive }: Genera
const getItems = (): SelectableItem[] => {
switch (wizard.step) {
case 'language':
return LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: o.disabled }));
return LANGUAGE_OPTIONS.map(o => ({ id: o.id, title: o.title, disabled: 'disabled' in o ? o.disabled : undefined }));
case 'sdk':
return SDK_OPTIONS.map(o => ({ id: o.id, title: o.title, description: o.description }));
case 'modelProvider':
Expand Down
143 changes: 48 additions & 95 deletions src/cli/tui/screens/home/HelpScreen.tsx
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
import {
Cursor,
ScreenLayout,
ShellCommandText,
ShellEscapeContainer,
ShellPrompt,
useShellContext,
} from '../../components';
import { Cursor, ScreenLayout } from '../../components';
import { useLayout } from '../../context';
import { HINTS } from '../../copy';
import { useTextInput } from '../../hooks';
import type { CommandMeta } from '../../utils/commands';
import { Box, Text, useInput } from 'ink';
import React, { useMemo } from 'react';
import React, { useMemo, useState } from 'react';

const MAX_DESC_WIDTH = 50;

Expand All@@ -34,7 +27,6 @@ interface HelpDisplayProps {
}

function HelpDisplay({ items, query, cursor, clampedIndex, notice }: HelpDisplayProps) {
const { isActive } = useShellContext();
const { contentWidth } = useLayout();
const divider = '─'.repeat(contentWidth);

Expand All@@ -45,88 +37,76 @@ function HelpDisplay({ items, query, cursor, clampedIndex, notice }: HelpDisplay
Commands
</Text>

{/* Input line - changes based on shell mode */}
{/* Input line */}
<Box marginTop={1} flexShrink={0}>
<ShellPrompt />
{isActive ? (
<ShellCommandText />
<Text color="cyan">&gt; </Text>
<Text>{query.slice(0, cursor)}</Text>
<Cursor />
<Text>{query.slice(cursor)}</Text>
</Box>

{/* Commands list */}
<Box marginTop={1} flexDirection="column">
{items.length === 0 ? (
<Box flexDirection="column">
<Text dimColor>No commands match &quot;{query}&quot;</Text>
<Text dimColor>Esc to clear</Text>
</Box>
) : (
<>
<Text>{query.slice(0, cursor)}</Text>
<Cursor />
<Text>{query.slice(cursor)}</Text>
</>
items.map((item, idx) => {
const selected = idx === clampedIndex;
const itemKey = item.matchedSubcommand ? `${item.command.id}-${item.matchedSubcommand}` : item.command.id;
const desc = truncateDescription(item.command.description, MAX_DESC_WIDTH);
return (
<Box key={itemKey}>
<Text color={selected ? 'cyan' : 'white'}>{selected ? '❯' : ' '} </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.command.title}
</Text>
{item.matchedSubcommand && (
<>
<Text dimColor> → </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.matchedSubcommand}
</Text>
</>
)}
<Text dimColor> {desc}</Text>
</Box>
);
})
)}
</Box>

{/* Commands list - only visible when NOT in shell mode */}
{!isActive && (
<Box marginTop={1} flexDirection="column">
{items.length === 0 ? (
<Box flexDirection="column">
<Text dimColor>No commands match &quot;{query}&quot;</Text>
<Text dimColor>Esc to clear</Text>
</Box>
) : (
items.map((item, idx) => {
const selected = idx === clampedIndex;
const itemKey = item.matchedSubcommand ? `${item.command.id}-${item.matchedSubcommand}` : item.command.id;
const desc = truncateDescription(item.command.description, MAX_DESC_WIDTH);
return (
<Box key={itemKey}>
<Text color={selected ? 'cyan' : 'white'}>{selected ? '❯' : ' '} </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.command.title}
</Text>
{item.matchedSubcommand && (
<>
<Text dimColor> → </Text>
<Text bold={selected} color={selected ? 'cyan' : undefined}>
{item.matchedSubcommand}
</Text>
</>
)}
<Text dimColor> {desc}</Text>
</Box>
);
})
)}
</Box>
)}

{!isActive && notice && <Box marginTop={1}>{notice}</Box>}
{notice && <Box marginTop={1}>{notice}</Box>}

{/* Divider and hints at bottom */}
{!isActive && (
<Box marginTop={1} flexDirection="column">
<Text dimColor>{divider}</Text>
<Text dimColor>{HINTS.COMMANDS}</Text>
</Box>
)}
<Box marginTop={1} flexDirection="column">
<Text dimColor>{divider}</Text>
<Text dimColor>{HINTS.COMMANDS}</Text>
</Box>
</Box>
);
}

interface HelpContentProps {
export function HelpScreen(props: {
commands: CommandMeta[];
initialQuery?: string;
notice?: React.ReactNode;
onNoticeDismiss?: () => void;
onSelect: (id: string) => void;
onBack: () => void;
}

function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect, onBack }: HelpContentProps) {
const { isActive } = useShellContext();
const [index, setIndex] = React.useState(0);
}) {
const { commands, initialQuery, notice, onNoticeDismiss, onSelect, onBack } = props;
const [index, setIndex] = useState(0);

const {
value: query,
cursor,
clear,
} = useTextInput({
initialValue: initialQuery ?? '',
isActive: !isActive,
isActive: true,
});

const items = useMemo((): DisplayItem[] => {
Expand DownExpand Up@@ -162,11 +142,6 @@ function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect
const clampedIndex = Math.min(index, Math.max(0, items.length - 1));

useInput((input, key) => {
// When shell mode is active, don't handle normal screen input
if (isActive) {
return;
}

if (notice && onNoticeDismiss) {
onNoticeDismiss();
}
Expand DownExpand Up@@ -203,25 +178,3 @@ function HelpContent({ commands, initialQuery, notice, onNoticeDismiss, onSelect
</ScreenLayout>
);
}

export function HelpScreen(props: {
commands: CommandMeta[];
initialQuery?: string;
notice?: React.ReactNode;
onNoticeDismiss?: () => void;
onSelect: (id: string) => void;
onBack: () => void;
}) {
return (
<ShellEscapeContainer>
<HelpContent
commands={props.commands}
initialQuery={props.initialQuery}
notice={props.notice}
onNoticeDismiss={props.onNoticeDismiss}
onSelect={props.onSelect}
onBack={props.onBack}
/>
</ShellEscapeContainer>
);
}
Loading