@sentry/junior 0.154.0 → 0.156.0

package/dist/chat/runtime/agent-runner.d.ts

@@ -2,13 +2,17 @@ import type { StreamFn } from "@earendil-works/pi-agent-core";
 import { type AgentRun, type SpawnAgent } from "@/chat/agent/types";
 import type { AgentRunOutcome } from "@/chat/runtime/agent-run-outcome";
 import type { SandboxEgressTracePropagationConfig } from "@/chat/sandbox/egress/tracing";
+import type { AttachmentStorage } from "@/chat/attachments/storage";
 /** Run one agent-run slice behind runtime-owned orchestration boundaries. */
 export interface AgentRunner {
     run(run: AgentRun): Promise<AgentRunOutcome>;
 }
 /** Compose the agent executor with stable host dependencies. */
 export declare function createAgentRunner(execute: (run: AgentRun, streamFn?: StreamFn) => Promise<AgentRunOutcome>, options?: {
+    attachmentStorage?: AttachmentStorage;
     bindSpawnAgent?: (run: AgentRun) => SpawnAgent | undefined;
     streamFn?: StreamFn;
     tracePropagation?: SandboxEgressTracePropagationConfig;
 }): AgentRunner;
+/** Abort a timed-out agent run and wait briefly for its work to settle. */
+export declare function runAgentWithTimeout(agentRunner: AgentRunner, run: AgentRun, timeoutMs: number | undefined): Promise<AgentRunOutcome>;

package/dist/chat/runtime/slack-resume.d.ts

@@ -1,6 +1,6 @@
 import { type AgentRun } from "@/chat/agent/types";
 import type { AgentRunResult } from "@/chat/services/turn-result";
-import type { AgentRunner } from "@/chat/runtime/agent-runner";
+import { type AgentRunner } from "@/chat/runtime/agent-runner";
 import { type ConversationTurnLifecycle } from "@/chat/conversations/turn-lifecycle";
 import { type AssistantStatusSpec } from "@/chat/slack/assistant-thread/status";
 import type { SlackMessageTs } from "@/chat/slack/timestamp";

package/dist/chat/services/conversation-memory.d.ts

