@xopcai/xopc 0.0.369 → 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/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/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");

package/dist/src/mcp/channel-bridge.js

@@ -1,8 +1,8 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { loadConfig } from "../config/loader.js";
-import { createGatewayHttpClientFromConfig, resolveGatewayHttpBaseUrl } from "./gateway-http-client.js";
 import { RealtimeClient } from "../../packages/realtime-client/src/index.js";
+import { createGatewayHttpClientFromConfig, resolveGatewayHttpBaseUrl } from "./gateway-http-client.js";
 import { toConversation } from "./channel-shared.js";
 import { createRequire } from "node:module";
 import crypto from "node:crypto";

package/dist/src/providers/env-keys.js

@@ -27,7 +27,7 @@ var init_env_keys = __esmMin((() => {
 		cerebras: ["CEREBRAS_API_KEY"],
 		mistral: ["MISTRAL_API_KEY"],
 		openrouter: ["OPENROUTER_API_KEY"],
-		"azure-openai-responses": ["AZURE_OPENAI_API_KEY", "AZURE_OPENAI_BASE_URL"],
+		azure: ["AZURE_OPENAI_API_KEY", "AZURE_OPENAI_BASE_URL"],
 		"amazon-bedrock": [
 			"AWS_ACCESS_KEY_ID",
 			"AWS_SECRET_ACCESS_KEY",

package/dist/src/providers/index.js

@@ -1,6 +1,7 @@
 import { __esmMin, __exportAll } from "../../_virtual/_rolldown/runtime.js";
 import { PROVIDER_ENV_MAP, getApiKeyFromEnv, init_env_keys } from "./env-keys.js";
 import { getModelOAuthProviderIds, init_registry } from "../auth/oauth/registry.js";
+import { assertCurrentModelProvider, init_provider_policy, isRetiredModelProvider } from "./provider-policy.js";
 import { CredentialResolver, hasCredentials, init_credentials } from "../auth/credentials.js";
 import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
 import { hasProviderAuthOnDiskSync, init_sync_provider_auth } from "../auth/sync-provider-auth.js";
@@ -45,12 +46,8 @@ var providers_exports = /* @__PURE__ */ __exportAll({
 	resolveModel: () => resolveModel
 });
 function normalizeProviderModel(model) {
-	const correctedModel = applyOfficialModelMetadataCorrections(model);
-	if (model.provider === "openai-codex" && model.api === "openai-codex-responses") return {
-		...correctedModel,
-		baseUrl: OPENAI_CODEX_CANONICAL_BASE_URL
-	};
-	return correctedModel;
+	assertCurrentModelProvider(model.provider);
+	return applyOfficialModelMetadataCorrections(model);
 }
 /** Map a plugin registry model to the pi-ai {@link Model} shape. */
 function pluginModelToModel(providerId, definition) {
@@ -77,6 +74,7 @@ function pluginModelToModel(providerId, definition) {
 * Use this for Agent's getApiKey callback which must be synchronous.
 */
 function getApiKeySync(provider) {
+	assertCurrentModelProvider(provider);
 	if (getProviderRegistry().has(provider)) return "extension-managed";
 	const registryKey = getModelRegistry().getApiKey(provider);
 	if (registryKey) return registryKey;
@@ -91,6 +89,8 @@ function getApiKeySync(provider) {
 function resolveModel(ref) {
 	const trimmedRef = typeof ref === "string" ? ref.trim() : "";
 	if (!trimmedRef) throw new Error("No default model configured. Choose a model in onboarding or update global Agent defaults.");
+	const requestedProvider = splitProviderModelRef(trimmedRef)?.provider;
+	if (requestedProvider) assertCurrentModelProvider(requestedProvider);
 	const customModel = getModelRegistry().resolve(trimmedRef);
 	if (customModel) return normalizeProviderModel(customModel);
 	const qualifiedRef = splitProviderModelRef(trimmedRef);
@@ -107,11 +107,14 @@ function resolveModel(ref) {
 		}
 		throw new Error(`Model not found: ${trimmedRef}`);
 	}
-	for (const provider of getProviders()) try {
-		const found = getModels(provider).find((m) => m.id === trimmedRef);
-		if (found) return normalizeProviderModel(found);
-	} catch {
-		continue;
+	for (const provider of getProviders()) {
+		if (isRetiredModelProvider(provider)) continue;
+		try {
+			const found = getModels(provider).find((m) => m.id === trimmedRef);
+			if (found) return normalizeProviderModel(found);
+		} catch {
+			continue;
+		}
 	}
 	const supplementalModel = getSupplementalModels().find((m) => m.id === trimmedRef);
 	if (supplementalModel) return normalizeProviderModel(supplementalModel);
@@ -123,6 +126,7 @@ function resolveModel(ref) {
 	throw new Error(`Model not found: ${trimmedRef}. Use format: provider/model-id`);
 }
 function getModelsByProvider(provider) {
+	assertCurrentModelProvider(provider);
 	const fromRegistry = getModelRegistry().getAll().filter((m) => m.provider === provider).map(normalizeProviderModel);
 	const existingIds = new Set(fromRegistry.map((m) => m.id));
 	const supplementalModels = getSupplementalModels().filter((m) => m.provider === provider && !existingIds.has(m.id)).map(normalizeProviderModel);
@@ -138,13 +142,14 @@ function getModelsByProvider(provider) {
 function getAllProviders() {
 	const registry = getModelRegistry();
 	const providers = /* @__PURE__ */ new Set();
-	for (const p of getProviders()) providers.add(p);
-	for (const m of registry.getAll()) providers.add(m.provider);
+	for (const p of getProviders()) if (!isRetiredModelProvider(p)) providers.add(p);
+	for (const m of registry.getAll()) if (!isRetiredModelProvider(m.provider)) providers.add(m.provider);
 	for (const plugin of getProviderRegistry().listAll()) providers.add(plugin.id);
 	for (const provider of getModelOAuthProviderIds()) providers.add(provider);
 	return Array.from(providers);
 }
 async function getApiKey(provider, credentialOptions) {
+	assertCurrentModelProvider(provider);
 	if (getProviderRegistry().has(provider)) return "extension-managed";
 	const credentialKey = await resolveProviderApiKey(provider, credentialOptions);
 	if (credentialKey) return credentialKey;
@@ -157,12 +162,14 @@ async function getApiKey(provider, credentialOptions) {
 * Only checks environment variables and registry, not credential system
 */
 function isProviderConfiguredSync(provider) {
+	assertCurrentModelProvider(provider);
 	if (getProviderRegistry().has(provider)) return true;
 	if (getModelRegistry().getApiKey(provider)) return true;
 	if (getApiKeyFromEnv(provider)) return true;
 	return hasProviderAuthOnDiskSync(provider);
 }
 async function isProviderConfigured(provider) {
+	assertCurrentModelProvider(provider);
 	if (getProviderRegistry().has(provider)) return true;
 	if (getModelRegistry().getApiKey(provider)) return true;
 	return await hasCredentials(provider);
@@ -310,7 +317,7 @@ function getDefaultModelSync(config) {
 	if (modelRef) return modelRef;
 	return "";
 }
-var OPENAI_CODEX_CANONICAL_BASE_URL, PROVIDER_META;
+var PROVIDER_META;
 var init_providers = __esmMin((() => {
 	init_schema();
 	init_model_registry();
@@ -322,8 +329,8 @@ var init_providers = __esmMin((() => {
 	init_model_supplements();
 	init_model_ref();
 	init_plugin_registry();
+	init_provider_policy();
 	init_provider_auth_service();
-	OPENAI_CODEX_CANONICAL_BASE_URL = "https://chatgpt.com/backend-api/codex";
 	PROVIDER_META = {
 		"xopc-cloud": {
 			name: "XOPC Model Service",
@@ -334,7 +341,8 @@ var init_providers = __esmMin((() => {
 		"openai": {
 			name: "OpenAI",
 			category: "common",
-			supportsApiKey: true
+			supportsApiKey: true,
+			supportsOAuth: true
 		},
 		"anthropic": {
 			name: "Anthropic",
@@ -556,8 +564,8 @@ var init_providers = __esmMin((() => {
 			category: "enterprise",
 			supportsApiKey: true
 		},
-		"azure-openai-responses": {
-			name: "Azure OpenAI",
+		"azure": {
+			name: "Azure",
 			category: "enterprise",
 			supportsApiKey: true
 		},
@@ -577,12 +585,6 @@ var init_providers = __esmMin((() => {
 			supportsOAuth: true,
 			supportsApiKey: false
 		},
-		"openai-codex": {
-			name: "OpenAI Codex (OAuth)",
-			category: "oauth",
-			supportsOAuth: true,
-			supportsApiKey: false
-		},
 		"google-gemini-cli": {
 			name: "Google Gemini CLI (OAuth)",
 			category: "oauth",

package/dist/src/providers/model-call.d.ts

@@ -2,8 +2,6 @@ import { type Api, type AssistantMessage, type Context, type Model, type SimpleS
 import type { CredentialResolverOptions } from '../auth/credentials.js';
 import type { AiUsageContext } from '../usage/types.js';
 export declare function isLocalModelBaseUrl(baseUrl: string | undefined): boolean;
-/** Codex Responses rejects the temperature request parameter. */
-export declare function supportsModelTemperature(model: Model<Api>): boolean;
 export declare function resolveModelCallApiKey(model: Model<Api>, credentialOptions?: CredentialResolverOptions): Promise<string | undefined>;
 export declare function resolveModelCallOptions(model: Model<Api>, options?: SimpleStreamOptions, credentialOptions?: CredentialResolverOptions): Promise<SimpleStreamOptions>;
 /**

package/dist/src/providers/model-call.js

@@ -15,10 +15,6 @@ function isLocalModelBaseUrl(baseUrl) {
 		return false;
 	}
 }
-/** Codex Responses rejects the temperature request parameter. */
-function supportsModelTemperature(model) {
-	return model.api !== "openai-codex-responses";
-}
 async function resolveModelCallApiKey(model, credentialOptions) {
 	try {
 		const apiKey = credentialOptions ? await getApiKey(model.provider, credentialOptions) : await getApiKey(model.provider);
@@ -35,7 +31,7 @@ async function resolveModelCallOptions(model, options = {}, credentialOptions) {
 	return {
 		...rest,
 		apiKey,
-		...temperature !== void 0 && supportsModelTemperature(model) ? { temperature } : {}
+		...temperature !== void 0 ? { temperature } : {}
 	};
 }
 /**
@@ -94,4 +90,4 @@ async function createResolvedModelStream(model, context, options, credentialOpti
 	}
 }
 //#endregion
-export { completeWithResolvedCredentials, createResolvedModelStream, isLocalModelBaseUrl, resolveModelCallApiKey, resolveModelCallOptions, supportsModelTemperature };
+export { completeWithResolvedCredentials, createResolvedModelStream, isLocalModelBaseUrl, resolveModelCallApiKey, resolveModelCallOptions };