@xopcai/xopc 0.0.388 → 0.0.390

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

@@ -6,28 +6,30 @@ import { getSessionMetadata } from "../../storage/sqlite/session-read-repository
 import { loadCompactionSourceSnapshot } from "../../storage/sqlite/transcript-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
 import { extractTextContent } from "../context/workspace.js";
-import { getAssertionSlot, listUserAssertions } from "../../user-model/repository.js";
+import { resolveUserContextSessionAccess } from "../../user-context/access-policy.js";
+import { failLearningJob, finishLearningJob, learningPolicyHash } from "../../memory-learning/repository.js";
+import { init_model_usage, withModelUsageOrigin } from "../../providers/model-usage.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 { resolveModelIntentRef, resolveModelSelector } from "../../config/agent-model-intents.js";
-import { claimRegisteredExtraction } from "../../user-context/extraction/registry.js";
-import { resolveUserContextSessionAccess } from "../../user-context/access-policy.js";
-import { stripRuntimeContextFromUserMessage } from "../../session/user-message-display.js";
-import { readAgentMessageContent } from "../memory/agent-message-access.js";
-import { 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 { claimRegisteredExtraction } from "../../user-context/extraction/registry.js";
 import { applyWorkCandidates } from "../../memory-learning/work-capture.js";
+import { stripRuntimeContextFromUserMessage } from "../../session/user-message-display.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 { readAgentMessageContent } from "../memory/agent-message-access.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
+init_model_usage();
 init_transaction();
 init_sync_provider_auth();
 init_providers();
@@ -143,6 +145,12 @@ async function interpret(params) {
 		getApiKey: (provider) => resolveProviderApiKeySync(provider) ?? getApiKeySync(provider) ?? ""
 	});
 	reviewAgent.state.messages = params.evidence.map(tagMessage);
+	let interpretation = null;
+	const diagnostics = {
+		conversationId: params.conversationId,
+		provider: params.model.provider,
+		modelId: params.model.id
+	};
 	try {
 		await runAgentTurnWithTimeout(reviewAgent, async () => {
 			const timezone = params.getConfig()?.userContext.userModel.maintenance.timezone ?? Intl.DateTimeFormat().resolvedOptions().timeZone ?? "UTC";
@@ -163,20 +171,52 @@ async function interpret(params) {
 				timestamp: Date.now()
 			});
 			await reviewAgent.waitForIdle();
+			for (let attempt = 0; attempt < 2; attempt += 1) {
+				if (isAssistantTurnAborted(reviewAgent) || isAssistantTurnFailed(reviewAgent)) {
+					log.warn({
+						...diagnostics,
+						failureReason: isAssistantTurnAborted(reviewAgent) ? "aborted" : "model_failed",
+						errorMessage: getAssistantTurnErrorMessage(reviewAgent)
+					}, "User-understanding model turn failed");
+					return;
+				}
+				const raw = lastAssistantText(reviewAgent);
+				let failure;
+				interpretation = parseUserModelInterpretation(raw, params.evidence, params.availableAssertions.map((item) => item.id), (value) => {
+					failure = value;
+				});
+				if (interpretation) return;
+				const fields = {
+					...diagnostics,
+					...failure,
+					outputChars: raw.length,
+					stopReason: getLastAssistantMessage(reviewAgent.state.messages)?.stopReason
+				};
+				if (attempt === 1) {
+					log.warn(fields, "User-understanding output invalid after one repair attempt");
+					return;
+				}
+				log.debug(fields, "Repairing invalid user-understanding output");
+				await reviewAgent.prompt({
+					role: "user",
+					timestamp: Date.now(),
+					content: `Your previous response did not satisfy the required JSON schema (${JSON.stringify(failure)}). Return a corrected complete JSON object using exactly the shapes, allowed values, and limits above. Omit optional fields instead of returning null. Do not invent evidence or relax grounding. Return empty candidate arrays when no supported candidates exist. Return JSON only.`
+				});
+				await reviewAgent.waitForIdle();
+			}
 		}, Math.min(params.timeoutMs, resolveAgentTurnTimeoutMs(params.getConfig())));
 	} catch (err) {
 		log.warn({
 			err,
-			conversationId: params.conversationId
+			...diagnostics
 		}, "User-understanding interpretation failed or timed out");
 		reviewAgent.abort();
 		await reviewAgent.waitForIdle().catch(() => {});
 		return null;
 	}
