@sentry/junior 0.206.0 → 0.208.0

package/dist/{agent-C9yuiZUF.js → agent-BfxfHsf1.js}

@@ -1,28 +1,28 @@
-import { C as resolveGatewayCredential, S as getGatewayApiKey, _ as findProviderError, b as isProviderRetryError, c as COMPACTION_SUMMARY_PREFIX, d as isCompactionSummaryText, f as renderCurrentInstruction, g as createProviderError, h as ProviderError, i as completeText, l as MODEL_HANDOFF_SUMMARY_PREFIX, m as escapeXml, n as GEN_AI_SERVER_ADDRESS, o as resolveGatewayModel, p as unwrapCurrentInstruction, r as completeObject, s as ACTIVE_TURN_COMPACTION_SUMMARY_PREFIX, t as GEN_AI_PROVIDER_NAME, u as hasCompactedConversationContext, v as getProviderErrorAttributes, x as MISSING_GATEWAY_CREDENTIALS_ERROR } from "./client-ceE7NtvC.js";
-import { C as withSpan, F as isRecord$2, P as normalizeIdentityEmail, S as withLogContext, _ as setSpanAttributes, a as extractGenAiUsageSummary, b as summarizeMessageText, c as getTracePropagationHeaders, d as logInfo, f as logWarn, h as serializeGenAiAttribute, i as extractGenAiUsageAttributes, l as logError, p as normalizeGenAiFinishReason, s as getLogContextAttributesForSpan, u as logException, v as setSpanStatus, y as setTags } from "./logging-D37bayDc.js";
+import { C as resolveGatewayCredential, S as getGatewayApiKey, _ as findProviderError, b as isProviderRetryError, c as COMPACTION_SUMMARY_PREFIX, d as isCompactionSummaryText, f as renderCurrentInstruction, g as createProviderError, h as ProviderError, i as completeText, l as MODEL_HANDOFF_SUMMARY_PREFIX, m as escapeXml, n as GEN_AI_SERVER_ADDRESS, o as resolveGatewayModel, p as unwrapCurrentInstruction, r as completeObject, s as ACTIVE_TURN_COMPACTION_SUMMARY_PREFIX, t as GEN_AI_PROVIDER_NAME, u as hasCompactedConversationContext, v as getProviderErrorAttributes, x as MISSING_GATEWAY_CREDENTIALS_ERROR } from "./client-bRyPqwAV.js";
+import { C as withSpan, F as isRecord$2, P as normalizeIdentityEmail, S as withLogContext, _ as setSpanAttributes, a as extractGenAiUsageSummary, b as summarizeMessageText, c as getTracePropagationHeaders, d as logInfo, f as logWarn, h as serializeGenAiAttribute, i as extractGenAiUsageAttributes, l as logError, p as normalizeGenAiFinishReason, s as getLogContextAttributesForSpan, u as logException, v as setSpanStatus, y as setTags } from "./logging-sNS84Yuu.js";
 import { _ as withActiveSpan, m as startInactiveSpan } from "./sentry-CD3SdJl-.js";
-import { a as toCanonicalInputMessage, c as toGenAiPayloadMetadata, i as runWithConversationPrivacy, l as toGenAiPayloadTraceAttributes, o as toCanonicalOutputMessage, r as resolveConversationPrivacy, s as toGenAiMessagesTraceAttributes, t as canExposeConversationPayload } from "./conversation-privacy-Auyq26XQ.js";
-import { h as normalizeSlackEmojiName, n as botConfig } from "./config-CIE83sR2.js";
+import { a as toCanonicalInputMessage, c as toGenAiPayloadMetadata, i as runWithConversationPrivacy, l as toGenAiPayloadTraceAttributes, o as toCanonicalOutputMessage, r as resolveConversationPrivacy, s as toGenAiMessagesTraceAttributes, t as canExposeConversationPayload } from "./conversation-privacy-whGaV2TG.js";
+import { h as normalizeSlackEmojiName, n as botConfig } from "./config-EtF2uEaW.js";
 import { a as modelIdForProfile, c as TURN_REASONING_LEVELS, i as formatModelProfiles, o as modelProfileSchema, r as formatModelProfile, s as profileConfig, t as ModelProfileNotConfiguredError } from "./model-profile-CZmVoGdX.js";
-import { _ as parseSlackMessageTs, g as parseSlackUserId, h as parseSlackTeamId, i as credentialUserSubjectId, l as isUserActor, m as parseSlackChannelReferenceId, n as credentialContextSchema, p as parseSlackChannelId, t as credentialContextForActor } from "./context-B45_WqVX.js";
-import { A as tryWorkspaceRepoCheckoutPath, B as downloadPrivateSlackFile, C as invalidateReadySnapshot, D as SANDBOX_RUNTIME, E as setWorkspaceSnapshotBuild, Ft as getConversationStore, It as getDb, J as withSlackRetries, K as normalizeSlackConversationId, Lt as getSqlExecutor, M as resolveChannelCapabilities, Nt as getConversationEventStore, O as deleteWorkspaceSnapshotBuilders, Pt as getConversationMessageSearchStore, Q as readActorIdentity, S as WorkspaceValidationError, T as setWorkspaceSnapshot, U as getSlackClient, V as getFilePermalink, W as isConversationScopedChannel, Xt as parseDestination, _ as deleteWorkspace, at as STOP_WATCHING_TOOL_NAME, b as listWorkspaces, bt as createPluginLogger, c as getPluginTools, dt as findMatchingResourceEventSubscriptions, ft as listResourceEventSubscriptions, g as createWorkspace, ht as getDashboardTaskLink, it as RESOURCE_WATCH_TOOL_SOURCE, j as workspaceRepoCheckoutPath, k as getWorkspaceSnapshotBuilder, l as getPluginUserPromptContributions, lt as createResourceEventSubscription, mt as getDashboardConversationLink, nt as RESOURCE_SUBSCRIPTION_DEFAULT_TTL_MS, ot as cancelResourceEventSubscription, pt as JUNIOR_THREAD_STATE_TTL_MS, r as createPluginHookRunner, s as getPluginSystemPromptContributions, st as cancelSubscriptions, tt as getSlackToolContext, u as getPlugins, ut as deliverResourceEventSubscription, v as getWorkspace, w as loadSnapshotsForProfile, x as updateWorkspace, y as getWorkspaceByName, z as SlackActionError } from "./agent-hooks-DNjlz2A-.js";
+import { _ as parseSlackMessageTs, g as parseSlackUserId, h as parseSlackTeamId, i as credentialUserSubjectId, l as isUserActor, m as parseSlackChannelReferenceId, n as credentialContextSchema, p as parseSlackChannelId, t as credentialContextForActor } from "./context-Bplcgypl.js";
+import { A as tryWorkspaceRepoCheckoutPath, B as downloadPrivateSlackFile, C as invalidateReadySnapshot, D as SANDBOX_RUNTIME, E as setWorkspaceSnapshotBuild, Gt as getDb, Ht as getConversationEventStore, J as withSlackRetries, K as normalizeSlackConversationId, Kt as getSqlExecutor, M as resolveChannelCapabilities, O as deleteWorkspaceSnapshotBuilders, Q as readActorIdentity, S as WorkspaceValidationError, T as setWorkspaceSnapshot, U as getSlackClient, Ut as getConversationMessageSearchStore, V as getFilePermalink, W as isConversationScopedChannel, Wt as getConversationStore, _ as deleteWorkspace, an as parseDestination, at as STOP_WATCHING_TOOL_NAME, b as listWorkspaces, bt as createPluginLogger, c as getPluginTools, dt as findMatchingWatches, ft as listWatches, g as createWorkspace, ht as getDashboardTaskLink, it as RESOURCE_WATCH_TOOL_SOURCE, j as workspaceRepoCheckoutPath, k as getWorkspaceSnapshotBuilder, l as getPluginUserPromptContributions, lt as createWatch, mt as getDashboardConversationLink, nt as RESOURCE_SUBSCRIPTION_DEFAULT_TTL_MS, ot as cancelSubscriptions, pt as JUNIOR_THREAD_STATE_TTL_MS, r as createPluginHookRunner, s as getPluginSystemPromptContributions, st as cancelWatch, tt as getSlackToolContext, u as getPlugins, ut as deliverWatch, v as getWorkspace, w as loadSnapshotsForProfile, x as updateWorkspace, y as getWorkspaceByName, z as SlackActionError } from "./agent-hooks-CuGjLjmR.js";
 import { n as juniorDestinations } from "./destinations-BeBiJeEM.js";
-import { D as juniorArtifacts, S as juniorAttachments, T as juniorIdentities, a as juniorSchedulerRuns, d as AGENT_INVOCATION_MAILBOX_STATUSES, g as juniorConversationBriefs, w as juniorConversations, y as juniorConversationAnnotations } from "./executor-BfbYPW63.js";
+import { D as juniorArtifacts, S as juniorAttachments, T as juniorIdentities, a as juniorSchedulerRuns, d as AGENT_INVOCATION_MAILBOX_STATUSES, g as juniorConversationBriefs, w as juniorConversations, y as juniorConversationAnnotations } from "./executor-BW5qp0jC.js";
 import { A as briefLinkSchema, F as KNOWN_CONVERSATION_EVENT_TYPES, G as instructionProvenanceFor, K as sameActorIdentity, M as conversationBriefSchema, U as contextProvenance, W as instructionActors, j as briefOutcomeStatusSchema } from "./conversation-AA4R1VUn.js";
 import { a as listReferenceFiles, c as soulPathCandidates, l as worldPathCandidates } from "./package-discovery-7a9YqLhE.js";
