@xopcai/xopc 0.0.427 → 0.0.430

package/dist/src/agent/background-review/run-background-review.js

@@ -6,30 +6,30 @@ import { getSessionMetadata } from "../../storage/sqlite/session-read-repository
 import { loadCompactionSourceSnapshot } from "../../storage/sqlite/transcript-repository.js";
 import { readAgentMessageContent } from "../memory/agent-message-access.js";
 import "../../storage/sqlite/index.js";
+import { extractTextContent } from "../context/workspace.js";
+import { getAssertionSlot, listUserAssertions } from "../../user-model/repository.js";
 import { init_model_usage, withModelUsageOrigin } from "../../providers/model-usage.js";
-import { resolveUserContextSessionAccess } from "../../user-context/access-policy.js";
-import { failLearningJob, finishLearningJob, learningPolicyHash } from "../../memory-learning/repository.js";
-import { canUseKnowledge } from "../../knowledge-memory/usage-policy.js";
-import { listKnowledgeItems } from "../../knowledge-memory/repository.js";
-import "../../knowledge-memory/index.js";
 import { extractProfileAgentId } from "../../config/agent-profile.js";
-import { resolveModelIntentRef, resolveModelSelector } from "../../config/agent-model-intents.js";
 import { init_sync_provider_auth, resolveProviderApiKeySync } from "../../auth/sync-provider-auth.js";
 import { getApiKeySync, init_providers, resolveModel } from "../../providers/index.js";
 import { createExtensionAwareStreamFn } from "../../providers/extension-stream-bridge.js";
 import { trackAiUsageStream } from "../../usage/recorder.js";
-import { isLoopbackModel } from "../../providers/local-model.js";
+import { resolveModelIntentRef, resolveModelSelector } from "../../config/agent-model-intents.js";
+import { canUseKnowledge } from "../../knowledge-memory/usage-policy.js";
+import { listKnowledgeItems } from "../../knowledge-memory/repository.js";
+import "../../knowledge-memory/index.js";
 import { claimRegisteredExtraction } from "../../user-context/extraction/registry.js";
-import { applyWorkCandidates } from "../../memory-learning/work-capture.js";
+import { resolveUserContextSessionAccess } from "../../user-context/access-policy.js";
 import { stripRuntimeContextFromUserMessage } from "../../session/user-message-display.js";
+import { getAssistantTurnErrorMessage, getLastAssistantMessage, isAssistantTurnAborted, isAssistantTurnFailed } from "../orchestration/llm-turn-retry.js";
+import { resolveAgentTurnTimeoutMs, runAgentTurnWithTimeout } from "../orchestration/run-agent-turn-with-timeout.js";
+import { failLearningJob, finishLearningJob, learningPolicyHash } from "../../memory-learning/repository.js";
+import { isLoopbackModel } from "../../providers/local-model.js";
+import { applyWorkCandidates } from "../../memory-learning/work-capture.js";
 import { applyKnowledgeDeletions } from "../../memory-learning/forget-capture.js";
-import { getAssertionSlot, listUserAssertions } from "../../user-model/repository.js";
 import { emptyUserModelCaptureResult, executeUserModelInterpretation } from "../../user-model/capture/executor.js";
 import { parseUserModelInterpretation } from "../../user-model/capture/semantic.js";
 import "../../user-model/capture/index.js";
-import { extractTextContent } from "../context/workspace.js";
-import { resolveAgentTurnTimeoutMs, runAgentTurnWithTimeout } from "../orchestration/run-agent-turn-with-timeout.js";
-import { getAssistantTurnErrorMessage, getLastAssistantMessage, isAssistantTurnAborted, isAssistantTurnFailed } from "../orchestration/llm-turn-retry.js";
 import { USER_MODEL_MAINTAINER_SYSTEM_PROMPT, buildUserModelInterpreterPrompt } from "./prompts.js";
 import { Agent } from "@earendil-works/pi-agent-core";
 //#region src/agent/background-review/run-background-review.ts
@@ -459,16 +459,25 @@ async function runPersistentLearningJobInner(job, getConfig) {
 		failLearningJob(job, "policy_changed", true);
 		return;
 	}
