Skip to content

Commit 641ce34

Browse files
t3dotggclaude
andcommitted
fix(server): native protocol log names Claude settings keys instead of their values
User --settings can carry credentials, such as an env block. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 6f1934f commit 641ce34

2 files changed

Lines changed: 18 additions & 2 deletions

File tree

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,19 @@ describe("ClaudeAdapterV2 native protocol logging", () => {
569569
assert.equal(logged.hasMcpServers, true);
570570
assert.notInclude(JSON.stringify(logged), "secret-claude-token");
571571
});
572+
573+
it("logs --settings key names without their values", () => {
574+
const options = ClaudeAdapterV2.makeClaudeQueryOptions({
575+
modelSelection: CLAUDE_TEST_MODEL_SELECTION,
576+
nativeThreadId: "native-thread-claude-settings-log",
577+
resume: false,
578+
cwd: "/workspace",
579+
sdkSettings: { env: { ANTHROPIC_API_KEY: "secret-settings-key" } },
580+
});
581+
const logged = ClaudeAdapterV2.loggedClaudeQueryOptions(options);
582+
assert.deepEqual(logged.settingKeys, ["env", "showThinkingSummaries"]);
583+
assert.notInclude(JSON.stringify(logged), "secret-settings-key");
584+
});
572585
});
573586

574587
describe("ClaudeAdapterV2 context usage", () => {

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ export interface ClaudeAgentSdkLoggedQueryOptions {
631631
readonly cwd?: ClaudeAgentSdkQueryOptions["cwd"];
632632
readonly allowedTools?: ClaudeAgentSdkQueryOptions["allowedTools"];
633633
readonly disallowedTools?: ClaudeAgentSdkQueryOptions["disallowedTools"];
634-
readonly settings?: ClaudeAgentSdkQueryOptions["settings"];
634+
readonly settingKeys?: ReadonlyArray<string>;
635635
readonly effort?: ClaudeAgentSdkQueryOptions["effort"];
636636
readonly includePartialMessages?: true;
637637
readonly pathToClaudeCodeExecutable?: ClaudeAgentSdkQueryOptions["pathToClaudeCodeExecutable"];
@@ -770,7 +770,10 @@ export function loggedClaudeQueryOptions(
770770
...(options.cwd === undefined ? {} : { cwd: options.cwd }),
771771
...(options.allowedTools === undefined ? {} : { allowedTools: options.allowedTools }),
772772
...(options.disallowedTools === undefined ? {} : { disallowedTools: options.disallowedTools }),
773-
...(options.settings === undefined ? {} : { settings: options.settings }),
773+
// Settings can carry the user's --settings values, such as an env block with credentials.
774+
...(typeof options.settings === "object" && options.settings !== null
775+
? { settingKeys: Object.keys(options.settings) }
776+
: {}),
774777
...(options.effort === undefined ? {} : { effort: options.effort }),
775778
...(options.includePartialMessages === true ? { includePartialMessages: true } : {}),
776779
...(options.pathToClaudeCodeExecutable === undefined

0 commit comments

Comments
 (0)