@sentry/junior 0.244.0 → 0.246.0

package/dist/{agent-runner-DtEtbaOb.js → agent-runner-DSKpHjHW.js}

@@ -1,28 +1,28 @@
-import { b as getGatewayApiKey, c as hasCompactedConversationContext, d as unwrapCurrentInstruction, f as escapeXml, g as getProviderErrorAttributes, h as findProviderError, i as completeText, l as isCompactionSummaryText, m as createProviderError, n as GEN_AI_SERVER_ADDRESS, o as resolveGatewayModel, p as ProviderError, r as completeObject, s as COMPACTION_SUMMARY_PREFIX, t as GEN_AI_PROVIDER_NAME, u as renderCurrentInstruction, v as isProviderRetryError, x as resolveGatewayCredential, y as MISSING_GATEWAY_CREDENTIALS_ERROR } from "./client-BVaGEb1-.js";
-import { C as withLogContext, F as normalizeIdentityEmail, I as isRecord$3, L as toOptionalNumber, R as toOptionalString, a as extractGenAiUsageSummary, b as setTags, c as getLogContextAttributesForSpan, d as logException, f as logInfo, g as serializeGenAiAttribute, i as extractGenAiUsageAttributes, l as getTracePropagationHeaders, m as normalizeGenAiFinishReason, p as logWarn, u as logError, v as setSpanAttributes, w as withSpan, x as summarizeMessageText, y as setSpanStatus } from "./logging-z7_w-KN_.js";
+import { b as getGatewayApiKey, c as hasCompactedConversationContext, d as unwrapCurrentInstruction, f as escapeXml, g as getProviderErrorAttributes, h as findProviderError, i as completeText, l as isCompactionSummaryText, m as createProviderError, n as GEN_AI_SERVER_ADDRESS, o as resolveGatewayModel, p as ProviderError, r as completeObject, s as COMPACTION_SUMMARY_PREFIX, t as GEN_AI_PROVIDER_NAME, u as renderCurrentInstruction, v as isProviderRetryError, x as resolveGatewayCredential, y as MISSING_GATEWAY_CREDENTIALS_ERROR } from "./client--xtsAxKP.js";
+import { C as withLogContext, F as normalizeIdentityEmail, I as isRecord$3, L as toOptionalNumber, R as toOptionalString, a as extractGenAiUsageSummary, b as setTags, c as getLogContextAttributesForSpan, d as logException, f as logInfo, g as serializeGenAiAttribute, i as extractGenAiUsageAttributes, l as getTracePropagationHeaders, m as normalizeGenAiFinishReason, p as logWarn, u as logError, v as setSpanAttributes, w as withSpan, x as summarizeMessageText, y as setSpanStatus } from "./logging-DVtMYOdD.js";
 import { m as startInactiveSpan, v as withActiveSpan } from "./sentry-CgWZM_kV.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-Dyh_63Ee.js";
-import { i as getChatConfig, n as botConfig, v as normalizeSlackEmojiName } from "./config-q9xXVN_5.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-BDBFw6Ws.js";
+import { i as getChatConfig, n as botConfig, v as normalizeSlackEmojiName } from "./config-BK53Ip5C.js";
 import { a as formatModelProfiles, c as profileConfig, i as formatModelProfile, l as TURN_REASONING_LEVELS, n as ModelProfileNotConfiguredError, o as modelIdForProfile, s as modelProfileSchema } from "./model-profile-BwU8mqwD.js";
 import { a as isUserActor, d as parseSlackTeamId, f as parseSlackUserId, g as parseSlackMessageTs, l as parseSlackChannelId, s as parseStoredSlackActor, u as parseSlackChannelReferenceId } from "./actor-BTtLaeWy.js";
-import { F as sameDestination$1, N as parseDestination, T as hasAgentTurnUsage, c as getConversationEventStore, d as getDb, f as getSqlExecutor, l as getConversationMessageSearchStore, r as readActorIdentity, u as getConversationStore, x as addAgentTurnUsage } from "./viewer-BBnCMR1g.js";
-import { a as juniorAgentInvocations, c as juniorIdentities, d as juniorDestinations, i as juniorAgentBindings, n as AGENT_INVOCATION_PARENT_MAILBOX_STATUSES, r as AGENT_INVOCATION_STATUSES, s as juniorConversations, t as AGENT_INVOCATION_MAILBOX_STATUSES } from "./agent-invocations-BO6ddZax.js";
-import { C as juniorArtifacts, S as juniorAttachments, a as juniorSchedulerRuns, l as juniorStats, m as juniorConversationBriefs, y as juniorConversationAnnotations } from "./executor-DA7eHhmC.js";
+import { F as sameDestination$1, N as parseDestination, T as hasAgentTurnUsage, c as getConversationEventStore, d as getDb, f as getSqlExecutor, l as getConversationMessageSearchStore, r as readActorIdentity, u as getConversationStore, x as addAgentTurnUsage } from "./viewer-D5hbx6TE.js";
+import { a as juniorAgentInvocations, c as juniorIdentities, d as juniorDestinations, i as juniorAgentBindings, n as AGENT_INVOCATION_PARENT_MAILBOX_STATUSES, s as juniorConversations, t as AGENT_INVOCATION_MAILBOX_STATUSES } from "./agent-invocations-BO6ddZax.js";
+import { C as juniorArtifacts, S as juniorAttachments, a as juniorSchedulerRuns, l as juniorStats, m as juniorConversationBriefs, y as juniorConversationAnnotations } from "./executor-bmmuRY-w.js";
 import { d as instructionActors, f as instructionProvenanceFor, p as sameActorIdentity, t as KNOWN_CONVERSATION_EVENT_TYPES, u as contextProvenance } from "./history-Nte1oVed.js";
 import { a as listReferenceFiles, c as soulPathCandidates, l as worldPathCandidates } from "./package-discovery-BVvSnQBB.js";
