@xopcai/xopc 0.0.82 → 0.0.84

package/dist/src/agent/embedded/session-tool-result-guard.js

@@ -2,17 +2,58 @@ import { normalizeOptionalString } from "../../utils/string-coerce.js";
 import { emitSessionTranscriptUpdate } from "../../session/transcript-events.js";
 import { boundedJsonUtf8Bytes, firstEnumerableOwnKeys, jsonUtf8BytesOrInfinity } from "../../infra/json-utf8-bytes.js";
 import { formatContextLimitTruncationNotice } from "./tool-result-context-guard.js";
-import { truncateToolResultMessage } from "./tool-result-truncation.js";
-import { getRawSessionAppendMessage, setRawSessionAppendMessage } from "./session-raw-append-message.js";
-import { createPendingToolCallState } from "./session-tool-result-state.js";
+import { resolveLiveToolResultMaxChars, truncateToolResultMessage } from "./tool-result-truncation.js";
 import { extractToolCallsFromAssistant, extractToolResultId } from "../transcript/tool-call-id.js";
 import { makeMissingToolResult, sanitizeToolCallInputs } from "../transcript/session-transcript-repair.js";
 //#region src/agent/embedded/session-tool-result-guard.ts
 /**
-* Truncate oversized text content blocks in a tool result message.
-* Returns the original message if under the limit, or a new message with
-* truncated text blocks otherwise.
+* Install the guard on a SessionManager and return its control API.
+* Subsequent assistant/toolResult writes by pi-coding-agent flow through the
+* guard transparently.
 */
+function installSessionToolResultGuard(sessionManager, opts = {}) {
+	const guard = new ToolResultGuard(sessionManager, opts);
+	guard.attach();
+	return {
+		flushPendingToolResults: () => guard.flushPending(),
+		clearPendingToolResults: () => guard.clearPending(),
+		getPendingIds: () => guard.getPendingIds()
+	};
+}
+/**
+* Convenience wrapper used by the embedded runner pool: install the guard
+* (idempotent), pin the size cap from the model context window, and expose
+* `flushPendingToolResults` / `clearPendingToolResults` directly on the
+* SessionManager instance so callers do not need to keep the install result.
+*/
+function guardSessionManager(sessionManager, opts) {
+	if (typeof sessionManager.flushPendingToolResults === "function") return sessionManager;
+	const result = installSessionToolResultGuard(sessionManager, {
+		sessionKey: opts?.sessionKey,
+		allowSyntheticToolResults: opts?.allowSyntheticToolResults,
+		missingToolResultText: opts?.missingToolResultText,
+		allowedToolNames: opts?.allowedToolNames,
+		maxToolResultChars: typeof opts?.contextWindowTokens === "number" ? resolveLiveToolResultMaxChars({
+			contextWindowTokens: opts.contextWindowTokens,
+			cfg: opts?.config,
+			agentId: opts?.agentId
+		}) : void 0
+	});
+	const tagged = sessionManager;
+	tagged.flushPendingToolResults = result.flushPendingToolResults;
+	tagged.clearPendingToolResults = result.clearPendingToolResults;
+	return tagged;
+}
+/**
+* Recover the original (un-guarded) appendMessage for a session manager.
+* Useful for callers that need a low-level "bypass the guard" write path.
+*/
+function getRawSessionAppendMessage(sessionManager) {
+	return sessionManager[RAW_APPEND_MESSAGE] ?? sessionManager.appendMessage.bind(sessionManager);
+}
+function resolveMaxToolResultChars(opts) {
+	return Math.max(1, opts.maxToolResultChars ?? 16e3);
+}
 function capToolResultSize(msg, maxChars) {
 	if (msg.role !== "toolResult") return msg;
 	return truncateToolResultMessage(msg, maxChars, {
@@ -20,9 +61,6 @@ function capToolResultSize(msg, maxChars) {
 		minKeepChars: 2e3
 	});
 }
-function resolveMaxToolResultChars(opts) {
-	return Math.max(1, opts?.maxToolResultChars ?? 16e3);
-}
 const MAX_PERSISTED_TOOL_RESULT_DETAILS_BYTES = 8192;
 const MAX_PERSISTED_DETAIL_STRING_CHARS = 2e3;
 const MAX_PERSISTED_DETAIL_SESSION_COUNT = 10;
@@ -170,58 +208,116 @@ function normalizePersistedToolResultName(message, fallbackName) {
 	};
 	return toolResult;
 }
