fix: improve TUI initial screen based on project state#10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aidandaly24 merged 1 commit into from
Feb 1, 2026
Merged

fix: improve TUI initial screen based on project state #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 23 additions & 4 deletions src/cli/tui/App.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
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@@ -20,13 +21,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, { useState } from 'react';
import React, { useEffect, useState } from 'react';

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

type Route =
| { name: 'home' }
| { name: 'home'; initialShellCommand?: string; returnTo?: 'deploy' | 'plan' }
| { name: 'help'; initialQuery?: string }
| { name: 'command'; command: CommandMeta }
| { name: 'dev' }
Expand All@@ -46,9 +47,17 @@ type Route =
| { name: 'update' };

function AppContent() {
const [route, setRoute] = useState<Route>({ name: 'home' });
// Start on help screen if project exists (show commands), otherwise home (show Quick Start)
const initialRoute: Route = projectExists() ? { name: 'help' } : { name: 'home' };
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@@ -105,7 +114,10 @@ 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@@ -135,6 +147,7 @@ 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@@ -153,7 +166,13 @@ function AppContent() {
}

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

if (route.name === 'edit') {
Expand Down
106 changes: 79 additions & 27 deletions src/cli/tui/screens/home/HomeScreen.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
import { findConfigRoot } from '../../../../lib';
import { Cursor, ScreenLayout } from '../../components';
import {
Cursor,
ScreenLayout,
ShellCommandText,
ShellEscapeContainer,
ShellPrompt,
useShellContext,
} from '../../components';
import { buildLogo, useLayout } from '../../context';
import { HINTS, QUICK_START } from '../../copy';
import { Box, Text, useApp, useInput } from 'ink';
import React from 'react';

function InputLine() {
const { isActive } = useShellContext();

return (
<Box>
<ShellPrompt />
{isActive ? <ShellCommandText /> : <Cursor />}
</Box>
);
}

function QuickStart() {
return (
<Box marginTop={1} flexDirection="column">
Expand All@@ -16,56 +34,59 @@ function QuickStart() {
<Text color="cyan">create</Text>
<Text dimColor> {QUICK_START.create}</Text>
</Text>
<Text>
<Text color="cyan">add</Text>
<Text dimColor> {QUICK_START.add}</Text>
</Text>
<Text>
<Text color="cyan">deploy</Text>
<Text dimColor> {QUICK_START.deploy}</Text>
</Text>
</Box>
<Box marginTop={1}>
<Text>
<Text color="cyan">⚑ </Text>
<Text dimColor>{QUICK_START.tip}</Text>
<Text dimColor>Run create to get started</Text>
</Text>
</Box>
</Box>
);
}

interface HomeContentProps {
cwd: string;
version: string;
onShowHelp: (initialQuery?: string) => void;
onSelectCreate: () => void;
}

function hasProject(): boolean {
return findConfigRoot() !== null;
}

// Quick start takes 8 lines: margin(1) + header(1) + margin(1) + 3 items + margin(1) + tip(1)
const QUICK_START_LINES = 8;

interface HomeScreenProps {
cwd: string;
version: string;
onShowHelp: (initialQuery?: string) => void;
}

export function HomeScreen({ cwd: _cwd, version, onShowHelp }: HomeScreenProps) {
function HomeContent({ cwd: _cwd, version, onShowHelp, onSelectCreate }: HomeContentProps) {
const { exit } = useApp();
const { isActive } = useShellContext();
const { contentWidth } = useLayout();
const showQuickStart = !hasProject();
const showQuickStart = !isActive && !hasProject();
const logo = buildLogo(contentWidth, version);
const divider = '─'.repeat(contentWidth);

useInput((input, key) => {
if (isActive) return;

if (key.escape) {
exit();
return;
}

if (key.return && showQuickStart) {
onSelectCreate();
return;
}

if (key.tab) {
onShowHelp();
return;
}

if (input === '!') return;

if (input && !key.ctrl && !key.meta) {
onShowHelp(input);
}
Expand All@@ -79,21 +100,52 @@ export function HomeScreen({ cwd: _cwd, version, onShowHelp }: HomeScreenProps)

{/* Input - directly under logo */}
<Box marginTop={1}>
<Box>
<Text color="cyan">&gt; </Text>
<Cursor />
</Box>
<InputLine />
</Box>

{/* Quick Start or equal blank space */}
{showQuickStart ? <QuickStart /> : <Box height={QUICK_START_LINES} />}
{showQuickStart ? <QuickStart /> : !isActive && <Box height={QUICK_START_LINES} />}

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

// Reserved: logo(4) + version(1) + input margin(1) + input(1) + indicator(1) + padding(2) + buffer(2)
const RESERVED_LINES = 12;

interface HomeScreenProps {
cwd: string;
version: string;
initialShellCommand?: string;
onShowHelp: (initialQuery?: string) => void;
onSelectCreate: () => void;
/** Called when shell mode completes (after running a command). Used to auto-return to previous screen. */
onShellComplete?: () => void;
}

export function HomeScreen({
cwd,
version,
initialShellCommand,
onShowHelp,
onSelectCreate,
onShellComplete,
}: HomeScreenProps) {
return (
<ShellEscapeContainer
reservedLines={RESERVED_LINES}
initialShellCommand={initialShellCommand}
onShellComplete={onShellComplete}
>
<HomeContent cwd={cwd} version={version} onShowHelp={onShowHelp} onSelectCreate={onSelectCreate} />
</ShellEscapeContainer>
);
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: improve TUI initial screen based on project state#10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aidandaly24
merged 1 commit into

from

Feb 1, 2026
 Merged


fix: improve TUI initial screen based on project state
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


27 changes: 23 additions & 4 deletions
src/cli/tui/App.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
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@@ -20,13 +21,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, { useState } from 'react';
import React, { useEffect, useState } from 'react';

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

type Route =
 | { name: 'home' }
 | { name: 'home'; initialShellCommand?: string; returnTo?: 'deploy' | 'plan' }
 | { name: 'help'; initialQuery?: string }
 | { name: 'command'; command: CommandMeta }
 | { name: 'dev' }
Expand All@@ -46,9 +47,17 @@ type Route =
 | { name: 'update' };

function AppContent() {
 const [route, setRoute] = useState<Route>({ name: 'home' });
 // Start on help screen if project exists (show commands), otherwise home (show Quick Start)
 const initialRoute: Route = projectExists() ? { name: 'help' } : { name: 'home' };
 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@@ -105,7 +114,10 @@ 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@@ -135,6 +147,7 @@ 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@@ -153,7 +166,13 @@ function AppContent() {
 }

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

 if (route.name === 'edit') {
Expand Down

106 changes: 79 additions & 27 deletions
src/cli/tui/screens/home/HomeScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
import { findConfigRoot } from '../../../../lib';
import { Cursor, ScreenLayout } from '../../components';
import {
 Cursor,
 ScreenLayout,
 ShellCommandText,
 ShellEscapeContainer,
 ShellPrompt,
 useShellContext,
} from '../../components';
import { buildLogo, useLayout } from '../../context';
import { HINTS, QUICK_START } from '../../copy';
import { Box, Text, useApp, useInput } from 'ink';
import React from 'react';

function InputLine() {
 const { isActive } = useShellContext();

 return (
 <Box>
 <ShellPrompt />
 {isActive ? <ShellCommandText /> : <Cursor />}
 </Box>
 );
}

function QuickStart() {
 return (
 <Box marginTop={1} flexDirection="column">
Expand All@@ -16,56 +34,59 @@ function QuickStart() {
 <Text color="cyan">create</Text>
 <Text dimColor> {QUICK_START.create}</Text>
 </Text>
 <Text>
 <Text color="cyan">add</Text>
 <Text dimColor> {QUICK_START.add}</Text>
 </Text>
 <Text>
 <Text color="cyan">deploy</Text>
 <Text dimColor> {QUICK_START.deploy}</Text>
 </Text>
 </Box>
 <Box marginTop={1}>
 <Text>
 <Text color="cyan">⚑ </Text>
 <Text dimColor>{QUICK_START.tip}</Text>
 <Text dimColor>Run create to get started</Text>
 </Text>
 </Box>
 </Box>
 );
}

interface HomeContentProps {
 cwd: string;
 version: string;
 onShowHelp: (initialQuery?: string) => void;
 onSelectCreate: () => void;
}

function hasProject(): boolean {
 return findConfigRoot() !== null;
}

// Quick start takes 8 lines: margin(1) + header(1) + margin(1) + 3 items + margin(1) + tip(1)
const QUICK_START_LINES = 8;

interface HomeScreenProps {
 cwd: string;
 version: string;
 onShowHelp: (initialQuery?: string) => void;
}

export function HomeScreen({ cwd: _cwd, version, onShowHelp }: HomeScreenProps) {
function HomeContent({ cwd: _cwd, version, onShowHelp, onSelectCreate }: HomeContentProps) {
 const { exit } = useApp();
 const { isActive } = useShellContext();
 const { contentWidth } = useLayout();
 const showQuickStart = !hasProject();
 const showQuickStart = !isActive && !hasProject();
 const logo = buildLogo(contentWidth, version);
 const divider = '─'.repeat(contentWidth);

 useInput((input, key) => {
 if (isActive) return;

 if (key.escape) {
 exit();
 return;
 }

 if (key.return && showQuickStart) {
 onSelectCreate();
 return;
 }

 if (key.tab) {
 onShowHelp();
 return;
 }

 if (input === '!') return;

 if (input && !key.ctrl && !key.meta) {
 onShowHelp(input);
 }
Expand All@@ -79,21 +100,52 @@ export function HomeScreen({ cwd: _cwd, version, onShowHelp }: HomeScreenProps)

 {/* Input - directly under logo */}
 <Box marginTop={1}>
 <Box>
 <Text color="cyan">&gt; </Text>
 <Cursor />
 </Box>
 <InputLine />
 </Box>

 {/* Quick Start or equal blank space */}
 {showQuickStart ? <QuickStart /> : <Box height={QUICK_START_LINES} />}
 {showQuickStart ? <QuickStart /> : !isActive && <Box height={QUICK_START_LINES} />}

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

// Reserved: logo(4) + version(1) + input margin(1) + input(1) + indicator(1) + padding(2) + buffer(2)
const RESERVED_LINES = 12;

interface HomeScreenProps {
 cwd: string;
 version: string;
 initialShellCommand?: string;
 onShowHelp: (initialQuery?: string) => void;
 onSelectCreate: () => void;
 /** Called when shell mode completes (after running a command). Used to auto-return to previous screen. */
 onShellComplete?: () => void;
}

export function HomeScreen({
 cwd,
 version,
 initialShellCommand,
 onShowHelp,
 onSelectCreate,
 onShellComplete,
}: HomeScreenProps) {
 return (
 <ShellEscapeContainer
 reservedLines={RESERVED_LINES}
 initialShellCommand={initialShellCommand}
 onShellComplete={onShellComplete}
 >
 <HomeContent cwd={cwd} version={version} onShowHelp={onShowHelp} onSelectCreate={onSelectCreate} />
 </ShellEscapeContainer>
 );
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: improve TUI initial screen based on project state#10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aidandaly24
merged 1 commit into

from

Feb 1, 2026
 Merged


fix: improve TUI initial screen based on project state
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


27 changes: 23 additions & 4 deletions
src/cli/tui/App.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
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@@ -20,13 +21,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, { useState } from 'react';
import React, { useEffect, useState } from 'react';

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

type Route =
 | { name: 'home' }
 | { name: 'home'; initialShellCommand?: string; returnTo?: 'deploy' | 'plan' }
 | { name: 'help'; initialQuery?: string }
 | { name: 'command'; command: CommandMeta }
 | { name: 'dev' }
Expand All@@ -46,9 +47,17 @@ type Route =
 | { name: 'update' };

function AppContent() {
 const [route, setRoute] = useState<Route>({ name: 'home' });
 // Start on help screen if project exists (show commands), otherwise home (show Quick Start)
 const initialRoute: Route = projectExists() ? { name: 'help' } : { name: 'home' };
 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@@ -105,7 +114,10 @@ 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@@ -135,6 +147,7 @@ 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@@ -153,7 +166,13 @@ function AppContent() {
 }

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

 if (route.name === 'edit') {
Expand Down

106 changes: 79 additions & 27 deletions
src/cli/tui/screens/home/HomeScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
import { findConfigRoot } from '../../../../lib';
import { Cursor, ScreenLayout } from '../../components';
import {
 Cursor,
 ScreenLayout,
 ShellCommandText,
 ShellEscapeContainer,
 ShellPrompt,
 useShellContext,
} from '../../components';
import { buildLogo, useLayout } from '../../context';
import { HINTS, QUICK_START } from '../../copy';
import { Box, Text, useApp, useInput } from 'ink';
import React from 'react';

function InputLine() {
 const { isActive } = useShellContext();

 return (
 <Box>
 <ShellPrompt />
 {isActive ? <ShellCommandText /> : <Cursor />}
 </Box>
 );
}

function QuickStart() {
 return (
 <Box marginTop={1} flexDirection="column">
Expand All@@ -16,56 +34,59 @@ function QuickStart() {
 <Text color="cyan">create</Text>
 <Text dimColor> {QUICK_START.create}</Text>
 </Text>
 <Text>
 <Text color="cyan">add</Text>
 <Text dimColor> {QUICK_START.add}</Text>
 </Text>
 <Text>
 <Text color="cyan">deploy</Text>
 <Text dimColor> {QUICK_START.deploy}</Text>
 </Text>
 </Box>
 <Box marginTop={1}>
 <Text>
 <Text color="cyan">⚑ </Text>
 <Text dimColor>{QUICK_START.tip}</Text>
 <Text dimColor>Run create to get started</Text>
 </Text>
 </Box>
 </Box>
 );
}

interface HomeContentProps {
 cwd: string;
 version: string;
 onShowHelp: (initialQuery?: string) => void;
 onSelectCreate: () => void;
}

function hasProject(): boolean {
 return findConfigRoot() !== null;
}

// Quick start takes 8 lines: margin(1) + header(1) + margin(1) + 3 items + margin(1) + tip(1)
const QUICK_START_LINES = 8;

interface HomeScreenProps {
 cwd: string;
 version: string;
 onShowHelp: (initialQuery?: string) => void;
}

export function HomeScreen({ cwd: _cwd, version, onShowHelp }: HomeScreenProps) {
function HomeContent({ cwd: _cwd, version, onShowHelp, onSelectCreate }: HomeContentProps) {
 const { exit } = useApp();
 const { isActive } = useShellContext();
 const { contentWidth } = useLayout();
 const showQuickStart = !hasProject();
 const showQuickStart = !isActive && !hasProject();
 const logo = buildLogo(contentWidth, version);
 const divider = '─'.repeat(contentWidth);

 useInput((input, key) => {
 if (isActive) return;

 if (key.escape) {
 exit();
 return;
 }

 if (key.return && showQuickStart) {
 onSelectCreate();
 return;
 }

 if (key.tab) {
 onShowHelp();
 return;
 }

 if (input === '!') return;

 if (input && !key.ctrl && !key.meta) {
 onShowHelp(input);
 }
Expand All@@ -79,21 +100,52 @@ export function HomeScreen({ cwd: _cwd, version, onShowHelp }: HomeScreenProps)

 {/* Input - directly under logo */}
 <Box marginTop={1}>
 <Box>
 <Text color="cyan">&gt; </Text>
 <Cursor />
 </Box>
 <InputLine />
 </Box>

 {/* Quick Start or equal blank space */}
 {showQuickStart ? <QuickStart /> : <Box height={QUICK_START_LINES} />}
 {showQuickStart ? <QuickStart /> : !isActive && <Box height={QUICK_START_LINES} />}

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

// Reserved: logo(4) + version(1) + input margin(1) + input(1) + indicator(1) + padding(2) + buffer(2)
const RESERVED_LINES = 12;

interface HomeScreenProps {
 cwd: string;
 version: string;
 initialShellCommand?: string;
 onShowHelp: (initialQuery?: string) => void;
 onSelectCreate: () => void;
 /** Called when shell mode completes (after running a command). Used to auto-return to previous screen. */
 onShellComplete?: () => void;
}

export function HomeScreen({
 cwd,
 version,
 initialShellCommand,
 onShowHelp,
 onSelectCreate,
 onShellComplete,
}: HomeScreenProps) {
 return (
 <ShellEscapeContainer
 reservedLines={RESERVED_LINES}
 initialShellCommand={initialShellCommand}
 onShellComplete={onShellComplete}
 >
 <HomeContent cwd={cwd} version={version} onShowHelp={onShowHelp} onSelectCreate={onSelectCreate} />
 </ShellEscapeContainer>
 );
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: improve TUI initial screen based on project state#10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aidandaly24
merged 1 commit into

from

Feb 1, 2026
 Merged


fix: improve TUI initial screen based on project state
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


27 changes: 23 additions & 4 deletions
src/cli/tui/App.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
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@@ -20,13 +21,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, { useState } from 'react';
import React, { useEffect, useState } from 'react';

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

type Route =
 | { name: 'home' }
 | { name: 'home'; initialShellCommand?: string; returnTo?: 'deploy' | 'plan' }
 | { name: 'help'; initialQuery?: string }
 | { name: 'command'; command: CommandMeta }
 | { name: 'dev' }
Expand All@@ -46,9 +47,17 @@ type Route =
 | { name: 'update' };

function AppContent() {
 const [route, setRoute] = useState<Route>({ name: 'home' });
 // Start on help screen if project exists (show commands), otherwise home (show Quick Start)
 const initialRoute: Route = projectExists() ? { name: 'help' } : { name: 'home' };
 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@@ -105,7 +114,10 @@ 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@@ -135,6 +147,7 @@ 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@@ -153,7 +166,13 @@ function AppContent() {
 }

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

 if (route.name === 'edit') {
Expand Down

106 changes: 79 additions & 27 deletions
src/cli/tui/screens/home/HomeScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
import { findConfigRoot } from '../../../../lib';
import { Cursor, ScreenLayout } from '../../components';
import {
 Cursor,
 ScreenLayout,
 ShellCommandText,
 ShellEscapeContainer,
 ShellPrompt,
 useShellContext,
} from '../../components';
import { buildLogo, useLayout } from '../../context';
import { HINTS, QUICK_START } from '../../copy';
import { Box, Text, useApp, useInput } from 'ink';
import React from 'react';

function InputLine() {
 const { isActive } = useShellContext();

 return (
 <Box>
 <ShellPrompt />
 {isActive ? <ShellCommandText /> : <Cursor />}
 </Box>
 );
}

function QuickStart() {
 return (
 <Box marginTop={1} flexDirection="column">
Expand All@@ -16,56 +34,59 @@ function QuickStart() {
 <Text color="cyan">create</Text>
 <Text dimColor> {QUICK_START.create}</Text>
 </Text>
 <Text>
 <Text color="cyan">add</Text>
 <Text dimColor> {QUICK_START.add}</Text>
 </Text>
 <Text>
 <Text color="cyan">deploy</Text>
 <Text dimColor> {QUICK_START.deploy}</Text>
 </Text>
 </Box>
 <Box marginTop={1}>
 <Text>
 <Text color="cyan">⚑ </Text>
 <Text dimColor>{QUICK_START.tip}</Text>
 <Text dimColor>Run create to get started</Text>
 </Text>
 </Box>
 </Box>
 );
}

interface HomeContentProps {
 cwd: string;
 version: string;
 onShowHelp: (initialQuery?: string) => void;
 onSelectCreate: () => void;
}

function hasProject(): boolean {
 return findConfigRoot() !== null;
}

// Quick start takes 8 lines: margin(1) + header(1) + margin(1) + 3 items + margin(1) + tip(1)
const QUICK_START_LINES = 8;

interface HomeScreenProps {
 cwd: string;
 version: string;
 onShowHelp: (initialQuery?: string) => void;
}

export function HomeScreen({ cwd: _cwd, version, onShowHelp }: HomeScreenProps) {
function HomeContent({ cwd: _cwd, version, onShowHelp, onSelectCreate }: HomeContentProps) {
 const { exit } = useApp();
 const { isActive } = useShellContext();
 const { contentWidth } = useLayout();
 const showQuickStart = !hasProject();
 const showQuickStart = !isActive && !hasProject();
 const logo = buildLogo(contentWidth, version);
 const divider = '─'.repeat(contentWidth);

 useInput((input, key) => {
 if (isActive) return;

 if (key.escape) {
 exit();
 return;
 }

 if (key.return && showQuickStart) {
 onSelectCreate();
 return;
 }

 if (key.tab) {
 onShowHelp();
 return;
 }

 if (input === '!') return;

 if (input && !key.ctrl && !key.meta) {
 onShowHelp(input);
 }
Expand All@@ -79,21 +100,52 @@ export function HomeScreen({ cwd: _cwd, version, onShowHelp }: HomeScreenProps)

 {/* Input - directly under logo */}
 <Box marginTop={1}>
 <Box>
 <Text color="cyan">&gt; </Text>
 <Cursor />
 </Box>
 <InputLine />
 </Box>

 {/* Quick Start or equal blank space */}
 {showQuickStart ? <QuickStart /> : <Box height={QUICK_START_LINES} />}
 {showQuickStart ? <QuickStart /> : !isActive && <Box height={QUICK_START_LINES} />}

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

// Reserved: logo(4) + version(1) + input margin(1) + input(1) + indicator(1) + padding(2) + buffer(2)
const RESERVED_LINES = 12;

interface HomeScreenProps {
 cwd: string;
 version: string;
 initialShellCommand?: string;
 onShowHelp: (initialQuery?: string) => void;
 onSelectCreate: () => void;
 /** Called when shell mode completes (after running a command). Used to auto-return to previous screen. */
 onShellComplete?: () => void;
}

export function HomeScreen({
 cwd,
 version,
 initialShellCommand,
 onShowHelp,
 onSelectCreate,
 onShellComplete,
}: HomeScreenProps) {
 return (
 <ShellEscapeContainer
 reservedLines={RESERVED_LINES}
 initialShellCommand={initialShellCommand}
 onShellComplete={onShellComplete}
 >
 <HomeContent cwd={cwd} version={version} onShowHelp={onShowHelp} onSelectCreate={onSelectCreate} />
 </ShellEscapeContainer>
 );
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix: improve TUI initial screen based on project state#10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aidandaly24
merged 1 commit into

from

Feb 1, 2026
 Merged


fix: improve TUI initial screen based on project state
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


27 changes: 23 additions & 4 deletions
src/cli/tui/App.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
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@@ -20,13 +21,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, { useState } from 'react';
import React, { useEffect, useState } from 'react';

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

type Route =
 | { name: 'home' }
 | { name: 'home'; initialShellCommand?: string; returnTo?: 'deploy' | 'plan' }
 | { name: 'help'; initialQuery?: string }
 | { name: 'command'; command: CommandMeta }
 | { name: 'dev' }
Expand All@@ -46,9 +47,17 @@ type Route =
 | { name: 'update' };

function AppContent() {
 const [route, setRoute] = useState<Route>({ name: 'home' });
 // Start on help screen if project exists (show commands), otherwise home (show Quick Start)
 const initialRoute: Route = projectExists() ? { name: 'help' } : { name: 'home' };
 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@@ -105,7 +114,10 @@ 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@@ -135,6 +147,7 @@ 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@@ -153,7 +166,13 @@ function AppContent() {
 }

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

 if (route.name === 'edit') {
Expand Down

106 changes: 79 additions & 27 deletions
src/cli/tui/screens/home/HomeScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
import { findConfigRoot } from '../../../../lib';
import { Cursor, ScreenLayout } from '../../components';
import {
 Cursor,
 ScreenLayout,
 ShellCommandText,
 ShellEscapeContainer,
 ShellPrompt,
 useShellContext,
} from '../../components';
import { buildLogo, useLayout } from '../../context';
import { HINTS, QUICK_START } from '../../copy';
import { Box, Text, useApp, useInput } from 'ink';
import React from 'react';

function InputLine() {
 const { isActive } = useShellContext();

 return (
 <Box>
 <ShellPrompt />
 {isActive ? <ShellCommandText /> : <Cursor />}
 </Box>
 );
}

function QuickStart() {
 return (
 <Box marginTop={1} flexDirection="column">
Expand All@@ -16,56 +34,59 @@ function QuickStart() {
 <Text color="cyan">create</Text>
 <Text dimColor> {QUICK_START.create}</Text>
 </Text>
 <Text>
 <Text color="cyan">add</Text>
 <Text dimColor> {QUICK_START.add}</Text>
 </Text>
 <Text>
 <Text color="cyan">deploy</Text>
 <Text dimColor> {QUICK_START.deploy}</Text>
 </Text>
 </Box>
 <Box marginTop={1}>
 <Text>
 <Text color="cyan">⚑ </Text>
 <Text dimColor>{QUICK_START.tip}</Text>
 <Text dimColor>Run create to get started</Text>
 </Text>
 </Box>
 </Box>
 );
}

interface HomeContentProps {
 cwd: string;
 version: string;
 onShowHelp: (initialQuery?: string) => void;
 onSelectCreate: () => void;
}

function hasProject(): boolean {
 return findConfigRoot() !== null;
}

// Quick start takes 8 lines: margin(1) + header(1) + margin(1) + 3 items + margin(1) + tip(1)
const QUICK_START_LINES = 8;

interface HomeScreenProps {
 cwd: string;
 version: string;
 onShowHelp: (initialQuery?: string) => void;
}

export function HomeScreen({ cwd: _cwd, version, onShowHelp }: HomeScreenProps) {
function HomeContent({ cwd: _cwd, version, onShowHelp, onSelectCreate }: HomeContentProps) {
 const { exit } = useApp();
 const { isActive } = useShellContext();
 const { contentWidth } = useLayout();
 const showQuickStart = !hasProject();
 const showQuickStart = !isActive && !hasProject();
 const logo = buildLogo(contentWidth, version);
 const divider = '─'.repeat(contentWidth);

 useInput((input, key) => {
 if (isActive) return;

 if (key.escape) {
 exit();
 return;
 }

 if (key.return && showQuickStart) {
 onSelectCreate();
 return;
 }

 if (key.tab) {
 onShowHelp();
 return;
 }

 if (input === '!') return;

 if (input && !key.ctrl && !key.meta) {
 onShowHelp(input);
 }
Expand All@@ -79,21 +100,52 @@ export function HomeScreen({ cwd: _cwd, version, onShowHelp }: HomeScreenProps)

 {/* Input - directly under logo */}
 <Box marginTop={1}>
 <Box>
 <Text color="cyan">&gt; </Text>
 <Cursor />
 </Box>
 <InputLine />
 </Box>

 {/* Quick Start or equal blank space */}
 {showQuickStart ? <QuickStart /> : <Box height={QUICK_START_LINES} />}
 {showQuickStart ? <QuickStart /> : !isActive && <Box height={QUICK_START_LINES} />}

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

// Reserved: logo(4) + version(1) + input margin(1) + input(1) + indicator(1) + padding(2) + buffer(2)
const RESERVED_LINES = 12;

interface HomeScreenProps {
 cwd: string;
 version: string;
 initialShellCommand?: string;
 onShowHelp: (initialQuery?: string) => void;
 onSelectCreate: () => void;
 /** Called when shell mode completes (after running a command). Used to auto-return to previous screen. */
 onShellComplete?: () => void;
}

export function HomeScreen({
 cwd,
 version,
 initialShellCommand,
 onShowHelp,
 onSelectCreate,
 onShellComplete,
}: HomeScreenProps) {
 return (
 <ShellEscapeContainer
 reservedLines={RESERVED_LINES}
 initialShellCommand={initialShellCommand}
 onShellComplete={onShellComplete}
 >
 <HomeContent cwd={cwd} version={version} onShowHelp={onShowHelp} onSelectCreate={onSelectCreate} />
 </ShellEscapeContainer>
 );
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: improve TUI initial screen based on project state#10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aidandaly24
merged 1 commit into

from

Feb 1, 2026
 Merged


fix: improve TUI initial screen based on project state
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


27 changes: 23 additions & 4 deletions
src/cli/tui/App.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
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@@ -20,13 +21,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, { useState } from 'react';
import React, { useEffect, useState } from 'react';

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

type Route =
 | { name: 'home' }
 | { name: 'home'; initialShellCommand?: string; returnTo?: 'deploy' | 'plan' }
 | { name: 'help'; initialQuery?: string }
 | { name: 'command'; command: CommandMeta }
 | { name: 'dev' }
Expand All@@ -46,9 +47,17 @@ type Route =
 | { name: 'update' };

function AppContent() {
 const [route, setRoute] = useState<Route>({ name: 'home' });
 // Start on help screen if project exists (show commands), otherwise home (show Quick Start)
 const initialRoute: Route = projectExists() ? { name: 'help' } : { name: 'home' };
 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@@ -105,7 +114,10 @@ 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@@ -135,6 +147,7 @@ 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@@ -153,7 +166,13 @@ function AppContent() {
 }

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

 if (route.name === 'edit') {
Expand Down

106 changes: 79 additions & 27 deletions
src/cli/tui/screens/home/HomeScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
import { findConfigRoot } from '../../../../lib';
import { Cursor, ScreenLayout } from '../../components';
import {
 Cursor,
 ScreenLayout,
 ShellCommandText,
 ShellEscapeContainer,
 ShellPrompt,
 useShellContext,
} from '../../components';
import { buildLogo, useLayout } from '../../context';
import { HINTS, QUICK_START } from '../../copy';
import { Box, Text, useApp, useInput } from 'ink';
import React from 'react';

function InputLine() {
 const { isActive } = useShellContext();

 return (
 <Box>
 <ShellPrompt />
 {isActive ? <ShellCommandText /> : <Cursor />}
 </Box>
 );
}

function QuickStart() {
 return (
 <Box marginTop={1} flexDirection="column">
Expand All@@ -16,56 +34,59 @@ function QuickStart() {
 <Text color="cyan">create</Text>
 <Text dimColor> {QUICK_START.create}</Text>
 </Text>
 <Text>
 <Text color="cyan">add</Text>
 <Text dimColor> {QUICK_START.add}</Text>
 </Text>
 <Text>
 <Text color="cyan">deploy</Text>
 <Text dimColor> {QUICK_START.deploy}</Text>
 </Text>
 </Box>
 <Box marginTop={1}>
 <Text>
 <Text color="cyan">⚑ </Text>
 <Text dimColor>{QUICK_START.tip}</Text>
 <Text dimColor>Run create to get started</Text>
 </Text>
 </Box>
 </Box>
 );
}

interface HomeContentProps {
 cwd: string;
 version: string;
 onShowHelp: (initialQuery?: string) => void;
 onSelectCreate: () => void;
}

function hasProject(): boolean {
 return findConfigRoot() !== null;
}

// Quick start takes 8 lines: margin(1) + header(1) + margin(1) + 3 items + margin(1) + tip(1)
const QUICK_START_LINES = 8;

interface HomeScreenProps {
 cwd: string;
 version: string;
 onShowHelp: (initialQuery?: string) => void;
}

export function HomeScreen({ cwd: _cwd, version, onShowHelp }: HomeScreenProps) {
function HomeContent({ cwd: _cwd, version, onShowHelp, onSelectCreate }: HomeContentProps) {
 const { exit } = useApp();
 const { isActive } = useShellContext();
 const { contentWidth } = useLayout();
 const showQuickStart = !hasProject();
 const showQuickStart = !isActive && !hasProject();
 const logo = buildLogo(contentWidth, version);
 const divider = '─'.repeat(contentWidth);

 useInput((input, key) => {
 if (isActive) return;

 if (key.escape) {
 exit();
 return;
 }

 if (key.return && showQuickStart) {
 onSelectCreate();
 return;
 }

 if (key.tab) {
 onShowHelp();
 return;
 }

 if (input === '!') return;

 if (input && !key.ctrl && !key.meta) {
 onShowHelp(input);
 }
Expand All@@ -79,21 +100,52 @@ export function HomeScreen({ cwd: _cwd, version, onShowHelp }: HomeScreenProps)

 {/* Input - directly under logo */}
 <Box marginTop={1}>
 <Box>
 <Text color="cyan">&gt; </Text>
 <Cursor />
 </Box>
 <InputLine />
 </Box>

 {/* Quick Start or equal blank space */}
 {showQuickStart ? <QuickStart /> : <Box height={QUICK_START_LINES} />}
 {showQuickStart ? <QuickStart /> : !isActive && <Box height={QUICK_START_LINES} />}

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

// Reserved: logo(4) + version(1) + input margin(1) + input(1) + indicator(1) + padding(2) + buffer(2)
const RESERVED_LINES = 12;

interface HomeScreenProps {
 cwd: string;
 version: string;
 initialShellCommand?: string;
 onShowHelp: (initialQuery?: string) => void;
 onSelectCreate: () => void;
 /** Called when shell mode completes (after running a command). Used to auto-return to previous screen. */
 onShellComplete?: () => void;
}

export function HomeScreen({
 cwd,
 version,
 initialShellCommand,
 onShowHelp,
 onSelectCreate,
 onShellComplete,
}: HomeScreenProps) {
 return (
 <ShellEscapeContainer
 reservedLines={RESERVED_LINES}
 initialShellCommand={initialShellCommand}
 onShellComplete={onShellComplete}
 >
 <HomeContent cwd={cwd} version={version} onShowHelp={onShowHelp} onSelectCreate={onSelectCreate} />
 </ShellEscapeContainer>
 );
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: improve TUI initial screen based on project state#10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aidandaly24
merged 1 commit into

from

Feb 1, 2026
 Merged


fix: improve TUI initial screen based on project state
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


27 changes: 23 additions & 4 deletions
src/cli/tui/App.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
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@@ -20,13 +21,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, { useState } from 'react';
import React, { useEffect, useState } from 'react';

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

type Route =
 | { name: 'home' }
 | { name: 'home'; initialShellCommand?: string; returnTo?: 'deploy' | 'plan' }
 | { name: 'help'; initialQuery?: string }
 | { name: 'command'; command: CommandMeta }
 | { name: 'dev' }
Expand All@@ -46,9 +47,17 @@ type Route =
 | { name: 'update' };

function AppContent() {
 const [route, setRoute] = useState<Route>({ name: 'home' });
 // Start on help screen if project exists (show commands), otherwise home (show Quick Start)
 const initialRoute: Route = projectExists() ? { name: 'help' } : { name: 'home' };
 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@@ -105,7 +114,10 @@ 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@@ -135,6 +147,7 @@ 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@@ -153,7 +166,13 @@ function AppContent() {
 }

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

 if (route.name === 'edit') {
Expand Down

106 changes: 79 additions & 27 deletions
src/cli/tui/screens/home/HomeScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
import { findConfigRoot } from '../../../../lib';
import { Cursor, ScreenLayout } from '../../components';
import {
 Cursor,
 ScreenLayout,
 ShellCommandText,
 ShellEscapeContainer,
 ShellPrompt,
 useShellContext,
} from '../../components';
import { buildLogo, useLayout } from '../../context';
import { HINTS, QUICK_START } from '../../copy';
import { Box, Text, useApp, useInput } from 'ink';
import React from 'react';

function InputLine() {
 const { isActive } = useShellContext();

 return (
 <Box>
 <ShellPrompt />
 {isActive ? <ShellCommandText /> : <Cursor />}
 </Box>
 );
}

function QuickStart() {
 return (
 <Box marginTop={1} flexDirection="column">
Expand All@@ -16,56 +34,59 @@ function QuickStart() {
 <Text color="cyan">create</Text>
 <Text dimColor> {QUICK_START.create}</Text>
 </Text>
 <Text>
 <Text color="cyan">add</Text>
 <Text dimColor> {QUICK_START.add}</Text>
 </Text>
 <Text>
 <Text color="cyan">deploy</Text>
 <Text dimColor> {QUICK_START.deploy}</Text>
 </Text>
 </Box>
 <Box marginTop={1}>
 <Text>
 <Text color="cyan">⚑ </Text>
 <Text dimColor>{QUICK_START.tip}</Text>
 <Text dimColor>Run create to get started</Text>
 </Text>
 </Box>
 </Box>
 );
}

interface HomeContentProps {
 cwd: string;
 version: string;
 onShowHelp: (initialQuery?: string) => void;
 onSelectCreate: () => void;
}

function hasProject(): boolean {
 return findConfigRoot() !== null;
}

// Quick start takes 8 lines: margin(1) + header(1) + margin(1) + 3 items + margin(1) + tip(1)
const QUICK_START_LINES = 8;

interface HomeScreenProps {
 cwd: string;
 version: string;
 onShowHelp: (initialQuery?: string) => void;
}

export function HomeScreen({ cwd: _cwd, version, onShowHelp }: HomeScreenProps) {
function HomeContent({ cwd: _cwd, version, onShowHelp, onSelectCreate }: HomeContentProps) {
 const { exit } = useApp();
 const { isActive } = useShellContext();
 const { contentWidth } = useLayout();
 const showQuickStart = !hasProject();
 const showQuickStart = !isActive && !hasProject();
 const logo = buildLogo(contentWidth, version);
 const divider = '─'.repeat(contentWidth);

 useInput((input, key) => {
 if (isActive) return;

 if (key.escape) {
 exit();
 return;
 }

 if (key.return && showQuickStart) {
 onSelectCreate();
 return;
 }

 if (key.tab) {
 onShowHelp();
 return;
 }

 if (input === '!') return;

 if (input && !key.ctrl && !key.meta) {
 onShowHelp(input);
 }
Expand All@@ -79,21 +100,52 @@ export function HomeScreen({ cwd: _cwd, version, onShowHelp }: HomeScreenProps)

 {/* Input - directly under logo */}
 <Box marginTop={1}>
 <Box>
 <Text color="cyan">&gt; </Text>
 <Cursor />
 </Box>
 <InputLine />
 </Box>

 {/* Quick Start or equal blank space */}
 {showQuickStart ? <QuickStart /> : <Box height={QUICK_START_LINES} />}
 {showQuickStart ? <QuickStart /> : !isActive && <Box height={QUICK_START_LINES} />}

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

// Reserved: logo(4) + version(1) + input margin(1) + input(1) + indicator(1) + padding(2) + buffer(2)
const RESERVED_LINES = 12;

interface HomeScreenProps {
 cwd: string;
 version: string;
 initialShellCommand?: string;
 onShowHelp: (initialQuery?: string) => void;
 onSelectCreate: () => void;
 /** Called when shell mode completes (after running a command). Used to auto-return to previous screen. */
 onShellComplete?: () => void;
}

export function HomeScreen({
 cwd,
 version,
 initialShellCommand,
 onShowHelp,
 onSelectCreate,
 onShellComplete,
}: HomeScreenProps) {
 return (
 <ShellEscapeContainer
 reservedLines={RESERVED_LINES}
 initialShellCommand={initialShellCommand}
 onShellComplete={onShellComplete}
 >
 <HomeContent cwd={cwd} version={version} onShowHelp={onShowHelp} onSelectCreate={onSelectCreate} />
 </ShellEscapeContainer>
 );
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix: improve TUI initial screen based on project state#10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

aidandaly24
merged 1 commit into

from

Feb 1, 2026
 Merged


fix: improve TUI initial screen based on project state
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


27 changes: 23 additions & 4 deletions
src/cli/tui/App.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
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@@ -20,13 +21,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, { useState } from 'react';
import React, { useEffect, useState } from 'react';

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

type Route =
 | { name: 'home' }
 | { name: 'home'; initialShellCommand?: string; returnTo?: 'deploy' | 'plan' }
 | { name: 'help'; initialQuery?: string }
 | { name: 'command'; command: CommandMeta }
 | { name: 'dev' }
Expand All@@ -46,9 +47,17 @@ type Route =
 | { name: 'update' };

function AppContent() {
 const [route, setRoute] = useState<Route>({ name: 'home' });
 // Start on help screen if project exists (show commands), otherwise home (show Quick Start)
 const initialRoute: Route = projectExists() ? { name: 'help' } : { name: 'home' };
 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@@ -105,7 +114,10 @@ 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@@ -135,6 +147,7 @@ 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@@ -153,7 +166,13 @@ function AppContent() {
 }

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

 if (route.name === 'edit') {
Expand Down

106 changes: 79 additions & 27 deletions
src/cli/tui/screens/home/HomeScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
import { findConfigRoot } from '../../../../lib';
import { Cursor, ScreenLayout } from '../../components';
import {
 Cursor,
 ScreenLayout,
 ShellCommandText,
 ShellEscapeContainer,
 ShellPrompt,
 useShellContext,
} from '../../components';
import { buildLogo, useLayout } from '../../context';
import { HINTS, QUICK_START } from '../../copy';
import { Box, Text, useApp, useInput } from 'ink';
import React from 'react';

function InputLine() {
 const { isActive } = useShellContext();

 return (
 <Box>
 <ShellPrompt />
 {isActive ? <ShellCommandText /> : <Cursor />}
 </Box>
 );
}

function QuickStart() {
 return (
 <Box marginTop={1} flexDirection="column">
Expand All@@ -16,56 +34,59 @@ function QuickStart() {
 <Text color="cyan">create</Text>
 <Text dimColor> {QUICK_START.create}</Text>
 </Text>
 <Text>
 <Text color="cyan">add</Text>
 <Text dimColor> {QUICK_START.add}</Text>
 </Text>
 <Text>
 <Text color="cyan">deploy</Text>
 <Text dimColor> {QUICK_START.deploy}</Text>
 </Text>
 </Box>
 <Box marginTop={1}>
 <Text>
 <Text color="cyan">⚑ </Text>
 <Text dimColor>{QUICK_START.tip}</Text>
 <Text dimColor>Run create to get started</Text>
 </Text>
 </Box>
 </Box>
 );
}

interface HomeContentProps {
 cwd: string;
 version: string;
 onShowHelp: (initialQuery?: string) => void;
 onSelectCreate: () => void;
}

function hasProject(): boolean {
 return findConfigRoot() !== null;
}

// Quick start takes 8 lines: margin(1) + header(1) + margin(1) + 3 items + margin(1) + tip(1)
const QUICK_START_LINES = 8;

interface HomeScreenProps {
 cwd: string;
 version: string;
 onShowHelp: (initialQuery?: string) => void;
}

export function HomeScreen({ cwd: _cwd, version, onShowHelp }: HomeScreenProps) {
function HomeContent({ cwd: _cwd, version, onShowHelp, onSelectCreate }: HomeContentProps) {
 const { exit } = useApp();
 const { isActive } = useShellContext();
 const { contentWidth } = useLayout();
 const showQuickStart = !hasProject();
 const showQuickStart = !isActive && !hasProject();
 const logo = buildLogo(contentWidth, version);
 const divider = '─'.repeat(contentWidth);

 useInput((input, key) => {
 if (isActive) return;

 if (key.escape) {
 exit();
 return;
 }

 if (key.return && showQuickStart) {
 onSelectCreate();
 return;
 }

 if (key.tab) {
 onShowHelp();
 return;
 }

 if (input === '!') return;

 if (input && !key.ctrl && !key.meta) {
 onShowHelp(input);
 }
Expand All@@ -79,21 +100,52 @@ export function HomeScreen({ cwd: _cwd, version, onShowHelp }: HomeScreenProps)

 {/* Input - directly under logo */}
 <Box marginTop={1}>
 <Box>
 <Text color="cyan">&gt; </Text>
 <Cursor />
 </Box>
 <InputLine />
 </Box>

 {/* Quick Start or equal blank space */}
 {showQuickStart ? <QuickStart /> : <Box height={QUICK_START_LINES} />}
 {showQuickStart ? <QuickStart /> : !isActive && <Box height={QUICK_START_LINES} />}

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

// Reserved: logo(4) + version(1) + input margin(1) + input(1) + indicator(1) + padding(2) + buffer(2)
const RESERVED_LINES = 12;

interface HomeScreenProps {
 cwd: string;
 version: string;
 initialShellCommand?: string;
 onShowHelp: (initialQuery?: string) => void;
 onSelectCreate: () => void;
 /** Called when shell mode completes (after running a command). Used to auto-return to previous screen. */
 onShellComplete?: () => void;
}

export function HomeScreen({
 cwd,
 version,
 initialShellCommand,
 onShowHelp,
 onSelectCreate,
 onShellComplete,
}: HomeScreenProps) {
 return (
 <ShellEscapeContainer
 reservedLines={RESERVED_LINES}
 initialShellCommand={initialShellCommand}
 onShellComplete={onShellComplete}
 >
 <HomeContent cwd={cwd} version={version} onShowHelp={onShowHelp} onSelectCreate={onSelectCreate} />
 </ShellEscapeContainer>
 );
}