@shuind/dsh-codex-harness 0.1.19 → 0.1.21

package/README.md

@@ -1,13 +1,14 @@
 # @shuind/dsh-codex-harness
 
-在 DSH 中提供 Codex preset：引入 Codex 风格的系统提示词与工具契约，支持图片输入、可选思考强度、Fast 优先级请求、OpenAI Responses 网页搜索与远程压缩，以及在 Web 设置上下文容量；旨在给来源于Codex的token提供适配harness，并兼容享受DSH生态。
+在 DSH 中提供 Codex preset：使用精简版 Codex 系统提示词与工具契约，支持图片输入、可选思考强度、Fast 优先级请求、OpenAI Responses 网页搜索与远程压缩，以及在 Web 设置上下文容量；旨在给来源于 Codex 的 token 提供适配 harness，并兼容 DSH 生态。
 
 ## 功能
 
-- **Codex coding-agent 提示词**：提供 Codex 风格的系统提示词、工具契约和编码工作流。
-- **Codex 工具**：`exec_command`、`write_stdin`、`apply_patch`、`update_plan`。
+- **精简 Codex coding-agent 提示词**：使用精简版系统提示词；身份、模型和工作目录由 `dsh-persona` 提供，避免重复的 Harness 身份说明，同时保留必要的工具契约和编码工作流。
+- **Codex 工具**：`exec_command`、`write_stdin`、`apply_patch`、`update_plan`；`apply_patch` 匹配失败时会显示文件、hunk、行号、可见空白和附近文件内容，便于修正上下文。
 - **GPT 能力补全**：为 GPT 系列模型补充图片输入和思考强度选项；不会覆盖用户已有的显式配置。
 - **Fast**：仅在 Codex preset 的模型选择菜单中显示，开启后向 Responses 请求发送 `service_tier: "priority"`。
+- **旧版 Web 兼容**：在未提供新版模型设置/上下文设置 slot 的 DSH Web 中，Fast 和上下文容量会自动回退到旧版 composer slot；client 注入不依赖纯类型 slot 包。
 - **远程搜索与压缩**：OpenAI Responses 请求默认优先使用 hosted `web_search` 和 `/responses/compact`；失败时回退到 DSH 的本地实现。
 - **上下文容量**：在 Web 中设置 `1K`–`1000K` tokens，设置值作用于下一次请求。
 - **活动状态**：Codex 等待模型响应或进行上下文压缩时，在输入框上方显示对应状态和耗时，让长时间 Deep Diving 不再像卡住。
@@ -15,7 +16,7 @@
 ## 安装
 
 ```sh
-dsh plugin --profile web add @shuind/dsh-codex-harness@0.1.19
+dsh plugin --profile web add @shuind/dsh-codex-harness@0.1.21
 ```
 
 重启 Web，创建新会话，在模式菜单中选择 **Codex 模式**。

package/lib/client.js

@@ -28,6 +28,11 @@ window.__ModuleLoader__.load({
 		/** Browser controls for the Codex request settings mounted by the Host plugin. */
 		const NS = "codex";
 		const SETTINGS_NAMESPACE = "codex";
+		const MODEL_SETTINGS_SLOT = "conversation.input.model.settings";
+		const CONTEXT_SETTINGS_SLOT = "conversation.input.context.settings";
+		const FAST_FALLBACK_SLOT = "conversation.input.right";
+		const CONTEXT_FALLBACK_SLOT = "conversation.input.dock";
+		const DEFAULT_CONTEXT_WINDOW = 262144;
 		const en = {
 			fast: "Fast mode",
 			fastOn: "Fast mode on (priority tier)",
@@ -95,6 +100,50 @@ window.__ModuleLoader__.load({
 				})]
 			});
 		}
