dsh-crate-web 0.1.2-preview.5 → 0.1.2-preview.6

package/README.md

@@ -1,11 +1,11 @@
 # DSH Crate — Preview
 
-DSH Crate 为 DeepSeek Harness 的设置页提供环境包导出、检查、恢复、验证和历史记录。正式 npm 包名是 `dsh-crate-web`；本候选为 `0.1.2-preview.5`，使用 `preview` 标签，保留既有 `latest`。
+DSH Crate 为 DeepSeek Harness 的设置页提供环境包导出、检查、恢复、验证和历史记录。正式 npm 包名是 `dsh-crate-web`；本候选为 `0.1.2-preview.6`，使用 `preview` 标签，保留既有 `latest`。
 
 可通过官方插件入口安装明确版本：
 
 ```powershell
-dsh plugin --profile web add dsh-crate-web@0.1.2-preview.5
+dsh plugin --profile web add dsh-crate-web@0.1.2-preview.6
 ```
 
 重启后打开 Settings → DSH Crate。离线环境可从同版本 tgz 安装。Windows x64 随包保留 Python 3.14.6，无需另外安装系统 Python。其他系统未完成本轮桌面验收。
@@ -14,7 +14,16 @@ Import 默认恢复到新 Profile，先执行 Preflight 和计划检查。覆盖
 
 默认 Verify 使用独立验证桌面并隔离 Home、工作区与缓存，不调用模型。模型、原生工具和各插件的真实业务验收必须有单独的执行证据；报告中的 UNTESTED 不能视为 PASS。
 
-此 npm 包仅含 Crate 插件、Core 和必要运行文件，不包含完整 DSH 桌面，也不向官方安装目录写入 Windows 终端或 NARB 补丁。历史业务证据来自配套的 Windows x64 / DSH 0.2.1-rc.5 独立修补桌面；本候选调整了正式包身份，尚未完成该身份下的完整桌面复测，不能宣称任意官方桌面均已兼容。
+此 npm 包包含 Crate 插件、Core、必要运行文件，以及供用户显式调用的 Windows 终端独立副本构建入口，不包含完整 DSH 桌面。安装插件不会向官方安装目录写入 Windows 终端或 NARB 补丁。历史业务证据来自配套的 Windows x64 / DSH 0.2.1-rc.5 独立修补桌面；尚未完成当前完整组合的模型及插件业务复测，不能宣称任意官方桌面均已兼容。
+
+`0.1.2-preview.6` 新增随包的 [Windows 终端宿主构建入口](./packaging/windows-terminal/README.md)。它针对 manifest 锁定的官方输入，使用随包控制台 Node 修复 runner 空 stdin／退出 127，并补齐退出码和终端生命周期；匹配的独立副本已通过恢复后、重启后、移除 Crate 后的真实终端及正常清理验证。这些宿主证据来自升版前同字节补丁，不等于新 npm 版本完成了模型业务验收。必须由用户显式运行脚本，目标为不存在的新目录；原安装保持不变：
+
+```powershell
+# <包目录> 是已安装 dsh-crate-web 的目录；Windows x64 可使用包内 Python。
+& "<包目录>\runtime\python\python.exe" "<包目录>\packaging\windows-terminal\build.py" --source "<匹配的官方桌面目录>" --destination "<不存在的新副本目录>"
+```
+
+输入 EXE、ASAR 和控制台 Node 哈希不匹配时会停止；构建不关闭完整性检查，但新副本 EXE 的原代码签名不再有效。该入口不包含 Inspector／NARB 补丁，也不会自动启动新副本或调用模型。
 
 已知限制：Windows 上 Import 偶发在临时 Profile 改为正式目录名时返回 WinError 5。界面会提示文件可能仍被占用或权限不足，并保留完整原始错误与回滚结果。请关闭正在使用目标目录的文件预览、编辑器或终端，核实权限与残留状态后手动重新导入；程序不会自动重试。历史故障的实际占用者尚未定位，当前提示不代表根因已修复。
 

package/core/dsh_pack/_version.py

@@ -1 +1 @@
-__version__ = "0.1.2-preview.5"
+__version__ = "0.1.2-preview.6"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-crate-web",
   "description": "DSH Web Settings surface for DSH Crate export, import, inspect, and history",
-  "version": "0.1.2-preview.5",
+  "version": "0.1.2-preview.6",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -30,7 +30,11 @@
     "skills/dsh-crate-troubleshooting/compatibility.json",
     "skills/dsh-crate-troubleshooting/reference/*.md",
     "THIRD-PARTY-LICENSE.txt",
