@@ -12130,8 +12130,8 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
1213012130 const openQuery = Effect.fnUntraced(function* (
1213112131 turnInput: ProviderAdapter.ProviderAdapterV2TurnInput,
1213212132 nativeThreadId: string,
12133+ queryPolicy: Effect.Success<ReturnType<typeof queryPolicyForTurn>>,
1213312134 ) {
12134- const queryPolicy = yield* queryPolicyForTurn(turnInput);
1213512135 const mcpSession = yield* mcpSessions.read(turnInput.threadId);
1213612136 const mcpOverrides = claudeMcpQueryOverrides({
1213712137 mcpSession,
@@ -12208,18 +12208,31 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
1220812208 }
1220912209
1221012210 // Read before closing the live process so a bad path leaves it running.
12211- const appendSystemPromptFileText = yield* readClaudeAppendSystemPromptFile({
12212- settings: adapterOptions.settings,
12213- cwd: turnInput.runtimePolicy.cwd,
12214- fileSystem,
12215- path,
12216- });
12217- const launchArgSettings = yield* readClaudeLaunchArgSettings({
12218- settings: adapterOptions.settings,
12219- cwd: turnInput.runtimePolicy.cwd,
12220- fileSystem,
12221- path,
12222- });
12211+ const [appendSystemPromptFileText, { launchArgSettings, toolSearchOverride }] =
12212+ yield* Effect.all(
12213+ [
12214+ readClaudeAppendSystemPromptFile({
12215+ settings: adapterOptions.settings,
12216+ cwd: turnInput.runtimePolicy.cwd,
12217+ fileSystem,
12218+ path,
12219+ }),
12220+ Effect.gen(function* () {
12221+ const launchArgSettings = yield* readClaudeLaunchArgSettings({
12222+ settings: adapterOptions.settings,
12223+ cwd: turnInput.runtimePolicy.cwd,
12224+ fileSystem,
12225+ path,
12226+ });
12227+ const toolSearchOverride = yield* resolveToolSearchOverride(
12228+ turnInput.runtimePolicy.cwd,
12229+ launchArgSettings,
12230+ );
12231+ return { launchArgSettings, toolSearchOverride };
12232+ }),
12233+ ],
12234+ { concurrency: "unbounded" },
12235+ );
1222312236 const closedExistingNativeThreadId = existing !== null ? existing.nativeThreadId : null;
1222412237 clearedNativeSessions.delete(nativeThreadId);
1222512238 if (existing !== null) {
@@ -12238,10 +12251,6 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
1223812251 turnInput.nativeThreadHasTurns ?? turnInput.providerTurnOrdinal > 1;
1223912252 const shouldResume =
1224012253 resumeSessionAt !== undefined || openedWithResume || hasPersistedProviderTurn;
12241- const toolSearchOverride = yield* resolveToolSearchOverride(
12242- turnInput.runtimePolicy.cwd,
12243- launchArgSettings,
12244- );
1224512254 const queryOptions = makeClaudeQueryOptions({
1224612255 modelSelection: turnInput.modelSelection,
1224712256 modelCatalog,
@@ -12520,6 +12529,15 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
1252012529 const used = turnInput.providerThread.nativeMetadata?.claudeAttachmentBudget;
1252112530 pdfBudgets.set(nativeThreadId, makeClaudeAttachmentBudget(used));
1252212531 }
12532+ const [skills, queryPolicy] = yield* Effect.all(
12533+ [
12534+ promptUuid === null
12535+ ? Effect.undefined
12536+ : userInvocableSkills(turnInput.runtimePolicy.cwd),
12537+ queryPolicyForTurn(turnInput),
12538+ ],
12539+ { concurrency: "unbounded" },
12540+ );
1252312541 const pdfReservation = yield* reserveClaudePdfBudget(
1252412542 pdfBudgets.get(nativeThreadId)!,
1252512543 persistAttachmentBudget(nativeThreadId),
@@ -12546,13 +12564,13 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
1254612564 attachmentsDir,
1254712565 fileSystem,
1254812566 pdfReservation,
12549- skills: yield* userInvocableSkills(turnInput.runtimePolicy.cwd ),
12567+ ...( skills === undefined ? {} : { skills } ),
1255012568 uuid: promptUuid,
1255112569 }).pipe(
1255212570 Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
1255312571 Effect.provideService(Path.Path, path),
1255412572 );
12555- const querySession = yield* openQuery(turnInput, nativeThreadId);
12573+ const querySession = yield* openQuery(turnInput, nativeThreadId, queryPolicy );
1255612574 const autoCompactWindow = yield* resolveAutoCompactWindow(
1255712575 querySession.settingsCwd,
1255812576 turnInput.modelSelection,
0 commit comments