@eddyskywalker/dsh-chatgpt-subscription 0.1.8 → 0.1.9

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.9 - 2026-08-17
+
+- 移除临时 Bash Prompt 兼容模块：由于上游 DSH `0.1.0-rc.7` 已经原生修复持久化 Bash 提示符不匹配与重置问题，现按照标记 `DSH_COMPAT_REMOVE(persistent-bash-prompt-mismatch)` 安全移除全部相关兼容代码与测试。保留子代理报告去重兼容模块 `DSH_COMPAT_REMOVE(subagent-report-settlement-dedup)`。
+
 ## 0.1.8 - 2026-08-17
 
 - 修复 Cordis 插件依赖安全检查：使用 `ctx.inject(['terminals'], ...)` 作用域安全声明，解决在未加载 terminals 服务的 Profile 或非终端环境下直接访问 `ctx.terminals` 抛出 `cannot get property "terminals" without inject` 的启动崩溃问题。

package/README.md

@@ -32,8 +32,7 @@
 - 原样转发 DSH 暴露的工具 schema；命令工具兼容 `pwsh` / `powershell`、`bash`、`sh` 与 `shell`，并按 PowerShell、Bash 或 POSIX sh 注入对应说明；
 - 429/5xx 由 DSH retry policy 接管；401 只强制刷新并重试一次，支持 `AbortSignal`；
 - Codex 与 Code review 多窗口额度，60 秒缓存、15 秒上游节流并遵守 `Retry-After`；
-- 临时兼容 DSH `0.1.0-rc.6` 的子代理最终报告去重：若 settlement 已向父 Agent 提供同一子代理、完全相同的最终内容，则删除仍在 inbox 中的重复 report；部分报告、不同内容和不同子代理不受影响。兼容代码以 `DSH_COMPAT_REMOVE(subagent-report-settlement-dedup)` 集中标记，待 DSH 原生修复后删除；
-- 临时兼容 DSH `0.1.0-rc.6` 持久化 Bash 提示符不匹配导致的命令执行延迟（70倍提速）：上层 `tool-bash-persistent` 设置的 `__DSH_PERSISTENT_BASH_PROMPT__ ` 与底层 `terminal-bash` 期待的 `dsh> ` 提示符不一致导致无法命中 50ms 快速通道，本插件动态增强就绪检测以识别两类提示符，避免回退到 3.5s 静默超时。兼容代码以 `DSH_COMPAT_REMOVE(persistent-bash-prompt-mismatch)` 集中标记，待 DSH 原生修复后删除。
+- 临时兼容 DSH `0.1.0-rc.6` 的子代理最终报告去重：若 settlement 已向父 Agent 提供同一子代理、完全相同的最终内容，则删除仍在 inbox 中的重复 report；部分报告、不同内容和不同子代理不受影响。兼容代码以 `DSH_COMPAT_REMOVE(subagent-report-settlement-dedup)` 集中标记，待 DSH 原生修复后删除。
 
 **设置页**
 
@@ -162,4 +161,3 @@ npm pack --dry-run
 | Linux 凭据存储不可用 | 确认凭据属于当前用户且权限为 `0600`，父目录权限为 `0700`；修复权限或注销后重新登录 |
 | Linux 上工具调用语法错误 | 确认 DSH 暴露的是 `bash`、`sh` 或 `shell`，并使用相应的 Bash/POSIX 语法与 `/` 路径 |
 | 父 Agent 已收到子代理结果，但相同报告仍显示为排队消息 | 本插件为 DSH `0.1.0-rc.6` 提供临时 report/settlement 精确去重；升级或重载插件并新建会话后验证。若未来 DSH 已原生修复，可移除所有 `DSH_COMPAT_REMOVE(subagent-report-settlement-dedup)` 标记代码 |
-| Bash/Linux 命令执行卡顿 3.5 秒以上 | DSH `0.1.0-rc.6` 中 persistent prompt 命名不匹配，本插件已内置热修复兼容；若未来 DSH 修复可移除所有 `DSH_COMPAT_REMOVE(persistent-bash-prompt-mismatch)` 标记代码 |

package/lib/index.js

@@ -259,131 +259,6 @@ function installSubagentReportDedupCompat(ctx) {
 	};
 }
 //#endregion