-    "runtime-inventory.mjs"
+    "runtime-inventory.mjs",
+    "packaging/windows-terminal/build.py",
+    "packaging/windows-terminal/manifest.json",
+    "packaging/windows-terminal/README.md",
+    "packaging/windows-terminal/*.patch"
   ],
   "publishConfig": {
     "access": "public",

package/packaging/windows-terminal/README.md

@@ -0,0 +1,43 @@
+# Windows 终端宿主修复
+
+该目录保存 DSH 0.2.1-rc.5 / Windows x64 的精确输入补丁和独立副本构建入口。它属于桌面宿主修复，**不随 npm 插件静默应用**，不修改用户原安装、Home、PowerShell Profile 或注册表。
+
+已确认的原始故障是：打包 GUI EXE 作为 ConPTY 的 ACL runner 宿主时，runner 内 `GetStdHandle(-10)` 返回 NULL，受限 PowerShell 创建前即退出 127。管道关闭通知先于原生退出回调，旧 node-pty 又把退出码传播成 undefined，掩盖了原始错误。
+
+补丁让独立桌面使用其随附的控制台 Node 运行原字节 ACL runner，保留原 sandbox 策略及显式 runner 覆盖优先级；同时修复退出事件、有效 PID 就绪、连接取消及 Windows PTY 收尾，并保留已采集的启动错误详情。不删除 required 插件，不放宽 ACL。
+
+## 构建新副本
+
+需要 Python 3.12 或更新版本，仅使用标准库。提供合法取得、与 manifest 中 EXE / ASAR / 控制台 Node 哈希完全一致的桌面目录；版本名相同不足以匹配。此仓库不分发官方桌面二进制或完整官方模块。
+
+```powershell
+python packaging/windows-terminal/build.py --source "<官方桌面目录>" --destination "<不存在的新目录>"
+```
+
+输入和输出不能嵌套，拒绝已有目标及重解析点。所有补丁与 ACL 依赖先核对哈希，再复制；不使用硬链接。EXE 仅更新与 ASAR 对应的完整性资源，不关闭完整性检查、不改 fuse；代码签名不会因此保持有效。失败时保留新副本现场，不自动删除或重试。
+
+输出中的 `crate-terminal-fix-receipt.json` 记录输入 manifest 与输出身份。`BUILT_NOT_TESTED` 只表示构建完成，必须在独立 DSH_HOME、workspace、Electron userData、TEMP 和缓存中另做业务验收。
+
+## 验证
+
+```powershell
+python -m unittest discover -s tests -p test_windows_terminal_build.py
+
+# 可选：读取本地官方输入，应用实际补丁并执行真实模块的受控事件回归。
+$env:DSH_CRATE_TEST_DESKTOP = "<官方桌面目录>"
+python -m unittest discover -s tests -p test_windows_terminal_build.py
+```
+
+受控回归不启动桌面、Worker 或模型；没有指定本地桌面时，实际模块用例标为 skipped，不能据此声称真实终端通过。真实业务验收还需覆盖：打开终端、命令输出及文件标记、关闭、自然退出码、计划重启和移除 Crate 后继续可用，以及进程/Job/端点释放。
+
+### 隔离目录的权限前提
+
+验收夹具 `tests/windows_terminal_directory.py` 只创建明确 scope 内的新目录，并给原所有者显式保留 Modify + WRITE_OWNER，其他主体、owner、继承和官方沙箱策略不变。必须先准备整棵隔离运行目录的全新根目录，再在其中创建 Home、workspace、TEMP 和缓存，使子目录继承明确的所有者权限。只处理 workspace / TEMP 叶目录，仍可能因祖先目录不可访问而得到错误的工作目录。不要把它用于已有用户目录。仅继承 `OWNER RIGHTS` 的私有临时目录，可能在官方受限令牌下无法读取或写入；只补 WRITE_OWNER 不足以证明可用。
+
+已观察到的失败链路是：沙箱子进程不能写入指定 TEMP → PowerShell 进入受限语言模式 → 编码／提示符初始化无法工作 → 最后报告就绪超时。应检查实际 PowerShell 语言模式、工作目录、指定 TEMP 写入及目录外写入仍被拒绝，不能通过关闭语言限制、增加 Everyone 权限或提高超时来制造通过。
+
+在 manifest 锁定的 DSH 0.2.1-rc.5 / Windows x64 / 随包 Node 24.21.0 独立副本中，已实际验证恢复后、重启后和移除 Crate 后的 `terminal_open → terminal_send → terminal_close`：命令输出和文件标记正确、工作目录正确、目录外写入被拒绝，桌面正常退出，受控 Job 活动进程归零，相关 TCP 连接释放。自然退出 0 / 127 的事件传播另有实际 ConPTY 回归。调用通过显式隔离测试插件执行真实注册工具，不经过外部模型；逐名称管道释放没有独立探测。
+
+默认零模型 Verify 的 composition、boot、surface_ready、new_session 和 cleanup 已实际通过；其模型、核心工具及插件业务步骤仍保留 `UNTESTED`，不能据此宣称完整业务验收通过。移除后的 API 检查应核对官方回退层语义：该版本静态回退层对未匹配的 POST 返回 405，不能把“必须是 404”用作卸载成功条件。
+
+此补丁不包含 Inspector / NARB 的历史候选修复，不代表完整桌面产品交付，也不宣称适用所有 rc.5 制品或后续版本。node-pty 的变更基于其 MIT 许可模块；构建保留原安装内许可证，其他官方模块使用者仍须遵守其适用许可。

package/packaging/windows-terminal/build.py

@@ -0,0 +1,258 @@
+"""对精确匹配的 Windows 桌面创建独立修复副本；只用 Python 标准库。"""
+from __future__ import annotations
+
+import argparse
+import copy
+import hashlib
+import json
+from pathlib import Path, PurePosixPath
+import re
+import shutil
+import struct
+
+ROOT = Path(__file__).resolve().parent
+
+
+def digest(data):
+    return hashlib.sha256(data).hexdigest()
+
+
+def file_hash(path):
+    with Path(path).open('rb') as stream:
+        return hashlib.file_digest(stream, 'sha256').hexdigest()
+
+
+def safe_name(name):
+    if not isinstance(name, str) or not name or '\\' in name:
+        raise ValueError('非法资源相对路径')
+    path = PurePosixPath(name)
+    if path.is_absolute() or ':' in name or any(p in ('', '.', '..') for p in name.split('/')):
+        raise ValueError('非法资源相对路径')
+    return name
+
+
+def leaves(header, prefix=''):
+    for key, node in header.get('files', {}).items():
+        name = prefix + key
+        safe_name(name)
+        if 'files' in node:
+            yield from leaves(node, name + '/')
+        else:
+            yield name, node
+
+
+class Asar:
+    def __init__(self, path):
+        self.path = Path(path)
+        self.file = self.path.open('rb')
+        try:
+            a, n, c, size = struct.unpack('<4I', self.file.read(16))
+            if a != 4 or size > 64 * 1024 * 1024 or n < 8 + size or c < 4 + size:
+                raise ValueError('不支持的 ASAR 头')
+            raw = self.file.read(size)
+            if len(raw) != size:
+                raise ValueError('ASAR 头不完整')
+            self.header_hash = digest(raw)
+            self.header = json.loads(raw)
+            self.base = 8 + n
+        except BaseException:
+            self.close()
+            raise
+
+    def entry(self, name):
+        node = self.header
+        for part in safe_name(name).split('/'):
+            node = node['files'][part]
+        return node
+
+    def read(self, name, seen=()):
+        if name in seen or len(seen) > 64:
+            raise ValueError('ASAR 链接循环')
+        entry = self.entry(name)
+        if 'link' in entry:
+            return self.read(entry['link'], (*seen, name))
+        if entry.get('unpacked'):
+            return Path(str(self.path) + '.unpacked').joinpath(*name.split('/')).read_bytes()
+        self.file.seek(self.base + int(entry['offset']))
+        data = self.file.read(entry['size'])
+        if len(data) != entry['size']:
+            raise ValueError('ASAR 内容不完整')
+        return data
+
+    def close(self):
+        self.file.close()
+
+
+def apply_patch(source, patch):
+    """精确应用统一 diff；行号、旧内容和 hunk 数量均核对，不模糊匹配。"""
+    original = source.splitlines(keepends=True)
+    result, position, index, hunks = [], 0, 0, 0
+    lines = patch.splitlines(keepends=True)
+    while index < len(lines):
+        line = lines[index]
+        if not line.startswith('@@ '):
+            index += 1
+            continue
+        match = re.fullmatch(r'@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@[^\r\n]*\n?', line)
+        if not match:
+            raise ValueError('非法补丁 hunk')
+        start = int(match[1]) - 1
+        if start < position or start > len(original):
+            raise ValueError('补丁 hunk 越界或重叠')
+        result.extend(original[position:start])
+        position, index, old_count, new_count = start, index + 1, 0, 0
+        hunks += 1
+        while index < len(lines) and not lines[index].startswith('@@ '):
+            line = lines[index]
+            index += 1
+            if not line or line[0] not in ' +-':
+                raise ValueError('非法补丁内容')
+            kind, text = line[0], line[1:]
+            if kind in ' -':
+                if position >= len(original) or original[position] != text:
+                    raise ValueError('补丁上下文不匹配')
+                position += 1
+                old_count += 1
+            if kind in ' +':
+                result.append(text)
+                new_count += 1
+        if old_count != int(match[2] or 1) or new_count != int(match[4] or 1):
+            raise ValueError('补丁行数不匹配')
+    if not hunks:
+        raise ValueError('空补丁')
+    result.extend(original[position:])
+    return ''.join(result)
+
+
+def patched_modules(reader, manifest, asset_root=ROOT):
+    changes = {}
+    for row in manifest['patches']:
+        name = safe_name(row['path'])
+        if name in changes or reader.entry(name).get('unpacked') or 'link' in reader.entry(name):
+            raise ValueError('补丁目标重复或不是 packed 普通文件')
+        original = reader.read(name)
+        patch = (asset_root / safe_name(row['patch'])).read_bytes()
+        if digest(original) != row['beforeSha256'] or digest(patch) != row['patchSha256']:
+            raise ValueError('模块或补丁身份不匹配: ' + name)
+        normalized = original.decode('utf8').replace('\r\n', '\n')
+        text = apply_patch(normalized if normalized.endswith('\n') else normalized + '\n', patch.decode('utf8'))
+        if not row['outputFinalNewline']:
+            text = text.removesuffix('\n')
+        if row['outputNewline'] == 'CRLF':
+            text = text.replace('\n', '\r\n')
+        elif row['outputNewline'] != 'LF':
+            raise ValueError('未知输出换行格式')
+        raw = text.encode('utf8')
+        if digest(raw) != row['afterSha256']:
+            raise ValueError('补丁输出身份不匹配: ' + name)
+        changes[name] = raw
+    return changes
+
+
+def rewrite_asar(reader, destination, changes):
+    header = copy.deepcopy(reader.header)
+    packed = []
+    for name, node in leaves(header):
+        if name in changes:
+            data = changes[name]
+            node['size'] = len(data)
+            if 'integrity' in node:
+                integrity = node['integrity']
+                block = integrity['blockSize']
+                if block <= 0:
+                    raise ValueError('非法 ASAR blockSize')
+                integrity['hash'] = digest(data)
+                integrity['blocks'] = [digest(data[i:i + block]) for i in range(0, len(data), block)]
+        if 'offset' in node:
+            packed.append((int(reader.entry(name)['offset']), name, node))
+    packed.sort()
+    offset = 0
+    for _, name, node in packed:
+        node['offset'] = str(offset)
+        offset += node['size']
+    raw = json.dumps(header, ensure_ascii=False, separators=(',', ':')).encode()
+    padded = (len(raw) + 3) & ~3
+    with Path(destination).open('wb') as output:
+        output.write(struct.pack('<4I', 4, 8 + padded, 4 + padded, len(raw)) + raw + b'\0' * (padded - len(raw)))
+        for _, name, node in packed:
+            output.write(changes[name] if name in changes else reader.read(name))
+    return digest(raw)
+
+
+def patch_integrity(executable, spec, new_hash):
+    """精确输入已锁定，唯一更新已核对的 ELECTRONASAR 完整性资源。"""
+    raw = executable.read_bytes()
+    offset, size = spec['resourceOffset'], spec['resourceBytes']
+    old = spec['oldHeaderSha256'].encode()
+    section = raw[offset:offset + size]
+    if len(section) != size or section.count(old) != 1 or len(new_hash) != len(old):
+        raise ValueError('EXE/ASAR 完整性资源不匹配')
+    executable.write_bytes(raw[:offset] + section.replace(old, new_hash.encode()) + raw[offset + size:])
+
+
+def plain_tree(path):
+    for item in [path, *path.rglob('*')]:
+        if item.is_symlink() or item.is_junction():
+            raise ValueError('目录含重解析点')
+
+
+def materialize(source, destination):
+    source_arg, destination_arg = Path(source).absolute(), Path(destination).absolute()
+    for path in (source_arg, destination_arg):
+        for ancestor in (path, *path.parents):
+            if ancestor.is_symlink() or ancestor.is_junction():
+                raise ValueError('输入或输出路径含重解析点')
+    source, destination = source_arg.resolve(), destination_arg.resolve()
+    if destination.exists() or destination.is_relative_to(source) or source.is_relative_to(destination):
+        raise ValueError('目标已存在或与输入嵌套，拒绝覆盖')
+    manifest = json.loads((ROOT / 'manifest.json').read_text('utf8'))
+    if manifest['schemaVersion'] != 1:
+        raise ValueError('不支持的 manifest 版本')
+    if file_hash(source / 'DeepSeek Harness.exe') != manifest['inputExeSha256'] or file_hash(source / 'resources/app.asar') != manifest['inputAsarSha256']:
+        raise ValueError('官方输入身份不匹配；同一版本名不能代替文件身份')
+    if file_hash(source / safe_name(manifest['consoleNode']['path'])) != manifest['consoleNode']['sha256']:
+        raise ValueError('随包控制台 Node 身份不匹配')
+    plain_tree(source)
+    reader = Asar(source / 'resources/app.asar')
+    try:
+        if reader.header_hash != manifest['exeIntegrity']['oldHeaderSha256']:
+            raise ValueError('原 ASAR header 身份不匹配')
+        changes = patched_modules(reader, manifest)
+        resources = {}
+        for name, expected in manifest['aclFiles'].items():
+            safe_name(name)
+            raw = reader.read('dsh/' + name)
+            if digest(raw) != expected:
+                raise ValueError('官方 ACL 依赖身份不匹配')
+            resources[name] = raw
+        # 所有内容先核对；新副本不使用硬链接，不修改原安装或用户 Home。
+        destination.parent.mkdir(parents=True, exist_ok=True)
+        shutil.copytree(source, destination, symlinks=False)
+        header_hash = rewrite_asar(reader, destination / 'resources/app.asar', changes)
+        patch_integrity(destination / 'DeepSeek Harness.exe', manifest['exeIntegrity'], header_hash)
+        resource_root = destination / 'resources/runtime' / safe_name(manifest['aclResourceDirectory'])
+        resource_root.mkdir(exist_ok=False)
+        for name, raw in resources.items():
+            target = resource_root / name
+            target.parent.mkdir(parents=True, exist_ok=True)
+            with target.open('xb') as stream:
+                stream.write(raw)
+        receipt = {'status': 'BUILT_NOT_TESTED', 'manifestSha256': file_hash(ROOT / 'manifest.json'),
+                   'changedModules': list(changes), 'testHooksIncluded': False,
+                   'outputExeSha256': file_hash(destination / 'DeepSeek Harness.exe'),
+                   'outputAsarSha256': file_hash(destination / 'resources/app.asar'),
+                   'integrityDisabled': False, 'originalInstallationChanged': False,
+                   'modelsRequested': 0, 'desktopStarted': False}
+        with (destination / 'crate-terminal-fix-receipt.json').open('x', encoding='utf8') as stream:
+            json.dump(receipt, stream, ensure_ascii=False, indent=2)
+        return receipt
+    finally:
+        reader.close()
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument('--source', required=True, type=Path)
+    parser.add_argument('--destination', required=True, type=Path)
+    args = parser.parse_args()
+    print(json.dumps(materialize(args.source, args.destination), ensure_ascii=False))

package/packaging/windows-terminal/dsh__node_modules__@deepseek-ai__dsh-sandbox-local__lib__index.js.patch

@@ -0,0 +1,21 @@
+--- a/dsh/node_modules/@deepseek-ai/dsh-sandbox-local/lib/index.js
++++ b/dsh/node_modules/@deepseek-ai/dsh-sandbox-local/lib/index.js
+@@ -540,7 +540,17 @@
+ 		const override = this.internals.windowsAclRunnerArgs;
+ 		if (override !== void 0) return override;
+ 		const builtEntry = this.internals.windowsAclRunnerEntry ?? fileURLToPath(import.meta.resolve("@deepseek-ai/dsh-sandbox-windows-acl/runner"));
+-		if (existsSync(builtEntry)) return [process.execPath, builtEntry];
++		if (existsSync(builtEntry)) {
++			// 打包 Windows 桌面的 GUI EXE 不作为继承控制台句柄的 runner 宿主。
++			// 使用随附控制台 Node 和原字节官方 ACL runner，保持原沙箱协议。
++			if (process.platform === "win32" && process.versions.electron && import.meta.url.includes("/app.asar/")) {
++				const node = fileURLToPath(new URL("../../../../../../runtime/primary-runtime/dependencies/node/bin/node.exe", import.meta.url));
++				const runner = fileURLToPath(new URL("../../../../../../runtime/windows-acl-runner-v127/node_modules/@deepseek-ai/dsh-sandbox-windows-acl/lib/runner.js", import.meta.url));
++				if (!existsSync(node) || !existsSync(runner)) throw new Error("sandbox-local: Windows ACL console host resources are missing");
++				return [node, runner];
++			}
++			return [process.execPath, builtEntry];
++		}
+ 		const sourceEntry = fileURLToPath(import.meta.resolve("@deepseek-ai/dsh-sandbox-windows-acl/src/runner.ts"));
+ 		const sourceConfig = fileURLToPath(new URL("../../../../tsconfig.base.json", import.meta.url));
+ 		const registration = `import { register } from ${JSON.stringify(import.meta.resolve("tsx/esm/api"))}; register({ tsconfig: ${JSON.stringify(sourceConfig)} });`;

package/packaging/windows-terminal/dsh__node_modules__@deepseek-ai__dsh-subprocess-local__lib__index.js.patch

@@ -0,0 +1,51 @@
+--- a/dsh/node_modules/@deepseek-ai/dsh-subprocess-local/lib/index.js
++++ b/dsh/node_modules/@deepseek-ai/dsh-subprocess-local/lib/index.js
+@@ -1226,6 +1226,8 @@
+ 		survivors = await this.stopDescendants();
+ 		if (survivors.length > 0) throw new Error(`terminal cleanup failed; surviving pids: ${survivors.map((member) => member.pid).join(", ")}`);
+ 		this.settleExitIfGone();
++		// shell及后代都已退出后释放 Windows PTY 传输端点。
++		if (this.platform === "win32") this.terminal.kill();
+ 		this.dataDisposable.dispose();
+ 		this.exitDisposable.dispose();
+ 	}
+@@ -1643,6 +1645,7 @@
+ 		const linuxScope = containmentMode === "linux-scope" ? this.linuxScopeDecision : void 0;
+ 		let scope;
+ 		let terminal;
++		let cancelConnectingTerminal;
+ 		try {
+ 			scope = linuxScope === void 0 ? void 0 : prepareLinuxTerminalScope(launch, {
+ 				...activity?.env ?? env,
+@@ -1654,10 +1657,31 @@
+ 				options.env = scope.env;
+ 			}
+ 			terminal = requireNodePty().spawn(scope?.command ?? file, scope?.args ?? [...launch.argv.slice(1)], options);
++			if (platform === "win32") {
++				if (terminal.processReady === void 0) throw new Error("subprocess-local: Windows PTY process readiness contract is missing");
++				if (spec.signal !== void 0) {
++                    cancelConnectingTerminal = () => {
++                        // 取消事件回调不抛出到 Host；kill 缓存失败，随后 catch 会保留清理错误。
++                        try { terminal.kill(); } catch (_) { /* 由连接错误收尾路径读取并报告 */ }
++                    };
++					spec.signal.addEventListener("abort", cancelConnectingTerminal, { once: true });
++					if (spec.signal.aborted) cancelConnectingTerminal();
++				}
++				await terminal.processReady;
++				spec.signal?.throwIfAborted();
++				if (!Number.isSafeInteger(terminal.pid) || terminal.pid <= 0) throw new Error("subprocess-local: Windows PTY returned an invalid child pid");
++			}
+ 		} catch (error) {
++			let cleanupError;
++			if (platform === "win32" && terminal !== void 0) {
++				try { terminal.kill(); } catch (failure) { cleanupError = failure; }
++			}
+ 			scope?.cleanup();
+ 			activity?.dispose();
++			if (cleanupError !== void 0) throw new AggregateError([error, cleanupError], "PTY connection and cleanup both failed");
+ 			throw error;
++		} finally {
++			if (cancelConnectingTerminal !== void 0) spec.signal?.removeEventListener("abort", cancelConnectingTerminal);
+ 		}
+ 		let handle;
+ 		const directSettlement = Promise.withResolvers();

package/packaging/windows-terminal/dsh__node_modules__@deepseek-ai__dsh-terminal-bash__lib__index.js.patch

@@ -0,0 +1,38 @@
+--- a/dsh/node_modules/@deepseek-ai/dsh-terminal-bash/lib/index.js
++++ b/dsh/node_modules/@deepseek-ai/dsh-terminal-bash/lib/index.js
+@@ -498,7 +498,7 @@
+ 				submit: false,
+ 				...signal !== void 0 ? { signal } : {}
+ 			}).done;
+-			if (result.waitReason === "session_exit") throw new Error("PTY shell exited during startup");
++			if (result.waitReason === "session_exit") throw startupExitError(result);
+ 			if (result.waitReason === "timeout") throw new Error("PTY shell did not reach readiness before startup timeout");
+ 			this.motd = result.viewport;
+ 		} catch (error) {
+@@ -971,6 +971,17 @@
+ 		mode: policy.mode
+ 	}, signal)).argv;
+ }
++/** 保留实际退出结果和已收集的启动输出；不将缺失退出码伪装为0。 */
++function startupExitError(result) {
++	const status = result.sessionStatus;
++	const exitCode = status.kind === "exited" && typeof status.exitCode === "number" ? status.exitCode : null;
++	const signal = status.kind === "exited" ? status.signal ?? null : null;
++	const output = result.viewport;
++	const truncated = result.truncated === true;
++	const error = new Error(`PTY shell exited during startup (exitCode=${exitCode ?? "unknown"}, signal=${signal ?? "none"})${output.length ? `\n${output}` : ""}${truncated ? "\n[startup output reached the configured capture limit]" : ""}`);
++	Object.assign(error, { exitCode, signal, startupOutput: output, startupOutputTruncated: truncated });
++	return error;
++}
+ async function startupSession(session, dialect, timeoutMs, signal) {
+ 	let startupOperation;
+ 	const start = async () => {
+@@ -987,7 +998,7 @@
+ 				...signal !== void 0 ? { signal } : {}
+ 			});
+ 			const result = await startupOperation.done;
+-			if (result.waitReason === "session_exit") throw new Error("PTY shell exited during startup");
++			if (result.waitReason === "session_exit") throw startupExitError(result);
+ 			if (result.waitReason === "timeout") throw new Error("PTY shell did not reach readiness before startup timeout");
+ 			viewport = result.viewport;
+ 			if (result.waitReason === "stdin_read") break;

