@sentry/junior 0.210.1 → 0.211.0

package/dist/{checkpoint-CTBVbFYq.js → checkpoint-B6jEtGHN.js}

@@ -1,12 +1,11 @@
-import { i as completeText, m as escapeXml, o as resolveGatewayModel, p as unwrapCurrentInstruction } from "./client-BvhLSDdj.js";
-import { _ as setSpanAttributes, f as logWarn, o as getActiveTraceId, t as buildTurnFailureResponse, u as logException } from "./logging-Bb_U9Vff.js";
-import { n as botConfig } from "./config-DfGsDs-7.js";
+import { i as completeText, m as escapeXml, o as resolveGatewayModel, p as unwrapCurrentInstruction } from "./client-BBPo9KiG.js";
+import { _ as setSpanAttributes, f as logWarn, o as getActiveTraceId, t as buildTurnFailureResponse, u as logException } from "./logging-CXQcqM-W.js";
+import { n as botConfig } from "./config-DMq-uJAV.js";
 import { _ as parseSlackMessageTs, f as toStoredSlackActor } from "./context-Bplcgypl.js";
-import { Bt as authenticationUnlinkedEvent, Ht as getConversationEventStore, Jt as withConversationEventLock, Kt as getSqlExecutor, Lt as JUNIOR_NATIVE_EVENT_NAMESPACE, Qt as bindProviderConversation, Rt as agentsInstructionsUpdatedEvent, Wt as getConversationStore, Yt as sanitizePostgresJson, qt as createSqlConversationEventStore, zt as authenticationLinkedEvent } from "./agent-hooks-CbFeRDRP.js";
+import { Bt as authenticationUnlinkedEvent, Ht as getConversationEventStore, Jt as withConversationEventLock, Kt as getSqlExecutor, Lt as JUNIOR_NATIVE_EVENT_NAMESPACE, Qt as bindProviderConversation, Rt as agentsInstructionsUpdatedEvent, Wt as getConversationStore, Yt as sanitizePostgresJson, qt as createSqlConversationEventStore, zt as authenticationLinkedEvent } from "./agent-hooks-7vR8uZw2.js";
 import { G as instructionProvenanceFor, I as agentHistoryItemSchema, U as contextProvenance, W as instructionActors } from "./conversation-AA4R1VUn.js";
-import { c as generateShortTitle, o as ToolInputError, s as fallbackShortTitle, t as addAgentTurnUsage } from "./usage-D0KzRV9P.js";
-import { A as sleep, D as fenceLock, M as SANDBOX_REPOS_ROOT, P as SANDBOX_WORKSPACE_ROOT, T as MUTATION_LOCK_TTL_MS, k as withLock, w as getStateAdapter } from "./profile-BGU13Ftr.js";
-import path from "node:path";
+import { o as fallbackShortTitle, s as generateShortTitle, t as addAgentTurnUsage } from "./usage-DHJ3ng2s.js";
+import { A as sleep, D as fenceLock, T as MUTATION_LOCK_TTL_MS, k as withLock, w as getStateAdapter } from "./profile-8K6D5LHD.js";
 import { isDeepStrictEqual } from "node:util";
 import { z } from "zod";
 import { createHash } from "node:crypto";
@@ -19,147 +18,6 @@ z.object({
 	role: z.string().min(1)
 }).passthrough().transform((value) => value);
 //#endregion
