refactor: centralize bootstrap system prompt assembly · o...

Recent Commits to openclaw:main

steipete · 2026-05-04 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@ export type AttemptBootstrapRoutingInput = {`
`15`	`15`
`16`	`16`	`export type AttemptBootstrapRouting = {`
`17`	`17`	`bootstrapMode: BootstrapMode;`
`18`		`-shouldStripBootstrapFromContext: boolean;`
	`18`	`+includeBootstrapInSystemContext: boolean;`
	`19`	`+includeBootstrapInRuntimeContext: boolean;`
`19`	`20`	`};`
`20`	`21`
`21`	`22`	`export type AttemptWorkspaceBootstrapRoutingInput = Omit<`
`@@ -25,10 +26,16 @@ export type AttemptWorkspaceBootstrapRoutingInput = Omit<`
`25`	`26`	`isWorkspaceBootstrapPending: (workspaceDir: string) => Promise<boolean>;`
`26`	`27`	`};`
`27`	`28`
`28`		`-export function shouldStripBootstrapFromEmbeddedContext(_params: {`
	`29`	`+export function resolveBootstrapContextTargets(params: {`
`29`	`30`	`bootstrapMode: BootstrapMode;`
`30`		`-}): boolean {`
`31`		`-return _params.bootstrapMode !== "full";`
	`31`	`+}): Pick<`
	`32`	`+AttemptBootstrapRouting,`
	`33`	`+"includeBootstrapInSystemContext" \| "includeBootstrapInRuntimeContext"`
	`34`	`+> {`
	`35`	`+return {`
	`36`	`+includeBootstrapInSystemContext: params.bootstrapMode === "full",`
	`37`	`+includeBootstrapInRuntimeContext: false,`
	`38`	`+};`
`32`	`39`	`}`
`33`	`40`
`34`	`41`	`function resolveAttemptBootstrapRouting(`
`@@ -47,9 +54,7 @@ function resolveAttemptBootstrapRouting(`
`47`	`54`
`48`	`55`	`return {`
`49`	`56`	`bootstrapMode,`
`50`		`-shouldStripBootstrapFromContext: shouldStripBootstrapFromEmbeddedContext({`
`51`		`- bootstrapMode,`
`52`		`-}),`
	`57`	`+ ...resolveBootstrapContextTargets({ bootstrapMode }),`
`53`	`58`	`};`
`54`	`59`	`}`
`55`	`60`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,90 @@`
	`1`	`+import { describe, expect, it } from "vitest";`
	`2`	`+import { buildAttemptSystemPrompt } from "./attempt-system-prompt.js";`
	`3`	`+`
	`4`	`+const baseProviderTransform = {`
	`5`	`+provider: "openai",`
	`6`	`+workspaceDir: "/tmp/openclaw",`
	`7`	`+context: {`
	`8`	`+provider: "openai",`
	`9`	`+modelId: "gpt-5.5",`
	`10`	`+promptMode: "full" as const,`
	`11`	`+},`
	`12`	`+};`
	`13`	`+`
	`14`	`+describe("buildAttemptSystemPrompt", () => {`
	`15`	`+it("preserves bootstrap Project Context when a system prompt override is configured", () => {`
	`16`	`+const result = buildAttemptSystemPrompt({`
	`17`	`+isRawModelRun: false,`
	`18`	`+systemPromptOverrideText: "Custom override prompt.",`
	`19`	`+embeddedSystemPrompt: {`
	`20`	`+workspaceDir: "/tmp/openclaw",`
	`21`	`+reasoningTagHint: false,`
	`22`	`+runtimeInfo: {`
	`23`	`+host: "test-host",`
	`24`	`+os: "Darwin",`
	`25`	`+arch: "arm64",`
	`26`	`+node: "v22.0.0",`
	`27`	`+model: "openai/gpt-5.5",`
	`28`	`+},`
	`29`	`+tools: [],`
	`30`	`+modelAliasLines: [],`
	`31`	`+userTimezone: "UTC",`
	`32`	`+bootstrapMode: "full",`
	`33`	`+bootstrapTruncationNotice: "Bootstrap context was truncated.",`
	`34`	`+contextFiles: [`
	`35`	`+{`
	`36`	`+path: "/tmp/openclaw/BOOTSTRAP.md",`
	`37`	`+content: "Reply with BOOTSTRAP_OK.",`
	`38`	`+},`
	`39`	`+{`
	`40`	`+path: "/tmp/openclaw/USER.md",`
	`41`	`+content: "User profile should stay in normal prompt context only.",`
	`42`	`+},`
	`43`	`+],`
	`44`	`+},`
	`45`	`+providerTransform: baseProviderTransform,`
	`46`	`+});`
	`47`	`+`
	`48`	`+expect(result.systemPrompt).toContain("Custom override prompt.");`
	`49`	`+expect(result.systemPrompt).toContain("## Bootstrap Pending");`
	`50`	`+expect(result.systemPrompt).toContain("BOOTSTRAP.md is included below in Project Context");`
	`51`	`+expect(result.systemPrompt).toContain("## Bootstrap Context Notice");`
	`52`	`+expect(result.systemPrompt).toContain("Bootstrap context was truncated.");`
	`53`	`+expect(result.systemPrompt).toContain("# Project Context");`
	`54`	`+expect(result.systemPrompt).toContain("## /tmp/openclaw/BOOTSTRAP.md");`
	`55`	`+expect(result.systemPrompt).toContain("Reply with BOOTSTRAP_OK.");`
	`56`	`+expect(result.systemPrompt).not.toContain("USER.md");`
	`57`	`+});`
	`58`	`+`
	`59`	`+it("omits system prompts for raw model probes", () => {`
	`60`	`+const result = buildAttemptSystemPrompt({`
	`61`	`+isRawModelRun: true,`
	`62`	`+embeddedSystemPrompt: {`
	`63`	`+workspaceDir: "/tmp/openclaw",`
	`64`	`+reasoningTagHint: false,`
	`65`	`+runtimeInfo: {`
	`66`	`+host: "test-host",`
	`67`	`+os: "Darwin",`
	`68`	`+arch: "arm64",`
	`69`	`+node: "v22.0.0",`
	`70`	`+model: "openai/gpt-5.5",`
	`71`	`+},`
	`72`	`+tools: [],`
	`73`	`+modelAliasLines: [],`
	`74`	`+userTimezone: "UTC",`
	`75`	`+bootstrapMode: "full",`
	`76`	`+contextFiles: [`
	`77`	`+{`
	`78`	`+path: "/tmp/openclaw/BOOTSTRAP.md",`
	`79`	`+content: "Reply with BOOTSTRAP_OK.",`
	`80`	`+},`
	`81`	`+],`
	`82`	`+},`
	`83`	`+providerTransform: baseProviderTransform,`
	`84`	`+});`
	`85`	`+`
	`86`	`+expect(result.baseSystemPrompt).toContain("BOOTSTRAP.md is included below in Project Context");`
	`87`	`+expect(result.systemPrompt).toBe("");`
	`88`	`+expect(result.systemPromptOverride()).toBe("");`
	`89`	`+});`
	`90`	`+});`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,56 @@`
	`1`	`+import type { OpenClawConfig } from "../../../config/types.openclaw.js";`
	`2`	`+import { transformProviderSystemPrompt } from "../../../plugins/provider-runtime.js";`
	`3`	`+import type { ProviderTransformSystemPromptContext } from "../../../plugins/types.js";`
	`4`	`+import { appendAgentBootstrapSystemPromptSupplement } from "../../system-prompt.js";`
	`5`	`+import { buildEmbeddedSystemPrompt, createSystemPromptOverride } from "../system-prompt.js";`
	`6`	`+`
	`7`	`+type EmbeddedSystemPromptParams = Parameters<typeof buildEmbeddedSystemPrompt>[0];`
	`8`	`+`
	`9`	`+export type BuildAttemptSystemPromptParams = {`
	`10`	`+isRawModelRun: boolean;`
	`11`	`+systemPromptOverrideText?: string;`
	`12`	`+embeddedSystemPrompt: EmbeddedSystemPromptParams;`
	`13`	`+providerTransform: {`
	`14`	`+provider: string;`
	`15`	`+config?: OpenClawConfig;`
	`16`	`+workspaceDir: string;`
	`17`	`+context: Omit<ProviderTransformSystemPromptContext, "systemPrompt">;`
	`18`	`+};`
	`19`	`+};`
	`20`	`+`
	`21`	`+export type AttemptSystemPrompt = {`
	`22`	`+baseSystemPrompt: string;`
	`23`	`+systemPrompt: string;`
	`24`	`+systemPromptOverride: (defaultPrompt?: string) => string;`
	`25`	`+};`
	`26`	`+`
	`27`	`+export function buildAttemptSystemPrompt(`
	`28`	`+params: BuildAttemptSystemPromptParams,`
	`29`	`+): AttemptSystemPrompt {`
	`30`	`+const baseSystemPrompt = params.systemPromptOverrideText`
	`31`	`+ ? appendAgentBootstrapSystemPromptSupplement({`
	`32`	`+systemPrompt: params.systemPromptOverrideText,`
	`33`	`+bootstrapMode: params.embeddedSystemPrompt.bootstrapMode,`
	`34`	`+bootstrapTruncationNotice: params.embeddedSystemPrompt.bootstrapTruncationNotice,`
	`35`	`+contextFiles: params.embeddedSystemPrompt.contextFiles,`
	`36`	`+})`
	`37`	`+ : buildEmbeddedSystemPrompt(params.embeddedSystemPrompt);`
	`38`	`+`
	`39`	`+const systemPrompt = params.isRawModelRun`
	`40`	`+ ? ""`
	`41`	`+ : transformProviderSystemPrompt({`
	`42`	`+provider: params.providerTransform.provider,`
	`43`	`+config: params.providerTransform.config,`
	`44`	`+workspaceDir: params.providerTransform.workspaceDir,`
	`45`	`+context: {`
	`46`	`+ ...params.providerTransform.context,`
	`47`	`+systemPrompt: baseSystemPrompt,`
	`48`	`+},`
	`49`	`+});`
	`50`	`+`
	`51`	`+return {`
	`52`	`+ baseSystemPrompt,`
	`53`	`+ systemPrompt,`
	`54`	`+systemPromptOverride: createSystemPromptOverride(systemPrompt),`
	`55`	`+};`
	`56`	`+}`

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import { describe, expect, it, vi } from "vitest";`
`2`	`2`	`import {`
	`3`	`+resolveBootstrapContextTargets,`
`3`	`4`	`resolveAttemptWorkspaceBootstrapRouting,`
`4`		`-shouldStripBootstrapFromEmbeddedContext,`
`5`	`5`	`} from "./attempt-bootstrap-routing.js";`
`6`	`6`
`7`	`7`	`describe("runEmbeddedAttempt bootstrap routing", () => {`
`@@ -26,7 +26,8 @@ describe("runEmbeddedAttempt bootstrap routing", () => {`
`26`	`26`	`expect(isWorkspaceBootstrapPending).toHaveBeenCalledWith(canonicalWorkspace);`
`27`	`27`	`expect(isWorkspaceBootstrapPending).not.toHaveBeenCalledWith(sandboxWorkspace);`
`28`	`28`	`expect(routing.bootstrapMode).toBe("none");`
`29`		`-expect(routing.shouldStripBootstrapFromContext).toBe(true);`
	`29`	`+expect(routing.includeBootstrapInSystemContext).toBe(false);`
	`30`	`+expect(routing.includeBootstrapInRuntimeContext).toBe(false);`
`30`	`31`	`});`
`31`	`32`
`32`	`33`	`it("falls back to limited bootstrap wording when a primary run cannot read files", async () => {`
`@@ -41,15 +42,25 @@ describe("runEmbeddedAttempt bootstrap routing", () => {`
`41`	`42`	`});`
`42`	`43`
`43`	`44`	`expect(routing.bootstrapMode).toBe("limited");`
`44`		`-expect(routing.shouldStripBootstrapFromContext).toBe(true);`
	`45`	`+expect(routing.includeBootstrapInSystemContext).toBe(false);`
	`46`	`+expect(routing.includeBootstrapInRuntimeContext).toBe(false);`
`45`	`47`	`});`
`46`	`48`
`47`	`49`	`it("keeps BOOTSTRAP.md in Project Context for full bootstrap turns", () => {`
`48`		`-expect(shouldStripBootstrapFromEmbeddedContext({ bootstrapMode: "full" })).toBe(false);`
	`50`	`+expect(resolveBootstrapContextTargets({ bootstrapMode: "full" })).toEqual({`
	`51`	`+includeBootstrapInSystemContext: true,`
	`52`	`+includeBootstrapInRuntimeContext: false,`
	`53`	`+});`
`49`	`54`	`});`
`50`	`55`
`51`		`-it("strips BOOTSTRAP.md from Project Context outside full bootstrap turns", () => {`
`52`		`-expect(shouldStripBootstrapFromEmbeddedContext({ bootstrapMode: "limited" })).toBe(true);`
`53`		`-expect(shouldStripBootstrapFromEmbeddedContext({ bootstrapMode: "none" })).toBe(true);`
	`56`	`+it("excludes BOOTSTRAP.md from every context outside full bootstrap turns", () => {`
	`57`	`+expect(resolveBootstrapContextTargets({ bootstrapMode: "limited" })).toEqual({`
	`58`	`+includeBootstrapInSystemContext: false,`
	`59`	`+includeBootstrapInRuntimeContext: false,`
	`60`	`+});`
	`61`	`+expect(resolveBootstrapContextTargets({ bootstrapMode: "none" })).toEqual({`
	`62`	`+includeBootstrapInSystemContext: false,`
	`63`	`+includeBootstrapInRuntimeContext: false,`
	`64`	`+});`
`54`	`65`	`});`
`55`	`66`	`});`

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ import { describe, expect, it, vi } from "vitest";`
`3`	`3`	`import type { OpenClawConfig } from "../../../config/config.js";`
`4`	`4`	`import { SYSTEM_PROMPT_CACHE_BOUNDARY } from "../../system-prompt-cache-boundary.js";`
`5`	`5`	`import { buildAgentSystemPrompt } from "../../system-prompt.js";`
	`6`	`+import { resolveBootstrapContextTargets } from "./attempt-bootstrap-routing.js";`
`6`	`7`	`import {`
`7`	`8`	`buildContextEnginePromptCacheInfo,`
`8`	`9`	`buildAfterTurnRuntimeContext,`
`@@ -24,7 +25,6 @@ import {`
`24`	`25`	`resolveAttemptToolPolicyMessageProvider,`
`25`	`26`	`resolvePromptBuildHookResult,`
`26`	`27`	`resolvePromptModeForSession,`
`27`		`-shouldStripBootstrapFromEmbeddedContext,`
`28`	`28`	`shouldWarnOnOrphanedUserRepair,`
`29`	`29`	`wrapStreamFnRepairMalformedToolCallArguments,`
`30`	`30`	`wrapStreamFnSanitizeMalformedToolCalls,`
`@@ -404,11 +404,20 @@ describe("resolvePromptModeForSession", () => {`
`404`	`404`	`});`
`405`	`405`	`});`
`406`	`406`
`407`		`-describe("shouldStripBootstrapFromEmbeddedContext", () => {`
	`407`	`+describe("resolveBootstrapContextTargets", () => {`
`408`	`408`	`it("keeps BOOTSTRAP.md in system Project Context only for full bootstrap turns", () => {`
`409`		`-expect(shouldStripBootstrapFromEmbeddedContext({ bootstrapMode: "full" })).toBe(false);`
`410`		`-expect(shouldStripBootstrapFromEmbeddedContext({ bootstrapMode: "limited" })).toBe(true);`
`411`		`-expect(shouldStripBootstrapFromEmbeddedContext({ bootstrapMode: "none" })).toBe(true);`
	`409`	`+expect(resolveBootstrapContextTargets({ bootstrapMode: "full" })).toEqual({`
	`410`	`+includeBootstrapInSystemContext: true,`
	`411`	`+includeBootstrapInRuntimeContext: false,`
	`412`	`+});`
	`413`	`+expect(resolveBootstrapContextTargets({ bootstrapMode: "limited" })).toEqual({`
	`414`	`+includeBootstrapInSystemContext: false,`
	`415`	`+includeBootstrapInRuntimeContext: false,`
	`416`	`+});`
	`417`	`+expect(resolveBootstrapContextTargets({ bootstrapMode: "none" })).toEqual({`
	`418`	`+includeBootstrapInSystemContext: false,`
	`419`	`+includeBootstrapInRuntimeContext: false,`
	`420`	`+});`
`412`	`421`	`});`
`413`	`422`	`});`
`414`	`423`

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

推荐订阅源

Recent Commits to openclaw:main