@xopcai/xopc 0.0.432 → 0.0.434

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

@@ -7,29 +7,29 @@ import { loadCompactionSourceSnapshot } from "../../storage/sqlite/transcript-re
 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 { 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 { 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 { claimRegisteredExtraction } from "../../user-context/extraction/registry.js";
 import { applyWorkCandidates } from "../../memory-learning/work-capture.js";
+import { stripRuntimeContextFromUserMessage } from "../../session/user-message-display.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 { 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

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 { withSearchCache } from "./tools/search/cache.js";
+import { resolveResponseLanguageForSession } from "./prompt/response-language.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";

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 { 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/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 { withDataToolPermissions } from "../tools/dataBatch.js";
 import { isCodemodeCoreRead } from "../tools/codemode-permissions.js";
+import { withDataToolPermissions } from "../tools/dataBatch.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/execution-tool-policy.d.ts

@@ -1,6 +1,6 @@
 import type { AgentTool } from '@earendil-works/pi-agent-core';
 export declare const TASK_EXECUTION_TOOL_IDS: readonly string[];
-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 declare const PERSONAL_REQUEST_TOOL_IDS: readonly ["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';
     taskExecution: boolean;

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

@@ -3,15 +3,15 @@ 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 { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
 import { PERSONAL_MAIN_TOOL_IDS } from "../../personal-agent/policy.js";
+import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
 //#region src/agent/embedded/execution-tool-policy.ts
 init_request_repository();
 init_connection();
 init_session_repository();
 const TASK_EXECUTION_TOOL_IDS = ["task_collaboration", "publish_task_result"];
 const PERSONAL_REQUEST_TOOL_IDS = [
-	"xopc_tool_search",
+	"tool_search",
 	"xopc_tool_describe",
 	"xopc_tool_execute",
 	"personal_request_result",
@@ -32,7 +32,7 @@ function resolveExecutionToolPolicy(conversationId) {
 		externalMaterialization: configured,
 		discovery: configured,
 		codemode: configured,
-		revision: "personal-tool-boundaries-v3"
+		revision: "unified-tool-discovery-v1"
 	};
 }
 function allowsExecutionTool(policy, name) {

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,23 @@ 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 { resolveAgentAbortReason } from "../orchestration/run-termination.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 { filterExecutionTools, resolveExecutionToolPolicy } from "./execution-tool-policy.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 { refreshPluginRuntimeAccess } from "../../extensions/agent-plugins/refresh-runtime-access.js";
 import { connectionObjectiveContext } from "../context/connection-objective-context.js";
 import { voicePresentationPrompt } from "../prompt/voice-presentation.js";
@@ -60,13 +61,27 @@ async function runEmbeddedTurnForSessionInner(params) {
 		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,
-			terminationReason: "deadline_exceeded",
-			errorMessage: supervisor.signal.reason.message
-		};
+		if (supervisor.signal.aborted) {
+			const terminationReason = resolveAgentAbortReason(supervisor.signal.reason);
+			result = {
+				...result,
+				ok: false,
+				retryable: false,
+				terminationReason,
+				errorMessage: terminationReason === "deadline_exceeded" ? supervisor.signal.reason instanceof Error ? supervisor.signal.reason.message : "Agent run deadline expired" : "aborted"
+			};
+		}
+		log.info({
+			conversationId,
+			runId,
+			phase: "agent_run_end",
+			ok: result.ok,
+			terminationReason: result.terminationReason,
+			stopReason: result.stopReason,
+			errorMessage: result.errorMessage,
+			hostSignalAborted: supervisor.signal.aborted,
+			deadlineAtMs: supervisor.deadlineAtMs
+		}, result.ok ? "Agent run completed" : `Agent run ended: ${result.errorMessage ?? "unknown failure"}`);
 		turnCompleted = result.ok && result.stopReason !== "connection_required" && result.stopReason !== "clarification_required" && result.stopReason !== "phone_assistance_required";
 		if (result.stopReason === "connection_required" || result.stopReason === "clarification_required" || result.stopReason === "phone_assistance_required") return result;
 		try {
@@ -82,7 +97,7 @@ async function runEmbeddedTurnForSessionInner(params) {
 			const outcome = projectTurnOutcome({
 				rows,
 				turnId: runId,
-				runStatus: result.ok ? "success" : result.errorMessage === "aborted" ? "cancelled" : "error",
+				runStatus: result.ok ? "success" : result.terminationReason === "user_cancelled" || result.terminationReason === "parent_cancelled" || result.errorMessage === "aborted" && supervisor.signal.aborted ? "cancelled" : "error",
 				summary: result.errorMessage
 			});
 			await sessionStore.appendTranscriptCustomEntry(conversationId, {

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

@@ -12,40 +12,40 @@ import { resolveEffectiveAgentConfigForSession } from "../../config/agent-profil
 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 { runWithEmbeddedExecutionSession } from "./execution-context.js";
-import { bindComputerAgentTurn, computerImagesForRequest, computerRequestFrameCleanup, endComputerAgentTurn, setComputerProgramAuthorization } from "../../computer/agent-context.js";
-import { isComputerControlActive, isComputerLeaseTool, stopComputerControl } from "../../computer/control-guard.js";
+import { originalReadAuthorizationNotice, projectForgottenHistoryMessages, projectSuppressedMemoryBlocks } from "../../memory-learning/forgotten-history.js";
 import { resolveAgentAbortReason } from "../orchestration/run-termination.js";
-import { EmbeddedRunConflictError, abortEmbeddedRun, acquireEmbeddedRunLease, queueEmbeddedSteer } from "./runs.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 { 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 { classifyLlmFailure, 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 { getMcpSetupResumeInput } from "../mcp/continuation-input.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 { EmbeddedRunConflictError, abortEmbeddedRun, acquireEmbeddedRunLease, queueEmbeddedSteer } from "./runs.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 { getActiveTranscriptUserText } from "../inbound/attachment-pipeline.js";
+import { resolvePromptCachePolicy } from "../../providers/prompt-cache-plan.js";
+import { wrapStreamFnForXopcExtensions } from "./xopc-stream-bridge.js";
+import { acquireEmbeddedSessionRunner, evictEmbeddedSessionRunner } from "./session-runner.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";
@@ -377,7 +377,12 @@ async function runXopcEmbeddedTurnInner(params) {
 		const { session, reused } = runner;
 		const configurationTurnStart = session.agent.state.messages.length;
 		await runLease.attach(session, async () => session.abort());
-		const runAbortSignal = params.abortSignal ? AbortSignal.any([runLease.signal, params.abortSignal]) : runLease.signal;
+		const turnDeadline = new AbortController();
+		const runAbortSignal = AbortSignal.any([
+			runLease.signal,
+			turnDeadline.signal,
+			...params.abortSignal ? [params.abortSignal] : []
+		]);
 		if (runAbortSignal.aborted) {
 			await session.abort();
 			return {
@@ -917,7 +922,20 @@ async function runXopcEmbeddedTurnInner(params) {
 					modelRequestNumber
 				}, "Embedded first response text ready");
 			}
-			if (event.type === "message_end" && event.message.role === "assistant") recordPromptCacheTouch(conversationId, resolvedModel, event.message.usage);
+			if (event.type === "message_end" && event.message.role === "assistant") {
+				recordPromptCacheTouch(conversationId, resolvedModel, event.message.usage);
+				if (event.message.stopReason === "error" || event.message.stopReason === "aborted") log.warn({
+					conversationId,
+					runId,
+					modelRef: latencyModelRef,
+					modelRequestNumber,
+					phase: "model_request_end",
+					stopReason: event.message.stopReason,
+					errorMessage: event.message.errorMessage,
+					hostSignalAborted: runAbortSignal.aborted,
+					...runAbortSignal.aborted ? { terminationReason: resolveAgentAbortReason(runAbortSignal.reason) } : {}
+				}, "Model request ended without completing the response");
+			}
 			if (event.type === "tool_execution_end") {
 				markTurnToolResult(conversationId, runId, event.toolName);
 				if (event.toolName === "send_message" && !event.isError) sentVisibleMessage = true;
@@ -1055,7 +1073,10 @@ async function runXopcEmbeddedTurnInner(params) {
 					await session.agent.waitForIdle();
 					await recoverSettledTurn();
 				}
-			}), timeoutMs, { timeoutExtensionMs: params.timeoutExtensionMs });
+			}), timeoutMs, {
+				timeoutExtensionMs: params.timeoutExtensionMs,
+				onTimeout: (reason) => turnDeadline.abort(reason)
+			});
 			if (phoneStopped) {
 				const wait = phoneAssistance(conversationId);
 				const notice = {
@@ -1125,7 +1146,7 @@ async function runXopcEmbeddedTurnInner(params) {
 				ok: false,
 				retryable: false,
 				terminationReason: "provider_error",
-				errorMessage: "aborted",
+				errorMessage: `Model request was interrupted while the agent run was still active; automatic recovery could not complete. ${getAssistantTurnErrorMessage(session.agent) ?? "Provider returned an aborted stream."}`,
 				lastAssistantText: lastAssistantPlainText(session)
 			};
 			if (policyStopped && !policyCompleted || lengthRecoveryExhausted || lastAssistantMessage(session.agent.state.messages)?.stopReason === "length") return {
@@ -1139,7 +1160,7 @@ async function runXopcEmbeddedTurnInner(params) {
 				ok: false,
 				retryable: canResumeAfterModelFailure(session.agent.state.messages, { allowFailedReadTools: ACCEPTANCE_REPAIR_READ_TOOLS }),
 				terminationReason: "provider_error",
-				errorMessage: getAssistantTurnErrorMessage(session.agent) ?? "Assistant turn failed",
+				errorMessage: classifyLlmFailure(getAssistantTurnErrorMessage(session.agent) ?? "") === "aborted" ? `Model request was interrupted while the agent run was still active; automatic recovery could not complete. ${getAssistantTurnErrorMessage(session.agent)}` : getAssistantTurnErrorMessage(session.agent) ?? "Assistant turn failed",
 				lastAssistantText: lastAssistantPlainText(session)
 			};
 			if (params.requireVisibleReply && !sentVisibleMessage && lastAssistantPlainText(session).trim() === "NO_REPLY") return {
@@ -1191,7 +1212,9 @@ async function runXopcEmbeddedTurnInner(params) {
 		log.error({
 			err,
 			conversationId,
-			runId
+			runId,
+			phase: "embedded_run_end",
+			terminationReason: isAgentTurnTimeoutError(err) ? "deadline_exceeded" : params.abortSignal?.aborted ? resolveAgentAbortReason(params.abortSignal.reason) : "runtime_error"
 		}, `Embedded run failed: ${em}`);
 		onEvent?.({
 			type: "error",

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

@@ -30,11 +30,11 @@ export declare class EmbeddedRunRegistry {
     acquire(identity: EmbeddedRunIdentity): EmbeddedRunLease;
     getByConversationId(conversationId: string): EmbeddedRunHandle | undefined;
     abortByConversationId(conversationId: string, reason?: 'user_cancelled' | 'parent_cancelled', expectedRunId?: string): Promise<boolean>;
-    steerByConversationId(conversationId: string, text: string): Promise<boolean>;
+    steerByConversationId(conversationId: string, text: string, expectedRunId?: string): Promise<boolean>;
     size(): number;
 }
 export declare function acquireEmbeddedRunLease(identity: EmbeddedRunIdentity): EmbeddedRunLease;
 export declare function reserveEmbeddedRunCancellation(identity: Pick<EmbeddedRunIdentity, 'conversationId' | 'runId'>): EmbeddedRunCancellation;
 export declare function getEmbeddedRunByConversationId(conversationId: string): EmbeddedRunHandle | undefined;
 export declare function abortEmbeddedRun(conversationId: string, reason?: 'user_cancelled' | 'parent_cancelled', expectedRunId?: string): Promise<boolean>;
-export declare function queueEmbeddedSteer(conversationId: string, text: string): Promise<boolean>;
+export declare function queueEmbeddedSteer(conversationId: string, text: string, expectedRunId?: string): Promise<boolean>;

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

@@ -63,9 +63,9 @@ var EmbeddedRunRegistry = class {
 		if (entry.handle) await entry.handle.abort();
 		return true;
 	}
-	async steerByConversationId(conversationId, text) {
+	async steerByConversationId(conversationId, text, expectedRunId) {
 		const handle = this.getByConversationId(conversationId);
-		if (!handle) return false;
+		if (!handle || expectedRunId !== void 0 && handle.runId !== expectedRunId || this.byConversationId.get(conversationId)?.abortController.signal.aborted) return false;
 		await handle.session.steer(text);
 		return true;
 	}
@@ -86,8 +86,8 @@ function getEmbeddedRunByConversationId(conversationId) {
 function abortEmbeddedRun(conversationId, reason = "parent_cancelled", expectedRunId) {
 	return embeddedRunRegistry.abortByConversationId(conversationId, reason, expectedRunId);
 }
-function queueEmbeddedSteer(conversationId, text) {
-	return embeddedRunRegistry.steerByConversationId(conversationId, text);
+function queueEmbeddedSteer(conversationId, text, expectedRunId) {
+	return embeddedRunRegistry.steerByConversationId(conversationId, text, expectedRunId);
 }
 //#endregion
 export { EmbeddedRunConflictError, EmbeddedRunRegistry, abortEmbeddedRun, acquireEmbeddedRunLease, getEmbeddedRunByConversationId, queueEmbeddedSteer, reserveEmbeddedRunCancellation };

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

@@ -1,33 +1,41 @@
 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 { getExternalToolRegistry } from "../external-tools/tool-registry.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";
 import { DefaultResourceLoader, SettingsManager, createAgentSession, createMcpExtension } from "@earendil-works/pi-coding-agent";
 //#region src/agent/embedded/session-runner.ts
 init_logger();
-const toolContract = (tool) => JSON.stringify([
-	tool.name,
-	tool.parameters,
-	tool.description,
-	isCodemodeCoreRead(tool),
-	getXopcToolMetadata(tool)
-]);
+const toolContract = (tool) => {
+	const registry = getExternalToolRegistry([tool]);
+	return JSON.stringify([
+		tool.name,
+		tool.parameters,
+		tool.description,
+		isCodemodeCoreRead(tool),
+		getXopcToolMetadata(tool),
+		registry ? {
+			discovery: registry.discovery,
+			nativeSources: registry.nativeSources
+		} : void 0
+	]);
+};
 const log = createLogger("EmbeddedSessionRunner");
 const DEFAULT_IDLE_TTL_MS = 5 * 6e4;
 function providerCredentialRevision(providerId) {
@@ -259,8 +267,8 @@ var EmbeddedSessionRunnerPool = class {
 			contextWindowTokens: model.contextWindow ?? 128e3,
 			transformMessageForPersistence: params.transcriptRuntime.persistent ? (message) => transformUserMessageForPersistence(runtimeId, message) : void 0
 		});
-		const toolDefs = xopcToolsToDefinitions(tools);
-		const toolNames = tools.filter((tool) => getXopcToolMetadata(tool)?.exposure !== "deferred").map((tool) => tool.name);
+		const toolDefs = xopcToolsToDefinitions(tools.filter((tool) => tool.name !== "tool_search"));
+		const toolNames = tools.filter((tool) => !["deferred", "hidden"].includes(getXopcToolMetadata(tool)?.exposure ?? "") && tool.name !== "tool_search").map((tool) => tool.name);
 		const discoveryState = piSm.getBranch().findLast((entry) => entry.type === "custom" && entry.customType === "xopc-tool-discovery");
 		const saved = discoveryState?.type === "custom" ? discoveryState.data : void 0;
 		const restored = new Map((saved?.loaded ?? []).map((tool) => [tool.name, tool.contract]));
@@ -277,7 +285,10 @@ var EmbeddedSessionRunnerPool = class {
 			maxOutputTokens: 4e3
 		} : void 0;
 		if (codemode) toolNames.push("codemode");
-		const discovery = params.executionToolPolicy?.discovery !== false && (hasMcp || tools.some((tool) => getXopcToolMetadata(tool)?.exposure === "deferred"));
+		const registry = getExternalToolRegistry(tools);
+		const nativeDiscovery = params.executionToolPolicy?.discovery !== false && registry?.discovery?.native !== false;
+		const externalDiscovery = registry?.discovery?.connectors !== false;
+		const discovery = nativeDiscovery && (hasMcp || externalDiscovery && Boolean(registry) || tools.some((tool) => getXopcToolMetadata(tool)?.exposure === "deferred")) || externalDiscovery && params.executionToolPolicy?.surface === "personal_request_worker";
 		if (discovery) toolNames.push("tool_search");
 		const modelRuntime = await createEmbeddedModelRuntime(model.provider);
 		const resourceLoader = new DefaultResourceLoader({
@@ -291,7 +302,11 @@ var EmbeddedSessionRunnerPool = class {
 				createMcpSetupContinuationGuard(runtimeId, tools.some((tool) => tool.name === "mcp_setup")),
 				...mcp?.automationSourceRunId ? [createAutomationMcpSourceGuard(mcp.automationSourceRunId)] : [],
 				...codemode ? [createXopcCodemodeExtension(codemode, tools, () => boundSession)] : [],
-				...discovery ? [createXopcToolSearchExtension(tools)] : [],
+				...discovery ? [createXopcToolSearchExtension(tools, {
+					nativeDiscovery,
+					externalDiscovery,
+					registry
+				})] : [],
 				...mcp ? [createMcpExtension({
 					createTransport: createXopcMcpTransport(),
 					loadConfig: () => mcp,

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/tool-search-extension.d.ts

@@ -1,5 +1,11 @@
 import type { AgentTool } from '@earendil-works/pi-agent-core';
 import { type ExtensionFactory } from '@earendil-works/pi-coding-agent';
+import { type ExternalToolRegistry } from '../external-tools/tool-registry.js';
 export declare const TOOL_DISCOVERY_STATE = "xopc-tool-discovery";
-/** xopc deliberately excludes pi system declarations from SQLite; retain only discovery state. */
-export declare function createXopcToolSearchExtension(tools: readonly AgentTool[]): ExtensionFactory;
+/** One model-facing discovery entry; execution and connection permissions remain host-owned. */
+export declare function createXopcToolSearchExtension(tools: readonly AgentTool[], options?: {
+    nativeDiscovery?: boolean;
+    externalDiscovery?: boolean;
+    registry?: ExternalToolRegistry;
+    externalTimeoutMs?: number;
+}): ExtensionFactory;