package/packaging/windows-terminal/dsh__node_modules__node-pty__lib__windowsPtyAgent.js.patch

@@ -0,0 +1,31 @@
+--- a/dsh/node_modules/node-pty/lib/windowsPtyAgent.js
++++ b/dsh/node_modules/node-pty/lib/windowsPtyAgent.js
+@@ -38,6 +38,8 @@
+         this._useConptyDll = _useConptyDll;
+         this._innerPid = 0;
+         this._onError = new eventEmitter2_1.EventEmitter2();
++        // 原生进程退出与输出管道关闭分别通知，避免将管道 EOF 当作完整退出结果。
++        this._onProcessExit = new eventEmitter2_1.EventEmitter2();
+         if (!conptyNative) {
+             conptyNative = (0, utils_1.loadNativeModule)('conpty').module;
+         }
+@@ -91,6 +93,11 @@
+         });
+         this._inSocket.setEncoding('utf8');
+     }
++    Object.defineProperty(WindowsPtyAgent.prototype, "onProcessExit", {
++        get: function () { return this._onProcessExit.event; },
++        enumerable: false,
++        configurable: true
++    });
+     Object.defineProperty(WindowsPtyAgent.prototype, "onError", {
+         get: function () { return this._onError.event; },
+         enumerable: false,
+@@ -248,6 +255,7 @@
+     WindowsPtyAgent.prototype._$onProcessExit = function (exitCode) {
+         var _this = this;
+         this._exitCode = exitCode;
++        this._onProcessExit.fire(exitCode);
+         if (!this._useConptyDll) {
+             this._flushDataAndCleanUp();
+             this._outSocket.on('data', function () { return _this._flushDataAndCleanUp(); });

package/packaging/windows-terminal/dsh__node_modules__node-pty__lib__windowsTerminal.js.patch

@@ -0,0 +1,107 @@
+--- a/dsh/node_modules/node-pty/lib/windowsTerminal.js
++++ b/dsh/node_modules/node-pty/lib/windowsTerminal.js
+@@ -49,14 +49,32 @@
+         _this._isReady = false;
+         // Functions that need to run after `ready` event is emitted.
+         _this._deferreds = [];
++        _this._outputClosed = false;
++        _this._exitPublished = false;
++        _this._killRequested = false;
++        _this._processReadySettled = false;
++        _this.processReady = new Promise(function (resolve, reject) {
++            _this._resolveProcessReady = resolve;
++            _this._rejectProcessReady = reject;
++        });
++        // 原始 node-pty 调用方可能不消费该附加 Promise；保留拒绝结果但防止未处理拒绝。
++        _this.processReady.catch(function () {});
+         // Create new termal.
+         _this._agent = new windowsPtyAgent_1.WindowsPtyAgent(file, args, parsedEnv, cwd, _this._cols, _this._rows, false, opt.useConptyDll, opt.conptyInheritCursor);
+         _this._socket = _this._agent.outSocket;
+         // The socket 'close' handler that drives 'exit' is only attached after
+         // ready_datapipe, which never fires when connect() fails.
+-        _this._agent.onError(function () {
++        _this._agent.onError(function (error) {
++            if (!_this._processReadySettled) {
++                _this._processReadySettled = true;
++                _this._rejectProcessReady(error);
++            }
+             _this._close();
+-            _this.emit('exit', _this._agent.exitCode);
++            // 创建/连接失败可能没有原生子进程；保留失败码，禁止等待不会到来的回调。
++            _this._emitExitOnce(typeof _this._agent.exitCode === 'number' ? _this._agent.exitCode : -1);
++        });
++        _this._processExitDisposable = _this._agent.onProcessExit(function () {
++            _this._publishExitWhenComplete();
+         });
+         // Not available until `ready` event emitted.
+         _this._pid = _this._agent.innerPid;
+@@ -67,6 +85,11 @@
+         _this._socket.on('ready_datapipe', function () {
+             // Update pid now that the agent has connected
+             _this._pid = _this._agent.innerPid;
++            if (!_this._processReadySettled) {
++                _this._processReadySettled = true;
++                if (_this._pid > 0) _this._resolveProcessReady(_this._pid);
++                else _this._rejectProcessReady(new Error('ConPTY connected without a valid child pid'));
++            }
+             // Run deferreds and set ready state once the first data event is received.
+             _this._socket.once('data', function () {
+                 // Wait until the first data event is fired then we can run deferreds.
+@@ -105,8 +128,9 @@
+             });
+             // Cleanup after the socket is closed.
+             _this._socket.on('close', function () {
+-                _this.emit('exit', _this._agent.exitCode);
++                _this._outputClosed = true;
+                 _this._close();
++                _this._publishExitWhenComplete();
+             });
+         });
+         _this._file = file;
+@@ -116,6 +140,17 @@
+         _this._forwardEvents();
+         return _this;
+     }
++    WindowsTerminal.prototype._publishExitWhenComplete = function () {
++        // 两个顺序均允许：进程先退出，或输出管道先关闭；不设置猜测性延时或退出码。
++        if (!this._outputClosed || typeof this._agent.exitCode !== 'number') return;
++        this._emitExitOnce(this._agent.exitCode);
++    };
++    WindowsTerminal.prototype._emitExitOnce = function (exitCode) {
++        if (this._exitPublished) return;
++        this._exitPublished = true;
++        if (this._processExitDisposable) this._processExitDisposable.dispose();
++        this.emit('exit', exitCode);
++    };
+     WindowsTerminal.prototype._write = function (data) {
+         this._defer(this._doWrite, data);
+     };
+@@ -155,14 +190,20 @@
+         });
+     };
+     WindowsTerminal.prototype.kill = function (signal) {
+-        var _this = this;
+-        this._deferNoArgs(function () {
+-            if (signal) {
+-                throw new Error('Signals not supported on windows.');
+-            }
+-            _this._close();
+-            _this._agent.kill();
+-        });
++        if (signal) throw new Error('Signals not supported on windows.');
++        if (this._killRequested) {
++            if (this._killError) throw this._killError;
++            return;
++        }
++        this._killRequested = true;
++        // 释放连接中的 PTY 不依赖首屏数据，避免连接失败或取消时留下延迟 kill。
++        if (!this._processReadySettled) {
++            this._processReadySettled = true;
++            this._rejectProcessReady(new Error('Terminal was closed before its process connected'));
++        }
++        this._close();
++        try { this._agent.kill(); }
++        catch (error) { this._killError = error; throw error; }
+     };
+     WindowsTerminal.prototype._deferNoArgs = function (deferredFn) {
+         var _this = this;