Files
openclaw/src/gateway/server-methods/cron.ts
zhanggttry f9b2fcc33a feat(cron): add agentId filtering to cron list
Adds optional agentId parameter to cron list action, allowing agents
to filter cron jobs by their own agentId. This reduces noise in
multi-agent setups where each agent sees all jobs across all agents.

Changes:
- Protocol schema: add optional agentId to CronListParamsSchema
- Service types: add agentId to CronListPageOptions
- Service ops: filter by agentId when provided
- Gateway handler: pass through agentId param
- Agent tool: auto-fill agentId from session context (like cron add)
- CLI: add --agent <id> option to 'openclaw cron list'

When called from an agent session without explicit agentId, the tool
auto-fills it from the calling agent's session context. When called
from CLI without --agent, all jobs are shown (backward compatible).

Closes #77118
2026-05-05 05:58:49 +00:00

556 lines
16 KiB
TypeScript

import type { OpenClawConfig } from "../../config/types.openclaw.js";
import { resolveCronDeliveryPreviews } from "../../cron/delivery-preview.js";
import { normalizeCronJobCreate, normalizeCronJobPatch } from "../../cron/normalize.js";
import {
readCronRunLogEntriesPage,
readCronRunLogEntriesPageAll,
resolveCronRunLogPath,
} from "../../cron/run-log.js";
import { applyJobPatch } from "../../cron/service/jobs.js";
import { isInvalidCronSessionTargetIdError } from "../../cron/session-target.js";
import type { CronDelivery, CronJob, CronJobCreate, CronJobPatch } from "../../cron/types.js";
import { validateScheduleTimestamp } from "../../cron/validate-timestamp.js";
import { formatErrorMessage } from "../../infra/errors.js";
import {
resolveTargetPrefixedChannel,
validateTargetProviderPrefix,
} from "../../infra/outbound/channel-target-prefix.js";
import { listConfiguredAnnounceChannelIdsForConfig } from "../../plugins/channel-plugin-ids.js";
import { normalizeMessageChannel } from "../../utils/message-channel.js";
import {
ErrorCodes,
errorShape,
formatValidationErrors,
validateCronAddParams,
validateCronListParams,
validateCronRemoveParams,
validateCronRunParams,
validateCronRunsParams,
validateCronStatusParams,
validateCronUpdateParams,
validateWakeParams,
} from "../protocol/index.js";
import type { GatewayRequestHandlers } from "./types.js";
function listConfiguredAnnounceChannelIds(cfg: OpenClawConfig): string[] {
return listConfiguredAnnounceChannelIdsForConfig({
config: cfg,
env: process.env,
});
}
function assertConfiguredAnnounceChannel(params: {
cfg: OpenClawConfig;
channel?: string;
field: "delivery.channel" | "delivery.failureDestination.channel";
}) {
if (params.channel === "last") {
return;
}
const configuredChannels = listConfiguredAnnounceChannelIds(params.cfg).toSorted();
const normalizedChannel = normalizeMessageChannel(params.channel);
if (!normalizedChannel) {
if (configuredChannels.length <= 1) {
return;
}
throw new Error(
`${params.field} is required when multiple channels are configured: ${configuredChannels.join(", ")}`,
);
}
if (configuredChannels.length === 0) {
return;
}
if (configuredChannels.includes(normalizedChannel)) {
return;
}
throw new Error(`${params.field} must be one of: ${configuredChannels.join(", ")}`);
}
function resolveAnnounceValidationChannel(params: {
channel?: string;
to?: string;
}): string | undefined {
if (params.channel && params.channel !== "last") {
return params.channel;
}
return resolveTargetPrefixedChannel(params.to) ?? params.channel;
}
function assertCompatibleAnnounceTarget(params: {
channel?: string;
to?: string;
field: "delivery.channel" | "delivery.failureDestination.channel";
}) {
if (!params.channel || params.channel === "last") {
return;
}
const error = validateTargetProviderPrefix({
channel: params.channel,
to: params.to,
});
if (error) {
throw new Error(`${params.field}: ${error.message}`);
}
}
function assertValidCronAnnounceDelivery(params: { cfg: OpenClawConfig; delivery?: CronDelivery }) {
if (params.delivery && (params.delivery.mode ?? "announce") === "announce") {
assertCompatibleAnnounceTarget({
channel: params.delivery.channel,
to: params.delivery.to,
field: "delivery.channel",
});
assertConfiguredAnnounceChannel({
cfg: params.cfg,
channel: resolveAnnounceValidationChannel({
channel: params.delivery.channel,
to: params.delivery.to,
}),
field: "delivery.channel",
});
}
const failureDestination = params.delivery?.failureDestination;
if (failureDestination && (failureDestination.mode ?? "announce") === "announce") {
assertCompatibleAnnounceTarget({
channel: failureDestination.channel,
to: failureDestination.to,
field: "delivery.failureDestination.channel",
});
assertConfiguredAnnounceChannel({
cfg: params.cfg,
channel: resolveAnnounceValidationChannel({
channel: failureDestination.channel,
to: failureDestination.to,
}),
field: "delivery.failureDestination.channel",
});
}
}
function assertValidCronCreateDelivery(cfg: OpenClawConfig, jobCreate: CronJobCreate) {
assertValidCronAnnounceDelivery({
cfg,
delivery: jobCreate.delivery,
});
}
function assertValidCronUpdateDelivery(params: {
cfg: OpenClawConfig;
defaultAgentId?: string;
currentJob: CronJob | undefined;
patch: CronJobPatch;
}) {
if (!params.currentJob || !("delivery" in params.patch)) {
return;
}
const nextJob = structuredClone(params.currentJob);
applyJobPatch(nextJob, params.patch, {
defaultAgentId: params.defaultAgentId,
});
assertValidCronAnnounceDelivery({
cfg: params.cfg,
delivery: nextJob.delivery,
});
}
export const cronHandlers: GatewayRequestHandlers = {
wake: ({ params, respond, context }) => {
if (!validateWakeParams(params)) {
respond(
false,
undefined,
errorShape(
ErrorCodes.INVALID_REQUEST,
`invalid wake params: ${formatValidationErrors(validateWakeParams.errors)}`,
),
);
return;
}
const p = params as {
mode: "now" | "next-heartbeat";
text: string;
};
const result = context.cron.wake({ mode: p.mode, text: p.text });
respond(true, result, undefined);
},
"cron.list": async ({ params, respond, context }) => {
if (!validateCronListParams(params)) {
respond(
false,
undefined,
errorShape(
ErrorCodes.INVALID_REQUEST,
`invalid cron.list params: ${formatValidationErrors(validateCronListParams.errors)}`,
),
);
return;
}
const p = params as {
includeDisabled?: boolean;
limit?: number;
offset?: number;
query?: string;
enabled?: "all" | "enabled" | "disabled";
sortBy?: "nextRunAtMs" | "updatedAtMs" | "name";
sortDir?: "asc" | "desc";
agentId?: string;
};
const page = await context.cron.listPage({
includeDisabled: p.includeDisabled,
limit: p.limit,
offset: p.offset,
query: p.query,
enabled: p.enabled,
sortBy: p.sortBy,
sortDir: p.sortDir,
agentId: p.agentId,
});
const deliveryPreviews = await resolveCronDeliveryPreviews({
cfg: context.getRuntimeConfig(),
defaultAgentId: context.cron.getDefaultAgentId(),
jobs: page.jobs,
});
respond(true, { ...page, deliveryPreviews }, undefined);
},
"cron.status": async ({ params, respond, context }) => {
if (!validateCronStatusParams(params)) {
respond(
false,
undefined,
errorShape(
ErrorCodes.INVALID_REQUEST,
`invalid cron.status params: ${formatValidationErrors(validateCronStatusParams.errors)}`,
),
);
return;
}
const status = await context.cron.status();
respond(true, status, undefined);
},
"cron.add": async ({ params, respond, context }) => {
const sessionKey =
typeof (params as { sessionKey?: unknown } | null)?.sessionKey === "string"
? (params as { sessionKey: string }).sessionKey
: undefined;
let normalized: unknown;
try {
normalized =
normalizeCronJobCreate(params, {
sessionContext: { sessionKey },
}) ?? params;
} catch (err) {
respond(
false,
undefined,
errorShape(
ErrorCodes.INVALID_REQUEST,
`invalid cron.add params: ${formatErrorMessage(err)}`,
),
);
return;
}
if (!validateCronAddParams(normalized)) {
respond(
false,
undefined,
errorShape(
ErrorCodes.INVALID_REQUEST,
`invalid cron.add params: ${formatValidationErrors(validateCronAddParams.errors)}`,
),
);
return;
}
const jobCreate = normalized as unknown as CronJobCreate;
const cfg = context.getRuntimeConfig();
const timestampValidation = validateScheduleTimestamp(jobCreate.schedule);
if (!timestampValidation.ok) {
respond(
false,
undefined,
errorShape(ErrorCodes.INVALID_REQUEST, timestampValidation.message),
);
return;
}
try {
assertValidCronCreateDelivery(cfg, jobCreate);
} catch (err) {
respond(
false,
undefined,
errorShape(
ErrorCodes.INVALID_REQUEST,
`invalid cron.add params: ${formatErrorMessage(err)}`,
),
);
return;
}
let job: Awaited<ReturnType<typeof context.cron.add>>;
try {
job = await context.cron.add(jobCreate);
} catch (err) {
if (!(err instanceof TypeError) && !(err instanceof RangeError)) {
throw err;
}
respond(
false,
undefined,
errorShape(
ErrorCodes.INVALID_REQUEST,
`invalid cron.add params: ${formatErrorMessage(err)}`,
),
);
return;
}
context.logGateway.info("cron: job created", { jobId: job.id, schedule: jobCreate.schedule });
respond(true, job, undefined);
},
"cron.update": async ({ params, respond, context }) => {
let normalizedPatch: ReturnType<typeof normalizeCronJobPatch>;
try {
normalizedPatch = normalizeCronJobPatch((params as { patch?: unknown } | null)?.patch);
} catch (err) {
respond(
false,
undefined,
errorShape(
ErrorCodes.INVALID_REQUEST,
`invalid cron.update params: ${formatErrorMessage(err)}`,
),
);
return;
}
const candidate =
normalizedPatch && typeof params === "object" && params !== null
? { ...params, patch: normalizedPatch }
: params;
if (!validateCronUpdateParams(candidate)) {
respond(
false,
undefined,
errorShape(
ErrorCodes.INVALID_REQUEST,
`invalid cron.update params: ${formatValidationErrors(validateCronUpdateParams.errors)}`,
),
);
return;
}
const p = candidate as {
id?: string;
jobId?: string;
patch: Record<string, unknown>;
};
const jobId = p.id ?? p.jobId;
if (!jobId) {
respond(
false,
undefined,
errorShape(ErrorCodes.INVALID_REQUEST, "invalid cron.update params: missing id"),
);
return;
}
const patch = p.patch as unknown as CronJobPatch;
const cfg = context.getRuntimeConfig();
if (patch.schedule) {
const timestampValidation = validateScheduleTimestamp(patch.schedule);
if (!timestampValidation.ok) {
respond(
false,
undefined,
errorShape(ErrorCodes.INVALID_REQUEST, timestampValidation.message),
);
return;
}
}
try {
assertValidCronUpdateDelivery({
cfg,
defaultAgentId: context.cron.getDefaultAgentId(),
currentJob: context.cron.getJob(jobId),
patch,
});
} catch (err) {
respond(
false,
undefined,
errorShape(
ErrorCodes.INVALID_REQUEST,
`invalid cron.update params: ${formatErrorMessage(err)}`,
),
);
return;
}
let job: Awaited<ReturnType<typeof context.cron.update>>;
try {
job = await context.cron.update(jobId, patch);
} catch (err) {
if (!(err instanceof TypeError) && !(err instanceof RangeError)) {
throw err;
}
respond(
false,
undefined,
errorShape(
ErrorCodes.INVALID_REQUEST,
`invalid cron.update params: ${formatErrorMessage(err)}`,
),
);
return;
}
context.logGateway.info("cron: job updated", { jobId });
respond(true, job, undefined);
},
"cron.remove": async ({ params, respond, context }) => {
if (!validateCronRemoveParams(params)) {
respond(
false,
undefined,
errorShape(
ErrorCodes.INVALID_REQUEST,
`invalid cron.remove params: ${formatValidationErrors(validateCronRemoveParams.errors)}`,
),
);
return;
}
const p = params as { id?: string; jobId?: string };
const jobId = p.id ?? p.jobId;
if (!jobId) {
respond(
false,
undefined,
errorShape(ErrorCodes.INVALID_REQUEST, "invalid cron.remove params: missing id"),
);
return;
}
const result = await context.cron.remove(jobId);
if (result.removed) {
context.logGateway.info("cron: job removed", { jobId });
}
respond(true, result, undefined);
},
"cron.run": async ({ params, respond, context }) => {
if (!validateCronRunParams(params)) {
respond(
false,
undefined,
errorShape(
ErrorCodes.INVALID_REQUEST,
`invalid cron.run params: ${formatValidationErrors(validateCronRunParams.errors)}`,
),
);
return;
}
const p = params as { id?: string; jobId?: string; mode?: "due" | "force" };
const jobId = p.id ?? p.jobId;
if (!jobId) {
respond(
false,
undefined,
errorShape(ErrorCodes.INVALID_REQUEST, "invalid cron.run params: missing id"),
);
return;
}
let result: Awaited<ReturnType<typeof context.cron.enqueueRun>>;
try {
result = await context.cron.enqueueRun(jobId, p.mode ?? "force");
} catch (error) {
if (isInvalidCronSessionTargetIdError(error)) {
respond(true, { ok: true, ran: false, reason: "invalid-spec" }, undefined);
return;
}
throw error;
}
respond(true, result, undefined);
},
"cron.runs": async ({ params, respond, context }) => {
if (!validateCronRunsParams(params)) {
respond(
false,
undefined,
errorShape(
ErrorCodes.INVALID_REQUEST,
`invalid cron.runs params: ${formatValidationErrors(validateCronRunsParams.errors)}`,
),
);
return;
}
const p = params as {
scope?: "job" | "all";
id?: string;
jobId?: string;
limit?: number;
offset?: number;
statuses?: Array<"ok" | "error" | "skipped">;
status?: "all" | "ok" | "error" | "skipped";
deliveryStatuses?: Array<"delivered" | "not-delivered" | "unknown" | "not-requested">;
deliveryStatus?: "delivered" | "not-delivered" | "unknown" | "not-requested";
query?: string;
sortDir?: "asc" | "desc";
};
const explicitScope = p.scope;
const jobId = p.id ?? p.jobId;
const scope: "job" | "all" = explicitScope ?? (jobId ? "job" : "all");
if (scope === "job" && !jobId) {
respond(
false,
undefined,
errorShape(ErrorCodes.INVALID_REQUEST, "invalid cron.runs params: missing id"),
);
return;
}
if (scope === "all") {
const jobs = await context.cron.list({ includeDisabled: true });
const jobNameById = Object.fromEntries(
jobs
.filter((job) => typeof job.id === "string" && typeof job.name === "string")
.map((job) => [job.id, job.name]),
);
const page = await readCronRunLogEntriesPageAll({
storePath: context.cronStorePath,
limit: p.limit,
offset: p.offset,
statuses: p.statuses,
status: p.status,
deliveryStatuses: p.deliveryStatuses,
deliveryStatus: p.deliveryStatus,
query: p.query,
sortDir: p.sortDir,
jobNameById,
});
respond(true, page, undefined);
return;
}
let logPath: string;
try {
logPath = resolveCronRunLogPath({
storePath: context.cronStorePath,
jobId: jobId as string,
});
} catch {
respond(
false,
undefined,
errorShape(ErrorCodes.INVALID_REQUEST, "invalid cron.runs params: invalid id"),
);
return;
}
const page = await readCronRunLogEntriesPage(logPath, {
limit: p.limit,
offset: p.offset,
jobId: jobId as string,
statuses: p.statuses,
status: p.status,
deliveryStatuses: p.deliveryStatuses,
deliveryStatus: p.deliveryStatus,
query: p.query,
sortDir: p.sortDir,
});
respond(true, page, undefined);
},
};