dsh-codex-subscription 3.0.0-beta.6 → 3.0.0-beta.7

package/README.en.md

@@ -106,10 +106,10 @@ Pair the ChatGPT mobile app's Codex section with a QR code and the DSH on your c
 - approvals and questions pop up on the phone; if it drops, they pop up again when you reopen it, otherwise they go back to the computer;
 - replies appear as they are written; commands, file edits with diffs, the task list, web searches, connector calls and generated images use the phone's native views;
 - send photos, @ search files on the computer, / pick DSH skills, view changes with read-only git, and start chats in a real folder picker;
-- DSH workspaces appear as projects; fork a conversation, see usage limits, lifetime usage and context usage;
+- DSH workspaces appear as projects; fork a conversation, see usage limits, lifetime usage and context usage; where DSH has `/compact` (0.2.0-rc.2 onwards), compact the context from the phone;
 - model errors show on the phone; paired phones are listed in settings and can be removed.
 
-Off by default: **Settings → Codex → Models & runtime → Phone remote control**. The computer must stay on, online and running DSH. This is a ChatGPT capability OpenAI has not opened to third parties and may change at any time, hence Beta. Currently in the pre-release: `dsh-codex-subscription@3.0.0-beta.5`.
+Off by default: **Settings → Codex → Models & runtime → Phone remote control**. The computer must stay on, online and running DSH. This is a ChatGPT capability OpenAI has not opened to third parties and may change at any time, hence Beta. Currently in the pre-release: `dsh-codex-subscription@3.0.0-beta.7`.
 
 <p align="center"><picture><source media="(prefers-color-scheme: dark)" srcset="docs/assets/ui-remote-en-dark.png"><img src="docs/assets/ui-remote-en-light.png" width="560" alt="Phone remote control in settings: the switch, pairing QR code and manual code, paired phones"></picture></p>
 
@@ -199,7 +199,7 @@ Model access and quota depend on your account.
 
 | Feature | What you can do | Availability / setup |
 | --- | --- | --- |
-| **Phone remote control** | Drive the DSH on your computer from the Codex section of the ChatGPT mobile app: start, continue and archive conversations, switch model and permissions, answer approvals and questions; DeepSeek and any other DSH model work | Beta (3.0.0-beta.5); off by default; Settings → Codex → Models & runtime → Phone remote control, pair by QR or manual code |
+| **Phone remote control** | Drive the DSH on your computer from the Codex section of the ChatGPT mobile app: start, continue and archive conversations, switch model and permissions, answer approvals and questions; DeepSeek and any other DSH model work | Beta (3.0.0-beta.7); off by default; Settings → Codex → Models & runtime → Phone remote control, pair by QR or manual code |
 | **Codex independent subtasks** | Reuse subscription sign-in and workspace permissions; select allowed models and reasoning levels | Beta; DSH by default, Codex requires the optional component and model-selection setup |
 | **Subtask component management** | Install, disable, or uninstall the official Codex subtask component from settings | Managed by supported DSH hosts; no extra login |
 | **Cloud context compaction** | Continue long conversations using Codex compaction while retaining DSH history and native compaction | Beta / experimental; off by default, enabled requests use SSE |

package/README.md

@@ -106,10 +106,10 @@ dsh --profile headless "只回复：ok"
 - 批准工具调用或回答提问时手机直接弹出；手机掉线，重新打开会再弹一次，否则交回电脑处理；
 - 回复边生成边显示；命令、文件修改（带差异）、任务清单、联网搜索、连接器调用和生成的图片用手机原生视图显示；
 - 发图片，@ 搜电脑上的文件，/ 选 DSH 技能，只读 git 查看改动，用真实的文件夹选择器新建对话；
-- DSH 工作区对应手机上的项目；可以从手机分叉对话，看用量额度、累计用量和上下文用量；
+- DSH 工作区对应手机上的项目；可以从手机分叉对话，看用量额度、累计用量和上下文用量；DSH 带有 `/compact` 时（0.2.0-rc.2 起）还能从手机压缩上下文；
 - 模型报错会显示在手机上；设置里能看到已配对的手机，随时移除。
 
