fix(cli): close background shell type gaps after the main merge

wenshao · Oct 6, 2026 · Oct 3, 2026 · Oct 3, 2026 · Oct 3, 2026 · Oct 3, 2026
commit 9c1437ddd6a1d97a8480084f49730d735058b2b0
diff --git a/packages/cli/src/serve/managed-background-shell-registry.ts b/packages/cli/src/serve/managed-background-shell-registry.ts
@@ -126,12 +126,12 @@ export class ManagedBackgroundShellRegistry {
       // event may lead it, so wait for each end first.
       const eof = { stdout: false, stderr: false };
       await Promise.allSettled([
-        process.child.stdout?.ended
+        process.child.stdout && process.child.stdout.readableEnded
           ? Promise.resolve((eof.stdout = true))
           : once(process.child.stdout!, 'end').then(() => {
               eof.stdout = true;
             }),
-        process.child.stderr?.ended
+        process.child.stderr && process.child.stderr.readableEnded
           ? Promise.resolve((eof.stderr = true))
           : once(process.child.stderr!, 'end').then(() => {
               eof.stderr = true;

diff --git a/packages/cli/src/serve/managed-background-shell.test.ts b/packages/cli/src/serve/managed-background-shell.test.ts
@@ -14,7 +14,11 @@ import type { ChildProcess } from 'node:child_process';
 import { managedToolDigest } from '@qwen-code/qwen-code-core/tools/managed-tool-protocol.js';
 import type { ToolResultEnvelope } from '@qwen-code/qwen-code-core/managed-runtime/managed-tool-result.js';
 import type { ToolResultExpectedIdentity } from '@qwen-code/qwen-code-core/managed-runtime/managed-tool-result-store.js';
-import type { ChildRunExitEvidence , ManagedChildRunProcess } from '@qwen-code/qwen-code-core/managed-runtime/managed-child-run-supervisor.js';
+import type {
+  ChildRunExitEvidence,
+  ManagedChildRunProcess,
+  ManagedChildRunSupervisor,
+} from '@qwen-code/qwen-code-core/managed-runtime/managed-child-run-supervisor.js';
 import { HookCommandIsolationUnavailableError } from '@qwen-code/qwen-code-core/managed-runtime/managed-child-run-supervisor.js';
 import {
   ManagedToolExecutor,
@@ -31,24 +35,24 @@ afterEach(async () => {
   await rm(directory, { recursive: true, force: true });
 });
 
-function fakeChild(
-  unitName: string,
-): ChildProcess & {
+function fakeChild(unitName: string): ChildProcess & {
   emitExit: (code: number | null, signal: string | null) => void;
 } {
   const child = new EventEmitter() as ChildProcess & {
     emitExit: (code: number | null, signal: string | null) => void;
   };
   (child as unknown as { pid: number }).pid = 4242;
-  child.stdout = new PassThrough() as ChildProcess['stdout'];
-  child.stderr = new PassThrough() as ChildProcess['stderr'];
-  child.stdout!.resume();
-  child.stderr!.resume();
-  child.stdout!.write(`out:${unitName}\n`);
-  child.stderr!.write('');
+  const stdout = new PassThrough();
+  const stderr = new PassThrough();
+  child.stdout = stdout as ChildProcess['stdout'];
+  child.stderr = stderr as ChildProcess['stderr'];
+  stdout.resume();
+  stderr.resume();
+  stdout.write(`out:${unitName}\n`);
+  stderr.write('');
   child.emitExit = (code, signal) => {
-    child.stdout!.end();
-    child.stderr!.end();
+    stdout.end();
+    stderr.end();
     child.emit('exit', code, signal ?? null);
   };
   child.kill = (signal) => {
@@ -176,7 +180,7 @@ function rig(options: { withSupervisor?: boolean } = {}): Rig {
     sessionId: 'runtime-session-1',
     directory,
     tools: new Map([['run_shell_command', tool]]),
-    admitsDirectory: (each) => each.startsWith(directory),
+    admitsDirectory: (each: string) => each.startsWith(directory),
   } as unknown as ManagedToolSet;
   const executor = new ManagedToolExecutor(
     async () => tools,
@@ -185,7 +189,7 @@ function rig(options: { withSupervisor?: boolean } = {}): Rig {
     undefined,
     options.withSupervisor === false
       ? undefined
-      : (supervisor as unknown as { start: never }),
+      : (supervisor as unknown as ManagedChildRunSupervisor),
   );
   return {
     executor,

diff --git a/packages/cli/src/serve/managed-runtime-tool-executor.ts b/packages/cli/src/serve/managed-runtime-tool-executor.ts
@@ -828,7 +828,16 @@ export class ManagedToolExecutor {
     entry.acknowledgement = receipt;
     entry.v3Result = {
       ...entry.v3Result,
-      capture: { ...actual, deliveryStatus: receipt.deliveryStatus },
+      capture:
+        actual === null
+          ? null
+          : {
+              captureStatus: actual.captureStatus,
+              captureReason: actual.captureReason,
+              manifest: actual.manifest,
+              previewTruncated: actual.previewTruncated,
+              deliveryStatus: receipt.deliveryStatus,
+            },
     };
     return v3View(entry);
   }