@sentry/junior 0.235.0 → 0.237.0

package/dist/{agent-runner-BlDI1zV2.js → agent-runner-DMAsnPb9.js}

@@ -1,27 +1,27 @@
 import { t as __exportAll } from "./rolldown-runtime-B4FMCO8f.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-BSnNHO0R.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, s as getLogContextAttributes, u as logError, v as setSpanAttributes, w as withSpan, x as summarizeMessageText, y as setSpanStatus } from "./logging-F--48Q7Q.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-CPMbTmJU.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, s as getLogContextAttributes, u as logError, v as setSpanAttributes, w as withSpan, x as summarizeMessageText, y as setSpanStatus } from "./logging-rB_ngE_R.js";
 import { m as startInactiveSpan, n as captureMessage, 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-BV2dtba2.js";
-import { a as getChatConfig, h as normalizeSlackEmojiName, n as botConfig } from "./config-Bmw4xTPK.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-Dbkdvozu.js";
+import { i as getChatConfig, n as botConfig, o as getSlackBotToken, v as normalizeSlackEmojiName } from "./config-CxpPG6nR.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 { b as parseSlackMessageTs, d as parseStoredSlackActor, g as parseSlackUserId, h as parseSlackTeamId, i as credentialUserSubjectId, l as isUserActor, m as parseSlackChannelReferenceId, n as credentialContextSchema, p as parseSlackChannelId, t as credentialContextForActor } from "./context-0Et9iVSB.js";
-import { $ as readActorIdentity, $t as getConversationMessageSearchStore, A as getWorkspaceSnapshotBuilder, B as SlackActionError, C as WorkspaceValidationError, D as setWorkspaceSnapshotBuild, E as setWorkspaceSnapshot, G as isConversationScopedChannel, H as getFilePermalink, K as isDmChannel$1, M as workspaceRepoCheckoutPath, N as resolveChannelCapabilities, O as SANDBOX_RUNTIME, Qt as getConversationEventStore, S as updateWorkspace, T as loadSnapshotsForProfile, Ut as saveObjectAnnotations, V as downloadPrivateSlackFile, W as getSlackClient, Wt as createPluginAnnotations, Y as withSlackRetries, _ as deleteWorkspace, _t as getDashboardConversationLink, at as RESOURCE_WATCH_TOOL_SOURCE, b as listWorkspaces, c as getPluginTools, ct as cancelWatch, dt as createWatch, en as getConversationStore, ft as deliverWatch, g as createWorkspace, gt as JUNIOR_THREAD_STATE_TTL_MS, it as RESOURCE_SUBSCRIPTION_MAX_TTL_MS, j as tryWorkspaceRepoCheckoutPath, k as deleteWorkspaceSnapshotBuilders, l as getPluginUserPromptContributions, ln as addAgentTurnUsage, mt as listWatches, n as applyPluginFormatMarkdown, nn as getSqlExecutor, nt as getSlackToolContext, ot as STOP_WATCHING_TOOL_NAME, pn as hasAgentTurnUsage, pt as findMatchingWatches, q as normalizeSlackConversationId, r as createPluginHookRunner, rt as RESOURCE_SUBSCRIPTION_DEFAULT_TTL_MS, s as getPluginSystemPromptContributions, st as cancelSubscriptions, tn as getDb, u as getPlugins, ut as createTimerWatch, v as getWorkspace, w as invalidateReadySnapshot, wt as createPluginLogger, xn as sameDestination$1, y as getWorkspaceByName, yn as parseDestination, yt as getDashboardTaskLink, zt as matchSlackAttachments } from "./agent-hooks-DS7k0ZWY.js";
+import { $ as readActorIdentity, $t as getConversationMessageSearchStore, A as getWorkspaceSnapshotBuilder, B as SlackActionError, C as WorkspaceValidationError, Cn as sameDestination$1, D as setWorkspaceSnapshotBuild, E as setWorkspaceSnapshot, G as isConversationScopedChannel, H as getFilePermalink, K as isDmChannel$1, M as workspaceRepoCheckoutPath, N as resolveChannelCapabilities, O as SANDBOX_RUNTIME, Qt as getConversationEventStore, S as updateWorkspace, T as loadSnapshotsForProfile, Ut as saveObjectAnnotations, V as downloadPrivateSlackFile, W as getSlackClient, Wt as createPluginAnnotations, Y as withSlackRetries, _ as deleteWorkspace, _n as saveUserTimezone, _t as getDashboardConversationLink, at as RESOURCE_WATCH_TOOL_SOURCE, b as listWorkspaces, c as getPluginTools, ct as cancelWatch, dt as createWatch, en as getConversationStore, ft as deliverWatch, g as createWorkspace, gn as readUserTimezone, gt as JUNIOR_THREAD_STATE_TTL_MS, it as RESOURCE_SUBSCRIPTION_MAX_TTL_MS, j as tryWorkspaceRepoCheckoutPath, k as deleteWorkspaceSnapshotBuilders, l as getPluginUserPromptContributions, ln as addAgentTurnUsage, mt as listWatches, n as applyPluginFormatMarkdown, nn as getSqlExecutor, nt as getSlackToolContext, ot as STOP_WATCHING_TOOL_NAME, pn as hasAgentTurnUsage, pt as findMatchingWatches, q as normalizeSlackConversationId, r as createPluginHookRunner, rt as RESOURCE_SUBSCRIPTION_DEFAULT_TTL_MS, s as getPluginSystemPromptContributions, st as cancelSubscriptions, tn as getDb, u as getPlugins, ut as createTimerWatch, v as getWorkspace, w as invalidateReadySnapshot, wt as createPluginLogger, xn as parseDestination, y as getWorkspaceByName, yt as getDashboardTaskLink, zt as matchSlackAttachments } from "./agent-hooks-otHGbhBx.js";
 import { n as juniorDestinations } from "./destinations-BeBiJeEM.js";
-import { D as juniorIdentities, E as juniorConversations, a as juniorSchedulerRuns, c as juniorStats, d as AGENT_INVOCATION_MAILBOX_STATUSES, g as juniorConversationBriefs, k as juniorArtifacts, l as juniorEventAutomations, o as juniorSchedulerTasks, w as juniorAttachments, x as juniorConversationAnnotations } from "./executor-B9ksWZCv.js";
-import { F as briefLinkSchema, G as KNOWN_CONVERSATION_EVENT_TYPES, I as briefOutcomeStatusSchema, L as conversationBriefSchema, N as isVisionImageMediaType, U as removedCardSchema, et as contextProvenance, nt as instructionProvenanceFor, rt as sameActorIdentity, tt as instructionActors } from "./conversation-C_aYrISI.js";
-import { a as listReferenceFiles, c as soulPathCandidates, l as worldPathCandidates } from "./package-discovery-7a9YqLhE.js";
-import { a as resolveAuthTokenPlaceholder, c as fetchWithBoundedOAuthErrorBodies, d as CredentialUnavailableError, i as resolvePluginHeaderEnvRefs, l as getOAuthProviderErrorAttributes, o as resolvePluginCommandEnv, s as OAuthProviderError } from "./registry-_JLY0x7b.js";
-import { n as pluginCatalogRuntime } from "./catalog-runtime-B9u_3-GW.js";
-import { a as parseSkillInvocation, n as findSkillByName, r as loadSkillsByName, t as discoverSkills } from "./skills-DAegjk5Y.js";
-import { $ as fallbackShortTitle, C as isToolResultError, D as stripRuntimeTurnContext, E as retainRuntimeTurnContext, F as loadTurnRoute, G as recordToolExecutionStarted, H as recordGuardianActionReviewed, I as openConversationProjection, K as recordTurnRoute, L as recordAgentsInstructionsUpdated, M as loadConnectedMcpProviders, N as loadConversationProjection, O as trimTrailingAssistantMessages, R as recordAttachmentsDelivered, S as isContinuablePiBoundary, T as normalizeToolNameFromResult, U as recordMcpProviderConnected, V as recordAuthorizationRequested, _ as getTerminalAssistantMessages, d as TurnSliceLimitExceededError, et as resolveTaskTitle, f as assertTurnToolCallLimit, ft as estimateTextTokens, g as getPiMessageRole, gt as piMessageFromHistoryItem, h as extractAssistantText, ht as historyItemFromPiMessage, k as TURN_CONTEXT_TAG, m as isTurnExecutionLimitExceededError, mt as getAgentContextInputLimitTokens, n as loadTurnCheckpoint, pt as getAgentContextCompactionTriggerTokens, r as saveTurnCheckpoint, t as continuableMessages, v as getUserMessageInstructionText, w as isToolResultMessage, x as isAssistantMessage, y as hasRuntimeTurnContext } from "./checkpoint-DLcJ5mKL.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-DZ2DUdd1.js";
-import { n as canReusePendingAuthLink, t as abandonReplacedPendingAuth } from "./pending-auth-DrG9Mkje.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-LasSG3Qc.js";
-import { r as EVENT_AUTHOR_ID } from "./prompt-BM_5mAU3.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-Cuoj3MML.js";
-import { a as getVercelConversationWorkQueue, f as getTurnRequestDeadline, n as sendNextWorkspaceSnapshotJob, r as sendWorkspaceSnapshotJob } from "./job-queue-CY1L2YRn.js";
-import { a as automationTitleSchema, c as ScheduleIntentError, g as taskOutcomeInputSchema, i as automationInstructionSchema, l as compileScheduleIntent, m as eventAutomationSchema, n as scheduledAutomationSchema, p as getZonedDateTimeParts, r as scheduledRunSchema, t as SCHEDULED_AUTOMATION_SYSTEM_ACTOR, u as scheduleIntentSchema } from "./types-Du-HbEun.js";
+import { A as juniorArtifacts, D as juniorConversations, O as juniorIdentities, S as juniorConversationAnnotations, T as juniorAttachments, _ as juniorConversationBriefs, a as juniorSchedulerRuns, f as AGENT_INVOCATION_MAILBOX_STATUSES, l as juniorStats, o as juniorSchedulerTasks, s as juniorAutomationVersions, u as juniorEventAutomations } from "./executor-BNxfDS1V.js";
+import { F as isVisionImageMediaType, G as removedCardSchema, L as briefLinkSchema, R as briefOutcomeStatusSchema, at as sameActorIdentity, it as instructionProvenanceFor, nt as contextProvenance, q as KNOWN_CONVERSATION_EVENT_TYPES, rt as instructionActors, z as conversationBriefSchema } from "./conversation-9Fxa1Zbq.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 CredentialUnavailableError, i as resolvePluginHeaderEnvRefs, l as getOAuthProviderErrorAttributes, o as resolvePluginCommandEnv, s as OAuthProviderError } from "./registry-zfTzTHe6.js";
+import { n as pluginCatalogRuntime } from "./catalog-runtime-DlXuhrmk.js";
+import { a as parseSkillInvocation, i as parseSkillFile, n as findSkillByName, r as loadSkillsByName, t as discoverSkills } from "./skills-BVpr_Gnv.js";
+import { C as isToolResultError, D as stripRuntimeTurnContext, E as retainRuntimeTurnContext, H as recordAuthorizationRequested, I as loadTurnRoute, K as recordToolExecutionStarted, L as openConversationProjection, M as loadConnectedMcpProviders, N as loadConversationProjection, O as trimTrailingAssistantMessages, R as recordAgentsInstructionsUpdated, S as isContinuablePiBoundary, T as normalizeToolNameFromResult, U as recordGuardianActionReviewed, W as recordMcpProviderConnected, _ as getTerminalAssistantMessages, _t as historyItemFromPiMessage, d as TurnSliceLimitExceededError, f as assertTurnToolCallLimit, g as getPiMessageRole, gt as getAgentContextInputLimitTokens, h as extractAssistantText, ht as getAgentContextCompactionTriggerTokens, k as TURN_CONTEXT_TAG, m as isTurnExecutionLimitExceededError, mt as estimateTextTokens, n as loadTurnCheckpoint, nt as resolveTaskTitle, q as recordTurnRoute, r as saveTurnCheckpoint, t as continuableMessages, tt as fallbackShortTitle, v as getUserMessageInstructionText, vt as piMessageFromHistoryItem, w as isToolResultMessage, x as isAssistantMessage, y as hasRuntimeTurnContext, z as recordAttachmentsDelivered } from "./checkpoint-BlIIiHG5.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-D6apIG2N.js";
+import { n as canReusePendingAuthLink, t as abandonReplacedPendingAuth } from "./pending-auth-moCA2mTc.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-5T1S1v_1.js";
+import { r as EVENT_AUTHOR_ID } from "./prompt-Ctwy6hSI.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-sJtTzuBO.js";
+import { a as getVercelConversationWorkQueue, f as getTurnRequestDeadline, n as sendNextWorkspaceSnapshotJob, r as sendWorkspaceSnapshotJob } from "./job-queue-Dq5_zt_l.js";
+import { A as eventAutomationSchema, D as scheduledRunSchema, E as scheduledAutomationSchema, M as compileScheduleIntent, N as isValidTimeZone$1, O as automationInstructionToolSchema, P as scheduleIntentSchema, R as getZonedDateTimeParts, S as automationVersionSchema, T as SCHEDULED_AUTOMATION_SYSTEM_ACTOR, j as ScheduleIntentError, k as automationTitleSchema, z as taskOutcomeInputSchema } from "./automation-CrQGQ2MT.js";
 import { n as privateTraceResultAttributes } from "./private-trace-result-BLvBjy_e.js";
 import { streamSimple } from "@earendil-works/pi-ai/compat";
 import { createGatewayProvider } from "@ai-sdk/gateway";
@@ -397,6 +397,15 @@ async function collectFiles(params) {
 //#region src/chat/repository-instructions.ts
 const AGENTS_FILENAME = "AGENTS.md";
 const MAX_REPOSITORY_INSTRUCTIONS_BYTES = 32768;
+/** Repository skill directories, in priority order, relative to the Git root. */
+const REPOSITORY_SKILL_ROOTS = [".agents/skills", ".claude/skills"];
+const REPOSITORY_SKILLS_HEADER = [
+	"## Repository skills",
+	"",
+	"These skills come from the repository, not from `<available-skills>`. `loadSkill` cannot load them.",
+	"Before work that matches a skill description, read its `SKILL.md` with `readFile` and follow it.",
+	"Resolve relative paths in a skill against the skill directory."
+].join("\n");
 const AGENTS_REPLACEMENT_NOTICE = "These AGENTS.md instructions replace all previously provided AGENTS.md instructions.";
 const AGENTS_REMOVAL_NOTICE = "The previously provided AGENTS.md instructions no longer apply.";
 async function pathExists(fs, target) {
@@ -446,20 +455,53 @@ async function readInstructionFile(fs, filePath) {
 		throw error;
 	}
 }
-/** Resolve the effective root-to-cwd AGENTS.md bundle for one selected directory. */
-async function resolveRepositoryInstructions(args) {
-	const gitRoot = await findGitRoot(args.fs, args.cwd);
-	if (!gitRoot) return;
+async function readOptionalDirectory(fs, directory) {
+	try {
+		return await fs.readdir(directory);
+	} catch (error) {
+		if (isMissingPathError(error)) return [];
+		throw error;
+	}
+}
+/** Read model-invocable skills from the repository skill directories. */
+async function readRepositorySkills(fs, gitRoot) {
+	const roots = REPOSITORY_SKILL_ROOTS.map((root) => path.posix.join(gitRoot, root));
+	const listings = await Promise.all(roots.map(async (root) => await readOptionalDirectory(fs, root)));
+	const candidates = /* @__PURE__ */ new Map();
+	listings.forEach((entries, index) => {
+		for (const entry of [...entries].sort()) if (!candidates.has(entry)) candidates.set(entry, path.posix.join(roots[index], entry));
+	});
+	return (await Promise.all([...candidates].map(async ([name, skillDirectory]) => {
+		if (!await directoryExists(fs, skillDirectory)) return;
+		const filePath = path.posix.join(skillDirectory, "SKILL.md");
+		const raw = await readInstructionFile(fs, filePath);
+		const parsed = raw ? parseSkillFile(raw, name) : void 0;
+		if (!parsed?.ok || parsed.skill.disableModelInvocation) return;
+		return {
+			description: parsed.skill.description.replace(/\s+/g, " ").trim(),
+			name,
+			path: filePath
+		};
+	}))).filter((skill) => Boolean(skill)).sort((left, right) => left.name < right.name ? -1 : left.name > right.name ? 1 : 0);
+}
+function sourceBytes(sources) {
+	return sources.reduce((total, source) => total + Buffer.byteLength(source.content, "utf8"), 0);
+}
+function skillListBytes(skills) {
+	return skills.reduce((total, skill) => total + repositorySkillBytes(skill), 0);
+}
+/** Read root-to-cwd AGENTS.md files within the byte budget. */
+async function readAgentsSources(args) {
 	const directories = [];
 	let current = args.cwd;
 	for (;;) {
 		directories.push(current);
-		if (current === gitRoot) break;
+		if (current === args.gitRoot) break;
 		current = path.posix.dirname(current);
 	}
 	directories.reverse();
 	const sources = [];
-	let remaining = Math.max(0, args.maxBytes ?? MAX_REPOSITORY_INSTRUCTIONS_BYTES);
+	let remaining = Math.max(0, args.maxBytes);
 	for (const directory of directories) {
 		if (remaining <= 0) break;
 		const filePath = path.posix.join(directory, AGENTS_FILENAME);
@@ -473,34 +515,69 @@ async function resolveRepositoryInstructions(args) {
 		});
 		remaining -= Buffer.byteLength(bounded, "utf8");
 	}
-	if (sources.length === 0) return;
-	const text = formatInstructionSources(sources);
-	const fingerprint = createHash("sha256").update(JSON.stringify({
-		directory: args.cwd,
-		sources
-	})).digest("hex");
+	return sources;
+}
+/** Read repository skills that fit the byte budget, keeping each entry whole. */
+async function readRepositorySkillsWithinBudget(args) {
+	const skills = [];
+	let remaining = args.maxBytes;
+	if (remaining <= 0) return skills;
+	for (const skill of await readRepositorySkills(args.fs, args.gitRoot)) {
+		const bytes = repositorySkillBytes(skill);
+		if (bytes > remaining) break;
+		skills.push(skill);
+		remaining -= bytes;
+	}
+	return skills;
+}
+function buildRepositoryInstructions(directory, sources, skills) {
+	if (sources.length === 0 && skills.length === 0) return;
 	return {
-		directory: args.cwd,
-		fingerprint,
+		directory,
+		fingerprint: createHash("sha256").update(JSON.stringify({
+			directory,
+			sources,
+			...skills.length > 0 ? { skills } : void 0
+		})).digest("hex"),
+		...skills.length > 0 ? { skills } : void 0,
 		sources,
-		text
+		text: formatRepositoryInstructions(sources, skills)
 	};
 }
 function formatInstructionSources(sources) {
 	if (sources.length === 1) return sources[0].content;
 	return sources.map((source) => `## ${path.posix.dirname(source.path)}\n\n${source.content}`).join("\n\n");
 }
+function formatRepositorySkill(skill) {
+	return `- \`${skill.name}\` (\`${skill.path}\`): ${skill.description}`;
+}
+function repositorySkillBytes(skill) {
+	return Buffer.byteLength(formatRepositorySkill(skill), "utf8") + 1;
+}
+function formatRepositoryInstructions(sources, skills) {
+	const sections = [];
+	if (sources.length > 0) sections.push(formatInstructionSources(sources));
+	if (skills.length > 0) sections.push([
+		REPOSITORY_SKILLS_HEADER,
+		"",
+		...skills.map(formatRepositorySkill)
+	].join("\n"));
+	return sections.join("\n\n");
+}
 /** Combine AGENTS.md bundles from one or more repository directories. */
 function mergeRepositoryInstructions(bundles) {
 	if (bundles.length === 0) return;
 	if (bundles.length === 1) return bundles[0];
 	const sources = bundles.flatMap((bundle) => bundle.sources);
-	const text = formatInstructionSources(sources);
+	const skills = bundles.flatMap((bundle) => bundle.skills ?? []);
+	const text = formatRepositoryInstructions(sources, skills);
 	return {
 		fingerprint: createHash("sha256").update(JSON.stringify({
 			directories: bundles.map((bundle) => bundle.directory ?? null),
-			sources
+			sources,
+			...skills.length > 0 ? { skills } : void 0
 		})).digest("hex"),
+		...skills.length > 0 ? { skills } : void 0,
 		sources,
 		text
 	};
@@ -509,17 +586,33 @@ function mergeRepositoryInstructions(bundles) {
 async function resolveRepositoryInstructionsForDirectories(args) {
 	const uniqueDirectories = [...new Set(args.directories.filter((directory) => directory === SANDBOX_WORKSPACE_ROOT || directory.startsWith(`${SANDBOX_WORKSPACE_ROOT}/`)))].sort((left, right) => left < right ? -1 : left > right ? 1 : 0);
 	let remaining = MAX_REPOSITORY_INSTRUCTIONS_BYTES;
-	const bundles = [];
+	const repositories = [];
 	for (const directory of uniqueDirectories) {
-		if (remaining <= 0) break;
-		const instructions = await resolveRepositoryInstructions({
+		const gitRoot = await findGitRoot(args.fs, directory);
+		if (!gitRoot) continue;
+		const sources = await readAgentsSources({
 			cwd: directory,
 			fs: args.fs,
+			gitRoot,
+			maxBytes: remaining
+		});
+		remaining -= sourceBytes(sources);
+		repositories.push({
+			directory,
+			gitRoot,
+			sources
+		});
+	}
+	const bundles = [];
+	for (const repository of repositories) {
+		const skills = await readRepositorySkillsWithinBudget({
+			fs: args.fs,
+			gitRoot: repository.gitRoot,
 			maxBytes: remaining
 		});
-		if (!instructions) continue;
-		bundles.push(instructions);
-		remaining -= instructions.sources.reduce((total, source) => total + Buffer.byteLength(source.content, "utf8"), 0);
+		remaining -= skillListBytes(skills);
+		const bundle = buildRepositoryInstructions(repository.directory, repository.sources, skills);
+		if (bundle) bundles.push(bundle);
 	}
 	return mergeRepositoryInstructions(bundles);
 }
@@ -3095,6 +3188,10 @@ function normalizeSlackStatusText(text) {
 	if (!trimmed) return "";
 	return truncateStatusText(trimmed.replace(/(?:\.\s*)+$/, "").trim());
 }
+/** Render a Slack user mention, which Slack shows as the person's name. */
+function slackMention(userId) {
+	return `<@${userId}>`;
+}
 //#endregion
 //#region src/chat/slack/oauth-authorization-message.ts
 /** Present private OAuth authorization with a clear action and text fallback. */
@@ -3984,12 +4081,14 @@ function renderTaskInput(args) {
 	const instructions = args.instructions.trim();
 	if (!instructions) throw new Error("Task instructions are required");
 	const about = args.about?.trim();
+	const creator = args.creator?.trim();
 	const lines = [
 		"[task]",
 		"",
 		"This is a task, not a message from a person.",
 		"",
 		...about ? [`About: ${oneLine(about)}`] : [],
+		...creator ? [`Created by: ${oneLine(creator)}. Where the instructions say "me" or "my", write this mention.`] : [],
 		`Instructions: ${instructions}`
 	];
 	const guidance = args.guidance?.trim();
@@ -8742,7 +8841,7 @@ var PluginMcpClient = class {
 			return [...this.listedTools];
 		});
 	}
-	async callTool(name, args) {
+	async callTool(name, args, signal) {
 		return await this.withSessionRecovery(async () => {
 			const client = await this.getClient();
 			const mcp = this.plugin.manifest.mcp;
@@ -8759,7 +8858,7 @@ var PluginMcpClient = class {
 			const result = await this.wrapAuth(() => client.callTool({
 				name,
 				arguments: args ?? {}
-			}), "call_tool");
+			}, void 0, signal ? { signal } : void 0), "call_tool");
 			await this.syncTransportSessionId();
 			return result;
 		});
@@ -9143,7 +9242,7 @@ var McpToolManager = class {
 				const argumentAttribute = serializeMcpPayload(resolvedArgs, conversationPrivacy, { privateMetadata: true });
 				return await withSpan(`execute_tool ${managedToolName}`, "gen_ai.execute_tool", {}, async () => {
 					try {
-						const result = await client.callTool(tool.name, resolvedArgs);
+						const result = await client.callTool(tool.name, resolvedArgs, options?.signal);
 						if ("isError" in result && result.isError) throw new McpToolError(extractMcpErrorMessage(result));
 						const resultAttribute = serializeMcpPayload(result, conversationPrivacy, { privateMetadata: true });
 						if (resultAttribute) setSpanAttributes({ "gen_ai.tool.call.result": resultAttribute });
@@ -9503,6 +9602,7 @@ function createCallMcpToolTool(mcpToolManager) {
 			}
 			const result = await mcpTool.execute(resolveMcpArguments(input), {
 				conversationPrivacy: options?.conversationPrivacy ?? "private",
+				...options?.signal ? { signal: options.signal } : void 0,
 				...options?.toolCallId ? { toolCallId: options.toolCallId } : void 0
 			});
 			return {
@@ -10262,6 +10362,7 @@ var AutomationConflictError = class extends ToolInputError {
 		this.name = "AutomationConflictError";
 	}
 };
+/** Sort object keys so equal values produce equal JSON. */
 function canonicalJson$1(value) {
 	if (Array.isArray(value)) return value.map(canonicalJson$1);
 	if (value && typeof value === "object") return Object.fromEntries(Object.entries(value).sort(([a], [b]) => a.localeCompare(b)).map(([key, child]) => [key, canonicalJson$1(child)]));
@@ -10276,6 +10377,70 @@ function requireAutomationRevision(task, revision) {
 	if (!task || automationRevision(task) !== revision) throw new AutomationConflictError();
 }
 //#endregion
+//#region src/chat/automations/versions.ts
+/** Automation versions keep each saved definition so people can see how it changed. */
+/** Return the versioned part of an Automation. Lifecycle and run state are excluded. */
+function automationDefinition(task) {
+	const common = {
+		title: task.title?.trim() || null,
+		instruction: task.task.text,
+		credentialMode: task.credentialMode,
+		destination: task.destination,
+		outcomes: task.outcomes
+	};
+	return "schedule" in task ? {
+		...common,
+		schedule: task.schedule
+	} : {
+		...common,
+		trigger: task.trigger
+	};
+}
+/** Compare definition values after key sorting. */
+function sameDefinitionValue(left, right) {
+	return JSON.stringify(canonicalJson$1(left)) === JSON.stringify(canonicalJson$1(right));
+}
+/**
+* Save a version when the definition changed. Call this in the same
+* transaction and lock as the Automation write. Without `current`, the
+* Automation is new, so the creator saves version 1.
+*/
+async function recordAutomationVersion(db, kind, task, current, editedBy) {
+	const definition = automationDefinition(task);
+	if (current && sameDefinitionValue(automationDefinition(current), definition)) return;
+	await db.insert(juniorAutomationVersions).values({
+		kind,
+		automationId: task.id,
+		version: sql`(
+      SELECT coalesce(max(${juniorAutomationVersions.version}), 0) + 1
+      FROM ${juniorAutomationVersions}
+      WHERE ${juniorAutomationVersions.kind} = ${kind}
+        AND ${juniorAutomationVersions.automationId} = ${task.id}
+    )`,
+		createdAtMs: Date.now(),
+		editedBy: editedBy ?? (current ? null : task.createdBy),
+		definition
+	});
+}
+function parseVersionRow(kind, row) {
+	return automationVersionSchema.parse({
+		kind,
+		version: row.version,
+		createdAt: new Date(row.createdAtMs).toISOString(),
+		editedBy: row.editedBy,
+		definition: row.definition
+	});
+}
+/** Read one saved definition. */
+async function readAutomationVersion(db, kind, automationId, version) {
+	const [row] = await db.select().from(juniorAutomationVersions).where(and(eq(juniorAutomationVersions.kind, kind), eq(juniorAutomationVersions.automationId, automationId), eq(juniorAutomationVersions.version, version))).limit(1);
+	return row ? parseVersionRow(kind, row) : void 0;
+}
+/** Read saved definitions, newest first. */
+async function listAutomationVersions(db, kind, automationId, limit) {
+	return (await db.select().from(juniorAutomationVersions).where(and(eq(juniorAutomationVersions.kind, kind), eq(juniorAutomationVersions.automationId, automationId))).orderBy(desc(juniorAutomationVersions.version)).limit(limit)).map((row) => parseVersionRow(kind, row));
+}
+//#endregion
 //#region src/chat/event-automations/store.ts
 const retainedEventAutomationSchema = eventAutomationSchema.extend({
 	destination: slackDestinationSchema,
@@ -10327,61 +10492,84 @@ async function getEventAutomation(db, id) {
 async function createEventAutomation(db, task) {
 	const parsed = eventAutomationSchema.parse(eventAutomationJsonPayload(task));
 	const title = task.title?.trim() || null;
-	await db.insert(juniorEventAutomations).values({
-		id: parsed.id,
-		teamId: parsed.destination.teamId,
-		namespace: parsed.trigger.namespace,
-		identifier: parsed.trigger.identifier,
-		createdAtMs: parsed.createdAtMs,
-		status: "active",
-		title,
-		task: parsed
-	}).onConflictDoNothing();
-	const existing = await getEventAutomation(db, parsed.id);
-	if (!existing) return {
-		...parsed,
-		status: "active",
-		...title ? { title } : void 0
-	};
-	if (existing.status !== "deleted") return existing;
-	const rows = await db.update(juniorEventAutomations).set({
-		teamId: parsed.destination.teamId,
-		namespace: parsed.trigger.namespace,
-		identifier: parsed.trigger.identifier,
-		status: "active",
-		title,
-		task: parsed
-	}).where(and(eq(juniorEventAutomations.id, parsed.id), eq(juniorEventAutomations.status, "deleted"))).returning({
-		status: juniorEventAutomations.status,
-		task: juniorEventAutomations.task,
-		title: juniorEventAutomations.title
+	return db.transaction(async (tx) => {
+		const inserted = await tx.insert(juniorEventAutomations).values({
+			id: parsed.id,
+			teamId: parsed.destination.teamId,
+			namespace: parsed.trigger.namespace,
+			identifier: parsed.trigger.identifier,
+			createdAtMs: parsed.createdAtMs,
+			status: "active",
+			title,
+			task: parsed
+		}).onConflictDoNothing().returning({
+			status: juniorEventAutomations.status,
+			task: juniorEventAutomations.task,
+			title: juniorEventAutomations.title
+		});
+		if (inserted[0]) {
+			const created = parseEventAutomationRow(inserted[0]);
+			await recordAutomationVersion(tx, "event", created, void 0);
+			return created;
+		}
+		const existing = await getEventAutomation(tx, parsed.id);
+		if (!existing) return {
+			...parsed,
+			status: "active",
+			...title ? { title } : void 0
+		};
+		if (existing.status !== "deleted") return existing;
+		const rows = await tx.update(juniorEventAutomations).set({
+			teamId: parsed.destination.teamId,
+			namespace: parsed.trigger.namespace,
+			identifier: parsed.trigger.identifier,
+			status: "active",
+			title,
+			task: parsed
+		}).where(and(eq(juniorEventAutomations.id, parsed.id), eq(juniorEventAutomations.status, "deleted"))).returning({
+			status: juniorEventAutomations.status,
+			task: juniorEventAutomations.task,
+			title: juniorEventAutomations.title
+		});
+		if (!rows[0]) return await getEventAutomation(tx, parsed.id) ?? {
+			...parsed,
+			status: "active",
+			...title ? { title } : void 0
+		};
+		const revived = parseEventAutomationRow(rows[0]);
+		await recordAutomationVersion(tx, "event", revived, void 0);
+		return revived;
 	});
-	return rows[0] ? parseEventAutomationRow(rows[0]) : await getEventAutomation(db, parsed.id) ?? {
-		...parsed,
-		status: "active",
-		...title ? { title } : void 0
-	};
 }
-/** Replace an existing non-deleted event automation. */
-async function saveEventAutomation(db, task, expectedRevision) {
-	if (expectedRevision !== void 0) return db.transaction(async (tx) => {
-		const rows = await tx.select().from(juniorEventAutomations).where(eq(juniorEventAutomations.id, task.id)).for("update");
-		requireAutomationRevision(rows[0] ? parseEventAutomationRow(rows[0]) : void 0, expectedRevision);
-		return saveEventAutomation(tx, task);
-	});
+/**
+* Replace an existing non-deleted event automation under a row lock.
+* Pass `editedBy` when a person changes the definition so its version names them.
+*/
+async function saveEventAutomation(db, task, expectedRevision, editedBy) {
 	const parsed = eventAutomationSchema.parse(eventAutomationJsonPayload(task));
 	const title = task.title?.trim() || null;
-	const rows = await db.update(juniorEventAutomations).set({
-		namespace: parsed.trigger.namespace,
-		identifier: parsed.trigger.identifier,
-		title,
-		task: parsed
-	}).where(and(eq(juniorEventAutomations.id, parsed.id), activeEventAutomationWhere())).returning({
-		status: juniorEventAutomations.status,
-		task: juniorEventAutomations.task,
-		title: juniorEventAutomations.title
+	return db.transaction(async (tx) => {
+		const rows = await tx.select({
+			status: juniorEventAutomations.status,
+			task: juniorEventAutomations.task,
+			title: juniorEventAutomations.title
+		}).from(juniorEventAutomations).where(eq(juniorEventAutomations.id, parsed.id)).for("update");
+		const current = rows[0] ? parseEventAutomationRow(rows[0]) : void 0;
+		if (expectedRevision !== void 0) requireAutomationRevision(current, expectedRevision);
+		if (!current || current.status === "deleted") return void 0;
+		const saved = parseEventAutomationRow((await tx.update(juniorEventAutomations).set({
+			namespace: parsed.trigger.namespace,
+			identifier: parsed.trigger.identifier,
+			title,
+			task: parsed
+		}).where(eq(juniorEventAutomations.id, parsed.id)).returning({
+			status: juniorEventAutomations.status,
+			task: juniorEventAutomations.task,
+			title: juniorEventAutomations.title
+		}))[0]);
+		await recordAutomationVersion(tx, "event", saved, current, editedBy);
+		return saved;
 	});
-	return rows[0] ? parseEventAutomationRow(rows[0]) : void 0;
 }
 /** Mark one existing event automation deleted while retaining the row for history. */
 async function deleteEventAutomation(db, id) {
@@ -10697,7 +10885,7 @@ function createEventAutomationTool(context, catalog) {
 		executionMode: "sequential",
 		description: "Create a durable event automation in the active Slack channel or DM, never a thread. It executes the supplied instruction for every matching event. Use for whenever-this-happens-do-X automation; ordinary watch, notify, or tell-me-when requests use watchEvents instead. The automation may use the creator's connected credentials. Prefer a subscribable tool result when available.",
 		inputSchema: z.object({
-			instruction: z.string().trim().min(1).max(4e3),
+			instruction: automationInstructionToolSchema,
 			title: z.string().trim().min(1).max(60).nullable().describe("Optional short display title. Omit or use null to generate one from the task instruction.").optional(),
 			trigger,
 			outcomes: z.array(taskOutcomeInputSchema).max(5).describe("Successful work is silent by default. Omit this field or use an empty list when the Automation should act through tools without a status message. Add send_message only when the user asks for a notification, post, digest, summary, or other visible result.").optional(),
@@ -10908,7 +11096,7 @@ function createUpdateEventAutomationTool(context, catalog) {
 		inputSchema: z.object({
 			automationId: z.string().min(1),
 			title: automationTitleSchema.optional(),
-			instruction: automationInstructionSchema.nullable().optional(),
+			instruction: automationInstructionToolSchema.nullable().optional(),
 			trigger: registeredEventAutomationTriggerSchema(catalog).nullable().optional(),
 			outcomes: z.array(taskOutcomeInputSchema).max(5).nullable().describe("Replacement messages to send after successful work. Use an empty list to send nothing. Omit or use null to leave unchanged.").optional(),
 			credentialMode: z.enum(["system", "creator"]).nullable().describe("Set creator to make the task's original creator credentials available, or system to disable them. Creator always means the task's createdBy actor, never the current requester. Only that original creator may enable creator mode. Omit or use null to leave unchanged.").optional()
@@ -10936,7 +11124,11 @@ function createUpdateEventAutomationTool(context, catalog) {
 				outcomes: input.outcomes ?? void 0,
 				credentialMode: input.credentialMode ?? void 0
 			}, isCreator, catalog);
-			const saved = await saveEventAutomation(getDb(), next, automationRevision(current));
+			const saved = await saveEventAutomation(getDb(), next, automationRevision(current), {
+				slackUserId: actor.userId,
+				...actor.fullName ? { fullName: actor.fullName } : void 0,
+				...actor.userName ? { userName: actor.userName } : void 0
+			});
 			if (!saved) throw new ToolInputError("Event automation was not found.");
 			return eventAutomationToolResult(context.conversationId, saved, catalog, actor.userId);
 		}
@@ -11090,10 +11282,11 @@ async function listScheduledAutomations(db) {
 async function listScheduledAutomationsForTeam(db, teamId) {
 	return await readListedScheduledAutomations(db, teamId);
 }
-async function writeScheduledAutomation(db, task, current) {
+async function writeScheduledAutomation(db, task, current, editedBy) {
 	if (current?.status === "blocked" && task.status === "active" && typeof task.nextRunAtMs === "number" && Number.isFinite(task.nextRunAtMs)) await db.delete(juniorSchedulerRuns).where(and(eq(juniorSchedulerRuns.id, scheduledRunId(task.id, task.nextRunAtMs)), eq(juniorSchedulerRuns.status, "blocked")));
 	if (task.status === "deleted" && current?.status !== "deleted") await skipPendingRunsForDeletedTask(db, task);
 	await upsertScheduledAutomation(db, task);
+	await recordAutomationVersion(db, "scheduled", task, current, editedBy);
 }
 async function skipPendingRunsForDeletedTask(db, task) {
 	const errorMessage = `Scheduled automation ${task.id} was deleted before the run started.`;
@@ -11123,13 +11316,16 @@ async function createScheduledAutomation(db, task) {
 		return next;
 	});
 }
-/** Save a scheduled automation and clear its blocked occurrence on reactivation. */
-async function saveScheduledAutomation(db, task, expectedRevision) {
+/**
+* Save a scheduled automation and clear its blocked occurrence on reactivation.
+* Pass `editedBy` when a person changes the definition so its version names them.
+*/
+async function saveScheduledAutomation(db, task, expectedRevision, editedBy) {
 	const next = requireStoredTask(task);
 	await withScheduledAutomationLock(db, task.id, async (tx) => {
 		const current = await readScheduledAutomation(tx, task.id);
 		if (expectedRevision !== void 0) requireAutomationRevision(current, expectedRevision);
-		await writeScheduledAutomation(tx, next, current);
+		await writeScheduledAutomation(tx, next, current, editedBy);
 	});
 	return next;
 }
@@ -11174,6 +11370,76 @@ function logScheduledAutomationRunSkipped(task, run, extras = {}) {
 	logInfo("scheduled_automation.run.skipped", scheduledAutomationRunAttributes(task, run, extras));
 }
 //#endregion
+//#region src/chat/slack/user.ts
+const slackUserInfoSchema = z.object({
+	ok: z.literal(true),
+	user: z.object({
+		name: z.string().nullish(),
+		tz: z.string().nullish(),
+		profile: z.object({
+			email: z.string().nullish(),
+			real_name: z.string().nullish()
+		}).optional()
+	})
+});
+const USER_CACHE_TTL_MS = 3e5;
+const userCache = /* @__PURE__ */ new Map();
+function userCacheKey(teamId, userId) {
+	return `${teamId}:${userId}`;
+}
+function readFromCache(teamId, userId) {
+	const hit = userCache.get(userCacheKey(teamId, userId));
+	if (!hit) return null;
+	if (hit.expiresAt < Date.now()) {
+		userCache.delete(userCacheKey(teamId, userId));
+		return null;
+	}
+	return hit.value;
+}
+function writeToCache(teamId, userId, value) {
+	userCache.set(userCacheKey(teamId, userId), {
+		value,
+		expiresAt: Date.now() + USER_CACHE_TTL_MS
+	});
+}
+/** Fetch Slack user profile info with in-memory TTL cache to avoid repeated API calls. */
+async function lookupSlackUser(teamId, userId) {
+	if (!teamId || !userId) return null;
+	const cached = readFromCache(teamId, userId);
+	if (cached) return cached;
+	const token = getSlackBotToken();
+	if (!token) return null;
+	try {
+		const response = await fetch(`https://slack.com/api/users.info?user=${encodeURIComponent(userId)}`, { headers: { authorization: `Bearer ${token}` } });
+		if (!response.ok) {
+			logWarn("slack.user.lookup.failed", {
+				"enduser.id": userId,
+				"app.slack.team_id": teamId,
+				"http.response.status_code": response.status
+			});
+			return null;
+		}
+		const parsed = slackUserInfoSchema.safeParse(await response.json());
+		if (!parsed.success) return null;
+		const payload = parsed.data;
+		const result = {
+			userName: payload.user.name?.trim() || void 0,
+			fullName: payload.user.profile?.real_name?.trim() || void 0,
+			email: payload.user.profile?.email?.trim() || void 0,
+			timezone: payload.user.tz?.trim() || void 0
+		};
+		writeToCache(teamId, userId, result);
+		return result;
+	} catch (error) {
+		logWarn("slack.user.lookup.failed", {
+			"enduser.id": userId,
+			"app.slack.team_id": teamId,
+			"exception.message": error instanceof Error ? error.message : String(error)
+		});
+		return null;
+	}
+}
+//#endregion
 //#region src/chat/scheduled-automations/identity.ts
 const SLACK_USER_ID_PATTERN = /^[UW][A-Z0-9]{5,}$/;
 function clean(value) {
@@ -11425,6 +11691,19 @@ function normalizeStatus(value) {
 function getDefaultScheduleTimezone() {
 	return process.env.JUNIOR_TIMEZONE?.trim() || DEFAULT_SCHEDULE_TIMEZONE;
 }
+/**
+* Pick the timezone for a new schedule when the user names none: the
+* creator's Slack profile, then the saved user timezone, then the install
+* default. A valid Slack timezone is saved on the linked user.
+*/
+async function resolveCreatorScheduleTimezone(args) {
+	const timezone = (await lookupSlackUser(args.teamId, args.slackUserId))?.timezone;
+	if (timezone && isValidTimeZone$1(timezone)) {
+		if (args.userId) await saveUserTimezone(args.db, args.userId, timezone, args.nowMs);
+		return timezone;
+	}
+	return (args.userId ? await readUserTimezone(args.db, args.userId) : void 0) ?? getDefaultScheduleTimezone();
+}
 //#endregion
 //#region src/chat/scheduled-automations/tools/create.ts
 /** Create a tool that stores a scheduled automation for the active Slack context. */
@@ -11440,7 +11719,7 @@ function createSlackScheduleCreateAutomationTool(context) {
 		description: "Create a one-time or recurring Junior task in the active Slack channel. Store the requested future work; do not perform it or check its service access now unless the user also asks for that.",
 		executionMode: "sequential",
 		inputSchema: z.object({
-			instruction: z.string().min(1).max(4e3).describe("Work to perform when the task runs. Preserve the user's scope, targets, and constraints. Do not add permissions or side effects the user did not request."),
+			instruction: automationInstructionToolSchema,
 			title: z.string().trim().min(1).max(60).nullable().describe("Optional short display title. Omit or use null to generate one from the task instruction.").optional(),
 			schedule: scheduleIntentSchema.describe("When the task runs. The scheduler computes the exact next run from this intent and the server clock."),
 			outcomes: z.array(taskOutcomeInputSchema).max(5).describe("Successful work is silent by default. Omit this field or use an empty list when the Automation should act through tools without a status message. Add send_message only when the user asks for a reminder, post, digest, summary, or other visible result.").optional(),
@@ -11467,13 +11746,21 @@ function createSlackScheduleCreateAutomationTool(context) {
 				if (!sameDestination(existing, destination) || existing.createdBy.slackUserId !== actor.slackUserId) throwToolInputError("Scheduled automation operation identity is invalid.");
 				return scheduleAutomationToolResult(context.conversationId, existing, actor.slackUserId);
 			}
-			const identity = (await context.users.resolveActor())?.identity;
+			const creator = await context.users.resolveActor();
+			const identity = creator?.identity;
 			if (!identity || identity.provider !== "slack" || identity.providerTenantId !== destination.teamId || identity.providerSubjectId !== actor.slackUserId) throwToolInputError("Scheduled automation creator identity is unavailable.");
 			const nowMs = context.now?.() ?? Date.now();
+			const defaultTimezone = input.schedule.timezone ?? await resolveCreatorScheduleTimezone({
+				db,
+				nowMs,
+				slackUserId: actor.slackUserId,
+				teamId: destination.teamId,
+				...creator.user ? { userId: creator.user.id } : void 0
+			});
 			let compiled;
 			try {
 				compiled = compileScheduleIntent({
-					defaultTimezone: getDefaultScheduleTimezone(),
+					defaultTimezone,
 					intent: input.schedule,
 					nowMs
 				});
@@ -11730,7 +12017,7 @@ function createSlackScheduleUpdateAutomationTool(context) {
 		inputSchema: z.object({
 			automationId: z.string().min(1).describe("Scheduled automation ID returned by slackScheduleListAutomations."),
 			title: automationTitleSchema.optional(),
-			instruction: automationInstructionSchema.optional(),
+			instruction: automationInstructionToolSchema.optional(),
 			schedule: scheduleIntentSchema.describe("Complete replacement schedule. Omit to keep it unchanged.").nullable().optional(),
 			outcomes: z.array(taskOutcomeInputSchema).max(5).describe("Replacement messages to send after successful work. Use an empty list to send nothing. Omit to keep unchanged.").optional(),
 			status: z.enum(["active", "blocked"]).describe("Set active to resume a blocked task, or blocked to stop dispatch.").optional(),
@@ -11777,7 +12064,7 @@ function createSlackScheduleUpdateAutomationTool(context) {
 				next.outcomes = input.outcomes === void 0 ? moveTaskOutcomes(lookup.outcomes, lookup.destination, requestedDestination) : await resolveTaskOutcomes(input.outcomes, requestedDestination, lookup.createdBy.slackUserId);
 			}
 			if (!changingDestination && !instructionChanged && !input.schedule && input.title === void 0 && status === void 0 && (input.credentialMode === void 0 || input.credentialMode === null || input.credentialMode === lookup.credentialMode) && input.outcomes === void 0 && moveDestination) return scheduleAutomationToolResult(context.conversationId, lookup, actor.slackUserId);
-			const committed = await saveScheduledAutomation(db, next, automationRevision(lookup));
+			const committed = await saveScheduledAutomation(db, next, automationRevision(lookup), actor);
 			if (changingDestination) logInfo("scheduled_automation.move.completed", scheduledAutomationAttributes(committed));
 			return scheduleAutomationToolResult(context.conversationId, committed, actor.slackUserId);
 		}
@@ -14651,9 +14938,6 @@ function explicitUserLookupError(error) {
 	if (error.code === "invalid_arguments") return `Slack rejected the user lookup arguments (${error.apiError ?? error.code}).`;
 	if (error.code === "feature_unavailable") return "User lookup is not available for this workspace or app installation.";
 }
-function slackMention(userId) {
-	return `<@${userId}>`;
-}
 function asMatch(user) {
 	return {
 		...user,
@@ -17617,6 +17901,36 @@ function createSearchToolsTool(catalogTools) {
 }
 //#endregion
 //#region src/chat/tool-support/pi-tool-adapter.ts
+/**
+* How long a preempted tool may take to return its own aborted result. Keep it
+* below the agent's abort settle grace, so the parked turn sees the result.
+*/
+const TOOL_ABORT_SETTLE_GRACE_MS = 2e3;
+/**
+* Stop waiting for a tool shortly after the host preempts it. A tool that
+* ignores the signal must not hold the turn past its deadline, or the parked
+* turn loses the attempt. Work that keeps running is detached; its outcome is
+* unknown.
+*/
+async function untilPreempted(work, signal) {
+	if (!signal) return await work;
+	let timer;
+	let onAbort = () => {};
+	const preempted = new Promise((_, reject) => {
+		onAbort = () => {
+			timer = setTimeout(() => reject(signal.reason), TOOL_ABORT_SETTLE_GRACE_MS);
+		};
+		if (signal.aborted) onAbort();
+		else signal.addEventListener("abort", onAbort, { once: true });
+	});
+	try {
+		return await Promise.race([work, preempted]);
+	} finally {
+		clearTimeout(timer);
+		signal.removeEventListener("abort", onAbort);
+		work.catch(() => void 0);
+	}
+}
 /** Wrap tool definitions into Pi Agent tool objects with logging, validation, and sandbox execution. */
 function createPiAgentTools(tools, sandbox, spanContext, onStatus, sandboxTools, pluginAuthOrchestration, onToolCall, agentHooks, conversationPrivacy, onToolResult, actionReview) {
 	const plannedTools = planToolExposure(tools);
@@ -17678,17 +17992,17 @@ function createPiAgentTools(tools, sandbox, spanContext, onStatus, sandboxTools,
 		}
 		const sandboxInput = buildSandboxInput(toolName, executionInput);
 		const isSandbox = Boolean(sandboxTools?.supports(toolName));
-		const result = isSandbox ? await sandboxTools.execute({
+		const result = await untilPreempted(isSandbox ? sandboxTools.execute({
 			toolName,
 			input: sandboxInput,
 			...signal ? { signal } : void 0,
 			...toolName === "grep" || toolName === "findFiles" ? { setToolCallSpanAttributes: setSpanAttributes } : void 0
-		}) : await toolDef.execute(executionInput, {
+		}) : Promise.resolve(toolDef.execute(executionInput, {
 			experimental_context: sandbox,
 			...signal ? { signal } : void 0,
 			conversationPrivacy: effectiveConversationPrivacy,
 			toolCallId
-		});
+		})), signal);
 		const normalized = normalizeToolResult(result, {
 			requireStructuredResult: Boolean(toolDef.outputSchema),
 			toolName
@@ -18068,17 +18382,24 @@ function clientAllowsRedirectUri(clientInformation, callbackUrl) {
 	if (!Array.isArray(redirectUris)) return true;
 	return redirectUris.includes(callbackUrl);
 }
+function requireEnv(name) {
+	const value = process.env[name]?.trim();
+	if (!value) throw new Error(`MCP OAuth client env var ${name} is unset`);
+	return value;
+}
 var StateBackedMcpOAuthClientProvider = class {
 	authSessionId;
 	callbackUrl;
 	sessionContext;
 	runCredentialMutation;
+	oauthClient;
 	clientMetadata;
-	constructor(authSessionId, callbackUrl, sessionContext, runCredentialMutation) {
+	constructor(authSessionId, callbackUrl, sessionContext, runCredentialMutation, oauthClient) {
 		this.authSessionId = authSessionId;
 		this.callbackUrl = callbackUrl;
 		this.sessionContext = sessionContext;
 		this.runCredentialMutation = runCredentialMutation;
+		this.oauthClient = oauthClient;
 		this.clientMetadata = createClientMetadata(callbackUrl);
 	}
 	get redirectUrl() {
@@ -18088,6 +18409,10 @@ var StateBackedMcpOAuthClientProvider = class {
 		return this.authSessionId;
 	}
 	async clientInformation() {
+		if (this.oauthClient) return {
+			client_id: requireEnv(this.oauthClient.clientIdEnv),
+			client_secret: requireEnv(this.oauthClient.clientSecretEnv)
+		};
 		const session = await this.getCredentialContext();
 		const clientInformation = (await getMcpStoredOAuthCredentials(session.userId, session.provider))?.clientInformation;
 		if (!clientInformation) return;
@@ -18118,6 +18443,8 @@ var StateBackedMcpOAuthClientProvider = class {
 		});
 	}
 	async redirectToAuthorization(authorizationUrl) {
+		if (this.oauthClient?.scope) authorizationUrl.searchParams.set("scope", this.oauthClient.scope);
+		for (const [key, value] of Object.entries(this.oauthClient?.authorizeParams ?? {})) authorizationUrl.searchParams.set(key, value);
 		const existing = await getMcpAuthSession(this.authSessionId);
 		if (existing?.authorizationUrl && existing.authorizationUrl !== authorizationUrl.toString()) throw new Error("MCP OAuth authorization attempt is already initialized");
 		await this.ensureSession({ authorizationUrl: authorizationUrl.toString() });
@@ -18211,7 +18538,7 @@ function requirePluginWithMcp(provider) {
 }
 /** Create one immutable provider authorization attempt for the active turn. */
 async function createMcpOAuthClientProvider(input) {
-	requirePluginWithMcp(input.provider);
+	const plugin = requirePluginWithMcp(input.provider);
 	const baseUrl = resolveBaseUrl();
 	if (!baseUrl) throw new Error("Cannot determine base URL (set JUNIOR_BASE_URL or deploy to Vercel)");
 	return new StateBackedMcpOAuthClientProvider(input.createAuthorizationState ? await input.createAuthorizationState() : randomUUID(), `${baseUrl}${getMcpOAuthCallbackPath(input.provider)}`, {
@@ -18226,7 +18553,7 @@ async function createMcpOAuthClientProvider(input) {
 		...input.threadTs ? { threadTs: input.threadTs } : void 0,
 		...input.toolChannelId ? { toolChannelId: input.toolChannelId } : void 0,
 		...input.configuration ? { configuration: input.configuration } : void 0
-	});
+	}, void 0, plugin.manifest.mcp?.oauthClient);
 }
 /** Exchange a callback code while guarding every shared credential mutation. */
 async function finalizeMcpAuthorization(provider, authSessionId, authorizationCode, runCredentialMutation) {
@@ -18237,7 +18564,7 @@ async function finalizeMcpAuthorization(provider, authSessionId, authorizationCo
 	if (session.provider !== provider) throw new Error(`MCP auth session provider mismatch: expected "${provider}", got "${session.provider}"`);
 	const baseUrl = resolveBaseUrl();
 	if (!baseUrl) throw new Error("Cannot determine base URL (set JUNIOR_BASE_URL or deploy to Vercel)");
-	const authProvider = new StateBackedMcpOAuthClientProvider(authSessionId, `${baseUrl}${getMcpOAuthCallbackPath(provider)}`, void 0, runCredentialMutation);
+	const authProvider = new StateBackedMcpOAuthClientProvider(authSessionId, `${baseUrl}${getMcpOAuthCallbackPath(provider)}`, void 0, runCredentialMutation, mcp.oauthClient);
 	const headers = mcp.headers ? resolvePluginHeaderEnvRefs(provider, mcp.headers, "MCP header") : void 0;
 	let providerStatus;
 	const transport = new StreamableHTTPClientTransport(new URL(mcp.url), {
@@ -18431,6 +18758,10 @@ function defaultGrantForProvider(input) {
 		}
 	};
 }
+function hasGenericCredentials(provider) {
+	const manifest = pluginCatalogRuntime.getDefinition(provider)?.manifest;
+	return Boolean(manifest?.credentials || manifest?.apiHeaders);
+}
 function oauthAuthorizationForProvider(provider) {
 	const oauth = pluginCatalogRuntime.getOAuthConfig(provider);
 	return oauth ? {
@@ -18453,6 +18784,8 @@ function assertLeaseTransformsOwnedByProvider(provider, lease) {
 *
 * GitHub GraphQL and other plugin-owned APIs may need body-aware grant choices;
 * providers without hooks use a simple read/write default based on HTTP method.
+* A hook plugin that also declares generic credentials can return no grant to
+* use that default for one request.
 */
 async function selectSandboxEgressGrant(input) {
 	if (!hasEgressCredentialHooks(input.provider)) return defaultGrantForProvider(input);
@@ -18463,7 +18796,10 @@ async function selectSandboxEgressGrant(input) {
 		method: input.method,
 		upstreamUrl: input.upstreamUrl
 	});
-	if (!pluginGrant) throw new Error(`Plugin "${input.provider}" grantForEgress must return a grant for sandbox egress`);
+	if (!pluginGrant) {
+		if (hasGenericCredentials(input.provider)) return defaultGrantForProvider(input);
+		throw new Error(`Plugin "${input.provider}" grantForEgress must return a grant for sandbox egress`);
+	}
 	return {
 		source: "plugin",
 		grant: pluginGrant
@@ -21476,7 +21812,7 @@ function createAgentRunner(execute, options) {
 			} } : void 0
 		};
 		if (run.instruction.storedAttachments?.length) {
-			const { loadInputImages } = await import("./images-CEXcQ0Id.js").then((n) => n.n);
+			const { loadInputImages } = await import("./images-D6Y3FJDQ.js").then((n) => n.n);
 			const storage = nextRun.environment?.attachmentStorage;
 			if (!storage) throw new Error("Attachment storage is unavailable.");
 			nextRun.instruction = {
@@ -21527,4 +21863,4 @@ async function runAgentWithTimeout(agentRunner, run, timeoutMs) {
 	}
 }
 //#endregion
-export { deleteEventAutomation as $, isFinalAttempt as $t, requestAttachmentDeletion as A, actorFromRun as An, clearExpiredConversationLease as At, listScheduledAutomations as B, listActiveConversationIds as Bt, isExperimentalFeatureEnabled as C, postSlackMessage as Cn, ackMessages as Ct, renderBlockText as D, createUserTokenStore as Dn, cancelHumanFacingPendingMessages as Dt, renderAttachmentText as E, slackExternalRefIdSchema as En, beginConversationResume as Et, resolveSlackChannelIdFromThreadId as F, setConfigDefaults as Fn, drainConversationMailbox as Ft, saveScheduledAutomationInLock as G, requestAnotherSlice as Gt, parseScheduledAutomationRow as H, recordConversationRetry as Ht, listThreadReplies as I, ensureConversationWake as It, editEventAutomation as J, stopConversationWork as Jt, scheduledRunId as K, requestConversationWork as Kt, editScheduledAutomation as L, getConversation as Lt, parseSlackThreadId as M, AuthorizationFlowDisabledError as Mn, completeConversationWork as Mt, readSlackRawMessageContext as N, shouldEmitDevAgentTrace as Nn, countPendingConversationMessages as Nt, collectAttachmentGarbage as O, buildSteeringPiMessage as On, checkInConversationWork as Ot, resolveSlackChannelIdFromMessage as P, getConfigDefaults as Pn, deadLetterAttempt as Pt, collectEventAutomationMatchKeys as Q, hasRunnableConversationWork$1 as Qt, logScheduledAutomationRunSkipped as R, getConversationWorkState as Rt, getExperimentalFeatures as S, addReactionToMessage as Sn, pluginEventCatalog as St, lookupSlackUserProfile as T, slackEntitySchema as Tn, appendAndEnqueueInboundMessage as Tt, readScheduledAutomation as U, releaseConversationWork as Ut, listScheduledAutomationsForTeam as V, recordAttemptFailure as Vt, saveScheduledAutomation as W, removeActiveConversation as Wt, eventAutomationTriggerAvailable as X, CONVERSATION_WORK_STALE_ENQUEUE_MS as Xt, AutomationEditError as Y, CONVERSATION_WORK_CHECK_IN_INTERVAL_MS as Yt, effectiveTaskOutcomes as Z, hasConversationStop as Zt, resolvePluginOAuthAccount as _, escapeSlackMrkdwnText as _n, ingestEvent as _t, executeCredentialedEgressRequest as a, normalizeSandboxEgressTracePropagationDomains as an, saveEventAutomation as at, unpublishedArtifactHeaders as b, normalizeSlackStatusText as bn, getEventCatalog as bt, deleteMcpAuthSessionsForUserProvider as c, clearSandboxEgressSignals as cn, automationRevision as ct, getMcpAuthSession as d, parseSandboxEgressCredentialToken as dn, agentInvocationSchema as dt, isInvalidConversationRecordError as en, eventAutomationBelongsToUser as et, getMcpStoredOAuthCredentials as f, sandboxEgressSignalsResponseSchema as fn, createAgentInvocationSchema as ft, readStats as g, startOAuthFlow as gn, processWorkspaceSnapshotJob as gt, latestProgressStatus as h, resolveBaseUrl as hn, getMcpProviderErrorAttributes as ht, createContextCompactor as i, resolveSandboxEgressProviderForHost as in, parseEventAutomationRow as it, storeAttachment as j, toolInvocationDestination as jn, completeConversationStop as jt, readLiveAttachment as k, RetryableDeliveryError as kn, clearConsumedConversationWake as kt, deleteMcpServerSessionId as l, consumeSandboxEgressAuthRequiredSignal as ln, requireAutomationRevision as lt, PluginCredentialFailureError as m, parseOAuthStatePayload as mn, AgentInvocationLimitError as mt, runAgentWithTimeout as n, maybePostAutomatedTurnLimitNotice as nn, getEventAutomation as nt, finalizeMcpAuthorization as o, shouldPropagateSandboxEgressTrace as on, setEventAutomationStatus as ot, putMcpStoredOAuthCredentials as p, formatProviderLabel as pn, AgentInvocationBusyError as pt, withScheduledAutomationLock as q, startConversationWork as qt, executeAgentRun as r, recordFinishedTurnForAutomatedLimit as rn, listDeletedEventAutomationsCreatedBy as rt, deleteMcpAuthSession as s, SANDBOX_EGRESS_PROXY_PATH as sn, AutomationConflictError as st, createAgentRunner as t, renderTaskInput as tn, findMatchingEventAutomations as tt, deleteMcpStoredOAuthCredentials as u, consumeSandboxEgressPermissionDeniedSignal as un, agentBindingSchema as ut, publicArtifactHeaders as v, formatSlackLink as vn, EVENT_WAIT_MS as vt, setExperimentalFeatures as w, removeReactionFromMessage as wn, appendAndEnqueueExclusiveInboundMessage as wt, experimental_exports as x, truncateStatusText as xn, eventGuidance as xt, readPublicArtifact as y, normalizeSlackReplyMarkdown as yn, isEventMailboxMetadata as yt, scheduledAutomationRunAttributes as z, hasRunnableConversationWork as zt };
+export { effectiveTaskOutcomes as $, requestConversationWork as $t, requestAttachmentDeletion as A, addReactionToMessage as An, ackMessages as At, logScheduledAutomationRunSkipped as B, AuthorizationFlowDisabledError as Bn, countPendingConversationMessages as Bt, isExperimentalFeatureEnabled as C, startOAuthFlow as Cn, processWorkspaceSnapshotJob as Ct, renderBlockText as D, normalizeSlackStatusText as Dn, getEventCatalog as Dt, renderAttachmentText as E, normalizeSlackReplyMarkdown as En, isEventMailboxMetadata as Et, resolveSlackChannelIdFromThreadId as F, createUserTokenStore as Fn, checkInConversationWork as Ft, readScheduledAutomation as G, getConversationWorkState as Gt, listScheduledAutomations as H, getConfigDefaults as Hn, drainConversationMailbox as Ht, getConversationInfo as I, buildSteeringPiMessage as In, clearConsumedConversationWake as It, scheduledRunId as J, recordAttemptFailure as Jt, saveScheduledAutomation as K, hasRunnableConversationWork as Kt, listThreadReplies as L, RetryableDeliveryError as Ln, clearExpiredConversationLease as Lt, parseSlackThreadId as M, removeReactionFromMessage as Mn, appendAndEnqueueInboundMessage as Mt, readSlackRawMessageContext as N, slackEntitySchema as Nn, beginConversationResume as Nt, collectAttachmentGarbage as O, slackMention as On, eventGuidance as Ot, resolveSlackChannelIdFromMessage as P, slackExternalRefIdSchema as Pn, cancelHumanFacingPendingMessages as Pt, eventAutomationTriggerAvailable as Q, requestAnotherSlice as Qt, editScheduledAutomation as R, actorFromRun as Rn, completeConversationStop as Rt, getExperimentalFeatures as S, resolveBaseUrl as Sn, getMcpProviderErrorAttributes as St, lookupSlackUserProfile as T, formatSlackLink as Tn, EVENT_WAIT_MS as Tt, listScheduledAutomationsForTeam as U, setConfigDefaults as Un, ensureConversationWake as Ut, scheduledAutomationRunAttributes as V, shouldEmitDevAgentTrace as Vn, deadLetterAttempt as Vt, parseScheduledAutomationRow as W, getConversation as Wt, editEventAutomation as X, releaseConversationWork as Xt, withScheduledAutomationLock as Y, recordConversationRetry as Yt, AutomationEditError as Z, removeActiveConversation as Zt, resolvePluginOAuthAccount as _, consumeSandboxEgressPermissionDeniedSignal as _n, agentBindingSchema as _t, executeCredentialedEgressRequest as a, hasRunnableConversationWork$1 as an, getEventAutomation as at, unpublishedArtifactHeaders as b, formatProviderLabel as bn, AgentInvocationBusyError as bt, deleteMcpAuthSessionsForUserProvider as c, renderTaskInput as cn, saveEventAutomation as ct, getMcpAuthSession as d, resolveSandboxEgressProviderForHost as dn, listAutomationVersions as dt, startConversationWork as en, resolveTaskOutcomes as et, getMcpStoredOAuthCredentials as f, normalizeSandboxEgressTracePropagationDomains as fn, readAutomationVersion as ft, readStats as g, consumeSandboxEgressAuthRequiredSignal as gn, requireAutomationRevision as gt, latestProgressStatus as h, clearSandboxEgressSignals as hn, automationRevision as ht, createContextCompactor as i, hasConversationStop as in, findMatchingEventAutomations as it, storeAttachment as j, postSlackMessage as jn, appendAndEnqueueExclusiveInboundMessage as jt, readLiveAttachment as k, truncateStatusText as kn, pluginEventCatalog as kt, deleteMcpServerSessionId as l, maybePostAutomatedTurnLimitNotice as ln, setEventAutomationStatus as lt, PluginCredentialFailureError as m, SANDBOX_EGRESS_PROXY_PATH as mn, AutomationConflictError as mt, runAgentWithTimeout as n, CONVERSATION_WORK_CHECK_IN_INTERVAL_MS as nn, deleteEventAutomation as nt, finalizeMcpAuthorization as o, isFinalAttempt as on, listDeletedEventAutomationsCreatedBy as ot, putMcpStoredOAuthCredentials as p, shouldPropagateSandboxEgressTrace as pn, sameDefinitionValue as pt, saveScheduledAutomationInLock as q, listActiveConversationIds as qt, executeAgentRun as r, CONVERSATION_WORK_STALE_ENQUEUE_MS as rn, eventAutomationBelongsToUser as rt, deleteMcpAuthSession as s, isInvalidConversationRecordError as sn, parseEventAutomationRow as st, createAgentRunner as t, stopConversationWork as tn, collectEventAutomationMatchKeys as tt, deleteMcpStoredOAuthCredentials as u, recordFinishedTurnForAutomatedLimit as un, automationDefinition as ut, publicArtifactHeaders as v, parseSandboxEgressCredentialToken as vn, agentInvocationSchema as vt, setExperimentalFeatures as w, escapeSlackMrkdwnText as wn, ingestEvent as wt, experimental_exports as x, parseOAuthStatePayload as xn, AgentInvocationLimitError as xt, readPublicArtifact as y, sandboxEgressSignalsResponseSchema as yn, createAgentInvocationSchema as yt, lookupSlackUser as z, toolInvocationDestination as zn, completeConversationWork as zt };