Skip to content

Commit e1dfe9f

Browse files
fix(server): keep startup stderr other than the root refusal out of turn failures
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 6ecda6b commit e1dfe9f

3 files changed

Lines changed: 43 additions & 24 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,9 @@ const WORKFLOW_MEMBER_TRANSCRIPT_FLUSH_MS = 500;
315315
const BACKGROUND_MOVE_TIMEOUT_MS = 5_000;
316316
// Matches the stderr tail the SDK keeps for a CLI it spawns itself.
317317
const CLAUDE_STDERR_TAIL_LENGTH = 2_048;
318+
// Claude Code's refusal of bypassPermissions as root, which it explains only on stderr (#15882).
319+
const CLAUDE_ROOT_REFUSAL =
320+
"--dangerously-skip-permissions cannot be used with root/sudo privileges for security reasons";
318321

319322
const CLAUDE_GROUP_WATCH_SCRIPT = [
320323
"{ trap '' TERM; read -r _ <&3; kill -TERM 0; sleep 5; kill -KILL 0; } </dev/null >/dev/null 2>&1 &",
@@ -539,15 +542,14 @@ export class ClaudeAgentSdkQueryRunnerError extends Schema.TaggedError<ClaudeAge
539542
}
540543
}
541544

542-
export class ClaudeCodeStartupError extends Schema.TaggedError<ClaudeCodeStartupError>()(
543-
"ClaudeCodeStartupError",
545+
export class ClaudeCodeRootRefusalError extends Schema.TaggedError<ClaudeCodeRootRefusalError>()(
546+
"ClaudeCodeRootRefusalError",
544547
{
545-
stderr: Schema.String,
546-
cause: Schema.optional(Schema.Defect()),
548+
cause: Schema.Defect(),
547549
},
548550
) {
549551
override get message(): string {
550-
return `Claude Code exited before it started: ${this.stderr}`;
552+
return `Claude Code exited before it started: ${CLAUDE_ROOT_REFUSAL}`;
551553
}
552554
}
553555

@@ -962,8 +964,8 @@ export const layerQueryRunner: Layer.Layer<
962964
executableArgs: [...launch.args, ...(queryOptions.executableArgs ?? [])],
963965
};
964966
// Only a CLI that fails before its first message explains itself on
965-
// stderr, such as refusing bypassPermissions as root (#15882); later
966-
// stderr stays out of turn failures.
967+
// stderr. The known root refusal becomes a curated failure; any other
968+
// stderr can hold private text, so it stays out of turn failures.
967969
let stderrTail = "";
968970
let answered = false;
969971
const appendStderr = (text: string) => {
@@ -1041,9 +1043,9 @@ export const layerQueryRunner: Layer.Layer<
10411043

10421044
return {
10431045
messages: Stream.fromAsyncIterable(claudeQueryMessages(queryRuntime), (cause) => {
1044-
const stderr = answered ? "" : stderrTail.trim();
1046+
const refusedRoot = !answered && stderrTail.includes(CLAUDE_ROOT_REFUSAL);
10451047
return queryRunnerError(
1046-
stderr.length > 0 ? new ClaudeCodeStartupError({ stderr, cause }) : cause,
1048+
refusedRoot ? new ClaudeCodeRootRefusalError({ cause }) : cause,
10471049
"fromAsyncIterable",
10481050
);
10491051
}).pipe(

‎apps/server/src/orchestration-v2/Adapters/ClaudeAgentSdkQueryRunner.test.ts‎

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -172,27 +172,44 @@ describe.skipIf(HostProcess.Platform.defaultValue() === "win32")("Claude CLI pro
172172
}).pipe(Effect.provide(realQueryRunner)),
173173
);
174174

175-
// Claude Code refuses bypassPermissions as root and explains why only on
176-
// stderr, so the turn failure has to carry that line (#15882).
177-
it.effect("reports the CLI's startup error when it exits before answering", () =>
175+
const rootRefusal =
176+
"--dangerously-skip-permissions cannot be used with root/sudo privileges for security reasons";
177+
178+
const startupFailureMessage = (stderr: string) =>
178179
Effect.gen(function* () {
179-
const reason =
180-
"--dangerously-skip-permissions cannot be used with root/sudo privileges for security reasons";
181-
const cli = fakeClaudeCli(`echo '${reason}' >&2\nexit 1`);
180+
const cli = fakeClaudeCli(`printf '%s\\n' '${stderr}' >&2\nexit 1`);
182181
yield* Effect.addFinalizer(() =>
183182
Effect.sync(() => NodeFS.rmSync(NodePath.dirname(cli), { recursive: true, force: true })),
184183
);
185-
186184
const session = yield* openFakeCli(cli);
187185
const exit = yield* Stream.runDrain(session.messages).pipe(Effect.exit);
188-
189186
assert.isTrue(Exit.isFailure(exit));
190-
if (Exit.isFailure(exit)) {
191-
assert.include(
192-
makeProviderFailure({ cause: exit.cause, class: "transport_error" }).message,
193-
reason,
194-
);
195-
}
187+
return Exit.isFailure(exit)
188+
? makeProviderFailure({ cause: exit.cause, class: "transport_error" }).message
189+
: "";
190+
});
191+
192+
// Claude Code refuses bypassPermissions as root and explains why only on
193+
// stderr, so the turn failure has to carry that line (#15882).
194+
it.effect("reports the CLI's root refusal when it exits before answering", () =>
195+
Effect.gen(function* () {
196+
assert.include(yield* startupFailureMessage(rootRefusal), rootRefusal);
197+
}).pipe(Effect.provide(realQueryRunner)),
198+
);
199+
200+
// Startup stderr can carry paths, tokens, or settings, so only the known
201+
// refusal reaches the failure the client shows.
202+
it.effect("keeps other startup stderr out of the turn failure", () =>
203+
Effect.gen(function* () {
204+
const surrounded = yield* startupFailureMessage(
205+
`token=sk-private-123\n${rootRefusal}\nat /home/private/settings.json`,
206+
);
207+
assert.include(surrounded, rootRefusal);
208+
assert.notInclude(surrounded, "sk-private-123");
209+
assert.notInclude(surrounded, "/home/private");
210+
211+
const unknown = yield* startupFailureMessage("token=sk-private-123");
212+
assert.notInclude(unknown, "sk-private-123");
196213
}).pipe(Effect.provide(realQueryRunner)),
197214
);
198215

‎packages/provider-core/src/server/failure.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ function curatedCauseMessages(cause: unknown): {
9191
case "ClaudeBackgroundWorkBlocksQueryReplacementError":
9292
case "ClaudeAppendSystemPromptFileError":
9393
case "ClaudeAppendSystemPromptMissingValueError":
94-
case "ClaudeCodeStartupError":
94+
case "ClaudeCodeRootRefusalError":
9595
case "CursorModelUnavailableError":
9696
return { known: stringField(cause, "message"), category: categoryMessage() };
9797
case "ContextHandoffDeliveryUncertainError":

0 commit comments

Comments
 (0)