The best way to control Claude Code, Codex and more from any computer or phone
fix(claude): pass every --add-dir launch directory to Claude (#23281)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
Victor Vogel committed
Oct 29, 2026 at 12:57 UTC
c9d3f7c9f4c312e61990ea5184afd9c3056b4791
4 files changed
+58
-15
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
+22
@@ -268,6 +268,28 @@ describe("ClaudeAdapterV2 runtime query policy", () => {
268
assert.isUndefined(options.extraArgs?.["dangerously-skip-permissions"]);
269
});
270
271
+ it("passes every --add-dir launch directory to Claude", () => {
272
+ const options = ClaudeAdapterV2.makeClaudeQueryOptions({
273
+ modelSelection: CLAUDE_TEST_MODEL_SELECTION,
274
+ nativeThreadId: "native-add-dir",
275
+ resume: false,
276
+ cwd: "/workspace",
277
+ attachmentsDir: "/attachments",
278
+ settings: {
279
+ ...AUTO_COMPACT_CLAUDE_SETTINGS,
280
+ launchArgs: "--add-dir ../apps ../lib --verbose --add-dir=/shared",
281
+ },
282
+ });
283
+ assert.deepEqual(options.additionalDirectories, [
284
+ "/workspace",
285
+ "/attachments",
286
+ "../apps",
287
+ "../lib",
288
+ "/shared",
289
+ ]);
290
+ assert.isUndefined(options.extraArgs?.["add-dir"]);
291
+ });
292
+
293
it("gives delegated children Claude's subagent prompt cache TTL", () => {
294
const lineage = (relationshipToParent: "fork" | "subagent" | null) => ({
295
lineage: {
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
+7
-1
@@ -135,7 +135,10 @@ import {
135
planClaudeSkillDispatch,
136
type ClaudeSkillTarget,
137
} from "../../provider/Drivers/ClaudeSkillDispatch.ts";
138
-import { discoverClaudeSkills } from "../../provider/Drivers/ClaudeSkills.ts";
138
+import {
139
+ claudeLaunchArgDirectories,
140
+ discoverClaudeSkills,
141
+} from "../../provider/Drivers/ClaudeSkills.ts";
142
import {
143
compileClaudeModelSelection,
144
type CompiledClaudeModelSelection,
@@ -1473,6 +1476,8 @@ export function makeClaudeQueryOptions(input: {
1476
}): ClaudeAgentSdkQueryOptions {
1477
const compiledSelection = compileClaudeModelSelection(input.modelSelection);
1478
const {
1479
+ // claudeLaunchArgDirectories reads every --add-dir into additionalDirectories.
1480
+ "add-dir": _launchArgAddDir,
1481
"permission-mode": launchArgPermissionMode,
1482
"dangerously-skip-permissions": launchArgSkipPermissions,
1483
"append-system-prompt": launchArgAppendSystemPrompt,
@@ -1592,6 +1597,7 @@ export function makeClaudeQueryOptions(input: {
1597
const additionalDirectories = [
1598
...(input.cwd === null ? [] : [input.cwd]),
1599
...(input.attachmentsDir === undefined ? [] : [input.attachmentsDir]),
1600
+ ...claudeLaunchArgDirectories(input.settings?.launchArgs),
1601
];
1602
const withDirectories =
1603
additionalDirectories.length === 0 ? options : { ...options, additionalDirectories };
apps/server/src/provider/Drivers/ClaudeSkills.test.ts
+2
@@ -358,6 +358,8 @@ it.layer(NodeServices.layer)("discoverClaudeSkills", (it) => {
358
'--add-dir "extra skills"',
359
'--add-dir="extra skills"',
360
`--add-dir missing --add-dir "${extraDir}"`,
361
+ `--add-dir "${extraDir}" --add-dir missing`,
362
+ `--add-dir missing "${extraDir}"`,
363
]) {
364
const settings = { homePath: configDir, launchArgs };
365
const skills = yield* discoverClaudeSkills(settings, workspace);
apps/server/src/provider/Drivers/ClaudeSkills.ts
+27
-14
@@ -5,7 +5,7 @@ import * as Path from "effect/Path";
5
import * as Option from "effect/Option";
6
import * as Schema from "effect/Schema";
7
import * as HostProcess from "@t3tools/shared/HostProcess";
8
-import { parseCliArgs } from "@t3tools/shared/cliArgs";
8
+import { tokenizeCliArgs } from "@t3tools/shared/cliArgs";
9
import { fromLenientJson } from "@t3tools/shared/schemaJson";
10
import { SKILL_MENTION_PATTERN } from "@t3tools/shared/composerInlineTokens";
11
import { parse as parseYamlDocument } from "yaml";
@@ -427,6 +427,26 @@ const resolveClaudeConfigDirPath = Effect.fn("resolveClaudeConfigDirPath")(funct
427
return path.join(home, ".claude");
428
});
429
430
+// Claude's --add-dir is repeatable and variadic; parseCliArgs keeps only one value.
431
+export function claudeLaunchArgDirectories(launchArgs?: string): ReadonlyArray<string> {
432
+ const directories: string[] = [];
433
+ let collecting = false;
434
+ for (const token of tokenizeCliArgs(launchArgs)) {
435
+ if (token === "--") break;
436
+ if (token === "--add-dir") {
437
+ collecting = true;
438
+ } else if (token.startsWith("--add-dir=")) {
439
+ directories.push(token.slice("--add-dir=".length));
440
+ collecting = false;
441
+ } else if (token.startsWith("-")) {
442
+ collecting = false;
443
+ } else if (collecting) {
444
+ directories.push(token);
445
+ }
446
+ }
447
+ return directories;
448
+}
449
+
450
/** First name wins, matching Claude Code's precedence of user skills over project skills. */
451
export const discoverClaudeSkills = Effect.fn("discoverClaudeSkills")(function* (
452
config: Pick<ClaudeSettings, "homePath"> & Partial<Pick<ClaudeSettings, "launchArgs">>,
@@ -442,22 +462,15 @@ export const discoverClaudeSkills = Effect.fn("discoverClaudeSkills")(function*
462
environment ?? process.env,
463
);
464
445
- const additionalDirectory = parseCliArgs(config.launchArgs ?? "").flags["add-dir"];
465
const roots: ReadonlyArray<ClaudeSkillRoot> = [
466
{ directory: path.join(configDirPath, "skills"), scope: "user" },
467
...(cwd ? [{ directory: path.join(cwd, ".claude", "skills"), scope: "project" as const }] : []),
449
- ...(additionalDirectory && (cwd || path.isAbsolute(additionalDirectory))
450
- ? [
451
- {
452
- directory: path.join(
453
- path.resolve(cwd ?? ".", additionalDirectory),
454
- ".claude",
455
- "skills",
456
- ),
457
- scope: "project" as const,
458
- },
459
- ]
460
- : []),
468
+ ...claudeLaunchArgDirectories(config.launchArgs)
469
+ .filter((directory) => directory && (cwd || path.isAbsolute(directory)))
470
+ .map((directory) => ({
471
+ directory: path.join(path.resolve(cwd ?? ".", directory), ".claude", "skills"),
472
+ scope: "project" as const,
473
+ })),
474
...(yield* discoverPluginSkillRoots(
475
configDirPath,
476
cwd,