@sentry/junior-scheduler 0.74.1 → 0.76.0

package/src/schedule-tools.ts

@@ -1,19 +1,18 @@
 import { randomUUID } from "node:crypto";
 import { Type } from "@sinclair/typebox";
 import {
-  AgentPluginToolInputError,
-  agentPluginCredentialSubjectSchema,
-  destinationSchema,
-  isSlackDestination,
-  type AgentPluginCredentialSubject,
-  type AgentPluginState,
-  type AgentPluginToolDefinition,
+  PluginToolInputError,
+  pluginCredentialSubjectSchema,
+  sourceSchema,
+  type PluginCredentialSubject,
+  type PluginToolDefinition,
   type SlackDestination,
   type SlackRequester,
+  type SlackSource,
 } from "@sentry/junior-plugin-api";
 import { buildCalendarRecurrence, parseScheduleTimestamp } from "./cadence";
 import { sanitizeScheduledTaskPrincipal } from "./identity";
-import { createSchedulerStore } from "./store";
+import { type SchedulerStore } from "./store";
 import { SCHEDULED_TASK_SYSTEM_ACTOR } from "./types";
 import type {
   ScheduledCalendarFrequency,
@@ -25,10 +24,10 @@ import type {
 } from "./types";
 
 export interface SchedulerToolContext {
-  credentialSubject?: AgentPluginCredentialSubject;
+  credentialSubject?: PluginCredentialSubject;
   requester?: SlackRequester;
-  source?: SlackDestination;
-  state: AgentPluginState;
+  source?: SlackSource;
+  store: SchedulerStore;
   userText?: string;
 }
 
@@ -42,15 +41,15 @@ type SchemaIssue = {
 };
 
 function throwToolInputError(error: string): never {
-  throw new AgentPluginToolInputError(error);
+  throw new PluginToolInputError(error);
 }
 
 function requireActiveConversation(
   context: SchedulerToolContext,
 ): SlackDestination {
-  const parsed = destinationSchema.safeParse(context.source);
+  const parsed = sourceSchema.safeParse(context.source);
   if (!parsed.success) {
-    const source = context.source as Partial<SlackDestination> | undefined;
+    const source = context.source as Partial<SlackSource> | undefined;
     const issues = parsed.error.issues as readonly SchemaIssue[];
     if (!source || source.platform !== "slack") {
       throwToolInputError("No active Slack conversation is available.");
@@ -69,11 +68,15 @@ function requireActiveConversation(
     throwToolInputError("No active Slack conversation is available.");
   }
 
-  if (!isSlackDestination(parsed.data)) {
+  if (parsed.data.platform !== "slack") {
     throwToolInputError("No active Slack conversation is available.");
   }
 
-  return parsed.data;
+  return {
+    platform: "slack",
+    teamId: parsed.data.teamId,
+    channelId: parsed.data.channelId,
+  };
 }
 
 function requireRequester(
@@ -99,8 +102,8 @@ function requireRequester(
 }
 
 function tool<TInput = any>(
-  definition: AgentPluginToolDefinition<TInput>,
-): AgentPluginToolDefinition<TInput> {
+  definition: PluginToolDefinition<TInput>,
+): PluginToolDefinition<TInput> {
   return definition;
 }
 
@@ -125,8 +128,8 @@ function getConversationAccess(
 
 function getCredentialSubject(args: {
   access: ScheduledTaskConversationAccess;
-  subject: AgentPluginCredentialSubject | undefined;
-}): AgentPluginCredentialSubject | undefined {
+  subject: PluginCredentialSubject | undefined;
+}): PluginCredentialSubject | undefined {
   if (
     args.access.audience !== "direct" ||
     args.access.visibility !== "private"
@@ -136,7 +139,7 @@ function getCredentialSubject(args: {
   if (!args.subject) {
     return undefined;
   }
-  const subject = agentPluginCredentialSubjectSchema.safeParse(args.subject);
+  const subject = pluginCredentialSubjectSchema.safeParse(args.subject);
   if (!subject.success) {
     throwToolInputError("Active Slack credential subject is invalid.");
   }
@@ -165,9 +168,7 @@ async function getWritableTask(args: {
 }): Promise<ScheduledTask> {
   const destination = requireActiveConversation(args.context);
 
-  const task = await createSchedulerStore(args.context.state).getTask(
-    args.taskId,
-  );
+  const task = await schedulerStore(args.context).getTask(args.taskId);
   if (!task || task.status === "deleted") {
     throwToolInputError(
       "Scheduled task was not found in the active Slack conversation.",
@@ -216,7 +217,6 @@ function compactTask(task: ScheduledTask): Record<string, unknown> {
     run_now_at: task.runNowAtMs
       ? new Date(task.runNowAtMs).toISOString()
       : null,
-    version: task.version,
   };
 }
 
@@ -224,6 +224,10 @@ function buildTaskId(): string {
   return `${TASK_ID_PREFIX}_${randomUUID()}`;
 }
 
+function schedulerStore(context: SchedulerToolContext): SchedulerStore {
+  return context.store;
+}
+
 function normalizeStatus(
   value: string | undefined,
 ): ScheduledTaskStatus | undefined {
@@ -299,6 +303,30 @@ function validateRecurringFrequencyLimit(input: { recurrence?: unknown }) {
   }
 }
 
+function validateCreateScheduleKind(input: {
+  recurrence?: unknown;
+  schedule_kind?: unknown;
+}) {
+  if (input.schedule_kind === undefined) {
+    throwToolInputError("Provide schedule_kind as one_off or recurring.");
+  }
+  if (
+    input.schedule_kind !== "one_off" &&
+    input.schedule_kind !== "recurring"
+  ) {
+    throwToolInputError("schedule_kind must be one_off or recurring.");
+  }
+  if (input.schedule_kind === "one_off" && input.recurrence !== undefined) {
+    throwToolInputError("Omit recurrence when schedule_kind is one_off.");
+  }
+  if (
+    input.schedule_kind === "recurring" &&
+    (input.recurrence === undefined || input.recurrence === null)
+  ) {
+    throwToolInputError("Provide recurrence when schedule_kind is recurring.");
+  }
+}
+
 function shouldRebuildRecurrence(input: {
   next_run_at?: string;
   recurrence?: unknown;
@@ -343,11 +371,18 @@ export function createSlackScheduleCreateTaskTool(
 ) {
   return tool({
     description:
-      "Create a future or recurring Junior task in the active Slack conversation. Use only when the user explicitly asks Junior to do work later or on a recurring cadence. Only manage tasks for the active Slack DM or channel; never target threads, other channels, or another user's DM. When the task, schedule, and destination are clear, create it without asking for confirmation; ask only when one of those is ambiguous.",
+      "Create a one-time or recurring Junior task in the active Slack conversation. For one-time reminders or one-time scheduled work, omit recurrence entirely; never choose a default recurrence. Use only when the user explicitly asks Junior to do work later or on a recurring cadence. Only manage tasks for the active Slack DM or channel; never target threads, other channels, or another user's DM. When the task, schedule, and destination are clear, create it without asking for confirmation; ask only when one of those is ambiguous.",
     executionMode: "sequential",
     inputSchema: Type.Object({
       task: Type.String({ minLength: 1, maxLength: 4000 }),
       schedule: Type.String({ minLength: 1, maxLength: 300 }),
+      schedule_kind: Type.Union(
+        [Type.Literal("one_off"), Type.Literal("recurring")],
+        {
+          description:
+            "Required schedule classification. Use one_off for one-time reminders or one-time scheduled work. Use recurring only when the user explicitly asks for a repeating schedule.",
+        },
+      ),
       timezone: Type.Optional(
         Type.String({
           minLength: 1,
@@ -373,7 +408,7 @@ export function createSlackScheduleCreateTaskTool(
           ],
           {
             description:
-              "Provide only for explicitly repeating schedules; omit for one-time requests like 'in 1 minute', 'tomorrow', or a specific date. Recurring tasks run at most once per day: use daily, weekly, monthly, or yearly only.",
+              "Required when schedule_kind is recurring. Omit when schedule_kind is one_off. Recurring tasks run at most once per day: use daily, weekly, monthly, or yearly only.",
           },
         ),
       ),
@@ -384,6 +419,7 @@ export function createSlackScheduleCreateTaskTool(
 
       const nowMs = Date.now();
       const timezone = input.timezone ?? getDefaultScheduleTimezone();
+      validateCreateScheduleKind(input);
       validateRecurringFrequencyLimit(input);
       if (!isValidTimeZone(timezone)) {
         throwToolInputError("timezone must be a valid IANA time zone.");
@@ -424,10 +460,9 @@ export function createSlackScheduleCreateTaskTool(
         task: {
           text: input.task,
         },
-        version: 1,
       };
 
-      await createSchedulerStore(context.state).saveTask(task);
+      await schedulerStore(context).saveTask(task);
       return {
         ok: true,
         task: compactTask(task),
@@ -448,7 +483,7 @@ export function createSlackScheduleListTasksTool(
     execute: async () => {
       const destination = requireActiveConversation(context);
 
-      const tasks = await createSchedulerStore(context.state).listTasksForTeam(
+      const tasks = await schedulerStore(context).listTasksForTeam(
         destination.teamId,
       );
       const matching = tasks.filter((task) =>
@@ -571,10 +606,9 @@ export function createSlackScheduleUpdateTaskTool(
           recurrence,
         },
         task: input.task ? { text: input.task } : lookup.task,
-        version: lookup.version + 1,
       };
 
-      await createSchedulerStore(context.state).saveTask(next);
+      await schedulerStore(context).saveTask(next);
       return {
         ok: true,
         task: compactTask(next),
@@ -607,10 +641,9 @@ export function createSlackScheduleDeleteTaskTool(
         status: "deleted",
         nextRunAtMs: undefined,
         runNowAtMs: undefined,
-        version: lookup.version + 1,
       };
 
-      await createSchedulerStore(context.state).saveTask(next);
+      await schedulerStore(context).saveTask(next);
       return {
         ok: true,
         task: compactTask(next),
@@ -647,10 +680,9 @@ export function createSlackScheduleRunTaskNowTool(
         ...lookup,
         updatedAtMs: nowMs,
         runNowAtMs: nowMs,
-        version: lookup.version + 1,
       };
 
-      await createSchedulerStore(context.state).saveTask(next);
+      await schedulerStore(context).saveTask(next);
       return {
         ok: true,
         task: compactTask(next),