@promptbook/cli 0.114.0-2 → 0.114.0-4

package/README.md

@@ -215,8 +215,6 @@ Respond to incoming legal inquiries via email and keep the company website updat
 **KNOWLEDGE** https://company.com/company-policies.pdf<br/>
 **KNOWLEDGE** https://company.com/internal-documents/employee-handbook.docx<br/>
 <br/>
-USE EMAIL<br/>
-USE BROWSER<br/>
 <br/>
 TEAM You are part of the legal team of Paul Smith & Associés, you discuss with {Emily White}, the head of the compliance department. {George Brown} is expert in corporate law and {Sophia Black} is expert in labor law.<br/>
 
@@ -305,7 +303,7 @@ GOAL Keep the company website updated with the latest legal policies and complia
 
 #### `Use` commitments
 
-Use commitments grant the agent real capabilities - tools it can use to interact with the outside world. `USE EMAIL` lets the agent send emails, `USE BROWSER` lets it access and read web content, `USE SEARCH ENGINE` lets it search the web, and many more.
+Use commitments grant the agent real capabilities - tools it can use to interact with the outside world. `USE CALENDAR` lets the agent work with a calendar, `USE PROJECT` gives it access to a code repository, `USE MCP` connects any external Model Context Protocol server, and many more.
 
 These are what turn a chatbot into a persistent agent that actually does work.
 
@@ -322,9 +320,6 @@ GOAL Keep the company website updated with the latest legal policies and complia
 **RULE** Never provide legal advice about criminal law.<br/>
 **KNOWLEDGE** https://company.com/company-policies.pdf<br/>
 **KNOWLEDGE** https://company.com/internal-documents/employee-handbook.docx<br/>
-USE EMAIL<br/>
-USE BROWSER<br/>
-USE SEARCH ENGINE<br/>
 
 </td></tr></table>
 
@@ -345,9 +340,6 @@ GOAL Keep the company website updated with the latest legal policies and complia
 **RULE** Never provide legal advice about criminal law.<br/>
 **KNOWLEDGE** https://company.com/company-policies.pdf<br/>
 **KNOWLEDGE** https://company.com/internal-documents/employee-handbook.docx<br/>
-USE EMAIL<br/>
-USE BROWSER<br/>
-USE SEARCH ENGINE<br/>
 TEAM You are part of the legal team of Paul Smith & Associés, you discuss with {Emily White}, the head of the compliance department. {George Brown} is expert in corporate law and {Sophia Black} is expert in labor law.<br/>
 
 </td></tr></table>

package/apps/agents-server/{USE_TIMEOUT_CHIP_QA.md → TIMEOUT_CHIP_QA.md}

@@ -1,4 +1,4 @@
-# USE TIMEOUT Chip QA
+# Timeout Chip QA
 
 -   Friendly default popup:
     Trigger a `set_timeout` tool call in an agent chat, click the timeout chip under the assistant message, and confirm the first view shows friendly copy (for example `Will retry in ...`) plus local time, relative time, and timezone.

package/apps/agents-server/next.config.ts

@@ -22,6 +22,11 @@ const agentsServerNodeModulesPath = process.env.PTBK_AGENTS_SERVER_NODE_MODULES_
  */
 const isNextValidationIgnored = process.env.PTBK_AGENTS_SERVER_IGNORE_NEXT_VALIDATION === 'true';
 
+/**
+ * Whether one isolated CLI production build should avoid writing a webpack filesystem cache that no later release can reuse.
+ */
+const isWebpackFilesystemCacheDisabled = process.env.PTBK_AGENTS_SERVER_DISABLE_WEBPACK_FILESYSTEM_CACHE === 'true';
+
 /**
  * Optional worker count override for CLI-owned production builds on memory-constrained VPS hosts.
  */
