Files
openclaw/src/agents/spawned-context.ts
Max aka Mosheh 55e79adf69 fix: resolve target agent workspace for cross-agent subagent spawns (#40176)
Merged via squash.

Prepared head SHA: 2378e40383
Co-authored-by: moshehbenavraham <17122072+moshehbenavraham@users.noreply.github.com>
Co-authored-by: mcaxtr <7562095+mcaxtr@users.noreply.github.com>
Reviewed-by: @mcaxtr
2026-03-13 12:09:51 -03:00

84 lines
2.7 KiB
TypeScript

import type { OpenClawConfig } from "../config/config.js";
import { normalizeAgentId, parseAgentSessionKey } from "../routing/session-key.js";
import { resolveAgentWorkspaceDir } from "./agent-scope.js";
export type SpawnedRunMetadata = {
spawnedBy?: string | null;
groupId?: string | null;
groupChannel?: string | null;
groupSpace?: string | null;
workspaceDir?: string | null;
};
export type SpawnedToolContext = {
agentGroupId?: string | null;
agentGroupChannel?: string | null;
agentGroupSpace?: string | null;
workspaceDir?: string;
};
export type NormalizedSpawnedRunMetadata = {
spawnedBy?: string;
groupId?: string;
groupChannel?: string;
groupSpace?: string;
workspaceDir?: string;
};
function normalizeOptionalText(value?: string | null): string | undefined {
if (typeof value !== "string") {
return undefined;
}
const trimmed = value.trim();
return trimmed || undefined;
}
export function normalizeSpawnedRunMetadata(
value?: SpawnedRunMetadata | null,
): NormalizedSpawnedRunMetadata {
return {
spawnedBy: normalizeOptionalText(value?.spawnedBy),
groupId: normalizeOptionalText(value?.groupId),
groupChannel: normalizeOptionalText(value?.groupChannel),
groupSpace: normalizeOptionalText(value?.groupSpace),
workspaceDir: normalizeOptionalText(value?.workspaceDir),
};
}
export function mapToolContextToSpawnedRunMetadata(
value?: SpawnedToolContext | null,
): Pick<NormalizedSpawnedRunMetadata, "groupId" | "groupChannel" | "groupSpace" | "workspaceDir"> {
return {
groupId: normalizeOptionalText(value?.agentGroupId),
groupChannel: normalizeOptionalText(value?.agentGroupChannel),
groupSpace: normalizeOptionalText(value?.agentGroupSpace),
workspaceDir: normalizeOptionalText(value?.workspaceDir),
};
}
export function resolveSpawnedWorkspaceInheritance(params: {
config: OpenClawConfig;
targetAgentId?: string;
requesterSessionKey?: string;
explicitWorkspaceDir?: string | null;
}): string | undefined {
const explicit = normalizeOptionalText(params.explicitWorkspaceDir);
if (explicit) {
return explicit;
}
// For cross-agent spawns, use the target agent's workspace instead of the requester's.
const agentId =
params.targetAgentId ??
(params.requesterSessionKey
? parseAgentSessionKey(params.requesterSessionKey)?.agentId
: undefined);
return agentId ? resolveAgentWorkspaceDir(params.config, normalizeAgentId(agentId)) : undefined;
}
export function resolveIngressWorkspaceOverrideForSpawnedRun(
metadata?: Pick<SpawnedRunMetadata, "spawnedBy" | "workspaceDir"> | null,
): string | undefined {
const normalized = normalizeSpawnedRunMetadata(metadata);
return normalized.spawnedBy ? normalized.workspaceDir : undefined;
}