@shuind/dsh-codex-harness 0.1.23 → 0.1.24

package/README.md

@@ -13,12 +13,12 @@
 - **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.23
+dsh plugin --profile web add @shuind/dsh-codex-harness@0.1.24
 ```
 
 重启 Web，创建新会话，在模式菜单中选择 **Codex 模式**。
@@ -63,9 +63,14 @@ Codex 等待模型首个输出时，Web 会在 `Deep diving...` 右侧显示 `
 
 ## 随包提供的 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
 

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. */
@@ -63,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",
@@ -108,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",
@@ -279,20 +284,20 @@ 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)("span", {
 				id: "codex-activity",

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.js

@@ -1,7 +1,7 @@
 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';
@@ -42,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',
@@ -70,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',
@@ -149,18 +149,18 @@ 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')

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuind/dsh-codex-harness",
-  "version": "0.1.23",
+  "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