shumengya/sproutclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(coding-agent): reserve stdout in print and json mode closes #2482

Browse Source
This commit is contained in:
Mario Zechner
2026-03-22 21:21:29 +01:00
parent d1613e3f53
commit f1fe49a641
7 changed files with 197 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/coding-agent/src/modes/print-mode.ts
View File

@@ -8,6 +8,7 @@
import type { AssistantMessage, ImageContent } from "@mariozechner/pi-ai";
import type { AgentSession } from "../core/agent-session.js";
import { flushRawStdout, writeRawStdout } from "../core/output-guard.js";
/**
* Options for print mode.
@@ -32,7 +33,7 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
if (mode === "json") {
const header = session.sessionManager.getHeader();
if (header) {
console.log(JSON.stringify(header));
writeRawStdout(`${JSON.stringify(header)}\n`);
}
}
// Set up extensions for print mode (no UI)
@@ -76,7 +77,7 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
session.subscribe((event) => {
// In JSON mode, output all events
if (mode === "json") {
console.log(JSON.stringify(event));
writeRawStdout(`${JSON.stringify(event)}\n`);
}
});
@@ -107,7 +108,7 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
// Output text content
for (const content of assistantMsg.content) {
if (content.type === "text") {
console.log(content.text);
writeRawStdout(`${content.text}\n`);
}
}
}
@@ -115,10 +116,5 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
// Ensure stdout is fully flushed before returning
// This prevents race conditions where the process exits before all output is written
await new Promise<void>((resolve, reject) => {
process.stdout.write("", (err) => {
if (err) reject(err);
else resolve();
});
});
await flushRawStdout();
}

10
packages/coding-agent/src/modes/rpc/rpc-mode.ts
View File

@@ -18,6 +18,7 @@ import type {
ExtensionUIDialogOptions,
ExtensionWidgetOptions,
} from "../../core/extensions/index.js";
import { takeOverStdout, writeRawStdout } from "../../core/output-guard.js";
import { type Theme, theme } from "../interactive/theme/theme.js";
import { attachJsonlLineReader, serializeJsonLine } from "./jsonl.js";
import type {
@@ -43,15 +44,10 @@ export type {
* Listens for JSON commands on stdin, outputs events and responses on stdout.
*/
export async function runRpcMode(session: AgentSession): Promise<never> {
const rawStdoutWrite = process.stdout.write.bind(process.stdout);
const rawStderrWrite = process.stderr.write.bind(process.stderr);
process.stdout.write = ((
...args: Parameters<typeof process.stdout.write>
): ReturnType<typeof process.stdout.write> => rawStderrWrite(...args)) as typeof process.stdout.write;
takeOverStdout();
const output = (obj: RpcResponse | RpcExtensionUIRequest | object) => {
rawStdoutWrite(serializeJsonLine(obj));
writeRawStdout(serializeJsonLine(obj));
};
const success = <T extends RpcCommand["type"]>(