mirror of
https://github.com/openclaw/openclaw.git
synced 2026-08-27 12:56:01 -06:00
82d1a03f25
* refactor(agents): require explicit roster defaults * feat(onboard): create named first roster agent * refactor(agents): remove runtime main fallbacks * style(agents): apply roster refactor formatting * refactor(agents): finish roster-only runtime sweep * fix(doctor): migrate legacy main session sqlite * fix(doctor): harden roster session migrations * fix(onboard): commit first agent atomically * fix(config): support empty-roster analysis * fix(agents): preserve legacy main state during creation * fix(setup): materialize baseline agent roster * fix(agents): harden legacy default transfer recovery * fix(agents): simplify roster-only legacy compatibility * fix(agents): preserve staged first-agent entries * fix(config): migrate persisted implicit-main rosters * fix(config): preserve staged empty rosters * fix(agents): finalize roster-only upgrade paths * fix(sessions): close legacy main migration outcomes * fix(config): migrate legacy roster markers at load * fix(sessions): preserve roster upgrade history * refactor(sessions): restore lean legacy main compatibility * fix(setup): prepare first-agent credentials before publish * fix(config): stabilize roster snapshot migration * refactor(sessions): shrink legacy main compatibility * fix(agents): restore roster compatibility fidelity * fix(sessions): preserve divergent legacy history * refactor(agents): narrow roster-only scope * fix(config): isolate roster migration * test(agents): align roster-only fixtures * fix(agents): keep main agent undeletable * fix(agents): harden roster migration invariants * fix(agents): close setup and audit scope gaps * fix(cron): scope session reaper throttles by agent * fix(agents): preserve scoped owner precedence * fix(config): preserve authored config ownership * fix(setup): keep default workspace and roster in sync * fix(setup): preserve default entry workspace on bare runs * fix(agents): adapt roster rebase to keyed entries * fix(agents): honor both roster representations * fix(agents): route roster reads through shared helpers * fix(config): preserve canonical roster writes * fix(cron): resolve dynamic default for session reaper * fix(agents): close dynamic default migration gaps * fix(agents): align scoped session ownership * fix(sessions): preserve legacy main directory casing * fix(agents): align cron and legacy auth ownership * fix(setup): provision the committed default workspace * fix(cron): align scoped ownership and reaping * fix(cron): treat blank agent ids as absent * fix(cron): retain configured session-store owners * fix(agents): repair roster-aware CI boundaries * fix(cron): preserve scoped ownership resolution * fix(agents): preserve rosterless maintenance paths * fix(agents): propagate roster ownership through runtime boundaries * fix(agents): preserve roster ownership across runtime paths * fix(agents): harden roster diagnostics and legacy routing * fix(agents): remove redundant diagnostic import * test(agents): type CLI policy fixture explicitly * fix(config): preserve canonical roster mutation identity * fix(doctor): read canonical agent rosters consistently * fix(config): resolve compound roster unsets safely * fix(config): finalize main-session reconciliation * fix(doctor): read canonical session state safely * fix(sessions): preserve current visibility alias * fix(config): track roster include provenance * test(config): type roster provenance cases * fix(config): refine roster include ownership * fix(agents): preserve staged roster invariants * test(config): align fixtures with explicit roster ownership * test(node-host): preserve optional plan typing * fix(config): preserve authored roster projections * test(config): keep raw roster fixtures explicit * test(config): normalize rosters at runtime fixtures * fix(config): protect authored roster ownership * fix(agents): require explicit session ownership * fix(agents): enforce scoped roster ownership * fix(sessions): merge fixed-store agent partitions * fix(agents): harden roster ownership boundaries * fix(config): reject ambiguous roster projections * fix(sessions): preserve persisted store ownership * fix(sessions): keep collision diagnostics additive * fix(security): scan malformed roster workspaces * test(config): align snapshot fixtures after rebase * test(agents): use explicit roster fixtures * fix(config): harden roster diagnostic boundaries * fix(sessions): isolate fixed-store agent databases * test(agents): type malformed default markers * refactor(sessions): extract store collision resolution * test(system-agent): split oversized setup coverage * style(system-agent): format split setup suite * fix(sessions): preserve promoted store ownership * fix(sessions): derive scoped owner before target * fix(sessions): preserve explicit sqlite ownership * fix(agents): restore roster compatibility across CI * fix(agents): enforce roster-owned runtime boundaries * fix(agents): satisfy default lookup lint * test(sessions): split known-owner coverage * fix(state): satisfy path identity lint * fix(agents): preserve malformed roster safety boundaries * fix(agents): restore roster compatibility at runtime boundaries * fix(config): satisfy roster boundary type checks * fix(agents): preserve roster ownership across runtime probes Setup inference probes now execute as the configured roster owner. Malformed agent-prefixed session rows are intentionally omitted by the fail-closed visibility contract rather than normalized by tests. * fix(agents): satisfy session list owner lint * fix(agents): preserve roster-owned runtime boundaries Restore shared logical rows for exact SQLite session locators while keeping their physical database owner separate. The ownership regression test now constructs an explicit sole-owner database directly instead of relying on first-touch capture, matching the intentional shared-store contract. * fix(sessions): preserve multiply owned exact stores * fix(sessions): restore runtime owner boundaries Keep incognito sentinels agent-owned, fold default-agent approvals into the global snapshot, and preserve the configless legacy-main CLI policy fallback. Also repair the existing CLI watchdog test lifecycle so the compact shard observes its timeout without an unawaited assertion or async timer stall; product behavior is unchanged by that test-only fix. * test(ci): align owner-scoped fixtures These assertions are unchanged. The fixtures now declare the intended non-default runner, expose the session-key constant imported by production status code, and select the main approvals bucket explicitly on Windows. * fix(agents): close final roster ownership gaps
169 lines
5.4 KiB
TypeScript
169 lines
5.4 KiB
TypeScript
/**
|
|
* Agent run workspace resolver.
|
|
*
|
|
* Selects per-run workspace directories and redacts run identifiers for logs/prompts.
|
|
*/
|
|
import type { OpenClawConfig } from "../config/types.openclaw.js";
|
|
import { logWarn } from "../logger.js";
|
|
import { redactIdentifier } from "../logging/redact-identifier.js";
|
|
import {
|
|
classifySessionKeyShape,
|
|
normalizeAgentId,
|
|
parseAgentSessionKey,
|
|
} from "../routing/session-key.js";
|
|
import { resolveUserPath } from "../utils.js";
|
|
import { hasAgentRosterProperty } from "./agent-scope-config.js";
|
|
import {
|
|
resolveAgentConfig,
|
|
resolveAgentWorkspaceDir,
|
|
resolveDefaultAgentId,
|
|
} from "./agent-scope.js";
|
|
import { sanitizeForPromptLiteral } from "./sanitize-for-prompt.js";
|
|
|
|
type WorkspaceFallbackReason = "missing" | "blank" | "invalid_type";
|
|
type AgentIdSource = "explicit" | "session_key" | "default";
|
|
|
|
export type ResolveRunWorkspaceResult = {
|
|
workspaceDir: string;
|
|
isCanonicalWorkspace: boolean;
|
|
usedFallback: boolean;
|
|
fallbackReason?: WorkspaceFallbackReason;
|
|
agentId: string;
|
|
agentIdSource: AgentIdSource;
|
|
};
|
|
|
|
const RUN_WORKSPACE_ROSTER_REQUIRED_ERROR_CODE = "RUN_WORKSPACE_ROSTER_REQUIRED";
|
|
|
|
class RunWorkspaceRosterRequiredError extends Error {
|
|
readonly code = RUN_WORKSPACE_ROSTER_REQUIRED_ERROR_CODE;
|
|
|
|
constructor() {
|
|
super("No agents configured; run workspace resolution requires an explicit roster.");
|
|
this.name = "RunWorkspaceRosterRequiredError";
|
|
}
|
|
}
|
|
|
|
class RunWorkspaceAgentNotConfiguredError extends Error {
|
|
readonly code = "RUN_WORKSPACE_AGENT_NOT_CONFIGURED";
|
|
readonly agentId: string;
|
|
|
|
constructor(agentId: string) {
|
|
super(`Agent ${agentId} is not present in the configured roster.`);
|
|
this.name = "RunWorkspaceAgentNotConfiguredError";
|
|
this.agentId = agentId;
|
|
}
|
|
}
|
|
|
|
function resolveRunAgentId(params: {
|
|
sessionKey?: string;
|
|
agentId?: string;
|
|
config: OpenClawConfig;
|
|
}): {
|
|
agentId: string;
|
|
agentIdSource: AgentIdSource;
|
|
} {
|
|
const rawSessionKey = params.sessionKey?.trim() ?? "";
|
|
const shape = classifySessionKeyShape(rawSessionKey);
|
|
if (shape === "malformed_agent") {
|
|
throw new Error("Malformed agent session key; refusing workspace resolution.");
|
|
}
|
|
|
|
const explicit =
|
|
typeof params.agentId === "string" && params.agentId.trim()
|
|
? normalizeAgentId(params.agentId)
|
|
: undefined;
|
|
if (explicit) {
|
|
return { agentId: explicit, agentIdSource: "explicit" };
|
|
}
|
|
|
|
if (shape === "missing" || shape === "legacy_or_alias") {
|
|
return {
|
|
agentId: resolveDefaultAgentId(params.config),
|
|
agentIdSource: "default",
|
|
};
|
|
}
|
|
|
|
const parsed = parseAgentSessionKey(rawSessionKey);
|
|
if (parsed?.agentId) {
|
|
return {
|
|
agentId: normalizeAgentId(parsed.agentId),
|
|
agentIdSource: "session_key",
|
|
};
|
|
}
|
|
|
|
// Defensive fallback, should be unreachable for non-malformed shapes.
|
|
throw new Error("Session key does not resolve to a configured agent.");
|
|
}
|
|
|
|
/** Redacts a run/session identifier for logs and prompts. */
|
|
export function redactRunIdentifier(value: string | undefined): string {
|
|
return redactIdentifier(value, { len: 12 });
|
|
}
|
|
|
|
/** Resolves the workspace directory used for an agent run. */
|
|
export function resolveRunWorkspaceDir(params: {
|
|
workspaceDir: unknown;
|
|
sessionKey?: string;
|
|
agentId?: string;
|
|
config?: OpenClawConfig;
|
|
env?: NodeJS.ProcessEnv;
|
|
}): ResolveRunWorkspaceResult {
|
|
const rawSessionKey = params.sessionKey?.trim() ?? "";
|
|
if (classifySessionKeyShape(rawSessionKey) === "malformed_agent") {
|
|
throw new Error("Malformed agent session key; refusing workspace resolution.");
|
|
}
|
|
// Workspace ownership is an isolation boundary. Raw/configless SDK inputs may
|
|
// retain implicit-main routing compatibility, but must not invent an owner here.
|
|
const config = params.config;
|
|
if (!config || !hasAgentRosterProperty(config)) {
|
|
throw new RunWorkspaceRosterRequiredError();
|
|
}
|
|
const env = params.env ?? process.env;
|
|
const requested = params.workspaceDir;
|
|
const { agentId, agentIdSource } = resolveRunAgentId({
|
|
sessionKey: params.sessionKey,
|
|
agentId: params.agentId,
|
|
config,
|
|
});
|
|
if (!resolveAgentConfig(config, agentId)) {
|
|
throw new RunWorkspaceAgentNotConfiguredError(agentId);
|
|
}
|
|
if (typeof requested === "string") {
|
|
const trimmed = requested.trim();
|
|
if (trimmed) {
|
|
const sanitized = sanitizeForPromptLiteral(trimmed);
|
|
if (sanitized !== trimmed) {
|
|
logWarn("Control/format characters stripped from workspaceDir (OC-19 hardening).");
|
|
}
|
|
const workspaceDir = resolveUserPath(sanitized, env);
|
|
const canonicalWorkspaceDir = resolveUserPath(
|
|
resolveAgentWorkspaceDir(config, agentId, env),
|
|
env,
|
|
);
|
|
return {
|
|
workspaceDir,
|
|
isCanonicalWorkspace: workspaceDir === canonicalWorkspaceDir,
|
|
usedFallback: false,
|
|
agentId,
|
|
agentIdSource,
|
|
};
|
|
}
|
|
}
|
|
|
|
const fallbackReason: WorkspaceFallbackReason =
|
|
requested == null ? "missing" : typeof requested === "string" ? "blank" : "invalid_type";
|
|
const fallbackWorkspace = resolveAgentWorkspaceDir(config, agentId, env);
|
|
const sanitizedFallback = sanitizeForPromptLiteral(fallbackWorkspace);
|
|
if (sanitizedFallback !== fallbackWorkspace) {
|
|
logWarn("Control/format characters stripped from fallback workspaceDir (OC-19 hardening).");
|
|
}
|
|
return {
|
|
workspaceDir: resolveUserPath(sanitizedFallback, env),
|
|
isCanonicalWorkspace: true,
|
|
usedFallback: true,
|
|
fallbackReason,
|
|
agentId,
|
|
agentIdSource,
|
|
};
|
|
}
|