@@ -79,6 +84,12 @@ const nextConfig: NextConfig = {
     },
 
     webpack(config, { isServer, nextRuntime }) {
+        if (isWebpackFilesystemCacheDisabled) {
+            // Versioned VPS releases build into a fresh checkout. Persisting the multi-gigabyte webpack cache there
+            // adds substantial disk I/O but cannot accelerate the next release, which has a different checkout.
+            config.cache = false;
+        }
+
         config.resolve.alias = {
             ...config.resolve.alias,
             '@': path.resolve(__dirname),

package/apps/agents-server/src/app/agents/[agentName]/api/chat/resolveAgentChatRouteContext.ts

@@ -25,7 +25,6 @@ import {
 } from '@/src/utils/metaDisclaimer';
 import { composePromptParametersWithMemoryContext } from '@/src/utils/memoryRuntimeContext';
 import { extractUseCalendarConnectionsFromAgentSource } from '@/src/utils/calendars/extractUseCalendarConnectionsFromAgentSource';
-import { extractUseEmailConfigurationFromAgentSource } from '@/src/utils/emails/extractUseEmailConfigurationFromAgentSource';
 import { extractProjectRepositoriesFromAgentSource } from '@/src/utils/projects/extractProjectRepositoriesFromAgentSource';
 import { resolveUseCalendarGoogleToken } from '@/src/utils/resolveUseCalendarGoogleToken';
 import { resolveUseEmailSmtpCredential } from '@/src/utils/resolveUseEmailSmtpCredential';
@@ -141,7 +140,6 @@ export async function resolveAgentChatRouteContext(
     const resolvedAgentName = resolvedAgentContext.resolvedAgentName;
     const projectRepositories = extractProjectRepositoriesFromAgentSource(agentSource);
     const calendarConnections = extractUseCalendarConnectionsFromAgentSource(agentSource);
-    const useEmailConfiguration = extractUseEmailConfigurationFromAgentSource(agentSource);
     const messageSuffix = resolveMessageSuffixFromAgentSource(agentSource);
     const incomingParameters = normalizeAgentChatIncomingParameters(rawParameters);
     const [preparedAgentModelRequirements, requestIdentities] = await Promise.all([
@@ -166,7 +164,6 @@ export async function resolveAgentChatRouteContext(
         currentUserId: currentUserIdentity?.userId,
         agentId,
         calendarConnections,
-        useEmailConfiguration,
     });
     const runtimeTools = createAgentProgressTools(createChatAttachmentTools([], attachments));
     const promptParameters = composePromptParametersWithMemoryContext({
@@ -178,7 +175,6 @@ export async function resolveAgentChatRouteContext(
         projectRepositories,
         projectGithubToken,
         emailSmtpCredential,
-        emailFromAddress: useEmailConfiguration.senderEmail,
         calendarGoogleAccessToken,
         calendarConnections,
         chatAttachments: attachments,
@@ -288,9 +284,8 @@ async function resolveAgentChatCredentials(options: {
     currentUserId: number | undefined;
     agentId: string;
     calendarConnections: ReturnType<typeof extractUseCalendarConnectionsFromAgentSource>;
-    useEmailConfiguration: ReturnType<typeof extractUseEmailConfigurationFromAgentSource>;
 }): Promise<AgentChatCredentials> {
-    const { currentUserId, agentId, calendarConnections, useEmailConfiguration } = options;
+    const { currentUserId, agentId, calendarConnections } = options;
     const [projectGithubToken, calendarGoogleAccessToken, emailSmtpCredential] = await Promise.all([
         resolveUseProjectGithubToken({
             userId: currentUserId,
@@ -302,12 +297,10 @@ async function resolveAgentChatCredentials(options: {
                   agentPermanentId: agentId,
               })
             : Promise.resolve(undefined),
-        useEmailConfiguration.isEnabled
-            ? resolveUseEmailSmtpCredential({
-                  userId: currentUserId,
-                  agentPermanentId: agentId,
-              })
-            : Promise.resolve(undefined),
+        resolveUseEmailSmtpCredential({
+            userId: currentUserId,
+            agentPermanentId: agentId,
+        }),
     ]);
 
     return {

package/apps/agents-server/src/app/agents/[agentName]/api/voice/route.ts

@@ -9,7 +9,6 @@ import {
     resolveMetaDisclaimerMarkdownFromAgentSource,
     resolveMetaDisclaimerStatusForUser,
 } from '@/src/utils/metaDisclaimer';
-import { extractUseEmailConfigurationFromAgentSource } from '@/src/utils/emails/extractUseEmailConfigurationFromAgentSource';
 import { extractProjectRepositoriesFromAgentSource } from '@/src/utils/projects/extractProjectRepositoriesFromAgentSource';
 import { extractUseCalendarConnectionsFromAgentSource } from '@/src/utils/calendars/extractUseCalendarConnectionsFromAgentSource';
 import { logCalendarToolCallsActivity } from '@/src/utils/calendars/logCalendarToolCallsActivity';
@@ -122,7 +121,6 @@ export async function POST(request: Request, { params }: { params: Promise<{ age
         const unresolvedAgentSource = resolvedAgentContext.unresolvedAgentSource;
         const projectRepositories = extractProjectRepositoriesFromAgentSource(agentSource);
         const calendarConnections = extractUseCalendarConnectionsFromAgentSource(agentSource);
-        const useEmailConfiguration = extractUseEmailConfigurationFromAgentSource(agentSource);
         const projectGithubToken = await resolveUseProjectGithubToken({
             userId: currentUserIdentity?.userId,
             agentPermanentId,
@@ -134,12 +132,10 @@ export async function POST(request: Request, { params }: { params: Promise<{ age
                       agentPermanentId,
                   })
                 : undefined;
-        const emailSmtpCredential = useEmailConfiguration.isEnabled
-            ? await resolveUseEmailSmtpCredential({
-                  userId: currentUserIdentity?.userId,
-                  agentPermanentId,
-              })
-            : undefined;
+        const emailSmtpCredential = await resolveUseEmailSmtpCredential({
+            userId: currentUserIdentity?.userId,
+            agentPermanentId,
+        });
         const disclaimerMarkdown = resolveMetaDisclaimerMarkdownFromAgentSource(agentSource);
 
         if (disclaimerMarkdown) {
@@ -183,7 +179,6 @@ export async function POST(request: Request, { params }: { params: Promise<{ age
             projectRepositories,
             projectGithubToken,
             emailSmtpCredential,
-            emailFromAddress: useEmailConfiguration.senderEmail,
             calendarGoogleAccessToken,
             calendarConnections,
             localServerUrl,

package/apps/agents-server/src/app/api/scrape/route.ts

@@ -1,6 +1,6 @@
 import { serializeError } from '@promptbook-local/utils';
 import { NextRequest, NextResponse } from 'next/server';
-import { fetchUrlContent } from '../../../../../../src/commitments/USE_BROWSER/fetchUrlContent';
+import { fetchUrlContent } from '../../../../../../src/scrapers/_common/utils/fetchUrlContent';
 import { assertsError } from '../../../../../../src/errors/assertsError';
 import { getCurrentUser } from '../../../utils/getCurrentUser';
 import { assertSafeUrl } from '../../../utils/assertSafeUrl';

package/apps/agents-server/src/app/layout.tsx

@@ -4,6 +4,7 @@ import { createThemeModeBootstrapScript } from '@/src/components/ThemeMode/creat
 import { APPLICATION_FONT_VARIABLE_CLASS_NAME } from '@/src/utils/applicationFonts';
 import type { Metadata } from 'next';
 import { cookies, headers } from 'next/headers';
+import { connection } from 'next/server';
 import { CONTENT_SECURITY_POLICY_NONCE_REQUEST_HEADER } from '../middleware/contentSecurityPolicy';
 import { getCustomJavascriptWithIntegrations } from '../database/customJavascript';
 import { getAggregatedCustomStylesheetCss } from '../database/customStylesheet';
@@ -72,6 +73,8 @@ import {
     readStalwartEmailSnapshot,
 } from '../utils/stalwart/readStalwartEmailSnapshot';
 import { readStalwartConfiguration } from '../utils/stalwart/StalwartConfiguration';
+import { isVpsSelfUpdateJobRunning } from '../utils/vpsSelfUpdate/isVpsSelfUpdateJobRunning';
+import { readVpsSelfUpdateJobSnapshot } from '../utils/vpsSelfUpdate/readPersistedVpsSelfUpdateJob';
 import { readAgentsServerFooterVersion } from '../utils/vpsSelfUpdate/readAgentsServerFooterVersion';
 import '@prisma/studio-core/ui/index.css';
 import './globals.css';
@@ -279,6 +282,25 @@ async function resolveInternalS3WarningStatus(isGlobalAdmin: boolean): Promise<b
     }
 }
 
+/**
+ * Resolves whether a standalone VPS self-update is running right now.
+ *
+ * @param isGlobalAdmin - Whether the current viewer may see VPS-wide operational details.
+ * @returns `true` when a self-update job is in progress.
+ */
+async function resolveSelfUpdateRunningStatus(isGlobalAdmin: boolean): Promise<boolean> {
+    if (!isGlobalAdmin) {
+        return false;
+    }
+
+    try {
+        return isVpsSelfUpdateJobRunning(await readVpsSelfUpdateJobSnapshot());
+    } catch (error) {
+        console.error('Failed to resolve self-update running status:', error);
+        return false;
+    }
+}
+
 /**
  * Generates metadata.
  */
@@ -349,6 +371,11 @@ export default async function RootLayout({
 }: Readonly<{
     children: React.ReactNode;
 }>) {
+    // Every page uses this request-aware layout (cookies, headers, and the current user). Tell Next.js before
+    // starting its database-backed work so a production build does not repeat that work for every static-render
+    // attempt only to discover that the route must be dynamic.
+    await connection();
+
     const layoutMetadataPromise = getMetadataMap([
         'SERVER_NAME',
         'SERVER_LOGO_URL',
@@ -394,6 +421,7 @@ export default async function RootLayout({
     const vpsEmailServerWarningPromise = isGlobalAdminPromise.then(resolveVpsEmailServerWarningStatus);
     const serversDnsWarningPromise = isGlobalAdminPromise.then(resolveServersDnsWarningStatus);
     const internalS3WarningPromise = isGlobalAdminPromise.then(resolveInternalS3WarningStatus);
+    const selfUpdateRunningPromise = isGlobalAdminPromise.then(resolveSelfUpdateRunningStatus);
     const serverVisibilityPromise = getServerVisibility();
     const agentNamingPromise = getAgentNaming();
     const organizationStatePromise = isAdminPromise.then((isAdmin) =>
@@ -494,6 +522,7 @@ export default async function RootLayout({
         isVpsEmailServerWarningShown,
         isServersDnsWarningShown,
         isInternalS3WarningShown,
+        isSelfUpdateRunning,
     ] = await Promise.all([
         isAdminPromise,
         isGlobalAdminPromise,
@@ -520,6 +549,7 @@ export default async function RootLayout({
         vpsEmailServerWarningPromise,
         serversDnsWarningPromise,
         internalS3WarningPromise,
+        selfUpdateRunningPromise,
     ]);
 
     const serverName = layoutMetadata.SERVER_NAME || 'Promptbook Agents Server';
@@ -619,6 +649,7 @@ export default async function RootLayout({
                     isVpsEmailServerWarningShown={isVpsEmailServerWarningShown}
                     isServersDnsWarningShown={isServersDnsWarningShown}
                     isInternalS3WarningShown={isInternalS3WarningShown}
+                    isSelfUpdateRunning={isSelfUpdateRunning}
                     isExperimentalPwaAppEnabled={isExperimentalPwaAppEnabled}
                     controlPanelOptionAvailability={controlPanelOptionAvailability}
                     defaultServerLanguage={serverLanguage}

package/apps/agents-server/src/app/system/user-wallet/UserWalletDraft.ts

@@ -56,7 +56,7 @@ type UserWalletRecordRequestPayload = Omit<CreateUserWalletRecordOptions, 'userI
 const USE_EMAIL_SMTP_WALLET_SCHEMA_TEXT = formatWalletJsonSchemaForTextarea(USE_EMAIL_SMTP_WALLET_SECRET_JSON_SCHEMA);
 
 /**
- * Returns true when record identity matches USE EMAIL SMTP credentials.
+ * Returns true when record identity matches the agent email SMTP credentials.
  *
  * @private function of UserWalletClient
  */
@@ -219,7 +219,7 @@ export function clearSensitiveUserWalletDraftFields(draft: UserWalletDraft): Use
 }
 
 /**
- * Applies SMTP defaults to simplify USE EMAIL setup.
+ * Applies SMTP defaults to simplify agent email setup.
  *
  * @private function of UserWalletClient
  */

package/apps/agents-server/src/components/AgentProfile/AgentCapabilityChips.tsx

@@ -3,13 +3,10 @@ import {
     Book,
     Calendar,
     Code,
-    Clock8Icon,
     ExternalLink,
     FileText,
-    Globe,
     Link,
     MapPin,
-    Search,
     Shield,
     ShieldAlert,
     ShieldQuestionMarkIcon,
@@ -33,11 +30,6 @@ export const HOMEPAGE_CAPABILITY_CHIPS_LIMIT = 3;
  */
 export const AGENT_PROFILE_CAPABILITY_CHIPS_LIMIT = 7;
 
-/**
- * Capability types omitted from homepage agent cards.
- */
-export const AGENT_CARD_HIDDEN_CAPABILITY_TYPES: ReadonlyArray<AgentCapability['type']> = ['time'];
-
 /**
  * Constant for max individual knowledge chips.
  */
@@ -49,19 +41,7 @@ const MAX_INDIVIDUAL_KNOWLEDGE_CHIPS = 2;
 const CAPABILITY_PRIORITY_BUCKETS: ReadonlyArray<ReadonlyArray<AgentCapability['type']>> = [
     ['team'],
     ['inheritance', 'import'],
-    [
-        'browser',
-        'search-engine',
-        'timeout',
-        'time',
-        'user-location',
-        'image-generator',
-        'email',
-        'privacy',
-        'project',
-        'calendar',
-        'wallet',
-    ],
+    ['user-location', 'image-generator', 'privacy', 'project', 'calendar'],
     ['knowledge'],
 ];
 
@@ -188,11 +168,8 @@ export function AgentCapabilityChips({
 
                 const Icon =
                     {
-                        Globe,
-                        Search,
                         Book,
                         FileText,
-                        Clock: Clock8Icon,
                         SquareArrowOutUpRight,
                         SquareArrowUpRight,
                         ShieldAlert,

package/apps/agents-server/src/components/Header/Header.tsx

@@ -20,6 +20,7 @@ import { buildDocumentationDropdownItems } from './buildDocumentationDropdownIte
 import { buildFederatedDropdownItems } from './buildFederatedDropdownItems';
 import { buildHeaderMenuItems } from './buildHeaderMenuItems';
 import { buildHeaderSystemMenuItems } from './buildHeaderSystemMenuItems';
+import { resolveHeaderSystemActivities } from './resolveHeaderSystemActivities';
 import { resolveHeaderSystemWarnings } from './resolveHeaderSystemWarnings';
 import { HeaderControlPanelDropdown } from './ControlPanel/ControlPanel';
 import { HeaderDesktopContextNavigation } from './HeaderDesktopContextNavigation';
@@ -65,6 +66,7 @@ export function Header(props: HeaderProps) {
         isVpsEmailServerWarningShown = false,
         isServersDnsWarningShown = false,
         isInternalS3WarningShown = false,
+        isSelfUpdateRunning = false,
     } = props;
     const [isChangePasswordOpen, setIsChangePasswordOpen] = useState(false);
     const router = useRouter();
@@ -276,6 +278,10 @@ export function Header(props: HeaderProps) {
             isInternalS3WarningShown,
         ],
     );
+    const systemActivities = useMemo(
+        () => resolveHeaderSystemActivities({ isGlobalAdmin, isSelfUpdateRunning }),
+        [isGlobalAdmin, isSelfUpdateRunning],
+    );
     const systemMenuEntries = useMemo(
         () =>
             buildHeaderSystemMenuItems({
@@ -287,6 +293,7 @@ export function Header(props: HeaderProps) {
                 feedbackMode,
                 shibbolethAuthenticationStatus,
                 systemWarnings,
+                systemActivities,
             }),
         [
             currentUser,
@@ -295,6 +302,7 @@ export function Header(props: HeaderProps) {
             isExperimental,
             isGlobalAdmin,
             shibbolethAuthenticationStatus,
+            systemActivities,
             systemWarnings,
             t,
         ],

package/apps/agents-server/src/components/Header/HeaderTypes.ts

@@ -99,6 +99,11 @@ export type HeaderProps = {
      * Whether the active self-contained S3 storage needs super-admin attention.
      */
     isInternalS3WarningShown?: boolean;
+
+    /**
+     * Whether a standalone VPS self-update is running right now (super-admin-only activity).
+     */
+    isSelfUpdateRunning?: boolean;
 };
 
 /**

package/apps/agents-server/src/components/Header/buildHeaderSystemMenuItems.ts

@@ -37,6 +37,7 @@ import {
     MousePointerClick,
     Paintbrush,
     PlugZap,
+    RefreshCcw,
     RefreshCw,
     Scale,
     ScrollText,
@@ -63,6 +64,7 @@ import type { ServerTranslationKey } from '../../languages/ServerTranslationKeys
 import type { ShibbolethAuthenticationMenuStatus } from '../../constants/shibbolethAuth';
 import type { ChatFeedbackMode } from '../../utils/chatFeedbackMode';
 import type { UserInfo } from '../../utils/getCurrentUser';
+import { isHeaderSystemActivityShownForHref, type HeaderSystemActivities } from './resolveHeaderSystemActivities';
 import {
     isHeaderSystemWarningShownForCategory,
     isHeaderSystemWarningShownForHref,
@@ -160,6 +162,7 @@ type BuildHeaderSystemMenuItemsOptions = {
     readonly feedbackMode: ChatFeedbackMode;
     readonly shibbolethAuthenticationStatus?: ShibbolethAuthenticationMenuStatus;
     readonly systemWarnings?: HeaderSystemWarnings;
+    readonly systemActivities?: HeaderSystemActivities;
 };
 
 /**
@@ -172,6 +175,15 @@ const EMPTY_HEADER_SYSTEM_WARNINGS: HeaderSystemWarnings = {
     isSystemWarningShown: false,
 };
 
+/**
+ * Shared activity-free fallback for callers that only need the static System menu structure.
+ *
+ * @private constant of Header
+ */
+const EMPTY_HEADER_SYSTEM_ACTIVITIES: HeaderSystemActivities = {
+    activities: [],
+};
+
 /**
  * Default icon used for each System dropdown category.
  */
@@ -297,42 +309,104 @@ function applySystemSubMenuIcons(
 }
 
 /**
- * Decorates a System menu label with the shared warning indicator.
+ * Kinds of status indicator that can decorate a System menu label.
+ *
+ * @private type of Header
+ */
+type SystemMenuIndicatorKind = 'warning' | 'activity';
+
+/**
+ * Visual definition of one System menu status indicator.
+ *
+ * @private type of Header
+ */
+type SystemMenuIndicatorDefinition = {
+    /**
+     * Icon rendered after the menu label.
+     */
+    readonly icon: LucideIcon;
+
+    /**
+     * Utility classes applied to the indicator icon.
+     */
+    readonly className: string;
+
+    /**
+     * Accessible description of the indicated state.
+     */
+    readonly ariaLabel: string;
+};
+
+/**
+ * Look of every System menu status indicator, kept in one place so labels never style icons themselves.
+ *
+ * @private constant of Header
+ */
+const SYSTEM_MENU_INDICATOR_DEFINITIONS: Record<SystemMenuIndicatorKind, SystemMenuIndicatorDefinition> = {
+    warning: {
+        icon: TriangleAlert,
+        className: 'h-4 w-4 text-amber-500',
+        ariaLabel: 'Warning',
+    },
+    activity: {
+        icon: RefreshCcw,
+        className: 'h-4 w-4 animate-spin text-blue-500',
+        ariaLabel: 'Running',
+    },
+};
+
+/**
+ * Resolves which indicator, if any, one System menu destination currently shows.
+ *
+ * @private type of Header
+ */
+type SystemMenuIndicatorResolver = (href: string) => SystemMenuIndicatorKind | null;
+
+/**
+ * Decorates a System menu label with one shared status indicator.
  *
  * @private function of Header
  */
-function createWarningMenuLabel(label: string) {
+function createIndicatorMenuLabel(label: string, indicatorKind: SystemMenuIndicatorKind) {
+    const indicator = SYSTEM_MENU_INDICATOR_DEFINITIONS[indicatorKind];
+
     return createElement(
         'span',
         { className: 'inline-flex items-center gap-2' },
         label,
-        createElement(TriangleAlert, {
-            className: 'h-4 w-4 text-amber-500',
-            'aria-label': 'Warning',
+        createElement(indicator.icon, {
+            className: indicator.className,
+            'aria-label': indicator.ariaLabel,
         }),
     );
 }
 
 /**
- * Decorates every System menu entry whose destination currently has a visible warning.
+ * Decorates every System menu entry whose destination currently has a visible status indicator.
  *
- * The warning registry owns the route-to-warning mapping, so adding another operational warning
- * does not require scattered leaf-label conditionals throughout this menu tree.
+ * The warning and activity registries own the route-to-indicator mapping, so adding another
+ * operational state does not require scattered leaf-label conditionals throughout this menu tree.
  *
  * @private function of Header
  */
-function applySystemSubMenuWarnings(
+function applySystemSubMenuIndicators(
     items: ReadonlyArray<SubMenuItem>,
-    systemWarnings: HeaderSystemWarnings,
+    resolveIndicatorKind: SystemMenuIndicatorResolver,
 ): SubMenuItem[] {
-    return items.map((item) => ({
-        ...item,
-        label:
-            item.href && typeof item.label === 'string' && isHeaderSystemWarningShownForHref(systemWarnings, item.href)
-                ? createWarningMenuLabel(item.label)
-                : item.label,
-        items: item.items ? applySystemSubMenuWarnings(item.items, systemWarnings) : item.items,
-    }));
+    return items.map((item) => {
+        const decoratedItems = item.items ? applySystemSubMenuIndicators(item.items, resolveIndicatorKind) : item.items;
+
+        if (!item.href || typeof item.label !== 'string') {
+            return { ...item, items: decoratedItems };
+        }
+
+        const indicatorKind = resolveIndicatorKind(item.href);
+        return {
+            ...item,
+            label: indicatorKind ? createIndicatorMenuLabel(item.label, indicatorKind) : item.label,
+            items: decoratedItems,
+        };
+    });
 }
 
 /**
@@ -354,7 +428,7 @@ function createSystemCategory(
     return [
         {
             label: isWarningShown
-                ? createWarningMenuLabel(translate(SYSTEM_CATEGORY_TRANSLATION_KEY_MAP[label]))
+                ? createIndicatorMenuLabel(translate(SYSTEM_CATEGORY_TRANSLATION_KEY_MAP[label]), 'warning')
                 : translate(SYSTEM_CATEGORY_TRANSLATION_KEY_MAP[label]),
             icon: categoryIcon,
             items: applySystemSubMenuIcons(items, categoryIcon),
@@ -376,6 +450,7 @@ export function buildHeaderSystemMenuItems({
     feedbackMode,
     shibbolethAuthenticationStatus,
     systemWarnings = EMPTY_HEADER_SYSTEM_WARNINGS,
+    systemActivities = EMPTY_HEADER_SYSTEM_ACTIVITIES,
 }: BuildHeaderSystemMenuItemsOptions): SubMenuItem[] {
     const userAccountSystemItems: SubMenuItem[] = [
         {
@@ -629,33 +704,46 @@ export function buildHeaderSystemMenuItems({
             : []),
     ];
 
-    const applyWarnings = (items: ReadonlyArray<SubMenuItem>): SubMenuItem[] =>
-        applySystemSubMenuWarnings(items, systemWarnings);
+    // Note: A warning always wins over a running activity, so a menu entry which needs administrator
+    //       attention is never hidden behind the progress of a background job.
+    const resolveIndicatorKind: SystemMenuIndicatorResolver = (href) => {
+        if (isHeaderSystemWarningShownForHref(systemWarnings, href)) {
+            return 'warning';
+        }
+
+        if (isHeaderSystemActivityShownForHref(systemActivities, href)) {
+            return 'activity';
+        }
+
+        return null;
+    };
+    const applyIndicators = (items: ReadonlyArray<SubMenuItem>): SubMenuItem[] =>
+        applySystemSubMenuIndicators(items, resolveIndicatorKind);
 
     return [
-        ...createSystemCategory('My Account', applyWarnings(userAccountSystemItems), translate),
-        ...createSystemCategory('Utilities', applyWarnings(utilitiesSystemItems), translate),
+        ...createSystemCategory('My Account', applyIndicators(userAccountSystemItems), translate),
+        ...createSystemCategory('Utilities', applyIndicators(utilitiesSystemItems), translate),
         ...createSystemCategory(
             'Super Admin',
-            applyWarnings(superAdminSystemItems),
+            applyIndicators(superAdminSystemItems),
             translate,
             isHeaderSystemWarningShownForCategory(systemWarnings, 'Super Admin'),
         ),
         ...createSystemCategory(
             'Administration',
-            applyWarnings(administrationSystemItems),
+            applyIndicators(administrationSystemItems),
             translate,
             isHeaderSystemWarningShownForCategory(systemWarnings, 'Administration'),
         ),
         ...createSystemCategory(
             'Login Methods',
-            applyWarnings(loginMethodsSystemItems),
+            applyIndicators(loginMethodsSystemItems),
             translate,
             isHeaderSystemWarningShownForCategory(systemWarnings, 'Login Methods'),
         ),
-        ...createSystemCategory('Monitoring & Usage', applyWarnings(monitoringAndUsageSystemItems), translate),
-        ...createSystemCategory('Integrations & Keys', applyWarnings(integrationsAndKeysSystemItems), translate),
-        ...createSystemCategory('Developer / Debug', applyWarnings(developerDebugSystemItems), translate),
-        ...createSystemCategory('Legal & About', applyWarnings(legalAndAboutSystemItems), translate),
+        ...createSystemCategory('Monitoring & Usage', applyIndicators(monitoringAndUsageSystemItems), translate),
+        ...createSystemCategory('Integrations & Keys', applyIndicators(integrationsAndKeysSystemItems), translate),
+        ...createSystemCategory('Developer / Debug', applyIndicators(developerDebugSystemItems), translate),
+        ...createSystemCategory('Legal & About', applyIndicators(legalAndAboutSystemItems), translate),
     ];
 }