dsh-pwsh-plugin 0.2.17 → 0.2.19

package/plugin/session-server.ps1

@@ -1,225 +1,189 @@
-# pwsh_run 常驻会话服务端 —— 已实测验证的参考实现
-#
-# 启动：pwsh -NoProfile -NonInteractive -EncodedCommand <base64(utf16le, 本文件)>
-#   - -EncodedCommand 而非 -File，是为了不落地临时脚本文件；
-#     启动字符串是 base64(UTF-16LE, 本文件)；命令行上限 32K，本文件换算后约 16.6K，安全在内。
-#   - 不要用 -Command -：那是"读到 EOF 就退出"的一次性模式，无法常驻。
-#
-# 协议（客户端 → 服务端，每行一条）：
-#   <id> <timeoutSeconds> <base64(utf8 脚本文本)>
-#   保留控制行：QUIT
-#
-# 响应（服务端 → 客户端，每行一条）：
-#   <<<B:id>>>           本次调用的输出开始
-#   O:<base64>           输出流对象
-#   E:<base64>           ErrorRecord（Write-Error / 非终止错误）
-#   W:<base64>           WarningRecord
-#   X:<base64>           异常消息（throw 或包装层自身异常）
-#   S:<base64>           哨兵：ok=正常跑完 / threw=抛异常 / ran=被 exit 或超时打断
-#   F:<base64>           BeginInvoke 本身失败
-#   <<<T:id:0|1>>>       结束标记，1 表示超时被打断
-#   <<<E:id>>>           整条响应结束
-#   <<<BYE>>>            进程正常退出
-#
-# 关键设计决定（每条都有实测依据，见 ../../FINDINGS.md）：
-#   1. 每次调用新建 PowerShell 实例、共享同一 Runspace。
-#      单例实例在 throw 之后会让下一次调用静默返回空输出。
-#   2. 原始 stdin/stdout 被协议独占，Console.In/Out/Error 换成安全流。
-#      否则用户脚本一句 [Console]::In.ReadLine() 就会吃掉协议数据、整个会话失联。
-#   3. *>&1 而非 2>&1：只合并 error 会漏掉 warning / verbose。
-#   4. 边跑边吐（$out 增量读取）：超时被打断前的部分输出也能交付。
-#   5. 每次调用前重置 $ErrorActionPreference：脚本内设成 'Stop' 会跨调用污染。
-
-$ErrorActionPreference = 'Continue'
+# stdin: id timeoutMs base64(utf8 JSON {script,workdir}) outputByteLimit
+# stdout: B/T/E framing; typed UTF-8 base64 records; '+' continues one record; L: reports truncation.
+# Console and inherited child handles must never carry protocol traffic.
+$ErrorActionPreference = 'Stop'
 $Utf8 = [Text.UTF8Encoding]::new($false)
-# 子进程的 stdout 是按它自己的编码吐的（node / git / gh 都是 UTF-8），PowerShell 用
-# Console.OutputEncoding 去解码这些字节。这个值默认跟随系统 ANSI 代码页（本机是 gb2312），
-# 于是「node -e "console.log('中文')"」在常驻会话里全变成乱码——原生 pwsh 工具没这个问题，
-# 因为它的启动前导显式设了 UTF-8。这里补上同一句。
 [Console]::OutputEncoding = $Utf8
 $OutputEncoding = $Utf8
-# 原始 stdin 交给协议读取器独占；再把 Console.In 换成安全空流
-# 否则用户脚本一句 [Console]::In.ReadLine() 就会吃掉协议数据，整个会话失联（已实测）
 $ProtoIn = [IO.StreamReader]::new([Console]::OpenStandardInput(), $Utf8)
-$SafeIn = [IO.StreamReader]::new([IO.MemoryStream]::new([byte[]]@()), $Utf8)
-[Console]::SetIn($SafeIn)
 $ProtoOut = [IO.StreamWriter]::new([Console]::OpenStandardOutput(), $Utf8)
 $ProtoOut.AutoFlush = $true
-# 原始 stdout 同样收回，避免用户脚本 [Console]::Out 直写污染协议行
-$SafeOut = [IO.StreamWriter]::new([IO.MemoryStream]::new(), $Utf8)
-[Console]::SetOut($SafeOut)
-[Console]::SetError($SafeOut)
+[Console]::SetIn([IO.StringReader]::new(''))
+[Console]::SetOut([IO.TextWriter]::Null)
+[Console]::SetError([IO.TextWriter]::Null)
 
