thejoker.msk/iris-context
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: stdin handling and exit command (#58)

Browse Source 
### Summary of Changes
Fixes **#53** (*Fish shell integration panics with `inappropriate ioctl
for device`*).
#### 1. Fixed Non-TTY Stdin (`panic: inappropriate ioctl for device`) —
Fixes #53
- **Root Cause**: When executing `iris init fish | source` (or sourcing
shell configs), `os.Stdin` (FD 0) is connected to a pipe instead of a
TTY. Calling `term.MakeRaw()` on
a pipe returns `ENOTTY`.
- **Fix**: Guarded `term.MakeRaw()` with `term.IsTerminal()` checks
across `root/wrapper.go` and `root/root.go`. Added fallback to open and
use `/dev/tty` when `os.Stdin` is
  not a terminal device.
- **Fish IPC Hooks**: Added `fish_preexec` and `fish_postexec` event
handlers to `iris init fish` to send `IRIS_CMD_START` / `IRIS_CMD_STOP`
IPC signals over `$IRIS_FD`.
  
#### 2. Fixed Shell Setup Order (Duplicate `fastfetch` / startup
executions) — Fixes #53
- **Root Cause**: `iris setup` appended the init script to the bottom of
shell configs (`config.fish`, `.zshrc`, `.bashrc`), causing pre-existing
interactive startup commands
  to run twice.
- **Fix**: Updated `setupCmd` in `root/init.go` to **prepend** `# Iris
Autocomplete` to the top of shell configuration files.
  
#### 3. Fixed Terminal Exit Loop Handling — Relates to #50
- **Root Cause**: When typing `exit` in the wrapped shell, Linux PTY
returns `syscall.EIO` (`Input/output error`) on `ptmx.Read()` rather
than `io.EOF`. `runWrapper()` was
ignoring non-EOF errors and looping indefinitely without restoring the
terminal or calling `os.Exit(0)`.
- **Fix**: Updated the `ptmx.Read` error handler in `root/wrapper.go` to
handle `syscall.EIO` and exit cleanly.
  
   ---
  
  ### Issues Addressed
   - Closes #53
   - Relates to #50, #55
  
   ---
  
  ### Verification Tested
- [x] Verified `iris setup fish` / `iris init fish | source` initializes
without `ioctl` panic.
- [x] Verified typing `exit` in Fish, Zsh, and Bash terminates IRIS
cleanly and restores standard terminal state.
   - [x] Ran `go test ./...` — all tests pass.

---------

Co-authored-by: verse91 <versedev.store@proton.me>
Co-authored-by: VERSE <sunnyone0901@gmail.com>
This commit is contained in:
Ashvin Singh
2026-07-29 21:28:48 +07:00
committed by GitHub
co-authored by verse91 VERSE
parent d6cfb9c909
commit d73921e419
4 changed files with 83 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
root/wrapper.go
+38 -14
View File
@@ -4,6 +4,7 @@ import (
"bufio"
"bytes"
"context"
"errors"
"fmt"
"io"
"os"
@@ -83,6 +84,7 @@ func saveMode(mode string) {
var (
oldState *term.State
oldStateFd int
oldStateMu sync.Mutex
activeMode string
activeModeMu sync.RWMutex
@@ -103,7 +105,7 @@ func restoreTerminal() {
oldStateMu.Lock()
defer oldStateMu.Unlock()
if oldState != nil {
_ = term.Restore(int(os.Stdin.Fd()), oldState)
_ = term.Restore(oldStateFd, oldState)
oldState = nil
}
}
@@ -152,20 +154,39 @@ func runWrapper() {
}
defer func() { _ = ptmx.Close() }()
_ = pty.InheritSize(os.Stdin, ptmx)
stdinFile := os.Stdin
if !term.IsTerminal(int(stdinFile.Fd())) {
if tty, ttyErr := os.OpenFile("/dev/tty", os.O_RDWR, 0); ttyErr == nil {
stdinFile = tty
}
}
_ = pty.InheritSize(stdinFile, ptmx)
spec.ShellPID = c.Process.Pid
logger.Infof("PTY child shell started: shell=%s, path=%s, pid=%d", shellName, adapter.GetShellPath(), c.Process.Pid)
// put terminal in raw mode to intercept every keystroke
var errMakeRaw error
oldState, errMakeRaw = term.MakeRaw(int(os.Stdin.Fd()))
if errMakeRaw != nil {
logger.Errorf("Failed to set terminal raw mode: %v", errMakeRaw)
panic(errMakeRaw)
if term.IsTerminal(int(stdinFile.Fd())) {
oldState, errMakeRaw = term.MakeRaw(int(stdinFile.Fd()))
if errMakeRaw != nil {
logger.Errorf("Failed to set terminal raw mode: %v", errMakeRaw)
panic(errMakeRaw)
}
oldStateFd = int(stdinFile.Fd())
logger.Debugf("Terminal set to raw mode successfully")
defer func() {
oldStateMu.Lock()
defer oldStateMu.Unlock()
if oldState != nil {
_ = term.Restore(int(stdinFile.Fd()), oldState)
oldState = nil
}
}()
} else {
logger.Warnf("stdinFile is not a terminal, skipping raw mode")
}
logger.Debugf("Terminal set to raw mode successfully")
defer restoreTerminal()
sigCh := make(chan os.Signal, 2)
signal.Notify(sigCh, syscall.SIGWINCH, syscall.SIGUSR1)
@@ -183,7 +204,7 @@ func runWrapper() {
switch s {
case syscall.SIGWINCH:
logger.Debugf("Received SIGWINCH terminal resize signal")
_ = pty.InheritSize(os.Stdin, ptmx) // handle terminal window resize
_ = pty.InheritSize(stdinFile, ptmx) // handle terminal window resize
// this is the core feature of reloading
// it helps IRIS reload itself that you dont need to restart the shell manually
// SIGUSR1 is the signal to active reload when you type "just reload"
@@ -263,7 +284,7 @@ func runWrapper() {
config.AutoDetectConfigChange(func(cfg *config.Config) {
disableGhostText.Store(!cfg.UI.GhostText)
})
var renderOverlay func()
renderOverlay := func() {}
isExecuting := func() bool {
if isCommandActive.Load() {
return true
@@ -291,11 +312,12 @@ func runWrapper() {
for {
n, err := ptmx.Read(buf)
if err != nil {
if err == io.EOF {
restoreTerminal()
restoreTerminal()
if err == io.EOF || errors.Is(err, syscall.EIO) || strings.Contains(err.Error(), "input/output error") {
os.Exit(0)
}
continue
logger.Errorf("Unexpected PTY read error: %v", err)
os.Exit(1)
}
writeStdout(buf[:n])
@@ -319,6 +341,8 @@ func runWrapper() {
}
}()
// listen for suggestion requests from shell scripts via the ipc pipe
go func() {
defer func() {
@@ -599,7 +623,7 @@ func runWrapper() {
inBracketedPaste := false
for {
inputSlice := make([]byte, 128)
n, err := os.Stdin.Read(inputSlice)
n, err := stdinFile.Read(inputSlice)
if err != nil {
break
}