-//#region src/chat/turn-context-tag.ts
-/**
-* Canonical tag name for the runtime turn context block injected into Pi
-* messages. Shared between prompt assembly and turn context stripping to keep
-* both in sync without requiring the full prompt module.
-*/
-const TURN_CONTEXT_TAG = "runtime-turn-context";
-//#endregion
-//#region src/chat/pi/transcript.ts
-const RUNTIME_TURN_CONTEXT_START = `<${TURN_CONTEXT_TAG}>`;
-const AGENTS_INSTRUCTIONS_START = "# AGENTS.md instructions";
-function userMessageContent(message) {
-	const record = message;
-	return record.role === "user" && Array.isArray(record.content) ? record.content : void 0;
-}
-function isRuntimeTurnContextPart(part) {
-	return part !== null && typeof part === "object" && part.type === "text" && typeof part.text === "string" && (part.text.startsWith(RUNTIME_TURN_CONTEXT_START) || part.text.startsWith(AGENTS_INSTRUCTIONS_START));
-}
-function hasCurrentInstruction(message) {
-	return userMessageContent(message)?.some((part) => part !== null && typeof part === "object" && part.type === "text" && typeof part.text === "string" && part.text.includes("<current-instruction")) ?? false;
-}
-function messageTimestamp$1(message) {
-	return message.timestamp;
-}
-function isStandaloneRuntimeContextMessage(messages, index) {
-	const message = messages[index];
-	const next = messages[index + 1];
-	return Boolean(message && next && userMessageContent(message) && userMessageContent(next) && messageTimestamp$1(message) === messageTimestamp$1(next) && !hasCurrentInstruction(message) && hasCurrentInstruction(next));
-}
-const EMBEDDED_THREAD_CONTEXT_PATTERN = new RegExp(`<(${[
-	"thread-context",
-	"recent-thread-messages",
-	"thread-compactions",
-	"thread-transcript",
-	"thread-background"
-].join("|")})(?:\\s[^>]*)?>[\\s\\S]*</\\1>`, "g");
-/** Type guard for Pi SDK assistant messages. */
-function isAssistantMessage(value) {
-	return typeof value === "object" && value !== null && value.role === "assistant";
-}
-/** Type guard for Pi SDK tool result messages. */
-function isToolResultMessage(value) {
-	return typeof value === "object" && value !== null && value.role === "toolResult";
-}
-/** Check whether a tool result carries an error flag. */
-function isToolResultError(result) {
-	if (!result || typeof result !== "object") return false;
-	return Boolean(result.isError);
-}
-/** Extract the tool name from a raw tool result message. */
-function normalizeToolNameFromResult(result) {
-	if (!result || typeof result !== "object") return void 0;
-	const record = result;
-	if (typeof record.toolName === "string" && record.toolName.length > 0) return record.toolName;
-	if (typeof record.name === "string" && record.name.length > 0) return record.name;
-}
-/** Extract role string from a raw Pi message. */
-function getPiMessageRole(value) {
-	if (!value || typeof value !== "object") return;
-	const role = value.role;
-	return typeof role === "string" ? role : void 0;
-}
-/** Return whether Pi can continue directly from the current history tail. */
-function isContinuablePiBoundary(messages) {
-	const lastRole = getPiMessageRole(messages.at(-1));
-	return lastRole === "user" || lastRole === "toolResult";
-}
-/** Concatenate text content parts from an assistant message. */
-function extractAssistantText(message) {
-	return (message.content ?? []).filter((part) => part.type === "text" && typeof part.text === "string").map((part) => part.text).join("\n");
-}
-/** Return assistant messages that belong to the terminal post-tool reply phase. */
-function getTerminalAssistantMessages(messages) {
-	let lastNonAssistantIndex = -1;
-	for (let index = messages.length - 1; index >= 0; index -= 1) if (!isAssistantMessage(messages[index])) {
-		lastNonAssistantIndex = index;
-		break;
-	}
-	return messages.slice(lastNonAssistantIndex + 1).filter(isAssistantMessage);
-}
-/** Remove trailing assistant messages before committing a resumable boundary. */
-function trimTrailingAssistantMessages(messages) {
-	let end = messages.length;
-	while (end > 0 && getPiMessageRole(messages[end - 1]) === "assistant") end -= 1;
-	return end === messages.length ? [...messages] : messages.slice(0, end);
-}
-/** Return whether Pi history already carries session bootstrap context. */
-function hasRuntimeTurnContext(messages) {
-	return messages.some((message, index) => isStandaloneRuntimeContextMessage(messages, index) || userMessageContent(message)?.some(isRuntimeTurnContextPart));
-}
-/** Keep only volatile bootstrap messages needed by an in-turn context replacement. */
-function retainRuntimeTurnContext(messages) {
-	return messages.flatMap((message, index) => {
-		if (isStandaloneRuntimeContextMessage(messages, index)) return [message];
-		const runtimeContent = userMessageContent(message)?.filter(isRuntimeTurnContextPart) ?? [];
-		return runtimeContent.length > 0 ? [{
-			...message,
-			content: runtimeContent
-		}] : [];
-	});
-}
-/**
-* Reduce a runtime user-turn prompt to only the current turn's instruction.
-*
-* Live user prompts embed prior-thread context as `<thread-context
-* authority="evidence-only">` (or legacy transcript/background blocks) beside
-* the `<current-instruction>` block. Those blocks hold other participants'
-* verbatim messages, so completed-run projections consumed by plugins must
-* expose only the instruction authored by this turn's actor — otherwise
-* per-entry provenance can be defeated by reading another user's text out of an
-* instruction-authority entry. Prior thread context is projected separately as
-* per-author context-authority entries, so dropping it here is non-lossy for
-* plugins. This is projection-only; it never touches what the model sees during
-* a live run.
-*/
-function instructionTextForProjection(text) {
-	const withoutContext = text.replace(EMBEDDED_THREAD_CONTEXT_PATTERN, "").trim();
-	return unwrapCurrentInstruction(withoutContext) ?? withoutContext;
-}
-/** Return the projected instruction text carried by one user message. */
-function getUserMessageInstructionText(message) {
-	if (getPiMessageRole(message) !== "user") return "";
-	const content = message.content;
-	return instructionTextForProjection(typeof content === "string" ? content : Array.isArray(content) ? content.flatMap((part) => part && typeof part === "object" && part.type === "text" && typeof part.text === "string" ? [part.text] : []).join("\n") : "").trim();
-}
-/** Remove volatile runtime context before reusing messages as history. */
-function stripRuntimeTurnContext(messages) {
-	return messages.flatMap((message, index) => {
-		if (isStandaloneRuntimeContextMessage(messages, index)) return [];
-		const content = userMessageContent(message);
-		if (!content) return [message];
-		const nextContent = content.filter((part) => !isRuntimeTurnContextPart(part));
-		if (nextContent.length === content.length) return [message];
-		if (nextContent.length === 0) return [];
-		return [{
-			...message,
-			content: nextContent
-		}];
-	});
-}
-//#endregion
 //#region src/chat/pi/conversation-events.ts
 function authorizationObservationMessage(data, createdAtMs) {
 	const label = data.kind === "mcp" ? "MCP authorization" : "Authorization";
@@ -172,9 +30,6 @@ function authorizationObservationMessage(data, createdAtMs) {
 		timestamp: createdAtMs
 	});
 }
