@xopcai/xopc 0.0.368 → 0.0.370

package/dist/src/gateway/hono/routes/session-input-handler.js

@@ -1,6 +1,7 @@
 import { createLogger } from "../../../utils/logger/index.js";
 import { init_logger } from "../../../utils/logger.js";
 import { browserPageContextsInputSchema } from "../../../../packages/gateway-contract/src/browser-page-context.js";
+import { endpointContextSchema } from "../../../../packages/gateway-contract/src/session-input-command.js";
 import { parseUserTurnDocument, userTurnDocumentRefIds } from "../../../../packages/gateway-contract/src/user-turn-document.js";
 import { init_src } from "../../../../packages/gateway-contract/src/index.js";
 import { endpointTurnClaimSchema, init_src as init_src$1 } from "../../../../packages/endpoint-tools-protocol/src/index.js";
@@ -15,6 +16,7 @@ import { commandRegistry } from "../../../chat-commands/registry.js";
 import "../../../chat-commands/index.js";
 import { isVoiceLikeAttachment } from "../../../channels/attachments/voice-stt-webchat.js";
 import { parseTurnContextRefs } from "../../../agent/source-context/types.js";
+import { deviceTurnSourceContext, endpointClaimBelongsToPrincipal } from "../../../endpoint-tools/turn-context.js";
 import { withModelConfigLock } from "../../../session/model-config-lock.js";
 import { getGatewayPrincipal } from "../../security/gateway-principal.js";
 import { browserPageContextToAgentContext } from "../../../agent/source-context/browser-page.js";
@@ -127,6 +129,21 @@ async function submitSessionInput(c, deps, conversationId, options) {
 			message: "Endpoint connection is not active"
 		}
 	}, 401);
+	if (!endpointClaimBelongsToPrincipal(deps.service.endpointTools.registry, origin.data.endpointId, getGatewayPrincipal(c))) return c.json({
+		ok: false,
+		error: {
+			code: "FORBIDDEN",
+			message: "Endpoint does not belong to the authenticated device"
+		}
+	}, 403);
+	const environment = endpointContextSchema.optional().safeParse(body.endpointContext);
+	if (!environment.success) return c.json({
+		ok: false,
+		error: {
+			code: "BAD_REQUEST",
+			message: "Invalid device context"
+		}
+	}, 400);
 	if (browserContexts.data.length && deps.service.endpointTools.registry.get(origin.data.endpointId)?.kind !== "browser") return c.json({
 		ok: false,
 		error: {
@@ -176,7 +193,7 @@ async function submitSessionInput(c, deps, conversationId, options) {
 				}, 409);
 			}
 		}
-		const sourceContexts = browserContexts.data.map(browserPageContextToAgentContext);
+		const sourceContexts = [deviceTurnSourceContext(deps.service.endpointTools.registry.get(origin.data.endpointId), environment.data), ...browserContexts.data.map(browserPageContextToAgentContext)];
 		if (body.appContext !== void 0) try {
 			sourceContexts.push(await deps.service.prepareSessionAppContext(body.appContext, getGatewayPrincipal(c), conversationId, typeof body.clientMessageId === "string" ? body.clientMessageId.trim() : ""));
 		} catch (error) {
@@ -300,6 +317,13 @@ async function replaceLatestSessionTurn(c, deps, conversationId, targetTurnId) {
 			message: "Endpoint connection is not active"
 		}
 	}, 401);
