Skip to content

fix(cli): ignore stream-json input format in TTY mode to prevent hanging #2047

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
tanzhenxin merged 2 commits into from
Mar 6, 2026
Merged

fix(cli): ignore stream-json input format in TTY mode to prevent hanging #2047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7679910
fix(cli): ignore stream-json input format in TTY mode to prevent hanging
Mingholy Mar 2, 2026
b8eccc4
Fix failing tests in @packages/cli/src/gemini.test.tsx
Mingholy Mar 3, 2026
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
6 changes: 5 additions & 1 deletion packages/cli/src/gemini.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ describe('gemini.tsx main function', () => {
'isRaw',
);
Object.defineProperty(process.stdin, 'isTTY', {
value: true,
value: false, // 在 stream-json 樑式下应为 false
configurable: true,
});
Object.defineProperty(process.stdin, 'isRaw', {
Expand Down Expand Up @@ -344,6 +344,9 @@ describe('gemini.tsx main function', () => {
getInputFormat: () => 'stream-json',
getContentGeneratorConfig: () => ({ authType: 'test-auth' }),
getWarnings: () => [],
getUsageStatisticsEnabled: () => true,
getSessionId: () => 'test-session-id',
getOutputFormat: () => OutputFormat.TEXT,
} as unknown as Config;

vi.mocked(loadCliConfig).mockResolvedValue(configStub);
Expand Down Expand Up @@ -442,6 +445,7 @@ describe('gemini.tsx main function kitty protocol', () => {
getScreenReader: () => false,
getGeminiMdFileCount: () => 0,
getWarnings: () => [],
getUsageStatisticsEnabled: () => true,
} as unknown as Config);
vi.mocked(loadSettings).mockReturnValue({
errors: [],
Expand Down
11 changes: 5 additions & 6 deletions packages/cli/src/gemini.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,17 +385,16 @@ export async function main() {
setMaxSizedBoxDebugging(isDebugMode);

// Check input format early to determine initialization flow
const inputFormat =
typeof config.getInputFormat === 'function'
// In TTY mode, ignore stream-json input format to prevent process from hanging
const inputFormat = process.stdin.isTTY
? InputFormat.TEXT
: typeof config.getInputFormat === 'function'
? config.getInputFormat()
: InputFormat.TEXT;

// For stream-json mode, defer config.initialize() until after the initialize control request
// For other modes, initialize normally
let initializationResult: InitializationResult | undefined;
if (inputFormat !== InputFormat.STREAM_JSON) {
initializationResult = await initializeApp(config, settings);
}
const initializationResult = await initializeApp(config, settings);

if (config.getExperimentalZedIntegration()) {
return runAcpAgent(config, settings, argv);
Expand Down