mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-08 02:11:23 +00:00
* docs: add ACP thread-bound agents plan doc * docs: expand ACP implementation specification * feat(acp): route ACP sessions through core dispatch and lifecycle cleanup * feat(acp): add /acp commands and Discord spawn gate * ACP: add acpx runtime plugin backend * fix(subagents): defer transient lifecycle errors before announce * Agents: harden ACP sessions_spawn and tighten spawn guidance * Agents: require explicit ACP target for runtime spawns * docs: expand ACP control-plane implementation plan * ACP: harden metadata seeding and spawn guidance * ACP: centralize runtime control-plane manager and fail-closed dispatch * ACP: harden runtime manager and unify spawn helpers * Commands: route ACP sessions through ACP runtime in agent command * ACP: require persisted metadata for runtime spawns * Sessions: preserve ACP metadata when updating entries * Plugins: harden ACP backend registry across loaders * ACPX: make availability probe compatible with adapters * E2E: add manual Discord ACP plain-language smoke script * ACPX: preserve streamed spacing across Discord delivery * Docs: add ACP Discord streaming strategy * ACP: harden Discord stream buffering for thread replies * ACP: reuse shared block reply pipeline for projector * ACP: unify streaming config and adopt coalesceIdleMs * Docs: add temporary ACP production hardening plan * Docs: trim temporary ACP hardening plan goals * Docs: gate ACP thread controls by backend capabilities * ACP: add capability-gated runtime controls and /acp operator commands * Docs: remove temporary ACP hardening plan * ACP: fix spawn target validation and close cache cleanup * ACP: harden runtime dispatch and recovery paths * ACP: split ACP command/runtime internals and centralize policy * ACP: harden runtime lifecycle, validation, and observability * ACP: surface runtime and backend session IDs in thread bindings * docs: add temp plan for binding-service migration * ACP: migrate thread binding flows to SessionBindingService * ACP: address review feedback and preserve prompt wording * ACPX plugin: pin runtime dependency and prefer bundled CLI * Discord: complete binding-service migration cleanup and restore ACP plan * Docs: add standalone ACP agents guide * ACP: route harness intents to thread-bound ACP sessions * ACP: fix spawn thread routing and queue-owner stall * ACP: harden startup reconciliation and command bypass handling * ACP: fix dispatch bypass type narrowing * ACP: align runtime metadata to agentSessionId * ACP: normalize session identifier handling and labels * ACP: mark thread banner session ids provisional until first reply * ACP: stabilize session identity mapping and startup reconciliation * ACP: add resolved session-id notices and cwd in thread intros * Discord: prefix thread meta notices consistently * Discord: unify ACP/thread meta notices with gear prefix * Discord: split thread persona naming from meta formatting * Extensions: bump acpx plugin dependency to 0.1.9 * Agents: gate ACP prompt guidance behind acp.enabled * Docs: remove temp experiment plan docs * Docs: scope streaming plan to holy grail refactor * Docs: refactor ACP agents guide for human-first flow * Docs/Skill: add ACP feature-flag guidance and direct acpx telephone-game flow * Docs/Skill: add OpenCode and Pi to ACP harness lists * Docs/Skill: align ACP harness list with current acpx registry * Dev/Test: move ACP plain-language smoke script and mark as keep * Docs/Skill: reorder ACP harness lists with Pi first * ACP: split control-plane manager into core/types/utils modules * Docs: refresh ACP thread-bound agents plan * ACP: extract dispatch lane and split manager domains * ACP: centralize binding context and remove reverse deps * Infra: unify system message formatting * ACP: centralize error boundaries and session id rendering * ACP: enforce init concurrency cap and strict meta clear * Tests: fix ACP dispatch binding mock typing * Tests: fix Discord thread-binding mock drift and ACP request id * ACP: gate slash bypass and persist cleared overrides * ACPX: await pre-abort cancel before runTurn return * Extension: pin acpx runtime dependency to 0.1.11 * Docs: add pinned acpx install strategy for ACP extension * Extensions/acpx: enforce strict local pinned startup * Extensions/acpx: tighten acp-router install guidance * ACPX: retry runtime test temp-dir cleanup * Extensions/acpx: require proactive ACPX repair for thread spawns * Extensions/acpx: require restart offer after acpx reinstall * extensions/acpx: remove workspace protocol devDependency * extensions/acpx: bump pinned acpx to 0.1.13 * extensions/acpx: sync lockfile after dependency bump * ACPX: make runtime spawn Windows-safe * fix: align doctor-config-flow repair tests with default-account migration (#23580) (thanks @osolmaz)
238 lines
6.5 KiB
TypeScript
238 lines
6.5 KiB
TypeScript
import { ChannelType } from "@buape/carbon";
|
|
import { beforeEach, describe, expect, it } from "vitest";
|
|
import {
|
|
__testing as sessionBindingTesting,
|
|
registerSessionBindingAdapter,
|
|
} from "../../infra/outbound/session-binding-service.js";
|
|
import {
|
|
preflightDiscordMessage,
|
|
resolvePreflightMentionRequirement,
|
|
shouldIgnoreBoundThreadWebhookMessage,
|
|
} from "./message-handler.preflight.js";
|
|
import {
|
|
__testing as threadBindingTesting,
|
|
createNoopThreadBindingManager,
|
|
createThreadBindingManager,
|
|
} from "./thread-bindings.js";
|
|
|
|
function createThreadBinding(
|
|
overrides?: Partial<
|
|
import("../../infra/outbound/session-binding-service.js").SessionBindingRecord
|
|
>,
|
|
) {
|
|
return {
|
|
bindingId: "default:thread-1",
|
|
targetSessionKey: "agent:main:subagent:child-1",
|
|
targetKind: "subagent",
|
|
conversation: {
|
|
channel: "discord",
|
|
accountId: "default",
|
|
conversationId: "thread-1",
|
|
parentConversationId: "parent-1",
|
|
},
|
|
status: "active",
|
|
boundAt: 1,
|
|
metadata: {
|
|
agentId: "main",
|
|
boundBy: "test",
|
|
webhookId: "wh-1",
|
|
webhookToken: "tok-1",
|
|
},
|
|
...overrides,
|
|
} satisfies import("../../infra/outbound/session-binding-service.js").SessionBindingRecord;
|
|
}
|
|
|
|
describe("resolvePreflightMentionRequirement", () => {
|
|
it("requires mention when config requires mention and thread is not bound", () => {
|
|
expect(
|
|
resolvePreflightMentionRequirement({
|
|
shouldRequireMention: true,
|
|
isBoundThreadSession: false,
|
|
}),
|
|
).toBe(true);
|
|
});
|
|
|
|
it("disables mention requirement for bound thread sessions", () => {
|
|
expect(
|
|
resolvePreflightMentionRequirement({
|
|
shouldRequireMention: true,
|
|
isBoundThreadSession: true,
|
|
}),
|
|
).toBe(false);
|
|
});
|
|
|
|
it("keeps mention requirement disabled when config already disables it", () => {
|
|
expect(
|
|
resolvePreflightMentionRequirement({
|
|
shouldRequireMention: false,
|
|
isBoundThreadSession: false,
|
|
}),
|
|
).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe("preflightDiscordMessage", () => {
|
|
beforeEach(() => {
|
|
sessionBindingTesting.resetSessionBindingAdaptersForTests();
|
|
});
|
|
|
|
it("bypasses mention gating in bound threads for allowed bot senders", async () => {
|
|
const threadBinding = createThreadBinding();
|
|
const threadId = "thread-bot-focus";
|
|
const parentId = "channel-parent-focus";
|
|
const client = {
|
|
fetchChannel: async (channelId: string) => {
|
|
if (channelId === threadId) {
|
|
return {
|
|
id: threadId,
|
|
type: ChannelType.PublicThread,
|
|
name: "focus",
|
|
parentId,
|
|
ownerId: "owner-1",
|
|
};
|
|
}
|
|
if (channelId === parentId) {
|
|
return {
|
|
id: parentId,
|
|
type: ChannelType.GuildText,
|
|
name: "general",
|
|
};
|
|
}
|
|
return null;
|
|
},
|
|
} as unknown as import("@buape/carbon").Client;
|
|
const message = {
|
|
id: "m-bot-1",
|
|
content: "relay message without mention",
|
|
timestamp: new Date().toISOString(),
|
|
channelId: threadId,
|
|
attachments: [],
|
|
mentionedUsers: [],
|
|
mentionedRoles: [],
|
|
mentionedEveryone: false,
|
|
author: {
|
|
id: "relay-bot-1",
|
|
bot: true,
|
|
username: "Relay",
|
|
},
|
|
} as unknown as import("@buape/carbon").Message;
|
|
|
|
registerSessionBindingAdapter({
|
|
channel: "discord",
|
|
accountId: "default",
|
|
listBySession: () => [],
|
|
resolveByConversation: (ref) => (ref.conversationId === threadId ? threadBinding : null),
|
|
});
|
|
|
|
const result = await preflightDiscordMessage({
|
|
cfg: {
|
|
session: {
|
|
mainKey: "main",
|
|
scope: "per-sender",
|
|
},
|
|
} as import("../../config/config.js").OpenClawConfig,
|
|
discordConfig: {
|
|
allowBots: true,
|
|
} as NonNullable<import("../../config/config.js").OpenClawConfig["channels"]>["discord"],
|
|
accountId: "default",
|
|
token: "token",
|
|
runtime: {} as import("../../runtime.js").RuntimeEnv,
|
|
botUserId: "openclaw-bot",
|
|
guildHistories: new Map(),
|
|
historyLimit: 0,
|
|
mediaMaxBytes: 1_000_000,
|
|
textLimit: 2_000,
|
|
replyToMode: "all",
|
|
dmEnabled: true,
|
|
groupDmEnabled: true,
|
|
ackReactionScope: "direct",
|
|
groupPolicy: "open",
|
|
threadBindings: createNoopThreadBindingManager("default"),
|
|
data: {
|
|
channel_id: threadId,
|
|
guild_id: "guild-1",
|
|
guild: {
|
|
id: "guild-1",
|
|
name: "Guild One",
|
|
},
|
|
author: message.author,
|
|
message,
|
|
} as unknown as import("./listeners.js").DiscordMessageEvent,
|
|
client,
|
|
});
|
|
|
|
expect(result).not.toBeNull();
|
|
expect(result?.boundSessionKey).toBe(threadBinding.targetSessionKey);
|
|
expect(result?.shouldRequireMention).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe("shouldIgnoreBoundThreadWebhookMessage", () => {
|
|
beforeEach(() => {
|
|
sessionBindingTesting.resetSessionBindingAdaptersForTests();
|
|
threadBindingTesting.resetThreadBindingsForTests();
|
|
});
|
|
|
|
it("returns true when inbound webhook id matches the bound thread webhook", () => {
|
|
expect(
|
|
shouldIgnoreBoundThreadWebhookMessage({
|
|
webhookId: "wh-1",
|
|
threadBinding: createThreadBinding(),
|
|
}),
|
|
).toBe(true);
|
|
});
|
|
|
|
it("returns false when webhook ids differ", () => {
|
|
expect(
|
|
shouldIgnoreBoundThreadWebhookMessage({
|
|
webhookId: "wh-other",
|
|
threadBinding: createThreadBinding(),
|
|
}),
|
|
).toBe(false);
|
|
});
|
|
|
|
it("returns false when there is no bound thread webhook", () => {
|
|
expect(
|
|
shouldIgnoreBoundThreadWebhookMessage({
|
|
webhookId: "wh-1",
|
|
threadBinding: createThreadBinding({
|
|
metadata: {
|
|
webhookId: undefined,
|
|
},
|
|
}),
|
|
}),
|
|
).toBe(false);
|
|
});
|
|
|
|
it("returns true for recently unbound thread webhook echoes", async () => {
|
|
const manager = createThreadBindingManager({
|
|
accountId: "default",
|
|
persist: false,
|
|
enableSweeper: false,
|
|
});
|
|
const binding = await manager.bindTarget({
|
|
threadId: "thread-1",
|
|
channelId: "parent-1",
|
|
targetKind: "subagent",
|
|
targetSessionKey: "agent:main:subagent:child-1",
|
|
agentId: "main",
|
|
webhookId: "wh-1",
|
|
webhookToken: "tok-1",
|
|
});
|
|
expect(binding).not.toBeNull();
|
|
|
|
manager.unbindThread({
|
|
threadId: "thread-1",
|
|
sendFarewell: false,
|
|
});
|
|
|
|
expect(
|
|
shouldIgnoreBoundThreadWebhookMessage({
|
|
accountId: "default",
|
|
threadId: "thread-1",
|
|
webhookId: "wh-1",
|
|
}),
|
|
).toBe(true);
|
|
});
|
|
});
|