+	const personalRebuild = job.extractor_version?.startsWith("understanding-") === true;
 	let committed = false;
 	try {
 		committed = finishLearningJob(job, () => {
 			const access = resolveUserContextSessionAccess(current, job.conversation_id);
 			const projectId = getSessionMetadata(job.conversation_id)?.projectId;
 			const result = access.userModel ? executeUserModelInterpretation({
-				interpretation,
+				interpretation: personalRebuild ? {
+					...interpretation,
+					intent: "user_assertion",
+					targetAssertionIds: [],
+					goals: [],
+					collaborationRules: [],
+					assertions: interpretation.intent === "forget" ? [] : interpretation.assertions
+				} : interpretation,
 				evidence,
 				extractionRunId: extraction.run.id,
 				extractorId: "transcript-synthesis",
+				allowRestoreDeleted: !personalRebuild,
 				scopeContext: {
 					conversationId: job.conversation_id,
 					agentId,
@@ -487,7 +496,7 @@ async function runPersistentLearningJobInner(job, getConfig) {
 				workspaceId: job.workspace_id,
 				projectId
 			};
-			const deletions = access.knowledge ? applyKnowledgeDeletions({
+			const deletions = !personalRebuild && access.knowledge ? applyKnowledgeDeletions({
 				interpretation,
 				evidence,
 				context: deletionContext,
@@ -496,7 +505,7 @@ async function runPersistentLearningJobInner(job, getConfig) {
 					limit: 200
 				}).filter((item) => canUseKnowledge(item, deletionContext, access.knowledgePolicy)).map((item) => item.id)
 			}) : [];
-			const work = interpretation.intent !== "forget" && !interpretation.knowledgeDeletions?.length && access.knowledge && current.userContext.knowledgeMemory.writePolicy === "allow" && access.knowledgePolicy.contentSources.includes("memory") ? applyWorkCandidates({
+			const work = !personalRebuild && interpretation.intent !== "forget" && !interpretation.knowledgeDeletions?.length && access.knowledge && current.userContext.knowledgeMemory.writePolicy === "allow" && access.knowledgePolicy.contentSources.includes("memory") ? applyWorkCandidates({
 				candidates: (interpretation.knowledge ?? []).filter((candidate) => access.knowledgePolicy.scopes.includes(candidate.scope)),
 				evidence,
 				conversationId: job.conversation_id,

package/dist/src/agent/child-agent-factory.js

@@ -1,11 +1,11 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { cloudCreditBudgetStopMessage, isCloudCreditBudgetExhausted } from "../providers/xopc-cloud-credit-budget.js";
+import { resolveResponseLanguageForSession } from "./prompt/response-language.js";
 import { resolveAgentAbortReason } from "./orchestration/run-termination.js";
 import { executeWithTimeout } from "./lifecycle/timeout-wrapper.js";
-import { resolveResponseLanguageForSession } from "./prompt/response-language.js";
-import { withDataToolPermissions } from "./tools/dataBatch.js";
 import { withSearchCache } from "./tools/search/cache.js";
+import { withDataToolPermissions } from "./tools/dataBatch.js";
 import { evictEmbeddedSessionRunner } from "./embedded/session-runner.js";
 import { InMemoryTranscriptRuntime } from "./embedded/transcript-runtime.js";
 import { runXopcEmbeddedTurn } from "./embedded/run-turn.js";

package/dist/src/agent/coding/run-verification.d.ts

@@ -13,6 +13,7 @@ type VerificationOptions = {
     required?: boolean;
     toolNames?: string[];
     workspace?: string;
+    trackWorkspace?: boolean;
 };
 /** One run owns its evidence; transcript tool results are the durable record. */
 export declare class RunVerification {

package/dist/src/agent/coding/run-verification.js

@@ -50,7 +50,7 @@ var RunVerification = class RunVerification {
 		this.options = options;
 	}
 	static async open(workspace, options = {}) {
-		const run = new RunVerification(() => readWorkspaceRevision(workspace), {
+		const run = new RunVerification(options.trackWorkspace === false && options.required === false ? async () => void 0 : () => readWorkspaceRevision(workspace), {
 			...options,
 			workspace
 		});

package/dist/src/agent/context/coordinator.js

@@ -1,8 +1,8 @@
 import { extractProfileAgentId } from "../../config/agent-profile.js";
-import { assembleTaskContext } from "../../tasks/task-context-assembler.js";
 import { recordExecutionContext } from "./audit.js";
-import { extractAgentUserPlainText } from "../memory/user-message-text.js";
 import { buildExecutionContext, fitExecutionContextToChars } from "./execution-context.js";
+import { assembleTaskContext } from "../../tasks/task-context-assembler.js";
+import { extractAgentUserPlainText } from "../memory/user-message-text.js";
 //#region src/agent/context/coordinator.ts
 var ExecutionContextCoordinator = class {
 	queriesBySession = /* @__PURE__ */ new Map();

package/dist/src/agent/context/execution-context.js

@@ -1,14 +1,14 @@
 import { getSqliteDatabase, init_transaction } from "../../storage/sqlite/transaction.js";
 import { listCollaborationRules } from "../../storage/sqlite/collaboration-rule-repository.js";
-import { canUseKnowledge } from "../../knowledge-memory/usage-policy.js";
-import { listKnowledgeItems, searchKnowledgeItems } from "../../knowledge-memory/repository.js";
-import "../../knowledge-memory/index.js";
 import { listUserAssertions } from "../../user-model/repository.js";
 import { calculateExecutionValue } from "../../user-model/importance.js";
 import { canUseAssertion } from "../../user-model/usage-policy.js";
+import { canUseKnowledge } from "../../knowledge-memory/usage-policy.js";
+import { listKnowledgeItems, searchKnowledgeItems } from "../../knowledge-memory/repository.js";
+import "../../knowledge-memory/index.js";
 import { retrievalLexicalSimilarity } from "../../retrieval/textFeatures.js";
-import { getExecutionContextFeedbackScores } from "./audit.js";
 import { buildUserContextBlock } from "../memory/context-fence.js";
+import { getExecutionContextFeedbackScores } from "./audit.js";
 import { randomUUID } from "node:crypto";
 //#region src/agent/context/execution-context.ts
 init_transaction();
@@ -46,6 +46,7 @@ function urgency(assertion, asOf) {
 }
 function rankAssertion(assertion, query, asOf, feedbackScore) {
 	const taskRelevance = retrievalLexicalSimilarity(query, `${assertion.statement} ${assertion.normalizedValue}`);
+	const ongoingCollaboration = assertion.authority === "user_explicit" && assertion.kind === "preference" && (assertion.applicability.operation === "response" || Array.isArray(assertion.applicability.operation) && assertion.applicability.operation.includes("response"));
 	const score = calculateExecutionValue({
 		declaredImportance: assertion.declaredImportance,
 		inferredImportance: assertion.inferredImportance,
@@ -55,6 +56,7 @@ function rankAssertion(assertion, query, asOf, feedbackScore) {
 		urgency: urgency(assertion, asOf)
 	}) + feedbackScore;
 	const reasons = [
+		ongoingCollaboration ? "ongoing_collaboration" : "",
 		taskRelevance >= .35 ? "task_relevant" : "",
 		assertion.declaredImportance !== void 0 ? "user_declared_importance" : "",
 		assertion.consequence === "critical" || assertion.consequence === "high" ? "high_consequence" : "",
@@ -130,7 +132,7 @@ function buildExecutionContext(request) {
 		use: "answer",
 		agentId: request.agentId
 	})).map((item) => rankAssertion(item, request.query, asOf, feedbackScores.get(`assertion:${item.id}`) ?? 0)).filter((item) => item.score >= .12 || item.reasons.includes("high_consequence")).sort((left, right) => right.score - left.score) : [];
-	const assertions = [...rankedAssertions.filter((item) => item.usage === "confirmed"), ...rankedAssertions.filter((item) => item.usage === "working_assumption")].slice(0, assertionLimit);
+	const assertions = [...rankedAssertions.filter((item) => item.usage === "confirmed").sort((left, right) => Number(right.reasons.includes("high_consequence")) - Number(left.reasons.includes("high_consequence")) || Number(right.reasons.includes("ongoing_collaboration")) - Number(left.reasons.includes("ongoing_collaboration")) || right.score - left.score), ...rankedAssertions.filter((item) => item.usage === "working_assumption")].slice(0, assertionLimit);
 	const maxKnowledge = Math.max(0, Math.min(100, request.maxKnowledge ?? 12));
 	let knowledge = request.includeKnowledge === false || maxKnowledge === 0 ? [] : searchKnowledgeItems({
 		query: request.query,

package/dist/src/agent/context/project-context.js

@@ -1,12 +1,12 @@
 import { TaskRepository, init_task_repository } from "../../tasks/task-repository.js";
 import { getSessionMetadata } from "../../storage/sqlite/session-read-repository.js";
 import "../../storage/sqlite/index.js";
+import { TaskReadModelProjector } from "../../tasks/task-read-model-projector.js";
+import { ProjectStore } from "../../projects/project-store.js";
+import { getProjectForSession, getProjectWorkspacePathForSession } from "../../projects/workspace.js";
 import { canUseKnowledge } from "../../knowledge-memory/usage-policy.js";
 import { listKnowledgeItems, searchKnowledgeItems } from "../../knowledge-memory/repository.js";
 import "../../knowledge-memory/index.js";
-import { ProjectStore } from "../../projects/project-store.js";
-import { getProjectForSession, getProjectWorkspacePathForSession } from "../../projects/workspace.js";
-import { TaskReadModelProjector } from "../../tasks/task-read-model-projector.js";
 import { sanitizeForPromptLiteral } from "../prompt/sanitize-for-prompt.js";
 import { LocalAppStore } from "../../local-apps/store.js";
 //#region src/agent/context/project-context.ts

package/dist/src/agent/data-acquisition/service.js

@@ -1,11 +1,11 @@
 import { executeWithTimeout } from "../lifecycle/timeout-wrapper.js";
+import { SearchError, classifySearchError } from "../tools/search/errors.js";
 import { checkedFilePath, readWorkspaceFileAsync } from "../sandbox/fileAccess.js";
 import { checkFileSafety } from "../prompt/safety.js";
 import { dataScheduler } from "./scheduler.js";
 import { parseRepositoryMatch, repositorySearch } from "../tools/repository-search.js";
 import { DATA_OPERATION_TOOLS, nativeDataArgs, validateDataBatch } from "./schema.js";
 import { readGitData } from "./git.js";
-import { SearchError, classifySearchError } from "../tools/search/errors.js";
 import { resolve } from "node:path";
 import { createHash } from "node:crypto";
 import { stat } from "node:fs/promises";

package/dist/src/agent/embedded/codemode-extension.js

@@ -1,6 +1,6 @@
 import { getXopcToolMetadata } from "./tool-metadata.js";
-import { isCodemodeCoreRead } from "../tools/codemode-permissions.js";
 import { withDataToolPermissions } from "../tools/dataBatch.js";
+import { isCodemodeCoreRead } from "../tools/codemode-permissions.js";
 import { retainCodemodeOutput } from "./codemode-output.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { createCodemodeExtension } from "@earendil-works/pi-coding-agent";

package/dist/src/agent/embedded/configuration-capability-correction.js

@@ -1,7 +1,7 @@
 //#region src/agent/embedded/configuration-capability-correction.ts
 /** Correct an unverified capability denial once; never infer authorization or execute a write. */
 function configurationCapabilityCorrection(toolNames, userText, answer, messages) {
-	const explicitSkillInstall = /^(?:请|帮我)?安装(?:这个|此)|^(?:please\s+)?install\s+(?:this|the)\b/i.test(userText.trim()) && /skill|技能|能力|周报/i.test(userText) && /https?:\/\//i.test(userText) && !/mcp/i.test(userText) && !/不要|别|暂不|先不|只推荐|仅查看|do not|don't|not now|only recommend|review only/i.test(userText);
+	const explicitSkillInstall = /^(?:请|帮我)?安装(?:这个|此)|^(?:please\s+)?install\s+(?:this|the)\b/i.test(userText.trim()) && /skill|技能|能力/i.test(userText) && /https?:\/\//i.test(userText) && !/mcp/i.test(userText) && !/不要|别|暂不|先不|只推荐|仅查看|do not|don't|not now|only recommend|review only/i.test(userText);
 	const skillAttempted = messages.some((message) => message.role === "assistant" && Array.isArray(message.content) && message.content.some((block) => block.type === "toolCall" && ["skill_install", "skill_manage"].includes(block.name)));
 	const promiseOnly = /^(?:我会|我将|I will|I'll).{0,100}(?:安装|install)/i.test(answer.trim()) && !/需要.{0,20}(?:确认|授权|权限)|cannot|can.t|denied|不可|无法|失败|拒绝/i.test(answer);
 	if (explicitSkillInstall && promiseOnly && !skillAttempted && toolNames.includes("skill_install")) return "Host execution check: the user explicitly requested installing the supplied Skill and using it. The registered skill_install tool has not been attempted; a promise to act is not execution. Continue that exact authorized request with the actual Skill tools and inspect the result, or report an actual blocker. Do not add permissions, force an overwrite, use shell/file configuration, or ask for duplicate consent. This is one bounded continuation, not a new user request.";

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

@@ -3,8 +3,8 @@ import { init_request_repository, personalRequestForExecution } from "../../pers
 import { getSessionMetadata } from "../../storage/sqlite/session-read-repository.js";
 import { init_session_repository } from "../../storage/sqlite/session-repository.js";
 import { isPersonalConversation } from "../../personal-agent/repository.js";
-import { PERSONAL_MAIN_TOOL_IDS } from "../../personal-agent/policy.js";
 import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
+import { PERSONAL_MAIN_TOOL_IDS } from "../../personal-agent/policy.js";
 //#region src/agent/embedded/execution-tool-policy.ts
 init_request_repository();
 init_connection();

package/dist/src/agent/embedded/external-tool-discovery.js

@@ -1,7 +1,7 @@
 import { getEmbeddedExecutionRunId, runWithEmbeddedExecutionSession } from "./execution-context.js";
-import { setXopcToolMetadata } from "./tool-metadata.js";
 import { parseExternalToolRef } from "../external-tools/refs.js";
 import { wrapToolsWithProtection } from "../tools/executor.js";
+import { setXopcToolMetadata } from "./tool-metadata.js";
 import { getExternalToolRegistry } from "../external-tools/tool-registry.js";
 import { createHash } from "node:crypto";
 //#region src/agent/embedded/external-tool-discovery.ts

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

@@ -3,22 +3,22 @@ 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 { evaluateContextBudget } from "../memory/context-budget.js";
+import { isPersonalConversation } from "../../personal-agent/repository.js";
 import { assertProviderUsage, getModelUsageOrigin, init_model_usage, isProviderUsageScopeError } from "../../providers/model-usage.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 { resolveAgentTurnTimeoutMs } from "../orchestration/run-agent-turn-with-timeout.js";
-import { isPersonalConversation } from "../../personal-agent/repository.js";
-import { filterExecutionTools, resolveExecutionToolPolicy } from "./execution-tool-policy.js";
-import { runWithEmbeddedExecutionSession } from "./execution-context.js";
 import { prepareNativeMcpConfig } from "../mcp/native-mcp.js";
 import { boundAutomationMcpSource, restrictAutomationMcpConfig } from "../../automations/mcp-source.js";
+import { runWithEmbeddedExecutionSession } from "./execution-context.js";
 import { resolvePromptCachePolicy } from "../../providers/prompt-cache-plan.js";
-import { assessContext, recoverContext as recoverContext$1 } from "../memory/context-recovery.js";
+import { filterExecutionTools, resolveExecutionToolPolicy } from "./execution-tool-policy.js";
 import { resolveCompactionPolicy } from "../memory/compaction-policy.js";
-import { runXopcEmbeddedTurn } from "./run-turn.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 { runXopcEmbeddedTurn } from "./run-turn.js";
 import { refreshPluginRuntimeAccess } from "../../extensions/agent-plugins/refresh-runtime-access.js";
 import { connectionObjectiveContext } from "../context/connection-objective-context.js";
 import { voicePresentationPrompt } from "../prompt/voice-presentation.js";

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

@@ -9,42 +9,43 @@ import { getClarification, getClarificationResumeInput, isClarificationSuspended
 import "../../storage/sqlite/index.js";
 import { ProviderUsageScopeError, init_model_usage } from "../../providers/model-usage.js";
 import { resolveEffectiveAgentConfigForSession } from "../../config/agent-profile.js";
-import { setTraceIdentity, traceOperation, traceRun, traceTools } from "../../observability/runtime.js";
+import { recordTraceLatency, 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 { originalReadAuthorizationNotice, projectForgottenHistoryMessages, projectSuppressedMemoryBlocks } from "../../memory-learning/forgotten-history.js";
-import { resolveAgentAbortReason } from "../orchestration/run-termination.js";
-import { isAgentTurnTimeoutError, isAgentTurnUnsettledError, resolveAgentTurnTimeoutMs, runAgentTurnWithTimeout } from "../orchestration/run-agent-turn-with-timeout.js";
-import { isContextOverflowError } from "../orchestration/context-overflow.js";
-import { ACCEPTANCE_REPAIR_READ_TOOLS, 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 { isPhoneAssistanceSuspended, phoneAssistance, phoneResumeForRun } from "../../phone/assistance.js";
 import { runWithEmbeddedExecutionSession } from "./execution-context.js";
-import { externalPolicyContext, getXopcToolMetadata } from "./tool-metadata.js";
-import { withDelegationScope } from "../orchestration/delegation-scope.js";
-import { isNestedCodemodePolicy } from "./codemode-extension.js";
-import { isComputerControlActive, isComputerLeaseTool, stopComputerControl } from "../../computer/control-guard.js";
 import { bindComputerAgentTurn, computerImagesForRequest, computerRequestFrameCleanup, endComputerAgentTurn, setComputerProgramAuthorization } from "../../computer/agent-context.js";
+import { isComputerControlActive, isComputerLeaseTool, stopComputerControl } from "../../computer/control-guard.js";
+import { resolveAgentAbortReason } from "../orchestration/run-termination.js";
 import { EmbeddedRunConflictError, abortEmbeddedRun, acquireEmbeddedRunLease, queueEmbeddedSteer } from "./runs.js";
-import { lastAssistantPlainText, subscribeEmbeddedSessionEvents } from "./subscribe-session.js";
-import { detectToolLoops } from "../orchestration/loop-guard.js";
-import { tryApplySessionTranscriptHygiene } from "../transcript/transcript-hygiene.js";
-import { restoreCurrentTurnImages } from "./current-turn-images.js";
+import { externalPolicyContext, getXopcToolMetadata } from "./tool-metadata.js";
+import { isPhoneAssistanceSuspended, phoneAssistance, phoneResumeForRun } from "../../phone/assistance.js";
 import { getActiveTranscriptUserText } from "../inbound/attachment-pipeline.js";
 import { resolvePromptCachePolicy } from "../../providers/prompt-cache-plan.js";
 import { wrapStreamFnForXopcExtensions } from "./xopc-stream-bridge.js";
+import { isNestedCodemodePolicy } from "./codemode-extension.js";
+import { allowsExecutionTool, filterExecutionTools, resolveExecutionToolPolicy } from "./execution-tool-policy.js";
 import { acquireEmbeddedSessionRunner, evictEmbeddedSessionRunner } from "./session-runner.js";
+import { resolveCompactionPolicy } from "../memory/compaction-policy.js";
+import { markTurnToolResult } from "../memory/turn-provenance.js";
+import { ACCEPTANCE_REPAIR_READ_TOOLS, canResumeAfterModelFailure, completedRecoveryToolResult } from "../orchestration/turn-recovery.js";
+import { getMcpSetupResumeInput } from "../mcp/continuation-input.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 { isAgentTurnTimeoutError, 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 { configurationCapabilityCorrection } from "./configuration-capability-correction.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 { projectWorkEvidence } from "../coding/projectEvidence.js";
+import { withDelegationScope } from "../orchestration/delegation-scope.js";
+import { originalReadAuthorizationNotice, projectForgottenHistoryMessages, projectSuppressedMemoryBlocks } from "../../memory-learning/forgotten-history.js";
 import { getModelThinking } from "../../providers/model-thinking.js";
 import "../messaging/no-reply.js";
 import { createAssistantMessageEventStream, getCurrentSystemPrompt, getCurrentTools, isRecoverableLength } from "@earendil-works/pi-ai";
@@ -644,6 +645,7 @@ async function runXopcEmbeddedTurnInner(params) {
 			latencyReasoning = options?.reasoning;
 			if (firstModelRequestAt === void 0) {
 				firstModelRequestAt = currentModelRequestAt;
+				recordTraceLatency({ embeddedPreparationMs: firstModelRequestAt - preparationStartedAt });
 				log.info({
 					conversationId,
 					runId,
@@ -673,7 +675,8 @@ async function runXopcEmbeddedTurnInner(params) {
 		session.agent.streamFunction = loggingStreamFn;
 		const verification = await RunVerification.open(workspaceDir, {
 			required: params.verifyChanges === true,
-			toolNames: tools.map((tool) => tool.name)
+			toolNames: tools.map((tool) => tool.name),
+			trackWorkspace: executionToolPolicy.surface !== "personal_main"
 		});
 		const checkpoints = runner.piSm.getBranch?.() ?? [];
 		const recoveryTurn = params.resumeLastUserMessage === true || Boolean(params.recoveryMessage);
@@ -897,14 +900,20 @@ async function runXopcEmbeddedTurnInner(params) {
 		unsubscribe = subscribeEmbeddedSessionEvents(session, (event) => {
 			if (!firstModelTextSeen && firstModelRequestAt !== void 0 && currentModelRequestAt !== void 0 && event.type === "message_update" && event.assistantMessageEvent?.type === "text_delta" && event.assistantMessageEvent.delta.trim()) {
 				firstModelTextSeen = true;
+				const textSeenAt = performance.now();
+				recordTraceLatency({
+					modelFirstTextMs: textSeenAt - currentModelRequestAt,
+					firstRequestToTextMs: textSeenAt - firstModelRequestAt,
+					modelRequestNumber
+				});
 				log.info({
 					conversationId,
 					runId,
 					modelRef: latencyModelRef,
 					thinking: latencyReasoning ?? "off",
 					phase: "first_model_text",
-					modelFirstTextMs: performance.now() - currentModelRequestAt,
-					firstRequestToTextMs: performance.now() - firstModelRequestAt,
+					modelFirstTextMs: textSeenAt - currentModelRequestAt,
+					firstRequestToTextMs: textSeenAt - firstModelRequestAt,
 					modelRequestNumber
 				}, "Embedded first response text ready");
 			}
@@ -930,10 +939,20 @@ async function runXopcEmbeddedTurnInner(params) {
 			};
 			await runAgentTurnWithTimeout(session.agent, () => withDelegationScope({
 				tools,
+				getToolContext: () => {
+					const message = session.agent.state.messages.findLast((item) => item.role === "assistant");
+					return message?.role === "assistant" ? {
+						assistantMessage: message,
+						context: {
+							messages: session.agent.state.messages,
+							tools: session.agent.state.tools
+						}
+					} : void 0;
+				},
 				authorizeToolCall: params.turnPolicy ? (context, signal) => runWithEmbeddedExecutionSession(conversationId, () => params.turnPolicy.beforeToolCall(context, signal), runId) : void 0
 			}, async () => {
 				if (runAbortSignal.aborted) return;
-				const connectionResume = getConnectionResumeInput(conversationId, runId);
+				const connectionResume = getConnectionResumeInput(conversationId, runId) ?? getMcpSetupResumeInput(conversationId, runId);
 				const clarificationResume = getClarificationResumeInput(conversationId, runId);
 				if (phoneResumeForRun(conversationId, runId)) await session.sendCustomMessage({
 					customType: "phone_resume",

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

@@ -1,18 +1,20 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { filterExecutionTools, resolveExecutionToolPolicy } from "./execution-tool-policy.js";
-import { deferredToolContract, getXopcToolMetadata } from "./tool-metadata.js";
-import { isCodemodeCoreRead } from "../tools/codemode-permissions.js";
 import { createEmbeddedModelRuntime, resolveEmbeddedProviderApiKeySync } from "./model-runtime.js";
 import { getNativePiAgentDir } from "../mcp/native-mcp.js";
+import { createXopcMcpTransport } from "../mcp/transport.js";
 import { createAutomationMcpSourceGuard } from "../../automations/mcp-source.js";
-import { createXopcCodemodeExtension } from "./codemode-extension.js";
 import { abortEmbeddedRun } from "./runs.js";
+import { deferredToolContract, getXopcToolMetadata } from "./tool-metadata.js";
 import { guardSessionManager } from "./session-tool-result-guard.js";
 import { transformUserMessageForPersistence } from "../inbound/attachment-pipeline.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 { createMcpSetupContinuationGuard } from "../mcp/continuation-guard.js";
+import { filterExecutionTools, resolveExecutionToolPolicy } from "./execution-tool-policy.js";
 import { AGENT_PROFILE_CONTEXT_STATE, createAgentProfileContextExtension } from "./agent-profile-context.js";
 import { join } from "node:path";
 import { createHash } from "node:crypto";
@@ -286,10 +288,12 @@ var EmbeddedSessionRunnerPool = class {
 			noContextFiles: true,
 			noExtensions: true,
 			extensionFactories: [
+				createMcpSetupContinuationGuard(runtimeId, tools.some((tool) => tool.name === "mcp_setup")),
 				...mcp?.automationSourceRunId ? [createAutomationMcpSourceGuard(mcp.automationSourceRunId)] : [],
 				...codemode ? [createXopcCodemodeExtension(codemode, tools, () => boundSession)] : [],
 				...discovery ? [createXopcToolSearchExtension(tools)] : [],
 				...mcp ? [createMcpExtension({
+					createTransport: createXopcMcpTransport(),
 					loadConfig: () => mcp,
 					credentials: mcp.credentials,
 					logPath: join(getNativePiAgentDir(), "mcp.log")

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

@@ -3,9 +3,9 @@ import { formatContextLimitTruncationNotice } from "./tool-result-context-guard.
 import { resolveLiveToolResultMaxChars, truncateToolResultMessage } from "./tool-result-truncation.js";
 import { emitSessionTranscriptUpdate } from "../../session/transcript-events.js";
 import { sanitizeSearchInfo } from "../tools/search/search-info.js";
+import { boundedJsonUtf8Bytes, firstEnumerableOwnKeys, jsonUtf8BytesOrInfinity } from "../../infra/json-utf8-bytes.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";
 //#region src/agent/embedded/session-tool-result-guard.ts
 init_string_coerce();
 /**

package/dist/src/agent/embedded/xopc-tools-bridge.js

@@ -1,6 +1,6 @@
+import { recordPersonalPerformance } from "../../personal-agent/performance.js";
 import { getXopcToolMetadata } from "./tool-metadata.js";
 import { withDataToolPermissions } from "../tools/dataBatch.js";
-import { recordPersonalPerformance } from "../../personal-agent/performance.js";
 //#region src/agent/embedded/xopc-tools-bridge.ts
 const APPLY_PATCH_BEGIN_MARKER = "*** Begin Patch";
 const APPLY_PATCH_END_MARKER = "*** End Patch";

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

@@ -5,17 +5,17 @@ import { getConnectorAccount, init_connector_account_repository } from "../../st
 import { appendConnectorExecutionAudit, consumeConnectorApproval, createConnectorApproval, getConnectorApproval, getConnectorConnection, getConnectorInstallation, init_connector_repository } from "../../storage/sqlite/connector-repository.js";
 import { connectorObjectiveScope, init_connection_wait_repository, publishConnectionWait, requireSessionConnection } from "../../storage/sqlite/connection-wait-repository.js";
 import "../../storage/sqlite/index.js";
-import { connectorArgumentsHash, connectorArgumentsPreview } from "../../connectors/approval.js";
-import { connectorPrincipalForSession } from "../../connectors/principal.js";
 import { CapabilityError } from "../../capabilities/runtime/errors.js";
 import { ExternalEffectNotAppliedError, executeExternalOperation } from "../../capabilities/runtime/external-operations.js";
 import "../../capabilities/runtime/dispatcher.js";
-import { selectConnectorAccount } from "../../connectors/account-selection.js";
-import { cliContextPath } from "../../connectors/cli/process.js";
+import { connectorPrincipalForSession } from "../../connectors/principal.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 { validateActionInput } from "../../connectors/cli/protocol.js";
 import { describeCliAction, executeCliAction } from "../../connectors/cli/runtime.js";
 import { externalToolRef, parseExternalToolRef } from "./refs.js";

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

@@ -5,19 +5,19 @@ import { getConnectorAccount } from "../../storage/sqlite/connector-account-repo
 import { consumeConnectorApproval, createConnectorApproval, getConnectorApproval, getConnectorConnection, getConnectorInstallation, listConnectorActionMetadata, listConnectorConnections, listConnectorInstallations, upsertConnectorActionMetadata, upsertConnectorInstallation } from "../../storage/sqlite/connector-repository.js";
 import { bindObjectiveAccount, connectionBinding, connectionBindings, connectorObjectiveScope, init_connection_wait_repository, publishConnectionWait, requireSessionConnection } from "../../storage/sqlite/connection-wait-repository.js";
 import "../../storage/sqlite/index.js";
-import { connectorArgumentsHash, connectorArgumentsPreview } from "../../connectors/approval.js";
-import { canAccessConnectorAccount, currentAccountConnections } from "../../connectors/account-access.js";
-import { connectorPrincipalForSession } from "../../connectors/principal.js";
 import { CapabilityError } from "../../capabilities/runtime/errors.js";
 import { ExternalEffectNotAppliedError, executeExternalOperation } from "../../capabilities/runtime/external-operations.js";
+import { canAccessConnectorAccount, currentAccountConnections } from "../../connectors/account-access.js";
+import { connectorPrincipalForSession } from "../../connectors/principal.js";
 import { connectorIdentitySummary } from "../../connectors/connector-identity.js";
 import { evaluateConnectorExecutionPolicy } from "../../connectors/policy.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 { externalToolRef, parseExternalToolRef } from "./refs.js";
+import { connectorArgumentsHash, connectorArgumentsPreview } from "../../connectors/approval.js";
 import { isToolInputSchema } from "../../connectors/connection-capabilities.js";
+import { externalToolRef, parseExternalToolRef } from "./refs.js";
 import { ExternalToolSearchError } from "./search-error.js";
 //#region src/agent/external-tools/composio-provider.ts
 init_session_input_repository();

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

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

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

@@ -1,6 +1,6 @@
-import { getXopcToolMetadata } from "../embedded/tool-metadata.js";
 import { externalToolRef, parseExternalToolRef } from "./refs.js";
 import { executeToolWithProtection } from "../tools/executor.js";
+import { getXopcToolMetadata } from "../embedded/tool-metadata.js";
 //#region src/agent/external-tools/extension-provider.ts
 function toolSummary(tool) {
 	return tool.description || tool.label || tool.name;

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

@@ -6,12 +6,12 @@ import { connectionBindings, getActiveConnectionWait, init_connection_wait_repos
 import { getSessionMetadata } from "../../storage/sqlite/session-read-repository.js";
 import { init_session_repository } from "../../storage/sqlite/session-repository.js";
 import { connectorPrincipalForSession } from "../../connectors/principal.js";
-import { setXopcToolMetadata } from "../embedded/tool-metadata.js";
 import { listConnectorInstances } from "../../connectors/instances.js";
-import { parseExternalToolRef } from "./refs.js";
 import { getStoreConnectorInstallPlan, parseStoreConnectorCandidateRef, searchStoreConnectorInstallCandidates } from "../../capabilities/store-connector.js";
-import { assertPersonalRequestAccountAccess } from "../../personal-agent/request-access.js";
 import { connectionCandidates, resolveConnectionCandidate } from "../../connectors/connection-candidates.js";
+import { parseExternalToolRef } from "./refs.js";
+import { setXopcToolMetadata } from "../embedded/tool-metadata.js";
+import { assertPersonalRequestAccountAccess } from "../../personal-agent/request-access.js";
 import { ExternalToolService } from "./service.js";
 import { EXTERNAL_TOOL_SOURCES } from "./types.js";
 import { bindExternalToolRegistry } from "./tool-registry.js";

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

@@ -1,6 +1,6 @@
-import { getXopcToolMetadata } from "../embedded/tool-metadata.js";
 import { externalToolRef, parseExternalToolRef } from "./refs.js";
 import { executeToolWithProtection } from "../tools/executor.js";
+import { getXopcToolMetadata } from "../embedded/tool-metadata.js";
 //#region src/agent/external-tools/memory-provider.ts
 function toolSummary(tool) {
 	return tool.description || tool.label || tool.name;

package/dist/src/agent/image/generation/openai-images-provider.js

@@ -5,10 +5,10 @@ import { privateNetworkPolicyToSsrfGuardOptions } from "../../../media-shared/ht
 import { resolveProviderHttpRequestConfig } from "../../../media-shared/http/resolve-provider-http-request-config.js";
 import { postJsonRequest, postMultipartRequest, readJsonResponseLimited } from "../../../media-shared/http/provider-http.js";
 import "../../../media-shared/http/index.js";
-import { imageFileExtensionForMimeType } from "./image-assets.js";
 import { ImageProviderError, validateImageRequest } from "../../../../packages/image-providers/src/validation.js";
 import { decodeBase64, imageFromBytes } from "../../../../packages/image-providers/src/http.js";
 import "../../../../packages/image-providers/src/index.js";
+import { imageFileExtensionForMimeType } from "./image-assets.js";
 //#region src/agent/image/generation/openai-images-provider.ts
 /** Strict implementation of the OpenAI Images REST protocol. */
 init_logger();