@shuind/dsh-codex-harness 0.1.22 → 0.1.24

package/README.md

@@ -10,14 +10,15 @@
 - **GPT 能力补全**：为 GPT 系列模型补充图片输入和思考强度选项；不会覆盖用户已有的显式配置。
 - **Fast**：仅在 Codex preset 的模型选择菜单中显示，开启后向 Responses 请求发送 `service_tier: "priority"`。
 - **旧版 Web 兼容**：在未提供新版模型设置/上下文设置 slot 的 DSH Web 中，Fast 和上下文容量会自动回退到旧版 composer slot；client 注入不依赖纯类型 slot 包。
+- **Responses 原生 apply_patch**：在 GPT Responses 请求的插件传输边界，把普通 JSON function tool 改写为 `type: "custom"` + OpenAI `lark` grammar；下一轮历史同步改写为 `custom_tool_call`。如果中转站拒绝 custom tool，则自动回退到普通 function tool，不改变 DSH 工具执行器。
 - **远程搜索与压缩**：OpenAI Responses 请求默认优先使用 hosted `web_search` 和 `/responses/compact`；失败时回退到 DSH 的本地实现。
 - **上下文容量**：在 Web 中设置 `1K`–`1000K` tokens，设置值作用于下一次请求。
-- **活动状态**：Codex 等待模型响应或进行上下文压缩时，在输入框上方显示对应状态和耗时，让长时间 Deep Diving 不再像卡住。
+- **活动状态**：Codex 等待模型响应或进行上下文压缩时，在 `Deep diving...` 右侧显示对应状态和耗时，让长时间 Deep Diving 不再像卡住。
 
 ## 安装
 
 ```sh
-dsh plugin --profile web add @shuind/dsh-codex-harness@0.1.22
+dsh plugin --profile web add @shuind/dsh-codex-harness@0.1.24
 ```
 
 重启 Web，创建新会话，在模式菜单中选择 **Codex 模式**。
@@ -56,15 +57,20 @@ Fast 设置保存在 `codex` 命名空间，只对 Codex preset 生效。
 
 ### 活动状态
 
-Codex 等待模型首个输出时，Web 输入框上方会显示 `正在等待模型响应... · Ns`；开始上下文压缩后会切换为 `正在压缩上下文... · Ns`。收到模型输出、压缩结束或下一轮开始后自动隐藏。该状态由 Host 的 `sessionProjections` 投影驱动，因此本地压缩和远程 `/responses/compact` 都会显示同一种状态。
+Codex 等待模型首个输出时，Web 会在 `Deep diving...` 右侧显示 `正在等待模型响应... · Ns`；开始上下文压缩后会切换为 `正在压缩上下文... · Ns`。收到模型输出、压缩结束或下一轮开始后自动隐藏。该状态由 Host 的 `sessionProjections` 投影驱动，因此本地压缩和远程 `/responses/compact` 都会显示同一种状态。
 
 如果当前 DSH 组合没有加载 projection 服务，插件会跳过注册，客户端也会自动隐藏这行，不影响普通会话。
 
 ## 随包提供的 Codex preset
 
-安装插件后，首次启动对应的 DSH profile 时，插件会把完整 preset 从随包提供的 `presets/codex` 安装到 `${DSH_HOME:-$HOME/.dsh}/.agent-presets/codex/`；如果你已经创建了同名 preset，插件会保留你的文件。普通用户不需要自己创建 preset。
+安装插件后，首次启动对应的 DSH profile 时，插件会安装两套随包提供的 preset：
 
-在 Web 的 **Agent 预设** 中选择 **Codex**，再新建会话即可使用随包提供的 Codex 工具、网页搜索、远程压缩和 Skills 组合。Fast、思考强度、GPT 图片输入和上下文容量可以在对应的设置位置配置。
+- **Codex 模式**：使用精简版 Codex 提示词。
+- **Codex 协作模式**：在精简版 Codex 提示词后追加协作提示词。
+
+它们分别位于 `${DSH_HOME:-$HOME/.dsh}/.agent-presets/codex/` 和 `${DSH_HOME:-$HOME/.dsh}/.agent-presets/codex-collaboration/`。如果对应目录已经存在，插件会保留你的文件，不会覆盖自定义内容。
+
+在 Web 的 **Agent 预设** 中选择 **Codex 模式** 或 **Codex 协作模式**，再新建会话即可使用随包提供的 Codex 工具、网页搜索、远程压缩和 Skills 组合。两套 preset 共用 Fast、思考强度、GPT 图片输入和上下文容量设置；只有系统提示词是否包含协作指导不同。
 
 ## 自定义 preset
 
@@ -127,6 +133,7 @@ Make things as effortless as possible for the user.
 - preset 在创建会话时确定；已有会话不会自动切换到 Codex 模式。
 - GPT 模型的图片输入和思考强度属于能力补全；用户已明确配置的字段会被保留。
 - hosted search、远程压缩以及 reasoning 参数的可用性取决于实际 Responses 中转站和模型。
+- `apply_patch` 的 custom grammar 改写只作用于 GPT Responses 请求；中转站必须接受 OpenAI custom tools 和 Lark grammar。拒绝时插件会自动发送原始 JSON function-call 请求。
 
 ## License
 

package/lib/client.js

