Skip to content

Commit 84320a7

Browse files
federiconericlaude
federiconeri
and
claude
authored
feat(cli): route wiggum monitor to Ink TUI in interactive terminals (#106)
* feat(cli): route wiggum monitor to Ink TUI in interactive terminals - Add RunAppProps interface and runProps to AppProps/RenderAppOptions so the run screen can be launched with featureName/monitorOnly from CLI - Extend startInkTui() to accept options object with runFeature/monitorOnly - Add isCI() utility to detect CI environment (CI / CONTINUOUS_INTEGRATION) - Update monitor routing: TTY+non-CI → Ink TUI (monitor-only), --stream or non-TTY/CI → headless streaming, --bash → bash script; with Ink error fallback - Add --stream flag to help text - Tests: runProps plumbing in App, isCI() utility, monitor routing, --stream parsing Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * test(e2e): add E2E fixtures and screenshots for route-wiggum-monitor Add initialized-project fixture for E2E tests and screenshots confirming both scenarios pass: - monitor in TTY opens Ink TUI RunScreen (monitor-only mode) - monitor --stream forces headless streaming output Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(route-wiggum-monitor): address code review feedback - Narrow RunAppProps.reviewMode from string to 'manual' | 'auto' union - Handle CI=false and CI=0 as non-CI in isCI() utility - Make pre-existing monitor test explicit about isTTY state - Add test cases for CI=false, CI=0, and CI="" edge cases Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent cbdf9a2 commit 84320a7

9 files changed

Lines changed: 403 additions & 15 deletions

File tree

‎e2e/e2e-monitor-stream.png‎

33.8 KB
Loading

‎e2e/e2e-monitor-tui.png‎

38.7 KB
Loading

‎e2e/fixtures/initialized-project/package.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"name": "initialized-project",
3+
"version": "1.0.0"
4+
}

‎src/index.test.ts‎

Lines changed: 111 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
22