+		/** The legacy composer seat is a compact inline row, not a menu panel. */
+		function FastModeFallback(props) {
+			const { sessionId, useSessions, useSettings, setSetting, t } = props;
+			const agentPreset = useSessions((state) => state.byId[sessionId]?.agentPreset);
+			const snapshot = useSettings((state) => state);
+			const fast = snapshot.value?.fast ?? false;
+			if (agentPreset !== "codex") return null;
+			return (0, react_jsx_runtime.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: () => {
+					setSetting("fast", !fast);
+				},
+				style: {
+					boxSizing: "border-box",
+					display: "inline-flex",
+					alignItems: "center",
+					gap: 5,
+					height: 28,
+					border: "1px solid var(--dsw-alias-border-primary)",
+					borderRadius: 7,
+					padding: "0 8px",
+					color: fast ? "var(--dsw-static-blue-500)" : "var(--dsw-alias-label-secondary)",
+					background: fast ? "var(--dsw-alias-interactive-bg-selected)" : "transparent",
+					cursor: snapshot.writable === false ? "default" : "pointer",
+					font: "inherit",
+					fontSize: 12,
+					lineHeight: "20px",
+					fontWeight: fast ? 600 : 400,
+					whiteSpace: "nowrap"
+				},
+				children: [(0, react_jsx_runtime.jsx)("span", { children: t("fast") }), (0, react_jsx_runtime.jsx)("span", {
+					style: {
+						color: "var(--dsw-alias-label-tertiary)",
+						fontSize: 11
+					},
+					children: fast ? t("fastStateOn") : t("fastStateOff")
+				})]
+			});
+		}
 		function ContextSizeControl({ contextWindow, useSettings, setSetting, unsetSetting, t }) {
 			const snapshot = useSettings((state) => state);
 			const configured = snapshot.value?.contextWindow;
@@ -211,6 +260,16 @@ window.__ModuleLoader__.load({
 				]
 			});
 		}
+		function contextWindowFromProjection(useProjection) {
+			const pressure = useProjection("contextPressure");
+			return pressure?.contextWindow !== void 0 && pressure.contextWindow > 0 ? pressure.contextWindow : DEFAULT_CONTEXT_WINDOW;
+		}
+		function LegacyContextSizeControl({ useProjection, ...props }) {
+			return (0, react_jsx_runtime.jsx)(ContextSizeControl, {
+				...props,
+				contextWindow: contextWindowFromProjection(useProjection)
+			});
+		}
 		function elapsedSeconds(startedAt, now) {
 			return Math.max(0, Math.floor((now - startedAt) / 1e3));
 		}
