🐛 fix: target tmux windows by name instead of numeric index
Removes base-index detection which was unreliable and defaulted to 0 when tmux's actual base-index was 1, causing "index in use" and "can't find window" errors on session creation.
This commit is contained in:
parent
5f587c96b5
commit
e883835ae3
@ -41,7 +41,6 @@ impl SessionConfig {
|
|||||||
pub struct TmuxSession {
|
pub struct TmuxSession {
|
||||||
pub(crate) session_name: String,
|
pub(crate) session_name: String,
|
||||||
project_path: String,
|
project_path: String,
|
||||||
base_index: usize,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl TmuxSession {
|
impl TmuxSession {
|
||||||
@ -53,34 +52,12 @@ impl TmuxSession {
|
|||||||
.replace('.', "_")
|
.replace('.', "_")
|
||||||
.replace(' ', "-");
|
.replace(' ', "-");
|
||||||
|
|
||||||
let base_index = Self::get_base_index();
|
|
||||||
|
|
||||||
Self {
|
Self {
|
||||||
session_name,
|
session_name,
|
||||||
project_path: project_path.display().to_string(),
|
project_path: project_path.display().to_string(),
|
||||||
base_index,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_base_index() -> usize {
|
|
||||||
// Try to get base-index from tmux
|
|
||||||
let output = Command::new("tmux")
|
|
||||||
.args(["show-options", "-gv", "base-index"])
|
|
||||||
.output();
|
|
||||||
|
|
||||||
if let Ok(output) = output
|
|
||||||
&& output.status.success()
|
|
||||||
{
|
|
||||||
let index_str = String::from_utf8_lossy(&output.stdout);
|
|
||||||
if let Ok(index) = index_str.trim().parse::<usize>() {
|
|
||||||
return index;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Default to 0 if we can't determine
|
|
||||||
0
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn create(&self, config: &SessionConfig) -> Result<()> {
|
pub fn create(&self, config: &SessionConfig) -> Result<()> {
|
||||||
// Check if we're already inside a tmux session
|
// Check if we're already inside a tmux session
|
||||||
let inside_tmux = std::env::var("TMUX").is_ok();
|
let inside_tmux = std::env::var("TMUX").is_ok();
|
||||||
@ -167,25 +144,23 @@ impl TmuxSession {
|
|||||||
.status()
|
.status()
|
||||||
.context("Failed to create tmux session")?;
|
.context("Failed to create tmux session")?;
|
||||||
|
|
||||||
// Create panes for first window if specified
|
let first_target = format!("{}:{}", self.session_name, first_window.name);
|
||||||
|
|
||||||
if !first_window.panes.is_empty() {
|
if !first_window.panes.is_empty() {
|
||||||
self.create_panes(self.base_index, &first_window.panes)?;
|
self.create_panes(&first_target, &first_window.panes)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Apply layout for first window if specified
|
|
||||||
if let Some(layout) = &first_window.layout {
|
if let Some(layout) = &first_window.layout {
|
||||||
self.apply_layout(self.base_index, layout)?;
|
self.apply_layout(&first_target, layout)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create additional windows
|
// Create additional windows, targeting by session name so tmux auto-assigns the index
|
||||||
for (index, window) in config.windows.iter().skip(1).enumerate() {
|
for window in config.windows.iter().skip(1) {
|
||||||
let window_index = self.base_index + index + 1;
|
|
||||||
|
|
||||||
Command::new("tmux")
|
Command::new("tmux")
|
||||||
.args([
|
.args([
|
||||||
"new-window",
|
"new-window",
|
||||||
"-t",
|
"-t",
|
||||||
&format!("{}:{}", self.session_name, window_index),
|
&self.session_name,
|
||||||
"-n",
|
"-n",
|
||||||
&window.name,
|
&window.name,
|
||||||
"-c",
|
"-c",
|
||||||
@ -194,46 +169,44 @@ impl TmuxSession {
|
|||||||
.status()
|
.status()
|
||||||
.with_context(|| format!("Failed to create window: {}", window.name))?;
|
.with_context(|| format!("Failed to create window: {}", window.name))?;
|
||||||
|
|
||||||
// Create panes if specified
|
let target = format!("{}:{}", self.session_name, window.name);
|
||||||
|
|
||||||
if !window.panes.is_empty() {
|
if !window.panes.is_empty() {
|
||||||
self.create_panes(window_index, &window.panes)?;
|
self.create_panes(&target, &window.panes)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Apply layout if specified
|
|
||||||
if let Some(layout) = &window.layout {
|
if let Some(layout) = &window.layout {
|
||||||
self.apply_layout(window_index, layout)?;
|
self.apply_layout(&target, layout)?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Select the first window
|
// Select the first window by name
|
||||||
Command::new("tmux")
|
Command::new("tmux")
|
||||||
.args([
|
.args(["select-window", "-t", &first_target])
|
||||||
"select-window",
|
|
||||||
"-t",
|
|
||||||
&format!("{}:{}", self.session_name, self.base_index),
|
|
||||||
])
|
|
||||||
.status()
|
.status()
|
||||||
.context("Failed to select first window")?;
|
.context("Failed to select first window")?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn create_panes(&self, window_index: usize, panes: &[String]) -> Result<()> {
|
fn create_panes(&self, window_target: &str, panes: &[String]) -> Result<()> {
|
||||||
for (pane_index, command) in panes.iter().enumerate() {
|
for (pane_index, command) in panes.iter().enumerate() {
|
||||||
let target = format!("{}:{}", self.session_name, window_index);
|
|
||||||
|
|
||||||
// First pane already exists (created with the window), skip split
|
// First pane already exists (created with the window), skip split
|
||||||
if pane_index > 0 {
|
if pane_index > 0 {
|
||||||
// Create new pane by splitting
|
|
||||||
Command::new("tmux")
|
Command::new("tmux")
|
||||||
.args(["split-window", "-t", &target, "-c", &self.project_path])
|
.args([
|
||||||
|
"split-window",
|
||||||
|
"-t",
|
||||||
|
window_target,
|
||||||
|
"-c",
|
||||||
|
&self.project_path,
|
||||||
|
])
|
||||||
.status()
|
.status()
|
||||||
.context("Failed to split pane")?;
|
.context("Failed to split pane")?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Send the command to the pane if it's not empty
|
|
||||||
if !command.is_empty() {
|
if !command.is_empty() {
|
||||||
let pane_target = format!("{}:{}.{}", self.session_name, window_index, pane_index);
|
let pane_target = format!("{}.{}", window_target, pane_index);
|
||||||
Command::new("tmux")
|
Command::new("tmux")
|
||||||
.args(["send-keys", "-t", &pane_target, command, "Enter"])
|
.args(["send-keys", "-t", &pane_target, command, "Enter"])
|
||||||
.status()
|
.status()
|
||||||
@ -244,14 +217,9 @@ impl TmuxSession {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn apply_layout(&self, window_index: usize, layout: &str) -> Result<()> {
|
fn apply_layout(&self, window_target: &str, layout: &str) -> Result<()> {
|
||||||
Command::new("tmux")
|
Command::new("tmux")
|
||||||
.args([
|
.args(["select-layout", "-t", window_target, layout])
|
||||||
"select-layout",
|
|
||||||
"-t",
|
|
||||||
&format!("{}:{}", self.session_name, window_index),
|
|
||||||
layout,
|
|
||||||
])
|
|
||||||
.status()
|
.status()
|
||||||
.with_context(|| format!("Failed to apply layout: {}", layout))?;
|
.with_context(|| format!("Failed to apply layout: {}", layout))?;
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user