Merge remote-tracking branch 'origin/master' into fix/pty-handoff-grace

packages/pty/pty-local/package.json

@@ -36,6 +36,7 @@
     "@deepseek-ai/dsh-sandbox": "^0.0.1",
     "@deepseek-ai/dsh-sandbox-policy": "^0.0.1",
     "@deepseek-ai/dsh-session": "^0.0.1",
+    "@deepseek-ai/dsh-subprocess": "^0.0.1",
     "cordis": "^4.0.0-rc.7"
   },
   "dependencies": {
@@ -49,6 +50,7 @@
     "@deepseek-ai/dsh-sandbox": "workspace:^",
     "@deepseek-ai/dsh-sandbox-policy": "workspace:^",
     "@deepseek-ai/dsh-session": "workspace:^",
+    "@deepseek-ai/dsh-subprocess": "workspace:^",
     "cordis": "^4.0.0-rc.7"
   }
 }

packages/pty/pty-local/src/index.ts

@@ -10,6 +10,7 @@ import type { IPtyForkOptions } from 'node-pty'
 import type { Agent } from '@deepseek-ai/dsh-agent'
 import type { Session, SessionEvent } from '@deepseek-ai/dsh-session'
 import { PtyBackendCleanupError } from '@deepseek-ai/dsh-pty'
+import { scrubbedParentEnv } from '@deepseek-ai/dsh-subprocess'
 import type { PtyBackend, PtyBackendSpawnSpec } from '@deepseek-ai/dsh-pty'
 import type { SandboxMode } from '@deepseek-ai/dsh-sandbox'
 import { effectiveSandboxMode } from '@deepseek-ai/dsh-sandbox-policy'
@@ -26,7 +27,6 @@ export const name = 'pty-local'
 /** Required services: PTY registry plus the one shared confinement policy. */
 export const inject = ['pty', 'sandbox', 'sandboxPolicy']
 
-const SENSITIVE_ENV_PATTERN = /KEY|SECRET|TOKEN/i
 interface SandboxModeFenceState {
   pty: Context['pty']
   sandboxPolicy: Context['sandboxPolicy']
@@ -56,12 +56,9 @@ function ensureSandboxModeFence(ctx: Context, owner: Agent): void {
 }
 
 function childEnvironment(spec: PtyBackendSpawnSpec): NodeJS.ProcessEnv {
-  const env: NodeJS.ProcessEnv = {}
-  for (const [key, value] of Object.entries(process.env)) {
-    if (value !== undefined && !SENSITIVE_ENV_PATTERN.test(key) && !key.startsWith('DSH_')) env[key] = value
-  }
+  // node-pty owns the spawn; the base env shares the subprocess seam's scrub.
   return {
-    ...env,
+    ...scrubbedParentEnv(),
     TERM: 'dumb',
     PAGER: 'cat',
     GIT_PAGER: 'cat',

packages/pty/pty-local/src/session.ts

@@ -93,13 +93,6 @@ class LocalSendOperation implements PtySendOperation {
     return this.promise.promise
   }
 
-  /**
-   * Accumulate sanitized output into the operation's viewport. Output that arrives after
-   * the operation settles is dropped here and survives only in the session scrollback, so
-   * a caller waiting on this operation for a marker cannot observe one the child prints
-   * after any readiness tier ended the send.
-   * @param text Sanitized text to append while the operation is still active.
-   */
   append(text: string): void {
     if (!this.finished) this.output.append(text)
   }

packages/pty/pty-local/tests/local.spec.ts

@@ -68,7 +68,9 @@ async function harness(
 }
 
 // PtySendOperation.append drops output once the operation settles, so this only
-// observes a marker the child prints while the send is still active.
+// observes a marker the child prints while `operation` is still active. A caller
+// whose child is slow to print must raise the harness `timing` bounds too;
+// extending this deadline alone cannot recover output the operation never collected.
 async function waitForOutput(operation: PtySendOperation, expected: string, timeoutMs = 2_000): Promise<void> {
   const deadline = Date.now() + timeoutMs
   let output = ''

packages/pty/pty-local/tsconfig.json

@@ -32,6 +32,9 @@
     {
       "path": "../../sandbox/sandbox-policy"
     },
+    {
+      "path": "../../subprocess/subprocess"
+    },
     {
       "path": "../../support/invariants"
     }