vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-04-24 15:41:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(auto-reply): extract reply prompt prelude

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-06 18:33:04 +01:00
parent b98cccc06e
commit e6c1e9c64b
2 changed files with 56 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/auto-reply/reply/get-reply-run.ts
View File

@@ -16,7 +16,6 @@ import { normalizeMainKey } from "../../routing/session-key.js";
import { isReasoningTagProvider } from "../../utils/provider-utils.js";
import { hasControlCommand } from "../command-detection.js";
import { resolveEnvelopeFormatOptions } from "../envelope.js";
import { buildInboundMediaNote } from "../media-note.js";
import type { MsgContext, TemplateContext } from "../templating.js";
import {
type ElevatedLevel,
@@ -36,6 +35,7 @@ import { buildGroupChatContext, buildGroupIntro } from "./groups.js";
import { buildInboundMetaSystemPrompt, buildInboundUserContextPrefix } from "./inbound-meta.js";
import type { createModelSelectionState } from "./model-selection.js";
import { resolveOriginMessageProvider } from "./origin-routing.js";
import { buildReplyPromptBodies } from "./prompt-prelude.js";
import { resolveActiveRunQueueAction } from "./queue-policy.js";
import { resolveQueueSettings } from "./queue/settings.js";
import { buildBareSessionResetPrompt } from "./session-reset-prompt.js";
@@ -43,7 +43,6 @@ import { drainFormattedSystemEvents } from "./session-system-events.js";
import { resolveTypingMode } from "./typing-mode.js";
import { resolveRunTypingPolicy } from "./typing-policy.js";
import type { TypingController } from "./typing.js";
import { appendUntrustedContext } from "./untrusted-context.js";
type AgentDefaults = NonNullable<OpenClawConfig["agents"]>["defaults"];
type ExecOverrides = Pick<ExecToolDefaults, "host" | "security" | "ask" | "node">;
@@ -321,23 +320,14 @@ export async function runPreparedReply(
if (eventsBlock) {
drainedSystemEventBlocks.push(eventsBlock);
}
const combinedEventsBlock = drainedSystemEventBlocks.join("\n");
const prependEvents = (body: string) =>
combinedEventsBlock ? `${combinedEventsBlock}\n\n${body}` : body;
const bodyWithEvents = prependEvents(effectiveBaseBody);
const prefixedBodyWithEvents = appendUntrustedContext(
prependEvents(prefixedBodyCore),
sessionCtx.UntrustedContext,
);
const prefixedBody = [threadContextNote, prefixedBodyWithEvents].filter(Boolean).join("\n\n");
const queueBodyBase = [threadContextNote, bodyWithEvents].filter(Boolean).join("\n\n");
const queuedBody = mediaNote
? [mediaNote, mediaReplyHint, queueBodyBase].filter(Boolean).join("\n").trim()
: queueBodyBase;
const prefixedCommandBody = mediaNote
? [mediaNote, mediaReplyHint, prefixedBody || ""].filter(Boolean).join("\n").trim()
: prefixedBody;
return { prefixedCommandBody, queuedBody };
return buildReplyPromptBodies({
ctx,
sessionCtx,
effectiveBaseBody,
prefixedBody: prefixedBodyCore,
threadContextNote,
systemEventBlocks: drainedSystemEventBlocks,
});
};
const skillResult =
process.env.OPENCLAW_TEST_FAST === "1"
@@ -363,10 +353,6 @@ export async function runPreparedReply(
sessionEntry = skillResult.sessionEntry ?? sessionEntry;
currentSystemSent = skillResult.systemSent;
const skillsSnapshot = skillResult.skillsSnapshot;
const mediaNote = buildInboundMediaNote(ctx);
const mediaReplyHint = mediaNote
? "To send an image back, prefer the message tool (media/path/filePath). If you must inline, use MEDIA:https://example.com/image.jpg (spaces ok, quote if needed) or a safe relative path like MEDIA:./image.jpg. Avoid absolute paths (MEDIA:/...) and ~ paths - they are blocked for security. Keep caption in the text body."
: undefined;
let { prefixedCommandBody, queuedBody } = await rebuildPromptBodies();
if (!resolvedThinkLevel) {
resolvedThinkLevel = await modelState.resolveDefaultThinkingLevel();

47
src/auto-reply/reply/prompt-prelude.ts Normal file
View File

@@ -0,0 +1,47 @@
import { buildInboundMediaNote } from "../media-note.js";
import type { MsgContext, TemplateContext } from "../templating.js";
import { appendUntrustedContext } from "./untrusted-context.js";
export const REPLY_MEDIA_HINT =
"To send an image back, prefer the message tool (media/path/filePath). If you must inline, use MEDIA:https://example.com/image.jpg (spaces ok, quote if needed) or a safe relative path like MEDIA:./image.jpg. Avoid absolute paths (MEDIA:/...) and ~ paths - they are blocked for security. Keep caption in the text body.";
export function buildReplyPromptBodies(params: {
ctx: MsgContext;
sessionCtx: TemplateContext;
effectiveBaseBody: string;
prefixedBody: string;
threadContextNote?: string;
systemEventBlocks?: string[];
}): {
mediaNote?: string;
mediaReplyHint?: string;
prefixedCommandBody: string;
queuedBody: string;
} {
const combinedEventsBlock = (params.systemEventBlocks ?? []).filter(Boolean).join("\n");
const prependEvents = (body: string) =>
combinedEventsBlock ? `${combinedEventsBlock}\n\n${body}` : body;
const bodyWithEvents = prependEvents(params.effectiveBaseBody);
const prefixedBodyWithEvents = appendUntrustedContext(
prependEvents(params.prefixedBody),
params.sessionCtx.UntrustedContext,
);
const prefixedBody = [params.threadContextNote, prefixedBodyWithEvents]
.filter(Boolean)
.join("\n\n");
const queueBodyBase = [params.threadContextNote, bodyWithEvents].filter(Boolean).join("\n\n");
const mediaNote = buildInboundMediaNote(params.ctx);
const mediaReplyHint = mediaNote ? REPLY_MEDIA_HINT : undefined;
const queuedBody = mediaNote
? [mediaNote, mediaReplyHint, queueBodyBase].filter(Boolean).join("\n").trim()
: queueBodyBase;
const prefixedCommandBody = mediaNote
? [mediaNote, mediaReplyHint, prefixedBody].filter(Boolean).join("\n").trim()
: prefixedBody;
return {
mediaNote,
mediaReplyHint,
prefixedCommandBody,
queuedBody,
};
}