@xopcai/xopc 0.0.383 → 0.0.385

package/dist/src/agent/embedded/execution-tool-policy.d.ts

@@ -1,5 +1,5 @@
 import type { AgentTool } from '@earendil-works/pi-agent-core';
-export declare const PERSONAL_REQUEST_TOOL_IDS: readonly ["xopc_tool_search", "xopc_tool_describe", "xopc_tool_execute", "personal_request_result", "personal_request_connection"];
+export declare const PERSONAL_REQUEST_TOOL_IDS: readonly ["xopc_tool_search", "xopc_tool_describe", "xopc_tool_execute", "personal_request_result", "personal_request_connection", "task_collaboration"];
 export type ExecutionToolPolicy = Readonly<{
     surface: 'agent' | 'personal_main' | 'personal_request_worker';
     nativeMcp: boolean;

package/dist/src/agent/embedded/execution-tool-policy.js

@@ -13,7 +13,8 @@ const PERSONAL_REQUEST_TOOL_IDS = [
 	"xopc_tool_describe",
 	"xopc_tool_execute",
 	"personal_request_result",
-	"personal_request_connection"
+	"personal_request_connection",
+	"task_collaboration"
 ];
 /** Resolve from persisted execution identity, never from tool names or model input. */
 function resolveExecutionToolPolicy(conversationId) {
@@ -27,7 +28,7 @@ function resolveExecutionToolPolicy(conversationId) {
 		externalMaterialization: configured,
 		discovery: configured,
 		codemode: configured,
-		revision: "personal-tool-boundaries-v1"
+		revision: "personal-tool-boundaries-v2"
 	};
 }
 function allowsExecutionTool(policy, name) {

package/dist/src/agent/embedded/index.js

@@ -1,7 +1,7 @@
 import { getEmbeddedExecutionRunId, getEmbeddedExecutionSession, runWithEmbeddedExecutionSession } from "./execution-context.js";
+import { abortEmbeddedRun, getEmbeddedRunByConversationId, queueEmbeddedSteer } from "./runs.js";
 import { DEFAULT_MAX_LIVE_TOOL_RESULT_CHARS, resolveLiveToolResultMaxChars, truncateToolResultMessage } from "./tool-result-truncation.js";
 import { getRawSessionAppendMessage, guardSessionManager, installSessionToolResultGuard } from "./session-tool-result-guard.js";
-import { abortEmbeddedRun, getEmbeddedRunByConversationId, queueEmbeddedSteer } from "./runs.js";
 import { acquireEmbeddedSessionRunner, buildEmbeddedRunnerFingerprint, evictAllEmbeddedSessionRunners, evictEmbeddedSessionRunner, getEmbeddedSessionRunnerIdleTtlMs, getEmbeddedSessionRunnerStats, isEmbeddedSessionRunnerEnabled, resetEmbeddedSessionRunnerForTest } from "./session-runner.js";
 import { repairAssistantUsageInSessionManager } from "./session-manager-init.js";
 import { openSqliteHydratingSessionManager } from "./sqlite-hydrating-session-manager.js";

package/dist/src/agent/embedded/run-for-session.js

@@ -2,25 +2,26 @@ import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { parseTurnOutcome } from "../../../packages/gateway-contract/src/turn-outcome.js";
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
+import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
 import { init_providers, resolveModel } from "../../providers/index.js";
 import { appendDynamicPromptSection } from "../prompt/cache-boundary.js";
 import { setTraceIdentity, startObservation, traceOperation, traceRun } from "../../observability/runtime.js";
-import { runWithEmbeddedExecutionSession } from "./execution-context.js";
+import { resolveAgentTurnTimeoutMs } from "../orchestration/run-agent-turn-with-timeout.js";
 import { isPersonalConversation } from "../../personal-agent/repository.js";
-import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
+import { filterExecutionTools, resolveExecutionToolPolicy } from "./execution-tool-policy.js";
+import { runWithEmbeddedExecutionSession } from "./execution-context.js";
 import { resolvePromptCachePolicy } from "../../providers/prompt-cache-plan.js";
 import { prepareNativeMcpConfig } from "../mcp/native-mcp.js";
-import { filterExecutionTools, resolveExecutionToolPolicy } from "./execution-tool-policy.js";
 import { evaluateContextBudget } from "../memory/context-budget.js";
-import { resolveCompactionPolicy } from "../memory/compaction-policy.js";
-import { projectTurnOutcome } from "../../session/turn-outcome-projector.js";
-import { resolveAgentTurnTimeoutMs } from "../orchestration/run-agent-turn-with-timeout.js";
 import { assessContext, recoverContext as recoverContext$1 } from "../memory/context-recovery.js";
+import { resolveCompactionPolicy } from "../memory/compaction-policy.js";
 import { runXopcEmbeddedTurn } from "./run-turn.js";
+import { projectTurnOutcome } from "../../session/turn-outcome-projector.js";
 import { voicePresentationPrompt } from "../prompt/voice-presentation.js";
 import { applyStartupContextToUserMessage } from "../reply/apply-turn-user-enrichment.js";
 import { AgentRunSupervisor } from "../orchestration/agent-run-supervisor.js";
 import { materializeNativeExternalTools } from "./external-tool-discovery.js";
+import { getTaskContinuation, getTaskExecutionDeadline } from "../../tasks/task-continuation.js";
 import crypto from "node:crypto";
 //#region src/agent/embedded/run-for-session.ts
 init_src();
@@ -45,14 +46,21 @@ async function runEmbeddedTurnForSessionInner(params) {
 	let idleJob;
 	let turnCompleted = false;
 	const runId = params.runId ?? crypto.randomUUID();
+	const taskContinuation = getTaskContinuation(conversationId, runId);
 	const config = params.getConfig?.();
 	if (config) setTraceIdentity({ agentId: resolveEffectiveAgentProfileForSession(conversationId).agentId });
 	const supervisor = new AgentRunSupervisor({
 		timeoutMs: resolveAgentTurnTimeoutMs(config, conversationId),
-		deadlineAtMs: params.deadlineAtMs,
+		deadlineAtMs: params.deadlineAtMs ?? getTaskExecutionDeadline(conversationId, runId),
 		parentSignal: params.abortSignal
 	});
 	const finish = async (result) => {
+		if (supervisor.signal.aborted && supervisor.signal.reason instanceof Error && supervisor.signal.reason.message === "Agent run deadline expired") result = {
+			...result,
+			ok: false,
+			retryable: false,
+			errorMessage: supervisor.signal.reason.message
+		};
 		turnCompleted = result.ok && result.stopReason !== "connection_required" && result.stopReason !== "clarification_required";
 		if (result.stopReason === "connection_required" || result.stopReason === "clarification_required") return result;
 		try {
@@ -91,15 +99,15 @@ async function runEmbeddedTurnForSessionInner(params) {
 	};
 	try {
 		await params.beforeTurn?.();
-		if (supervisor.signal.aborted) return {
+		if (supervisor.signal.aborted) return await finish({
 			ok: false,
 			errorMessage: "aborted"
-		};
+		});
 		await agentManager.ensureMemoryReadyForSession?.(conversationId);
-		if (supervisor.signal.aborted) return {
+		if (supervisor.signal.aborted) return await finish({
 			ok: false,
 			errorMessage: "aborted"
-		};
+		});
 		const agent = agentManager.getOrCreateAgent(conversationId);
 		const mm = modelManager;
 		const configuredModelRef = String(mm.getModelForSession(conversationId));
@@ -185,10 +193,10 @@ async function runEmbeddedTurnForSessionInner(params) {
 				startupAction: params.startupAction,
 				force: params.forceStartupContext
 			});
-			if (supervisor.signal.aborted) return {
+			if (supervisor.signal.aborted) return await finish({
 				ok: false,
 				errorMessage: "aborted"
-			};
+			});
 		}
 		try {
 			await maybeAutoCompactBeforeTurn({
@@ -206,16 +214,16 @@ async function runEmbeddedTurnForSessionInner(params) {
 				onEvent: params.onEvent
 			});
 		} catch (err) {
-			if (supervisor.signal.aborted) return {
+			if (supervisor.signal.aborted) return await finish({
 				ok: false,
 				errorMessage: "aborted"
-			};
+			});
 			throw err;
 		}
-		if (supervisor.signal.aborted) return {
+		if (supervisor.signal.aborted) return await finish({
 			ok: false,
 			errorMessage: "aborted"
-		};
+		});
 		log.info({
 			conversationId,
 			runId,
@@ -281,9 +289,21 @@ async function runEmbeddedTurnForSessionInner(params) {
 					timeoutMs: attemptPlan.timeoutMs,
 					turnPolicy,
 					abortSignal: supervisor.signal,
-					onEvent: params.onEvent,
+					onEvent: (event) => {
+						if (event.type === "error") {
+							log.warn({
+								conversationId,
+								runId,
+								modelRef: candidateModelRef,
+								errorMessage: event.content
+							}, "Model attempt failed");
+							return;
+						}
+						params.onEvent?.(event);
+					},
 					onAgentEvent: (event) => agentManager.emitRuntimeEvent(conversationId, event),
 					resumeLastUserMessage,
+					recoveryMessage: taskContinuation?.message,
 					requireVisibleReply: params.requireVisibleReply
 				}), runId));
 				attempt.finish(turnResult.ok ? "success" : "error", turnResult.errorMessage);

package/dist/src/agent/embedded/run-turn.js

@@ -6,32 +6,33 @@ import { getConnectionResumeInput, init_connection_wait_repository, isConnection
 import { getSessionMetadata } from "../../storage/sqlite/session-read-repository.js";
 import { init_session_repository } from "../../storage/sqlite/session-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
+import { resolveEffectiveAgentConfigForSession } from "../../config/agent-profile.js";
 import { setTraceIdentity, traceOperation, traceRun, traceTools } from "../../observability/runtime.js";
 import { continuesAfterTool, trackAiUsageStream } from "../../usage/recorder.js";
 import { cloudCreditBudgetStopMessage, isCloudCreditBudgetExhausted, reportCloudCreditError, withCloudCreditBudget } from "../../providers/xopc-cloud-credit-budget.js";
+import { isAgentTurnUnsettledError, resolveAgentTurnTimeoutMs, runAgentTurnWithTimeout } from "../orchestration/run-agent-turn-with-timeout.js";
+import { isContextOverflowError } from "../orchestration/context-overflow.js";
+import { canResumeAfterModelFailure, completedRecoveryToolResult } from "../orchestration/turn-recovery.js";
+import { getAssistantTurnErrorMessage, isAssistantTurnAborted, isAssistantTurnFailed, maybeRetryTurnAfterTransientLlmFailure, stripTrailingErrorAssistantMessages } from "../orchestration/llm-turn-retry.js";
+import { allowsExecutionTool, filterExecutionTools, resolveExecutionToolPolicy } from "./execution-tool-policy.js";
 import { runWithEmbeddedExecutionSession } from "./execution-context.js";
-import { resolveEffectiveAgentConfigForSession } from "../../config/agent-profile.js";
+import { externalPolicyContext, getXopcToolMetadata } from "./tool-metadata.js";
 import { isComputerControlActive, isComputerLeaseTool, stopComputerControl } from "../../computer/control-guard.js";
-import { externalPolicyContext } from "./tool-metadata.js";
-import { resolvePromptCachePolicy } from "../../providers/prompt-cache-plan.js";
-import { wrapStreamFnForXopcExtensions } from "./xopc-stream-bridge.js";
 import { EmbeddedRunConflictError, abortEmbeddedRun, acquireEmbeddedRunLease, queueEmbeddedSteer } from "./runs.js";
-import { allowsExecutionTool, filterExecutionTools, resolveExecutionToolPolicy } from "./execution-tool-policy.js";
-import { acquireEmbeddedSessionRunner, evictEmbeddedSessionRunner } from "./session-runner.js";
-import { projectContextForModel } from "../memory/context-budget.js";
-import { resolveCompactionPolicy } from "../memory/compaction-policy.js";
-import { markTurnToolResult } from "../memory/turn-provenance.js";
 import { lastAssistantPlainText, subscribeEmbeddedSessionEvents } from "./subscribe-session.js";
-import { isContextOverflowError } from "../orchestration/context-overflow.js";
-import { getAssistantTurnErrorMessage, isAssistantTurnAborted, isAssistantTurnFailed, maybeRetryTurnAfterTransientLlmFailure, stripTrailingErrorAssistantMessages } from "../orchestration/llm-turn-retry.js";
-import { isAgentTurnUnsettledError, resolveAgentTurnTimeoutMs, runAgentTurnWithTimeout } from "../orchestration/run-agent-turn-with-timeout.js";
 import { detectToolLoops } from "../orchestration/loop-guard.js";
 import { tryApplySessionTranscriptHygiene } from "../transcript/transcript-hygiene.js";
 import { restoreCurrentTurnImages } from "./current-turn-images.js";
+import { resolvePromptCachePolicy } from "../../providers/prompt-cache-plan.js";
+import { wrapStreamFnForXopcExtensions } from "./xopc-stream-bridge.js";
+import { acquireEmbeddedSessionRunner, evictEmbeddedSessionRunner } from "./session-runner.js";
+import { projectContextForModel } from "../memory/context-budget.js";
 import { createSqliteTranscriptRuntime } from "./transcript-runtime.js";
 import { assessContext, recoverContext as recoverContext$1 } from "../memory/context-recovery.js";
+import { resolveCompactionPolicy } from "../memory/compaction-policy.js";
 import { buildPromptCacheSnapshot, observePromptCacheSnapshot } from "../../providers/prompt-cache-observability.js";
 import { isPromptCacheExpired, recordPromptCacheTouch } from "../../providers/prompt-cache-lifecycle.js";
+import { markTurnToolResult } from "../memory/turn-provenance.js";
 import { RepositoryInstructions } from "../coding/repository-instructions.js";
 import { RunVerification } from "../coding/run-verification.js";
 import { withDelegationScope } from "../orchestration/delegation-scope.js";
@@ -46,6 +47,17 @@ init_sqlite();
 init_session_repository();
 const log = createLogger("EmbeddedRun");
 const LOG_PREVIEW_MAX_CHARS = 300;
+const RECOVERY_READ_TOOLS = new Set([
+	"read_file",
+	"find",
+	"grep",
+	"list_dir",
+	"tool_manual",
+	"tool_search",
+	"review_workspace",
+	"language_diagnostics",
+	"session_status"
+]);
 function truncateForLog(value, maxChars = LOG_PREVIEW_MAX_CHARS) {
 	return value.length > maxChars ? `${value.slice(0, maxChars)}…` : value;
 }
@@ -216,6 +228,11 @@ async function maybeRecoverInterruptedContext(params) {
 	const overflow = !!errorMessage && isContextOverflowError(errorMessage);
 	const recoverableLength = !!assistant && isRecoverableLengthForModel(assistant, params.model);
 	if (!overflow && !recoverableLength) return false;
+	const discardedCalls = new Set(recoverableLength && assistant ? discardedAttempt(assistant).toolCallIds : []);
+	if (!canResumeAfterModelFailure(params.agent.state.messages.filter((message) => !recoverableLength || message !== assistant && !(message.role === "toolResult" && discardedCalls.has(message.toolCallId))))) {
+		log.warn({ conversationId: params.conversationId }, "Context recovery stopped because a tool outcome is unconfirmed");
+		return false;
+	}
 	if (recoverableLength && (!params.policy.enabled || params.recoveryState.interruptedAttempts >= 1)) {
 		log.warn({
 			conversationId: params.conversationId,
@@ -349,6 +366,7 @@ async function runXopcEmbeddedTurnInner(params) {
 		session.agent.state.messages = stripTrailingErrorAssistantMessages(await transcriptRuntime.loadMessages());
 		runner.piSm.setActiveTurnId?.(runId);
 		const recoveryState = { interruptedAttempts: 0 };
+		const requestRetryBudget = { continues: 0 };
 		let useAuthoritativeProjection = false;
 		const basePrepareNextTurn = session.agent.prepareNextTurnWithContext;
 		const inTurnPrepareNextTurn = async (turn, signal) => {
@@ -566,10 +584,11 @@ async function runXopcEmbeddedTurnInner(params) {
 		session.agent.streamFunction = loggingStreamFn;
 		const verification = await RunVerification.open(workspaceDir);
 		const checkpoints = runner.piSm.getBranch?.() ?? [];
+		const recoveryTurn = params.resumeLastUserMessage === true || Boolean(params.recoveryMessage);
 		const lastStart = checkpoints.findLastIndex((entry) => entry.type === "custom" && entry.customType === "coding_run_started");
 		const lastSummary = checkpoints.findLastIndex((entry) => entry.type === "custom" && entry.customType === "coding_verification");
-		const checkpoint = checkpoints[params.resumeLastUserMessage && lastSummary >= lastStart ? lastSummary : lastStart];
-		if (checkpoint?.type === "custom" && (params.resumeLastUserMessage || lastStart > lastSummary)) verification.restore(checkpoint.data, params.resumeLastUserMessage === true && lastSummary >= lastStart);
+		const checkpoint = checkpoints[recoveryTurn && lastSummary >= lastStart ? lastSummary : lastStart];
+		if (checkpoint?.type === "custom" && (recoveryTurn || lastStart > lastSummary)) verification.restore(checkpoint.data, recoveryTurn && lastSummary >= lastStart);
 		runner.piSm.appendCustomEntry("coding_run_started", {
 			runId,
 			workspace: workspaceDir,
@@ -577,6 +596,11 @@ async function runXopcEmbeddedTurnInner(params) {
 			...await verification.summary()
 		});
 		let policyStopped = false;
+		let policyCompleted = false;
+		let recoveringModel = params.resumeLastUserMessage === true || Boolean(params.recoveryMessage);
+		let recoveryMessages = [...session.agent.state.messages];
+		let policyStopReason;
+		let lengthRecoveryExhausted = false;
 		let connectionStopped = false;
 		let clarificationStopped = false;
 		let sentVisibleMessage = false;
@@ -588,6 +612,7 @@ async function runXopcEmbeddedTurnInner(params) {
 			};
 			if (executionToolPolicy.surface !== "agent" && resolveExecutionToolPolicy(toolPolicyConversationId).surface !== executionToolPolicy.surface) {
 				policyStopped = true;
+				policyStopReason = "Execution identity changed during the run";
 				quarantineRunner = true;
 				return {
 					block: true,
@@ -615,8 +640,23 @@ async function runXopcEmbeddedTurnInner(params) {
 			const decision = await params.turnPolicy?.beforeToolCall(externalPolicyContext(context, tools), signal);
 			if (decision?.block) {
 				policyStopped ||= decision.terminate === true;
+				if (decision.terminate) policyStopReason = decision.reason;
 				return decision;
 			}
+			const tool = tools.find((candidate) => candidate.name === context.toolCall.name);
+			const metadata = tool && getXopcToolMetadata(tool);
+			const readOnly = RECOVERY_READ_TOOLS.has(context.toolCall.name) || metadata?.external?.readOnly === true || metadata?.annotations?.readOnlyHint === true || context.toolCall.name === "task_collaboration" && context.args.command === "get" || context.toolCall.name === "managed_job" && [
+				"wait",
+				"status",
+				"list"
+			].includes(String(context.args.action));
+			if (recoveringModel && !readOnly) {
+				const recorded = completedRecoveryToolResult(recoveryMessages, context.toolCall.name, context.args);
+				if (recorded) return {
+					block: true,
+					reason: recorded
+				};
+			}
 			if (context.toolCall.name !== "read_file") {
 				const scoped = await instructions.forTool(context.toolCall.name, context.args);
 				if (scoped) return {
@@ -661,9 +701,12 @@ async function runXopcEmbeddedTurnInner(params) {
 					conversationId,
 					runId
 				}, "Stopping after the bounded truncated-response recovery attempt");
+				lengthRecoveryExhausted = true;
 				return { action: "end" };
 			}
 			policyStopped ||= params.turnPolicy?.shouldStopAfterTurn(context) ?? false;
+			policyCompleted ||= policyStopped && params.turnPolicy?.stopReason?.() === "completed";
+			if (policyStopped) policyStopReason ??= "Agent execution policy stopped before completion";
 			if (policyStopped || connectionStopped || clarificationStopped) return { action: "end" };
 			const continuation = params.turnPolicy?.takeContinuationMessage?.();
 			if (continuation) {
@@ -721,7 +764,14 @@ async function runXopcEmbeddedTurnInner(params) {
 					content: clarificationResume.content,
 					display: false
 				}, { triggerTurn: true });
-				else if (params.resumeLastUserMessage) await session.agent.continue();
+				else if (params.recoveryMessage && !params.resumeLastUserMessage) {
+					if (!canResumeAfterModelFailure(session.agent.state.messages)) throw new Error("Cannot resume because a tool outcome is unconfirmed");
+					await session.sendCustomMessage({
+						customType: "task_continuation",
+						content: params.recoveryMessage,
+						display: false
+					}, { triggerTurn: true });
+				} else if (params.resumeLastUserMessage) await session.agent.continue();
 				else {
 					const text = userMessageToPromptText(userMessage);
 					const images = params.images ?? [];
@@ -730,25 +780,47 @@ async function runXopcEmbeddedTurnInner(params) {
 				await session.agent.waitForIdle();
 				clarificationStopped ||= isClarificationSuspended(conversationId, runId);
 				if (connectionStopped || clarificationStopped) return;
-				await maybeRetryTurnAfterTransientLlmFailure(session.agent, {
-					conversationId,
-					log,
-					signal: runAbortSignal
-				});
-				await maybeRecoverInterruptedContext({
-					agent: session.agent,
-					model: resolvedModel,
-					conversationId,
-					transcriptRuntime,
-					policy: compactionPolicy,
-					systemPrompt: [systemPrompt, rootInstructions].filter(Boolean).join("\n\n"),
-					abortSignal: runAbortSignal,
-					onEvent,
-					recoveryState,
-					onContextRecovered: () => {
-						useAuthoritativeProjection = true;
-					}
-				});
+				const recoverSettledTurn = async () => {
+					if (policyStopped || connectionStopped || clarificationStopped) return;
+					await maybeRetryTurnAfterTransientLlmFailure(session.agent, {
+						conversationId,
+						log,
+						signal: runAbortSignal,
+						budget: requestRetryBudget,
+						shouldRetry: () => !policyStopped && !connectionStopped && !clarificationStopped,
+						onRetry: () => {
+							recoveringModel = true;
+							recoveryMessages = [...session.agent.state.messages];
+						}
+					});
+					if (policyStopped || connectionStopped || clarificationStopped) return;
+					if (await maybeRecoverInterruptedContext({
+						agent: session.agent,
+						model: resolvedModel,
+						conversationId,
+						transcriptRuntime,
+						policy: compactionPolicy,
+						systemPrompt: [systemPrompt, rootInstructions].filter(Boolean).join("\n\n"),
+						abortSignal: runAbortSignal,
+						onEvent,
+						recoveryState,
+						onContextRecovered: () => {
+							useAuthoritativeProjection = true;
+							recoveringModel = true;
+						}
+					})) await maybeRetryTurnAfterTransientLlmFailure(session.agent, {
+						conversationId,
+						log,
+						signal: runAbortSignal,
+						budget: requestRetryBudget,
+						shouldRetry: () => !policyStopped && !connectionStopped && !clarificationStopped,
+						onRetry: () => {
+							recoveringModel = true;
+							recoveryMessages = [...session.agent.state.messages];
+						}
+					});
+				};
+				await recoverSettledTurn();
 				if (params.requireVisibleReply && !sentVisibleMessage && !policyStopped && !runAbortSignal.aborted && !isAssistantTurnFailed(session.agent) && !isAssistantTurnAborted(session.agent) && lastAssistantPlainText(session).trim() === "NO_REPLY") {
 					await session.sendCustomMessage({
 						customType: "visible_reply_required",
@@ -756,6 +828,7 @@ async function runXopcEmbeddedTurnInner(params) {
 						display: false
 					}, { triggerTurn: true });
 					await session.agent.waitForIdle();
+					await recoverSettledTurn();
 				}
 				const pending = await verification.pendingContext();
 				if ((params.verifyChanges ?? false) && pending && !policyStopped && !runAbortSignal.aborted && !isAssistantTurnFailed(session.agent) && !isAssistantTurnAborted(session.agent)) {
@@ -765,6 +838,7 @@ async function runXopcEmbeddedTurnInner(params) {
 						display: false
 					}, { triggerTurn: true });
 					await session.agent.waitForIdle();
+					await recoverSettledTurn();
 				}
 			}), timeoutMs);
 			if (connectionStopped) runner.piSm.appendCustomEntry("connection_required", {
@@ -787,11 +861,21 @@ async function runXopcEmbeddedTurnInner(params) {
 				errorMessage: "aborted"
 			};
 			if (isAssistantTurnAborted(session.agent)) return {
-				ok: true,
+				ok: false,
+				retryable: false,
+				errorMessage: "aborted",
+				lastAssistantText: lastAssistantPlainText(session)
+			};
+			if (policyStopped && !policyCompleted || lengthRecoveryExhausted || lastAssistantMessage(session.agent.state.messages)?.stopReason === "length") return {
+				ok: false,
+				retryable: false,
+				errorMessage: policyStopReason ?? "Assistant response was truncated before completion",
+				stopReason: policyStopped ? "policy_limit" : "response_truncated",
 				lastAssistantText: lastAssistantPlainText(session)
 			};
 			if (isAssistantTurnFailed(session.agent)) return {
 				ok: false,
+				retryable: canResumeAfterModelFailure(session.agent.state.messages),
 				errorMessage: getAssistantTurnErrorMessage(session.agent) ?? "Assistant turn failed",
 				lastAssistantText: lastAssistantPlainText(session)
 			};

package/dist/src/agent/embedded/session-runner.js

@@ -1,17 +1,17 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
+import { isCodemodeCoreRead } from "../tools/codemode-permissions.js";
+import { filterExecutionTools, resolveExecutionToolPolicy } from "./execution-tool-policy.js";
 import { deferredToolContract, getXopcToolMetadata } from "./tool-metadata.js";
+import { abortEmbeddedRun } from "./runs.js";
 import { guardSessionManager } from "./session-tool-result-guard.js";
 import { transformUserMessageForPersistence } from "../inbound/attachment-pipeline.js";
 import { createEmbeddedModelRuntime, resolveEmbeddedProviderApiKeySync } from "./model-runtime.js";
 import { wrapStreamFnForXopcExtensions } from "./xopc-stream-bridge.js";
 import { xopcToolsToDefinitions } from "./xopc-tools-bridge.js";
-import { isCodemodeCoreRead } from "../tools/codemode-permissions.js";
 import { createXopcCodemodeExtension } from "./codemode-extension.js";
 import { TOOL_DISCOVERY_STATE, createXopcToolSearchExtension } from "./tool-search-extension.js";
 import { getNativePiAgentDir } from "../mcp/native-mcp.js";
-import { abortEmbeddedRun } from "./runs.js";
-import { filterExecutionTools, resolveExecutionToolPolicy } from "./execution-tool-policy.js";
 import { join } from "node:path";
 import { createHash } from "node:crypto";
 import { DefaultResourceLoader, SettingsManager, createAgentSession, createMcpExtension } from "@earendil-works/pi-coding-agent";
@@ -236,7 +236,15 @@ var EmbeddedSessionRunnerPool = class {
 		const settingsManager = createEmbeddedSettingsManager(workspaceDir);
 		const piSm = guardSessionManager(params.transcriptRuntime.openSessionManager(workspaceDir), {
 			conversationId: params.transcriptRuntime.persistent ? runtimeId : void 0,
-			persistCustomTypes: ["codemode-store", TOOL_DISCOVERY_STATE],
+			persistCustomTypes: [
+				"codemode-store",
+				TOOL_DISCOVERY_STATE,
+				"coding_run_started",
+				"coding_verification",
+				"xopc.model-selection",
+				"connection_required",
+				"clarification_required"
+			],
 			contextWindowTokens: model.contextWindow ?? 128e3,
 			transformMessageForPersistence: params.transcriptRuntime.persistent ? (message) => transformUserMessageForPersistence(runtimeId, message) : void 0
 		});

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

@@ -1,10 +1,10 @@
 import { init_string_coerce, normalizeOptionalString } from "../../utils/string-coerce.js";
 import { emitSessionTranscriptUpdate } from "../../session/transcript-events.js";
+import { extractToolCallsFromAssistant, extractToolResultId } from "../transcript/tool-call-id.js";
+import { makeMissingToolResult, sanitizeToolCallInputs } from "../transcript/session-transcript-repair.js";
 import { boundedJsonUtf8Bytes, firstEnumerableOwnKeys, jsonUtf8BytesOrInfinity } from "../../infra/json-utf8-bytes.js";
 import { formatContextLimitTruncationNotice } from "./tool-result-context-guard.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
 init_string_coerce();
 /**

package/dist/src/agent/embedded/tool-result-truncation.js

@@ -1,6 +1,6 @@
 import { init_string_coerce, normalizeLowercaseStringOrEmpty } from "../../utils/string-coerce.js";
-import { formatContextLimitTruncationNotice } from "./tool-result-context-guard.js";
 import { isDataBatchResult, renderDataBatch } from "../data-acquisition/render.js";
+import { formatContextLimitTruncationNotice } from "./tool-result-context-guard.js";
 //#region src/agent/embedded/tool-result-truncation.ts
 init_string_coerce();
 const MAX_TOOL_RESULT_CONTEXT_SHARE = .3;

package/dist/src/agent/embedded/types.d.ts

@@ -95,12 +95,13 @@ export type RunXopcEmbeddedTurnParams = {
     images?: ImageContent[];
     /** Continue from the persisted trailing user row instead of appending it again. */
     resumeLastUserMessage?: boolean;
+    recoveryMessage?: string;
     verifyChanges?: boolean;
     requireVisibleReply?: boolean;
 };
 export type RunXopcEmbeddedTurnResult = {
     ok: boolean;
-    stopReason?: 'connection_required' | 'clarification_required';
+    stopReason?: 'connection_required' | 'clarification_required' | 'policy_limit' | 'response_truncated';
     /** False for harness failures that must not trigger another model attempt. */
     retryable?: boolean;
     errorMessage?: string;

package/dist/src/agent/external-tools/cliProvider.d.ts

@@ -23,6 +23,7 @@ export declare class CliToolProvider implements ExternalToolProvider {
         title: string;
         summary: string;
         description: string;
+        readOnly: boolean;
         batchRead: boolean;
         inputSchema: {
             properties: {

package/dist/src/agent/external-tools/cliProvider.js

@@ -8,14 +8,14 @@ import { init_sqlite } from "../../storage/sqlite/index.js";
 import { CapabilityError } from "../../capabilities/runtime/errors.js";
 import { ExternalEffectNotAppliedError, executeExternalOperation } from "../../capabilities/runtime/external-operations.js";
 import "../../capabilities/runtime/dispatcher.js";
+import { connectorArgumentsHash, connectorArgumentsPreview } from "../../connectors/approval.js";
+import { selectConnectorAccount } from "../../connectors/account-selection.js";
+import { cliContextPath } from "../../connectors/cli/process.js";
 import { validateActionInput } from "../../connectors/cli/protocol.js";
 import { getCliAdapter } from "../../connectors/cli/adapterRegistry.js";
 import { evaluateConnectorExecutionPolicy } from "../../connectors/policy.js";
 import { listConnectorInstances } from "../../connectors/instances.js";
-import { cliContextPath } from "../../connectors/cli/process.js";
 import { cliOwnerId, recoverCliExecutions } from "../../connectors/cli/store.js";
-import { selectConnectorAccount } from "../../connectors/account-selection.js";
-import { connectorArgumentsHash, connectorArgumentsPreview } from "../../connectors/approval.js";
 import { describeCliAction, executeCliAction } from "../../connectors/cli/runtime.js";
 import { connectorPrincipalForSession } from "../../connectors/principal.js";
 import { externalToolRef, parseExternalToolRef } from "./refs.js";
@@ -120,6 +120,7 @@ var CliToolProvider = class {
 			title: action.id,
 			summary: action.description,
 			description: action.description,
+			readOnly: action.scope === "read",
 			batchRead: action.scope === "read",
 			inputSchema: {
 				...action.inputSchema,

package/dist/src/agent/external-tools/composio-provider.js

@@ -7,17 +7,17 @@ import { bindObjectiveAccount, connectionBinding, connectionBindings, connectorO
 import { init_sqlite } from "../../storage/sqlite/index.js";
 import { CapabilityError } from "../../capabilities/runtime/errors.js";
 import { ExternalEffectNotAppliedError, executeExternalOperation } from "../../capabilities/runtime/external-operations.js";
+import { connectorArgumentsHash, connectorArgumentsPreview } from "../../connectors/approval.js";
+import { canAccessConnectorAccount, currentAccountConnections } from "../../connectors/account-access.js";
 import { connectorIdentitySummary } from "../../connectors/connector-identity.js";
 import { evaluateConnectorExecutionPolicy } from "../../connectors/policy.js";
-import { canAccessConnectorAccount, currentAccountConnections } from "../../connectors/account-access.js";
 import { ComposioSessionsAdapter } from "../../connectors/composio-sessions.js";
 import { getComposioToolkitScope, getConfiguredComposioAuthConfigs, isComposioActionAllowedByCatalog, scopeForComposioAction } from "../../connectors/composio.js";
 import { getConnectorDefinition } from "../../connectors/catalog.js";
 import { listConnectorInstances } from "../../connectors/instances.js";
-import { connectorArgumentsHash, connectorArgumentsPreview } from "../../connectors/approval.js";
-import { isToolInputSchema } from "../../connectors/connection-capabilities.js";
 import { connectorPrincipalForSession } from "../../connectors/principal.js";
 import { externalToolRef, parseExternalToolRef } from "./refs.js";
+import { isToolInputSchema } from "../../connectors/connection-capabilities.js";
 import { ExternalToolSearchError } from "./search-error.js";
 //#region src/agent/external-tools/composio-provider.ts
 init_session_input_repository();
@@ -232,6 +232,7 @@ var ComposioToolProvider = class {
 			summary,
 			description: `${summary} Available accounts: ${JSON.stringify(accounts)}. Use xopcAccountId to select one; never guess when the user's intent is ambiguous.`,
 			inputSchema: actionInputSchema(action),
+			readOnly: action.scope === "read" && action.curated,
 			batchRead: accounts.length > 0 && action.scope === "read" && action.curated && BATCH_READ_ACTIONS.has(action.actionId)
 		};
 	}
@@ -313,6 +314,7 @@ var ComposioToolProvider = class {
 			confirmed = true;
 		}
 		const authorizeCurrent = () => {
+			context.authorize?.();
 			context.signal?.throwIfAborted();
 			const current = this.availableInstallations();
 			const installation = this.resolve(toolRef, current.installations)?.installation;

package/dist/src/agent/external-tools/endpoint-provider.js

@@ -2,14 +2,14 @@ import { ExternalEffectNotAppliedError, executeExternalOperation } from "../../c
 import { canonicalCapabilityJson } from "../../capabilities/runtime/dispatcher.js";
 import { init_src } from "../../../packages/computer-control-contract/src/index.js";
 import "../../../packages/browser-control-contract/src/index.js";
+import { externalToolRef, parseExternalToolRef } from "./refs.js";
 import { extractDocumentText } from "../../document-understanding/extract.js";
-import { EndpointToolExecutionError } from "../../endpoint-tools/invocation-service.js";
+import { prepareImageForModel } from "../image/prepare-image-for-model.js";
 import { processLocationTask } from "../../endpoint-tools/location-task.js";
 import { projectDeviceReading } from "../../endpoint-tools/result-projector.js";
-import { DeviceTargetResolver } from "../../endpoint-tools/target-resolver.js";
 import { getEndpointDeviceSettings } from "../../storage/sqlite/endpoint-device-settings-repository.js";
-import { externalToolRef, parseExternalToolRef } from "./refs.js";
-import { prepareImageForModel } from "../image/prepare-image-for-model.js";
+import { DeviceTargetResolver } from "../../endpoint-tools/target-resolver.js";
+import { EndpointToolExecutionError } from "../../endpoint-tools/invocation-service.js";
 import { createHash } from "node:crypto";
 //#region src/agent/external-tools/endpoint-provider.ts
 init_src();