-默认关闭：**设置 → Codex 订阅 → 模型与运行 → 手机远程控制**。电脑需要保持开机、联网并打开 DSH。这是 OpenAI 尚未向第三方开放的 ChatGPT 能力，随时可能变化，所以标为 Beta，目前在预发布版中提供：`dsh-codex-subscription@3.0.0-beta.5`。
+默认关闭：**设置 → Codex 订阅 → 模型与运行 → 手机远程控制**。电脑需要保持开机、联网并打开 DSH。这是 OpenAI 尚未向第三方开放的 ChatGPT 能力，随时可能变化，所以标为 Beta，目前在预发布版中提供：`dsh-codex-subscription@3.0.0-beta.7`。
 
 <p align="center"><picture><source media="(prefers-color-scheme: dark)" srcset="docs/assets/ui-remote-zh-dark.png"><img src="docs/assets/ui-remote-zh-light.png" width="560" alt="设置里的手机远程控制：开关、配对二维码和手动码、已配对的手机"></picture></p>
 
@@ -199,7 +199,7 @@ dsh --profile headless "只回复：ok"
 
 | 功能 | 你可以做什么 | 使用方式 / 条件 |
 | --- | --- | --- |
-| **手机远程控制** | 在 ChatGPT 手机 App 的 Codex 里直接指挥电脑上的 DSH：新建、续聊、归档对话，切换模型和权限，回答审批和提问，DeepSeek 等任意 DSH 模型都能用 | Beta（3.0.0-beta.5）；默认关闭，设置 → Codex 订阅 → 模型与运行 → 手机远程控制，扫码或输入手动码配对 |
+| **手机远程控制** | 在 ChatGPT 手机 App 的 Codex 里直接指挥电脑上的 DSH：新建、续聊、归档对话，切换模型和权限，回答审批和提问，DeepSeek 等任意 DSH 模型都能用 | Beta（3.0.0-beta.7）；默认关闭，设置 → Codex 订阅 → 模型与运行 → 手机远程控制，扫码或输入手动码配对 |
 | **Codex 独立子任务** | 复用订阅登录和工作区权限执行独立任务，可指定允许的模型与推理档位 | Beta；默认 DSH，Codex 需安装可选组件并配置模型选择 |
 | **子任务组件管理** | 在设置里安装、停用或卸载官方 Codex 子任务组件 | 由支持的 DSH 宿主管理，无需额外登录 |
 | **云端上下文压缩** | 使用 Codex 云端压缩继续长对话，同时保留 DSH 历史与原生压缩 | Beta / 实验性；默认关闭，开启的请求使用 SSE |

package/lib/client.js

@@ -9282,7 +9282,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region src/version.js
-		const PACKAGE_VERSION = "3.0.0-beta.6";
+		const PACKAGE_VERSION = "3.0.0-beta.7";
 		//#endregion
 		//#region src/client-recovery.js
 		async function recoveryCall(rpc, endpoint, payload = {}, timeoutMs = 1e4) {

package/lib/index.js

@@ -12,7 +12,7 @@ import { clientRequestSchema } from "@deepseek-ai/dsh-client-connection";
 import { lstat, mkdir, open, readFile, readdir, rename, rm, stat, writeFile } from "node:fs/promises";
 import { constants, readFileSync, readdirSync, statSync } from "node:fs";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
-import { pathToFileURL } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import * as dshLlm from "@deepseek-ai/dsh-llm";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
@@ -2158,7 +2158,7 @@ function inheritedOriginalImageRef(session, assetId) {
 }
 //#endregion
 //#region src/version.js
-const PACKAGE_VERSION = "3.0.0-beta.6";
+const PACKAGE_VERSION = "3.0.0-beta.7";
 const USER_AGENT = `dsh-codex-subscription/${PACKAGE_VERSION}`;
 //#endregion
 //#region src/codex-images.js
@@ -3969,7 +3969,7 @@ const emptyTurn = () => ({
 	completedAt: null,
 	durationMs: null
 });
-const textOf = (content) => (content ?? []).map((block) => block?.type === "text" ? block.text : "").filter(Boolean).join("\n");
+const textOf$1 = (content) => (content ?? []).map((block) => block?.type === "text" ? block.text : "").filter(Boolean).join("\n");
 const inputText = (input) => (Array.isArray(input) ? input : []).map((part) => part?.type === "text" ? part.text : "").filter(Boolean).join("\n");
 /** Skills the phone picked, written the way DSH invokes a skill: a /name gesture ahead of the text. */
 const skillGestures = (input) => (Array.isArray(input) ? input : []).filter((part) => part?.type === "skill" && /^[a-z0-9]+(?:-[a-z0-9]+)*$/u.test(String(part.name))).map((part) => `/${part.name}`);
@@ -3996,7 +3996,7 @@ function parseArguments(value) {
 	}
 }
 /** What the person typed: DSH appends its own system reminders (skills, context) to user messages. */
