Skip to content

A modern terminal with a built-in multiplexer: close it and your sessions keep running. Run shells and tons of AI agents across your machines, then pick them up from desktop, browser, TUI and more. Written in Rust with no UI framework: interface drawn straight on the GPU. No Electron, GPUI or webview.

feat(web): show pane labels

RoversX0fb95760ed9f
diff --git a/thinkterm-web/src/app.rs b/thinkterm-web/src/app.rs
index c646bcea..5e56ede1 100644
--- a/thinkterm-web/src/app.rs
+++ b/thinkterm-web/src/app.rs
@@ -1708,6 +1708,7 @@ impl<P: Platform, L: Link> App<P, L> {
Pdu::PaneRemoved(_)
| Pdu::TabAddedToWindow(_)
| Pdu::TabTitleChanged(_)
+ | Pdu::PaneLabelChanged(_)
| Pdu::WindowTitleChanged(_)
| Pdu::TabResized(_)
| Pdu::WindowWorkspaceChanged(_) => {
@@ -3402,9 +3403,16 @@ impl<P: Platform, L: Link> App<P, L> {
.unwrap_or(&m.title);
let (title, busy) = crate::navbar::display_title(raw);
let busy = busy || inner.tree.agents.get(&m.pane_id) == Some(&thinkterm_proto::AgentState::Working);
+ // A label someone gave the pane names it, as it is
+ // in the desktop's pane bar.
+ let title = inner
+ .layout
+ .as_ref()
+ .and_then(|layout| layout.pane_labels.get(&m.pane_id).cloned())
+ .unwrap_or(title);
crate::navbar::CapsuleView {
pane_id: m.pane_id,
- title: title.to_string(),
+ title,
busy,
current: m.pane_id == place.pane_id,
icon: Self::pane_icon(inner, m.pane_id),
@@ -7419,6 +7427,7 @@ mod tests {
],
tab_titles: Vec::new(),
window_titles: Default::default(),
+ pane_labels: Default::default(),
};
let at = |pane_id| tab_places(&layout, pane_id).map(|places| places.iter().map(|p| (p.pane, p.left, p.top)).collect::<Vec<_>>());
assert_eq!(at(10), Some(vec![(10, 0, 0)]));
diff --git a/thinkterm-web/src/chrome.rs b/thinkterm-web/src/chrome.rs
index 6bdf1127..4600fa54 100644
--- a/thinkterm-web/src/chrome.rs
+++ b/thinkterm-web/src/chrome.rs
@@ -119,6 +119,15 @@ pub fn model(
e.title.clone()
}
};
+ // A label someone gave a pane names the pane, as in the desktop's
+ // pane bar; a tab goes on reading as the desktop's tab does.
+ let name_of = |e: &PaneEntry| {
+ layout
+ .pane_labels
+ .get(&e.pane_id)
+ .cloned()
+ .unwrap_or_else(|| title_of(e))
+ };
let title = layout
.tab_titles
.get(i)
@@ -131,7 +140,7 @@ pub fn model(
.iter()
.map(|e| PaneView {
pane_id: e.pane_id,
- title: title_of(e),
+ title: name_of(e),
current: e.pane_id == current,
})
.collect()
@@ -215,6 +224,7 @@ mod tests {
],
tab_titles: vec!["".to_string(), "work".to_string(), "".to_string()],
window_titles: Default::default(),
+ pane_labels: Default::default(),
}
}
@@ -246,6 +256,19 @@ mod tests {
assert!(tabs[0].panes.is_empty(), "one pane is not a choice");
}
+ #[test]
+ fn a_label_names_its_pane_but_not_its_tab() {
+ let mut labelled = layout();
+ labelled.pane_labels.insert(10, "build".to_string());
+ labelled.pane_labels.insert(21, "reviewer".to_string());
+ let tabs = model(&labelled, 10, "zsh · ~", None);
+ assert_eq!(tabs[0].title, "zsh · ~", "a tab reads as on the desktop");
+ assert_eq!(tabs[1].title, "work");
+ let tabs = model(&labelled, 20, "vim", None);
+ assert_eq!(tabs[1].panes[0].title, "vim");
+ assert_eq!(tabs[1].panes[1].title, "reviewer");
+ }
+
#[test]
fn a_pane_is_found_wherever_it_is_and_the_first_tab_is_the_default() {
assert_eq!(entry(&layout(), 21).map(|e| e.tab_id), Some(2));
@@ -259,6 +282,7 @@ mod tests {
})],
tab_titles: vec![],
window_titles: Default::default(),
+ pane_labels: Default::default(),
};
assert_eq!(first_choice(&stack).map(|e| e.pane_id), Some(31));
}
diff --git a/thinkterm-web/src/layout.rs b/thinkterm-web/src/layout.rs
index 24758af1..0e0c4e2a 100644
--- a/thinkterm-web/src/layout.rs
+++ b/thinkterm-web/src/layout.rs
@@ -737,6 +737,7 @@ mod tests {
],
tab_titles: vec![],
window_titles: Default::default(),
+ pane_labels: Default::default(),
};
assert!(matches!(tab_containing(&list, 7), Some(PaneNode::Leaf(e)) if e.pane_id == 7));
assert!(tab_containing(&list, 9).is_none());
@@ -753,6 +754,7 @@ mod tests {
],
tab_titles: vec!["a".into(), "b".into(), "c".into(), "d".into()],
window_titles: Default::default(),
+ pane_labels: Default::default(),
};
let mut overflowing = pane(5, 80, 24, 0, 0, true);
overflowing.physical_top = StableRowIndex::MAX;
diff --git a/thinkterm-web/src/tree.rs b/thinkterm-web/src/tree.rs
index 303466b5..c36b6b68 100644
--- a/thinkterm-web/src/tree.rs
+++ b/thinkterm-web/src/tree.rs
@@ -1020,6 +1020,7 @@ mod tests {
})],
tab_titles: vec![],
window_titles: Default::default(),
+ pane_labels: Default::default(),
};
m.apply_panes(&list);
let rows = m.rows(30, "default", 3);