-import { a as resolvePluginCommandEnv, c as getOAuthProviderErrorAttributes, i as resolveAuthTokenPlaceholder, o as OAuthProviderError, s as fetchWithBoundedOAuthErrorBodies, u as CredentialUnavailableError } from "./registry-DiR0-xRg.js";
-import { n as pluginCatalogRuntime } from "./catalog-runtime-TBR8n4e1.js";
-import { a as parseSkillInvocation, n as findSkillByName, r as loadSkillsByName, t as discoverSkills } from "./skills-BhM5qyCF.js";
-import { A as normalizeToLf$1, At as retainRuntimeTurnContext, B as openConversationProjection, C as DEFAULT_SEARCH_COMMAND_TIMEOUT_MS, Ct as hasRuntimeTurnContext, D as getRipgrepSearchLocation, Dt as isToolResultError, E as collectFiles, Et as isContinuablePiBoundary, G as recordAuthorizationRequested, H as recordAttachmentsDelivered, I as loadConnectedMcpProviders, K as recordGuardianActionReviewed, L as loadConversationProjection, M as resolveWorkspacePath, Mt as trimTrailingAssistantMessages, N as truncateText$1, Nt as TURN_CONTEXT_TAG, O as isMissingPathError, Ot as isToolResultMessage, S as resolveRepositoryInstructionsForDirectories, St as getUserMessageInstructionText, T as RIPGREP_EXCLUDED_GLOBS, Tt as isAssistantMessage, V as recordAgentsInstructionsUpdated, X as recordTurnRoute, Y as recordToolExecutionStarted, _ as AGENTS_REPLACEMENT_NOTICE, _t as historyItemFromPiMessage, b as listRepositoryDirectories, bt as getPiMessageRole, f as TurnSliceLimitExceededError, g as AGENTS_REMOVAL_NOTICE, gt as getAgentContextInputLimitTokens, h as isTurnExecutionLimitExceededError, ht as getAgentContextCompactionTriggerTokens, j as positiveInteger$1, jt as stripRuntimeTurnContext, k as missingPathSearchResult, kt as normalizeToolNameFromResult, mt as estimateTextTokens, n as loadTurnCheckpoint, p as assertTurnToolCallLimit, q as recordMcpProviderConnected, r as saveTurnCheckpoint, t as continuableMessages, v as buildAgentsInstructionsMessage, vt as piMessageFromHistoryItem, w as MAX_TEXT_CHARS, x as renderAgentsInstructions, xt as getTerminalAssistantMessages, y as findVisibleAgentsInstructions, yt as extractAssistantText, z as loadTurnRoute } from "./checkpoint-BY47jJCB.js";
-import { a as hasAgentTurnUsage, c as generateShortTitle, l as resolveTaskTitle, o as ToolInputError, t as addAgentTurnUsage } from "./usage-D4A48Bdl.js";
-import { A as sleep$1, D as fenceLock, E as acquireActiveLock, F as sandboxSkillDir, I as sandboxSkillFile, L as sandboxSkillPathResolution, M as SANDBOX_REPOS_ROOT, N as SANDBOX_SKILLS_ROOT, P as SANDBOX_WORKSPACE_ROOT, _ as workspaceSnapshotNotReadyUserMessage, a as isAbortError, b as buildNonInteractiveShellScript, c as isSandboxCommandStreamInterruptedError, d as isSnapshottingError, f as throwSandboxOperationError, g as isWorkspaceSnapshotNotReadyError, h as getWorkspaceSnapshotNotReadyError, i as ensureDockerDaemon, j as SANDBOX_DATA_ROOT, k as withLock, l as isSandboxMissingError, m as WorkspaceSnapshotNotReadyError, n as hash, o as isAlreadyExistsError, p as wrapSandboxSetupError, r as isStale, s as isSandboxApiTransientError, t as create, u as isSandboxUnavailableError, v as getVercelSandboxCredentials, w as getStateAdapter, x as runNonInteractiveCommand, y as buildCommandScript } from "./profile-CSixooTi.js";
-import { $ as workspaceSnapshotFinishedEvent, B as createEventTask, C as SCHEDULED_TASK_SYSTEM_ACTOR, D as eventTaskMatchesDestination, E as eventTaskListToolResultSchema, F as effectiveTaskOutcomes, Ht as injectContinuationToolName, I as moveTaskOutcomes, L as resolveTaskOutcomes, M as requireEventTaskSlackContext, N as requireSupportedEventTaskTrigger, O as eventTaskSuccess, P as writableEventTask, Q as WORKSPACE_SNAPSHOT_READY_EVENT, R as taskOutcomeInputSchema, T as compactEventTask, Ut as juniorToolOutputSchema, V as deleteEventTask, W as getEventTask, Wt as makeStructuredToolOutput, X as getResourceEventCatalog, Y as saveEventTask, Z as WORKSPACE_SNAPSHOT_FAILED_EVENT, at as pluginSupportsEvent, c as parseSlackThreadId, ct as registeredResourceTypeSchema, et as workspaceSnapshotWatch, f as createScheduledTask, g as listScheduledTasksForTeam, i as readLiveAttachment, it as normalizeEventIdentifier, j as registeredEventTaskTriggerSchema, k as eventTaskToolResultSchema, lt as requireSupportedResourceEventMatch, nt as hasPluginResourceEventCatalogEntries, ot as registeredEventTypeSchema, pt as appendAndEnqueueInboundMessage, q as listEventTasksForTeam, rt as hasResourceEventCatalogEntries, s as storeAttachments, st as registeredResourceEventMatchSchema, t as incrementStat, tt as eventNamespaceSchema, ut as resourceEventGuidance, v as readScheduledTask, y as saveScheduledTask } from "./stats-DKRP4rsY.js";
-import { _ as isTurnInputCommitLostError, c as sanitizeAssistantText, f as CooperativeTurnYieldError, l as NO_REPLY_MARKER, n as canReusePendingAuthLink, o as decideReply, p as TurnInputCommitLostError, s as getAssistantReplyText, t as abandonReplacedPendingAuth, u as isNoReplyMarker } from "./pending-auth-BPUzcs7n.js";
-import { C as toolInvocationDestination, S as surfaceFromRun, _ as uploadFilesToConversation, b as assertRunConsistency, h as postSlackMessage, i as formatProviderLabel, m as getSlackMessagePermalink, o as resolveBaseUrl, p as addReactionToMessage, r as deliverOAuthAuthorization, s as startOAuthFlow, v as RetryableDeliveryError, x as isAgentRunFeatureDisabled, y as actorFromRun } from "./agent-runner-E67lFrDG.js";
-import { r as RESOURCE_EVENT_AUTHOR_ID } from "./prompt-3gqNY1Ka.js";
-import { a as createSandboxSession, c as postinstall, d as getSandboxResources, i as bindSandboxFileSystem, l as setSnapshotSpanAttributes, n as isMissingError, o as stopSession, r as resolve$1, s as dependencies } from "./resolve-Bn5q__9b.js";
+import { a as resolvePluginCommandEnv, c as getOAuthProviderErrorAttributes, i as resolveAuthTokenPlaceholder, o as OAuthProviderError, s as fetchWithBoundedOAuthErrorBodies, u as CredentialUnavailableError } from "./registry-Cyww_jnC.js";
+import { n as pluginCatalogRuntime } from "./catalog-runtime-D8YUMNhb.js";
+import { a as parseSkillInvocation, n as findSkillByName, r as loadSkillsByName, t as discoverSkills } from "./skills-DhL_wXEp.js";
+import { A as normalizeToLf$1, At as retainRuntimeTurnContext, B as openConversationProjection, C as DEFAULT_SEARCH_COMMAND_TIMEOUT_MS, Ct as hasRuntimeTurnContext, D as getRipgrepSearchLocation, Dt as isToolResultError, E as collectFiles, Et as isContinuablePiBoundary, G as recordAuthorizationRequested, H as recordAttachmentsDelivered, I as loadConnectedMcpProviders, K as recordGuardianActionReviewed, L as loadConversationProjection, M as resolveWorkspacePath, Mt as trimTrailingAssistantMessages, N as truncateText$1, Nt as TURN_CONTEXT_TAG, O as isMissingPathError, Ot as isToolResultMessage, S as resolveRepositoryInstructionsForDirectories, St as getUserMessageInstructionText, T as RIPGREP_EXCLUDED_GLOBS, Tt as isAssistantMessage, V as recordAgentsInstructionsUpdated, X as recordTurnRoute, Y as recordToolExecutionStarted, _ as AGENTS_REPLACEMENT_NOTICE, _t as historyItemFromPiMessage, b as listRepositoryDirectories, bt as getPiMessageRole, f as TurnSliceLimitExceededError, g as AGENTS_REMOVAL_NOTICE, gt as getAgentContextInputLimitTokens, h as isTurnExecutionLimitExceededError, ht as getAgentContextCompactionTriggerTokens, j as positiveInteger$1, jt as stripRuntimeTurnContext, k as missingPathSearchResult, kt as normalizeToolNameFromResult, mt as estimateTextTokens, n as loadTurnCheckpoint, p as assertTurnToolCallLimit, q as recordMcpProviderConnected, r as saveTurnCheckpoint, t as continuableMessages, v as buildAgentsInstructionsMessage, vt as piMessageFromHistoryItem, w as MAX_TEXT_CHARS, x as renderAgentsInstructions, xt as getTerminalAssistantMessages, y as findVisibleAgentsInstructions, yt as extractAssistantText, z as loadTurnRoute } from "./checkpoint-FKMcINix.js";
+import { a as hasAgentTurnUsage, c as generateShortTitle, l as resolveTaskTitle, o as ToolInputError, t as addAgentTurnUsage } from "./usage-BMuAlKIW.js";
+import { A as sleep$1, D as fenceLock, E as acquireActiveLock, F as sandboxSkillDir, I as sandboxSkillFile, L as sandboxSkillPathResolution, M as SANDBOX_REPOS_ROOT, N as SANDBOX_SKILLS_ROOT, P as SANDBOX_WORKSPACE_ROOT, _ as workspaceSnapshotNotReadyUserMessage, a as isAbortError, b as buildNonInteractiveShellScript, c as isSandboxCommandStreamInterruptedError, d as isSnapshottingError, f as throwSandboxOperationError, g as isWorkspaceSnapshotNotReadyError, h as getWorkspaceSnapshotNotReadyError, i as ensureDockerDaemon, j as SANDBOX_DATA_ROOT, k as withLock, l as isSandboxMissingError, m as WorkspaceSnapshotNotReadyError, n as hash, o as isAlreadyExistsError, p as wrapSandboxSetupError, r as isStale, s as isSandboxApiTransientError, t as create, u as isSandboxUnavailableError, v as getVercelSandboxCredentials, w as getStateAdapter, x as runNonInteractiveCommand, y as buildCommandScript } from "./profile-BfLMVhWo.js";
+import { $ as workspaceSnapshotFinishedEvent, B as createEventAutomation, C as SCHEDULED_AUTOMATION_SYSTEM_ACTOR, D as eventAutomationMatchesDestination, E as eventAutomationListToolResultSchema, F as effectiveTaskOutcomes, Ht as injectContinuationToolName, I as moveTaskOutcomes, L as resolveTaskOutcomes, M as requireEventAutomationSlackContext, N as requireSupportedEventAutomationTrigger, O as eventAutomationToolResult, P as writableEventAutomation, Q as WORKSPACE_SNAPSHOT_READY_EVENT, R as taskOutcomeInputSchema, T as compactEventAutomation, Ut as juniorToolOutputSchema, V as deleteEventAutomation, W as getEventAutomation, Wt as makeStructuredToolOutput, X as getEventCatalog, Y as saveEventAutomation, Z as WORKSPACE_SNAPSHOT_FAILED_EVENT, at as normalizeCatalogEventIdentifier, c as parseSlackThreadId, ct as registeredEventTypeSchema, et as workspaceSnapshotWatch, f as createScheduledAutomation, g as listScheduledAutomationsForTeam, i as readLiveAttachment, it as hasPluginEventCatalogEntries, j as registeredEventAutomationTriggerSchema, k as eventAutomationToolResultSchema, lt as registeredResourceTypeSchema, nt as eventNamespaceSchema, ot as pluginSupportsEvent, pt as appendAndEnqueueInboundMessage, q as listEventAutomationsForTeam, rt as hasEventCatalogEntries, s as storeAttachments, st as registeredEventMatchSchema, t as incrementStat, tt as eventGuidance, ut as requireSupportedEventMatch, v as readScheduledAutomation, y as saveScheduledAutomation } from "./stats-Cq5w_Awk.js";
+import { _ as isTurnInputCommitLostError, c as sanitizeAssistantText, f as CooperativeTurnYieldError, l as NO_REPLY_MARKER, n as canReusePendingAuthLink, o as decideReply, p as TurnInputCommitLostError, s as getAssistantReplyText, t as abandonReplacedPendingAuth, u as isNoReplyMarker } from "./pending-auth-CRJCt9Ux.js";
+import { C as toolInvocationDestination, S as surfaceFromRun, _ as uploadFilesToConversation, b as assertRunConsistency, h as postSlackMessage, i as formatProviderLabel, m as getSlackMessagePermalink, o as resolveBaseUrl, p as addReactionToMessage, r as deliverOAuthAuthorization, s as startOAuthFlow, v as RetryableDeliveryError, x as isAgentRunFeatureDisabled, y as actorFromRun } from "./agent-runner-Dz1PMKP0.js";
+import { r as EVENT_AUTHOR_ID } from "./prompt-x-0ZtTyb.js";
+import { a as createSandboxSession, c as postinstall, d as getSandboxResources, i as bindSandboxFileSystem, l as setSnapshotSpanAttributes, n as isMissingError, o as stopSession, r as resolve$1, s as dependencies } from "./resolve-BApIFQXX.js";
 import { t as getVercelConversationWorkQueue } from "./vercel-queue-DIkVcfK4.js";
-import { a as getTurnRequestDeadline, n as sendNextWorkspaceSnapshotJob, r as sendWorkspaceSnapshotJob } from "./job-queue-CyTc24Es.js";
+import { a as getTurnRequestDeadline, n as sendNextWorkspaceSnapshotJob, r as sendWorkspaceSnapshotJob } from "./job-queue-BIHNIEIX.js";
 import { n as privateTraceResultAttributes } from "./private-trace-result-BLvBjy_e.js";
 import { streamSimple } from "@earendil-works/pi-ai/compat";
 import { createGatewayProvider } from "@ai-sdk/gateway";
@@ -33,7 +33,7 @@ import { AsyncLocalStorage } from "node:async_hooks";
 import { z } from "zod";
 import { createHash, createHmac, randomUUID, timingSafeEqual } from "node:crypto";
 import { and, desc, eq, gt, gte, inArray, isNull, lt, ne, notExists, or, sql } from "drizzle-orm";
-import { EgressAuthRequired, EgressPolicyDenied, PluginToolInputError, actorSchema, destinationSchema, missingToolAnnotationKeys, pluginAuthorizationSchema, pluginCredentialHeaderTransformSchema, pluginCredentialResultSchema, pluginGrantSchema, pluginProviderAccountSchema, pluginStoredTokensSchema, resourceEventSchema, resourceEventSubscriptionResultSchema, sourceSchema, stableResourceEventMatchKey, taskOutcomeSchema } from "@sentry/junior-plugin-api";
+import { EgressAuthRequired, EgressPolicyDenied, PluginToolInputError, actorSchema, destinationSchema, eventSchema, missingToolAnnotationKeys, pluginAuthorizationSchema, pluginCredentialHeaderTransformSchema, pluginCredentialResultSchema, pluginGrantSchema, pluginProviderAccountSchema, pluginStoredTokensSchema, sourceSchema, stableEventMatchKey, watchResultSchema } from "@sentry/junior-plugin-api";
 import { alias } from "drizzle-orm/pg-core";
 import { Agent, estimateContextTokens } from "@earendil-works/pi-agent-core";
 import fs from "node:fs/promises";
@@ -405,21 +405,22 @@ function buildTurnResult(input) {
 		"app.ai.generated_files": input.generatedFileCount
 	});
 	const usedPrimaryText = Boolean(rawPrimaryText);
+	const suppressedPrimaryText = Boolean(rawPrimaryText && !noReplyRequested && !primaryText);
 	let outcome;
 	if (isProviderError) outcome = "provider_error";
+	else if (suppressedPrimaryText) outcome = "execution_failure";
 	else if (primaryText || completedWithoutTerminalText) outcome = "success";
 	else outcome = "execution_failure";
