dsh-crate-web 0.1.2-preview.3 → 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.3`，使用 `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.3
+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。界面会提示文件可能仍被占用或权限不足，并保留完整原始错误与回滚结果。请关闭正在使用目标目录的文件预览、编辑器或终端，核实权限与残留状态后手动重新导入；程序不会自动重试。历史故障的实际占用者尚未定位，当前提示不代表根因已修复。
 
@@ -23,3 +32,5 @@ Import 默认恢复到新 Profile，先执行 Preflight 和计划检查。覆盖
 工作流先扫描提交与实际 tgz，再让发布任务复用同一 tgz 并核对 SHA-256。新代码必须升 prerelease 版本；同版本不同内容会停止。现有 npm Trusted Publisher 对应本仓库和 `publish-dsh-crate-web.yml`，无需把长期 npm Token 写入仓库。
 
 宿主依赖：DSH 模块与 React 由目标 DSH 宿主提供，npm 将这些 peer 标记为 optional，避免在空 Profile 中自动安装另一套旧 DSH。这不表示插件可以脱离 DSH 运行，也不跳过实际宿主服务检查；客户端 UI 组件仍须由 DSH 模块加载器提供。发布流程对最终 tgz 执行普通干净安装，不使用 legacy-peer-deps 或 force。官方 CLI 与真实桌面的覆盖以对应版本的验证报告为准。
+
+本候选修复了两个实际入口问题：无系统 npm 时，Export 可以复用桌面提供的 pnpm，禁用打包脚本与钩子并保留源清单；默认 Verify 根据完整的运行插件清单判断 Inspector 端点是否适用，清单不完整或已启用的 Inspector 缺监听时仍失败。Windows x64 / 原装 DSH 0.2.1-rc.5 下，前一候选的页面导出、下载、检查和新 Profile 恢复真实通过；本候选使用同一配置、仅更新 Crate 制品的诊断包，真实通过恢复、默认 Verify 的组合、启动、页面就绪、空白会话动作和清理。会话动作遵循官方行为，复用了已有空白会话，没有制造新的会话文件。默认 Verify 总结果仍为 UNTESTED：零模型，没有覆盖模型、原生工具、计划重启和其后的插件测试；本轮也没有覆盖启用 Inspector 的真实运行或历史 Worker 取消故障。诊断包不是本候选重新完成的页面 Export，不能将两轮证据合称为完整候选验收。

package/core/dsh_pack/_version.py

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

package/core/dsh_pack/cli.py

@@ -8,7 +8,7 @@ import os
 from pathlib import Path
 from typing import Sequence
 
-from .errors import DshPackError, PackImportError
+from .errors import DshPackError, ExportError, PackImportError
 from .export import EMBEDDED, REFERENCE_ONLY, ExportOptions, PluginExportOptions, export_profile
 from .importer import ImportOptions, create_import_plan, delete_profile, import_pack
 from .preflight import PreflightContext, inspect_pack, render_text
@@ -250,7 +250,7 @@ def _run_export(args: argparse.Namespace) -> int:
             return 0
         result = export_profile(args.profile, args.output, options=options)
     except (DshPackError, OSError, ValueError, json.JSONDecodeError) as error:
-        payload = {"status": "failed", "error": {"message": str(error)}}
+        payload = {"status": "failed", "error": error.as_dict() if isinstance(error, ExportError) else {"message": str(error)}}
         if args.json:
             _emit(payload, args.command)
         else:

package/core/dsh_pack/desktop_verify.py

@@ -154,6 +154,9 @@ class DesktopVerifyAdapter:
 
     def _surface(self):
         value = self._rpc('surface')
+        inspector = value.get('inspector')
+        if not isinstance(inspector, dict) or inspector.get('inventoryComplete') is not True or type(inspector.get('applicable')) is not bool:
+            raise RuntimeError('Inspector applicability not confirmed: runtime inventory missing or incomplete')
         self.endpoints[f'web-{self.generation}'] = value['webPort']
         table = tcp_rows()
         with self.lock:
@@ -164,6 +167,9 @@ class DesktopVerifyAdapter:
         for name, port in self.endpoints.items():
             if not name.endswith('-' + str(self.generation)):
                 continue
+            if name.startswith('inspector-') and not inspector['applicable']:
+                evidence.append({'name': name, 'port': port, 'status': 'NOT_APPLICABLE', 'applicability': inspector})
+                continue
             listeners = [row for row in table if row['localPort'] == port and row['state'] == 'LISTEN']
             if not listeners or not all(row['pid'] in pids for row in listeners):
                 raise RuntimeError('Owned endpoint listener not confirmed: ' + name)

package/core/dsh_pack/errors.py

@@ -28,6 +28,20 @@ class IntegrityError(DshPackError):
 class ExportError(DshPackError):
     """A Profile cannot be exported into a valid DSH Pack."""
 