-function durableMessages(message) {
-	return stripRuntimeTurnContext([message]);
-}
 /** Translate one Pi message into Junior's native durable history item. */
 function historyItemFromPiMessage(message, provenance) {
 	const { role, ...fields } = piMessageSchema.parse(message);
@@ -239,7 +94,8 @@ function projectConversationEvents(events, options) {
 		if (event.data.type === "compaction" || event.data.type === "handoff") {
 			modelProfile = event.data.modelProfile;
 			replacementSeq = event.seq;
-			for (const replacement of event.data.replacementHistory) for (const message of durableMessages(piMessageFromHistoryItem(replacement.item))) {
+			for (const replacement of event.data.replacementHistory) {
+				const message = piMessageFromHistoryItem(replacement.item);
 				messages.push(message);
 				provenance.push(historyItemProvenance(replacement.item));
 				seqs.push(replacement.sourceEventSeq ?? event.seq);
@@ -247,11 +103,10 @@ function projectConversationEvents(events, options) {
 			continue;
 		}
 		if (event.data.type === "user_message" || event.data.type === "assistant_message" || event.data.type === "tool_result") {
-			for (const message of durableMessages(piMessageFromHistoryItem(event.data))) {
-				messages.push(message);
-				provenance.push(historyItemProvenance(event.data));
-				seqs.push(event.seq);
-			}
+			const message = piMessageFromHistoryItem(event.data);
+			messages.push(message);
+			provenance.push(historyItemProvenance(event.data));
+			seqs.push(event.seq);
 			continue;
 		}
 		if (event.data.type === "authorization_completed") {
@@ -274,7 +129,7 @@ const COMPACTION_TRIGGER_RATIO = .9;
 const CONTEXT_INPUT_LIMIT_RATIO = .95;
 const COMPACTION_TARGET_RATIO = .8;
 const FALLBACK_CONTEXT_WINDOW_TOKENS = 4e5;
-function positiveInteger$1(value, fallback) {
+function positiveInteger(value, fallback) {
 	return Number.isFinite(value) && value > 0 ? Math.floor(value) : fallback;
 }
 /** Estimate text tokens with the shared coarse heuristic used for local budgets. */
@@ -283,12 +138,12 @@ function estimateTextTokens(text) {
 }
 /** Derive the automatic compaction threshold from model context capacity. */
 function calculateContextCompactionTriggerTokens(model) {
-	const contextWindow = positiveInteger$1(model.contextWindow, FALLBACK_CONTEXT_WINDOW_TOKENS);
+	const contextWindow = positiveInteger(model.contextWindow, FALLBACK_CONTEXT_WINDOW_TOKENS);
 	return Math.max(1, Math.floor(contextWindow * COMPACTION_TRIGGER_RATIO));
 }
 /** Derive the maximum estimated input size with room for uncounted request overhead. */
 function calculateContextInputLimitTokens(model) {
-	const contextWindow = positiveInteger$1(model.contextWindow, FALLBACK_CONTEXT_WINDOW_TOKENS);
+	const contextWindow = positiveInteger(model.contextWindow, FALLBACK_CONTEXT_WINDOW_TOKENS);
 	return Math.max(1, Math.floor(contextWindow * CONTEXT_INPUT_LIMIT_RATIO));
 }
 /** Derive the post-compaction target from the automatic trigger threshold. */
@@ -297,7 +152,7 @@ function calculateContextCompactionTargetTokens(triggerTokens) {
 }
 /** Cap one model's advertised context capacity with the host bot configuration. */
 function getModelContextBudget(modelId) {
-	const advertisedContextWindow = positiveInteger$1(resolveGatewayModel(modelId).contextWindow, FALLBACK_CONTEXT_WINDOW_TOKENS);
+	const advertisedContextWindow = positiveInteger(resolveGatewayModel(modelId).contextWindow, FALLBACK_CONTEXT_WINDOW_TOKENS);
 	return { contextWindow: Math.min(botConfig.contextWindowTokens, advertisedContextWindow) };
 }
 /** Resolve the automatic compaction threshold for the active agent model. */
@@ -987,7 +842,7 @@ async function loadTurnProjection(args) {
 async function loadConnectedMcpProviders(args) {
 	return connectedMcpProvidersFromEvents(await getConversationEventStore().loadHistory(args.conversationId), args.credentialSubjectId);
 }
-function messageTimestamp(message) {
+function messageTimestamp$1(message) {
 	const timestamp = message.timestamp;
 	return typeof timestamp === "number" ? timestamp : Date.now();
 }
@@ -1019,7 +874,7 @@ async function commitAcceptedReply(args) {
 			await createSqlConversationEventStore(executor).append(args.conversationId, [{
 				idempotencyKey: `message:${args.conversationMessageId}:agent`,
 				data: historyItemFromPiMessage(agentMessage, contextProvenance),
-				createdAtMs: messageTimestamp(agentMessage)
+				createdAtMs: messageTimestamp$1(agentMessage)
 			}]);
 		}
 		await appendConversationMessages(createSqlConversationEventStore(executor), {
@@ -1037,7 +892,7 @@ async function commitMessagesLocked(args, executor) {
 	const eventStore = createSqlConversationEventStore(executor);
 	const currentEvents = await eventStore.loadCurrentHistory(args.conversationId);
 	const current = projectConversationEvents(currentEvents, { defaultProfile: botConfig.defaultProfile });
-	const nextLocalMessages = stripRuntimeTurnContext(args.messages).map(normalizeDurableMessage);
+	const nextLocalMessages = args.messages.map(normalizeDurableMessage);
 	const matchingPrefix = countDurablePrefix(current.messages, nextLocalMessages);
 	const nextLocalProvenance = resolveCommitProvenance({
 		existing: current,
@@ -1064,7 +919,7 @@ async function commitMessagesLocked(args, executor) {
 		})) ?? [];
 		const appendedEvents = await eventStore.append(args.conversationId, [...newMessages.map((message, index) => ({
 			data: historyItemFromPiMessage(message, nextLocalProvenance[matchingPrefix + index]),
-			createdAtMs: messageTimestamp(message)
+			createdAtMs: messageTimestamp$1(message)
 		})), ...turnContextEvents]);
 		const cursor = appendedEvents.at(-1) ?? currentEvents.at(-1);
 		return {
@@ -1304,341 +1159,145 @@ async function recordGuardianActionReviewed(args) {
 	}]);
 }
 //#endregion
-//#region src/chat/tools/sandbox/file-utils.ts
-const MAX_TEXT_CHARS = 6e4;
-const RIPGREP_EXCLUDED_GLOBS = ["!**/.git/**", "!**/node_modules/**"];
-const DEFAULT_SEARCH_COMMAND_TIMEOUT_MS = 3e4;
-const SKIPPED_DIRECTORIES = /* @__PURE__ */ new Set([".git", "node_modules"]);
-/** Normalize model-supplied numeric knobs before they reach filesystem tools. */
-function positiveInteger(value) {
-	if (typeof value !== "number" || !Number.isFinite(value)) return;
-	const integer = Math.floor(value);
-	return integer > 0 ? integer : void 0;
-}
-/** Compare and slice text in one line-ending space while preserving callers' output rules. */
-function normalizeToLf(value) {
-	return value.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-}
-/** Keep tool output inside the model-facing budget with an explicit notice. */
-function truncateText(value, maxChars = MAX_TEXT_CHARS) {
-	if (value.length <= maxChars) return {
-		content: value,
-		truncated: false
-	};
-	const removed = value.length - maxChars;
-	return {
-		content: `${value.slice(0, maxChars)}\n\n[output truncated: ${removed} characters removed]`,
-		truncated: true
-	};
+//#region src/chat/turn-context-tag.ts
+/**
+* Canonical tag name for the runtime turn context block injected into Pi
+* messages. Shared between prompt assembly and turn context stripping to keep
+* both in sync without requiring the full prompt module.
+*/
+const TURN_CONTEXT_TAG = "runtime-turn-context";
+//#endregion
+//#region src/chat/pi/transcript.ts
+const RUNTIME_TURN_CONTEXT_START = `<${TURN_CONTEXT_TAG}>`;
+const AGENTS_INSTRUCTIONS_START = "# AGENTS.md instructions";
+function userMessageContent(message) {
+	const record = message;
+	return record.role === "user" && Array.isArray(record.content) ? record.content : void 0;
 }
-/** Detect model-facing missing paths without swallowing sandbox lifecycle/API failures. */
-function isMissingPathError(error) {
-	if (!error || typeof error !== "object") return false;
-	const candidate = error;
-	if (candidate.code === "ENOENT") return true;
-	return typeof candidate.message === "string" && candidate.message.startsWith("File not found:");
-}
-/** Reject an expected missing search/list path through the tool-error channel. */
-function missingPathSearchResult(params) {
-	const textPath = params.displayPath ?? params.missingPath ?? params.path;
-	throw new ToolInputError(`Path not found: ${textPath}`);
-}
-function escapeRegExp(value) {
-	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function globToRegExp(pattern) {
-	let source = "";
-	for (let index = 0; index < pattern.length; index += 1) {
-		const char = pattern[index];
-		const next = pattern[index + 1];
-		if (char === "*" && next === "*") {
-			if (pattern[index + 2] === "/") {
-				source += "(?:.*/)?";
-				index += 2;
-				continue;
-			}
-			source += ".*";
-			index += 1;
-			continue;
-		}
-		if (char === "*") {
-			source += "[^/]*";
-			continue;
-		}
-		if (char === "?") {
-			source += "[^/]";
-			continue;
-		}
-		source += escapeRegExp(char);
-	}
-	return new RegExp(`^${source}$`);
-}
-function matchesGlob(relativePath, pattern) {
-	const matcher = globToRegExp(pattern);
-	if (matcher.test(relativePath)) return true;
-	if (pattern.startsWith("**/") && matchesGlob(relativePath, pattern.slice(3))) return true;
-	return !pattern.includes("/") && matcher.test(path.posix.basename(relativePath));
-}
-/** Keep sandbox filesystem tools scoped to the mounted workspace root. */
-function resolveWorkspacePath(input, fallback = ".") {
-	const requested = (input ?? "").trim() || fallback;
-	const absolute = requested.startsWith("/") ? requested : path.posix.join(SANDBOX_WORKSPACE_ROOT, requested);
-	const normalized = path.posix.normalize(absolute);
-	if (normalized !== SANDBOX_WORKSPACE_ROOT && !normalized.startsWith(`${SANDBOX_WORKSPACE_ROOT}/`)) throw new ToolInputError(`Path must stay within ${SANDBOX_WORKSPACE_ROOT}: ${requested}`);
-	return normalized;
-}
-/** Anchor ripgrep paths and globs to the requested search root. */
-function getRipgrepSearchLocation(root, rootIsDirectory) {
-	if (rootIsDirectory) return {
-		cwd: root,
-		target: "."
-	};
-	return {
-		cwd: path.posix.dirname(root),
-		target: path.posix.basename(root)
-	};
+function isRuntimeTurnContextPart(part) {
+	return part !== null && typeof part === "object" && part.type === "text" && typeof part.text === "string" && (part.text.startsWith(RUNTIME_TURN_CONTEXT_START) || part.text.startsWith(AGENTS_INSTRUCTIONS_START));
 }
-/** Share bounded workspace traversal across search tools so their skip rules stay aligned. */
-async function collectFiles(params) {
-	const files = [];
-	let limitReached = false;
-	let missingPath;
-	const visit = async (dirPath) => {
-		if (missingPath) return;
-		let entries;
-		try {
-			entries = (await params.fs.readdir(dirPath)).sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
-		} catch (error) {
-			if (isMissingPathError(error)) {
-				missingPath = dirPath;
-				return;
-			}
-			throw error;
-		}
-		for (const entry of entries) {
-			const fullPath = path.posix.join(dirPath, entry);
-			let stat;
-			try {
-				stat = await params.fs.stat(fullPath);
-			} catch (error) {
-				if (isMissingPathError(error)) {
-					missingPath = fullPath;
-					return;
-				}
-				throw error;
-			}
-			if (stat.isDirectory()) {
-				if (!SKIPPED_DIRECTORIES.has(entry)) await visit(fullPath);
-				if (limitReached) return;
-				continue;
-			}
-			const relativePath = path.posix.relative(params.root, fullPath);
-			if (!params.pattern || matchesGlob(relativePath, params.pattern)) {
-				files.push(fullPath);
-				if (params.limit && files.length >= params.limit) {
-					limitReached = true;
-					return;
-				}
-			}
-		}
-	};
-	let stat;
-	try {
-		stat = await params.fs.stat(params.root);
-	} catch (error) {
-		if (isMissingPathError(error)) return {
-			files,
-			limitReached: false,
-			missingPath: params.root,
-			missingRoot: true
-		};
-		throw error;
-	}
-	if (!stat.isDirectory()) {
-		const relativePath = path.posix.basename(params.root);
-		return {
-			files: !params.pattern || matchesGlob(relativePath, params.pattern) ? [params.root] : [],
-			limitReached: false,
-			missingRoot: false
-		};
-	}
-	await visit(params.root);
-	return {
-		files,
-		limitReached,
-		missingPath,
-		missingRoot: missingPath === params.root
-	};
+function hasCurrentInstruction(message) {
+	return userMessageContent(message)?.some((part) => part !== null && typeof part === "object" && part.type === "text" && typeof part.text === "string" && part.text.includes("<current-instruction")) ?? false;
 }
-//#endregion
-//#region src/chat/repository-instructions.ts
-const AGENTS_FILENAME = "AGENTS.md";
-const MAX_REPOSITORY_INSTRUCTIONS_BYTES = 32768;
-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) {
-	try {
-		await fs.stat(target);
-		return true;
-	} catch (error) {
-		if (isMissingPathError(error)) return false;
-		throw error;
-	}
+function messageTimestamp(message) {
+	return message.timestamp;
 }
-async function directoryExists(fs, target) {
-	try {
-		return (await fs.stat(target)).isDirectory();
-	} catch (error) {
-		if (isMissingPathError(error)) return false;
-		throw error;
-	}
+function isStandaloneRuntimeContextMessage(messages, index) {
+	const message = messages[index];
+	const next = messages[index + 1];
+	return Boolean(message && next && userMessageContent(message) && userMessageContent(next) && messageTimestamp(message) === messageTimestamp(next) && !hasCurrentInstruction(message) && hasCurrentInstruction(next));
 }
-async function findGitRoot(fs, cwd) {
-	let current = cwd;
-	for (;;) {
-		if (await pathExists(fs, path.posix.join(current, ".git"))) return current;
-		if (current === SANDBOX_WORKSPACE_ROOT) return;
-		const parent = path.posix.dirname(current);
-		if (parent === current || parent !== SANDBOX_WORKSPACE_ROOT && !parent.startsWith(`${SANDBOX_WORKSPACE_ROOT}/`)) return;
-		current = parent;
-	}
+const EMBEDDED_THREAD_CONTEXT_PATTERN = new RegExp(`<(${[
+	"thread-context",
+	"recent-thread-messages",
+	"thread-compactions",
+	"thread-transcript",
+	"thread-background"
+].join("|")})(?:\\s[^>]*)?>[\\s\\S]*</\\1>`, "g");
+/** Type guard for Pi SDK assistant messages. */
+function isAssistantMessage(value) {
+	return typeof value === "object" && value !== null && value.role === "assistant";
 }
-/** Return Git worktrees under repos/, sorted for stable instruction capture. */
-async function listRepositoryDirectories(fs) {
-	if (!await directoryExists(fs, SANDBOX_REPOS_ROOT)) return [];
-	const entries = await fs.readdir(SANDBOX_REPOS_ROOT);
-	const repositories = [];
-	for (const entry of entries) {
-		const candidate = path.posix.join(SANDBOX_REPOS_ROOT, entry);
-		if (await directoryExists(fs, candidate) && await pathExists(fs, path.posix.join(candidate, ".git"))) repositories.push(candidate);
-	}
-	return repositories.sort((left, right) => left < right ? -1 : left > right ? 1 : 0);
+/** Type guard for Pi SDK tool result messages. */
+function isToolResultMessage(value) {
+	return typeof value === "object" && value !== null && value.role === "toolResult";
 }
-async function readInstructionFile(fs, filePath) {
-	try {
-		const content = await fs.readFile(filePath, { encoding: "utf8" });
-		return content.trim() ? content : void 0;
-	} catch (error) {
-		if (isMissingPathError(error)) return;
-		throw error;
-	}
+/** Check whether a tool result carries an error flag. */
+function isToolResultError(result) {
+	if (!result || typeof result !== "object") return false;
+	return Boolean(result.isError);
 }
-/** 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;
-	const directories = [];
-	let current = args.cwd;
-	for (;;) {
-		directories.push(current);
-		if (current === gitRoot) break;
-		current = path.posix.dirname(current);
-	}
-	directories.reverse();
-	const sources = [];
-	let remaining = Math.max(0, args.maxBytes ?? MAX_REPOSITORY_INSTRUCTIONS_BYTES);
-	for (const directory of directories) {
-		if (remaining <= 0) break;
-		const filePath = path.posix.join(directory, AGENTS_FILENAME);
-		const content = await readInstructionFile(args.fs, filePath);
-		if (!content) continue;
-		const bytes = Buffer.from(content, "utf8");
-		const bounded = bytes.length <= remaining ? content : bytes.subarray(0, remaining).toString("utf8");
-		sources.push({
-			content: bounded,
-			path: filePath
-		});
-		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 {
-		directory: args.cwd,
-		fingerprint,
-		sources,
-		text
-	};
+/** Extract the tool name from a raw tool result message. */
+function normalizeToolNameFromResult(result) {
+	if (!result || typeof result !== "object") return void 0;
+	const record = result;
+	if (typeof record.toolName === "string" && record.toolName.length > 0) return record.toolName;
+	if (typeof record.name === "string" && record.name.length > 0) return record.name;
 }
-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");
+/** Extract role string from a raw Pi message. */
+function getPiMessageRole(value) {
+	if (!value || typeof value !== "object") return;
+	const role = value.role;
+	return typeof role === "string" ? role : void 0;
 }
-/** 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);
-	return {
-		fingerprint: createHash("sha256").update(JSON.stringify({
-			directories: bundles.map((bundle) => bundle.directory ?? null),
-			sources
-		})).digest("hex"),
-		sources,
-		text
-	};
+/** Return whether Pi can continue directly from the current history tail. */
+function isContinuablePiBoundary(messages) {
+	const lastRole = getPiMessageRole(messages.at(-1));
+	return lastRole === "user" || lastRole === "toolResult";
 }
-/** Resolve AGENTS.md instructions for each selected repository directory. */
-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 = [];
-	for (const directory of uniqueDirectories) {
-		if (remaining <= 0) break;
-		const instructions = await resolveRepositoryInstructions({
-			cwd: directory,
-			fs: args.fs,
-			maxBytes: remaining
-		});
-		if (!instructions) continue;
-		bundles.push(instructions);
-		remaining -= instructions.sources.reduce((total, source) => total + Buffer.byteLength(source.content, "utf8"), 0);
+/** Concatenate text content parts from an assistant message. */
+function extractAssistantText(message) {
+	return (message.content ?? []).filter((part) => part.type === "text" && typeof part.text === "string").map((part) => part.text).join("\n");
+}
+/** Return assistant messages that belong to the terminal post-tool reply phase. */
+function getTerminalAssistantMessages(messages) {
+	let lastNonAssistantIndex = -1;
+	for (let index = messages.length - 1; index >= 0; index -= 1) if (!isAssistantMessage(messages[index])) {
+		lastNonAssistantIndex = index;
+		break;
 	}
-	return mergeRepositoryInstructions(bundles);
+	return messages.slice(lastNonAssistantIndex + 1).filter(isAssistantMessage);
 }
-/** Render repository instructions with Codex's exact model-visible wrapper. */
-function renderAgentsInstructions(args) {
-	return `# AGENTS.md instructions${args.directory ? ` for ${args.directory}` : ""}\n\n<INSTRUCTIONS>\n${args.text}\n</INSTRUCTIONS>`;
+/** Remove trailing assistant messages before committing a resumable boundary. */
+function trimTrailingAssistantMessages(messages) {
+	let end = messages.length;
+	while (end > 0 && getPiMessageRole(messages[end - 1]) === "assistant") end -= 1;
+	return end === messages.length ? [...messages] : messages.slice(0, end);
 }
-/** Build one user-role repository-instructions context message. */
-function buildAgentsInstructionsMessage(args) {
-	return {
-		role: "user",
-		content: [{
-			type: "text",
-			text: renderAgentsInstructions(args)
-		}],
-		timestamp: args.timestamp ?? Date.now()
-	};
+/** Return whether Pi history already carries session bootstrap context. */
+function hasRuntimeTurnContext(messages) {
+	return messages.some((message, index) => isStandaloneRuntimeContextMessage(messages, index) || userMessageContent(message)?.some(isRuntimeTurnContextPart));
 }
-/** Read the latest effective AGENTS.md state from model-visible history. */
-function findVisibleAgentsInstructions(messages) {
-	for (let messageIndex = messages.length - 1; messageIndex >= 0; messageIndex -= 1) {
-		const message = messages[messageIndex];
-		if (message.role !== "user" || !Array.isArray(message.content)) continue;
-		for (let partIndex = message.content.length - 1; partIndex >= 0; partIndex -= 1) {
-			const part = message.content[partIndex];
-			if (part.type !== "text" || typeof part.text !== "string" || !part.text.startsWith("# AGENTS.md instructions")) continue;
-			const match = part.text.match(/^# AGENTS\.md instructions(?: for ([^\n]+))?\n\n<INSTRUCTIONS>\n([\s\S]*)\n<\/INSTRUCTIONS>$/);
-			if (!match) continue;
-			let text = match[2];
-			if (text === "The previously provided AGENTS.md instructions no longer apply.") return { active: false };
-			if (text.startsWith(`These AGENTS.md instructions replace all previously provided AGENTS.md instructions.\n\n`)) text = text.slice(86);
-			return {
-				active: true,
-				...match[1] ? { directory: match[1] } : void 0,
-				text
-			};
-		}
-	}
+/** Keep only volatile bootstrap messages needed by an in-turn context replacement. */
+function retainRuntimeTurnContext(messages) {
+	return messages.flatMap((message, index) => {
+		if (isStandaloneRuntimeContextMessage(messages, index)) return [message];
+		const runtimeContent = userMessageContent(message)?.filter(isRuntimeTurnContextPart) ?? [];
+		return runtimeContent.length > 0 ? [{
+			...message,
+			content: runtimeContent
+		}] : [];
+	});
+}
+/**
+* Reduce a runtime user-turn prompt to only the current turn's instruction.
+*
+* Live user prompts embed prior-thread context as `<thread-context
+* authority="evidence-only">` (or legacy transcript/background blocks) beside
+* the `<current-instruction>` block. Those blocks hold other participants'
+* verbatim messages, so completed-run projections consumed by plugins must
+* expose only the instruction authored by this turn's actor — otherwise
+* per-entry provenance can be defeated by reading another user's text out of an
+* instruction-authority entry. Prior thread context is projected separately as
+* per-author context-authority entries, so dropping it here is non-lossy for
+* plugins. This is projection-only; it never touches what the model sees during
+* a live run.
+*/
+function instructionTextForProjection(text) {
+	const withoutContext = text.replace(EMBEDDED_THREAD_CONTEXT_PATTERN, "").trim();
+	return unwrapCurrentInstruction(withoutContext) ?? withoutContext;
+}
+/** Return the projected instruction text carried by one user message. */
+function getUserMessageInstructionText(message) {
+	if (getPiMessageRole(message) !== "user") return "";
+	const content = message.content;
+	return instructionTextForProjection(typeof content === "string" ? content : Array.isArray(content) ? content.flatMap((part) => part && typeof part === "object" && part.type === "text" && typeof part.text === "string" ? [part.text] : []).join("\n") : "").trim();
 }
-/** Whether one message is a generated AGENTS.md context update. */
-function isAgentsInstructionsMessage(message) {
-	return Boolean(findVisibleAgentsInstructions([message]));
+/** Remove runtime context from a non-model projection or explicit replacement. */
+function stripRuntimeTurnContext(messages) {
+	return messages.flatMap((message, index) => {
+		if (isStandaloneRuntimeContextMessage(messages, index)) return [];
+		const content = userMessageContent(message);
+		if (!content) return [message];
+		const nextContent = content.filter((part) => !isRuntimeTurnContextPart(part));
+		if (nextContent.length === content.length) return [message];
+		if (nextContent.length === 0) return [];
+		return [{
+			...message,
+			content: nextContent
+		}];
+	});
 }
 //#endregion
 //#region src/chat/services/turn-limit.ts
@@ -1893,8 +1552,7 @@ async function recordConversationActivityMetadata(args) {
 		visibility: hasParent ? void 0 : args.destinationVisibility
 	});
 }
-function materializeTurnRecord(stored, piProjection, turnStartMessageIndex, restoreVolatileContext = true, runtimeMetrics) {
-	const restoredProjection = restoreVolatileContext && (stored.state === "running" || stored.state === "paused") ? restoreRuntimeContext(piProjection, stored.runtimeContext) : piProjection;
+function materializeTurnRecord(stored, piProjection, turnStartMessageIndex, runtimeMetrics) {
 	return {
 		...definedProps$1({ actor: stored.actor }),
 		schemaVersion: stored.schemaVersion,
@@ -1906,8 +1564,8 @@ function materializeTurnRecord(stored, piProjection, turnStartMessageIndex, rest
 		startedAtMs: stored.startedAtMs,
 		lastProgressAtMs: stored.lastProgressAtMs,
 		updatedAtMs: stored.updatedAtMs,
-		piMessages: restoredProjection.messages,
-		piMessageProvenance: restoredProjection.provenance,
+		piMessages: piProjection.messages,
+		piMessageProvenance: piProjection.provenance,
 		actors: instructionActors(piProjection.provenance),
 		cumulativeDurationMs: runtimeMetrics?.cumulativeDurationMs ?? 0,
 		...definedProps$1({
@@ -1927,37 +1585,6 @@ function materializeTurnRecord(stored, piProjection, turnStartMessageIndex, rest
 		})
 	};
 }
-function restoreRuntimeContext(projection, runtimeContext) {
-	if (!runtimeContext || runtimeContext.length === 0) return projection;
-	const restoredMessages = [...projection.messages];
-	const restoredProvenance = [...projection.provenance];
-	const unmatchedRuntimeContext = [];
-	for (const runtimeMessage of runtimeContext) {
-		const runtime = runtimeMessage;
-		const targetIndex = restoredMessages.findIndex((message) => {
-			const candidate = message;
-			return candidate.role === "user" && candidate.timestamp === runtime.timestamp;
-		});
-		if (targetIndex < 0) {
-			if (isAgentsInstructionsMessage(runtimeMessage)) {
-				const followingIndex = restoredMessages.findIndex((message) => {
-					const timestamp = message.timestamp;
-					return typeof runtime.timestamp === "number" && typeof timestamp === "number" && timestamp > runtime.timestamp;
-				});
-				const insertionIndex = followingIndex < 0 ? restoredMessages.length : followingIndex;
-				restoredMessages.splice(insertionIndex, 0, runtimeMessage);
-				restoredProvenance.splice(insertionIndex, 0, contextProvenance);
-			} else unmatchedRuntimeContext.push(runtimeMessage);
-			continue;
-		}
-		restoredMessages.splice(targetIndex, 0, runtimeMessage);
-		restoredProvenance.splice(targetIndex, 0, contextProvenance);
-	}
-	return {
-		messages: [...unmatchedRuntimeContext, ...restoredMessages],
-		provenance: [...unmatchedRuntimeContext.map(() => contextProvenance), ...restoredProvenance]
-	};
-}
 /** Read only the stored metadata record without materializing transcript logs. */
 async function getStoredTurnRecord(conversationId, turnId) {
 	const stateAdapter = getStateAdapter();
@@ -1982,7 +1609,7 @@ async function materializeStoredTurnRecord(conversationId, turnId, followCurrent
 	const turnStartMessageIndex = followsReplacement ? 0 : parsed.turnStartSeq === void 0 ? void 0 : piProjection.seqs.filter((seq) => seq <= parsed.turnStartSeq).length;
 	const conversation = await getConversationStore().get({ conversationId });
 	const executionMetrics = executionMetricsForTurn(conversation, turnId);
-	return materializeTurnRecord(parsed, piProjection, turnStartMessageIndex, !followsReplacement && (parsed.historyVersion === void 0 || parsed.historyVersion === currentHistoryVersion), {
+	return materializeTurnRecord(parsed, piProjection, turnStartMessageIndex, {
 		channelName: conversation?.channelName,
 		cumulativeDurationMs: executionMetrics?.durationMs,
 		cumulativeUsage: executionMetrics?.usage
@@ -2022,7 +1649,6 @@ function buildStoredRecord(args) {
 			source: args.source,
 			resultMessageId: args.resultMessageId,
 			resumedFromSliceId: args.resumedFromSliceId,
-			runtimeContext: args.runtimeContext && args.runtimeContext.length > 0 ? args.runtimeContext : void 0,
 			surface: args.surface,
 			traceId: args.traceId,
 			turnStartSeq: args.turnStartSeq
@@ -2054,7 +1680,7 @@ async function setStoredRecord(args) {
 	return materializeTurnRecord(storedRecord, {
 		messages: [...args.piMessages],
 		provenance: [...args.piMessageProvenance]
-	}, args.turnStartMessageIndex, true, args.runtimeMetrics);
+	}, args.turnStartMessageIndex, args.runtimeMetrics);
 }
 /**
 * Transition an unfinished turn only if the caller still holds the
@@ -2127,9 +1753,7 @@ async function upsertTurnRecordLocked(args, fence) {
 			turnId: args.turnId
 		} } : void 0
 	});
-	const durableTurnStartMessageIndex = args.turnStartMessageIndex === void 0 ? void 0 : stripRuntimeTurnContext(args.piMessages.slice(0, args.turnStartMessageIndex)).length;
-	const runtimeContext = retainRuntimeTurnContext(args.piMessages);
-	const retainedRuntimeContext = runtimeContext.length > 0 ? runtimeContext : existingRecord?.historyVersion === commit.historyVersion ? existingRecord.runtimeContext : void 0;
+	const durableTurnStartMessageIndex = args.turnStartMessageIndex;
 	const turnStartSeq = durableTurnStartMessageIndex === void 0 ? existingRecord?.turnStartSeq : durableTurnStartMessageIndex <= 0 ? -1 : commit.messageSeqs[durableTurnStartMessageIndex - 1] ?? commit.committedSeq;
 	const turnStartMessageIndex = durableTurnStartMessageIndex ?? (turnStartSeq === void 0 ? void 0 : commit.messageSeqs.filter((seq) => seq <= turnStartSeq).length);
 	const turnSource = args.source ?? existingRecord?.source;
@@ -2173,7 +1797,6 @@ async function upsertTurnRecordLocked(args, fence) {
 				source: args.source ?? existingRecord?.source,
 				resultMessageId: args.resultMessageId ?? existingRecord?.resultMessageId,
 				resumedFromSliceId: args.resumedFromSliceId,
-				runtimeContext: args.state === "running" || args.state === "paused" ? retainedRuntimeContext : void 0,
 				startedAtMs: existingRecord?.startedAtMs,
 				surface: args.surface ?? existingRecord?.surface,
 				traceId: args.traceId ?? existingRecord?.traceId,
@@ -2448,4 +2071,4 @@ async function saveDone(args) {
 	});
 }
 //#endregion
-export { persistConversationMessages as $, normalizeToLf as A, retainRuntimeTurnContext as At, openConversationProjection as B, DEFAULT_SEARCH_COMMAND_TIMEOUT_MS as C, hasRuntimeTurnContext as Ct, getRipgrepSearchLocation as D, isToolResultError as Dt, collectFiles as E, isContinuablePiBoundary as Et, commitMessages as F, recordAuthorizationRequested as G, recordAttachmentsDelivered as H, loadConnectedMcpProviders as I, recordSubscribedReplyRoute as J, recordGuardianActionReviewed as K, loadConversationProjection as L, resolveWorkspacePath as M, trimTrailingAssistantMessages as Mt, truncateText as N, TURN_CONTEXT_TAG as Nt, isMissingPathError as O, isToolResultMessage as Ot, commitAcceptedReply as P, hydrateConversationMessages as Q, loadProjection as R, resolveRepositoryInstructionsForDirectories as S, getUserMessageInstructionText as St, RIPGREP_EXCLUDED_GLOBS as T, isAssistantMessage as Tt, recordAuthenticationLinked as U, recordAgentsInstructionsUpdated as V, recordAuthorizationCompleted as W, recordTurnRoute as X, recordToolExecutionStarted as Y, appendConversationMessages as Z, AGENTS_REPLACEMENT_NOTICE as _, historyItemFromPiMessage as _t, completeTurnRecord as a, createConversationMemoryService as at, listRepositoryDirectories as b, getPiMessageRole as bt, getTurnRecordForResume as c, isHumanConversationMessage as ct, persistWithRetry as d, recordDeliveredAssistantMessage as dt, projectConversationMessages as et, TurnSliceLimitExceededError as f, turnHasReply as ft, AGENTS_REMOVAL_NOTICE as g, getAgentContextInputLimitTokens as gt, isTurnExecutionLimitExceededError as h, getAgentContextCompactionTriggerTokens as ht, abandonTurnRecord as i, buildConversationContext as it, positiveInteger as j, stripRuntimeTurnContext as jt, missingPathSearchResult as k, normalizeToolNameFromResult as kt, listTurnSummaries as l, markConversationMessage as lt, buildTurnErrorResponse as m, estimateTextTokens as mt, loadTurnCheckpoint as n, resolveConversationTitle as nt, failTurnRecord as o, estimateConversationContextTokens as ot, assertTurnToolCallLimit as p, upsertConversationMessage as pt, recordMcpProviderConnected as q, saveTurnCheckpoint as r, appendThreadContextMessages as rt, getTurnRecord as s, getConversationMessageSlackTs as st, continuableMessages as t, persistConversationMessageSummaries as tt, recordTurnSummary as u, normalizeConversationText as ut, buildAgentsInstructionsMessage as v, piMessageFromHistoryItem as vt, MAX_TEXT_CHARS as w, instructionTextForProjection as wt, renderAgentsInstructions as x, getTerminalAssistantMessages as xt, findVisibleAgentsInstructions as y, extractAssistantText as yt, loadTurnRoute as z };
+export { resolveConversationTitle as $, TURN_CONTEXT_TAG as A, recordAuthenticationLinked as B, isContinuablePiBoundary as C, retainRuntimeTurnContext as D, normalizeToolNameFromResult as E, loadProjection as F, recordSubscribedReplyRoute as G, recordAuthorizationRequested as H, loadTurnRoute as I, appendConversationMessages as J, recordToolExecutionStarted as K, openConversationProjection as L, commitMessages as M, loadConnectedMcpProviders as N, stripRuntimeTurnContext as O, loadConversationProjection as P, persistConversationMessageSummaries as Q, recordAgentsInstructionsUpdated as R, isAssistantMessage as S, isToolResultMessage as T, recordGuardianActionReviewed as U, recordAuthorizationCompleted as V, recordMcpProviderConnected as W, persistConversationMessages as X, hydrateConversationMessages as Y, projectConversationMessages as Z, getPiMessageRole as _, completeTurnRecord as a, isHumanConversationMessage as at, hasRuntimeTurnContext as b, getTurnRecordForResume as c, recordDeliveredAssistantMessage as ct, persistWithRetry as d, estimateTextTokens as dt, appendThreadContextMessages as et, TurnSliceLimitExceededError as f, getAgentContextCompactionTriggerTokens as ft, extractAssistantText as g, isTurnExecutionLimitExceededError as h, piMessageFromHistoryItem as ht, abandonTurnRecord as i, getConversationMessageSlackTs as it, commitAcceptedReply as j, trimTrailingAssistantMessages as k, listTurnSummaries as l, turnHasReply as lt, buildTurnErrorResponse as m, historyItemFromPiMessage as mt, loadTurnCheckpoint as n, createConversationMemoryService as nt, failTurnRecord as o, markConversationMessage as ot, assertTurnToolCallLimit as p, getAgentContextInputLimitTokens as pt, recordTurnRoute as q, saveTurnCheckpoint as r, estimateConversationContextTokens as rt, getTurnRecord as s, normalizeConversationText as st, continuableMessages as t, buildConversationContext as tt, recordTurnSummary as u, upsertConversationMessage as ut, getTerminalAssistantMessages as v, isToolResultError as w, instructionTextForProjection as x, getUserMessageInstructionText as y, recordAttachmentsDelivered as z };