-function installSessionToolResultGuard(sessionManager, opts) {
-	const originalAppend = getRawSessionAppendMessage(sessionManager);
-	setRawSessionAppendMessage(sessionManager, originalAppend);
-	const pendingState = createPendingToolCallState();
-	const persistMessage = (message) => {
-		const transformer = opts?.transformMessageForPersistence;
+const RAW_APPEND_MESSAGE = Symbol("xopc.session.rawAppendMessage");
+function rememberOriginalAppend(sessionManager) {
+	const tagged = sessionManager;
+	const stored = tagged[RAW_APPEND_MESSAGE];
+	if (stored) return stored;
+	const original = sessionManager.appendMessage.bind(sessionManager);
+	tagged[RAW_APPEND_MESSAGE] = original;
+	return original;
+}
+var PendingToolCallTracker = class {
+	pending = /* @__PURE__ */ new Map();
+	size() {
+		return this.pending.size;
+	}
+	getToolName(id) {
+		return this.pending.get(id);
+	}
+	delete(id) {
+		this.pending.delete(id);
+	}
+	clear() {
+		this.pending.clear();
+	}
+	trackToolCalls(calls) {
+		for (const call of calls) this.pending.set(call.id, call.name);
+	}
+	entries() {
+		return this.pending.entries();
+	}
+	getPendingIds() {
+		return Array.from(this.pending.keys());
+	}
+	shouldFlushForSanitizedDrop() {
+		return this.pending.size > 0;
+	}
+	shouldFlushBeforeNonToolResult(nextRole, toolCallCount) {
+		return this.pending.size > 0 && (toolCallCount === 0 || nextRole !== "assistant");
+	}
+	shouldFlushBeforeNewToolCalls(toolCallCount) {
+		return this.pending.size > 0 && toolCallCount > 0;
+	}
+};
+var ToolResultGuard = class {
+	sessionManager;
+	opts;
+	pending = new PendingToolCallTracker();
+	originalAppend;
+	allowSyntheticToolResults;
+	maxToolResultChars;
+	constructor(sessionManager, opts) {
+		this.sessionManager = sessionManager;
+		this.opts = opts;
+		this.originalAppend = rememberOriginalAppend(sessionManager);
+		this.allowSyntheticToolResults = opts.allowSyntheticToolResults ?? true;
+		this.maxToolResultChars = resolveMaxToolResultChars(opts);
+	}
+	/** Monkey-patch the session manager so pi-coding-agent's internal appendMessage flows through us. */
+	attach() {
+		const bound = this.guardedAppend.bind(this);
+		this.sessionManager.appendMessage = bound;
+	}
+	flushPending() {
+		if (this.pending.size() === 0) return;
+		if (this.allowSyntheticToolResults) for (const [id, name] of this.pending.entries()) {
+			const synthetic = makeMissingToolResult({
+				toolCallId: id,
+				toolName: name,
+				text: this.opts.missingToolResultText
+			});
+			const flushed = this.applyBeforeWriteHook(this.persistToolResult(this.persistMessage(synthetic), {
+				toolCallId: id,
+				toolName: name,
+				isSynthetic: true
+			}));
+			if (flushed) this.originalAppend(capToolResultForPersistence(flushed, this.maxToolResultChars));
+		}
+		this.pending.clear();
+	}
+	clearPending() {
+		this.pending.clear();
+	}
+	getPendingIds() {
+		return this.pending.getPendingIds();
+	}
+	persistMessage(message) {
+		const transformer = this.opts.transformMessageForPersistence;
 		return transformer ? transformer(message) : message;
-	};
-	const persistToolResult = (message, meta) => {
-		const transformer = opts?.transformToolResultForPersistence;
+	}
+	persistToolResult(message, meta) {
+		const transformer = this.opts.transformToolResultForPersistence;
 		return transformer ? transformer(message, meta) : message;
-	};
-	const allowSyntheticToolResults = opts?.allowSyntheticToolResults ?? true;
-	const missingToolResultText = opts?.missingToolResultText;
-	const beforeWrite = opts?.beforeMessageWriteHook;
-	const maxToolResultChars = resolveMaxToolResultChars(opts);
+	}
 	/**
 	* Run the before_message_write hook. Returns the (possibly modified) message,
 	* or null if the message should be blocked.
 	*/
-	const applyBeforeWriteHook = (msg) => {
+	applyBeforeWriteHook(msg) {
+		const beforeWrite = this.opts.beforeMessageWriteHook;
 		if (!beforeWrite) return msg;
 		const result = beforeWrite({ message: msg });
 		if (result?.block) return null;
 		if (result?.message) return result.message;
 		return msg;
-	};
-	const flushPendingToolResults = () => {
-		if (pendingState.size() === 0) return;
-		if (allowSyntheticToolResults) for (const [id, name] of pendingState.entries()) {
-			const flushed = applyBeforeWriteHook(persistToolResult(persistMessage(makeMissingToolResult({
-				toolCallId: id,
-				toolName: name,
-				text: missingToolResultText
-			})), {
-				toolCallId: id,
-				toolName: name,
-				isSynthetic: true
-			}));
-			if (flushed) originalAppend(capToolResultForPersistence(flushed, maxToolResultChars));
-		}
-		pendingState.clear();
-	};
-	const clearPendingToolResults = () => {
-		pendingState.clear();
-	};
-	const guardedAppend = (message) => {
+	}
+	guardedAppend(message) {
 		let nextMessage = message;
 		if (message.role === "assistant") {
-			const sanitized = sanitizeToolCallInputs([message], { allowedToolNames: opts?.allowedToolNames });
+			const sanitized = sanitizeToolCallInputs([message], { allowedToolNames: this.opts.allowedToolNames });
 			if (sanitized.length === 0) {
-				if (pendingState.shouldFlushForSanitizedDrop()) flushPendingToolResults();
+				if (this.pending.shouldFlushForSanitizedDrop()) this.flushPending();
 				return;
 			}
 			nextMessage = sanitized[0];
@@ -229,41 +325,37 @@ function installSessionToolResultGuard(sessionManager, opts) {
 		const nextRole = nextMessage.role;
 		if (nextRole === "toolResult") {
 			const id = extractToolResultId(nextMessage);
-			const toolName = id ? pendingState.getToolName(id) : void 0;
-			if (id) pendingState.delete(id);
-			const persisted = applyBeforeWriteHook(persistToolResult(capToolResultForPersistence(persistMessage(normalizePersistedToolResultName(nextMessage, toolName)), maxToolResultChars), {
+			const toolName = id ? this.pending.getToolName(id) : void 0;
+			if (id) this.pending.delete(id);
+			const normalizedToolResult = normalizePersistedToolResultName(nextMessage, toolName);
+			const capped = capToolResultForPersistence(this.persistMessage(normalizedToolResult), this.maxToolResultChars);
+			const persisted = this.applyBeforeWriteHook(this.persistToolResult(capped, {
 				toolCallId: id ?? void 0,
 				toolName,
 				isSynthetic: false
 			}));
 			if (!persisted) return;
-			return originalAppend(capToolResultForPersistence(persisted, maxToolResultChars));
+			return this.originalAppend(capToolResultForPersistence(persisted, this.maxToolResultChars));
 		}
 		const stopReason = nextMessage.stopReason;
 		const toolCalls = nextRole === "assistant" && stopReason !== "aborted" && stopReason !== "error" ? extractToolCallsFromAssistant(nextMessage) : [];
-		if (pendingState.shouldFlushBeforeNonToolResult(nextRole, toolCalls.length)) flushPendingToolResults();
-		if (pendingState.shouldFlushBeforeNewToolCalls(toolCalls.length)) flushPendingToolResults();
-		const finalMessage = applyBeforeWriteHook(persistMessage(nextMessage));
+		if (this.pending.shouldFlushBeforeNonToolResult(nextRole, toolCalls.length)) this.flushPending();
+		if (this.pending.shouldFlushBeforeNewToolCalls(toolCalls.length)) this.flushPending();
+		const finalMessage = this.applyBeforeWriteHook(this.persistMessage(nextMessage));
 		if (!finalMessage) return;
-		const result = originalAppend(finalMessage);
-		const sessionFile = sessionManager.getSessionFile?.();
+		const result = this.originalAppend(finalMessage);
+		const sessionFile = this.sessionManager.getSessionFile?.();
 		if (sessionFile) emitSessionTranscriptUpdate({
 			sessionFile,
-			sessionKey: opts?.sessionKey,
+			sessionKey: this.opts.sessionKey,
 			message: finalMessage,
 			messageId: typeof result === "string" ? result : void 0
 		});
-		if (toolCalls.length > 0) pendingState.trackToolCalls(toolCalls);
+		if (toolCalls.length > 0) this.pending.trackToolCalls(toolCalls);
 		return result;
-	};
-	sessionManager.appendMessage = guardedAppend;
-	return {
-		flushPendingToolResults,
-		clearPendingToolResults,
-		getPendingIds: pendingState.getPendingIds
-	};
-}
+	}
+};
 //#endregion
-export { getRawSessionAppendMessage, installSessionToolResultGuard };
+export { getRawSessionAppendMessage, guardSessionManager, installSessionToolResultGuard };
 
 //# sourceMappingURL=session-tool-result-guard.js.map

package/dist/src/agent/embedded/session-tool-result-guard.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-tool-result-guard.js","names":[],"sources":["../../../../src/agent/embedded/session-tool-result-guard.ts"],"sourcesContent":["import type { AgentMessage } from \"@earendil-works/pi-agent-core\";\nimport type { SessionManager } from \"@earendil-works/pi-coding-agent\";\nimport {\n  boundedJsonUtf8Bytes,\n  firstEnumerableOwnKeys,\n  jsonUtf8BytesOrInfinity,\n  type BoundedJsonUtf8Bytes,\n} from \"../../infra/json-utf8-bytes.js\";\nexport type BeforeMessageWriteHookEvent = { message: AgentMessage };\nexport type BeforeMessageWriteHookResult =\n  | { block?: boolean; message?: AgentMessage }\n  | undefined;\nimport { emitSessionTranscriptUpdate } from \"../../session/transcript-events.js\";\nimport { normalizeOptionalString } from \"../../utils/string-coerce.js\";\nimport { formatContextLimitTruncationNotice } from \"./tool-result-context-guard.js\";\nimport {\n  DEFAULT_MAX_LIVE_TOOL_RESULT_CHARS,\n  truncateToolResultMessage,\n} from \"./tool-result-truncation.js\";\nimport {\n  getRawSessionAppendMessage,\n  setRawSessionAppendMessage,\n} from \"./session-raw-append-message.js\";\nimport { createPendingToolCallState } from \"./session-tool-result-state.js\";\nimport { makeMissingToolResult, sanitizeToolCallInputs } from '../transcript/session-transcript-repair.js';\nimport { extractToolCallsFromAssistant, extractToolResultId } from '../transcript/tool-call-id.js';\n\n/**\n * Truncate oversized text content blocks in a tool result message.\n * Returns the original message if under the limit, or a new message with\n * truncated text blocks otherwise.\n */\nfunction capToolResultSize(msg: AgentMessage, maxChars: number): AgentMessage {\n  if ((msg as { role?: string }).role !== \"toolResult\") {\n    return msg;\n  }\n  return truncateToolResultMessage(msg, maxChars, {\n    suffix: (truncatedChars) => formatContextLimitTruncationNotice(truncatedChars),\n    minKeepChars: 2_000,\n  });\n}\n\nfunction resolveMaxToolResultChars(opts?: { maxToolResultChars?: number }): number {\n  return Math.max(1, opts?.maxToolResultChars ?? DEFAULT_MAX_LIVE_TOOL_RESULT_CHARS);\n}\n\n// `details` is runtime/UI metadata, not model-visible tool output. Keep the\n// session JSONL useful for debugging without letting metadata blobs dominate\n// disk, replay repair, transcript broadcasts, or future tooling that reads raw\n// sessions. Model-visible text belongs in tool result `content`.\nconst MAX_PERSISTED_TOOL_RESULT_DETAILS_BYTES = 8_192;\nconst MAX_PERSISTED_DETAIL_STRING_CHARS = 2_000;\nconst MAX_PERSISTED_DETAIL_SESSION_COUNT = 10;\nconst MAX_PERSISTED_DETAIL_FALLBACK_STRING_CHARS = 200;\n\nfunction originalDetailsSizeFields(size: BoundedJsonUtf8Bytes): Record<string, number> {\n  return size.complete\n    ? { originalDetailsBytes: size.bytes }\n    : { originalDetailsBytesAtLeast: size.bytes };\n}\n\nfunction truncatePersistedDetailString(\n  value: string,\n  maxChars = MAX_PERSISTED_DETAIL_STRING_CHARS,\n): string {\n  if (value.length <= maxChars) {\n    return value;\n  }\n  return `${value.slice(0, maxChars)}\\n\\n[xopc persisted detail truncated: ${\n    value.length - maxChars\n  } chars omitted]`;\n}\n\nfunction sanitizePersistedSessionDetail(value: unknown): unknown {\n  if (!value || typeof value !== \"object\") {\n    return value;\n  }\n  const src = value as Record<string, unknown>;\n  const out: Record<string, unknown> = {};\n  for (const key of [\n    \"sessionId\",\n    \"status\",\n    \"pid\",\n    \"startedAt\",\n    \"endedAt\",\n    \"runtimeMs\",\n    \"cwd\",\n    \"name\",\n    \"truncated\",\n    \"exitCode\",\n    \"exitSignal\",\n  ]) {\n    const field = src[key];\n    if (field !== undefined) {\n      out[key] = typeof field === \"string\" ? truncatePersistedDetailString(field, 500) : field;\n    }\n  }\n  if (typeof src.command === \"string\") {\n    out.command = truncatePersistedDetailString(src.command, 500);\n  }\n  return out;\n}\n\nfunction buildPersistedDetailsFallback(\n  src: Record<string, unknown> | undefined,\n  originalSize: BoundedJsonUtf8Bytes,\n  sanitizedBytes?: number,\n): Record<string, unknown> {\n  // If even the structured summary is too large, keep only shape and stable\n  // status fields. This preserves \"what happened?\" without persisting the raw\n  // diagnostics payload that caused the cap to trip.\n  const fallback: Record<string, unknown> = {\n    persistedDetailsTruncated: true,\n    finalDetailsTruncated: true,\n    ...originalDetailsSizeFields(originalSize),\n  };\n  if (sanitizedBytes !== undefined) {\n    fallback.sanitizedDetailsBytes = sanitizedBytes;\n  }\n  if (src) {\n    fallback.originalDetailKeys = firstEnumerableOwnKeys(src, 40);\n    for (const key of [\"status\", \"sessionId\", \"pid\", \"exitCode\", \"exitSignal\", \"truncated\"]) {\n      const field = src[key];\n      if (field !== undefined) {\n        fallback[key] =\n          typeof field === \"string\"\n            ? truncatePersistedDetailString(field, MAX_PERSISTED_DETAIL_FALLBACK_STRING_CHARS)\n            : field;\n      }\n    }\n  }\n  return fallback;\n}\n\nfunction enforcePersistedDetailsByteCap(\n  value: Record<string, unknown>,\n  src: Record<string, unknown> | undefined,\n  originalSize: BoundedJsonUtf8Bytes,\n): Record<string, unknown> {\n  const sanitizedBytes = jsonUtf8BytesOrInfinity(value);\n  if (sanitizedBytes <= MAX_PERSISTED_TOOL_RESULT_DETAILS_BYTES) {\n    return value;\n  }\n  const fallback = buildPersistedDetailsFallback(src, originalSize, sanitizedBytes);\n  if (jsonUtf8BytesOrInfinity(fallback) <= MAX_PERSISTED_TOOL_RESULT_DETAILS_BYTES) {\n    return fallback;\n  }\n  return {\n    persistedDetailsTruncated: true,\n    finalDetailsTruncated: true,\n    ...originalDetailsSizeFields(originalSize),\n    sanitizedDetailsBytes: sanitizedBytes,\n  };\n}\n\nfunction sanitizeToolResultDetailsForPersistence(details: unknown): unknown {\n  if (details === undefined || details === null) {\n    return details;\n  }\n  // Measure with an early-exit walker so hostile or enormous details do not\n  // need to be fully stringified just to learn they exceed the persistence cap.\n  const originalSize = boundedJsonUtf8Bytes(details, MAX_PERSISTED_TOOL_RESULT_DETAILS_BYTES);\n  if (originalSize.complete && originalSize.bytes <= MAX_PERSISTED_TOOL_RESULT_DETAILS_BYTES) {\n    return details;\n  }\n  if (typeof details !== \"object\") {\n    return enforcePersistedDetailsByteCap(\n      {\n        persistedDetailsTruncated: true,\n        ...originalDetailsSizeFields(originalSize),\n        valueType: typeof details,\n      },\n      undefined,\n      originalSize,\n    );\n  }\n  const src = details as Record<string, unknown>;\n  const out: Record<string, unknown> = {\n    persistedDetailsTruncated: true,\n    ...originalDetailsSizeFields(originalSize),\n    originalDetailKeys: firstEnumerableOwnKeys(src, 40),\n  };\n  for (const key of [\n    \"status\",\n    \"sessionId\",\n    \"pid\",\n    \"startedAt\",\n    \"endedAt\",\n    \"cwd\",\n    \"name\",\n    \"exitCode\",\n    \"exitSignal\",\n    \"retryInMs\",\n    \"total\",\n    \"totalLines\",\n    \"totalChars\",\n    \"truncated\",\n    \"fullOutputPath\",\n    \"truncation\",\n  ]) {\n    const field = src[key];\n    if (field !== undefined) {\n      out[key] = typeof field === \"string\" ? truncatePersistedDetailString(field) : field;\n    }\n  }\n  if (typeof src.tail === \"string\") {\n    out.tail = truncatePersistedDetailString(src.tail);\n  }\n  if (Array.isArray(src.sessions)) {\n    out.sessions = src.sessions\n      .slice(0, MAX_PERSISTED_DETAIL_SESSION_COUNT)\n      .map(sanitizePersistedSessionDetail);\n    if (src.sessions.length > MAX_PERSISTED_DETAIL_SESSION_COUNT) {\n      out.sessionsTruncated = src.sessions.length - MAX_PERSISTED_DETAIL_SESSION_COUNT;\n    }\n  }\n  return enforcePersistedDetailsByteCap(out, src, originalSize);\n}\n\nfunction capToolResultDetails(msg: AgentMessage): AgentMessage {\n  if ((msg as { role?: string }).role !== \"toolResult\") {\n    return msg;\n  }\n  const details = (msg as { details?: unknown }).details;\n  const sanitizedDetails = sanitizeToolResultDetailsForPersistence(details);\n  if (sanitizedDetails === details) {\n    return msg;\n  }\n  const next = { ...msg } as AgentMessage & { details?: unknown };\n  next.details = sanitizedDetails;\n  return next;\n}\n\nfunction capToolResultForPersistence(msg: AgentMessage, maxChars: number): AgentMessage {\n  return capToolResultDetails(capToolResultSize(msg, maxChars));\n}\n\nfunction normalizePersistedToolResultName(\n  message: AgentMessage,\n  fallbackName?: string,\n): AgentMessage {\n  if ((message as { role?: unknown }).role !== \"toolResult\") {\n    return message;\n  }\n  const toolResult = message as Extract<AgentMessage, { role: \"toolResult\" }>;\n  const rawToolName = (toolResult as { toolName?: unknown }).toolName;\n  const normalizedToolName = normalizeOptionalString(rawToolName);\n  if (normalizedToolName) {\n    if (rawToolName === normalizedToolName) {\n      return toolResult;\n    }\n    return { ...toolResult, toolName: normalizedToolName };\n  }\n\n  const normalizedFallback = normalizeOptionalString(fallbackName);\n  if (normalizedFallback) {\n    return { ...toolResult, toolName: normalizedFallback };\n  }\n\n  if (typeof rawToolName === \"string\") {\n    return { ...toolResult, toolName: \"unknown\" };\n  }\n  return toolResult;\n}\n\nexport { getRawSessionAppendMessage };\n\nexport function installSessionToolResultGuard(\n  sessionManager: SessionManager,\n  opts?: {\n    /** Optional session key for transcript update broadcasts. */\n    sessionKey?: string;\n    /**\n     * Optional transform applied to any message before persistence.\n     */\n    transformMessageForPersistence?: (message: AgentMessage) => AgentMessage;\n    /**\n     * Optional, synchronous transform applied to toolResult messages *before* they are\n     * persisted to the session transcript.\n     */\n    transformToolResultForPersistence?: (\n      message: AgentMessage,\n      meta: { toolCallId?: string; toolName?: string; isSynthetic?: boolean },\n    ) => AgentMessage;\n    /**\n     * Whether to synthesize missing tool results to satisfy strict providers.\n     * Defaults to true.\n     */\n    allowSyntheticToolResults?: boolean;\n    missingToolResultText?: string;\n    /**\n     * Optional set/list of tool names accepted for assistant toolCall/toolUse blocks.\n     * When set, tool calls with unknown names are dropped before persistence.\n     */\n    allowedToolNames?: Iterable<string>;\n    /**\n     * Synchronous hook invoked before any message is written to the session JSONL.\n     * If the hook returns { block: true }, the message is silently dropped.\n     * If it returns { message }, the modified message is written instead.\n     */\n    beforeMessageWriteHook?: (\n      event: BeforeMessageWriteHookEvent,\n    ) => BeforeMessageWriteHookResult;\n    maxToolResultChars?: number;\n  },\n): {\n  flushPendingToolResults: () => void;\n  clearPendingToolResults: () => void;\n  getPendingIds: () => string[];\n} {\n  const originalAppend = getRawSessionAppendMessage(sessionManager);\n  setRawSessionAppendMessage(sessionManager, originalAppend);\n  const pendingState = createPendingToolCallState();\n  const persistMessage = (message: AgentMessage) => {\n    const transformer = opts?.transformMessageForPersistence;\n    return transformer ? transformer(message) : message;\n  };\n\n  const persistToolResult = (\n    message: AgentMessage,\n    meta: { toolCallId?: string; toolName?: string; isSynthetic?: boolean },\n  ) => {\n    const transformer = opts?.transformToolResultForPersistence;\n    return transformer ? transformer(message, meta) : message;\n  };\n\n  const allowSyntheticToolResults = opts?.allowSyntheticToolResults ?? true;\n  const missingToolResultText = opts?.missingToolResultText;\n  const beforeWrite = opts?.beforeMessageWriteHook;\n  const maxToolResultChars = resolveMaxToolResultChars(opts);\n\n  /**\n   * Run the before_message_write hook. Returns the (possibly modified) message,\n   * or null if the message should be blocked.\n   */\n  const applyBeforeWriteHook = (msg: AgentMessage): AgentMessage | null => {\n    if (!beforeWrite) {\n      return msg;\n    }\n    const result = beforeWrite({ message: msg });\n    if (result?.block) {\n      return null;\n    }\n    if (result?.message) {\n      return result.message;\n    }\n    return msg;\n  };\n\n  const flushPendingToolResults = () => {\n    if (pendingState.size() === 0) {\n      return;\n    }\n    if (allowSyntheticToolResults) {\n      for (const [id, name] of pendingState.entries()) {\n        const synthetic = makeMissingToolResult({\n          toolCallId: id,\n          toolName: name,\n          text: missingToolResultText,\n        });\n        const flushed = applyBeforeWriteHook(\n          persistToolResult(persistMessage(synthetic), {\n            toolCallId: id,\n            toolName: name,\n            isSynthetic: true,\n          }),\n        );\n        if (flushed) {\n          originalAppend(capToolResultForPersistence(flushed, maxToolResultChars) as never);\n        }\n      }\n    }\n    pendingState.clear();\n  };\n\n  const clearPendingToolResults = () => {\n    pendingState.clear();\n  };\n\n  const guardedAppend = (message: AgentMessage) => {\n    let nextMessage = message;\n    const role = (message as { role?: unknown }).role;\n    if (role === \"assistant\") {\n      const sanitized = sanitizeToolCallInputs([message], {\n        allowedToolNames: opts?.allowedToolNames,\n      });\n      if (sanitized.length === 0) {\n        if (pendingState.shouldFlushForSanitizedDrop()) {\n          flushPendingToolResults();\n        }\n        return undefined;\n      }\n      nextMessage = sanitized[0];\n    }\n    const nextRole = (nextMessage as { role?: unknown }).role;\n\n    if (nextRole === \"toolResult\") {\n      const id = extractToolResultId(nextMessage as Extract<AgentMessage, { role: \"toolResult\" }>);\n      const toolName = id ? pendingState.getToolName(id) : undefined;\n      if (id) {\n        pendingState.delete(id);\n      }\n      const normalizedToolResult = normalizePersistedToolResultName(nextMessage, toolName);\n      // Apply hard size cap before persistence to prevent oversized tool results\n      // from consuming the entire context window on subsequent LLM calls.\n      const capped = capToolResultForPersistence(\n        persistMessage(normalizedToolResult),\n        maxToolResultChars,\n      );\n      const persisted = applyBeforeWriteHook(\n        persistToolResult(capped, {\n          toolCallId: id ?? undefined,\n          toolName,\n          isSynthetic: false,\n        }),\n      );\n      if (!persisted) {\n        return undefined;\n      }\n      return originalAppend(capToolResultForPersistence(persisted, maxToolResultChars) as never);\n    }\n\n    // Skip tool call extraction for aborted/errored assistant messages.\n    // When stopReason is \"error\" or \"aborted\", the tool_use blocks may be incomplete\n    // and should not have synthetic tool_results created. Creating synthetic results\n    // for incomplete tool calls causes API 400 errors:\n    // \"unexpected tool_use_id found in tool_result blocks\"\n    // This matches the behavior in repairToolUseResultPairing (session-transcript-repair.ts)\n    const stopReason = (nextMessage as { stopReason?: string }).stopReason;\n    const toolCalls =\n      nextRole === \"assistant\" && stopReason !== \"aborted\" && stopReason !== \"error\"\n        ? extractToolCallsFromAssistant(nextMessage as Extract<AgentMessage, { role: \"assistant\" }>)\n        : [];\n\n    // Always clear pending tool call state before appending non-tool-result messages.\n    // flushPendingToolResults() only inserts synthetic results when allowSyntheticToolResults\n    // is true; it always clears the pending map. Without this, providers that disable\n    // synthetic results (e.g. OpenAI) accumulate stale pending state when a user message\n    // interrupts in-flight tool calls, leaving orphaned tool_use blocks in the transcript\n    // that cause API 400 errors on subsequent requests.\n    if (pendingState.shouldFlushBeforeNonToolResult(nextRole, toolCalls.length)) {\n      flushPendingToolResults();\n    }\n    // If new tool calls arrive while older ones are pending, flush the old ones first.\n    if (pendingState.shouldFlushBeforeNewToolCalls(toolCalls.length)) {\n      flushPendingToolResults();\n    }\n\n    const finalMessage = applyBeforeWriteHook(persistMessage(nextMessage));\n    if (!finalMessage) {\n      return undefined;\n    }\n    const result = originalAppend(finalMessage as never);\n\n    const sessionFile = (\n      sessionManager as { getSessionFile?: () => string | null }\n    ).getSessionFile?.();\n    if (sessionFile) {\n      emitSessionTranscriptUpdate({\n        sessionFile,\n        sessionKey: opts?.sessionKey,\n        message: finalMessage,\n        messageId: typeof result === \"string\" ? result : undefined,\n      });\n    }\n\n    if (toolCalls.length > 0) {\n      pendingState.trackToolCalls(toolCalls);\n    }\n\n    return result;\n  };\n\n  // Monkey-patch appendMessage with our guarded version.\n  sessionManager.appendMessage = guardedAppend as SessionManager[\"appendMessage\"];\n\n  return {\n    flushPendingToolResults,\n    clearPendingToolResults,\n    getPendingIds: pendingState.getPendingIds,\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"session-tool-result-guard.js","names":[],"sources":["../../../../src/agent/embedded/session-tool-result-guard.ts"],"sourcesContent":["/**\n * Session tool-result guard — wraps a pi `SessionManager.appendMessage` to:\n *   1. cap oversized tool-result text + details so they cannot blow up the next\n *      LLM request (size + persistence limits).\n *   2. track pending tool-call IDs so missing tool results can be synthesised\n *      (some providers refuse a turn that has an orphan tool_use block).\n *   3. drop assistant `toolCall` blocks whose tool name is not in the allowlist\n *      (these would also trigger provider 400s).\n *   4. broadcast `xopc:transcript-row` updates so the gateway UI can stream them.\n *\n * Previously this module shipped with three sibling files\n * (`session-tool-result-state.ts`, `session-raw-append-message.ts`,\n * `session-tool-result-guard-wrapper.ts`). They are now consolidated here as\n * private constructs around the `ToolResultGuard` class. Pi-coding-agent owns\n * the `SessionManager` instance and calls `appendMessage` from inside the\n * runtime, so we still need to monkey-patch that method — but the patched\n * implementation is just `guard.guardedAppend.bind(guard)` and all state lives\n * on the class.\n */\n\nimport type { AgentMessage } from '@earendil-works/pi-agent-core';\nimport type { SessionManager } from '@earendil-works/pi-coding-agent';\n\nimport type { Config } from '../../config/schema.js';\nimport {\n  boundedJsonUtf8Bytes,\n  firstEnumerableOwnKeys,\n  jsonUtf8BytesOrInfinity,\n  type BoundedJsonUtf8Bytes,\n} from '../../infra/json-utf8-bytes.js';\nimport { emitSessionTranscriptUpdate } from '../../session/transcript-events.js';\nimport { normalizeOptionalString } from '../../utils/string-coerce.js';\nimport { formatContextLimitTruncationNotice } from './tool-result-context-guard.js';\nimport {\n  DEFAULT_MAX_LIVE_TOOL_RESULT_CHARS,\n  resolveLiveToolResultMaxChars,\n  truncateToolResultMessage,\n} from './tool-result-truncation.js';\nimport {\n  makeMissingToolResult,\n  sanitizeToolCallInputs,\n} from '../transcript/session-transcript-repair.js';\nimport {\n  extractToolCallsFromAssistant,\n  extractToolResultId,\n} from '../transcript/tool-call-id.js';\n\n// ── Public surface ──────────────────────────────────────────────────────────\n\nexport type BeforeMessageWriteHookEvent = { message: AgentMessage };\nexport type BeforeMessageWriteHookResult =\n  | { block?: boolean; message?: AgentMessage }\n  | undefined;\n\nexport interface ToolResultGuardOptions {\n  /** Optional session key for transcript update broadcasts. */\n  sessionKey?: string;\n  /** Optional transform applied to any message before persistence. */\n  transformMessageForPersistence?: (message: AgentMessage) => AgentMessage;\n  /**\n   * Optional, synchronous transform applied to toolResult messages *before* they are\n   * persisted to the session transcript.\n   */\n  transformToolResultForPersistence?: (\n    message: AgentMessage,\n    meta: { toolCallId?: string; toolName?: string; isSynthetic?: boolean },\n  ) => AgentMessage;\n  /**\n   * Whether to synthesize missing tool results to satisfy strict providers.\n   * Defaults to true.\n   */\n  allowSyntheticToolResults?: boolean;\n  missingToolResultText?: string;\n  /**\n   * Optional set/list of tool names accepted for assistant toolCall/toolUse blocks.\n   * When set, tool calls with unknown names are dropped before persistence.\n   */\n  allowedToolNames?: Iterable<string>;\n  /**\n   * Synchronous hook invoked before any message is written to the session JSONL.\n   * If the hook returns { block: true }, the message is silently dropped.\n   * If it returns { message }, the modified message is written instead.\n   */\n  beforeMessageWriteHook?: (event: BeforeMessageWriteHookEvent) => BeforeMessageWriteHookResult;\n  maxToolResultChars?: number;\n}\n\nexport interface InstallSessionToolResultGuardResult {\n  flushPendingToolResults: () => void;\n  clearPendingToolResults: () => void;\n  getPendingIds: () => string[];\n}\n\n/** Idempotent wrapper that also adds the helper methods consumers expect. */\nexport type GuardedPiTranscriptManager = SessionManager & {\n  flushPendingToolResults?: () => void;\n  clearPendingToolResults?: () => void;\n};\n\n/**\n * Install the guard on a SessionManager and return its control API.\n * Subsequent assistant/toolResult writes by pi-coding-agent flow through the\n * guard transparently.\n */\nexport function installSessionToolResultGuard(\n  sessionManager: SessionManager,\n  opts: ToolResultGuardOptions = {},\n): InstallSessionToolResultGuardResult {\n  const guard = new ToolResultGuard(sessionManager, opts);\n  guard.attach();\n  return {\n    flushPendingToolResults: () => guard.flushPending(),\n    clearPendingToolResults: () => guard.clearPending(),\n    getPendingIds: () => guard.getPendingIds(),\n  };\n}\n\n/**\n * Convenience wrapper used by the embedded runner pool: install the guard\n * (idempotent), pin the size cap from the model context window, and expose\n * `flushPendingToolResults` / `clearPendingToolResults` directly on the\n * SessionManager instance so callers do not need to keep the install result.\n */\nexport function guardSessionManager(\n  sessionManager: SessionManager,\n  opts?: {\n    agentId?: string;\n    sessionKey?: string;\n    config?: Config;\n    contextWindowTokens?: number;\n    allowSyntheticToolResults?: boolean;\n    missingToolResultText?: string;\n    allowedToolNames?: Iterable<string>;\n  },\n): GuardedPiTranscriptManager {\n  if (typeof (sessionManager as GuardedPiTranscriptManager).flushPendingToolResults === 'function') {\n    return sessionManager as GuardedPiTranscriptManager;\n  }\n\n  const result = installSessionToolResultGuard(sessionManager, {\n    sessionKey: opts?.sessionKey,\n    allowSyntheticToolResults: opts?.allowSyntheticToolResults,\n    missingToolResultText: opts?.missingToolResultText,\n    allowedToolNames: opts?.allowedToolNames,\n    maxToolResultChars:\n      typeof opts?.contextWindowTokens === 'number'\n        ? resolveLiveToolResultMaxChars({\n            contextWindowTokens: opts.contextWindowTokens,\n            cfg: opts?.config,\n            agentId: opts?.agentId,\n          })\n        : undefined,\n  });\n  const tagged = sessionManager as GuardedPiTranscriptManager;\n  tagged.flushPendingToolResults = result.flushPendingToolResults;\n  tagged.clearPendingToolResults = result.clearPendingToolResults;\n  return tagged;\n}\n\n/**\n * Recover the original (un-guarded) appendMessage for a session manager.\n * Useful for callers that need a low-level \"bypass the guard\" write path.\n */\nexport function getRawSessionAppendMessage(\n  sessionManager: SessionManager,\n): SessionManager['appendMessage'] {\n  const stored = (sessionManager as SessionManagerWithRawAppend)[RAW_APPEND_MESSAGE];\n  return stored ?? sessionManager.appendMessage.bind(sessionManager);\n}\n\n// ── Internal: persistence + truncation helpers ──────────────────────────────\n\nfunction resolveMaxToolResultChars(opts: { maxToolResultChars?: number }): number {\n  return Math.max(1, opts.maxToolResultChars ?? DEFAULT_MAX_LIVE_TOOL_RESULT_CHARS);\n}\n\nfunction capToolResultSize(msg: AgentMessage, maxChars: number): AgentMessage {\n  if ((msg as { role?: string }).role !== 'toolResult') {\n    return msg;\n  }\n  return truncateToolResultMessage(msg, maxChars, {\n    suffix: (truncatedChars) => formatContextLimitTruncationNotice(truncatedChars),\n    minKeepChars: 2_000,\n  });\n}\n\n// `details` is runtime/UI metadata, not model-visible tool output. Keep the\n// session JSONL useful for debugging without letting metadata blobs dominate\n// disk, replay repair, transcript broadcasts, or future tooling that reads raw\n// sessions. Model-visible text belongs in tool result `content`.\nconst MAX_PERSISTED_TOOL_RESULT_DETAILS_BYTES = 8_192;\nconst MAX_PERSISTED_DETAIL_STRING_CHARS = 2_000;\nconst MAX_PERSISTED_DETAIL_SESSION_COUNT = 10;\nconst MAX_PERSISTED_DETAIL_FALLBACK_STRING_CHARS = 200;\n\nfunction originalDetailsSizeFields(size: BoundedJsonUtf8Bytes): Record<string, number> {\n  return size.complete\n    ? { originalDetailsBytes: size.bytes }\n    : { originalDetailsBytesAtLeast: size.bytes };\n}\n\nfunction truncatePersistedDetailString(\n  value: string,\n  maxChars = MAX_PERSISTED_DETAIL_STRING_CHARS,\n): string {\n  if (value.length <= maxChars) {\n    return value;\n  }\n  return `${value.slice(0, maxChars)}\\n\\n[xopc persisted detail truncated: ${\n    value.length - maxChars\n  } chars omitted]`;\n}\n\nfunction sanitizePersistedSessionDetail(value: unknown): unknown {\n  if (!value || typeof value !== 'object') {\n    return value;\n  }\n  const src = value as Record<string, unknown>;\n  const out: Record<string, unknown> = {};\n  for (const key of [\n    'sessionId',\n    'status',\n    'pid',\n    'startedAt',\n    'endedAt',\n    'runtimeMs',\n    'cwd',\n    'name',\n    'truncated',\n    'exitCode',\n    'exitSignal',\n  ]) {\n    const field = src[key];\n    if (field !== undefined) {\n      out[key] = typeof field === 'string' ? truncatePersistedDetailString(field, 500) : field;\n    }\n  }\n  if (typeof src.command === 'string') {\n    out.command = truncatePersistedDetailString(src.command, 500);\n  }\n  return out;\n}\n\nfunction buildPersistedDetailsFallback(\n  src: Record<string, unknown> | undefined,\n  originalSize: BoundedJsonUtf8Bytes,\n  sanitizedBytes?: number,\n): Record<string, unknown> {\n  const fallback: Record<string, unknown> = {\n    persistedDetailsTruncated: true,\n    finalDetailsTruncated: true,\n    ...originalDetailsSizeFields(originalSize),\n  };\n  if (sanitizedBytes !== undefined) {\n    fallback.sanitizedDetailsBytes = sanitizedBytes;\n  }\n  if (src) {\n    fallback.originalDetailKeys = firstEnumerableOwnKeys(src, 40);\n    for (const key of ['status', 'sessionId', 'pid', 'exitCode', 'exitSignal', 'truncated']) {\n      const field = src[key];\n      if (field !== undefined) {\n        fallback[key] =\n          typeof field === 'string'\n            ? truncatePersistedDetailString(field, MAX_PERSISTED_DETAIL_FALLBACK_STRING_CHARS)\n            : field;\n      }\n    }\n  }\n  return fallback;\n}\n\nfunction enforcePersistedDetailsByteCap(\n  value: Record<string, unknown>,\n  src: Record<string, unknown> | undefined,\n  originalSize: BoundedJsonUtf8Bytes,\n): Record<string, unknown> {\n  const sanitizedBytes = jsonUtf8BytesOrInfinity(value);\n  if (sanitizedBytes <= MAX_PERSISTED_TOOL_RESULT_DETAILS_BYTES) {\n    return value;\n  }\n  const fallback = buildPersistedDetailsFallback(src, originalSize, sanitizedBytes);\n  if (jsonUtf8BytesOrInfinity(fallback) <= MAX_PERSISTED_TOOL_RESULT_DETAILS_BYTES) {\n    return fallback;\n  }\n  return {\n    persistedDetailsTruncated: true,\n    finalDetailsTruncated: true,\n    ...originalDetailsSizeFields(originalSize),\n    sanitizedDetailsBytes: sanitizedBytes,\n  };\n}\n\nfunction sanitizeToolResultDetailsForPersistence(details: unknown): unknown {\n  if (details === undefined || details === null) {\n    return details;\n  }\n  const originalSize = boundedJsonUtf8Bytes(details, MAX_PERSISTED_TOOL_RESULT_DETAILS_BYTES);\n  if (originalSize.complete && originalSize.bytes <= MAX_PERSISTED_TOOL_RESULT_DETAILS_BYTES) {\n    return details;\n  }\n  if (typeof details !== 'object') {\n    return enforcePersistedDetailsByteCap(\n      {\n        persistedDetailsTruncated: true,\n        ...originalDetailsSizeFields(originalSize),\n        valueType: typeof details,\n      },\n      undefined,\n      originalSize,\n    );\n  }\n  const src = details as Record<string, unknown>;\n  const out: Record<string, unknown> = {\n    persistedDetailsTruncated: true,\n    ...originalDetailsSizeFields(originalSize),\n    originalDetailKeys: firstEnumerableOwnKeys(src, 40),\n  };\n  for (const key of [\n    'status',\n    'sessionId',\n    'pid',\n    'startedAt',\n    'endedAt',\n    'cwd',\n    'name',\n    'exitCode',\n    'exitSignal',\n    'retryInMs',\n    'total',\n    'totalLines',\n    'totalChars',\n    'truncated',\n    'fullOutputPath',\n    'truncation',\n  ]) {\n    const field = src[key];\n    if (field !== undefined) {\n      out[key] = typeof field === 'string' ? truncatePersistedDetailString(field) : field;\n    }\n  }\n  if (typeof src.tail === 'string') {\n    out.tail = truncatePersistedDetailString(src.tail);\n  }\n  if (Array.isArray(src.sessions)) {\n    out.sessions = src.sessions\n      .slice(0, MAX_PERSISTED_DETAIL_SESSION_COUNT)\n      .map(sanitizePersistedSessionDetail);\n    if (src.sessions.length > MAX_PERSISTED_DETAIL_SESSION_COUNT) {\n      out.sessionsTruncated = src.sessions.length - MAX_PERSISTED_DETAIL_SESSION_COUNT;\n    }\n  }\n  return enforcePersistedDetailsByteCap(out, src, originalSize);\n}\n\nfunction capToolResultDetails(msg: AgentMessage): AgentMessage {\n  if ((msg as { role?: string }).role !== 'toolResult') {\n    return msg;\n  }\n  const details = (msg as { details?: unknown }).details;\n  const sanitizedDetails = sanitizeToolResultDetailsForPersistence(details);\n  if (sanitizedDetails === details) {\n    return msg;\n  }\n  const next = { ...msg } as AgentMessage & { details?: unknown };\n  next.details = sanitizedDetails;\n  return next;\n}\n\nfunction capToolResultForPersistence(msg: AgentMessage, maxChars: number): AgentMessage {\n  return capToolResultDetails(capToolResultSize(msg, maxChars));\n}\n\nfunction normalizePersistedToolResultName(\n  message: AgentMessage,\n  fallbackName?: string,\n): AgentMessage {\n  if ((message as { role?: unknown }).role !== 'toolResult') {\n    return message;\n  }\n  const toolResult = message as Extract<AgentMessage, { role: 'toolResult' }>;\n  const rawToolName = (toolResult as { toolName?: unknown }).toolName;\n  const normalizedToolName = normalizeOptionalString(rawToolName);\n  if (normalizedToolName) {\n    if (rawToolName === normalizedToolName) {\n      return toolResult;\n    }\n    return { ...toolResult, toolName: normalizedToolName };\n  }\n\n  const normalizedFallback = normalizeOptionalString(fallbackName);\n  if (normalizedFallback) {\n    return { ...toolResult, toolName: normalizedFallback };\n  }\n\n  if (typeof rawToolName === 'string') {\n    return { ...toolResult, toolName: 'unknown' };\n  }\n  return toolResult;\n}\n\n// ── Internal: raw-append symbol storage ─────────────────────────────────────\n\nconst RAW_APPEND_MESSAGE = Symbol('xopc.session.rawAppendMessage');\n\ntype SessionManagerWithRawAppend = SessionManager & {\n  [RAW_APPEND_MESSAGE]?: SessionManager['appendMessage'];\n};\n\nfunction rememberOriginalAppend(\n  sessionManager: SessionManager,\n): SessionManager['appendMessage'] {\n  const tagged = sessionManager as SessionManagerWithRawAppend;\n  const stored = tagged[RAW_APPEND_MESSAGE];\n  if (stored) {\n    return stored;\n  }\n  const original = sessionManager.appendMessage.bind(sessionManager);\n  tagged[RAW_APPEND_MESSAGE] = original;\n  return original;\n}\n\n// ── Internal: pending tool-call state ──────────────────────────────────────\n\ntype PendingToolCall = { id: string; name?: string };\n\nclass PendingToolCallTracker {\n  private readonly pending = new Map<string, string | undefined>();\n\n  size(): number {\n    return this.pending.size;\n  }\n\n  getToolName(id: string): string | undefined {\n    return this.pending.get(id);\n  }\n\n  delete(id: string): void {\n    this.pending.delete(id);\n  }\n\n  clear(): void {\n    this.pending.clear();\n  }\n\n  trackToolCalls(calls: readonly PendingToolCall[]): void {\n    for (const call of calls) {\n      this.pending.set(call.id, call.name);\n    }\n  }\n\n  entries(): IterableIterator<[string, string | undefined]> {\n    return this.pending.entries();\n  }\n\n  getPendingIds(): string[] {\n    return Array.from(this.pending.keys());\n  }\n\n  shouldFlushForSanitizedDrop(): boolean {\n    return this.pending.size > 0;\n  }\n\n  shouldFlushBeforeNonToolResult(nextRole: unknown, toolCallCount: number): boolean {\n    return this.pending.size > 0 && (toolCallCount === 0 || nextRole !== 'assistant');\n  }\n\n  shouldFlushBeforeNewToolCalls(toolCallCount: number): boolean {\n    return this.pending.size > 0 && toolCallCount > 0;\n  }\n}\n\n// ── ToolResultGuard class ──────────────────────────────────────────────────\n\nclass ToolResultGuard {\n  private readonly sessionManager: SessionManager;\n  private readonly opts: ToolResultGuardOptions;\n  private readonly pending = new PendingToolCallTracker();\n  private readonly originalAppend: SessionManager['appendMessage'];\n  private readonly allowSyntheticToolResults: boolean;\n  private readonly maxToolResultChars: number;\n\n  constructor(sessionManager: SessionManager, opts: ToolResultGuardOptions) {\n    this.sessionManager = sessionManager;\n    this.opts = opts;\n    this.originalAppend = rememberOriginalAppend(sessionManager);\n    this.allowSyntheticToolResults = opts.allowSyntheticToolResults ?? true;\n    this.maxToolResultChars = resolveMaxToolResultChars(opts);\n  }\n\n  /** Monkey-patch the session manager so pi-coding-agent's internal appendMessage flows through us. */\n  attach(): void {\n    const bound = this.guardedAppend.bind(this);\n    this.sessionManager.appendMessage = bound as SessionManager['appendMessage'];\n  }\n\n  flushPending(): void {\n    if (this.pending.size() === 0) {\n      return;\n    }\n    if (this.allowSyntheticToolResults) {\n      for (const [id, name] of this.pending.entries()) {\n        const synthetic = makeMissingToolResult({\n          toolCallId: id,\n          toolName: name,\n          text: this.opts.missingToolResultText,\n        });\n        const flushed = this.applyBeforeWriteHook(\n          this.persistToolResult(this.persistMessage(synthetic), {\n            toolCallId: id,\n            toolName: name,\n            isSynthetic: true,\n          }),\n        );\n        if (flushed) {\n          this.originalAppend(capToolResultForPersistence(flushed, this.maxToolResultChars) as never);\n        }\n      }\n    }\n    this.pending.clear();\n  }\n\n  clearPending(): void {\n    this.pending.clear();\n  }\n\n  getPendingIds(): string[] {\n    return this.pending.getPendingIds();\n  }\n\n  private persistMessage(message: AgentMessage): AgentMessage {\n    const transformer = this.opts.transformMessageForPersistence;\n    return transformer ? transformer(message) : message;\n  }\n\n  private persistToolResult(\n    message: AgentMessage,\n    meta: { toolCallId?: string; toolName?: string; isSynthetic?: boolean },\n  ): AgentMessage {\n    const transformer = this.opts.transformToolResultForPersistence;\n    return transformer ? transformer(message, meta) : message;\n  }\n\n  /**\n   * Run the before_message_write hook. Returns the (possibly modified) message,\n   * or null if the message should be blocked.\n   */\n  private applyBeforeWriteHook(msg: AgentMessage): AgentMessage | null {\n    const beforeWrite = this.opts.beforeMessageWriteHook;\n    if (!beforeWrite) {\n      return msg;\n    }\n    const result = beforeWrite({ message: msg });\n    if (result?.block) {\n      return null;\n    }\n    if (result?.message) {\n      return result.message;\n    }\n    return msg;\n  }\n\n  private guardedAppend(message: AgentMessage): unknown {\n    let nextMessage = message;\n    const role = (message as { role?: unknown }).role;\n    if (role === 'assistant') {\n      const sanitized = sanitizeToolCallInputs([message], {\n        allowedToolNames: this.opts.allowedToolNames,\n      });\n      if (sanitized.length === 0) {\n        if (this.pending.shouldFlushForSanitizedDrop()) {\n          this.flushPending();\n        }\n        return undefined;\n      }\n      nextMessage = sanitized[0];\n    }\n    const nextRole = (nextMessage as { role?: unknown }).role;\n\n    if (nextRole === 'toolResult') {\n      const id = extractToolResultId(nextMessage as Extract<AgentMessage, { role: 'toolResult' }>);\n      const toolName = id ? this.pending.getToolName(id) : undefined;\n      if (id) {\n        this.pending.delete(id);\n      }\n      const normalizedToolResult = normalizePersistedToolResultName(nextMessage, toolName);\n      // Apply hard size cap before persistence to prevent oversized tool results\n      // from consuming the entire context window on subsequent LLM calls.\n      const capped = capToolResultForPersistence(\n        this.persistMessage(normalizedToolResult),\n        this.maxToolResultChars,\n      );\n      const persisted = this.applyBeforeWriteHook(\n        this.persistToolResult(capped, {\n          toolCallId: id ?? undefined,\n          toolName,\n          isSynthetic: false,\n        }),\n      );\n      if (!persisted) {\n        return undefined;\n      }\n      return this.originalAppend(capToolResultForPersistence(persisted, this.maxToolResultChars) as never);\n    }\n\n    // Skip tool call extraction for aborted/errored assistant messages.\n    // When stopReason is \"error\" or \"aborted\", the tool_use blocks may be incomplete\n    // and should not have synthetic tool_results created. Creating synthetic results\n    // for incomplete tool calls causes API 400 errors:\n    // \"unexpected tool_use_id found in tool_result blocks\"\n    // This matches the behavior in repairToolUseResultPairing (session-transcript-repair.ts)\n    const stopReason = (nextMessage as { stopReason?: string }).stopReason;\n    const toolCalls =\n      nextRole === 'assistant' && stopReason !== 'aborted' && stopReason !== 'error'\n        ? extractToolCallsFromAssistant(nextMessage as Extract<AgentMessage, { role: 'assistant' }>)\n        : [];\n\n    // Always clear pending tool call state before appending non-tool-result messages.\n    // flushPendingToolResults() only inserts synthetic results when allowSyntheticToolResults\n    // is true; it always clears the pending map. Without this, providers that disable\n    // synthetic results (e.g. OpenAI) accumulate stale pending state when a user message\n    // interrupts in-flight tool calls, leaving orphaned tool_use blocks in the transcript\n    // that cause API 400 errors on subsequent requests.\n    if (this.pending.shouldFlushBeforeNonToolResult(nextRole, toolCalls.length)) {\n      this.flushPending();\n    }\n    // If new tool calls arrive while older ones are pending, flush the old ones first.\n    if (this.pending.shouldFlushBeforeNewToolCalls(toolCalls.length)) {\n      this.flushPending();\n    }\n\n    const finalMessage = this.applyBeforeWriteHook(this.persistMessage(nextMessage));\n    if (!finalMessage) {\n      return undefined;\n    }\n    const result = this.originalAppend(finalMessage as never);\n\n    const sessionFile = (\n      this.sessionManager as { getSessionFile?: () => string | null }\n    ).getSessionFile?.();\n    if (sessionFile) {\n      emitSessionTranscriptUpdate({\n        sessionFile,\n        sessionKey: this.opts.sessionKey,\n        message: finalMessage,\n        messageId: typeof result === 'string' ? result : undefined,\n      });\n    }\n\n    if (toolCalls.length > 0) {\n      this.pending.trackToolCalls(toolCalls);\n    }\n\n    return result;\n  }\n}\n"],"mappings":";;;;;;;;;;;;;AAwGA,SAAgB,8BACd,gBACA,OAA+B,EAAE,EACI;CACrC,MAAM,QAAQ,IAAI,gBAAgB,gBAAgB,KAAK;AACvD,OAAM,QAAQ;AACd,QAAO;EACL,+BAA+B,MAAM,cAAc;EACnD,+BAA+B,MAAM,cAAc;EACnD,qBAAqB,MAAM,eAAe;EAC3C;;;;;;;;AASH,SAAgB,oBACd,gBACA,MAS4B;AAC5B,KAAI,OAAQ,eAA8C,4BAA4B,WACpF,QAAO;CAGT,MAAM,SAAS,8BAA8B,gBAAgB;EAC3D,YAAY,MAAM;EAClB,2BAA2B,MAAM;EACjC,uBAAuB,MAAM;EAC7B,kBAAkB,MAAM;EACxB,oBACE,OAAO,MAAM,wBAAwB,WACjC,8BAA8B;GAC5B,qBAAqB,KAAK;GAC1B,KAAK,MAAM;GACX,SAAS,MAAM;GAChB,CAAC,GACF,KAAA;EACP,CAAC;CACF,MAAM,SAAS;AACf,QAAO,0BAA0B,OAAO;AACxC,QAAO,0BAA0B,OAAO;AACxC,QAAO;;;;;;AAOT,SAAgB,2BACd,gBACiC;AAEjC,QADgB,eAA+C,uBAC9C,eAAe,cAAc,KAAK,eAAe;;AAKpE,SAAS,0BAA0B,MAA+C;AAChF,QAAO,KAAK,IAAI,GAAG,KAAK,sBAAA,KAAyD;;AAGnF,SAAS,kBAAkB,KAAmB,UAAgC;AAC5E,KAAK,IAA0B,SAAS,aACtC,QAAO;AAET,QAAO,0BAA0B,KAAK,UAAU;EAC9C,SAAS,mBAAmB,mCAAmC,eAAe;EAC9E,cAAc;EACf,CAAC;;AAOJ,MAAM,0CAA0C;AAChD,MAAM,oCAAoC;AAC1C,MAAM,qCAAqC;AAC3C,MAAM,6CAA6C;AAEnD,SAAS,0BAA0B,MAAoD;AACrF,QAAO,KAAK,WACR,EAAE,sBAAsB,KAAK,OAAO,GACpC,EAAE,6BAA6B,KAAK,OAAO;;AAGjD,SAAS,8BACP,OACA,WAAW,mCACH;AACR,KAAI,MAAM,UAAU,SAClB,QAAO;AAET,QAAO,GAAG,MAAM,MAAM,GAAG,SAAS,CAAC,wCACjC,MAAM,SAAS,SAChB;;AAGH,SAAS,+BAA+B,OAAyB;AAC/D,KAAI,CAAC,SAAS,OAAO,UAAU,SAC7B,QAAO;CAET,MAAM,MAAM;CACZ,MAAM,MAA+B,EAAE;AACvC,MAAK,MAAM,OAAO;EAChB;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACD,EAAE;EACD,MAAM,QAAQ,IAAI;AAClB,MAAI,UAAU,KAAA,EACZ,KAAI,OAAO,OAAO,UAAU,WAAW,8BAA8B,OAAO,IAAI,GAAG;;AAGvF,KAAI,OAAO,IAAI,YAAY,SACzB,KAAI,UAAU,8BAA8B,IAAI,SAAS,IAAI;AAE/D,QAAO;;AAGT,SAAS,8BACP,KACA,cACA,gBACyB;CACzB,MAAM,WAAoC;EACxC,2BAA2B;EAC3B,uBAAuB;EACvB,GAAG,0BAA0B,aAAa;EAC3C;AACD,KAAI,mBAAmB,KAAA,EACrB,UAAS,wBAAwB;AAEnC,KAAI,KAAK;AACP,WAAS,qBAAqB,uBAAuB,KAAK,GAAG;AAC7D,OAAK,MAAM,OAAO;GAAC;GAAU;GAAa;GAAO;GAAY;GAAc;GAAY,EAAE;GACvF,MAAM,QAAQ,IAAI;AAClB,OAAI,UAAU,KAAA,EACZ,UAAS,OACP,OAAO,UAAU,WACb,8BAA8B,OAAO,2CAA2C,GAChF;;;AAIZ,QAAO;;AAGT,SAAS,+BACP,OACA,KACA,cACyB;CACzB,MAAM,iBAAiB,wBAAwB,MAAM;AACrD,KAAI,kBAAkB,wCACpB,QAAO;CAET,MAAM,WAAW,8BAA8B,KAAK,cAAc,eAAe;AACjF,KAAI,wBAAwB,SAAS,IAAI,wCACvC,QAAO;AAET,QAAO;EACL,2BAA2B;EAC3B,uBAAuB;EACvB,GAAG,0BAA0B,aAAa;EAC1C,uBAAuB;EACxB;;AAGH,SAAS,wCAAwC,SAA2B;AAC1E,KAAI,YAAY,KAAA,KAAa,YAAY,KACvC,QAAO;CAET,MAAM,eAAe,qBAAqB,SAAS,wCAAwC;AAC3F,KAAI,aAAa,YAAY,aAAa,SAAS,wCACjD,QAAO;AAET,KAAI,OAAO,YAAY,SACrB,QAAO,+BACL;EACE,2BAA2B;EAC3B,GAAG,0BAA0B,aAAa;EAC1C,WAAW,OAAO;EACnB,EACD,KAAA,GACA,aACD;CAEH,MAAM,MAAM;CACZ,MAAM,MAA+B;EACnC,2BAA2B;EAC3B,GAAG,0BAA0B,aAAa;EAC1C,oBAAoB,uBAAuB,KAAK,GAAG;EACpD;AACD,MAAK,MAAM,OAAO;EAChB;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACD,EAAE;EACD,MAAM,QAAQ,IAAI;AAClB,MAAI,UAAU,KAAA,EACZ,KAAI,OAAO,OAAO,UAAU,WAAW,8BAA8B,MAAM,GAAG;;AAGlF,KAAI,OAAO,IAAI,SAAS,SACtB,KAAI,OAAO,8BAA8B,IAAI,KAAK;AAEpD,KAAI,MAAM,QAAQ,IAAI,SAAS,EAAE;AAC/B,MAAI,WAAW,IAAI,SAChB,MAAM,GAAG,mCAAmC,CAC5C,IAAI,+BAA+B;AACtC,MAAI,IAAI,SAAS,SAAS,mCACxB,KAAI,oBAAoB,IAAI,SAAS,SAAS;;AAGlD,QAAO,+BAA+B,KAAK,KAAK,aAAa;;AAG/D,SAAS,qBAAqB,KAAiC;AAC7D,KAAK,IAA0B,SAAS,aACtC,QAAO;CAET,MAAM,UAAW,IAA8B;CAC/C,MAAM,mBAAmB,wCAAwC,QAAQ;AACzE,KAAI,qBAAqB,QACvB,QAAO;CAET,MAAM,OAAO,EAAE,GAAG,KAAK;AACvB,MAAK,UAAU;AACf,QAAO;;AAGT,SAAS,4BAA4B,KAAmB,UAAgC;AACtF,QAAO,qBAAqB,kBAAkB,KAAK,SAAS,CAAC;;AAG/D,SAAS,iCACP,SACA,cACc;AACd,KAAK,QAA+B,SAAS,aAC3C,QAAO;CAET,MAAM,aAAa;CACnB,MAAM,cAAe,WAAsC;CAC3D,MAAM,qBAAqB,wBAAwB,YAAY;AAC/D,KAAI,oBAAoB;AACtB,MAAI,gBAAgB,mBAClB,QAAO;AAET,SAAO;GAAE,GAAG;GAAY,UAAU;GAAoB;;CAGxD,MAAM,qBAAqB,wBAAwB,aAAa;AAChE,KAAI,mBACF,QAAO;EAAE,GAAG;EAAY,UAAU;EAAoB;AAGxD,KAAI,OAAO,gBAAgB,SACzB,QAAO;EAAE,GAAG;EAAY,UAAU;EAAW;AAE/C,QAAO;;AAKT,MAAM,qBAAqB,OAAO,gCAAgC;AAMlE,SAAS,uBACP,gBACiC;CACjC,MAAM,SAAS;CACf,MAAM,SAAS,OAAO;AACtB,KAAI,OACF,QAAO;CAET,MAAM,WAAW,eAAe,cAAc,KAAK,eAAe;AAClE,QAAO,sBAAsB;AAC7B,QAAO;;AAOT,IAAM,yBAAN,MAA6B;CAC3B,0BAA2B,IAAI,KAAiC;CAEhE,OAAe;AACb,SAAO,KAAK,QAAQ;;CAGtB,YAAY,IAAgC;AAC1C,SAAO,KAAK,QAAQ,IAAI,GAAG;;CAG7B,OAAO,IAAkB;AACvB,OAAK,QAAQ,OAAO,GAAG;;CAGzB,QAAc;AACZ,OAAK,QAAQ,OAAO;;CAGtB,eAAe,OAAyC;AACtD,OAAK,MAAM,QAAQ,MACjB,MAAK,QAAQ,IAAI,KAAK,IAAI,KAAK,KAAK;;CAIxC,UAA0D;AACxD,SAAO,KAAK,QAAQ,SAAS;;CAG/B,gBAA0B;AACxB,SAAO,MAAM,KAAK,KAAK,QAAQ,MAAM,CAAC;;CAGxC,8BAAuC;AACrC,SAAO,KAAK,QAAQ,OAAO;;CAG7B,+BAA+B,UAAmB,eAAgC;AAChF,SAAO,KAAK,QAAQ,OAAO,MAAM,kBAAkB,KAAK,aAAa;;CAGvE,8BAA8B,eAAgC;AAC5D,SAAO,KAAK,QAAQ,OAAO,KAAK,gBAAgB;;;AAMpD,IAAM,kBAAN,MAAsB;CACpB;CACA;CACA,UAA2B,IAAI,wBAAwB;CACvD;CACA;CACA;CAEA,YAAY,gBAAgC,MAA8B;AACxE,OAAK,iBAAiB;AACtB,OAAK,OAAO;AACZ,OAAK,iBAAiB,uBAAuB,eAAe;AAC5D,OAAK,4BAA4B,KAAK,6BAA6B;AACnE,OAAK,qBAAqB,0BAA0B,KAAK;;;CAI3D,SAAe;EACb,MAAM,QAAQ,KAAK,cAAc,KAAK,KAAK;AAC3C,OAAK,eAAe,gBAAgB;;CAGtC,eAAqB;AACnB,MAAI,KAAK,QAAQ,MAAM,KAAK,EAC1B;AAEF,MAAI,KAAK,0BACP,MAAK,MAAM,CAAC,IAAI,SAAS,KAAK,QAAQ,SAAS,EAAE;GAC/C,MAAM,YAAY,sBAAsB;IACtC,YAAY;IACZ,UAAU;IACV,MAAM,KAAK,KAAK;IACjB,CAAC;GACF,MAAM,UAAU,KAAK,qBACnB,KAAK,kBAAkB,KAAK,eAAe,UAAU,EAAE;IACrD,YAAY;IACZ,UAAU;IACV,aAAa;IACd,CAAC,CACH;AACD,OAAI,QACF,MAAK,eAAe,4BAA4B,SAAS,KAAK,mBAAmB,CAAU;;AAIjG,OAAK,QAAQ,OAAO;;CAGtB,eAAqB;AACnB,OAAK,QAAQ,OAAO;;CAGtB,gBAA0B;AACxB,SAAO,KAAK,QAAQ,eAAe;;CAGrC,eAAuB,SAAqC;EAC1D,MAAM,cAAc,KAAK,KAAK;AAC9B,SAAO,cAAc,YAAY,QAAQ,GAAG;;CAG9C,kBACE,SACA,MACc;EACd,MAAM,cAAc,KAAK,KAAK;AAC9B,SAAO,cAAc,YAAY,SAAS,KAAK,GAAG;;;;;;CAOpD,qBAA6B,KAAwC;EACnE,MAAM,cAAc,KAAK,KAAK;AAC9B,MAAI,CAAC,YACH,QAAO;EAET,MAAM,SAAS,YAAY,EAAE,SAAS,KAAK,CAAC;AAC5C,MAAI,QAAQ,MACV,QAAO;AAET,MAAI,QAAQ,QACV,QAAO,OAAO;AAEhB,SAAO;;CAGT,cAAsB,SAAgC;EACpD,IAAI,cAAc;AAElB,MADc,QAA+B,SAChC,aAAa;GACxB,MAAM,YAAY,uBAAuB,CAAC,QAAQ,EAAE,EAClD,kBAAkB,KAAK,KAAK,kBAC7B,CAAC;AACF,OAAI,UAAU,WAAW,GAAG;AAC1B,QAAI,KAAK,QAAQ,6BAA6B,CAC5C,MAAK,cAAc;AAErB;;AAEF,iBAAc,UAAU;;EAE1B,MAAM,WAAY,YAAmC;AAErD,MAAI,aAAa,cAAc;GAC7B,MAAM,KAAK,oBAAoB,YAA6D;GAC5F,MAAM,WAAW,KAAK,KAAK,QAAQ,YAAY,GAAG,GAAG,KAAA;AACrD,OAAI,GACF,MAAK,QAAQ,OAAO,GAAG;GAEzB,MAAM,uBAAuB,iCAAiC,aAAa,SAAS;GAGpF,MAAM,SAAS,4BACb,KAAK,eAAe,qBAAqB,EACzC,KAAK,mBACN;GACD,MAAM,YAAY,KAAK,qBACrB,KAAK,kBAAkB,QAAQ;IAC7B,YAAY,MAAM,KAAA;IAClB;IACA,aAAa;IACd,CAAC,CACH;AACD,OAAI,CAAC,UACH;AAEF,UAAO,KAAK,eAAe,4BAA4B,WAAW,KAAK,mBAAmB,CAAU;;EAStG,MAAM,aAAc,YAAwC;EAC5D,MAAM,YACJ,aAAa,eAAe,eAAe,aAAa,eAAe,UACnE,8BAA8B,YAA4D,GAC1F,EAAE;AAQR,MAAI,KAAK,QAAQ,+BAA+B,UAAU,UAAU,OAAO,CACzE,MAAK,cAAc;AAGrB,MAAI,KAAK,QAAQ,8BAA8B,UAAU,OAAO,CAC9D,MAAK,cAAc;EAGrB,MAAM,eAAe,KAAK,qBAAqB,KAAK,eAAe,YAAY,CAAC;AAChF,MAAI,CAAC,aACH;EAEF,MAAM,SAAS,KAAK,eAAe,aAAsB;EAEzD,MAAM,cACJ,KAAK,eACL,kBAAkB;AACpB,MAAI,YACF,6BAA4B;GAC1B;GACA,YAAY,KAAK,KAAK;GACtB,SAAS;GACT,WAAW,OAAO,WAAW,WAAW,SAAS,KAAA;GAClD,CAAC;AAGJ,MAAI,UAAU,SAAS,EACrB,MAAK,QAAQ,eAAe,UAAU;AAGxC,SAAO"}

package/dist/src/agent/goals/goal-run-store.js

@@ -1,13 +1,13 @@
-import { init_agent_scope, resolveAgentHomeDir } from "../agent-scope.js";
-import { extractProfileAgentId } from "../../config/agent-profile.js";
+import { init_write_file_atomic, writeTextAtomic } from "../../infra/write-file-atomic.js";
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { init_write_file_atomic, writeTextAtomic } from "../../infra/write-file-atomic.js";
+import { init_agent_scope, resolveAgentHomeDir } from "../agent-scope.js";
+import { extractProfileAgentId } from "../../config/agent-profile.js";
 import { checklistCounts } from "./checklist-types.js";
 import "./goal-run-types.js";
-import { join } from "node:path";
 import { createHash, randomUUID } from "node:crypto";
 import { readFile } from "node:fs/promises";
+import { join } from "node:path";
 //#region src/agent/goals/goal-run-store.ts
 init_agent_scope();
 init_write_file_atomic();

package/dist/src/agent/goals/persistent-goal-service.d.ts

@@ -0,0 +1,84 @@
+/**
+ * PersistentGoalService — owns the "/goal" runtime: continuation scheduling,
+ * the `PersistentGoalApis` bag that command handlers receive, and the post-turn
+ * verdict hook called from `OutboundCoordinator`.
+ *
+ * Previously this logic was scattered across `AgentService`:
+ *   - `setPersistentGoalWebchatContinuationScheduler` + a private callback field
+ *   - `schedulePersistentGoalContinuation` (bus vs webchat fork)
+ *   - `getPersistentGoalApisForCommand` (~40-line API factory)
+ *   - `recordPersistentGoalStreamOutcome` / `takePersistentGoalStreamOutcome`
+ *   - the `/goal` half of `emitSessionTurnComplete` (delegated to
+ *     `handlePersistentGoalPostTurn`)
+ *
+ * Concentrating it here gives the rest of `AgentService` a cleaner surface
+ * (one collaborator instead of five methods) and makes the goal runtime
+ * unit-testable in isolation.
+ */
+import type { Config } from '../../config/schema.js';
+import type { MessageBus } from '../../infra/bus/index.js';
+import type { ModelManager } from '../models/index.js';
+import type { SessionStore } from '../../session/store.js';
+import type { SessionStateBag } from '../session/index.js';
+import type { PersistentGoalApis } from './persistent-goal-apis.js';
+export interface PersistentGoalRouting {
+    sessionKey: string;
+    channel: string;
+    chatId: string;
+    inboundMetadata?: Record<string, unknown>;
+}
+export interface SessionTurnCompletionForGoal {
+    sessionKey: string;
+    channel: string;
+    chatId: string;
+    assistantPlainText: string;
+    aborted: boolean;
+    streamError?: string;
+    skipPersistentGoalPostTurn?: boolean;
+    outboundMetadata?: Record<string, unknown>;
+}
+export interface PersistentGoalServiceOptions {
+    bus: MessageBus;
+    sessionStore: SessionStore;
+    modelManager: ModelManager;
+    sessionState: SessionStateBag;
+    /** Effective config snapshot accessor. */
+    getConfig: () => Config | undefined;
+    /** Resolve the workspace directory for `appendAssistantReceipt` writes. */
+    getResolvedWorkspaceForSession: (sessionKey: string) => string;
+    /** Notify the gateway UI after a metadata change (replaces the in-bag emit). */
+    onSessionMetadataUpdated?: (sessionKey: string) => void;
+    /** Push an assistant token + transcript refresh into a live webchat stream. */
+    notifyWebchatTranscriptAppend: (sessionKey: string, assistantText: string) => void;
+}
+export declare class PersistentGoalService {
+    private readonly opts;
+    /** Gateway only: webchat continuations bypass the bus and reuse `runGatewayAgent`. */
+    private webchatContinuationScheduler?;
+    constructor(opts: PersistentGoalServiceOptions);
+    /** Register the gateway-side webchat continuation hook (set from `web-agent` wiring). */
+    setWebchatContinuationScheduler(fn: ((sessionKey: string, message: string) => void) | undefined): void;
+    /**
+     * Continue a session after `/goal` decides the previous turn needs follow-up.
+     * Webchat sessions go through the scheduler; bus-driven channels re-publish the
+     * follow-up message as an inbound bus event so the existing inbound loop picks it up.
+     */
+    scheduleContinuation(sessionKey: string, message: string, routing: {
+        channel: string;
+        chatId: string;
+        inboundMetadata?: Record<string, unknown>;
+    }): void;
+    /** Build the per-command `PersistentGoalApis` bag (transcript writers + scheduler closures). */
+    buildApisForRouting(routing: PersistentGoalRouting): PersistentGoalApis;
+    recordStreamOutcome(sessionKey: string, outcome: {
+        skipPersistentGoalPostTurn: boolean;
+    }): void;
+    takeStreamOutcome(sessionKey: string): {
+        skipPersistentGoalPostTurn: boolean;
+    } | undefined;
+    /**
+     * Run the `/goal` post-turn verdict for a completed user turn (called from
+     * `OutboundCoordinator.emitSessionTurnComplete`).
+     */
+    runPostTurn(payload: SessionTurnCompletionForGoal): Promise<void>;
+}

package/dist/src/agent/goals/persistent-goal-service.js

@@ -0,0 +1,139 @@
+import { createLogger } from "../../utils/logger/index.js";
+import { init_logger } from "../../utils/logger.js";
+import { init_session_key, parseSessionKey } from "../../routing/session-key.js";
+import { appendPiTranscriptMessage } from "../../session/parity/jsonl-transcript-io.js";
+import { handlePersistentGoalPostTurn } from "./post-turn.js";
+//#region src/agent/goals/persistent-goal-service.ts
+init_session_key();
+init_logger();
+const log = createLogger("PersistentGoalService");
+var PersistentGoalService = class {
+	opts;
+	/** Gateway only: webchat continuations bypass the bus and reuse `runGatewayAgent`. */
+	webchatContinuationScheduler;
+	constructor(opts) {
+		this.opts = opts;
+	}
+	/** Register the gateway-side webchat continuation hook (set from `web-agent` wiring). */
+	setWebchatContinuationScheduler(fn) {
+		this.webchatContinuationScheduler = fn;
+	}
+	/**
+	* Continue a session after `/goal` decides the previous turn needs follow-up.
+	* Webchat sessions go through the scheduler; bus-driven channels re-publish the
+	* follow-up message as an inbound bus event so the existing inbound loop picks it up.
+	*/
+	scheduleContinuation(sessionKey, message, routing) {
+		if (parseSessionKey(sessionKey)?.source === "webchat" && this.webchatContinuationScheduler) {
+			this.webchatContinuationScheduler(sessionKey, message);
+			return;
+		}
+		queueMicrotask(() => {
+			this.opts.bus.publishInbound({
+				channel: routing.channel,
+				chat_id: routing.chatId,
+				sender_id: "persistent-goal",
+				content: message,
+				metadata: {
+					sessionKey,
+					...routing.inboundMetadata
+				}
+			}).catch((err) => {
+				log.warn({
+					err,
+					sessionKey
+				}, "Persistent goal: publishInbound failed");
+			});
+		});
+	}
+	/** Build the per-command `PersistentGoalApis` bag (transcript writers + scheduler closures). */
+	buildApisForRouting(routing) {
+		return {
+			getSessionMetadata: (k) => this.opts.sessionStore.getMetadata(k),
+			updateSessionMetadata: async (k, u) => {
+				await this.opts.sessionStore.updateMetadata(k, u);
+				this.opts.onSessionMetadataUpdated?.(k);
+			},
+			loadMessages: (k) => this.opts.sessionStore.loadMessages(k),
+			saveMessages: (k, m) => this.opts.sessionStore.saveMessages(k, m),
+			appendAssistantReceipt: async (k, text) => {
+				const trimmed = text.trim();
+				if (!trimmed) return;
+				const { absPath } = await this.opts.sessionStore.resolveTranscriptPath(k);
+				await appendPiTranscriptMessage({
+					absPath,
+					cwd: this.opts.getResolvedWorkspaceForSession(k),
+					message: {
+						role: "assistant",
+						content: [{
+							type: "text",
+							text: trimmed
+						}],
+						timestamp: Date.now()
+					},
+					sessionKey: k
+				});
+				this.opts.notifyWebchatTranscriptAppend(k, trimmed);
+			},
+			scheduleContinuation: (sk, msg) => {
+				this.scheduleContinuation(sk, msg, {
+					channel: routing.channel,
+					chatId: routing.chatId,
+					inboundMetadata: routing.inboundMetadata
+				});
+			},
+			inboundConcurrentDepth: (sk) => this.opts.sessionState.getInboundTurnDepth(sk)
+		};
+	}
+	recordStreamOutcome(sessionKey, outcome) {
+		this.opts.sessionState.recordPersistentGoalStreamOutcome(sessionKey, outcome);
+	}
+	takeStreamOutcome(sessionKey) {
+		return this.opts.sessionState.takePersistentGoalStreamOutcome(sessionKey);
+	}
+	/**
+	* Run the `/goal` post-turn verdict for a completed user turn (called from
+	* `OutboundCoordinator.emitSessionTurnComplete`).
+	*/
+	async runPostTurn(payload) {
+		const apis = this.buildApisForRouting({
+			sessionKey: payload.sessionKey,
+			channel: payload.channel,
+			chatId: payload.chatId,
+			inboundMetadata: payload.outboundMetadata
+		});
+		const publishVerdict = !(parseSessionKey(payload.sessionKey)?.source === "webchat") && payload.channel !== "cli" ? async (text) => {
+			await this.opts.bus.publishOutbound({
+				channel: payload.channel,
+				chat_id: payload.chatId,
+				content: text,
+				type: "message",
+				metadata: {
+					accountId: payload.outboundMetadata?.accountId,
+					threadId: payload.outboundMetadata?.threadId
+				}
+			});
+		} : void 0;
+		let runtimeSessionModelRef;
+		try {
+			runtimeSessionModelRef = this.opts.modelManager.getModelForSession(payload.sessionKey);
+		} catch {
+			runtimeSessionModelRef = void 0;
+		}
+		await handlePersistentGoalPostTurn({
+			apis,
+			sessionKey: payload.sessionKey,
+			assistantPlainText: payload.assistantPlainText,
+			aborted: payload.aborted,
+			...payload.streamError !== void 0 ? { streamError: payload.streamError } : {},
+			skipPersistentGoalPostTurn: payload.skipPersistentGoalPostTurn ?? false,
+			config: this.opts.getConfig(),
+			runtimeSessionModelRef,
+			publishVerdictToChannel: publishVerdict
+		});
+	}
+};
+//#endregion
+export { PersistentGoalService };
+
+//# sourceMappingURL=persistent-goal-service.js.map