refactor(channels): move more turn policy into kernel · o...

Recent Commits to openclaw:main

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

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-ae28566c922ce79527943b069abc199de28e3898ec08eea12c4ff6050795f276 plugin-sdk-api-baseline.json`
`2`		`-79446b23832949553b23e7cf92be37b81c69d123fc09bed6f8fc04bd98e9257d plugin-sdk-api-baseline.jsonl`
	`1`	`+d26a70c9ea3bd277135a1712556f07195fb464b5cd846d04f18c2166c319a73d plugin-sdk-api-baseline.json`
	`2`	`+9fe2cb122fb3de17eaaf54c7768f268aa689063cf9091bd4b0be9422550a70a8 plugin-sdk-api-baseline.jsonl`

Original file line number	Diff line number	Diff line change
`@@ -12,16 +12,9 @@ import {`
`12`	`12`	`} from "openclaw/plugin-sdk/conversation-runtime";`
`13`	`13`	`import { recordInboundSession } from "openclaw/plugin-sdk/conversation-runtime";`
`14`	`14`	`import { normalizeScpRemoteHost } from "openclaw/plugin-sdk/host-runtime";`
`15`		`-import {`
`16`		`-hasFinalInboundReplyDispatch,`
`17`		`-runPreparedInboundReplyTurn,`
`18`		`-} from "openclaw/plugin-sdk/inbound-reply-dispatch";`
	`15`	`+import { runPreparedInboundReplyTurn } from "openclaw/plugin-sdk/inbound-reply-dispatch";`
`19`	`16`	`import { isInboundPathAllowed, kindFromMime } from "openclaw/plugin-sdk/media-runtime";`
`20`		`-import {`
`21`		`-clearHistoryEntriesIfEnabled,`
`22`		`-DEFAULT_GROUP_HISTORY_LIMIT,`
`23`		`-type HistoryEntry,`
`24`		`-} from "openclaw/plugin-sdk/reply-history";`
	`17`	`+import { DEFAULT_GROUP_HISTORY_LIMIT, type HistoryEntry } from "openclaw/plugin-sdk/reply-history";`
`25`	`18`	`import { resolveTextChunkLimit } from "openclaw/plugin-sdk/reply-runtime";`
`26`	`19`	`import { dispatchInboundMessage } from "openclaw/plugin-sdk/reply-runtime";`
`27`	`20`	`import { createReplyDispatcher } from "openclaw/plugin-sdk/reply-runtime";`
`@@ -442,7 +435,7 @@ export async function monitorIMessageProvider(opts: MonitorIMessageOpts = {}): P`
`442`	`435`	`},`
`443`	`436`	`});`
`444`	`437`
`445`		`-const { dispatchResult } = await runPreparedInboundReplyTurn({`
	`438`	`+await runPreparedInboundReplyTurn({`
`446`	`439`	`channel: "imessage",`
`447`	`440`	`accountId: decision.route.accountId,`
`448`	`441`	`routeSessionKey: decision.route.sessionKey,`
`@@ -475,6 +468,12 @@ export async function monitorIMessageProvider(opts: MonitorIMessageOpts = {}): P`
`475`	`468`	logVerbose(`imessage: failed updating session meta: ${String(err)}`);
`476`	`469`	`},`
`477`	`470`	`},`
	`471`	`+history: {`
	`472`	`+isGroup: decision.isGroup,`
	`473`	`+historyKey: decision.historyKey,`
	`474`	`+historyMap: groupHistories,`
	`475`	`+limit: historyLimit,`
	`476`	`+},`
`478`	`477`	`onPreDispatchFailure: () => settleReplyDispatcher({ dispatcher }),`
`479`	`478`	`runDispatch: () =>`
`480`	`479`	`dispatchInboundMessage({`
`@@ -490,23 +489,6 @@ export async function monitorIMessageProvider(opts: MonitorIMessageOpts = {}): P`
`490`	`489`	`},`
`491`	`490`	`}),`
`492`	`491`	`});`
`493`		`-if (!hasFinalInboundReplyDispatch(dispatchResult)) {`
`494`		`-if (decision.isGroup && decision.historyKey) {`
`495`		`-clearHistoryEntriesIfEnabled({`
`496`		`-historyMap: groupHistories,`
`497`		`-historyKey: decision.historyKey,`
`498`		`-limit: historyLimit,`
`499`		`-});`
`500`		`-}`
`501`		`-return;`
`502`		`-}`
`503`		`-if (decision.isGroup && decision.historyKey) {`
`504`		`-clearHistoryEntriesIfEnabled({`
`505`		`-historyMap: groupHistories,`
`506`		`-historyKey: decision.historyKey,`
`507`		`-limit: historyLimit,`
`508`		`-});`
`509`		`-}`
`510`	`492`	`}`
`511`	`493`
`512`	`494`	`const handleMessage = async (raw: unknown) => {`

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,8 @@`
`1`	`1`	`import type { webhook } from "@line/bot-sdk";`
`2`	`2`	`import { createChannelReplyPipeline } from "openclaw/plugin-sdk/channel-reply-pipeline";`
`3`	`3`	`import type { OpenClawConfig } from "openclaw/plugin-sdk/config-types";`
`4`		`-import { recordInboundSession } from "openclaw/plugin-sdk/conversation-runtime";`
`5`		`-import {`
`6`		`-hasFinalInboundReplyDispatch,`
`7`		`-runPreparedInboundReplyTurn,`
`8`		`-} from "openclaw/plugin-sdk/inbound-reply-dispatch";`
`9`		`-import {`
`10`		`-dispatchReplyWithBufferedBlockDispatcher,`
`11`		`-chunkMarkdownText,`
`12`		`-} from "openclaw/plugin-sdk/reply-runtime";`
	`4`	`+import { hasFinalInboundReplyDispatch } from "openclaw/plugin-sdk/inbound-reply-dispatch";`
	`5`	`+import { chunkMarkdownText } from "openclaw/plugin-sdk/reply-runtime";`
`13`	`6`	`import {`
`14`	`7`	`danger,`
`15`	`8`	`logVerbose,`
`@@ -32,6 +25,7 @@ import { deliverLineAutoReply } from "./auto-reply-delivery.js";`
`32`	`25`	`import { createLineBot } from "./bot.js";`
`33`	`26`	`import { processLineMessage } from "./markdown-to-line.js";`
`34`	`27`	`import { sendLineReplyChunks } from "./reply-chunks.js";`
	`28`	`+import { getLineRuntime } from "./runtime.js";`
`35`	`29`	`import {`
`36`	`30`	`createFlexMessage,`
`37`	`31`	`createImageMessage,`
`@@ -236,21 +230,36 @@ export async function monitorLineProvider(`
`236`	`230`	`accountId: route.accountId,`
`237`	`231`	`});`
`238`	`232`
`239`		`-const { dispatchResult } = await runPreparedInboundReplyTurn({`
	`233`	`+const core = getLineRuntime();`
	`234`	`+const { dispatchResult } = await core.channel.turn.run({`
`240`	`235`	`channel: "line",`
`241`	`236`	`accountId: route.accountId,`
`242`		`-routeSessionKey: route.sessionKey,`
`243`		`-storePath: ctx.turn.storePath,`
`244`		`- ctxPayload,`
`245`		`- recordInboundSession,`
`246`		`-record: ctx.turn.record,`
`247`		`-runDispatch: () =>`
`248`		`-dispatchReplyWithBufferedBlockDispatcher({`
`249`		`-ctx: ctxPayload,`
	`237`	`+raw: ctx,`
	`238`	`+adapter: {`
	`239`	`+ingest: () => ({`
	`240`	+id: ctxPayload.MessageSid ?? `${ctxPayload.From}:${Date.now()}`,
	`241`	`+rawText: ctxPayload.RawBody ?? ctxPayload.BodyForAgent ?? "",`
	`242`	`+}),`
	`243`	`+resolveTurn: () => ({`
`250`	`244`	`cfg: config,`
	`245`	`+channel: "line",`
	`246`	`+accountId: route.accountId,`
	`247`	`+agentId: route.agentId,`
	`248`	`+routeSessionKey: route.sessionKey,`
	`249`	`+storePath: ctx.turn.storePath,`
	`250`	`+ ctxPayload,`
	`251`	`+recordInboundSession: core.channel.session.recordInboundSession,`
	`252`	`+dispatchReplyWithBufferedBlockDispatcher:`
	`253`	`+core.channel.reply.dispatchReplyWithBufferedBlockDispatcher,`
	`254`	`+record: ctx.turn.record,`
`251`	`255`	`dispatcherOptions: {`
`252`	`256`	`...replyPipeline,`
`253`		`-deliver: async (payload, _info) => {`
	`257`	`+},`
	`258`	`+replyOptions: {`
	`259`	`+ onModelSelected,`
	`260`	`+},`
	`261`	`+delivery: {`
	`262`	`+deliver: async (payload) => {`
`254`	`263`	`const lineData = (payload.channelData?.line as LineChannelData \| undefined) ?? {};`
`255`	`264`
`256`	`265`	`if (ctx.userId && !ctx.isGroup) {`
`@@ -304,10 +313,8 @@ export async function monitorLineProvider(`
`304`	`313`	runtime.error?.(danger(`line ${info.kind} reply failed: ${String(err)}`));
`305`	`314`	`},`
`306`	`315`	`},`
`307`		`-replyOptions: {`
`308`		`- onModelSelected,`
`309`		`-},`
`310`	`316`	`}),`
	`317`	`+},`
`311`	`318`	`});`
`312`	`319`	`if (!hasFinalInboundReplyDispatch(dispatchResult)) {`
`313`	`320`	logVerbose(`line: no response generated for message from ${ctxPayload.From}`);

Original file line number	Diff line number	Diff line change
`@@ -25,14 +25,10 @@ import {`
`25`	`25`	`toInternalMessageReceivedContext,`
`26`	`26`	`triggerInternalHook,`
`27`	`27`	`} from "openclaw/plugin-sdk/hook-runtime";`
`28`		`-import {`
`29`		`-hasFinalInboundReplyDispatch,`
`30`		`-runPreparedInboundReplyTurn,`
`31`		`-} from "openclaw/plugin-sdk/inbound-reply-dispatch";`
	`28`	`+import { runPreparedInboundReplyTurn } from "openclaw/plugin-sdk/inbound-reply-dispatch";`
`32`	`29`	`import { kindFromMime } from "openclaw/plugin-sdk/media-runtime";`
`33`	`30`	`import {`
`34`	`31`	`buildPendingHistoryContextFromMap,`
`35`		`-clearHistoryEntriesIfEnabled,`
`36`	`32`	`recordPendingHistoryEntryIfEnabled,`
`37`	`33`	`} from "openclaw/plugin-sdk/reply-history";`
`38`	`34`	`import { dispatchInboundMessage } from "openclaw/plugin-sdk/reply-runtime";`
`@@ -292,7 +288,7 @@ export function createSignalEventHandler(deps: SignalEventHandlerDeps) {`
`292`	`288`	`},`
`293`	`289`	`});`
`294`	`290`
`295`		`-const { dispatchResult } = await runPreparedInboundReplyTurn({`
	`291`	`+await runPreparedInboundReplyTurn({`
`296`	`292`	`channel: "signal",`
`297`	`293`	`accountId: route.accountId,`
`298`	`294`	`routeSessionKey: route.sessionKey,`
`@@ -331,6 +327,12 @@ export function createSignalEventHandler(deps: SignalEventHandlerDeps) {`
`331`	`327`	logVerbose(`signal: failed updating session meta: ${String(err)}`);
`332`	`328`	`},`
`333`	`329`	`},`
	`330`	`+history: {`
	`331`	`+isGroup: entry.isGroup,`
	`332`	`+ historyKey,`
	`333`	`+historyMap: deps.groupHistories,`
	`334`	`+limit: deps.historyLimit,`
	`335`	`+},`
`334`	`336`	`onPreDispatchFailure: () =>`
`335`	`337`	`settleReplyDispatcher({`
`336`	`338`	`dispatcher,`
`@@ -354,23 +356,6 @@ export function createSignalEventHandler(deps: SignalEventHandlerDeps) {`
`354`	`356`	`}`
`355`	`357`	`},`
`356`	`358`	`});`
`357`		`-if (!hasFinalInboundReplyDispatch(dispatchResult)) {`
`358`		`-if (entry.isGroup && historyKey) {`
`359`		`-clearHistoryEntriesIfEnabled({`
`360`		`-historyMap: deps.groupHistories,`
`361`		`- historyKey,`
`362`		`-limit: deps.historyLimit,`
`363`		`-});`
`364`		`-}`
`365`		`-return;`
`366`		`-}`
`367`		`-if (entry.isGroup && historyKey) {`
`368`		`-clearHistoryEntriesIfEnabled({`
`369`		`-historyMap: deps.groupHistories,`
`370`		`- historyKey,`
`371`		`-limit: deps.historyLimit,`
`372`		`-});`
`373`		`-}`
`374`	`359`	`}`
`375`	`360`
`376`	`361`	`const { debouncer: inboundDebouncer } = createChannelInboundDebouncer<SignalInboundEntry>({`

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,40 @@`
`1`	`1`	`import { describe, expect, it } from "vitest";`
`2`		`-import { buildChannelTurnContext } from "./context.js";`
	`2`	`+import { buildChannelTurnContext, type BuildChannelTurnContextParams } from "./context.js";`
	`3`	`+`
	`4`	`+function createBaseContextParams(`
	`5`	`+overrides: Partial<BuildChannelTurnContextParams> = {},`
	`6`	`+): BuildChannelTurnContextParams {`
	`7`	`+return {`
	`8`	`+channel: "test",`
	`9`	`+accountId: "acct",`
	`10`	`+messageId: "msg-1",`
	`11`	`+from: "test:user:u1",`
	`12`	`+sender: {`
	`13`	`+id: "u1",`
	`14`	`+},`
	`15`	`+conversation: {`
	`16`	`+kind: "group",`
	`17`	`+id: "room-1",`
	`18`	`+routePeer: {`
	`19`	`+kind: "group",`
	`20`	`+id: "room-1",`
	`21`	`+},`
	`22`	`+},`
	`23`	`+route: {`
	`24`	`+agentId: "main",`
	`25`	`+routeSessionKey: "agent:main:test:group:room-1",`
	`26`	`+},`
	`27`	`+reply: {`
	`28`	`+to: "test:room:room-1",`
	`29`	`+originatingTo: "test:room:room-1",`
	`30`	`+},`
	`31`	`+message: {`
	`32`	`+rawBody: "hello",`
	`33`	`+envelopeFrom: "User One",`
	`34`	`+},`
	`35`	`+ ...overrides,`
	`36`	`+};`
	`37`	`+}`
`3`	`38`
`4`	`39`	`describe("buildChannelTurnContext", () => {`
`5`	`40`	`it("maps normalized turn facts into a finalized message context", () => {`
`@@ -139,4 +174,92 @@ describe("buildChannelTurnContext", () => {`
`139`	`174`	`}),`
`140`	`175`	`);`
`141`	`176`	`});`
	`177`	`+`
	`178`	`+it("filters supplemental context with channel visibility policy", () => {`
	`179`	`+const ctx = buildChannelTurnContext(`
	`180`	`+createBaseContextParams({`
	`181`	`+supplemental: {`
	`182`	`+quote: {`
	`183`	`+id: "quote-1",`
	`184`	`+body: "quoted",`
	`185`	`+sender: "Quoted User",`
	`186`	`+senderAllowed: false,`
	`187`	`+isQuote: true,`
	`188`	`+},`
	`189`	`+forwarded: {`
	`190`	`+from: "Forwarded User",`
	`191`	`+fromId: "f1",`
	`192`	`+senderAllowed: false,`
	`193`	`+},`
	`194`	`+thread: {`
	`195`	`+starterBody: "thread starter",`
	`196`	`+historyBody: "thread history",`
	`197`	`+senderAllowed: false,`
	`198`	`+},`
	`199`	`+},`
	`200`	`+contextVisibility: "allowlist",`
	`201`	`+}),`
	`202`	`+);`
	`203`	`+`
	`204`	`+expect(ctx.ReplyToBody).toBeUndefined();`
	`205`	`+expect(ctx.ReplyToSender).toBeUndefined();`
	`206`	`+expect(ctx.ForwardedFrom).toBeUndefined();`
	`207`	`+expect(ctx.ThreadStarterBody).toBeUndefined();`
	`208`	`+expect(ctx.ThreadHistoryBody).toBeUndefined();`
	`209`	`+});`
	`210`	`+`
	`211`	`+it("keeps quoted context in allowlist_quote mode", () => {`
	`212`	`+const ctx = buildChannelTurnContext(`
	`213`	`+createBaseContextParams({`
	`214`	`+supplemental: {`
	`215`	`+quote: {`
	`216`	`+id: "quote-1",`
	`217`	`+body: "quoted",`
	`218`	`+sender: "Quoted User",`
	`219`	`+senderAllowed: false,`
	`220`	`+isQuote: true,`
	`221`	`+},`
	`222`	`+thread: {`
	`223`	`+starterBody: "thread starter",`
	`224`	`+senderAllowed: false,`
	`225`	`+},`
	`226`	`+},`
	`227`	`+contextVisibility: "allowlist_quote",`
	`228`	`+}),`
	`229`	`+);`
	`230`	`+`
	`231`	`+expect(ctx.ReplyToBody).toBe("quoted");`
	`232`	`+expect(ctx.ReplyToSender).toBe("Quoted User");`
	`233`	`+expect(ctx.ThreadStarterBody).toBeUndefined();`
	`234`	`+});`
	`235`	`+`
	`236`	`+it("drops supplemental context with unknown sender allow state in restrictive modes", () => {`
	`237`	`+const ctx = buildChannelTurnContext(`
	`238`	`+createBaseContextParams({`
	`239`	`+supplemental: {`
	`240`	`+quote: {`
	`241`	`+id: "quote-1",`
	`242`	`+body: "quoted",`
	`243`	`+sender: "Quoted User",`
	`244`	`+isQuote: true,`
	`245`	`+},`
	`246`	`+forwarded: {`
	`247`	`+from: "Forwarded User",`
	`248`	`+fromId: "f1",`
	`249`	`+},`
	`250`	`+thread: {`
	`251`	`+starterBody: "thread starter",`
	`252`	`+historyBody: "thread history",`
	`253`	`+},`
	`254`	`+},`
	`255`	`+contextVisibility: "allowlist_quote",`
	`256`	`+}),`
	`257`	`+);`
	`258`	`+`
	`259`	`+expect(ctx.ReplyToBody).toBeUndefined();`
	`260`	`+expect(ctx.ReplyToSender).toBeUndefined();`
	`261`	`+expect(ctx.ForwardedFrom).toBeUndefined();`
	`262`	`+expect(ctx.ThreadStarterBody).toBeUndefined();`
	`263`	`+expect(ctx.ThreadHistoryBody).toBeUndefined();`
	`264`	`+});`
`142`	`265`	`});`

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

推荐订阅源

Recent Commits to openclaw:main