@@ -22,7 +22,7 @@ export declare function upsertConversationMessage(conversation: ThreadConversati
 export declare function recordDeliveredAssistantMessage(args: {
     conversation: ThreadConversationState;
     sessionId: string;
-    source?: "web";
+    source?: "slack" | "web";
     text: string;
     userMessageId?: string;
 }): string;

package/dist/chat/slack/tools/send-files.d.ts

@@ -1,10 +1,16 @@
+import type { AttachmentStorage } from "@/chat/attachments/storage";
+import type { JuniorSqlDatabase } from "@/db/db";
 import type { SlackToolContext } from "@/chat/slack/tool-support/context";
 import { type SandboxFileMaterializationInput, type SandboxFileUpload } from "@/chat/tools/sandbox/file-uploads";
 import type { ToolState } from "@/chat/tools/types";
 /** Convert a model-supplied sandbox file path into bytes safe for Slack upload. */
 export type MaterializeFile = (input: SandboxFileMaterializationInput) => Promise<SandboxFileUpload>;
 /** Create the Slack side-effect tool for active-conversation file messages. */
-export declare function createSendFilesTool(context: SlackToolContext, state: ToolState, materializeFile: MaterializeFile): Omit<import("../../tools/definition").AnyToolDefinition, "inputSchema" | "outputSchema" | "prepareArguments" | "execute"> & {
+export declare function createSendFilesTool(context: SlackToolContext, state: ToolState, materializeFile: MaterializeFile, attachments?: {
+    conversationId: string;
+    db: JuniorSqlDatabase;
+    storage: AttachmentStorage;
+}): Omit<import("../../tools/definition").AnyToolDefinition, "inputSchema" | "outputSchema" | "prepareArguments" | "execute"> & {
     inputSchema: import("../../tools/definition").JsonSchemaObject;
     outputSchema: import("../../tools/definition").JsonSchemaObject;
     prepareArguments(args: unknown): {
@@ -17,10 +23,11 @@ export declare function createSendFilesTool(context: SlackToolContext, state: To
     };
     execute?: ((input: unknown, options: import("../../tools/definition").ToolExecuteOptions) => {
         [x: string]: unknown;
-        target: string;
-        channel_id: string;
-        file_count: number;
-        thread_ts: string;
+        attachment_refs: {
+            id: string;
+            name: string;
+        }[];
+        target?: string | undefined;
         truncated?: boolean | undefined;
         timed_out?: boolean | undefined;
         continuation?: {
@@ -28,13 +35,13 @@ export declare function createSendFilesTool(context: SlackToolContext, state: To
             reason?: string | undefined;
         } | undefined;
         deduplicated?: boolean | undefined;
-        file_ids?: string[] | undefined;
     } | Promise<{
         [x: string]: unknown;
-        target: string;
-        channel_id: string;
-        file_count: number;
-        thread_ts: string;
+        attachment_refs: {
+            id: string;
+            name: string;
+        }[];
+        target?: string | undefined;
         truncated?: boolean | undefined;
         timed_out?: boolean | undefined;
         continuation?: {
@@ -42,6 +49,5 @@ export declare function createSendFilesTool(context: SlackToolContext, state: To
             reason?: string | undefined;
         } | undefined;
         deduplicated?: boolean | undefined;
-        file_ids?: string[] | undefined;
     }>) | undefined;
 };

package/dist/chat/state/conversation.d.ts

@@ -1,5 +1,6 @@
 type ConversationRole = "assistant" | "system" | "user";
 export interface ConversationAuthor {
+    email?: string;
     fullName?: string;
     isBot?: boolean;
     userId?: string;
@@ -7,7 +8,8 @@ export interface ConversationAuthor {
 }
 export interface ConversationMessageMeta {
     attachmentCount?: number;
-    source?: "web";
+    /** Known message provenance. Omit when unknown; never invent a default. */
+    source?: "slack" | "web";
     eventType?: string;
     explicitMention?: boolean;
     imageAttachmentCount?: number;

package/dist/chat/tools/types.d.ts

@@ -10,6 +10,7 @@ import type { SlackActionToken } from "@/chat/slack/action-token";
 import type { ModelProfile } from "@/chat/model-profile";
 import type { GeneratedArtifactFileRef } from "@/chat/tools/sandbox/file-uploads";
 import type { SpawnAgent } from "@/chat/agent/types";
+import type { AttachmentStorage } from "@/chat/attachments/storage";
 interface HandoffControl {
     /** Non-empty catalog of configured targets. */
     profiles: readonly [ModelProfile, ...ModelProfile[]];
@@ -52,6 +53,7 @@ export interface ToolHooks {
     };
 }
 interface BaseToolRuntimeContext {
+    attachmentStorage?: AttachmentStorage;
     handoff?: HandoffControl;
     spawnAgent?: SpawnAgent;
     /**

package/dist/{chunk-XYMCZGH6.js → chunk-3FFUC32L.js}

@@ -4,45 +4,43 @@ import {
   isConversationScopedChannel,
   isDmChannel,
   normalizeSlackConversationId
-} from "./chunk-7CPN5JTA.js";
+} from "./chunk-NTNU6T2D.js";
 import {
   getConversationEventStore,
   getDb
-} from "./chunk-Y654CTW2.js";
+} from "./chunk-IIO5PFZX.js";
 import {
   juniorConversationAnnotations,
   juniorConversationEvents,
   juniorIdentities,
   juniorUsers
-} from "./chunk-CZD6M57V.js";
+} from "./chunk-AIJRG227.js";
 import {
   SANDBOX_WORKSPACE_ROOT
 } from "./chunk-EM225ITJ.js";
 import {
   getStateAdapter
-} from "./chunk-NNN2WYAD.js";
+} from "./chunk-MC57E5U5.js";
 import {
   botConfig,
   completeObject,
   embedTexts,
   getSlackBotToken,
   standardModelId
-} from "./chunk-6PJXR4BC.js";
+} from "./chunk-GKC43TLS.js";
 import {
   isActorUserId,
-  parseActorUserId
-} from "./chunk-HZF5P5UN.js";
-import {
+  parseActorUserId,
   parseSlackChannelReferenceId,
   parseSlackMessageTs,
   parseSlackTeamId
-} from "./chunk-F3B2YJ76.js";
+} from "./chunk-V7YE4WCP.js";
 import {
   logException,
   logInfo,
   logWarn,
   normalizeIdentityEmail
-} from "./chunk-3HX67UPN.js";
+} from "./chunk-X7W45B5G.js";
 
 // src/chat/plugins/agent-hooks.ts
 import {

package/dist/{chunk-4U4MNYGP.js → chunk-3L2PMOSR.js}

@@ -13,7 +13,7 @@ import {
   instructionProvenanceFor,
   sanitizePostgresJson,
   withConversationEventLock
-} from "./chunk-Y654CTW2.js";
+} from "./chunk-IIO5PFZX.js";
 import {
   SANDBOX_WORKSPACE_ROOT,
   sleep
@@ -23,26 +23,24 @@ import {
   fenceLock,
   getStateAdapter,
   withLock
-} from "./chunk-NNN2WYAD.js";
+} from "./chunk-MC57E5U5.js";
 import {
   botConfig,
   completeText,
   escapeXml,
   resolveGatewayModel,
   unwrapCurrentInstruction
-} from "./chunk-6PJXR4BC.js";
+} from "./chunk-GKC43TLS.js";
 import {
+  parseSlackMessageTs,
   toStoredSlackActor
-} from "./chunk-HZF5P5UN.js";
-import {
-  parseSlackMessageTs
-} from "./chunk-F3B2YJ76.js";
+} from "./chunk-V7YE4WCP.js";
 import {
   getActiveTraceId,
   logException,
   logWarn,
   setSpanAttributes
-} from "./chunk-3HX67UPN.js";
+} from "./chunk-X7W45B5G.js";
 
 // src/chat/turn-context-tag.ts
 var TURN_CONTEXT_TAG = "runtime-turn-context";

package/dist/{chunk-PTJ75ZWR.js → chunk-4ZZDTHFC.js}

@@ -1,34 +1,40 @@
+import {
+  isAgentRunFeatureDisabled
+} from "./chunk-RF6J3DIO.js";
 import {
   resolveBaseUrl
-} from "./chunk-O4AQDOKA.js";
+} from "./chunk-7RAETIYO.js";
+import {
+  isExperimentalFeatureEnabled
+} from "./chunk-5IDFPCON.js";
 import {
   createPluginLogger,
   getPlugins
-} from "./chunk-XYMCZGH6.js";
+} from "./chunk-3FFUC32L.js";
 import {
   getSlackClient,
   withSlackRetries
-} from "./chunk-7CPN5JTA.js";
+} from "./chunk-NTNU6T2D.js";
 import {
   getDb,
   parseDestination
-} from "./chunk-Y654CTW2.js";
+} from "./chunk-IIO5PFZX.js";
 import {
   sleep
 } from "./chunk-EM225ITJ.js";
 import {
   acquireActiveLock,
   getStateAdapter
-} from "./chunk-NNN2WYAD.js";
+} from "./chunk-MC57E5U5.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-3567VGCN.js";
+} from "./chunk-EDJ64P2P.js";
 import {
   fetchWithBoundedOAuthErrorBodies
-} from "./chunk-MSOZLASC.js";
+} from "./chunk-WD7SEUZO.js";
 import {
   isRecord
-} from "./chunk-3HX67UPN.js";
+} from "./chunk-X7W45B5G.js";
 
 // src/chat/capabilities/router.ts
 var ProviderCredentialRouter = class {
@@ -140,6 +146,83 @@ async function issueProviderCredentialLease(input) {
   return await getSandboxEgressRouter().issue(input);
 }
 
+// src/chat/runtime/agent-runner.ts
+var AGENT_ABORT_SETTLE_GRACE_MS = 5e3;
+function createAgentRunner(execute, options) {
+  const attachmentStorage = options?.attachmentStorage;
+  const streamFn = options?.streamFn;
+  const tracePropagation = options?.tracePropagation;
+  const bindSpawnAgent = options?.bindSpawnAgent;
+  const canBindSpawn = Boolean(bindSpawnAgent) && isExperimentalFeatureEnabled("subagents");
+  return {
+    run: async (run) => {
+      const spawnAgent = bindSpawnAgent && canBindSpawn && !isAgentRunFeatureDisabled(run.disabledFeatures, "subagents") ? bindSpawnAgent(run) : void 0;
+      const nextRun = {
+        ...run,
+        environment: {
+          ...run.environment,
+          attachmentStorage: run.environment?.attachmentStorage ?? attachmentStorage,
+          sandboxTracePropagation: run.environment?.sandboxTracePropagation ?? tracePropagation
+        },
+        ...spawnAgent ? {
+          durability: {
+            ...run.durability,
+            spawnAgent
+          }
+        } : {}
+      };
+      return await execute(nextRun, streamFn);
+    }
+  };
+}
+async function waitForAgentSettlement(runPromise) {
+  let timeoutId;
+  const settleGrace = new Promise((resolve) => {
+    timeoutId = setTimeout(resolve, AGENT_ABORT_SETTLE_GRACE_MS);
+    timeoutId.unref?.();
+  });
+  await Promise.race([
+    runPromise.then(
+      () => void 0,
+      () => void 0
+    ),
+    settleGrace
+  ]);
+  if (timeoutId) {
+    clearTimeout(timeoutId);
+  }
+}
+async function runAgentWithTimeout(agentRunner, run, timeoutMs) {
+  if (typeof timeoutMs !== "number") {
+    return await agentRunner.run(run);
+  }
+  const timeoutError = new Error(
+    `executeAgentRun timed out after ${timeoutMs}ms`
+  );
+  const abortController = new AbortController();
+  const signal = run.signal ? AbortSignal.any([run.signal, abortController.signal]) : abortController.signal;
+  const runPromise = agentRunner.run({ ...run, signal });
+  let timeoutId;
+  const timeoutPromise = new Promise((_, reject) => {
+    timeoutId = setTimeout(() => {
+      abortController.abort(timeoutError);
+      reject(timeoutError);
+    }, timeoutMs);
+  });
+  try {
+    return await Promise.race([runPromise, timeoutPromise]);
+  } catch (error) {
+    if (abortController.signal.aborted) {
+      await waitForAgentSettlement(runPromise);
+    }
+    throw error;
+  } finally {
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
+  }
+}
+
 // src/chat/mcp/errors.ts
 var McpProviderError = class extends Error {
   phase;
@@ -1159,5 +1242,7 @@ export {
   deleteMcpStoredOAuthCredentials,
   deleteMcpServerSessionId,
   createMcpOAuthClientProvider,
-  finalizeMcpAuthorization
+  finalizeMcpAuthorization,
+  createAgentRunner,
+  runAgentWithTimeout
 };