Fix restart sentinel internal continuations (#88161) · openclaw/openclaw@584fa32

Recent Commits to openclaw:main

joshavant · 2026-05-30 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -646,10 +646,16 @@ describe("runCliAgent spawn path", () => {`
`646`	`646`	`runId: "run-claude-channel-wrapper",`
`647`	`647`	`messageChannel: "telegram",`
`648`	`648`	`messageProvider: "acp",`
	`649`	`+currentChannelId: "telegram:-100123:topic:42",`
	`650`	`+currentThreadTs: "42",`
	`651`	`+currentMessageId: "reply-message-1",`
`649`	`652`	`});`
`650`	`653`
`651`	`654`	`expect(params.messageChannel).toBe("telegram");`
`652`	`655`	`expect(params.messageProvider).toBe("acp");`
	`656`	`+expect(params.currentChannelId).toBe("telegram:-100123:topic:42");`
	`657`	`+expect(params.currentThreadTs).toBe("42");`
	`658`	`+expect(params.currentMessageId).toBe("reply-message-1");`
`653`	`659`	`expect(params.cwd).toBe("/tmp/task-repo");`
`654`	`660`	`});`
`655`	`661`

Original file line number	Diff line number	Diff line change
`@@ -779,6 +779,9 @@ export function buildRunClaudeCliAgentParams(params: RunClaudeCliAgentParams): R`
`779`	`779`	`images: params.images,`
`780`	`780`	`messageChannel: params.messageChannel,`
`781`	`781`	`messageProvider: params.messageProvider,`
	`782`	`+currentChannelId: params.currentChannelId,`
	`783`	`+currentThreadTs: params.currentThreadTs,`
	`784`	`+currentMessageId: params.currentMessageId,`
`782`	`785`	`};`
`783`	`786`	`}`
`784`	`787`

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,9 @@ function createTestMcpLoopbackServerConfig(port: number) {`
`98`	`98`	`"x-openclaw-agent-id": "${OPENCLAW_MCP_AGENT_ID}",`
`99`	`99`	`"x-openclaw-account-id": "${OPENCLAW_MCP_ACCOUNT_ID}",`
`100`	`100`	`"x-openclaw-message-channel": "${OPENCLAW_MCP_MESSAGE_CHANNEL}",`
	`101`	`+"x-openclaw-current-channel-id": "${OPENCLAW_MCP_CURRENT_CHANNEL_ID}",`
	`102`	`+"x-openclaw-current-thread-ts": "${OPENCLAW_MCP_CURRENT_THREAD_TS}",`
	`103`	`+"x-openclaw-current-message-id": "${OPENCLAW_MCP_CURRENT_MESSAGE_ID}",`
`101`	`104`	`"x-openclaw-inbound-event-kind": "${OPENCLAW_MCP_INBOUND_EVENT_KIND}",`
`102`	`105`	`"x-openclaw-source-reply-delivery-mode": "${OPENCLAW_MCP_SOURCE_REPLY_DELIVERY_MODE}",`
`103`	`106`	`},`
`@@ -1147,6 +1150,9 @@ describe("shouldSkipLocalCliCredentialEpoch", () => {`
`1147`	`1150`	`cfg: expect.any(Object),`
`1148`	`1151`	`sessionKey: "agent:main:test",`
`1149`	`1152`	`messageProvider: undefined,`
	`1153`	`+currentChannelId: undefined,`
	`1154`	`+currentThreadTs: undefined,`
	`1155`	`+currentMessageId: undefined,`
`1150`	`1156`	`accountId: undefined,`
`1151`	`1157`	`inboundEventKind: undefined,`
`1152`	`1158`	`sourceReplyDeliveryMode: undefined,`
`@@ -1289,11 +1295,17 @@ describe("shouldSkipLocalCliCredentialEpoch", () => {`
`1289`	`1295`	`config: createCliBackendConfig(),`
`1290`	`1296`	`currentInboundEventKind: "room_event",`
`1291`	`1297`	`messageChannel: "telegram",`
	`1298`	`+currentChannelId: "telegram:-100123:topic:42",`
	`1299`	`+currentThreadTs: "42",`
	`1300`	`+currentMessageId: "reply-message-1",`
`1292`	`1301`	`sourceReplyDeliveryMode: "message_tool_only",`
`1293`	`1302`	`});`
`1294`	`1303`
`1295`	`1304`	`expect(context.preparedBackend.env).toMatchObject({`
`1296`	`1305`	`OPENCLAW_MCP_MESSAGE_CHANNEL: "telegram",`
	`1306`	`+OPENCLAW_MCP_CURRENT_CHANNEL_ID: "telegram:-100123:topic:42",`
	`1307`	`+OPENCLAW_MCP_CURRENT_THREAD_TS: "42",`
	`1308`	`+OPENCLAW_MCP_CURRENT_MESSAGE_ID: "reply-message-1",`
