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

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;