-const visibleText = (content) => textOf(content).replace(/<system-reminder>[\s\S]*?<\/system-reminder>/gu, "").trim();
+const visibleText = (content) => textOf$1(content).replace(/<system-reminder>[\s\S]*?<\/system-reminder>/gu, "").trim();
 /** Text of a user-role message the person wrote; DSH's own injected ones (runtime context, notices) carry another source kind. */
 const typedText = (message) => message.role === "user" && (message.source === void 0 || message.source?.kind === "user") ? visibleText(message.content) : "";
 const lines = (text) => String(text ?? "").split("\n");
@@ -4101,7 +4101,7 @@ function finishTool(item, message, imageUrls) {
 	const failed = Boolean(message.isError);
 	item.status = failed ? "failed" : "completed";
 	if (item.type === "commandExecution") {
-		item.aggregatedOutput = textOf(message.content);
+		item.aggregatedOutput = textOf$1(message.content);
 		item.exitCode = failed ? 1 : 0;
 	} else if (item.type === "imageGeneration") {
 		const url = imageBlocks(message).map((block) => imageUrls.get(block.attachment.attachmentId)).find(Boolean);
@@ -4111,7 +4111,7 @@ function finishTool(item, message, imageUrls) {
 		item.contentItems = toolOutput(message, imageUrls);
 		item.success = !failed;
 	} else if (item.type === "mcpToolCall") {
-		const text = textOf(message.content);
+		const text = textOf$1(message.content);
 		if (failed) item.error = { message: text.slice(0, 500) || "The connector tool failed" };
 		else item.result = {
 			content: [{
@@ -4125,7 +4125,7 @@ function finishTool(item, message, imageUrls) {
 const imageBlocks = (message) => (message.content ?? []).filter((block) => block?.type === "image" && block.attachment);
 const toolOutput = (message, imageUrls) => [{
 	type: "inputText",
-	text: textOf(message.content)
+	text: textOf$1(message.content)
 }, ...imageBlocks(message).map((block) => imageUrls.get(block.attachment.attachmentId)).filter(Boolean).map((imageUrl) => ({
 	type: "inputImage",
 	imageUrl
@@ -4242,7 +4242,7 @@ function thread({ id, title, preview, cwd, createdAt, updatedAt, running, turns
 */
 const PHONE_RETURN_MS = 12e4;
 const ADOPT_WITHIN_MS = 6e5;
-function createDshRemoteControl({ controller, agents, permissions = () => void 0, workspaces = () => void 0, attachments = () => void 0, usage = () => void 0, usageProfile = () => void 0, projections = () => void 0, skills = () => void 0, llm = () => void 0, trace = () => {}, phoneReturnMs = PHONE_RETURN_MS, userAgent }) {
+function createDshRemoteControl({ controller, agents, permissions = () => void 0, workspaces = () => void 0, attachments = () => void 0, usage = () => void 0, usageProfile = () => void 0, projections = () => void 0, skills = () => void 0, commands = () => void 0, llm = () => void 0, trace = () => {}, phoneReturnMs = PHONE_RETURN_MS, userAgent }) {
 	const subscribers = /* @__PURE__ */ new Map();
 	const active = /* @__PURE__ */ new Map();
 	const queues = /* @__PURE__ */ new Map();
@@ -5051,6 +5051,92 @@ function createDshRemoteControl({ controller, agents, permissions = () => void 0
 		"turn/start": (params, { notify }) => titles.has(params?.threadId) ? titleTurn(params, notify) : startTurn(params, notify),
 		"turn/interrupt": (params) => {
 			service().cancel({ sessionId: params?.threadId });
+			active.get(params?.threadId)?.abort?.abort();
+			return {};
+		},
+		"thread/compact/start": async (params, { notify }) => {
+			const id = params?.threadId;
+			const registry = commands();
+			const agent = await agentFor(id);
+			if (typeof registry?.execute !== "function" || registry.find?.(agent, "compact") === void 0) throw new RpcError(-32601, "This DSH version cannot compact a conversation on request");
+			if (active.has(id)) throw new RpcError(-32602, "A turn is already running in this conversation");
+			subscribe(id, notify);
+			const turn = emptyTurn();
+			const abort = new AbortController();
+			active.set(id, {
+				turn,
+				ended: void 0,
+				abort
+			});
+			emit(id, "turn/started", {
+				threadId: id,
+				turn
+			});
+			emit(id, "thread/status/changed", {
+				threadId: id,
+				status: {
+					type: "active",
+					activeFlags: []
+				}
+			});
+			(async () => {
+				try {
+					const result = (await registry.execute(agent, "/compact", [], abort.signal))?.result;
+					if (result?.kind === "error") throw new Error(result.text || "Compaction failed");
+					if (result?.sourceEventSeq !== void 0 && turn.items.length === 0) {
+						const item = {
+							type: "contextCompaction",
+							id: randomUUID()
+						};
+						turn.items.push(item);
+						emit(id, "item/started", {
+							threadId: id,
+							turnId: turn.id,
+							item,
+							startedAtMs: Date.now()
+						});
+						emit(id, "item/completed", {
+							threadId: id,
+							turnId: turn.id,
+							item,
+							completedAtMs: Date.now()
+						});
+					}
+					turn.status = "completed";
+				} catch (error) {
+					turn.status = abort.signal.aborted ? "interrupted" : "failed";
+					if (turn.status === "failed") {
+						turn.error = {
+							message: String(error?.message ?? "Compaction failed").slice(0, 500),
+							codexErrorInfo: null,
+							additionalDetails: null
+						};
+						emit(id, "error", {
+							threadId: id,
+							turnId: turn.id,
+							willRetry: false,
+							error: turn.error
+						});
+					}
+				}
+				turn.completedAt = seconds(Date.now());
+				active.delete(id);
+				compactions.delete(id);
+				const usageNow = tokenUsage(agent.session);
+				if (usageNow) emit(id, "thread/tokenUsage/updated", {
+					threadId: id,
+					turnId: turn.id,
+					tokenUsage: usageNow
+				});
+				emit(id, "turn/completed", {
+					threadId: id,
+					turn
+				});
+				emit(id, "thread/status/changed", {
+					threadId: id,
+					status: { type: "idle" }
+				});
+			})();
 			return {};
 		},
 		"turn/steer": async (params) => {
@@ -6431,6 +6517,62 @@ function redactRequest(value) {
 	return walk(value, "", 0);
 }
 //#endregion
+//#region src/pi-ai-compat.js
+const versionOf = (specifier) => {
+	try {
+		let path = fileURLToPath(import.meta.resolve(specifier));
+		for (let depth = 0; depth < 6; depth += 1) {
+			path = path.replace(/[\\/][^\\/]+$/u, "");
+			try {
+				const manifest = JSON.parse(readFileSync(`${path}/package.json`, "utf8"));
+				if (typeof manifest.version === "string") return manifest.version;
+			} catch {}
+		}
+	} catch {}
+};
+let cached;
+/** Versions of the pi-ai library and of DSH's adapter this plugin runs against. */
+function runtimeVersions() {
+	cached ??= {
+		piAi: versionOf("@earendil-works/pi-ai"),
+		adapter: versionOf("@deepseek-ai/dsh-llm-pi-ai")
+	};
+	return cached;
+}
+const atLeast087 = (version) => {
+	const match = /^(\d+)\.(\d+)/u.exec(version ?? "");
+	return match !== null && (Number(match[1]) > 0 || Number(match[2]) >= 87);
+};
+/** Whether the installed pi-ai understands system messages inside the transcript. */
+const understandsSystemMessages = (version) => atLeast087(version);
+const textOf = (content) => typeof content === "string" ? content : Array.isArray(content) ? content.filter((block) => block?.type === "text" && typeof block.text === "string").map((block) => block.text).join("\n") : "";
+/**
+* Fold the transcript's leading system messages back into `systemPrompt` and `tools`,
+* the form every pi-ai release accepts. Messages after the first non-system one stay.
+*/
+function hoistLeadingSystem(context) {
+	const messages = context?.messages;
+	if (!Array.isArray(messages) || messages[0]?.role !== "system") return context;
+	let end = 0;
+	const texts = context.systemPrompt ? [context.systemPrompt] : [];
+	const tools = [...Array.isArray(context.tools) ? context.tools : []];
+	while (messages[end]?.role === "system") {
+		const message = messages[end];
+		const text = [textOf(message.content), ...Object.values(message.sections ?? {}).filter((value) => typeof value === "string")].filter(Boolean).join("\n\n");
+		if (text !== "") texts.push(text);
+		if (Array.isArray(message.toolsAdded)) tools.push(...message.toolsAdded);
+		end += 1;
+	}
+	const { systemPrompt: _systemPrompt, tools: _tools, ...rest } = context;
+	const systemPrompt = texts.join("\n\n");
+	return {
+		...rest,
+		...systemPrompt === "" ? {} : { systemPrompt },
+		...tools.length === 0 ? {} : { tools },
+		messages: messages.slice(end)
+	};
+}
+//#endregion
 //#region src/transport-failure.js
 const TRANSIENT_WEBSOCKET_CLOSE = /^WebSocket closed (?:1000|1006|1011|1012|1013)(?:\s|$)/;
 const GATEWAY_REPLAY_BUFFER_EXCEEDED = /^\s*exceeded request buffer limit while retrying upstream\s*$/;
@@ -6724,7 +6866,8 @@ function openaiCodexSubscriptionProvider({ resolveSpeedMode = () => void 0, reso
 			throw: (error) => iterator ? step("throw", error) : Promise.reject(error)
 		};
 	};
-	const routed = (method, model, context, options) => {
+	const routed = (method, model, transcript, options) => {
+		const context = understandsSystemMessages(runtimeVersions().piAi) ? transcript : hoistLeadingSystem(transcript);
 		const route = reviewRoute(model, context);
 		const source = {
 			method,
@@ -7691,6 +7834,15 @@ function safeRequests(network) {
 	}
 	return result;
 }
+/** pi-ai and DSH's adapter come from the host; a profile can pair an adapter with an older library, so the report names both. */
+function libraryVersions() {
+	const { piAi, adapter } = runtimeVersions();
+	const valid = (value) => typeof value === "string" && /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]{1,32})?$/u.test(value);
+	return {
+		...valid(piAi) ? { piAi } : {},
+		...valid(adapter) ? { adapter } : {}
+	};
+}
 /** Build a support report that deliberately excludes OAuth and account metadata. */
 async function createSubscriptionDiagnostics({ auth, preferences, login = { phase: "idle" }, network, modelCatalog, connection, compaction, review, inspectionOptions, operations, runtimeManagement, storage, tools }) {
 	const collected = {};
@@ -7869,7 +8021,8 @@ async function createSubscriptionDiagnostics({ auth, preferences, login = { phas
 			node: process.version,
 			platform: process.platform,
 			arch: process.arch,
-			...hostDshVersion() ? { dsh: hostDshVersion() } : {}
+			...hostDshVersion() ? { dsh: hostDshVersion() } : {},
+			...libraryVersions()
 		},
 		account,
 		login,
@@ -10227,6 +10380,7 @@ function apply(ctx, config = {}) {
 		usageProfile: () => usageProfileReader,
 		projections: () => ctx.get?.("sessionProjections"),
 		skills: () => ctx.get?.("skills"),
+		commands: () => ctx.get?.("commands"),
 		llm: () => ctx.llm,
 		trace: (entry) => {
 			try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-subscription",
-  "version": "3.0.0-beta.6",
+  "version": "3.0.0-beta.7",
   "description": "Use ChatGPT and Codex subscriptions in DeepSeek Harness with OAuth, quota, safe resets, web search, images, and Fast mode",
   "type": "module",
   "main": "./lib/index.js",