diff --git a/packages/provider-core/src/server/failure.ts b/packages/provider-core/src/server/failure.ts index cfdb0eb3df9a6..f821db75a60ec 100644 --- a/packages/provider-core/src/server/failure.ts +++ b/packages/provider-core/src/server/failure.ts @@ -271,7 +271,7 @@ function replaceUnsafeControlCharacters(value: string): string { return sanitized.join(""); } -function redactProviderFailureText(value: string): string { +export function redactProviderFailureText(value: string): string { return replaceUnsafeControlCharacters(value) .replace(/\bhttps?:\/\/[^\s<>"']+/giu, redactUrl) .replace(/\b(Bearer|Basic)\s+[^\s,;]+/giu, "$1 [REDACTED]") diff --git a/packages/provider-pi/src/server/adapter.test.ts b/packages/provider-pi/src/server/adapter.test.ts index 019af2a98783f..78441b7741e39 100644 --- a/packages/provider-pi/src/server/adapter.test.ts +++ b/packages/provider-pi/src/server/adapter.test.ts @@ -7177,6 +7177,34 @@ describe("PiRpc early process exit", () => { assert.isFalse(error.message.includes("super-secret")); }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)), ); + + it.effect("includes Pi's stderr cause when it exits nonzero", () => + Effect.gen(function* () { + const cause = `Error: This extension ctx is stale after session replacement --api-key super-secret --token "quoted leaked-word ${"y".repeat(240)}"\n`; + const spawner = ChildProcessSpawner.make(() => + Effect.succeed( + makeHandle({ + exitCode: Effect.succeed(ChildProcessSpawner.ExitCode(1)), + stderr: Stream.fromIterable([new TextEncoder().encode(cause)]), + }), + ), + ); + const connection = yield* makePiRpcConnection({ + command: "pi", + args: ["--mode", "rpc"], + cwd: undefined, + env: {}, + }).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner)); + + const error = yield* Queue.take(connection.events).pipe(Effect.flip); + assert.equal(error._tag, "PiRpcError"); + assert.include(error.message, "pi process exited with code 1"); + assert.include(error.message, "This extension ctx is stale after session replacement"); + assert.include(error.message, "--api-key [REDACTED]"); + assert.isFalse(error.message.includes("super-secret")); + assert.isFalse(error.message.includes("leaked-word")); + }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)), + ); }); describe("PiRpc teardown", () => { diff --git a/packages/provider-pi/src/server/rpc.ts b/packages/provider-pi/src/server/rpc.ts index 3cdb2058f1cf3..1c5e2a1f8f139 100644 --- a/packages/provider-pi/src/server/rpc.ts +++ b/packages/provider-pi/src/server/rpc.ts @@ -18,6 +18,7 @@ import { MAX_TOOL_OUTPUT_IMAGE_BASE64_LENGTH, } from "@t3tools/shared/toolOutput"; +import { redactProviderFailureText } from "@t3tools/provider-core/server/failure"; import { signalProcessGroup } from "@t3tools/provider-core/server/processGroup"; export class PiRpcError extends Schema.TaggedError()("PiRpcError", { @@ -172,12 +173,39 @@ function summarizePiError(error: unknown): string { : text; } +const PI_STDERR_TAIL_MAX_CHARS = 8_192; +const PI_STDERR_LINE_MAX_CHARS = 240; +const PI_STDERR_ERROR_LINE = /^[\w$.]*(?:Error|Exception)(?: \[[\w-]+\])?:/; +// The shared redactor covers `key=value`; extension errors can also echo `--api-key value` argv. +const PI_STDERR_CREDENTIAL_FLAG = + /((? line.trim()); + for (let index = lines.length - 1; index >= 0; index -= 1) { + if (!PI_STDERR_ERROR_LINE.test(lines[index]!)) continue; + const frame = lines[index + 1]; + return [lines[index]!, ...(frame?.startsWith("at ") ? [frame] : [])] + .map((line) => + // Redact before truncating so a cut cannot split a quoted value out of its match. + redactProviderFailureText(line.replace(PI_STDERR_CREDENTIAL_FLAG, "$1[REDACTED]")).slice( + 0, + PI_STDERR_LINE_MAX_CHARS, + ), + ) + .join(" "); + } + return undefined; +} + // Pi 0.84+ may exit 1 during import without any protocol output. -function describePiStdoutClosure(exitCode: number | undefined): string { +function describePiStdoutClosure(exitCode: number | undefined, stderrTail: string): string { if (exitCode === undefined || !Number.isFinite(exitCode)) { return "pi process closed stdout"; } - return `pi process exited with code ${exitCode}`; + const cause = exitCode === 0 ? undefined : piStderrCause(stderrTail); + return `pi process exited with code ${exitCode}${cause === undefined ? "" : `: ${cause}`}`; } function parsePiRecord(line: string): PiRpcRecord | undefined { @@ -290,6 +318,8 @@ export const makePiRpcConnection = Effect.fnUntraced(function* (options: PiRpcSp const outgoing = yield* Queue.unbounded(); const transportDown = yield* Deferred.make(); const exitDeferred = yield* Deferred.make(); + const stderrDrained = yield* Deferred.make(); + let stderrTail = ""; let nextRequestId = 0; const failTransport = Effect.fn("PiRpc.failTransport")(function* (error: PiRpcError) { @@ -388,11 +418,17 @@ export const makePiRpcConnection = Effect.fnUntraced(function* (options: PiRpcSp Effect.provideService(Clock.Clock, Clock.Clock.defaultValue()), Effect.orElseSucceed(() => Option.none()), ); + // Extension children that inherit stderr can hold it open after Pi exits. + yield* Deferred.await(stderrDrained).pipe( + Effect.timeoutOption(Duration.millis(250)), + Effect.provideService(Clock.Clock, Clock.Clock.defaultValue()), + ); return yield* failTransport( new PiRpcError({ operation: "read", detail: describePiStdoutClosure( Option.isSome(maybeExitCode) ? maybeExitCode.value : undefined, + stderrTail, ), }), ); @@ -403,13 +439,15 @@ export const makePiRpcConnection = Effect.fnUntraced(function* (options: PiRpcSp yield* child.stderr.pipe( Stream.decodeText(), - Stream.runForEach((chunk) => - chunk.trim().length === 0 + Stream.runForEach((chunk) => { + stderrTail = `${stderrTail}${chunk}`.slice(-PI_STDERR_TAIL_MAX_CHARS); + return chunk.trim().length === 0 ? Effect.void : // Log stderr length only; unbounded text may contain credentials or prompts. - Effect.logDebug("pi stderr", { stderrLength: chunk.length }), - ), + Effect.logDebug("pi stderr", { stderrLength: chunk.length }); + }), Effect.ignore, + Effect.ensuring(Deferred.succeed(stderrDrained, undefined)), Effect.forkIn(scope), );