Suppress ^C echo and trailing % on exit for live transcription commands (#23)

Author: finnvoor

Sources/yap/Dictate.swift

@@ -104,6 +104,16 @@ struct Dictate: AsyncParsableCommand {
         let signalReadFD = signalPipe[0]
         dictateSignalWriteFD = signalPipe[1]
 
+        // Suppress ^C echo
+        var originalTermios = termios()
+        let hasTerminal = isatty(STDIN_FILENO) != 0
+        if hasTerminal {
+            tcgetattr(STDIN_FILENO, &originalTermios)
+            var raw = originalTermios
+            raw.c_lflag &= ~UInt(ECHOCTL)
+            tcsetattr(STDIN_FILENO, TCSANOW, &raw)
+        }
+
         signal(SIGINT) { _ in
             _ = write(dictateSignalWriteFD, "x", 1)
         }
@@ -113,11 +123,16 @@ struct Dictate: AsyncParsableCommand {
         }
 
         // Wait for SIGINT in background, then gracefully shut down
+        nonisolated(unsafe) var savedTermios = originalTermios
+        let restoreTerminal = hasTerminal
         Task.detached {
             var buf: UInt8 = 0
             _ = read(signalReadFD, &buf, 1)
             close(signalReadFD)
             close(dictateSignalWriteFD)
+            if restoreTerminal {
+                tcsetattr(STDIN_FILENO, TCSANOW, &savedTermios)
+            }
             capture.stop()
             try? await analyzer.finalizeAndFinishThroughEndOfInput()
         }
@@ -130,6 +145,7 @@ struct Dictate: AsyncParsableCommand {
                 fflush(stdout)
             }
         }
+        print()
     }
 }
 

Sources/yap/Listen.swift

@@ -135,6 +135,16 @@ struct Listen: AsyncParsableCommand {
         let signalReadFD = signalPipe[0]
         listenSignalWriteFD = signalPipe[1]
 
+        // Suppress ^C echo
+        var originalTermios = termios()
+        let hasTerminal = isatty(STDIN_FILENO) != 0
+        if hasTerminal {
+            tcgetattr(STDIN_FILENO, &originalTermios)
+            var raw = originalTermios
+            raw.c_lflag &= ~UInt(ECHOCTL)
+            tcsetattr(STDIN_FILENO, TCSANOW, &raw)
+        }
+
         signal(SIGINT) { _ in
             _ = write(listenSignalWriteFD, "x", 1)
         }
@@ -145,11 +155,16 @@ struct Listen: AsyncParsableCommand {
 
         // Wait for SIGINT in background, then gracefully shut down
         nonisolated(unsafe) let streamToStop = stream
+        nonisolated(unsafe) var savedTermios = originalTermios
+        let restoreTerminal = hasTerminal
         Task.detached {
             var buf: UInt8 = 0
             _ = read(signalReadFD, &buf, 1)
             close(signalReadFD)
             close(listenSignalWriteFD)
+            if restoreTerminal {
+                tcsetattr(STDIN_FILENO, TCSANOW, &savedTermios)
+            }
             try? await streamToStop.stopCapture()
             inputContinuation.finish()
             try? await analyzer.finalizeAndFinishThroughEndOfInput()
@@ -163,6 +178,7 @@ struct Listen: AsyncParsableCommand {
                 fflush(stdout)
             }
         }
+        print()
     }
 }
 

Sources/yap/ListenAndDictate.swift

@@ -155,6 +155,16 @@ struct ListenAndDictate: AsyncParsableCommand {
         let signalReadFD = signalPipe[0]
         listenAndDictateSignalWriteFD = signalPipe[1]
 
+        // Suppress ^C echo
+        var originalTermios = termios()
+        let hasTerminal = isatty(STDIN_FILENO) != 0
+        if hasTerminal {
+            tcgetattr(STDIN_FILENO, &originalTermios)
+            var raw = originalTermios
+            raw.c_lflag &= ~UInt(ECHOCTL)
+            tcsetattr(STDIN_FILENO, TCSANOW, &raw)
+        }
+
         signal(SIGINT) { _ in
             _ = write(listenAndDictateSignalWriteFD, "x", 1)
         }
@@ -165,11 +175,16 @@ struct ListenAndDictate: AsyncParsableCommand {
 
         // Wait for SIGINT in background, then gracefully shut down both pipelines
         nonisolated(unsafe) let streamToStop = stream
+        nonisolated(unsafe) var savedTermios = originalTermios
+        let restoreTerminal = hasTerminal
         Task.detached {
             var buf: UInt8 = 0
             _ = read(signalReadFD, &buf, 1)
             close(signalReadFD)
             close(listenAndDictateSignalWriteFD)
+            if restoreTerminal {
+                tcsetattr(STDIN_FILENO, TCSANOW, &savedTermios)
+            }
             capture.stop()
             try? await streamToStop.stopCapture()
             sysInputContinuation.finish()
@@ -198,5 +213,6 @@ struct ListenAndDictate: AsyncParsableCommand {
                 }
             }
         }
+        print()
     }
 }