@agentrouter-top/relay-dsh-plugin-codex 0.2.2-agentrouter.1 → 0.2.2-agentrouter.3

package/lib/host-plugin.js

@@ -681,8 +681,11 @@ function newThreadConfig(bypassHookTrust) {
 	};
 }
 var CodexSessionRuntime = class extends EventEmitter {
-	constructor({ client, cwd = process.cwd(), codexHome }) {
+	constructor({ client, cwd = process.cwd(), codexHome, behaviorDefaults = "relay" }) {
 		super();
+		if (!["relay", "native"].includes(behaviorDefaults)) throw new TypeError(`Unknown Codex behavior defaults: ${behaviorDefaults}`);
+		this.behaviorDefaults = behaviorDefaults;
+		this.defaultMultiAgentMode = behaviorDefaults === "native" ? void 0 : DEFAULT_MULTI_AGENT_MODE;
 		this.client = client;
 		this.cwd = cwd;
 		this.codexHome = codexHome;
@@ -807,15 +810,15 @@ var CodexSessionRuntime = class extends EventEmitter {
 			approvalPolicy,
 			permissions: permissionProfile(selectedSandbox),
 			runtimeWorkspaceRoots: selectedSandbox === "read-only" ? [] : [cwd],
-			personality: ephemeral ? null : "friendly",
+			personality: this.behaviorDefaults === "native" ? void 0 : ephemeral ? null : "friendly",
 			ephemeral: ephemeral ?? null,
-			baseInstructions: baseInstructions ?? null,
+			baseInstructions: this.behaviorDefaults === "native" ? baseInstructions : baseInstructions ?? null,
 			serviceName,
 			threadSource,
 			mockExperimentalField: null,
 			experimentalRawEvents: !ephemeral,
 			dynamicTools,
-			developerInstructions: developerInstructions ?? null
+			developerInstructions: this.behaviorDefaults === "native" ? developerInstructions : developerInstructions ?? null
 		}));
 		const session = this.upsertThread(result.thread, {
 			model: selectedModel,
@@ -828,7 +831,7 @@ var CodexSessionRuntime = class extends EventEmitter {
 		this.recordNativeSettings(session, result, {
 			model: selectedModel,
 			effort: selectedEffort,
-			multiAgentMode: DEFAULT_MULTI_AGENT_MODE
+			multiAgentMode: this.defaultMultiAgentMode
 		});
 		if (!session.ephemeral) this.selectedSessionId = session.id;
 		this.emitChange();
@@ -851,8 +854,8 @@ var CodexSessionRuntime = class extends EventEmitter {
 			approvalPolicy,
 			permissions: permissionProfile(selectedSandbox),
 			runtimeWorkspaceRoots: selectedSandbox === "read-only" ? [] : [cwd],
-			baseInstructions: baseInstructions ?? null,
-			developerInstructions: developerInstructions ?? null,
+			baseInstructions: this.behaviorDefaults === "native" ? baseInstructions : baseInstructions ?? null,
+			developerInstructions: this.behaviorDefaults === "native" ? developerInstructions : developerInstructions ?? null,
 			ephemeral,
 			threadSource
 		}));
@@ -868,7 +871,7 @@ var CodexSessionRuntime = class extends EventEmitter {
 		this.recordNativeSettings(session, result, {
 			model: session.model,
 			effort: session.effort,
-			multiAgentMode: DEFAULT_MULTI_AGENT_MODE
+			multiAgentMode: this.defaultMultiAgentMode
 		});
 		if (!session.ephemeral) this.selectedSessionId = session.id;
 		this.emitChange();
@@ -890,7 +893,7 @@ var CodexSessionRuntime = class extends EventEmitter {
 		this.recordNativeSettings(session, result, {
 			model: session.model,
 			effort: session.effort,
-			multiAgentMode: DEFAULT_MULTI_AGENT_MODE
+			multiAgentMode: this.defaultMultiAgentMode
 		});
 		if (result.thread.turns?.length > 0) session.turns = structuredClone(result.thread.turns);
 		this.selectedSessionId = threadId;
@@ -913,7 +916,7 @@ var CodexSessionRuntime = class extends EventEmitter {
 		await this.syncThreadSettings(session.id, {
 			model: nextModel,
 			effort: nextEffort,
-			multiAgentMode: DEFAULT_MULTI_AGENT_MODE
+			multiAgentMode: this.defaultMultiAgentMode
 		});
 		Object.assign(session, {
 			model: nextModel,
@@ -935,12 +938,12 @@ var CodexSessionRuntime = class extends EventEmitter {
 			runtimeWorkspaceRoots: usePermissionProfile ? runtimeWorkspaceRoots(nextSandbox, workspaceRoots) : null,
 			model: null,
 			effort: null,
-			multiAgentMode: DEFAULT_MULTI_AGENT_MODE,
+			multiAgentMode: this.defaultMultiAgentMode,
 			summary: reasoningSummary === "none" ? "none" : "auto",
-			personality: "friendly",
+			personality: this.behaviorDefaults === "native" ? void 0 : "friendly",
 			responsesapiClientMetadata: { workspace_kind: "project" },
 			outputSchema: null,
-			collaborationMode: {
+			collaborationMode: this.behaviorDefaults === "native" ? void 0 : {
 				mode: "default",
 				settings: {
 					model: nextModel,
@@ -1051,15 +1054,15 @@ var CodexSessionRuntime = class extends EventEmitter {
 		});
 	}
 	async syncThreadSettings(threadId, settings) {
-		const next = normalizeThreadSettings(settings);
+		const next = normalizeThreadSettings(settings, this.defaultMultiAgentMode);
 		const current = this.appliedThreadSettings.get(threadId);
 		if (current && sameThreadSettings(current, next)) return;
-		await this.client.request("thread/settings/update", {
+		await this.client.request("thread/settings/update", compactObject({
 			threadId,
 			model: next.model,
 			effort: next.effort,
 			multiAgentMode: next.multiAgentMode
-		});
+		}));
 		this.appliedThreadSettings.set(threadId, next);
 	}
 	async releaseSession(threadId) {
@@ -1363,7 +1366,7 @@ var CodexSessionRuntime = class extends EventEmitter {
 		if (!this.closed) this.emit("connectionStatus", this.status());
 	}
 	recordAppliedThreadSettings(threadId, settings) {
-		this.appliedThreadSettings.set(threadId, normalizeThreadSettings(settings));
+		this.appliedThreadSettings.set(threadId, normalizeThreadSettings(settings, this.defaultMultiAgentMode));
 	}
 	recordNativeSettings(session, result, fallback = {}) {
 		const settings = compactObject({
@@ -1550,15 +1553,15 @@ function turnInterruptionFailure(threadId, turnId, failures) {
 	error.failures = failures;
 	return error;
 }
-function normalizeThreadSettings(settings = {}) {
+function normalizeThreadSettings(settings = {}, defaultMultiAgentMode) {
 	return {
 		model: settings.model ?? null,
 		effort: settings.effort ?? null,
-		multiAgentMode: settings.multiAgentMode ?? DEFAULT_MULTI_AGENT_MODE
+		multiAgentMode: settings.multiAgentMode ?? defaultMultiAgentMode
 	};
 }
 function sameThreadSettings(left, right) {
-	return left.model === right.model && left.effort === right.effort && left.multiAgentMode === right.multiAgentMode;
+	return left.model === right.model && left.effort === right.effort && (right.multiAgentMode === void 0 || left.multiAgentMode === right.multiAgentMode);
 }
 function summarizeTitle$1(text) {
 	const normalized = text.replace(/\s+/g, " ").trim();
@@ -1598,7 +1601,8 @@ function createCodexExecutionPlugin(config = {}) {
 			const runtime = new CodexSessionRuntime({
 				client,
 				cwd: config.cwd ?? process.cwd(),
-				codexHome: config.codexHome
+				codexHome: config.codexHome,
+				behaviorDefaults: config.behaviorDefaults
 			});
 			defer(() => runtime.close());
 			const ready = runtime.initialize();
@@ -1748,6 +1752,16 @@ async function appendPersistedEvents(persistence, id, events) {
 	}
 }
 //#endregion
+//#region kernel-policy.mjs
+/** Execution ownership, not a model-name or provider-brand allowlist. */
+function assertKernelRoute(codexSession, options) {
+	if (options.purpose) return;
+	if (codexSession === (options.provider === "relay-codex")) return;
+	const error = /* @__PURE__ */ new Error(codexSession ? "Codex 内核只能使用 Codex 适配器的模型。请重新选择 Codex 模型；不会忽略当前选择或自动换用其他模型。" : "当前会话不是 Codex 内核，不能使用 Codex 适配器的模型。请新建 Codex 会话。既有会话的内核不会被替换。");
+	error.code = "CODEX_KERNEL_MODEL_MISMATCH";
+	throw error;
+}
+//#endregion
 //#region codex-activity-wire.mjs
 const CODEX_ACTIVITY_TOOL = "relay_codex_activity";
 //#endregion
@@ -2275,6 +2289,14 @@ var CodexDshAdapter = class extends LlmAdapter {
 	servesAgent(agent) {
 		return effectivePreset(agent.session) === CODEX_PRESET;
 	}
+	admitStepMessages(agent, decision) {
+		if (!this.servesAgent(agent) || decision.kind !== "enter") return decision;
+		const messages = decision.messages.filter((message) => acceptsCodexInputSource(message.source));
+		return messages.length === decision.messages.length ? decision : {
+			...decision,
+			messages
+		};
+	}
 	detachAgent(sessionId) {
 		const key = String(sessionId);
 		this.agents.delete(key);
@@ -2621,6 +2643,7 @@ var CodexDshAdapter = class extends LlmAdapter {
 		return binding ? this.activeTurnSignals.get(binding.rootThreadId) : void 0;
 	}
 	async *stream(options) {
+		assertKernelRoute(true, options);
 		if (options.purpose) {
 			yield* this.streamAuxiliary(options);
 			return;
@@ -2634,8 +2657,8 @@ var CodexDshAdapter = class extends LlmAdapter {
 		const events = sessionEvents(agent.session);
 		const nativePermissions = permissionConfiguration(events);
 		const config = this.configure(sessionId, {
-			...options.provider === "relay-codex" ? { model: options.model } : {},
-			...options.provider === "relay-codex" ? { effort: options.reasoningEffort } : {},
+			model: options.model,
+			effort: options.reasoningEffort,
 			...nativePermissions,
 			cwd: agent.session.header.cwd
 		});
@@ -3482,7 +3505,7 @@ async function latestUserInput(messages, attachments, signal, codexHome) {
 	for (let index = messages.length - 1; index >= 0; index -= 1) {
 		const message = messages[index];
 		if (message?.role !== "user") continue;
-		if (message.source?.kind !== "user" && !isRelayActivation(message.source)) continue;
+		if (!acceptsCodexInputSource(message.source)) continue;
 		const text = (message.content ?? []).filter((block) => block.type === "text").map((block) => block.text).join("\n").trim();
 		const localImages = [];
 		for (const block of message.content ?? []) {
@@ -3541,8 +3564,8 @@ function completeAuxiliaryItem(state, item) {
 	if (item.type === "agentMessage") return completeTextItem(state, item.id, "text", item.text ?? "");
 	return [];
 }
-function isRelayActivation(source) {
-	return source?.kind === "plugin" && source.plugin === "relay";
+function acceptsCodexInputSource(source) {
+	return source?.kind === "user" || source?.kind === "plugin" && source.plugin === "relay";
 }
 function compact(value) {
 	return Object.fromEntries(Object.entries(value).filter(([, item]) => item !== void 0 && item !== null));
@@ -4987,11 +5010,18 @@ function createDshCodexPlugin(ctx, config = {}) {
 			defer(ctx.on("llm/stream", (options, next) => {
 				if (options.purpose || !options.sessionId) return next();
 				const agent = ctx.agents.get(options.sessionId);
+				if (agent) assertKernelRoute(adapter.servesAgent(agent), options);
 				return agent && adapter.servesAgent(agent) ? adapter.stream(options) : next();
 			}, {
 				global: true,
 				prepend: true
 			}));
+			defer(ctx.on("agent/pre-step", async ({ agent }, next) => {
+				return adapter.admitStepMessages(agent, await next());
+			}, {
+				global: true,
+				prepend: true
+			}));
 			defer(ctx.on("agent/created", ({ agent }) => {
 				adapter.attachAgent(agent);
 			}));
@@ -5126,7 +5156,8 @@ async function apply(ctx, config = {}) {
 			requestTimeoutMs: config.codexRequestTimeoutMs,
 			cwd: config.cwd,
 			codexHome: launch.codexHome,
-			env: launch.env
+			env: launch.env,
+			behaviorDefaults: config.codexBehaviorDefaults
 		}), createDshCodexPlugin(ctx, {
 			...config,
 			codexHome: launch.codexHome