@sentry/junior 0.122.1 → 0.124.0

package/dist/{chunk-LZ4XXS76.js → chunk-7S36LUYT.js}

@@ -1,7 +1,7 @@
 // package.json
 var package_default = {
   name: "@sentry/junior",
-  version: "0.122.1",
+  version: "0.124.0",
   private: false,
   publishConfig: {
     access: "public"
@@ -63,6 +63,7 @@ var package_default = {
     "test:watch": "vitest",
     typecheck: "tsc --noEmit",
     "skills:check": "node --test scripts/check-skills.test.mjs && node scripts/check-skills.mjs",
+    "tool-annotations:check": "node --test scripts/check-tool-annotations.test.mjs && node scripts/check-tool-annotations.mjs",
     "test:coverage": "vitest run --maxWorkers=4 --coverage --reporter=default --reporter=junit --outputFile.junit=coverage/results.junit.xml"
   },
   dependencies: {
@@ -86,7 +87,7 @@ var package_default = {
     chat: "4.29.0",
     commander: "^14.0.3",
     "drizzle-orm": "catalog:",
-    hono: "^4.12.22",
+    hono: "^4.12.27",
     jiti: "^2.7.0",
     jose: "^6.2.3",
     "just-bash": "3.0.1",

package/dist/{chunk-4ZV2GNHX.js → chunk-APPWCJVJ.js}

@@ -5,7 +5,7 @@ import {
   logInfo,
   logWarn,
   setSpanAttributes
-} from "./chunk-4JPJTFUH.js";
+} from "./chunk-VLAWZSCB.js";
 import {
   discoverInstalledPluginPackageContent,
   normalizePluginPackageNames

package/dist/{chunk-O2ULQJWR.js → chunk-AYQZCJZJ.js}

@@ -39,7 +39,10 @@ function activityDays(days, nowMs, count) {
 
 // src/api/schema/conversation.ts
 import { z as z2 } from "zod";
-import { conversationAnnotationInputSchema } from "@sentry/junior-plugin-api";
+import {
+  conversationAnnotationInputSchema,
+  conversationEventPresentationSchema
+} from "@sentry/junior-plugin-api";
 var conversationReportStatusSchema = z2.enum([
   "active",
   "completed",
@@ -95,6 +98,7 @@ var conversationReportMessageEventDataSchema = z2.object({
   type: z2.literal("message"),
   messageId: z2.string().min(1),
   role: z2.enum(["assistant", "system", "user"]),
+  actorIdentity: actorIdentitySchema.optional(),
   eventType: z2.string().min(1).optional(),
   text: z2.string().optional(),
   redacted: z2.literal(true).optional()
@@ -105,6 +109,12 @@ var conversationReportMessageEventDataSchema = z2.object({
       message: "message content must be text or explicitly redacted"
     });
   }
+  if (data.redacted && data.actorIdentity) {
+    context.addIssue({
+      code: "custom",
+      message: "redacted messages must not expose actor identity"
+    });
+  }
 });
 var conversationReportMessageHandledEventDataSchema = z2.object({
   type: z2.literal("message_handled"),
@@ -210,6 +220,15 @@ var conversationReportTurnRoutedEventDataSchema = z2.object({
   confidence: z2.number().min(0).max(1).optional(),
   source: z2.enum(["configured", "inherited", "router"])
 }).strict();
+var conversationReportGuardianActionReviewedEventDataSchema = z2.object({
+  type: z2.literal("guardian_action_reviewed"),
+  turnId: z2.string().min(1),
+  toolCallId: z2.string().min(1),
+  toolName: z2.string().min(1),
+  decision: z2.enum(["allow", "ask", "deny"]),
+  riskLevel: z2.enum(["low", "medium", "high", "critical"]),
+  userAuthorization: z2.enum(["high", "medium", "low", "unknown"])
+}).strict();
 var conversationReportTurnContextEventDataSchema = z2.object({
   type: z2.literal("turn_context"),
   turnId: z2.string().min(1),
@@ -218,6 +237,14 @@ var conversationReportTurnContextEventDataSchema = z2.object({
   version: z2.number().int().positive(),
   content: z2.record(z2.string(), z2.unknown())
 }).strict();
+var conversationReportStructuredEventDataSchema = z2.object({
+  type: z2.literal("structured_event"),
+  namespace: z2.string().min(1),
+  name: z2.string().min(1),
+  version: z2.number().int().positive(),
+  turnId: z2.string().min(1).optional(),
+  presentation: conversationEventPresentationSchema
+}).strict();
 var conversationReportCompactionEventDataSchema = z2.object({
   type: z2.literal("compaction"),
   modelProfile: z2.string().min(1).optional(),
@@ -258,7 +285,9 @@ var conversationReportEventDataSchema = z2.discriminatedUnion("type", [
   conversationReportToolCallsEventDataSchema,
   conversationReportTurnLifecycleEventDataSchema,
   conversationReportTurnContextEventDataSchema,
+  conversationReportStructuredEventDataSchema,
   conversationReportTurnRoutedEventDataSchema,
+  conversationReportGuardianActionReviewedEventDataSchema,
   conversationReportCompactionEventDataSchema,
   conversationReportHandoffEventDataSchema,
   conversationReportSubagentEventDataSchema
@@ -396,12 +425,29 @@ var conversationMetricDaySchema = z2.object({
   durationMs: z2.number(),
   tokens: z2.number().optional()
 }).strict();
+var guardianMetricDaySchema = z2.object({
+  allow: z2.number(),
+  ask: z2.number(),
+  costUsd: z2.number().optional(),
+  date: z2.string(),
+  deny: z2.number(),
+  requests: z2.number()
+}).strict();
+var guardianStatsSchema = z2.object({
+  allow: z2.number(),
+  ask: z2.number(),
+  costUsd: z2.number().optional(),
+  deny: z2.number(),
+  metricDays: z2.array(guardianMetricDaySchema),
+  requests: z2.number()
+}).strict();
 var conversationStatsReportSchema = z2.object({
   active: z2.number(),
   conversations: z2.number(),
   durationMs: z2.number(),
   failed: z2.number(),
   generatedAt: z2.string(),
+  guardian: guardianStatsSchema,
   metricDays: z2.array(conversationMetricDaySchema),
   locations: z2.array(conversationStatsItemSchema),
   actors: z2.array(conversationStatsItemSchema),

package/dist/{chunk-XBYNPBPQ.js → chunk-EKVBTUVM.js}

@@ -1,9 +1,9 @@
 import {
   pluginCatalogRuntime
-} from "./chunk-73TQBD5S.js";
+} from "./chunk-4HQMMFRL.js";
 import {
   logWarn
-} from "./chunk-4JPJTFUH.js";
+} from "./chunk-VLAWZSCB.js";
 import {
   skillRoots
 } from "./chunk-H4HBKISO.js";

package/dist/{chunk-VLRECFIC.js → chunk-GBIFLB5Y.js}

@@ -13,7 +13,7 @@ import {
   persistAuthPauseTurnState,
   requireTurnFailureEventId,
   scheduleSessionCompletedPluginTasks
-} from "./chunk-GPQLJDT5.js";
+} from "./chunk-PBZEJRYY.js";
 import {
   buildSentryConversationUrl
 } from "./chunk-4CODA7P5.js";
@@ -40,7 +40,7 @@ import {
   resolveBaseUrl,
   resolvePluginOAuthAccount,
   truncateStatusText
-} from "./chunk-U5PRRZMZ.js";
+} from "./chunk-WFIXN6UU.js";
 import {
   JUNIOR_THREAD_STATE_TTL_MS,
   TurnSliceLimitExceededError,
@@ -68,11 +68,12 @@ import {
   persistThreadStateById,
   persistWithRetry,
   recordAgentTurnSessionSummary,
+  recordAuthenticationLinked,
   recordAuthorizationCompleted,
   recordDeliveredAssistantMessage,
   turnHasReply,
   updateConversationStats
-} from "./chunk-BXT63TNS.js";
+} from "./chunk-WKLA6WLW.js";
 import {
   SlackActionError,
   getDashboardConversationLink,
@@ -81,19 +82,19 @@ import {
   getSlackClient,
   isDmChannel,
   normalizeSlackConversationId
-} from "./chunk-QE33ATQW.js";
+} from "./chunk-PGLSOXFU.js";
 import {
   getConversationEventStore,
   getConversationStore,
   parseDestination,
   requireSlackDestination,
   sameDestination
-} from "./chunk-M7KAZXTE.js";
+} from "./chunk-YYAQ5ZNK.js";
 import {
   acquireActiveLock,
   getDefaultRedisStateAdapterFor,
   getStateAdapter
-} from "./chunk-WFJ2EG4E.js";
+} from "./chunk-RW6MD6ZV.js";
 import {
   FUNCTION_TIMEOUT_BUFFER_SECONDS,
   botConfig,
@@ -102,7 +103,7 @@ import {
   getRuntimeMetadata,
   normalizeSlackEmojiName,
   standardModelId
-} from "./chunk-TI7SYDD4.js";
+} from "./chunk-IYUHOYFA.js";
 import {
   parseSlackThreadId,
   readSlackRawMessageContext,
@@ -111,15 +112,15 @@ import {
 } from "./chunk-S7G34U75.js";
 import {
   discoverSkills
-} from "./chunk-XBYNPBPQ.js";
+} from "./chunk-EKVBTUVM.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-73TQBD5S.js";
+} from "./chunk-4HQMMFRL.js";
 import {
   buildOAuthTokenRequest,
   hasRequiredOAuthScope,
   parseOAuthTokenResponse
-} from "./chunk-4ZV2GNHX.js";
+} from "./chunk-APPWCJVJ.js";
 import {
   createSlackResumeActor,
   isUserActor,
@@ -132,7 +133,7 @@ import {
   logWarn,
   setTags,
   withLogContext
-} from "./chunk-4JPJTFUH.js";
+} from "./chunk-VLAWZSCB.js";
 import {
   isRecord,
   toOptionalNumber,
@@ -3605,6 +3606,29 @@ async function GET(request, provider, waitUntil, options) {
         mutation
       )
     );
+    let providerLabel;
+    try {
+      providerLabel = formatProviderLabel(provider);
+    } catch {
+      providerLabel = void 0;
+    }
+    try {
+      await recordAuthenticationLinked({
+        conversationId: authSession.conversationId,
+        provider,
+        actorId: authSession.userId,
+        authorizationId: mcpAuthorizationId({
+          provider,
+          sessionId: authSession.sessionId
+        }),
+        turnId: authSession.sessionId,
+        ...providerLabel ? { providerLabel } : {}
+      });
+    } catch (error2) {
+      logException(error2, "mcp.oauth_callback.authentication_event.failed", {
+        "app.credential.provider": provider
+      });
+    }
     try {
       await deleteMcpAuthSession(authSession.authSessionId);
     } catch (cleanupError) {
@@ -4295,6 +4319,28 @@ async function GET2(request, provider, waitUntil, options) {
     ...parsedTokenResponse,
     ...account ? { account } : {}
   });
+  if (stored.resumeConversationId) {
+    try {
+      await recordAuthenticationLinked({
+        conversationId: stored.resumeConversationId,
+        provider,
+        actorId: stored.userId,
+        providerLabel,
+        ...account?.label ? { accountLabel: account.label } : {},
+        ...stored.resumeSessionId ? {
+          authorizationId: pluginAuthorizationId({
+            provider,
+            sessionId: stored.resumeSessionId
+          }),
+          turnId: stored.resumeSessionId
+        } : {}
+      });
+    } catch (error) {
+      logException(error, "oauth.callback.authentication_event.failed", {
+        "app.credential.provider": provider
+      });
+    }
+  }
   if (stored.destination?.platform !== "local") {
     waitUntil(async () => {
       try {

package/dist/{chunk-MSDKKTRG.js → chunk-HOVHXQQE.js}

@@ -2,18 +2,18 @@ import {
   SANDBOX_WORKSPACE_ROOT,
   getStateAdapter,
   sleep
-} from "./chunk-WFJ2EG4E.js";
+} from "./chunk-RW6MD6ZV.js";
 import {
   toOptionalTrimmed
-} from "./chunk-TI7SYDD4.js";
+} from "./chunk-IYUHOYFA.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-73TQBD5S.js";
+} from "./chunk-4HQMMFRL.js";
 import {
   setSpanAttributes,
   setSpanStatus,
   withSpan
-} from "./chunk-4JPJTFUH.js";
+} from "./chunk-VLAWZSCB.js";
 
 // src/chat/sandbox/snapshot/profile.ts
 import { createHash } from "crypto";

package/dist/{chunk-TI7SYDD4.js → chunk-IYUHOYFA.js}

@@ -12,7 +12,7 @@ import {
   normalizeGenAiFinishReason,
   serializeGenAiAttribute,
   withSpan
-} from "./chunk-4JPJTFUH.js";
+} from "./chunk-VLAWZSCB.js";
 
 // src/chat/config.ts
 import { getModel as getModel2 } from "@earendil-works/pi-ai/compat";
@@ -28,6 +28,7 @@ function toOptionalTrimmed(value) {
 
 // src/chat/pi/sdk.ts
 import {
+  calculateCost,
   completeSimple,
   getEnvApiKey,
   getModel,
@@ -42,7 +43,11 @@ import {
 
 // src/chat/pi/client.ts
 import { createGatewayProvider } from "@ai-sdk/gateway";
-import { embedMany, generateObject, NoObjectGeneratedError } from "ai";
+import {
+  embedMany,
+  generateObject,
+  NoObjectGeneratedError
+} from "ai";
 
 // src/chat/services/provider-error.ts
 var ProviderError = class extends Error {
@@ -176,6 +181,18 @@ function createProviderError(error, options = {}) {
 function isProviderRetryError(error) {
   return error instanceof ProviderError && error.retryable;
 }
+function findProviderError(error) {
+  const visited = /* @__PURE__ */ new Set();
+  let current = error;
+  while (current instanceof Error && !visited.has(current)) {
+    if (current instanceof ProviderError) {
+      return current;
+    }
+    visited.add(current);
+    current = current.cause;
+  }
+  return void 0;
+}
 function getProviderErrorUserMessage(error) {
   switch (error.kind) {
     case "capacity":
@@ -434,11 +451,40 @@ function logContextFromMetadata(modelId, metadata) {
     ...runId ? { runId } : {}
   };
 }
+function objectCompletionCost(modelId, usage) {
+  const cacheRead = usage.inputTokenDetails.cacheReadTokens;
+  const cacheWrite = usage.inputTokenDetails.cacheWriteTokens;
+  const input = usage.inputTokenDetails.noCacheTokens ?? (usage.inputTokens === void 0 ? void 0 : Math.max(0, usage.inputTokens - (cacheRead ?? 0) - (cacheWrite ?? 0)));
+  if (input === void 0 && usage.outputTokens === void 0 && cacheRead === void 0 && cacheWrite === void 0) {
+    return void 0;
+  }
+  return calculateCost(resolveGatewayModel(modelId), {
+    input: input ?? 0,
+    output: usage.outputTokens ?? 0,
+    cacheRead: cacheRead ?? 0,
+    cacheWrite: cacheWrite ?? 0,
+    ...usage.outputTokenDetails.reasoningTokens !== void 0 ? { reasoning: usage.outputTokenDetails.reasoningTokens } : {},
+    totalTokens: usage.totalTokens ?? (input ?? 0) + (usage.outputTokens ?? 0) + (cacheRead ?? 0) + (cacheWrite ?? 0),
+    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 }
+  }).total;
+}
+function bestEffortObjectCompletionCost(modelId, usage) {
+  try {
+    return objectCompletionCost(modelId, usage);
+  } catch (error) {
+    logWarn("ai.completion.cost_estimate.failed", {
+      "exception.message": error instanceof Error ? error.message : String(error),
+      "gen_ai.request.model": modelId
+    });
+    return void 0;
+  }
+}
 async function completeObject(params) {
   const apiKey = getGatewayApiKey();
   const provider = createGatewayProvider(apiKey ? { apiKey } : {});
+  let result;
   try {
-    const result = await withSpan(
+    result = await withSpan(
       `${GEN_AI_OPERATION_CHAT} ${params.modelId}`,
       "gen_ai.chat",
       logContextFromMetadata(params.modelId, params.metadata),
@@ -450,6 +496,13 @@ async function completeObject(params) {
           ...params.system !== void 0 ? { system: params.system } : {},
           ...params.temperature !== void 0 ? { temperature: params.temperature } : {},
           ...params.maxTokens !== void 0 ? { maxOutputTokens: params.maxTokens } : {},
+          ...params.recordTelemetryPayloads === false ? {
+            experimental_telemetry: {
+              isEnabled: true,
+              recordInputs: false,
+              recordOutputs: false
+            }
+          } : {},
           ...params.signal !== void 0 ? { abortSignal: params.signal } : {}
         });
         setSpanAttributes({
@@ -470,7 +523,6 @@ async function completeObject(params) {
         ...params.maxTokens !== void 0 ? { "gen_ai.request.max_tokens": params.maxTokens } : {}
       }
     );
-    return { object: result.object };
   } catch (error) {
     const providerError = createProviderError(error, {
       ...NoObjectGeneratedError.isInstance(error) ? { kind: "invalid_response" } : {},
@@ -478,6 +530,11 @@ async function completeObject(params) {
     });
     throw providerError;
   }
+  const costUsd = bestEffortObjectCompletionCost(params.modelId, result.usage);
+  return {
+    object: result.object,
+    ...costUsd !== void 0 ? { costUsd } : {}
+  };
 }
 async function embedTexts(params) {
   const texts = params.texts.map((text) => text.trim());
@@ -695,6 +752,10 @@ var DEFAULT_FAST_MODEL_ID = getModel2(
   "vercel-ai-gateway",
   "anthropic/claude-haiku-4.5"
 ).id;
+var DEFAULT_GUARDIAN_MODEL_ID = getModel2(
+  "vercel-ai-gateway",
+  "openai/gpt-5.6-luna"
+).id;
 var DEFAULT_HANDOFF_MODEL_ID = getModel2(
   "vercel-ai-gateway",
   "openai/gpt-5.6-sol"
@@ -773,6 +834,7 @@ function readBotConfig(env, functionMaxDurationSeconds) {
   const modelId = validateGatewayModelId(env.AI_MODEL) ?? DEFAULT_MODEL_ID;
   const reasoningLevel = toOptionalTrimmed(env.AI_REASONING_LEVEL);
   const fastModelId = validateGatewayModelId(env.AI_FAST_MODEL ?? env.AI_MODEL) ?? DEFAULT_FAST_MODEL_ID;
+  const guardianModelId = validateGatewayModelId(env.AI_GUARDIAN_MODEL) ?? DEFAULT_GUARDIAN_MODEL_ID;
   const handoffModelId = validateGatewayModelId(env.AI_HANDOFF_MODEL) ?? DEFAULT_HANDOFF_MODEL_ID;
   return {
     userName: toOptionalTrimmed(env.JUNIOR_BOT_NAME) ?? "junior",
@@ -786,6 +848,7 @@ function readBotConfig(env, functionMaxDurationSeconds) {
     ) ?? DEFAULT_MODEL_CONTEXT_WINDOW_TOKENS,
     reasoningLevel: reasoningLevel === void 0 ? void 0 : parseTurnReasoningLevel(reasoningLevel),
     fastModelId,
+    guardianModelId,
     imageGenerationModelId: toOptionalTrimmed(env.AI_IMAGE_MODEL) ?? DEFAULT_IMAGE_GENERATION_MODEL_ID,
     embeddingModelId: validateEmbeddingModelId(env.AI_EMBEDDING_MODEL) ?? DEFAULT_EMBEDDING_MODEL_ID,
     loadingMessages: parseLoadingMessages(env.JUNIOR_LOADING_MESSAGES),
@@ -918,6 +981,7 @@ export {
   ProviderError,
   createProviderError,
   isProviderRetryError,
+  findProviderError,
   getProviderErrorUserMessage,
   getProviderErrorAttributes,
   escapeXml,

package/dist/{chunk-HGREP4UX.js → chunk-MG3L3UGS.js}

@@ -1,6 +1,6 @@
 import {
   pluginCatalogRuntime
-} from "./chunk-73TQBD5S.js";
+} from "./chunk-4HQMMFRL.js";
 
 // src/chat/plugins/validation.ts
 import { isDeepStrictEqual } from "util";

package/dist/{chunk-GPQLJDT5.js → chunk-PBZEJRYY.js}

@@ -1,3 +1,6 @@
+import {
+  createPluginConversationEvents
+} from "./chunk-W4YS2LXS.js";
 import {
   pluginTaskId,
   pluginTaskParamsSchema,
@@ -22,28 +25,30 @@ import {
   persistThreadStateById,
   stripRuntimeTurnContext,
   updateConversationStats
-} from "./chunk-BXT63TNS.js";
+} from "./chunk-WKLA6WLW.js";
 import {
   createPluginEmbedder,
   createPluginLogger,
   createPluginModel,
   createPluginState,
   getPlugins
-} from "./chunk-QE33ATQW.js";
+} from "./chunk-PGLSOXFU.js";
 import {
-  getDb
-} from "./chunk-M7KAZXTE.js";
+  getDb,
+  sameActorIdentity
+} from "./chunk-YYAQ5ZNK.js";
 import {
   getStateAdapter
-} from "./chunk-WFJ2EG4E.js";
+} from "./chunk-RW6MD6ZV.js";
 import {
   ProviderError,
+  findProviderError,
   getProviderErrorAttributes,
   getProviderErrorUserMessage
-} from "./chunk-TI7SYDD4.js";
+} from "./chunk-IYUHOYFA.js";
 import {
   buildTurnFailureResponse
-} from "./chunk-4JPJTFUH.js";
+} from "./chunk-VLAWZSCB.js";
 import {
   parseSlackMessageTs
 } from "./chunk-F3B2YJ76.js";
@@ -122,18 +127,6 @@ function sanitizeText(text) {
     "[image data omitted]"
   ).replaceAll("\0", " ").trim();
 }
-function sameActorIdentity(left, right) {
-  if (!left || !right || left.platform !== right.platform) {
-    return false;
-  }
-  if (left.platform === "system" || right.platform === "system") {
-    return left.platform === "system" && right.platform === "system" && left.name === right.name;
-  }
-  if (left.platform === "slack" && right.platform === "slack") {
-    return left.teamId === right.teamId && left.userId === right.userId;
-  }
-  return left.userId === right.userId;
-}
 function messageProvenance(provenance) {
   return {
     authority: provenance.authority,
@@ -318,6 +311,12 @@ function taskPluginContext(plugin, message, options = {}) {
     embedder: createPluginEmbedder(pluginName, {
       signal: options.signal
     }),
+    events: createPluginConversationEvents({
+      conversationId: sessionParams.conversationId,
+      operationId: pluginTaskId(message),
+      plugin,
+      turnId: sessionParams.sessionId
+    }),
     id: pluginTaskId(message),
     log: createPluginLogger(pluginName),
     model: createPluginModel(pluginName, plugin.model, {
@@ -412,12 +411,13 @@ function getExecutionFailureReason(reply) {
 }
 function getFailureCapture(reply) {
   if (reply.diagnostics.outcome === "provider_error") {
+    const providerError = findProviderError(reply.diagnostics.providerError);
     return {
       eventName: "agent.turn.provider_error",
       error: reply.diagnostics.providerError ?? new Error(
         reply.diagnostics.errorMessage ?? "Provider error without explicit message"
       ),
-      attributes: reply.diagnostics.providerError instanceof ProviderError ? getProviderErrorAttributes(reply.diagnostics.providerError) : {},
+      attributes: providerError ? getProviderErrorAttributes(providerError) : {},
       body: "Agent turn failed with provider error"
     };
   }

package/dist/{chunk-QE33ATQW.js → chunk-PGLSOXFU.js}

@@ -1,6 +1,6 @@
 import {
   getDb
-} from "./chunk-M7KAZXTE.js";
+} from "./chunk-YYAQ5ZNK.js";
 import {
   juniorConversationAnnotations,
   juniorIdentities,
@@ -10,14 +10,14 @@ import {
   SANDBOX_WORKSPACE_ROOT,
   getStateAdapter,
   sleep
-} from "./chunk-WFJ2EG4E.js";
+} from "./chunk-RW6MD6ZV.js";
 import {
   botConfig,
   completeObject,
   embedTexts,
   getSlackBotToken,
   standardModelId
-} from "./chunk-TI7SYDD4.js";
+} from "./chunk-IYUHOYFA.js";
 import {
   isActorUserId,
   parseActorUserId
@@ -30,7 +30,7 @@ import {
   setSpanAttributes,
   setSpanStatus,
   withSpan
-} from "./chunk-4JPJTFUH.js";
+} from "./chunk-VLAWZSCB.js";
 import {
   parseSlackChannelReferenceId,
   parseSlackMessageTs,
@@ -39,6 +39,7 @@ import {
 
 // src/chat/plugins/agent-hooks.ts
 import {
+  missingToolAnnotationKeys,
   promptContextSchema,
   promptMessageSchema,
   resourceEventSchema
@@ -1337,6 +1338,17 @@ function getPluginTools(context) {
         );
       }
       const definition = tool;
+      const missingAnnotationKeys = missingToolAnnotationKeys(
+        definition.annotations
+      );
+      if (missingAnnotationKeys.length > 0) {
+        logWarn("plugin.tool_annotations.missing", {
+          "app.plugin.name": pluginName,
+          "gen_ai.tool.name": localName,
+          "app.tool.missing_annotations": missingAnnotationKeys.join(",")
+        });
+      }
+      definition.approvalMode ??= "auto";
       definition.identity = {
         id: `${pluginName}.${localName}`,
         name: localName,
@@ -1860,8 +1872,8 @@ function createPluginHookRunner(input = {}) {
       }
     },
     async beforeToolExecute(tool) {
+      const env = {};
       let nextInput = { ...tool.input };
-      const env = normalizeEnv(nextInput.env);
       const actors = input.actors?.() ?? (input.actor ? [input.actor] : []);
       for (const plugin of loaded) {
         const pluginName = plugin.manifest.name;
@@ -1881,7 +1893,7 @@ function createPluginHookRunner(input = {}) {
           },
           env: {
             get(key) {
-              return env[key];
+              return env[key] ?? normalizeEnv(nextInput.env)[key];
             },
             set(key, value) {
               env[key] = value;
@@ -1906,14 +1918,10 @@ function createPluginHookRunner(input = {}) {
             );
           }
           nextInput = { ...replacement };
-          Object.assign(env, normalizeEnv(nextInput.env));
         }
       }
       return {
-        input: {
-          ...nextInput,
-          ...Object.keys(env).length > 0 ? { env } : {}
-        },
+        input: nextInput,
         env
       };
     }