fix: keep ctrl-c input clearing when queue paused

Author: brandonkachen

cli/src/hooks/__tests__/use-queue-controls.test.ts

@@ -0,0 +1,66 @@
+import { describe, test, expect, mock } from 'bun:test'
+
+import { createQueueCtrlCHandler } from '../use-queue-controls'
+
+describe('createQueueCtrlCHandler', () => {
+  const setupHandler = (
+    overrides: Partial<Parameters<typeof createQueueCtrlCHandler>[0]> = {},
+  ) => {
+    const clearQueue = mock(() => [] as string[])
+    const resumeQueue = mock(() => {})
+    const baseHandleCtrlC = mock(() => true as const)
+
+    const handler = createQueueCtrlCHandler({
+      queuePaused: false,
+      queuedCount: 0,
+      inputHasText: false,
+      clearQueue,
+      resumeQueue,
+      baseHandleCtrlC,
+      ...overrides,
+    })
+
+    return { handler, clearQueue, resumeQueue, baseHandleCtrlC }
+  }
+
+  test('delegates to base handler when input has text even if queue is paused', () => {
+    const { handler, clearQueue, resumeQueue, baseHandleCtrlC } = setupHandler({
+      queuePaused: true,
+      queuedCount: 2,
+      inputHasText: true,
+    })
+
+    handler()
+
+    expect(clearQueue.mock.calls.length).toBe(0)
+    expect(resumeQueue.mock.calls.length).toBe(0)
+    expect(baseHandleCtrlC.mock.calls.length).toBe(1)
+  })
+
+  test('clears queued items when paused with pending work and input is empty', () => {
+    const { handler, clearQueue, resumeQueue, baseHandleCtrlC } = setupHandler({
+      queuePaused: true,
+      queuedCount: 3,
+      inputHasText: false,
+    })
+
+    handler()
+
+    expect(clearQueue.mock.calls.length).toBe(1)
+    expect(resumeQueue.mock.calls.length).toBe(1)
+    expect(baseHandleCtrlC.mock.calls.length).toBe(0)
+  })
+
+  test('delegates when there are no queued items to cancel', () => {
+    const { handler, clearQueue, resumeQueue, baseHandleCtrlC } = setupHandler({
+      queuePaused: true,
+      queuedCount: 0,
+    })
+
+    handler()
+
+    expect(clearQueue.mock.calls.length).toBe(0)
+    expect(resumeQueue.mock.calls.length).toBe(0)
+    expect(baseHandleCtrlC.mock.calls.length).toBe(1)
+  })
+})

cli/src/hooks/use-queue-controls.ts

@@ -9,6 +9,24 @@ interface UseQueueControlsParams {
   baseHandleCtrlC: () => true
 }
 
+type QueueCtrlCHandlerOptions = UseQueueControlsParams
+
+export const createQueueCtrlCHandler = ({
+  queuePaused,
+  queuedCount,
+  clearQueue,
+  resumeQueue,
+  inputHasText,
+  baseHandleCtrlC,
+}: QueueCtrlCHandlerOptions) => () => {
+  if (queuePaused && queuedCount > 0 && !inputHasText) {
+    clearQueue()
+    resumeQueue()
+    return true
+  }
+  return baseHandleCtrlC()
+}
+
 export const useQueueControls = ({
   queuePaused,
   queuedCount,
@@ -17,14 +35,24 @@ export const useQueueControls = ({
   inputHasText,
   baseHandleCtrlC,
 }: UseQueueControlsParams) => {
-  const handleCtrlC = useCallback(() => {
-    if (queuePaused && queuedCount > 0) {
-      clearQueue()
-      resumeQueue()
-      return true
-    }
-    return baseHandleCtrlC()
-  }, [baseHandleCtrlC, clearQueue, queuePaused, queuedCount, resumeQueue])
+  const handleCtrlC = useCallback(
+    createQueueCtrlCHandler({
+      queuePaused,
+      queuedCount,
+      clearQueue,
+      resumeQueue,
+      inputHasText,
+      baseHandleCtrlC,
+    }),
+    [
+      baseHandleCtrlC,
+      clearQueue,
+      inputHasText,
+      queuePaused,
+      queuedCount,
+      resumeQueue,
+    ],
+  )
 
   const ensureQueueActiveBeforeSubmit = useCallback(() => {
     if (queuePaused) {