+    def __init__(self, message: str, *, stage: str | None = None, code: str | None = None, details: dict | None = None) -> None:
+        super().__init__(message)
+        self.stage, self.code, self.details = stage, code, details
+
+    def as_dict(self) -> dict:
+        result = {"message": str(self)}
+        if self.stage is not None:
+            result["stage"] = self.stage
+        if self.code is not None:
+            result["code"] = self.code
+        if self.details is not None:
+            result["details"] = self.details
+        return result
+
 
 class PackImportError(DshPackError):
     """A Pack cannot be prepared as a new Profile."""

package/core/dsh_pack/export.py

@@ -492,12 +492,22 @@ def _with_bundle_composition(profile_files: dict[str, bytes], bundles: Sequence[
     profile_files["package.json"] = (json.dumps(manifest, ensure_ascii=False, indent=2) + "\n").encode("utf-8")
 
 
-def _npm_command(configured: str | None) -> str:
+def _npm_command(configured: str | None) -> str | tuple[str, ...]:
     if configured:
         return configured
-    if os.name == "nt":
-        return shutil.which("npm.cmd") or shutil.which("npm") or "npm.cmd"
-    return shutil.which("npm") or "npm"
+    available = (shutil.which("npm.cmd") if os.name == "nt" else None) or shutil.which("npm")
+    if available:
+        return available
+    value = os.environ.get("DSH_PACK_PNPM_COMMAND")
+    if value:
+        try:
+            argv = json.loads(value)
+        except ValueError:
+            argv = None
+        if not isinstance(argv, list) or not argv or not all(isinstance(item, str) and item and "\x00" not in item for item in argv):
+            raise ExportError("DSH_PACK_PNPM_COMMAND must be a nonempty JSON argv array", stage="package-artifact", code="EXPORT_PACK_COMMAND_INVALID")
+        return tuple(argv)
+    return "npm.cmd" if os.name == "nt" else "npm"
 
 
 def _bundle_patch_path(package_dir: Path, package_name: str, patch: str) -> str:
@@ -613,13 +623,14 @@ def _validate_tarball(content: bytes, package_name: str, required_file: str | Se
 def _npm_pack(
     package_dir: Path,
     package_name: str,
-    npm_command: str,
+    npm_command: str | tuple[str, ...],
     *,
     required_file: str | Sequence[str] | None = None,
 ) -> bytes:
     with tempfile.TemporaryDirectory(prefix="dsh-pack-npm-") as directory:
         cache_directory = Path(directory) / "npm-cache"
         cache_directory.mkdir()
+        is_pnpm = isinstance(npm_command, tuple)
         command = [
             npm_command,
             "pack",
@@ -630,24 +641,56 @@ def _npm_pack(
             "--cache",
             str(cache_directory),
         ]
-        completed = subprocess.run(
-            command,
-            cwd=package_dir,
-            capture_output=True,
-            text=True,
-            check=False,
-            timeout=120,
-        )
+        environment = None
+        if is_pnpm:
+            command = [*npm_command, "pack", "--pack-destination", directory,
+                       "--skip-manifest-obfuscation", "--config.ignore-scripts=true",
+                       "--config.ignore-pnpmfile=true", "--config.offline=true",
+                       "--config.pm-on-fail=ignore", "--config.runtime-on-fail=ignore"]
+            environment = dict(os.environ, ELECTRON_RUN_AS_NODE="1")
+        try:
+            completed = subprocess.run(
+                command, cwd=package_dir, capture_output=True, text=True,
+                check=False, timeout=120, **({"env": environment} if environment is not None else {}),
+            )
+        except (OSError, subprocess.TimeoutExpired) as error:
+            raise ExportError(
+                f"Cannot pack {package_name}: {error}. Install npm or use the desktop-provided pnpm entry.",
+                stage="package-artifact", code="EXPORT_PACK_START_FAILED",
+                details={"package": package_name, "command": command, "cwd": str(package_dir), "originalError": str(error)},
+            ) from error
         if completed.returncode != 0:
             raise ExportError(
                 f"npm pack failed for {package_name} with exit code {completed.returncode}: "
-                f"{completed.stderr.strip() or completed.stdout.strip()}"
+                f"{completed.stderr.strip() or completed.stdout.strip()}",
+                stage="package-artifact", code="EXPORT_PACK_FAILED",
+                details={"package": package_name, "command": command, "cwd": str(package_dir),
+                         "exitCode": completed.returncode, "stdout": completed.stdout, "stderr": completed.stderr},
             )
         tarballs = sorted(Path(directory).glob("*.tgz"))
         if len(tarballs) != 1:
             raise ExportError(f"npm pack produced {len(tarballs)} tarballs for {package_name}")
         content = tarballs[0].read_bytes()
     _validate_tarball(content, package_name, required_file)
+    if is_pnpm:
+        # pnpm strips fields even with --skip-manifest-obfuscation. Preserve the
+        # installed manifest exactly; the artifact is a snapshot, not a publish.
+        import io
+        manifest = (package_dir / "package.json").read_bytes()
+        output = io.BytesIO()
+        with tarfile.open(fileobj=io.BytesIO(content), mode="r:gz") as source:
+            manifests = [member for member in source.getmembers() if member.name == "package/package.json"]
+            if len(manifests) != 1 or not manifests[0].isfile():
+                raise ExportError(f"pnpm pack artifact has no unique regular package manifest: {package_name}")
+            with tarfile.open(fileobj=output, mode="w:gz") as target:
+                for member in source.getmembers():
+                    if member.name == "package/package.json":
+                        member.size = len(manifest)
+                        target.addfile(member, io.BytesIO(manifest))
+                    else:
+                        target.addfile(member, source.extractfile(member) if member.isfile() else None)
+        content = output.getvalue()
+        _validate_tarball(content, package_name, required_file)
     return content
 
 
@@ -663,7 +706,7 @@ def _plugin_lock_entry(
     specifier: str,
     bundle_order: int | None,
     options: PluginExportOptions,
-    npm_command: str,
+    npm_command: str | tuple[str, ...],
 ) -> tuple[dict[str, Any], dict[str, bytes]]:
     package_dir, package_manifest = _installed_package(profile_dir, package_name, bundle=bundle_order is not None)
     installed_name = _string(package_manifest.get("name", package_name), f"{package_name}.package.json.name")

package/lib/index.js

@@ -1,3 +1,4 @@
+import { readRuntimeInventory } from "../runtime-inventory.mjs";
 import { createHash, randomUUID } from "node:crypto";
 import { access, lstat, mkdir, readFile, readdir, realpath, rename, rm, stat, unlink, writeFile } from "node:fs/promises";
 import { dirname, isAbsolute, join, relative, resolve } from "node:path";
@@ -951,33 +952,7 @@ const SAFE_PLUGIN_NAME = /^@?[A-Za-z0-9._-]+(?:\/[A-Za-z0-9._-]+)?$/;
 const SAFE_OPERATION_ID = /^[0-9a-f-]{36}$/i;
 const CRATE_PACKAGE_NAME = "dsh-crate-web";
 /** Cordis FiberState enum values; mirrors dsh-host-plugin-inventory phases. */
-const RUNTIME_FIBER_PHASE = {
-	0: "pending",
-	1: "loading",
-	2: "active",
-	3: "failed",
-	4: null,
-	5: "unloading"
-};
-/** Read-only projection of the currently running Loader's non-group entries. */
-function listRuntimePlugins(ctx) {
-	const loader = ctx.loader;
-	if (!loader || typeof loader.entries !== "function") return [];
-	const rows = [];
-	try {
-		for (const entry of loader.entries()) {
-			if (entry.options.group) continue;
-			if (entry.options.name.startsWith("cordis:")) continue;
-			rows.push({
-				id: entry.id,
-				name: entry.options.name,
-				enabled: entry.disabled !== true,
-				phase: entry.fiber ? RUNTIME_FIBER_PHASE[entry.fiber.state] ?? null : null
-			});
-		}
-	} catch {}
-	return rows;
-}
+
 function json(res, status, body) {
 	const payload = JSON.stringify(body);
 	res.writeHead(status, {
@@ -1594,7 +1569,7 @@ async function createProfile(home, body, workspace) {
 		history: item
 	};
 }
-async function handleApi(home, body, runtimePlugins = []) {
+async function handleApi(home, body, runtimePlugins = [], runtimeInventoryComplete = false) {
 	const action = body.action;
 	const workspace = await ensureWorkspace(home);
 	if (action === "profiles") {
@@ -1608,6 +1583,7 @@ async function handleApi(home, body, runtimePlugins = []) {
 			status: "ok",
 			profiles: await listProfiles(home),
 			runtimePlugins: classifiedPlugins,
+			runtimeInventoryComplete,
 			runtime
 		};
 	}
@@ -2137,7 +2113,8 @@ function apply(ctx, config = {}) {
 					return;
 				}
 				try {
-					json(res, 200, await handleApi(home, await readRequest(req), listRuntimePlugins(ctx)));
+					const inventory = readRuntimeInventory(ctx);
+					json(res, 200, await handleApi(home, await readRequest(req), inventory.rows, inventory.complete));
 				} catch (error) {
 					json(res, 400, {
 						status: "failed",

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.3",
+  "version": "0.1.2-preview.6",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -29,7 +29,12 @@
     "skills/dsh-crate-troubleshooting/SKILL.md",
     "skills/dsh-crate-troubleshooting/compatibility.json",
     "skills/dsh-crate-troubleshooting/reference/*.md",
-    "THIRD-PARTY-LICENSE.txt"
+    "THIRD-PARTY-LICENSE.txt",
+    "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)} });`;