-	if (isAssistantTurnAborted(reviewAgent) || isAssistantTurnFailed(reviewAgent)) return null;
-	return parseUserModelInterpretation(lastAssistantText(reviewAgent), params.evidence, params.availableAssertions.map((item) => item.id));
+	return interpretation;
 }
-async function executeReview(params) {
+async function executeReviewInner(params) {
 	const runtime = resolveInterpreterRuntime(params);
 	if (!runtime) return emptyUserModelCaptureResult();
 	const extraction = claimRegisteredExtraction({
@@ -280,7 +320,7 @@ function listAvailableAssertions() {
 	});
 }
 /** Persisted job runner; independent of an interactive Agent instance surviving eviction. */
-async function runPersistentLearningJob(job, getConfig) {
+async function runPersistentLearningJobInner(job, getConfig) {
 	const config = getConfig();
 	if (!config || !resolveUserContextSessionAccess(config, job.conversation_id).enabled || learningPolicyHash(config) !== job.policy_hash) {
 		failLearningJob(job, "policy_changed", true);
@@ -436,5 +476,11 @@ async function runPersistentLearningJob(job, getConfig) {
 		errorCode: "lease_lost"
 	});
 }
+async function executeReview(params) {
+	return withModelUsageOrigin("background", () => executeReviewInner(params));
+}
+async function runPersistentLearningJob(job, getConfig) {
+	return withModelUsageOrigin("background", () => runPersistentLearningJobInner(job, getConfig));
+}
 //#endregion
 export { createBackgroundUserModelReviewTask, runPersistentLearningJob };

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

@@ -4,6 +4,7 @@ import { cloudCreditBudgetStopMessage, isCloudCreditBudgetExhausted } from "../p
 import { resolveAgentAbortReason } from "./orchestration/run-termination.js";
 import { executeWithTimeout } from "./lifecycle/timeout-wrapper.js";
 import { withDataToolPermissions } from "./tools/dataBatch.js";
+import { withSearchCache } from "./tools/search/cache.js";
 import { evictEmbeddedSessionRunner } from "./embedded/session-runner.js";
 import { InMemoryTranscriptRuntime } from "./embedded/transcript-runtime.js";
 import { runXopcEmbeddedTurn } from "./embedded/run-turn.js";
@@ -11,7 +12,6 @@ import { createAgentTurnPolicy } from "./orchestration/agent-turn-policy.js";
 import { createDelegationBudgetPolicy, resolveDelegationBudget } from "./orchestration/delegation-budget.js";
 import { buildSubagentSystemPrompt } from "./prompt/subagent-context.js";
 import { resolveResponseLanguageForSession } from "./prompt/response-language.js";
-import { withSearchCache } from "./tools/search/cache.js";
 import { createResearchCheckpointTool } from "./tools/research-checkpoint-tool.js";
 import { randomUUID } from "node:crypto";
 //#region src/agent/child-agent-factory.ts

package/dist/src/agent/coding/repository-instructions.js

@@ -1,5 +1,5 @@
-import { isDataBatchResult } from "../data-acquisition/render.js";
 import { validateDataBatch } from "../data-acquisition/schema.js";
+import { isDataBatchResult } from "../data-acquisition/render.js";
 import { basename, dirname, isAbsolute, relative, resolve, sep } from "node:path";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";

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

@@ -1,8 +1,8 @@
 import { extractProfileAgentId } from "../../config/agent-profile.js";
-import { recordExecutionContext } from "./audit.js";
-import { buildExecutionContext, fitExecutionContextToChars } from "./execution-context.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";
 //#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 { init_collaboration_rule_repository, listCollaborationRules } from "../../storage/sqlite/collaboration-rule-repository.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 { listUserAssertions } from "../../user-model/repository.js";
+import { calculateExecutionValue } from "../../user-model/importance.js";
+import { canUseAssertion } from "../../user-model/usage-policy.js";
 import { retrievalLexicalSimilarity } from "../../retrieval/textFeatures.js";
-import { buildUserContextBlock } from "../memory/context-fence.js";
 import { getExecutionContextFeedbackScores } from "./audit.js";
+import { buildUserContextBlock } from "../memory/context-fence.js";
 import { randomUUID } from "node:crypto";
 //#region src/agent/context/execution-context.ts
 init_transaction();

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

@@ -3,8 +3,8 @@ import { TaskRepository, init_task_repository } from "../../tasks/task-repositor
 import { getSessionMetadata } from "../../storage/sqlite/session-read-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
 import { TaskReadModelProjector } from "../../tasks/task-read-model-projector.js";
-import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
 import { sanitizeForPromptLiteral } from "../prompt/sanitize-for-prompt.js";
+import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
 import { buildActiveProjectContextForPrompt } from "./project-context.js";
 //#region src/agent/context/execution-scope.ts
 init_sqlite();

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 { init_sqlite } from "../../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,7 +1,7 @@
 import { executeWithTimeout } from "../lifecycle/timeout-wrapper.js";
 import { checkedFilePath, readWorkspaceFileAsync } from "../sandbox/fileAccess.js";
-import { checkFileSafety } from "../prompt/safety.js";
 import { dataScheduler } from "./scheduler.js";
+import { checkFileSafety } from "../prompt/safety.js";
 import { parseRepositoryMatch, repositorySearch } from "../tools/repository-search.js";
 import { DATA_OPERATION_TOOLS, nativeDataArgs, validateDataBatch } from "./schema.js";
 import { readGitData } from "./git.js";

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

@@ -1,6 +1,6 @@
+import { isCodemodeCoreRead } from "../tools/codemode-permissions.js";
 import { getXopcToolMetadata } from "./tool-metadata.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/run-for-session.js

@@ -2,21 +2,22 @@ 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 { 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 { 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 { connectionObjectiveContext } from "../context/connection-objective-context.js";
 import { voicePresentationPrompt } from "../prompt/voice-presentation.js";
 import { applyStartupContextToUserMessage } from "../reply/apply-turn-user-enrichment.js";
@@ -25,6 +26,7 @@ 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_model_usage();
 init_src();
 init_logger();
 init_providers();
@@ -114,15 +116,26 @@ async function runEmbeddedTurnForSessionInner(params) {
 		const mm = modelManager;
 		const configuredModelRef = String(mm.getModelForSession(conversationId));
 		const candidates = typeof mm.getFallbackCandidatesForSession === "function" ? mm.getFallbackCandidatesForSession(conversationId) : [];
-		const candidateModelRefs = candidates.length > 0 ? candidates.map((candidate) => `${candidate.provider}/${candidate.model}`) : [configuredModelRef];
+		const effective = config ? resolveEffectiveAgentProfileForSession(conversationId).config : void 0;
+		const background = getModelUsageOrigin() === "background" && !mm.hasSessionModelOverride?.(conversationId) && configuredModelRef === effective?.models.chat.primary ? effective.models.background : void 0;
+		const candidateModelRefs = background ? [background.primary, ...background.fallbacks] : candidates.length > 0 ? candidates.map((candidate) => `${candidate.provider}/${candidate.model}`) : [configuredModelRef];
+		const selectedRef = background?.primary ?? configuredModelRef;
+		assertProviderUsage(selectedRef.split("/")[0]);
+		try {
+			const selected = !background && typeof mm.getResolvedModelForSession === "function" ? mm.getResolvedModelForSession(conversationId) : resolveModel(selectedRef);
+			assertProviderUsage(selected.provider, selected.baseUrl);
+		} catch (error) {
+			if (isProviderUsageScopeError(error)) throw error;
+		}
 		const resolvedCandidates = [];
 		for (const [index, ref] of candidateModelRefs.entries()) try {
-			const resolved = index === 0 && typeof mm.getResolvedModelForSession === "function" ? mm.getResolvedModelForSession(conversationId) : resolveModel(ref);
+			const resolved = !background && index === 0 && typeof mm.getResolvedModelForSession === "function" ? mm.getResolvedModelForSession(conversationId) : resolveModel(ref);
 			resolvedCandidates.push({
 				ref,
 				model: resolved
 			});
 		} catch (err) {
+			if (index === 0) assertProviderUsage(ref.split("/")[0]);
 			log.warn({
 				err,
 				conversationId,
@@ -134,6 +147,7 @@ async function runEmbeddedTurnForSessionInner(params) {
 		if (!primary) throw new Error(`No available model candidates for '${configuredModelRef}'`);
 		const modelRef = primary.ref;
 		const model = primary.model;
+		assertProviderUsage(model.provider, model.baseUrl);
 		if (typeof mm.applyResolvedModel === "function") mm.applyResolvedModel(agent, model, modelRef);
 		else await mm.applyModelForSession(agent, conversationId);
 		agentManager.setModelForSession(conversationId, modelRef);
@@ -155,7 +169,7 @@ async function runEmbeddedTurnForSessionInner(params) {
 				triggerThreshold: idlePolicy.personalIdle.triggerThreshold
 			});
 			if (budget.estimatedTokens <= budget.triggerTokens || messages.length < idlePolicy.minMessagesBeforeCompact) return "skipped";
-			const summaryModel = idlePolicy.personalIdle.model ?? idlePolicy.model;
+			const summaryModel = idlePolicy.personalIdle.model ?? idlePolicy.model ?? effective?.models.background?.primary;
 			const candidate = await sessionStore.prepareCompaction(conversationId, summaryModel ? resolveModel(summaryModel) : model, {
 				...idlePolicy,
 				keepRecentTokens: idlePolicy.personalIdle.keepRecentTokens,
@@ -322,6 +336,10 @@ async function runEmbeddedTurnForSessionInner(params) {
 					return await finish(turnResult);
 				}
 				lastResult = turnResult;
+				if (isProviderUsageScopeError(turnResult.errorMessage)) return await finish({
+					...turnResult,
+					retryable: false
+				});
 				if (supervisor.signal.aborted || turnResult.retryable === false) break;
 				log.warn({
 					conversationId,
@@ -334,6 +352,11 @@ async function runEmbeddedTurnForSessionInner(params) {
 				}, hasNextCandidate ? "Agent model turn failed, trying fallback" : "Agent model turn failed, no fallback remains");
 			} catch (err) {
 				attempt.finish("error", err instanceof Error ? err.message : String(err));
+				if (isProviderUsageScopeError(err)) return await finish({
+					ok: false,
+					retryable: false,
+					errorMessage: err instanceof Error ? err.message : String(err)
+				});
 				lastError = err;
 				if (err instanceof DOMException && err.name === "AbortError") {
 					await finish({

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

@@ -6,34 +6,35 @@ 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 { 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 { continuesAfterTool, trackAiUsageStream } from "../../usage/recorder.js";
 import { cloudCreditBudgetStopMessage, isCloudCreditBudgetExhausted, reportCloudCreditError, withCloudCreditBudget } from "../../providers/xopc-cloud-credit-budget.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 { runWithEmbeddedExecutionSession } from "./execution-context.js";
+import { externalPolicyContext, getXopcToolMetadata } from "./tool-metadata.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 { externalPolicyContext, getXopcToolMetadata } from "./tool-metadata.js";
-import { resolvePromptCachePolicy } from "../../providers/prompt-cache-plan.js";
-import { wrapStreamFnForXopcExtensions } from "./xopc-stream-bridge.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 { ACCEPTANCE_REPAIR_READ_TOOLS, canResumeAfterModelFailure, completedRecoveryToolResult } from "../orchestration/turn-recovery.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 { 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";
@@ -41,6 +42,7 @@ import { getModelThinking } from "../../providers/model-thinking.js";
 import "../messaging/no-reply.js";
 import { createAssistantMessageEventStream, getCurrentSystemPrompt, getCurrentTools, isRecoverableLength } from "@earendil-works/pi-ai";
 //#region src/agent/embedded/run-turn.ts
+init_model_usage();
 init_connection_wait_repository();
 init_clarification_wait_repository();
 init_logger();
@@ -273,6 +275,11 @@ async function runXopcEmbeddedTurn(params) {
 				conversationId: params.conversationId,
 				runId: params.runId
 			}, () => runXopcEmbeddedTurnInner(params), params.userMessage);
+			if (result.errorMessage?.includes("provider_usage_scope_denied")) return {
+				...result,
+				ok: false,
+				retryable: false
+			};
 			const stopped = cloudCreditBudgetStopMessage();
 			if (stopped) return {
 				...result,
@@ -289,6 +296,11 @@ async function runXopcEmbeddedTurn(params) {
 			}
 			return result;
 		} catch (error) {
+			if (error instanceof ProviderUsageScopeError) return {
+				ok: false,
+				retryable: false,
+				errorMessage: error.message
+			};
 			const message = error instanceof Error ? error.message : String(error);
 			if (isCloudCreditBudgetExhausted(message)) {
 				reportCloudCreditError(message);
@@ -624,7 +636,7 @@ async function runXopcEmbeddedTurnInner(params) {
 			}
 			const resume = getClarificationResumeInput(conversationId, runId);
 			const wait = resume?.payload?.waitId ? getClarification(resume.payload.waitId) : void 0;
-			if (wait?.approvalKey?.startsWith("computer:") && wait.answer !== "已在桌面端处理，继续") await stopComputerControl(conversationId);
+			if (wait?.approvalKey?.startsWith("computer:") && wait.decision !== "approve") await stopComputerControl(conversationId);
 			if (isComputerControlActive(conversationId) && !isComputerLeaseTool(context.toolCall.name)) return {
 				block: true,
 				reason: "A desktop-control lease is active. Only computer_use, clarification and static tool manuals are admitted until release is confirmed. Close the lease before an authorized tool handoff. Never use shell, browser or raw MCP to bypass a desktop refusal."

package/dist/src/agent/embedded/session-runner.d.ts

@@ -1,10 +1,11 @@
 import type { AgentTool } from '@earendil-works/pi-agent-core';
 import type { ThinkingLevel } from '@earendil-works/pi-agent-core';
-import { type LoadedMcpConfig, type AgentSession } from '@earendil-works/pi-coding-agent';
+import { type AgentSession } from '@earendil-works/pi-coding-agent';
 import type { Model, Api } from '@earendil-works/pi-ai';
 import { type GuardedPiTranscriptManager } from './session-tool-result-guard.js';
 import type { EmbeddedTranscriptRuntime } from './transcript-runtime.js';
 import { type CodemodePolicy } from './codemode-extension.js';
+import { type NativeMcpConfig } from '../mcp/native-mcp.js';
 import { type ExecutionToolPolicy } from './execution-tool-policy.js';
 export type EmbeddedRunnerFingerprintInput = {
     transcriptId: string;
@@ -16,7 +17,7 @@ export type EmbeddedRunnerFingerprintInput = {
     thinkingLevel: string;
     credentialRevision: string;
     codemode?: CodemodePolicy;
-    mcp?: LoadedMcpConfig;
+    mcp?: NativeMcpConfig;
     executionToolPolicy?: ExecutionToolPolicy;
 };
 export declare function buildEmbeddedRunnerFingerprint(input: EmbeddedRunnerFingerprintInput): string;
@@ -31,7 +32,7 @@ export type AcquireEmbeddedSessionRunnerParams = {
     thinkingLevel: ThinkingLevel;
     transcriptRuntime: EmbeddedTranscriptRuntime;
     codemode?: CodemodePolicy;
-    mcp?: LoadedMcpConfig;
+    mcp?: NativeMcpConfig;
     executionToolPolicy?: ExecutionToolPolicy;
 };
 export type AcquiredEmbeddedSessionRunner = {

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 { abortEmbeddedRun } from "./runs.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 { 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";
@@ -43,7 +43,11 @@ function buildEmbeddedRunnerFingerprint(input) {
 		input.thinkingLevel,
 		input.credentialRevision,
 		JSON.stringify(input.codemode ?? null),
-		JSON.stringify(input.mcp ?? null),
+		JSON.stringify(input.mcp ? {
+			servers: input.mcp.servers,
+			errors: input.mcp.errors,
+			credentialAliases: input.mcp.credentialAliases
+		} : null),
 		JSON.stringify(input.executionToolPolicy ?? null)
 	].join("\0")).digest("base64url");
 }
@@ -283,6 +287,7 @@ var EmbeddedSessionRunnerPool = class {
 				...discovery ? [createXopcToolSearchExtension(tools)] : [],
 				...mcp ? [createMcpExtension({
 					loadConfig: () => mcp,
+					credentials: mcp.credentials,
 					logPath: join(getNativePiAgentDir(), "mcp.log")
 				})] : [],
 				createAgentProfileContextExtension(runtimeId)

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/xopc-stream-bridge.js

@@ -1,3 +1,4 @@
+import { assertProviderUsage, init_model_usage } from "../../providers/model-usage.js";
 import "../../providers/constants.js";
 import { init_providers } from "../../providers/index.js";
 import { createExtensionAwareStreamFn } from "../../providers/extension-stream-bridge.js";
@@ -6,6 +7,7 @@ import { assertCloudCreditBudgetActive, cloudCreditBudgetHeaders, hasCloudCredit
 import { preparePromptCacheContext, withPromptCachePayloadTransform } from "../../providers/prompt-cache-payload.js";
 import { getCurrentSystemPrompt, getCurrentTools, normalizeContext } from "@earendil-works/pi-ai";
 //#region src/agent/embedded/xopc-stream-bridge.ts
+init_model_usage();
 init_providers();
 /**
 * pi-coding-agent's default {@link createAgentSession} streamFn always routes through
@@ -20,6 +22,7 @@ function wrapStreamFnForXopcExtensions(originalStreamFn, promptCachePolicy) {
 	const extensionStreamFn = createExtensionAwareStreamFn();
 	return ((model, context, options) => {
 		assertCloudCreditBudgetActive();
+		assertProviderUsage(model.provider, model.baseUrl);
 		if (model.provider === "xopc-cloud") options = withCloudUsageResponse(options);
 		const promptContext = {
 			systemPrompt: getCurrentSystemPrompt(context.messages),

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

@@ -8,15 +8,15 @@ 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 { connectorPrincipalForSession } from "../../connectors/principal.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 { externalToolRef, parseExternalToolRef } from "./refs.js";
 import { join } from "node:path";

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

@@ -7,6 +7,7 @@ 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 { connectorPrincipalForSession } from "../../connectors/principal.js";
 import { connectorIdentitySummary } from "../../connectors/connector-identity.js";
@@ -15,9 +16,8 @@ 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 { 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();

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();