diff --git a/docs/features/scheduled-operations.mdx b/docs/features/scheduled-operations.mdx
index c1c6a58f..4c0314b0 100644
--- a/docs/features/scheduled-operations.mdx
+++ b/docs/features/scheduled-operations.mdx
@@ -18,7 +18,7 @@ Schedules is a unified surface for every recurring maintenance operation Sencho
Open the **Schedules** tab from the top navigation bar. The page opens on the Timeline view with the masthead, the five lane track, and a bottom time axis.
{formatHourTick(pill.runAt)}
{targetLabel}
diff --git a/frontend/src/components/__tests__/ScheduledOperationsView.test.tsx b/frontend/src/components/__tests__/ScheduledOperationsView.test.tsx
index 57f01aff..87cc7875 100644
--- a/frontend/src/components/__tests__/ScheduledOperationsView.test.tsx
+++ b/frontend/src/components/__tests__/ScheduledOperationsView.test.tsx
@@ -306,11 +306,48 @@ describe('ScheduledOperationsView', () => {
it('renders the five registry category lanes in the timeline view', async () => {
render(([]);
+ const [nodes, setNodes] = useState([]);
const [loading, setLoading] = useState(true);
const [now, setNow] = useState(() => Date.now());
const abortRef = useRef(null);
+ const fetchNodes = useCallback(async () => {
+ try {
+ const res = await apiFetch('/nodes', { localOnly: true });
+ if (!res.ok) {
+ console.error('Node poll failed:', res.status);
+ return;
+ }
+ const data = await res.json();
+ if (!Array.isArray(data)) {
+ console.error('Unexpected /nodes response shape');
+ return;
+ }
+ setNodes((data as { id: number; name: string; type: 'local' | 'remote' }[])
+ .map(n => ({ id: n.id, name: n.name, type: n.type })));
+ } catch (error) {
+ console.error('Failed to fetch nodes:', error);
+ }
+ }, []);
+
const fetchTasks = useCallback(async () => {
abortRef.current?.abort();
const controller = new AbortController();
@@ -94,11 +105,24 @@ export function MobileSchedules({ headerActions }: MobileSchedulesProps) {
};
}, [fetchTasks]);
+ useEffect(() => {
+ // Node names rarely change, so fetch once on mount rather than on the poll.
+ // eslint-disable-next-line react-hooks/set-state-in-effect
+ void fetchNodes();
+ }, [fetchNodes]);
+
useEffect(() => {
const id = setInterval(() => setNow(Date.now()), 30_000);
return () => clearInterval(id);
}, []);
+ const nodeNameById = useMemo(() => new Map(nodes.map(n => [n.id, n.name])), [nodes]);
+ const describeTarget = useCallback(
+ (task: ScheduledTask) =>
+ scheduleTargetDescriptor(task, task.node_id != null ? nodeNameById.get(task.node_id) : undefined),
+ [nodeNameById],
+ );
+
const enabledCount = tasks.filter(t => t.enabled === 1).length;
const upcoming: UpcomingRun[] = tasks
.filter(t => t.enabled === 1 && t.next_runs && t.next_runs.length > 0)
@@ -116,7 +140,7 @@ export function MobileSchedules({ headerActions }: MobileSchedulesProps) {
state={next ? hhmm(next.runAt) : '--:--'}
stateTone="brand"
live={false}
- meta={next ? `${relative(next.runAt, now)} · ${actionShortLabel(next.task)} ${targetLabel(next.task)}` : 'nothing scheduled'}
+ meta={next ? `${relative(next.runAt, now)} · ${actionShortLabel(next.task)} ${describeTarget(next.task)}` : 'nothing scheduled'}
right={headerActions}
/>
@@ -141,7 +165,7 @@ export function MobileSchedules({ headerActions }: MobileSchedulesProps) {
{hhmm(run.runAt)}
- {actionShortLabel(run.task)} {` ${targetLabel(run.task)}`}
+ {actionShortLabel(run.task)} {` ${describeTarget(run.task)}`}
{relative(run.runAt, now)}
diff --git a/frontend/src/components/mobile/__tests__/MobileSchedules.test.tsx b/frontend/src/components/mobile/__tests__/MobileSchedules.test.tsx
index ed8108f4..45233e13 100644
--- a/frontend/src/components/mobile/__tests__/MobileSchedules.test.tsx
+++ b/frontend/src/components/mobile/__tests__/MobileSchedules.test.tsx
@@ -43,18 +43,29 @@ function makeTask(overrides: Partial = {}): ScheduledTask {
};
}
+let tasksFixture: ScheduledTask[];
+let nodesFixture: { id: number; name: string; type: 'local' | 'remote' }[];
+
beforeEach(() => {
+ tasksFixture = [];
+ nodesFixture = [{ id: 1, name: 'hub', type: 'local' }, { id: 2, name: 'edge', type: 'remote' }];
mockedFetch.mockReset();
+ // The view fetches nodes and tasks separately, so dispatch by URL.
+ mockedFetch.mockImplementation(async (url: string) => {
+ if (url === '/nodes') return jsonResponse(nodesFixture);
+ if (url === '/scheduled-tasks') return jsonResponse(tasksFixture);
+ return jsonResponse({});
+ });
});
afterEach(() => vi.clearAllMocks());
describe('MobileSchedules', () => {
it('renders registry short labels for upcoming runs', async () => {
- mockedFetch.mockResolvedValue(jsonResponse([
+ tasksFixture = [
makeTask({ id: 1, action: 'auto_backup' }),
makeTask({ id: 2, action: 'auto_down', next_runs: [Date.now() + 7_200_000] }),
- ]));
+ ];
const { container } = render(;
const BACKEND_ACTIONS: BackendAction[] = [
'restart', 'snapshot', 'prune', 'update', 'scan',
@@ -173,4 +178,46 @@ describe('scheduledActions registry', () => {
expect(def?.riskLevel).toBe('runtime-change');
expect(def?.helperText).toBe('Checks every stack on the selected node and updates stacks with newer images.');
});
+
+ describe('stripComposeExt', () => {
+ it('drops a trailing .yml or .yaml and leaves other names alone', () => {
+ expect(stripComposeExt('web')).toBe('web');
+ expect(stripComposeExt('web.yml')).toBe('web');
+ expect(stripComposeExt('web.yaml')).toBe('web');
+ expect(stripComposeExt('')).toBe('');
+ expect(stripComposeExt('my.app')).toBe('my.app');
+ });
+ });
+
+ describe('scheduleTargetDescriptor', () => {
+ it('shows the stack name (without compose extension) for stack actions', () => {
+ const task: TargetTask = { action: 'restart', target_type: 'stack', target_id: 'web.yml', name: 'Nightly restart' };
+ expect(scheduleTargetDescriptor(task, 'hub')).toBe('web');
+ });
+
+ it('falls back to the task name when a stack target_id is missing', () => {
+ const task: TargetTask = { action: 'restart', target_type: 'stack', target_id: null, name: 'api.yaml' };
+ expect(scheduleTargetDescriptor(task)).toBe('api');
+ });
+
+ it('shows the node for a fleet auto-update, or a generic label without one', () => {
+ const task: TargetTask = { action: 'update', target_type: 'fleet', target_id: null, name: 'Fleet update' };
+ expect(scheduleTargetDescriptor(task, 'edge-1')).toBe('All stacks · edge-1');
+ expect(scheduleTargetDescriptor(task)).toBe('All stacks');
+ });
+
+ it('shows Entire fleet for a fleet snapshot regardless of node', () => {
+ const task: TargetTask = { action: 'snapshot', target_type: 'fleet', target_id: null, name: 'Nightly Snapshot' };
+ expect(scheduleTargetDescriptor(task, 'edge-1')).toBe('Entire fleet');
+ expect(scheduleTargetDescriptor(task)).toBe('Entire fleet');
+ });
+
+ it('shows the node for system actions (prune / scan), with a fallback', () => {
+ const scan: TargetTask = { action: 'scan', target_type: 'system', target_id: null, name: 'Vul Scan' };
+ const prune: TargetTask = { action: 'prune', target_type: 'system', target_id: null, name: 'Nightly Prune' };
+ expect(scheduleTargetDescriptor(scan, 'hub')).toBe('hub');
+ expect(scheduleTargetDescriptor(prune, 'edge-1')).toBe('edge-1');
+ expect(scheduleTargetDescriptor(scan)).toBe('Selected node');
+ });
+ });
});
diff --git a/frontend/src/lib/scheduledActions.ts b/frontend/src/lib/scheduledActions.ts
index 773e97cf..dc5876b4 100644
--- a/frontend/src/lib/scheduledActions.ts
+++ b/frontend/src/lib/scheduledActions.ts
@@ -129,6 +129,37 @@ export function resolveTaskAction(
return getActionById(task.action);
}
+/** Drop a trailing `.yml` / `.yaml` from a stack file name for display. */
+export function stripComposeExt(name: string): string {
+ return name.replace(/\.(ya?ml)$/, '');
+}
+
+/**
+ * Category-aware label for what a scheduled run acts on, used by the Timeline
+ * pills and the mobile schedule list. Stack actions show the stack, fleet
+ * snapshots show the whole fleet, fleet updates and node-scoped actions
+ * (prune / scan) show the selected node when its name is known.
+ */
+export function scheduleTargetDescriptor(
+ task: Pick,
+ nodeName?: string,
+): string {
+ switch (task.target_type) {
+ case 'stack':
+ return stripComposeExt(task.target_id ?? task.name);
+ case 'fleet':
+ return task.action === 'update'
+ ? (nodeName ? `All stacks · ${nodeName}` : 'All stacks')
+ : 'Entire fleet';
+ case 'system':
+ return nodeName ?? 'Selected node';
+ default: {
+ const exhaustive: never = task.target_type;
+ return exhaustive;
+ }
+ }
+}
+
export interface ScheduledActionCategoryLane {
key: ScheduledActionCategory;
label: string;
@@ -138,7 +169,7 @@ export interface ScheduledActionCategoryLane {
/** Ordered Timeline lanes; each scheduled action maps to one lane by category. */
export const SCHEDULED_ACTION_CATEGORIES: ScheduledActionCategoryLane[] = [
- { key: 'lifecycle', label: 'Lifecycle', color: 'var(--label-blue)', bg: 'var(--label-blue-bg)' },
+ { key: 'lifecycle', label: 'Stack lifecycle', color: 'var(--label-blue)', bg: 'var(--label-blue-bg)' },
{ key: 'updates', label: 'Updates', color: 'var(--success)', bg: 'oklch(from var(--success) l c h / 0.18)' },
{ key: 'security', label: 'Security', color: 'var(--label-purple)', bg: 'var(--label-purple-bg)' },
{ key: 'maintenance', label: 'Maintenance', color: 'var(--warning)', bg: 'oklch(from var(--warning) l c h / 0.18)' },
+ 
+