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

package/AGENTROUTER-FORK.md

@@ -2,6 +2,6 @@
 
 Upstream: https://github.com/yangbobo2021/relay-dsh-plugin-codex.git @ 75918b3e06880df25375154321109f364124a544 (MIT).
 
-Changes: version 1 generic codexHome/codexEnv launch interface, Codex 0.153.4, and package/build identity. No agent protocol, model picker, effort controls or tool implementation replaced.
+Changes: version 1 generic codexHome/codexEnv launch interface, optional codexBehaviorDefaults=native (see docs/behavior-defaults.md), Codex 0.153.4, and package/build identity. No agent protocol, model picker, effort controls or tool implementation replaced.
 
 Sources and checksummed contributions: https://github.com/Maybank01/agentrouter-dsh-plugins/tree/main/upstream/relay-codex

package/docs/behavior-defaults.md

@@ -0,0 +1,43 @@
+# Optional native behavior defaults
+
+The public DSH host configuration accepts `codexBehaviorDefaults: "native"`.
+Omitting it (or setting `"relay"`) preserves upstream Relay behavior. Unknown
+values fail activation. This is independent of `codexExecutionMode`.
+
+For a Codex-native agent that can still use DSH plugin tools, compose:
+
+```yaml
+codexExecutionGuidance: false
+codexBehaviorDefaults: native
+# codexExecutionMode remains enhanced (the default).
+```
+
+This omits Relay's fixed personality, collaboration mode and multi-agent mode
+from ordinary thread/turn requests and from model/effort synchronization. It
+does not replace these overrides with empty strings or null, and does not remove
+Codex's own instructions, native mode defaults, AGENTS.md or Skills. Model/effort
+choices, tool schemas, attachment context, permissions and cancellation stay on
+their existing paths. Native configuration may itself select a personality or
+mode; this switch does not force a different one.
+
+With execution guidance disabled, ordinary conversations add no Relay developer
+instructions and do not forward the combined DSH `options.system`. Plugin tool
+descriptions/results still carry their necessary knowledge. This is **not** an
+automatic bridge for all DSH preset prompts or plugin context messages. A future
+knowledge/mode bridge needs explicit source and session scope, not a heuristic
+that classifies arbitrary system text as knowledge. Do not use this option to
+claim that unbridged DSH prompt contributions already reach Codex.
+
+Explicit instructions supplied by a caller still work (including separate,
+read-only auxiliary title/compaction threads); absent instruction fields are
+omitted. User files and existing conversation history are never rewritten.
+Previously injected guidance can remain in a resumed/forked conversation: use
+a new conversation to evaluate the new defaults.
+
+Implementation: `apply(ctx, config)` passes `behaviorDefaults` through the
+existing execution plugin to `CodexSessionRuntime`. There is no Desktop API,
+provider policy, extra AgentLoop or tool implementation here.
+
+Protocol semantics: [official OpenAI App Server documentation](https://learn.chatgpt.com/docs/app-server).
+In particular, `collaborationMode.settings.developer_instructions: null` selects
+the mode's built-in instructions; it does not clear them.

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();
@@ -5126,7 +5130,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