* docs: thread-bound subagents plan * docs: add exact thread-bound subagent implementation touchpoints * Docs: prioritize auto thread-bound subagent flow * Docs: add ACP harness thread-binding extensions * Discord: add thread-bound session routing and auto-bind spawn flow * Subagents: add focus commands and ACP/session binding lifecycle hooks * Tests: cover thread bindings, focus commands, and ACP unbind hooks * Docs: add plugin-hook appendix for thread-bound subagents * Plugins: add subagent lifecycle hook events * Core: emit subagent lifecycle hooks and decouple Discord bindings * Discord: handle subagent bind lifecycle via plugin hooks * Subagents: unify completion finalizer and split registry modules * Add subagent lifecycle events module * Hooks: fix subagent ended context key * Discord: share thread bindings across ESM and Jiti * Subagents: add persistent sessions_spawn mode for thread-bound sessions * Subagents: clarify thread intro and persistent completion copy * test(subagents): stabilize sessions_spawn lifecycle cleanup assertions * Discord: add thread-bound session TTL with auto-unfocus * Subagents: fail session spawns when thread bind fails * Subagents: cover thread session failure cleanup paths * Session: add thread binding TTL config and /session ttl controls * Tests: align discord reaction expectations * Agent: persist sessionFile for keyed subagent sessions * Discord: normalize imports after conflict resolution * Sessions: centralize sessionFile resolve/persist helper * Discord: harden thread-bound subagent session routing * Rebase: resolve upstream/main conflicts * Subagents: move thread binding into hooks and split bindings modules * Docs: add channel-agnostic subagent routing hook plan * Agents: decouple subagent routing from Discord * Discord: refactor thread-bound subagent flows * Subagents: prevent duplicate end hooks and orphaned failed sessions * Refactor: split subagent command and provider phases * Subagents: honor hook delivery target overrides * Discord: add thread binding kill switches and refresh plan doc * Discord: fix thread bind channel resolution * Routing: centralize account id normalization * Discord: clean up thread bindings on startup failures * Discord: add startup cleanup regression tests * Docs: add long-term thread-bound subagent architecture * Docs: split session binding plan and dedupe thread-bound doc * Subagents: add channel-agnostic session binding routing * Subagents: stabilize announce completion routing tests * Subagents: cover multi-bound completion routing * Subagents: suppress lifecycle hooks on failed thread bind * tests: fix discord provider mock typing regressions * docs/protocol: sync slash command aliases and delete param models * fix: add changelog entry for Discord thread-bound subagents (#21805) (thanks @onutc) --------- Co-authored-by: Shadow <hi@shadowing.dev>
132 lines
4.0 KiB
TypeScript
132 lines
4.0 KiB
TypeScript
import os from "node:os";
|
|
import path from "node:path";
|
|
import { resolveStateDir } from "../config/paths.js";
|
|
import { loadJsonFile, saveJsonFile } from "../infra/json-file.js";
|
|
import { normalizeDeliveryContext } from "../utils/delivery-context.js";
|
|
import type { SubagentRunRecord } from "./subagent-registry.types.js";
|
|
|
|
export type PersistedSubagentRegistryVersion = 1 | 2;
|
|
|
|
type PersistedSubagentRegistryV1 = {
|
|
version: 1;
|
|
runs: Record<string, LegacySubagentRunRecord>;
|
|
};
|
|
|
|
type PersistedSubagentRegistryV2 = {
|
|
version: 2;
|
|
runs: Record<string, PersistedSubagentRunRecord>;
|
|
};
|
|
|
|
type PersistedSubagentRegistry = PersistedSubagentRegistryV1 | PersistedSubagentRegistryV2;
|
|
|
|
const REGISTRY_VERSION = 2 as const;
|
|
|
|
type PersistedSubagentRunRecord = SubagentRunRecord;
|
|
|
|
type LegacySubagentRunRecord = PersistedSubagentRunRecord & {
|
|
announceCompletedAt?: unknown;
|
|
announceHandled?: unknown;
|
|
requesterChannel?: unknown;
|
|
requesterAccountId?: unknown;
|
|
};
|
|
|
|
function resolveSubagentStateDir(env: NodeJS.ProcessEnv = process.env): string {
|
|
const explicit = env.OPENCLAW_STATE_DIR?.trim();
|
|
if (explicit) {
|
|
return resolveStateDir(env);
|
|
}
|
|
if (env.VITEST || env.NODE_ENV === "test") {
|
|
return path.join(os.tmpdir(), "openclaw-test-state", String(process.pid));
|
|
}
|
|
return resolveStateDir(env);
|
|
}
|
|
|
|
export function resolveSubagentRegistryPath(): string {
|
|
return path.join(resolveSubagentStateDir(process.env), "subagents", "runs.json");
|
|
}
|
|
|
|
export function loadSubagentRegistryFromDisk(): Map<string, SubagentRunRecord> {
|
|
const pathname = resolveSubagentRegistryPath();
|
|
const raw = loadJsonFile(pathname);
|
|
if (!raw || typeof raw !== "object") {
|
|
return new Map();
|
|
}
|
|
const record = raw as Partial<PersistedSubagentRegistry>;
|
|
if (record.version !== 1 && record.version !== 2) {
|
|
return new Map();
|
|
}
|
|
const runsRaw = record.runs;
|
|
if (!runsRaw || typeof runsRaw !== "object") {
|
|
return new Map();
|
|
}
|
|
const out = new Map<string, SubagentRunRecord>();
|
|
const isLegacy = record.version === 1;
|
|
let migrated = false;
|
|
for (const [runId, entry] of Object.entries(runsRaw)) {
|
|
if (!entry || typeof entry !== "object") {
|
|
continue;
|
|
}
|
|
const typed = entry as LegacySubagentRunRecord;
|
|
if (!typed.runId || typeof typed.runId !== "string") {
|
|
continue;
|
|
}
|
|
const legacyCompletedAt =
|
|
isLegacy && typeof typed.announceCompletedAt === "number"
|
|
? typed.announceCompletedAt
|
|
: undefined;
|
|
const cleanupCompletedAt =
|
|
typeof typed.cleanupCompletedAt === "number" ? typed.cleanupCompletedAt : legacyCompletedAt;
|
|
const cleanupHandled =
|
|
typeof typed.cleanupHandled === "boolean"
|
|
? typed.cleanupHandled
|
|
: isLegacy
|
|
? Boolean(typed.announceHandled ?? cleanupCompletedAt)
|
|
: undefined;
|
|
const requesterOrigin = normalizeDeliveryContext(
|
|
typed.requesterOrigin ?? {
|
|
channel: typeof typed.requesterChannel === "string" ? typed.requesterChannel : undefined,
|
|
accountId:
|
|
typeof typed.requesterAccountId === "string" ? typed.requesterAccountId : undefined,
|
|
},
|
|
);
|
|
const {
|
|
announceCompletedAt: _announceCompletedAt,
|
|
announceHandled: _announceHandled,
|
|
requesterChannel: _channel,
|
|
requesterAccountId: _accountId,
|
|
...rest
|
|
} = typed;
|
|
out.set(runId, {
|
|
...rest,
|
|
requesterOrigin,
|
|
cleanupCompletedAt,
|
|
cleanupHandled,
|
|
spawnMode: typed.spawnMode === "session" ? "session" : "run",
|
|
});
|
|
if (isLegacy) {
|
|
migrated = true;
|
|
}
|
|
}
|
|
if (migrated) {
|
|
try {
|
|
saveSubagentRegistryToDisk(out);
|
|
} catch {
|
|
// ignore migration write failures
|
|
}
|
|
}
|
|
return out;
|
|
}
|
|
|
|
export function saveSubagentRegistryToDisk(runs: Map<string, SubagentRunRecord>) {
|
|
const pathname = resolveSubagentRegistryPath();
|
|
const serialized: Record<string, PersistedSubagentRunRecord> = {};
|
|
for (const [runId, entry] of runs.entries()) {
|
|
serialized[runId] = entry;
|
|
}
|
|
const out: PersistedSubagentRegistry = {
|
|
version: REGISTRY_VERSION,
|
|
runs: serialized,
|
|
};
|
|
saveJsonFile(pathname, out);
|
|
}
|