-import { a as resolveAuthTokenPlaceholder, c as fetchWithBoundedOAuthErrorBodies, d as credentialContextForActor, f as credentialContextSchema, h as CredentialUnavailableError, i as resolvePluginHeaderEnvRefs, l as getOAuthProviderErrorAttributes, m as credentialUserSubjectId, o as resolvePluginCommandEnv, p as credentialSubjectSchema, s as OAuthProviderError } from "./registry-DvzzL8-v.js";
-import { n as pluginCatalogRuntime } from "./catalog-runtime-CpxhLwZG.js";
-import { a as parseSkillInvocation, i as parseSkillFile, n as findSkillByName, r as loadSkillsByName, t as discoverSkills } from "./skills-DFduSvuO.js";
-import { A as formatSlackLink, At as recordAttachmentsDelivered, Ct as loadConversationProjection, D as automationRevision, Dt as loadTurnRoute, F as addReactionToMessage, Ft as recordMcpProviderConnected, G as loadTurnCheckpoint, I as getSlackMessagePermalink, K as saveTurnCheckpoint, Kt as fallbackShortTitle, L as openSlackDirectMessage, Lt as recordToolExecutionStarted, N as slackMention, Nt as recordAuthorizationRequested, Ot as openConversationProjection, Pt as recordGuardianActionReviewed, R as postSlackEphemeralMessage, Rt as recordTurnRoute, St as loadConnectedMcpProviders, V as uploadFilesToConversation, W as continuableMessages, _t as trimTrailingAssistantMessages, a as readScheduledAutomation, an as estimateTextTokens, at as getPiMessageRole, b as saveEventAutomation, cn as historyItemFromPiMessage, ct as hasRuntimeTurnContext, dt as isContinuablePiBoundary, et as TurnSliceLimitExceededError, f as createEventAutomation, ft as isToolResultError, g as getEventAutomation, gt as stripRuntimeTurnContext, ht as retainRuntimeTurnContext, it as extractAssistantText, k as escapeSlackMrkdwnText, kt as recordAgentsInstructionsUpdated, ln as piMessageFromHistoryItem, mt as normalizeToolNameFromResult, o as saveScheduledAutomation, on as getAgentContextCompactionTriggerTokens, ot as getTerminalAssistantMessages, p as deleteEventAutomation, pt as isToolResultMessage, qt as resolveTaskTitle, r as listScheduledAutomationsForTeam, rt as isTurnExecutionLimitExceededError, sn as getAgentContextInputLimitTokens, st as getUserMessageInstructionText, t as createScheduledAutomation, tt as assertTurnToolCallLimit, ut as isAssistantMessage, v as listEventAutomationsForTeam, vt as TURN_CONTEXT_TAG, wt as loadLastModelProfile, x as setEventAutomationStatus, yt as ToolInputError, z as postSlackMessage } from "./tasks-DBZAgTx7.js";
-import { A as getWorkspaceSnapshotBuilder, B as cancelWatch, Bt as isConversationScopedChannel, C as WorkspaceValidationError, D as setWorkspaceSnapshotBuild, E as setWorkspaceSnapshot, F as RESOURCE_SUBSCRIPTION_DEFAULT_TTL_MS, Ft as SlackActionError, G as findMatchingWatches, H as createTimerWatch, Ht as normalizeSlackConversationId, I as RESOURCE_SUBSCRIPTION_MAX_TTL_MS, It as downloadPrivateSlackFile, K as listWatches, L as RESOURCE_WATCH_TOOL_SOURCE, Lt as getFilePermalink, M as workspaceRepoCheckoutPath, Mt as defaultTimezone, N as resolveChannelCapabilities, Nt as resolveUserTimezone, O as SANDBOX_RUNTIME, Ot as saveObjectAnnotations, P as getSlackToolContext, R as STOP_WATCHING_TOOL_NAME, S as updateWorkspace, T as loadSnapshotsForProfile, U as createWatch, Vt as isDmChannel$1, W as deliverWatch, Wt as withSlackRetries, _ as deleteWorkspace, b as listWorkspaces, c as getPluginTools, et as verifyTimerWatchCredentialSubject, g as createWorkspace, it as getDashboardTaskLink, j as tryWorkspaceRepoCheckoutPath, k as deleteWorkspaceSnapshotBuilders, kt as createPluginAnnotations, l as getPluginUserPromptContributions, lt as createPluginLogger, nt as getDashboardConversationLink, r as createPluginHookRunner, s as getPluginSystemPromptContributions, tt as JUNIOR_THREAD_STATE_TTL_MS, u as getPlugins, v as getWorkspace, w as invalidateReadySnapshot, wt as matchSlackAttachments, y as getWorkspaceByName, z as cancelSubscriptions, zt as getSlackClient } from "./agent-hooks-Cj_rSeWd.js";
-import { F as isVisionImageMediaType, G as removedCardSchema, L as briefLinkSchema, R as briefOutcomeStatusSchema, z as conversationBriefSchema } from "./conversation-BxvgH64Q.js";
-import { A as SANDBOX_DATA_ROOT, C as getDefaultRedisStateAdapterFor, D as fenceLock, E as acquireActiveLock, F as sandboxSkillFile, I as sandboxSkillPathResolution, M as SANDBOX_SKILLS_ROOT, N as SANDBOX_WORKSPACE_ROOT, O as withLock, P as sandboxSkillDir, _ 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_REPOS_ROOT, k as sleep$2, 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-yeKVNECl.js";
-import { n as canReusePendingAuthLink, t as abandonReplacedPendingAuth } from "./pending-auth-OndKPW4M.js";
-import { a as NO_REPLY_MARKER, c as CooperativeTurnYieldError, i as sanitizeAssistantText, l as TurnInputCommitLostError, n as decideReply, o as isNoReplyMarker, p as isTurnInputCommitLostError, r as getAssistantReplyText, t as authorizationId } from "./oauth-authorization-Db1yGVvG.js";
+import { a as resolveAuthTokenPlaceholder, c as fetchWithBoundedOAuthErrorBodies, d as credentialContextForActor, f as credentialContextSchema, h as CredentialUnavailableError, i as resolvePluginHeaderEnvRefs, l as getOAuthProviderErrorAttributes, m as credentialUserSubjectId, o as resolvePluginCommandEnv, p as credentialSubjectSchema, s as OAuthProviderError } from "./registry-C2rSEio1.js";
+import { n as pluginCatalogRuntime } from "./catalog-runtime-CTaQXYqS.js";
+import { a as parseSkillInvocation, i as parseSkillFile, n as findSkillByName, r as loadSkillsByName, t as discoverSkills } from "./skills-C6zJbudq.js";
+import { At as openConversationProjection, B as postSlackEphemeralMessage, Bt as recordTurnRoute, Et as loadLastModelProfile, F as slackMention, Ft as recordAuthorizationRequested, It as recordGuardianActionReviewed, J as saveTurnCheckpoint, Jt as fallbackShortTitle, K as continuableMessages, L as addReactionToMessage, Lt as recordMcpProviderConnected, M as formatSlackLink, Mt as recordAttachmentsDelivered, R as getSlackMessagePermalink, Tt as loadConversationProjection, U as uploadFilesToConversation, V as postSlackMessage, Yt as resolveTaskTitle, _t as retainRuntimeTurnContext, a as readScheduledAutomation, at as isTurnExecutionLimitExceededError, b as saveEventAutomation, bt as TURN_CONTEXT_TAG, cn as getAgentContextCompactionTriggerTokens, ct as getTerminalAssistantMessages, dn as piMessageFromHistoryItem, f as createEventAutomation, ft as isAssistantMessage, g as getEventAutomation, gt as normalizeToolNameFromResult, ht as isToolResultMessage, j as escapeSlackMrkdwnText, jt as recordAgentsInstructionsUpdated, k as automationRevision, kt as loadTurnRoute, ln as getAgentContextInputLimitTokens, lt as getUserMessageInstructionText, mt as isToolResultError, nt as TurnSliceLimitExceededError, o as saveScheduledAutomation, ot as extractAssistantText, p as deleteEventAutomation, pt as isContinuablePiBoundary, q as loadTurnCheckpoint, r as listScheduledAutomationsForTeam, rt as assertTurnToolCallLimit, sn as estimateTextTokens, st as getPiMessageRole, t as createScheduledAutomation, un as historyItemFromPiMessage, ut as hasRuntimeTurnContext, v as listEventAutomationsForTeam, vt as stripRuntimeTurnContext, wt as loadConnectedMcpProviders, x as setEventAutomationStatus, xt as ToolInputError, yt as trimTrailingAssistantMessages, z as openSlackDirectMessage, zt as recordToolExecutionStarted } from "./tasks-B9OIjl2K.js";
+import { A as getWorkspaceSnapshotBuilder, B as cancelWatch, Bt as isConversationScopedChannel, C as WorkspaceValidationError, D as setWorkspaceSnapshotBuild, E as setWorkspaceSnapshot, F as RESOURCE_SUBSCRIPTION_DEFAULT_TTL_MS, Ft as SlackActionError, G as findMatchingWatches, H as createTimerWatch, Ht as normalizeSlackConversationId, I as RESOURCE_SUBSCRIPTION_MAX_TTL_MS, It as downloadPrivateSlackFile, K as listWatches, L as RESOURCE_WATCH_TOOL_SOURCE, Lt as getFilePermalink, M as workspaceRepoCheckoutPath, Mt as defaultTimezone, N as resolveChannelCapabilities, Nt as resolveUserTimezone, O as SANDBOX_RUNTIME, Ot as saveObjectAnnotations, P as getSlackToolContext, R as STOP_WATCHING_TOOL_NAME, S as updateWorkspace, T as loadSnapshotsForProfile, U as createWatch, Vt as isDmChannel$1, W as deliverWatch, Wt as withSlackRetries, _ as deleteWorkspace, b as listWorkspaces, c as getPluginTools, et as verifyTimerWatchCredentialSubject, g as createWorkspace, it as getDashboardTaskLink, j as tryWorkspaceRepoCheckoutPath, k as deleteWorkspaceSnapshotBuilders, kt as createPluginAnnotations, l as getPluginUserPromptContributions, lt as createPluginLogger, nt as getDashboardConversationLink, r as createPluginHookRunner, s as getPluginSystemPromptContributions, tt as JUNIOR_THREAD_STATE_TTL_MS, u as getPlugins, v as getWorkspace, w as invalidateReadySnapshot, wt as matchSlackAttachments, y as getWorkspaceByName, z as cancelSubscriptions, zt as getSlackClient } from "./agent-hooks-DpklSWZg.js";
+import { B as conversationBriefSchema, I as isVisionImageMediaType, K as removedCardSchema, R as briefLinkSchema, z as briefOutcomeStatusSchema } from "./conversation-CvBG57Io.js";
+import { A as SANDBOX_DATA_ROOT, C as getDefaultRedisStateAdapterFor, D as fenceLock, E as acquireActiveLock, F as sandboxSkillFile, I as sandboxSkillPathResolution, M as SANDBOX_SKILLS_ROOT, N as SANDBOX_WORKSPACE_ROOT, O as withLock, P as sandboxSkillDir, _ 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_REPOS_ROOT, k as sleep$2, 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-BevMNSlr.js";
+import { n as canReusePendingAuthLink, t as abandonReplacedPendingAuth } from "./pending-auth-BuQLZ6dK.js";
+import { a as NO_REPLY_MARKER, c as CooperativeTurnYieldError, i as sanitizeAssistantText, l as TurnInputCommitLostError, n as decideReply, o as isNoReplyMarker, p as isTurnInputCommitLostError, r as getAssistantReplyText, t as authorizationId } from "./oauth-authorization-By_MVRDC.js";
 import { i as isValidTimeZone, r as getZonedDateTimeParts } from "./cadence-D00SCzT1.js";
-import { r as EVENT_AUTHOR_ID } from "./prompt-CX36ZlbV.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-4u5gEU04.js";
-import { a as getVercelConversationWorkQueue, f as getTurnRequestDeadline, n as sendNextWorkspaceSnapshotJob, r as sendWorkspaceSnapshotJob } from "./job-queue-mVyF9jgv.js";
+import { r as EVENT_AUTHOR_ID } from "./prompt-C9Q9cjD3.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-qPhrznTf.js";
+import { a as getVercelConversationWorkQueue, f as getTurnRequestDeadline, n as sendNextWorkspaceSnapshotJob, r as sendWorkspaceSnapshotJob } from "./job-queue-Cz3M7gg4.js";
 import { F as taskOutcomeInputSchema, M as compileScheduleIntent, N as scheduleIntentSchema, O as automationInstructionToolSchema, T as SCHEDULED_AUTOMATION_SYSTEM_ACTOR, j as ScheduleIntentError, k as automationTitleSchema } from "./automation-gznOMaQ2.js";
 import { r as isExperimentalFeatureEnabled } from "./experimental-Qn9rKLgx.js";
 import { n as privateTraceResultAttributes } from "./private-trace-result-BLvBjy_e.js";
@@ -34,7 +34,7 @@ import { isDeepStrictEqual } from "node:util";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { z } from "zod";
 import { createHash, createHmac, randomBytes, randomUUID, timingSafeEqual } from "node:crypto";
-import { and, asc, count, desc, eq, gt, gte, inArray, isNotNull, isNull, lt, lte, ne, notExists, or, sql } from "drizzle-orm";
+import { and, asc, count, countDistinct, desc, eq, gt, gte, inArray, isNotNull, isNull, lt, lte, ne, notExists, or, sql } from "drizzle-orm";
 import { EgressAuthRequired, EgressPolicyDenied, PluginToolInputError, actorSchema, destinationSchema, eventMatchSchema, eventSchema, missingToolAnnotationKeys, normalizeEventIdentifier, objectTypeSchema, ownedObjectAnnotationSchema, 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";
@@ -895,6 +895,26 @@ function remindMissingAutomationResult(messages) {
 	}];
 }
 //#endregion
+//#region src/chat/agent-invocations/blocked-report.ts
+/** Blocked report of a child agent. See "Blocked Reports" in README.md. */
+/** Model-facing tool that ends a child agent run as blocked. */
+const REPORT_BLOCKED_TOOL_NAME = "reportBlocked";
+const blockedReportSchema = z.object({ missing: z.string().trim().min(1) });
+/**
+* Read the last successful blocked report from the new messages of one run.
+*
+* Do not pass the whole history. A named child keeps its history, so a report
+* from an earlier agent invocation must not end the current one.
+*/
+function readBlockedReport(messages) {
+	for (let index = messages.length - 1; index >= 0; index -= 1) {
+		const message = messages[index];
+		if (!isToolResultMessage(message) || isToolResultError(message) || normalizeToolNameFromResult(message) !== "reportBlocked") continue;
+		const parsed = blockedReportSchema.safeParse(message.details);
+		if (parsed.success) return parsed.data;
+	}
+}
+//#endregion
 //#region src/chat/services/turn-result.ts
 /** Process raw agent messages into a structured AgentRunResult. */
 function buildTurnResult(input) {
@@ -903,6 +923,7 @@ function buildTurnResult(input) {
 	const toolResults = newMessages.filter(isToolResultMessage);
 	const assistantMessages = newMessages.filter(isAssistantMessage);
 	const terminalAssistantMessages = getTerminalAssistantMessages(newMessages);
+	const blocked = readBlockedReport(newMessages);
 	const rawPrimaryText = sanitizeAssistantText(terminalAssistantMessages.map((message) => extractAssistantText(message)).join("\n\n")).trim();
 	const primaryText = terminalAssistantMessages.map((message) => decideReply(message)).filter((output) => output.kind === "deliver").map((output) => output.text).join("\n\n");
 	const terminalTexts = terminalAssistantMessages.map((message) => sanitizeAssistantText(extractAssistantText(message)));
@@ -922,7 +943,7 @@ function buildTurnResult(input) {
 		};
 		if (!isProviderError) logInfo("ai.no_reply_marker.accepted", markerAttributes);
 	}
-	if (!primaryText && !completedWithoutTerminalText && !isProviderError) logWarn("ai.model_response.empty", {
+	if (!primaryText && !completedWithoutTerminalText && !blocked && !isProviderError) logWarn("ai.model_response.empty", {
 		"app.ai.tool_results": toolResults.length,
 		"app.ai.tool_error_results": toolErrorCount,
 		"app.ai.generated_files": input.generatedFileCount
@@ -932,7 +953,7 @@ function buildTurnResult(input) {
 	let outcome;
 	if (isProviderError) outcome = "provider_error";
 	else if (suppressedPrimaryText) outcome = "execution_failure";
-	else if (primaryText || completedWithoutTerminalText) outcome = "success";
+	else if (primaryText || completedWithoutTerminalText || blocked) outcome = "success";
 	else outcome = "execution_failure";
 	if (shouldTrace) logInfo("agent.message.generated", {
 		"app.message.kind": "assistant_outbound",
@@ -944,6 +965,7 @@ function buildTurnResult(input) {
 	});
 	return {
 		text: primaryText,
+		...blocked ? { blocked } : void 0,
 		sandboxRef,
 		piMessages: input.piMessages,
 		diagnostics: buildDiagnostics(input, {
@@ -1873,12 +1895,19 @@ const AUTOMATION_RUN_RULES = [
 	"- A tool result with `timed_out: true` means that attempt did not finish. Before you retry work that may have side effects, inspect authoritative state and do not repeat a mutation that already applied.",
 	`- Assistant text is never delivered. End the run with \`${FINISH_AUTOMATION_RUN_TOOL_NAME}\`. Do not post the result with another tool.`
 ];
+const CHILD_AGENT_RUN_RULES = [
+	"- This run is a task that a parent agent gave you. The task is the job. The parent agent reads your final reply; no person reads this run.",
+	"- Do the work now. Do not ask questions, ask for approval, or offer options.",
+	`- Your final text reply goes to the parent as finished work. When the task cannot be finished, end the run with \`${REPORT_BLOCKED_TOOL_NAME}\` instead.`,
+	"- A tool result with `timed_out: true` means that attempt did not finish. Before you retry work that may have side effects, inspect authoritative state and do not repeat a mutation that already applied."
+];
 const SAFETY_RULES = [
 	"- Stay within the user's request and the runtime's available capabilities; do not pursue independent goals, persistence, replication, credential gathering, or access expansion.",
 	"- Respect stop, pause, audit, and approval boundaries. Do not bypass safeguards or persuade the user to weaken them.",
 	"- Do not change system prompts, tool policies, security settings, credentials, or runtime configuration unless the user explicitly requests that exact administrative action and an available tool permits it."
 ];
 const AUTOMATION_FAILURE_RULES = ["- Keep commands, error output, raw tool payloads, and internal routing metadata out of the message.", `- When a failure stops the job, put its cause in the \`${FINISH_AUTOMATION_RUN_TOOL_NAME}\` reason, not in the message.`];
+const CHILD_AGENT_FAILURE_RULES = [`- When a failure or a missing part stops the task, put what you checked and what is missing in \`${REPORT_BLOCKED_TOOL_NAME}\`, not in a text reply.`, "- Keep raw tool payloads and internal routing metadata out of the final reply."];
 const FAILURE_RULES = [
 	"- For tool/runtime failures, run the named check before diagnosing and report the exact failed command plus stderr/exit code.",
 	"- If a fact cannot be verified after focused checks, say what you checked and what blocked a stronger answer.",
@@ -1892,7 +1921,7 @@ function renderRuleSection(tag, lines) {
 	].join("\n");
 }
 function buildBehaviorSection(platform, mode) {
-	const runSections = mode === "automation" ? [renderRuleSection("automation-run", AUTOMATION_RUN_RULES)] : [
+	const runSections = mode === "automation" ? [renderRuleSection("automation-run", AUTOMATION_RUN_RULES)] : mode === "child_agent" ? [renderRuleSection("child-agent-run", CHILD_AGENT_RUN_RULES)] : [
 		renderRuleSection("task-execution", TASK_EXECUTION_RULES),
 		renderRuleSection("conversation", CONVERSATION_RULES),
 		...platform === "slack" ? [renderRuleSection("slack-actions", SLACK_ACTION_RULES)] : []
@@ -1900,12 +1929,12 @@ function buildBehaviorSection(platform, mode) {
 	const automation = mode === "automation";
 	return [
 		renderRuleSection("tool-policy", TOOL_POLICY_RULES),
-		...automation ? [] : [renderRuleSection("tool-call-style", TOOL_CALL_STYLE_RULES)],
+		...mode !== "conversation" ? [] : [renderRuleSection("tool-call-style", TOOL_CALL_STYLE_RULES)],
 		renderRuleSection("skill-policy", SKILL_POLICY_RULES),
 		renderRuleSection("planning", PLANNING_RULES),
 		...runSections,
 		renderRuleSection("safety", SAFETY_RULES),
-		renderRuleSection("failure-handling", automation ? AUTOMATION_FAILURE_RULES : FAILURE_RULES)
+		renderRuleSection("failure-handling", automation ? AUTOMATION_FAILURE_RULES : mode === "child_agent" ? CHILD_AGENT_FAILURE_RULES : FAILURE_RULES)
 	].join("\n\n");
 }
 function buildAutomationOutputSection(platform) {
@@ -1918,6 +1947,13 @@ function buildAutomationOutputSection(platform) {
 }
 function buildOutputSection(platform, mode) {
 	if (mode === "automation") return buildAutomationOutputSection(platform);
+	if (mode === "child_agent") return [
+		`<output format="markdown">`,
+		"- Start with the result, not internal process narration.",
+		"- Use concise Markdown: short paragraphs, bullets, links, and fenced code blocks.",
+		"- Reply with text only when the task is finished.",
+		"</output>"
+	].join("\n");
 	if (platform === "local") return [
 		`<output format="markdown">`,
 		"- Start with the answer or result, not internal process narration.",
@@ -2071,6 +2107,10 @@ const STATIC_SYSTEM_PROMPTS = {
 		local: buildStaticSystemPrompt("local", "automation"),
 		slack: buildStaticSystemPrompt("slack", "automation")
 	},
+	child_agent: {
+		local: buildStaticSystemPrompt("local", "child_agent"),
+		slack: buildStaticSystemPrompt("slack", "child_agent")
+	},
 	conversation: {
 		local: buildStaticSystemPrompt("local", "conversation"),
 		slack: buildStaticSystemPrompt("slack", "conversation")
@@ -2365,7 +2405,7 @@ async function assemblePrompt(args) {
 		userContentParts: requestContentParts
 	}) : void 0;
 	const needsBootstrapContextForPrompt = shouldPromptAgent && !replayedPrompt && !hasRuntimeTurnContext(promptHistoryMessages);
-	const promptMode = args.run.dispatch?.declaresResult ? "automation" : "conversation";
+	const promptMode = args.run.dispatch?.declaresResult ? "automation" : args.run.source.kind === "agent_invocation" ? "child_agent" : "conversation";
 	const platform = (args.run.delivery || promptMode === "automation") && args.run.location?.provider === "slack" ? "slack" : "local";
 	const pluginSystemPrompt = buildPluginSystemPromptContributions(await getPluginSystemPromptContributions(platform));
 	const baseInstructions = [buildSystemPrompt(platform, promptMode), pluginSystemPrompt].filter((section) => Boolean(section)).join("\n\n");
@@ -5154,22 +5194,14 @@ function hasEventCatalogEntries(catalog) {
 	return Object.keys(catalog).length > 0;
 }
 /**
-* True when at least one plugin namespace is enabled.
-*
-* Core Workspace snapshot events stay in the catalog for search and temporary
-* watches. Durable event automations still require a plugin publisher.
-*/
-function hasPluginEventCatalogEntries(catalog) {
-	return Object.keys(pluginEventCatalog(catalog)).length > 0;
-}
-/**
 * Catalog entries that durable event automations may select.
 *
 * Core Workspace snapshot events only wake temporary watches. Snapshot finish
 * does not run event-automation ingest, so those namespaces stay out of create/update
-* schemas and trigger availability.
+* schemas and trigger availability. The core `slack` namespace stays in: Slack
+* ingress runs event-automation ingest for channel messages.
 */
-function pluginEventCatalog(catalog) {
+function automationEventCatalog(catalog) {
 	return Object.fromEntries(Object.entries(catalog).filter(([namespace]) => namespace !== CORE_EVENT_NAMESPACE));
 }
 function enumSchema(values, unavailableMessage) {
@@ -5301,23 +5333,100 @@ function workspaceSnapshotFinishedEvent(input) {
 	return event;
 }
 //#endregion
+//#region src/chat/slack/channel-message-events.ts
+/** Core-owned event namespace for Slack Events. Not a plugin publisher. */
+const SLACK_EVENT_NAMESPACE = "slack";
+/** The trigger identifier that names the channel of the automation. */
+const SLACK_CURRENT_CHANNEL_IDENTIFIER = "current_channel";
+const CHANNEL_RESOURCE_TYPE = "channel";
+const MESSAGE_POSTED_EVENT = "message.posted";
+const CHANNEL_ID_PATTERN = /^[CG][A-Z0-9]{2,}$/;
+/** Event registration for new top-level Slack channel messages. */
+function slackChannelMessageEvents() {
+	return { resourceTypes: [{
+		type: CHANNEL_RESOURCE_TYPE,
+		identifier: {
+			format: `"${SLACK_CURRENT_CHANNEL_IDENTIFIER}" for the channel where the automation is created`,
+			pattern: /^(?:current_channel|[CG][A-Z0-9]{2,})$/
+		},
+		supportedEvents: [MESSAGE_POSTED_EVENT],
+		suggestedEvents: [],
+		guidance: { [MESSAGE_POSTED_EVENT]: "A person posted a new top-level message in this channel. A reply goes in that message's thread. If the instructions do not apply to this message, end with no action." }
+	}] };
+}
+/**
+* Bind a Slack channel-message automation to its own channel.
+*
+* Resolve `current_channel` to the destination channel and reject other
+* channels, so private channel text cannot reach another channel.
+*/
+function requireSlackChannelMessageScope(automation) {
+	if (automation.trigger.namespace !== "slack") return automation;
+	const channelId = automation.destination.channelId;
+	if (!CHANNEL_ID_PATTERN.test(channelId)) throw new ToolInputError("A Slack channel-message automation works only in a channel, not in a DM.");
+	const identifier = automation.trigger.identifier === "current_channel" ? channelId : automation.trigger.identifier;
+	if (identifier !== channelId) throw new ToolInputError(`A Slack channel-message automation can watch only the channel where it posts. Use identifier "${SLACK_CURRENT_CHANNEL_IDENTIFIER}", or create the automation in the channel to watch.`);
+	return {
+		...automation,
+		credentialMode: "system",
+		trigger: {
+			...automation.trigger,
+			identifier
+		}
+	};
+}
+/**
+* Build the Event for one new top-level channel message, or nothing.
+*
+* Thread replies and bot posts, including Slackbot, do not count. Bots can
+* post often and use up the run limit of the automation.
+*/
+function slackChannelMessageEvent(input) {
+	if (input.botId || input.subtype === "bot_message" || input.userId === "USLACKBOT") return;
+	if (input.threadTs && input.threadTs !== input.ts) return void 0;
+	if (!CHANNEL_ID_PATTERN.test(input.channelId)) return void 0;
+	return {
+		eventKey: `${input.channelId}:${input.ts}`,
+		eventType: MESSAGE_POSTED_EVENT,
+		identifier: input.channelId,
+		occurredAtMs: Math.floor(Number(input.ts) * 1e3),
+		trustedSummary: `<@${input.userId}> posted a new message in <#${input.channelId}>.`,
+		data: {
+			channelId: input.channelId,
+			messageTs: input.ts,
+			userId: input.userId
+		},
+		...input.text?.trim() ? { untrustedText: input.text } : void 0
+	};
+}
+/** Return the source message thread for a channel-message run. */
+function slackChannelMessageReplyThreadTs(event) {
+	if (event.namespace !== "slack") return void 0;
+	const messageTs = event.data?.messageTs;
+	return typeof messageTs === "string" ? messageTs : void 0;
+}
+//#endregion
 //#region src/chat/events/runtime-catalog.ts
 /**
 * Enabled event registrations for search, guidance, and tool schemas.
 *
-* Includes core Workspace snapshot events under the `junior` namespace, plus
-* every enabled plugin registration. Plugins may not use the `junior` namespace.
+* Includes core Workspace snapshot events under the `junior` namespace, Slack
+* channel-message events under the `slack` namespace, plus every enabled plugin
+* registration. Plugins may not use the `junior` or `slack` namespaces.
 */
 function getEventCatalog() {
-	const catalog = { [CORE_EVENT_NAMESPACE]: { resourceTypes: [...workspaceSnapshotEvents().resourceTypes, {
-		type: "timer",
-		supportedEvents: ["timer.fired"],
-		suggestedEvents: []
-	}] } };
+	const catalog = {
+		[CORE_EVENT_NAMESPACE]: { resourceTypes: [...workspaceSnapshotEvents().resourceTypes, {
+			type: "timer",
+			supportedEvents: ["timer.fired"],
+			suggestedEvents: []
+		}] },
+		[SLACK_EVENT_NAMESPACE]: slackChannelMessageEvents()
+	};
 	for (const plugin of getPlugins()) {
 		const registration = plugin.events;
 		if (!registration || registration.isEnabled?.() === false) continue;
-		if (plugin.manifest.name === "junior") throw new Error(`Plugin "${CORE_EVENT_NAMESPACE}" cannot register events; that namespace is reserved for core events`);
+		if (plugin.manifest.name === "junior" || plugin.manifest.name === "slack") throw new Error(`Plugin "${plugin.manifest.name}" cannot register events; that namespace is reserved for core events`);
 		catalog[plugin.manifest.name] = registration;
 	}
 	return catalog;
@@ -9618,6 +9727,8 @@ function createUpdatePlanTool() {
 //#region src/chat/agent-invocations/types.ts
 const exactStringSchema = z.string().min(1).refine((value) => value === value.trim());
 const agentNameSchema = exactStringSchema.max(64);
+/** `messageAgent` target for the parent of a child agent. */
+const PARENT_AGENT_TARGET = "parent";
 const agentInvocationMailboxStatusSchema = z.enum(AGENT_INVOCATION_MAILBOX_STATUSES);
 const agentInvocationParentMailboxStatusSchema = z.enum(AGENT_INVOCATION_PARENT_MAILBOX_STATUSES);
 const agentBindingSchema = z.object({
@@ -9677,13 +9788,19 @@ const createAgentInvocationSchema = z.object({
 	reasoningLevel: z.enum(TURN_REASONING_LEVELS).optional(),
 	title: exactStringSchema.optional()
 }).strict();
+/** How a finished task of a child agent ended. A stop is not a result. */
+const CHILD_AGENT_RESULTS = [
+	"completed",
+	"blocked",
+	"failed"
+];
 //#endregion
 //#region src/chat/agent-invocations/errors.ts
-/** Named child cannot accept another invocation until its active work ends. */
-var AgentInvocationBusyError = class extends Error {
+/** A child agent already uses this name in the parent Conversation. */
+var AgentNameInUseError = class extends Error {
 	constructor(name) {
-		super(`Named agent "${name}" already has active work`);
-		this.name = "AgentInvocationBusyError";
+		super(`A child agent named "${name}" already exists`);
+		this.name = "AgentNameInUseError";
 	}
 };
 /** Parent already has the maximum number of non-terminal child invocations. */
@@ -9693,10 +9810,28 @@ var AgentInvocationLimitError = class extends Error {
 		this.name = "AgentInvocationLimitError";
 	}
 };
+/** A child agent already has the maximum number of open tasks. */
+var AgentMessageQueueFullError = class extends Error {
+	constructor(limit) {
+		super(`The child agent already has ${limit} open tasks`);
+		this.name = "AgentMessageQueueFullError";
+	}
+};
+/** A messageAgent target is not the parent or a child of the sender. */
+var AgentMessageTargetError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "AgentMessageTargetError";
+	}
+};
 //#endregion
 //#region src/chat/agent-invocations/store.ts
 const CREATE_LOCK_PREFIX = "junior:agent_invocation:create";
-function createLockName(parentConversationId) {
+/**
+* Return the SQL lock that one parent Conversation takes to start, message,
+* or stop its child agents.
+*/
+function getChildAgentLockName(parentConversationId) {
 	return `${CREATE_LOCK_PREFIX}:${parentConversationId}`;
 }
 const TERMINAL_AGENT_INVOCATION_STATUSES = [
@@ -9705,6 +9840,7 @@ const TERMINAL_AGENT_INVOCATION_STATUSES = [
 	"failed",
 	"stopped"
 ];
+/** Statuses of an agent invocation that has not finished. */
 const NON_TERMINAL_AGENT_INVOCATION_STATUSES = [
 	"pending",
 	"running",
@@ -9732,6 +9868,13 @@ function getNamedAgentConversationId(parentConversationId, name) {
 function getAgentInvocationIdForResult(resultInvocationId) {
 	return stableId("agent-invocation", "result", resultInvocationId);
 }
+/**
+* Return the stable identity of the agent invocation that gives one message
+* from a child agent to the child Conversation that started that child agent.
+*/
+function getAgentInvocationIdForMessage(messageId) {
+	return stableId("agent-invocation", "message", messageId);
+}
 /** Return the stable turn identity advanced by one agent invocation. */
 function getAgentInvocationTurnId(invocationId) {
 	return `agent-invocation:${invocationId}`;
@@ -9751,6 +9894,7 @@ function bindingFromRow(row) {
 		parentConversationId: row.parentConversationId
 	});
 }
+/** Parse one agent invocation row. */
 function invocationFromRow(row) {
 	return agentInvocationSchema.parse({
 		actor: row.actor,
@@ -9804,87 +9948,74 @@ async function getLatestAgentInvocationForConversation(childConversationId) {
 	const rows = await getSqlExecutor().db().select().from(juniorAgentInvocations).where(eq(juniorAgentInvocations.childConversationId, childConversationId)).orderBy(desc(juniorAgentInvocations.createdAt)).limit(1);
 	return rows[0] ? invocationFromRow(rows[0]) : void 0;
 }
-/** Bound the agent invocations that one child agent listing reads. */
-const CHILD_AGENT_LIST_INVOCATION_LIMIT = 200;
-/** Return the child state that one child's agent invocations show. */
-function childAgentFromInvocations(invocations, resultInvocationIds) {
-	const latest = invocations[0];
-	let current = latest;
-	for (const invocation of invocations) if (!isTerminalAgentInvocation(invocation)) current = invocation;
-	const task = invocations.find((invocation) => !resultInvocationIds.has(invocation.invocationId)) ?? invocations[invocations.length - 1];
-	const terminal = isTerminalAgentInvocation(current) ? current : void 0;
-	return {
-		...latest.agentName ? { agentName: latest.agentName } : void 0,
-		childConversationId: latest.childConversationId,
-		...terminal && terminal.status !== "completed" ? { errorMessage: terminal.errorMessage } : void 0,
-		status: terminal?.parentMailboxStatus === "replaced" ? "pending" : terminal?.parentMailboxStatus === "skipped" ? "stopped" : current.status,
-		task: task.input,
-		...task.title ? { title: task.title } : void 0,
-		updatedAtMs: Math.max(...invocations.map((invocation) => invocation.updatedAtMs))
-	};
-}
 /**
-* List the direct child agents of one parent Conversation, with the newest
-* activity first. The state comes from SQL agent invocation records, not from
-* model output.
+* Read the name and the newest task title of one child Conversation, for
+* labels. Agent invocations that give a nested result to the child have no
+* title, so an agent invocation with a title comes first.
 */
-async function listChildAgents(parentConversationId) {
-	const db = getSqlExecutor().db();
-	const rows = await db.select().from(juniorAgentInvocations).where(eq(juniorAgentInvocations.parentConversationId, parentConversationId)).orderBy(desc(juniorAgentInvocations.createdAt)).limit(CHILD_AGENT_LIST_INVOCATION_LIMIT);
-	if (rows.length === 0) return [];
-	const byChild = /* @__PURE__ */ new Map();
-	for (const invocation of rows.map(invocationFromRow)) {
-		const invocations = byChild.get(invocation.childConversationId) ?? [];
-		invocations.push(invocation);
-		byChild.set(invocation.childConversationId, invocations);
-	}
-	const grandchildren = await db.select({ invocationId: juniorAgentInvocations.invocationId }).from(juniorAgentInvocations).where(inArray(juniorAgentInvocations.parentConversationId, [...byChild.keys()]));
-	const resultInvocationIds = new Set(grandchildren.map((row) => getAgentInvocationIdForResult(row.invocationId)));
-	return [...byChild.values()].map((invocations) => childAgentFromInvocations(invocations, resultInvocationIds)).sort((left, right) => right.updatedAtMs - left.updatedAtMs);
+async function getChildAgentLabel(childConversationId) {
+	const [row] = await getSqlExecutor().db().select({
+		agentName: juniorAgentInvocations.agentName,
+		title: juniorAgentInvocations.title
+	}).from(juniorAgentInvocations).where(eq(juniorAgentInvocations.childConversationId, childConversationId)).orderBy(sql`${juniorAgentInvocations.title} is null`, desc(juniorAgentInvocations.createdAt)).limit(1);
+	return row;
 }
 async function getNonTerminalAgentInvocationForConversation(childConversationId) {
 	const rows = await getSqlExecutor().db().select().from(juniorAgentInvocations).where(and(eq(juniorAgentInvocations.childConversationId, childConversationId), inArray(juniorAgentInvocations.status, NON_TERMINAL_AGENT_INVOCATION_STATUSES))).orderBy(asc(juniorAgentInvocations.createdAt)).limit(1);
 	return rows[0] ? invocationFromRow(rows[0]) : void 0;
 }
-async function countNonTerminalAgentInvocationsForParent(parentConversationId) {
-	return (await getSqlExecutor().db().select({ value: count() }).from(juniorAgentInvocations).where(and(eq(juniorAgentInvocations.parentConversationId, parentConversationId), inArray(juniorAgentInvocations.status, NON_TERMINAL_AGENT_INVOCATION_STATUSES))))[0]?.value ?? 0;
+async function countNonTerminalAgentInvocationsForChild(childConversationId) {
+	return (await getSqlExecutor().db().select({ value: count() }).from(juniorAgentInvocations).where(and(eq(juniorAgentInvocations.childConversationId, childConversationId), inArray(juniorAgentInvocations.status, NON_TERMINAL_AGENT_INVOCATION_STATUSES))))[0]?.value ?? 0;
 }
 /**
-* Create or replay one invocation, reusing named child conversations and
-* keeping unnamed child identities scoped to the invocation.
+* A child agent can only start or give work to child agents while it has
+* open work. A stopped child has none. A root Conversation has no agent
+* invocation, so it always passes.
+*/
+async function assertCanGiveChildWork(parentConversationId) {
+	if (await getLatestAgentInvocationForConversation(parentConversationId) && !await getNonTerminalAgentInvocationForConversation(parentConversationId)) throw new Error(`Agent conversation ${parentConversationId} has no open work and cannot give work to child agents`);
+}
+/**
+* Count the child agents of one parent that have open work. Messages queued
+* for a busy child do not count again.
+*/
+async function countActiveChildAgentsForParent(parentConversationId) {
+	return (await getSqlExecutor().db().select({ value: countDistinct(juniorAgentInvocations.childConversationId) }).from(juniorAgentInvocations).where(and(eq(juniorAgentInvocations.parentConversationId, parentConversationId), inArray(juniorAgentInvocations.status, NON_TERMINAL_AGENT_INVOCATION_STATUSES))))[0]?.value ?? 0;
+}
+/**
+* Create or replay the first invocation of one new child agent. A name gives
+* the child a stable Conversation id that later messages can address. A name
+* that is already used throws: later work for that child goes through
+* `createAgentInvocationForMessage`.
 */
 async function createAgentInvocation(rawInput, nowMs = Date.now()) {
 	const input = createAgentInvocationSchema.parse(rawInput);
 	const invocationId = getAgentInvocationId(input.parentConversationId, input.idempotencyKey);
 	const childConversationId = input.agentName ? getNamedAgentConversationId(input.parentConversationId, input.agentName) : getUnnamedAgentConversationId(invocationId);
-	const lockName = createLockName(input.parentConversationId);
+	const lockName = getChildAgentLockName(input.parentConversationId);
 	return await getSqlExecutor().withLock(lockName, async () => {
 		const existing = await getAgentInvocation(invocationId);
 		if (existing) {
 			if (!sameCreateInput(existing, input)) throw new Error(`Agent invocation idempotency key was reused with different input for ${invocationId}`);
 			return existing;
 		}
-		if (await getLatestAgentInvocationForConversation(input.parentConversationId) && !await getNonTerminalAgentInvocationForConversation(input.parentConversationId)) throw new Error(`Agent conversation ${input.parentConversationId} has no open work and cannot start child agents`);
-		if (await countNonTerminalAgentInvocationsForParent(input.parentConversationId) >= 8) throw new AgentInvocationLimitError(8);
+		await assertCanGiveChildWork(input.parentConversationId);
+		if (input.agentName && await getAgentBinding({
+			name: input.agentName,
+			parentConversationId: input.parentConversationId
+		})) throw new AgentNameInUseError(input.agentName);
+		if (await countActiveChildAgentsForParent(input.parentConversationId) >= 8) throw new AgentInvocationLimitError(8);
 		await getConversationStore().createChild({
 			childConversationId,
 			parentConversationId: input.parentConversationId,
 			nowMs,
 			source: "internal"
 		});
-		if (input.agentName) {
-			await getSqlExecutor().db().insert(juniorAgentBindings).values({
-				childConversationId,
-				name: input.agentName,
-				parentConversationId: input.parentConversationId
-			}).onConflictDoNothing();
-			const binding = await getAgentBinding({
-				name: input.agentName,
-				parentConversationId: input.parentConversationId
-			});
-			if (!binding || binding.childConversationId !== childConversationId) throw new Error(`Named agent binding did not resolve to ${childConversationId}`);
-			if (await getNonTerminalAgentInvocationForConversation(childConversationId)) throw new AgentInvocationBusyError(input.agentName);
-		}
+		if (input.agentName) await getSqlExecutor().db().insert(juniorAgentBindings).values({
+			childConversationId,
+			name: input.agentName,
+			parentConversationId: input.parentConversationId
+		});
 		await getSqlExecutor().db().insert(juniorAgentInvocations).values({
 			invocationId,
 			parentConversationId: input.parentConversationId,
@@ -9910,13 +10041,14 @@ async function createAgentInvocation(rawInput, nowMs = Date.now()) {
 	});
 }
 /**
-* Create or replay the agent invocation that gives one child agent result to
-* the child Conversation that started it. It continues that Conversation for
-* the same parent, Actor, and credentials as `latest`. It skips the busy and
-* active-count checks because it continues work that already passed them.
+* Create or replay the agent invocation that gives one child agent result or
+* message to the child Conversation that started that child agent. It
+* continues that Conversation for the same parent, Actor, and credentials as
+* `latest`. It skips the queue and active-count checks because it continues
+* work that already passed them.
 */
-async function createAgentInvocationForResult(args, nowMs = Date.now()) {
-	const invocationId = getAgentInvocationIdForResult(args.resultInvocationId);
+async function createAgentInvocationFromLatest(args, nowMs = Date.now()) {
+	const { invocationId } = args;
 	await getSqlExecutor().db().insert(juniorAgentInvocations).values({
 		invocationId,
 		parentConversationId: args.latest.parentConversationId,
@@ -9938,6 +10070,73 @@ async function createAgentInvocationForResult(args, nowMs = Date.now()) {
 	if (!invocation || invocation.childConversationId !== args.latest.childConversationId) throw new Error(`Agent invocation creation raced for ${invocationId}`);
 	return invocation;
 }
+/** Find a direct child agent of one parent by name or child Conversation id. */
+async function findChildAgentConversationId(args) {
+	const binding = await getAgentBinding({
+		name: args.target,
+		parentConversationId: args.parentConversationId
+	});
+	if (binding) return binding.childConversationId;
+	return (await getSqlExecutor().db().select({ childConversationId: juniorAgentInvocations.childConversationId }).from(juniorAgentInvocations).where(and(eq(juniorAgentInvocations.parentConversationId, args.parentConversationId), eq(juniorAgentInvocations.childConversationId, args.target))).limit(1))[0]?.childConversationId;
+}
+/**
+* Return whether a pending agent invocation still waits for older open work
+* on its child.
+*/
+async function isQueuedBehindOpenWork(invocation) {
+	if (invocation.status !== "pending") return false;
+	return (await getSqlExecutor().db().select({ invocationId: juniorAgentInvocations.invocationId }).from(juniorAgentInvocations).where(and(eq(juniorAgentInvocations.childConversationId, invocation.childConversationId), lt(juniorAgentInvocations.createdAt, new Date(invocation.createdAtMs)), inArray(juniorAgentInvocations.status, NON_TERMINAL_AGENT_INVOCATION_STATUSES))).limit(1)).length > 0;
+}
+/**
+* Create or replay the agent invocation for one message from a parent to one
+* of its child agents. The child continues its history. If the child already
+* has open work, the new agent invocation waits for that work and the parent
+* gets one report for both. A stopped child starts again.
+*/
+async function createAgentInvocationForMessage(input, nowMs = Date.now()) {
+	const invocationId = getAgentInvocationId(input.parentConversationId, input.idempotencyKey);
+	return await getSqlExecutor().withLock(getChildAgentLockName(input.parentConversationId), async () => {
+		const existing = await getAgentInvocation(invocationId);
+		if (existing) {
+			if (existing.childConversationId !== input.childConversationId || existing.input !== input.input) throw new Error(`Agent invocation idempotency key was reused with different input for ${invocationId}`);
+			return {
+				invocation: existing,
+				queued: await isQueuedBehindOpenWork(existing)
+			};
+		}
+		const latest = await getLatestAgentInvocationForConversation(input.childConversationId);
+		if (!latest || latest.parentConversationId !== input.parentConversationId) throw new Error(`${input.childConversationId} is not a child agent of ${input.parentConversationId}`);
+		await assertCanGiveChildWork(input.parentConversationId);
+		const openCount = await countNonTerminalAgentInvocationsForChild(input.childConversationId);
+		if (openCount >= 4) throw new AgentMessageQueueFullError(4);
+		if (openCount === 0 && await countActiveChildAgentsForParent(input.parentConversationId) >= 8) throw new AgentInvocationLimitError(8);
+		await getSqlExecutor().db().insert(juniorAgentInvocations).values({
+			invocationId,
+			parentConversationId: input.parentConversationId,
+			childConversationId: input.childConversationId,
+			agentName: latest.agentName ?? null,
+			input: input.input,
+			title: null,
+			actor: input.actor,
+			credentialContext: input.credentialContext ?? null,
+			source: { kind: "agent_invocation" },
+			destination: input.destination,
+			reasoningLevel: latest.reasoningLevel ?? null,
+			parentToolCallId: input.parentToolCallId,
+			status: "pending",
+			mailboxStatus: "pending",
+			createdAt: new Date(nowMs),
+			updatedAt: new Date(nowMs),
+			terminalAt: null
+		}).onConflictDoNothing();
+		const invocation = await getAgentInvocation(invocationId);
+		if (!invocation) throw new Error(`Agent invocation creation raced for ${invocationId}`);
+		return {
+			invocation,
+			queued: openCount > 0
+		};
+	});
+}
 /**
 * Return whether a child Conversation has work that will start another agent
 * invocation on it: another open agent invocation, an open child agent, or a
@@ -10020,76 +10219,90 @@ async function completeAgentInvocation(args) {
 	}).where(and(eq(juniorAgentInvocations.invocationId, args.invocationId), inArray(juniorAgentInvocations.status, NON_TERMINAL_AGENT_INVOCATION_STATUSES)));
 	return await getAgentInvocation(args.invocationId);
 }
-/**
-* List one child Conversation and every Conversation below it, child first.
-* It takes the create lock of each Conversation before it reads that
-* Conversation's children, so no child agent can start in the tree until the
-* caller's transaction ends.
-*/
-async function lockAgentConversationTree(childConversationId) {
-	const executor = getSqlExecutor();
-	const conversationIds = [childConversationId];
-	let parents = conversationIds;
-	while (parents.length > 0) {
-		for (const parent of parents) await executor.withLock(createLockName(parent), async () => void 0);
-		parents = (await executor.db().selectDistinct({ childConversationId: juniorAgentInvocations.childConversationId }).from(juniorAgentInvocations).where(inArray(juniorAgentInvocations.parentConversationId, parents))).map((row) => row.childConversationId).filter((id) => !conversationIds.includes(id));
-		conversationIds.push(...parents);
-	}
-	return conversationIds;
-}
-/**
-* Stop the agent invocations of one direct child agent and of every child
-* agent below it. Returns undefined when the child does not belong to the
-* parent.
-*/
-async function stopChildAgentInvocations(args) {
-	if ((await getSqlExecutor().db().select({ invocationId: juniorAgentInvocations.invocationId }).from(juniorAgentInvocations).where(and(eq(juniorAgentInvocations.parentConversationId, args.parentConversationId), eq(juniorAgentInvocations.childConversationId, args.childConversationId))).limit(1)).length === 0) return;
-	return await stopAgentInvocationTree(args.childConversationId, args.nowMs);
+/** Return whether an agent invocation has finished. */
+function isTerminalAgentInvocation(invocation) {
+	return TERMINAL_AGENT_INVOCATION_STATUSES.includes(invocation.status);
 }
-/**
-* Stop the agent invocations of one agent Conversation and of every child
-* agent below it. Open agent invocations become `stopped`. Results that would
-* still start or report work in the tree become `skipped`.
-*/
-async function stopAgentInvocationTree(conversationId, nowMs = Date.now()) {
-	return await getSqlExecutor().withLock(createLockName(conversationId), () => stopLockedAgentInvocationTree(conversationId, nowMs));
+//#endregion
+//#region src/chat/agent-invocations/list.ts
+function isChildAgentResult(status) {
+	return CHILD_AGENT_RESULTS.includes(status);
 }
-async function stopLockedAgentInvocationTree(conversationId, nowMs) {
-	const db = getSqlExecutor().db();
-	const now = new Date(nowMs);
-	const conversationIds = await lockAgentConversationTree(conversationId);
-	const stopped = await db.update(juniorAgentInvocations).set({
-		errorMessage: "Stopped by the parent conversation",
-		parentMailboxStatus: "skipped",
-		result: null,
-		status: "stopped",
-		terminalAt: now,
-		updatedAt: now
-	}).where(and(inArray(juniorAgentInvocations.childConversationId, conversationIds), inArray(juniorAgentInvocations.status, NON_TERMINAL_AGENT_INVOCATION_STATUSES))).returning();
-	await db.update(juniorAgentInvocations).set({
-		parentMailboxStatus: "skipped",
-		updatedAt: now
-	}).where(or(and(inArray(juniorAgentInvocations.parentConversationId, conversationIds), inArray(juniorAgentInvocations.parentMailboxStatus, ["pending", "appended"])), and(inArray(juniorAgentInvocations.childConversationId, conversationIds), eq(juniorAgentInvocations.parentMailboxStatus, "replaced"))));
+/** Bound the agent invocations that one child agent listing reads. */
+const CHILD_AGENT_LIST_INVOCATION_LIMIT = 200;
+/** Return the child state that one child's agent invocations show. */
+function childAgentFromInvocations(invocations, resultInvocationIds) {
+	const latest = invocations[0];
+	let current = latest;
+	for (const invocation of invocations) if (!isTerminalAgentInvocation(invocation)) current = invocation;
+	const tasks = invocations.filter((invocation) => !resultInvocationIds.has(invocation.invocationId));
+	const task = tasks.find((invocation) => invocation.parentToolCallId) ?? tasks[0] ?? invocations[invocations.length - 1];
+	const terminal = isTerminalAgentInvocation(current) ? current : void 0;
+	const lastResult = invocations.filter(isTerminalAgentInvocation).filter((invocation) => invocation.parentMailboxStatus !== "replaced" && invocation.parentMailboxStatus !== "skipped").map((invocation) => invocation.status).find(isChildAgentResult);
 	return {
-		conversationIds,
-		stopped: stopped.map(invocationFromRow).filter(isTerminalAgentInvocation)
+		...latest.agentName ? { agentName: latest.agentName } : void 0,
+		childConversationId: latest.childConversationId,
+		...terminal && terminal.status !== "completed" ? { errorMessage: terminal.errorMessage } : void 0,
+		...lastResult ? { lastResult } : void 0,
+		status: terminal?.parentMailboxStatus === "replaced" ? "pending" : terminal?.parentMailboxStatus === "skipped" ? "stopped" : current.status,
+		task: task.input,
+		...task.title ? { title: task.title } : void 0,
+		updatedAtMs: Math.max(...invocations.map((invocation) => invocation.updatedAtMs))
 	};
 }
-/** Return whether an agent invocation has finished. */
-function isTerminalAgentInvocation(invocation) {
-	return TERMINAL_AGENT_INVOCATION_STATUSES.includes(invocation.status);
+/**
+* List the direct child agents of one parent Conversation, with the newest
+* activity first. The state comes from SQL agent invocation records, not from
+* model output.
+*/
+async function listChildAgents(parentConversationId) {
+	const db = getSqlExecutor().db();
+	const rows = await db.select().from(juniorAgentInvocations).where(eq(juniorAgentInvocations.parentConversationId, parentConversationId)).orderBy(desc(juniorAgentInvocations.createdAt)).limit(CHILD_AGENT_LIST_INVOCATION_LIMIT);
+	if (rows.length === 0) return [];
+	const byChild = /* @__PURE__ */ new Map();
+	for (const invocation of rows.map(invocationFromRow)) {
+		const invocations = byChild.get(invocation.childConversationId) ?? [];
+		invocations.push(invocation);
+		byChild.set(invocation.childConversationId, invocations);
+	}
+	const grandchildren = await db.select({ invocationId: juniorAgentInvocations.invocationId }).from(juniorAgentInvocations).where(inArray(juniorAgentInvocations.parentConversationId, [...byChild.keys()]));
+	const resultInvocationIds = new Set(grandchildren.map((row) => getAgentInvocationIdForResult(row.invocationId)));
+	return [...byChild.values()].map((invocations) => childAgentFromInvocations(invocations, resultInvocationIds)).sort((left, right) => right.updatedAtMs - left.updatedAtMs);
 }
 //#endregion
 //#region src/chat/tools/runtime/list-agents.ts
 const TASK_MAX_LENGTH = 1e3;
 const ERROR_MAX_LENGTH = 500;
+/**
+* What a child agent does now. The words match the Conversation execution
+* status, plus `stopped` after stopAgent.
+*/
+const CHILD_AGENT_STATUSES = [
+	"pending",
+	"running",
+	"paused",
+	"idle",
+	"stopped"
+];
+function childAgentStatus(agent) {
+	switch (agent.status) {
+		case "pending":
+		case "running":
+		case "paused":
+		case "stopped": return agent.status;
+		case "blocked":
+		case "completed":
+		case "failed": return "idle";
+	}
+}
 function truncate(text, maxLength) {
 	return text.length > maxLength ? `${text.slice(0, maxLength)}…` : text;
 }
 const listAgentsOutputSchema = juniorToolOutputSchema.extend({ agents: z.array(z.object({
 	conversation_id: z.string().min(1).describe("Child conversation ID. Pass it to searchConversationEvents to read the child's history."),
-	name: agentNameSchema.optional().describe("Child-agent name. Pass it to spawnAgent to reuse it."),
-	status: z.enum(AGENT_INVOCATION_STATUSES).describe("pending: waiting to run. running or paused: working. completed, blocked, failed, or stopped: not working."),
+	name: agentNameSchema.optional().describe("Child-agent name. Pass it to messageAgent."),
+	status: z.enum(CHILD_AGENT_STATUSES).describe("What the child agent does now. pending: waiting to run. running or paused: working. idle: finished its work and waits for a message. stopped: stopAgent stopped it."),
+	last_result: z.enum(CHILD_AGENT_RESULTS).optional().describe("How the latest finished task of the child agent ended"),
 	task: z.string().describe("Latest task given to the child agent"),
 	title: z.string().optional().describe("Short display title of the latest task"),
 	error: z.string().optional().describe("Why the child agent is blocked, failed, or stopped"),
@@ -10098,7 +10311,7 @@ const listAgentsOutputSchema = juniorToolOutputSchema.extend({ agents: z.array(z
 /** Create the read-only tool that lists the child agents of one conversation. */
 function createListAgentsTool(conversationId) {
 	return zodTool({
-		description: "List the child agents that this conversation started, with the state recorded by the runtime. Use it to check which child agents are still working, or to find a named child agent before you give it more work with spawnAgent. Results still arrive as new tasks; do not poll with this tool.",
+		description: "List the child agents that this conversation started, with the state recorded by the runtime. Use it to check which child agents are still working, or to find a child agent before you give it more work with messageAgent. Results still arrive as new tasks; do not poll with this tool.",
 		annotations: {
 			destructiveHint: false,
 			idempotentHint: true,
@@ -10110,7 +10323,8 @@ function createListAgentsTool(conversationId) {
 		execute: async () => ({ agents: (await listChildAgents(conversationId)).map((agent) => ({
 			conversation_id: agent.childConversationId,
 			...agent.agentName ? { name: agent.agentName } : void 0,
-			status: agent.status,
+			status: childAgentStatus(agent),
+			...agent.lastResult ? { last_result: agent.lastResult } : void 0,
 			task: truncate(agent.task, TASK_MAX_LENGTH),
 			...agent.title ? { title: agent.title } : void 0,
 			...agent.errorMessage ? { error: truncate(agent.errorMessage, ERROR_MAX_LENGTH) } : void 0,
@@ -10119,12 +10333,59 @@ function createListAgentsTool(conversationId) {
 	});
 }
 //#endregion
+//#region src/chat/tools/runtime/message-agent.ts
+/** Bound the text of one message so a loop cannot fill a mailbox quickly. */
+const MESSAGE_AGENT_TEXT_MAX_LENGTH = 8e3;
+const messageAgentOutputSchema = juniorToolOutputSchema.extend({
+	conversation_id: z.string().min(1).describe("Target conversation ID"),
+	delivery: z.enum(["started", "queued"]).describe("started: the child agent starts work on the message now. queued: the target reads the message after its current work.")
+});
+/** Create the tool that sends one message to the parent or a child agent. */
+function createMessageAgentTool(messageAgent) {
+	return zodTool({
+		description: `Send a message to your parent agent or to a child agent that this conversation started. Use it to give an existing child agent more work, an answer, or a correction, and to send your parent agent a finding or a question while you keep working. A message to a child continues its history. If the child is still working, it reads the message after its current work, and one result covers both. The result arrives later as a new task in this conversation; do not wait or poll for it. A message to your parent does not end your task. Use spawnAgent only to start a new child agent.`,
+		annotations: {
+			destructiveHint: false,
+			idempotentHint: true,
+			openWorldHint: false,
+			readOnlyHint: false
+		},
+		inputSchema: z.object({
+			to: z.string().trim().min(1).describe(`"${PARENT_AGENT_TARGET}" for your parent agent, or the name or conversation_id of a child agent from spawnAgent or listAgents`),
+			text: z.string().trim().min(1).max(MESSAGE_AGENT_TEXT_MAX_LENGTH).describe("Message text. Include all context the target needs.")
+		}).strict(),
+		outputSchema: messageAgentOutputSchema,
+		execute: async (input, options) => {
+			if (!options.toolCallId) throw new ToolInputError("messageAgent requires an active tool call ID");
+			let result;
+			try {
+				result = await messageAgent({
+					text: input.text,
+					to: input.to
+				}, {
+					...options.signal ? { signal: options.signal } : void 0,
+					toolCallId: options.toolCallId
+				});
+			} catch (error) {
+				if (error instanceof AgentMessageTargetError) throw new ToolInputError(`${error.message}. Use listAgents to find a child agent.`, { cause: error });
+				if (error instanceof AgentMessageQueueFullError) throw new ToolInputError(`${error.message}. Wait for its result, then send one message with everything it needs.`, { cause: error });
+				if (error instanceof AgentInvocationLimitError) throw new ToolInputError(`${error.message}. Wait for active children to finish before you give more work.`, { cause: error });
+				throw error;
+			}
+			return {
+				conversation_id: result.conversationId,
+				delivery: result.delivery
+			};
+		}
+	});
+}
+//#endregion
 //#region src/chat/tools/runtime/spawn-agent.ts
 const spawnAgentOutputSchema = juniorToolOutputSchema.extend({ conversation_id: z.string().min(1).describe("Child conversation ID. Pass it to searchConversationEvents to read the child's history.") });
 /** Create the asynchronous child-agent tool for one parent run. */
 function createSpawnAgentTool(spawnAgent) {
 	return zodTool({
-		description: "Start an asynchronous child agent on a delegated task. Give it a name to reuse the same child agent and its history on later calls; omit the name for a one-off agent. This call confirms durable scheduling, not task completion. The result arrives later as a new task in this conversation; do not wait or poll for it.",
+		description: "Start a new asynchronous child agent on a delegated task. Give it a name when you may send it more work later. To give more work to a child agent that already exists, use messageAgent instead. This call confirms durable scheduling, not task completion. The result arrives later as a new task in this conversation; do not wait or poll for it.",
 		annotations: {
 			destructiveHint: false,
 			idempotentHint: true,
@@ -10134,7 +10395,7 @@ function createSpawnAgentTool(spawnAgent) {
 		inputSchema: z.object({
 			task: z.string().trim().min(1).describe("Task for the child agent"),
 			title: z.string().trim().min(1).max(60).nullable().optional().describe("Optional short display title for the task. Omit to generate one from the task."),
-			name: agentNameSchema.nullable().optional().describe("Stable child-agent name, or omit for a one-off agent"),
+			name: agentNameSchema.refine((name) => name !== PARENT_AGENT_TARGET, { message: `"${PARENT_AGENT_TARGET}" is reserved` }).nullable().optional().describe("New child-agent name that messageAgent can address, or omit for a one-off agent"),
 			reasoning_level: z.enum(TURN_REASONING_LEVELS).nullable().optional().describe("Optional reasoning level for this delegated task only")
 		}).strict(),
 		outputSchema: spawnAgentOutputSchema,
@@ -10158,7 +10419,7 @@ function createSpawnAgentTool(spawnAgent) {
 					toolCallId: options.toolCallId
 				});
 			} catch (error) {
-				if (error instanceof AgentInvocationBusyError) throw new ToolInputError(`${error.message}. Wait for it to finish or use a different name.`, { cause: error });
+				if (error instanceof AgentNameInUseError) throw new ToolInputError(`${error.message}. Use messageAgent to give it more work, or choose a different name.`, { cause: error });
 				if (error instanceof AgentInvocationLimitError) throw new ToolInputError(`${error.message}. Wait for active children to finish before spawning more.`, { cause: error });
 				throw error;
 			}
@@ -10169,18 +10430,33 @@ function createSpawnAgentTool(spawnAgent) {
 //#endregion
 //#region src/chat/agent-invocations/markers.ts
 /**
-* Dashboard markers for agent invocations. The parent Conversation gets one
+* Dashboard records for agent invocations. The parent Conversation gets one
 * `subagent_started` and one `subagent_ended` event for each agent invocation.
+* The child Conversation gets `message` events for its input and its result,
+* because a child has no Location that records visible messages.
 */
 const SUBAGENT_KIND = "agent";
 /**
-* Record in the parent Conversation that one agent invocation started. The
-* dashboard pairs this event with `subagent_ended` to show the child and its
+* Record in the parent Conversation that one agent invocation started, and
+* record its input as a user message in the child Conversation. The dashboard
+* pairs the parent event with `subagent_ended` to show the child and its
 * status. It must be written before the child mailbox append, so the child
 * cannot end first.
 */
 async function recordSubagentStarted(invocation) {
-	await getConversationEventStore().append(invocation.parentConversationId, [{
+	const eventStore = getConversationEventStore();
+	const messageId = getAgentInvocationMessageId(invocation.invocationId);
+	await eventStore.append(invocation.childConversationId, [{
+		idempotencyKey: `message:${messageId}`,
+		data: {
+			type: "message",
+			messageId,
+			role: "user",
+			text: invocation.input
+		},
+		createdAtMs: invocation.createdAtMs
+	}]);
+	await eventStore.append(invocation.parentConversationId, [{
 		idempotencyKey: `subagent_started:${invocation.invocationId}`,
 		data: {
 			type: "subagent_started",
@@ -10205,12 +10481,14 @@ const SUBAGENT_OUTCOMES = {
 	stopped: "aborted"
 };
 /**
-* Record in the parent Conversation how one agent invocation ended. The
+* Record in the parent Conversation how one agent invocation ended, and record
+* a completed result as an assistant message in the child Conversation. The
 * heartbeat result repair also calls this, because the child work can be
 * acknowledged before the worker reports the result.
 */
 async function recordSubagentEnded(invocation) {
-	await getConversationEventStore().append(invocation.parentConversationId, [{
+	const eventStore = getConversationEventStore();
+	await eventStore.append(invocation.parentConversationId, [{
 		idempotencyKey: `subagent_ended:${invocation.invocationId}`,
 		data: {
 			type: "subagent_ended",
@@ -10219,6 +10497,19 @@ async function recordSubagentEnded(invocation) {
 		},
 		createdAtMs: invocation.terminalAtMs
 	}]);
+	const result = invocation.status === "completed" ? invocation.result.trim() : "";
+	if (!result) return;
+	const messageId = `agent-invocation:${invocation.invocationId}:reply`;
+	await eventStore.append(invocation.childConversationId, [{
+		idempotencyKey: `message:${messageId}`,
+		data: {
+			type: "message",
+			messageId,
+			role: "assistant",
+			text: result
+		},
+		createdAtMs: invocation.terminalAtMs
+	}]);
 }
 //#endregion
 //#region src/chat/agent-invocations/stop.ts
@@ -10251,6 +10542,61 @@ async function finishStoppedTree(tree, conversationIdsToStop, state) {
 		state
 	});
 }
+/**
+* List one child Conversation and every Conversation below it, child first.
+* It takes the create lock of each Conversation before it reads that
+* Conversation's children, so no child agent can start in the tree until the
+* caller's transaction ends.
+*/
+async function lockAgentConversationTree(childConversationId) {
+	const executor = getSqlExecutor();
+	const conversationIds = [childConversationId];
+	let parents = conversationIds;
+	while (parents.length > 0) {
+		for (const parent of parents) await executor.withLock(getChildAgentLockName(parent), async () => void 0);
+		parents = (await executor.db().selectDistinct({ childConversationId: juniorAgentInvocations.childConversationId }).from(juniorAgentInvocations).where(inArray(juniorAgentInvocations.parentConversationId, parents))).map((row) => row.childConversationId).filter((id) => !conversationIds.includes(id));
+		conversationIds.push(...parents);
+	}
+	return conversationIds;
+}
+/**
+* Stop the agent invocations of one direct child agent and of every child
+* agent below it. Returns undefined when the child does not belong to the
+* parent.
+*/
+async function stopChildAgentInvocations(args) {
+	if ((await getSqlExecutor().db().select({ invocationId: juniorAgentInvocations.invocationId }).from(juniorAgentInvocations).where(and(eq(juniorAgentInvocations.parentConversationId, args.parentConversationId), eq(juniorAgentInvocations.childConversationId, args.childConversationId))).limit(1)).length === 0) return;
+	return await stopAgentInvocationTree(args.childConversationId, args.nowMs);
+}
+/**
+* Stop the agent invocations of one agent Conversation and of every child
+* agent below it. Open agent invocations become `stopped`. Results that would
+* still start or report work in the tree become `skipped`.
+*/
+async function stopAgentInvocationTree(conversationId, nowMs = Date.now()) {
+	return await getSqlExecutor().withLock(getChildAgentLockName(conversationId), () => stopLockedAgentInvocationTree(conversationId, nowMs));
+}
+async function stopLockedAgentInvocationTree(conversationId, nowMs) {
+	const db = getSqlExecutor().db();
+	const now = new Date(nowMs);
+	const conversationIds = await lockAgentConversationTree(conversationId);
+	const stopped = await db.update(juniorAgentInvocations).set({
+		errorMessage: "Stopped by the parent conversation",
+		parentMailboxStatus: "skipped",
+		result: null,
+		status: "stopped",
+		terminalAt: now,
+		updatedAt: now
+	}).where(and(inArray(juniorAgentInvocations.childConversationId, conversationIds), inArray(juniorAgentInvocations.status, NON_TERMINAL_AGENT_INVOCATION_STATUSES))).returning();
+	await db.update(juniorAgentInvocations).set({
+		parentMailboxStatus: "skipped",
+		updatedAt: now
+	}).where(or(and(inArray(juniorAgentInvocations.parentConversationId, conversationIds), inArray(juniorAgentInvocations.parentMailboxStatus, ["pending", "appended"])), and(inArray(juniorAgentInvocations.childConversationId, conversationIds), eq(juniorAgentInvocations.parentMailboxStatus, "replaced"))));
+	return {
+		conversationIds,
+		stopped: stopped.map(invocationFromRow).filter(isTerminalAgentInvocation)
+	};
+}
 //#endregion
 //#region src/chat/tools/runtime/stop-agent.ts
 const stopAgentOutputSchema = juniorToolOutputSchema.extend({
@@ -10260,7 +10606,7 @@ const stopAgentOutputSchema = juniorToolOutputSchema.extend({
 /** Create the tool that stops one child agent of one conversation. */
 function createStopAgentTool(conversationId) {
 	return zodTool({
-		description: "Stop a child agent that this conversation started, and every child agent it started. Use it when the child agent's work is no longer needed or goes in the wrong direction. A stopped child agent sends no result. To give a named child agent new work later, call spawnAgent with its name.",
+		description: "Stop a child agent that this conversation started, and every child agent it started. Use it when the child agent's work is no longer needed or goes in the wrong direction. A stopped child agent sends no result. To give it new work later, use messageAgent.",
 		annotations: {
 			destructiveHint: true,
 			idempotentHint: true,
@@ -10321,6 +10667,23 @@ function createFinishAutomationRunTool(options) {
 	});
 }
 //#endregion
+//#region src/chat/tools/runtime/report-blocked.ts
+/** Create the tool that ends a child agent run as blocked. */
+function createReportBlockedTool() {
+	return zodTool({
+		annotations: {
+			destructiveHint: false,
+			idempotentHint: true,
+			openWorldHint: false,
+			readOnlyHint: false
+		},
+		description: "End this delegated task as blocked. Call this when missing access, credentials, input, or a decision stops the task, also when a search for the missing part found nothing. Do not guess, mock, or fake results to work around it.",
+		inputSchema: z.object({ missing: z.string().trim().min(1).describe("What the task needs and who can give it. Add the work you already did, so the parent does not repeat it.") }).strict(),
+		outputSchema: juniorToolOutputSchema.extend({ missing: z.string() }),
+		execute: async (input) => ({ missing: input.missing })
+	});
+}
+//#endregion
 //#region src/chat/tools/list-watches.ts
 const listedResourceWatchSchema = z.object({
 	id: z.string().min(1),
@@ -10592,6 +10955,7 @@ function createWatchEventsTool(context, catalog) {
 		outputSchema: outputSchema$2,
 		async execute(input) {
 			if (input.namespace === "junior" && input.resourceType === "timer") throw new ToolInputError("Use watchTimer to create a timer Watch.");
+			if (input.namespace === "slack") throw new ToolInputError("Slack channel messages can trigger only an event automation in that channel. Use createEventAutomation.");
 			const events = cleanStrings(input.events);
 			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();
@@ -10756,7 +11120,7 @@ const eventAutomationListToolResultSchema = juniorToolOutputSchema.extend({
 }).strict();
 /** Build the validated event trigger accepted by event-automation tools. */
 function registeredEventAutomationTriggerSchema(catalog) {
-	const plugins = pluginEventCatalog(catalog);
+	const plugins = automationEventCatalog(catalog);
 	return z.object({
 		namespace: eventNamespaceSchema(plugins),
 		identifier: z.string().trim().min(1).max(300),
@@ -10768,7 +11132,7 @@ function registeredEventAutomationTriggerSchema(catalog) {
 }
 /** Reject an event-automation trigger that is no longer supported by the catalog. */
 function requireSupportedEventAutomationTrigger(catalog, trigger) {
-	const plugins = pluginEventCatalog(catalog);
+	const plugins = automationEventCatalog(catalog);
 	for (const eventType of trigger.events) if (!pluginSupportsEvent(plugins, trigger.namespace, trigger.resourceType, eventType)) throw new ToolInputError(`Resource type "${trigger.namespace}:${trigger.resourceType}" does not support event "${eventType}".`);
 	return requireSupportedEventMatch(plugins, {
 		match: trigger.match,
@@ -10810,7 +11174,7 @@ async function writableEventAutomation(context, id) {
 	return task;
 }
 function eventAutomationTriggerAvailable(task, catalog) {
-	const registration = pluginEventCatalog(catalog)[task.trigger.namespace];
+	const registration = automationEventCatalog(catalog)[task.trigger.namespace];
 	return Boolean(registration && task.trigger.events.every((eventType) => registration.resourceTypes.some((resourceType) => resourceType.supportedEvents.includes(eventType))));
 }
 /** Project an event automation into the bounded tool-result shape. */
@@ -10934,7 +11298,7 @@ function createEventAutomationTool(context, catalog) {
 				instruction: input.instruction,
 				title: input.title
 			});
-			const task = {
+			const task = requireSlackChannelMessageScope({
 				id,
 				destinationVisibility: source.visibility,
 				createdAtMs: Date.now(),
@@ -10956,7 +11320,7 @@ function createEventAutomationTool(context, catalog) {
 					events: [...new Set(input.trigger.events)],
 					...match ? { match } : void 0
 				}
-			};
+			});
 			return eventAutomationToolResult(context.conversationId, await createEventAutomation(db, task), catalog, actor.userId);
 		}
 	});
@@ -11088,11 +11452,17 @@ async function editEventAutomation(current, input, isCreator, catalog) {
 		};
 	}
 	const changesExecution = input.instruction !== void 0 && input.instruction !== current.task.text || changesEventAutomationTrigger(current.trigger, trigger);
-	return {
+	const next = {
 		...current,
 		...await editAutomationFields(current, input, isCreator, changesExecution),
 		trigger
 	};
+	try {
+		return requireSlackChannelMessageScope(next);
+	} catch (error) {
+		if (error instanceof ToolInputError) throw new AutomationEditError(error.message, "trigger");
+		throw error;
+	}
 }
 //#endregion
 //#region src/chat/tools/update-event-automation.ts
@@ -11165,7 +11535,7 @@ function createUpdateEventAutomationTool(context, catalog) {
 function createEventAutomationTools(context, catalog) {
 	if (context.source.kind !== "slack" || context.destination.platform !== "slack" || context.actor?.platform !== "slack") return {};
 	return {
-		...hasPluginEventCatalogEntries(catalog) ? { createEventAutomation: createEventAutomationTool(context, catalog) } : void 0,
+		createEventAutomation: createEventAutomationTool(context, catalog),
 		listEventAutomations: createListEventAutomationsTool(context, catalog),
 		updateEventAutomation: createUpdateEventAutomationTool(context, catalog),
 		deleteEventAutomation: createDeleteEventAutomationTool(context, catalog)
@@ -16700,6 +17070,8 @@ function createTools(availableSkills, hooks = {}, context, options = {}) {
 		tools.listAgents = createListAgentsTool(context.conversationId);
 		tools.stopAgent = createStopAgentTool(context.conversationId);
 	}
+	if (context.messageAgent) tools.messageAgent = createMessageAgentTool(context.messageAgent);
+	if (context.source.kind === "agent_invocation") tools[REPORT_BLOCKED_TOOL_NAME] = createReportBlockedTool();
 	if (context.automation) tools[FINISH_AUTOMATION_RUN_TOOL_NAME] = createFinishAutomationRunTool(context.automation);
 	if (context.mcpToolManager) {
 		tools.searchMcpTools = createSearchMcpToolsTool(context.mcpToolManager);
@@ -19656,6 +20028,7 @@ async function wireAgentTools(args) {
 		surface: args.surface,
 		...args.currentActor ? { resolveActorIdentity: async () => await readActorIdentity(args.currentActor) } : void 0,
 		...args.durability.spawnAgent ? { spawnAgent: args.durability.spawnAgent } : void 0,
+		...args.durability.messageAgent ? { messageAgent: args.durability.messageAgent } : void 0,
 		...args.requestHandoff ? { handoff: args.requestHandoff } : void 0,
 		...args.run.dispatch?.declaresResult ? { automation: { sendsMessage: args.run.dispatch.outcomes?.length !== 0 } } : void 0
 	};
@@ -20493,7 +20866,8 @@ async function compactActiveContextIfNeeded(args, deps) {
 const EXCLUSIVE_TOOL_NAMES = [
 	HANDOFF_TOOL_NAME,
 	"switchWorkspace",
-	FINISH_AUTOMATION_RUN_TOOL_NAME
+	FINISH_AUTOMATION_RUN_TOOL_NAME,
+	REPORT_BLOCKED_TOOL_NAME
 ];
 /** Return the exclusive tool name when one is present among the calls. */
 function exclusiveToolName(toolCalls) {
@@ -21229,7 +21603,7 @@ async function executeAgentRunInPrivacyContext(run, conversationPrivacy, runLogC
 				const sourceResult = timedOutResult ?? result;
 				const projectedResult = wiring.projectActionReviewResult(toolCall.id, sourceResult);
 				const override = timedOutResult || projectedResult !== result ? projectedResult : void 0;
-				if (toolCall.name === "finishAutomationRun" && !isError && !override) return { terminate: true };
+				if ((toolCall.name === "finishAutomationRun" || toolCall.name === "reportBlocked") && !isError && !override) return { terminate: true };
 				return override;
 			},
 			prepareNextTurnWithContext: async (nextTurn, hookSignal) => {
@@ -21589,9 +21963,11 @@ function createAgentRunner(execute, options) {
 	const streamFn = options?.streamFn;
 	const tracePropagation = options?.tracePropagation;
 	const bindSpawnAgent = options?.bindSpawnAgent;
+	const bindMessageAgent = options?.bindMessageAgent;
 	const canBindSpawn = Boolean(bindSpawnAgent) && isExperimentalFeatureEnabled("subagents");
 	return { run: async (run) => {
 		const spawnAgent = bindSpawnAgent && canBindSpawn && !isAgentRunFeatureDisabled(run.disabledFeatures, "subagents") ? bindSpawnAgent(run) : void 0;
+		const messageAgent = bindMessageAgent && canBindSpawn && (spawnAgent || run.source.kind === "agent_invocation") ? bindMessageAgent(run) : void 0;
 		const nextRun = {
 			...run,
 			environment: {
@@ -21599,13 +21975,14 @@ function createAgentRunner(execute, options) {
 				attachmentStorage: run.environment?.attachmentStorage ?? attachmentStorage,
 				sandboxTracePropagation: run.environment?.sandboxTracePropagation ?? tracePropagation
 			},
-			...spawnAgent ? { durability: {
+			...spawnAgent || messageAgent ? { durability: {
 				...run.durability,
-				spawnAgent
+				...spawnAgent ? { spawnAgent } : void 0,
+				...messageAgent ? { messageAgent } : void 0
 			} } : void 0
 		};
 		if (run.instruction.storedAttachments?.length) {
-			const { loadInputImages } = await import("./images-CvMreau5.js").then((n) => n.n);
+			const { loadInputImages } = await import("./images-DZliDtSH.js").then((n) => n.n);
 			const storage = nextRun.environment?.attachmentStorage;
 			if (!storage) throw new Error("Attachment storage is unavailable.");
 			nextRun.instruction = {
@@ -21621,4 +21998,4 @@ function createAgentRunner(execute, options) {
 	} };
 }
 //#endregion
-export { getLatestAgentInvocationForConversation as $, resolveSandboxEgressProviderForHost as $t, resolveSlackChannelIdFromMessage as A, drainConversationMailbox as At, effectiveTaskOutcomes as B, requestAnotherSlice as Bt, renderBlockText as C, setConfigDefaults as Cn, checkInConversationWork as Ct, storeAttachment as D, completeConversationWork as Dt, requestAttachmentDeletion as E, completeConversationStop as Et, logScheduledAutomationRunSkipped as F, listActiveConversationIds as Ft, completeAgentInvocation as G, CONVERSATION_WORK_STALE_ENQUEUE_MS as Gt, stopChildAgentsOf as H, startConversationWork as Ht, scheduledAutomationRunAttributes as I, recordAttemptFailure as It, getActiveAgentInvocationForConversation as J, isFinalAttempt as Jt, createAgentInvocation as K, hasConversationStop as Kt, editEventAutomation as L, recordConversationRetry as Lt, getConversationInfo as M, getConversation as Mt, listThreadReplies as N, getConversationWorkState as Nt, parseSlackThreadId as O, countPendingConversationMessages as Ot, editScheduledAutomation as P, hasRunnableConversationWork as Pt, getAgentInvocationTurnId as Q, recordFinishedTurnForAutomatedLimit as Qt, AutomationEditError as R, releaseConversationWork as Rt, renderAttachmentText as S, getConfigDefaults as Sn, cancelHumanFacingPendingMessages as St, readLiveAttachment as T, clearExpiredConversationLease as Tt, recordSubagentEnded as U, stopConversationWork as Ut, resolveTaskOutcomes as V, requestConversationWork as Vt, recordSubagentStarted as W, CONVERSATION_WORK_CHECK_IN_INTERVAL_MS as Wt, getAgentInvocationMessageId as X, renderTaskInput as Xt, getAgentInvocation as Y, isInvalidConversationRecordError as Yt, getAgentInvocationResultMessageId as Z, maybePostAutomatedTurnLimitNotice as Zt, resolvePluginOAuthAccount as _, AuthorizationFlowDisabledError as _n, pluginEventCatalog as _t, buildAuthPauseResponse as a, consumeSandboxEgressPermissionDeniedSignal as an, markAgentInvocationParentMailboxAppended as at, unpublishedArtifactHeaders as b, runDispatchOutcome as bn, appendAndEnqueueInboundMessage as bt, deleteMcpAuthSessionsForUserProvider as c, formatProviderLabel as cn, reportReplacedAgentInvocation as ct, getMcpAuthSession as d, startOAuthFlow as dn, ingestEvent as dt, normalizeSandboxEgressTracePropagationDomains as en, isTerminalAgentInvocation as et, getMcpStoredOAuthCredentials as f, createUserTokenStore as fn, EVENT_WAIT_MS as ft, readStats as g, toolInvocationDestination as gn, eventGuidance as gt, latestProgressStatus as h, actorFromRun as hn, getEventCatalog as ht, executeCredentialedEgressRequest as i, consumeSandboxEgressAuthRequiredSignal as in, markAgentInvocationMailboxAppended as it, resolveSlackChannelIdFromThreadId as j, ensureConversationWake as jt, readSlackRawMessageContext as k, deadLetterAttempt as kt, deleteMcpServerSessionId as l, parseOAuthStatePayload as ln, getMcpProviderErrorAttributes as lt, PluginCredentialFailureError as m, RetryableDeliveryError as mn, timerWatchCredentialSubject as mt, executeAgentRun as n, SANDBOX_EGRESS_PROXY_PATH as nn, listPendingAgentInvocationMailboxAppends as nt, finalizeMcpAuthorization as o, parseSandboxEgressCredentialToken as on, markAgentInvocationPaused as ot, putMcpStoredOAuthCredentials as p, buildSteeringPiMessage as pn, isEventMailboxMetadata as pt, createAgentInvocationForResult as q, hasRunnableConversationWork$1 as qt, createContextCompactor as r, clearSandboxEgressSignals as rn, listPendingAgentInvocationResults as rt, deleteMcpAuthSession as s, sandboxEgressSignalsResponseSchema as sn, markAgentInvocationRunning as st, createAgentRunner as t, shouldPropagateSandboxEgressTrace as tn, listChildAgents as tt, deleteMcpStoredOAuthCredentials as u, resolveBaseUrl as un, processWorkspaceSnapshotJob as ut, publicArtifactHeaders as v, deliversFinalText as vn, ackMessages as vt, collectAttachmentGarbage as w, clearConsumedConversationWake as wt, lookupSlackUserProfile as x, shouldEmitDevAgentTrace as xn, beginConversationResume as xt, readPublicArtifact as y, finishedRunReply as yn, appendAndEnqueueExclusiveInboundMessage as yt, eventAutomationTriggerAvailable as z, removeActiveConversation as zt };
+export { getAgentInvocationIdForMessage as $, stopConversationWork as $t, resolveSlackChannelIdFromMessage as A, finishedRunReply as An, appendAndEnqueueInboundMessage as At, effectiveTaskOutcomes as B, drainConversationMailbox as Bt, renderBlockText as C, buildSteeringPiMessage as Cn, SLACK_EVENT_NAMESPACE as Ct, storeAttachment as D, AuthorizationFlowDisabledError as Dn, eventGuidance as Dt, requestAttachmentDeletion as E, toolInvocationDestination as En, automationEventCatalog as Et, logScheduledAutomationRunSkipped as F, clearExpiredConversationLease as Ft, listChildAgents as G, listActiveConversationIds as Gt, stopChildAgentsOf as H, getConversation as Ht, scheduledAutomationRunAttributes as I, completeConversationStop as It, createAgentInvocationForMessage as J, releaseConversationWork as Jt, completeAgentInvocation as K, recordAttemptFailure as Kt, editEventAutomation as L, completeConversationWork as Lt, getConversationInfo as M, shouldEmitDevAgentTrace as Mn, cancelHumanFacingPendingMessages as Mt, listThreadReplies as N, getConfigDefaults as Nn, checkInConversationWork as Nt, parseSlackThreadId as O, readBlockedReport as On, ackMessages as Ot, editScheduledAutomation as P, setConfigDefaults as Pn, clearConsumedConversationWake as Pt, getAgentInvocation as Q, startConversationWork as Qt, AutomationEditError as R, countPendingConversationMessages as Rt, renderAttachmentText as S, createUserTokenStore as Sn, getEventCatalog as St, readLiveAttachment as T, actorFromRun as Tn, slackChannelMessageReplyThreadTs as Tt, recordSubagentEnded as U, getConversationWorkState as Ut, resolveTaskOutcomes as V, ensureConversationWake as Vt, recordSubagentStarted as W, hasRunnableConversationWork as Wt, findChildAgentConversationId as X, requestAnotherSlice as Xt, createAgentInvocationFromLatest as Y, removeActiveConversation as Yt, getActiveAgentInvocationForConversation as Z, requestConversationWork as Zt, resolvePluginOAuthAccount as _, sandboxEgressSignalsResponseSchema as _n, processWorkspaceSnapshotJob as _t, buildAuthPauseResponse as a, isInvalidConversationRecordError as an, getLatestAgentInvocationForConversation as at, unpublishedArtifactHeaders as b, resolveBaseUrl as bn, isEventMailboxMetadata as bt, deleteMcpAuthSessionsForUserProvider as c, recordFinishedTurnForAutomatedLimit as cn, listPendingAgentInvocationResults as ct, getMcpAuthSession as d, shouldPropagateSandboxEgressTrace as dn, markAgentInvocationPaused as dt, CONVERSATION_WORK_CHECK_IN_INTERVAL_MS as en, getAgentInvocationIdForResult as et, getMcpStoredOAuthCredentials as f, SANDBOX_EGRESS_PROXY_PATH as fn, markAgentInvocationRunning as ft, readStats as g, parseSandboxEgressCredentialToken as gn, getMcpProviderErrorAttributes as gt, latestProgressStatus as h, consumeSandboxEgressPermissionDeniedSignal as hn, PARENT_AGENT_TARGET as ht, executeCredentialedEgressRequest as i, isFinalAttempt as in, getChildAgentLabel as it, resolveSlackChannelIdFromThreadId as j, runDispatchOutcome as jn, beginConversationResume as jt, readSlackRawMessageContext as k, deliversFinalText as kn, appendAndEnqueueExclusiveInboundMessage as kt, deleteMcpServerSessionId as l, resolveSandboxEgressProviderForHost as ln, markAgentInvocationMailboxAppended as lt, PluginCredentialFailureError as m, consumeSandboxEgressAuthRequiredSignal as mn, AgentMessageTargetError as mt, executeAgentRun as n, hasConversationStop as nn, getAgentInvocationResultMessageId as nt, finalizeMcpAuthorization as o, renderTaskInput as on, isTerminalAgentInvocation as ot, putMcpStoredOAuthCredentials as p, clearSandboxEgressSignals as pn, reportReplacedAgentInvocation as pt, createAgentInvocation as q, recordConversationRetry as qt, createContextCompactor as r, hasRunnableConversationWork$1 as rn, getAgentInvocationTurnId as rt, deleteMcpAuthSession as s, maybePostAutomatedTurnLimitNotice as sn, listPendingAgentInvocationMailboxAppends as st, createAgentRunner as t, CONVERSATION_WORK_STALE_ENQUEUE_MS as tn, getAgentInvocationMessageId as tt, deleteMcpStoredOAuthCredentials as u, normalizeSandboxEgressTracePropagationDomains as un, markAgentInvocationParentMailboxAppended as ut, publicArtifactHeaders as v, formatProviderLabel as vn, ingestEvent as vt, collectAttachmentGarbage as w, RetryableDeliveryError as wn, slackChannelMessageEvent as wt, lookupSlackUserProfile as x, startOAuthFlow as xn, timerWatchCredentialSubject as xt, readPublicArtifact as y, parseOAuthStatePayload as yn, EVENT_WAIT_MS as yt, eventAutomationTriggerAvailable as z, deadLetterAttempt as zt };