`1297`	`1309`	`OPENCLAW_MCP_INBOUND_EVENT_KIND: "room_event",`
`1298`	`1310`	`OPENCLAW_MCP_SOURCE_REPLY_DELIVERY_MODE: "message_tool_only",`
`1299`	`1311`	`});`

Original file line number	Diff line number	Diff line change
`@@ -277,6 +277,10 @@ export async function prepareCliRunContext(`
`277`	`277`	`OPENCLAW_MCP_ACCOUNT_ID: params.agentAccountId ?? "",`
`278`	`278`	`OPENCLAW_MCP_SESSION_KEY: params.sessionKey ?? "",`
`279`	`279`	`OPENCLAW_MCP_MESSAGE_CHANNEL: params.messageChannel ?? params.messageProvider ?? "",`
	`280`	`+OPENCLAW_MCP_CURRENT_CHANNEL_ID: params.currentChannelId ?? "",`
	`281`	`+OPENCLAW_MCP_CURRENT_THREAD_TS: params.currentThreadTs ?? "",`
	`282`	`+OPENCLAW_MCP_CURRENT_MESSAGE_ID:`
	`283`	`+params.currentMessageId != null ? String(params.currentMessageId) : "",`
`280`	`284`	`OPENCLAW_MCP_INBOUND_EVENT_KIND: params.currentInboundEventKind ?? "",`
`281`	`285`	`OPENCLAW_MCP_SOURCE_REPLY_DELIVERY_MODE: params.sourceReplyDeliveryMode ?? "",`
`282`	`286`	`}`
`@@ -351,6 +355,9 @@ export async function prepareCliRunContext(`
`351`	`355`	`cfg: params.config ?? getRuntimeConfig(),`
`352`	`356`	`sessionKey: params.sessionKey ?? "",`
`353`	`357`	`messageProvider: params.messageChannel ?? params.messageProvider,`
	`358`	`+currentChannelId: params.currentChannelId,`
	`359`	`+currentThreadTs: params.currentThreadTs,`
	`360`	`+currentMessageId: params.currentMessageId,`