@@ -13,6 +13,11 @@ window.__ModuleLoader__.load({
 		/** User-selectable Codex context controls use whole K-token units. */
 		const CODEX_CONTEXT_UNIT = 1e3;
 		const CODEX_CONTEXT_MAX = 1e6;
+		const CODEX_PRESET_IDS = /* @__PURE__ */ new Set(["codex", "codex-collaboration"]);
+		/** Both shipped presets use the same Codex request controls in Web. */
+		function isCodexPresetId(value) {
+			return value !== void 0 && CODEX_PRESET_IDS.has(value);
+		}
 		//#endregion
 		//#region lib/types/client/activity.js
 		/** Client-only inference used while the host activity projection frame is in flight. */
@@ -30,6 +35,8 @@ window.__ModuleLoader__.load({
 		const SETTINGS_NAMESPACE = "codex";
 		const MODEL_SETTINGS_SLOT = "conversation.input.model.settings";
 		const CONTEXT_SETTINGS_SLOT = "conversation.input.context.settings";
+		const ACTIVITY_SLOT = "conversation.chat.status";
+		const ACTIVITY_FALLBACK_SLOT = "conversation.composer.dock";
 		const FAST_FALLBACK_SLOT = "conversation.input.right";
 		const CONTEXT_FALLBACK_SLOT = "conversation.input.dock";
 		const DEFAULT_CONTEXT_WINDOW = 262144;
@@ -61,7 +68,7 @@ window.__ModuleLoader__.load({
 			const agentPreset = useSessions((state) => state.byId[sessionId]?.agentPreset);
 			const snapshot = useSettings((state) => state);
 			const fast = snapshot.value?.fast ?? false;
-			if (agentPreset !== "codex") return null;
+			if (!isCodexPresetId(agentPreset)) return null;
 			return (0, react_jsx_runtime.jsxs)("button", {
 				type: "button",
 				role: "menuitemcheckbox",
@@ -106,7 +113,7 @@ window.__ModuleLoader__.load({
 			const agentPreset = useSessions((state) => state.byId[sessionId]?.agentPreset);
 			const snapshot = useSettings((state) => state);
 			const fast = snapshot.value?.fast ?? false;
-			if (agentPreset !== "codex") return null;
+			if (!isCodexPresetId(agentPreset)) return null;
 			return (0, react_jsx_runtime.jsxs)("button", {
 				type: "button",
 				role: "switch",
@@ -277,34 +284,34 @@ window.__ModuleLoader__.load({
 			const agentPreset = useSessions((state) => state.byId[sessionId]?.agentPreset);
 			const projectedActivity = useProjection("codexActivity");
 			const fallbackStartedAt = useSession((snapshot) => awaitingModelStartedAt(snapshot));
-			const activity = projectedActivity !== void 0 ? projectedActivity : agentPreset === "codex" && fallbackStartedAt !== void 0 ? {
+			const activity = projectedActivity !== void 0 ? projectedActivity : isCodexPresetId(agentPreset) && fallbackStartedAt !== void 0 ? {
 				activity: "awaiting-model",
 				startedAt: fallbackStartedAt
 			} : null;
 			const [now, setNow] = (0, react.useState)(() => Date.now());
 			(0, react.useEffect)(() => {
-				if (agentPreset !== "codex" || activity === void 0 || activity === null) return void 0;
+				if (!isCodexPresetId(agentPreset) || activity === void 0 || activity === null) return void 0;
 				setNow(Date.now());
 				const timer = setInterval(() => {
 					setNow(Date.now());
 				}, 1e3);
 				return () => clearInterval(timer);
 			}, [agentPreset, activity?.startedAt]);
-			if (agentPreset !== "codex" || activity === void 0 || activity === null) return null;
+			if (!isCodexPresetId(agentPreset) || activity === void 0 || activity === null) return null;
 			const label = activity.activity === "awaiting-model" ? t("activityAwaitingModel") : t("activityCompacting");
-			return (0, react_jsx_runtime.jsxs)("div", {
+			return (0, react_jsx_runtime.jsxs)("span", {
 				id: "codex-activity",
 				role: "status",
 				"aria-live": "polite",
 				style: {
-					display: "flex",
+					display: "inline-flex",
 					alignItems: "center",
 					gap: 7,
-					minHeight: 28,
-					padding: "4px 10px",
+					minHeight: 26,
 					color: "var(--dsw-alias-label-secondary)",
 					fontSize: 12,
-					lineHeight: "20px"
+					lineHeight: "20px",
+					whiteSpace: "nowrap"
 				},
 				children: [
 					(0, react_jsx_runtime.jsx)("span", {
@@ -329,6 +336,18 @@ window.__ModuleLoader__.load({
 				]
 			});
 		}
+		/** Preserve the old composer-dock footprint for hosts without the chat status seat. */
+		function ActivityDock(props) {
+			return (0, react_jsx_runtime.jsx)("div", {
+				style: {
+					display: "flex",
+					alignItems: "center",
+					minHeight: 28,
+					padding: "4px 10px"
+				},
+				children: (0, react_jsx_runtime.jsx)(ActivityLine, { ...props })
+			});
+		}
 		const inject = [
 			"slots",
 			"locale",
@@ -342,6 +361,16 @@ window.__ModuleLoader__.load({
 			const registry = ctx.slots;
 			return typeof registry.spec === "function" && registry.spec.call(ctx.slots, slot) !== void 0;
 		}
+		/** Register an optional host slot without claiming it in older SlotMap declarations. */
+		function injectOptionalActivitySlot(ctx, slot) {
+			const registry = ctx.slots;
+			registry.inject(slot, () => registry.register({
+				name: slot,
+				id: "codex-activity",
+				order: 5,
+				locale: NS
+			}, ActivityLine));
+		}
 		/** Mount Codex controls in the newest named seats, with legacy composer fallbacks. */
 		function apply(ctx) {
 			ctx.effect(() => ctx.locale.register(NS, {
@@ -382,12 +411,13 @@ window.__ModuleLoader__.load({
 				locale: NS,
 				inject: injected
 			}, LegacyContextSizeControl));
-			ctx.slots.inject("conversation.composer.dock", () => ctx.slots.register({
-				name: "conversation.composer.dock",
+			if (chooseDeclaredSlot(ACTIVITY_SLOT, ACTIVITY_FALLBACK_SLOT, (slot) => slotIsDeclared(ctx, slot)) === ACTIVITY_SLOT) injectOptionalActivitySlot(ctx, ACTIVITY_SLOT);
+			else ctx.slots.inject(ACTIVITY_FALLBACK_SLOT, () => ctx.slots.register({
+				name: ACTIVITY_FALLBACK_SLOT,
 				id: "codex-activity",
 				order: 5,
 				locale: NS
-			}, ActivityLine));
+			}, ActivityDock));
 		}
 		var client_default = {
 			inject,

package/lib/index.js

@@ -8,7 +8,12 @@ import { AsyncLocalStorage } from "node:async_hooks";
 import { z as z$1 } from "zod";
 //#region lib/types/context.js
 const CODEX_CONTEXT_MAX = 1e6;
-String.raw`start: begin_patch environment_id? hunk+ end_patch
+//#endregion
+//#region lib/types/patch.js
+/** Parser and line-oriented applicator for Codex's `apply_patch` language. */
+const APPLY_PATCH_DESCRIPTION = "Edits files using Codex patch syntax with Begin/End Patch markers and file update directives. In hunk lines, the first character is the operation marker; repeat a source-leading marker when the source line itself starts with one.";
+/** The grammar sent to providers that support OpenAI custom grammar tools. */
+const APPLY_PATCH_GRAMMAR = String.raw`start: begin_patch environment_id? hunk+ end_patch
 begin_patch: "*** Begin Patch" LF
 environment_id: "*** Environment ID: " filename LF
 end_patch: "*** End Patch" LF?
@@ -575,6 +580,134 @@ function isWebSearchTool(tool) {
 function hasWebSearchTool(body) {
 	return Array.isArray(body.tools) && body.tools.some(isWebSearchTool);
 }
+function toolName(tool) {
+	if (typeof tool !== "object" || tool === null) return void 0;
+	const value = tool;
+	if (typeof value.name === "string") return value.name;
+	const fn = value.function;
+	return typeof fn === "object" && fn !== null && typeof fn.name === "string" ? fn.name : void 0;
+}
+function isApplyPatchTool(tool) {
+	return toolName(tool) === "apply_patch";
+}
+function isFunctionApplyPatchTool(tool) {
+	if (!isApplyPatchTool(tool) || typeof tool !== "object" || tool === null) return false;
+	return tool.type !== "custom";
+}
+function hasFunctionApplyPatchTool(body) {
+	return Array.isArray(body.tools) && body.tools.some(isFunctionApplyPatchTool);
+}
+function applyPatchTool(tool) {
+	const value = tool;
+	const fn = value.function;
+	const custom = {
+		type: "custom",
+		name: "apply_patch",
+		description: typeof value.description === "string" ? value.description : typeof fn === "object" && fn !== null && typeof fn.description === "string" ? fn.description : APPLY_PATCH_DESCRIPTION,
+		format: {
+			type: "grammar",
+			syntax: "lark",
+			definition: APPLY_PATCH_GRAMMAR
+		}
+	};
+	if (value.defer_loading !== void 0) custom.defer_loading = value.defer_loading;
+	return custom;
+}
+/** Replace DSH's JSON function declaration with the Responses custom grammar tool. */
+function addCodexApplyPatch(body) {
+	if (!Array.isArray(body.tools)) return body;
+	let changed = false;
+	const tools = body.tools.map((tool) => {
+		if (!isApplyPatchTool(tool) || typeof tool !== "object" || tool === null) return tool;
+		if (tool.type === "custom") return tool;
+		changed = true;
+		return applyPatchTool(tool);
+	});
+	return changed ? {
+		...body,
+		tools
+	} : body;
+}
+function applyPatchInputOfCall(item) {
+	if (item.type !== "function_call" || item.name !== "apply_patch") return void 0;
+	if (typeof item.call_id !== "string" || item.call_id.length === 0) return void 0;
+	const raw = item.arguments;
+	const argumentsObject = typeof raw === "string" ? (() => {
+		try {
+			return JSON.parse(raw);
+		} catch {
+			return;
+		}
+	})() : raw;
+	if (typeof argumentsObject !== "object" || argumentsObject === null) return void 0;
+	const input = argumentsObject.input;
+	return typeof input === "string" ? {
+		callId: item.call_id,
+		input
+	} : void 0;
+}
+function canRewriteApplyPatchHistory(body) {
+	if (!Array.isArray(body.input)) return true;
+	return body.input.every((item) => {
+		if (typeof item !== "object" || item === null) return true;
+		const value = item;
+		return value.type !== "function_call" || value.name !== "apply_patch" || applyPatchInputOfCall(value) !== void 0;
+	});
+}
+/** Replay apply_patch calls as custom tool items after pi-ai's generic conversion. */
+function rewriteCodexApplyPatchHistory(body) {
+	if (!Array.isArray(body.input) || !canRewriteApplyPatchHistory(body)) return body;
+	const applyCallIds = /* @__PURE__ */ new Set();
+	for (const item of body.input) {
+		if (typeof item !== "object" || item === null) continue;
+		const value = item;
+		if (value.type === "custom_tool_call" && value.name === "apply_patch" && typeof value.call_id === "string") applyCallIds.add(value.call_id);
+		const call = applyPatchInputOfCall(value);
+		if (call !== void 0) applyCallIds.add(call.callId);
+	}
+	if (applyCallIds.size === 0) return body;
+	let changed = false;
+	const input = body.input.map((item) => {
+		if (typeof item !== "object" || item === null) return item;
+		const value = item;
+		const call = applyPatchInputOfCall(value);
+		if (call !== void 0) {
+			const next = {
+				type: "custom_tool_call",
+				call_id: call.callId,
+				name: "apply_patch",
+				input: call.input
+			};
+			if (typeof value.id === "string") next.id = value.id;
+			changed = true;
+			return next;
+		}
+		if (value.type === "function_call_output" && typeof value.call_id === "string" && applyCallIds.has(value.call_id)) {
+			changed = true;
+			return {
+				type: "custom_tool_call_output",
+				call_id: value.call_id,
+				output: value.output
+			};
+		}
+		return item;
+	});
+	return changed ? {
+		...body,
+		input
+	} : body;
+}
+/** Compose the plugin-only Responses rewrites without changing DSH's tool API. */
+function rewriteCodexResponsesBody(body) {
+	let next = body;
+	if (hasWebSearchTool(next)) next = addHostedWebSearch(next);
+	else if (hasRemoteCompaction(next)) next = replaceRemoteCompactions(next);
+	if (hasFunctionApplyPatchTool(next) && canRewriteApplyPatchHistory(next)) {
+		next = addCodexApplyPatch(next);
+		next = rewriteCodexApplyPatchHistory(next);
+	}
+	return next;
+}
 /** Convert a generic DSH Responses tool list to the hosted Codex variant. */
 function addHostedWebSearch(body) {
 	const tools = Array.isArray(body.tools) ? body.tools.filter((tool) => !isWebSearchTool(tool)) : [];
@@ -618,12 +751,13 @@ function hasRemoteCompaction(body) {
 	});
 }
 function canPatchBody(body) {
-	return isGptModel$1(body.model) && (hasWebSearchTool(body) || hasRemoteCompaction(body));
+	return isGptModel$1(body.model) && (hasWebSearchTool(body) || hasRemoteCompaction(body) || hasFunctionApplyPatchTool(body) && canRewriteApplyPatchHistory(body));
 }
 /**
 * Install a scoped fetch shim for pi-ai's already-built Responses request.
 * The generic DSH adapter remains the owner of auth, streaming, replay, and
-* attachments; this shim changes only the hosted-tool portion of the wire body.
+* attachments; this shim changes only Codex's Responses tool and compaction
+* representation at the wire boundary.
 */
 function installGlobalHostedWebSearchPatch() {
 	const original = globalThis.fetch;
@@ -642,7 +776,7 @@ function installGlobalHostedWebSearchPatch() {
 		const headers = new Headers(request.headers);
 		headers.delete("content-length");
 		const hostedRequest = new Request(request, {
-			body: JSON.stringify(hasWebSearchTool(body) ? addHostedWebSearch(body) : replaceRemoteCompactions(body)),
+			body: JSON.stringify(rewriteCodexResponsesBody(body)),
 			headers
 		});
 		try {
@@ -1063,7 +1197,6 @@ function buildCodexSystemPrompt(config = {}) {
 }
 const EXEC_COMMAND_DESCRIPTION = "Runs a command in a PTY, returning output, a session ID for ongoing interaction, or a background job ID when requested.";
 const WRITE_STDIN_DESCRIPTION = "Writes characters to an existing unified exec session and returns recent output.";
-const APPLY_PATCH_DESCRIPTION = "Edits files using Codex patch syntax with Begin/End Patch markers and file update directives. In hunk lines, the first character is the operation marker; repeat a source-leading marker when the source line itself starts with one.";
 const UPDATE_PLAN_DESCRIPTION = "Updates the task plan.\nProvide an optional explanation and a list of plan items, each with a step and status.\nAt most one step can be in_progress at a time.";
 const PLAN_STATUSES = [
 	"pending",
@@ -1445,13 +1578,13 @@ function apply(ctx, config = {}) {
 	ctx.on("agent/request", async (_payload, next) => {
 		return applyCodexRequestSettings(await next(), codexSettings.current());
 	});
-	if ((resolved.hostedWebSearch || resolved.remoteCompact) && typeof ctx.effect === "function") {
+	if (typeof ctx.effect === "function") {
 		const disposeHostedWebSearch = installHostedWebSearch();
 		ctx.effect(() => disposeHostedWebSearch, "codex: Responses transport wrapper");
 	}
-	if (resolved.hostedWebSearch || resolved.remoteCompact) ctx.on("llm/stream", ((options, next) => {
+	ctx.on("llm/stream", ((options, next) => {
 		if (resolved.remoteCompact && options.purpose === "compaction" && isGptModel(options.model)) return remoteCompactStream(ctx, options, next);
-		if ((resolved.hostedWebSearch || resolved.remoteCompact) && options.purpose === void 0 && isGptModel(options.model)) return hostedWebSearchStream(next);
+		if (options.purpose === void 0 && isGptModel(options.model)) return hostedWebSearchStream(next);
 		return next();
 	}));
 	ctx.on("system-prompt/assemble", async (_assembly, _context, next) => normalizeCodexPromptAssembly(await next()));

package/lib/installer.js

@@ -4,9 +4,9 @@ import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 //#region lib/types/installer.js
 /** Install the user-visible Codex agent preset supplied by this bundle. */
-const PRESET_ID = "codex";
 const PRESET_FILES = ["agent.cordis.yml", "preset.yml"];
 const SOURCE_PRESET_DIR = fileURLToPath(new URL("../presets/codex/", import.meta.url));
+const SOURCE_COLLABORATION_PRESET_DIR = fileURLToPath(new URL("../presets/codex-collaboration/", import.meta.url));
 function dshHomePath(...segments) {
 	const configured = process.env.DSH_HOME?.trim();
 	const expanded = configured === void 0 || configured.length === 0 ? join(homedir(), ".dsh") : configured === "~" ? homedir() : configured.startsWith("~/") || configured.startsWith("~\\") ? join(homedir(), configured.slice(2)) : configured;
@@ -14,21 +14,11 @@ function dshHomePath(...segments) {
 }
 /** Bundle plugin name for the preset installer. */
 const name = "codex-preset-installer";
-/**
-* Install the shipped Codex preset only when the user has not authored one.
-*
-* The directory is committed with a staging rename so a failed copy cannot
-* leave a half-written preset that hides the mode from the roster. Existing
-* directories are intentionally preserved, including user customizations.
-*
-* @param targetDir - destination preset directory.
-* @param sourceDir - directory containing the packaged preset files.
-*/
-function installCodexPreset(targetDir = dshHomePath(".agent-presets", PRESET_ID), sourceDir = SOURCE_PRESET_DIR) {
+function installPreset(targetDir, sourceDir, presetId) {
 	if (existsSync(targetDir)) return;
 	const parentDir = dirname(targetDir);
 	mkdirSync(parentDir, { recursive: true });
-	const stagingDir = mkdtempSync(join(parentDir, `.${PRESET_ID}-`));
+	const stagingDir = mkdtempSync(join(parentDir, `.${presetId}-`));
 	try {
 		for (const file of PRESET_FILES) copyFileSync(join(sourceDir, file), join(stagingDir, file));
 		try {
@@ -43,12 +33,30 @@ function installCodexPreset(targetDir = dshHomePath(".agent-presets", PRESET_ID)
 		});
 	}
 }
+/**
+* Install the shipped Codex preset only when the user has not authored one.
+*
+* The directory is committed with a staging rename so a failed copy cannot
+* leave a half-written preset that hides the mode from the roster. Existing
+* directories are intentionally preserved, including user customizations.
+*
+* @param targetDir - destination preset directory.
+* @param sourceDir - directory containing the packaged preset files.
+*/
+function installCodexPreset(targetDir = dshHomePath(".agent-presets", "codex"), sourceDir = SOURCE_PRESET_DIR) {
+	installPreset(targetDir, sourceDir, "codex");
+}
+/** Install the shipped Codex preset with the optional collaboration guidance enabled. */
+function installCodexCollaborationPreset(targetDir = dshHomePath(".agent-presets", "codex-collaboration"), sourceDir = SOURCE_COLLABORATION_PRESET_DIR) {
+	installPreset(targetDir, sourceDir, "codex-collaboration");
+}
 /** Install the preset during profile boot without changing the host tool catalog. */
 function apply(ctx) {
 	try {
 		installCodexPreset();
+		installCodexCollaborationPreset();
 	} catch (error) {
-		ctx.logger.warn(`dsh-codex: could not install the Codex preset: ${String(error)}`);
+		ctx.logger.warn(`dsh-codex: could not install the Codex presets: ${String(error)}`);
 	}
 }
 var installer_default = {
@@ -56,4 +64,4 @@ var installer_default = {
 	apply
 };
 //#endregion
-export { apply, installer_default as default, installCodexPreset, name };
+export { apply, installer_default as default, installCodexCollaborationPreset, installCodexPreset, name };

package/lib/types/client/index.d.ts

@@ -32,7 +32,8 @@ declare module '@deepseek-ai/dsh-client-ui-slots' {
         };
     }
 }
-type ActivityProps = PropsRuntime<'conversation.composer.dock'> & PropsLocale<'codex'>;
+type ActivityDockProps = PropsRuntime<'conversation.composer.dock'> & PropsLocale<'codex'>;
+type ActivityProps = ActivityDockProps;
 export declare function ActivityLine({ sessionId, useSession, useSessions, useProjection, t }: ActivityProps): import("react").JSX.Element | null;
 export declare const inject: string[];
 /** Select a preferred slot when the host declares it, otherwise use a stable legacy composer seat. */

package/lib/types/client/index.js

@@ -1,12 +1,16 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /** Browser controls for the Codex request settings mounted by the Host plugin. */
 import { useEffect, useState } from 'react';
-import { CODEX_CONTEXT_MAX, CODEX_CONTEXT_UNIT, CODEX_PRESET_ID } from "../context.js";
+import { CODEX_CONTEXT_MAX, CODEX_CONTEXT_UNIT, isCodexPresetId } from "../context.js";
 import { awaitingModelStartedAt } from "./activity.js";
 const NS = 'codex';
 const SETTINGS_NAMESPACE = 'codex';
 const MODEL_SETTINGS_SLOT = 'conversation.input.model.settings';
 const CONTEXT_SETTINGS_SLOT = 'conversation.input.context.settings';
+// Prefer a dedicated status seat when a newer host declares it; the current
+// conversation contract falls back to the ambient composer dock below.
+const ACTIVITY_SLOT = 'conversation.chat.status';
+const ACTIVITY_FALLBACK_SLOT = 'conversation.composer.dock';
 const FAST_FALLBACK_SLOT = 'conversation.input.right';
 const CONTEXT_FALLBACK_SLOT = 'conversation.input.dock';
 const DEFAULT_CONTEXT_WINDOW = 262_144;
@@ -38,7 +42,7 @@ function FastModeButton({ sessionId, useSessions, useSettings, setSetting, t })
     const agentPreset = useSessions(state => state.byId[sessionId]?.agentPreset);
     const snapshot = useSettings(state => state);
     const fast = snapshot.value?.fast ?? false;
-    if (agentPreset !== CODEX_PRESET_ID)
+    if (!isCodexPresetId(agentPreset))
         return null;
     return (_jsxs("button", { type: "button", role: "menuitemcheckbox", disabled: snapshot.writable === false, "aria-pressed": fast, "aria-label": fast ? t('fastOn') : t('fastOff'), title: fast ? t('fastOn') : t('fastOff'), onClick: () => { void setSetting('fast', !fast); }, style: {
             boxSizing: 'border-box',
@@ -66,7 +70,7 @@ function FastModeFallback(props) {
     const agentPreset = useSessions(state => state.byId[sessionId]?.agentPreset);
     const snapshot = useSettings(state => state);
     const fast = snapshot.value?.fast ?? false;
-    if (agentPreset !== CODEX_PRESET_ID)
+    if (!isCodexPresetId(agentPreset))
         return null;
     return (_jsxs("button", { type: "button", role: "switch", disabled: snapshot.writable === false, "aria-checked": fast, "aria-label": fast ? t('fastOn') : t('fastOff'), title: fast ? t('fastOn') : t('fastOff'), onClick: () => { void setSetting('fast', !fast); }, style: {
             boxSizing: 'border-box',
@@ -145,31 +149,31 @@ export function ActivityLine({ sessionId, useSession, useSessions, useProjection
     const fallbackStartedAt = useSession((snapshot) => awaitingModelStartedAt(snapshot));
     // `undefined` means the key has not arrived yet; `null` is an authoritative
     // clear and must not be resurrected by the local snapshot fallback.
-    const activity = projectedActivity !== undefined ? projectedActivity : (agentPreset === CODEX_PRESET_ID && fallbackStartedAt !== undefined
+    const activity = projectedActivity !== undefined ? projectedActivity : (isCodexPresetId(agentPreset) && fallbackStartedAt !== undefined
         ? { activity: 'awaiting-model', startedAt: fallbackStartedAt }
         : null);
     const [now, setNow] = useState(() => Date.now());
     useEffect(() => {
-        if (agentPreset !== CODEX_PRESET_ID || activity === undefined || activity === null)
+        if (!isCodexPresetId(agentPreset) || activity === undefined || activity === null)
             return undefined;
         setNow(Date.now());
         const timer = setInterval(() => { setNow(Date.now()); }, 1_000);
         return () => clearInterval(timer);
     }, [agentPreset, activity?.startedAt]);
-    if (agentPreset !== CODEX_PRESET_ID || activity === undefined || activity === null)
+    if (!isCodexPresetId(agentPreset) || activity === undefined || activity === null)
         return null;
     const label = activity.activity === 'awaiting-model'
         ? t('activityAwaitingModel')
         : t('activityCompacting');
-    return (_jsxs("div", { id: "codex-activity", role: "status", "aria-live": "polite", style: {
-            display: 'flex',
+    return (_jsxs("span", { id: "codex-activity", role: "status", "aria-live": "polite", style: {
+            display: 'inline-flex',
             alignItems: 'center',
             gap: 7,
-            minHeight: 28,
-            padding: '4px 10px',
+            minHeight: 26,
             color: 'var(--dsw-alias-label-secondary)',
             fontSize: 12,
             lineHeight: '20px',
+            whiteSpace: 'nowrap',
         }, children: [_jsx("span", { "aria-hidden": "true", style: {
                     width: 7,
                     height: 7,
@@ -178,6 +182,10 @@ export function ActivityLine({ sessionId, useSession, useSessions, useProjection
                     background: 'var(--dsw-static-blue-500)',
                 } }), _jsx("span", { children: label }), _jsxs("span", { style: { color: 'var(--dsw-alias-label-tertiary)' }, children: ["\u00B7 ", elapsedSeconds(activity.startedAt, now), "s"] })] }));
 }
+/** Preserve the old composer-dock footprint for hosts without the chat status seat. */
+function ActivityDock(props) {
+    return (_jsx("div", { style: { display: 'flex', alignItems: 'center', minHeight: 28, padding: '4px 10px' }, children: _jsx(ActivityLine, { ...props }) }));
+}
 export const inject = ['slots', 'locale', 'settingsScope'];
 /** Select a preferred slot when the host declares it, otherwise use a stable legacy composer seat. */
 export function chooseDeclaredSlot(preferred, fallback, isDeclared) {
@@ -187,6 +195,16 @@ function slotIsDeclared(ctx, slot) {
     const registry = ctx.slots;
     return typeof registry.spec === 'function' && registry.spec.call(ctx.slots, slot) !== undefined;
 }
+/** Register an optional host slot without claiming it in older SlotMap declarations. */
+function injectOptionalActivitySlot(ctx, slot) {
+    const registry = ctx.slots;
+    registry.inject(slot, () => registry.register({
+        name: slot,
+        id: 'codex-activity',
+        order: 5,
+        locale: NS,
+    }, ActivityLine));
+}
 /** Mount Codex controls in the newest named seats, with legacy composer fallbacks. */
 export function apply(ctx) {
     ctx.effect(() => ctx.locale.register(NS, { en, zh }), 'codex client: dictionaries');
@@ -234,12 +252,18 @@ export function apply(ctx) {
             inject: injected,
         }, LegacyContextSizeControl));
     }
-    ctx.slots.inject('conversation.composer.dock', () => ctx.slots.register({
-        name: 'conversation.composer.dock',
-        id: 'codex-activity',
-        order: 5,
-        locale: NS,
-    }, ActivityLine));
+    const activitySlot = chooseDeclaredSlot(ACTIVITY_SLOT, ACTIVITY_FALLBACK_SLOT, slot => slotIsDeclared(ctx, slot));
+    if (activitySlot === ACTIVITY_SLOT) {
+        injectOptionalActivitySlot(ctx, ACTIVITY_SLOT);
+    }
+    else {
+        ctx.slots.inject(ACTIVITY_FALLBACK_SLOT, () => ctx.slots.register({
+            name: ACTIVITY_FALLBACK_SLOT,
+            id: 'codex-activity',
+            order: 5,
+            locale: NS,
+        }, ActivityDock));
+    }
 }
 export default { inject, apply };
 //# sourceMappingURL=index.js.map

package/lib/types/context.d.ts

@@ -2,4 +2,7 @@
 export declare const CODEX_CONTEXT_UNIT = 1000;
 export declare const CODEX_CONTEXT_MAX = 1000000;
 export declare const CODEX_PRESET_ID = "codex";
+export declare const CODEX_COLLABORATION_PRESET_ID = "codex-collaboration";
+/** Both shipped presets use the same Codex request controls in Web. */
+export declare function isCodexPresetId(value: string | undefined): boolean;
 //# sourceMappingURL=context.d.ts.map

package/lib/types/context.js

@@ -2,4 +2,13 @@
 export const CODEX_CONTEXT_UNIT = 1_000;
 export const CODEX_CONTEXT_MAX = 1_000_000;
 export const CODEX_PRESET_ID = 'codex';
+export const CODEX_COLLABORATION_PRESET_ID = 'codex-collaboration';
+const CODEX_PRESET_IDS = new Set([
+    CODEX_PRESET_ID,
+    CODEX_COLLABORATION_PRESET_ID,
+]);
+/** Both shipped presets use the same Codex request controls in Web. */
+export function isCodexPresetId(value) {
+    return value !== undefined && CODEX_PRESET_IDS.has(value);
+}
 //# sourceMappingURL=context.js.map

package/lib/types/index.js

@@ -3,7 +3,7 @@ import z from '@deepseek-ai/schemastery';
 import { installSettingsSection, settingsNamespace } from '@deepseek-ai/dsh-settings';
 import { defineTool } from '@deepseek-ai/dsh-tools';
 import { CODEX_CONTEXT_MAX } from "./context.js";
-import { applyPatchHunks, parsePatch } from "./patch.js";
+import { APPLY_PATCH_DESCRIPTION, applyPatchHunks, parsePatch } from "./patch.js";
 import { renderExecResult, runExecCommand, runWriteStdin } from "./exec.js";
 import { hostedWebSearchStream, installHostedWebSearch, remoteCompactStream } from "./remote.js";
 import { registerCodexActivityProjection } from "./activity.js";
@@ -196,7 +196,6 @@ export function buildCodexSystemPrompt(config = {}) {
 }
 const EXEC_COMMAND_DESCRIPTION = 'Runs a command in a PTY, returning output, a session ID for ongoing interaction, or a background job ID when requested.';
 const WRITE_STDIN_DESCRIPTION = 'Writes characters to an existing unified exec session and returns recent output.';
-const APPLY_PATCH_DESCRIPTION = 'Edits files using Codex patch syntax with Begin/End Patch markers and file update directives. In hunk lines, the first character is the operation marker; repeat a source-leading marker when the source line itself starts with one.';
 const UPDATE_PLAN_DESCRIPTION = 'Updates the task plan.\nProvide an optional explanation and a list of plan items, each with a step and status.\nAt most one step can be in_progress at a time.';
 const PLAN_STATUSES = ['pending', 'in_progress', 'completed'];
 function sessionCwd(exec) {
@@ -473,23 +472,22 @@ export function apply(ctx, config = {}) {
         const request = await next();
         return applyCodexRequestSettings(request, codexSettings.current());
     });
-    if ((resolved.hostedWebSearch || resolved.remoteCompact) && typeof ctx.effect === 'function') {
+    if (typeof ctx.effect === 'function') {
         const disposeHostedWebSearch = installHostedWebSearch();
         ctx.effect(() => disposeHostedWebSearch, 'codex: Responses transport wrapper');
     }
-    if (resolved.hostedWebSearch || resolved.remoteCompact) {
-        ctx.on('llm/stream', ((options, next) => {
-            if (resolved.remoteCompact && options.purpose === 'compaction' && isGptModel(options.model)) {
-                return remoteCompactStream(ctx, options, next);
-            }
-            if ((resolved.hostedWebSearch || resolved.remoteCompact)
-                && options.purpose === undefined
-                && isGptModel(options.model)) {
-                return hostedWebSearchStream(next);
-            }
-            return next();
-        }));
-    }
+    ctx.on('llm/stream', ((options, next) => {
+        if (resolved.remoteCompact && options.purpose === 'compaction' && isGptModel(options.model)) {
+            return remoteCompactStream(ctx, options, next);
+        }
+        // Keep all ordinary GPT Responses calls inside the plugin-owned transport
+        // scope so apply_patch can use the same wire bridge even when hosted search
+        // and remote compaction are disabled.
+        if (options.purpose === undefined && isGptModel(options.model)) {
+            return hostedWebSearchStream(next);
+        }
+        return next();
+    }));
     ctx.on('system-prompt/assemble', async (_assembly, _context, next) => normalizeCodexPromptAssembly(await next()));
     ctx.systemPrompt.section({ name: 'codex:base', order: 10, text: buildCodexSystemPrompt(resolved) });
     registerExecTools(ctx, resolved);

package/lib/types/installer.d.ts

@@ -13,6 +13,8 @@ export declare const name = "codex-preset-installer";
  * @param sourceDir - directory containing the packaged preset files.
  */
 export declare function installCodexPreset(targetDir?: string, sourceDir?: string): void;
+/** Install the shipped Codex preset with the optional collaboration guidance enabled. */
+export declare function installCodexCollaborationPreset(targetDir?: string, sourceDir?: string): void;
 /** Install the preset during profile boot without changing the host tool catalog. */
 export declare function apply(ctx: Context): void;
 declare const _default: {

package/lib/types/installer.js

@@ -3,9 +3,9 @@ import { copyFileSync, existsSync, mkdirSync, mkdtempSync, renameSync, rmSync }
 import { homedir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
-const PRESET_ID = 'codex';
 const PRESET_FILES = ['agent.cordis.yml', 'preset.yml'];
 const SOURCE_PRESET_DIR = fileURLToPath(new URL('../presets/codex/', import.meta.url));
+const SOURCE_COLLABORATION_PRESET_DIR = fileURLToPath(new URL('../presets/codex-collaboration/', import.meta.url));
 function dshHomePath(...segments) {
     const configured = process.env.DSH_HOME?.trim();
     const expanded = configured === undefined || configured.length === 0
@@ -19,22 +19,12 @@ function dshHomePath(...segments) {
 }
 /** Bundle plugin name for the preset installer. */
 export const name = 'codex-preset-installer';
-/**
- * Install the shipped Codex preset only when the user has not authored one.
- *
- * The directory is committed with a staging rename so a failed copy cannot
- * leave a half-written preset that hides the mode from the roster. Existing
- * directories are intentionally preserved, including user customizations.
- *
- * @param targetDir - destination preset directory.
- * @param sourceDir - directory containing the packaged preset files.
- */
-export function installCodexPreset(targetDir = dshHomePath('.agent-presets', PRESET_ID), sourceDir = SOURCE_PRESET_DIR) {
+function installPreset(targetDir, sourceDir, presetId) {
     if (existsSync(targetDir))
         return;
     const parentDir = dirname(targetDir);
     mkdirSync(parentDir, { recursive: true });
-    const stagingDir = mkdtempSync(join(parentDir, `.${PRESET_ID}-`));
+    const stagingDir = mkdtempSync(join(parentDir, `.${presetId}-`));
     try {
         for (const file of PRESET_FILES)
             copyFileSync(join(sourceDir, file), join(stagingDir, file));
@@ -51,13 +41,31 @@ export function installCodexPreset(targetDir = dshHomePath('.agent-presets', PRE
             rmSync(stagingDir, { recursive: true, force: true });
     }
 }
+/**
+ * Install the shipped Codex preset only when the user has not authored one.
+ *
+ * The directory is committed with a staging rename so a failed copy cannot
+ * leave a half-written preset that hides the mode from the roster. Existing
+ * directories are intentionally preserved, including user customizations.
+ *
+ * @param targetDir - destination preset directory.
+ * @param sourceDir - directory containing the packaged preset files.
+ */
+export function installCodexPreset(targetDir = dshHomePath('.agent-presets', 'codex'), sourceDir = SOURCE_PRESET_DIR) {
+    installPreset(targetDir, sourceDir, 'codex');
+}
+/** Install the shipped Codex preset with the optional collaboration guidance enabled. */
+export function installCodexCollaborationPreset(targetDir = dshHomePath('.agent-presets', 'codex-collaboration'), sourceDir = SOURCE_COLLABORATION_PRESET_DIR) {
+    installPreset(targetDir, sourceDir, 'codex-collaboration');
+}
 /** Install the preset during profile boot without changing the host tool catalog. */
 export function apply(ctx) {
     try {
         installCodexPreset();
+        installCodexCollaborationPreset();
     }
     catch (error) {
-        ctx.logger.warn(`dsh-codex: could not install the Codex preset: ${String(error)}`);
+        ctx.logger.warn(`dsh-codex: could not install the Codex presets: ${String(error)}`);
     }
 }
 export default { name, apply };

package/lib/types/patch.d.ts

@@ -1,4 +1,5 @@
 /** Parser and line-oriented applicator for Codex's `apply_patch` language. */
+export declare const APPLY_PATCH_DESCRIPTION = "Edits files using Codex patch syntax with Begin/End Patch markers and file update directives. In hunk lines, the first character is the operation marker; repeat a source-leading marker when the source line itself starts with one.";
 /** The grammar sent to providers that support OpenAI custom grammar tools. */
 export declare const APPLY_PATCH_GRAMMAR: string;
 export type PatchLine = {

package/lib/types/patch.js

@@ -1,4 +1,5 @@
 /** Parser and line-oriented applicator for Codex's `apply_patch` language. */
+export const APPLY_PATCH_DESCRIPTION = 'Edits files using Codex patch syntax with Begin/End Patch markers and file update directives. In hunk lines, the first character is the operation marker; repeat a source-leading marker when the source line itself starts with one.';
 /** The grammar sent to providers that support OpenAI custom grammar tools. */
 export const APPLY_PATCH_GRAMMAR = String.raw `start: begin_patch environment_id? hunk+ end_patch
 begin_patch: "*** Begin Patch" LF

package/lib/types/remote.d.ts

@@ -7,6 +7,12 @@ export interface RemoteCodexConfig {
 interface JsonObject {
     [key: string]: unknown;
 }
+/** Replace DSH's JSON function declaration with the Responses custom grammar tool. */
+export declare function addCodexApplyPatch(body: JsonObject): JsonObject;
+/** Replay apply_patch calls as custom tool items after pi-ai's generic conversion. */
+export declare function rewriteCodexApplyPatchHistory(body: JsonObject): JsonObject;
+/** Compose the plugin-only Responses rewrites without changing DSH's tool API. */
+export declare function rewriteCodexResponsesBody(body: JsonObject): JsonObject;
 /** Convert a generic DSH Responses tool list to the hosted Codex variant. */
 export declare function addHostedWebSearch(body: JsonObject): JsonObject;
 /** Replace the text placeholder written by dsh-compaction-basic with the native item. */

package/lib/types/remote.js

@@ -1,5 +1,6 @@
 import { credentialRef } from '@deepseek-ai/dsh-credentials';
 import { AsyncLocalStorage } from 'node:async_hooks';
+import { APPLY_PATCH_DESCRIPTION, APPLY_PATCH_GRAMMAR } from "./patch.js";
 const SETTINGS_NAMESPACE = 'llm-pi-ai';
 const REMOTE_COMPACTION_OPEN = '<codex-remote-compaction>';
 const REMOTE_COMPACTION_CLOSE = '</codex-remote-compaction>';
@@ -59,6 +60,162 @@ function isWebSearchTool(tool) {
 function hasWebSearchTool(body) {
     return Array.isArray(body.tools) && body.tools.some(isWebSearchTool);
 }
+function toolName(tool) {
+    if (typeof tool !== 'object' || tool === null)
+        return undefined;
+    const value = tool;
+    if (typeof value.name === 'string')
+        return value.name;
+    const fn = value.function;
+    return typeof fn === 'object' && fn !== null && typeof fn.name === 'string'
+        ? fn.name
+        : undefined;
+}
+function isApplyPatchTool(tool) {
+    return toolName(tool) === 'apply_patch';
+}
+function isFunctionApplyPatchTool(tool) {
+    if (!isApplyPatchTool(tool) || typeof tool !== 'object' || tool === null)
+        return false;
+    return tool.type !== 'custom';
+}
+function hasFunctionApplyPatchTool(body) {
+    return Array.isArray(body.tools) && body.tools.some(isFunctionApplyPatchTool);
+}
+function applyPatchTool(tool) {
+    const value = tool;
+    const fn = value.function;
+    const description = typeof value.description === 'string'
+        ? value.description
+        : typeof fn === 'object' && fn !== null && typeof fn.description === 'string'
+            ? fn.description
+            : APPLY_PATCH_DESCRIPTION;
+    const custom = {
+        type: 'custom',
+        name: 'apply_patch',
+        description,
+        format: {
+            type: 'grammar',
+            syntax: 'lark',
+            definition: APPLY_PATCH_GRAMMAR,
+        },
+    };
+    if (value.defer_loading !== undefined)
+        custom.defer_loading = value.defer_loading;
+    return custom;
+}
+/** Replace DSH's JSON function declaration with the Responses custom grammar tool. */
+export function addCodexApplyPatch(body) {
+    if (!Array.isArray(body.tools))
+        return body;
+    let changed = false;
+    const tools = body.tools.map(tool => {
+        if (!isApplyPatchTool(tool) || typeof tool !== 'object' || tool === null)
+            return tool;
+        if (tool.type === 'custom')
+            return tool;
+        changed = true;
+        return applyPatchTool(tool);
+    });
+    return changed ? { ...body, tools } : body;
+}
+function applyPatchInputOfCall(item) {
+    if (item.type !== 'function_call' || item.name !== 'apply_patch')
+        return undefined;
+    if (typeof item.call_id !== 'string' || item.call_id.length === 0)
+        return undefined;
+    const raw = item.arguments;
+    const argumentsObject = typeof raw === 'string'
+        ? (() => {
+            try {
+                return JSON.parse(raw);
+            }
+            catch {
+                return undefined;
+            }
+        })()
+        : raw;
+    if (typeof argumentsObject !== 'object' || argumentsObject === null)
+        return undefined;
+    const input = argumentsObject.input;
+    return typeof input === 'string' ? { callId: item.call_id, input } : undefined;
+}
+function canRewriteApplyPatchHistory(body) {
+    if (!Array.isArray(body.input))
+        return true;
+    return body.input.every(item => {
+        if (typeof item !== 'object' || item === null)
+            return true;
+        const value = item;
+        return value.type !== 'function_call' || value.name !== 'apply_patch'
+            || applyPatchInputOfCall(value) !== undefined;
+    });
+}
+/** Replay apply_patch calls as custom tool items after pi-ai's generic conversion. */
+export function rewriteCodexApplyPatchHistory(body) {
+    if (!Array.isArray(body.input) || !canRewriteApplyPatchHistory(body))
+        return body;
+    const applyCallIds = new Set();
+    for (const item of body.input) {
+        if (typeof item !== 'object' || item === null)
+            continue;
+        const value = item;
+        if (value.type === 'custom_tool_call' && value.name === 'apply_patch' && typeof value.call_id === 'string') {
+            applyCallIds.add(value.call_id);
+        }
+        const call = applyPatchInputOfCall(value);
+        if (call !== undefined)
+            applyCallIds.add(call.callId);
+    }
+    if (applyCallIds.size === 0)
+        return body;
+    let changed = false;
+    const input = body.input.map(item => {
+        if (typeof item !== 'object' || item === null)
+            return item;
+        const value = item;
+        const call = applyPatchInputOfCall(value);
+        if (call !== undefined) {
+            const next = {
+                type: 'custom_tool_call',
+                call_id: call.callId,
+                name: 'apply_patch',
+                input: call.input,
+            };
+            if (typeof value.id === 'string')
+                next.id = value.id;
+            changed = true;
+            return next;
+        }
+        if (value.type === 'function_call_output'
+            && typeof value.call_id === 'string'
+            && applyCallIds.has(value.call_id)) {
+            changed = true;
+            return {
+                type: 'custom_tool_call_output',
+                call_id: value.call_id,
+                output: value.output,
+            };
+        }
+        return item;
+    });
+    return changed ? { ...body, input } : body;
+}
+/** Compose the plugin-only Responses rewrites without changing DSH's tool API. */
+export function rewriteCodexResponsesBody(body) {
+    let next = body;
+    if (hasWebSearchTool(next)) {
+        next = addHostedWebSearch(next);
+    }
+    else if (hasRemoteCompaction(next)) {
+        next = replaceRemoteCompactions(next);
+    }
+    if (hasFunctionApplyPatchTool(next) && canRewriteApplyPatchHistory(next)) {
+        next = addCodexApplyPatch(next);
+        next = rewriteCodexApplyPatchHistory(next);
+    }
+    return next;
+}
 /** Convert a generic DSH Responses tool list to the hosted Codex variant. */
 export function addHostedWebSearch(body) {
     const tools = Array.isArray(body.tools) ? body.tools.filter(tool => !isWebSearchTool(tool)) : [];
@@ -107,12 +264,15 @@ function hasRemoteCompaction(body) {
 }
 function canPatchBody(body) {
     return isGptModel(body.model)
-        && (hasWebSearchTool(body) || hasRemoteCompaction(body));
+        && (hasWebSearchTool(body)
+            || hasRemoteCompaction(body)
+            || (hasFunctionApplyPatchTool(body) && canRewriteApplyPatchHistory(body)));
 }
 /**
  * Install a scoped fetch shim for pi-ai's already-built Responses request.
  * The generic DSH adapter remains the owner of auth, streaming, replay, and
- * attachments; this shim changes only the hosted-tool portion of the wire body.
+ * attachments; this shim changes only Codex's Responses tool and compaction
+ * representation at the wire boundary.
  */
 function installGlobalHostedWebSearchPatch() {
     const original = globalThis.fetch;
@@ -135,7 +295,7 @@ function installGlobalHostedWebSearchPatch() {
         const headers = new Headers(request.headers);
         headers.delete('content-length');
         const hostedRequest = new Request(request, {
-            body: JSON.stringify(hasWebSearchTool(body) ? addHostedWebSearch(body) : replaceRemoteCompactions(body)),
+            body: JSON.stringify(rewriteCodexResponsesBody(body)),
             headers,
         });
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuind/dsh-codex-harness",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "description": "A Codex harness with a streamlined system prompt for GPT models that do not fit DSH's native interface, while remaining compatible with the DSH plugin ecosystem.",
   "type": "module",
   "main": "lib/index.js",
@@ -35,6 +35,7 @@
     "lib/client.js",
     "cordis.patch.yml",
     "presets/codex",
+    "presets/codex-collaboration",
     "README.md",
     "README.zh.md",
     "LICENSE"

package/presets/codex-collaboration/agent.cordis.yml

@@ -0,0 +1,91 @@
+# The Codex collaboration preset. It shares the standard Codex composition
+# while enabling the optional collaboration guidance in the prompt layer.
+
+- id: persona
+  name: '@deepseek-ai/dsh-persona'
+  config:
+    # Keep identity, model, cwd, and runtime context in one persona section.
+    text: >-
+      You are Codex, a coding agent based on the {{model}} model. Your working directory is {{cwd}}.
+    includeRuntimeContext: true
+
+- id: agent-instructions
+  name: '@deepseek-ai/dsh-agent-instructions'
+  config:
+    maxBytes: 65536
+
+# The collaboration variant only changes this flag; execution remains
+# delegated to the same dsh Codex tool layer.
+- id: codex-tools
+  name: '@shuind/dsh-codex-harness'
+  config:
+    collaborationPrompt: true
+
+# Background jobs use the host-plane registry. A busy agent receives a
+# completion in its next step; an idle agent keeps it pending until the next
+# user/tool wake, so finishing work never opens an unsolicited model turn.
+- id: codex-jobs
+  name: '@deepseek-ai/dsh-tool-jobs'
+  config:
+    completionDelivery: quiet
+
+# The generic DSH pi-ai adapter still owns the user's configured provider,
+# endpoint, API key, and model. Codex's remote-first transport wrapper is
+# installed only in this Codex scope and falls back to the generic DSH path.
+
+# Keep the local tool mounted as the fallback. Codex rewrites the final GPT
+# Responses request to a hosted web_search tool first; a failed remote request
+# is retried through this unchanged local function-tool path.
+- id: codex-web-search
+  name: '@deepseek-ai/dsh-tool-web'
+  config:
+    search: true
+    fetch: false
+
+# PTY execution is optional. Pipe-backed exec_command remains available on all
+# platforms through the shell capability consumed by the Codex tool layer.
+- id: codex-terminal
+  name: cordis:group
+  group: true
+  isolate:
+    terminals: true
+  config:
+    - id: terminals
+      name: '@deepseek-ai/dsh-terminal'
+
+    - id: terminal-bash
+      name: '@deepseek-ai/dsh-terminal-bash'
+      disabled: !!js process.platform === 'win32'
+      config:
+        timeoutMs: 300000
+
+# Context compaction is agent-scoped in Web. The token meter stays on the host
+# plane, while this group owns the backend, `/compact`, and optional tool-result
+# pruning for Codex sessions.
+- id: compaction
+  name: cordis:group
+  group: true
+  isolate:
+    compaction: true
+    toolResultPruner: true
+  config:
+    - id: compaction-basic
+      name: '@deepseek-ai/dsh-compaction-basic'
+
+    - id: command-compact
+      name: '@deepseek-ai/dsh-command-compact'
+
+    - id: tool-result-pruner
+      name: '@deepseek-ai/dsh-compaction-tool-result-pruner'
+      config:
+        thresholdChars: 8192
+        headChars: 4096
+        tailChars: 1024
+
+# Skills are the dsh extensibility seam and do not change the four Codex core
+# tool names.
+- id: skill-filesystem
+  name: '@deepseek-ai/dsh-skill-filesystem'
+
+- id: tool-skill
+  name: '@deepseek-ai/dsh-tool-skill'

package/presets/codex-collaboration/preset.yml

@@ -0,0 +1,3 @@
+name: Codex 协作模式
+description: 使用精简版 Codex 提示词，并加入协作提示词、统一执行工具、后台任务控制和 dsh Skills。
+order: 6