* 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)
252 lines
8.8 KiB
TypeScript
252 lines
8.8 KiB
TypeScript
import { getChannelDock } from "../../channels/dock.js";
|
|
import { normalizeChannelId } from "../../channels/plugins/index.js";
|
|
import type { OpenClawConfig } from "../../config/config.js";
|
|
import type { BlockStreamingCoalesceConfig } from "../../config/types.js";
|
|
import { resolveAccountEntry } from "../../routing/account-lookup.js";
|
|
import { normalizeAccountId } from "../../routing/session-key.js";
|
|
import {
|
|
INTERNAL_MESSAGE_CHANNEL,
|
|
listDeliverableMessageChannels,
|
|
} from "../../utils/message-channel.js";
|
|
import { resolveChunkMode, resolveTextChunkLimit, type TextChunkProvider } from "../chunk.js";
|
|
|
|
const DEFAULT_BLOCK_STREAM_MIN = 800;
|
|
const DEFAULT_BLOCK_STREAM_MAX = 1200;
|
|
const DEFAULT_BLOCK_STREAM_COALESCE_IDLE_MS = 1000;
|
|
const getBlockChunkProviders = () =>
|
|
new Set<TextChunkProvider>([...listDeliverableMessageChannels(), INTERNAL_MESSAGE_CHANNEL]);
|
|
|
|
function normalizeChunkProvider(provider?: string): TextChunkProvider | undefined {
|
|
if (!provider) {
|
|
return undefined;
|
|
}
|
|
const cleaned = provider.trim().toLowerCase();
|
|
return getBlockChunkProviders().has(cleaned as TextChunkProvider)
|
|
? (cleaned as TextChunkProvider)
|
|
: undefined;
|
|
}
|
|
|
|
type ProviderBlockStreamingConfig = {
|
|
blockStreamingCoalesce?: BlockStreamingCoalesceConfig;
|
|
accounts?: Record<string, { blockStreamingCoalesce?: BlockStreamingCoalesceConfig }>;
|
|
};
|
|
|
|
function resolveProviderBlockStreamingCoalesce(params: {
|
|
cfg: OpenClawConfig | undefined;
|
|
providerKey?: TextChunkProvider;
|
|
accountId?: string | null;
|
|
}): BlockStreamingCoalesceConfig | undefined {
|
|
const { cfg, providerKey, accountId } = params;
|
|
if (!cfg || !providerKey) {
|
|
return undefined;
|
|
}
|
|
const providerCfg = (cfg as Record<string, unknown>)[providerKey];
|
|
if (!providerCfg || typeof providerCfg !== "object") {
|
|
return undefined;
|
|
}
|
|
const normalizedAccountId = normalizeAccountId(accountId);
|
|
const typed = providerCfg as ProviderBlockStreamingConfig;
|
|
const accountCfg = resolveAccountEntry(typed.accounts, normalizedAccountId);
|
|
return accountCfg?.blockStreamingCoalesce ?? typed.blockStreamingCoalesce;
|
|
}
|
|
|
|
export type BlockStreamingCoalescing = {
|
|
minChars: number;
|
|
maxChars: number;
|
|
idleMs: number;
|
|
joiner: string;
|
|
/** When true, the coalescer flushes the buffer on each enqueue (paragraph-boundary flush). */
|
|
flushOnEnqueue?: boolean;
|
|
};
|
|
|
|
export type BlockStreamingChunking = {
|
|
minChars: number;
|
|
maxChars: number;
|
|
breakPreference: "paragraph" | "newline" | "sentence";
|
|
flushOnParagraph?: boolean;
|
|
};
|
|
|
|
function clampPositiveInteger(
|
|
value: number | undefined,
|
|
fallback: number,
|
|
bounds: { min: number; max: number },
|
|
): number {
|
|
if (typeof value !== "number" || !Number.isFinite(value)) {
|
|
return fallback;
|
|
}
|
|
const rounded = Math.round(value);
|
|
if (rounded < bounds.min) {
|
|
return bounds.min;
|
|
}
|
|
if (rounded > bounds.max) {
|
|
return bounds.max;
|
|
}
|
|
return rounded;
|
|
}
|
|
|
|
export function resolveEffectiveBlockStreamingConfig(params: {
|
|
cfg: OpenClawConfig | undefined;
|
|
provider?: string;
|
|
accountId?: string | null;
|
|
chunking?: BlockStreamingChunking;
|
|
/** Optional upper bound for chunking/coalescing max chars. */
|
|
maxChunkChars?: number;
|
|
/** Optional coalescer idle flush override in milliseconds. */
|
|
coalesceIdleMs?: number;
|
|
}): {
|
|
chunking: BlockStreamingChunking;
|
|
coalescing: BlockStreamingCoalescing;
|
|
} {
|
|
const providerKey = normalizeChunkProvider(params.provider);
|
|
const providerId = providerKey ? normalizeChannelId(providerKey) : null;
|
|
const providerChunkLimit = providerId
|
|
? getChannelDock(providerId)?.outbound?.textChunkLimit
|
|
: undefined;
|
|
const textLimit = resolveTextChunkLimit(params.cfg, providerKey, params.accountId, {
|
|
fallbackLimit: providerChunkLimit,
|
|
});
|
|
const chunkingDefaults =
|
|
params.chunking ?? resolveBlockStreamingChunking(params.cfg, params.provider, params.accountId);
|
|
const chunkingMax = clampPositiveInteger(params.maxChunkChars, chunkingDefaults.maxChars, {
|
|
min: 1,
|
|
max: Math.max(1, textLimit),
|
|
});
|
|
const chunking: BlockStreamingChunking = {
|
|
...chunkingDefaults,
|
|
minChars: Math.min(chunkingDefaults.minChars, chunkingMax),
|
|
maxChars: chunkingMax,
|
|
};
|
|
const coalescingDefaults = resolveBlockStreamingCoalescing(
|
|
params.cfg,
|
|
params.provider,
|
|
params.accountId,
|
|
chunking,
|
|
);
|
|
const coalescingMax = Math.max(
|
|
1,
|
|
Math.min(coalescingDefaults?.maxChars ?? chunking.maxChars, chunking.maxChars),
|
|
);
|
|
const coalescingMin = Math.min(coalescingDefaults?.minChars ?? chunking.minChars, coalescingMax);
|
|
const coalescingIdleMs = clampPositiveInteger(
|
|
params.coalesceIdleMs,
|
|
coalescingDefaults?.idleMs ?? DEFAULT_BLOCK_STREAM_COALESCE_IDLE_MS,
|
|
{ min: 0, max: 5_000 },
|
|
);
|
|
const coalescing: BlockStreamingCoalescing = {
|
|
minChars: coalescingMin,
|
|
maxChars: coalescingMax,
|
|
idleMs: coalescingIdleMs,
|
|
joiner:
|
|
coalescingDefaults?.joiner ??
|
|
(chunking.breakPreference === "sentence"
|
|
? " "
|
|
: chunking.breakPreference === "newline"
|
|
? "\n"
|
|
: "\n\n"),
|
|
flushOnEnqueue: coalescingDefaults?.flushOnEnqueue ?? chunking.flushOnParagraph === true,
|
|
};
|
|
|
|
return { chunking, coalescing };
|
|
}
|
|
|
|
export function resolveBlockStreamingChunking(
|
|
cfg: OpenClawConfig | undefined,
|
|
provider?: string,
|
|
accountId?: string | null,
|
|
): BlockStreamingChunking {
|
|
const providerKey = normalizeChunkProvider(provider);
|
|
const providerConfigKey = providerKey;
|
|
const providerId = providerKey ? normalizeChannelId(providerKey) : null;
|
|
const providerChunkLimit = providerId
|
|
? getChannelDock(providerId)?.outbound?.textChunkLimit
|
|
: undefined;
|
|
const textLimit = resolveTextChunkLimit(cfg, providerConfigKey, accountId, {
|
|
fallbackLimit: providerChunkLimit,
|
|
});
|
|
const chunkCfg = cfg?.agents?.defaults?.blockStreamingChunk;
|
|
|
|
// When chunkMode="newline", the outbound delivery splits on paragraph boundaries.
|
|
// The block chunker should flush eagerly on \n\n boundaries during streaming,
|
|
// regardless of minChars, so each paragraph is sent as its own message.
|
|
const chunkMode = resolveChunkMode(cfg, providerConfigKey, accountId);
|
|
|
|
const maxRequested = Math.max(1, Math.floor(chunkCfg?.maxChars ?? DEFAULT_BLOCK_STREAM_MAX));
|
|
const maxChars = Math.max(1, Math.min(maxRequested, textLimit));
|
|
const minFallback = DEFAULT_BLOCK_STREAM_MIN;
|
|
const minRequested = Math.max(1, Math.floor(chunkCfg?.minChars ?? minFallback));
|
|
const minChars = Math.min(minRequested, maxChars);
|
|
const breakPreference =
|
|
chunkCfg?.breakPreference === "newline" || chunkCfg?.breakPreference === "sentence"
|
|
? chunkCfg.breakPreference
|
|
: "paragraph";
|
|
return {
|
|
minChars,
|
|
maxChars,
|
|
breakPreference,
|
|
flushOnParagraph: chunkMode === "newline",
|
|
};
|
|
}
|
|
|
|
export function resolveBlockStreamingCoalescing(
|
|
cfg: OpenClawConfig | undefined,
|
|
provider?: string,
|
|
accountId?: string | null,
|
|
chunking?: {
|
|
minChars: number;
|
|
maxChars: number;
|
|
breakPreference: "paragraph" | "newline" | "sentence";
|
|
},
|
|
opts?: { chunkMode?: "length" | "newline" },
|
|
): BlockStreamingCoalescing | undefined {
|
|
const providerKey = normalizeChunkProvider(provider);
|
|
const providerConfigKey = providerKey;
|
|
|
|
// Resolve the outbound chunkMode so the coalescer can flush on paragraph boundaries
|
|
// when chunkMode="newline", matching the delivery-time splitting behavior.
|
|
const chunkMode = opts?.chunkMode ?? resolveChunkMode(cfg, providerConfigKey, accountId);
|
|
|
|
const providerId = providerKey ? normalizeChannelId(providerKey) : null;
|
|
const providerChunkLimit = providerId
|
|
? getChannelDock(providerId)?.outbound?.textChunkLimit
|
|
: undefined;
|
|
const textLimit = resolveTextChunkLimit(cfg, providerConfigKey, accountId, {
|
|
fallbackLimit: providerChunkLimit,
|
|
});
|
|
const providerDefaults = providerId
|
|
? getChannelDock(providerId)?.streaming?.blockStreamingCoalesceDefaults
|
|
: undefined;
|
|
const providerCfg = resolveProviderBlockStreamingCoalesce({
|
|
cfg,
|
|
providerKey,
|
|
accountId,
|
|
});
|
|
const coalesceCfg = providerCfg ?? cfg?.agents?.defaults?.blockStreamingCoalesce;
|
|
const minRequested = Math.max(
|
|
1,
|
|
Math.floor(
|
|
coalesceCfg?.minChars ??
|
|
providerDefaults?.minChars ??
|
|
chunking?.minChars ??
|
|
DEFAULT_BLOCK_STREAM_MIN,
|
|
),
|
|
);
|
|
const maxRequested = Math.max(1, Math.floor(coalesceCfg?.maxChars ?? textLimit));
|
|
const maxChars = Math.max(1, Math.min(maxRequested, textLimit));
|
|
const minChars = Math.min(minRequested, maxChars);
|
|
const idleMs = Math.max(
|
|
0,
|
|
Math.floor(
|
|
coalesceCfg?.idleMs ?? providerDefaults?.idleMs ?? DEFAULT_BLOCK_STREAM_COALESCE_IDLE_MS,
|
|
),
|
|
);
|
|
const preference = chunking?.breakPreference ?? "paragraph";
|
|
const joiner = preference === "sentence" ? " " : preference === "newline" ? "\n" : "\n\n";
|
|
return {
|
|
minChars,
|
|
maxChars,
|
|
idleMs,
|
|
joiner,
|
|
flushOnEnqueue: chunkMode === "newline",
|
|
};
|
|
}
|