fix(pty): reset persistent shell on cancellation

packages/pty/tool-bash-persistent/src/index.ts

@@ -309,6 +309,10 @@ async function executeCommand(
         SHELL_RESET_MESSAGE,
       ].join('\n')
     }
+    if (commandDeadline.signal.aborted) {
+      await shells.reset(owner, 'persistent bash command aborted')
+      commandDeadline.signal.throwIfAborted()
+    }
     if (latest.text.includes(marker.end)) {
       const complete = commandOutput(retainedScrollback(ctx, owner, id, latest), marker)
       return renderCaptured(complete, config.maxOutputChars)
@@ -325,10 +329,6 @@ async function executeCommand(
         SHELL_RESET_MESSAGE,
       ].filter(part => part.length > 0).join('\n')
     }
-    if (commandDeadline.signal.aborted) {
-      await shells.reset(owner, 'persistent bash command aborted')
-      commandDeadline.signal.throwIfAborted()
-    }
     if (promptCompleted(result)) {
       const snapshot = retainedScrollback(ctx, owner, id, latest)
       return renderCaptured(

packages/pty/tool-bash-persistent/tests/tools.spec.ts

@@ -80,6 +80,7 @@ type StubMode =
   | 'exit'
   | 'signal-exit'
   | 'wait-for-abort'
+  | 'end-on-abort'
   | 'idle-then-normal'
   | 'large'
   | 'nonzero'
@@ -119,11 +120,16 @@ class StubPtySession implements PtyBackendSession {
       return this.operation(Promise.resolve(this.result(this.motd, 'stdin_read')))
     }
     if (this.mode === 'send-error') throw new Error('stub send failed')
-    if (this.mode === 'wait-for-abort') {
+    if (this.mode === 'wait-for-abort' || this.mode === 'end-on-abort') {
       const done = new Promise<ReturnType<StubPtySession['result']>>((resolve) => {
         request.signal?.addEventListener('abort', () => {
-          this.scrollback += 'partial output'
+          const start = /__DSH_PERSISTENT_BASH_START_[^_]+(?:-[^_]+)*__/.exec(request.text)?.[0]
-          resolve(this.result('partial output', 'stdin_read'))
+          const end = /__DSH_PERSISTENT_BASH_END_[^:]+:/.exec(request.text)?.[0]
+          const output = this.mode === 'end-on-abort'
+            ? `${start ?? ''}\ninterrupted\n${end ?? ''}130\n${this.motd}`
+            : 'partial output'
+          this.scrollback += output
+          resolve(this.result(output, 'stdin_read'))
         }, { once: true })
       })
       return this.operation(done)
@@ -389,22 +395,25 @@ describe('tool-bash-persistent', () => {
     expect(stub.sessions[0]?.closed).toContain('persistent bash command timed out')
   })
 
-  it('cancels in-flight work, resets the shell, and releases a queued call', async () => {
+  it.each(['wait-for-abort', 'end-on-abort'] as const)(
-    const { ctx, owner, stub } = await setup({ backendType: 'stub', timeoutMs: 5_000 })
+    'cancels %s work, resets the shell, and releases a queued call',
-    await call(ctx, owner, 'warm up')
+    async (mode) => {
-    stub.sessions[0]!.mode = 'wait-for-abort'
+      const { ctx, owner, stub } = await setup({ backendType: 'stub', timeoutMs: 5_000 })
-    const controller = new AbortController()
+      await call(ctx, owner, 'warm up')
-    const cancelled = call(ctx, owner, 'hang', controller.signal)
+      stub.sessions[0]!.mode = mode
-    const queued = call(ctx, owner, 'after cancellation')
+      const controller = new AbortController()
-    setTimeout(() => {
+      const cancelled = call(ctx, owner, 'hang', controller.signal)
-      controller.abort(new Error('caller stopped'))
+      const queued = call(ctx, owner, 'after cancellation')
-    }, 5)
+      setTimeout(() => {
+        controller.abort(new Error('caller stopped'))
+      }, 5)
 
-    expect((await cancelled).isError).toBe(true)
+      expect((await cancelled).isError).toBe(true)
-    expect(text(await queued)).toBe('hello from stub')
+      expect(text(await queued)).toBe('hello from stub')
-    expect(stub.sessions[0]?.closed).toContain('persistent bash command aborted')
+      expect(stub.sessions[0]?.closed).toContain('persistent bash command aborted')
-    expect(stub.sessions).toHaveLength(2)
+      expect(stub.sessions).toHaveLength(2)
-  })
+    },
+  )
 
   it.each(['init-exit', 'init-timeout'] as const)(
     'fails initialization and closes the unusable shell for %s',