fix(core): restore typecheck helpers · openclaw/openclaw@dc5c2f6

Recent Commits to openclaw:main

vincentkoc · 2026-06-22 · via Recent Commits to openclaw:main

File tree

- agents/embedded-agent-runner

Original file line number	Diff line number	Diff line change
`@@ -533,11 +533,11 @@ describe("truncateOversizedToolResultsInMessages", () => {`
`533`	`533`	`] as never;`
`534`	`534`	`truncateOversizedToolResultsInMessages([source], 128_000, 12_000, 12_000, projectionState);`
`535`	`535`
`536`		`-const providerMessage = {`
	`536`	`+const providerMessage: ToolResultMessage = {`
`537`	`537`	`...source,`
`538`	`538`	`content: [`
`539`		`-{ type: "text", text: "Image reading is disabled." },`
`540`		`-{ type: "text", text: "x".repeat(15_000) },`
	`539`	`+{ type: "text" as const, text: "Image reading is disabled." },`
	`540`	`+{ type: "text" as const, text: "x".repeat(15_000) },`
`541`	`541`	`],`
`542`	`542`	`};`
`543`	`543`	`const result = truncateOversizedToolResultsInMessages(`
`@@ -546,7 +546,7 @@ describe("truncateOversizedToolResultsInMessages", () => {`
`546`	`546`	`12_000,`
`547`	`547`	`12_000,`
`548`	`548`	`projectionState,`
`549`		`-).messages[0];`
	`549`	`+).messages[0] as ToolResultMessage \| undefined;`
`550`	`550`
`551`	`551`	`expect(result?.content?.[0]).toEqual({`
`552`	`552`	`type: "text",`

Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ export function truncateOversizedToolResultsInMessages(`
`393`	`393`	`}`
`394`	`394`	`}`
`395`	`395`	`if (plan.replacements.length === 0) {`
`396`		`-const projectedMessages = branch.map((entry) => entry.message as AgentMessage);`
	`396`	`+const projectedMessages = branch.map((entry) => entry.message);`
`397`	`397`	`const hasProjectedChanges = projectedMessages.some(`
`398`	`398`	`(message, index) => message !== messages[index],`
`399`	`399`	`);`
`@@ -555,7 +555,7 @@ function mergeProjectedToolResultMessage(`
`555`	`555`	`return block;`
`556`	`556`	`}`
`557`	`557`	`const projectedBlock = projectedText[textIndex++];`
`558`		`-return projectedBlock ? { ...block, text: projectedBlock.text } : block;`
	`558`	`+return projectedBlock ? Object.assign({}, block, { text: projectedBlock.text }) : block;`
`559`	`559`	`});`
`560`	`560`	`return { ...message, content: mergedContent } as AgentMessage;`
`561`	`561`	`}`
`@@ -588,7 +588,7 @@ function buildAggregateToolResultReplacements(params: {`
`588`	`588`	`(`
`589`	`589`	`item,`
`590`	`590`	`): item is {`
`591`		`-entry: { id: string; type: string; message: AgentMessage };`
	`591`	`+entry: { id: string; type: string; message: AgentMessage; aggregateEligible?: boolean };`
`592`	`592`	`index: number;`
`593`	`593`	`} =>`
`594`	`594`	`item.entry.type === "message" &&`
`@@ -697,7 +697,7 @@ function clearToolResultText(message: AgentMessage): AgentMessage {`
`697`	`697`	`...message,`
`698`	`698`	`content: content.map((block) =>`
`699`	`699`	`block && typeof block === "object" && (block as { type?: unknown }).type === "text"`
`700`		`- ? { ...block, text: "" }`
	`700`	`+ ? Object.assign({}, block, { text: "" })`
`701`	`701`	`: block,`
`702`	`702`	`),`
`703`	`703`	`} as AgentMessage;`

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,25 @@ export function resolveModelFallbackOptions(`
`38`	`38`	`};`
`39`	`39`	`}`
`40`	`40`
	`41`	`+/** Resolves whether final-answer tags should be enforced for an embedded follow-up run. */`
	`42`	`+export function resolveEnforceFinalTagWithResolver(`
	`43`	`+run: FollowupRun["run"],`
	`44`	`+provider: string,`
	`45`	`+model: string,`
	`46`	`+isReasoningTagProvider?: ReasoningTagProviderResolver,`
	`47`	`+): boolean {`
	`48`	`+return (`
	`49`	`+(run.skipProviderRuntimeHints ? false : undefined) ??`
	`50`	`+(run.enforceFinalTag \|\|`
	`51`	`+isReasoningTagProvider?.(provider, {`
	`52`	`+config: run.config,`
	`53`	`+workspaceDir: run.workspaceDir,`
	`54`	`+modelId: model,`
	`55`	`+}) \|\|`
	`56`	`+false)`
	`57`	`+);`
	`58`	`+}`
	`59`	`+`
`41`	`60`	`/** Builds the shared embedded-agent run params from a queued follow-up run. */`
`42`	`61`	`export function buildEmbeddedRunBaseParams(params: {`
`43`	`62`	`run: FollowupRun["run"];`
`@@ -58,15 +77,12 @@ export function buildEmbeddedRunBaseParams(params: {`
`58`	`77`	`modelOverrideSource: params.run.modelOverrideSource,`
`59`	`78`	`hasAutoFallbackProvenance: params.run.hasAutoFallbackProvenance === true,`
`60`	`79`	`});`
`61`		`-const enforceFinalTag =`
`62`		`-(params.run.skipProviderRuntimeHints ? false : undefined) ??`
`63`		`-(params.run.enforceFinalTag \|\|`
`64`		`-params.isReasoningTagProvider?.(params.provider, {`
`65`		`- config,`
`66`		`-workspaceDir: params.run.workspaceDir,`
`67`		`-modelId: params.model,`
`68`		`-}) \|\|`
`69`		`-false);`
	`80`	`+const enforceFinalTag = resolveEnforceFinalTagWithResolver(`
	`81`	`+params.run,`
	`82`	`+params.provider,`
	`83`	`+params.model,`
	`84`	`+params.isReasoningTagProvider,`
	`85`	`+);`
`70`	`86`	`// Runtime policy keys may differ from session keys for direct-message scoped policy.`
`71`	`87`	`return {`
`72`	`88`	`sessionFile: params.run.sessionFile,`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main

File tree