3-
const { mockRenderApp, mockRunCommand, mockMonitorCommand, mockHandleConfigCommand } = vi.hoisted(() => {
3+
const { mockRenderApp, mockRunCommand, mockMonitorCommand, mockHandleConfigCommand, mockIsCI } = vi.hoisted(() => {
44
const mockRenderApp = vi.fn().mockReturnValue({
55
unmount: vi.fn(),
66
waitUntilExit: vi.fn().mockResolvedValue(undefined),
@@ -10,7 +10,8 @@ const { mockRenderApp, mockRunCommand, mockMonitorCommand, mockHandleConfigComma
1010
const mockHandleConfigCommand = vi.fn().mockImplementation((args: string[], state: unknown) =>
1111
Promise.resolve(state)
1212
);
13-
return { mockRenderApp, mockRunCommand, mockMonitorCommand, mockHandleConfigCommand };
13+
const mockIsCI = vi.fn().mockReturnValue(false);
14+
return { mockRenderApp, mockRunCommand, mockMonitorCommand, mockHandleConfigCommand, mockIsCI };
1415
});
1516

1617
// Mock all heavy dependencies before imports
@@ -70,6 +71,10 @@ vi.mock('./commands/monitor.js', () => ({
7071
monitorCommand: mockMonitorCommand,
7172
}));
7273

74+
vi.mock('./utils/ci.js', () => ({
75+
isCI: mockIsCI,
76+
}));
77+
7378
vi.mock('./commands/config.js', () => ({
7479
handleConfigCommand: mockHandleConfigCommand,
7580
}));
@@ -188,6 +193,14 @@ describe('parseCliArgs', () => {
188193
expect(result.positionalArgs).toEqual(['my-feature']);
189194
expect(result.flags.worktree).toBe(true);
190195
});
196+
197+
it('--stream flag parsed as boolean', () => {
198+
expect(parseCliArgs(['monitor', 'foo', '--stream'])).toEqual({
199+
command: 'monitor',
200+
positionalArgs: ['foo'],
201+
flags: { stream: true },
202+
});
203+
});
191204
});
192205

193206
// ─── main() routing tests ──────────────────────────────────────────────────────
@@ -402,7 +415,14 @@ describe('main', () => {
402415

403416
it('monitor my-feature → calls monitorCommand with feature name', async () => {
404417
process.argv = ['node', 'ralph.js', 'monitor', 'my-feature'];
405-
await main();
418+
const originalIsTTY = process.stdout.isTTY;
419+
Object.defineProperty(process.stdout, 'isTTY', { value: undefined, configurable: true });
420+
421+
try {
422+
await main();
423+
} finally {
424+
Object.defineProperty(process.stdout, 'isTTY', { value: originalIsTTY, configurable: true });
425+
}
406426

407427
expect(mockMonitorCommand).toHaveBeenCalledWith('my-feature', expect.any(Object));
408428
expect(mockRenderApp).not.toHaveBeenCalled();
@@ -444,6 +464,94 @@ describe('main', () => {
444464
expect(consoleErrorSpy).toHaveBeenCalledWith(expect.stringContaining('--interval'));
445465
});
446466

467+
it('monitor my-feature --stream → calls monitorCommand (headless) even in TTY', async () => {
468+
process.argv = ['node', 'ralph.js', 'monitor', 'my-feature', '--stream'];
469+
const originalIsTTY = process.stdout.isTTY;
470+
Object.defineProperty(process.stdout, 'isTTY', { value: true, configurable: true });
471+
472+
try {
473+
await main();
474+
} finally {
475+
Object.defineProperty(process.stdout, 'isTTY', { value: originalIsTTY, configurable: true });
476+
}
477+
478+
expect(mockMonitorCommand).toHaveBeenCalledWith('my-feature', expect.any(Object));
479+
expect(mockRenderApp).not.toHaveBeenCalled();
480+
});
481+
482+
it('monitor my-feature in TTY (no CI) → starts Ink TUI in monitor-only mode', async () => {
483+
process.argv = ['node', 'ralph.js', 'monitor', 'my-feature'];
484+
const originalIsTTY = process.stdout.isTTY;
485+
Object.defineProperty(process.stdout, 'isTTY', { value: true, configurable: true });
486+
mockIsCI.mockReturnValue(false);
487+
488+
try {
489+
await main();
490+
} finally {
491+
Object.defineProperty(process.stdout, 'isTTY', { value: originalIsTTY, configurable: true });
492+
mockIsCI.mockReturnValue(false);
493+
}
494+
495+
expect(mockRenderApp).toHaveBeenCalledWith(
496+
expect.objectContaining({
497+
screen: 'run',
498+
runProps: expect.objectContaining({ featureName: 'my-feature', monitorOnly: true }),
499+
}),
500+
);
501+
expect(mockMonitorCommand).not.toHaveBeenCalled();
502+
});
503+
504+
it('monitor my-feature in CI (even with TTY) → calls monitorCommand (headless)', async () => {
505+
process.argv = ['node', 'ralph.js', 'monitor', 'my-feature'];
506+
const originalIsTTY = process.stdout.isTTY;
507+
Object.defineProperty(process.stdout, 'isTTY', { value: true, configurable: true });
508+
mockIsCI.mockReturnValue(true);
509+
510+
try {
511+
await main();
512+
} finally {
513+
Object.defineProperty(process.stdout, 'isTTY', { value: originalIsTTY, configurable: true });
514+
mockIsCI.mockReturnValue(false);
515+
}
516+
517+
expect(mockMonitorCommand).toHaveBeenCalledWith('my-feature', expect.any(Object));
518+
expect(mockRenderApp).not.toHaveBeenCalled();
519+
});
520+
521+
it('monitor my-feature in non-TTY → calls monitorCommand (headless)', async () => {
522+
process.argv = ['node', 'ralph.js', 'monitor', 'my-feature'];
523+
const originalIsTTY = process.stdout.isTTY;
524+
Object.defineProperty(process.stdout, 'isTTY', { value: false, configurable: true });
525+
526+
try {
527+
await main();
528+
} finally {
529+
Object.defineProperty(process.stdout, 'isTTY', { value: originalIsTTY, configurable: true });
530+
}
531+
532+
expect(mockMonitorCommand).toHaveBeenCalledWith('my-feature', expect.any(Object));
533+
expect(mockRenderApp).not.toHaveBeenCalled();
534+
});
535+
536+
it('monitor my-feature in TTY with TUI error → falls back to monitorCommand', async () => {
537+
process.argv = ['node', 'ralph.js', 'monitor', 'my-feature'];
538+
const originalIsTTY = process.stdout.isTTY;
539+
Object.defineProperty(process.stdout, 'isTTY', { value: true, configurable: true });
540+
mockIsCI.mockReturnValue(false);
541+
mockRenderApp.mockImplementationOnce(() => {
542+
throw new Error('Ink initialization failed');
543+
});
544+
545+
try {
546+
await main();
547+
} finally {
548+
Object.defineProperty(process.stdout, 'isTTY', { value: originalIsTTY, configurable: true });
549+
mockIsCI.mockReturnValue(false);
550+
}
551+
552+
expect(mockMonitorCommand).toHaveBeenCalledWith('my-feature', expect.any(Object));
553+
});
554+
447555
// ─── config command routing ───────────────────────────────────────────────────
448556

449557
it('config → calls handleConfigCommand with empty args', async () => {

‎src/index.ts‎

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { listSpecNames } from './utils/spec-names.js';
44
import { AVAILABLE_MODELS, getAvailableProvider, isAnthropicAlias } from './ai/providers.js';
55
import type { AIProvider } from './ai/providers.js';
66
import { notifyIfUpdateAvailable } from './utils/update-check.js';
7-
import { renderApp, type AppScreen } from './tui/app.js';
7+
import { renderApp, type AppScreen, type RunAppProps } from './tui/app.js';
88
import { logger } from './utils/logger.js';
99
import { loadApiKeysFromEnvLocal } from './utils/env.js';
1010
import { readFileSync } from 'fs';
@@ -13,6 +13,7 @@ import { dirname, join } from 'path';
1313
import { runCommand, type RunOptions } from './commands/run.js';
1414
import { monitorCommand, type MonitorOptions } from './commands/monitor.js';
1515
import { handleConfigCommand } from './commands/config.js';
16+
import { isCI } from './utils/ci.js';
1617

1718
/**
1819
* Parsed CLI arguments
@@ -129,7 +130,11 @@ function getVersion(): string {
129130
* Start Ink TUI mode
130131
* Called when wiggum is invoked with no arguments or with screen-routing args
131132
*/
132-
async function startInkTui(initialScreen: AppScreen = 'shell', interviewFeature?: string): Promise<void> {
133+
async function startInkTui(
134+
initialScreen: AppScreen = 'shell',
135+
options?: { interviewFeature?: string; runFeature?: string; monitorOnly?: boolean },
136+
): Promise<void> {
137+
const interviewFeature = options?.interviewFeature;
133138
const projectRoot = process.cwd();
134139
const version = getVersion();
135140

@@ -189,11 +194,17 @@ async function startInkTui(initialScreen: AppScreen = 'shell', interviewFeature?
189194
}
190195
: undefined;
191196

197+
// Build run props if starting on run/monitor screen
198+
const runProps: RunAppProps | undefined = options?.runFeature
199+
? { featureName: options.runFeature, monitorOnly: options.monitorOnly }
200+
: undefined;
201+
192202
const instance = renderApp({
193203
screen: initialScreen,
194204
initialSessionState: initialState,
195205
version,
196206
interviewProps,
207+
runProps,
197208
onComplete: (specPath) => {
198209
// Spec was saved to disk by app.tsx (avoid stdout noise during TUI)
199210
logger.debug(`Created spec: ${specPath}`);
@@ -244,6 +255,7 @@ Options for run:
244255
Options for monitor:
245256
--interval <seconds> Refresh interval (default: 5)
246257
--bash Use bash monitor script
258+
--stream Force headless streaming output (skip TUI)
247259
248260
Options for init:
249261
--provider <name> AI provider (anthropic, openai, openrouter)
@@ -298,7 +310,7 @@ Press Esc to cancel any operation.
298310
process.exit(1);
299311
}
300312
// TODO: pass parsed flags to startInkTui once TUI supports new flags
301-
await startInkTui('interview', featureName);
313+
await startInkTui('interview', { interviewFeature: featureName });
302314
break;
303315
}
304316

@@ -325,14 +337,32 @@ Press Esc to cancel any operation.
325337
const feature = parsed.positionalArgs[0];
326338
if (!feature) {
327339
console.error('Error: <feature> is required for "monitor"');
328-
console.error('Usage: wiggum monitor <feature> [--interval <seconds>] [--bash]');
340+
console.error('Usage: wiggum monitor <feature> [--interval <seconds>] [--bash] [--stream]');
329341
process.exit(1);
330342
}
331-
const monitorOptions: MonitorOptions = {
332-
bash: parsed.flags.bash === true,
333-
interval: typeof parsed.flags.interval === 'string' ? parseIntFlag(parsed.flags.interval, '--interval') : undefined,
334-
};
335-
await monitorCommand(feature, monitorOptions);
343+
const interval = typeof parsed.flags.interval === 'string'
344+
? parseIntFlag(parsed.flags.interval, '--interval')
345+
: undefined;
346+
347+
// Routing order per spec:
348+
// 1. --bash → always use bash script path
349+
// 2. --stream → force headless streaming
350+
// 3. TTY and not CI → start Ink TUI in monitor-only mode
351+
// 4. default → headless streaming monitor
352+
if (parsed.flags.bash === true) {
353+
await monitorCommand(feature, { bash: true, interval });
354+
} else if (parsed.flags.stream === true) {
355+
await monitorCommand(feature, { interval });
356+
} else if (process.stdout.isTTY && !isCI()) {
357+
try {
358+
await startInkTui('run', { runFeature: feature, monitorOnly: true });
359+
} catch (err) {
360+
logger.error(`TUI failed to start: ${err instanceof Error ? err.message : String(err)}. Falling back to headless monitor.`);
361+
await monitorCommand(feature, { interval });
362+
}
363+
} else {
364+
await monitorCommand(feature, { interval });
365+
}
336366
break;
337367
}
338368

0 commit comments

Comments
 (0)