-# 孙子进程的 std handle 继承自 Win32 槽位，Console::SetIn/SetOut 只改 .NET 层，槽位里仍是
-# 真正的协议管道：脚本里一句 Start-Process 起的子进程就能往协议流里写（实测伪造一行
-# <<<BYE>>> 会让客户端当场判定会话死亡），也能读走客户端发来的调用数据。
-# 所以拿到协议流之后要把三个槽位整体换掉：stdin 接 NUL（子进程读到 EOF），
-# stdout/stderr 接一个带 FILE_FLAG_DELETE_ON_CLOSE 的临时文件（子进程写进去，随进程退出自动消失）。
-# stdout 不能接 NUL：NUL 是字符设备，PowerShell 会认为输出没被重定向，于是 & exe 的报错从
-# 「failed to run: 拒绝访问」变成「StandardOutputEncoding is only supported when standard output
-# is redirected」，沙箱边界的诊断信息就丢了。磁盘句柄没有这个问题（实测两种文案只随句柄类型变）。
-# 接管失败只降级不中断：它是加固，不是本工具能干活的前提；原因随第一次调用的警告行告知模型。
-$TakeoverNote = ''
-$K = $null
-$Drain = ''
-$hOut = [IntPtr]::Zero
-try {
-    # 句柄必须带 bInheritHandle 才交得给子进程。用 NULL 安全属性建的句柄不可继承，子进程按
-    # STARTUPINFO.hStdInput 拿到的就只是"父进程的句柄号"，在本进程里没有对应对象：
-    # GetFileType 报 UNKNOWN，偶尔这个编号还被别的对象复用，读出来是别人的字节（实测 20 次里有 1 次
-    # 读到一个 PE 头）。带上继承位之后 30 次全是字符设备、每次都读到 EOF。
-    $Sig = @'
+# C# callbacks drain collections on the producer thread. PowerShell scriptblock event handlers
+# need a runspace and cannot safely serve as callbacks from the pipeline's worker thread.
+$Types = @'
 using System;
+using System.IO;
+using System.Text;
+using System.Management.Automation;
 using System.Runtime.InteropServices;
 
+public sealed class PwshRunOutput {
+    readonly TextWriter writer;
+    readonly object gate = new object();
+    int outputLeft, errorLeft = 65536;
+    int outputRecords, errorRecords;
+    bool truncated;
+    public PwshRunOutput(TextWriter writer, int limit) { this.writer = writer; outputLeft = limit; }
+    public void Emit(string kind, string text) {
+        lock (gate) {
+            text = text ?? "";
+            bool error = kind == "E" || kind == "X" || kind == "F";
+            int separator = (error ? errorRecords : outputRecords) > 0 ? 1 : 0;
+            int left = (error ? errorLeft : outputLeft) - separator;
+            if (left < 0) {
+                if (!truncated) { writer.WriteLine("L:"); truncated = true; }
+                return;
+            }
+            int length = text.Length;
+            if (Encoding.UTF8.GetByteCount(text) > left) {
+                int lo = 0, hi = length;
+                while (lo < hi) {
+                    int mid = lo + (hi - lo + 1) / 2;
+                    if (Encoding.UTF8.GetByteCount(text.Substring(0, mid)) <= left) lo = mid;
+                    else hi = mid - 1;
+                }
+                length = lo;
+                if (length > 0 && char.IsHighSurrogate(text[length - 1])) length--;
+                if (!truncated) { writer.WriteLine("L:"); truncated = true; }
+            }
+            int bytes = Encoding.UTF8.GetByteCount(text.Substring(0, length));
+            if (length == 0 && text.Length != 0) return;
+            if (error) { errorLeft -= bytes + separator; errorRecords++; }
+            else { outputLeft -= bytes + separator; outputRecords++; }
+            int offset = 0;
+            do {
+                int count = Math.Min(4096, length - offset);
+                if (count > 0 && offset + count < length && char.IsHighSurrogate(text[offset + count - 1])) count--;
+                string payload = Convert.ToBase64String(Encoding.UTF8.GetBytes(text.Substring(offset, count)));
+                offset += count;
+                writer.WriteLine(kind + (offset < length ? "+:" : ":") + payload);
+            } while (offset < length);
+        }
+    }
+    void Wire<T>(PSDataCollection<T> items, string kind) {
+        items.DataAdded += (sender, args) => {
+            foreach (T item in items.ReadAll()) Emit(kind, item == null ? "" : item.ToString());
+        };
+    }
+    public void Attach(PowerShell ps, PSDataCollection<PSObject> output) {
+        Wire(output, "O"); Wire(ps.Streams.Error, "E"); Wire(ps.Streams.Warning, "W");
+        Wire(ps.Streams.Verbose, "V"); Wire(ps.Streams.Debug, "D"); Wire(ps.Streams.Information, "I");
+        // Progress is not rendered by this noninteractive tool, but must not accumulate.
+        ps.Streams.Progress.DataAdded += (sender, args) => { ps.Streams.Progress.ReadAll(); };
+    }
+}
+
 public static class PwshRunStdio {
     [StructLayout(LayoutKind.Sequential)]
-    public struct SecurityAttributes {
-        public int nLength;
-        public IntPtr lpSecurityDescriptor;
-        public bool bInheritHandle;
+    public struct SecurityAttributes { public int nLength; public IntPtr lpSecurityDescriptor; public bool bInheritHandle; }
+    [DllImport("kernel32.dll", SetLastError=true, CharSet=CharSet.Unicode)]
+    static extern IntPtr CreateFileW(string n, uint a, uint s, ref SecurityAttributes sa, uint d, uint f, IntPtr t);
+    [DllImport("kernel32.dll", SetLastError=true)]
+    static extern bool SetStdHandle(int n, IntPtr h);
+    public static void Detach() {
+        var sa = new SecurityAttributes { nLength = Marshal.SizeOf(typeof(SecurityAttributes)), bInheritHandle = true };
+        var input = CreateFileW("NUL", 0x80000000, 3, ref sa, 3, 0, IntPtr.Zero);
+        var output = CreateFileW("NUL", 0x40000000, 3, ref sa, 3, 0, IntPtr.Zero);
+        if (input == IntPtr.Zero || input == new IntPtr(-1) || output == IntPtr.Zero || output == new IntPtr(-1)
+            || !SetStdHandle(-10, input) || !SetStdHandle(-11, output) || !SetStdHandle(-12, output))
+            throw new System.ComponentModel.Win32Exception(Marshal.GetLastWin32Error(), "Could not detach child std handles");
     }
-
-    /// <summary>结构体字节数。放在 C# 里算：PowerShell 会把 Marshal.SizeOf(type) 绑到 object 重载上并报错。</summary>
-    public static int SecurityAttributesSize { get { return Marshal.SizeOf(typeof(SecurityAttributes)); } }
-
-    [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-    public static extern IntPtr CreateFileW(string n, uint a, uint s, ref SecurityAttributes sa, uint d, uint f, IntPtr t);
-
-    [DllImport("kernel32.dll", SetLastError = true)]
-    public static extern bool SetStdHandle(int n, IntPtr h);
-
-    [DllImport("kernel32.dll", SetLastError = true)]
-    public static extern uint SetFilePointer(IntPtr h, int lo, IntPtr hi, uint method);
-
-    [DllImport("kernel32.dll", SetLastError = true)]
-    public static extern bool SetEndOfFile(IntPtr h);
 }
 '@
-    # -PassThru 给出的是类型数组，取 [0] 才是那个类；直接按名字拿更直白。
-    $null = Add-Type -TypeDefinition $Sig -ErrorAction Stop
-    $K = [PwshRunStdio]
-    $SA = [PwshRunStdio+SecurityAttributes]::new()
-    $SA.nLength = $K::SecurityAttributesSize
-    $SA.bInheritHandle = $true
-    $Invalid = [IntPtr]::new(-1)
-    # 0x40000000 GENERIC_WRITE / 0x80000000 GENERIC_READ / 0x3 share read+write / 0x3 OPEN_EXISTING
-    $NulR = $K::CreateFileW('NUL', [uint32]2147483648, [uint32]3, [ref]$SA, [uint32]3, [uint32]0, [IntPtr]::Zero)
-    if ($NulR -eq [IntPtr]::Zero -or $NulR -eq $Invalid) { throw 'CreateFileW(NUL, read) failed' }
-    if (-not $K::SetStdHandle(-10, $NulR)) { throw 'SetStdHandle(stdin) failed' }
-    # 0x2 CREATE_ALWAYS / 0x7 share read+write+delete / 0x04000000 FILE_FLAG_DELETE_ON_CLOSE
-    $Drain = [IO.Path]::Combine([IO.Path]::GetTempPath(), 'pwsh-run-drain-' + [Guid]::NewGuid().ToString('N') + '.log')
-    $hOut = $K::CreateFileW($Drain, [uint32]1073741824, [uint32]7, [ref]$SA, [uint32]2, [uint32]67108864, [IntPtr]::Zero)
-    if ($hOut -eq [IntPtr]::Zero -or $hOut -eq $Invalid) {
-        # 临时目录不可写时退回 NUL：协议流仍然干净，只是 & exe 的报错文案会变成重定向那一句。
-        $Drain = ''
-        $hOut = $K::CreateFileW('NUL', [uint32]1073741824, [uint32]3, [ref]$SA, [uint32]3, [uint32]0, [IntPtr]::Zero)
-        if ($hOut -eq [IntPtr]::Zero -or $hOut -eq $Invalid) { throw 'CreateFileW(stdout) failed' }
-    }
-    if (-not $K::SetStdHandle(-11, $hOut)) { throw 'SetStdHandle(stdout) failed' }
-    if (-not $K::SetStdHandle(-12, $hOut)) { throw 'SetStdHandle(stderr) failed' }
+try {
+    $null = Add-Type -TypeDefinition $Types -ErrorAction Stop
+    # NUL bounds discarded native output without any temporary drain file. Its handle type can
+    # change PowerShell's native-launch denial text; the client recognizes that diagnostic too.
+    if ($IsWindows) { [PwshRunStdio]::Detach() }
 } catch {
-    $TakeoverNote = 'pwsh-run: could not detach the child std handles (' + $_.Exception.Message + '); a script that starts its own processes may write into the session protocol stream and break this session.'
+    # A partially detached process must not accept user scripts and expose the protocol handles.
+    $ProtoOut.WriteLine('<<<B:c1>>>')
+    $ProtoOut.WriteLine('F:' + [Convert]::ToBase64String($Utf8.GetBytes($_.Exception.Message)))
+    $ProtoOut.WriteLine('S:' + [Convert]::ToBase64String($Utf8.GetBytes('threw')))
+    $ProtoOut.WriteLine('<<<E:c1>>>')
+    exit 1
 }
 
 $RS = [RunspaceFactory]::CreateRunspace()
 $RS.Open()
-$Fmt = @'
-$ErrorActionPreference = 'Continue'
-$__pwshn = 'ran'
+$RS.SessionStateProxy.SetVariable('ErrorActionPreference', 'Continue')
 try {
-  # *>&1 把全部流按发生顺序汇入管道（只写 2>&1 会漏 warning / verbose），
-  # 再按对象类型逐条打标：顺序保真，同时保留 stdout / error / warning 的分流。
-  . { __PWSHRUN_BODY__
-  } *>&1 | ForEach-Object {
-    if ($_ -is [System.Management.Automation.ErrorRecord]) { 'E:' + [Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes([string]$_)) }
-    elseif ($_ -is [System.Management.Automation.WarningRecord]) { 'W:' + [Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes([string]$_)) }
-    elseif ($_ -is [System.Management.Automation.VerboseRecord]) { 'V:' + [Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes([string]$_)) }
-    else { 'O:' + [Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes([string]$_)) }
-  }
-  $__pwshn = 'ok'
-} catch {
-  $__pwshn = 'threw'
-  # PowerShell 会把真实异常包进一层 RuntimeException，EndInvoke 还会再包一层；
-  # 逐层剥到最内层，模型看到的才是原始错误文本。
-  $__e = $_.Exception
-  while ($null -ne $__e.InnerException) { $__e = $__e.InnerException }
-  'X:' + [Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes([string]$__e.Message))
-} finally {
-  'S:' + [Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes($__pwshn))
-}
-'@
-
-while ($true) {
-    $line = $ProtoIn.ReadLine()
-    if ($null -eq $line -or $line -eq 'QUIT') { break }
-    if ($line.Length -eq 0) { continue }
-    $sp1 = $line.IndexOf(' '); $sp2 = $line.IndexOf(' ', $sp1+1)
-    $cid = $line.Substring(0, $sp1)
-    $to = [double]$line.Substring($sp1+1, $sp2-$sp1-1)
-    $src = [Text.Encoding]::UTF8.GetString([Convert]::FromBase64String($line.Substring($sp2+1)))
-    $ProtoOut.WriteLine('<<<B:' + $cid + '>>>')
-    # 子进程往 drain 文件里写的东西没人要，每次调用前截回零，免得常驻会话把临时盘越写越满。
-    # 截断失败不理会：那只是空间回收，不影响本调用。
-    if ($null -ne $K -and $Drain.Length -gt 0) {
-      try { [void]$K::SetFilePointer($hOut, 0, [IntPtr]::Zero, 0); [void]$K::SetEndOfFile($hOut) } catch {}
-    }
-    # 接管失败的说明只随第一次调用交付一次：模型需要知道这一次的会话对子进程不可靠，
-    # 但把它挂在每次调用上只会变成噪音。
-    if ($TakeoverNote.Length -gt 0) {
-      $ProtoOut.WriteLine('W:' + [Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes($TakeoverNote)))
-      $TakeoverNote = ''
-    }
-    $PS = [PowerShell]::Create()
-    $PS.Runspace = $RS
-    $out = [System.Management.Automation.PSDataCollection[psobject]]::new()
-    $a = $null
-    try {
-      [void]$PS.AddScript($Fmt.Replace('__PWSHRUN_BODY__', $src))
-      $a = $PS.BeginInvoke[psobject, psobject]($null, $out)
-    } catch {
-      # 语法错误在 AddScript 阶段就抛 ParseException，不会走到 $Fmt 的 finally，
-      # 所以这里必须自己补哨兵，否则客户端分不清「语法错」和「协议崩」。
-      $__e = $_.Exception
-      while ($null -ne $__e.InnerException) { $__e = $__e.InnerException }
-      $ProtoOut.WriteLine('X:' + [Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes([string]$__e.Message)))
-      $ProtoOut.WriteLine('S:' + [Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes('threw')))
-    }
-    # 管道内每条输出已经是 "标记:base64" 的合法协议行（见 $Fmt），
-    # 这里必须原样写出；再包一层 base64 会变成 "O:<b64(O:xxx)>"，客户端解不出来。
-    $emitted = 0; $timedOut = $false; $sawSentinel = $false
-    if ($null -ne $a) {
-      $deadline = [DateTime]::UtcNow.AddSeconds($to)
-      while (-not $a.IsCompleted) {
-        while ($out.Count -gt $emitted) { $item = $out[$emitted]; $emitted++; if ($null -ne $item) { if ([string]$item -like 'S:*') { $sawSentinel = $true }; $ProtoOut.WriteLine([string]$item) } }
-        if ([DateTime]::UtcNow -gt $deadline) { $timedOut = $true; break }
-        [void]$a.AsyncWaitHandle.WaitOne(30)
-      }
-      if ($timedOut) { try { $PS.Stop() } catch {}; [void]$a.AsyncWaitHandle.WaitOne(1500) }
-      else {
-        try { [void]$PS.EndInvoke($a) } catch {
-          # 语法错误不会进 $Fmt 的 catch（脚本根本没跑起来），而是从这里冒出，
-          # 同样要剥掉 EndInvoke 的包装层再交付。
-          $__e = $_.Exception
-          while ($null -ne $__e.InnerException) { $__e = $__e.InnerException }
-          $ProtoOut.WriteLine('X:' + [Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes([string]$__e.Message)))
+    while ($true) {
+        $line = $ProtoIn.ReadLine()
+        if ($null -eq $line -or $line -eq 'QUIT') { break }
+        if ($line.Length -eq 0) { continue }
+        $parts = $line.Split(' ', 4)
+        $cid = $parts[0]
+        $timeoutMs = [int]$parts[1]
+        $request = [Text.Encoding]::UTF8.GetString([Convert]::FromBase64String($parts[2])) | ConvertFrom-Json
+        $limit = [int]$parts[3]
+        $ProtoOut.WriteLine('<<<B:' + $cid + '>>>')
+        $sink = [PwshRunOutput]::new($ProtoOut, $limit)
+        $PS = [PowerShell]::Create()
+        $PS.Runspace = $RS
+        $out = [System.Management.Automation.PSDataCollection[psobject]]::new()
+        $sink.Attach($PS, $out)
+        $timedOut = $false
+        $sentinel = 'threw'
+        try {
+            if ($request.workdir) {
+                [void]$PS.AddCommand('Microsoft.PowerShell.Management\Set-Location').AddParameter('LiteralPath', $request.workdir).AddParameter('ErrorAction', 'Stop')
+                [void]$PS.Invoke()
+                if ($PS.HadErrors) { throw 'Could not set the requested working directory' }
+                $PS.Commands.Clear()
+            }
+            # AddScript does not enforce #requires; check its AST contract before user code runs.
+            $requirements = [scriptblock]::Create($request.script).Ast.ScriptRequirements
+            if ($requirements) {
+                if ($requirements.RequiredPSVersion -and $PSVersionTable.PSVersion -lt $requirements.RequiredPSVersion) {
+                    throw ('Script requires PowerShell ' + $requirements.RequiredPSVersion)
+                }
+                if ($requirements.RequiredPSEditions.Count -gt 0 -and $requirements.RequiredPSEditions -notcontains $PSVersionTable.PSEdition) {
+                    throw ('Script requires PowerShell edition ' + ($requirements.RequiredPSEditions -join ', '))
+                }
+                if ($requirements.IsElevationRequired) {
+                    $elevated = if ($IsWindows) {
+                        [Security.Principal.WindowsPrincipal]::new([Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
+                    } else { [Environment]::UserName -eq 'root' }
+                    if (-not $elevated) { throw 'Script requires administrator privileges' }
+                }
+                if ($requirements.RequiredApplicationId -or $requirements.RequiredAssemblies.Count -gt 0) {
+                    throw 'pwsh_run does not support #requires -ShellId or -Assembly; load assemblies explicitly'
+                }
+                if ($requirements.RequiredModules.Count -gt 0) {
+                    [void]$PS.AddCommand('Microsoft.PowerShell.Core\Import-Module').AddParameter('FullyQualifiedName', $requirements.RequiredModules).AddParameter('ErrorAction', 'Stop')
+                    [void]$PS.Invoke()
+                    if ($PS.HadErrors) { throw 'Could not load the modules required by the script' }
+                    $PS.Commands.Clear()
+                }
+            }
+            # Run the user's script at top level; formatting is the following pipeline command.
+            [void]$PS.AddScript($request.script, $false).AddCommand('Microsoft.PowerShell.Utility\Out-String').AddParameter('Stream').AddParameter('Width', 200)
+            $a = $PS.BeginInvoke[psobject, psobject]($null, $out)
+            if (-not $a.AsyncWaitHandle.WaitOne($timeoutMs)) {
+                $timedOut = $true
+                $PS.Stop()
+            }
+            [void]$PS.EndInvoke($a)
+            $sentinel = 'ok'
+        } catch {
+            if ($timedOut) { $sentinel = 'ran' }
+            else {
+                $cause = $_.Exception
+                while ($null -ne $cause.InnerException) { $cause = $cause.InnerException }
+                $sink.Emit('X', $cause.Message)
+            }
+        } finally {
+            $PS.Dispose()
+            $out.Dispose()
         }
-      }
-      while ($out.Count -gt $emitted) { $item = $out[$emitted]; $emitted++; if ($null -ne $item) { if ([string]$item -like 'S:*') { $sawSentinel = $true }; $ProtoOut.WriteLine([string]$item) } }
-    }
-    # 错误 / 警告已在管道内按类型打标，这里不再重复汇总，
-    # 只兜底那些没能进入管道的残留（例如 runspace 级错误）。
-    foreach ($er in $PS.Streams.Error) { $ProtoOut.WriteLine('E:' + [Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes([string]$er))) }
-    $PS.Streams.Error.Clear()
-    $PS.Dispose()
-    # 哨兵兜底：$Fmt 没能执行（语法错误 / BeginInvoke 就失败）时补一条，
-    # 让客户端始终能区分「跑完了」「抛异常了」「被中断了」。
-    if (-not $sawSentinel) {
-      $__n = 'threw'; if ($timedOut) { $__n = 'ran' }
-      $ProtoOut.WriteLine('S:' + [Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes($__n)))
+        $ProtoOut.WriteLine('S:' + [Convert]::ToBase64String($Utf8.GetBytes($sentinel)))
+        $ProtoOut.WriteLine('<<<T:' + $cid + ':' + [int]$timedOut + '>>>')
+        $ProtoOut.WriteLine('<<<E:' + $cid + '>>>')
     }
-    $ProtoOut.WriteLine('<<<T:' + $cid + ':' + [int]$timedOut + '>>>')
-    $ProtoOut.WriteLine('<<<E:' + $cid + '>>>')
-    $ProtoOut.Flush()
-}
-$ProtoOut.WriteLine('<<<BYE>>>'); $ProtoOut.Flush()
+} finally { $RS.Dispose() }
+$ProtoOut.WriteLine('<<<BYE>>>')