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

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, 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.
+Changes: version 1 generic codexHome/codexEnv launch interface, optional codexBehaviorDefaults=native (see docs/behavior-defaults.md), DSH pre-step context admission (see docs/context-admission.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/context-admission.md

@@ -0,0 +1,27 @@
+# Codex context admission
+
+Relay uses DSH's public `agent/pre-step` waterfall to align newly recorded
+context messages with the adapter's existing native-input source policy.
+For the effective `relay-codex` preset, it awaits downstream decisions and
+DSH's runtime snapshot, then removes messages from unsupported sources before
+the loop appends them as `user/message` events. DSH's ordinary chat/trajectory
+views therefore no longer label these unforwarded messages as injected.
+
+Both admission and native input selection use the same source predicate:
+user input and Relay's existing `source.plugin = "relay"` activation messages
+are supported. Arbitrary DSH system/preset/plugin knowledge is still **not**
+automatically bridged. This fix does not enable more prompt injection, change
+the existing latest-input selection, or classify text heuristically.
+
+The hook preserves accepted message identities/attachments, upstream rejection
+decisions, request-series metadata and normal empty-step semantics. It follows
+the effective preset after switching and leaves other agents untouched. It is
+disposed with Relay. No Desktop/private API or extra plugin is needed, and
+AgentRouter's authentication and Codex Home composition do not implement it.
+
+This is admission for submission, not a receipt from the model: a later failed
+network request is still a failed request. Historical session events and native
+thread history are not rewritten; old misleading rows can remain in old chats.
+The DSH assembled request header is not a native Codex prompt dump. Native
+permissions, tools, behavior defaults and auxiliary requests keep their existing
+paths. A future knowledge bridge must update this same admission/input contract.

package/docs/kernel-policy.md

@@ -0,0 +1,12 @@
+# Kernel/model consistency
+
+Relay's `relay-codex` preset owns Codex execution. Primary calls from that
+preset must explicitly select the `relay-codex` model route. Selecting another
+route is an error, not permission to silently use the native default. A
+non-Codex session cannot select the Codex route either. Auxiliary calls with
+an explicit purpose retain their existing behavior.
+
+This is a route-ownership check, not a GPT/DeepSeek model-name allowlist.
+Native model and effort catalogs, permissions, tools and history stay upstream
+owned. Product-only preset visibility and provider activation belong to the
+deployment's ordinary DSH plugin/profile composition, not this generic adapter.

package/docs/presentation-policy.md

@@ -0,0 +1,29 @@
+# Optional Codex presentation policy, version 1
+
+Relay owns Codex event projection, process/transcript presentation, kernel labels,
+blank-session preset selection and the native model seat guard. Integration
+plugins configure the browser Cordis service `relayCodexPresentation`; they do
+not render Codex components. Types are exported from the `./presentation` subpath.
+
+Wait for the service with `ctx.inject(['relayCodexPresentation'], ...)`, check
+`version === 1`, then call `configure({ kernelMode: 'codex-only', hideFeedback:
+true, hideStatistics: true })`. Register the returned disposer with the owner's
+lifecycle. Only one configuration owner is accepted. Dispose before reconfiguring.
+Without configuration Relay retains its upstream coexistence UI.
+
+`kernelMode` defaults to `coexist`. `codex-only` enables the Codex label/settings,
+selects Codex only for blank sessions through the public preset transaction, and
+guards the existing DSH model picker. The integrating host remains responsible
+for enforcing its execution policy. Existing sessions/presets are not deleted or
+retargeted. Model catalogs and effort controls remain upstream implementations.
+
+`hideFeedback` and `hideStatistics` default to false. They shadow only the native
+feedback/statistics public leaf slots for the rendered Codex session. Other
+kernels and other plugins' entries remain unchanged. Changed/unknown leaf
+contracts are left visible. Unloading or disposing restores native entries.
+
+The current DSH turn-tail component has no separate public switch for its copy,
+branch, timing and timestamp actions. Version 1 does **not** hide that parent:
+it also owns deliverable child slots. No private DOM/CSS manipulation, event
+rewriting or DSH component fork is used. Files, errors, approvals and history are
+unaffected. Account credentials and runtime launch options never enter this API.

package/docs/transcript-presentation.md

@@ -0,0 +1,20 @@
+# Codex transcript presentation
+
+Relay hides the `permission` command row and the DSH `request/header.system`
+chat row for sessions whose effective preset is `relay-codex`. This includes
+replayed and failed turns; it does not depend on a successful Codex response.
+The primary adapter does not forward DSH's `options.system` to Codex. Native
+Codex instructions, explicitly admitted plugin context, and task-specific
+auxiliary instructions are not affected by this presentation rule.
+
+This uses the public `conversation.chat.commandview` permission specialization
+and a leaf shadow of `conversation.chat.node/system-prompt`. Other commands,
+tool approvals, turn errors and the original event log remain unchanged.
+Other or unknown presets retain a permission disclosure built from the public
+DSH primitive and the original system-prompt renderer. DSH does not export its
+generic command card; Relay does not copy it or claim its child slots.
+
+No Desktop patch, private DOM mutation, log deletion, authentication change or
+permission-policy change is involved. Removing Relay restores native renderers.
+Changes to the native system-prompt leaf contract fail open. If the primary
+adapter starts forwarding system prompts in future, update this policy with it.

package/lib/client.js

@@ -36319,6 +36319,339 @@ window.__ModuleLoader__.load({
 			});
 		}
 		//#endregion
