diff --git a/packages/contracts/src/settings.ts b/packages/contracts/src/settings.ts
index 426f8bee568..499175fbd57 100644
--- a/packages/contracts/src/settings.ts
+++ b/packages/contracts/src/settings.ts
@@ -70,6 +70,7 @@ export const ClaudeSettings = Schema.Struct({
enabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
binaryPath: makeBinaryPathSetting("claude"),
customModels: Schema.Array(Schema.String).pipe(Schema.withDecodingDefault(Effect.succeed([]))),
+ enableChrome: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
});
export type ClaudeSettings = typeof ClaudeSettings.Type;
@@ -163,6 +164,7 @@ const ClaudeSettingsPatch = Schema.Struct({
enabled: Schema.optionalKey(Schema.Boolean),
binaryPath: Schema.optionalKey(Schema.String),
customModels: Schema.optionalKey(Schema.Array(Schema.String)),
+ enableChrome: Schema.optionalKey(Schema.Boolean),
});
export const ServerSettingsPatch = Schema.Struct({
From 9873c016fb513b8004c3d4e6951a949637a6ec7e Mon Sep 17 00:00:00 2001
From: Karabach <12261380+akarabach@users.noreply.github.com>
Date: Mon, 13 Apr 2026 01:09:34 +0300
Subject: [PATCH 2/6] feat: launch args instead of specific chrome flag - fix
test - add tests for parser
---
.../src/provider/Layers/ClaudeAdapter.test.ts | 70 ++++++++++++++++++-
.../src/provider/Layers/ClaudeAdapter.ts | 35 +++++++++-
apps/server/src/serverSettings.test.ts | 2 +
.../components/settings/SettingsPanels.tsx | 36 +++++-----
packages/contracts/src/settings.ts | 4 +-
5 files changed, 126 insertions(+), 21 deletions(-)
diff --git a/apps/server/src/provider/Layers/ClaudeAdapter.test.ts b/apps/server/src/provider/Layers/ClaudeAdapter.test.ts
index 8b1f1389c41..2a93aace199 100644
--- a/apps/server/src/provider/Layers/ClaudeAdapter.test.ts
+++ b/apps/server/src/provider/Layers/ClaudeAdapter.test.ts
@@ -25,7 +25,7 @@ import { ServerConfig } from "../../config.ts";
import { ServerSettingsService } from "../../serverSettings.ts";
import { ProviderAdapterValidationError } from "../Errors.ts";
import { ClaudeAdapter } from "../Services/ClaudeAdapter.ts";
-import { makeClaudeAdapterLive, type ClaudeAdapterLiveOptions } from "./ClaudeAdapter.ts";
+import { makeClaudeAdapterLive, parseLaunchArgs, type ClaudeAdapterLiveOptions } from "./ClaudeAdapter.ts";
class FakeClaudeQuery implements AsyncIterable
{
private readonly queue: Array = [];
@@ -3219,3 +3219,71 @@ describe("ClaudeAdapterLive", () => {
);
});
});
+
+describe("parseLaunchArgs", () => {
+ it("returns empty object for empty string", () => {
+ assert.deepEqual(parseLaunchArgs(""), {});
+ });
+
+ it("returns empty object for whitespace-only string", () => {
+ assert.deepEqual(parseLaunchArgs(" "), {});
+ });
+
+ it("parses --chrome boolean flag", () => {
+ assert.deepEqual(parseLaunchArgs("--chrome"), { chrome: null });
+ });
+
+ it("parses --chrome with --verbose", () => {
+ assert.deepEqual(parseLaunchArgs("--chrome --verbose"), {
+ chrome: null,
+ verbose: null,
+ });
+ });
+
+ it("parses --effort with a value", () => {
+ assert.deepEqual(parseLaunchArgs("--effort high"), { effort: "high" });
+ });
+
+ it("parses --chrome --effort high --debug", () => {
+ assert.deepEqual(parseLaunchArgs("--chrome --effort high --debug"), {
+ chrome: null,
+ effort: "high",
+ debug: null,
+ });
+ });
+
+ it("parses --model with full model name", () => {
+ assert.deepEqual(parseLaunchArgs("--model claude-sonnet-4-6"), {
+ model: "claude-sonnet-4-6",
+ });
+ });
+
+ it("parses --append-system-prompt with value and --chrome", () => {
+ assert.deepEqual(parseLaunchArgs("--append-system-prompt always-think-step-by-step --chrome"), {
+ "append-system-prompt": "always-think-step-by-step",
+ chrome: null,
+ });
+ });
+
+ it("parses --max-budget-usd with numeric value", () => {
+ assert.deepEqual(parseLaunchArgs("--chrome --max-budget-usd 5.00"), {
+ chrome: null,
+ "max-budget-usd": "5.00",
+ });
+ });
+
+ it("handles extra whitespace between tokens", () => {
+ assert.deepEqual(parseLaunchArgs(" --chrome --verbose "), {
+ chrome: null,
+ verbose: null,
+ });
+ });
+
+ it("ignores bare -- with no flag name", () => {
+ assert.deepEqual(parseLaunchArgs("--"), {});
+ });
+
+ it("ignores tokens that don't start with --", () => {
+ assert.deepEqual(parseLaunchArgs("chrome"), {});
+ });
+});
diff --git a/apps/server/src/provider/Layers/ClaudeAdapter.ts b/apps/server/src/provider/Layers/ClaudeAdapter.ts
index b7e09f1b595..d286801ed88 100644
--- a/apps/server/src/provider/Layers/ClaudeAdapter.ts
+++ b/apps/server/src/provider/Layers/ClaudeAdapter.ts
@@ -506,6 +506,35 @@ const CLAUDE_SETTING_SOURCES = [
"local",
] as const satisfies ReadonlyArray;
+/**
+ * Parse a CLI-style launch args string into the SDK's `extraArgs` format.
+ *
+ * Boolean flags (no value) become `null`, flags with a value become strings:
+ * "" → {}
+ * "--chrome" → { chrome: null }
+ * "--chrome --debug" → { chrome: null, debug: null }
+ * "--chrome --max-turns 5" → { chrome: null, "max-turns": "5" }
+ */
+export function parseLaunchArgs(args: string): Record {
+ const result: Record = {};
+ const tokens = args.trim().split(/\s+/).filter(Boolean);
+ for (let i = 0; i < tokens.length; i++) {
+ const token = tokens[i]!;
+ if (token.startsWith("--")) {
+ const key = token.slice(2);
+ if (!key) continue;
+ const next = tokens[i + 1];
+ if (next !== undefined && !next.startsWith("--")) {
+ result[key] = next;
+ i++;
+ } else {
+ result[key] = null;
+ }
+ }
+ }
+ return result;
+}
+
function buildPromptText(input: ProviderSendTurnInput): string {
const rawEffort =
input.modelSelection?.provider === "claudeAgent" ? input.modelSelection.options?.effort : null;
@@ -2680,7 +2709,7 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
),
);
const claudeBinaryPath = claudeSettings.binaryPath;
- const enableChrome = claudeSettings.enableChrome;
+ const launchArgs = claudeSettings.launchArgs;
const modelSelection =
input.modelSelection?.provider === "claudeAgent" ? input.modelSelection : undefined;
const caps = getClaudeModelCapabilities(modelSelection?.model);
@@ -2720,7 +2749,9 @@ const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
canUseTool,
env: process.env,
...(input.cwd ? { additionalDirectories: [input.cwd] } : {}),
- ...(enableChrome ? { extraArgs: { chrome: null } } : {}),
+ ...(Object.keys(parseLaunchArgs(launchArgs)).length > 0
+ ? { extraArgs: parseLaunchArgs(launchArgs) }
+ : {}),
};
const queryRuntime = yield* Effect.try({
diff --git a/apps/server/src/serverSettings.test.ts b/apps/server/src/serverSettings.test.ts
index 289bc689617..d3d92e42126 100644
--- a/apps/server/src/serverSettings.test.ts
+++ b/apps/server/src/serverSettings.test.ts
@@ -92,6 +92,7 @@ it.layer(NodeServices.layer)("server settings", (it) => {
enabled: true,
binaryPath: "/usr/local/bin/claude",
customModels: ["claude-custom"],
+ launchArgs: "",
});
assert.deepEqual(next.textGenerationModelSelection, {
provider: "codex",
@@ -167,6 +168,7 @@ it.layer(NodeServices.layer)("server settings", (it) => {
enabled: true,
binaryPath: "/opt/homebrew/bin/claude",
customModels: [],
+ launchArgs: "",
});
}).pipe(Effect.provide(makeServerSettingsLayer())),
);
diff --git a/apps/web/src/components/settings/SettingsPanels.tsx b/apps/web/src/components/settings/SettingsPanels.tsx
index ec5f3b34e57..fb234805c3a 100644
--- a/apps/web/src/components/settings/SettingsPanels.tsx
+++ b/apps/web/src/components/settings/SettingsPanels.tsx
@@ -441,7 +441,7 @@ export function GeneralSettingsPanel() {
settings.providers.claudeAgent.binaryPath !==
DEFAULT_UNIFIED_SETTINGS.providers.claudeAgent.binaryPath ||
settings.providers.claudeAgent.customModels.length > 0 ||
- settings.providers.claudeAgent.enableChrome,
+ settings.providers.claudeAgent.launchArgs !== "",
),
});
const [customModelInputByProvider, setCustomModelInputByProvider] = useState<
@@ -1182,31 +1182,35 @@ export function GeneralSettingsPanel() {
{providerCard.provider === "claudeAgent" ? (
-
-
-
- Enable Chrome
-
-
- Launch Claude with Chrome browser integration (--chrome).
-
-
-
+
+
+ Additional CLI arguments passed to Claude Code on session start.
+
+