`354`	`361`	`accountId: params.agentAccountId,`
`355`	`362`	`inboundEventKind: params.currentInboundEventKind,`
`356`	`363`	`sourceReplyDeliveryMode: params.sourceReplyDeliveryMode,`

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,9 @@ export type RunCliAgentParams = {`
`70`	`70`	`skillsSnapshot?: SkillSnapshot;`
`71`	`71`	`messageChannel?: string;`
`72`	`72`	`messageProvider?: string;`
	`73`	`+currentChannelId?: string;`
	`74`	`+currentThreadTs?: string;`
	`75`	`+currentMessageId?: string \| number;`
`73`	`76`	`agentAccountId?: string;`
`74`	`77`	`/** Trusted sender identity bit for channel action auth. */`
`75`	`78`	`senderIsOwner?: boolean;`

Original file line number	Diff line number	Diff line change
`@@ -137,12 +137,15 @@ describe("gateway tool restart continuation", () => {`
`137`	`137`	`expect(parameters.properties?.timeoutMs).toMatchObject({ type: "integer", minimum: 1 });`
`138`	`138`	`});`
`139`	`139`
`140`		`-it("instructs agents to use continuationMessage when a restart still needs a reply", async () => {`
	`140`	`+it("instructs agents to use continuationMessage for internal post-restart work", async () => {`
`141`	`141`	`const tool = createGatewayTool();`
`142`	`142`
`143`		`-expect(tool.description).toContain("still owe the user a reply");`
	`143`	`+expect(tool.description).toContain("post-restart work must continue internally");`
	`144`	`+expect(tool.description).toContain(`
	`145`	`+"visible follow-up from that turn must use the message tool",`
	`146`	`+);`
`144`	`147`	`expect(tool.description).toContain("continuationMessage");`
`145`		`-expect(tool.description).toContain("do not write restart sentinel files directly");`
	`148`	`+expect(tool.description).toContain("Do not write restart sentinel files directly");`
`146`	`149`	`});`
`147`	`150`
`148`	`151`	`it("writes an agentTurn continuation into the restart sentinel", async () => {`
`@@ -234,9 +237,7 @@ describe("gateway tool restart continuation", () => {`
`234`	`237`	`});`
`235`	`238`	`});`
`236`	`239`
`237`		`-it("defaults session-scoped restarts to a success continuation", async () => {`
`238`		`-const { DEFAULT_RESTART_SUCCESS_CONTINUATION_MESSAGE } =`
`239`		`-await import("../../infra/restart-sentinel.js");`
	`240`	`+it("does not infer a continuation for session-scoped restarts", async () => {`
`240`	`241`	`const tool = createGatewayTool({`
`241`	`242`	`agentSessionKey: "agent:main:main",`
`242`	`243`	`config: {},`
`@@ -252,10 +253,7 @@ describe("gateway tool restart continuation", () => {`
`252`	`253`
`253`	`254`	`const payload = requireRestartSentinelPayload();`
`254`	`255`	`expect(payload.sessionKey).toBe("agent:main:main");`
`255`		`-expect(payload.continuation).toEqual({`
`256`		`-kind: "agentTurn",`
`257`		`-message: DEFAULT_RESTART_SUCCESS_CONTINUATION_MESSAGE,`
`258`		`-});`
	`256`	`+expect(payload.continuation).toBeNull();`
`259`	`257`	`});`
`260`	`258`
`261`	`259`	`it("removes the prepared sentinel when restart emission is rejected", async () => {`

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ export function createGatewayTool(opts?: {`
`369`	`369`	`label: "Gateway",`
`370`	`370`	`name: "gateway",`
`371`	`371`	`description:`
`372`		-"Gateway restart/config/update. Before config edits, use config.schema.lookup with targeted dot path. Prefer config.patch for partial merge; config.apply only full replace. Writes hot-reload or restart as needed. Always pass human `note` for post-restart delivery. If still owe the user a reply, pass one-shot `continuationMessage`; do not write restart sentinel files directly.",
	`372`	+"Gateway restart/config/update. Before config edits, use config.schema.lookup with targeted dot path. Prefer config.patch for partial merge; config.apply only full replace. Writes hot-reload or restart as needed. Always pass human `note` for post-restart delivery. If post-restart work must continue internally, pass one-shot `continuationMessage`; visible follow-up from that turn must use the message tool. Do not write restart sentinel files directly.",
`373`	`373`	`parameters: GatewayToolSchema,`
`374`	`374`	`execute: async (_toolCallId, args) => {`
`375`	`375`	`const params = args as Record<string, unknown>;`

Original file line number	Diff line number	Diff line change
`@@ -2015,6 +2015,14 @@ export async function runAgentTurnWithFallback(params: {`
`2015`	`2015`	`originatingChannel: params.followupRun.originatingChannel,`
`2016`	`2016`	`provider: params.sessionCtx.Provider,`
`2017`	`2017`	`});`
	`2018`	`+const cliCurrentThreadId =`
	`2019`	`+params.followupRun.originatingThreadId ?? params.sessionCtx.MessageThreadId;`
	`2020`	`+const isRestartSentinelContinuation =`
	`2021`	`+params.sessionCtx.InputProvenance?.kind === "internal_system" &&`
	`2022`	`+params.sessionCtx.InputProvenance.sourceTool === "restart-sentinel";`
	`2023`	`+const cliCurrentMessageId = isRestartSentinelContinuation`
	`2024`	`+ ? params.sessionCtx.ReplyToId`
	`2025`	`+ : (params.sessionCtx.MessageSidFull ?? params.sessionCtx.MessageSid);`
`2018`	`2026`	`const result = await agentTurnTiming.measure("cli_run", () =>`
`2019`	`2027`	`runCliAgentWithLifecycle({`
`2020`	`2028`	`runId,`
`@@ -2107,6 +2115,13 @@ export async function runAgentTurnWithFallback(params: {`
`2107`	`2115`	`skillsSnapshot: params.followupRun.run.skillsSnapshot,`
`2108`	`2116`	`messageChannel: params.followupRun.originatingChannel ?? undefined,`
`2109`	`2117`	`messageProvider: hookMessageProvider,`
	`2118`	`+currentChannelId:`
	`2119`	`+params.followupRun.originatingTo ??`
	`2120`	`+params.sessionCtx.OriginatingTo ??`
	`2121`	`+params.sessionCtx.To,`
	`2122`	`+currentThreadTs:`
	`2123`	`+cliCurrentThreadId != null ? String(cliCurrentThreadId) : undefined,`
	`2124`	`+currentMessageId: cliCurrentMessageId,`
`2110`	`2125`	`agentAccountId: params.followupRun.run.agentAccountId,`
`2111`	`2126`	`senderIsOwner: params.followupRun.run.senderIsOwner,`
`2112`	`2127`	`disableTools: params.opts?.disableTools,`

Original file line number	Diff line number	Diff line change
`@@ -309,4 +309,63 @@ describe("agent-runner-utils", () => {`
`309`	`309`	`expect(context.currentChannelId).toBe("channel:123456789012345678");`
`310`	`310`	`expect(context.currentMessageId).toBe("msg-9");`
`311`	`311`	`});`
	`312`	`+`
	`313`	`+it("does not expose restart-sentinel synthetic ids as message-tool reply targets", () => {`
	`314`	`+hoisted.getChannelPluginMock.mockReturnValue({`
	`315`	`+threading: {`
	`316`	`+buildToolContext: ({`
	`317`	`+ context,`
	`318`	`+}: {`
	`319`	`+context: { To?: string; MessageThreadId?: string \| number };`
	`320`	`+}) => ({`
	`321`	`+currentChannelId: context.To,`
	`322`	`+currentThreadTs:`
	`323`	`+context.MessageThreadId != null ? String(context.MessageThreadId) : undefined,`
	`324`	`+}),`
	`325`	`+},`
	`326`	`+});`
	`327`	`+`
	`328`	`+const context = buildThreadingToolContext({`
	`329`	`+sessionCtx: {`
	`330`	`+Provider: "webchat",`
	`331`	`+OriginatingChannel: "telegram",`
	`332`	`+OriginatingTo: "telegram:-1003841603622:topic:928",`
	`333`	`+MessageThreadId: 928,`
	`334`	`+MessageSid: "restart-sentinel:agent:main:telegram:agentTurn:123",`
	`335`	`+InputProvenance: {`
	`336`	`+kind: "internal_system",`
	`337`	`+sourceChannel: "telegram",`
	`338`	`+sourceTool: "restart-sentinel",`
	`339`	`+},`
	`340`	`+},`
	`341`	`+config: {},`
	`342`	`+hasRepliedRef: undefined,`
	`343`	`+});`
	`344`	`+`
	`345`	`+expect(context.currentChannelId).toBe("telegram:-1003841603622:topic:928");`
	`346`	`+expect(context.currentThreadTs).toBe("928");`
	`347`	`+expect(context.currentMessageId).toBeUndefined();`
	`348`	`+});`
	`349`	`+`
	`350`	`+it("uses restart-sentinel reply target when one exists", () => {`
	`351`	`+const context = buildThreadingToolContext({`
	`352`	`+sessionCtx: {`
	`353`	`+Provider: "webchat",`
	`354`	`+OriginatingChannel: "whatsapp",`
	`355`	`+OriginatingTo: "whatsapp:+15550002",`
	`356`	`+ReplyToId: "provider-reply-id",`
	`357`	`+MessageSid: "restart-sentinel:agent:main:whatsapp:agentTurn:123",`
	`358`	`+InputProvenance: {`
	`359`	`+kind: "internal_system",`
	`360`	`+sourceChannel: "whatsapp",`
	`361`	`+sourceTool: "restart-sentinel",`
	`362`	`+},`
	`363`	`+},`
	`364`	`+config: {},`
	`365`	`+hasRepliedRef: undefined,`
	`366`	`+});`
	`367`	`+`
	`368`	`+expect(context.currentChannelId).toBe("whatsapp:+15550002");`
	`369`	`+expect(context.currentMessageId).toBe("provider-reply-id");`
	`370`	`+});`
`312`	`371`	`});`

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,12 @@ export function buildThreadingToolContext(params: {`
`105`	`105`	`hasRepliedRef: { value: boolean } \| undefined;`
`106`	`106`	`}): ChannelThreadingToolContext {`
`107`	`107`	`const { sessionCtx, config, hasRepliedRef } = params;`
`108`		`-const currentMessageId = sessionCtx.MessageSidFull ?? sessionCtx.MessageSid;`
	`108`	`+const isRestartSentinelContinuation =`
	`109`	`+sessionCtx.InputProvenance?.kind === "internal_system" &&`
	`110`	`+sessionCtx.InputProvenance.sourceTool === "restart-sentinel";`
	`111`	`+const currentMessageId = isRestartSentinelContinuation`
	`112`	`+ ? sessionCtx.ReplyToId`
	`113`	`+ : (sessionCtx.MessageSidFull ?? sessionCtx.MessageSid);`
`109`	`114`	`const originProvider = resolveOriginMessageProvider({`
`110`	`115`	`originatingChannel: sessionCtx.OriginatingChannel,`
`111`	`116`	`provider: sessionCtx.Provider,`

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

推荐订阅源

Recent Commits to openclaw:main