+	if (!endpointClaimBelongsToPrincipal(deps.service.endpointTools.registry, origin.data.endpointId, getGatewayPrincipal(c))) return c.json({
+		ok: false,
+		error: {
+			code: "FORBIDDEN",
+			message: "Endpoint does not belong to the authenticated device"
+		}
+	}, 403);
 	return withModelConfigLock(conversationId, async () => {
 		if (deps.service.voiceRealtime?.hasConversation(conversationId)) return c.json({
 			ok: false,

package/dist/src/gateway/hono/routes/voice.js

@@ -1,5 +1,5 @@
 import { voiceSelectionSchema } from "../../../../packages/realtime-protocol/src/voice-catalog.js";
-import { createVoiceSessionRequestSchema, init_voice } from "../../../../packages/realtime-protocol/src/voice.js";
+import { VOICE_TIMING_METRICS, createVoiceSessionRequestSchema, init_voice } from "../../../../packages/realtime-protocol/src/voice.js";
 import { getDefaultModelSync, init_providers, resolveModel } from "../../../providers/index.js";
 import { isPersonalConversation } from "../../../personal-agent/repository.js";
 import { completeWithResolvedCredentials } from "../../../providers/model-call.js";
@@ -312,7 +312,10 @@ function registerVoiceRoutes(authenticated, deps) {
 			}, 409);
 			if (action === "preflight") {
 				await service.voiceRealtime.preflight(parsed.data);
-				return c.json({ ok: true });
+				return c.json({
+					ok: true,
+					timingMetrics: VOICE_TIMING_METRICS
+				});
 			}
 			const principal = getGatewayPrincipal(c);
 			const create = () => service.voiceRealtime.createSession(parsed.data, principal.principalId);

package/dist/src/gateway/security/gateway-scopes.js

@@ -20,7 +20,9 @@ function requiredGatewayScope(method, path) {
 	if (path.startsWith("/api/endpoint-tools")) return "device.self";
 	if (path === "/api/personal-agent/activity") return "tasks.read";
 	if (path === "/api/personal-agent" || path.startsWith("/api/personal-agent/")) return methodScope(method, "sessions.read", "sessions.write");
-	if (path.startsWith("/api/browser/tab-bindings") || path.startsWith("/api/browser/approvals")) return methodScope(method, "sessions.read", "sessions.write");
+	if (path.startsWith("/api/browser/recordings/")) return "device.self";
+	if (path.startsWith("/api/browser/automations") || path.startsWith("/api/browser/automation-runs")) return methodScope(method, "automations.read", "automations.write");
+	if (path.startsWith("/api/browser/tab-bindings")) return methodScope(method, "sessions.read", "sessions.write");
 	if (method === "GET" && path === "/api/connectors/approvals") return "sessions.read";
 	if (method === "POST" && path === "/api/connectors/approvals/respond") return "sessions.write";
 	if (path === "/api/agent" || path.startsWith("/api/agent/")) return "agents.run";

package/dist/src/gateway/service/agent-runner.js

@@ -397,6 +397,7 @@ var GatewayAgentRunner = class {
 			suggestedAnswer: request.suggestedAnswer,
 			approvalKey: request.approvalKey
 		});
+		this.opts.emit("clarification.created", wait);
 		const event = {
 			type: "clarify_request",
 			requestId: wait.id,

package/dist/src/gateway/service/config-coordinator.js

@@ -3,9 +3,8 @@ import { init_logger } from "../../utils/logger.js";
 import { configureTracing } from "../../observability/runtime.js";
 import { getModelRegistry } from "../../providers/model-registry.js";
 import { init_providers } from "../../providers/index.js";
-import { disposeAllSessionMcpRuntimes } from "../../agent/mcp/bundle-mcp-runtime.js";
+import { evictAllEmbeddedSessionRunners } from "../../agent/embedded/session-runner.js";
 import { reloadImageGenerationProviders } from "../../agent/image/generation/provider-registry.js";
-import "../../agent/mcp/bundle-mcp-tools.js";
 import { loadConfig, saveConfig } from "../../config/loader.js";
 import { ConfigHotReloader } from "../../config/reload.js";
 import "../../config/index.js";
@@ -280,9 +279,7 @@ var GatewayConfigCoordinator = class {
 	handleMcpReload(newConfig) {
 		log.debug("Reloading MCP config...");
 		this.opts.setConfig(newConfig);
-		disposeAllSessionMcpRuntimes().catch((err) => {
-			log.warn({ err }, "MCP runtime dispose on config reload failed");
-		});
+		evictAllEmbeddedSessionRunners("mcp_config_reload");
 		this.opts.emit("config.reload", { section: "mcp" });
 		log.debug("MCP config reloaded");
 	}

package/dist/src/gateway/service/marketplace-service.js

@@ -5,10 +5,10 @@ import { init_agent_scope, resolveDefaultAgentId } from "../../agent/agent-scope
 import { init_paths, resolveExtensionsDir } from "../../config/paths.js";
 import { removeSkillsLockEntry } from "../../agent/skills/hub-lock.js";
 import { deleteManagedSkill, installSkillFromZip, listManagedSkillDirs } from "../../agent/skills/managed-store.js";
-import { getExtensionLockfileManager } from "../../extensions/lockfile.js";
-import { AgentPluginStore } from "../../extensions/agent-plugins/store.js";
 import { createSkillConfigManager } from "../../agent/skills/config.js";
 import { resolveWorkspaceSkillsDir, resolveWorkspaceSkillsLockPath } from "../../agent/skills/workspace-skills-dir.js";
+import { getExtensionLockfileManager } from "../../extensions/lockfile.js";
+import { AgentPluginStore } from "../../extensions/agent-plugins/store.js";
 import { normalizeSkillInstallTarget } from "../../agent/skills/install-target.js";
 import { isAgentPluginArchive, withAgentPluginArchive } from "../../extensions/agent-plugins/sources.js";
 import { existsSync, rmSync } from "node:fs";

package/dist/src/gateway/service/run-gateway-agent.js

@@ -1,6 +1,8 @@
 import { inboundCorrelationMetadataFromAsyncLogContext, updateAsyncLogContext } from "../../utils/logger/context.js";
 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 { init_session_input_repository, listTaskUpdateTriggers } from "../../storage/sqlite/session-input-repository.js";
 import { init_clarification_wait_repository, isClarificationSuspended } from "../../storage/sqlite/clarification-wait-repository.js";
 import { updateInteractionStateFromMessage } from "../../storage/sqlite/interaction-state-repository.js";
@@ -23,6 +25,7 @@ import crypto from "crypto";
 //#region src/gateway/service/run-gateway-agent.ts
 init_connection_wait_repository();
 init_clarification_wait_repository();
+init_src();
 init_logger();
 init_session_key();
 init_sqlite();
@@ -165,6 +168,7 @@ async function* runGatewayAgent(deps, message, channel, chatId, origin, attachme
 				});
 			}
 			let streamError;
+			let embeddedAborted = false;
 			try {
 				const eventStream = agentService.turnDispatcher.processDirectStreaming(stampedMessage, conversationId, origin, prepared, thinking, {
 					signal: mergedSignal,
@@ -182,22 +186,26 @@ async function* runGatewayAgent(deps, message, channel, chatId, origin, attachme
 					}
 				});
 				const mappedEvents = (async function* () {
-					for await (const event of eventStream) yield* mapper.map(event);
+					for await (const event of eventStream) {
+						if (event.type === "turn_outcome" && parseTurnOutcome(event.outcome)?.summary === "aborted") embeddedAborted = true;
+						yield* mapper.map(event);
+					}
 				})();
 				for await (const event of coalesceThinkingDeltas(mappedEvents)) yield* emitAndYield([event]);
 				const connectionSuspended = isConnectionSuspended(conversationId, runId);
 				const clarificationSuspended = isClarificationSuspended(conversationId, runId);
 				const suspended = connectionSuspended || clarificationSuspended;
-				const endStatus = mergedSignal.aborted ? "cancelled" : suspended ? "suspended" : "success";
-				const endSummary = mergedSignal.aborted ? "Interrupted" : connectionSuspended ? "Waiting for connection" : clarificationSuspended ? "Waiting for user input" : "Message processed successfully";
-				taskRunStatus = mergedSignal.aborted ? "cancelled" : "succeeded";
+				const cancelled = mergedSignal.aborted || embeddedAborted;
+				const endStatus = cancelled ? "cancelled" : suspended ? "suspended" : "success";
+				const endSummary = cancelled ? "Interrupted" : connectionSuspended ? "Waiting for connection" : clarificationSuspended ? "Waiting for user input" : "Message processed successfully";
+				taskRunStatus = cancelled ? "cancelled" : "succeeded";
 				terminalStatus = endStatus;
 				taskRunSummary = endSummary;
 				yield* emitAndYield(mapper.end(endStatus, endSummary));
 				completeRealtimeTopic(`run:${runId}`);
 				runTopicCompleted = true;
 				return {
-					status: mergedSignal.aborted ? "aborted" : suspended ? "suspended" : "ok",
+					status: cancelled ? "aborted" : suspended ? "suspended" : "ok",
 					summary: endSummary
 				};
 			} catch (error) {

package/dist/src/gateway/service/session-input-coordinator.d.ts

@@ -1,5 +1,5 @@
 import type { TurnOrigin } from '@xopcai/endpoint-tools-protocol';
-import type { SessionInput } from '../../storage/sqlite/session-input-repository.js';
+import { type SessionInput } from '../../storage/sqlite/session-input-repository.js';
 import type { UserTurnAttachment } from '../user-turn-input.js';
 import { type AgentSourceContext, type TurnContextRef } from '../../agent/source-context/types.js';
 import { type SessionInputDelivery, type SessionInputState } from '../../storage/sqlite/index.js';

package/dist/src/gateway/service/session-input-coordinator.js

@@ -1,19 +1,20 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { SessionInstanceChangedError, cancelQueuedSessionInput, claimNextSessionInput, findSessionInput, finishSessionInputRun, getSessionInputById, getSessionInputState, init_session_input_repository, insertSessionInput, mutateQueuedSessionInput, recoverSessionInputState, setSessionInputStatus } from "../../storage/sqlite/session-input-repository.js";
+import { SessionInstanceChangedError, cancelQueuedSessionInput, claimNextSessionInput, findSessionInput, findSessionInputByRunId, finishSessionInputRun, getSessionInputById, getSessionInputState, init_session_input_repository, insertSessionInput, mutateQueuedSessionInput, recoverSessionInputState, setSessionInputStatus } from "../../storage/sqlite/session-input-repository.js";
 import { consumeClarificationResume, init_clarification_wait_repository, supersedeActiveClarification } from "../../storage/sqlite/clarification-wait-repository.js";
 import { replaceLatestSessionTurnAndQueueInput, validateLatestSessionTurnTarget } from "../../storage/sqlite/session-turn-replace-repository.js";
 import { cancelConnectionObjective, consumeConnectionResume, init_connection_wait_repository, invalidateConnectionResumeIntent, publishConnectionWait } from "../../storage/sqlite/connection-wait-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
 import { summarizeSourceContext } from "../../agent/source-context/types.js";
+import { injectSourceContextsIntoUserMessage } from "../../agent/source-context/injector.js";
 import { deleteMediaUrisNoLongerReferenced } from "../../media/session-references.js";
 import { fitSourceContextsToBudget } from "../../agent/source-context/budget.js";
 import crypto from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
 //#region src/gateway/service/session-input-coordinator.ts
+init_session_input_repository();
 init_connection_wait_repository();
 init_clarification_wait_repository();
-init_session_input_repository();
 init_sqlite();
 init_logger();
 const log = createLogger("SessionInputCoordinator");
@@ -23,10 +24,23 @@ function sameAppContext(input, existing) {
 		snapshot: source.appContext,
 		principal: source.appContextGrant?.principal.principalId
 	})) ?? [];
-	return isDeepStrictEqual(identity(input.sourceContexts), identity(existing.contextSnapshots));
+	return isDeepStrictEqual(input.origin, existing.origin) && isDeepStrictEqual(identity(input.sourceContexts), identity(existing.contextSnapshots));
+}
+function canSteerContexts(state, origin, contexts) {
+	if (!contexts?.length) return true;
+	const active = state.activeInputId ? getSessionInputById(state.conversationId, state.activeInputId) : void 0;
+	return Boolean(active && isDeepStrictEqual(active.origin, origin) && contexts.every((context) => context.kind === "device_context"));
+}
+function steeringText(content, contexts) {
+	if (!contexts?.length) return content;
+	return injectSourceContextsIntoUserMessage({
+		role: "user",
+		content,
+		timestamp: Date.now()
+	}, contexts).content[0].text;
 }
 function contextRefsMatchFrozenSnapshot(requested, frozen) {
-	const editable = frozen?.filter((ref) => ref.kind === "note" || ref.kind === "task" || ref.kind === "file" || ref.kind === "session" || ref.kind === "browser_tab" || ref.kind === "mcp_resource" || ref.kind === "user_assertion") ?? [];
+	const editable = frozen?.filter((ref) => ref.kind === "note" || ref.kind === "task" || ref.kind === "file" || ref.kind === "session" || ref.kind === "browser_tab" || ref.kind === "user_assertion") ?? [];
 	if (requested.length !== editable.length) return false;
 	return requested.every((ref, index) => {
 		const snapshot = editable[index];
@@ -74,13 +88,13 @@ var SessionInputCoordinator = class {
 				this.prioritizeAcceptedInput(row, state);
 				return;
 			}
-			if (row.requestedDelivery !== "steer" || !state.activeRunId || row.attachments?.length || row.contextSnapshots?.length || state.preparation && state.preparation.state !== "ready") return;
+			if (row.requestedDelivery !== "steer" || !state.activeRunId || row.attachments?.length || !canSteerContexts(state, row.origin, row.contextSnapshots) || state.preparation && state.preparation.state !== "ready") return;
 			setSessionInputStatus(row.id, "injecting", {
 				effectiveDelivery: "steer",
 				targetRunId: state.activeRunId
 			});
 			try {
-				if (!await this.deps.steer(row.conversationId, row.content)) setSessionInputStatus(row.id, "queued", {
+				if (!await this.deps.steer(row.conversationId, steeringText(row.content, row.contextSnapshots))) setSessionInputStatus(row.id, "queued", {
 					effectiveDelivery: "next",
 					targetRunId: null
 				});
@@ -180,6 +194,7 @@ var SessionInputCoordinator = class {
 			};
 			const existing = findSessionInput(conversationId, clientMessageId);
 			if (existing) {
+				input.origin = existing.origin;
 				if (!sameAppContext(input, existing)) return {
 					ok: false,
 					code: "CONTEXT_UNAVAILABLE"
@@ -192,6 +207,11 @@ var SessionInputCoordinator = class {
 			}
 			const target = validateLatestSessionTurnTarget(conversationId, targetTurnId);
 			if (target.ok === false) return target;
+			const original = findSessionInputByRunId(conversationId, targetTurnId);
+			if (original) {
+				input.origin = original.origin;
+				input.sourceContexts = [...(input.sourceContexts ?? []).filter((source) => source.kind !== "device_context"), ...(original.contextSnapshots ?? []).filter((source) => source.kind === "device_context")];
+			}
 			const attachments = await this.deps.prepareAttachments(conversationId, input.attachments);
 			let sourceContexts;
 			try {
@@ -284,7 +304,7 @@ var SessionInputCoordinator = class {
 		}
 		const runtime = this.snapshot(conversationId);
 		const priority = input.interrupt !== false && this.deps.prioritizeInput?.(input) === true;
-		const canSteer = !priority && input.delivery === "steer" && runtime.activeRunId !== void 0 && !attachments?.length && !sourceContexts?.length;
+		const canSteer = !priority && input.delivery === "steer" && runtime.activeRunId !== void 0 && !attachments?.length && canSteerContexts(runtime, input.origin, sourceContexts);
 		const effectiveDelivery = canSteer ? "steer" : "next";
 		const row = insertSessionInput({
 			expectedTranscriptId: input.expectedTranscriptId,
@@ -314,7 +334,7 @@ var SessionInputCoordinator = class {
 			};
 		}
 		if (canSteer) {
-			if (!await this.deps.steer(conversationId, content)) {
+			if (!await this.deps.steer(conversationId, steeringText(content, sourceContexts))) {
 				setSessionInputStatus(row.id, "queued", {
 					effectiveDelivery: "next",
 					targetRunId: null
@@ -414,7 +434,7 @@ var SessionInputCoordinator = class {
 			const existing = getSessionInputById(conversationId, id);
 			if (!contextRefsMatchFrozenSnapshot(body.contextRefs, existing?.contextRefs)) try {
 				const resolved = await this.deps.prepareContexts(conversationId, body.contextRefs) ?? [];
-				sourceContexts = fitSourceContextsToBudget([...existing?.contextSnapshots?.filter((source) => source.kind === "app_context" || source.kind === "browser_page") ?? [], ...resolved]);
+				sourceContexts = fitSourceContextsToBudget([...existing?.contextSnapshots?.filter((source) => source.kind === "app_context" || source.kind === "browser_page" || source.kind === "device_context") ?? [], ...resolved]);
 			} catch (err) {
 				log.warn({
 					err,

package/dist/src/gateway/service/sessions-api.js

@@ -1,9 +1,7 @@
 import { init_agent_session_key, resolveAgentIdFromConversationId } from "../../routing/agent-session-key.js";
 import { isPersonalConversation } from "../../personal-agent/repository.js";
-import { retireSessionMcpRuntimeForConversationId } from "../../agent/mcp/bundle-mcp-runtime.js";
 import { buildSessionTimeline } from "../../session/transcript-outline.js";
 import { transcriptRowsToClientHistory } from "../../session/client-history.js";
-import "../../agent/mcp/bundle-mcp-tools.js";
 import { collectMediaUrisFromValues, deleteMediaUris } from "../../media/session-references.js";
 import { withModelConfigLock } from "../../session/model-config-lock.js";
 import { publicExecutionDetail } from "../../session/execution-detail.js";
@@ -180,10 +178,6 @@ var GatewaySessionsApi = class {
 		if (result) {
 			await deleteMediaUris(collectMediaUrisFromValues(transcriptRows));
 			this.opts.getAgentService().evictSessionAgent(key);
-			await retireSessionMcpRuntimeForConversationId({
-				conversationId: key,
-				reason: "session-delete"
-			});
 		}
 		return { deleted: result };
 	}

package/dist/src/gateway/service.js

@@ -34,7 +34,6 @@ import "../knowledge-memory/index.js";
 import { getPersonalAgentByConversation } from "../personal-agent/repository.js";
 import { TaskConversationRepository } from "../tasks/task-conversation-repository.js";
 import { getEmbeddedExecutionSession } from "../agent/embedded/execution-context.js";
-import { disposeAllSessionMcpRuntimes } from "../agent/mcp/bundle-mcp-runtime.js";
 import { DomainOutboxDispatcher } from "../infra/domain-outbox-dispatcher.js";
 import { ProjectService } from "../projects/project-service.js";
 import { resolveProjectAgentId } from "../projects/project-agent.js";
@@ -44,6 +43,7 @@ import { runMemoryMaintenance } from "../memory-maintenance/service.js";
 import "../memory-maintenance/index.js";
 import { RealtimeExtensionBrowserProvider } from "../browser/providers/realtime-extension.js";
 import { onSessionTranscriptUpdate } from "../session/transcript-events.js";
+import { drainEmbeddedSessionRunnerShutdowns, evictAllEmbeddedSessionRunners } from "../agent/embedded/session-runner.js";
 import { buildNoteAgentContext } from "../notes/agent-context.js";
 import { NotesStore } from "../notes/store.js";
 import { NotesService } from "../notes/service.js";
@@ -56,7 +56,6 @@ import { createProductDispatcher } from "../capabilities/runtime/product.js";
 import "../automations/index.js";
 import { TaskRunDispatcher } from "../tasks/task-run-dispatcher.js";
 import "../tasks/index.js";
-import "../agent/mcp/bundle-mcp-tools.js";
 import { areExtensionsGloballyDisabled } from "../extensions/discover-extensions.js";
 import { SessionIndex } from "../session/manager.js";
 import "../session/index.js";
@@ -103,7 +102,6 @@ import { createBackgroundTask } from "../infra/background-task.js";
 import { buildTaskAgentContext } from "../agent/source-context/task-context.js";
 import { buildFileAgentContext } from "../agent/source-context/file-context.js";
 import { buildSessionAgentContext } from "../agent/source-context/session-context.js";
-import { buildMcpResourceAgentContext } from "../agent/source-context/mcp-resource-context.js";
 import { buildBrowserTabAgentContext } from "../agent/source-context/browser-tab.js";
 import { buildUserAssertionAgentContext } from "../agent/source-context/user-assertion-context.js";
 import { WorkDiscoveryService } from "../work-discovery/service.js";
@@ -538,12 +536,6 @@ var GatewayService = class {
 					const [metadata, messages] = await Promise.all([this.sessionIndex.getSessionMetadata(ref.sourceId), this.sessionIndex.getStore().loadMessages(ref.sourceId)]);
 					return buildSessionAgentContext(metadata, messages, ref.expectedVersion);
 				}
-				if (ref.kind === "mcp_resource") return buildMcpResourceAgentContext({
-					workspaceDir: this.currentWorkspacePath,
-					config: this.config,
-					sourceId: ref.sourceId,
-					expectedVersion: ref.expectedVersion
-				});
 				if (ref.kind === "browser_tab") {
 					const binding = getBrowserTabBindingById(ref.sourceId);
 					if (!binding || binding.conversationId !== conversationId || ref.expectedVersion && ref.expectedVersion !== binding.documentId) return null;
@@ -1596,9 +1588,8 @@ var GatewayService = class {
 		registerClarificationChannelRuntime(null);
 		this.connectionRecovery.stop();
 		this.agentRunner.disposeClarifications();
-		await disposeAllSessionMcpRuntimes().catch((err) => {
-			log.warn({ err }, "MCP runtime shutdown failed");
-		});
+		evictAllEmbeddedSessionRunners("gateway_stop");
+		await drainEmbeddedSessionRunnerShutdowns();
 		await this._agentService?.stop();
 		this.running = false;
 		this.bus.shutdown();

package/dist/src/gateway/session-reset-service.js

@@ -1,9 +1,7 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { isPersonalConversation } from "../personal-agent/repository.js";
-import { retireSessionMcpRuntimeForConversationId } from "../agent/mcp/bundle-mcp-runtime.js";
 import { abortEmbeddedRun } from "../agent/embedded/runs.js";
-import "../agent/mcp/bundle-mcp-tools.js";
 //#region src/gateway/session-reset-service.ts
 init_logger();
 const log = createLogger("SessionReset");
@@ -30,10 +28,6 @@ async function performSessionReset(conversationId, deps) {
 	};
 	try {
 		deps.getAgentService().evictSessionAgent(key);
-		await retireSessionMcpRuntimeForConversationId({
-			conversationId: key,
-			reason: "session-reset"
-		});
 	} catch (err) {
 		const em = err instanceof Error ? err.message : String(err);
 		log.warn({

package/dist/src/home-intelligence/generator.d.ts

@@ -109,6 +109,8 @@ export declare const HomeModelResultSchema: z.ZodDiscriminatedUnion<[z.ZodObject
 }, z.core.$strict>], "state">;
 export type HomeModelCandidate = z.infer<typeof HomeModelCandidateSchema>;
 export type HomeModelResult = z.infer<typeof HomeModelResultSchema>;
+/** Check prose rather than identifiers so English evidence cannot override Chinese output. */
+export declare function isHomeProseLocalized(values: readonly string[], locale: HomeContextSnapshot['locale']): boolean;
 export interface HomeModelGeneration {
     result: HomeModelResult;
     modelRef: string;

package/dist/src/home-intelligence/generator.js

@@ -102,7 +102,8 @@ function buildSystemPrompt(locale) {
 		"Prefer outcomes over feature promotion. Mention a connector or skill only when it materially enables the outcome.",
 		"When useful work remains possible without a missing capability, provide degradedActionPrompt using only supplied evidence.",
 		"External writes always require user confirmation.",
-		`Write only user-visible prose values such as title, rationale, steps, and prompts in ${locale === "zh" ? "Simplified Chinese" : "English"}. Machine values listed above must remain in English.`
+		`Write all user-visible prose values (title, outcome, rationale, proposedSteps, verification, actionPrompt, degradedActionPrompt, question, and option labels) in ${locale === "zh" ? "Simplified Chinese" : "English"}. Machine values listed above must remain in English. Translate English source material into the requested language; keep technical identifiers and proper names intact.`,
+		"Use plain text in prose values. Do not HTML-encode characters or include HTML markup."
 	].join("\n");
 }
 function extractHomeResponseText(response) {
@@ -126,6 +127,54 @@ function parseJson(raw) {
 	}
 	throw new Error("Home intelligence model did not return valid JSON");
 }
+function decodeProse(value) {
+	const named = {
+		amp: "&",
+		lt: "<",
+		gt: ">",
+		quot: "\"",
+		apos: "'",
+		nbsp: " "
+	};
+	return value.replace(/&(#x[0-9a-f]+|#\d+|amp|lt|gt|quot|apos|nbsp);/gi, (entity, code) => {
+		if (!code.startsWith("#")) return named[code.toLowerCase()] ?? entity;
+		const point = code.toLowerCase().startsWith("#x") ? parseInt(code.slice(2), 16) : Number(code.slice(1));
+		return point > 0 && point <= 1114111 && !(point >= 55296 && point <= 57343) ? String.fromCodePoint(point) : entity;
+	});
+}
+/** Check prose rather than identifiers so English evidence cannot override Chinese output. */
+function isHomeProseLocalized(values, locale) {
+	return locale !== "zh" || values.every((value) => !/[a-z]/i.test(value) || /\p{Script=Han}/u.test(value));
+}
+function parseLocalizedResult(raw, locale) {
+	const result = HomeModelResultSchema.parse(parseJson(raw));
+	const prose = [];
+	if (result.state === "ready") for (const candidate of result.candidates) {
+		candidate.title = decodeProse(candidate.title);
+		candidate.outcome = decodeProse(candidate.outcome);
+		candidate.rationale = decodeProse(candidate.rationale);
+		candidate.proposedSteps = candidate.proposedSteps.map(decodeProse);
+		candidate.verification = candidate.verification.map(decodeProse);
+		candidate.actionPrompt = decodeProse(candidate.actionPrompt);
+		if (candidate.degradedActionPrompt) candidate.degradedActionPrompt = decodeProse(candidate.degradedActionPrompt);
+		prose.push(candidate.title, candidate.outcome, candidate.rationale, candidate.actionPrompt);
+		prose.push(...[
+			...candidate.proposedSteps,
+			...candidate.verification,
+			candidate.degradedActionPrompt ?? ""
+		].filter((value) => (value.match(/[a-z]+/gi)?.length ?? 0) >= 3));
+	}
+	else if (result.state === "clarification") {
+		result.question = decodeProse(result.question);
+		result.options = result.options.map((option) => ({
+			...option,
+			label: decodeProse(option.label)
+		}));
+		prose.push(result.question, ...result.options.map((option) => option.label).filter((value) => (value.match(/[a-z]+/gi)?.length ?? 0) >= 3));
+	}
+	if (!isHomeProseLocalized(prose, locale)) throw new Error("User-visible prose must be in Simplified Chinese; translate English source material while preserving identifiers and evidence IDs");
+	return result;
+}
 function validationSummary(error) {
 	if (!(error instanceof z.ZodError)) return error instanceof Error ? error.message : String(error);
 	return error.issues.slice(0, 20).map((issue) => `${issue.path.join(".") || "<root>"}: ${issue.message}`).join("; ");
@@ -194,7 +243,7 @@ var HomeAdviceGenerator = class {
 		const raw = extractHomeResponseText(response);
 		let result;
 		try {
-			result = HomeModelResultSchema.parse(parseJson(raw));
+			result = parseLocalizedResult(raw, snapshot.locale);
 		} catch (firstError) {
 			const correction = {
 				role: "user",
@@ -221,7 +270,7 @@ var HomeAdviceGenerator = class {
 				trigger: "retry"
 			});
 			try {
-				result = HomeModelResultSchema.parse(parseJson(extractHomeResponseText(corrected)));
+				result = parseLocalizedResult(extractHomeResponseText(corrected), snapshot.locale);
 			} catch (correctionError) {
 				throw new Error(`Home intelligence model returned invalid structured JSON after correction: ${validationSummary(correctionError)}`);
 			}
@@ -239,4 +288,4 @@ var HomeAdviceGenerator = class {
 	}
 };
 //#endregion
-export { HomeAdviceBudgetExceededError, HomeAdviceGenerator, HomeModelCandidateSchema, HomeModelResultSchema };
+export { HomeAdviceBudgetExceededError, HomeAdviceGenerator, HomeModelCandidateSchema, HomeModelResultSchema, isHomeProseLocalized };

package/dist/src/home-intelligence/host.d.ts

@@ -35,12 +35,13 @@ export declare class HomeIntelligenceHost {
     private stopped;
     private abortController;
     private localeHint;
+    private advisorLocale;
     private contextRefreshTimer?;
     private readonly pendingContextReasons;
     constructor(db: DatabaseSync, deps: HomeIntelligenceHostDeps);
     start(): void;
     stop(): void;
-    getAdvisor(): HomeAdvisor;
+    getAdvisor(locale?: string): HomeAdvisor;
     getMetrics(since?: number): HomeAdviceMetrics;
     getHistory(): HomeOpportunityHistoryItem[];
     requestRefresh(reason: HomeGenerationReason, idempotencyKey?: string, locale?: string): string;

package/dist/src/home-intelligence/host.js

@@ -1,6 +1,6 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
-import { HomeAdviceBudgetExceededError } from "./generator.js";
+import { HomeAdviceBudgetExceededError, isHomeProseLocalized } from "./generator.js";
 import { homePatternKey } from "./strategy.js";
 import { HomeAdvicePolicy } from "./policy.js";
 import { HomeIntelligenceRepository } from "./repository.js";
@@ -39,6 +39,7 @@ var HomeIntelligenceHost = class {
 	stopped = false;
 	abortController = new AbortController();
 	localeHint;
+	advisorLocale;
 	contextRefreshTimer;
 	pendingContextReasons = /* @__PURE__ */ new Set();
 	constructor(db, deps) {
@@ -47,6 +48,7 @@ var HomeIntelligenceHost = class {
 		this.opportunities = new HomeOpportunityApplicationService(db, deps.principal, () => deps.capabilities().agentId);
 		this.now = deps.now ?? Date.now;
 		this.localeHint = deps.locale();
+		this.advisorLocale = this.localeHint;
 	}
 	start() {
 		if (this.timer) return;
@@ -65,9 +67,26 @@ var HomeIntelligenceHost = class {
 		this.contextRefreshTimer = void 0;
 		this.pendingContextReasons.clear();
 	}
-	getAdvisor() {
+	getAdvisor(locale) {
 		if (this.deps.enabled?.() === false) return { state: "disabled" };
-		return this.repository.getAdvisor(this.deps.principal, this.now());
+		if (locale) {
+			const requestedLocale = locale.toLowerCase().startsWith("zh") ? "zh" : "en";
+			if (requestedLocale !== this.localeHint) this.requestRefresh("manual_refresh", `locale:${requestedLocale}:${this.now()}`, requestedLocale);
+		}
+		const advisor = this.repository.getAdvisor(this.deps.principal, this.now());
+		const prose = advisor.state === "ready" ? [advisor.primary, ...advisor.alternatives].flatMap((item) => [
+			item.title,
+			item.outcome,
+			item.rationale
+		]) : advisor.state === "clarification" ? [advisor.question.question] : [];
+		if (prose.length > 0 && this.advisorLocale !== this.localeHint || !isHomeProseLocalized(prose, this.localeHint)) return advisor.state === "ready" && advisor.stale ? {
+			state: "refreshing",
+			requestedAt: this.now()
+		} : {
+			state: "quiet",
+			reason: "generation_failed"
+		};
+		return advisor;
 	}
 	getMetrics(since = Math.max(0, this.now() - 720 * 60 * 6e4)) {
 		return this.repository.getMetrics(this.deps.principal, since, this.now());
@@ -251,6 +270,7 @@ var HomeIntelligenceHost = class {
 				outcomeReason: result.state === "quiet" ? result.reason : result.state,
 				completedAt
 			});
+			this.advisorLocale = snapshot.locale;
 			this.deps.publish("home.advisor.updated", {
 				state: result.state,
 				completedAt

package/dist/src/imports/compatibility.js

@@ -115,8 +115,12 @@ function inspectMcp(base, name, raw) {
 		"env",
 		"headers",
 		"http_headers",
-		"startup_timeout_sec",
-		"tool_timeout_sec"
+		"tool_timeout_sec",
+		"timeout",
+		"exposure",
+		"toolExposure",
+		"description",
+		"enabled"
 	]);
 	for (const [key, v] of Object.entries(value)) {
 		if (!supported.has(key)) {
@@ -131,14 +135,12 @@ function inspectMcp(base, name, raw) {
 		].includes(key)) {
 			if (v && typeof v === "object") item.requiredEnv.push(...Object.keys(v));
 			item.findings.push(`${key} values omitted; configure them in xopc`);
-		} else if (key === "type") {
-			if (v === "http") draft.transport = "streamable-http";
-			else if (v === "sse") draft.transport = "sse";
-			else if (v !== "stdio") {
-				item.compatibility = "blocked";
-				item.findings.push("Unsupported MCP transport");
-			}
-		} else if (key === "startup_timeout_sec" || key === "tool_timeout_sec") if (typeof v === "number") draft[key === "startup_timeout_sec" ? "connectionTimeoutMs" : "requestTimeoutMs"] = v * 1e3;
+		} else if (key === "type") if (v === "http" || v === "streamable-http" || v === "stdio") draft.type = v;
+		else {
+			item.compatibility = "blocked";
+			item.findings.push("Unsupported MCP transport");
+		}
+		else if (key === "tool_timeout_sec") if (typeof v === "number") draft.timeout = v;
 		else {
 			item.compatibility = "blocked";
 			item.findings.push("Invalid MCP timeout");