Skip to content

fix(zed-integration): Allow Zed integration to use stdio #13795

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

Closed
benbrandt wants to merge 2 commits into from
Closed

fix(zed-integration): Allow Zed integration to use stdio #13795

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5cf071
fix(zed-integration): Allow Zed integration to use stdio
benbrandt Nov 25, 2025
a58e95b
Move custom version of the output listeners so we don't write console…
benbrandt Nov 25, 2025
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: 27 additions & 0 deletions packages/cli/src/zed-integration/zedIntegration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import type {
ToolResult,
ToolCallConfirmationDetails,
FilterFilesOptions,
OutputPayload,
ConsoleLogPayload,
} from '@google/gemini-cli-core';
import {
AuthType,
Expand All @@ -31,6 +33,10 @@ import {
ReadManyFilesTool,
getEffectiveModel,
startupProfiler,
CoreEvent,
coreEvents,
writeToStderr,
writeToStdout,
} from '@google/gemini-cli-core';
import * as acp from './acp.js';
import { AcpFileSystemService } from './fileSystemService.js';
Expand All @@ -51,6 +57,7 @@ export async function runZedIntegration(
settings: LoadedSettings,
argv: CliArgs,
) {
initializeOutputListenersAndFlush();
const stdout = Writable.toWeb(process.stdout) as WritableStream;
const stdin = Readable.toWeb(process.stdin) as ReadableStream<Uint8Array>;

Expand All @@ -67,6 +74,26 @@ export async function runZedIntegration(
);
}

export function initializeOutputListenersAndFlush() {
// If there are no listeners for output, make sure we flush so output is not
// lost.
if (coreEvents.listenerCount(CoreEvent.Output) === 0) {
// In non-interactive mode, ensure we drain any buffered output or logs to stderr
coreEvents.on(CoreEvent.Output, (payload: OutputPayload) => {
if (payload.isStderr) {
writeToStderr(payload.chunk, payload.encoding);
} else {
writeToStdout(payload.chunk, payload.encoding);
}
});

coreEvents.on(CoreEvent.ConsoleLog, (payload: ConsoleLogPayload) => {
writeToStderr(payload.content);
});
}
coreEvents.drainBacklogs();
}

export class GeminiAgent {
private sessions: Map<string, Session> = new Map();
private clientCapabilities: acp.ClientCapabilities | undefined;
Expand Down