fix(schedules): align UI with exact skip contract

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: jromualdez-scale

agentex-ui/components/scheduled-tasks/scheduled-tasks-page.tsx

@@ -1016,6 +1016,7 @@ function ScheduleRow({
   const pause = useScheduleAction({ baseURL, agentId, action: 'pause' });
   const resume = useScheduleAction({ baseURL, agentId, action: 'resume' });
   const isPaused = isSchedulePaused(schedule);
+  const nextRun = getNextRun(schedule);
 
   return (
     <article className="border-border/70 relative flex items-center justify-between gap-4 border-b px-4 py-3 last:border-b-0">
@@ -1024,7 +1025,7 @@ function ScheduleRow({
         <div className="text-muted-foreground truncate text-sm">
           {describeCadence(schedule)}
           {showAgentName ? ` · ${agentName}` : ''}
-          {` · ${schedule.num_tasks_created} runs`}
+          {` · ${schedule.num_actions_taken} runs`}
         </div>
       </div>
       <div className="relative flex shrink-0 items-center justify-end gap-2">
@@ -1055,6 +1056,7 @@ function ScheduleRow({
           agentId={agentId}
           onEdit={() => setIsEditing(true)}
           includeRunNow={true}
+          {...(nextRun ? { scheduledTime: nextRun.toISOString() } : {})}
         />
       </div>
       {isEditing && (
@@ -1112,6 +1114,7 @@ function ScheduleOverflowMenu({
     action: 'delete',
   });
   const isPaused = isSchedulePaused(schedule);
+  const canSkip = scheduledTime != null && !isPaused;
 
   return (
     <div ref={menuRef} className="relative">
@@ -1152,17 +1155,14 @@ function ScheduleOverflowMenu({
           ) : (
             <MenuButton
               onClick={() => {
+                if (!scheduledTime) return;
                 setIsOpen(false);
-                skip.mutate(
-                  scheduledTime
-                    ? { scheduleId: schedule.id, scheduledTime }
-                    : schedule.id
-                );
+                skip.mutate({ scheduleId: schedule.id, scheduledTime });
               }}
-              disabled={skip.isPending}
+              disabled={skip.isPending || !canSkip}
             >
               <Play className="size-4" />
-              Skip run
+              Skip next run
             </MenuButton>
           )}
           <MenuButton disabled title="Backend support needed">

agentex-ui/hooks/use-agent-run-schedules.ts

@@ -34,7 +34,7 @@ type ScheduleActionInput =
   | string
   | {
       scheduleId: string;
-      scheduledTime?: string;
+      scheduledTime: string;
     };
 
 export type AgentRunScheduleListItem = {
@@ -177,6 +177,9 @@ export function useScheduleAction({
         case 'resume':
           return agentRunSchedulesAPI.resume(baseURL, agentId, scheduleId);
         case 'skip':
+          if (!scheduledTime) {
+            throw new Error('scheduledTime is required to skip a run');
+          }
           return agentRunSchedulesAPI.skip(
             baseURL,
             agentId,

agentex-ui/lib/agent-run-schedules.ts

@@ -26,7 +26,6 @@ export type AgentRunSchedule = {
   skipped_action_times: string[];
   last_action_time: string | null;
   num_actions_taken: number;
-  num_tasks_created: number;
 };
 
 export type AgentRunScheduleListResponse = {
@@ -152,7 +151,7 @@ export const agentRunSchedulesAPI = {
     baseURL: string,
     agentId: string,
     scheduleId: string,
-    scheduledTime?: string
+    scheduledTime: string
   ) =>
     request<AgentRunSchedule>(
       baseURL,

agentex-ui/lib/schedule-utils.test.ts

@@ -99,7 +99,6 @@ describe('scheduleToCadence', () => {
     skipped_action_times: [],
     last_action_time: null,
     num_actions_taken: 0,
-    num_tasks_created: 0,
   } satisfies AgentRunSchedule;
 
   it('converts weekly cron to editable cadence config', () => {

agentex/src/api/schemas/agent_run_schedules.py

@@ -160,12 +160,6 @@ class AgentRunScheduleResponse(BaseModel):
     num_actions_taken: int = Field(
         0, description="Number of times the schedule has fired."
     )
-    num_tasks_created: int = Field(
-        0,
-        description=(
-            "Number of non-deleted tasks created by this schedule, including manual runs."
-        ),
-    )
 
 
 class AgentRunScheduleListResponse(BaseModel):

agentex/src/domain/repositories/task_repository.py

@@ -96,23 +96,6 @@ async def list_with_join(
             relationships=relationships,
         )
 
-    async def count_by_agent_id_and_task_metadata(
-        self, *, agent_id: str, task_metadata: dict
-    ) -> int:
-        """Count non-deleted tasks for an agent matching JSONB metadata."""
-        query = (
-            select(func.count(TaskORM.id))
-            .join(TaskAgentORM, TaskORM.id == TaskAgentORM.task_id)
-            .where(
-                TaskAgentORM.agent_id == agent_id,
-                TaskORM.task_metadata.contains(task_metadata),
-                TaskORM.status != TaskStatus.DELETED,
-            )
-        )
-        async with self.start_async_db_session(allow_writes=False) as session:
-            result = await session.execute(query)
-            return result.scalar_one()
-
     async def list_cleanup_candidate_ids(
         self,
         *,

agentex/src/domain/services/agent_run_schedule_service.py

@@ -28,7 +28,6 @@
 from src.domain.repositories.agent_run_schedule_repository import (
     DAgentRunScheduleRepository,
 )
-from src.domain.repositories.task_repository import DTaskRepository
 from src.domain.services.authorization_service import DAuthorizationService
 from src.utils.ids import orm_id
 from src.utils.logging import make_logger
@@ -73,13 +72,11 @@ def __init__(
         authorization_service: DAuthorizationService,
         schedule_repository: DAgentRunScheduleRepository,
         agent_repository: DAgentRepository,
-        task_repository: DTaskRepository,
     ):
         self.temporal_adapter = temporal_adapter
         self.authorization_service = authorization_service
         self.schedule_repository = schedule_repository
         self.agent_repository = agent_repository
-        self.task_repository = task_repository
 
     async def create_schedule(
         self,
@@ -450,12 +447,6 @@ async def _to_response(
         skipped_action_times: list[datetime] = []
         last_action_time: datetime | None = None
         num_actions_taken = 0
-        num_tasks_created = (
-            await self.task_repository.count_by_agent_id_and_task_metadata(
-                agent_id=entity.agent_id,
-                task_metadata={"schedule_id": entity.id},
-            )
-        )
 
         # Live Temporal fields are best-effort and opt-in. ``include_live=False``
         # (list path) skips the describe RPC entirely and serves state from the
@@ -505,7 +496,6 @@ async def _to_response(
             skipped_action_times=skipped_action_times,
             last_action_time=last_action_time,
             num_actions_taken=num_actions_taken,
-            num_tasks_created=num_tasks_created,
         )
 
     @staticmethod

agentex/tests/unit/services/test_agent_run_schedule_service.py

@@ -49,14 +49,11 @@ def service():
     )
     schedule_repository = AsyncMock()
     agent_repository = AsyncMock()
-    task_repository = AsyncMock()
-    task_repository.count_by_agent_id_and_task_metadata.return_value = 0
     return AgentRunScheduleService(
         temporal_adapter=temporal_adapter,
         authorization_service=authorization_service,
         schedule_repository=schedule_repository,
         agent_repository=agent_repository,
-        task_repository=task_repository,
     )
 
 
@@ -512,20 +509,6 @@ async def test_unskip_updates_temporal_schedule(self, service, agent):
             temporal_id, scheduled_time=scheduled_time
         )
 
-    async def test_response_counts_tasks_created(self, service, agent):
-        row = _persisted(agent.id, _request())
-        service.schedule_repository.get_by_agent_id_and_id_or_raise.return_value = row
-        service.agent_repository.get.return_value = agent
-        service.task_repository.count_by_agent_id_and_task_metadata.return_value = 7
-
-        response = await service.get_schedule(agent.id, row.id)
-
-        assert response.num_tasks_created == 7
-        service.task_repository.count_by_agent_id_and_task_metadata.assert_awaited_once_with(
-            agent_id=agent.id,
-            task_metadata={"schedule_id": row.id},
-        )
-
 
 @pytest.mark.unit
 class TestCadenceValidation: