fix(cron): respect isolated target and error on missing remove id (#86234)

stevenepalmer · web-flow · commit 6709f4efe56c · 2026-05-25T07:50:30.000+01:00
diff --git a/src/agents/tools/cron-tool.test.ts b/src/agents/tools/cron-tool.test.ts
@@ -630,6 +630,25 @@ describe("cron tool", () => {
     expect(sessionKey).toBe("agent:main:telegram:group:-100123:topic:99");
   });
 
+  it("does not stamp caller sessionKey when add targets isolated session", async () => {
+    callGatewayMock.mockResolvedValueOnce({ ok: true });
+
+    const tool = createTestCronTool({ agentSessionKey: "agent:main:webchat:dm:dashboard" });
+    await tool.execute("call-isolated-no-stamp", {
+      action: "add",
+      job: {
+        name: "isolated run",
+        schedule: { at: new Date(123).toISOString() },
+        sessionTarget: "isolated",
+        payload: { kind: "agentTurn", message: "hello" },
+      },
+    });
+    const call = readGatewayCall();
+    const payload = call.params as { sessionKey?: string; sessionTarget?: string } | undefined;
+    expect(payload?.sessionTarget).toBe("isolated");
+    expect(payload).not.toHaveProperty("sessionKey");
+  });
+
   it("adds recent context for systemEvent reminders when contextMessages > 0", async () => {
     callGatewayMock
       .mockResolvedValueOnce({
diff --git a/src/agents/tools/cron-tool.ts b/src/agents/tools/cron-tool.ts
@@ -670,7 +670,10 @@ Use jobId canonical; id accepted compat. contextMessages (0-10) adds previous me
                 (job as { agentId?: string }).agentId = agentId;
               }
             }
-            if (!("sessionKey" in job) && resolvedSessionKey) {
+            const sessionTarget = normalizeLowercaseStringOrEmpty(
+              (job as { sessionTarget?: unknown }).sessionTarget,
+            );
+            if (!("sessionKey" in job) && resolvedSessionKey && sessionTarget !== "isolated") {
               (job as { sessionKey?: string }).sessionKey = resolvedSessionKey;
             }
           }
diff --git a/src/gateway/server-methods/cron.ts b/src/gateway/server-methods/cron.ts
@@ -477,9 +477,15 @@ export const cronHandlers: GatewayRequestHandlers = {
       return;
     }
     const result = await context.cron.remove(jobId);
-    if (result.removed) {
-      context.logGateway.info("cron: job removed", { jobId });
+    if (!result.removed) {
+      respond(
+        false,
+        undefined,
+        errorShape(ErrorCodes.INVALID_REQUEST, "invalid cron.remove params: id not found"),
+      );
+      return;
     }
+    context.logGateway.info("cron: job removed", { jobId });
     respond(true, result, undefined);
   },
   "cron.run": async ({ params, respond, context }) => {
diff --git a/src/gateway/server-methods/cron.validation.test.ts b/src/gateway/server-methods/cron.validation.test.ts
@@ -75,6 +75,7 @@ function createCronContext(currentJob?: CronJob) {
     cron: {
       add: vi.fn(async () => ({ id: "cron-1" })),
       update: vi.fn(async () => ({ id: "cron-1" })),
+      remove: vi.fn(async () => ({ ok: true, removed: true })),
       getDefaultAgentId: vi.fn(() => "main"),
       getJob: vi.fn(() => currentJob),
       wake: vi.fn(() => ({ ok: true }) as const),
@@ -129,6 +130,26 @@ async function invokeCronUpdate(params: Record<string, unknown>, currentJob: Cro
   return { context, respond };
 }
 
+async function invokeCronRemove(
+  params: Record<string, unknown>,
+  options?: { removeResult?: { ok: boolean; removed: boolean } },
+) {
+  const context = createCronContext();
+  if (options?.removeResult) {
+    context.cron.remove.mockResolvedValueOnce(options.removeResult);
+  }
+  const respond = vi.fn();
+  await cronHandlers["cron.remove"]({
+    req: {} as never,
+    params: params as never,
+    respond: respond as never,
+    context: context as never,
+    client: null,
+    isWebchatConnect: () => false,
+  });
+  return { context, respond };
+}
+
 function createCronJob(overrides: Partial<CronJob> = {}): CronJob {
   return {
     id: "cron-1",
@@ -246,6 +267,17 @@ describe("cron method validation", () => {
     expect(respond).toHaveBeenCalledWith(true, { id: "cron-1" }, undefined);
   });
 
+  it("returns invalid-request error when cron.remove target id is missing", async () => {
+    const { respond } = await invokeCronRemove(
+      { id: "missing-id" },
+      { removeResult: { ok: true, removed: false } },
+    );
+    expectResponseError(respond, {
+      code: "INVALID_REQUEST",
+      messageIncludes: "invalid cron.remove params: id not found",
+    });
+  });
+
   it("returns a single cron job for cron.get", async () => {
     const job = createCronJob({ id: "cron-42", name: "single job" });
 

Original file line number	Diff line number	Diff line change
`@@ -670,7 +670,10 @@ Use jobId canonical; id accepted compat. contextMessages (0-10) adds previous me`
`670`	`670`	`(job as { agentId?: string }).agentId = agentId;`
`671`	`671`	`}`
`672`	`672`	`}`
`673`		`- if (!("sessionKey" in job) && resolvedSessionKey) {`
	`673`	`+ const sessionTarget = normalizeLowercaseStringOrEmpty(`
	`674`	`+ (job as { sessionTarget?: unknown }).sessionTarget,`
	`675`	`+ );`
	`676`	`+ if (!("sessionKey" in job) && resolvedSessionKey && sessionTarget !== "isolated") {`
`674`	`677`	`(job as { sessionKey?: string }).sessionKey = resolvedSessionKey;`
`675`	`678`	`}`
`676`	`679`	`}`