@@ -275,7 +334,15 @@ window.__ModuleLoader__.load({
 			"locale",
 			"settingsScope"
 		];
-		/** Mount Fast inside the model selector and context size inside the meter panel. */
+		/** Select a preferred slot when the host declares it, otherwise use a stable legacy composer seat. */
+		function chooseDeclaredSlot(preferred, fallback, isDeclared) {
+			return isDeclared(preferred) ? preferred : fallback;
+		}
+		function slotIsDeclared(ctx, slot) {
+			const registry = ctx.slots;
+			return typeof registry.spec === "function" && registry.spec.call(ctx.slots, slot) !== void 0;
+		}
+		/** Mount Codex controls in the newest named seats, with legacy composer fallbacks. */
 		function apply(ctx) {
 			ctx.effect(() => ctx.locale.register(NS, {
 				en,
@@ -287,20 +354,34 @@ window.__ModuleLoader__.load({
 				setSetting: (field, value) => settings.set(field, value),
 				unsetSetting: (field) => settings.unset(field)
 			});
-			ctx.slots.inject("conversation.input.model.settings", () => ctx.slots.register({
-				name: "conversation.input.model.settings",
+			if (chooseDeclaredSlot(MODEL_SETTINGS_SLOT, FAST_FALLBACK_SLOT, (slot) => slotIsDeclared(ctx, slot)) === MODEL_SETTINGS_SLOT) ctx.slots.inject(MODEL_SETTINGS_SLOT, () => ctx.slots.register({
+				name: MODEL_SETTINGS_SLOT,
 				id: "codex-fast",
 				order: 0,
 				locale: NS,
 				inject: injected
 			}, FastModeButton));
-			ctx.slots.inject("conversation.input.context.settings", () => ctx.slots.register({
-				name: "conversation.input.context.settings",
+			else ctx.slots.inject(FAST_FALLBACK_SLOT, () => ctx.slots.register({
+				name: FAST_FALLBACK_SLOT,
+				id: "codex-fast-fallback",
+				order: 0,
+				locale: NS,
+				inject: injected
+			}, FastModeFallback));
+			if (chooseDeclaredSlot(CONTEXT_SETTINGS_SLOT, CONTEXT_FALLBACK_SLOT, (slot) => slotIsDeclared(ctx, slot)) === CONTEXT_SETTINGS_SLOT) ctx.slots.inject(CONTEXT_SETTINGS_SLOT, () => ctx.slots.register({
+				name: CONTEXT_SETTINGS_SLOT,
 				id: "codex-context-size",
 				order: 0,
 				locale: NS,
 				inject: injected
 			}, ContextSizeControl));
+			else ctx.slots.inject(CONTEXT_FALLBACK_SLOT, () => ctx.slots.register({
+				name: CONTEXT_FALLBACK_SLOT,
+				id: "codex-context-size-fallback",
+				order: 0,
+				locale: NS,
+				inject: injected
+			}, LegacyContextSizeControl));
 			ctx.slots.inject("conversation.composer.dock", () => ctx.slots.register({
 				name: "conversation.composer.dock",
 				id: "codex-activity",
@@ -315,6 +396,7 @@ window.__ModuleLoader__.load({
 		//#endregion
 		exports.ActivityLine = ActivityLine;
 		exports.apply = apply;
+		exports.chooseDeclaredSlot = chooseDeclaredSlot;
 		exports.default = client_default;
 		exports.inject = inject;
 		return module.exports;

package/lib/index.js

@@ -177,17 +177,30 @@ function findSequence(lines, expected, from, endOfFile) {
 	}
 	return -1;
 }
+function displayPatchLine(line) {
+	if (line.length === 0) return "<empty>";
+	return line.replaceAll(" ", "[space]").replaceAll("	", "[tab]");
+}
+function formatPatchExcerpt(lines, start, count) {
+	if (lines.length === 0) return "  <empty file>";
+	const first = Math.max(0, Math.min(start, lines.length - 1));
+	return lines.slice(first, first + count).map((line, offset) => `  ${first + offset + 1}: ${displayPatchLine(line)}`).join("\n");
+}
+function mismatchMessage(label, hunkIndex, expected, actual, from, endOfFile) {
+	const expectedPreview = expected.slice(0, 12).map((line, index) => `  ${index + 1}: ${displayPatchLine(line)}`).join("\n");
+	const expectedSuffix = expected.length > 12 ? "\n  ..." : "";
+	const excerptStart = endOfFile ? Math.max(0, actual.length - 6) : Math.max(0, from - 2);
+	const markerHint = expected.some((wanted) => wanted.length > 0 && actual.includes(`-${wanted}`)) ? "\nHint: if a source line starts with a patch marker, repeat that marker after the operation marker; for example, `-- item` deletes the source line `- item`." : "";
+	return `could not find expected lines in ${label} hunk ${hunkIndex + 1} (search starts at line ${from + 1})\nExpected:\n${expectedPreview}${expectedSuffix}\nFile excerpt:\n${formatPatchExcerpt(actual, excerptStart, 10)}${markerHint}`;
+}
 /** Apply parsed update hunks and return LF-normalized text. */
-function applyPatchHunks(original, hunks) {
+function applyPatchHunks(original, hunks, label = "file") {
 	const value = splitText(original.replaceAll("\r\n", "\n"));
 	let cursor = 0;
-	for (const hunk of hunks) {
+	for (const [hunkIndex, hunk] of hunks.entries()) {
 		const expected = hunk.lines.filter((line) => line.kind !== "add").map((line) => line.text);
 		const start = findSequence(value.lines, expected, cursor, hunk.endOfFile);
-		if (start < 0) {
-			const detail = expected.join("\n");
-			invalid(`could not find expected lines${detail.length === 0 ? "" : `:\n${detail}`}`);
-		}
+		if (start < 0) invalid(mismatchMessage(label, hunkIndex, expected, value.lines, cursor, hunk.endOfFile));
 		const replacement = hunk.lines.filter((line) => line.kind !== "delete").map((line) => line.text);
 		value.lines.splice(start, expected.length, ...replacement);
 		cursor = start + replacement.length;
@@ -949,9 +962,7 @@ function applyCodexRequestSettings(request, settings) {
 		...settings.fast ? { serviceTier: "priority" } : {}
 	};
 }
-const CODEX_BASE_PROMPT = String.raw`You are Codex, based on {{model}}. You are running as a coding agent in dsh Web on a user's computer.
-
-## General
+const CODEX_BASE_PROMPT = String.raw`## General
 
 - When searching for text or files, prefer using rg or rg --files respectively because rg is much faster than alternatives like grep. If rg is not available, use the next best alternative.
 
@@ -959,7 +970,6 @@ const CODEX_BASE_PROMPT = String.raw`You are Codex, based on {{model}}. You are
 
 - Default to ASCII when editing or creating files. Only introduce non-ASCII or other Unicode characters when there is a clear justification and the file already uses them.
 - Add succinct code comments that explain non-obvious code. Do not add comments that merely narrate assignments or control flow.
-- Use apply_patch for single-file edits when practical. The apply_patch tool accepts its freeform patch language; do not wrap that patch in JSON.
 - You may be in a dirty git worktree. Never revert existing changes you did not make unless the user explicitly requests it. If unrelated files are changed, leave them alone.
 
 ## Planning
@@ -970,16 +980,10 @@ const CODEX_BASE_PROMPT = String.raw`You are Codex, based on {{model}}. You are
 ## dsh session
 
 - The user and you share one workspace. Inspect the repository and every applicable AGENTS.md before editing.
-- This session's preset was selected when the session was created and stays fixed for its lifetime. Do not attempt to switch the preset or replace its tool catalog while the session is running.
-- dsh provides the execution, filesystem, session, policy, and Skills capabilities behind these tools. Use those extension points as supplied; do not invent a second harness or bypass the filesystem service for file edits.
-- The core Codex tool names, arguments, and result formats are fixed: use exec_command for terminal work, write_stdin for an existing interactive command, apply_patch for file changes, and update_plan for multi-step tasks.
 
 ## Task execution
 
 - Keep the user informed with concise progress updates and lead with the result.
-- Prefer existing functions and extension points over new machinery.
-- Do not claim that a command, edit, or test succeeded unless it actually succeeded.
-- Use the exact tool names and argument formats supplied by this session; do not invent replacement editing tools.
 
 ## Presenting your work
 
@@ -996,13 +1000,26 @@ const CODEX_COLLABORATION_PROMPT = String.raw`## Collaboration
 - Solve problems by thinking from first principles and at a higher level.
 - Make things as effortless as possible for the user.
 `;
-/** Build the Codex system prompt with optional, user-enabled collaboration guidance. */
+/** Put the agent persona first and omit the generic Harness identity opener. */
+function normalizeCodexPromptAssembly(assembly) {
+	const sections = assembly.sections.filter((section) => section.name !== "harness:identity");
+	const persona = sections.find((section) => section.name === "deployment:persona");
+	if (persona === void 0) return {
+		...assembly,
+		sections
+	};
+	return {
+		...assembly,
+		sections: [persona, ...sections.filter((section) => section.name !== "deployment:persona")]
+	};
+}
+/** Build the Codex operating prompt with optional, user-enabled collaboration guidance. */
 function buildCodexSystemPrompt(config = {}) {
 	return config.collaborationPrompt === true ? `${CODEX_BASE_PROMPT}\n\n${CODEX_COLLABORATION_PROMPT}` : CODEX_BASE_PROMPT;
 }
 const EXEC_COMMAND_DESCRIPTION = "Runs a command in a PTY, returning output or a session ID for ongoing interaction.";
 const WRITE_STDIN_DESCRIPTION = "Writes characters to an existing unified exec session and returns recent output.";
-const APPLY_PATCH_DESCRIPTION = "The `apply_patch` tool can be used to edit files. This is a FREEFORM tool, so do not wrap the patch in JSON.";
+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",
@@ -1060,7 +1077,7 @@ async function applyOnePatch(ctx, file, exec, policy) {
 	}
 	const sourceInfo = await observedTarget(ctx, target, exec);
 	const original = await ctx.fs.readText(target, exec.signal);
-	const updated = file.kind === "delete" ? void 0 : applyPatchHunks(original, file.hunks);
+	const updated = file.kind === "delete" ? void 0 : applyPatchHunks(original, file.hunks, file.path);
 	if (file.kind === "delete") {
 		await deletePatchedFile(ctx, target, sourceInfo.version, exec, policy);
 		return {
@@ -1388,6 +1405,7 @@ function apply(ctx, config = {}) {
 		if ((resolved.hostedWebSearch || resolved.remoteCompact) && options.purpose === void 0 && 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,
@@ -1404,4 +1422,4 @@ var types_default = {
 	apply
 };
 //#endregion
-export { CODEX_SETTINGS_NAMESPACE, CODEX_SETTINGS_SCHEMA, Config, apply, applyCodexRequestSettings, buildCodexSystemPrompt, types_default as default, enrichCodexModel, inject, name };
+export { CODEX_SETTINGS_NAMESPACE, CODEX_SETTINGS_SCHEMA, Config, apply, applyCodexRequestSettings, buildCodexSystemPrompt, types_default as default, enrichCodexModel, inject, name, normalizeCodexPromptAssembly };

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

@@ -35,7 +35,9 @@ declare module '@deepseek-ai/dsh-client-ui-slots' {
 type ActivityProps = PropsRuntime<'conversation.composer.dock'> & PropsLocale<'codex'>;
 export declare function ActivityLine({ sessionId, useSession, useSessions, useProjection, t }: ActivityProps): import("react").JSX.Element | null;
 export declare const inject: string[];
-/** Mount Fast inside the model selector and context size inside the meter panel. */
+/** Select a preferred slot when the host declares it, otherwise use a stable legacy composer seat. */
+export declare function chooseDeclaredSlot(preferred: string, fallback: string, isDeclared: (slot: string) => boolean): string;
+/** Mount Codex controls in the newest named seats, with legacy composer fallbacks. */
 export declare function apply(ctx: Context): void;
 declare const _default: {
     inject: string[];

package/lib/types/client/index.js

@@ -5,6 +5,11 @@ import { CODEX_CONTEXT_MAX, CODEX_CONTEXT_UNIT, CODEX_PRESET_ID } from "../conte
 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';
+const FAST_FALLBACK_SLOT = 'conversation.input.right';
+const CONTEXT_FALLBACK_SLOT = 'conversation.input.dock';
+const DEFAULT_CONTEXT_WINDOW = 262_144;
 const en = {
     fast: 'Fast mode',
     fastOn: 'Fast mode on (priority tier)',
@@ -55,6 +60,33 @@ function FastModeButton({ sessionId, useSessions, useSettings, setSetting, t })
             textAlign: 'left',
         }, children: [_jsx("span", { children: t('fast') }), _jsx("span", { style: { color: 'var(--dsw-alias-label-tertiary)', fontSize: 12 }, children: fast ? t('fastStateOn') : t('fastStateOff') })] }));
 }
+/** The legacy composer seat is a compact inline row, not a menu panel. */
+function FastModeFallback(props) {
+    const { sessionId, useSessions, useSettings, setSetting, t } = 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)
+        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',
+            display: 'inline-flex',
+            alignItems: 'center',
+            gap: 5,
+            height: 28,
+            border: '1px solid var(--dsw-alias-border-primary)',
+            borderRadius: 7,
+            padding: '0 8px',
+            color: fast ? 'var(--dsw-static-blue-500)' : 'var(--dsw-alias-label-secondary)',
+            background: fast ? 'var(--dsw-alias-interactive-bg-selected)' : 'transparent',
+            cursor: snapshot.writable === false ? 'default' : 'pointer',
+            font: 'inherit',
+            fontSize: 12,
+            lineHeight: '20px',
+            fontWeight: fast ? 600 : 400,
+            whiteSpace: 'nowrap',
+        }, children: [_jsx("span", { children: t('fast') }), _jsx("span", { style: { color: 'var(--dsw-alias-label-tertiary)', fontSize: 11 }, children: fast ? t('fastStateOn') : t('fastStateOff') })] }));
+}
 function ContextSizeControl({ contextWindow, useSettings, setSetting, unsetSetting, t }) {
     const snapshot = useSettings(state => state);
     const configured = snapshot.value?.contextWindow;
@@ -90,6 +122,15 @@ function ContextSizeControl({ contextWindow, useSettings, setSetting, unsetSetti
                     fontSize: 11,
                 }, children: t('contextRestore') }))] }));
 }
+function contextWindowFromProjection(useProjection) {
+    const pressure = useProjection('contextPressure');
+    return pressure?.contextWindow !== undefined && pressure.contextWindow > 0
+        ? pressure.contextWindow
+        : DEFAULT_CONTEXT_WINDOW;
+}
+function LegacyContextSizeControl({ useProjection, ...props }) {
+    return _jsx(ContextSizeControl, { ...props, contextWindow: contextWindowFromProjection(useProjection) });
+}
 function elapsedSeconds(startedAt, now) {
     return Math.max(0, Math.floor((now - startedAt) / 1_000));
 }
@@ -138,7 +179,15 @@ export function ActivityLine({ sessionId, useSession, useSessions, useProjection
                 } }), _jsx("span", { children: label }), _jsxs("span", { style: { color: 'var(--dsw-alias-label-tertiary)' }, children: ["\u00B7 ", elapsedSeconds(activity.startedAt, now), "s"] })] }));
 }
 export const inject = ['slots', 'locale', 'settingsScope'];
-/** Mount Fast inside the model selector and context size inside the meter panel. */
+/** Select a preferred slot when the host declares it, otherwise use a stable legacy composer seat. */
+export function chooseDeclaredSlot(preferred, fallback, isDeclared) {
+    return isDeclared(preferred) ? preferred : fallback;
+}
+function slotIsDeclared(ctx, slot) {
+    const registry = ctx.slots;
+    return typeof registry.spec === 'function' && registry.spec.call(ctx.slots, slot) !== undefined;
+}
+/** 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');
     const settings = ctx.settingsScope.bind({ namespace: SETTINGS_NAMESPACE });
@@ -147,20 +196,44 @@ export function apply(ctx) {
         setSetting: (field, value) => settings.set(field, value),
         unsetSetting: (field) => settings.unset(field),
     });
-    ctx.slots.inject('conversation.input.model.settings', () => ctx.slots.register({
-        name: 'conversation.input.model.settings',
-        id: 'codex-fast',
-        order: 0,
-        locale: NS,
-        inject: injected,
-    }, FastModeButton));
-    ctx.slots.inject('conversation.input.context.settings', () => ctx.slots.register({
-        name: 'conversation.input.context.settings',
-        id: 'codex-context-size',
-        order: 0,
-        locale: NS,
-        inject: injected,
-    }, ContextSizeControl));
+    const fastSlot = chooseDeclaredSlot(MODEL_SETTINGS_SLOT, FAST_FALLBACK_SLOT, slot => slotIsDeclared(ctx, slot));
+    if (fastSlot === MODEL_SETTINGS_SLOT) {
+        ctx.slots.inject(MODEL_SETTINGS_SLOT, () => ctx.slots.register({
+            name: MODEL_SETTINGS_SLOT,
+            id: 'codex-fast',
+            order: 0,
+            locale: NS,
+            inject: injected,
+        }, FastModeButton));
+    }
+    else {
+        ctx.slots.inject(FAST_FALLBACK_SLOT, () => ctx.slots.register({
+            name: FAST_FALLBACK_SLOT,
+            id: 'codex-fast-fallback',
+            order: 0,
+            locale: NS,
+            inject: injected,
+        }, FastModeFallback));
+    }
+    const contextSlot = chooseDeclaredSlot(CONTEXT_SETTINGS_SLOT, CONTEXT_FALLBACK_SLOT, slot => slotIsDeclared(ctx, slot));
+    if (contextSlot === CONTEXT_SETTINGS_SLOT) {
+        ctx.slots.inject(CONTEXT_SETTINGS_SLOT, () => ctx.slots.register({
+            name: CONTEXT_SETTINGS_SLOT,
+            id: 'codex-context-size',
+            order: 0,
+            locale: NS,
+            inject: injected,
+        }, ContextSizeControl));
+    }
+    else {
+        ctx.slots.inject(CONTEXT_FALLBACK_SLOT, () => ctx.slots.register({
+            name: CONTEXT_FALLBACK_SLOT,
+            id: 'codex-context-size-fallback',
+            order: 0,
+            locale: NS,
+            inject: injected,
+        }, LegacyContextSizeControl));
+    }
     ctx.slots.inject('conversation.composer.dock', () => ctx.slots.register({
         name: 'conversation.composer.dock',
         id: 'codex-activity',

package/lib/types/index.d.ts

@@ -2,6 +2,7 @@
 import type { Context } from '@deepseek-ai/cordis';
 import z from '@deepseek-ai/schemastery';
 import type { LlmCallConfig } from '@deepseek-ai/dsh-llm';
+import type { PromptAssembly } from '@deepseek-ai/dsh-system-prompt';
 declare module '@deepseek-ai/dsh-llm' {
     interface LlmCallConfig {
         /** Codex request context capacity override, in tokens. */
@@ -50,7 +51,9 @@ export interface CodexModelProfile {
 export declare function enrichCodexModel(model: CodexModelProfile): CodexModelProfile;
 /** Apply the live Codex controls to one agent request without leaking them to other routes. */
 export declare function applyCodexRequestSettings(request: LlmCallConfig, settings: CodexSettings): LlmCallConfig;
-/** Build the Codex system prompt with optional, user-enabled collaboration guidance. */
+/** Put the agent persona first and omit the generic Harness identity opener. */
+export declare function normalizeCodexPromptAssembly(assembly: PromptAssembly): PromptAssembly;
+/** Build the Codex operating prompt with optional, user-enabled collaboration guidance. */
 export declare function buildCodexSystemPrompt(config?: Pick<Config, 'collaborationPrompt'>): string;
 /** Mount the Codex prompt/tool layer inside one fixed agent preset. */
 export declare function apply(ctx: Context, config?: Config): void;

package/lib/types/index.js

@@ -138,9 +138,8 @@ export function applyCodexRequestSettings(request, settings) {
         ...settings.fast ? { serviceTier: 'priority' } : {},
     };
 }
-const CODEX_BASE_PROMPT = String.raw `You are Codex, based on {{model}}. You are running as a coding agent in dsh Web on a user's computer.
-
-## General
+// The shipped persona owns the single Codex identity line, model, and working directory.
+const CODEX_BASE_PROMPT = String.raw `## General
 
 - When searching for text or files, prefer using rg or rg --files respectively because rg is much faster than alternatives like grep. If rg is not available, use the next best alternative.
 
@@ -148,7 +147,6 @@ const CODEX_BASE_PROMPT = String.raw `You are Codex, based on {{model}}. You are
 
 - Default to ASCII when editing or creating files. Only introduce non-ASCII or other Unicode characters when there is a clear justification and the file already uses them.
 - Add succinct code comments that explain non-obvious code. Do not add comments that merely narrate assignments or control flow.
-- Use apply_patch for single-file edits when practical. The apply_patch tool accepts its freeform patch language; do not wrap that patch in JSON.
 - You may be in a dirty git worktree. Never revert existing changes you did not make unless the user explicitly requests it. If unrelated files are changed, leave them alone.
 
 ## Planning
@@ -159,16 +157,10 @@ const CODEX_BASE_PROMPT = String.raw `You are Codex, based on {{model}}. You are
 ## dsh session
 
 - The user and you share one workspace. Inspect the repository and every applicable AGENTS.md before editing.
-- This session's preset was selected when the session was created and stays fixed for its lifetime. Do not attempt to switch the preset or replace its tool catalog while the session is running.
-- dsh provides the execution, filesystem, session, policy, and Skills capabilities behind these tools. Use those extension points as supplied; do not invent a second harness or bypass the filesystem service for file edits.
-- The core Codex tool names, arguments, and result formats are fixed: use exec_command for terminal work, write_stdin for an existing interactive command, apply_patch for file changes, and update_plan for multi-step tasks.
 
 ## Task execution
 
 - Keep the user informed with concise progress updates and lead with the result.
-- Prefer existing functions and extension points over new machinery.
-- Do not claim that a command, edit, or test succeeded unless it actually succeeded.
-- Use the exact tool names and argument formats supplied by this session; do not invent replacement editing tools.
 
 ## Presenting your work
 
@@ -185,7 +177,18 @@ const CODEX_COLLABORATION_PROMPT = String.raw `## Collaboration
 - Solve problems by thinking from first principles and at a higher level.
 - Make things as effortless as possible for the user.
 `;
-/** Build the Codex system prompt with optional, user-enabled collaboration guidance. */
+/** Put the agent persona first and omit the generic Harness identity opener. */
+export function normalizeCodexPromptAssembly(assembly) {
+    const sections = assembly.sections.filter(section => section.name !== 'harness:identity');
+    const persona = sections.find(section => section.name === 'deployment:persona');
+    if (persona === undefined)
+        return { ...assembly, sections };
+    return {
+        ...assembly,
+        sections: [persona, ...sections.filter(section => section.name !== 'deployment:persona')],
+    };
+}
+/** Build the Codex operating prompt with optional, user-enabled collaboration guidance. */
 export function buildCodexSystemPrompt(config = {}) {
     return config.collaborationPrompt === true
         ? `${CODEX_BASE_PROMPT}\n\n${CODEX_COLLABORATION_PROMPT}`
@@ -193,7 +196,7 @@ export function buildCodexSystemPrompt(config = {}) {
 }
 const EXEC_COMMAND_DESCRIPTION = 'Runs a command in a PTY, returning output or a session ID for ongoing interaction.';
 const WRITE_STDIN_DESCRIPTION = 'Writes characters to an existing unified exec session and returns recent output.';
-const APPLY_PATCH_DESCRIPTION = 'The `apply_patch` tool can be used to edit files. This is a FREEFORM tool, so do not wrap the patch in JSON.';
+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) {
@@ -242,7 +245,7 @@ async function applyOnePatch(ctx, file, exec, policy) {
     }
     const sourceInfo = await observedTarget(ctx, target, exec);
     const original = await ctx.fs.readText(target, exec.signal);
-    const updated = file.kind === 'delete' ? undefined : applyPatchHunks(original, file.hunks);
+    const updated = file.kind === 'delete' ? undefined : applyPatchHunks(original, file.hunks, file.path);
     if (file.kind === 'delete') {
         await deletePatchedFile(ctx, target, sourceInfo.version, exec, policy);
         return { path: file.path, operation: 'deleted' };
@@ -485,6 +488,7 @@ export function apply(ctx, config = {}) {
             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);
     registerPatchTool(ctx);

package/lib/types/patch.d.ts

@@ -32,5 +32,5 @@ export type PatchFile = {
 /** Parse one complete Codex patch after normalizing CRLF input to LF. */
 export declare function parsePatch(input: string): PatchFile[];
 /** Apply parsed update hunks and return LF-normalized text. */
-export declare function applyPatchHunks(original: string, hunks: readonly PatchHunk[]): string;
+export declare function applyPatchHunks(original: string, hunks: readonly PatchHunk[], label?: string): string;
 //# sourceMappingURL=patch.d.ts.map

package/lib/types/patch.js

@@ -188,16 +188,39 @@ function findSequence(lines, expected, from, endOfFile) {
     }
     return -1;
 }
+function displayPatchLine(line) {
+    if (line.length === 0)
+        return '<empty>';
+    return line.replaceAll(' ', '[space]').replaceAll('\t', '[tab]');
+}
+function formatPatchExcerpt(lines, start, count) {
+    if (lines.length === 0)
+        return '  <empty file>';
+    const first = Math.max(0, Math.min(start, lines.length - 1));
+    return lines.slice(first, first + count)
+        .map((line, offset) => `  ${first + offset + 1}: ${displayPatchLine(line)}`)
+        .join('\n');
+}
+function mismatchMessage(label, hunkIndex, expected, actual, from, endOfFile) {
+    const expectedPreview = expected.slice(0, 12)
+        .map((line, index) => `  ${index + 1}: ${displayPatchLine(line)}`)
+        .join('\n');
+    const expectedSuffix = expected.length > 12 ? '\n  ...' : '';
+    const excerptStart = endOfFile ? Math.max(0, actual.length - 6) : Math.max(0, from - 2);
+    const markerHint = expected.some(wanted => wanted.length > 0 && actual.includes(`-${wanted}`))
+        ? '\nHint: if a source line starts with a patch marker, repeat that marker after the operation marker; for example, `-- item` deletes the source line `- item`.'
+        : '';
+    return `could not find expected lines in ${label} hunk ${hunkIndex + 1} (search starts at line ${from + 1})\nExpected:\n${expectedPreview}${expectedSuffix}\nFile excerpt:\n${formatPatchExcerpt(actual, excerptStart, 10)}${markerHint}`;
+}
 /** Apply parsed update hunks and return LF-normalized text. */
-export function applyPatchHunks(original, hunks) {
+export function applyPatchHunks(original, hunks, label = 'file') {
     const value = splitText(original.replaceAll('\r\n', '\n'));
     let cursor = 0;
-    for (const hunk of hunks) {
+    for (const [hunkIndex, hunk] of hunks.entries()) {
         const expected = hunk.lines.filter(line => line.kind !== 'add').map(line => line.text);
         const start = findSequence(value.lines, expected, cursor, hunk.endOfFile);
         if (start < 0) {
-            const detail = expected.join('\n');
-            invalid(`could not find expected lines${detail.length === 0 ? '' : `:\n${detail}`}`);
+            invalid(mismatchMessage(label, hunkIndex, expected, value.lines, cursor, hunk.endOfFile));
         }
         const replacement = hunk.lines.filter(line => line.kind !== 'delete').map(line => line.text);
         value.lines.splice(start, expected.length, ...replacement);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shuind/dsh-codex-harness",
-  "version": "0.1.19",
-  "description": "A minimal Codex harness for GPT models that do not fit DSH's native interface, while remaining compatible with the DSH plugin ecosystem.",
+  "version": "0.1.21",
+  "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",
   "types": "lib/types/index.d.ts",
@@ -69,8 +69,7 @@
         "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-client-ui-conversation",
-        "@deepseek-ai/dsh-client-ui-settings",
-        "@deepseek-ai/dsh-client-ui-slots"
+        "@deepseek-ai/dsh-client-ui-settings"
       ],
       "platform": "web"
     }

package/presets/codex/agent.cordis.yml

@@ -4,6 +4,7 @@
 - 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

package/presets/codex/preset.yml

@@ -1,3 +1,3 @@
-name: Codex 模式
-description: 使用 Codex 的基础提示词、exec_command、write_stdin、apply_patch 和 update_plan，并保留 dsh 的 Skills 与可插拔运行时。
-order: 5
+name: Codex 模式
+description: 使用精简版 Codex 提示词、exec_command、write_stdin、apply_patch 和 update_plan，并保留 dsh 的 Skills 与可插拔运行时。
+order: 5