vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 06:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: share subagent registry query helpers

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-18 22:33:52 +01:00
parent 7481478303
commit 3b2db583cd
5 changed files with 77 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/agents/subagent-registry-announce-read.ts
View File

@@ -3,7 +3,7 @@ import { subagentRuns } from "./subagent-registry-memory.js";
import {
countPendingDescendantRunsExcludingRunFromRuns,
countPendingDescendantRunsFromRuns,
findRunIdsByChildSessionKeyFromRuns,
isSubagentSessionRunActiveFromRuns,
listRunsForRequesterFromRuns,
resolveRequesterForChildSessionFromRuns,
shouldIgnorePostCompletionAnnounceForSessionFromRuns,
@@ -29,18 +29,7 @@ export function resolveRequesterForChildSession(childSessionKey: string): {
}
export function isSubagentSessionRunActive(childSessionKey: string): boolean {
const runIds = findRunIdsByChildSessionKeyFromRuns(subagentRuns, childSessionKey);
let latest: SubagentRunRecord | undefined;
for (const runId of runIds) {
const entry = subagentRuns.get(runId);
if (!entry) {
continue;
}
if (!latest || entry.createdAt > latest.createdAt) {
latest = entry;
}
}
return Boolean(latest && typeof latest.endedAt !== "number");
return isSubagentSessionRunActiveFromRuns(subagentRuns, childSessionKey);
}
export function shouldIgnorePostCompletionAnnounceForSession(childSessionKey: string): boolean {

37
src/agents/subagent-registry-queries.ts
View File

@@ -86,6 +86,43 @@ function findLatestRunForChildSession(
return latest;
}
export function isSubagentSessionRunActiveFromRuns(
runs: Map<string, SubagentRunRecord>,
childSessionKey: string,
): boolean {
const latest = findLatestRunForChildSession(runs, childSessionKey);
return Boolean(latest && typeof latest.endedAt !== "number");
}
export function getSubagentRunByChildSessionKeyFromRuns(
runs: Map<string, SubagentRunRecord>,
childSessionKey: string,
): SubagentRunRecord | null {
const key = childSessionKey.trim();
if (!key) {
return null;
}
let latestActive: SubagentRunRecord | null = null;
let latestEnded: SubagentRunRecord | null = null;
for (const entry of runs.values()) {
if (entry.childSessionKey !== key) {
continue;
}
if (typeof entry.endedAt !== "number") {
if (!latestActive || entry.createdAt > latestActive.createdAt) {
latestActive = entry;
}
continue;
}
if (!latestEnded || entry.createdAt > latestEnded.createdAt) {
latestEnded = entry;
}
}
return latestActive ?? latestEnded;
}
export function resolveRequesterForChildSessionFromRuns(
runs: Map<string, SubagentRunRecord>,
childSessionKey: string,

28
src/agents/subagent-registry-read.ts
View File

@@ -1,6 +1,7 @@
import { subagentRuns } from "./subagent-registry-memory.js";
import {
countActiveDescendantRunsFromRuns,
getSubagentRunByChildSessionKeyFromRuns,
listDescendantRunsForRequesterFromRuns,
listRunsForControllerFromRuns,
} from "./subagent-registry-queries.js";
@@ -40,29 +41,10 @@ export function listDescendantRunsForRequester(rootSessionKey: string): Subagent
}
export function getSubagentRunByChildSessionKey(childSessionKey: string): SubagentRunRecord | null {
const key = childSessionKey.trim();
if (!key) {
return null;
}
let latestActive: SubagentRunRecord | null = null;
let latestEnded: SubagentRunRecord | null = null;
for (const entry of getSubagentRunsSnapshotForRead(subagentRuns).values()) {
if (entry.childSessionKey !== key) {
continue;
}
if (typeof entry.endedAt !== "number") {
if (!latestActive || entry.createdAt > latestActive.createdAt) {
latestActive = entry;
}
continue;
}
if (!latestEnded || entry.createdAt > latestEnded.createdAt) {
latestEnded = entry;
}
}
return latestActive ?? latestEnded;
return getSubagentRunByChildSessionKeyFromRuns(
getSubagentRunsSnapshotForRead(subagentRuns),
childSessionKey,
);
}
export function getSessionDisplaySubagentRunByChildSessionKey(

40
src/agents/subagent-registry-run-manager.ts
View File

@@ -31,6 +31,26 @@ function shouldDeleteAttachments(entry: SubagentRunRecord) {
return entry.cleanup === "delete" || !entry.retainAttachmentsOnKeep;
}
export type RegisterSubagentRunParams = {
runId: string;
childSessionKey: string;
controllerSessionKey?: string;
requesterSessionKey: string;
requesterOrigin?: DeliveryContext;
requesterDisplayKey: string;
task: string;
cleanup: "delete" | "keep";
label?: string;
model?: string;
workspaceDir?: string;
runTimeoutSeconds?: number;
expectsCompletionMessage?: boolean;
spawnMode?: "run" | "session";
attachmentsDir?: string;
attachmentsRootDir?: string;
retainAttachmentsOnKeep?: boolean;
};
export function createSubagentRunManager(params: {
runs: Map<string, SubagentRunRecord>;
resumedRuns: Set<string>;
@@ -261,25 +281,7 @@ export function createSubagentRunManager(params: {
return true;
};
const registerSubagentRun = (registerParams: {
runId: string;
childSessionKey: string;
controllerSessionKey?: string;
requesterSessionKey: string;
requesterOrigin?: DeliveryContext;
requesterDisplayKey: string;
task: string;
cleanup: "delete" | "keep";
label?: string;
model?: string;
workspaceDir?: string;
runTimeoutSeconds?: number;
expectsCompletionMessage?: boolean;
spawnMode?: "run" | "session";
attachmentsDir?: string;
attachmentsRootDir?: string;
retainAttachmentsOnKeep?: boolean;
}) => {
const registerSubagentRun = (registerParams: RegisterSubagentRunParams) => {
const runId = registerParams.runId.trim();
const childSessionKey = registerParams.childSessionKey.trim();
const requesterSessionKey = registerParams.requesterSessionKey.trim();

72
src/agents/subagent-registry.ts
View File

@@ -38,14 +38,18 @@ import {
countActiveRunsForSessionFromRuns,
countPendingDescendantRunsExcludingRunFromRuns,
countPendingDescendantRunsFromRuns,
findRunIdsByChildSessionKeyFromRuns,
getSubagentRunByChildSessionKeyFromRuns,
isSubagentSessionRunActiveFromRuns,
listRunsForControllerFromRuns,
listDescendantRunsForRequesterFromRuns,
listRunsForRequesterFromRuns,
resolveRequesterForChildSessionFromRuns,
shouldIgnorePostCompletionAnnounceForSessionFromRuns,
} from "./subagent-registry-queries.js";
import { createSubagentRunManager } from "./subagent-registry-run-manager.js";
import {
createSubagentRunManager,
type RegisterSubagentRunParams,
} from "./subagent-registry-run-manager.js";
import {
getSubagentRunsSnapshotForRead,
persistSubagentRunsToDisk,
@@ -723,25 +727,7 @@ export function replaceSubagentRunAfterSteer(params: {
return subagentRunManager.replaceSubagentRunAfterSteer(params);
}
export function registerSubagentRun(params: {
runId: string;
childSessionKey: string;
controllerSessionKey?: string;
requesterSessionKey: string;
requesterOrigin?: DeliveryContext;
requesterDisplayKey: string;
task: string;
cleanup: "delete" | "keep";
label?: string;
model?: string;
workspaceDir?: string;
runTimeoutSeconds?: number;
expectsCompletionMessage?: boolean;
spawnMode?: "run" | "session";
attachmentsDir?: string;
attachmentsRootDir?: string;
retainAttachmentsOnKeep?: boolean;
}) {
export function registerSubagentRun(params: RegisterSubagentRunParams) {
subagentRunManager.registerSubagentRun(params);
}
@@ -791,10 +777,6 @@ export function releaseSubagentRun(runId: string) {
subagentRunManager.releaseSubagentRun(runId);
}
function findRunIdsByChildSessionKey(childSessionKey: string): string[] {
return findRunIdsByChildSessionKeyFromRuns(subagentRuns, childSessionKey);
}
export function resolveRequesterForChildSession(childSessionKey: string): {
requesterSessionKey: string;
requesterOrigin?: DeliveryContext;
@@ -813,18 +795,7 @@ export function resolveRequesterForChildSession(childSessionKey: string): {
}
export function isSubagentSessionRunActive(childSessionKey: string): boolean {
const runIds = findRunIdsByChildSessionKey(childSessionKey);
let latest: SubagentRunRecord | undefined;
for (const runId of runIds) {
const entry = subagentRuns.get(runId);
if (!entry) {
continue;
}
if (!latest || entry.createdAt > latest.createdAt) {
latest = entry;
}
}
return Boolean(latest && typeof latest.endedAt !== "number");
return isSubagentSessionRunActiveFromRuns(subagentRuns, childSessionKey);
}
export function shouldIgnorePostCompletionAnnounceForSession(childSessionKey: string): boolean {
@@ -896,29 +867,10 @@ export function listDescendantRunsForRequester(rootSessionKey: string): Subagent
}
export function getSubagentRunByChildSessionKey(childSessionKey: string): SubagentRunRecord | null {
const key = childSessionKey.trim();
if (!key) {
return null;
}
let latestActive: SubagentRunRecord | null = null;
let latestEnded: SubagentRunRecord | null = null;
for (const entry of subagentRegistryDeps.getSubagentRunsSnapshotForRead(subagentRuns).values()) {
if (entry.childSessionKey !== key) {
continue;
}
if (typeof entry.endedAt !== "number") {
if (!latestActive || entry.createdAt > latestActive.createdAt) {
latestActive = entry;
}
continue;
}
if (!latestEnded || entry.createdAt > latestEnded.createdAt) {
latestEnded = entry;
}
}
return latestActive ?? latestEnded;
return getSubagentRunByChildSessionKeyFromRuns(
subagentRegistryDeps.getSubagentRunsSnapshotForRead(subagentRuns),
childSessionKey,
);
}
export function getLatestSubagentRunByChildSessionKey(