@sentry/junior 0.91.0 → 0.92.1

package/dist/{chunk-GCWD2VHP.js → chunk-OQQU3SD6.js}

@@ -1,22 +1,22 @@
 import {
   getConnectedStateContext,
   getStateAdapter
-} from "./chunk-RS6ANWVT.js";
+} from "./chunk-ZATRYQLR.js";
 import {
   getConversationStore
-} from "./chunk-2S7M37HY.js";
+} from "./chunk-NIFONS4W.js";
 import {
   getChatConfig
-} from "./chunk-HXL2ZV74.js";
+} from "./chunk-3F54A3YM.js";
 import {
   parseDestination
 } from "./chunk-GHGPTPBL.js";
 import {
   logWarn,
-  parseRequester,
-  storedSlackRequesterSchema,
-  toStoredSlackRequester
-} from "./chunk-ZUK7BL63.js";
+  parseActor,
+  storedSlackActorSchema,
+  toStoredSlackActor
+} from "./chunk-S6QKIGRM.js";
 import {
   isRecord
 } from "./chunk-OB42YVAE.js";
@@ -24,6 +24,7 @@ import {
 // src/chat/state/session-log.ts
 import { isDeepStrictEqual } from "util";
 import { z as z2 } from "zod";
+import { actorSchema } from "@sentry/junior-plugin-api";
 
 // src/chat/pi/messages.ts
 import { z } from "zod";
@@ -37,32 +38,67 @@ var piContentMessageSchema = z.object({
 
 // src/chat/state/session-log.ts
 var AGENT_SESSION_LOG_PREFIX = "junior:agent-session-log";
-var AGENT_SESSION_LOG_SCHEMA_VERSION = 1;
+var AGENT_SESSION_LOG_SCHEMA_VERSION = 2;
 var INITIAL_SESSION_ID = "session_0";
 var SESSION_ID_PREFIX = "session_";
 var STATE_STORE_LOCK_TTL_MS = 5e3;
+var schemaVersionSchema = z2.union([z2.literal(1), z2.literal(2)]);
+var piMessageAuthoritySchema = z2.union([
+  z2.literal("instruction"),
+  z2.literal("context")
+]);
+var piMessageProvenanceSchema = z2.object({
+  authority: piMessageAuthoritySchema,
+  actor: actorSchema.optional()
+}).strict();
+var unattributedContextProvenance = {
+  authority: "context"
+};
+function instructionProvenance(actor) {
+  return actor ? { authority: "instruction", actor } : { authority: "instruction" };
+}
+function isDefaultContextProvenance(provenance) {
+  return provenance.authority === "context" && !provenance.actor;
+}
+function legacyActorProvenance(actor) {
+  if (actor.teamId && actor.slackUserId && actor.platform) {
+    return instructionProvenance({
+      platform: "slack",
+      teamId: actor.teamId,
+      userId: actor.slackUserId,
+      ...actor.slackUserName ? { userName: actor.slackUserName } : {},
+      ...actor.fullName ? { fullName: actor.fullName } : {},
+      ...actor.email ? { email: actor.email } : {}
+    });
+  }
+  return unattributedContextProvenance;
+}
 var piMessageEntrySchema = z2.object({
-  schemaVersion: z2.literal(AGENT_SESSION_LOG_SCHEMA_VERSION),
+  schemaVersion: schemaVersionSchema,
   type: z2.literal("pi_message"),
   sessionId: z2.string().min(1).default(INITIAL_SESSION_ID),
   message: piMessageSchema,
-  requester: storedSlackRequesterSchema.optional()
+  provenance: piMessageProvenanceSchema.optional(),
+  // Legacy v1 latest-wins actor, decoded into provenance on read.
+  actor: storedSlackActorSchema.optional()
 });
 var projectionResetEntrySchema = z2.object({
-  schemaVersion: z2.literal(AGENT_SESSION_LOG_SCHEMA_VERSION),
+  schemaVersion: schemaVersionSchema,
   type: z2.literal("projection_reset"),
   sessionId: z2.string().min(1).default(INITIAL_SESSION_ID),
   messages: z2.array(piMessageSchema),
-  requester: storedSlackRequesterSchema.optional()
+  provenance: z2.array(piMessageProvenanceSchema).optional(),
+  // Legacy v1 latest-wins actor; v1 resets carry no per-message provenance.
+  actor: storedSlackActorSchema.optional()
 });
-var requesterRecordedEntrySchema = z2.object({
-  schemaVersion: z2.literal(AGENT_SESSION_LOG_SCHEMA_VERSION),
-  type: z2.literal("requester_recorded"),
+var actorRecordedEntrySchema = z2.object({
+  schemaVersion: schemaVersionSchema,
+  type: z2.literal("actor_recorded"),
   sessionId: z2.string().min(1).default(INITIAL_SESSION_ID),
-  requester: storedSlackRequesterSchema
+  actor: storedSlackActorSchema
 });
 var mcpProviderConnectedEntrySchema = z2.object({
-  schemaVersion: z2.literal(AGENT_SESSION_LOG_SCHEMA_VERSION),
+  schemaVersion: schemaVersionSchema,
   type: z2.literal("mcp_provider_connected"),
   sessionId: z2.string().min(1).default(INITIAL_SESSION_ID),
   provider: z2.string().min(1)
@@ -72,13 +108,13 @@ var authorizationKindSchema = z2.union([
   z2.literal("mcp")
 ]);
 var authorizationRequestedEntrySchema = z2.object({
-  schemaVersion: z2.literal(AGENT_SESSION_LOG_SCHEMA_VERSION),
+  schemaVersion: schemaVersionSchema,
   type: z2.literal("authorization_requested"),
   sessionId: z2.string().min(1).default(INITIAL_SESSION_ID),
   createdAtMs: z2.number().int().nonnegative(),
   kind: authorizationKindSchema,
   provider: z2.string().min(1),
-  requesterId: z2.string().min(1),
+  actorId: z2.string().min(1),
   authorizationId: z2.string().min(1),
   delivery: z2.union([
     z2.literal("private_link_sent"),
@@ -86,13 +122,13 @@ var authorizationRequestedEntrySchema = z2.object({
   ])
 });
 var authorizationCompletedEntrySchema = z2.object({
-  schemaVersion: z2.literal(AGENT_SESSION_LOG_SCHEMA_VERSION),
+  schemaVersion: schemaVersionSchema,
   type: z2.literal("authorization_completed"),
   sessionId: z2.string().min(1).default(INITIAL_SESSION_ID),
   createdAtMs: z2.number().int().nonnegative(),
   kind: authorizationKindSchema,
   provider: z2.string().min(1),
-  requesterId: z2.string().min(1),
+  actorId: z2.string().min(1),
   authorizationId: z2.string().min(1)
 });
 var transcriptRefSchema = z2.object({
@@ -101,7 +137,7 @@ var transcriptRefSchema = z2.object({
   key: z2.string().min(1)
 });
 var toolExecutionStartedEntrySchema = z2.object({
-  schemaVersion: z2.literal(AGENT_SESSION_LOG_SCHEMA_VERSION),
+  schemaVersion: schemaVersionSchema,
   type: z2.literal("tool_execution_started"),
   sessionId: z2.string().min(1).default(INITIAL_SESSION_ID),
   createdAtMs: z2.number().int().nonnegative(),
@@ -110,7 +146,7 @@ var toolExecutionStartedEntrySchema = z2.object({
   args: z2.unknown().optional()
 });
 var subagentStartedEntrySchema = z2.object({
-  schemaVersion: z2.literal(AGENT_SESSION_LOG_SCHEMA_VERSION),
+  schemaVersion: schemaVersionSchema,
   type: z2.literal("subagent_started"),
   sessionId: z2.string().min(1).default(INITIAL_SESSION_ID),
   subagentInvocationId: z2.string().min(1),
@@ -123,7 +159,7 @@ var subagentStartedEntrySchema = z2.object({
   createdAtMs: z2.number().int().nonnegative()
 });
 var subagentEndedEntrySchema = z2.object({
-  schemaVersion: z2.literal(AGENT_SESSION_LOG_SCHEMA_VERSION),
+  schemaVersion: schemaVersionSchema,
   type: z2.literal("subagent_ended"),
   sessionId: z2.string().min(1).default(INITIAL_SESSION_ID),
   subagentInvocationId: z2.string().min(1),
@@ -140,7 +176,7 @@ var subagentEndedEntrySchema = z2.object({
 var sessionLogEntrySchema = z2.discriminatedUnion("type", [
   piMessageEntrySchema,
   projectionResetEntrySchema,
-  requesterRecordedEntrySchema,
+  actorRecordedEntrySchema,
   mcpProviderConnectedEntrySchema,
   authorizationRequestedEntrySchema,
   authorizationCompletedEntrySchema,
@@ -159,6 +195,28 @@ function key(scope) {
 function rawKey(scope) {
   return [AGENT_SESSION_LOG_PREFIX, scope.conversationId].join(":");
 }
+function storedRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
+}
+function migrateStoredEntry(value) {
+  const record = storedRecord(value);
+  if (!record) {
+    return value;
+  }
+  const migrated = { ...record };
+  if ("requester" in migrated && !("actor" in migrated)) {
+    migrated.actor = migrated.requester;
+  }
+  delete migrated.requester;
+  if (migrated.type === "requester_recorded") {
+    migrated.type = "actor_recorded";
+  }
+  if ("requesterId" in migrated && !("actorId" in migrated)) {
+    migrated.actorId = migrated.requesterId;
+  }
+  delete migrated.requesterId;
+  return migrated;
+}
 function normalizeMessageCount(value) {
   return Number.isFinite(value) ? Math.max(0, Math.floor(value)) : 0;
 }
@@ -223,36 +281,29 @@ function projectionEntries(entries, sessionId) {
   const currentId = resetIndex < 0 ? INITIAL_SESSION_ID : entrySessionId(entries[resetIndex]);
   return entries.slice(startIndex).filter((entry) => entrySessionId(entry) === currentId);
 }
-function findLastIndex(values, predicate) {
-  for (let index = values.length - 1; index >= 0; index -= 1) {
-    if (predicate(values[index])) return index;
-  }
-  return -1;
-}
-function piEntry(message, sessionId, requester) {
+function piEntry(message, sessionId, provenance) {
   return {
     schemaVersion: AGENT_SESSION_LOG_SCHEMA_VERSION,
     type: "pi_message",
     sessionId,
     message,
-    ...requester ? { requester } : {}
+    // Ambient context is the decode default, so only attributed/instruction
+    // provenance needs to be persisted on the entry.
+    ...provenance && !isDefaultContextProvenance(provenance) ? { provenance } : {}
   };
 }
-function resetEntry(messages, sessionId, requester) {
+function resetEntry(messages, sessionId, provenance) {
+  if (provenance.length !== messages.length) {
+    throw new Error(
+      "projection_reset provenance must align one-to-one with messages"
+    );
+  }
   return {
     schemaVersion: AGENT_SESSION_LOG_SCHEMA_VERSION,
     type: "projection_reset",
     sessionId,
     messages,
-    ...requester ? { requester } : {}
-  };
-}
-function requesterRecordedEntry(requester, sessionId) {
-  return {
-    schemaVersion: AGENT_SESSION_LOG_SCHEMA_VERSION,
-    type: "requester_recorded",
-    sessionId,
-    requester
+    provenance
   };
 }
 function mcpProviderConnectedEntry(provider, sessionId) {
@@ -284,7 +335,7 @@ function authorizationRequestedEntry(args) {
     createdAtMs: args.createdAtMs,
     kind: args.kind,
     provider: args.provider,
-    requesterId: args.requesterId,
+    actorId: args.actorId,
     authorizationId: args.authorizationId,
     delivery: args.delivery
   };
@@ -297,7 +348,7 @@ function authorizationCompletedEntry(args) {
     createdAtMs: args.createdAtMs,
     kind: args.kind,
     provider: args.provider,
-    requesterId: args.requesterId,
+    actorId: args.actorId,
     authorizationId: args.authorizationId
   };
 }
@@ -344,43 +395,70 @@ function decode(value) {
   if (typeof value === "string") {
     return decode(JSON.parse(value));
   }
-  const parsed = sessionLogEntrySchema.safeParse(value);
+  const parsed = sessionLogEntrySchema.safeParse(migrateStoredEntry(value));
   if (parsed.success) {
     return parsed.data;
   }
   return piEntry(piMessageSchema.parse(value), INITIAL_SESSION_ID);
 }
+function piEntryProvenance(entry) {
+  if (entry.provenance) {
+    return entry.provenance;
+  }
+  if (entry.actor) {
+    return legacyActorProvenance(entry.actor);
+  }
+  return unattributedContextProvenance;
+}
 function project(entries, sessionId) {
   let messages = [];
-  let requester;
+  let provenance = [];
   for (const entry of projectionEntries(entries, sessionId)) {
     if (entry.type === "pi_message") {
       messages.push(entry.message);
-      if (entry.message.role === "user" && entry.requester) {
-        requester = entry.requester;
-      }
-      continue;
-    }
-    if (entry.type === "requester_recorded") {
-      requester = entry.requester;
+      provenance.push(piEntryProvenance(entry));
       continue;
     }
     if (entry.type === "authorization_completed") {
       messages.push(authorizationObservationMessage(entry));
+      provenance.push(unattributedContextProvenance);
       continue;
     }
     if (entry.type === "projection_reset") {
-      messages = [...entry.messages];
-      if (entry.requester) {
-        requester = entry.requester;
+      const resetProvenance = entry.provenance ?? entry.messages.map(() => unattributedContextProvenance);
+      if (resetProvenance.length !== entry.messages.length) {
+        throw new Error(
+          "projection_reset provenance must align one-to-one with messages"
+        );
       }
+      messages = [...entry.messages];
+      provenance = [...resetProvenance];
       continue;
     }
   }
-  return { messages, requester };
+  return { messages, provenance };
 }
-function projectMessages(entries, sessionId) {
-  return project(entries, sessionId).messages;
+function actorIdentityKey(actor) {
+  if (actor.platform === "system") {
+    return `system ${actor.name}`;
+  }
+  return actor.platform === "slack" ? `slack\0${actor.teamId}\0${actor.userId}` : `${actor.platform}\0${actor.userId}`;
+}
+function instructionActors(provenance) {
+  const seen = /* @__PURE__ */ new Set();
+  const actors = [];
+  for (const entry of provenance) {
+    if (entry.authority !== "instruction" || !entry.actor) {
+      continue;
+    }
+    const identity = actorIdentityKey(entry.actor);
+    if (seen.has(identity)) {
+      continue;
+    }
+    seen.add(identity);
+    actors.push(entry.actor);
+  }
+  return actors;
 }
 function connectedMcpProviders(entries, sessionId) {
   const providers = /* @__PURE__ */ new Set();
@@ -391,33 +469,65 @@ function connectedMcpProviders(entries, sessionId) {
   }
   return [...providers].sort((left, right) => left.localeCompare(right));
 }
-function commitEntries(existingMessages, nextMessages, sessionId, entries, existingRequester, requester) {
-  const matchingPrefix = countMatchingPrefix(existingMessages, nextMessages);
-  if (matchingPrefix === existingMessages.length) {
-    const newMessages = nextMessages.slice(matchingPrefix);
-    if (newMessages.length === 0 && requester && !isDeepStrictEqual(existingRequester, requester)) {
-      return {
-        entries: [requesterRecordedEntry(requester, sessionId)],
-        sessionId
-      };
+function isUserMessage(message) {
+  return message.role === "user";
+}
+function resolveCommitProvenance(args) {
+  if (args.explicitProvenance) {
+    if (args.explicitProvenance.length !== args.nextMessages.length) {
+      throw new Error("commit provenance must align one-to-one with messages");
+    }
+    return args.explicitProvenance;
+  }
+  const matchingPrefix = countMatchingPrefix(
+    args.existing.messages,
+    args.nextMessages
+  );
+  const provenance = args.nextMessages.map(
+    (_, index) => index < matchingPrefix ? args.existing.provenance[index] ?? unattributedContextProvenance : unattributedContextProvenance
+  );
+  if (args.newMessageProvenance) {
+    for (let index = args.nextMessages.length - 1; index >= matchingPrefix; index -= 1) {
+      if (isUserMessage(args.nextMessages[index])) {
+        provenance[index] = args.newMessageProvenance;
+        break;
+      }
     }
-    const requesterIndex = requester ? findLastIndex(newMessages, (m) => m.role === "user") : -1;
+  }
+  if (args.trailingMessageProvenance) {
+    if (args.trailingMessageProvenance.length > provenance.length) {
+      throw new Error(
+        "trailing commit provenance cannot exceed committed messages"
+      );
+    }
+    const newMessageCount = args.nextMessages.length - matchingPrefix;
+    if (args.trailingMessageProvenance.length > newMessageCount) {
+      throw new Error(
+        "trailing commit provenance must align to newly committed messages"
+      );
+    }
+    const start = provenance.length - args.trailingMessageProvenance.length;
+    args.trailingMessageProvenance.forEach((entry, offset) => {
+      provenance[start + offset] = entry;
+    });
+  }
+  return provenance;
+}
+function commitEntries(existing, nextMessages, nextProvenance, sessionId, entries) {
+  const matchingPrefix = countMatchingPrefix(existing.messages, nextMessages);
+  if (matchingPrefix === existing.messages.length) {
+    const newMessages = nextMessages.slice(matchingPrefix);
+    const newProvenance = nextProvenance.slice(matchingPrefix);
     return {
       entries: newMessages.map(
-        (message, index) => piEntry(
-          message,
-          sessionId,
-          index === requesterIndex ? requester : void 0
-        )
+        (message, index) => piEntry(message, sessionId, newProvenance[index])
       ),
       sessionId
     };
   }
   const resetSessionId = nextSessionId(entries);
   return {
-    entries: [
-      resetEntry(nextMessages, resetSessionId, requester ?? existingRequester)
-    ],
+    entries: [resetEntry(nextMessages, resetSessionId, nextProvenance)],
     sessionId: resetSessionId
   };
 }
@@ -485,24 +595,28 @@ async function defaultStore() {
 }
 async function loadEntries(args) {
   const store = args.store ?? await defaultStore();
-  return await store.read(args);
+  return (await store.read(args)).map(decode);
 }
 async function loadActivityEntries(args) {
   const entries = await loadEntries(args);
   return projectionEntries(entries, args.sessionId).filter(isActivityEntry);
 }
-async function loadMessages(args) {
+async function loadMessagesWithProvenance(args) {
   const messageCount = normalizeMessageCount(args.messageCount);
   if (messageCount === 0) {
-    return [];
+    return { messages: [], provenance: [] };
   }
-  const store = args.store ?? await defaultStore();
-  const messages = projectMessages(await store.read(args), args.sessionId);
-  return messages.length >= messageCount ? messages.slice(0, messageCount) : void 0;
+  const projection = project(await loadEntries(args), args.sessionId);
+  return projection.messages.length >= messageCount ? {
+    messages: projection.messages.slice(0, messageCount),
+    provenance: projection.provenance.slice(0, messageCount)
+  } : void 0;
 }
 async function loadProjection(args) {
-  const store = args.store ?? await defaultStore();
-  return project(await store.read(args), args.sessionId).messages;
+  return project(await loadEntries(args), args.sessionId).messages;
+}
+async function loadProjectionWithProvenance(args) {
+  return project(await loadEntries(args), args.sessionId);
 }
 async function loadConnectedMcpProviders(args) {
   return connectedMcpProviders(await loadEntries(args));
@@ -537,7 +651,7 @@ async function recordAuthorizationRequested(args) {
         kind: args.kind,
         sessionId,
         provider: args.provider,
-        requesterId: args.requesterId,
+        actorId: args.actorId,
         authorizationId: args.authorizationId,
         delivery: args.delivery
       })
@@ -562,7 +676,7 @@ async function recordAuthorizationCompleted(args) {
         kind: args.kind,
         sessionId,
         provider: args.provider,
-        requesterId: args.requesterId,
+        actorId: args.actorId,
         authorizationId: args.authorizationId
       })
     ],
@@ -634,13 +748,19 @@ async function commitMessages(args) {
   const entries = await store.read(args);
   const existingProjection = project(entries);
   const currentId = currentSessionId(entries);
+  const nextProvenance = resolveCommitProvenance({
+    existing: existingProjection,
+    nextMessages: args.messages,
+    ...args.provenance ? { explicitProvenance: args.provenance } : {},
+    ...args.trailingMessageProvenance ? { trailingMessageProvenance: args.trailingMessageProvenance } : {},
+    ...args.newMessageProvenance ? { newMessageProvenance: args.newMessageProvenance } : {}
+  });
   const commit = commitEntries(
-    existingProjection.messages,
+    existingProjection,
     args.messages,
+    nextProvenance,
     currentId,
-    entries,
-    existingProjection.requester,
-    args.requester
+    entries
   );
   await store.append({
     scope: args,
@@ -648,13 +768,26 @@ async function commitMessages(args) {
     ttlMs: args.ttlMs
   });
   return {
-    sessionId: commit.sessionId
+    sessionId: commit.sessionId,
+    provenance: nextProvenance
   };
 }
-
-// src/chat/xml.ts
-function escapeXml(value) {
-  return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;").replaceAll("'", "&apos;");
+function instructionProvenanceFor(actor) {
+  return instructionProvenance(actor);
+}
+var contextProvenance = unattributedContextProvenance;
+function parseStoredMessageProvenance(value, expectedLength) {
+  if (value === void 0) {
+    return Array.from(
+      { length: expectedLength },
+      () => unattributedContextProvenance
+    );
+  }
+  const parsed = z2.array(piMessageProvenanceSchema).safeParse(value);
+  if (!parsed.success || parsed.data.length !== expectedLength) {
+    return void 0;
+  }
+  return parsed.data;
 }
 
 // src/chat/state/turn-session.ts
@@ -733,8 +866,8 @@ function parseSource(value) {
   const result = sourceSchema.safeParse(value);
   return result.success ? result.data : void 0;
 }
-function sessionLogRequester(requester) {
-  return requester?.platform === "slack" ? toStoredSlackRequester(requester) : void 0;
+function sessionLogActor(actor) {
+  return actor?.platform === "slack" ? toStoredSlackActor(actor) : void 0;
 }
 function parseAgentTurnSessionFields(parsed) {
   const status = parseAgentTurnSessionStatus(parsed);
@@ -751,7 +884,8 @@ function parseAgentTurnSessionFields(parsed) {
   const cumulativeUsage = parseAgentTurnUsage(parsed.cumulativeUsage);
   const lastProgressAtMs = toFiniteNonNegativeNumber(parsed.lastProgressAtMs);
   const logSessionId = typeof parsed.logSessionId === "string" ? parsed.logSessionId : void 0;
-  const requester = parsed.requester === void 0 ? void 0 : parseRequester(parsed.requester);
+  const actorValue = parsed.actor !== void 0 ? parsed.actor : parsed.requester;
+  const actor = actorValue === void 0 ? void 0 : parseActor(actorValue);
   const startedAtMs = toFiniteNonNegativeNumber(parsed.startedAtMs);
   const surface = parseAgentTurnSurface(parsed.surface);
   const turnStartMessageIndex = toNonNegativeInteger(
@@ -759,7 +893,7 @@ function parseAgentTurnSessionFields(parsed) {
   );
   const destination = parsed.destination === void 0 ? void 0 : parseDestination(parsed.destination);
   const source = parsed.source === void 0 ? void 0 : parseSource(parsed.source);
-  if (typeof conversationId !== "string" || typeof sessionId !== "string" || sliceId === void 0 || version === void 0 || updatedAtMs === void 0 || parsed.destination !== void 0 && !destination || parsed.source !== void 0 && !source || parsed.requester !== void 0 && !requester) {
+  if (typeof conversationId !== "string" || typeof sessionId !== "string" || sliceId === void 0 || version === void 0 || updatedAtMs === void 0 || parsed.destination !== void 0 && !destination || parsed.source !== void 0 && !source || actorValue !== void 0 && !actor) {
     return void 0;
   }
   return {
@@ -777,7 +911,7 @@ function parseAgentTurnSessionFields(parsed) {
     ...cumulativeUsage ? { cumulativeUsage } : {},
     ...destination ? { destination } : {},
     ...source ? { source } : {},
-    ...requester ? { requester } : {},
+    ...actor ? { actor } : {},
     ...Array.isArray(parsed.loadedSkillNames) ? {
       loadedSkillNames: parsed.loadedSkillNames.filter(
         (value) => typeof value === "string"
@@ -803,9 +937,17 @@ function parseAgentTurnSessionRecord(value) {
   if (!fields || committedMessageCount === void 0) {
     return void 0;
   }
+  const committedMessageProvenance = parseStoredMessageProvenance(
+    parsed.committedMessageProvenance,
+    committedMessageCount
+  );
+  if (!committedMessageProvenance) {
+    return void 0;
+  }
   return {
     ...fields,
-    committedMessageCount
+    committedMessageCount,
+    committedMessageProvenance
   };
 }
 function parseAgentTurnSessionSummary(value) {
@@ -849,7 +991,7 @@ async function recordConversationActivityMetadata(args) {
       conversationId: args.summary.conversationId,
       destination: args.summary.destination,
       nowMs: args.nowMs,
-      requester: sessionLogRequester(args.summary.requester),
+      actor: sessionLogActor(args.summary.actor),
       source,
       visibility: args.destinationVisibility
     });
@@ -860,7 +1002,7 @@ async function recordConversationActivityMetadata(args) {
       destination: args.summary.destination,
       execution: conversationExecutionFromSummary(args.summary),
       lastActivityAtMs: args.summary.updatedAtMs,
-      requester: sessionLogRequester(args.summary.requester),
+      actor: sessionLogActor(args.summary.actor),
       source,
       updatedAtMs: args.nowMs,
       visibility: args.destinationVisibility
@@ -876,22 +1018,25 @@ async function recordConversationActivityMetadata(args) {
     );
   }
 }
-function materializePiMessages(committedMessageCount, includeProjectionTail, sessionMessages, sessionProjection) {
+function materializePiProjection(committedMessageCount, includeProjectionTail, sessionMessages, sessionProjection) {
   if (committedMessageCount === 0) {
     return sessionProjection;
   }
-  if (includeProjectionTail && sessionProjection.length >= committedMessageCount) {
+  if (includeProjectionTail && sessionProjection.messages.length >= committedMessageCount) {
     return sessionProjection;
   }
   if (sessionMessages) {
     return sessionMessages;
   }
-  if (sessionProjection.length >= committedMessageCount) {
-    return sessionProjection.slice(0, committedMessageCount);
+  if (sessionProjection.messages.length >= committedMessageCount) {
+    return {
+      messages: sessionProjection.messages.slice(0, committedMessageCount),
+      provenance: sessionProjection.provenance.slice(0, committedMessageCount)
+    };
   }
   return void 0;
 }
-function materializeAgentTurnSessionRecord(stored, piMessages) {
+function materializeAgentTurnSessionRecord(stored, piProjection) {
   return {
     version: stored.version,
     ...stored.channelName ? { channelName: stored.channelName } : {},
@@ -902,7 +1047,9 @@ function materializeAgentTurnSessionRecord(stored, piMessages) {
     startedAtMs: stored.startedAtMs,
     lastProgressAtMs: stored.lastProgressAtMs,
     updatedAtMs: stored.updatedAtMs,
-    piMessages,
+    piMessages: piProjection.messages,
+    piMessageProvenance: piProjection.provenance,
+    actors: instructionActors(piProjection.provenance),
     cumulativeDurationMs: stored.cumulativeDurationMs,
     ...stored.destination ? { destination: stored.destination } : {},
     ...stored.source ? { source: stored.source } : {},
@@ -910,7 +1057,7 @@ function materializeAgentTurnSessionRecord(stored, piMessages) {
     ...stored.resumeReason ? { resumeReason: stored.resumeReason } : {},
     ...stored.errorMessage ? { errorMessage: stored.errorMessage } : {},
     ...stored.loadedSkillNames ? { loadedSkillNames: stored.loadedSkillNames } : {},
-    ...stored.requester ? { requester: stored.requester } : {},
+    ...stored.actor ? { actor: stored.actor } : {},
     ...stored.resumedFromSliceId !== void 0 ? { resumedFromSliceId: stored.resumedFromSliceId } : {},
     ...stored.surface ? { surface: stored.surface } : {},
     ...stored.traceId ? { traceId: stored.traceId } : {},
@@ -933,25 +1080,25 @@ async function getAgentTurnSessionRecord(conversationId, sessionId) {
   if (!parsed) {
     return void 0;
   }
-  const sessionMessages = await loadMessages({
+  const sessionMessages = await loadMessagesWithProvenance({
     conversationId,
     messageCount: parsed.committedMessageCount,
     ...parsed.logSessionId ? { sessionId: parsed.logSessionId } : {}
   });
-  const sessionProjection = await loadProjection({
+  const sessionProjection = await loadProjectionWithProvenance({
     conversationId,
     ...parsed.logSessionId ? { sessionId: parsed.logSessionId } : {}
   });
-  const piMessages = materializePiMessages(
+  const piProjection = materializePiProjection(
     parsed.committedMessageCount,
     parsed.state === "running" || parsed.state === "awaiting_resume",
     sessionMessages,
     sessionProjection
   );
-  if (!piMessages) {
+  if (!piProjection) {
     return void 0;
   }
-  return materializeAgentTurnSessionRecord(parsed, piMessages);
+  return materializeAgentTurnSessionRecord(parsed, piProjection);
 }
 function buildStoredRecord(args) {
   const nowMs = Date.now();
@@ -966,12 +1113,13 @@ function buildStoredRecord(args) {
     lastProgressAtMs: args.lastProgressAtMs ?? nowMs,
     updatedAtMs: nowMs,
     committedMessageCount: args.committedMessageCount,
+    committedMessageProvenance: args.committedMessageProvenance,
     ...args.logSessionId ? { logSessionId: args.logSessionId } : {},
     cumulativeDurationMs: args.cumulativeDurationMs,
     ...args.cumulativeUsage ? { cumulativeUsage: args.cumulativeUsage } : {},
     ...args.destination ? { destination: args.destination } : {},
     ...args.source ? { source: args.source } : {},
-    ...args.requester ? { requester: args.requester } : {},
+    ...args.actor ? { actor: args.actor } : {},
     ...Array.isArray(args.loadedSkillNames) ? {
       loadedSkillNames: args.loadedSkillNames.filter(
         (value) => typeof value === "string"
@@ -995,6 +1143,7 @@ async function setStoredRecord(args) {
   );
   const {
     committedMessageCount: _committedMessageCount,
+    committedMessageProvenance: _committedMessageProvenance,
     errorMessage: _errorMessage,
     logSessionId: _logSessionId,
     turnStartMessageIndex: _turnStartMessageIndex,
@@ -1007,7 +1156,10 @@ async function setStoredRecord(args) {
     nowMs: Date.now(),
     summary
   });
-  return materializeAgentTurnSessionRecord(args.record, [...args.piMessages]);
+  return materializeAgentTurnSessionRecord(args.record, {
+    messages: [...args.piMessages],
+    provenance: [...args.piMessageProvenance]
+  });
 }
 async function updateAgentTurnSessionState(args) {
   const parsed = await getStoredAgentTurnSessionRecord(
@@ -1019,6 +1171,7 @@ async function updateAgentTurnSessionState(args) {
   }
   return await setStoredRecord({
     piMessages: args.existing.piMessages,
+    piMessageProvenance: args.existing.piMessageProvenance,
     ttlMs: AGENT_TURN_SESSION_TTL_MS,
     record: buildStoredRecord({
       conversationId: args.existing.conversationId,
@@ -1026,6 +1179,7 @@ async function updateAgentTurnSessionState(args) {
       sliceId: args.existing.sliceId,
       state: args.state,
       committedMessageCount: parsed.committedMessageCount,
+      committedMessageProvenance: parsed.committedMessageProvenance,
       ...parsed.channelName ? { channelName: parsed.channelName } : {},
       startedAtMs: parsed.startedAtMs,
       lastProgressAtMs: parsed.lastProgressAtMs,
@@ -1036,7 +1190,7 @@ async function updateAgentTurnSessionState(args) {
       ...args.existing.destination ? { destination: args.existing.destination } : {},
       ...args.existing.source ? { source: args.existing.source } : {},
       ...args.existing.loadedSkillNames ? { loadedSkillNames: args.existing.loadedSkillNames } : {},
-      ...args.existing.requester ? { requester: args.existing.requester } : {},
+      ...args.existing.actor ? { actor: args.existing.actor } : {},
       ...args.existing.resumeReason ? { resumeReason: args.existing.resumeReason } : {},
       ...args.existing.resumedFromSliceId !== void 0 ? { resumedFromSliceId: args.existing.resumedFromSliceId } : {},
       ...args.existing.surface ? { surface: args.existing.surface } : {},
@@ -1052,18 +1206,22 @@ async function upsertAgentTurnSessionRecord(args) {
     args.sessionId
   );
   const ttlMs = Math.max(1, args.ttlMs ?? AGENT_TURN_SESSION_TTL_MS);
+  const instructionActor = args.actor ?? existingRecord?.actor;
   const commit = await commitMessages({
     conversationId: args.conversationId,
     messages: args.piMessages,
-    requester: sessionLogRequester(args.requester ?? existingRecord?.requester),
+    ...instructionActor ? { newMessageProvenance: instructionProvenanceFor(instructionActor) } : {},
+    ...args.trailingMessageProvenance ? { trailingMessageProvenance: args.trailingMessageProvenance } : {},
     ttlMs
   });
   return await setStoredRecord({
     conversationStore: args.conversationStore,
     destinationVisibility: args.destinationVisibility,
     piMessages: args.piMessages,
+    piMessageProvenance: commit.provenance,
     ttlMs,
     record: buildStoredRecord({
+      committedMessageProvenance: commit.provenance,
       ...args.channelName ?? existingRecord?.channelName ? { channelName: args.channelName ?? existingRecord?.channelName } : {},
       conversationId: args.conversationId,
       sessionId: args.sessionId,
@@ -1079,7 +1237,7 @@ async function upsertAgentTurnSessionRecord(args) {
       ...args.destination ?? existingRecord?.destination ? { destination: args.destination ?? existingRecord?.destination } : {},
       ...args.source ?? existingRecord?.source ? { source: args.source ?? existingRecord?.source } : {},
       ...args.loadedSkillNames ? { loadedSkillNames: args.loadedSkillNames } : {},
-      ...args.requester ?? existingRecord?.requester ? { requester: args.requester ?? existingRecord?.requester } : {},
+      ...args.actor ?? existingRecord?.actor ? { actor: args.actor ?? existingRecord?.actor } : {},
       ...args.resumeReason ? { resumeReason: args.resumeReason } : {},
       ...args.errorMessage ? { errorMessage: args.errorMessage } : {},
       ...args.resumedFromSliceId !== void 0 ? { resumedFromSliceId: args.resumedFromSliceId } : {},
@@ -1112,7 +1270,7 @@ async function recordAgentTurnSessionSummary(args) {
     ...args.cumulativeUsage ?? existing?.cumulativeUsage ? { cumulativeUsage: args.cumulativeUsage ?? existing?.cumulativeUsage } : {},
     ...args.destination ?? existing?.destination ? { destination: args.destination ?? existing?.destination } : {},
     ...args.source ?? existing?.source ? { source: args.source ?? existing?.source } : {},
-    ...args.requester ?? existing?.requester ? { requester: args.requester ?? existing?.requester } : {},
+    ...args.actor ?? existing?.actor ? { actor: args.actor ?? existing?.actor } : {},
     ...Array.isArray(args.loadedSkillNames) ? {
       loadedSkillNames: args.loadedSkillNames.filter(
         (value) => typeof value === "string"
@@ -1195,8 +1353,10 @@ function getInterruptionMarker() {
 
 export {
   piContentMessageSchema,
+  instructionActors,
   loadActivityEntries,
   loadProjection,
+  loadProjectionWithProvenance,
   loadConnectedMcpProviders,
   recordMcpProviderConnected,
   recordAuthorizationRequested,
@@ -1205,7 +1365,8 @@ export {
   recordSubagentStarted,
   recordSubagentEnded,
   commitMessages,
-  escapeXml,
+  instructionProvenanceFor,
+  contextProvenance,
   getAgentTurnSessionRecord,
   upsertAgentTurnSessionRecord,
   recordAgentTurnSessionSummary,