+		//#region src/client/transcript-presentation.tsx
+		function isCodexSession(state, sessionId) {
+			return sessionPreset(state.byId[sessionId]) === "relay-codex";
+		}
+		/** Only the permission command seat is ours; all other commands stay with DSH. */
+		function PermissionTranscriptRow({ sessionId, useSessions, node, t }) {
+			const codex = useSessions((state) => isCodexSession(state, sessionId));
+			const [open, setOpen] = (0, react.useState)(false);
+			if (codex) return null;
+			const failed = node.outcome?.kind === "error";
+			const summary = node.outcome?.text ?? t(node.outcome === null ? "row.running" : failed ? "row.failed" : "ok");
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.DisclosureRow, {
+				title: "permission",
+				open,
+				expandable: true,
+				expandOnRowClick: true,
+				icon: failed ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.StateDot, { state: "error" }) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.IconApiOutline14, { size: 14 }),
+				onToggle: () => setOpen((value) => !value),
+				keepContentWhenOpen: true,
+				collapsedContent: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					style: {
+						marginInlineStart: 8,
+						whiteSpace: "pre-wrap"
+					},
+					children: summary
+				}),
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("pre", {
+					style: {
+						whiteSpace: "pre-wrap",
+						overflowWrap: "anywhere"
+					},
+					children: [node.args, summary].filter(Boolean).join("\n")
+				})
+			});
+		}
+		/** Presentation only: keep request headers, permission events and approvals intact. */
+		function installTranscriptPresentation(ctx) {
+			ctx.slots.inject("conversation.chat.commandview", () => {
+				const locale = ctx.slots.entries("conversation.chat.node").find((entry) => entry.children?.["conversation.chat.commandview"])?.locale;
+				if (locale !== "chat" && locale !== "conversation") return () => {};
+				return ctx.slots.register({
+					name: "conversation.chat.commandview",
+					key: "permission",
+					priority: -20,
+					locale
+				}, PermissionTranscriptRow);
+			});
+			ctx.slots.inject("conversation.chat.node", () => {
+				let previous;
+				let dispose;
+				const reconcile = () => {
+					const original = ctx.slots.entries("conversation.chat.node").find((entry) => entry.options.key === "system-prompt" && (entry.options.priority ?? 0) >= 0);
+					if (original === previous) return;
+					dispose?.();
+					dispose = void 0;
+					previous = original;
+					if (!original || original.children || original.store || original.inject || original.locale !== "chat" && original.locale !== "conversation") return;
+					const Original = original.component;
+					dispose = ctx.slots.register({
+						name: "conversation.chat.node",
+						key: "system-prompt",
+						priority: -20,
+						locale: original.locale
+					}, function CodexRequestPromptBoundary(props) {
+						return props.useSessions((state) => isCodexSession(state, props.sessionId)) ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Original, { ...props });
+					});
+				};
+				const unsubscribe = ctx.slots.subscribe("conversation.chat.node", reconcile);
+				reconcile();
+				return () => {
+					unsubscribe();
+					dispose?.();
+				};
+			});
+		}
+		//#endregion
+		//#region presentation-api.mjs
+		/** Public, optional browser presentation policy. No account/runtime configuration. */
+		function createPresentationController(install) {
+			let active;
+			return {
+				service: Object.freeze({
+					version: 1,
+					configure(options = {}) {
+						if (active) throw new Error("Relay Codex presentation already has a configuration owner");
+						const { kernelMode = "coexist", hideFeedback = false, hideStatistics = false } = options;
+						if (!["coexist", "codex-only"].includes(kernelMode) || typeof hideFeedback !== "boolean" || typeof hideStatistics !== "boolean" || Object.keys(options).some((key) => ![
+							"kernelMode",
+							"hideFeedback",
+							"hideStatistics"
+						].includes(key))) throw new TypeError("Unsupported Relay Codex presentation policy");
+						const remove = install(Object.freeze({
+							kernelMode,
+							hideFeedback,
+							hideStatistics
+						}));
+						const release = () => {
+							if (active !== release) return;
+							active = void 0;
+							remove();
+						};
+						active = release;
+						return release;
+					}
+				}),
+				dispose: () => active?.()
+			};
+		}
+		//#endregion
+		//#region src/client/kernel-presentation.tsx
+		const CODEX_PRESET = "relay-codex";
+		const UNSUPPORTED_KERNEL = "当前会话不是 Codex 内核。此客户端暂不支持执行，请新建 Codex 会话；原会话和历史记录会保留。";
+		const isCodex = (session) => sessionPreset(session) === CODEX_PRESET;
+		function KernelSection() {
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
+				style: {
+					maxWidth: 600,
+					lineHeight: 1.7
+				},
+				"aria-label": "执行内核",
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h2", { children: "执行内核" }),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: "当前产品仅支持 Codex App Server。" }),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: "模型、思考强度、工具和执行行为由 Codex 适配器提供。原生 DSH / DeepSeek 内核暂不提供执行入口。" }),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: "已有预设、自建预设和会话没有被删除；非 Codex 历史仍可查看。通用插件的共存模式不限制宿主的其他内核。" })
+				]
+			});
+		}
+		function KernelLabel({ sessionId, useSessions }) {
+			const codex = useSessions((state) => isCodex(state.byId[sessionId]));
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				role: "status",
+				"data-relay-codex-kernel": codex ? "codex" : "unsupported",
+				style: {
+					fontSize: 12,
+					lineHeight: 1.4,
+					maxWidth: "min(65vw, 440px)",
+					whiteSpace: "normal"
+				},
+				title: codex ? "Codex App Server 执行内核" : UNSUPPORTED_KERNEL,
+				children: codex ? "Codex" : "非 Codex 内核 · 当前不支持执行，请新建 Codex 会话"
+			});
+		}
+		function KernelModelSeat({ Upstream, ...props }) {
+			return props.useSessions((state) => isCodex(state.byId[props.sessionId])) ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Upstream, { ...props }) : null;
+		}
+		function installModelSeatGuard(ctx) {
+			const slot = "conversation.input.model";
+			let source, release;
+			const reconcile = () => {
+				const next = ctx.slots.entries(slot).find((entry) => entry.locale === "model" && (entry.options.priority ?? 0) === 0);
+				if (next === source) return;
+				source = next;
+				const previous = release;
+				release = void 0;
+				previous?.();
+				if (!next?.inject || next.children || next.store) return;
+				const original = next.inject;
+				release = ctx.slots.register({
+					name: slot,
+					priority: -50,
+					locale: "model",
+					inject: (sessionId) => {
+						const face = original(sessionId);
+						return {
+							...face,
+							Upstream: next.component,
+							select: (selection) => isCodex(ctx.sessions.list.getSnapshot().byId[sessionId]) ? face.select(selection) : Promise.resolve(false)
+						};
+					}
+				}, KernelModelSeat);
+			};
+			const stop = ctx.slots.subscribe(slot, reconcile);
+			reconcile();
+			return () => {
+				stop();
+				release?.();
+			};
+		}
+		function CodexSeat({ useSessions, selectCodex }) {
+			const session = useSessions((state) => state.current === void 0 ? void 0 : state.byId[state.current]);
+			const id = session?.id;
+			const preset = sessionPreset(session), blank = session?.blank;
+			const [failure, setFailure] = (0, react.useState)();
+			const [attempt, setAttempt] = (0, react.useState)(0);
+			(0, react.useEffect)(() => {
+				if (!id || !blank || preset === CODEX_PRESET) return;
+				let stopped = false;
+				setFailure(void 0);
+				selectCodex(id).then((message) => {
+					if (!stopped && message) setFailure({
+						id,
+						message
+					});
+				}).catch((error) => {
+					if (!stopped) setFailure({
+						id,
+						message: error instanceof Error ? error.message : "无法选择 Codex 预设，请重试。"
+					});
+				});
+				return () => {
+					stopped = true;
+				};
+			}, [
+				id,
+				blank,
+				preset,
+				selectCodex,
+				attempt
+			]);
+			const error = preset !== CODEX_PRESET && failure?.id === id ? failure?.message : void 0;
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+				style: {
+					fontSize: 13,
+					maxWidth: "60vw"
+				},
+				"aria-label": "Codex 执行内核",
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					role: "status",
+					children: !id || preset === CODEX_PRESET ? "Codex" : error ? "Codex 未就绪" : "正在准备 Codex…"
+				}), error && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+					role: "alert",
+					children: [
+						error,
+						" ",
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+							type: "button",
+							onClick: () => setAttempt((value) => value + 1),
+							children: "重试"
+						})
+					]
+				})]
+			});
+		}
+		/** Opt-in single-kernel product UI. Never retarget or delete existing history. */
+		function installExclusiveKernelPresentation(ctx) {
+			const selectCodex = async (id) => {
+				const session = ctx.sessions.list.getSnapshot().byId[id];
+				if (!session?.blank || isCodex(session)) return;
+				const result = await ctx.remote.agentPresets.select(id, CODEX_PRESET);
+				return result.ok ? void 0 : `${result.error.code}: ${result.error.message}`;
+			};
+			const releases = [];
+			const dispose = () => {
+				while (releases.length) releases.pop()();
+			};
+			try {
+				releases.push(ctx.slots.inject("conversation.input.model", () => installModelSeatGuard(ctx)));
+				releases.push(ctx.slots.inject("conversation.hero.agentPreset", () => ctx.slots.register({
+					name: "conversation.hero.agentPreset",
+					priority: -50,
+					inject: () => ({ selectCodex })
+				}, CodexSeat)));
+				releases.push(ctx.slots.inject("settings.section", () => ctx.slots.register({
+					name: "settings.section",
+					id: "relay-codex-kernels",
+					order: 20,
+					label: () => "执行内核"
+				}, KernelSection)));
+				releases.push(ctx.slots.inject("conversation.session.header.actions", () => ctx.slots.register({
+					name: "conversation.session.header.actions",
+					id: "relay-codex-kernel",
+					order: -10
+				}, KernelLabel)));
+				return dispose;
+			} catch (error) {
+				dispose();
+				throw error;
+			}
+		}
+		//#endregion
+		//#region src/client/presentation.tsx
+		function NativeNonCodexLeaf({ Upstream, ...props }) {
+			return props.useSessions((state) => sessionPreset(state.byId[props.sessionId]) === "relay-codex") ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Upstream, { ...props });
+		}
+		/** Shadow only a known public leaf. Parent ownership and unrelated entries stay intact. */
+		function hideNativeLeaf(ctx, name, id) {
+			return ctx.slots.inject(name, () => {
+				let source, release;
+				const reconcile = () => {
+					const next = ctx.slots.entries(name).find((entry) => entry.options.id === id && (entry.options.priority ?? 0) === 0);
+					if (next === source) return;
+					source = next;
+					const previous = release;
+					release = void 0;
+					previous?.();
+					if (!next || next.children || next.store) return;
+					if (name === "conversation.composer.dock" && next.inject) return;
+					if (next.locale !== void 0 && next.locale !== "chat" && next.locale !== "conversation" && next.locale !== "feedback") return;
+					const originalInject = next.inject;
+					release = ctx.slots.register({
+						name,
+						id,
+						priority: -50,
+						order: next.options.order,
+						locale: next.locale,
+						inject: (sessionId) => ({
+							...originalInject?.(sessionId),
+							Upstream: next.component
+						})
+					}, NativeNonCodexLeaf);
+				};
+				const stop = ctx.slots.subscribe(name, reconcile);
+				reconcile();
+				return () => {
+					stop();
+					release?.();
+				};
+			});
+		}
+		function installPresentationPolicy(ctx, options) {
+			const releases = [];
+			const dispose = () => {
+				while (releases.length) releases.pop()();
+			};
+			try {
+				if (options.kernelMode === "codex-only") releases.push(installExclusiveKernelPresentation(ctx));
+				if (options.hideStatistics) releases.push(hideNativeLeaf(ctx, "conversation.composer.dock", "stats"));
+				if (options.hideFeedback) releases.push(hideNativeLeaf(ctx, "conversation.chat.assistant-actions", "feedback"));
+				return dispose;
+			} catch (error) {
+				dispose();
+				throw error;
+			}
+		}
+		function installPresentationService(ctx) {
+			ctx.inject(["remote", "remote.agentPresets"], (scope) => {
+				const controller = createPresentationController((options) => installPresentationPolicy(scope, options));
+				scope.effect(() => controller.dispose, "relay-codex: optional presentation policy");
+				scope.provide("relayCodexPresentation", controller.service);
+			});
+		}
+		//#endregion
 		//#region src/client/codex-activity.ts
 		const codexActivityDefinition = {
 			kind: "relay-codex-activity",
@@ -37085,6 +37418,7 @@ window.__ModuleLoader__.load({
 			"connection"
 		];
 		function apply(ctx) {
+			installPresentationService(ctx);
 			const advancedDebug = applyAdvancedDebug(ctx);
 			applyWorkspaceImport(ctx);
 			applySessionOpenSync(ctx);
@@ -37092,6 +37426,7 @@ window.__ModuleLoader__.load({
 			return withConversationRuntime(ctx, (inner) => {
 				applyActivityPresentation(inner);
 				installProcessPresentation(inner, advancedDebug);
+				installTranscriptPresentation(inner);
 				return installModelSelection(inner, "relay-codex", "relay-codex", "relay-claude");
 			});
 		}