-	const resolvedOutcome = Boolean(rawPrimaryText && !noReplyRequested && !primaryText) ? "execution_failure" : outcome;
 	if (shouldTrace) logInfo("agent.message.generated", {
 		"app.message.kind": "assistant_outbound",
 		"app.message.length": primaryText.length,
 		"app.message.output": summarizeMessageText(primaryText),
-		"app.ai.outcome": resolvedOutcome,
+		"app.ai.outcome": outcome,
 		"app.ai.assistant_messages": assistantMessages.length,
 		...stopReason ? { "gen_ai.response.finish_reasons": [stopReason] } : void 0
 	});
 	const resolvedDiagnostics = {
-		outcome: resolvedOutcome,
+		outcome,
 		modelId,
 		assistantMessageCount: assistantMessages.length,
 		reasoningLevel: executionProfile.reasoningLevel,
@@ -431,7 +432,7 @@ function buildTurnResult(input) {
 		usage,
 		stopReason,
 		errorMessage,
-		providerError: resolvedOutcome === "provider_error" && errorMessage ? createProviderError(errorMessage, {
+		providerError: outcome === "provider_error" && errorMessage ? createProviderError(errorMessage, {
 			modelId,
 			retryable: lastAssistant !== void 0 && isAssistantMessage(lastAssistant) && isRetryableAssistantError(lastAssistant)
 		}) : void 0
@@ -1146,12 +1147,12 @@ const TOOL_POLICY_RULES = [
 	"- After changing files, name the changed paths and summarize the completed result in the final answer.",
 	"- If a sandbox-backed tool reports that sandbox execution is unavailable, treat that as a blocker for local file/shell inspection; do not pretend host files were inspected.",
 	"- For user-provided URLs, use `webFetch`; for discovery, use `webSearch` then fetch/read promising sources; for current time/date context, use `systemTime`.",
-	"- When searchResourceEventTypes is exposed, use it only when the user asks what resource events are supported or the required resource type or event name is unclear. It discovers options but does not watch a resource or create a task. When explaining how results can be used, distinguish temporary current-thread watches from durable event tasks.",
-	"- When a tool result includes a subscription, those events are already watched; do not call watchResourceEvents for them. When a tool result includes a subscribable resource with suggestedEvents, use watchResourceEvents only for those remaining events that serve the current intent. If suggestedEvents is empty or omitted, do not invent a watch. Do not create scheduled polling tasks for events a watch can deliver. Write a concise intent summary, and tell the user when the temporary watch expires. Stop only the requested watch by id unless the user explicitly asks to stop every watch in the thread.",
-	"- Use createEventTask only when the user explicitly asks for an event task or durable whenever-this-happens-do-X automation. Ordinary watch, notify, and tell-me-when requests use watchResourceEvents. When an event task's resource and events are known, create it without redundant confirmation.",
-	"- Event tasks make the task creator's connected credentials available by default when the requested work needs user-bound authorization. Do not ask for separate confirmation merely to use credentials needed for the requested work. On creation, omit credentialMode for the creator default and set system only when the creator explicitly requires it. For later changes, creator always means the task's original createdBy actor, never the current requester. If the requester is not that creator, do not attempt to enable creator credential use or suggest that confirmation could authorize it.",
-	"- Event tasks list for the current destination, not one thread. Public tasks can also be updated or deleted by task id from another destination in the same workspace. When listing them, use createdBy to explain creator-only credential changes and warn when triggerAvailable is false; an unavailable task remains stored but cannot receive events until its plugin event is enabled again.",
-	"- Scheduled tasks make the task creator's connected credentials available by default when the requested work needs user-bound authorization. Do not ask for separate confirmation merely to use credentials needed for the requested work. On creation, omit credential_mode for the creator default and set system only when the creator explicitly requires it. For later changes, creator always means the task's original created_by actor, never the current requester. If the requester is not that creator, do not attempt to enable creator credential use or suggest that confirmation could authorize it.",
+	"- When searchEventTypes is exposed, use it only when the user asks what events are supported or the required resource type or event name is unclear. It discovers options but does not watch a resource or create an automation. When explaining how results can be used, distinguish temporary current-thread watches from durable event automations.",
+	"- When a tool result includes a subscription, those events are already watched; do not call watchEvents for them. When a tool result includes a subscribable resource with suggestedEvents, use watchEvents only for those remaining events that serve the current intent. If suggestedEvents is empty or omitted, do not invent a watch. Do not create scheduled polling tasks for events a watch can deliver. Write a concise intent summary, and tell the user when the temporary watch expires. Stop only the requested watch by id unless the user explicitly asks to stop every watch in the thread.",
+	"- Use createEventAutomation only when the user explicitly asks for an event automation or durable whenever-this-happens-do-X automation. Ordinary watch, notify, and tell-me-when requests use watchEvents. When an event automation's resource and events are known, create it without redundant confirmation.",
+	"- Event automations make the automation creator's connected credentials available by default when the requested work needs user-bound authorization. Do not ask for separate confirmation merely to use credentials needed for the requested work. On creation, omit credentialMode for the creator default and set system only when the creator explicitly requires it. For later changes, creator always means the automation's original createdBy actor, never the current requester. If the requester is not that creator, do not attempt to enable creator credential use or suggest that confirmation could authorize it.",
+	"- Event automations list for the current destination, not one thread. Public automations can also be updated or deleted by automation id from another destination in the same workspace. When listing them, use createdBy to explain creator-only credential changes and warn when trigger.available is false; an unavailable automation remains stored but cannot receive events until its plugin event is enabled again.",
+	"- Scheduled automations make the automation creator's connected credentials available by default when the requested work needs user-bound authorization. Do not ask for separate confirmation merely to use credentials needed for the requested work. On creation, omit credentialMode for the creator default and set system only when the creator explicitly requires it. For later changes, creator always means the automation's original createdBy actor, never the current requester. If the requester is not that creator, do not attempt to enable creator credential use or suggest that confirmation could authorize it.",
 	"- When another model profile fits the task better, call `handoff` before substantial work. Follow the profile list and selection rules in the tool description.",
 	"- Run `jr-rpc config get|set|unset|list` for provider defaults and `jr-rpc plugins list` for installed plugin introspection as standalone bash commands; do not chain them with `cd`, `&&`, pipes, or provider commands.",
 	"- If the first result is empty, stale, ambiguous, or incomplete, try a focused alternate query, path, command, or source before concluding the answer cannot be verified."
@@ -1267,14 +1268,14 @@ function formatSourceLines(source) {
 			...source.messageTs ? [`- source.message_ts: ${escapeXml(source.messageTs)}`] : [],
 			...source.threadTs ? [`- source.thread_ts: ${escapeXml(source.threadTs)}`] : []
 		];
-		case "resource_event": return [
-			"- source.kind: resource_event",
+		case "event": return [
+			"- source.kind: event",
 			`- source.namespace: ${escapeXml(source.namespace)}`,
 			`- source.identifier: ${escapeXml(source.identifier)}`,
 			`- source.event_type: ${escapeXml(source.eventType)}`
 		];
-		case "scheduled_task":
-		case "event_task":
+		case "scheduled_automation":
+		case "event_automation":
 		case "plugin_dispatch":
 		case "agent_invocation": return [`- source.kind: ${source.kind}`];
 	}
@@ -2490,8 +2491,9 @@ async function prepareWorkspaceRepositories(params) {
 	const { sandbox, workspace, signal } = params;
 	signal?.throwIfAborted();
 	await params.applyNetworkPolicy(sandbox);
-	await params.prepareRepositories?.(sandbox, workspace, signal);
+	const finalize = await params.prepareRepositories?.(sandbox, workspace, signal);
 	if (params.removeCredentialRoute) await sandbox.update({ networkPolicy: "allow-all" });
+	await finalize?.();
 }
 /** Return bounded setup output for a Workspace failure. */
 function workspaceSetupFailureDetail(input) {
@@ -2614,7 +2616,7 @@ function emptyState(nowMs) {
 /** True when this Source starts an automated Turn rather than a user Turn. */
 function isAutomatedTurnSource(source) {
 	if (!source) return false;
-	return source.kind === "resource_event" || source.kind === "event_task" || source.kind === "scheduled_task" || source.kind === "plugin_dispatch" || source.kind === "agent_invocation";
+	return source.kind === "event" || source.kind === "event_automation" || source.kind === "scheduled_automation" || source.kind === "plugin_dispatch" || source.kind === "agent_invocation";
 }
 /** Plain notice when automatic updates stop until the user replies. */
 function buildAutomatedTurnLimitResponse(args) {
@@ -2826,15 +2828,15 @@ function renderTaskInput(args) {
 	return lines.join("\n");
 }
 //#endregion
-//#region src/chat/resource-events/notification.ts
+//#region src/chat/events/notification.ts
 /**
 * Render the runtime-owned conversation message for a subscribed event.
 *
 * Keep this short: facts the model cannot reconstruct, plus a one-line handling
 * contract. Stable delivery rules live in runtime and docs, not this prompt.
 */
-function renderResourceEventNotificationText(subscription, event) {
-	const guidance = resourceEventGuidance(getResourceEventCatalog(), event.namespace, subscription.resourceType, event.eventType);
+function renderEventNotificationText(subscription, event) {
+	const guidance = eventGuidance(getEventCatalog(), event.namespace, subscription.resourceType, event.eventType);
 	return renderTaskInput({
 		about: subscription.label,
 		instructions: subscription.intent,
@@ -2844,21 +2846,21 @@ function renderResourceEventNotificationText(subscription, event) {
 		externalText: event.untrustedText
 	});
 }
-/** Whether mailbox metadata is a plain resource-event wake. */
-function isResourceEventMailboxMetadata(value) {
+/** Whether mailbox metadata is a plain event wake. */
+function isEventMailboxMetadata(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return false;
 	const record = value;
-	if (record.kind !== "resource_event") return false;
-	const resourceEvent = record.resourceEvent;
-	if (!resourceEvent || typeof resourceEvent !== "object" || Array.isArray(resourceEvent)) return false;
-	const fields = resourceEvent;
+	if (record.kind !== "event") return false;
+	const event = record.event;
+	if (!event || typeof event !== "object" || Array.isArray(event)) return false;
+	const fields = event;
 	return typeof fields.eventKey === "string" && typeof fields.eventType === "string" && typeof fields.namespace === "string" && typeof fields.identifier === "string" && typeof fields.subscriptionId === "string" && (fields.trustedSummary === void 0 || typeof fields.trustedSummary === "string");
 }
 /** Build plain conversation mailbox input for one matched watch. */
-function createResourceEventInboundMessage(input) {
+function createEventInboundMessage(input) {
 	const metadata = {
-		kind: "resource_event",
-		resourceEvent: {
+		kind: "event",
+		event: {
 			eventKey: input.event.eventKey,
 			eventType: input.event.eventType,
 			namespace: input.event.namespace,
@@ -2870,25 +2872,25 @@ function createResourceEventInboundMessage(input) {
 	return {
 		conversationId: input.subscription.conversationId,
 		createdAtMs: input.event.occurredAtMs,
-		inboundMessageId: `resource-event:${input.subscription.id}:${input.event.eventKey}`,
+		inboundMessageId: `event:${input.subscription.id}:${input.event.eventKey}`,
 		delivery: "defer",
-		source: "resource_event",
+		source: "event",
 		receivedAtMs: input.receivedAtMs ?? Date.now(),
 		input: {
 			text: input.text,
-			authorId: RESOURCE_EVENT_AUTHOR_ID,
+			authorId: EVENT_AUTHOR_ID,
 			metadata
 		}
 	};
 }
 /**
-* Enqueue a resource event as normal conversation mailbox input.
+* Enqueue a event as normal conversation mailbox input.
 *
 * The watch only names the conversation. Destination stays on the conversation
 * and is applied when the worker runs. After too many automated Turns with no
 * user Turn, later wakes stay quiet until a user message clears the pause.
 */
-async function enqueueResourceEventNotification(args) {
+async function enqueueEventNotification(args) {
 	const maxTurns = botConfig.maxConsecutiveAutomatedTurns;
 	const decision = await admitAutomatedTurn({
 		conversationId: args.subscription.conversationId,
@@ -2897,12 +2899,12 @@ async function enqueueResourceEventNotification(args) {
 		state: args.state
 	});
 	if (decision.status === "paused") {
-		logInfo("resource_events.automated_turn_limit.paused", {
+		logInfo("events.automated_turn_limit.paused", {
 			conversationId: args.subscription.conversationId,
 			"app.automated_turn_limit.consecutive": decision.consecutiveAutomatedTurns,
 			"app.automated_turn_limit.max": maxTurns,
-			"app.resource_event.event_type": args.event.eventType,
-			"app.resource_event.namespace": args.event.namespace
+			"app.event.event_type": args.event.eventType,
+			"app.event.namespace": args.event.namespace
 		});
 		if (decision.shouldPostNotice) await postAutomatedTurnLimitNoticeForConversation({
 			conversationId: args.subscription.conversationId,
@@ -2911,9 +2913,9 @@ async function enqueueResourceEventNotification(args) {
 		});
 		return { status: "duplicate" };
 	}
-	const text = renderResourceEventNotificationText(args.subscription, args.event);
+	const text = renderEventNotificationText(args.subscription, args.event);
 	return await appendAndEnqueueInboundMessage({
-		message: createResourceEventInboundMessage({
+		message: createEventInboundMessage({
 			event: args.event,
 			subscription: {
 				conversationId: args.subscription.conversationId,
@@ -2926,12 +2928,12 @@ async function enqueueResourceEventNotification(args) {
 	});
 }
 //#endregion
-//#region src/chat/resource-events/ingest.ts
-/** Match a normalized resource event and enqueue notifications into conversations. */
-async function ingestResourceEvent(input, options) {
-	const event = resourceEventSchema.parse(input);
+//#region src/chat/events/ingest.ts
+/** Match a normalized event and enqueue notifications into conversations. */
+async function ingestEvent(input, options) {
+	const event = eventSchema.parse(input);
 	const nowMs = options.nowMs ?? Date.now();
-	const subscriptions = await findMatchingResourceEventSubscriptions({
+	const subscriptions = await findMatchingWatches({
 		data: event.data,
 		eventType: event.eventType,
 		nowMs,
@@ -2943,7 +2945,7 @@ async function ingestResourceEvent(input, options) {
 	const errors = [];
 	const waitDeadlineMs = Date.now() + 1e4;
 	for (const subscription of subscriptions) try {
-		if (await deliverResourceEventSubscription({
+		if (await deliverWatch({
 			data: event.data,
 			eventType: event.eventType,
 			namespace: event.namespace,
@@ -2954,7 +2956,7 @@ async function ingestResourceEvent(input, options) {
 			subscription,
 			waitDeadlineMs,
 			deliver: async (current) => {
-				return (await enqueueResourceEventNotification({
+				return (await enqueueEventNotification({
 					event,
 					queue: options.queue,
 					state: options.state,
@@ -2965,7 +2967,7 @@ async function ingestResourceEvent(input, options) {
 	} catch (error) {
 		errors.push(error);
 	}
-	if (errors.length > 0) throw new AggregateError(errors, "Failed to deliver one or more resource event subscriptions");
+	if (errors.length > 0) throw new AggregateError(errors, "Failed to deliver one or more watches");
 	return { enqueued };
 }
 //#endregion
@@ -3361,7 +3363,7 @@ const SNAPSHOT_BUILD_SYSTEM_ACTOR = {
 /** Leave time to send the next job before this request ends. */
 const JOB_STOP_BUFFER_MS = 4e4;
 async function publishFinishedEvent(input) {
-	await ingestResourceEvent(workspaceSnapshotFinishedEvent(input), { queue: getVercelConversationWorkQueue() });
+	await ingestEvent(workspaceSnapshotFinishedEvent(input), { queue: getVercelConversationWorkQueue() });
 }
 function createSnapshotBuildHelpers() {
 	const credentials = credentialContextForActor(SNAPSHOT_BUILD_SYSTEM_ACTOR);
@@ -3375,9 +3377,7 @@ function createSnapshotBuildHelpers() {
 		await sandbox.update({ networkPolicy });
 		return networkPolicy;
 	};
-	const prepareRepositories = async (sandbox, target, signal) => {
-		await pluginHooks.prepareWorkspace(sandbox, target.repos, signal);
-	};
+	const prepareRepositories = async (sandbox, target, signal) => await pluginHooks.prepareWorkspace(sandbox, target.repos, signal);
 	return {
 		applyNetworkPolicy,
 		prepareRepositories
@@ -3887,7 +3887,14 @@ function createSandboxRuntime(options) {
 		let networkPolicyKey;
 		try {
 			networkPolicyKey = await applyNetworkPolicy(createdSandbox);
-			if (workspace) await options.onWorkspacePrepare?.(createdSandbox, workspace, signal);
+			if (workspace) {
+				const finalize = await options.onWorkspacePrepare?.(createdSandbox, workspace, signal);
+				if (options.createNetworkPolicy) {
+					await createdSandbox.update({ networkPolicy: "allow-all" });
+					networkPolicyKey = void 0;
+				}
+				await finalize?.();
+			}
 			await prepareSandbox(createdSandbox);
 		} catch (error) {
 			if (workspace) await stopSession(createdSandbox);
@@ -7144,7 +7151,7 @@ function createSpawnAgentTool(spawnAgent) {
 	});
 }
 //#endregion
-//#region src/chat/tools/list-resource-event-subscriptions.ts
+//#region src/chat/tools/list-watches.ts
 const listedResourceWatchSchema = z.object({
 	id: z.string().min(1),
 	label: z.string().min(1),
@@ -7158,8 +7165,8 @@ const listedResourceWatchSchema = z.object({
 }).strict();
 const resultDataSchema$2 = z.object({ subscriptions: z.array(listedResourceWatchSchema) }).strict();
 const outputSchema$5 = juniorToolOutputSchema.merge(resultDataSchema$2);
-/** Create the tool that lists active resource watches for this conversation. */
-function createListResourceEventSubscriptionsTool(context) {
+/** Create the tool that lists active watches for this conversation. */
+function createListWatchesTool(context) {
 	return zodTool({
 		annotations: {
 			destructiveHint: false,
@@ -7167,13 +7174,13 @@ function createListResourceEventSubscriptionsTool(context) {
 			openWorldHint: false,
 			readOnlyHint: true
 		},
-		description: "List active resource event subscriptions for the current conversation.",
+		description: "List active watches for the current conversation.",
 		exposure: "deferred",
 		source: RESOURCE_WATCH_TOOL_SOURCE,
 		inputSchema: z.object({}).strict(),
 		outputSchema: outputSchema$5,
 		async execute() {
-			return { subscriptions: (await listResourceEventSubscriptions({ conversationId: context.conversationId })).map((subscription) => ({
+			return { subscriptions: (await listWatches({ conversationId: context.conversationId })).map((subscription) => ({
 				id: subscription.id,
 				label: subscription.label,
 				identifier: subscription.identifier,
@@ -7188,7 +7195,7 @@ function createListResourceEventSubscriptionsTool(context) {
 	});
 }
 //#endregion
-//#region src/chat/tools/search-resource-event-types.ts
+//#region src/chat/tools/search-event-types.ts
 const DEFAULT_SEARCH_RESULTS = 10;
 const MAX_SEARCH_RESULTS = 20;
 const searchedResourceTypeSchema = z.object({
@@ -7224,8 +7231,8 @@ function searchableResourceTypes(catalog) {
 		...resourceType.matchFields ? { matchFields: resourceType.matchFields } : void 0
 	}))).sort((left, right) => left.namespace.localeCompare(right.namespace) || left.type.localeCompare(right.type));
 }
-/** Create the read-only tool that searches enabled resource event types. */
-function createSearchResourceEventTypesTool(catalog) {
+/** Create the read-only tool that searches enabled event types. */
+function createSearchEventTypesTool(catalog) {
 	return zodTool({
 		annotations: {
 			destructiveHint: false,
@@ -7233,9 +7240,9 @@ function createSearchResourceEventTypesTool(catalog) {
 			openWorldHint: false,
 			readOnlyHint: true
 		},
-		description: "Search the resource event types currently enabled without creating anything. Includes plugin resources and core Workspace snapshot events. Use watchResourceEvents for temporary updates in the current conversation; use createEventTask for durable automation. This tool does not watch a resource, create a task, or list concrete resources.",
+		description: "Search the event types currently enabled without creating anything. Includes plugin resources and core Workspace snapshot events. Use watchEvents for temporary updates in the current conversation; use createEventAutomation for durable automation. This tool does not watch a resource, create an automation, or list concrete resources.",
 		inputSchema: z.object({
-			query: z.string().nullable().describe("Optional terms matching a namespace, resource type, or event name. Empty lists all enabled resource event types.").optional(),
+			query: z.string().nullable().describe("Optional terms matching a namespace, resource type, or event name. Empty lists all enabled event types.").optional(),
 			namespace: eventNamespaceSchema(catalog).nullable().describe("Optional enabled plugin namespace to search within.").optional(),
 			maxResults: z.number().int().min(1).max(MAX_SEARCH_RESULTS).nullable().describe("Maximum matching resource types to return.").optional()
 		}).strict(),
@@ -7264,13 +7271,13 @@ function createSearchResourceEventTypesTool(catalog) {
 	});
 }
 //#endregion
-//#region src/chat/tools/stop-watching-resources.ts
+//#region src/chat/tools/stop-watches.ts
 const resultDataSchema$1 = z.object({
 	watching_status: z.literal("stopped"),
 	stoppedIds: z.array(z.string().min(1))
 }).strict();
 const outputSchema$3 = juniorToolOutputSchema.merge(resultDataSchema$1);
-/** Create the tool that stops resource watches for this conversation. */
+/** Create the tool that stops watches for this conversation. */
 function createStopWatchingResourcesTool(context) {
 	return zodTool({
 		annotations: {
@@ -7279,7 +7286,7 @@ function createStopWatchingResourcesTool(context) {
 			openWorldHint: false,
 			readOnlyHint: false
 		},
-		description: "Stop one resource watch in the current conversation by id. Omit id only when the user explicitly asks to stop every watch in this conversation. Infer terse stop requests from context, inspect active watches when the target is unclear, and call this tool before confirming that watching stopped.",
+		description: "Stop one watch in the current conversation by id. Omit id only when the user explicitly asks to stop every watch in this conversation. Infer terse stop requests from context, inspect active watches when the target is unclear, and call this tool before confirming that watching stopped.",
 		exposure: "deferred",
 		source: RESOURCE_WATCH_TOOL_SOURCE,
 		inputSchema: z.object({ id: z.string().min(1).nullable().optional() }).strict(),
@@ -7287,14 +7294,14 @@ function createStopWatchingResourcesTool(context) {
 		async execute({ id }) {
 			let stoppedIds;
 			if (id) {
-				const stopped = await cancelResourceEventSubscription({
+				const stopped = await cancelWatch({
 					conversationId: context.conversationId,
 					id
 				});
-				if (!stopped) throw new ToolInputError("Resource watch was not found in the current conversation.");
+				if (!stopped) throw new ToolInputError("Watch was not found in the current conversation.");
 				stoppedIds = [stopped.id];
 			} else {
-				const subscriptions = await listResourceEventSubscriptions({ conversationId: context.conversationId });
+				const subscriptions = await listWatches({ conversationId: context.conversationId });
 				await cancelSubscriptions({ conversationId: context.conversationId });
 				stoppedIds = subscriptions.map((subscription) => subscription.id);
 			}
@@ -7306,7 +7313,7 @@ function createStopWatchingResourcesTool(context) {
 	});
 }
 //#endregion
-//#region src/chat/tools/watch-resource-events.ts
+//#region src/chat/tools/watch-events.ts
 function inputSchema(catalog) {
 	return z.object({
 		identifier: z.string().trim().min(1).describe("Plugin-defined resource identifier."),
@@ -7314,7 +7321,7 @@ function inputSchema(catalog) {
 		resourceType: registeredResourceTypeSchema(catalog).describe("Plugin-defined resource type."),
 		label: z.string().trim().min(1).max(500).describe("Human-readable resource label."),
 		events: z.array(registeredEventTypeSchema(catalog)).min(1).describe("High-signal event names to deliver to this conversation when they occur."),
-		match: registeredResourceEventMatchSchema(),
+		match: registeredEventMatchSchema(),
 		intent: z.string().trim().min(1).max(4e3).describe("Concise reason this conversation wants these events, used when an event arrives."),
 		ttlMs: z.coerce.number().describe("How long to keep the subscription active. Defaults to 14 days and must not exceed 30 days.").optional()
 	}).strict().superRefine((subscription, context) => {
@@ -7354,11 +7361,11 @@ function cleanStrings(values) {
 function ttlMs(input) {
 	if (input.ttlMs === void 0) return RESOURCE_SUBSCRIPTION_DEFAULT_TTL_MS;
 	if (!Number.isFinite(input.ttlMs) || input.ttlMs <= 0) throw new ToolInputError("ttlMs must be a positive finite number");
-	if (input.ttlMs > 2592e6) throw new ToolInputError("Resource watches cannot exceed 30 days");
+	if (input.ttlMs > 2592e6) throw new ToolInputError("Watches cannot exceed 30 days");
 	return input.ttlMs;
 }
-/** Create the tool that temporarily watches resource events in one conversation. */
-function createWatchResourceEventsTool(context, catalog) {
+/** Create the tool that temporarily watches events in one conversation. */
+function createWatchEventsTool(context, catalog) {
 	return zodTool({
 		annotations: {
 			destructiveHint: false,
@@ -7366,7 +7373,7 @@ function createWatchResourceEventsTool(context, catalog) {
 			openWorldHint: true,
 			readOnlyHint: false
 		},
-		description: "Watch one plugin resource in the current conversation for a limited time; matching events return to this conversation as updates. Use for watch, notify, or tell-me-when requests. This does not create an event task or execute a durable task instruction. Prefer a subscribable tool result when available.",
+		description: "Watch one plugin resource in the current conversation for a limited time; matching events return to this conversation as updates. Use for watch, notify, or tell-me-when requests. This does not create an event automation or execute a durable automation instruction. Prefer a subscribable tool result when available.",
 		inputSchema: inputSchema(catalog),
 		outputSchema: outputSchema$2,
 		async execute(input) {
@@ -7374,13 +7381,13 @@ function createWatchResourceEventsTool(context, catalog) {
 			for (const eventType of events) if (!pluginSupportsEvent(catalog, input.namespace, input.resourceType, eventType)) throw new ToolInputError(`Resource type "${input.namespace}:${input.resourceType}" does not support event "${eventType}".`);
 			const intent = input.intent.trim();
 			if (!intent) throw new ToolInputError("intent is required");
-			const match = requireSupportedResourceEventMatch(catalog, {
+			const match = requireSupportedEventMatch(catalog, {
 				match: input.match,
 				namespace: input.namespace,
 				resourceType: input.resourceType
 			});
 			const nowMs = Date.now();
-			const subscription = await createResourceEventSubscription({
+			const subscription = await createWatch({
 				conversationId: context.conversationId,
 				events,
 				expiresAtMs: nowMs + ttlMs(input),
@@ -7388,7 +7395,7 @@ function createWatchResourceEventsTool(context, catalog) {
 				label: input.label.trim(),
 				...match ? { match } : void 0,
 				namespace: input.namespace.trim(),
-				identifier: normalizeEventIdentifier(catalog, input.namespace, input.identifier),
+				identifier: normalizeCatalogEventIdentifier(catalog, input.namespace, input.identifier),
 				resourceType: input.resourceType.trim()
 			});
 			return {
@@ -7410,24 +7417,24 @@ function createWatchResourceEventsTool(context, catalog) {
 	});
 }
 //#endregion
-//#region src/chat/tools/resource-events.ts
+//#region src/chat/tools/events.ts
 /** Build the complete resource-watch tool set for this runtime context. */
-function createResourceEventTools(context, catalog) {
+function createEventTools(context, catalog) {
 	return {
-		...hasResourceEventCatalogEntries(catalog) ? {
-			searchResourceEventTypes: createSearchResourceEventTypesTool(catalog),
-			watchResourceEvents: createWatchResourceEventsTool(context, catalog)
+		...hasEventCatalogEntries(catalog) ? {
+			searchEventTypes: createSearchEventTypesTool(catalog),
+			watchEvents: createWatchEventsTool(context, catalog)
 		} : void 0,
-		listResourceEventSubscriptions: createListResourceEventSubscriptionsTool(context),
+		listWatches: createListWatchesTool(context),
 		stopWatchingResources: createStopWatchingResourcesTool(context)
 	};
 }
 //#endregion
-//#region src/chat/tools/create-event-task.ts
-/** Build a retry-stable task id scoped to actor, destination, and tool call. */
-function buildEventTaskId(args) {
+//#region src/chat/tools/create-event-automation.ts
+/** Build a retry-stable automation id scoped to actor, destination, and tool call. */
+function buildEventAutomationId(args) {
 	const toolCallId = args.toolCallId?.trim();
-	if (!toolCallId) throw new Error("Event task creation requires a tool-call identity.");
+	if (!toolCallId) throw new Error("Event automation creation requires a tool-call identity.");
 	return `evt_${createHash("sha256").update(JSON.stringify({
 		actor: args.userId,
 		channel: args.channelId,
@@ -7435,9 +7442,9 @@ function buildEventTaskId(args) {
 		team: args.teamId
 	})).digest("hex").slice(0, 32)}`;
 }
-/** Create the core tool that stores an event task. */
-function createEventTaskTool(context, catalog) {
-	const trigger = registeredEventTaskTriggerSchema(catalog);
+/** Create the core tool that stores an event automation. */
+function createEventAutomationTool(context, catalog) {
+	const trigger = registeredEventAutomationTriggerSchema(catalog);
 	return zodTool({
 		approvalMode: "review",
 		annotations: {
@@ -7447,12 +7454,12 @@ function createEventTaskTool(context, catalog) {
 			readOnlyHint: false
 		},
 		executionMode: "sequential",
-		description: "Create a durable event task that executes the supplied instruction for every matching resource event. Use for whenever-this-happens-do-X automation; ordinary watch, notify, or tell-me-when requests use watchResourceEvents instead. The task may use the creator's connected credentials. Prefer a subscribable tool result when available.",
+		description: "Create a durable event automation that executes the supplied instruction for every matching event. Use for whenever-this-happens-do-X automation; ordinary watch, notify, or tell-me-when requests use watchEvents instead. The automation may use the creator's connected credentials. Prefer a subscribable tool result when available.",
 		inputSchema: z.object({
-			task: z.string().trim().min(1).max(4e3),
+			instruction: z.string().trim().min(1).max(4e3),
 			title: z.string().trim().min(1).max(60).nullable().describe("Optional short display title. Omit or use null to generate one from the task instruction.").optional(),
 			trigger,
-			outcomes: z.array(taskOutcomeInputSchema).max(5).describe("Messages to send after successful work. Use an empty list to send nothing. Omit to send one message to the current Slack conversation.").optional(),
+			outcomes: z.array(taskOutcomeInputSchema).max(5).describe("Successful work is silent by default. Omit this field or use an empty list when the Automation should act through tools without a status message. Add send_message only when the user asks for a notification, post, digest, summary, or other visible result.").optional(),
 			credentialMode: z.enum(["creator", "system"]).nullable().describe("Use creator to make the task creator's connected credentials available, or system when the creator says not to use them. Omit or use null for the creator default.").optional()
 		}).strict(),
 		prepareArguments(args) {
@@ -7461,25 +7468,25 @@ function createEventTaskTool(context, catalog) {
 			if (prepared.credentialMode === "creator" || prepared.credentialMode === null) delete prepared.credentialMode;
 			return prepared;
 		},
-		outputSchema: eventTaskToolResultSchema,
+		outputSchema: eventAutomationToolResultSchema,
 		async execute(input, options) {
-			const { actor, destination, source } = requireEventTaskSlackContext(context);
-			const match = requireSupportedEventTaskTrigger(catalog, input.trigger);
-			const id = buildEventTaskId({
+			const { actor, destination, source } = requireEventAutomationSlackContext(context);
+			const match = requireSupportedEventAutomationTrigger(catalog, input.trigger);
+			const id = buildEventAutomationId({
 				channelId: destination.channelId,
 				teamId: destination.teamId,
 				toolCallId: options.toolCallId,
 				userId: actor.userId
 			});
 			const db = getDb();
-			const existing = await getEventTask(db, id);
+			const existing = await getEventAutomation(db, id);
 			if (existing) {
-				if (!eventTaskMatchesDestination(existing, destination) || existing.createdBy.slackUserId !== actor.userId) throw new ToolInputError("Event task operation identity is invalid.");
-				if (existing.status !== "deleted") return eventTaskSuccess(existing, catalog);
+				if (!eventAutomationMatchesDestination(existing, destination) || existing.createdBy.slackUserId !== actor.userId) throw new ToolInputError("Event automation operation identity is invalid.");
+				if (existing.status !== "deleted") return eventAutomationToolResult(existing, catalog, actor.userId);
 			}
 			const title = await resolveTaskTitle({
 				completeText,
-				instruction: input.task,
+				instruction: input.instruction,
 				title: input.title
 			});
 			const task = {
@@ -7494,25 +7501,25 @@ function createEventTaskTool(context, catalog) {
 				credentialMode: input.credentialMode ?? "creator",
 				destination,
 				outcomes: await resolveTaskOutcomes(input.outcomes, destination, actor.userId),
-				task: { text: input.task },
+				task: { text: input.instruction },
 				...title ? { title } : void 0,
 				trigger: {
 					namespace: input.trigger.namespace,
-					identifier: normalizeEventIdentifier(catalog, input.trigger.namespace, input.trigger.identifier),
+					identifier: normalizeCatalogEventIdentifier(catalog, input.trigger.namespace, input.trigger.identifier),
 					resourceType: input.trigger.resourceType,
 					label: input.trigger.label,
 					events: [...new Set(input.trigger.events)],
 					...match ? { match } : void 0
 				}
 			};
-			return eventTaskSuccess(await createEventTask(db, task), catalog);
+			return eventAutomationToolResult(await createEventAutomation(db, task), catalog, actor.userId);
 		}
 	});
 }
 //#endregion
-//#region src/chat/tools/delete-event-task.ts
-/** Create the core tool that deletes an event task. */
-function createDeleteEventTaskTool(context, catalog) {
+//#region src/chat/tools/delete-event-automation.ts
+/** Create the core tool that deletes an event automation. */
+function createDeleteEventAutomationTool(context, catalog) {
 	return zodTool({
 		approvalMode: "review",
 		annotations: {
@@ -7522,22 +7529,23 @@ function createDeleteEventTaskTool(context, catalog) {
 			readOnlyHint: false
 		},
 		executionMode: "sequential",
-		description: "Delete an event task.",
-		inputSchema: z.object({ taskId: z.string().min(1) }).strict(),
-		outputSchema: eventTaskToolResultSchema,
-		async execute({ taskId }) {
-			const current = await writableEventTask(context, taskId);
-			const deleted = await deleteEventTask(getDb(), current.id);
-			if (!deleted) throw new ToolInputError("Event task was not found.");
-			return eventTaskSuccess(deleted, catalog);
+		description: "Delete an event automation.",
+		inputSchema: z.object({ automationId: z.string().min(1) }).strict(),
+		outputSchema: eventAutomationToolResultSchema,
+		async execute({ automationId }) {
+			const { actor } = requireEventAutomationSlackContext(context);
+			const current = await writableEventAutomation(context, automationId);
+			const deleted = await deleteEventAutomation(getDb(), current.id);
+			if (!deleted) throw new ToolInputError("Event automation was not found.");
+			return eventAutomationToolResult(deleted, catalog, actor.userId);
 		}
 	});
 }
 //#endregion
-//#region src/chat/tools/list-event-tasks.ts
-const MAX_LISTED_EVENT_TASKS = 50;
-/** Create the core tool that lists event tasks for this destination. */
-function createListEventTasksTool(context, catalog) {
+//#region src/chat/tools/list-event-automations.ts
+const MAX_LISTED_EVENT_AUTOMATIONS = 50;
+/** Create the core tool that lists event automations for this destination. */
+function createListEventAutomationsTool(context, catalog) {
 	return zodTool({
 		annotations: {
 			destructiveHint: false,
@@ -7545,30 +7553,30 @@ function createListEventTasksTool(context, catalog) {
 			openWorldHint: false,
 			readOnlyHint: true
 		},
-		description: "List event tasks for the current destination. A false triggerAvailable value means the task remains stored but its plugin event is not currently enabled.",
+		description: "List event automations for the current destination. Each result says whether the requester is the creator and whether its trigger is available.",
 		inputSchema: z.object({}).strict(),
-		outputSchema: eventTaskListToolResultSchema,
+		outputSchema: eventAutomationListToolResultSchema,
 		async execute() {
-			const { destination } = requireEventTaskSlackContext(context);
-			const matching = (await listEventTasksForTeam(getDb(), destination.teamId)).filter((task) => eventTaskMatchesDestination(task, destination));
-			const tasks = matching.slice(0, MAX_LISTED_EVENT_TASKS).map((task) => compactEventTask(task, catalog));
+			const { actor, destination } = requireEventAutomationSlackContext(context);
+			const matching = (await listEventAutomationsForTeam(getDb(), destination.teamId)).filter((task) => eventAutomationMatchesDestination(task, destination));
+			const automations = matching.slice(0, MAX_LISTED_EVENT_AUTOMATIONS).map((task) => compactEventAutomation(task, catalog, actor.userId));
 			return {
-				tasks,
-				truncated: matching.length > tasks.length
+				automations,
+				truncated: matching.length > automations.length
 			};
 		}
 	});
 }
 //#endregion
-//#region src/chat/tools/update-event-task.ts
+//#region src/chat/tools/update-event-automation.ts
 /** Return whether an edit changes the task's executable event source. */
-function changesEventTaskTrigger(current, next) {
+function changesEventAutomationTrigger(current, next) {
 	const currentEvents = [...current.events].sort();
 	const nextEvents = [...next.events].sort();
-	return current.namespace !== next.namespace || current.identifier !== next.identifier || currentEvents.length !== nextEvents.length || currentEvents.some((event, index) => event !== nextEvents[index]) || stableResourceEventMatchKey(current.match) !== stableResourceEventMatchKey(next.match);
+	return current.namespace !== next.namespace || current.identifier !== next.identifier || currentEvents.length !== nextEvents.length || currentEvents.some((event, index) => event !== nextEvents[index]) || stableEventMatchKey(current.match) !== stableEventMatchKey(next.match);
 }
-/** Create the core tool that updates an event task. */
-function createUpdateEventTaskTool(context, catalog) {
+/** Create the core tool that updates an event automation. */
+function createUpdateEventAutomationTool(context, catalog) {
 	return zodTool({
 		approvalMode: "review",
 		annotations: {
@@ -7578,44 +7586,44 @@ function createUpdateEventTaskTool(context, catalog) {
 			readOnlyHint: false
 		},
 		executionMode: "sequential",
-		description: "Update the instruction, registered trigger, or credential use for an event task.",
+		description: "Update the instruction, registered trigger, or credential use for an event automation.",
 		inputSchema: z.object({
-			taskId: z.string().min(1),
-			task: z.string().trim().min(1).max(4e3).nullable().optional(),
-			trigger: registeredEventTaskTriggerSchema(catalog).nullable().optional(),
+			automationId: z.string().min(1),
+			instruction: z.string().trim().min(1).max(4e3).nullable().optional(),
+			trigger: registeredEventAutomationTriggerSchema(catalog).nullable().optional(),
 			outcomes: z.array(taskOutcomeInputSchema).max(5).nullable().describe("Replacement messages to send after successful work. Use an empty list to send nothing. Omit or use null to leave unchanged.").optional(),
 			credentialMode: z.enum(["system", "creator"]).nullable().describe("Set creator to make the task's original creator credentials available, or system to disable them. Creator always means the task's createdBy actor, never the current requester. Only that original creator may enable creator mode. Omit or use null to leave unchanged.").optional()
 		}).strict(),
 		prepareArguments(args) {
-			const { credentialMode, outcomes, task, trigger, ...prepared } = args;
+			const { credentialMode, outcomes, instruction, trigger, ...prepared } = args;
 			return {
 				...prepared,
-				...task != null ? { task } : void 0,
+				...instruction != null ? { instruction } : void 0,
 				...trigger != null ? { trigger } : void 0,
 				...outcomes != null ? { outcomes } : void 0,
 				...credentialMode != null ? { credentialMode } : void 0
 			};
 		},
-		outputSchema: eventTaskToolResultSchema,
+		outputSchema: eventAutomationToolResultSchema,
 		async execute(input) {
-			const current = await writableEventTask(context, input.taskId);
-			const match = input.trigger ? requireSupportedEventTaskTrigger(catalog, input.trigger) : void 0;
-			const { actor } = requireEventTaskSlackContext(context);
+			const current = await writableEventAutomation(context, input.automationId);
+			const match = input.trigger ? requireSupportedEventAutomationTrigger(catalog, input.trigger) : void 0;
+			const { actor } = requireEventAutomationSlackContext(context);
 			const isCreator = actor.userId === current.createdBy.slackUserId;
-			if (input.credentialMode === "creator" && !isCreator) throw new ToolInputError("Only the event task creator can enable creator credential use.");
-			if (input.outcomes != null && !isCreator) throw new ToolInputError("Only the event task creator can change message destinations.");
-			if (input.task === void 0 && input.trigger === void 0 && input.outcomes == null && input.credentialMode == null) throw new ToolInputError("Event task update requires a change.");
+			if (input.credentialMode === "creator" && !isCreator) throw new ToolInputError("Only the event automation creator can enable creator credential use.");
+			if (input.outcomes != null && !isCreator) throw new ToolInputError("Only the event automation creator can change message destinations.");
+			if (input.instruction === void 0 && input.trigger === void 0 && input.outcomes == null && input.credentialMode == null) throw new ToolInputError("Event automation update requires a change.");
 			const nextTrigger = input.trigger ? {
 				namespace: input.trigger.namespace,
-				identifier: normalizeEventIdentifier(catalog, input.trigger.namespace, input.trigger.identifier),
+				identifier: normalizeCatalogEventIdentifier(catalog, input.trigger.namespace, input.trigger.identifier),
 				resourceType: input.trigger.resourceType,
 				label: input.trigger.label,
 				events: [...new Set(input.trigger.events)],
 				...match ? { match } : void 0
 			} : current.trigger;
-			const nextInstruction = input.task != null ? input.task : current.task.text;
+			const nextInstruction = input.instruction != null ? input.instruction : current.task.text;
 			const instructionChanged = nextInstruction !== current.task.text;
-			const changesExecution = instructionChanged || changesEventTaskTrigger(current.trigger, nextTrigger);
+			const changesExecution = instructionChanged || changesEventAutomationTrigger(current.trigger, nextTrigger);
 			const next = {
 				...current,
 				credentialMode: changesExecution && !isCreator ? "system" : input.credentialMode ?? current.credentialMode,
@@ -7632,26 +7640,26 @@ function createUpdateEventTaskTool(context, catalog) {
 				if (title) next.title = title;
 				else delete next.title;
 			}
-			const saved = await saveEventTask(getDb(), next);
-			if (!saved) throw new ToolInputError("Event task was not found.");
-			return eventTaskSuccess(saved, catalog);
+			const saved = await saveEventAutomation(getDb(), next);
+			if (!saved) throw new ToolInputError("Event automation was not found.");
+			return eventAutomationToolResult(saved, catalog, actor.userId);
 		}
 	});
 }
 //#endregion
-//#region src/chat/tools/event-tasks.ts
-/** Build event task tools for an interactive Slack actor. */
-function createEventTaskTools(context, catalog) {
+//#region src/chat/tools/event-automations.ts
+/** Build event automation tools for an interactive Slack actor. */
+function createEventAutomationTools(context, catalog) {
 	if (context.source.kind !== "slack" || context.destination.platform !== "slack" || context.actor?.platform !== "slack") return {};
 	return {
-		...hasPluginResourceEventCatalogEntries(catalog) ? { createEventTask: createEventTaskTool(context, catalog) } : void 0,
-		listEventTasks: createListEventTasksTool(context, catalog),
-		updateEventTask: createUpdateEventTaskTool(context, catalog),
-		deleteEventTask: createDeleteEventTaskTool(context, catalog)
+		...hasPluginEventCatalogEntries(catalog) ? { createEventAutomation: createEventAutomationTool(context, catalog) } : void 0,
+		listEventAutomations: createListEventAutomationsTool(context, catalog),
+		updateEventAutomation: createUpdateEventAutomationTool(context, catalog),
+		deleteEventAutomation: createDeleteEventAutomationTool(context, catalog)
 	};
 }
 //#endregion
-//#region src/chat/scheduled-tasks/cadence.ts
+//#region src/chat/scheduled-automations/cadence.ts
 const FORMATTERS = /* @__PURE__ */ new Map();
 function getFormatter(timezone) {
 	const existing = FORMATTERS.get(timezone);
@@ -7894,7 +7902,7 @@ function getNextRunAtMs(task, scheduledForMs, afterMs = scheduledForMs) {
 	});
 }
 //#endregion
-//#region src/chat/scheduled-tasks/schedule-intent.ts
+//#region src/chat/scheduled-automations/schedule-intent.ts
 /**
 * Owns model-facing schedule intent and materializes it against the trusted
 * server clock into the canonical schedule persisted by core.
@@ -7941,9 +7949,9 @@ const recurringScheduleIntentSchema = z.object({
 	interval: z.number().int().positive().max(365).describe("Repeat every N frequency units. Defaults to 1.").nullable().optional(),
 	time: localTimeSchema.describe("Local wall-clock time for each occurrence in HH:MM format."),
 	weekdays: z.array(weekdaySchema).min(1).max(7).describe("Required for weekly schedules.").nullable().optional(),
-	day_of_month: z.number().int().min(1).max(31).describe("Required for monthly and yearly schedules.").nullable().optional(),
+	dayOfMonth: z.number().int().min(1).max(31).describe("Required for monthly and yearly schedules.").nullable().optional(),
 	month: z.number().int().min(1).max(12).describe("Required for yearly schedules, where January is 1.").nullable().optional(),
-	start_date: localDateSchema.describe("Optional local calendar date that anchors the recurrence. Omit to start with the next matching occurrence.").nullable().optional(),
+	startDate: localDateSchema.describe("Optional local calendar date that anchors the recurrence. Omit to start with the next matching occurrence.").nullable().optional(),
 	timezone: timezoneSchema
 }).strict().superRefine((schedule, context) => {
 	if (schedule.frequency === "weekly" && schedule.weekdays == null) context.addIssue({
@@ -7951,10 +7959,10 @@ const recurringScheduleIntentSchema = z.object({
 		message: "Weekly schedules require weekdays.",
 		path: ["weekdays"]
 	});
-	if ((schedule.frequency === "monthly" || schedule.frequency === "yearly") && schedule.day_of_month == null) context.addIssue({
+	if ((schedule.frequency === "monthly" || schedule.frequency === "yearly") && schedule.dayOfMonth == null) context.addIssue({
 		code: "custom",
-		message: `${schedule.frequency} schedules require day_of_month.`,
-		path: ["day_of_month"]
+		message: `${schedule.frequency} schedules require dayOfMonth.`,
+		path: ["dayOfMonth"]
 	});
 	if (schedule.frequency === "yearly" && schedule.month == null) context.addIssue({
 		code: "custom",
@@ -7966,10 +7974,10 @@ const recurringScheduleIntentSchema = z.object({
 		message: "weekdays applies only to weekly schedules.",
 		path: ["weekdays"]
 	});
-	if (schedule.frequency !== "monthly" && schedule.frequency !== "yearly" && schedule.day_of_month != null) context.addIssue({
+	if (schedule.frequency !== "monthly" && schedule.frequency !== "yearly" && schedule.dayOfMonth != null) context.addIssue({
 		code: "custom",
-		message: "day_of_month applies only to monthly or yearly schedules.",
-		path: ["day_of_month"]
+		message: "dayOfMonth applies only to monthly or yearly schedules.",
+		path: ["dayOfMonth"]
 	});
 	if (schedule.frequency !== "yearly" && schedule.month != null) context.addIssue({
 		code: "custom",
@@ -8036,8 +8044,8 @@ function recurringDescription(schedule, timezone) {
 	const cadence = interval === 1 ? cadenceUnit : `${interval} ${cadenceUnit}s`;
 	let detail = "";
 	if (schedule.frequency === "weekly") detail = ` on ${formatWeekdays(schedule.weekdays)}`;
-	else if (schedule.frequency === "monthly") detail = ` on day ${schedule.day_of_month}`;
-	else if (schedule.frequency === "yearly") detail = ` on ${String(schedule.month).padStart(2, "0")}-${String(schedule.day_of_month).padStart(2, "0")}`;
+	else if (schedule.frequency === "monthly") detail = ` on day ${schedule.dayOfMonth}`;
+	else if (schedule.frequency === "yearly") detail = ` on ${String(schedule.month).padStart(2, "0")}-${String(schedule.dayOfMonth).padStart(2, "0")}`;
 	return `Every ${cadence}${detail} at ${schedule.time} (${timezone})`;
 }
 var ScheduleIntentError = class extends Error {};
@@ -8073,13 +8081,13 @@ function compileScheduleIntent(args) {
 	const recurrence = {
 		frequency: args.intent.frequency,
 		interval: args.intent.interval ?? 1,
-		startDate: args.intent.start_date ?? localDateAt(args.nowMs, timezone),
+		startDate: args.intent.startDate ?? localDateAt(args.nowMs, timezone),
 		time: parseLocalTime(args.intent.time),
 		...args.intent.frequency === "weekly" ? { weekdays: [...new Set(args.intent.weekdays.map((weekday) => WEEKDAY_INDEX[weekday]))].sort((left, right) => left - right) } : void 0,
-		...args.intent.frequency === "monthly" || args.intent.frequency === "yearly" ? { dayOfMonth: args.intent.day_of_month ?? void 0 } : void 0,
+		...args.intent.frequency === "monthly" || args.intent.frequency === "yearly" ? { dayOfMonth: args.intent.dayOfMonth ?? void 0 } : void 0,
 		...args.intent.frequency === "yearly" ? { month: args.intent.month ?? void 0 } : void 0
 	};
-	const searchRecurrence = args.intent.start_date ? recurrence : {
+	const searchRecurrence = args.intent.startDate ? recurrence : {
 		...recurrence,
 		interval: 1
 	};
@@ -8089,7 +8097,7 @@ function compileScheduleIntent(args) {
 		timezone
 	});
 	if (nextRunAtMs === void 0) throw new ScheduleIntentError("The recurring schedule has no valid future occurrence.");
-	const materializedRecurrence = args.intent.start_date ? recurrence : {
+	const materializedRecurrence = args.intent.startDate ? recurrence : {
 		...recurrence,
 		startDate: localDateAt(nextRunAtMs, timezone)
 	};
@@ -8104,10 +8112,10 @@ function compileScheduleIntent(args) {
 	};
 }
 //#endregion
-//#region src/chat/scheduled-tasks/telemetry.ts
-/** Safe structured telemetry attributes for scheduled-task lifecycle events. */
-/** Correlation attributes shared by scheduled-task create and run events. */
-function scheduledTaskAttributes(task, extras = {}) {
+//#region src/chat/scheduled-automations/telemetry.ts
+/** Safe structured telemetry attributes for scheduled-automation lifecycle events. */
+/** Correlation attributes shared by scheduled-automation create and run events. */
+function scheduledAutomationAttributes(task, extras = {}) {
 	return {
 		"app.task.id": task.id,
 		"app.task.type": "scheduled",
@@ -8124,9 +8132,9 @@ function scheduledTaskAttributes(task, extras = {}) {
 		...extras
 	};
 }
-/** Correlation attributes for one scheduled-task run transition. */
-function scheduledTaskRunAttributes(task, run, extras = {}) {
-	return scheduledTaskAttributes(task, {
+/** Correlation attributes for one scheduled-automation run transition. */
+function scheduledAutomationRunAttributes(task, run, extras = {}) {
+	return scheduledAutomationAttributes(task, {
 		"app.task.run.id": run.id,
 		"app.task.run.status": run.status,
 		"app.task.run.scheduled_for": new Date(run.scheduledForMs).toISOString(),
@@ -8135,12 +8143,12 @@ function scheduledTaskRunAttributes(task, run, extras = {}) {
 		...extras
 	});
 }
-/** Emit the lifecycle event for one skipped scheduled-task run. */
-function logScheduledTaskRunSkipped(task, run, extras = {}) {
-	logInfo("scheduled_task.run.skipped", scheduledTaskRunAttributes(task, run, extras));
+/** Emit the lifecycle event for one skipped scheduled-automation run. */
+function logScheduledAutomationRunSkipped(task, run, extras = {}) {
+	logInfo("scheduled_automation.run.skipped", scheduledAutomationRunAttributes(task, run, extras));
 }
 //#endregion
-//#region src/chat/scheduled-tasks/identity.ts
+//#region src/chat/scheduled-automations/identity.ts
 const SLACK_USER_ID_PATTERN = /^[UW][A-Z0-9]{5,}$/;
 function clean(value) {
 	const normalized = value?.trim();
@@ -8156,9 +8164,9 @@ function cleanDisplay(value, slackUserId) {
 	return SLACK_USER_ID_PATTERN.test(normalized) ? void 0 : normalized;
 }
 /** Keep scheduler creator metadata from promoting Slack IDs into display names. */
-function sanitizeScheduledTaskPrincipal(principal) {
+function sanitizeScheduledAutomationPrincipal(principal) {
 	const slackUserId = cleanSlackUserId(principal.slackUserId);
-	if (!slackUserId) throw new Error("Scheduled task principal requires a Slack user id");
+	if (!slackUserId) throw new Error("Scheduled automation principal requires a Slack user id");
 	const fullName = cleanDisplay(principal.fullName, slackUserId);
 	const userName = cleanDisplay(principal.userName, slackUserId);
 	return {
@@ -8168,28 +8176,32 @@ function sanitizeScheduledTaskPrincipal(principal) {
 	};
 }
 //#endregion
-//#region src/chat/scheduled-tasks/tool-support.ts
+//#region src/chat/scheduled-automations/tool-support.ts
 const TASK_ID_PREFIX = "sched";
 const DEFAULT_SCHEDULE_TIMEZONE = "America/Los_Angeles";
 const compactTaskResultSchema = z.object({
 	id: z.string(),
+	title: z.string().nullable(),
 	status: z.enum([
 		"active",
 		"blocked",
 		"completed",
 		"deleted"
 	]),
-	task: z.string(),
+	statusReason: z.string().nullable(),
+	createdAt: z.string().datetime(),
+	updatedAt: z.string().datetime(),
+	originalRequest: z.string().nullable(),
+	instruction: z.string(),
 	schedule: z.string(),
 	timezone: z.string(),
 	recurrence: z.unknown().nullable(),
-	next_run_at: z.string().nullable(),
+	nextRunAt: z.string().nullable(),
 	destination: z.object({
-		platform: z.literal("slack"),
-		team_id: z.string().min(1),
-		channel_id: z.string().min(1)
+		channel: z.string().min(1),
+		thread: z.string().min(1).nullable()
 	}).strict(),
-	conversation_access: z.object({
+	conversationAccess: z.object({
 		audience: z.enum([
 			"direct",
 			"group",
@@ -8197,22 +8209,29 @@ const compactTaskResultSchema = z.object({
 		]),
 		visibility: z.enum(["private", "public"])
 	}).strict(),
-	credential_mode: z.enum(["system", "creator"]),
-	outcomes: z.array(taskOutcomeSchema).max(5),
-	dashboard_url: z.string().url().nullable(),
-	last_run_at: z.string().nullable(),
-	run_now_at: z.string().nullable()
-}).strict();
-const scheduleTaskToolResultSchema = juniorToolOutputSchema.extend({
-	target: z.string(),
-	task: compactTaskResultSchema
+	credentialMode: z.enum(["system", "creator"]),
+	isCreator: z.boolean(),
+	createdBy: z.object({
+		name: z.string().min(1).nullable(),
+		username: z.string().min(1).nullable()
+	}).strict(),
+	outcomes: z.array(z.object({
+		action: z.literal("send_message"),
+		destination: z.object({
+			channel: z.string().min(1),
+			thread: z.string().min(1).nullable()
+		}).strict()
+	}).strict()).max(5),
+	dashboardUrl: z.string().url().nullable(),
+	lastRunAt: z.string().nullable(),
+	runNowAt: z.string().nullable()
 }).strict();
+const scheduleAutomationToolResultSchema = juniorToolOutputSchema.extend({ automation: compactTaskResultSchema }).strict();
 const scheduleListToolResultSchema = juniorToolOutputSchema.extend({
-	target: z.string(),
-	tasks: z.array(compactTaskResultSchema),
+	automations: z.array(compactTaskResultSchema),
 	truncated: z.boolean()
 }).strict();
-/** Normalize scheduled-task validation failures into the core tool contract. */
+/** Normalize scheduled-automation validation failures into the core tool contract. */
 function throwToolInputError(error) {
 	throw new ToolInputError(error);
 }
@@ -8241,7 +8260,7 @@ function requireActor(context, destination) {
 	if (context.actor?.platform !== "slack" || context.actor.teamId !== destination.teamId) throwToolInputError("No active Slack actor context is available.");
 	const userId = context.actor?.userId?.trim();
 	if (!userId || userId.toLowerCase() === "unknown") throwToolInputError("No active Slack actor context is available.");
-	return sanitizeScheduledTaskPrincipal({
+	return sanitizeScheduledAutomationPrincipal({
 		slackUserId: userId,
 		...context.actor?.userName ? { userName: context.actor.userName } : void 0,
 		...context.actor?.fullName ? { fullName: context.actor.fullName } : void 0
@@ -8273,54 +8292,65 @@ function sameDestination(task, destination) {
 /** Look up a mutable task only after enforcing active-conversation ownership. */
 async function getWritableTask(args) {
 	const destination = requireActiveConversation(args.context);
-	const task = await readScheduledTask(getDb(), args.taskId);
-	if (!task || task.status === "deleted") throwToolInputError("Scheduled task was not found in the active Slack conversation.");
-	if (!sameDestination(task, destination)) throwToolInputError("Scheduled task can only be managed from the Slack destination where it currently delivers.");
+	const task = await readScheduledAutomation(getDb(), args.taskId);
+	if (!task || task.status === "deleted") throwToolInputError("Scheduled automation was not found in the active Slack conversation.");
+	if (!sameDestination(task, destination)) throwToolInputError("Scheduled automation can only be managed from the Slack destination where it currently delivers.");
 	return task;
 }
-/** Project scheduled task state into the stable model-facing result shape. */
-function compactTask(task) {
+/** Project scheduled automation state into the stable model-facing result shape. */
+function compactTask(task, requesterSlackUserId) {
 	return compactTaskResultSchema.parse({
 		id: task.id,
+		title: task.title?.trim() || null,
 		status: task.status,
-		task: task.task.text,
+		statusReason: task.statusReason ?? null,
+		createdAt: new Date(task.createdAtMs).toISOString(),
+		updatedAt: new Date(task.updatedAtMs).toISOString(),
+		originalRequest: task.originalRequest ?? null,
+		instruction: task.task.text,
 		schedule: task.schedule.description,
 		timezone: task.schedule.timezone,
 		recurrence: task.schedule.recurrence ? {
 			frequency: task.schedule.recurrence.frequency,
 			interval: task.schedule.recurrence.interval,
-			start_date: task.schedule.recurrence.startDate,
+			startDate: task.schedule.recurrence.startDate,
 			time: task.schedule.recurrence.time,
 			weekdays: task.schedule.recurrence.weekdays,
 			month: task.schedule.recurrence.month,
-			day_of_month: task.schedule.recurrence.dayOfMonth
+			dayOfMonth: task.schedule.recurrence.dayOfMonth
 		} : null,
-		next_run_at: task.nextRunAtMs ? new Date(task.nextRunAtMs).toISOString() : null,
+		nextRunAt: task.nextRunAtMs ? new Date(task.nextRunAtMs).toISOString() : null,
 		destination: {
-			platform: "slack",
-			team_id: task.destination.teamId,
-			channel_id: task.destination.channelId
+			channel: task.destination.channelId,
+			thread: task.destination.threadTs ?? null
+		},
+		conversationAccess: task.conversationAccess,
+		credentialMode: task.credentialMode,
+		isCreator: task.createdBy.slackUserId === requesterSlackUserId,
+		createdBy: {
+			name: task.createdBy.fullName ?? null,
+			username: task.createdBy.userName ?? null
 		},
-		conversation_access: task.conversationAccess,
-		credential_mode: task.credentialMode,
-		outcomes: effectiveTaskOutcomes(task.outcomes, task.destination),
-		dashboard_url: getDashboardTaskLink(task.id) ?? null,
-		last_run_at: task.lastRunAtMs ? new Date(task.lastRunAtMs).toISOString() : null,
-		run_now_at: task.runNowAtMs ? new Date(task.runNowAtMs).toISOString() : null
+		outcomes: effectiveTaskOutcomes(task.outcomes, task.destination).map((outcome) => ({
+			action: outcome.action,
+			destination: {
+				channel: outcome.destination.channelId,
+				thread: outcome.destination.threadTs ?? null
+			}
+		})),
+		dashboardUrl: getDashboardTaskLink(task.id) ?? null,
+		lastRunAt: task.lastRunAtMs ? new Date(task.lastRunAtMs).toISOString() : null,
+		runNowAt: task.runNowAtMs ? new Date(task.runNowAtMs).toISOString() : null
 	});
 }
 /** Build the structured result shared by single-task scheduler tools. */
-function scheduleTaskToolResult(target, task) {
-	return {
-		target,
-		task
-	};
+function scheduleAutomationToolResult(task, requesterSlackUserId) {
+	return { automation: compactTask(task, requesterSlackUserId) };
 }
 /** Build the structured result for listing scheduler tools. */
 function scheduleListToolResult(args) {
 	return {
-		target: args.target,
-		tasks: args.tasks,
+		automations: args.automations,
 		truncated: args.truncated
 	};
 }
@@ -8346,9 +8376,9 @@ function getDefaultScheduleTimezone() {
 	return process.env.JUNIOR_TIMEZONE?.trim() || DEFAULT_SCHEDULE_TIMEZONE;
 }
 //#endregion
-//#region src/chat/scheduled-tasks/tools/create.ts
-/** Create a tool that stores a scheduled task for the active Slack context. */
-function createSlackScheduleCreateTaskTool(context) {
+//#region src/chat/scheduled-automations/tools/create.ts
+/** Create a tool that stores a scheduled automation for the active Slack context. */
+function createSlackScheduleCreateAutomationTool(context) {
 	return zodTool({
 		approvalMode: "review",
 		annotations: {
@@ -8360,19 +8390,19 @@ function createSlackScheduleCreateTaskTool(context) {
 		description: "Create a one-time or recurring Junior task in the active Slack conversation when the user asks Junior to do work later or repeatedly.",
 		executionMode: "sequential",
 		inputSchema: z.object({
-			task: z.string().min(1).max(4e3),
+			instruction: z.string().min(1).max(4e3),
 			title: z.string().trim().min(1).max(60).nullable().describe("Optional short display title. Omit or use null to generate one from the task instruction.").optional(),
 			schedule: scheduleIntentSchema.describe("When the task runs. The scheduler computes the exact next run from this intent and the server clock."),
-			outcomes: z.array(taskOutcomeInputSchema).max(5).describe("Messages to send after successful work. Use an empty list to send nothing. Omit to send one message to the current Slack conversation.").optional(),
-			credential_mode: z.enum(["creator", "system"]).nullable().describe("Use creator to make the task creator's connected credentials available, or system when the creator says not to use them. Omit or use null for the creator default.").optional()
+			outcomes: z.array(taskOutcomeInputSchema).max(5).describe("Successful work is silent by default. Omit this field or use an empty list when the Automation should act through tools without a status message. Add send_message only when the user asks for a reminder, post, digest, summary, or other visible result.").optional(),
+			credentialMode: z.enum(["creator", "system"]).nullable().describe("Use creator to make the task creator's connected credentials available, or system when the creator says not to use them. Omit or use null for the creator default.").optional()
 		}).strict(),
 		prepareArguments(args) {
 			const prepared = { ...args };
 			if (prepared.title == null) delete prepared.title;
-			if (prepared.credential_mode === "creator" || prepared.credential_mode === null) delete prepared.credential_mode;
+			if (prepared.credentialMode === "creator" || prepared.credentialMode === null) delete prepared.credentialMode;
 			return prepared;
 		},
-		outputSchema: scheduleTaskToolResultSchema,
+		outputSchema: scheduleAutomationToolResultSchema,
 		execute: async (input, options) => {
 			const destination = requireActiveConversation(context);
 			const actor = requireActor(context, destination);
@@ -8382,13 +8412,13 @@ function createSlackScheduleCreateTaskTool(context) {
 				toolCallId: options.toolCallId
 			});
 			const db = getDb();
-			const existing = await readScheduledTask(db, id);
+			const existing = await readScheduledAutomation(db, id);
 			if (existing) {
-				if (!sameDestination(existing, destination) || existing.createdBy.slackUserId !== actor.slackUserId) throwToolInputError("Scheduled task operation identity is invalid.");
-				return scheduleTaskToolResult("slackScheduleCreateTask", compactTask(existing));
+				if (!sameDestination(existing, destination) || existing.createdBy.slackUserId !== actor.slackUserId) throwToolInputError("Scheduled automation operation identity is invalid.");
+				return scheduleAutomationToolResult(existing, actor.slackUserId);
 			}
 			const identity = (await context.users.resolveActor())?.identity;
-			if (!identity || identity.provider !== "slack" || identity.providerTenantId !== destination.teamId || identity.providerSubjectId !== actor.slackUserId) throwToolInputError("Scheduled task creator identity is unavailable.");
+			if (!identity || identity.provider !== "slack" || identity.providerTenantId !== destination.teamId || identity.providerSubjectId !== actor.slackUserId) throwToolInputError("Scheduled automation creator identity is unavailable.");
 			const nowMs = context.now?.() ?? Date.now();
 			let compiled;
 			try {
@@ -8404,7 +8434,7 @@ function createSlackScheduleCreateTaskTool(context) {
 			const conversationAccess = getConversationAccess(destination, context.source);
 			const title = await resolveTaskTitle({
 				completeText,
-				instruction: input.task,
+				instruction: input.instruction,
 				title: input.title
 			});
 			const task = {
@@ -8414,28 +8444,28 @@ function createSlackScheduleCreateTaskTool(context) {
 				createdBy: actor,
 				creatorIdentityId: identity.id,
 				conversationAccess,
-				credentialMode: input.credential_mode ?? "creator",
+				credentialMode: input.credentialMode ?? "creator",
 				destination,
-				executionActor: SCHEDULED_TASK_SYSTEM_ACTOR,
+				executionActor: SCHEDULED_AUTOMATION_SYSTEM_ACTOR,
 				nextRunAtMs: compiled.nextRunAtMs,
 				originalRequest: context.userText,
 				schedule: compiled.schedule,
 				status: "active",
 				outcomes: await resolveTaskOutcomes(input.outcomes, destination, actor.slackUserId),
-				task: { text: input.task },
+				task: { text: input.instruction },
 				...title ? { title } : void 0
 			};
-			const committed = await createScheduledTask(db, task);
-			if (!sameDestination(committed, destination) || committed.createdBy.slackUserId !== actor.slackUserId) throwToolInputError("Scheduled task operation identity is invalid.");
-			logInfo("scheduled_task.create.completed", scheduledTaskAttributes(committed));
-			return scheduleTaskToolResult("slackScheduleCreateTask", compactTask(committed));
+			const committed = await createScheduledAutomation(db, task);
+			if (!sameDestination(committed, destination) || committed.createdBy.slackUserId !== actor.slackUserId) throwToolInputError("Scheduled automation operation identity is invalid.");
+			logInfo("scheduled_automation.create.completed", scheduledAutomationAttributes(committed));
+			return scheduleAutomationToolResult(committed, actor.slackUserId);
 		}
 	});
 }
 //#endregion
-//#region src/chat/scheduled-tasks/tools/delete.ts
-/** Create a tool that removes a scheduled task from the active Slack conversation. */
-function createSlackScheduleDeleteTaskTool(context) {
+//#region src/chat/scheduled-automations/tools/delete.ts
+/** Create a tool that removes a scheduled automation from the active Slack conversation. */
+function createSlackScheduleDeleteAutomationTool(context) {
 	return zodTool({
 		approvalMode: "review",
 		annotations: {
@@ -8446,21 +8476,21 @@ function createSlackScheduleDeleteTaskTool(context) {
 		},
 		description: "Delete one scheduled Junior task from the active Slack conversation. Use only task IDs returned for this conversation. Do not delete schedules from threads, other channels, or another user's DM.",
 		executionMode: "sequential",
-		inputSchema: z.object({ task_id: z.string().min(1).describe("ID of the task to delete. Must be from this active Slack conversation.") }),
-		outputSchema: scheduleTaskToolResultSchema,
-		execute: async ({ task_id }) => {
+		inputSchema: z.object({ automationId: z.string().min(1).describe("ID of the task to delete. Must be from this active Slack conversation.") }),
+		outputSchema: scheduleAutomationToolResultSchema,
+		execute: async ({ automationId }) => {
 			const next = {
 				...await getWritableTask({
 					context,
-					taskId: task_id
+					taskId: automationId
 				}),
 				updatedAtMs: Date.now(),
 				status: "deleted",
 				nextRunAtMs: void 0,
 				runNowAtMs: void 0
 			};
-			await saveScheduledTask(getDb(), next);
-			return scheduleTaskToolResult("slackScheduleDeleteTask", compactTask(next));
+			await saveScheduledAutomation(getDb(), next);
+			return scheduleAutomationToolResult(next, context.actor?.userId);
 		}
 	});
 }
@@ -8499,7 +8529,7 @@ function parseRequiredSlackUserIdParam(field, value) {
 	};
 }
 //#endregion
-//#region src/chat/scheduled-tasks/tools/list.ts
+//#region src/chat/scheduled-automations/tools/list.ts
 function taskMatchesQuery(task, query) {
 	const normalized = query.toLowerCase();
 	return [
@@ -8510,10 +8540,10 @@ function taskMatchesQuery(task, query) {
 		task.status
 	].some((value) => value?.toLowerCase().includes(normalized));
 }
-/** Create a tool that lists scheduled tasks for the active conversation or the requester. */
-function createSlackScheduleListTasksTool(context) {
+/** Create a tool that lists scheduled automations for the active conversation or the requester. */
+function createSlackScheduleListAutomationsTool(context) {
 	return zodTool({
-		description: "List scheduled tasks in this Slack conversation. To find one of the requester's tasks elsewhere in the workspace, pass channel_id and/or query.",
+		description: "List scheduled automations in this Slack conversation. Each result says whether the requester is the creator. To find one of the requester's automations elsewhere in the workspace, pass channel_id and/or query.",
 		annotations: {
 			destructiveHint: false,
 			idempotentHint: true,
@@ -8522,7 +8552,7 @@ function createSlackScheduleListTasksTool(context) {
 		},
 		inputSchema: z.object({
 			channel_id: slackChannelIdParam("Current destination channel ID to filter by. Use the ID from a channel mention; do not guess.").nullable().optional(),
-			query: z.string().trim().min(1).max(200).nullable().describe("Text to match in the requester's scheduled tasks.").optional()
+			query: z.string().trim().min(1).max(200).nullable().describe("Text to match in the requester's scheduled automations.").optional()
 		}).strict(),
 		outputSchema: scheduleListToolResultSchema,
 		execute: async (input) => {
@@ -8536,7 +8566,7 @@ function createSlackScheduleListTasksTool(context) {
 			}
 			const query = input.query?.trim() || void 0;
 			const crossConversation = Boolean(query) || channelId !== void 0 && channelId !== destination.channelId;
-			const matching = (await listScheduledTasksForTeam(getDb(), destination.teamId)).filter((task) => {
+			const matching = (await listScheduledAutomationsForTeam(getDb(), destination.teamId)).filter((task) => {
 				if (task.destination.platform !== "slack") return false;
 				if (task.destination.teamId !== destination.teamId) return false;
 				if (task.status === "completed") return false;
@@ -8546,19 +8576,18 @@ function createSlackScheduleListTasksTool(context) {
 				if (query && !taskMatchesQuery(task, query)) return false;
 				return true;
 			}).sort((left, right) => right.createdAtMs - left.createdAtMs || right.id.localeCompare(left.id));
-			const visible = matching.slice(0, 50).map(compactTask);
+			const visible = matching.slice(0, 50).map((task) => compactTask(task, actor.slackUserId));
 			return scheduleListToolResult({
-				target: "slackScheduleListTasks",
-				tasks: visible,
+				automations: visible,
 				truncated: matching.length > visible.length
 			});
 		}
 	});
 }
 //#endregion
-//#region src/chat/scheduled-tasks/tools/run-now.ts
-/** Create a tool that marks an existing scheduled task due immediately. */
-function createSlackScheduleRunTaskNowTool(context) {
+//#region src/chat/scheduled-automations/tools/run-now.ts
+/** Create a tool that marks an existing scheduled automation due immediately. */
+function createSlackScheduleRunAutomationNowTool(context) {
 	return zodTool({
 		approvalMode: "review",
 		annotations: {
@@ -8567,31 +8596,31 @@ function createSlackScheduleRunTaskNowTool(context) {
 			openWorldHint: true,
 			readOnlyHint: false
 		},
-		description: "Queue an existing active scheduled Junior task to run as soon as possible, without changing its cadence. Use when the user asks to run an existing scheduled task now. Use only task IDs returned for this conversation.",
+		description: "Queue an existing active scheduled Junior task to run as soon as possible, without changing its cadence. Use when the user asks to run an existing scheduled automation now. Use only task IDs returned for this conversation.",
 		executionMode: "sequential",
-		inputSchema: z.object({ task_id: z.string().min(1).describe("ID of the active task to run now. Must be from this active Slack conversation.") }),
-		outputSchema: scheduleTaskToolResultSchema,
-		execute: async ({ task_id }) => {
+		inputSchema: z.object({ automationId: z.string().min(1).describe("ID of the active task to run now. Must be from this active Slack conversation.") }),
+		outputSchema: scheduleAutomationToolResultSchema,
+		execute: async ({ automationId }) => {
 			const lookup = await getWritableTask({
 				context,
-				taskId: task_id
+				taskId: automationId
 			});
-			if (lookup.status !== "active") throwToolInputError("Scheduled task must be active before it can be run now.");
+			if (lookup.status !== "active") throwToolInputError("Scheduled automation must be active before it can be run now.");
 			const nowMs = Date.now();
 			const next = {
 				...lookup,
 				updatedAtMs: nowMs,
 				runNowAtMs: nowMs
 			};
-			await saveScheduledTask(getDb(), next);
-			return scheduleTaskToolResult("slackScheduleRunTaskNow", compactTask(next));
+			await saveScheduledAutomation(getDb(), next);
+			return scheduleAutomationToolResult(next, context.actor?.userId);
 		}
 	});
 }
 //#endregion
-//#region src/chat/scheduled-tasks/tools/update.ts
-/** Create a tool that edits a scheduled task, including moving it here. */
-function createSlackScheduleUpdateTaskTool(context) {
+//#region src/chat/scheduled-automations/tools/update.ts
+/** Create a tool that edits a scheduled automation, including moving it here. */
+function createSlackScheduleUpdateAutomationTool(context) {
 	return zodTool({
 		approvalMode: "review",
 		annotations: {
@@ -8600,37 +8629,37 @@ function createSlackScheduleUpdateTaskTool(context) {
 			openWorldHint: true,
 			readOnlyHint: false
 		},
-		description: "Update a scheduled task. To move the requester's task into this Slack conversation, set destination to \"here\".",
+		description: "Update a scheduled automation. To move the requester's task into this Slack conversation, set destination to \"here\".",
 		executionMode: "sequential",
 		inputSchema: z.object({
-			task_id: z.string().min(1).describe("Scheduled task ID returned by slackScheduleListTasks."),
-			task: z.string().min(1).max(4e3).optional(),
+			automationId: z.string().min(1).describe("Scheduled automation ID returned by slackScheduleListAutomations."),
+			instruction: z.string().min(1).max(4e3).optional(),
 			schedule: scheduleIntentSchema.describe("Complete replacement schedule. Omit to keep it unchanged.").nullable().optional(),
 			outcomes: z.array(taskOutcomeInputSchema).max(5).describe("Replacement messages to send after successful work. Use an empty list to send nothing. Omit to keep unchanged.").optional(),
 			status: z.enum(["active", "blocked"]).describe("Set active to resume a blocked task, or blocked to stop dispatch.").optional(),
 			destination: z.literal("here").nullable().describe("Set to \"here\" to move the creator's task into this Slack conversation. Omit to keep its destination.").optional(),
-			credential_mode: z.enum(["system", "creator"]).nullable().describe("Use creator credentials or system credentials. Only the task creator may enable creator mode. Omit to keep unchanged.").optional()
+			credentialMode: z.enum(["system", "creator"]).nullable().describe("Use creator credentials or system credentials. Only the task creator may enable creator mode. Omit to keep unchanged.").optional()
 		}).strict(),
-		outputSchema: scheduleTaskToolResultSchema,
+		outputSchema: scheduleAutomationToolResultSchema,
 		execute: async (input) => {
 			const activeDestination = requireActiveConversation(context);
 			const actor = requireActor(context, activeDestination);
 			const db = getDb();
-			const lookup = await readScheduledTask(db, input.task_id);
-			if (!lookup || lookup.status === "deleted") throwToolInputError("Scheduled task was not found.");
-			if (lookup.status === "completed") throwToolInputError("Completed scheduled tasks cannot be updated. Create a new task instead.");
-			if (lookup.destination.platform !== "slack") throwToolInputError("Scheduled task destination is invalid.");
-			if (lookup.destination.teamId !== activeDestination.teamId) throwToolInputError("Scheduled tasks can only be managed within the same Slack workspace.");
+			const lookup = await readScheduledAutomation(db, input.automationId);
+			if (!lookup || lookup.status === "deleted") throwToolInputError("Scheduled automation was not found.");
+			if (lookup.status === "completed") throwToolInputError("Completed scheduled automations cannot be updated. Create a new automation instead.");
+			if (lookup.destination.platform !== "slack") throwToolInputError("Scheduled automation destination is invalid.");
+			if (lookup.destination.teamId !== activeDestination.teamId) throwToolInputError("Scheduled automations can only be managed within the same Slack workspace.");
 			const moveHere = input.destination === "here";
 			const alreadyHere = sameDestination(lookup, activeDestination);
 			const isCreator = actor.slackUserId === lookup.createdBy.slackUserId;
-			if (!alreadyHere && !moveHere) throwToolInputError("Scheduled task can only be managed from the Slack destination where it currently delivers. Set destination to \"here\" to move it into this conversation.");
-			if (moveHere && !isCreator) throwToolInputError("Only the scheduled task creator can move this task.");
-			if (input.credential_mode === "creator" && !isCreator) throwToolInputError("Only the scheduled task creator can enable creator credential use.");
-			if (input.outcomes !== void 0 && !isCreator) throwToolInputError("Only the scheduled task creator can change message destinations.");
+			if (!alreadyHere && !moveHere) throwToolInputError("Scheduled automation can only be managed from the Slack destination where it currently delivers. Set destination to \"here\" to move it into this conversation.");
+			if (moveHere && !isCreator) throwToolInputError("Only the scheduled automation creator can move this task.");
+			if (input.credentialMode === "creator" && !isCreator) throwToolInputError("Only the scheduled automation creator can enable creator credential use.");
+			if (input.outcomes !== void 0 && !isCreator) throwToolInputError("Only the scheduled automation creator can change message destinations.");
 			const changingDestination = moveHere && !alreadyHere;
 			if (changingDestination) {
-				if ((await db.select({ id: juniorSchedulerRuns.id }).from(juniorSchedulerRuns).where(and(eq(juniorSchedulerRuns.taskId, lookup.id), inArray(juniorSchedulerRuns.status, ["pending", "running"]))).limit(1)).length > 0) throwToolInputError("Scheduled task cannot be moved while an occurrence is already running. Try again after the current run finishes.");
+				if ((await db.select({ id: juniorSchedulerRuns.id }).from(juniorSchedulerRuns).where(and(eq(juniorSchedulerRuns.taskId, lookup.id), inArray(juniorSchedulerRuns.status, ["pending", "running"]))).limit(1)).length > 0) throwToolInputError("Scheduled automation cannot be moved while an occurrence is already running. Try again after the current run finishes.");
 			}
 			const nowMs = context.now?.() ?? Date.now();
 			let compiled;
@@ -8647,10 +8676,10 @@ function createSlackScheduleUpdateTaskTool(context) {
 			const nextRunAtMs = compiled?.nextRunAtMs ?? lookup.nextRunAtMs;
 			const status = normalizeStatus(input.status);
 			if (input.status && !status) throwToolInputError("status must be active or blocked.");
-			if (status === "active" && !nextRunAtMs) throwToolInputError("Active scheduled tasks require a schedule with a future occurrence.");
+			if (status === "active" && !nextRunAtMs) throwToolInputError("Active scheduled automations require a schedule with a future occurrence.");
 			const nextStatus = status ?? lookup.status;
-			const credentialMode = input.task !== void 0 && input.task !== lookup.task.text && !isCreator ? "system" : input.credential_mode ?? lookup.credentialMode;
-			const nextInstruction = input.task !== void 0 ? input.task : lookup.task.text;
+			const credentialMode = input.instruction !== void 0 && input.instruction !== lookup.task.text && !isCreator ? "system" : input.credentialMode ?? lookup.credentialMode;
+			const nextInstruction = input.instruction !== void 0 ? input.instruction : lookup.task.text;
 			const instructionChanged = nextInstruction !== lookup.task.text;
 			const nextDestination = changingDestination ? activeDestination : lookup.destination;
 			const next = {
@@ -8676,16 +8705,16 @@ function createSlackScheduleUpdateTaskTool(context) {
 				if (title) next.title = title;
 				else delete next.title;
 			}
-			if (!changingDestination && !instructionChanged && !compiled && status === void 0 && (input.credential_mode === void 0 || input.credential_mode === null || input.credential_mode === lookup.credentialMode) && input.outcomes === void 0 && moveHere) return scheduleTaskToolResult("slackScheduleUpdateTask", compactTask(lookup));
-			const committed = await saveScheduledTask(db, next);
-			if (changingDestination) logInfo("scheduled_task.move.completed", scheduledTaskAttributes(committed));
-			return scheduleTaskToolResult("slackScheduleUpdateTask", compactTask(committed));
+			if (!changingDestination && !instructionChanged && !compiled && status === void 0 && (input.credentialMode === void 0 || input.credentialMode === null || input.credentialMode === lookup.credentialMode) && input.outcomes === void 0 && moveHere) return scheduleAutomationToolResult(lookup, actor.slackUserId);
+			const committed = await saveScheduledAutomation(db, next);
+			if (changingDestination) logInfo("scheduled_automation.move.completed", scheduledAutomationAttributes(committed));
+			return scheduleAutomationToolResult(committed, actor.slackUserId);
 		}
 	});
 }
 //#endregion
-//#region src/chat/tools/scheduled-tasks.ts
-function scheduledTaskToolContext(context) {
+//#region src/chat/tools/scheduled-automations.ts
+function scheduledAutomationToolContext(context) {
 	if (context.source.kind !== "slack" || context.destination.platform !== "slack" || context.actor?.platform !== "slack" || !context.resolveActorIdentity) return;
 	return {
 		actor: context.actor,
@@ -8694,16 +8723,16 @@ function scheduledTaskToolContext(context) {
 		...context.userText ? { userText: context.userText } : void 0
 	};
 }
-/** Build scheduled-task tools for an interactive Slack actor. */
-function createScheduledTaskTools(context) {
-	const taskContext = scheduledTaskToolContext(context);
+/** Build scheduled-automation tools for an interactive Slack actor. */
+function createScheduledAutomationTools(context) {
+	const taskContext = scheduledAutomationToolContext(context);
 	if (!taskContext) return {};
 	return {
-		slackScheduleCreateTask: createSlackScheduleCreateTaskTool(taskContext),
-		slackScheduleListTasks: createSlackScheduleListTasksTool(taskContext),
-		slackScheduleUpdateTask: createSlackScheduleUpdateTaskTool(taskContext),
-		slackScheduleDeleteTask: createSlackScheduleDeleteTaskTool(taskContext),
-		slackScheduleRunTaskNow: createSlackScheduleRunTaskNowTool(taskContext)
+		slackScheduleCreateAutomation: createSlackScheduleCreateAutomationTool(taskContext),
+		slackScheduleListAutomations: createSlackScheduleListAutomationsTool(taskContext),
+		slackScheduleUpdateAutomation: createSlackScheduleUpdateAutomationTool(taskContext),
+		slackScheduleDeleteAutomation: createSlackScheduleDeleteAutomationTool(taskContext),
+		slackScheduleRunAutomationNow: createSlackScheduleRunAutomationNowTool(taskContext)
 	};
 }
 //#endregion
@@ -12770,7 +12799,7 @@ async function tryRecordWorkspaceSwitchStat(workspace) {
 }
 async function stopWorkspaceSnapshotWatch(input) {
 	try {
-		await cancelResourceEventSubscription({
+		await cancelWatch({
 			conversationId: input.conversationId,
 			id: input.subscriptionId
 		});
@@ -12967,7 +12996,7 @@ function createWorkspaceTools(context) {
 			outputSchema: juniorToolOutputSchema.extend({
 				workspace: workspaceSchema,
 				status: z.enum(["ready", "building"]),
-				subscription: resourceEventSubscriptionResultSchema.optional().describe("Present when the snapshot ready and failed events are already watched for this conversation.")
+				subscription: watchResultSchema.optional().describe("Present when the snapshot ready and failed events are already watched for this conversation.")
 			}),
 			async execute({ name }, options) {
 				const workspace = await getWorkspaceByName(getDb(), name);
@@ -12977,7 +13006,7 @@ function createWorkspaceTools(context) {
 					workspaceName: workspace.name
 				});
 				const conversationId = context.conversationId.trim();
-				const subscription = conversationId ? await createResourceEventSubscription({
+				const subscription = conversationId ? await createWatch({
 					conversationId,
 					events: [WORKSPACE_SNAPSHOT_READY_EVENT, WORKSPACE_SNAPSHOT_FAILED_EVENT],
 					expiresAtMs: Date.now() + RESOURCE_SUBSCRIPTION_DEFAULT_TTL_MS,
@@ -13042,7 +13071,7 @@ function createTools(availableSkills, hooks = {}, context, options = {}) {
 	const slackContext = getSlackToolContext(context);
 	const slackLocationCapabilities = slackContext ? resolveChannelCapabilities(slackContext.locationChannelId) : void 0;
 	const canSendFilesToActiveConversation = Boolean(slackContext && slackLocationCapabilities?.canSendFiles);
-	const resourceEventCatalog = getResourceEventCatalog();
+	const eventCatalog = getEventCatalog();
 	const tools = {
 		...options.includeLoadSkill === false ? void 0 : { loadSkill: createLoadSkillTool(availableSkills, { onSkillLoaded: hooks.onSkillLoaded }) },
 		reportProgress: createReportProgressTool(),
@@ -13056,9 +13085,9 @@ function createTools(availableSkills, hooks = {}, context, options = {}) {
 		writeFile: createWriteFileTool(),
 		webSearch: createWebSearchTool(botConfig.webSearchModelId, hooks.toolOverrides?.webSearch),
 		webFetch: createWebFetchTool(hooks, { canSendFilesToActiveConversation }),
-		...createResourceEventTools(context, resourceEventCatalog),
-		...createEventTaskTools(context, resourceEventCatalog),
-		...createScheduledTaskTools(context),
+		...createEventTools(context, eventCatalog),
+		...createEventAutomationTools(context, eventCatalog),
+		...createScheduledAutomationTools(context),
 		...createWorkspaceTools(context)
 	};
 	tools.searchConversationEvents = createSearchConversationEventsTool(context);
@@ -15434,7 +15463,7 @@ Assess the exact action's intrinsic risk and whether the user's intent authorize
 ## Data Exfiltration
 - Sending private data, organization data, secrets, or credentials to an untrusted destination is high or critical risk.
 - A user-requested read, query, or upload to a trusted destination is not exfiltration by default.
-- The active Junior conversation is not an untrusted destination merely because it is a public or multi-user channel. For a scheduled task or event task, a request by the current actor for scoped work that needs their connected service access authorizes routine service-native reads and posting the requested result to the task's stored Slack destination. It does not authorize exposing credential values, broad data dumps, or delivery to another destination.
+- The active Junior conversation is not an untrusted destination merely because it is a public or multi-user channel. For a scheduled automation or event automation, a request by the current actor for scoped work that needs their connected service access authorizes routine service-native reads and posting the requested result to the task's stored Slack destination. It does not authorize exposing credential values, broad data dumps, or delivery to another destination.
 - Using an existing credential to authenticate a user-requested action is not credential exfiltration by itself.
 - Ordinary product context such as internal system names, repository names, or workflow descriptions is not private organization data by itself, including on an authorized public write destination.
 - Deny disclosure of secrets, credentials, or private organization data to an untrusted destination even when the user requested it.
@@ -15728,9 +15757,9 @@ function resolveToolRuntimeRoute(args) {
 			actor: args.actor?.platform === "web" ? args.actor : void 0,
 			source: args.run.source
 		};
-		case "resource_event":
-		case "scheduled_task":
-		case "event_task":
+		case "event":
+		case "scheduled_automation":
+		case "event_automation":
 		case "plugin_dispatch":
 		case "agent_invocation": return {
 			destination,
@@ -17698,4 +17727,4 @@ async function executeAgentRunInPrivacyContext(run, conversationPrivacy, runLogC
 	}
 }
 //#endregion
-export { shouldEmitDevAgentTrace as $, createAgentInvocationSchema as A, resolveSandboxEgressProviderForHost as B, renderBlockText as C, getNextRunAtMs as D, scheduledTaskRunAttributes as E, ingestResourceEvent as F, consumeSandboxEgressAuthRequiredSignal as G, shouldPropagateSandboxEgressTrace as H, isResourceEventMailboxMetadata as I, sandboxEgressSignalsResponseSchema as J, consumeSandboxEgressPermissionDeniedSignal as K, renderTaskInput as L, AgentInvocationLimitError as M, getMcpProviderErrorAttributes as N, agentBindingSchema as O, processWorkspaceSnapshotJob as P, AuthorizationFlowDisabledError as Q, maybePostAutomatedTurnLimitNotice as R, renderAttachmentText as S, logScheduledTaskRunSkipped as T, SANDBOX_EGRESS_PROXY_PATH as U, normalizeSandboxEgressTracePropagationDomains as V, clearSandboxEgressSignals as W, buildSteeringPiMessage as X, createUserTokenStore as Y, isVisionImageMediaType as Z, readPublicArtifact as _, deleteMcpAuthSession as a, readAttachmentVisionSummary as b, deleteMcpStoredOAuthCredentials as c, putMcpStoredOAuthCredentials as d, getConfigDefaults as et, PluginCredentialFailureError as f, publicArtifactHeaders as g, resolvePluginOAuthAccount as h, finalizeMcpAuthorization as i, AgentInvocationBusyError as j, agentInvocationSchema as k, getMcpAuthSession as l, latestReportedProgress as m, createContextCompactor as n, deleteMcpAuthSessionsForUserProvider as o, authorizationId as p, parseSandboxEgressCredentialToken as q, executeCredentialedEgressRequest as r, deleteMcpServerSessionId as s, executeAgentRun as t, setConfigDefaults as tt, getMcpStoredOAuthCredentials as u, unpublishedArtifactHeaders as v, listThreadReplies as w, recordSlackAttachment as x, lookupSlackUserProfile as y, recordFinishedTurnForAutomatedLimit as z };
+export { shouldEmitDevAgentTrace as $, createAgentInvocationSchema as A, resolveSandboxEgressProviderForHost as B, renderBlockText as C, getNextRunAtMs as D, scheduledAutomationRunAttributes as E, ingestEvent as F, consumeSandboxEgressAuthRequiredSignal as G, shouldPropagateSandboxEgressTrace as H, isEventMailboxMetadata as I, sandboxEgressSignalsResponseSchema as J, consumeSandboxEgressPermissionDeniedSignal as K, renderTaskInput as L, AgentInvocationLimitError as M, getMcpProviderErrorAttributes as N, agentBindingSchema as O, processWorkspaceSnapshotJob as P, AuthorizationFlowDisabledError as Q, maybePostAutomatedTurnLimitNotice as R, renderAttachmentText as S, logScheduledAutomationRunSkipped as T, SANDBOX_EGRESS_PROXY_PATH as U, normalizeSandboxEgressTracePropagationDomains as V, clearSandboxEgressSignals as W, buildSteeringPiMessage as X, createUserTokenStore as Y, isVisionImageMediaType as Z, readPublicArtifact as _, deleteMcpAuthSession as a, readAttachmentVisionSummary as b, deleteMcpStoredOAuthCredentials as c, putMcpStoredOAuthCredentials as d, getConfigDefaults as et, PluginCredentialFailureError as f, publicArtifactHeaders as g, resolvePluginOAuthAccount as h, finalizeMcpAuthorization as i, AgentInvocationBusyError as j, agentInvocationSchema as k, getMcpAuthSession as l, latestReportedProgress as m, createContextCompactor as n, deleteMcpAuthSessionsForUserProvider as o, authorizationId as p, parseSandboxEgressCredentialToken as q, executeCredentialedEgressRequest as r, deleteMcpServerSessionId as s, executeAgentRun as t, setConfigDefaults as tt, getMcpStoredOAuthCredentials as u, unpublishedArtifactHeaders as v, listThreadReplies as w, recordSlackAttachment as x, lookupSlackUserProfile as y, recordFinishedTurnForAutomatedLimit as z };