-//#region src/host/bash-prompt-scheduling-compat.ts
-/**
-* DSH_COMPAT_REMOVE(persistent-bash-prompt-mismatch)
-*
-* Temporary compatibility shim for DSH 0.1.0-rc.6. The persistent bash tool
-* (`@deepseek-ai/dsh-tool-bash-persistent`) configures the bash shell PS1 to
-* `__DSH_PERSISTENT_BASH_PROMPT__ `, while the underlying PTY backend
-* (`@deepseek-ai/dsh-terminal-bash`) only checks for a hardcoded `dsh> `
-* prompt with a 6-character truncation limit.
-*
-* When the prompt does not match, `promptTextSeen` remains false and the PTY
-* session falls back to the 3.5s idle silence timeout (`idleSilenceMs: 3000ms`
-* + `handoffGraceMs: 500ms`) on every command execution.
-*
-* This compatibility module patches the PTY session `onData` handler so that
-* both `dsh> ` and `__DSH_PERSISTENT_BASH_PROMPT__ ` (and its trimmed variants)
-* satisfy `promptTextSeen`, restoring instant 50ms readiness settling.
-*
-* Remove this module, its installation in `src/index.ts`, and its focused test
-* once upstream aligns `CONTROLLED_PROMPT` with persistent bash tools.
-*/
-const DSH_BASH_PROMPT_COMPAT_MARKER = "__dshChatgptSubscriptionBashPromptCompatV1";
-const KNOWN_CONTROLLED_PROMPTS = [
-	"dsh> ",
-	"dsh>",
-	"__DSH_PERSISTENT_BASH_PROMPT__ ",
-	"__DSH_PERSISTENT_BASH_PROMPT__"
-];
-const MAX_PROMPT_BUFFER_LENGTH = 64;
-function isKnownControlledPrompt(tail) {
-	if (!tail) return false;
-	const cleaned = tail.replaceAll(/[\x00-\x1f\x7f]/g, "").trim();
-	for (const known of KNOWN_CONTROLLED_PROMPTS) if (cleaned === known.replaceAll(/[\x00-\x1f\x7f]/g, "").trim()) return true;
-	return false;
-}
-function patchSessionOnData(target) {
-	const obj = target.prototype ?? target;
-	if (!obj || typeof obj.onData !== "function") return () => {};
-	const existing = obj.onData[DSH_BASH_PROMPT_COMPAT_MARKER];
-	if (existing) {
-		existing.owners += 1;
-		return () => {
-			existing.owners -= 1;
-			if (existing.owners <= 0 && obj.onData["__dshChatgptSubscriptionBashPromptCompatV1"] === existing) obj.onData = existing.originalOnData;
-		};
-	}
-	const originalOnData = obj.onData;
-	const record = {
-		originalOnData,
-		owners: 1
-	};
-	function wrapper(data) {
-		const sanitized = this.sanitizer.push(data);
-		this.appendOutput(sanitized.text);
-		if (sanitized.prompt) {
-			this.promptSeen = true;
-			this.promptTail = "";
-			this.lastOutputAt = Date.now();
-		}
-		if (this.promptSeen && sanitized.promptTail !== void 0) {
-			const remaining = Math.max(0, MAX_PROMPT_BUFFER_LENGTH - this.promptTail.length);
-			this.promptTail += sanitized.promptTail.slice(0, remaining);
-			if (sanitized.promptTail.length > remaining) this.promptTail = `${this.promptTail}\0`;
-			this.promptTextSeen = isKnownControlledPrompt(this.promptTail);
-		}
-	}
-	Object.defineProperty(wrapper, DSH_BASH_PROMPT_COMPAT_MARKER, { value: record });
-	obj.onData = wrapper;
-	return () => {
-		record.owners -= 1;
-		if (record.owners <= 0 && obj.onData === wrapper) obj.onData = originalOnData;
-	};
-}
-/**
-* Installs the persistent bash prompt compatibility patch onto registered and
-* future PTY backends via Cordis scoped injection.
-*/
-function installBashPromptCompat(ctx) {
-	const fiber = ctx.inject(["terminals"], (subCtx) => {
-		const terminals = subCtx.terminals;
-		if (!terminals) return;
-		const disposers = [];
-		const patchBackend = (backend) => {
-			if (!backend) return;
-			if (typeof backend.createSession === "function") {
-				const originalCreate = backend.createSession;
-				backend.createSession = function(terminal, config) {
-					const session = originalCreate.call(this, terminal, config);
-					if (session) patchSessionOnData(session);
-					return session;
-				};
-				disposers.push(() => {
-					if (backend.createSession) backend.createSession = originalCreate;
-				});
-			}
-		};
-		if (terminals.backends) for (const backend of terminals.backends.values()) patchBackend(backend);
-		if (typeof terminals.registerBackend === "function") {
-			const originalRegister = terminals.registerBackend;
-			terminals.registerBackend = function(backend) {
-				patchBackend(backend);
-				return originalRegister.call(this, backend);
-			};
-			disposers.push(() => {
-				if (terminals.registerBackend) terminals.registerBackend = originalRegister;
-			});
-		}
-		subCtx.effect(() => () => {
-			while (disposers.length > 0) {
-				const dispose = disposers.pop();
-				try {
-					dispose?.();
-				} catch (error) {
-					subCtx.logger?.warn?.("[dsh-chatgpt-subscription] Could not remove bash prompt compatibility: " + (error instanceof Error ? error.message : String(error)));
-				}
-			}
-		}, "dsh-chatgpt-subscription: bash prompt compatibility cleanup");
-	});
-	return () => {
-		try {
-			fiber?.dispose?.();
-		} catch {}
-	};
-}
-//#endregion
 //#region src/compat.ts
 /**
 * Compatibility constants for the ChatGPT-backed Codex flow. The backend and
@@ -2333,9 +2208,7 @@ function apply(ctx) {
 		const disposeRoutes = registerRoutes(ctx, oauth, usage);
 		const disposeAdapter = ctx.llm.registerAdapter([PROVIDER_ID], adapter);
 		const disposeSubagentReportCompat = installSubagentReportDedupCompat(ctx);
-		const disposeBashPromptCompat = installBashPromptCompat(ctx);
 		return () => {
-			disposeBashPromptCompat();
 			disposeSubagentReportCompat();
 			disposeAdapter();
 			disposeRoutes();

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAclD,eAAO,MAAM,MAAM,UAAgD,CAAA;AAEnE,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAwBxC;AAED,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AAClF,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAA;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AACtE,YAAY,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAalD,eAAO,MAAM,MAAM,UAAgD,CAAA;AAEnE,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAqBxC;AAED,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AACvD,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AAClF,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAA;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAA;AACtE,YAAY,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eddyskywalker/dsh-chatgpt-subscription",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "DSH provider plugin for Codex access through a ChatGPT subscription.",
   "author": {
     "name": "eddyskywalker",

package/lib/types/host/bash-prompt-scheduling-compat.d.ts

@@ -1,51 +0,0 @@
-import type { Context } from '@deepseek-ai/cordis';
-/**
- * DSH_COMPAT_REMOVE(persistent-bash-prompt-mismatch)
- *
- * Temporary compatibility shim for DSH 0.1.0-rc.6. The persistent bash tool
- * (`@deepseek-ai/dsh-tool-bash-persistent`) configures the bash shell PS1 to
- * `__DSH_PERSISTENT_BASH_PROMPT__ `, while the underlying PTY backend
- * (`@deepseek-ai/dsh-terminal-bash`) only checks for a hardcoded `dsh> `
- * prompt with a 6-character truncation limit.
- *
- * When the prompt does not match, `promptTextSeen` remains false and the PTY
- * session falls back to the 3.5s idle silence timeout (`idleSilenceMs: 3000ms`
- * + `handoffGraceMs: 500ms`) on every command execution.
- *
- * This compatibility module patches the PTY session `onData` handler so that
- * both `dsh> ` and `__DSH_PERSISTENT_BASH_PROMPT__ ` (and its trimmed variants)
- * satisfy `promptTextSeen`, restoring instant 50ms readiness settling.
- *
- * Remove this module, its installation in `src/index.ts`, and its focused test
- * once upstream aligns `CONTROLLED_PROMPT` with persistent bash tools.
- */
-export declare const DSH_BASH_PROMPT_COMPAT_MARKER: "__dshChatgptSubscriptionBashPromptCompatV1";
-export declare const KNOWN_CONTROLLED_PROMPTS: readonly ["dsh> ", "dsh>", "__DSH_PERSISTENT_BASH_PROMPT__ ", "__DSH_PERSISTENT_BASH_PROMPT__"];
-export declare function isKnownControlledPrompt(tail: string): boolean;
-interface SanitizerResult {
-    text: string;
-    prompt?: boolean;
-    promptTail?: string;
-}
-interface SanitizerLike {
-    push(data: string): SanitizerResult;
-}
-export interface PtySessionLike {
-    sanitizer: SanitizerLike;
-    promptSeen: boolean;
-    promptTextSeen: boolean;
-    promptTail: string;
-    lastOutputAt: number;
-    appendOutput(text: string): void;
-    onData(data: string): void;
-}
-export declare function patchSessionOnData(target: {
-    prototype?: PtySessionLike;
-} | PtySessionLike): () => void;
-/**
- * Installs the persistent bash prompt compatibility patch onto registered and
- * future PTY backends via Cordis scoped injection.
- */
-export declare function installBashPromptCompat(ctx: Context): () => void;
-export {};
-//# sourceMappingURL=bash-prompt-scheduling-compat.d.ts.map

package/lib/types/host/bash-prompt-scheduling-compat.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"bash-prompt-scheduling-compat.d.ts","sourceRoot":"","sources":["../../../src/host/bash-prompt-scheduling-compat.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAElD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,6BAA6B,EACxC,4CAAqD,CAAA;AAEvD,eAAO,MAAM,wBAAwB,iGAK3B,CAAA;AAIV,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAQ7D;AAED,UAAU,eAAe;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,UAAU,aAAa;IACrB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAAA;CACpC;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,aAAa,CAAA;IACxB,UAAU,EAAE,OAAO,CAAA;IACnB,cAAc,EAAE,OAAO,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IAChC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAC3B;AAWD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE;IAAE,SAAS,CAAC,EAAE,cAAc,CAAA;CAAE,GAAG,cAAc,GAAG,MAAM,IAAI,CAkDtG;AAaD;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,IAAI,CAqEhE"}