






















@@ -157,6 +157,7 @@ import { runAgentHarnessBeforeAgentFinalizeHook } from "../../harness/lifecycle-
157157import { resolveHeartbeatPromptForSystemPrompt } from "../../heartbeat-system-prompt.js";
158158import { resolveImageSanitizationLimits } from "../../image-sanitization.js";
159159import {
160+applyLocalModelLeanToolSearchDefaults,
160161filterLocalModelLeanTools,
161162isLocalModelLeanEnabled,
162163resolveLocalModelLeanPreserveToolNames,
@@ -176,10 +177,6 @@ import {
176177import type { AgentMessage } from "../../runtime/index.js";
177178import { resolveSandboxContext } from "../../sandbox.js";
178179import { resolveSandboxRuntimeStatus } from "../../sandbox/runtime-status.js";
179-import {
180-mapSandboxSkillEntriesForPrompt,
181-resolveSandboxSkillRuntimeInputs,
182-} from "../sandbox-skills.js";
183180import { repairSessionFileIfNeeded } from "../../session-file-repair.js";
184181import { guardSessionManager } from "../../session-tool-result-guard-wrapper.js";
185182import { sanitizeToolUseResultPairing } from "../../session-transcript-repair.js";
@@ -266,6 +263,10 @@ import {
266263updateActiveEmbeddedRunSnapshot,
267264} from "../runs.js";
268265import { buildEmbeddedSandboxInfo, resolveEmbeddedSandboxInfoExecPolicy } from "../sandbox-info.js";
266+import {
267+mapSandboxSkillEntriesForPrompt,
268+resolveSandboxSkillRuntimeInputs,
269+} from "../sandbox-skills.js";
269270import { prewarmSessionFile, trackSessionManagerAccess } from "../session-manager-cache.js";
270271import { prepareSessionManagerForRun } from "../session-manager-init.js";
271272import {
@@ -1063,9 +1064,9 @@ export async function runEmbeddedAttempt(
10631064config: params.config,
10641065})
10651066 : applySkillEnvOverrides({
1066-skills: skillEntries ?? [],
1067-config: params.config,
1068-});
1067+ skills: skillEntries ?? [],
1068+ config: params.config,
1069+ });
10691070const promptSkillEntries = mapSandboxSkillEntriesForPrompt({
10701071entries: shouldLoadSkillEntries ? skillEntries : undefined,
10711072skillsWorkspaceDir: effectiveSkillsWorkspace,
@@ -1140,12 +1141,12 @@ export async function runEmbeddedAttempt(
11401141});
11411142};
11421143const corePluginToolStages = createEmbeddedRunStageTracker();
1144+const forceDirectMessageTool =
1145+params.forceMessageTool === true || params.sourceReplyDeliveryMode === "message_tool_only";
11431146const toolsAllowWithForcedRuntimeTools = mergeForcedEmbeddedAttemptToolsAllow(
11441147params.toolsAllow,
11451148{
1146-forceMessageTool:
1147-params.forceMessageTool === true ||
1148-params.sourceReplyDeliveryMode === "message_tool_only",
1149+forceMessageTool: forceDirectMessageTool,
11491150},
11501151);
11511152const toolConstructionPlan = resolveEmbeddedAttemptToolConstructionPlan({
@@ -1155,6 +1156,13 @@ export async function runEmbeddedAttempt(
11551156});
11561157const toolsEnabled = supportsModelTools(params.model);
11571158const codeModeConfig = resolveCodeModeConfig(params.config, sessionAgentId);
1159+const toolSearchRuntimeConfig = forceDirectMessageTool
1160+ ? params.config
1161+ : applyLocalModelLeanToolSearchDefaults({
1162+config: params.config,
1163+agentId: sessionAgentId,
1164+sessionKey: sandboxSessionKey,
1165+});
11581166const codeModeControlsEnabledForRun =
11591167toolsEnabled &&
11601168params.disableTools !== true &&
@@ -1167,7 +1175,7 @@ export async function runEmbeddedAttempt(
11671175!isRawModelRun &&
11681176params.toolsAllow?.length !== 0 &&
11691177!codeModeControlsEnabledForRun &&
1170-resolveToolSearchConfig(params.config).enabled;
1178+resolveToolSearchConfig(toolSearchRuntimeConfig).enabled;
11711179const effectiveToolsAllow =
11721180toolSearchControlsEnabledForRun && toolsAllowWithForcedRuntimeTools
11731181 ? [
@@ -1242,7 +1250,7 @@ export async function runEmbeddedAttempt(
12421250 sandbox,
12431251 resolvedWorkspace,
12441252}),
1245-config: params.config,
1253+config: toolSearchRuntimeConfig,
12461254abortSignal: runAbortController.signal,
12471255modelProvider: params.provider,
12481256modelId: params.modelId,
@@ -1628,7 +1636,7 @@ export async function runEmbeddedAttempt(
16281636})
16291637 : applyToolSearchCatalog({
16301638tools: effectiveTools,
1631-config: params.config,
1639+config: toolSearchRuntimeConfig,
16321640sessionId: params.sessionId,
16331641sessionKey: sandboxSessionKey,
16341642agentId: sessionAgentId,
@@ -2221,7 +2229,7 @@ export async function runEmbeddedAttempt(
22212229{
22222230agentId: sessionAgentId,
22232231sessionKey: sandboxSessionKey,
2224-config: params.config,
2232+config: toolSearchRuntimeConfig,
22252233sessionId: params.sessionId,
22262234runId: params.runId,
22272235loopDetection: clientToolLoopDetection,
@@ -2241,7 +2249,7 @@ export async function runEmbeddedAttempt(
22412249})
22422250 : addClientToolsToToolSearchCatalog({
22432251tools: clientToolDefs,
2244-config: params.config,
2252+config: toolSearchRuntimeConfig,
22452253sessionId: params.sessionId,
22462254sessionKey: sandboxSessionKey,
22472255agentId: sessionAgentId,
此内容由惯性聚合(RSS阅读器)自动聚合整理,仅供阅读参考。 原文来自 — 版权归原作者所有。